Merge branch 'nightly' into 'nightly'

[quix0rs-gnu-social.git] / plugins / ClientSideShorten / ClientSideShortenPlugin.php

diff --git a/plugins/ClientSideShorten/ClientSideShortenPlugin.php b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
index 57f5ad89e0f0a5392d145788baa3514ca9f9ef12..4d87ab22404f905e30b2b5753bd99caf074a86eb 100644 (file)
--- a/plugins/ClientSideShorten/ClientSideShortenPlugin.php
+++ b/plugins/ClientSideShorten/ClientSideShortenPlugin.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php');
-
 class ClientSideShortenPlugin extends Plugin
 {
     function __construct()
@@ -40,20 +38,12 @@ class ClientSideShortenPlugin extends Plugin
         parent::__construct();
     }
 
-    function onAutoload($cls)
-    {
-        switch ($cls)
-        {
-         case 'ShortenAction':
-            require_once(INSTALLDIR.'/plugins/ClientSideShorten/shorten.php');
-            return false;
-        }
-    }
-
     function onEndShowScripts($action){
-        $action->inlineScript('var Notice_maxContent = ' . Notice::maxContent());
         if (common_logged_in()) {
-            $action->script('plugins/ClientSideShorten/shorten.js');
+            $user = common_current_user();
+            $action->inlineScript('var maxNoticeLength = ' . User_urlshortener_prefs::maxNoticeLength($user));
+            $action->inlineScript('var maxUrlLength = ' . User_urlshortener_prefs::maxUrlLength($user));
+            $action->script($this->path('shorten.js'));
         }
     }
 
@@ -64,16 +54,15 @@ class ClientSideShortenPlugin extends Plugin
         }
     }
 
-    function onPluginVersion(&$versions)
+    function onPluginVersion(array &$versions)
     {
         $versions[] = array('name' => 'Shorten',
-                            'version' => STATUSNET_VERSION,
+                            'version' => GNUSOCIAL_VERSION,
                             'author' => 'Craig Andrews',
                             'homepage' => 'http://status.net/wiki/Plugin:ClientSideShorten',
                             'rawdescription' =>
-                            _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten urls as they entered, and before the notice is submitted.'));
+                            // TRANS: Plugin description.
+                            _m('ClientSideShorten causes the web interface\'s notice form to automatically shorten URLs as they entered, and before the notice is submitted.'));
         return true;
     }
-
 }
-