X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=b2c513733d4dd2876e5babd772734b6b11372966;hb=44058fe50ad006d976628fcdca6d95ec1016b148;hp=fed3278a47f1b0b5489a253f3b27c5b47a78cd77;hpb=6f6aed821387075de8c22da55c5620c04cda0dc1;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index fed3278a47..b2c513733d 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -1,18 +1,18 @@
 <?php
-/* 
+/*
  * Laconica - a distributed open-source microblogging tool
  * Copyright (C) 2008, Controlez-Vous, Inc.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Affero General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -20,7 +20,7 @@
 if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
-	
+
 	function handle($args) {
 		parent::handle($args);
 		# XXX: Ajax!
@@ -28,41 +28,57 @@ 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();
 		}
 	}
-	
+
 	function save_new_notice() {
+
 		$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();
-		$notice->content = trim($this->arg('content'));
-		return $notice->insert();
+		# Default theme uses 'content' for something else
+		$notice->content = $this->trimmed('noticecontent');
+
+		if (!$notice->content) {
+			$this->show_form(_t('No content!'));
+			return;
+		} else if (strlen($notice->content) > 140) {
+			$this->show_form(_t('Notice content too long.'));
+			return;
+		}
+
+		$id = $notice->insert();
+		
+		if (!$id) {
+			common_server_error(_t('Problem saving notice.'));
+			return;
+		}
+
+		$orig = clone($notice);
+		$notice->uri = common_mint_tag('notice:' . $id);
+		
+		if (!$notice->update($orig)) {
+			common_server_error(_t('Problem saving notice.'));
+			return;
+		}
+		
+		common_broadcast_notice($notice);
+		common_redirect(common_local_url('shownotice',
+										 array('notice' => $id)), 303);
 	}
-	
-	function show_form() {
+
+	function show_form($msg=NULL) {
 		common_show_header(_t('New notice'));
-		common_element_start('form', array('id' => 'newnotice', 'method' => 'POST',
-										   'action' => common_local_url('newnotice')));
-		common_element('span', 'nickname', $profile->nickname);
-		common_element('textarea', array('rows' => 3, 'cols' => 60,
-										 'name' => 'content',
-										 'id' => 'content'),
-					   ' ');
-		common_submit('submit', _t('Send'));
-		common_element_end('form');
+		if ($msg) {
+			common_element('div', 'error', $msg);
+		}
+		common_notice_form();
 		common_show_footer();
 	}
 }
\ No newline at end of file