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

diff --git a/actions/newnotice.php b/actions/newnotice.php
index f17ada3072..b5fc98c37c 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -20,22 +20,15 @@
 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') {
-			$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();
 		}
@@ -45,30 +38,70 @@ 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('noticecontent');
+		$content = $this->trimmed('status_textarea');
+		
+		if (!$content) {
+			$this->show_form(_('No content!'));
+			return;
+		} else if (mb_strlen($content) > 140) {
+			common_debug("Content = '$content'", __FILE__);
+			common_debug("mb_strlen(\$content) = " . mb_strlen($content), __FILE__);
+			$this->show_form(_('That\'s too long. Max notice size is 140 chars.'));
+			return;
+		}
 
-		if (!$notice->content) {
-			$this->show_form(_t('No content!'));
+		$inter = new CommandInterpreter();
+		
+		$cmd = $inter->handle_command($user, $content);
+		
+		if ($cmd) {
+			$cmd->execute(new WebChannel());
 			return;
-		} else if (strlen($notice->content) > 140) {
-			$this->show_form(_t('Notice content too long.'));
+		}
+
+		$replyto = $this->trimmed('inreplyto');
+
+		common_debug("Replyto = $replyto\n");
+		
+		$notice = Notice::saveNew($user->id, $content, 'web', 1, ($replyto == 'false') ? NULL : $replyto);
+		
+		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' => $notice->id));
+		}
+		common_redirect($url, 303);
+	}
 
-		return $notice->insert();
+	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(_('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
+}