/**
* StatusNet, the distributed open-source microblogging tool
*
- * Plugin to do "real time" updates using Comet/Bayeux
+ * Plugin to do "real time" updates using Meteor
*
* PHP version 5
*
* @link http://status.net/
*/
-if (!defined('STATUSNET') && !defined('LACONICA')) {
+if (!defined('GNUSOCIAL') && !defined('STATUSNET')) {
exit(1);
}
public $controlport = null;
public $controlserver = null;
public $channelbase = null;
+ public $protocol = null;
public $persistent = true;
protected $_socket = null;
- function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='')
+ function __construct($webserver=null, $webport=4670, $controlport=4671, $controlserver=null, $channelbase='', $protocol='http')
{
global $config;
$this->controlport = $controlport;
$this->controlserver = (empty($controlserver)) ? $webserver : $controlserver;
$this->channelbase = $channelbase;
-
+ $this->protocol = $protocol;
+
parent::__construct();
}
'webport',
'controlport',
'controlserver',
- 'channelbase');
+ 'channelbase',
+ 'protocol');
foreach ($settings as $name) {
$val = common_config('meteor', $name);
if ($val !== false) {
function _getScripts()
{
$scripts = parent::_getScripts();
- $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
- $scripts[] = $this->path('meteorupdater.min.js');
+ if ($this->protocol == 'https') {
+ $scripts[] = 'https://'.$this->webserver.(($this->webport == 443) ? '':':'.$this->webport).'/meteor.js';
+ } else {
+ $scripts[] = 'http://'.$this->webserver.(($this->webport == 80) ? '':':'.$this->webport).'/meteor.js';
+ }
+ $scripts[] = $this->path('js/meteorupdater.js');
return $scripts;
}
function _updateInitialize($timeline, $user_id)
{
$script = parent::_updateInitialize($timeline, $user_id);
- return $script." MeteorUpdater.init(\"$this->webserver\", $this->webport, \"{$timeline}\");";
+ $ours = sprintf("MeteorUpdater.init(%s, %s, %s, %s);",
+ json_encode($this->webserver),
+ json_encode($this->webport),
+ json_encode($this->protocol),
+ json_encode($timeline));
+ return $script." ".$ours;
}
function _connect()
$this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}", $errno, $errstr, $timeout, $flags);
if (!$this->_socket) {
// TRANS: Exception. %1$s is the control server, %2$s is the control port.
- throw new Exception(sprintf(_m('Couldn\'t connect to %1$s on %2$s.'),$controlserver,$this->controlport));
+ throw new Exception(sprintf(_m('Could not connect to %1$s on %2$s.'),$controlserver,$this->controlport));
}
}
$result = fgets($this->_socket);
if (preg_match('/^ERR (.*)$/', $result, $matches)) {
// TRANS: Exception. %s is the Meteor message that could not be added.
- throw new Exception(sprintf(_m('Error adding meteor message "%s"'),$matches[1]));
+ throw new Exception(sprintf(_m('Error adding meteor message "%s".'),$matches[1]));
}
// TODO: parse and deal with result
}
return implode('-', $path);
}
- function onPluginVersion(&$versions)
+ function onPluginVersion(array &$versions)
{
$versions[] = array('name' => 'Meteor',
- 'version' => STATUSNET_VERSION,
+ 'version' => GNUSOCIAL_VERSION,
'author' => 'Evan Prodromou',
'homepage' => 'http://status.net/wiki/Plugin:Meteor',
'rawdescription' =>
- _m('Plugin to do "real time" updates using Comet/Bayeux.'));
+ // TRANS: Plugin description.
+ _m('Plugin to do "real time" updates using Meteor.'));
return true;
}
}