Merge branch 'fix-author-fallback' into 'nightly'

[quix0rs-gnu-social.git] / plugins / Orbited / OrbitedPlugin.php

diff --git a/plugins/Orbited/OrbitedPlugin.php b/plugins/Orbited/OrbitedPlugin.php
index cf6e5de1392dfe5d01c773c51be5b0acd19cdd91..e007eebe7ef1bd3ec064ea482c6b4d6e5ec26687 100644 (file)
--- a/plugins/Orbited/OrbitedPlugin.php
+++ b/plugins/Orbited/OrbitedPlugin.php
@@ -27,7 +27,7 @@
  * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) {
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) {
     exit(1);
 }
 
@@ -45,47 +45,69 @@ require_once INSTALLDIR.'/plugins/Realtime/RealtimePlugin.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://laconi.ca/
  */
-
 class OrbitedPlugin extends RealtimePlugin
 {
     public $webserver   = null;
     public $webport     = null;
     public $channelbase = null;
     public $stompserver = null;
+    public $stompport   = null;
     public $username    = null;
     public $password    = null;
+    public $webuser     = null;
+    public $webpass     = null;
 
     protected $con      = null;
 
+    function onStartShowHeadElements($action)
+    {
+        // See http://orbited.org/wiki/Deployment#Cross-SubdomainDeployment
+        $action->element('script', null, ' document.domain = document.domain; ');
+    }
+
     function _getScripts()
     {
         $scripts = parent::_getScripts();
-        $root = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport);
+
+        $port = (is_null($this->webport)) ? 8000 : $this->webport;
+
+        $server = (is_null($this->webserver)) ? common_config('site', 'server') : $this->webserver;
+
+        $root = 'http://'.$server.(($port == 80) ? '':':'.$port);
+
         $scripts[] = $root.'/static/Orbited.js';
+        $scripts[] = $this->path('js/orbitedextra.js');
         $scripts[] = $root.'/static/protocols/stomp/stomp.js';
-        $scripts[] = common_path('plugins/Orbited/orbitedupdater.js');
+        $scripts[] = $this->path('js/orbitedupdater.js');
+
         return $scripts;
     }
 
     function _updateInitialize($timeline, $user_id)
     {
         $script = parent::_updateInitialize($timeline, $user_id);
-        return $script." OrbitedUpdater.init(\"$this->stompserver\", $this->stompport, \"{$timeline}\");";
+
+        $server = $this->_getStompServer();
+        $port   = $this->_getStompPort();
+
+        return $script." OrbitedUpdater.init(\"$server\", $port, ".
+          "\"{$timeline}\", \"{$this->webuser}\", \"{$this->webpass}\");";
     }
 
     function _connect()
     {
-        require_once(INSTALLDIR.'/extlibs/Stomp.php');
+        require_once(INSTALLDIR.'/extlib/Stomp.php');
 
-        $stompserver = (empty($this->stompserver)) ? "tcp://{$this->webserver}:61613/" : $this->stompserver;
+        $url = $this->_getStompUrl();
 
-        $this->con = new Stomp($stompserver);
+        $this->con = new Stomp($url);
 
         if ($this->con->connect($this->username, $this->password)) {
-            $this->_log(LOG_INFO, "Connected.");
+            $this->log(LOG_INFO, "Connected.");
         } else {
-            $this->_log(LOG_ERR, 'Failed to connect to queue server');
-            throw new ServerException('Failed to connect to queue server');
+            $this->log(LOG_ERR, 'Failed to connect to queue server');
+            // TRANS: Server exception thrown when no connection can be made to a queue server.
+            throw new ServerException(_m('Failed to connect to queue server.'));
         }
     }
 
@@ -95,7 +117,7 @@ class OrbitedPlugin extends RealtimePlugin
                                    json_encode($message));
 
         return $result;
-        // TODO: parse and deal with result
+        // @todo Parse and deal with result.
     }
 
     function _disconnect()
@@ -110,4 +132,42 @@ class OrbitedPlugin extends RealtimePlugin
         }
         return '/' . implode('/', $path);
     }
+
+    function _getStompServer()
+    {
+        return (!is_null($this->stompserver)) ? $this->stompserver :
+        (!is_null($this->webserver)) ? $this->webserver :
+        common_config('site', 'server');
+    }
+
+    function _getStompPort()
+    {
+        return (!is_null($this->stompport)) ? $this->stompport : 61613;
+    }
+
+    function _getStompUrl()
+    {
+        $server = $this->_getStompServer();
+        $port   = $this->_getStompPort();
+        return "tcp://$server:$port/";
+    }
+
+    /**
+     * Add our version information to output
+     *
+     * @param array &$versions Array of version-data arrays
+     *
+     * @return boolean hook value
+     */
+    function onPluginVersion(array &$versions)
+    {
+        $versions[] = array('name' => 'Orbited',
+                            'version' => GNUSOCIAL_VERSION,
+                            'author' => 'Evan Prodromou',
+                            'homepage' => 'https://git.gnu.io/gnu/gnu-social/tree/master/plugins/Orbited',
+                            'rawdescription' =>
+                            // TRANS: Plugin description.
+                            _m('Plugin to make updates using Orbited and STOMP.'));
+        return true;
+    }
 }