Changeset 797 for trunk/includes

Timestamp:

Feb 12, 2014, 9:11:46 PM (11 years ago)

Author:

chronos

Message:

• Fixed: HTML syntax in user profile.
• Fixed: Use correct HTML entity symbol "&" in query handling function.

Location:

trunk/includes

Files:

• Version.php (modified) (1 diff)
• global.php (modified) (41 diffs)

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 796; // Subversion revision
+$Revision = 797; // Subversion revision
 $DatabaseRevision = 787; // Database structure revision
 $ReleaseTime = '2014-02-12';

trunk/includes/global.php

@@ -6 +6 @@
 include_once(dirname(__FILE__).'/Update.php');
 include_once(dirname(__FILE__).'/Page.php');
-if(file_exists(dirname(__FILE__).'/config.php')) 
+if(file_exists(dirname(__FILE__).'/config.php'))
   include_once(dirname(__FILE__).'/config.php');
 include_once(dirname(__FILE__).'/Version.php');
@@ -83 +83 @@
 
 $UnitNames = array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB');
- 
+
 function HumanSize($Value)
 {
@@ -120 +120 @@
     $Parts[] = $Index.'='.$Item;
   }
-  return(implode('&', $Parts));
+  return(implode('&', $Parts));
 }
 
@@ -135 +135 @@
 }
 
-function getmonthyears($Days) 
+function getmonthyears($Days)
 {
   $month = floor($Days / 30);
   $year = floor($month / 12);
   $Days = floor($Days - $month * 30);
-  $month = $month - $year * 12; 
+  $month = $month - $year * 12;
   return($year.'r '.$month.'m '.$Days.'d');
 }
@@ -149 +149 @@
 //  $text = 'Balthule\'s letter is dire. This Cult of the Dark Strand is a thorn in my side that must be removed. I have been dealing with some of the Dark Strand scum northeast of here at Ordil\'Aran. One of their number possesses a soul gem that I believe holds the secret to the cult\'s power.$b$bBring it to me, and I will be able to decipher the secrets held within.';
  // $text = htmlspecialchars($text);
-  
+
   $text = str_replace('$B','$B ',$text);
   $text = urlencode($text);
@@ -163 +163 @@
   error_reporting(E_ALL ^ E_WARNING);
   if (($handle = @fopen($url, "r")) === FALSE) return false;
-    
+
   $data = stream_get_contents($handle);
   $data = substr($data, strpos($data,'result_box'));
@@ -178 +178 @@
     $data = $partbefore.' '.$partafter;
   }
-  
+
   $data = utf8_encode($data);
 
@@ -184 +184 @@
   $data = str_replace('$b $b','$b$b',$data);
   $data = str_replace('| ','|',$data);
-  
-  return $data; 
+
+  return $data;
 }
 
@@ -191 +191 @@
 {
   global $System;
-    
+
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-  
+
   $ItemPerPage = $System->Config['Web']['ItemsPerPage'];
   $Around = round($System->Config['Web']['VisiblePagingItems'] / 2);
   $Result = '';
   $PageCount = floor($TotalCount / $ItemPerPage) + 1;
-  
+
   if(!array_key_exists('Page', $_SESSION)) $_SESSION['Page'] = 0;
   if(array_key_exists('page', $_GET)) $_SESSION['Page'] = $_GET['page'] * 1;
@@ -204 +204 @@
   if($_SESSION['Page'] >= $PageCount) $_SESSION['Page'] = $PageCount - 1;
   $CurrentPage = $_SESSION['Page'];
-  
-        
+
+
   $Result .= 'Počet položek: <strong>'.$TotalCount.'</strong> &nbsp; Stránky: ';
 
@@ -211 +211 @@
   if($PageCount > 1)
   {
-    if($CurrentPage > 0) 
+    if($CurrentPage > 0)
     {
-      $QueryItems['page'] = 0;      
+      $QueryItems['page'] = 0;
       $Result.= '<a href="?'.SetQueryStringArray($QueryItems).'">&lt;&lt;</a> ';
       $QueryItems['page'] = ($CurrentPage - 1);
@@ -233 +233 @@
        $Result .= '<a href="?'.SetQueryStringArray($QueryItems).'">'.($i + 1).'</a> ';
       }
-    } 
+    }
     if($PagesMax < ($PageCount - 1)) $Result .= ' ... ';
-    if($CurrentPage < ($PageCount - 1)) 
+    if($CurrentPage < ($PageCount - 1))
     {
       $QueryItems['page'] = ($CurrentPage + 1);
@@ -244 +244 @@
   }
   $Result = '<div style="text-align: center">'.$Result.'</div>';
-  return(array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage, 
+  return(array('SQLLimit' => ' LIMIT '.$CurrentPage * $ItemPerPage.', '.$ItemPerPage,
     'Page' => $CurrentPage,
     'Output' => $Result,
@@ -256 +256 @@
 {
   global $OrderDirSQL, $OrderArrowImage, $Config, $System;
-  
+
   if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
-  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage))) 
+  if(array_key_exists('OrderDir', $_GET) and (array_key_exists($_GET['OrderDir'], $OrderArrowImage)))
         $_SESSION['OrderDir'] = $_GET['OrderDir'];
   if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
-  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;  
-  
+  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = $DefaultOrder;
+
   // Check OrderCol
   $Found = false;
@@ -269 +269 @@
     if($Column['Name'] == $_SESSION['OrderCol'])
     {
-      $Found = true;    
+      $Found = true;
       break;
     }
@@ -280 +280 @@
   // Check OrderDir
   if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
-  
+
   $Result = '';
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
@@ -304 +304 @@
 {
   global $System;
-  
+
   $Output = '<select name="ClientVersion">';
   $DbResult = $System->Database->select('ClientVersion', '`Id`, `Version`', '`Imported` = 1');
-  $Output .= '<option value=""'; 
-  if($Selected == '') 
+  $Output .= '<option value=""';
+  if($Selected == '')
     $Output .= ' selected="selected"';
   $Output .= '>Žádná</option>';
   while($ClientVersion = $DbResult->fetch_assoc())
   {
-    $Output .= '<option value="'.$ClientVersion['Id'].'"'; 
-    if($Selected == $ClientVersion['Id']) 
+    $Output .= '<option value="'.$ClientVersion['Id'].'"';
+    if($Selected == $ClientVersion['Id'])
       $Output .= ' selected="selected"';
     $Output .= '>'.$ClientVersion['Version'].'</option>';
-  }    
+  }
   $Output .= '</select>';
-  return($Output);    
+  return($Output);
 }
 
 function GetLanguageList()
-{ 
+{
   global $System;
-  
+
   $Result = array();
   $DbResult = $System->Database->query('SELECT * FROM `Language` WHERE `Enabled` = 1');
@@ -334 +334 @@
 
 function GetTranslationTree()
-{ 
+{
   global $System;
-  
+
   $Result = array();
   $DbResult = $System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group` ORDER BY `Name`');
@@ -381 +381 @@
 }
 
-function FollowingTran($TextID, $Table, $GroupId, $Prev = false) 
-{ 
+function FollowingTran($TextID, $Table, $GroupId, $Prev = false)
+{
   global $System, $Config;
-  
+
   if($Prev)
     $sql = 'SELECT `ID` FROM `'.$Table.'` AS `item` WHERE '.
@@ -394 +394 @@
       'FROM `'.$Table.'` AS `sub` WHERE (`sub`.`Language` <> '.$Config['OriginalLanguage'].') '.
       'AND (`sub`.`entry` = `item`.`entry`)) AND `ID` > '.$TextID.' ORDER BY `ID` LIMIT 1';
-  
+
   $DbResult = $System->Database->query($sql);
   $Next = $DbResult->fetch_assoc();
-  if($Next) 
+  if($Next)
   {
     if($Prev) $Output = '<a href="form.php?group='.$GroupId.'&amp;ID='.$Next['ID'].'">Předcházející '.$Next['ID'].'</a> ';
@@ -408 +408 @@
 {
   global $System, $BuildNumbers;
-  
-  if(isset($BuildNumbers[$Version]) == false) 
+
+  if(isset($BuildNumbers[$Version]) == false)
   {
     $sql = 'SELECT `BuildNumber` FROM `ClientVersion` WHERE `Version` = "'.$Version.'"';
@@ -419 +419 @@
 }
 
-// TODO: Client version build number should not be used in internal references 
+// TODO: Client version build number should not be used in internal references
 function GetVersionWOW($BuildNumber)
 {
   global $System, $VersionsWOW;
-  
-  if(isset($VersionsWOW[$BuildNumber]) == false) 
+
+  if(isset($VersionsWOW[$BuildNumber]) == false)
   {
     $sql = 'SELECT `Version` FROM `ClientVersion` WHERE `BuildNumber` = "'.$BuildNumber.'"';
@@ -434 +434 @@
 }
 
-// TODO: Client version build number should not be used in internal references 
+// TODO: Client version build number should not be used in internal references
 function GetVersionWOWId($BuildNumber)
 {
   global $System, $VersionsWOWId;
-  
-  if(isset($VersionsWOWId[$BuildNumber]) == false) 
+
+  if(isset($VersionsWOWId[$BuildNumber]) == false)
   {
     $sql = 'SELECT `Id` FROM `ClientVersion` WHERE `BuildNumber` = "'.$BuildNumber.'"';
@@ -452 +452 @@
 {
   global $TranslationTree;
-  
-  if(array_key_exists('group', $_GET)) $GroupId = $_GET['group'] * 1; 
+
+  if(array_key_exists('group', $_GET)) $GroupId = $_GET['group'] * 1;
     else $GroupId = 1;
-  
+
   if(isset($TranslationTree[$GroupId]) == false) ErrorMessage('Překladová skupina dle zadaného Id neexistuje.');
   return($GroupId);
@@ -473 +473 @@
         $_GET[$Index] = $Parameter;
       }
-    } 
+    }
   }
 }
@@ -480 +480 @@
 {
   $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
-  
+
   if(array_key_exists('Tab', $_GET)) $_SESSION['Tab'] = $_GET['Tab'];
   if(!array_key_exists('Tab', $_SESSION)) $_SESSION['Tab'] = 0;
@@ -489 +489 @@
   {
     $QueryItems['Tab'] = $Index;
-    if($Index == $_SESSION['Tab']) $Selected = ' id="selected"'; 
+    if($Index == $_SESSION['Tab']) $Selected = ' id="selected"';
       else $Selected = '';
     $Output .= '<li'.$Selected.'><a href="?'.SetQueryStringArray($QueryItems).'">'.$Tab.'</a></li>';
@@ -520 +520 @@
 }
 
-function DeleteDirectory($dirname) 
+function DeleteDirectory($dirname)
 {
   if(is_dir($dirname))
@@ -526 +526 @@
     $dir_handle = opendir($dirname);
     if(!$dir_handle) return(false);
-    while($file = readdir($dir_handle)) 
+    while($file = readdir($dir_handle))
     {
       if(($file != '.') and ($file != '..'))
       {
         if(!is_dir($dirname.'/'.$file)) unlink($dirname.'/'.$file);
-          else DeleteDirectory($dirname.'/'.$file);    
+          else DeleteDirectory($dirname.'/'.$file);
       }
     }
@@ -546 +546 @@
 }
 
-function GetIDbyName($Table) 
+function GetIDbyName($Table)
 {
   global $TranslationTree;
-  
-  foreach($TranslationTree as $TableID => $Value) 
+
+  foreach($TranslationTree as $TableID => $Value)
   {
     if($Value['TablePrefix'] == $Table) return $TableID;
   }
 }
-function GetTranslatNamesArray() {  
+function GetTranslatNamesArray() {
 
 $TablesColumn = array
@@ -576 +576 @@
   return($TablesColumn);
 }
-function GetTranslatNames($Text,$mode,$TablesColumn, $FirstBig = True) 
+function GetTranslatNames($Text,$mode,$TablesColumn, $FirstBig = True)
 {
   global $System, $Config;
-  
+
  /* $TablesID = array('gameobject' => 5,
   'creature' => 6,
@@ -609 +609 @@
     $Text = str_replace('>',' ',$Text);
     $ArrStr = explode(' ', $Text);
-    $sqlall = '';  
-  foreach($TablesColumn as $Table => $Column) 
-  {  
+    $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 '.
@@ -620 +620 @@
     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 ('; 
+    $where .= ' AND (';
     if (array_search('the' , $ArrStr)) $where .= '(`O`.`'.$Column.'` LIKE "The %") OR ';
-    
+
     $SqlOK = false;
     if (count($ArrStr) > 0) {
@@ -639 +639 @@
       $where .= ')';
     }
-      if ($SqlOK) {                                                       
+      if ($SqlOK) {
         //$sql.$where.$groupby.$orderby
 //          $buff[] = array($Line['ID'], GetIDbyName($Table), $Line['Orig'], $Line['Tran']);
@@ -646 +646 @@
       }
 
-  }    
+  }
     if ($SqlOK) {
         $orderby = ' ORDER BY LENGTH(Orig) DESC ';
@@ -652 +652 @@
         $DbResult = $System->Database->query($sqlall.$orderby);
     //  echo ($sql.'|'.$where.'|'.$groupby);
-        while($Line = $DbResult->fetch_assoc()) 
+        while($Line = $DbResult->fetch_assoc())
         {
           $buff[] = array($Line['ID'], $Line['GoupId'], $Line['Orig'], $Line['Tran']);
@@ -665 +665 @@
   if($Pixels > $Width) $Pixels = $Width;
   if($Text == '') $Text = $Percent;
-  
+
   return('<div class="progressbar" style="width: '.$Width.'px">'.
-    '<div class="bar" style="width: '.$Pixels.'px;"></div>'.  
-    '<div class="text" style="width: '.$Width.'px">'.$Text.'</div>'.  
+    '<div class="bar" style="width: '.$Pixels.'px;"></div>'.
+    '<div class="text" style="width: '.$Width.'px">'.$Text.'</div>'.
     '</div>');
 }
@@ -675 +675 @@
 {
   $IndexLevel = 100;
-  
+
   if($XP > 0) $Level = floor(sqrt($XP / $IndexLevel));
     else $Level = 0;
@@ -701 +701 @@
   $Content = str_replace("\n", ' <br/>', $Content);
   $Content = str_replace("\r", '', $Content);
-  
-  $Result = '';  
+
+  $Result = '';
   $I = 0;
   while((strpos($Content, 'http://') !== false) or (strpos($Content, 'https://') !== false))
@@ -713 +713 @@
     if($SpacePos !== false) $URL = substr($Content, 0, strpos($Content, ' '));
       else $URL = substr($Content, 0);
-    
+
     $Result .= '<a href="'.$URL.'">'.$URL.'</a>';
     $Content = substr($Content, strlen($URL));
@@ -728 +728 @@
 {
   global $System;
-  
+
   $IconName = array(
-          MESSAGE_INFORMATION => 'information', 
-    MESSAGE_WARNING => 'warning', 
+          MESSAGE_INFORMATION => 'information',
+    MESSAGE_WARNING => 'warning',
     MESSAGE_CRITICAL => 'critical'
   );
   $BackgroundColor = array(
-        MESSAGE_INFORMATION => '#e0e0ff', 
-    MESSAGE_WARNING => '#ffffe0', 
+        MESSAGE_INFORMATION => '#e0e0ff',
+    MESSAGE_WARNING => '#ffffe0',
         MESSAGE_CRITICAL => '#ffe0e0'
   );
-  
+
   return('<div class="message" style="background-color: '.$BackgroundColor[$Type].
         ';"><table><tr><td class="icon"><img src="'.