Changeset 399 for trunk

Timestamp:

Mar 19, 2010, 6:24:35 PM (15 years ago)

Author:

maron

Message:

Oprava zobrazování chyby u vyhledávání jmen ve formuláři překládání pokud je hledáno jediné slovo s menším počtem písmen než 5

File:

• trunk/includes/global_function.php (modified) (1 diff)

trunk/includes/global_function.php

@@ -496 +496 @@
     if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> 0) AND (`Sub`.`Entry` = `O`.`Entry`))';
     $where .= ' AND ('; 
- 
-    for($i = 0; $i < count($ArrStr); $i++)
-    {
-      if (strpos($ArrStr[$i],"'s") > 0)
+    
+    $SqlOK = false;
+    if (count($ArrStr) > 0) {
+      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 (strlen($ArrStr[$i]) > 5)
-        $where .= '(`O`.`'.$Column.'` LIKE "%'.addslashes($ArrStr[$i]).'%") OR ';
-    }
-    $where = substr($where,0,strlen($where)-4);
-    $where .= ')';
-
-    $ID = $Database->SQLCommand($sql.$where.$groupby);
-    //echo ($sql.$where.$groupby);
-    while($Line = mysql_fetch_assoc($ID)) 
-    {
-   //   if (($mode != 0) or (($mode == 0) and (strpos(strtolower($Text), strtolower($Line[2])) > 0) ) ) 
-          $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+        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);
+      $where .= ')';
+      if ($SqlOK) {
+        $ID = $Database->SQLCommand($sql.$where.$groupby);
+    //  echo ($sql.'|'.$where.'|'.$groupby);
+        while($Line = mysql_fetch_assoc($ID)) {
+              $buff[] = array($Line['ID'],GetIDbyName($Table),$Line[$Column],$Line['Tran']);
+        }
+          }
     }
   }