Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

12 files changed, 28 insertions, 19 deletions

diff --git a/actions/apidirectmessagenew.php b/actions/apidirectmessagenew.php
index fed6acc30..e6c39ce4a 100644
--- a/actions/apidirectmessagenew.php
+++ b/actions/apidirectmessagenew.php
@@ -79,7 +79,7 @@ class ApiDirectMessageNewAction extends ApiAuthAction
         $this->source = $this->trimmed('source'); // Not supported by Twitter.
 
         $reserved_sources = array('web', 'omb', 'mail', 'xmpp', 'api');
-        if (empty($thtis->source) || in_array($this->source, $reserved_sources)) {
+        if (empty($this->source) || in_array($this->source, $reserved_sources)) {
             $source = 'api';
         }
 
diff --git a/actions/apigroupshow.php b/actions/apigroupshow.php
index f9b960747..aae4d249c 100644
--- a/actions/apigroupshow.php
+++ b/actions/apigroupshow.php
@@ -96,7 +96,7 @@ class ApiGroupShowAction extends ApiPrivateAuthAction
 
         switch($this->format) {
         case 'xml':
-            $this->show_single_xml_group($this->group);
+            $this->showSingleXmlGroup($this->group);
             break;
         case 'json':
             $this->showSingleJsonGroup($this->group);
diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 4395f772b..3bb8e3bb9 100644
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -170,7 +170,7 @@ class PasswordsettingsAction extends AccountSettingsAction
         }
 
         $success = false;
-        if(! Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){
+        if(Event::handle('StartChangePassword', array($user, $oldpassword, $newpassword))){
             //no handler changed the password, so change the password internally
             $original = clone($user);
 
diff --git a/db/notice_source.sql b/db/notice_source.sql
index 10ff0d55a..50660e948 100644
--- a/db/notice_source.sql
+++ b/db/notice_source.sql
@@ -11,6 +11,7 @@ VALUES
     ('cliqset', 'Cliqset', 'http://www.cliqset.com/', now()),
     ('deskbar','Deskbar-Applet','http://www.gnome.org/projects/deskbar-applet/', now()),
     ('Do','Gnome Do','http://do.davebsd.com/wiki/index.php?title=Microblog_Plugin', now()),
+    ('drupal','Drupal','http://drupal.org/', now()),
     ('eventbox','EventBox','http://thecosmicmachine.com/eventbox/ ', now()),
     ('Facebook','Facebook','http://apps.facebook.com/identica/', now()),
     ('feed2omb','feed2omb','http://projects.ciarang.com/p/feed2omb/', now()),
diff --git a/lib/api.php b/lib/api.php
index 539aac4af..e2ea87b43 100644
--- a/lib/api.php
+++ b/lib/api.php
@@ -1142,10 +1142,15 @@ class ApiAction extends Action
 
     function getTargetUser($id)
     {
-        if (!preg_match('/^[a-zA-Z0-9]+$/', $id)) {
+        if (empty($id)) {
 
             // Twitter supports these other ways of passing the user ID
-            if ($this->arg('user_id')) {
+            if (is_numeric($this->arg('id'))) {
+                return User::staticGet($this->arg('id'));
+            } else if ($this->arg('id')) {
+                $nickname = common_canonical_nickname($this->arg('id'));
+                return User::staticGet('nickname', $nickname);
+            } else if ($this->arg('user_id')) {
                 // This is to ensure that a non-numeric user_id still
                 // overrides screen_name even if it doesn't get used
                 if (is_numeric($this->arg('user_id'))) {
@@ -1154,12 +1159,6 @@ class ApiAction extends Action
             } else if ($this->arg('screen_name')) {
                 $nickname = common_canonical_nickname($this->arg('screen_name'));
                 return User::staticGet('nickname', $nickname);
-
-            } else if (is_numeric($this->arg('id'))) {
-                return User::staticGet($this->arg('id'));
-            } else if ($this->arg('id')) {
-                $nickname = common_canonical_nickname($this->arg('id'));
-                return User::staticGet('nickname', $nickname);
             } else {
                 // Fall back to trying the currently authenticated user
                 return $this->auth_user;
diff --git a/lib/default.php b/lib/default.php
index 95366e0b3..d4ef045ea 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -226,4 +226,6 @@ $default =
         array('contentlimit' => null),
         'location' =>
         array('namespace' => 1), // 1 = geonames, 2 = Yahoo Where on Earth
+        'omb' =>
+        array('timeout' => 5), // HTTP request timeout in seconds when contacting remote hosts for OMB updates
         );
diff --git a/lib/omb.php b/lib/omb.php
index e2a6d9f3f..0f38a4936 100644
--- a/lib/omb.php
+++ b/lib/omb.php
@@ -167,6 +167,7 @@ class StatusNet_OMB_Service_Consumer extends OMB_Service_Consumer {
         $this->datastore      = omb_oauth_datastore();
         $this->oauth_consumer = omb_oauth_consumer();
         $this->fetcher        = Auth_Yadis_Yadis::getHTTPFetcher();
+        $this->fetcher->timeout = intval(common_config('omb', 'timeout'));
     }
 
 }
diff --git a/lib/router.php b/lib/router.php
index beb98eb04..1a090861e 100644
--- a/lib/router.php
+++ b/lib/router.php
@@ -358,6 +358,10 @@ class Router
 
             // users
 
+            $m->connect('api/users/show.:format',
+                        array('action' => 'ApiUserShow',
+                              'format' => '(xml|json)'));
+
             $m->connect('api/users/show/:id.:format',
                         array('action' => 'ApiUserShow',
                               'id' => '[a-zA-Z0-9]+',
diff --git a/locale/Makefile b/locale/Makefile
index 4f17f683f..00700ada1 100644
--- a/locale/Makefile
+++ b/locale/Makefile
@@ -2,10 +2,12 @@
 
 all : translations
 
-translations : */LC_MESSAGES/statusnet.mo
+trans = $(patsubst %.po,%.mo,$(wildcard */LC_MESSAGES/statusnet.po))
+
+translations : $(trans)
 
 clean :
-	rm -f */LC_MESSAGES/statusnet.mo
+	rm -f $(trans)
 
 %.mo : %.po
 	msgfmt -o $@ $<
diff --git a/theme/readme.txt b/theme/README
index d030f2db4..266a89fdf 100644
--- a/theme/readme.txt
+++ b/theme/README
@@ -1,10 +1,10 @@
-/** Howto: create a statusnet theme
+/** Howto: create a StatusNet theme
  *
  * @package   StatusNet
- * @author Sarven Capadisli <csarven@status.net>
- * @copyright 2009 Control Yourself, Inc.
+ * @author    Sarven Capadisli <csarven@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/
  */
 
 Location of key paths and files under theme/:
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index c29bff5b0..5ac04860c 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -182,7 +182,7 @@ border-color:transparent;
 background-color:#FFFFFF;
 }
 
-#site_nav_local_views li {
+#site_nav_local_views li.current {
 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);
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index cbad76fc5..768a11fb8 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -182,7 +182,7 @@ border-color:transparent;
 background-color:#FFFFFF;
 }
 
-#site_nav_local_views li {
+#site_nav_local_views li.current {
 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);