From a7cdf32df541bf73a47f1255b3e9f0a22c4724b4 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 25 Jun 2009 13:23:59 -0700
Subject: [PATCH 1/2] max public page

---
 actions/public.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/actions/public.php b/actions/public.php
index 27153f1315..9851285c48 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -35,6 +35,10 @@ require_once INSTALLDIR.'/lib/publicgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
 require_once INSTALLDIR.'/lib/feedlist.php';
 
+// Farther than any human will go
+
+define('MAX_PUBLIC_PAGE', 100);
+
 /**
  * Action for displaying the public stream
  *
@@ -74,6 +78,10 @@ class PublicAction extends Action
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
 
+        if ($this->page > MAX_PUBLIC_PAGE) {
+            $this->clientError(sprintf(_("Beyond the page limit (%s)"), MAX_PUBLIC_PAGE));
+        }
+
         common_set_returnto($this->selfUrl());
 
         return true;

From 6a0571d51b0cafb0dbc7caf3aa61cdfd17d6c7ce Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 25 Jun 2009 21:01:07 +0000
Subject: [PATCH 2/2] Added functionality to remove the notice data attachment

---
 js/util.js                 | 14 ++++++++++----
 theme/base/css/display.css | 11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/js/util.js b/js/util.js
index 9156045bbf..e7c54b74ac 100644
--- a/js/util.js
+++ b/js/util.js
@@ -222,6 +222,7 @@ $(document).ready(function(){
 													}
 													$("#notice_data-text").val("");
     												$("#notice_data-attach").val("");
+                                                    $('#notice_data-attach_selected').remove();
                                                     counter();
 												}
 												$("#form_notice").removeClass("processing");
@@ -233,7 +234,7 @@ $(document).ready(function(){
 	$("#form_notice").each(addAjaxHidden);
     NoticeReply();
     NoticeAttachments();
-    NoticeDataAttachSelected();
+    NoticeDataAttach();
 });
 
 function NoticeReply() {
@@ -312,10 +313,15 @@ function NoticeAttachments() {
     );
 }
 
-function NoticeDataAttachSelected() {
-    $('#notice_data-attach').change(function() {
-        S = '<div id="notice_data-attach_selected" class="success">'+$(this).val()+'</div>';
+function NoticeDataAttach() {
+    NDA = $('#notice_data-attach');
+    NDA.change(function() {
+        S = '<div id="notice_data-attach_selected" class="success"><code>'+$(this).val()+'</code> <button>&#215;</button></div>';
         NDAS = $('#notice_data-attach_selected');
         (NDAS.length > 0) ? NDAS.replaceWith(S) : $('#form_notice').append(S);
+        $('#notice_data-attach_selected button').click(function(){
+            $('#notice_data-attach_selected').remove();
+            NDA.val('');
+        });
     });
 }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c8f23e4f56..78fcd7ecef 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -517,8 +517,19 @@ clear:both;
 width:81.5%;
 margin-bottom:0;
 line-height:1.618;
+}
+#form_notice #notice_data-attach_selected code {
+float:left;
+width:90%;
+display:block;
+font-size:1.1em;
+line-height:1.8;
 overflow:auto;
 }
+#form_notice #notice_data-attach_selected button {
+float:right;
+font-size:0.8em;
+}
 
 /* entity_profile */
 .entity_profile {