From 39a8e9d8e679cfd02e47fa93aa26373101515cf9 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Feb 2010 10:30:37 -0800
Subject: Ensure that shortened URLs haven't accumulated whitespace when
 fetched by a plugin. Some shorteners have ended up inserting extra newlines
 when the string gets extracted from tidied HTML.

---
 lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/util.php')

diff --git a/lib/util.php b/lib/util.php
index 9354431f2..9c50d9931 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1606,6 +1606,7 @@ function common_database_tablename($tablename)
  */
 function common_shorten_url($long_url)
 {
+    $long_url = trim($long_url);
     $user = common_current_user();
     if (empty($user)) {
         // common current user does not find a user when called from the XMPP daemon
@@ -1620,7 +1621,7 @@ function common_shorten_url($long_url)
         return $long_url;
     }else{
         //URL was shortened, so return the result
-        return $shortenedUrl;
+        return trim($shortenedUrl);
     }
 }
 
-- 
cgit v1.2.3-54-g00ecf


From a8d0c8d8efca2f0ecd4203184c44c73ff11309fb Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Feb 2010 11:53:39 -0800
Subject: Normalize nickname case on login; fixes failed logins where people
 were typing MixedCase nicknames (if browser saved this form, it would never
 work again until clearing the saved form data; very icky.)

---
 lib/util.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/util.php')

diff --git a/lib/util.php b/lib/util.php
index dd8189a58..84928ec48 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -134,7 +134,7 @@ function common_check_user($nickname, $password)
     $authenticatedUser = false;
 
     if (Event::handle('StartCheckPassword', array($nickname, $password, &$authenticatedUser))) {
-        $user = User::staticGet('nickname', $nickname);
+        $user = User::staticGet('nickname', common_canonical_nickname($nickname));
         if (!empty($user)) {
             if (!empty($password)) { // never allow login with blank password
                 if (0 == strcmp(common_munge_password($password, $user->id),
-- 
cgit v1.2.3-54-g00ecf


From 593885f98c206a3acffdb179feae544e05a50ef2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Thu, 25 Feb 2010 23:52:34 +0000
Subject: Tweak common_url_to_nickname to take the last path component; fixes
 pulling nicks from Google profile pages (path is "/profile/<nickname>")

---
 lib/util.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/util.php')

diff --git a/lib/util.php b/lib/util.php
index d1c78f7d0..8381bc63c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1698,7 +1698,8 @@ function common_url_to_nickname($url)
             # Strip starting, ending slashes
             $path = preg_replace('@/$@', '', $parts['path']);
             $path = preg_replace('@^/@', '', $path);
-            if (strpos($path, '/') === false) {
+            $path = basename($path);
+            if ($path) {
                 return common_nicknamize($path);
             }
         }
-- 
cgit v1.2.3-54-g00ecf