forked from GNUsocial/gnu-social
More work on adapting phpmsnclass
This commit is contained in:
parent
f3c1e9da9a
commit
3d6bb5a597
@ -170,4 +170,3 @@ class MsnPlugin extends ImPlugin
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,120 +0,0 @@
|
||||
<?php
|
||||
/**
|
||||
* StatusNet, the distributed open-source microblogging tool
|
||||
*
|
||||
* Queue-mediated proxy class for outgoing MSN messages.
|
||||
*
|
||||
* PHP version 5
|
||||
*
|
||||
* LICENCE: This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
* @category Network
|
||||
* @package StatusNet
|
||||
* @author Luke Fitzgerald <lw.fitzgerald@googlemail.com>
|
||||
* @copyright 2010 StatusNet, Inc.
|
||||
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
|
||||
* @link http://status.net/
|
||||
*/
|
||||
|
||||
if (!defined('STATUSNET') && !defined('LACONICA')) {
|
||||
exit(1);
|
||||
}
|
||||
|
||||
class Queued_XMPP extends MSN {
|
||||
/**
|
||||
* Reference to the MsnPlugin object we're hooked up to.
|
||||
*/
|
||||
public $plugin;
|
||||
|
||||
/**
|
||||
* Constructor
|
||||
*
|
||||
* @param MsnPlugin $plugin
|
||||
* @param string $host
|
||||
* @param integer $port
|
||||
* @param string $user
|
||||
* @param string $password
|
||||
* @param string $resource
|
||||
* @param string $server
|
||||
* @param boolean $printlog
|
||||
* @param string $loglevel
|
||||
*/
|
||||
public function __construct($plugin, $host, $port, $user, $password, $resource, $server = null, $printlog = false, $loglevel = null)
|
||||
{
|
||||
$this->plugin = $plugin;
|
||||
|
||||
parent::__construct($host, $port, $user, $password, $resource, $server, $printlog, $loglevel);
|
||||
|
||||
// We use $host to connect, but $server to build JIDs if specified.
|
||||
// This seems to fix an upstream bug where $host was used to build
|
||||
// $this->basejid, never seen since it isn't actually used in the base
|
||||
// classes.
|
||||
if (!$server) {
|
||||
$server = $this->host;
|
||||
}
|
||||
$this->basejid = $this->user . '@' . $server;
|
||||
|
||||
// Normally the fulljid is filled out by the server at resource binding
|
||||
// time, but we need to do it since we're not talking to a real server.
|
||||
$this->fulljid = "{$this->basejid}/{$this->resource}";
|
||||
}
|
||||
|
||||
/**
|
||||
* Send a formatted message to the outgoing queue for later forwarding
|
||||
* to a real XMPP connection.
|
||||
*
|
||||
* @param string $msg
|
||||
*/
|
||||
public function send($msg, $timeout=NULL)
|
||||
{
|
||||
$this->plugin->enqueue_outgoing_raw($msg);
|
||||
}
|
||||
|
||||
//@{
|
||||
/**
|
||||
* Stream i/o functions disabled; only do output
|
||||
*/
|
||||
public function connect($timeout = 30, $persistent = false, $sendinit = true)
|
||||
{
|
||||
throw new Exception("Can't connect to server from fake XMPP.");
|
||||
}
|
||||
|
||||
public function disconnect()
|
||||
{
|
||||
throw new Exception("Can't connect to server from fake XMPP.");
|
||||
}
|
||||
|
||||
public function process()
|
||||
{
|
||||
throw new Exception("Can't read stream from fake XMPP.");
|
||||
}
|
||||
|
||||
public function processUntil($event, $timeout=-1)
|
||||
{
|
||||
throw new Exception("Can't read stream from fake XMPP.");
|
||||
}
|
||||
|
||||
public function read()
|
||||
{
|
||||
throw new Exception("Can't read stream from fake XMPP.");
|
||||
}
|
||||
|
||||
public function readyToProcess()
|
||||
{
|
||||
throw new Exception("Can't read stream from fake XMPP.");
|
||||
}
|
||||
//@}
|
||||
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -115,7 +115,7 @@ class MsnManager extends ImManager
|
||||
|
||||
$now = time();
|
||||
|
||||
$this->conn->send_ping();
|
||||
$this->conn->sendPing();
|
||||
$this->lastping = $now;
|
||||
return true;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user