Merge branch 'locshunt' into 0.9.x

[quix0rs-gnu-social.git] / actions / othersettings.php

diff --git a/actions/othersettings.php b/actions/othersettings.php
index b542233ca79ee72dc5bde18531822288c572f4ac..0de7cd90860b1a7cc26198a4e033c5820bb4ef5a 100644 (file)
--- a/actions/othersettings.php
+++ b/actions/othersettings.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Laconica, the distributed open-source microblogging tool
+ * StatusNet, the distributed open-source microblogging tool
  *
  * Miscellaneous settings
  *
@@ -20,15 +20,15 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * @category  Settings
- * @package   Laconica
- * @author    Robin Millette <millette@controlyourself.ca>
- * @author    Evan Prodromou <evan@controlyourself.ca>
- * @copyright 2008-2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author    Robin Millette <millette@status.net>
+ * @author    Evan Prodromou <evan@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://laconi.ca/
+ * @link      http://status.net/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
@@ -40,11 +40,11 @@ require_once INSTALLDIR.'/lib/accountsettingsaction.php';
  * Currently this just manages URL shortening.
  *
  * @category Settings
- * @package  Laconica
- * @author   Robin Millette <millette@controlyourself.ca>
- * @author   Zach Copley <zach@controlyourself.ca>
+ * @package  StatusNet
+ * @author   Robin Millette <millette@status.net>
+ * @author   Zach Copley <zach@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 OthersettingsAction extends AccountSettingsAction
@@ -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
      *
@@ -83,35 +89,38 @@ class OthersettingsAction extends AccountSettingsAction
     {
         $user = common_current_user();
 
-
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'form_settings_other',
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('othersettings')));
         $this->elementStart('fieldset');
-        $this->element('legend', null, _('URL Auto-shortening'));
         $this->hidden('token', common_session_token());
-
-        // I18N
-
-        $services = array(
-                          '' => 'None',
-                          'ur1.ca' => 'ur1.ca (free service)',
-                          '2tu.us' => '2tu.us (free service)',
-                          'ptiturl.com' => 'ptiturl.com',
-                          'bit.ly' => 'bit.ly',
-                          'tinyurl.com' => 'tinyurl.com',
-                          'is.gd' => 'is.gd',
-                          'snipr.com' => 'snipr.com',
-                          'metamark.net' => 'metamark.net'
-                          );
-
         $this->elementStart('ul', 'form_data');
+
+        $shorteners = array();
+        Event::handle('GetUrlShorteners', array(&$shorteners));
+        $services = array();
+        foreach($shorteners as $name=>$value)
+        {
+            $services[$name]=$name;
+            if($value['freeService']){
+                $services[$name].=_(' (free service)');
+            }
+        }
+        if($services)
+        {
+            asort($services);
+
+            $this->elementStart('li');
+            $this->dropdown('urlshorteningservice', _('Shorten URLs with'),
+                            $services, _('Automatic shortening service to use.'),
+                            false, $user->urlshorteningservice);
+            $this->elementEnd('li');
+        }
         $this->elementStart('li');
-        $this->dropdown('urlshorteningservice', _('Service'),
-                        $services, _('Automatic shortening service to use.'),
-                        false, $user->urlshorteningservice);
+        $this->checkbox('viewdesigns', _('View profile designs'),
+                        $user->viewdesigns, _('Show or hide profile designs.'));
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->submit('save', _('Save'));
@@ -145,6 +154,8 @@ class OthersettingsAction extends AccountSettingsAction
             return;
         }
 
+        $viewdesigns = $this->boolean('viewdesigns');
+
         $user = common_current_user();
 
         assert(!is_null($user)); // should already be checked
@@ -154,6 +165,7 @@ class OthersettingsAction extends AccountSettingsAction
         $original = clone($user);
 
         $user->urlshorteningservice = $urlshorteningservice;
+        $user->viewdesigns          = $viewdesigns;
 
         $result = $user->update($original);