* Remove manual query building in search mysql

[lhc/web/wiklou.git] / includes / MagicWord.php

diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 4698960..d30f7cc 100644 (file)
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -30,9 +30,13 @@ class MagicWord {
        /**#@+
         * @private
         */
-       var $mId, $mSynonyms, $mCaseSensitive, $mRegex;
-       var $mRegexStart, $mBaseRegex, $mVariableRegex;
-       var $mModified, $mFound;
+       var $mId, $mSynonyms, $mCaseSensitive;
+       var $mRegex = '';
+       var $mRegexStart = '';
+       var $mBaseRegex = '';
+       var $mVariableRegex = '';
+       var $mModified = false;
+       var $mFound = false;
 
        static public $mVariableIDsInitialised = false;
        static public $mVariableIDs = array(
@@ -178,20 +182,15 @@ class MagicWord {
 
        /**#@-*/
 
-       function __construct($id = 0, $syn = '', $cs = false) {
+       function __construct($id = 0, $syn = array(), $cs = false) {
                $this->mId = $id;
                $this->mSynonyms = (array)$syn;
                $this->mCaseSensitive = $cs;
-               $this->mRegex = '';
-               $this->mRegexStart = '';
-               $this->mVariableRegex = '';
-               $this->mVariableStartToEndRegex = '';
-               $this->mModified = false;
        }
 
        /**
         * Factory: creates an object representing an ID
-        * @static
+        * @return MagicWord
         */
        static function &get( $id ) {
                wfProfileIn( __METHOD__ );
@@ -272,13 +271,13 @@ class MagicWord {
         * @private
         */
        function initRegex() {
-               #$variableClass = Title::legalChars();
-               # This was used for matching "$1" variables, but different uses of the feature will have
-               # different restrictions, which should be checked *after* the MagicWord has been matched,
-               # not here. - IMSoP
+               // Sort the synonyms by length, descending, so that the longest synonym
+               // matches in precedence to the shortest
+               $synonyms = $this->mSynonyms;
+               usort( $synonyms, array( $this, 'compareStringLength' ) );
 
                $escSyn = array();
-               foreach ( $this->mSynonyms as $synonym )
+               foreach ( $synonyms as $synonym )
                        // In case a magic word contains /, like that's going to happen;)
                        $escSyn[] = preg_quote( $synonym, '/' );
                $this->mBaseRegex = implode( '|', $escSyn );
@@ -291,6 +290,23 @@ class MagicWord {
                        "/^(?:{$this->mBaseRegex})$/{$case}" );
        }
 
+       /**
+        * A comparison function that returns -1, 0 or 1 depending on whether the 
+        * first string is longer, the same length or shorter than the second 
+        * string.
+        */
+       function compareStringLength( $s1, $s2 ) {
+               $l1 = strlen( $s1 );
+               $l2 = strlen( $s2 );
+               if ( $l1 < $l2 ) {
+                       return 1;
+               } elseif ( $l1 > $l2 ) {
+                       return -1;
+               } else {
+                       return 0;
+               }
+       }
+
        /**
         * Gets a regex representing matching the word
         */
@@ -464,6 +480,7 @@ class MagicWord {
         * thereby gaining some efficiency. The result is placed in the out variable
         * $result. The return value is true if something was replaced.
         * @static
+        * @todo Should this be static? It doesn't seem to be used at all
         **/
        function replaceMultiple( $magicarr, $subject, &$result ){
                $search = array();