GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

* i18n/L10n update.

Browse Source 
* added onPluginVersion().
* superfluous whitespace removed.
This commit is contained in:
Siebrand Mazeland 2010-09-20 21:12:07 +02:00
parent 5cc08ccd07
commit a58877a2f8
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plugins/Meteor/MeteorPlugin.php
View File

@ -42,7 +42,6 @@ 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 * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://status.net/ * @link http://status.net/
*/ */
class MeteorPlugin extends RealtimePlugin class MeteorPlugin extends RealtimePlugin
{ {
public $webserver = null; public $webserver = null;
@ -112,7 +111,8 @@ class MeteorPlugin extends RealtimePlugin
// May throw an exception. // May throw an exception.
$this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}", $errno, $errstr, $timeout, $flags); $this->_socket = stream_socket_client("tcp://{$controlserver}:{$this->controlport}", $errno, $errstr, $timeout, $flags);
if (!$this->_socket) { if (!$this->_socket) {
throw new Exception("Couldn't connect to {$controlserver} on {$this->controlport}"); // 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));
} }
} }
@ -124,7 +124,8 @@ class MeteorPlugin extends RealtimePlugin
$cnt = fwrite($this->_socket, $cmd); $cnt = fwrite($this->_socket, $cmd);
$result = fgets($this->_socket); $result = fgets($this->_socket);
if (preg_match('/^ERR (.*)$/', $result, $matches)) { if (preg_match('/^ERR (.*)$/', $result, $matches)) {
throw new Exception('Error adding meteor message "'.$matches[1].'"'); // TRANS: Exception. %s is the Meteor message that could not be added.
throw new Exception(sprintf(_m('Error adding meteor message "%s"'),$matches[1]));
} }
// TODO: parse and deal with result // TODO: parse and deal with result
} }
@ -146,4 +147,15 @@ class MeteorPlugin extends RealtimePlugin
} }
return implode('-', $path); return implode('-', $path);
} }
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'Meteor',
'version' => STATUSNET_VERSION,
'author' => 'Evan Prodromou',
'homepage' => 'http://status.net/wiki/Plugin:Meteor',
'rawdescription' =>
_m('Plugin to do "real time" updates using Comet/Bayeux.'));
return true;
}
} }