Changeset 596 for trunk

Timestamp:

Nov 22, 2013, 11:34:47 AM (11 years ago)

Author:

maron

Message:

• Fixed: url in Dictionary.php to Form.php name starts with $b$b,< etc. now find too

Location:

trunk

Files:

• Modules/Dictionary/Dictionary.php (modified) (1 diff)
• includes/global.php (modified) (4 diffs)

trunk/Modules/Dictionary/Dictionary.php

@@ -67 +67 @@
           $Output .= '<tr><td>'.$Line[2].'</td>';
           if ($Line[3] <> '') $Output .= '<td><a target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">'.$Line[3].'</a></td></tr>';
-          else $Output .= '<td><a target="_NEW2" href="'.$this->System->Link('form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">Překládat</a></td></tr>';
+          else $Output .= '<td><a target="_NEW2" href="'.$this->System->Link('/form.php?group='.$Line[1].'&amp;ID='.$Line[0]).'">Překládat</a></td></tr>';
         }
       } else 

trunk/includes/global.php

@@ -512 +512 @@
   'areatrigger_tavern' => 'Name',); */
     $buff = array();
-  
+
+    //change chars by we want to separate
+    $Text = str_replace('$B$B',' ',$Text);
+    $Text = str_replace('$b$b',' ',$Text);
+    $Text = str_replace('$G',' ',$Text);
+    $Text = str_replace('$I',' ',$Text);
+    $Text = str_replace('$N',' ',$Text);
+    $Text = str_replace('$R',' ',$Text);
+    $Text = str_replace('$g',' ',$Text);
+    $Text = str_replace('$i',' ',$Text);
+    $Text = str_replace('$n',' ',$Text);
+    $Text = str_replace('$r',' ',$Text);
+    $Text = str_replace(':',' ',$Text);
+    $Text = str_replace(';',' ',$Text);
+    $Text = str_replace('!',' ',$Text);
+    $Text = str_replace('?',' ',$Text);
+    $Text = str_replace('.',' ',$Text);
+    $Text = str_replace(',',' ',$Text);
+    $Text = str_replace('\'s',' ',$Text);
+    $Text = str_replace('<',' ',$Text);
+    $Text = str_replace('>',' ',$Text);
+    $ArrStr = explode(' ', $Text);
+      
   foreach($TablesColumn as $Table => $Column) 
   {  
@@ -519 +541 @@
     $groupby = ' GROUP BY `'.$Column.'`';
   
-    $ArrStr = explode(' ', $Text);
+
     $where = '(`Language` = '.$Config['OriginalLanguage'].') ';
     if ($mode == 1) $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].') AND (`Sub`.`Entry` = `O`.`Entry`))';
@@ -529 +551 @@
       for($i = 0; $i < count($ArrStr); $i++)
       {
-        if (strpos($ArrStr[$i],"'s") > 0)
-       $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-2);
-        if (strpos($ArrStr[$i],',') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-        if (strpos($ArrStr[$i],'.') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-        if (strpos($ArrStr[$i],'!') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
-        if (strpos($ArrStr[$i],'?') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
+       // if (strpos($ArrStr[$i],"'s") > 0)     $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-2);
+      //  if (strpos($ArrStr[$i],',') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
+       // if (strpos($ArrStr[$i],'.') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
+       // if (strpos($ArrStr[$i],'!') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
+       // if (strpos($ArrStr[$i],'?') > 0) $ArrStr[$i] = substr($ArrStr[$i],0,strlen($ArrStr[$i])-1);
 
         if (strlen($ArrStr[$i]) > 4) {
           $where .= '(`O`.`'.$Column.'` LIKE "%'.addslashes($ArrStr[$i]).'%") OR ';
           $SqlOK = true;
-      }
+        }
       }
       $where = substr($where, 0, strlen($where) - 4);
@@ -550 +571 @@
           $buff[] = array($Line['ID'], GetIDbyName($Table), $Line[$Column], $Line['Tran']);
         }
-    }
+      }
     }
   }