Changeset 288

Timestamp:

Dec 22, 2009, 1:10:06 PM (14 years ago)

Author:

george

Message:

• Upraveno: Vytovřena funkce pro podporu řazení tabulek. Různé tabulky načítané za databáze mají nyní v hlavičce možnost řazení sestupně/vzestupně podle dostupných sloupců.

Location:

trunk

Files:

• TranslationList.php (modified) (1 diff)
• dictionary.php (modified) (1 diff)
• images/sort_asc.png (added)
• images/sort_desc.png (added)
• includes/error.php (modified) (4 diffs)
• includes/global_function.php (modified) (1 diff)
• log.php (modified) (1 diff)
• team.php (modified) (3 diffs)
• userlist.php (modified) (3 diffs)
• version.php (modified) (1 diff)

trunk/TranslationList.php

@@ -97 +97 @@
   }
   
-  echo('<table class="BaseTable"><tr>
-    <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=ID&amp;desc='.$desc.'">Pořadové číslo</a></th>
-    <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=entry&amp;desc='.$desc.'">Identifikační číslo</a></th>
-    <th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order='.$TranslationTree[$GroupId]['Items'][0]['Column'].'&amp;desc='.$desc.'">Název</a></th>
-    <th>Verze</th>');
-  if ($address == 'selection') echo('<th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=CountQuests&amp;desc='.$desc.'">Výskyt</a></th>'); 
-  else if ($address == 'connexion') echo ('<th>Již přeložil</th>');
-  else if($address <> 'notran') echo('<th><a href="?group='.$GroupId.'&amp;action='.$address.'&amp;order=user&amp;desc='.$desc.'">Uživatel</a></th>');
-  echo('</tr>');
+  $TableColumns = array(
+    array('Name' => 'ID', 'Title' => 'Pořadové číslo'), 
+    array('Name' => 'entry', 'Title' => 'Identifikační číslo'), 
+    array('Name' => $TranslationTree[$GroupId]['Items'][0]['Column'], 'Title' => 'Název'), 
+    array('Name' => 'VersionStart', 'Title' => 'Verze'), 
+  );
+  if($address == 'selection') $TableColumns[] = array('Name' => 'CountQuests', 'Title' => 'Výskyt');
+  else if($address == 'connexion') $TableColumns[] = array('Name' => '', 'Title' => 'Již přeložil');
+  else if($address <> 'notran') $TableColumns[] = array('Name' => 'User', 'Title' => 'Překladatel');
+    
+  $Order = GetOrderTableHeader($TableColumns, 'ID');
+  echo('<table class="BaseTable">');
+  echo($Order['Output']);
    
   //print_r($TranslationTree[$GroupId]['Items']);
-  $ID = $Database->SQLCommand($sql.' '.$order.' '.$desc.' '.$limit);
+  $ID = $Database->SQLCommand($sql.' '.$Order['SQL'].' '.$limit);
   while($Line = mysql_fetch_assoc($ID)) 
   {

trunk/dictionary.php

@@ -223 +223 @@
   $PageList = GetPageList($DbRow[0]);  
 
-  $sql_page = $sql.' '.$PageList['SQLLimit'];
-
   echo($PageList['Output']);
-  echo('<table width="98%" class="BaseTable">
-    <tr><th>Angličtina</th>
-    <th>'.$LanguageList[$_SESSION['language']]['Name'].'</th>
-    <th>Popis</th><th>Překladatel</th>');
-    if(Licence(LICENCE_USER)) echo('<th>Akce</th>');
-    echo('</tr>');
+  
+  $TableColumns = array(
+    array('Name' => 'Original', 'Title' => 'Angličtina'), 
+    array('Name' => 'Translated', 'Title' => $LanguageList[$_SESSION['language']]['Name']), 
+    array('Name' => 'Description', 'Title' => 'Popis'), 
+    array('Name' => 'UserName', 'Title' => 'Překladatel'), 
+  );
+  if(Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Akce');
+  $Order = GetOrderTableHeader($TableColumns, 'Original');
+  echo('<table width="98%" class="BaseTable">');
+  echo($Order['Output']);
+
+  $sql_page = $sql.$Order['SQL'].$PageList['SQLLimit'];
   $ID = $Database->SQLCommand($sql_page);
   while($Line = mysql_fetch_assoc($ID)) 

trunk/includes/error.php

@@ -5 +5 @@
   global $Config;
   
-  $Date = date('Y-m-d H:i:s');          // časové razítko položky
+  $Date = date('Y-m-d H:i:s');    // časové razítko položky
   $ErrorType = array
   (
@@ -36 +36 @@
     foreach($Backtrace as $Item)
     {
+      print_r($Item);
       $Error .= ' '.$Item['file'].'('.$Item['line'].")\t".$Item['function'];
       $Arguments = '';
@@ -51 +52 @@
     //if($Config['Web']['ErrorLogFile'] != '')
       //error_log($Error, 3, $Config['Web']['ErrorLogFile']);
-          // Pošli mi zprávu (pokud je to kritická chyba)
+    // Pošli mi zprávu (pokud je to kritická chyba)
       //mail($Config['Web']['AdminEmail'], $Config['Web']['Title'].' - Chybové hlášení', $Error);
-          // Show error message
-          if($Config['Web']['ShowPHPError'] == true)
-          {
-            echo('<?xml version="1.0" encoding="utf-8"?>'."\n".
+    // Show error message
+    if($Config['Web']['ShowPHPError'] == true)
+    {
+      echo('<?xml version="1.0" encoding="utf-8"?>'."\n".
       '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.
       '<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="cs" lang="cs">'.
@@ -63 +64 @@
       '</head><body>'.    
       'Došlo k vnitřní chybě!<br /> O chybě byl uvědoměn správce webu a chybu brzy odstraní.<br /><br />');
-          echo('<pre>'.$Error.'</pre><br />');                  // V případě ladění chybu i zobraz
+      echo('<pre>'.$Error.'</pre><br />');      // V případě ladění chybu i zobraz
       echo('</body></html>');
-          }
+    }
     WriteLog($Error, 10);
     if((E_ERROR | E_PARSE) & $Number) die(); 

trunk/includes/global_function.php

@@ -87 +87 @@
     'Output' => $Result,
   ));
+}
+
+$OrderDirSQL = array('ASC', 'DESC');
+$OrderArrowImage = array('sort_asc.png', 'sort_desc.png');
+
+function GetOrderTableHeader($Columns, $DefaultColumn)
+{
+  global $OrderDirSQL, $OrderArrowImage;
+  
+  if(array_key_exists('OrderCol', $_GET)) $_SESSION['OrderCol'] = $_GET['OrderCol'];
+  if(array_key_exists('OrderDir', $_GET)) $_SESSION['OrderDir'] = $_GET['OrderDir'];
+  if(!array_key_exists('OrderCol', $_SESSION)) $_SESSION['OrderCol'] = $DefaultColumn;
+  if(!array_key_exists('OrderDir', $_SESSION)) $_SESSION['OrderDir'] = 0;
+  
+  // Check OrderCol
+  $Found = false;
+  foreach($Columns as $Column)
+  {
+    if($Column['Name'] == $_SESSION['OrderCol'])
+    {
+      $Found = true;    
+      break;
+    }
+  }
+  if($Found == false) $_SESSION['OrderCol'] = $DefaultColumn;
+  // Check OrderDir
+  if(($_SESSION['OrderDir'] != 0) and ($_SESSION['OrderDir'] != 1)) $_SESSION['OrderDir'] = 0;
+  
+  $Result = '';
+  $QueryItems = GetQueryStringArray($_SERVER['QUERY_STRING']);
+  foreach($Columns as $Index => $Column)
+  {
+    $QueryItems['OrderCol'] = $Column['Name'];
+    $QueryItems['OrderDir'] = 1 - $_SESSION['OrderDir'];
+    if($Column['Name'] == $_SESSION['OrderCol']) $ArrowImage = '<img  style="vertical-align: middle; border: 0px;" src="images/'.$OrderArrowImage[$_SESSION['OrderDir']].'" alt="order arrow">';
+      else $ArrowImage = '';
+    if($Column['Name'] == '') $Result .= '<th>'.$Column['Title'].'</th>';
+      else $Result .= '<th><a href="?'.SetQueryStringArray($QueryItems).'">'.$Column['Title'].$ArrowImage.'</a></th>';
+  }
+  return(array(
+    'SQL' => ' ORDER BY '.$_SESSION['OrderCol'].' '.$OrderDirSQL[$_SESSION['OrderDir']],
+    'Output' => '<tr>'.$Result.'</tr>')
+  );
 }
 

trunk/log.php

@@ -68 +68 @@
   $PageList = GetPageList($DbRow[0]);    
   
-  $sql = 'SELECT *,(SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` FROM `log` '.$Where.' ORDER BY `date` DESC '.$PageList['SQLLimit'];
-   
   echo($PageList['Output']);
-  echo('<table class="BaseTable"><tr><th>Čas</th><th>Text</th><th>Uživatel</th><th>Adresa</th></tr>');
-  $ID = $Database->SQLCommand($sql);
+  
+  $TableColumns = array(
+    array('Name' => 'date', 'Title' => 'Čas'), 
+    array('Name' => 'text', 'Title' => 'Text'), 
+    array('Name' => 'user', 'Title' => 'Uživatel'), 
+    array('Name' => 'IP', 'Title' => 'Adresa'), 
+  );
+  $Order = GetOrderTableHeader($TableColumns, 'date');
+  echo('<table width="98%" class="BaseTable">');
+  echo($Order['Output']);
+  
+  $sql = 'SELECT *,(SELECT `user`.`user` FROM `user` WHERE `user`.`id` = `log`.`user`) AS `user` FROM `log` '.$Where.$Order['SQL'].$PageList['SQLLimit'];
+$ID = $Database->SQLCommand($sql);
   while($Line = mysql_fetch_assoc($ID)) 
   {

trunk/team.php

@@ -11 +11 @@
   echo('<h3>Seznam překladatelských týmů</h3>');
 
-  if(array_key_exists('Order', $_GET)) $_SESSION['Order'] = $_GET['Order']; 
-    else if(!array_key_exists('Order', $_SESSION)) $_SESSION['Order'] = 'numberuser';
-  if(array_key_exists('Desc', $_GET)) $_SESSION['Desc'] = $_GET['Desc']; 
-    else if(!array_key_exists('Desc', $_SESSION)) $_SESSION['Desc'] = '';
-  
   $DbResult = $Database->SQLCommand('SELECT COUNT(*) FROM `team`');
   $DbRow = mysql_fetch_row($DbResult);
@@ -22 +17 @@
   echo($PageList['Output']);
   echo('<table class="BaseTable">');
+
+  $TableColumns = array(
+    array('Name' => 'name', 'Title' => 'Jméno'), 
+    array('Name' => 'numberuser', 'Title' => 'Počet členů'), 
+  );
+  if(Licence(LICENCE_USER)) $TableColumns[] = array('Name' => '', 'Title' => 'Uživatelské akce');
+
+  $Order = GetOrderTableHeader($TableColumns, 'numberuser');
+  echo($Order['Output']);
 
   if(array_key_exists('search', $_GET))  $_SESSION['search'] = ' WHERE `name` LIKE "%'.$_GET['search'].'%" OR `description` LIKE "%'.$_GET['search'].'%"'; 
@@ -39 +43 @@
     */
 
-    $desc = $_SESSION['Desc']; 
-    if($desc == '') $desc = 'DESC'; else $desc = '';
-
-    //ochrana proti špatným údajům v session z jiných tabulek
-    if(($_SESSION['Order'] <> 'name') and ($_SESSION['Order'] <> 'numberuser') and ($_SESSION['Order'] <> 'description'))
-    $_SESSION['Order'] = 'numberuser';
-/*
- 
-  <th><a href="?Order=NumberTranslate&amp;Desc='.$desc.'" title="Počet přeložených textů">Přeložených</a></th>
-  <th><a href="?Order=XP&amp;Desc='.$desc.'">Úroveň</a></th>
-*/
-    echo('<tr><th><a href="?Order=name&amp;Desc='.$desc.'">Jméno</a></th>'.
-    '<th><a href="?Order=numberuser&amp;Desc='.$desc.'">Počet členů</a></th>');
-    if(Licence(LICENCE_USER)) echo('<th>Uživatelské akce</th>');
-    echo('</tr>');
-
-    $ID = $Database->SQLCommand('SELECT *, (SELECT COUNT(*) FROM user WHERE user.team = team.ID) AS numberuser FROM team '.$_SESSION['search'].' ORDER BY '.$_SESSION['Order'].' '.$_SESSION['Desc'].' '.$PageList['SQLLimit']);
+    $ID = $Database->SQLCommand('SELECT *, (SELECT COUNT(*) FROM user WHERE user.team = team.ID) AS numberuser FROM team '.$_SESSION['search'].$Order['SQL'].$PageList['SQLLimit']);
     while($Line = mysql_fetch_assoc($ID)) 
     {

trunk/userlist.php

@@ -8 +8 @@
 
 echo('<h3>Seznam uživatelů</h3>');
-if(array_key_exists('Order', $_GET)) $_SESSION['Order'] = $_GET['Order']; 
-else if(!array_key_exists('Order', $_SESSION)) $_SESSION['Order'] = 'NumberTranslate';
-if(array_key_exists('Desc', $_GET)) $_SESSION['Desc'] = $_GET['Desc']; 
-else if(!array_key_exists('Desc', $_SESSION)) $_SESSION['Desc'] = 'DESC';
 
 if(array_key_exists('search', $_GET))
@@ -37 +33 @@
 echo('<table class="BaseTable">');
 
-$desc = $_SESSION['Desc']; 
-if($desc == '') $desc = 'DESC'; else $desc = '';
-
-//ochrana proti špatným údajům v session z jiných tabulek
-if (($_SESSION['Order'] <> 'user') and ($_SESSION['Order'] <> 'XP') and ($_SESSION['Order'] <> 'NumberTranslate') and ($_SESSION['Order'] <> 'GM') and ($_SESSION['Order'] <> 'LastLogin'))
-$_SESSION['Order'] = 'NumberTranslate';
-
-echo('<tr><th><a href="?Order=user&amp;Desc='.$desc.'">Jméno</a></th>
-  <th><a href="?Order=NumberTranslate&amp;Desc='.$desc.'" title="Počet přeložených textů">Přeložených</a></th>
-  <th><a href="?Order=XP&amp;Desc='.$desc.'">Úroveň</a></th>
-  <th><a href="?Order=GM&amp;Desc='.$desc.'">Oprávnění</a></th>
-  <th><a href="?Order=LastLogin&amp;Desc='.$desc.'">Poslední připojení</a></th></tr>');
+$TableColumns = array(
+  array('Name' => 'user', 'Title' => 'Jméno'), 
+  array('Name' => 'NumberTranslate', 'Title' => 'Přeložených'), 
+  array('Name' => 'XP', 'Title' => 'Úroveň'), 
+  array('Name' => 'GM', 'Title' => 'Oprávnění'), 
+  array('Name' => 'LastLogin', 'Title' => 'Poslední připojení'), 
+);
+$Order = GetOrderTableHeader($TableColumns, 'NumberTranslate');
+echo($Order['Output']);
 
 $Columns = '';
@@ -59 +52 @@
   }
 
-$Query = 'SELECT ID, user.user, LastLogin, GM, ('.substr($Columns, 0, -3).') as NumberTranslate FROM `user`'.$Joins.' '.$_SESSION['Where'].' ORDER BY '.$_SESSION['Order'].' '.$_SESSION['Desc'].' '.$PageList['SQLLimit'];
+$Query = 'SELECT ID, user.user, LastLogin, GM, ('.substr($Columns, 0, -3).') as NumberTranslate FROM `user`'.$Joins.' '.$_SESSION['Where'].$Order['SQL'].$PageList['SQLLimit'];
 
 $ID = $Database->SQLCommand($Query);

trunk/version.php

@@ -11 +11 @@
 echo('<h3>Verze hry</h3>');
 echo($PageList['Output']);
-echo('<table class="BaseTable"><tr><th>Verze</th><th>Sestavení</th><th>Datum uvolnění</th><th>Titulek</th></tr>');
-$DbResult = $Database->SQLCommand('SELECT * FROM wow_client_version ORDER BY BuildNumber DESC '.$PageList['SQLLimit']);
+
+$TableColumns = array(
+  array('Name' => 'Version', 'Title' => 'Verze'), 
+  array('Name' => 'BuildNumber', 'Title' => 'Sestavení'), 
+  array('Name' => 'ReleaseDate', 'Title' => 'Datum uvolnění'), 
+  array('Name' => 'Title', 'Title' => 'Titutek'), 
+);
+$Order = GetOrderTableHeader($TableColumns, 'BuildNumber');
+echo('<table class="BaseTable">');
+echo($Order['Output']);
+
+$DbResult = $Database->SQLCommand('SELECT * FROM wow_client_version '.$Order['SQL'].$PageList['SQLLimit']);
 while($Version = mysql_fetch_assoc($DbResult))
 {