From 15c1d4f5e4947b9c60439ab5a17694ad57d06704 Mon Sep 17 00:00:00 2001
From: millette <millette@controlyourself.ca>
Date: Thu, 6 Nov 2008 15:59:26 -0500
Subject: trac31 url_auto_shortening by sgmurphy

darcs-hash:20081106205926-099f7-6bcfd7969a159a12b1ba6a9ee254e44a07b94761.gz
---
 actions/newmessage.php             | 13 +++++++++----
 actions/newnotice.php              | 13 +++++++++----
 actions/postnotice.php             |  7 +++++--
 actions/profilesettings.php        |  4 ++--
 actions/twitapidirect_messages.php |  9 ++++++---
 actions/twitapistatuses.php        | 18 ++++++++++++------
 6 files changed, 43 insertions(+), 21 deletions(-)

(limited to 'actions')

diff --git a/actions/newmessage.php b/actions/newmessage.php
index 7dce97d20..2455f42e9 100644
--- a/actions/newmessage.php
+++ b/actions/newmessage.php
@@ -53,10 +53,15 @@ class NewmessageAction extends Action {
 			$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 message size is 140 chars.'));
-			return;
+		
+			$content = common_shorten_links($content);
+
+			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 message size is 140 chars.'));
+				return;
+			}
 		}
 
 		$other = User::staticGet('id', $to);
diff --git a/actions/newnotice.php b/actions/newnotice.php
index 37cca982d..8ea47b235 100644
--- a/actions/newnotice.php
+++ b/actions/newnotice.php
@@ -51,10 +51,15 @@ class NewnoticeAction extends Action {
 			$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;
+			
+			$content = common_shorten_links($content);
+			
+			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;
+			}
 		}
 
 		$inter = new CommandInterpreter();
diff --git a/actions/postnotice.php b/actions/postnotice.php
index be486a1e9..b4a272e61 100644
--- a/actions/postnotice.php
+++ b/actions/postnotice.php
@@ -59,8 +59,11 @@ class PostnoticeAction extends Action {
 		}
 		$content = $req->get_parameter('omb_notice_content');
 		if (!$content || strlen($content) > 140) {
-			common_user_error(_('Invalid notice content'), 400);
-			return false;
+			$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) &&
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index e5698011a..2ae736087 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -224,8 +224,8 @@ class ProfilesettingsAction extends SettingsAction {
 		} else if ($this->nickname_exists($nickname)) {
 			$this->show_form(_('Nickname already in use. Try another one.'));
 			return;
-                } else if (!is_null($language) && strlen($language) > 50) {
-                        $this->show_form(_('Language is too long (max 50 chars).'));
+        } else if (!is_null($language) && strlen($language) > 50) {
+        	$this->show_form(_('Language is too long (max 50 chars).'));
 		}
 
 		$user = common_current_user();
diff --git a/actions/twitapidirect_messages.php b/actions/twitapidirect_messages.php
index a0a09a410..3037890ad 100644
--- a/actions/twitapidirect_messages.php
+++ b/actions/twitapidirect_messages.php
@@ -113,9 +113,12 @@ class Twitapidirect_messagesAction extends TwitterapiAction {
 		if (!$content) {
 			$this->client_error(_('No message text!'), $code = 406, $apidata['content-type']);
 		} else if (mb_strlen($status) > 140) {
-			$this->client_error(_('That\'s too long. Max message size is 140 chars.'),
-				$code = 406, $apidata['content-type']);
-			return;
+			$status = common_shorten_links($status);
+			if (mb_strlen($status) > 140) {
+				$this->client_error(_('That\'s too long. Max message size is 140 chars.'),
+					$code = 406, $apidata['content-type']);
+				return;
+			}
 		}
 
 		$other = $this->get_user($this->trimmed('user'));
diff --git a/actions/twitapistatuses.php b/actions/twitapistatuses.php
index 539a0b1b3..ca79feb4c 100644
--- a/actions/twitapistatuses.php
+++ b/actions/twitapistatuses.php
@@ -253,13 +253,19 @@ class TwitapistatusesAction extends TwitterapiAction {
 			return;
 
 		} else if (mb_strlen($status) > 140) {
+			
+			$status = common_shorten_links($status);
 
-			// XXX: Twitter truncates anything over 140, flags the status
-		    // as "truncated."  Sending this error may screw up some clients
-		    // that assume Twitter will truncate for them.  Should we just
-		    // truncate too? -- Zach
-			$this->client_error(_('That\'s too long. Max notice size is 140 chars.'), $code = 406, $apidata['content-type']);
-			return;
+			if (mb_strlen($status) > 140) {
+
+				// XXX: Twitter truncates anything over 140, flags the status
+			    // as "truncated."  Sending this error may screw up some clients
+			    // that assume Twitter will truncate for them.  Should we just
+			    // truncate too? -- Zach
+				$this->client_error(_('That\'s too long. Max notice size is 140 chars.'), $code = 406, $apidata['content-type']);
+				return;
+				
+			}
 		}
 
 		// Check for commands
-- 
cgit v1.2.3-54-g00ecf