Changeset 136

Timestamp:

03/07/08 03:43:21 (5 years ago)

Author:

Slynderdale

Message:

 

Files:

• trunk/Phergie/Plugin/Karma.php (modified) (6 diffs)

trunk/Phergie/Plugin/Karma.php

@@ -231 +231 @@
             $res = $this->fetchKarma->fetch(PDO::FETCH_ASSOC);
 
+            // Sanity check if someone if someone prefixed their conversation with karma
+            if (!$res && substr_count($term, ' ') > 1 && !(substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')'))
+                return;
+
             // Clean the raw term if it was contained within brackets
             if(substr($m[1], 0, 1) === '(' && substr($m[1], -1) === ')')
@@ -241 +245 @@
             }
         // Incrementation/decrementation request
-        } elseif (preg_match('#^('.$prefix.')?(\S+?|\(.+?\)+)(\+{2,}|-{2,})(?:\s+(.*))?$#i', $message, $m)) {
-            $word = strtolower($m[2]);
+        } elseif (preg_match('{^(?:'.$prefix.')?(\S+?|\(.+?\)+)(\+{2,}|-{2,})(?:\s+(.*))?$}i', $message, $m)) {
+            $word = strtolower($m[1]);
             // Strip parenthesis grouping multiple words
             if(substr($word, 0, 1) === '(' && substr($word, -1) === ')') {
                 $word = substr($word, 1, -1);
             } else { // Add trailing + or -'s
-                if(strlen($m[3]) > 2) {
-                    $word .= substr($m[3], 2);
-                    $m[3] = substr($m[3], -2);
+                if(strlen($m[2]) > 2) {
+                    $word .= substr($m[2], 2);
+                    $m[2] = substr($m[2], -2);
                 }
             }
@@ -260 +264 @@
             // Force a decrementation if someone tries to update his own karma
             if ($word == strtolower($this->event->getNick())) {
-                $m[3] = '--';
+                $m[2] = '--';
             }
             // Antithrottling check
@@ -279 +283 @@
             if ($res) {
                 $args = array(
-                    ':karma' => ($res['karma'] + ($m[3]=='++' ? 1 : -1)),
+                    ':karma' => ($res['karma'] + ($m[2]=='++' ? 1 : -1)),
                     ':word' => $word
                 );
@@ -286 +290 @@
                 $args = array(
                     ':word' => $word,
-                    ':karma' => ($m[3]=='++' ? '1' : '-1')
+                    ':karma' => ($m[2]=='++' ? '1' : '-1')
                 );
                 $this->insertKarma->execute($args);
@@ -295 +299 @@
 
             // Add comment
-            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $m[4]);
+            $comment = preg_replace('{(?:^//(.*)|^#(.*)|^/\*(.*?)\*/$)}', '$1$2$3', $m[3]);
             if (!empty($comment)) {
                 $this->insertComment->execute(array(':wordid' => $id, ':comment' => $comment));