From 5fc9f116776164da15cf6e927849e68f6515cdb9 Mon Sep 17 00:00:00 2001
From: millette <millette@controlyourself.ca>
Date: Thu, 13 Nov 2008 10:32:16 -0500
Subject: [PATCH] trac31 shorten all URLs even if notice is already <

darcs-hash:20081113153216-099f7-81c4aba01babca97edeaf55b230dee300dbeb57a.gz
---
 actions/newmessage.php |  5 ++---
 actions/newnotice.php  | 11 ++---------
 actions/postnotice.php |  4 ++--
 3 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 2455f42e94..d4e289465a 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -34,7 +34,6 @@ class NewmessageAction extends Action {
 	}
 
 	function save_new_message() {
-
 		$user = common_current_user();
 		assert($user); # XXX: maybe an error instead...
 
@@ -52,8 +51,8 @@ class NewmessageAction extends Action {
 		if (!$content) {
 			$this->show_form(_('No content!'));
 			return;
-		} else if (mb_strlen($content) > 140) {
-		
+//		} else if (mb_strlen($content) > 140) {
+		} else {
 			$content = common_shorten_links($content);
 
 			if (mb_strlen($content) > 140) {
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 8ea47b235b..e88da16876 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -36,13 +36,6 @@ class NewnoticeAction extends Action {
 
 	function save_new_notice() {
 
-		# CSRF protection - token set in common_notice_form()
-		$token = $this->trimmed('token');
-		if (!$token || $token != common_session_token()) {
-			$this->client_error(_('There was a problem with your session token. Try again, please.'));
-			return;
-		}
-
 		$user = common_current_user();
 		assert($user); # XXX: maybe an error instead...
 		$content = $this->trimmed('status_textarea');
@@ -50,8 +43,8 @@ class NewnoticeAction extends Action {
 		if (!$content) {
 			$this->show_form(_('No content!'));
 			return;
-		} else if (mb_strlen($content) > 140) {
-			
+//		} else if (mb_strlen($content) > 140) {
+		} else {
 			$content = common_shorten_links($content);
 			
 			if (mb_strlen($content) > 140) {
diff --git a/actions/postnotice.php b/actions/postnotice.php
index b4a272e618..243aa31633 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -58,13 +58,13 @@ class PostnoticeAction extends Action {
 			return false;
 		}
 		$content = $req->get_parameter('omb_notice_content');
-		if (!$content || strlen($content) > 140) {
+//		if (!$content || strlen($content) > 140) {
 			$content = common_shorten_links($content);
 			if (mb_strlen($content) > 140) {
 				common_user_error(_('Invalid notice content'), 400);
 				return false;
 			}
-		}
+//		}
 		$notice_uri = $req->get_parameter('omb_notice');
 		if (!Validate::uri($notice_uri) &&
 			!common_valid_tag($notice_uri)) {