Merge commit 'mainline/0.9.x' into 0.9.x

3 files changed, 82 insertions, 5 deletions

diff --git a/actions/bookmarklet.php b/actions/bookmarklet.php
new file mode 100644
index 000000000..0603a7456
--- /dev/null
+++ b/actions/bookmarklet.php
@@ -0,0 +1,75 @@
+<?php
+/**
+ * StatusNet, the distributed open-source microblogging tool
+ *
+ * Handler for posting new notices
+ *
+ * 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  Bookmarklet
+ * @package   StatusNet
+ * @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/
+ */
+
+if (!defined('STATUSNET') && !defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR . '/actions/newnotice.php';
+
+/**
+ * Action for posting a notice 
+ *
+ * @category Bookmarklet
+ * @package  StatusNet
+ * @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/
+ */
+
+class BookmarkletAction extends NewnoticeAction
+{
+    function showTitle()
+    {
+        $this->element('title', null, _('Post to ').common_config('site', 'name'));
+    }
+
+    function showHeader()
+    {
+        $this->elementStart('div', array('id' => 'header'));
+        $this->elementStart('address');
+        $this->element('a', array('class' => 'url',
+                                  'href' => common_local_url('public')),
+                         '');
+        $this->elementEnd('address');
+        if (common_logged_in()) {
+            $this->showNoticeForm();
+        }
+        $this->elementEnd('div');
+    }
+
+    function showCore()
+    {
+    }
+
+    function showFooter()
+    {
+    }
+}
+
diff --git a/actions/othersettings.php b/actions/othersettings.php
index 011b4fc83..d32a2d651 100644
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -103,7 +103,7 @@ class OthersettingsAction extends AccountSettingsAction
             foreach($_shorteners as $name=>$value)
             {
                 $services[$name]=$name;
-                if($value['info']['freeService']){
+                if(!empty($value['info']['freeService'])){
                     // I18N
                     $services[$name].=' (free service)';
                 }
diff --git a/actions/showstream.php b/actions/showstream.php
index b3a9b1f05..de7100b1d 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -348,6 +348,8 @@ class ShowstreamAction extends ProfileAction
     {
         if (Event::handle('StartProfilePageActionsSection', array(&$this, $this->profile))) {
 
+            $cur = common_current_user();
+
             $this->elementStart('div', 'entity_actions');
             $this->element('h2', null, _('User actions'));
             $this->elementStart('ul');
@@ -379,21 +381,21 @@ class ShowstreamAction extends ProfileAction
                         }
                         $this->elementEnd('li');
 
-                        if ($cur->mutuallySubscribed($user)) {
+                        if ($cur->mutuallySubscribed($this->user)) {
 
                             // message
 
                             $this->elementStart('li', 'entity_send-a-message');
-                            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $user->id)),
+                            $this->element('a', array('href' => common_local_url('newmessage', array('to' => $this->user->id)),
                                                       'title' => _('Send a direct message to this user')),
                                            _('Message'));
                             $this->elementEnd('li');
 
                             // nudge
 
-                            if ($user->email && $user->emailnotifynudge) {
+                            if ($this->user->email && $this->user->emailnotifynudge) {
                                 $this->elementStart('li', 'entity_nudge');
-                                $nf = new NudgeForm($this, $user);
+                                $nf = new NudgeForm($this, $this->user);
                                 $nf->show();
                                 $this->elementEnd('li');
                             }