ignore OTR messages over Jabber (I think)

darcs-hash:20080806002134-84dde-1674375f840a61ce469be784805a969beff35f43.gz

diff --git a/xmppdaemon.php b/xmppdaemon.php
index 7977dc804d2e51b980c208d55e4923631e27c9be..37b349f5889464bc2a13428f5fd06d79577e6943 100755 (executable)
--- 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);