X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=xmppdaemon.php;h=e772ecc0895322a640c6d1ec4118e9767ff17d73;hb=42bbd38417ffbfe5bfee669e0c52b50187a3032a;hp=6509ed1faf4d51f57510baf853aed472d3f6d469;hpb=8d3ec9c92076e172e5871e3603c143333d73ac3c;p=quix0rs-gnu-social.git

diff --git a/xmppdaemon.php b/xmppdaemon.php
index 6509ed1faf..e772ecc089 100755
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -18,6 +18,35 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+function xmppdaemon_error_handler($errno, $errstr, $errfile, $errline, $errcontext) {
+    switch ($errno) {
+     case E_USER_ERROR:
+	echo "ERROR: [$errno] $errstr\n";
+	echo "  Fatal error on line $errline in file $errfile";
+	echo ", PHP " . PHP_VERSION . " (" . PHP_OS . ")\n";
+	echo "Aborting...\n";
+	exit(1);
+	break;
+	
+     case E_USER_WARNING:
+	echo "WARNING [$errno] $errstr\n";
+	break;
+	
+     case E_USER_NOTICE:
+	echo "My NOTICE [$errno] $errstr\n";
+	break;
+	
+     default:
+	echo "Unknown error type: [$errno] $errstr\n";
+	break;
+    }
+    
+    /* Don't execute PHP internal error handler */
+    return true;
+}
+
+set_error_handler('xmppdaemon_error_handler');
+
 # Abort if called from a web server
 if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 	print "This script must be run from the command line\n";
@@ -98,7 +127,12 @@ class XMPPDaemon {
 			$this->confirmation_queue();
 		}
 	}
-
+	
+	function handle_session($pl) {
+		# XXX what to do here?
+		return true;
+	}
+	
 	function get_user($from) {
 		$user = User::staticGet('jabber', jabber_normalize_jid($from));
 		return $user;
@@ -135,11 +169,22 @@ class XMPPDaemon {
 		}
 		if ($this->handle_command($user, $pl['body'])) {
 			return;
+		} else if ($this->is_autoreply($pl['body'])) {
+			$this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);
+			return;
 		} else {
 			$this->add_notice($user, $pl);
 		}
 	}
 
+	function is_autoreply($txt) {
+		if (preg_match('/[\[\(]?[Aa]uto-?[Rr]eply[\]\)]/', $txt)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
 	function from_site($address, $msg) {
 		$text = '['.common_config('site', 'name') . '] ' . $msg;
 		jabber_send_message($address, $text);
@@ -181,6 +226,7 @@ class XMPPDaemon {
 		$notice = new Notice();
 		$notice->profile_id = $user->id;
 		$notice->content = trim(substr($pl['body'], 0, 140));
+		$notice->rendered = common_render_content($notice->content, $notice);
 		$notice->created = DB_DataObject_Cast::dateTime();
 		$notice->query('BEGIN');
 		$id = $notice->insert();
@@ -229,7 +275,7 @@ class XMPPDaemon {
 			if (!$pl['type']) {
 				$user = User::staticGet('jabber', $from);
 				if (!$user) {
-					$this->log(LOG_WARNING, 'Message from unknown user ' . $from);
+					$this->log(LOG_WARNING, 'Presence from unknown user ' . $from);
 					return;
 				}
 				if ($user->updatefrompresence) {