X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=b2c513733d4dd2876e5babd772734b6b11372966;hb=9d670d25f8bbab226f8ae6be48a8126f989f82b9;hp=cc62901f2bd0ada1d72815e71e49adaa0d67a9c7;hpb=63758c59e1df81c955ce8528d80ba3fd0e466bec;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index cc62901f2b..b2c513733d 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -28,39 +28,56 @@ 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'));
+		# Default theme uses 'content' for something else
+		$notice->content = $this->trimmed('noticecontent');
 
-		$val = $notice->validate();
-		if ($val === TRUE) {
-			return $notice->insert();
-		} else {
-			// XXX: display some info
-			return NULL;
+		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'));
+		if ($msg) {
+			common_element('div', 'error', $msg);
+		}
 		common_notice_form();
 		common_show_footer();
 	}