From 0d7d4dfe5d258d2018f601f8116d629577105864 Mon Sep 17 00:00:00 2001
From: mEDI <medi@milaro.net>
Date: Thu, 3 Sep 2009 19:32:27 +0200
Subject: add basic auth support for cgi servers on the api (trac #1832)

---
 actions/api.php | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/actions/api.php b/actions/api.php
index f425a8dcd..f624d6b69 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -27,6 +27,8 @@ class ApiAction extends Action
     var $api_arg;
     var $api_method;
     var $api_action;
+    var $auth_user;
+    var $auth_pw;
 
     function handle($args)
     {
@@ -35,6 +37,7 @@ class ApiAction extends Action
         $this->api_action = $this->arg('apiaction');
         $method = $this->arg('method');
         $argument = $this->arg('argument');
+	$this->basic_auth_process_header();
 
         if (isset($argument)) {
             $cmdext = explode('.', $argument);
@@ -50,7 +53,7 @@ class ApiAction extends Action
         }
 
         if ($this->requires_auth()) {
-            if (!isset($_SERVER['PHP_AUTH_USER'])) {
+            if (!isset($this->auth_user)) {
 
                 # This header makes basic auth go
                 header('WWW-Authenticate: Basic realm="StatusNet API"');
@@ -58,8 +61,8 @@ class ApiAction extends Action
                 # If the user hits cancel -- bam!
                 $this->show_basic_auth_error();
             } else {
-                $nickname = $_SERVER['PHP_AUTH_USER'];
-                $password = $_SERVER['PHP_AUTH_PW'];
+                $nickname = $this->auth_user;
+                $password = $this->auth_pw;
                 $user = common_check_user($nickname, $password);
 
                 if ($user) {
@@ -76,8 +79,8 @@ class ApiAction extends Action
         } else {
 
             // Caller might give us a username even if not required
-            if (isset($_SERVER['PHP_AUTH_USER'])) {
-                $user = User::staticGet('nickname', $_SERVER['PHP_AUTH_USER']);
+            if (isset($this->auth_user)) {
+                $user = User::staticGet('nickname', $this->auth_user);
                 if ($user) {
                     $this->user = $user;
                 }
@@ -203,6 +206,39 @@ class ApiAction extends Action
         }
     }
 
+    function basic_auth_process_header()
+    {
+	if(isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION']))
+	{
+		$authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])?$_SERVER['HTTP_AUTHORIZATION']:$_SERVER['AUTHORIZATION'];
+	}
+
+	if(isset($_SERVER['PHP_AUTH_USER']))
+	{
+		$this->auth_user = $_SERVER['PHP_AUTH_USER'];
+		$this->auth_pw = $_SERVER['PHP_AUTH_PW'];
+	}
+	elseif ( isset($authorization_header) && strstr(substr($authorization_header, 0,5),'Basic')  )
+	{
+		// decode the HTTP_AUTHORIZATION header on php-cgi server self
+		// on fcgid server is the header name AUTHORIZATION
+
+		$auth_hash = base64_decode( substr($authorization_header, 6) );
+		list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
+
+		// set all to NULL on a emty basic auth request
+		if($this->auth_user == "") {
+			$this->auth_user = NULL;
+			$this->auth_pw = NULL;
+		}
+	}
+	else
+	{
+		$this->auth_user = NULL;
+		$this->auth_pw = NULL;
+	}
+    }
+
     function show_basic_auth_error()
     {
         header('HTTP/1.1 401 Unauthorized');
-- 
cgit v1.2.3-54-g00ecf


From ebcbd3820e10e70ab2ed1bff9839a03f2948ee8f Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 3 Sep 2009 15:30:19 -0400
Subject: Fix spelling

---
 actions/api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/actions/api.php b/actions/api.php
index f624d6b69..c236378bc 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -221,12 +221,12 @@ class ApiAction extends Action
 	elseif ( isset($authorization_header) && strstr(substr($authorization_header, 0,5),'Basic')  )
 	{
 		// decode the HTTP_AUTHORIZATION header on php-cgi server self
-		// on fcgid server is the header name AUTHORIZATION
+		// on fcgid server the header name is AUTHORIZATION
 
 		$auth_hash = base64_decode( substr($authorization_header, 6) );
 		list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
 
-		// set all to NULL on a emty basic auth request
+		// set all to NULL on a empty basic auth request
 		if($this->auth_user == "") {
 			$this->auth_user = NULL;
 			$this->auth_pw = NULL;
-- 
cgit v1.2.3-54-g00ecf


From 277b464054b24f8d680ddbe762c9e438f6679592 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Thu, 3 Sep 2009 19:42:50 +0000
Subject: Created autofocus method to give focus to an element (primarily a
 form control) on page onload.

Updated some of the pages to use autofocus.
---
 actions/avatarsettings.php   |  2 ++
 actions/editgroup.php        |  6 ++++++
 actions/emailsettings.php    |  6 ++++++
 actions/grouplogo.php        |  2 ++
 actions/groupsearch.php      |  6 ++++++
 actions/invite.php           |  6 ++++++
 actions/login.php            |  8 ++++++++
 actions/noticesearch.php     |  6 ++++++
 actions/openidlogin.php      |  6 ++++++
 actions/openidsettings.php   |  6 ++++++
 actions/othersettings.php    |  6 ++++++
 actions/passwordsettings.php |  6 ++++++
 actions/peoplesearch.php     |  6 ++++++
 actions/profilesettings.php  |  8 ++++++++
 actions/register.php         |  6 ++++++
 actions/smssettings.php      |  6 ++++++
 actions/subscriptions.php    |  6 ++++++
 lib/designsettings.php       |  2 ++
 lib/htmloutputter.php        | 25 +++++++++++++++++++++++++
 19 files changed, 125 insertions(+)

diff --git a/actions/avatarsettings.php b/actions/avatarsettings.php
index 0bc439ff1..02a684b38 100644
--- a/actions/avatarsettings.php
+++ b/actions/avatarsettings.php
@@ -399,5 +399,7 @@ class AvatarsettingsAction extends AccountSettingsAction
             $this->script('js/jcrop/jquery.Jcrop.min.js');
             $this->script('js/jcrop/jquery.Jcrop.go.js');
         }
+
+        $this->autofocus('avatarfile');
     }
 }
diff --git a/actions/editgroup.php b/actions/editgroup.php
index cac910e9b..e7ba836a0 100644
--- a/actions/editgroup.php
+++ b/actions/editgroup.php
@@ -160,6 +160,12 @@ class EditgroupAction extends GroupDesignAction
         }
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('nickname');
+    }
+
     function trySave()
     {
         $cur = common_current_user();
diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index af528a892..6eff06c0d 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -71,6 +71,12 @@ class EmailsettingsAction extends AccountSettingsAction
         return _('Manage how you get email from %%site.name%%.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('email');
+    }
+
     /**
      * Content area of the page
      *
diff --git a/actions/grouplogo.php b/actions/grouplogo.php
index c6f376915..63ba769c7 100644
--- a/actions/grouplogo.php
+++ b/actions/grouplogo.php
@@ -445,6 +445,8 @@ class GrouplogoAction extends GroupDesignAction
             $this->script('js/jcrop/jquery.Jcrop.min.js');
             $this->script('js/jcrop/jquery.Jcrop.go.js');
         }
+
+        $this->autofocus('avatarfile');
     }
 
     function showLocalNav()
diff --git a/actions/groupsearch.php b/actions/groupsearch.php
index bbd4c3a74..be15efc47 100644
--- a/actions/groupsearch.php
+++ b/actions/groupsearch.php
@@ -91,6 +91,12 @@ class GroupsearchAction extends SearchAction
             $user_group->free();
         }
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('q');
+    }
 }
 
 class GroupSearchResults extends GroupList
diff --git a/actions/invite.php b/actions/invite.php
index ab43a2491..9fa6a76f6 100644
--- a/actions/invite.php
+++ b/actions/invite.php
@@ -98,6 +98,12 @@ class InviteAction extends CurrentUserDesignAction
         $this->showPage();
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('addresses');
+    }
+
     function title()
     {
         if ($this->mode == 'sent') {
diff --git a/actions/login.php b/actions/login.php
index 37f3c54ff..ac8c40c3e 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -22,6 +22,7 @@
  * @category  Login
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -37,6 +38,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  * @category Personal
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -162,6 +164,12 @@ class LoginAction extends Action
         $this->showPage();
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('nickname');
+    }
+
     /**
      * Title of the page
      *
diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 1188e7e10..1cd987df3 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -137,6 +137,12 @@ class NoticesearchAction extends SearchAction
         $this->pagination($page > 1, $cnt > NOTICES_PER_PAGE,
                           $page, 'noticesearch', array('q' => $q));
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('q');
+    }
 }
 
 class SearchNoticeList extends NoticeList {
diff --git a/actions/openidlogin.php b/actions/openidlogin.php
index 4b5338694..9b7deefb6 100644
--- a/actions/openidlogin.php
+++ b/actions/openidlogin.php
@@ -86,6 +86,12 @@ class OpenidloginAction extends Action
         }
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('openid_url');
+    }
+
     function title()
     {
         return _('OpenID Login');
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index 13da64a4f..30725fc1b 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -72,6 +72,12 @@ class OpenidsettingsAction extends AccountSettingsAction
                  ' Manage your associated OpenIDs from here.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('openid_url');
+    }
+
     /**
      * Show the form for OpenID management
      *
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 8b674161a..f898e2207 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -71,6 +71,12 @@ class OthersettingsAction extends AccountSettingsAction
         return _('Manage various other options.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('urlshorteningservice');
+    }
+
     /**
      * Content area of the page
      *
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index ec842600f..cd4beac3f 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -69,6 +69,12 @@ class PasswordsettingsAction extends AccountSettingsAction
         return _('Change your password.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('oldpassword');
+    }
+
     /**
      * Content area of the page
      *
diff --git a/actions/peoplesearch.php b/actions/peoplesearch.php
index ba0f71e39..38135ecbd 100644
--- a/actions/peoplesearch.php
+++ b/actions/peoplesearch.php
@@ -85,6 +85,12 @@ class PeoplesearchAction extends SearchAction
             $profile->free();
         }
     }
+
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('q');
+    }
 }
 
 /**
diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index f9c16351d..2d66e9946 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -23,6 +23,7 @@
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @author    Zach Copley <zach@status.net>
+ * @author    Sarven Capadisli <csarven@status.net>
  * @copyright 2008-2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://status.net/
@@ -41,6 +42,7 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @author   Zach Copley <zach@status.net>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
@@ -70,6 +72,12 @@ class ProfilesettingsAction extends AccountSettingsAction
                   'so people know more about you.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('nickname');
+    }
+
     /**
      * Content area of the page
      *
diff --git a/actions/register.php b/actions/register.php
index c431aeee3..eefbc340a 100644
--- a/actions/register.php
+++ b/actions/register.php
@@ -140,6 +140,12 @@ class RegisterAction extends Action
         }
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('nickname');
+    }
+
     /**
      * Try to register a user
      *
diff --git a/actions/smssettings.php b/actions/smssettings.php
index b956cceba..672abcef8 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -69,6 +69,12 @@ class SmssettingsAction extends ConnectSettingsAction
         return _('You can receive SMS messages through email from %%site.name%%.');
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('sms');
+    }
+
     /**
      * Content area of the page
      *
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index b1c668228..cc7b38ee4 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -107,6 +107,12 @@ class SubscriptionsAction extends GalleryAction
                           array('nickname' => $this->user->nickname));
     }
 
+    function showScripts()
+    {
+        parent::showScripts();
+        $this->autofocus('tag');
+    }
+
     function showEmptyListMessage()
     {
         if (common_logged_in()) {
diff --git a/lib/designsettings.php b/lib/designsettings.php
index fe4222597..fdc05562e 100644
--- a/lib/designsettings.php
+++ b/lib/designsettings.php
@@ -327,6 +327,8 @@ class DesignSettingsAction extends AccountSettingsAction
         $this->script('js/farbtastic/farbtastic.js');
         $this->script('js/farbtastic/farbtastic.go.js');
         $this->script('js/userdesign.go.js');
+
+        $this->autofocus('design_background-image_file');
     }
 
     /**
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 8ad7dc20f..aa01f6b1d 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -412,4 +412,29 @@ class HTMLOutputter extends XMLOutputter
             $this->element('p', 'form_guide', $instructions);
         }
     }
+
+
+    /**
+    * Internal script to autofocus the given element on page onload.
+    *
+    * @param string $id element ID, must refer to an existing element
+    *
+    * @return void
+    *
+    */
+    function autofocus($id)
+    {
+        $this->elementStart('script', array('type' => 'text/javascript'));
+        $this->raw('
+        <!--
+        $(document).ready(function() {
+            var el = $("#' . $id . '");
+            if (el.length) {
+                el.focus();
+            }
+        });
+        -->
+        ');
+        $this->elementEnd('script');
+    }
 }
-- 
cgit v1.2.3-54-g00ecf


From 5974871b7b00bd8e3f28dc5f5a9465a9eec0d3d3 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Thu, 3 Sep 2009 18:34:30 -0400
Subject: Improve OAuth CGI compatibility

Fixes http://status.net/trac/ticket/1822
Reported upstream at http://code.google.com/p/oauth/issues/detail?id=118
---
 extlib/OAuth.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extlib/OAuth.php b/extlib/OAuth.php
index 029166175..fd4853554 100644
--- a/extlib/OAuth.php
+++ b/extlib/OAuth.php
@@ -199,7 +199,8 @@ class OAuthRequest {/*{{{*/
     } else {
       // collect request parameters from query string (GET) and post-data (POST) if appropriate (note: POST vars have priority)
       $req_parameters = $_GET;
-      if ($http_method == "POST" && @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") ) {
+      if ($http_method == "POST" &&
+        ( @strstr($request_headers["Content-Type"], "application/x-www-form-urlencoded") || @strstr($_ENV["CONTENT_TYPE"], "application/x-www-form-urlencoded") )) {
         $req_parameters = array_merge($req_parameters, $_POST);
       }
 
-- 
cgit v1.2.3-54-g00ecf


From 80b7e54ca2cebcfd7c2c5e63b4ef604106a42aca Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Fri, 4 Sep 2009 11:30:29 -0400
Subject: Added additional characters as allowed in URLs.

---
 lib/util.php               |  6 +++---
 tests/URLDetectionTest.php | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index f4ba3a6c2..79611af2c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -442,9 +442,9 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
         ')'.
         '(?:'.
             '(?:\:\d+)?'. //:port
-            '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~]*)?'. // /path
-            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\/]*)?'. // ?query string
-            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\/\?\#]*)?'. // #fragment
+            '(?:/[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"]*)?'. // /path
+            '(?:\?[\pN\pL\$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\/]*)?'. // ?query string
+            '(?:\#[\pN\pL$\[\]\,\!\(\)\.\:\-\_\+\/\=\&\;\%\~\*\$\+\'\"\/\?\#]*)?'. // #fragment
         ')(?<![\?\.\,\#\,])'.
     ')'.
     '#ixu';
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index 9a103b6f7..c5d29e0f6 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -35,6 +35,22 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
                            '<a href="http://127.0.0.1/Name:test.php" rel="external">127.0.0.1/Name:test.php</a>'),
                      array('127.0.0.1/~test',
                            '<a href="http://127.0.0.1/~test" rel="external">127.0.0.1/~test</a>'),
+                     array('127.0.0.1/+test',
+                           '<a href="http://127.0.0.1/+test" rel="external">127.0.0.1/+test</a>'),
+                     array('127.0.0.1/$test',
+                           '<a href="http://127.0.0.1/$test" rel="external">127.0.0.1/$test</a>'),
+                     array('127.0.0.1/\'test',
+                           '<a href="http://127.0.0.1/\'test" rel="external">127.0.0.1/\'test</a>'),
+                     array('127.0.0.1/"test',
+                           '<a href="http://127.0.0.1/&quot;test" rel="external">127.0.0.1/&quot;test</a>'),
+                     array('127.0.0.1/-test',
+                           '<a href="http://127.0.0.1/-test" rel="external">127.0.0.1/-test</a>'),
+                     array('127.0.0.1/_test',
+                           '<a href="http://127.0.0.1/_test" rel="external">127.0.0.1/_test</a>'),
+                     array('127.0.0.1/!test',
+                           '<a href="http://127.0.0.1/!test" rel="external">127.0.0.1/!test</a>'),
+                     array('127.0.0.1/*test',
+                           '<a href="http://127.0.0.1/*test" rel="external">127.0.0.1/*test</a>'),
                      array('127.0.0.1/test%20stuff',
                            '<a href="http://127.0.0.1/test%20stuff" rel="external">127.0.0.1/test%20stuff</a>'),
                      array('http://[::1]:99/test.php',
-- 
cgit v1.2.3-54-g00ecf


From b237dc21ba672957d38daeb0ce1ddf501a3ede3f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@controlyourself.ca>
Date: Fri, 4 Sep 2009 15:59:27 +0000
Subject: Updated layout for filter by tag form

---
 lib/galleryaction.php      |  5 ++++-
 theme/base/css/display.css | 22 ++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index 18cc7b929..31e36803a 100644
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -132,13 +132,16 @@ class GalleryAction extends OwnerDesignAction
             $this->elementEnd('li');
             $this->elementStart('li', array('id'=>'filter_tags_item'));
             $this->elementStart('form', array('name' => 'bytag',
-                                               'id' => 'bytag',
+                                               'id' => 'form_filter_bytag',
                                                'action' => common_path('?action=' . $this->trimmed('action')),
                                                'method' => 'post'));
+            $this->elementStart('fieldset');
+            $this->element('legend', null, _('Select tag to filter'));
             $this->dropdown('tag', _('Tag'), $content,
                             _('Choose a tag to narrow list'), false, $tag);
             $this->hidden('nickname', $this->user->nickname);
             $this->submit('submit', _('Go'));
+            $this->elementEnd('fieldset');
             $this->elementEnd('form');
             $this->elementEnd('li');
             $this->elementEnd('ul');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 6f1a29f4a..d770f3868 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -156,7 +156,8 @@ font-weight:bold;
 #form_notice_delete legend,
 #form_password_recover legend,
 #form_password_change legend,
-.form_entity_block legend {
+.form_entity_block legend,
+#form_filter_bytag legend {
 display:none;
 }
 
@@ -1049,36 +1050,37 @@ display:none;
 #filter_tags ul {
 list-style-type:none;
 }
-#filter_tags ul li {
+#filter_tags li {
 float:left;
 margin-left:7px;
 padding-left:7px;
 border-left-width:1px;
 border-left-style:solid;
 }
-#filter_tags ul li.child_1 {
+#filter_tags #filter_tags_all {
 margin-left:0;
 border-left:0;
 padding-left:0;
 }
-#filter_tags ul li#filter_tags_all a {
+#filter_tags_all a {
 font-weight:bold;
 margin-top:7px;
 float:left;
 }
 
-#filter_tags ul li#filter_tags_item label {
+#filter_tags_item label {
 margin-right:7px;
 }
-#filter_tags ul li#filter_tags_item label,
-#filter_tags ul li#filter_tags_item select {
-display:inline;
+#filter_tags_item label,
+#filter_tags_item select {
+float:left;
 }
-#filter_tags ul li#filter_tags_item p {
+#filter_tags_item p {
 float:left;
+clear:both;
 margin-left:38px;
 }
-#filter_tags ul li#filter_tags_item input {
+#filter_tags_item .submit {
 position:relative;
 top:3px;
 left:3px;
-- 
cgit v1.2.3-54-g00ecf


From f218d7fd588660fb6d4def782c64abd8b991e4a7 Mon Sep 17 00:00:00 2001
From: brenda <brenda@toshi.shiny.geek.nz>
Date: Sat, 5 Sep 2009 16:11:38 +1200
Subject: more info in error message, to help next person who has to debug
 locales

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

diff --git a/lib/util.php b/lib/util.php
index 79611af2c..3dcd077a7 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -59,7 +59,7 @@ function common_init_language()
     textdomain("statusnet");
     setlocale(LC_CTYPE, 'C');
     if(!$locale_set) {
-        common_log(LOG_INFO,'Language requested:'.$language.' - locale could not be set:',__FILE__);
+        common_log(LOG_INFO, 'Language requested:' . $language . ' - locale could not be set. Perhaps that system locale is not installed.', __FILE__);
     }
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 8438724296dadf9e5b26e4a2220403d494de62d0 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 7 Sep 2009 14:51:10 +0000
Subject: Updated identica and default theme to use processing indicator

---
 theme/default/css/display.css  | 7 ++-----
 theme/identica/css/display.css | 3 ++-
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index a1c4a2171..86369cb99 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -94,10 +94,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
 opacity:0;
 }
 
-#form_notice.processing #notice_action-submit {
+#wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
+outline:none;
 }
 
 #content {
@@ -223,10 +224,6 @@ background:transparent url(../../base/images/icons/twotone/green/favourite.gif)
 .notice-options form.form_disfavor input.submit {
 background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 }
-.notice-options form.form_favor.processing input.submit,
-.notice-options form.form_disfavor.processing input.submit {
-background:transparent url(../../base/images/icons/icon_processing.gif) no-repeat 0 45%;
-}
 .notice-options .notice_delete {
 background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 51286657e..9fc97180d 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -94,10 +94,11 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
 opacity:0;
 }
 
-#form_notice.processing #notice_action-submit {
+#wrap form.processing input.submit {
 background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
+outline:none;
 }
 
 #content {
-- 
cgit v1.2.3-54-g00ecf


From c77c0d88cea4b26c9ede432eea728c2af72d2821 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Mon, 7 Sep 2009 15:14:05 +0000
Subject: Setting max width limit to select form control on inbox and outbox
 pages

---
 theme/base/css/display.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index d770f3868..1f37a7637 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -511,6 +511,7 @@ margin-top:7px;
 margin-bottom:7px;
 margin-left:18px;
 float:left;
+max-width:322px;
 }
 #form_notice .error,
 #form_notice .success {
-- 
cgit v1.2.3-54-g00ecf


From 6020d85191bdd838acbeb40ab17035e378b0aee1 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Mon, 7 Sep 2009 22:36:01 -0400
Subject: Don't "hightlight" search terms (by surrounding them in
 <strong>$term</strong>) when the term appears in an HTML attribute

Fixes http://status.net/trac/ticket/1852
---
 actions/noticesearch.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/actions/noticesearch.php b/actions/noticesearch.php
index 1cd987df3..69dcd1a46 100644
--- a/actions/noticesearch.php
+++ b/actions/noticesearch.php
@@ -198,7 +198,7 @@ class SearchNoticeListItem extends NoticeListItem {
         $result  = preg_replace($pattern, '<strong>\\1</strong>', $text);
 
         /* Remove highlighting from inside links, loop incase multiple highlights in links */
-        $pattern = '/(href="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
+        $pattern = '/(\w+="[^"]*)<strong>('.$options.')<\/strong>([^"]*")/iU';
         do {
             $result = preg_replace($pattern, '\\1\\2\\3', $result, -1, $count);
         } while ($count);
-- 
cgit v1.2.3-54-g00ecf


From afe1b8ec3df8d231ae9c6699da3a3947da285c00 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 8 Sep 2009 11:27:37 +0100
Subject: Use a non-error-generating array key check to a) improve performance
 and b) not fill the log file with crud

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

diff --git a/lib/omb.php b/lib/omb.php
index 0d6244599..7dca760c6 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -135,7 +135,7 @@ function omb_broadcast_remote_subscribers($notice)
     $posted = array();
 
     while ($rp->fetch()) {
-        if (!$posted[$rp->postnoticeurl]) {
+        if (!array_key_exists($rp->postnoticeurl, $posted)) {
             common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
             if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
                 common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
-- 
cgit v1.2.3-54-g00ecf


From 52a197b235c4347e0fe6b14609098c0a0e444319 Mon Sep 17 00:00:00 2001
From: CiaranG <ciaran@ciarang.com>
Date: Tue, 8 Sep 2009 13:25:59 +0100
Subject: Linkback Plugin: check result properly so failures are not reported
 as a success in the log. Also logs (debug only) when an attempt is being made

---
 plugins/LinkbackPlugin.php | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/plugins/LinkbackPlugin.php b/plugins/LinkbackPlugin.php
index c49f70de0..60f7a60c7 100644
--- a/plugins/LinkbackPlugin.php
+++ b/plugins/LinkbackPlugin.php
@@ -75,6 +75,8 @@ class LinkbackPlugin extends Plugin
 
     function linkbackUrl($url)
     {
+        common_log(LOG_DEBUG,"Attempting linkback for " . $url);
+
         $orig = $url;
         $url = htmlspecialchars_decode($orig);
         $scheme = parse_url($url, PHP_URL_SCHEME);
@@ -134,15 +136,20 @@ class LinkbackPlugin extends Plugin
                                                                "User-Agent: " . $this->userAgent(),
                                                                'content' => $request)));
         $file = file_get_contents($endpoint, false, $context);
-        $response = xmlrpc_decode($file);
-        if (xmlrpc_is_fault($response)) {
+        if (!$file) {
             common_log(LOG_WARNING,
+	               "Pingback request failed for '$url' ($endpoint)");
+        } else {
+            $response = xmlrpc_decode($file);
+            if (xmlrpc_is_fault($response)) {
+                common_log(LOG_WARNING,
                        "Pingback error for '$url' ($endpoint): ".
                        "$response[faultString] ($response[faultCode])");
-        } else {
-            common_log(LOG_INFO,
+            } else {
+                common_log(LOG_INFO,
                        "Pingback success for '$url' ($endpoint): ".
                        "'$response'");
+            }
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 3e1dc0e0b95ee106311bc19b0d867d8c98882f91 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Sep 2009 13:06:13 -0700
Subject: flip exe bit on Config.php

---
 classes/Config.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 classes/Config.php

diff --git a/classes/Config.php b/classes/Config.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3-54-g00ecf


From 1e707008c247d9d6c3c81bf1b1a6fef41f2049ba Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Sep 2009 13:06:46 -0700
Subject: flip exe bit on Deleted_notice.php

---
 classes/Deleted_notice.php | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 classes/Deleted_notice.php

diff --git a/classes/Deleted_notice.php b/classes/Deleted_notice.php
old mode 100755
new mode 100644
-- 
cgit v1.2.3-54-g00ecf


From e559f82e86c495abdc4cf5fff3d8c6279a808354 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 8 Sep 2009 13:07:21 -0700
Subject: flip exe bit on statusnet.ini

---
 classes/statusnet.ini | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 classes/statusnet.ini

diff --git a/classes/statusnet.ini b/classes/statusnet.ini
old mode 100755
new mode 100644
-- 
cgit v1.2.3-54-g00ecf


From 153b647f0b06b8053141589aa42c1231c20f6c61 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 9 Sep 2009 12:57:27 +0200
Subject: Updated biz theme.

---
 theme/biz/css/base.css    |  25 ++++-------
 theme/biz/css/display.css | 110 +++++++++++++++++++++++++++++-----------------
 2 files changed, 78 insertions(+), 57 deletions(-)

diff --git a/theme/biz/css/base.css b/theme/biz/css/base.css
index 5245ea5d2..6357e55b4 100644
--- a/theme/biz/css/base.css
+++ b/theme/biz/css/base.css
@@ -849,6 +849,10 @@ float:left;
 font-size:1.025em;
 }
 
+.notice div.entry-content .timestamp {
+display:inline-block;
+}
+
 .notice div.entry-content dl,
 .notice div.entry-content dt,
 .notice div.entry-content dd {
@@ -866,15 +870,12 @@ display:inline-block;
 text-transform:lowercase;
 }
 
-
 .notice-options {
-padding-left:2%;
-float:left;
-width:50%;
 position:relative;
 font-size:0.95em;
-width:12.5%;
+width:90px;
 float:right;
+margin-right:11px;
 }
 
 .notice-options a {
@@ -897,38 +898,28 @@ left:29px;
 .notice-options .notice_delete {
 right:0;
 }
-.notice-options .notice_reply dt {
-display:none;
-}
-
 .notice-options input,
 .notice-options a {
 text-indent:-9999px;
 outline:none;
 }
-
-.notice-options .notice_reply a,
 .notice-options input.submit {
 display:block;
 border:0;
 }
-.notice-options .notice_reply a,
-.notice-options .notice_delete a {
+.notice-options .notice_reply,
+.notice-options .notice_delete {
 text-decoration:none;
 padding-left:16px;
 }
-
 .notice-options form input.submit {
 width:16px;
 padding:2px 0;
 }
-
-.notice-options .notice_delete dt,
 .notice-options .form_favor legend,
 .notice-options .form_disfavor legend {
 display:none;
 }
-.notice-options .notice_delete fieldset,
 .notice-options .form_favor fieldset,
 .notice-options .form_disfavor fieldset {
 border:0;
diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index 240060b10..7ea451576 100644
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -30,10 +30,10 @@ font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
 }
 input, textarea, select,
 .entity_remote_subscribe {
-border-color:#aaa;
+border-color:#AAAAAA;
 }
 #filter_tags ul li {
-border-color:#ddd;
+border-color:#DDDDDD;
 }
 
 .form_settings input.form_action-primary {
@@ -50,11 +50,14 @@ background-color:#9BB43E;
 input:focus, textarea:focus, select:focus,
 #form_notice.warning #notice_data-text {
 border-color:#9BB43E;
+box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:3px 3px 3px rgba(194, 194, 194, 0.3);
 }
 input.submit,
 .entity_remote_subscribe,
 #site_nav_local_views a {
-color:#fff;
+color:#FFFFFF;
 }
 
 a,
@@ -62,10 +65,13 @@ a,
 div.notice-options input,
 .form_user_block input.submit,
 .form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit,
 .entity_send-a-message a,
 .form_user_nudge input.submit,
 .entity_nudge p,
-.form_settings input.form_action-primary {
+.form_settings input.form_action-primary,
+.form_make_admin input.submit {
 color:#002E6E;
 }
 
@@ -82,13 +88,6 @@ border-top-color:#CEE1E9;
 border-top-color:#87B4C8;
 }
 
-#content .notice p.entry-content a:visited {
-background-color:#fcfcfc;
-}
-#content .notice p.entry-content .vcard a {
-background-color:#fcfffc;
-}
-
 .aside .section {
 background-color:#F1F5F8;
 background-position:100% 0;
@@ -97,10 +96,10 @@ background-repeat:no-repeat;
 }
 
 #notice_text-count {
-color:#333;
+color:#333333;
 }
 #form_notice.warning #notice_text-count {
-color:#000;
+color:#000000;
 }
 #form_notice label[for=notice_data-attach] {
 background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no-repeat 0 45%;
@@ -109,28 +108,43 @@ background:transparent url(../../base/images/icons/twotone/green/clip-01.gif) no
 opacity:0;
 }
 
-#form_notice.processing #notice_action-submit {
-background:#fff url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
+#wrap form.processing input.submit {
+background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
 cursor:wait;
 text-indent:-9999px;
+outline:none;
 }
 
+#content {
+box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-moz-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+-webkit-box-shadow:5px 7px 7px rgba(194, 194, 194, 0.3);
+}
 #content,
 #site_nav_local_views a,
 .aside .section {
-border-color:#fff;
+border-color:#FFFFFF;
 }
 #content,
 #site_nav_local_views .current a {
-background-color:#fff;
+background-color:#FFFFFF;
 }
 
+#site_nav_local_views li {
+box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-moz-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+-webkit-box-shadow:3px 7px 5px rgba(194, 194, 194, 0.5);
+}
 #site_nav_local_views a {
-background-color:rgba(135, 180, 200, 0.3);
+background-color:rgba(194, 194, 194, 0.5);
 }
 #site_nav_local_views a:hover {
 background-color:rgba(255, 255, 255, 0.7);
 }
+#site_nav_local_views .current a {
+text-shadow: rgba(194,194,194,0.5) 1px 1px 1px;
+}
+
 
 .error {
 background-color:#F7E8E8;
@@ -140,10 +154,7 @@ background-color:#EFF3DC;
 }
 
 #anon_notice {
-color:#fff;
-}
-
-#showstream #anon_notice {
+color:#FFFFFF;
 }
 
 #export_data li a {
@@ -165,7 +176,10 @@ background-image:url(../../base/images/icons/icon_foaf.gif);
 .form_user_nudge input.submit,
 .form_user_block input.submit,
 .form_user_unblock input.submit,
-.entity_nudge p {
+.form_group_block input.submit,
+.form_group_unblock input.submit,
+.entity_nudge p,
+.form_make_admin input.submit {
 background-position: 0 40%;
 background-repeat: no-repeat;
 background-color:transparent;
@@ -175,7 +189,7 @@ background-color:transparent;
 .form_user_subscribe input.submit,
 .form_user_unsubscribe input.submit {
 background-color:#9BB43E;
-color:#fff;
+color:#FFFFFF;
 }
 .form_user_unsubscribe input.submit,
 .form_group_leave input.submit,
@@ -194,20 +208,23 @@ background-image:url(../../base/images/icons/twotone/green/quote.gif);
 background-image:url(../../base/images/icons/twotone/green/mail.gif);
 }
 .form_user_block input.submit,
-.form_user_unblock input.submit {
+.form_user_unblock input.submit,
+.form_group_block input.submit,
+.form_group_unblock input.submit {
 background-image:url(../../base/images/icons/twotone/green/shield.gif);
 }
+.form_make_admin input.submit {
+background-image:url(../../base/images/icons/twotone/green/admin.gif);
+}
 
 /* NOTICES */
-.notices li.over {
-background-color:#fcfcfc;
+.notice .attachment {
+background:transparent url(../../base/images/icons/twotone/green/clip-02.gif) no-repeat 0 45%;
 }
-
-.notice-options .notice_reply a,
-.notice-options form input.submit {
-background-color:transparent;
+#attachments .attachment {
+background:none;
 }
-.notice-options .notice_reply a {
+.notice-options .notice_reply {
 background:transparent url(../../base/images/icons/twotone/green/reply.gif) no-repeat 0 45%;
 }
 .notice-options form.form_favor input.submit {
@@ -216,7 +233,7 @@ background:transparent url(../../base/images/icons/twotone/green/favourite.gif)
 .notice-options form.form_disfavor input.submit {
 background:transparent url(../../base/images/icons/twotone/green/disfavourite.gif) no-repeat 0 45%;
 }
-.notice-options .notice_delete a {
+.notice-options .notice_delete {
 background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-repeat 0 45%;
 }
 
@@ -224,19 +241,32 @@ background:transparent url(../../base/images/icons/twotone/green/trash.gif) no-r
 .notices div.notice-options {
 opacity:0.4;
 }
-.notices li.hover div.entry-content,
-.notices li.hover div.notice-options {
+.notices li:hover div.entry-content,
+.notices li:hover div.notice-options {
 opacity:1;
 }
-div.entry-content {
-color:#333;
-}
 div.notice-options a,
 div.notice-options input {
 font-family:sans-serif;
 }
-.notices li.hover {
-background-color:#fcfcfc;
+#content .notices li:hover {
+background-color:rgba(240, 240, 240, 0.2);
+}
+#conversation .notices li:hover {
+background-color:transparent;
+}
+
+.notices .notices {
+background-color:rgba(200, 200, 200, 0.050);
+}
+.notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.100);
+}
+.notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.150);
+}
+.notices .notices .notices .notices .notices {
+background-color:rgba(200, 200, 200, 0.300);
 }
 /*END: NOTICES */
 
-- 
cgit v1.2.3-54-g00ecf


From 7a910961b6e2b5f1fe21a4a9d0b66f5a7d911250 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 9 Sep 2009 13:04:05 +0200
Subject: Updated biz, cloudy, h4ck3r, pigeonthoughts themes default logos

---
 theme/biz/logo.png            | Bin 2228 -> 6389 bytes
 theme/cloudy/logo.png         | Bin 2228 -> 6389 bytes
 theme/h4ck3r/logo.png         | Bin 2228 -> 6389 bytes
 theme/pigeonthoughts/logo.png | Bin 2228 -> 6389 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/theme/biz/logo.png b/theme/biz/logo.png
index fdead6c4a..550d373fe 100644
Binary files a/theme/biz/logo.png and b/theme/biz/logo.png differ
diff --git a/theme/cloudy/logo.png b/theme/cloudy/logo.png
index fdead6c4a..550d373fe 100644
Binary files a/theme/cloudy/logo.png and b/theme/cloudy/logo.png differ
diff --git a/theme/h4ck3r/logo.png b/theme/h4ck3r/logo.png
index fdead6c4a..550d373fe 100644
Binary files a/theme/h4ck3r/logo.png and b/theme/h4ck3r/logo.png differ
diff --git a/theme/pigeonthoughts/logo.png b/theme/pigeonthoughts/logo.png
index fdead6c4a..550d373fe 100644
Binary files a/theme/pigeonthoughts/logo.png and b/theme/pigeonthoughts/logo.png differ
-- 
cgit v1.2.3-54-g00ecf


From aecdba1ded89b45f32d0b7615ce6b103478403dd Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 9 Sep 2009 16:57:11 -0400
Subject: :: isn't a valid IPv6 address for our purposes

---
 lib/util.php               | 4 ++--
 tests/URLDetectionTest.php | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 3dcd077a7..256acf199 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -432,7 +432,7 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
             ')'.
             '|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)'. //IPv4
             '|(?:'. //IPv6
-                '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?'.
+                '\[?(?:(?:(?:[0-9A-Fa-f]{1,4}:){7}(?:(?:[0-9A-Fa-f]{1,4})|:))|(?:(?:[0-9A-Fa-f]{1,4}:){6}(?::|(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})|(?::[0-9A-Fa-f]{1,4})))|(?:(?:[0-9A-Fa-f]{1,4}:){5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){4}(?::[0-9A-Fa-f]{1,4}){0,1}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){3}(?::[0-9A-Fa-f]{1,4}){0,2}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:){2}(?::[0-9A-Fa-f]{1,4}){0,3}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:[0-9A-Fa-f]{1,4}:)(?::[0-9A-Fa-f]{1,4}){0,4}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?::(?::[0-9A-Fa-f]{1,4}){0,5}(?:(?::(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})?)|(?:(?::[0-9A-Fa-f]{1,4}){1,2})))|(?:(?:(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})(?:\.(?:25[0-5]|2[0-4]\d|[01]?\d{1,2})){3})))\]?(?<!:)'.
             ')|(?:'. //DNS
                 '(?:[\pN\pL\-\_\+\%\~]+(?:\:[\pN\pL\-\_\+\%\~]+)?\@)?'. //user:pass@
                 '[\pN\pL\-\_]+(?:\.[\pN\pL\-\_]+)*\.'.
@@ -448,7 +448,7 @@ function common_replace_urls_callback($text, $callback, $notice_id = null) {
         ')(?<![\?\.\,\#\,])'.
     ')'.
     '#ixu';
-    preg_match_all($regex,$text,$matches);
+    //preg_match_all($regex,$text,$matches);
     //print_r($matches);
     return preg_replace_callback($regex, curry('callback_helper',$callback,$notice_id) ,$text);
 }
diff --git a/tests/URLDetectionTest.php b/tests/URLDetectionTest.php
index c5d29e0f6..87b537646 100644
--- a/tests/URLDetectionTest.php
+++ b/tests/URLDetectionTest.php
@@ -25,6 +25,8 @@ class URLDetectionTest extends PHPUnit_Framework_TestCase
     static public function provider()
     {
         return array(
+                     array('not a link :: no way',
+                           'not a link :: no way'),
                      array('http://127.0.0.1',
                            '<a href="http://127.0.0.1/" rel="external">http://127.0.0.1</a>'),
                      array('127.0.0.1',
-- 
cgit v1.2.3-54-g00ecf


From e2848eb8621dd645fa68cb1641c0af1df5530408 Mon Sep 17 00:00:00 2001
From: Craig Andrews <candrews@integralblue.com>
Date: Wed, 9 Sep 2009 22:57:15 -0400
Subject: If a shortened URL begins with http://, don't include it in the
 shortened url. Saves 7 characters, which is pretty awesome for 140 character
 max length notices.

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

diff --git a/lib/util.php b/lib/util.php
index 256acf199..3e95d2bea 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -1414,6 +1414,9 @@ function common_shorten_url($long_url)
 
     curl_close($curlh);
 
+    if(substr($short_url,0,7)=='http://'){
+        $short_url = substr($short_url,7);
+    }
     return $short_url;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 4181c6f04ad6a2321b2957d8784abc7dfef5779f Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Sun, 13 Sep 2009 17:53:15 -0700
Subject: bug 1814: installer now only offers DB types which are available.

Abstracted a couple of hardcoded lists of mysql/pgsql checks and radio button creation to use a nice little array of names, installer funcs, and modules to check.
Only those DB types whose modules are present will be presented in the installer; if all are missing, we throw an error and list out all the possibilities we were looking for.
---
 install.php | 52 +++++++++++++++++++++++++++++++++++++---------------
 1 file changed, 37 insertions(+), 15 deletions(-)

diff --git a/install.php b/install.php
index e828fa814..092172d35 100644
--- a/install.php
+++ b/install.php
@@ -181,6 +181,18 @@ $external_libraries=array(
         'check_class'=>'Validate'
     )
 );
+$dbModules = array(
+    'mysql' => array(
+        'name' => 'MySQL',
+        'check_module' => 'mysql', // mysqli?
+        'installer' => 'mysql_db_installer',
+    ),
+    'pgsql' => array(
+        'name' => 'PostgreSQL',
+        'check_module' => 'pgsql',
+        'installer' => 'pgsql_db_installer',
+    ),
+);
 
 function main()
 {
@@ -238,8 +250,18 @@ function checkPrereqs()
 		    $pass = false;
         }
     }
-    if (!checkExtension('pgsql') && !checkExtension('mysql')) {
-      ?><p class="error">Cannot find mysql or pgsql extension. You need one or the other: <code><?php echo $req; ?></code></p><?php
+    
+    // Make sure we have at least one database module available
+    global $dbModules;
+    $missingExtensions = array();
+    foreach ($dbModules as $type => $info) {
+        if (!checkExtension($info['check_module'])) {
+            $missingExtensions[] = $info['check_module'];
+        }
+    }
+    if (count($missingExtensions) == count($dbModules)) {
+        $req = implode(', ', $missingExtensions);
+      ?><p class="error">Cannot find database support. You need at least one of these PHP extensions installed: <code><?php echo $req; ?></code></p><?php
                     $pass = false;
     }
 
@@ -340,6 +362,15 @@ E_O_T;
 
 function showForm()
 {
+    global $dbModules;
+    $dbRadios = '';
+    $checked = 'checked="checked" '; // Check the first one which exists
+    foreach ($dbModules as $type => $info) {
+        if (checkExtension($info['check_module'])) {
+            $dbRadios .= "<input type=\"radio\" name=\"dbtype\" id=\"dbtype-$type\" value=\"$type\" $checked/> $info[name]<br />\n";
+            $checked = '';
+        }
+    }
     echo<<<E_O_T
         </ul>
     </dd>
@@ -376,8 +407,7 @@ function showForm()
             <li>
 
                 <label for="dbtype">Type</label>
-                <input type="radio" name="dbtype" id="fancy-mysql" value="mysql" checked='checked' /> MySQL<br />
-                <input type="radio" name="dbtype" id="dbtype-pgsql" value="pgsql" /> PostgreSQL<br />
+                $dbRadios
                 <p class="form_guide">Database type</p>
             </li>
 
@@ -465,17 +495,9 @@ function handlePost()
         return;
     }
 
-    // FIXME: use PEAR::DB or PDO instead of our own switch
-
-    switch($dbtype) {
-        case 'mysql':
-            $db = mysql_db_installer($host, $database, $username, $password);
-            break;
-        case 'pgsql':
-            $db = pgsql_db_installer($host, $database, $username, $password);
-            break;
-        default:
-    }
+    global $dbModules;
+    $db = call_user_func($dbModules[$dbtype]['installer'],
+        $host, $database, $username, $password);
 
     if (!$db) {
         // database connection failed, do not move on to create config file.
-- 
cgit v1.2.3-54-g00ecf


From 222ef4d1869485426e893f85caf8a3014f814faa Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 17:43:02 +1200
Subject: added doxygen tags

---
 install.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index 092172d35..5754c717a 100644
--- a/install.php
+++ b/install.php
@@ -1,5 +1,5 @@
 <?php
-/**
+/** 
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2009, StatusNet, Inc.
  *
@@ -15,7 +15,14 @@
  *
  * 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/>.
+ * 
+ * @category Installation
+ * @package  Installation
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
+ * 
  */
+ 
+
 
 define('INSTALLDIR', dirname(__FILE__));
 
-- 
cgit v1.2.3-54-g00ecf


From 711fe39700e868ad2cea595b109d2958752d4aa6 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 17:43:48 +1200
Subject: changed curly bracks on if, else, foreach to match pear code styles

---
 install.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/install.php b/install.php
index 5754c717a..75646c852 100644
--- a/install.php
+++ b/install.php
@@ -203,14 +203,13 @@ $dbModules = array(
 
 function main()
 {
-    if (!checkPrereqs())
-    {
+    if (!checkPrereqs()) {
         return;
     }
     
-    if( $_GET['checklibs'] ){
+    if ($_GET['checklibs']) {
         showLibs();
-    }else{
+    } else {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
             handlePost();
         } else {
@@ -221,13 +220,13 @@ function main()
 
 function haveExternalLibrary($external_library)
 {
-    if(isset($external_library['include']) && ! include_once($external_library['include'])){
+    if (isset($external_library['include']) && ! include_once $external_library['include'] ) {
         return false;
     }
-    if(isset($external_library['check_function']) && ! function_exists($external_library['check_function'])){
+    if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) {
         return false;
     }
-    if(isset($external_library['check_class']) && ! class_exists($external_library['check_class'])){
+    if (isset($external_library['check_class']) && ! class_exists($external_library['check_class'])) {
         return false;
     }
     return true;
@@ -309,10 +308,10 @@ function showLibs()
     global $external_libraries;
     $present_libraries=array();
     $absent_libraries=array();
-    foreach($external_libraries as $external_library){
-        if(haveExternalLibrary($external_library)){
+    foreach ($external_libraries as $external_library){
+        if (haveExternalLibrary($external_library)) {
             $present_libraries[]=$external_library;
-        }else{
+        } else {
             $absent_libraries[]=$external_library;
         }
     }
-- 
cgit v1.2.3-54-g00ecf


From c2e156dc492925d6aa94b91d5cee9ceb615bc2ab Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 17:44:22 +1200
Subject: added doxygen for main()

---
 install.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/install.php b/install.php
index 75646c852..221e4746f 100644
--- a/install.php
+++ b/install.php
@@ -201,6 +201,12 @@ $dbModules = array(
     ),
 );
 
+/** 
+ * the actual installation.
+ * If call libraries are present, then install
+ * 
+ * @return void
+ */
 function main()
 {
     if (!checkPrereqs()) {
-- 
cgit v1.2.3-54-g00ecf


From 20764dc08b0231e4be07c4e181c8603b005c20b5 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 14 Sep 2009 19:05:14 +1200
Subject: removed most of the <?php ?> that was making this hard to read

Conflicts:

	install.php
---
 install.php | 58 +++++++++++++++++++++++++++-------------------------------
 1 file changed, 27 insertions(+), 31 deletions(-)

diff --git a/install.php b/install.php
index 221e4746f..6f8bff91e 100644
--- a/install.php
+++ b/install.php
@@ -240,17 +240,16 @@ function haveExternalLibrary($external_library)
 
 function checkPrereqs()
 {
-	$pass = true;
+    $pass = true;
 
     if (file_exists(INSTALLDIR.'/config.php')) {
-         ?><p class="error">Config file &quot;config.php&quot; already exists.</p>
-         <?php
+         printf('<p class="error">Config file &quot;config.php&quot; already exists.</p>');
         $pass = false;
     }
 
     if (version_compare(PHP_VERSION, '5.2.3', '<')) {
-            ?><p class="error">Require PHP version 5.2.3 or greater.</p><?php
-		    $pass = false;
+        printf('<p class="error">Require PHP version 5.2.3 or greater.</p>');
+        $pass = false;
     }
 
     $reqs = array('gd', 'curl',
@@ -258,11 +257,10 @@ function checkPrereqs()
 
     foreach ($reqs as $req) {
         if (!checkExtension($req)) {
-            ?><p class="error">Cannot load required extension: <code><?php echo $req; ?></code></p><?php
-		    $pass = false;
+            printf('<p class="error">Cannot load required extension: <code>%s</code></p>', $req);
+            $pass = false;
         }
-    }
-    
+    }    
     // Make sure we have at least one database module available
     global $dbModules;
     $missingExtensions = array();
@@ -273,30 +271,28 @@ function checkPrereqs()
     }
     if (count($missingExtensions) == count($dbModules)) {
         $req = implode(', ', $missingExtensions);
-      ?><p class="error">Cannot find database support. You need at least one of these PHP extensions installed: <code><?php echo $req; ?></code></p><?php
-                    $pass = false;
+        printf('<p class="error">Cannot find mysql or pgsql extension. You need one or the other: <code>%s</code></p>', $req);
+        $pass = false;
+    }
+    
+    if (!is_writable(INSTALLDIR)) {
+        printf('<p class="error">Cannot write config file to: <code>%s</code></p>', INSTALLDIR);
+        printf('<p>On your server, try this command: <code>chmod a+w %s</code>', INSTALLDIR);
+        $pass = false;
+    }
+
+    // Check the subdirs used for file uploads
+    $fileSubdirs = array('avatar', 'background', 'file');
+    foreach ($fileSubdirs as $fileSubdir) {
+        $fileFullPath = INSTALLDIR."/$fileSubdir/";
+        if (!is_writable($fileFullPath)) {
+            printf('<p class="error">Cannot write to %s directory: <code>%s</code></p>', $fileSubdir, $fileFullPath);
+            printf('<p>On your server, try this command: <code>chmod a+w %s</code></p>', $fileFullPath);
+            $pass = false;
+        }
     }
 
-	if (!is_writable(INSTALLDIR)) {
-         ?><p class="error">Cannot write config file to: <code><?php echo INSTALLDIR; ?></code></p>
-	       <p>On your server, try this command: <code>chmod a+w <?php echo INSTALLDIR; ?></code>
-         <?php
-	     $pass = false;
-	}
-
-	// Check the subdirs used for file uploads
-	$fileSubdirs = array('avatar', 'background', 'file');
-	foreach ($fileSubdirs as $fileSubdir) {
-		$fileFullPath = INSTALLDIR."/$fileSubdir/";
-		if (!is_writable($fileFullPath)) {
-    	     ?><p class="error">Cannot write <?php echo $fileSubdir; ?> directory: <code><?php echo $fileFullPath; ?></code></p>
-		       <p>On your server, try this command: <code>chmod a+w <?php echo $fileFullPath; ?></code></p>
-	     <?php
-		     $pass = false;
-		}
-	}
-
-	return $pass;
+    return $pass;
 }
 
 function checkExtension($name)
-- 
cgit v1.2.3-54-g00ecf


From 367ed28efadf9b2a4b1e8e90349107f0de1fa44f Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 17:59:42 +1200
Subject: fixed missing semisolon

---
 install.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/install.php b/install.php
index 6f8bff91e..64c8fd9b1 100644
--- a/install.php
+++ b/install.php
@@ -444,10 +444,8 @@ E_O_T;
 
 function updateStatus($status, $error=false)
 {
-?>
-                <li <?php echo ($error) ? 'class="error"': ''; ?>><?php echo $status;?></li>
-
-<?php
+    echo '<li ' . ($error) ? 'class="error"': '';
+    echo ">$status</li>";
 }
 
 function handlePost()
-- 
cgit v1.2.3-54-g00ecf


From 61d5d51cf55909e8fa2b4a362b47741a9cde25ae Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 18:22:32 +1200
Subject: lotsa tabulation changed to 4 spaces

---
 install.php | 205 +++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 105 insertions(+), 100 deletions(-)

diff --git a/install.php b/install.php
index 64c8fd9b1..9d59f25b9 100644
--- a/install.php
+++ b/install.php
@@ -450,9 +450,6 @@ function updateStatus($status, $error=false)
 
 function handlePost()
 {
-?>
-
-<?php
     $host     = $_POST['host'];
     $dbtype   = $_POST['dbtype'];
     $database = $_POST['database'];
@@ -463,27 +460,27 @@ function handlePost()
     $server = $_SERVER['HTTP_HOST'];
     $path = substr(dirname($_SERVER['PHP_SELF']), 1);
 
-?>
+    echo <<<STR
     <dl class="system_notice">
         <dt>Page notice</dt>
         <dd>
             <ul>
-<?php
-	$fail = false;
+STR;
+    $fail = false;
 
     if (empty($host)) {
         updateStatus("No hostname specified.", true);
-		$fail = true;
+        $fail = true;
     }
 
     if (empty($database)) {
         updateStatus("No database specified.", true);
-		$fail = true;
+        $fail = true;
     }
 
     if (empty($username)) {
         updateStatus("No username specified.", true);
-		$fail = true;
+        $fail = true;
     }
 
 //     if (empty($password)) {
@@ -532,106 +529,106 @@ function handlePost()
 }
 
 function pgsql_db_installer($host, $database, $username, $password) {
-  $connstring = "dbname=$database host=$host user=$username";
-
-  //No password would mean trust authentication used.
-  if (!empty($password)) {
-    $connstring .= " password=$password";
-  }
-  updateStatus("Starting installation...");
-  updateStatus("Checking database...");
-  $conn = pg_connect($connstring);
-
-  if ($conn ===false) {
-    updateStatus("Failed to connect to database: $connstring");
-    showForm();
-    return false;
-  }
-
-  //ensure database encoding is UTF8
-  $record = pg_fetch_object(pg_query($conn, 'SHOW server_encoding'));
-  if ($record->server_encoding != 'UTF8') {
-    updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
-    showForm();
-    return false;
-  }
-
-  updateStatus("Running database script...");
-  //wrap in transaction;
-  pg_query($conn, 'BEGIN');
-  $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
-
-  if ($res === false) {
-      updateStatus("Can't run database script.", true);
-      showForm();
-      return false;
-  }
-  foreach (array('sms_carrier' => 'SMS carrier',
+    $connstring = "dbname=$database host=$host user=$username";
+
+    //No password would mean trust authentication used.
+    if (!empty($password)) {
+        $connstring .= " password=$password";
+    }
+    updateStatus("Starting installation...");
+    updateStatus("Checking database...");
+    $conn = pg_connect($connstring);
+
+    if ($conn ===false) {
+        updateStatus("Failed to connect to database: $connstring");
+        showForm();
+        return false;
+    }
+
+    //ensure database encoding is UTF8
+    $record = pg_fetch_object(pg_query($conn, 'SHOW server_encoding'));
+    if ($record->server_encoding != 'UTF8') {
+        updateStatus("StatusNet requires UTF8 character encoding. Your database is ". htmlentities($record->server_encoding));
+        showForm();
+        return false;
+    }
+
+    updateStatus("Running database script...");
+    //wrap in transaction;
+    pg_query($conn, 'BEGIN');
+    $res = runDbScript(INSTALLDIR.'/db/statusnet_pg.sql', $conn, 'pgsql');
+
+    if ($res === false) {
+        updateStatus("Can't run database script.", true);
+        showForm();
+        return false;
+    }
+    foreach (array('sms_carrier' => 'SMS carrier',
                 'notice_source' => 'notice source',
                 'foreign_services' => 'foreign service')
           as $scr => $name) {
-      updateStatus(sprintf("Adding %s data to database...", $name));
-      $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql');
-      if ($res === false) {
-          updateStatus(sprintf("Can't run %d script.", $name), true);
-          showForm();
-          return false;
-      }
-  }
-  pg_query($conn, 'COMMIT');
-
-  if (empty($password)) {
-    $sqlUrl = "pgsql://$username@$host/$database";
-  }
-  else {
-    $sqlUrl = "pgsql://$username:$password@$host/$database";
-  }
-
-  $db = array('type' => 'pgsql', 'database' => $sqlUrl);
-
-  return $db;
+        updateStatus(sprintf("Adding %s data to database...", $name));
+        $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn, 'pgsql');
+        if ($res === false) {
+            updateStatus(sprintf("Can't run %d script.", $name), true);
+            showForm();
+            return false;
+        }
+    }
+    pg_query($conn, 'COMMIT');
+
+    if (empty($password)) {
+        $sqlUrl = "pgsql://$username@$host/$database";
+    }
+    else {
+        $sqlUrl = "pgsql://$username:$password@$host/$database";
+    }
+
+    $db = array('type' => 'pgsql', 'database' => $sqlUrl);
+
+    return $db;
 }
 
 function mysql_db_installer($host, $database, $username, $password) {
-  updateStatus("Starting installation...");
-  updateStatus("Checking database...");
-
-  $conn = mysql_connect($host, $username, $password);
-  if (!$conn) {
-      updateStatus("Can't connect to server '$host' as '$username'.", true);
-      showForm();
-      return false;
-  }
-  updateStatus("Changing to database...");
-  $res = mysql_select_db($database, $conn);
-  if (!$res) {
-      updateStatus("Can't change to database.", true);
-      showForm();
-      return false;
-  }
-  updateStatus("Running database script...");
-  $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
-  if ($res === false) {
-      updateStatus("Can't run database script.", true);
-      showForm();
-      return false;
-  }
-  foreach (array('sms_carrier' => 'SMS carrier',
+    updateStatus("Starting installation...");
+    updateStatus("Checking database...");
+
+    $conn = mysql_connect($host, $username, $password);
+    if (!$conn) {
+        updateStatus("Can't connect to server '$host' as '$username'.", true);
+        showForm();
+        return false;
+    }
+    updateStatus("Changing to database...");
+    $res = mysql_select_db($database, $conn);
+    if (!$res) {
+        updateStatus("Can't change to database.", true);
+        showForm();
+        return false;
+    }
+    updateStatus("Running database script...");
+    $res = runDbScript(INSTALLDIR.'/db/statusnet.sql', $conn);
+    if ($res === false) {
+        updateStatus("Can't run database script.", true);
+        showForm();
+        return false;
+    }
+    foreach (array('sms_carrier' => 'SMS carrier',
                 'notice_source' => 'notice source',
                 'foreign_services' => 'foreign service')
           as $scr => $name) {
-      updateStatus(sprintf("Adding %s data to database...", $name));
-      $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
-      if ($res === false) {
-          updateStatus(sprintf("Can't run %d script.", $name), true);
-          showForm();
-          return false;
-      }
-  }
-
-      $sqlUrl = "mysqli://$username:$password@$host/$database";
-      $db = array('type' => 'mysql', 'database' => $sqlUrl);
-      return $db;
+        updateStatus(sprintf("Adding %s data to database...", $name));
+        $res = runDbScript(INSTALLDIR.'/db/'.$scr.'.sql', $conn);
+        if ($res === false) {
+            updateStatus(sprintf("Can't run %d script.", $name), true);
+            showForm();
+            return false;
+        }
+    }
+
+    $sqlUrl = "mysqli://$username:$password@$host/$database";
+    $db = array('type' => 'mysql', 'database' => $sqlUrl);
+    return $db;
 }
 
 function writeConf($sitename, $server, $path, $fancy, $db)
@@ -662,6 +659,14 @@ function writeConf($sitename, $server, $path, $fancy, $db)
     return $res;
 }
 
+/**
+ * Install schema into the database
+ *
+ * @param filename $filename    location of database schema file
+ * @param conn $conn            connection to database
+ * @param type $type type of database, currently mysql or pgsql
+ * @return boolean - indicating success or failure
+ */
 function runDbScript($filename, $conn, $type = 'mysql')
 {
     $sql = trim(file_get_contents($filename));
-- 
cgit v1.2.3-54-g00ecf


From 36aa89d6959d0d03f3fe3c769f867f314aba8bf9 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 18:29:10 +1200
Subject: many doxygen comments added

---
 install.php | 28 ++++++++++++++++++++++++++--
 1 file changed, 26 insertions(+), 2 deletions(-)

diff --git a/install.php b/install.php
index 9d59f25b9..787edb20f 100644
--- a/install.php
+++ b/install.php
@@ -224,6 +224,13 @@ function main()
     }
 }
 
+/**
+ * checks if an external libary is present
+ *
+ * @param string $external_library Name of library
+ *
+ * @return boolean indicates if library present
+ */
 function haveExternalLibrary($external_library)
 {
     if (isset($external_library['include']) && ! include_once $external_library['include'] ) {
@@ -238,6 +245,11 @@ function haveExternalLibrary($external_library)
     return true;
 }
 
+/**
+ * Check if all is ready for installation
+ *
+ * @return void
+ */
 function checkPrereqs()
 {
     $pass = true;
@@ -295,6 +307,13 @@ function checkPrereqs()
     return $pass;
 }
 
+/**
+ * Checks if a php extension is both installed and loaded
+ *
+ * @param string $name of extension to check
+ *
+ * @return boolean whether extension is installed and loaded
+ */
 function checkExtension($name)
 {
     if (!extension_loaded($name)) {
@@ -305,6 +324,11 @@ function checkExtension($name)
     return true;
 }
 
+/**
+ * Show list of libraries
+ *
+ * @return void
+ */
 function showLibs()
 {
     global $external_libraries;
@@ -356,9 +380,9 @@ E_O_T;
     foreach($present_libraries as $library)
     {
         echo '<li>';
-        if($library['url']){
+        if ($library['url']) {
             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
-        }else{
+        } else {
             echo htmlentities($library['name']);
         }
         echo '</li>';
-- 
cgit v1.2.3-54-g00ecf


From f5b7ea739660cf15abb92f534b30fc1cfd5e07c6 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 18:31:44 +1200
Subject: fixed up curly brackets and spaces around for, if, else

---
 install.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/install.php b/install.php
index 787edb20f..30c6780ab 100644
--- a/install.php
+++ b/install.php
@@ -334,7 +334,7 @@ function showLibs()
     global $external_libraries;
     $present_libraries=array();
     $absent_libraries=array();
-    foreach ($external_libraries as $external_library){
+    foreach ($external_libraries as $external_library) {
         if (haveExternalLibrary($external_library)) {
             $present_libraries[]=$external_library;
         } else {
@@ -352,22 +352,21 @@ function showLibs()
     <h2>Absent Libraries</h2>
     <ul id="absent_libraries">
 E_O_T;
-    foreach($absent_libraries as $library)
-    {
+    foreach ($absent_libraries as $library) {
         echo '<li>';
-        if($library['url']){
+        if ($library['url']) {
             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
-        }else{
+        } else {
             echo htmlentities($library['name']);
         }
         echo '<ul>';
-        if($library['deb']){
+        if ($library['deb']) {
             echo '<li class="deb package">deb: <a href="apt:' . urlencode($library['deb']) . '">' . htmlentities($library['deb']) . '</a></li>';
         }
-        if($library['rpm']){
+        if ($library['rpm']) {
             echo '<li class="rpm package">rpm: ' . htmlentities($library['rpm']) . '</li>';
         }
-        if($library['pear']){
+        if ($library['pear']) {
             echo '<li class="pear package">pear: ' . htmlentities($library['pear']) . '</li>';
         }
         echo '</ul>';
@@ -377,8 +376,7 @@ E_O_T;
     <h2>Installed Libraries</h2>
     <ul id="present_libraries">
 E_O_T;
-    foreach($present_libraries as $library)
-    {
+    foreach ($present_libraries as $library) {
         echo '<li>';
         if ($library['url']) {
             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
@@ -514,11 +512,11 @@ STR;
 
     if (empty($sitename)) {
         updateStatus("No sitename specified.", true);
-		$fail = true;
+        $fail = true;
     }
 
-    if($fail){
-            showForm();
+    if ($fail) {
+        showForm();
         return;
     }
 
@@ -603,8 +601,7 @@ function pgsql_db_installer($host, $database, $username, $password) {
 
     if (empty($password)) {
         $sqlUrl = "pgsql://$username@$host/$database";
-    }
-    else {
+    } else {
         $sqlUrl = "pgsql://$username:$password@$host/$database";
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 93605dce99832868c3fdbb8af42db507a8005e97 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 18:32:59 +1200
Subject: removed commented out code we no longer want

---
 install.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/install.php b/install.php
index 30c6780ab..6e7e833a3 100644
--- a/install.php
+++ b/install.php
@@ -505,11 +505,6 @@ STR;
         $fail = true;
     }
 
-//     if (empty($password)) {
-//         updateStatus("No password specified.", true);
-// 		$fail = true;
-//     }
-
     if (empty($sitename)) {
         updateStatus("No sitename specified.", true);
         $fail = true;
-- 
cgit v1.2.3-54-g00ecf


From dbc08ef0a09e481e0884a38ee704f4d193edef6a Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 14 Sep 2009 19:08:05 +1200
Subject: most of code style errors gone

Conflicts:

	install.php
---
 install.php | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/install.php b/install.php
index 6e7e833a3..dea03fc5e 100644
--- a/install.php
+++ b/install.php
@@ -516,8 +516,7 @@ STR;
     }
 
     global $dbModules;
-    $db = call_user_func($dbModules[$dbtype]['installer'],
-        $host, $database, $username, $password);
+    $db = call_user_func($dbModules[$dbtype]['installer'], $host, $database, $username, $password);
 
     if (!$db) {
         // database connection failed, do not move on to create config file.
@@ -540,12 +539,10 @@ STR;
 
     updateStatus("StatusNet has been installed at $link");
     updateStatus("You can visit your <a href='$link'>new StatusNet site</a>.");
-?>
-
-<?php
 }
 
-function pgsql_db_installer($host, $database, $username, $password) {
+function Pgsql_Db_installer($host, $database, $username, $password) 
+{
     $connstring = "dbname=$database host=$host user=$username";
 
     //No password would mean trust authentication used.
@@ -605,7 +602,8 @@ function pgsql_db_installer($host, $database, $username, $password) {
     return $db;
 }
 
-function mysql_db_installer($host, $database, $username, $password) {
+function Mysql_Db_installer($host, $database, $username, $password) 
+{
     updateStatus("Starting installation...");
     updateStatus("Checking database...");
 
@@ -678,9 +676,10 @@ function writeConf($sitename, $server, $path, $fancy, $db)
 /**
  * Install schema into the database
  *
- * @param filename $filename    location of database schema file
- * @param conn $conn            connection to database
- * @param type $type type of database, currently mysql or pgsql
+ * @param string $filename location of database schema file
+ * @param dbconn $conn     connection to database
+ * @param string $type     type of database, currently mysql or pgsql
+ * 
  * @return boolean - indicating success or failure
  */
 function runDbScript($filename, $conn, $type = 'mysql')
-- 
cgit v1.2.3-54-g00ecf


From acd9e7c05610ce2e5ddc582b8ec7c58991b7a21e Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 20:15:21 +1200
Subject: added most of the required doxygen

---
 index.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.php b/index.php
index e2296549f..83c14c495 100644
--- a/index.php
+++ b/index.php
@@ -15,6 +15,10 @@
  *
  * 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/>.
+ * 
+ * @category StatusNet
+ * @package  StatusNet
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
 
 define('INSTALLDIR', dirname(__FILE__));
-- 
cgit v1.2.3-54-g00ecf


From a2f4fe7fc80fa851dd9293d64c4727d4bb233b90 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 20:16:07 +1200
Subject: fixed up if statements

---
 index.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/index.php b/index.php
index 83c14c495..8f2a7cf7f 100644
--- a/index.php
+++ b/index.php
@@ -49,11 +49,11 @@ function handleError($error)
     }
 
     $logmsg = "PEAR error: " . $error->getMessage();
-    if(common_config('site', 'logdebug')) {
+    if (common_config('site', 'logdebug')) {
         $logmsg .= " : ". $error->getDebugInfo();
     }
     common_log(LOG_ERR, $logmsg);
-    if(common_config('site', 'logdebug')) {
+    if (common_config('site', 'logdebug')) {
         $bt = $error->getBacktrace();
         foreach ($bt as $line) {
             common_log(LOG_ERR, $line);
-- 
cgit v1.2.3-54-g00ecf


From 738b6d1690ad595b85657fa282132459865fed93 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 20:31:19 +1200
Subject: lotsa of multiline if statements and function calls changed style to
 meat pear code style

---
 index.php | 54 ++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 20 deletions(-)

diff --git a/index.php b/index.php
index 8f2a7cf7f..71de39324 100644
--- a/index.php
+++ b/index.php
@@ -33,7 +33,8 @@ $action = null;
 function getPath($req)
 {
     if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
-        && array_key_exists('p', $req)) {
+        && array_key_exists('p', $req)
+        ) {
         return $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
         return $_SERVER['PATH_INFO'];
@@ -59,18 +60,25 @@ function handleError($error)
             common_log(LOG_ERR, $line);
         }
     }
-    if ($error instanceof DB_DataObject_Error ||
-        $error instanceof DB_Error) {
-        $msg = sprintf(_('The database for %s isn\'t responding correctly, '.
-                         'so the site won\'t work properly. '.
-                         'The site admins probably know about the problem, '.
-                         'but you can contact them at %s to make sure. '.
-                         'Otherwise, wait a few minutes and try again.'),
-                       common_config('site', 'name'),
-                       common_config('site', 'email'));
+    if ($error instanceof DB_DataObject_Error 
+        || $error instanceof DB_Error
+    ) {
+        $msg = sprintf(
+            _(
+                'The database for %s isn\'t responding correctly, '.
+                'so the site won\'t work properly. '.
+                'The site admins probably know about the problem, '.
+                'but you can contact them at %s to make sure. '.
+                'Otherwise, wait a few minutes and try again.'
+            ),
+            common_config('site', 'name'),
+            common_config('site', 'email')
+        );
     } else {
-        $msg = _('An important error occured, probably related to email setup. '.
-                 'Check logfiles for more info..');
+        $msg = _(
+            'An important error occured, probably related to email setup. '.
+            'Check logfiles for more info..'
+        );
     }
 
     $dac = new DBErrorAction($msg, 500);
@@ -131,10 +139,11 @@ function main()
         $_lighty_url = @parse_url($_lighty_url);
 
         if ($_lighty_url['path'] != '/index.php' && $_lighty_url['path'] != '/') {
-            $_lighty_path = preg_replace('/^'.preg_quote(common_config('site','path')).'\//', '', substr($_lighty_url['path'], 1));
+            $_lighty_path = preg_replace('/^'.preg_quote(common_config('site', 'path')).'\//', '', substr($_lighty_url['path'], 1));
             $_SERVER['QUERY_STRING'] = 'p='.$_lighty_path;
-            if ($_lighty_url['query'])
+            if ($_lighty_url['query']) {
                 $_SERVER['QUERY_STRING'] .= '&'.$_lighty_url['query'];
+            }
             parse_str($_lighty_url['query'], $_lighty_query);
             foreach ($_lighty_query as $key => $val) {
                 $_GET[$key] = $_REQUEST[$key] = $val;
@@ -145,7 +154,7 @@ function main()
     $_SERVER['REDIRECT_URL'] = preg_replace("/\?.+$/", "", $_SERVER['REQUEST_URI']);
 
     // quick check for fancy URL auto-detection support in installer.
-    if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/","",(dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) {
+    if (isset($_SERVER['REDIRECT_URL']) && (preg_replace("/^\/$/", "", (dirname($_SERVER['REQUEST_URI']))) . '/check-fancy') === $_SERVER['REDIRECT_URL']) {
         die("Fancy URL support detection succeeded. We suggest you enable this to get fancy (pretty) URLs.");
     }
     global $user, $action;
@@ -153,8 +162,12 @@ function main()
     Snapshot::check();
 
     if (!_have_config()) {
-        $msg = sprintf(_("No configuration file found. Try running ".
-                         "the installation program first."));
+        $msg = sprintf(
+            _(
+                "No configuration file found. Try running ".
+                "the installation program first."
+            )
+        );
         $sac = new ServerErrorAction($msg);
         $sac->showPage();
         return;
@@ -200,9 +213,10 @@ function main()
     // If the site is private, and they're not on one of the "public"
     // parts of the site, redirect to login
 
-    if (!$user && common_config('site', 'private') &&
-        !isLoginAction($action) &&
-        !preg_match('/rss$/', $action)) {
+    if (!$user && common_config('site', 'private') 
+        && !isLoginAction($action) 
+        && !preg_match('/rss$/', $action)
+    ) {
         common_redirect(common_local_url('login'));
         return;
     }
-- 
cgit v1.2.3-54-g00ecf


From 87c59fe8734479046c8433f74787f615484b3df7 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 20:32:58 +1200
Subject: fixed indentation for the pear code styles

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 71de39324..b8d9c7c69 100644
--- a/index.php
+++ b/index.php
@@ -34,7 +34,7 @@ function getPath($req)
 {
     if ((common_config('site', 'fancy') || !array_key_exists('PATH_INFO', $_SERVER))
         && array_key_exists('p', $req)
-        ) {
+    ) {
         return $req['p'];
     } else if (array_key_exists('PATH_INFO', $_SERVER)) {
         return $_SERVER['PATH_INFO'];
-- 
cgit v1.2.3-54-g00ecf


From 5ca90e2c8cbc76693cf0f2278d14f2a35da7e34e Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Mon, 14 Sep 2009 19:19:11 +1200
Subject: pulled @author from git logs

Conflicts:

	install.php
---
 index.php   | 14 ++++++++++++++
 install.php | 21 ++++++++++++++++-----
 2 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/index.php b/index.php
index b8d9c7c69..a1d983dce 100644
--- a/index.php
+++ b/index.php
@@ -19,6 +19,20 @@
  * @category StatusNet
  * @package  StatusNet
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
+ * @author Brenda Wallace <shiny@cpan.org> 
+ * @author Christopher Vollick <psycotica0@gmail.com> 
+ * @author CiaranG <ciaran@ciarang.com>
+ * @author Craig Andrews <candrews@integralblue.com> 
+ * @author Evan Prodromou <evan@controlezvous.ca>
+ * @author Evan Prodromou <evan@controlyourself.ca> 
+ * @author Evan Prodromou <evan@prodromou.name>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Gina Haeussge <osd@foosel.net> 
+ * @author Jeffery To <jeffery.to@gmail.com>
+ * @author Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author Robin Millette <millette@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@controlyourself.ca> 
+ * @author Tom Adams <tom@holizz.com>
  */
 
 define('INSTALLDIR', dirname(__FILE__));
diff --git a/install.php b/install.php
index dea03fc5e..07a7bfaaf 100644
--- a/install.php
+++ b/install.php
@@ -18,12 +18,22 @@
  * 
  * @category Installation
  * @package  Installation
- * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  * 
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Brett Taylor <brett@webfroot.co.nz>
+ * @author   Brion Vibber <brion@pobox.com>
+ * @author   CiaranG <ciaran@ciarang.com>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Eric Helgeson <helfire@Erics-MBP.local>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Tom Adams <tom@holizz.com>
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
  
-
-
 define('INSTALLDIR', dirname(__FILE__));
 
 $external_libraries=array(
@@ -281,6 +291,7 @@ function checkPrereqs()
             $missingExtensions[] = $info['check_module'];
         }
     }
+    
     if (count($missingExtensions) == count($dbModules)) {
         $req = implode(', ', $missingExtensions);
         printf('<p class="error">Cannot find mysql or pgsql extension. You need one or the other: <code>%s</code></p>', $req);
@@ -682,7 +693,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
  * 
  * @return boolean - indicating success or failure
  */
-function runDbScript($filename, $conn, $type = 'mysql')
+function runDbScript($filename, $conn, $type = 'mysqli')
 {
     $sql = trim(file_get_contents($filename));
     $stmts = explode(';', $sql);
@@ -693,7 +704,7 @@ function runDbScript($filename, $conn, $type = 'mysql')
         }
         // FIXME: use PEAR::DB or PDO instead of our own switch
         switch ($type) {
-        case 'mysql':
+        case 'mysqli':
             $res = mysql_query($stmt, $conn);
             if ($res === false) {
                 $error = mysql_error();
-- 
cgit v1.2.3-54-g00ecf


From 84da24aba41b459ad8b2735328e257275c0f6136 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 21:27:34 +1200
Subject: cleaned up code style

---
 actions/all.php | 82 ++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 58 insertions(+), 24 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 29a19afb6..e56e10c21 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
@@ -15,9 +15,29 @@
  *
  * 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/>.
+ * 
+ * @category Actions
+ * @package  Actions
+ * @author   Evan Prodromou <evan@prodromou.name>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Adrian Lang <mail@adrianlang.de>
+ * @author   Meitar Moscovitz <meitarm@gmail.com>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   csarven <csarven@controlyourself.ca>
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
+ * @link     http://status.net
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { 
+    exit(1); 
+}
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
 require_once INSTALLDIR.'/lib/noticelist.php';
@@ -43,8 +63,8 @@ class AllAction extends ProfileAction
             $this->notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
         }
 
-        if($this->page > 1 && $this->notice->N == 0){
-            $this->serverError(_('No such page'),$code=404);
+        if ($this->page > 1 && $this->notice->N == 0) {
+            $this->serverError(_('No such page'), $code = 404);
         }
 
         return true;
@@ -73,20 +93,33 @@ class AllAction extends ProfileAction
 
     function getFeeds()
     {
-        return array(new Feed(Feed::RSS1,
-                              common_local_url('allrss', array('nickname' =>
-                                                               $this->user->nickname)),
-                              sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
-                     new Feed(Feed::RSS2,
-                              common_local_url('api', array('apiaction' => 'statuses',
-                                                            'method' => 'friends_timeline',
-                                                            'argument' => $this->user->nickname.'.rss')),
-                              sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
-                     new Feed(Feed::ATOM,
-                              common_local_url('api', array('apiaction' => 'statuses',
-                                                            'method' => 'friends_timeline',
-                                                            'argument' => $this->user->nickname.'.atom')),
-                              sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname)));
+        return array(
+            new Feed(Feed::RSS1,
+                common_local_url(
+                    'allrss', array(
+                        'nickname' =>
+                        $this->user->nickname)
+                ),
+                sprintf(_('Feed for friends of %s (RSS 1.0)'), $this->user->nickname)),
+            new Feed(Feed::RSS2,
+                common_local_url(
+                    'api', array(
+                        'apiaction' => 'statuses',
+                        'method' => 'friends_timeline',
+                        'argument' => $this->user->nickname.'.rss'
+                    )
+                ),
+                sprintf(_('Feed for friends of %s (RSS 2.0)'), $this->user->nickname)),
+            new Feed(Feed::ATOM,
+                common_local_url(
+                    'api', array(
+                        'apiaction' => 'statuses',
+                        'method' => 'friends_timeline',
+                        'argument' => $this->user->nickname.'.atom'
+                    )
+                ),
+                sprintf(_('Feed for friends of %s (Atom)'), $this->user->nickname))
+        );
     }
 
     function showLocalNav()
@@ -106,8 +139,7 @@ class AllAction extends ProfileAction
             } else {
                 $message .= sprintf(_('You can try to [nudge %s](../%s) from his profile or [post something to his or her attention](%%%%action.newnotice%%%%?status_textarea=%s).'), $this->user->nickname, $this->user->nickname, '@' . $this->user->nickname);
             }
-        }
-        else {
+        } else {
             $message .= sprintf(_('Why not [register an account](%%%%action.register%%%%) and then nudge %s or post a notice to his or her attention.'), $this->user->nickname);
         }
 
@@ -126,17 +158,19 @@ class AllAction extends ProfileAction
             $this->showEmptyListMessage();
         }
 
-        $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
-                          $this->page, 'all', array('nickname' => $this->user->nickname));
+        $this->pagination(
+            $this->page > 1, $cnt > NOTICES_PER_PAGE,
+            $this->page, 'all', array('nickname' => $this->user->nickname)
+        );
     }
 
     function showPageTitle()
     {
         $user =& common_current_user();
         if ($user && ($user->id == $this->user->id)) {
-            $this->element('h1', NULL, _("You and friends"));
+            $this->element('h1', null, _("You and friends"));
         } else {
-            $this->element('h1', NULL, sprintf(_('%s and friends'), $this->user->nickname));
+            $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
         }
     }
 
-- 
cgit v1.2.3-54-g00ecf


From fcff85bb3610a0f2a77bfa72cf26ce8019ec0378 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <shiny@cpan.org>
Date: Sun, 13 Sep 2009 21:55:45 +1200
Subject: code style cleanup

---
 actions/api.php | 106 ++++++++++++++++++++++++++++++++------------------------
 1 file changed, 61 insertions(+), 45 deletions(-)

diff --git a/actions/api.php b/actions/api.php
index c236378bc..9b5f54807 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2008, 2009, StatusNet, Inc.
  *
@@ -15,9 +15,30 @@
  *
  * 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/>.
+ * 
+ * @category Actions
+ * @package  Actions
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@prodromou.name>
+ * @author   Brenda Wallace <shiny@cpan.org>
+ * @author   Jeffery To <jeffery.to@gmail.com>
+ * @author   Robin Millette <millette@controlyourself.ca>
+ * @author   Tom Adams <tom@holizz.com>
+ * @author   Christopher Vollick <psycotica0@gmail.com>
+ * @author   CiaranG <ciaran@ciarang.com>
+ * @author   Craig Andrews <candrews@integralblue.com>
+ * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Gina Haeussge <osd@foosel.net>
+ * @author   Mike Cochrane <mikec@mikenz.geek.nz>
+ * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @license  GNU Affero General Public License http://www.gnu.org/licenses/
+ * @link     http://status.net
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET') && !defined('LACONICA')) { 
+    exit(1); 
+}
 
 class ApiAction extends Action
 {
@@ -37,7 +58,7 @@ class ApiAction extends Action
         $this->api_action = $this->arg('apiaction');
         $method = $this->arg('method');
         $argument = $this->arg('argument');
-	$this->basic_auth_process_header();
+        $this->basic_auth_process_header();
 
         if (isset($argument)) {
             $cmdext = explode('.', $argument);
@@ -46,7 +67,7 @@ class ApiAction extends Action
             $this->content_type = strtolower($cmdext[1]);
         } else {
 
-            # Requested format / content-type will be an extension on the method
+            //Requested format / content-type will be an extension on the method
             $cmdext = explode('.', $method);
             $this->api_method = $cmdext[0];
             $this->content_type = strtolower($cmdext[1]);
@@ -55,10 +76,10 @@ class ApiAction extends Action
         if ($this->requires_auth()) {
             if (!isset($this->auth_user)) {
 
-                # This header makes basic auth go
+                //This header makes basic auth go
                 header('WWW-Authenticate: Basic realm="StatusNet API"');
 
-                # If the user hits cancel -- bam!
+                //If the user hits cancel -- bam!
                 $this->show_basic_auth_error();
             } else {
                 $nickname = $this->auth_user;
@@ -69,7 +90,7 @@ class ApiAction extends Action
                     $this->user = $user;
                     $this->process_command();
                 } else {
-                    # basic authentication failed
+                    //basic authentication failed
                     list($proxy, $ip) = common_client_ip();
 
                     common_log(LOG_WARNING, "Failed API auth attempt, nickname = $nickname, proxy = $proxy, ip = $ip.");
@@ -84,7 +105,7 @@ class ApiAction extends Action
                 if ($user) {
                     $this->user = $user;
                 }
-                # Twitter doesn't throw an error if the user isn't found
+                //Twitter doesn't throw an error if the user isn't found
             }
 
             $this->process_command();
@@ -97,7 +118,7 @@ class ApiAction extends Action
         $actionfile = INSTALLDIR."/actions/$action.php";
 
         if (file_exists($actionfile)) {
-            require_once($actionfile);
+            include_once $actionfile;
             $action_class = ucfirst($action)."Action";
             $action_obj = new $action_class();
 
@@ -113,10 +134,10 @@ class ApiAction extends Action
 
                 call_user_func(array($action_obj, $this->api_method), $_REQUEST, $apidata);
             } else {
-                $this->clientError("API method not found!", $code=404);
+                $this->clientError("API method not found!", $code = 404);
             }
         } else {
-            $this->clientError("API method not found!", $code=404);
+            $this->clientError("API method not found!", $code = 404);
         }
     }
 
@@ -184,10 +205,11 @@ class ApiAction extends Action
             $user_id     = $this->arg('user_id');
             $screen_name = $this->arg('screen_name');
 
-            if (empty($this->api_arg) &&
-                empty($id)            &&
-                empty($user_id)       &&
-                empty($screen_name)) {
+            if (empty($this->api_arg) 
+                && empty($id)            
+                && empty($user_id)       
+                && empty($screen_name)
+            ) {
                 return true;
             } else {
                 return false;
@@ -208,35 +230,29 @@ class ApiAction extends Action
 
     function basic_auth_process_header()
     {
-	if(isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION']))
-	{
-		$authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])?$_SERVER['HTTP_AUTHORIZATION']:$_SERVER['AUTHORIZATION'];
-	}
-
-	if(isset($_SERVER['PHP_AUTH_USER']))
-	{
-		$this->auth_user = $_SERVER['PHP_AUTH_USER'];
-		$this->auth_pw = $_SERVER['PHP_AUTH_PW'];
-	}
-	elseif ( isset($authorization_header) && strstr(substr($authorization_header, 0,5),'Basic')  )
-	{
-		// decode the HTTP_AUTHORIZATION header on php-cgi server self
-		// on fcgid server the header name is AUTHORIZATION
-
-		$auth_hash = base64_decode( substr($authorization_header, 6) );
-		list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
-
-		// set all to NULL on a empty basic auth request
-		if($this->auth_user == "") {
-			$this->auth_user = NULL;
-			$this->auth_pw = NULL;
-		}
-	}
-	else
-	{
-		$this->auth_user = NULL;
-		$this->auth_pw = NULL;
-	}
+        if (isset($_SERVER['AUTHORIZATION']) || isset($_SERVER['HTTP_AUTHORIZATION'])) {
+            $authorization_header = isset($_SERVER['HTTP_AUTHORIZATION'])? $_SERVER['HTTP_AUTHORIZATION'] : $_SERVER['AUTHORIZATION'];
+        }
+
+        if (isset($_SERVER['PHP_AUTH_USER'])) {
+            $this->auth_user = $_SERVER['PHP_AUTH_USER'];
+            $this->auth_pw = $_SERVER['PHP_AUTH_PW'];
+        } elseif (isset($authorization_header) && strstr(substr($authorization_header, 0, 5), 'Basic')) {
+            // decode the HTTP_AUTHORIZATION header on php-cgi server self
+            // on fcgid server the header name is AUTHORIZATION
+
+            $auth_hash = base64_decode(substr($authorization_header, 6));
+            list($this->auth_user, $this->auth_pw) = explode(':', $auth_hash);
+
+            // set all to null on a empty basic auth request
+            if ($this->auth_user == "") {
+                $this->auth_user = null;
+                $this->auth_pw = null;
+            }
+        } else {
+            $this->auth_user = null;
+            $this->auth_pw = null;
+        }
     }
 
     function show_basic_auth_error()
@@ -252,7 +268,7 @@ class ApiAction extends Action
             $this->element('request', null, $_SERVER['REQUEST_URI']);
             $this->elementEnd('hash');
             $this->endXML();
-        } else if ($this->content_type == 'json')  {
+        } else if ($this->content_type == 'json') {
             header('Content-Type: application/json; charset=utf-8');
             $error_array = array('error' => $msg, 'request' => $_SERVER['REQUEST_URI']);
             print(json_encode($error_array));
-- 
cgit v1.2.3-54-g00ecf


From 5bad7040b14bf61d84cc33c8b4cf2af3b5861d3b Mon Sep 17 00:00:00 2001
From: Adrian Lang <mail@adrianlang.de>
Date: Mon, 14 Sep 2009 22:08:17 +0200
Subject: Fix bad merge d7ae0ed4fd755ebad0788a17d0f2fb6a6ca9d63b

---
 lib/omb.php | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/lib/omb.php b/lib/omb.php
index 9133af7a0..0566701ff 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -80,14 +80,9 @@ function omb_broadcast_notice($notice)
     $posted = array();
 
     while ($rp->fetch()) {
-        if (!array_key_exists($rp->postnoticeurl, $posted)) {
-            common_log(LOG_DEBUG, 'Posting to ' . $rp->postnoticeurl);
-            if (omb_post_notice_keys($notice, $rp->postnoticeurl, $rp->token, $rp->secret)) {
-                common_log(LOG_DEBUG, 'Finished to ' . $rp->postnoticeurl);
-                $posted[$rp->postnoticeurl] = true;
-            } else {
-                common_log(LOG_DEBUG, 'Failed posting to ' . $rp->postnoticeurl);
-            }
+        if (isset($posted[$rp->postnoticeurl])) {
+            /* We already posted to this url. */
+            continue;
         }
         common_debug('Posting to ' . $rp->postnoticeurl, __FILE__);
 
-- 
cgit v1.2.3-54-g00ecf


From 4081ed79b02fd06f7c347803478e1f835311c2ab Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 12:59:32 -0700
Subject: Make it impossible to delete self-subscriptions via the API

---
 actions/twitapifriendships.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/actions/twitapifriendships.php b/actions/twitapifriendships.php
index f2ea46910..eea8945c3 100644
--- a/actions/twitapifriendships.php
+++ b/actions/twitapifriendships.php
@@ -99,6 +99,12 @@ class TwitapifriendshipsAction extends TwitterapiAction
         $other = $this->get_profile($id);
         $user = $apidata['user']; // Alwyas the auth user
 
+	if ($user->id == $other->id) {
+	    $this->clientError(_("You cannot unfollow yourself!"),
+			       403, $apidata['content-type']);
+	    return;
+	}
+
         $sub = new Subscription();
         $sub->subscriber = $user->id;
         $sub->subscribed = $other->id;
-- 
cgit v1.2.3-54-g00ecf


From 38409f1683351ae2b9bc932d441c6021a8b2aae7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 14:37:11 -0700
Subject: Add Jiminy to notice sources

---
 db/notice_source.sql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/db/notice_source.sql b/db/notice_source.sql
index f590d1b97..2657763f4 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -21,6 +21,7 @@ VALUES
     ('identichat','identichat','http://identichat.prosody.im/', now()),
     ('IdentiFox','IdentiFox','http://www.bitbucket.org/uncryptic/identifox/', now()),
     ('identitwitch','IdentiTwitch','http://richfish.org/identitwitch/', now()),
+    ('Jiminy','Jiminy','http://code.google.com/p/jiminy/', now()),
     ('LaTwit','LaTwit','http://latwit.mac65.com/', now()),
     ('LiveTweeter', 'LiveTweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
     ('livetweeter', 'livetweeter', 'http://addons.songbirdnest.com/addon/1204', now()),
-- 
cgit v1.2.3-54-g00ecf


From 94466da35afcb0b1680a478964b58fbc7970f4ec Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 16:31:09 -0700
Subject: Got rid of a bunch of ugly warnings

---
 install.php | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/install.php b/install.php
index 07a7bfaaf..a8f1ef4e2 100644
--- a/install.php
+++ b/install.php
@@ -1,5 +1,5 @@
 <?php
-/** 
+/**
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2009, StatusNet, Inc.
  *
@@ -15,10 +15,10 @@
  *
  * 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/>.
- * 
+ *
  * @category Installation
  * @package  Installation
- * 
+ *
  * @author   Adrian Lang <mail@adrianlang.de>
  * @author   Brenda Wallace <shiny@cpan.org>
  * @author   Brett Taylor <brett@webfroot.co.nz>
@@ -33,7 +33,7 @@
  * @author   Tom Adams <tom@holizz.com>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
- 
+
 define('INSTALLDIR', dirname(__FILE__));
 
 $external_libraries=array(
@@ -211,10 +211,10 @@ $dbModules = array(
     ),
 );
 
-/** 
+/**
  * the actual installation.
  * If call libraries are present, then install
- * 
+ *
  * @return void
  */
 function main()
@@ -222,8 +222,8 @@ function main()
     if (!checkPrereqs()) {
         return;
     }
-    
-    if ($_GET['checklibs']) {
+
+    if (!empty($_GET['checklibs'])) {
         showLibs();
     } else {
         if ($_SERVER['REQUEST_METHOD'] == 'POST') {
@@ -243,7 +243,7 @@ function main()
  */
 function haveExternalLibrary($external_library)
 {
-    if (isset($external_library['include']) && ! include_once $external_library['include'] ) {
+    if (isset($external_library['include']) && ! @include_once $external_library['include'] ) {
         return false;
     }
     if (isset($external_library['check_function']) && ! function_exists($external_library['check_function'])) {
@@ -282,7 +282,7 @@ function checkPrereqs()
             printf('<p class="error">Cannot load required extension: <code>%s</code></p>', $req);
             $pass = false;
         }
-    }    
+    }
     // Make sure we have at least one database module available
     global $dbModules;
     $missingExtensions = array();
@@ -291,13 +291,13 @@ function checkPrereqs()
             $missingExtensions[] = $info['check_module'];
         }
     }
-    
+
     if (count($missingExtensions) == count($dbModules)) {
         $req = implode(', ', $missingExtensions);
-        printf('<p class="error">Cannot find mysql or pgsql extension. You need one or the other: <code>%s</code></p>', $req);
+        printf('<p class="error">Cannot find mysql or pgsql extension. You need one or the other.');
         $pass = false;
     }
-    
+
     if (!is_writable(INSTALLDIR)) {
         printf('<p class="error">Cannot write config file to: <code>%s</code></p>', INSTALLDIR);
         printf('<p>On your server, try this command: <code>chmod a+w %s</code>', INSTALLDIR);
@@ -365,19 +365,19 @@ function showLibs()
 E_O_T;
     foreach ($absent_libraries as $library) {
         echo '<li>';
-        if ($library['url']) {
+        if (isset($library['url'])) {
             echo '<a href=">'.$library['url'].'">'.htmlentities($library['name']).'</a>';
         } else {
             echo htmlentities($library['name']);
         }
         echo '<ul>';
-        if ($library['deb']) {
+        if (isset($library['deb'])) {
             echo '<li class="deb package">deb: <a href="apt:' . urlencode($library['deb']) . '">' . htmlentities($library['deb']) . '</a></li>';
         }
-        if ($library['rpm']) {
+        if (isset($library['rpm'])) {
             echo '<li class="rpm package">rpm: ' . htmlentities($library['rpm']) . '</li>';
         }
-        if ($library['pear']) {
+        if (isset($library['pear'])) {
             echo '<li class="pear package">pear: ' . htmlentities($library['pear']) . '</li>';
         }
         echo '</ul>';
@@ -552,7 +552,7 @@ STR;
     updateStatus("You can visit your <a href='$link'>new StatusNet site</a>.");
 }
 
-function Pgsql_Db_installer($host, $database, $username, $password) 
+function Pgsql_Db_installer($host, $database, $username, $password)
 {
     $connstring = "dbname=$database host=$host user=$username";
 
@@ -613,7 +613,7 @@ function Pgsql_Db_installer($host, $database, $username, $password)
     return $db;
 }
 
-function Mysql_Db_installer($host, $database, $username, $password) 
+function Mysql_Db_installer($host, $database, $username, $password)
 {
     updateStatus("Starting installation...");
     updateStatus("Checking database...");
@@ -690,7 +690,7 @@ function writeConf($sitename, $server, $path, $fancy, $db)
  * @param string $filename location of database schema file
  * @param dbconn $conn     connection to database
  * @param string $type     type of database, currently mysql or pgsql
- * 
+ *
  * @return boolean - indicating success or failure
  */
 function runDbScript($filename, $conn, $type = 'mysqli')
-- 
cgit v1.2.3-54-g00ecf


From e29046b3a121db6aa95f94d4114467d0e747c6a7 Mon Sep 17 00:00:00 2001
From: Zach Copley <zach@controlyourself.ca>
Date: Tue, 15 Sep 2009 16:46:18 -0700
Subject: Fixed broken list items in installer output

---
 install.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/install.php b/install.php
index a8f1ef4e2..54ae0cd5e 100644
--- a/install.php
+++ b/install.php
@@ -477,7 +477,11 @@ E_O_T;
 
 function updateStatus($status, $error=false)
 {
-    echo '<li ' . ($error) ? 'class="error"': '';
+    echo '<li';
+
+    if ($error) {
+	echo ' class="error"';
+    }
     echo ">$status</li>";
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 46ece1178ce87697e95e5c90daafced142486e56 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 21:12:44 -0400
Subject: check correct define (not backwards compatible)

---
 classes/Config.php         | 4 +++-
 classes/Deleted_notice.php | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/classes/Config.php b/classes/Config.php
index 5bec13fdc..92f237d7f 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -17,7 +17,9 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 /**
  * Table Definition for config
diff --git a/classes/Deleted_notice.php b/classes/Deleted_notice.php
index 474d0b6f4..64dc85da6 100644
--- a/classes/Deleted_notice.php
+++ b/classes/Deleted_notice.php
@@ -17,7 +17,9 @@
  * along with this program.     If not, see <http://www.gnu.org/licenses/>.
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('STATUSNET')) {
+    exit(1);
+}
 
 /**
  * Table Definition for notice
-- 
cgit v1.2.3-54-g00ecf


From d44bc16ee989af7f5ebbd6a40edcc7a4d90902a0 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 26 Mar 2009 15:26:19 -0400
Subject: Start a common library for HTTP client stuff

---
 lib/httputil.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 80 insertions(+)
 create mode 100644 lib/httputil.php

diff --git a/lib/httputil.php b/lib/httputil.php
new file mode 100644
index 000000000..5c1f4f3e1
--- /dev/null
+++ b/lib/httputil.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Utility for doing HTTP-related things
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Action
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Utility class for doing HTTP-related stuff
+ *
+ * We make HTTP calls in several places, and we have several different
+ * ways of doing them. This class hides the specifics of what underlying
+ * library (curl or PHP-HTTP or whatever) that's used.
+ *
+ * @category HTTP
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class HTTPResponse
+{
+    var $code = null;
+    var $headers = null;
+    var $body = null;
+}
+
+class HTTPClientUtil
+{
+    function __construct()
+    {
+    }
+
+    function head($url, $headers)
+    {
+    }
+
+    function get($url, $headers)
+    {
+    }
+
+    function post($url, $headers, $body)
+    {
+    }
+
+    function put($url, $headers, $body)
+    {
+    }
+
+    function delete($url, $headers)
+    {
+    }
+}
-- 
cgit v1.2.3-54-g00ecf


From 20dd0db7049209a5f43697d8bba8eadb63736bce Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 20:29:41 -0400
Subject: move httputil to httpclient

---
 lib/httpclient.php | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/httputil.php   | 80 ------------------------------------------------------
 2 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 lib/httpclient.php
 delete mode 100644 lib/httputil.php

diff --git a/lib/httpclient.php b/lib/httpclient.php
new file mode 100644
index 000000000..5c1f4f3e1
--- /dev/null
+++ b/lib/httpclient.php
@@ -0,0 +1,80 @@
+<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Utility for doing HTTP-related things
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  Action
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+/**
+ * Utility class for doing HTTP-related stuff
+ *
+ * We make HTTP calls in several places, and we have several different
+ * ways of doing them. This class hides the specifics of what underlying
+ * library (curl or PHP-HTTP or whatever) that's used.
+ *
+ * @category HTTP
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class HTTPResponse
+{
+    var $code = null;
+    var $headers = null;
+    var $body = null;
+}
+
+class HTTPClientUtil
+{
+    function __construct()
+    {
+    }
+
+    function head($url, $headers)
+    {
+    }
+
+    function get($url, $headers)
+    {
+    }
+
+    function post($url, $headers, $body)
+    {
+    }
+
+    function put($url, $headers, $body)
+    {
+    }
+
+    function delete($url, $headers)
+    {
+    }
+}
diff --git a/lib/httputil.php b/lib/httputil.php
deleted file mode 100644
index 5c1f4f3e1..000000000
--- a/lib/httputil.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php
-/**
- * Laconica, the distributed open-source microblogging tool
- *
- * Utility for doing HTTP-related things
- *
- * PHP version 5
- *
- * LICENCE: 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/>.
- *
- * @category  Action
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
- * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
- */
-
-if (!defined('LACONICA')) {
-    exit(1);
-}
-
-/**
- * Utility class for doing HTTP-related stuff
- *
- * We make HTTP calls in several places, and we have several different
- * ways of doing them. This class hides the specifics of what underlying
- * library (curl or PHP-HTTP or whatever) that's used.
- *
- * @category HTTP
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
- */
-
-class HTTPResponse
-{
-    var $code = null;
-    var $headers = null;
-    var $body = null;
-}
-
-class HTTPClientUtil
-{
-    function __construct()
-    {
-    }
-
-    function head($url, $headers)
-    {
-    }
-
-    function get($url, $headers)
-    {
-    }
-
-    function post($url, $headers, $body)
-    {
-    }
-
-    function put($url, $headers, $body)
-    {
-    }
-
-    function delete($url, $headers)
-    {
-    }
-}
-- 
cgit v1.2.3-54-g00ecf


From ae20d073ce8cb393417be6f05cdf54289ecd5bad Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 20:40:03 -0400
Subject: update httpclient class

---
 lib/httpclient.php | 43 ++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 40 insertions(+), 3 deletions(-)

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 5c1f4f3e1..145409f50 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -32,7 +32,7 @@ if (!defined('LACONICA')) {
 }
 
 /**
- * Utility class for doing HTTP-related stuff
+ * Useful structure for HTTP responses
  *
  * We make HTTP calls in several places, and we have several different
  * ways of doing them. This class hides the specifics of what underlying
@@ -52,29 +52,66 @@ class HTTPResponse
     var $body = null;
 }
 
-class HTTPClientUtil
+/**
+ * Utility class for doing HTTP client stuff
+ *
+ * We make HTTP calls in several places, and we have several different
+ * ways of doing them. This class hides the specifics of what underlying
+ * library (curl or PHP-HTTP or whatever) that's used.
+ *
+ * @category HTTP
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class HTTPClient
 {
-    function __construct()
+    static $_client = null;
+
+    static function start()
     {
+        if (!is_null(self::$_client)) {
+            return self::$_client;
+        }
+
+        $type = common_config('http', 'client');
+
+        switch ($type) {
+         case 'curl':
+            self::$_client = new CurlClient();
+            break;
+         default:
+            throw new Exception("Unknown HTTP client type '$type'");
+            break;
+        }
+
+        return self::$_client;
     }
 
     function head($url, $headers)
     {
+        throw new Exception("HEAD method unimplemented");
     }
 
     function get($url, $headers)
     {
+        throw new Exception("GET method unimplemented");
     }
 
     function post($url, $headers, $body)
     {
+        throw new Exception("POST method unimplemented");
     }
 
     function put($url, $headers, $body)
     {
+        throw new Exception("PUT method unimplemented");
     }
 
     function delete($url, $headers)
     {
+        throw new Exception("DELETE method unimplemented");
     }
 }
-- 
cgit v1.2.3-54-g00ecf


From 3380b49aecb773ebadfe4a8e563f75ce4855e1a2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 20:40:18 -0400
Subject: add http client config value

---
 lib/common.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/common.php b/lib/common.php
index 3b21b548c..194eb568f 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -284,6 +284,8 @@ $config =
         array('contentlimit' => null),
         'message' =>
         array('contentlimit' => null),
+        'http' =>
+        array('client' => 'curl'), // XXX: should this be the default?
         );
 
 $config['db'] = &PEAR::getStaticProperty('DB_DataObject','options');
-- 
cgit v1.2.3-54-g00ecf


From 99c74f2cc4b2a2c62d4188c862fec96caec44c06 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 21:22:15 -0400
Subject: statusize OpenID plugin

---
 plugins/OpenID/OpenIDPlugin.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/plugins/OpenID/OpenIDPlugin.php b/plugins/OpenID/OpenIDPlugin.php
index eb450fc5e..91bddf381 100644
--- a/plugins/OpenID/OpenIDPlugin.php
+++ b/plugins/OpenID/OpenIDPlugin.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * PHP version 5
  *
@@ -18,14 +18,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Plugin
- * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -36,10 +36,10 @@ if (!defined('LACONICA')) {
  * and identity system.
  *
  * @category Plugin
- * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  * @link     http://openid.net/
  */
 
-- 
cgit v1.2.3-54-g00ecf


From 8ceb4196f323295742fd1113ff014ebee9ad7ae3 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 21:22:47 -0400
Subject: add user agent and correct version check to httpclient

---
 lib/httpclient.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lib/httpclient.php b/lib/httpclient.php
index 145409f50..d606f5a6e 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -27,7 +27,7 @@
  * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET')) {
     exit(1);
 }
 
@@ -114,4 +114,9 @@ class HTTPClient
     {
         throw new Exception("DELETE method unimplemented");
     }
+
+    function userAgent()
+    {
+        return "StatusNet/".STATUSNET_VERSION." (".STATUSNET_CODENAME.")";
+    }
 }
-- 
cgit v1.2.3-54-g00ecf


From 9a9a0ae56f5ae65144e6da5014859b1e30044f8b Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 21:50:19 -0400
Subject: add cURL client with HEAD method

---
 lib/curlclient.php | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/httpclient.php |   6 +--
 2 files changed, 137 insertions(+), 3 deletions(-)
 create mode 100644 lib/curlclient.php

diff --git a/lib/curlclient.php b/lib/curlclient.php
new file mode 100644
index 000000000..e027102e3
--- /dev/null
+++ b/lib/curlclient.php
@@ -0,0 +1,134 @@
+n<?php
+/**
+ * Laconica, the distributed open-source microblogging tool
+ *
+ * Utility class for wrapping Curl
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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/>.
+ *
+ * @category  HTTP
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2009 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
+ */
+
+if (!defined('STATUSNET')) {
+    exit(1);
+}
+
+define(CURLCLIENT_VERSION, "0.1");
+
+/**
+ * Wrapper for Curl
+ *
+ * Makes Curl HTTP client calls within our HTTPClient framework
+ *
+ * @category HTTP
+ * @package  Laconica
+ * @author   Evan Prodromou <evan@status.net>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
+
+class CurlClient extends HTTPClient
+{
+    function __construct()
+    {
+    }
+
+    function head($url, $headers=null)
+    {
+        $ch = curl_init($url);
+
+        $this->setup($ch);
+
+        curl_setopt_array($ch,
+                          array(CURLOPT_NOBODY => true));
+
+        $result = curl_exec($ch);
+
+        return $this->parseResults($result);
+    }
+
+    function setup($ch)
+    {
+        curl_setopt_array($ch,
+                          array(CURLOPT_USERAGENT, $this->userAgent(),
+                                CURLOPT_HEADER => true,
+                                CURLOPT_RETURNTRANSFER => true,
+                                CURLOPT_HTTPHEADER => $headers));
+    }
+
+    function userAgent()
+    {
+        $version = curl_version();
+        return parent::userAgent() . " CurlClient/".CURLCLIENT_VERSION . " cURL/" . $version['version'];
+    }
+
+    function parseResults($results)
+    {
+        $resp = new HTTPResponse();
+
+        $lines = explode("\r\n", $results);
+
+        if (preg_match("#^HTTP/1.[01] (\d\d\d) .+$#", $lines[0], $match)) {
+            $resp->code = $match[1];
+        } else {
+            throw Exception("Bad format: initial line is not HTTP status line");
+        }
+
+        $lastk = null;
+
+        for ($i = 1; $i < count($lines); $i++) {
+            $l =& $lines[$i];
+            if (mb_strlen($l) == 0) {
+                $resp->body = implode("\r\n", array_slice($lines, $i + 1));
+                break;
+            }
+            if (preg_match("#^(\S+):\s+(.*)$#", $l, $match)) {
+                $k = $match[1];
+                $v = $match[2];
+
+                if (array_key_exists($k, $resp->headers)) {
+                    if (is_array($resp->headers[$k])) {
+                        $resp->headers[$k][] = $v;
+                    } else {
+                        $resp->headers[$k] = array($resp->headers[$k], $v);
+                    }
+                } else {
+                    $resp->headers[$k] = $v;
+                }
+                $lastk = $k;
+            } else if (preg_match("#^\s+(.*)$#", $l, $match)) {
+                // continuation line
+                if (is_null($lastk)) {
+                    throw Exception("Bad format: initial whitespace in headers");
+                }
+                $h =& $resp->headers[$lastk];
+                if (is_array($h)) {
+                    $n = count($h);
+                    $h[$n-1] .= $match[1];
+                } else {
+                    $h .= $match[1];
+                }
+            }
+        }
+
+        return $resp;
+    }
+}
diff --git a/lib/httpclient.php b/lib/httpclient.php
index d606f5a6e..9b0bb6f3a 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -47,9 +47,9 @@ if (!defined('STATUSNET')) {
 
 class HTTPResponse
 {
-    var $code = null;
-    var $headers = null;
-    var $body = null;
+    public $code = null;
+    public $headers = null;
+    public $body = null;
 }
 
 /**
-- 
cgit v1.2.3-54-g00ecf


From 6b7f09eba675679d5ea84ed33e85fa9d5c62a30d Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 21:55:36 -0400
Subject: add get to curl client

---
 lib/curlclient.php | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/lib/curlclient.php b/lib/curlclient.php
index e027102e3..f45c3c2f4 100644
--- a/lib/curlclient.php
+++ b/lib/curlclient.php
@@ -60,8 +60,31 @@ class CurlClient extends HTTPClient
         curl_setopt_array($ch,
                           array(CURLOPT_NOBODY => true));
 
+        if (!is_null($headers)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        }
+
+        $result = curl_exec($ch);
+
+        curl_close($ch);
+
+        return $this->parseResults($result);
+    }
+
+    function get($url, $headers=null)
+    {
+        $ch = curl_init($url);
+
+        $this->setup($ch);
+
+        if (!is_null($headers)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        }
+
         $result = curl_exec($ch);
 
+        curl_close($ch);
+
         return $this->parseResults($result);
     }
 
@@ -70,8 +93,7 @@ class CurlClient extends HTTPClient
         curl_setopt_array($ch,
                           array(CURLOPT_USERAGENT, $this->userAgent(),
                                 CURLOPT_HEADER => true,
-                                CURLOPT_RETURNTRANSFER => true,
-                                CURLOPT_HTTPHEADER => $headers));
+                                CURLOPT_RETURNTRANSFER => true));
     }
 
     function userAgent()
-- 
cgit v1.2.3-54-g00ecf


From f8a8c14b550a3ac3a4b3a17c53559056f70409b2 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 22:05:57 -0400
Subject: fix user-agent for curlclient

---
 lib/curlclient.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/curlclient.php b/lib/curlclient.php
index f45c3c2f4..99c3b6aa4 100644
--- a/lib/curlclient.php
+++ b/lib/curlclient.php
@@ -88,10 +88,14 @@ class CurlClient extends HTTPClient
         return $this->parseResults($result);
     }
 
+    function post($url, $headers=null)
+    {
+    }
+
     function setup($ch)
     {
         curl_setopt_array($ch,
-                          array(CURLOPT_USERAGENT, $this->userAgent(),
+                          array(CURLOPT_USERAGENT => $this->userAgent(),
                                 CURLOPT_HEADER => true,
                                 CURLOPT_RETURNTRANSFER => true));
     }
-- 
cgit v1.2.3-54-g00ecf


From 2f97531a49c042a0a900edb31f067a3c9f32967f Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 22:14:15 -0400
Subject: add post to curlclient

---
 lib/curlclient.php | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/lib/curlclient.php b/lib/curlclient.php
index 99c3b6aa4..c43bfb57f 100644
--- a/lib/curlclient.php
+++ b/lib/curlclient.php
@@ -88,8 +88,27 @@ class CurlClient extends HTTPClient
         return $this->parseResults($result);
     }
 
-    function post($url, $headers=null)
+    function post($url, $headers=null, $body=null)
     {
+        $ch = curl_init($url);
+
+        $this->setup($ch);
+
+        curl_setopt($ch, CURLOPT_POST, true);
+
+        if (!is_null($body)) {
+            curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
+        }
+
+        if (!is_null($headers)) {
+            curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+        }
+
+        $result = curl_exec($ch);
+
+        curl_close($ch);
+
+        return $this->parseResults($result);
     }
 
     function setup($ch)
-- 
cgit v1.2.3-54-g00ecf


From 6f531745ca21e7b5460be90890c55b1934a45f15 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 22:28:59 -0400
Subject: change all evans to evan@status.net

---
 actions/all.php                   | 6 +++---
 actions/api.php                   | 6 +++---
 actions/finishremotesubscribe.php | 2 +-
 actions/updateprofile.php         | 2 +-
 index.php                         | 6 +++---
 install.php                       | 2 +-
 lib/httpclient.php                | 6 +++---
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index e56e10c21..5ffc7e9bd 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -18,15 +18,15 @@
  * 
  * @category Actions
  * @package  Actions
- * @author   Evan Prodromou <evan@prodromou.name>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Adrian Lang <mail@adrianlang.de>
  * @author   Meitar Moscovitz <meitarm@gmail.com>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@controlyourself.ca>
diff --git a/actions/api.php b/actions/api.php
index 9b5f54807..06fdbfb44 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -18,8 +18,8 @@
  * 
  * @category Actions
  * @package  Actions
- * @author   Evan Prodromou <evan@controlyourself.ca>
- * @author   Evan Prodromou <evan@prodromou.name>
+ * @author   Evan Prodromou <evan@status.net>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Brenda Wallace <shiny@cpan.org>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Robin Millette <millette@controlyourself.ca>
@@ -27,7 +27,7 @@
  * @author   Christopher Vollick <psycotica0@gmail.com>
  * @author   CiaranG <ciaran@ciarang.com>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@controlezvous.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Gina Haeussge <osd@foosel.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
diff --git a/actions/finishremotesubscribe.php b/actions/finishremotesubscribe.php
index 44abbfceb..5f6807d10 100644
--- a/actions/finishremotesubscribe.php
+++ b/actions/finishremotesubscribe.php
@@ -41,7 +41,7 @@ require_once INSTALLDIR.'/lib/omb.php';
  *
  * @category Action
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
diff --git a/actions/updateprofile.php b/actions/updateprofile.php
index 7f7dd75fe..d9cc7f7f3 100644
--- a/actions/updateprofile.php
+++ b/actions/updateprofile.php
@@ -38,7 +38,7 @@ require_once INSTALLDIR.'/extlib/libomb/service_provider.php';
  *
  * @category Action
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @license  http://www.fsf.org/licensing/licenses/agpl.html AGPLv3
  * @link     http://laconi.ca/
diff --git a/index.php b/index.php
index a1d983dce..4e6c09379 100644
--- a/index.php
+++ b/index.php
@@ -23,9 +23,9 @@
  * @author Christopher Vollick <psycotica0@gmail.com> 
  * @author CiaranG <ciaran@ciarang.com>
  * @author Craig Andrews <candrews@integralblue.com> 
- * @author Evan Prodromou <evan@controlezvous.ca>
- * @author Evan Prodromou <evan@controlyourself.ca> 
- * @author Evan Prodromou <evan@prodromou.name>
+ * @author Evan Prodromou <evan@status.net>
+ * @author Evan Prodromou <evan@status.net> 
+ * @author Evan Prodromou <evan@status.net>
  * @author Evan Prodromou <evan@status.net>
  * @author Gina Haeussge <osd@foosel.net> 
  * @author Jeffery To <jeffery.to@gmail.com>
diff --git a/install.php b/install.php
index 54ae0cd5e..24ad3eb24 100644
--- a/install.php
+++ b/install.php
@@ -26,7 +26,7 @@
  * @author   CiaranG <ciaran@ciarang.com>
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Eric Helgeson <helfire@Erics-MBP.local>
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
diff --git a/lib/httpclient.php b/lib/httpclient.php
index 9b0bb6f3a..005971153 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -21,7 +21,7 @@
  *
  * @category  Action
  * @package   Laconica
- * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
@@ -40,7 +40,7 @@ if (!defined('STATUSNET')) {
  *
  * @category HTTP
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  */
@@ -61,7 +61,7 @@ class HTTPResponse
  *
  * @category HTTP
  * @package  Laconica
- * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  */
-- 
cgit v1.2.3-54-g00ecf


From 1618d515e6d96c8c0458295282de89dfae790e00 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 22:30:52 -0400
Subject: dedupe evans

---
 actions/all.php |  9 +++------
 actions/api.php | 15 ++++++---------
 index.php       | 21 +++++++++------------
 install.php     |  1 -
 4 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 5ffc7e9bd..22da3cd68 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -15,19 +15,16 @@
  *
  * 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/>.
- * 
+ *
  * @category Actions
  * @package  Actions
  * @author   Evan Prodromou <evan@status.net>
- * @author   Evan Prodromou <evan@status.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Adrian Lang <mail@adrianlang.de>
  * @author   Meitar Moscovitz <meitarm@gmail.com>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@status.net>
- * @author   Evan Prodromou <evan@status.net>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@controlyourself.ca>
  * @author   csarven <csarven@controlyourself.ca>
@@ -35,8 +32,8 @@
  * @link     http://status.net
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { 
-    exit(1); 
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
 }
 
 require_once INSTALLDIR.'/lib/personalgroupnav.php';
diff --git a/actions/api.php b/actions/api.php
index 06fdbfb44..243ae4c62 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -15,11 +15,10 @@
  *
  * 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/>.
- * 
+ *
  * @category Actions
  * @package  Actions
  * @author   Evan Prodromou <evan@status.net>
- * @author   Evan Prodromou <evan@status.net>
  * @author   Brenda Wallace <shiny@cpan.org>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Robin Millette <millette@controlyourself.ca>
@@ -27,8 +26,6 @@
  * @author   Christopher Vollick <psycotica0@gmail.com>
  * @author   CiaranG <ciaran@ciarang.com>
  * @author   Craig Andrews <candrews@integralblue.com>
- * @author   Evan Prodromou <evan@status.net>
- * @author   Evan Prodromou <evan@status.net>
  * @author   Gina Haeussge <osd@foosel.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
@@ -36,8 +33,8 @@
  * @link     http://status.net
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) { 
-    exit(1); 
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
 }
 
 class ApiAction extends Action
@@ -205,9 +202,9 @@ class ApiAction extends Action
             $user_id     = $this->arg('user_id');
             $screen_name = $this->arg('screen_name');
 
-            if (empty($this->api_arg) 
-                && empty($id)            
-                && empty($user_id)       
+            if (empty($this->api_arg)
+                && empty($id)
+                && empty($user_id)
                 && empty($screen_name)
             ) {
                 return true;
diff --git a/index.php b/index.php
index 4e6c09379..fb3758590 100644
--- a/index.php
+++ b/index.php
@@ -15,23 +15,20 @@
  *
  * 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/>.
- * 
+ *
  * @category StatusNet
  * @package  StatusNet
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
- * @author Brenda Wallace <shiny@cpan.org> 
- * @author Christopher Vollick <psycotica0@gmail.com> 
+ * @author Brenda Wallace <shiny@cpan.org>
+ * @author Christopher Vollick <psycotica0@gmail.com>
  * @author CiaranG <ciaran@ciarang.com>
- * @author Craig Andrews <candrews@integralblue.com> 
- * @author Evan Prodromou <evan@status.net>
- * @author Evan Prodromou <evan@status.net> 
- * @author Evan Prodromou <evan@status.net>
+ * @author Craig Andrews <candrews@integralblue.com>
  * @author Evan Prodromou <evan@status.net>
- * @author Gina Haeussge <osd@foosel.net> 
+ * @author Gina Haeussge <osd@foosel.net>
  * @author Jeffery To <jeffery.to@gmail.com>
  * @author Mike Cochrane <mikec@mikenz.geek.nz>
  * @author Robin Millette <millette@controlyourself.ca>
- * @author Sarven Capadisli <csarven@controlyourself.ca> 
+ * @author Sarven Capadisli <csarven@controlyourself.ca>
  * @author Tom Adams <tom@holizz.com>
  */
 
@@ -74,7 +71,7 @@ function handleError($error)
             common_log(LOG_ERR, $line);
         }
     }
-    if ($error instanceof DB_DataObject_Error 
+    if ($error instanceof DB_DataObject_Error
         || $error instanceof DB_Error
     ) {
         $msg = sprintf(
@@ -227,8 +224,8 @@ function main()
     // If the site is private, and they're not on one of the "public"
     // parts of the site, redirect to login
 
-    if (!$user && common_config('site', 'private') 
-        && !isLoginAction($action) 
+    if (!$user && common_config('site', 'private')
+        && !isLoginAction($action)
         && !preg_match('/rss$/', $action)
     ) {
         common_redirect(common_local_url('login'));
diff --git a/install.php b/install.php
index 24ad3eb24..4398757de 100644
--- a/install.php
+++ b/install.php
@@ -27,7 +27,6 @@
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Eric Helgeson <helfire@Erics-MBP.local>
  * @author   Evan Prodromou <evan@status.net>
- * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Sarven Capadisli <csarven@controlyourself.ca>
  * @author   Tom Adams <tom@holizz.com>
-- 
cgit v1.2.3-54-g00ecf


From 15a2b69777479f1544a681ed1bff76aa066cf95c Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@status.net>
Date: Tue, 15 Sep 2009 22:31:52 -0400
Subject: statusize new HTTP classes

---
 lib/curlclient.php | 10 +++++-----
 lib/httpclient.php | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/curlclient.php b/lib/curlclient.php
index c43bfb57f..36fc7d157 100644
--- a/lib/curlclient.php
+++ b/lib/curlclient.php
@@ -1,6 +1,6 @@
 n<?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Utility class for wrapping Curl
  *
@@ -20,11 +20,11 @@ n<?php
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  HTTP
- * @package   Laconica
+ * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('STATUSNET')) {
@@ -39,10 +39,10 @@ define(CURLCLIENT_VERSION, "0.1");
  * Makes Curl HTTP client calls within our HTTPClient framework
  *
  * @category HTTP
- * @package  Laconica
+ * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class CurlClient extends HTTPClient
diff --git a/lib/httpclient.php b/lib/httpclient.php
index 005971153..c8c8ae5b2 100644
--- a/lib/httpclient.php
+++ b/lib/httpclient.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Utility for doing HTTP-related things
  *
@@ -20,11 +20,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Action
- * @package   Laconica
+ * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
- * @copyright 2009 Control Yourself, Inc.
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 if (!defined('STATUSNET')) {
@@ -39,10 +39,10 @@ if (!defined('STATUSNET')) {
  * library (curl or PHP-HTTP or whatever) that's used.
  *
  * @category HTTP
- * @package  Laconica
+ * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class HTTPResponse
@@ -60,10 +60,10 @@ class HTTPResponse
  * library (curl or PHP-HTTP or whatever) that's used.
  *
  * @category HTTP
- * @package  Laconica
+ * @package  StatusNet
  * @author   Evan Prodromou <evan@status.net>
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link     http://laconi.ca/
+ * @link     http://status.net/
  */
 
 class HTTPClient
-- 
cgit v1.2.3-54-g00ecf


From 83b09164573ede90d87a7038a56f651a5f82b9f1 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 16 Sep 2009 11:14:26 +0200
Subject: Updated csarven emails to csarven@status.net and removed dupes

---
 actions/all.php  | 3 +--
 actions/api.php  | 2 +-
 index.php        | 2 +-
 install.php      | 2 +-
 theme/readme.txt | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/actions/all.php b/actions/all.php
index 22da3cd68..f1786462e 100644
--- a/actions/all.php
+++ b/actions/all.php
@@ -23,11 +23,10 @@
  * @author   Robin Millette <millette@controlyourself.ca>
  * @author   Adrian Lang <mail@adrianlang.de>
  * @author   Meitar Moscovitz <meitarm@gmail.com>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Jeffery To <jeffery.to@gmail.com>
  * @author   Zach Copley <zach@controlyourself.ca>
- * @author   csarven <csarven@controlyourself.ca>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  * @link     http://status.net
  */
diff --git a/actions/api.php b/actions/api.php
index 243ae4c62..d570bb017 100644
--- a/actions/api.php
+++ b/actions/api.php
@@ -28,7 +28,7 @@
  * @author   Craig Andrews <candrews@integralblue.com>
  * @author   Gina Haeussge <osd@foosel.net>
  * @author   Mike Cochrane <mikec@mikenz.geek.nz>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  * @link     http://status.net
  */
diff --git a/index.php b/index.php
index fb3758590..d5174c2b7 100644
--- a/index.php
+++ b/index.php
@@ -28,7 +28,7 @@
  * @author Jeffery To <jeffery.to@gmail.com>
  * @author Mike Cochrane <mikec@mikenz.geek.nz>
  * @author Robin Millette <millette@controlyourself.ca>
- * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@status.net>
  * @author Tom Adams <tom@holizz.com>
  */
 
diff --git a/install.php b/install.php
index 4398757de..81241315e 100644
--- a/install.php
+++ b/install.php
@@ -28,7 +28,7 @@
  * @author   Eric Helgeson <helfire@Erics-MBP.local>
  * @author   Evan Prodromou <evan@status.net>
  * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Sarven Capadisli <csarven@controlyourself.ca>
+ * @author   Sarven Capadisli <csarven@status.net>
  * @author   Tom Adams <tom@holizz.com>
  * @license  GNU Affero General Public License http://www.gnu.org/licenses/
  */
diff --git a/theme/readme.txt b/theme/readme.txt
index 151b1fb71..d030f2db4 100644
--- a/theme/readme.txt
+++ b/theme/readme.txt
@@ -1,7 +1,7 @@
 /** Howto: create a statusnet theme
  *
  * @package   StatusNet
- * @author Sarven Capadisli <csarven@controlyourself.ca>
+ * @author Sarven Capadisli <csarven@status.net>
  * @copyright 2009 Control Yourself, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link      http://laconi.ca/
-- 
cgit v1.2.3-54-g00ecf