Clean up delete code. Add missing htaccess rule. Exit after errors so the code doesn't continue running.

darcs-hash:20080720124552-533db-81be2c04445f146e477b1bb7e6e8e7d0eb27431d.gz

1 files changed, 24 insertions, 24 deletions

diff --git a/lib/deleteaction.php b/lib/deleteaction.php
index 5d7a3245a..5ba0e7e44 100644
--- a/lib/deleteaction.php
+++ b/lib/deleteaction.php
@@ -23,39 +23,39 @@ class DeleteAction extends Action {
 
 	function handle($args) {
 		parent::handle($args);
-                $user = common_current_user();
-                $notice_id = $this->trimmed('notice');
-                $notice = Notice::staticGet($notice_id);
-                $profile = $notice->getProfile();
-                $user_profile = $user->getProfile();
-
-                if (!common_logged_in()) {
-                    common_user_error(_('Not logged in.'));
-                } else if ($notice->profile_id != $user_profile->id) {
-                    common_user_error(_('Can\'t delete this notice.'));
-                }
+		$user = common_current_user();
+		$notice_id = $this->trimmed('notice');
+		$notice = Notice::staticGet($notice_id);
+		if (!$notice) {
+			common_user_error(_('No such notice.'));
+			exit;
+		}
+
+		$profile = $notice->getProfile();
+		$user_profile = $user->getProfile();
+
+		if (!common_logged_in()) {
+			common_user_error(_('Not logged in.'));
+			exit;
+		} else if ($notice->profile_id != $user_profile->id) {
+			common_user_error(_('Can\'t delete this notice.'));
+			exit;
+		}
 	}
 
 	function show_top($arr=NULL) {
-		if ($arr) {
-			$error = $arr[1];
-		}
-		if ($error) {
-			common_element('p', 'error', $error);
-		} else {
-			$instr = $this->get_instructions();
-			$output = common_markup_to_html($instr);
-			common_element_start('div', 'instructions');
-			common_raw($output);
-			common_element_end('div');
-		}
+		$instr = $this->get_instructions();
+		$output = common_markup_to_html($instr);
+		common_element_start('div', 'instructions');
+		common_raw($output);
+		common_element_end('div');
 	}
 
 	function get_title() {
 		return NULL;
 	}
 
-	function show_header($arr) {
+	function show_header() {
 		return;
 	}
 }