Changeset 872 for trunk/includes

Timestamp:

Apr 9, 2017, 3:40:35 PM (8 years ago)

Author:

chronos

Message:

• Fixed: Allow to store IPv6 address in database for UserTrace and UserOnline tables.

File:

• trunk/includes/Global.php (modified) (3 diffs)

trunk/includes/Global.php

@@ -541 +541 @@
 }
 
-function GetTranslatNames($Text,$mode,$TablesColumn, $FirstBig = True)
+function GetTranslatNames($Text, $mode, $TablesColumn, $FirstBig = True)
 {
   global $System, $Config;
@@ -551 +551 @@
   'areatrigger_teleport' => 'Name',
   '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);
-    $sqlall = '';
+  $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);
+  $sqlall = '';
+
   foreach($TablesColumn as $Table => $Column)
   {
     $orderinby = ' ORDER BY ID DESC ';
-    $sql = 'SELECT `ID`, (SELECT CONCAT(  \''.GetIDbyName($Table).'\' )) AS  `GoupId`,`'.$Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
-      '(`O`.`Entry` = `T`.`Entry`) AND (`Language` <> '.$Config['OriginalLanguage'].') '.$orderinby.' LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
+    $sql = 'SELECT `ID`, (SELECT CONCAT(\''.GetIDbyName($Table).'\' )) AS `GroupId`,`'.
+      $Column.'` AS Orig, (SELECT `'.$Column.'` FROM `'.$Table.'` AS `T` WHERE '.
+      '(`O`.`Entry` = `T`.`Entry`) AND (`Language` <> '.$Config['OriginalLanguage'].') '.
+      $orderinby.' LIMIT 1) AS `Tran` FROM `'.$Table.'` AS `O` WHERE ';
     $groupby = ' GROUP BY `'.$Column.'` ';
 
     $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`))';
-    if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.'` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].') AND (`Sub`.`Entry` = `O`.`Entry`))';
+    if ($mode == 1) $where .= ' AND EXISTS(SELECT 1 FROM `'.$Table.
+      '` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].
+      ') AND (`Sub`.`Entry` = `O`.`Entry`))';
+    if ($mode == 2) $where .= ' AND NOT EXISTS(SELECT 1 FROM `'.$Table.
+      '` AS `Sub` WHERE (`Sub`.`Language` <> '.$Config['OriginalLanguage'].
+      ') AND (`Sub`.`Entry` = `O`.`Entry`))';
     $where .= ' AND (';
-    if (array_search('the' , $ArrStr)) $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
+    if (array_search('the', $ArrStr)) $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
 
     $SqlOK = false;
-    if (count($ArrStr) > 0) {
-      for($i = 0; $i < count($ArrStr); $i++)
+    if (count($ArrStr) > 0) 
+    {
+      for ($i = 0; $i < count($ArrStr); $i++)
       {
-
-        //find word only if is 3 characters and more, and if starts by upper char, and search only once
+        // find word only if is 3 characters and more, and if starts by upper char, and search only once
         if ((strlen($ArrStr[$i]) > 3) or ( ((count($ArrStr) < 6) or ($i == 0)) and (strlen($ArrStr[$i]) > 0) ) )  //length
-          if ((!$FirstBig) or (ctype_upper(substr($ArrStr[$i],0,1))) or (count($ArrStr) < 6) )  //first big
-            if (array_search($ArrStr[$i], $ArrStr) == $i) {  //first in array
+          if ((!$FirstBig) or (ctype_upper(substr($ArrStr[$i], 0, 1))) or (count($ArrStr) < 6) )  //first big
+            if (array_search($ArrStr[$i], $ArrStr) == $i) 
+            {  // first in array
               $where .= '(`O`.`'.$Column.'` LIKE "'.addslashes($ArrStr[$i]).'%") OR ';
               $SqlOK = true;
@@ -604 +612 @@
       $where .= ')';
     }
-      if ($SqlOK) {
+    if ($SqlOK) 
+    {
         //$sql.$where.$groupby.$orderby
 //          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
-        if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
+      if ($sqlall <> '') { $sqlall .= ' UNION ALL ( '.$sql.$where.$groupby.' )';}
         else {$sqlall .= ' ( '.$sql.$where.$groupby.' )'; }
-      }
-
-  }
-    if ($SqlOK) {
-        $orderby = ' ORDER BY LENGTH(Orig) DESC ';
-      // echo $sqlall. $orderby;
-        $DbResult = $System->Database->query($sqlall.$orderby);
+    }
+  }
+  if ($SqlOK) 
+  {
+    $orderby = ' ORDER BY LENGTH(Orig) DESC ';
+    // echo $sqlall. $orderby;
+    $DbResult = $System->Database->query($sqlall.$orderby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
-        while($Line = $DbResult->fetch_assoc())
-        {
-          $buff[] = array($Line['ID'], $Line['GoupId'], $Line['Orig'], $Line['Tran']);
-        }
-    }
-    return $buff;
+    while($Line = $DbResult->fetch_assoc())
+    {
+      $buff[] = array($Line['ID'], $Line['GroupId'], $Line['Orig'], $Line['Tran']);
+    }
+  }
+  return $buff;
 }