X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=b576e1326641b0c593feae507b644e8742366e72;hb=0bba990e2f4506da877224285442c81f68662743;hp=64fe2494b8f11845675e086d364910e656e8c9a5;hpb=d34fc127a55301a08560d4c2b45bdf057e852432;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index 64fe2494b8..b576e13266 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -20,13 +20,13 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
-
+	
 	function handle($args) {
 		parent::handle($args);
 		# XXX: Ajax!
 
 		if (!common_logged_in()) {
-			common_user_error(_t('Not logged in.'));
+			common_user_error(_('Not logged in.'));
 		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$this->save_new_notice();
 		} else {
@@ -38,44 +38,33 @@ class NewnoticeAction extends Action {
 
 		$user = common_current_user();
 		assert($user); # XXX: maybe an error instead...
-		$notice = DB_DataObject::factory('notice');
-		assert($notice);
-		$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('status_textarea');
-
-		if (!$notice->content) {
-			$this->show_form(_t('No content!'));
-			return;
-		} else if (strlen($notice->content) > 140) {
-			$this->show_form(_t('That\'s too long. Max notice size is 140 chars.'));
+		$content = $this->trimmed('status_textarea');
+		
+		if (!$content) {
+			$this->show_form(_('No content!'));
 			return;
-		}
-
-		$id = $notice->insert();
-
-		if (!$id) {
-			common_server_error(_t('Problem saving notice.'));
+		} else if (strlen($content) > 140) {
+			$this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
 			return;
 		}
 
-		$orig = clone($notice);
-		$notice->uri = common_notice_uri($notice);
-
-		if (!$notice->update($orig)) {
-			common_server_error(_t('Problem saving notice.'));
+		$notice = Notice::saveNew($user->id, $content, 'web');
+		
+		if (is_string($notice)) {
+			$this->show_form($notice);
 			return;
 		}
-
+		
 		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));
+									array('notice' => $notice->id));
 		}
 		common_redirect($url, 303);
 	}
@@ -86,7 +75,14 @@ class NewnoticeAction extends Action {
 
 	function show_form($msg=NULL) {
 		$content = $this->trimmed('status_textarea');
-		common_show_header(_t('New notice'), NULL, $content,
+		if (!$content) {
+			$replyto = $this->trimmed('replyto');
+			$profile = Profile::staticGet('nickname', $replyto);
+			if ($profile) {
+				$content = '@' . $profile->nickname . ' ';
+			}
+		}
+		common_show_header(_('New notice'), NULL, $content,
 		                   array($this, 'show_top'));
 		if ($msg) {
 			common_element('p', 'error', $msg);