X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=cc40f89bc137a519843858e7fdc20f659447d0b0;hb=ea40dabb392aec3d7b9da666285969bb296a94e2;hp=bbfa3285d7f9178bf9905694ec4da342fab582d9;hpb=67a347bafb875be60e7554f308d80d7f0a1d2747;p=quix0rs-gnu-social.git

diff --git a/actions/newnotice.php b/actions/newnotice.php
index bbfa3285d7..cc40f89bc1 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -1,4 +1,23 @@
 <?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/>.
+ */
+
+if (!defined('LACONICA')) { exit(1); }
 
 class NewnoticeAction extends Action {
 	
@@ -7,42 +26,69 @@ class NewnoticeAction extends Action {
 		# XXX: Ajax!
 
 		if (!common_logged_in()) {
-			common_user_error(_t('Not logged in.'));
-		} else if ($this->arg('METHOD') == 'POST') {
-			if ($this->save_new_notice()) {
-				# XXX: smarter redirects
-				$user = common_current_user();
-				assert(!is_null($user)); # see if... above
-				# XXX: redirect to source
-				# XXX: use Ajax instead of a redirect
-				common_redirect(common_local_url('all',
-												 array('nickname' =>
-													   $user->nickname)));
-			} else {
-				common_server_error(_t('Problem saving notice.'));
-			}
+			common_user_error(_('Not logged in.'));
+		} else if ($_SERVER['REQUEST_METHOD'] == 'POST') {
+			$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->content = $this->arg('content');
-		$notice->created = time();
-		return $notice->insert();
+		$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;
+		}
+
+		$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' => $notice->id));
+		}
+		common_redirect($url, 303);
 	}
-	
-	function show_form() {
-		common_start_element('form', array('id' => 'newnotice', 'method' => 'POST',
-										   'action' => common_local_url('newnotice')));
-		common_element('span', 'nickname', $profile->nickname);
-		common_element('textarea', array('rows' => 4, 'cols' => 80, 'id' => 'content'));
-		common_element('input', array('type' => 'submit'), 'Send');
-		common_end_element('form');
+
+	function show_top($content=NULL) {
+		common_notice_form(NULL, $content);
+	}
+
+	function show_form($msg=NULL) {
+		$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('p', 'error', $msg);
+		}
+		common_show_footer();
 	}
-}
\ No newline at end of file
+}