X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=de040ef77a38301d7152c2d9be6043e861dfa6f7;hb=86f02018cda02921e3980c3a2d3b0cdf2e39fcc6;hp=f17ada3072e49785b56abf32aeceb35825a8f59e;hpb=659feb5f43a1bd75b385fa2c96b568b71d2bcd96;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index f17ada3072..de040ef77a 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -28,14 +28,7 @@ class NewnoticeAction extends Action {
 		if (!common_logged_in()) {
 			common_user_error(_t('Not logged in.'));
 		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
-			$id = $this->save_new_notice();
-			if ($id) {
-				common_broadcast_notices($id);
-				common_redirect(common_local_url('shownotice',
-												 array('notice' => $id)), 303);
-			} else {
-				common_server_error(_t('Problem saving notice.'));
-			}
+			$this->save_new_notice();
 		} else {
 			$this->show_form();
 		}
@@ -50,25 +43,65 @@ class NewnoticeAction extends Action {
 		$notice->profile_id = $user->id; # user id *is* profile id
 		$notice->created = DB_DataObject_Cast::dateTime();
 		# Default theme uses 'content' for something else
-		$notice->content = $this->trimmed('noticecontent');
+		$notice->content = $this->trimmed('status_textarea');
 
 		if (!$notice->content) {
 			$this->show_form(_t('No content!'));
 			return;
 		} else if (strlen($notice->content) > 140) {
-			$this->show_form(_t('Notice content too long.'));
+			$this->show_form(_t('That\'s too long. Max notice size is 140 chars.'));
+			return;
+		}
+
+		$notice->rendered = common_render_content($notice->content, $notice);
+		
+		$id = $notice->insert();
+
+		if (!$id) {
+			common_server_error(_t('Problem saving notice.'));
 			return;
 		}
 
-		return $notice->insert();
+		$orig = clone($notice);
+		$notice->uri = common_notice_uri($notice);
+
+		if (!$notice->update($orig)) {
+			common_server_error(_t('Problem saving notice.'));
+			return;
+		}
+
+        common_save_replies($notice);	
+		common_broadcast_notice($notice);
+		
+		$returnto = $this->trimmed('returnto');
+		if ($returnto) {
+			$url = common_local_url($returnto,
+									array('nickname' => $user->nickname));
+		} else {
+			$url = common_local_url('shownotice',
+									array('notice' => $id));
+		}
+		common_redirect($url, 303);
+	}
+
+	function show_top($content=NULL) {
+		common_notice_form(NULL, $content);
 	}
 
 	function show_form($msg=NULL) {
-		common_show_header(_t('New notice'));
+		$content = $this->trimmed('status_textarea');
+		if (!$content) {
+			$replyto = $this->trimmed('replyto');
+			$profile = Profile::staticGet('nickname', $replyto);
+			if ($profile) {
+				$content = '@' . $profile->nickname . ' ';
+			}
+		}
+		common_show_header(_t('New notice'), NULL, $content,
+		                   array($this, 'show_top'));
 		if ($msg) {
-			common_element('div', 'error', $msg);
+			common_element('p', 'error', $msg);
 		}
-		common_notice_form();
 		common_show_footer();
 	}
-}
\ No newline at end of file
+}