1 files changed, 11 insertions, 0 deletions
diff --git a/xmppdaemon.php b/xmppdaemon.php
index 7977dc804..37b349f58 100755
--- a/xmppdaemon.php
+++ b/xmppdaemon.php
@@ -172,6 +172,9 @@ class XMPPDaemon {
 		} else if ($this->is_autoreply($pl['body'])) {
 			$this->log(LOG_INFO, 'Ignoring auto reply from ' . $from);
 			return;
+		} else if ($this->is_otr($pl['body'])) {
+			$this->log(LOG_INFO, 'Ignoring OTR from ' . $from);
+			return;
 		} else {
 			$this->add_notice($user, $pl);
 		}
@@ -185,6 +188,14 @@ class XMPPDaemon {
 		}
 	}
 
+	function is_otr($txt) {
+		if (preg_match('/^\?OTR/', $txt)) {
+			return true;
+		} else {
+			return false;
+		}
+	}
+	
 	function from_site($address, $msg) {
 		$text = '['.common_config('site', 'name') . '] ' . $msg;
 		jabber_send_message($address, $text);