X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=scripts%2Fxmppdaemon.php;h=e067fdcdb232ed30c3eb515ab4fd497aa4445068;hb=dbf80a0f5a64926e6205a33717037e851fee8ed4;hp=c7a4fc7638e70a77ba83b8204e1fc98699b96836;hpb=a586bbed243079cd2afb7760e2fc97d731bdcb51;p=quix0rs-gnu-social.git

diff --git a/scripts/xmppdaemon.php b/scripts/xmppdaemon.php
index c7a4fc7638..e067fdcdb2 100755
--- a/scripts/xmppdaemon.php
+++ b/scripts/xmppdaemon.php
@@ -29,6 +29,7 @@ define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 require_once(INSTALLDIR . '/lib/jabber.php');
+require_once(INSTALLDIR . '/lib/daemon.php');
 
 set_error_handler('common_error_handler');
 
@@ -36,7 +37,7 @@ set_error_handler('common_error_handler');
 # in jabber.php, which create a new XMPP class. A more elegant (?) solution
 # might be to use make this a subclass of XMPP.
 
-class XMPPDaemon {
+class XMPPDaemon extends Daemon {
 
 	function XMPPDaemon($resource=NULL) {
 		static $attrs = array('server', 'port', 'user', 'password', 'host');
@@ -52,7 +53,7 @@ class XMPPDaemon {
 			$this->resource = common_config('xmpp', 'resource') . 'daemon';
 		}
 
-		$this->log(LOG_INFO, "{$this->user}@{$this->server}/{$this->resource}");
+		$this->log(LOG_INFO, "INITIALIZE XMPPDaemon {$this->user}@{$this->server}/{$this->resource}");
 	}
 
 	function connect() {
@@ -61,22 +62,39 @@ class XMPPDaemon {
 
 		$this->log(LOG_INFO, "Connecting to $connect_to on port $this->port");
 
-		$this->conn = jabber_connect($this->resource, "Send me a message to post a notice", 100);
+		$this->conn = jabber_connect($this->resource);
 
 		if (!$this->conn) {
 			return false;
 		}
-
+		
+		$this->conn->setReconnectTimeout(600);
+		
+		jabber_send_presence("Send me a message to post a notice", 'available',
+							 NULL, 'available', 100);
 		return !$this->conn->isDisconnected();
 	}
 
-	function handle() {
-		$this->conn->addEventHandler('message', 'handle_message', $this);
-		$this->conn->addEventHandler('presence', 'handle_presence', $this);
-
-		$this->conn->process();
+	function name() {
+		return strtolower('xmppdaemon.'.$this->resource);
+	}
+	
+	function run() {
+		if ($this->connect()) {
+			
+			$this->conn->addEventHandler('message', 'handle_message', $this);
+			$this->conn->addEventHandler('presence', 'handle_presence', $this);
+			$this->conn->addEventHandler('reconnect', 'handle_reconnect', $this);
+			
+			$this->conn->process();
+		}
 	}
 
+	function handle_reconnect(&$pl) {
+		$this->conn->processUntil('session_start');
+		$this->conn->presence('Send me a message to post a notice', 'available', NULL, 'available', 100);
+	}
+	
 	function get_user($from) {
 		$user = User::staticGet('jabber', jabber_normalize_jid($from));
 		return $user;
@@ -95,9 +113,9 @@ class XMPPDaemon {
 		# Forwarded from another daemon (probably a broadcaster) for
 		# us to handle
 
-		if (preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from))) {
+		if ($this->is_self($from)) {
 			$from = $this->get_ofrom($pl);
-			if (is_null($from)) {
+			if (is_null($from) || $this->is_self($from)) {
 				return;
 			}
 		}
@@ -127,8 +145,15 @@ class XMPPDaemon {
 			}
 			$this->add_notice($user, $pl);
 		}
+		
+		$user->free();
+		unset($user);
 	}
 
+	function is_self($from) {
+		return preg_match('/^'.strtolower(jabber_daemon_address()).'/', strtolower($from));
+	}
+	
 	function get_ofrom($pl) {
 		$xml = $pl['raw'];
 		$addresses = $xml->sub('addresses');
@@ -136,17 +161,31 @@ class XMPPDaemon {
 			$this->log(LOG_WARNING, 'Forwarded message without addresses');
 			return NULL;
 		}
-		$address = $xml->sub('address');
+		$address = $addresses->sub('address');
 		if (!$address) {
 			$this->log(LOG_WARNING, 'Forwarded message without address');
 			return NULL;
 		}
-		$type = $address->attr('type');
+		if (!array_key_exists('type', $address->attrs)) {
+			$this->log(LOG_WARNING, 'No type for forwarded message');
+			return NULL;
+		}
+		$type = $address->attrs['type'];
 		if ($type != 'ofrom') {
 			$this->log(LOG_WARNING, 'Type of forwarded message is not ofrom');
 			return NULL;
 		}
-		return $address->attr('jid');
+		if (!array_key_exists('jid', $address->attrs)) {
+			$this->log(LOG_WARNING, 'No jid for forwarded message');
+			return NULL;
+		}
+		$jid = $address->attrs['jid'];
+		if (!$jid) {
+			$this->log(LOG_WARNING, 'Could not get jid from address');
+			return NULL;
+		}
+		$this->log(LOG_DEBUG, 'Got message forwarded from jid ' . $jid);
+		return $jid;
 	}
 
 	function is_autoreply($txt) {
@@ -245,6 +284,8 @@ class XMPPDaemon {
 		common_broadcast_notice($notice);
 		$this->log(LOG_INFO,
 				   'Added notice ' . $notice->id . ' from user ' . $user->nickname);
+		$notice->free();
+		unset($notice);
 	}
 
 	function handle_presence(&$pl) {
@@ -274,6 +315,8 @@ class XMPPDaemon {
 							   ' status from presence.');
 					$this->add_notice($user, $pl);
 				}
+				$user->free();
+				unset($user);
 			}
 			break;
 		}
@@ -288,12 +331,13 @@ class XMPPDaemon {
 	}
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-listen');
 
 $daemon = new XMPPDaemon($resource);
 
-if ($daemon->connect()) {
-	$daemon->handle();
-}
+$daemon->runOnce();