Changeset 498 for trunk

Timestamp:

Jan 30, 2013, 10:33:07 PM (12 years ago)

Author:

chronos

Message:

• Upraveno: Optimalizace výpisu překladových položek v seznamu.
• Přidáno: Nastavení časové zóny z PHP.
• Upraveno: Tabulky převedeny z myisam na innodb. Doplněny indexy a cizí klíče. Provedeny některé optimalizace načítání.

Location:

trunk

Files:

• TranslationList.php (modified) (1 diff)
• export/create_addon.php (modified) (1 diff)
• includes/config.sample.php (modified) (1 diff)
• includes/global.php (modified) (3 diffs)
• registrace.php (modified) (2 diffs)
• sql/updates/498.sql (added)
• statistic.php (modified) (1 diff)
• team.php (modified) (1 diff)

trunk/TranslationList.php

@@ -191 +191 @@
   $Table = $TranslationTree[$Filter['Group']]['TablePrefix'];
   
-  $Query = 'SELECT `T`.*, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`) AS `UserName` FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL'];
+  $Query = 'SELECT `T`.`ID`, `T`.`Entry`, `T`.`VersionStart`, `T`.`VersionEnd`, '.
+    '`T`.`Name`, (SELECT `User`.`Name` FROM `User` WHERE `User`.`ID` = `T`.`User`)'.
+    'AS `UserName` FROM `'.$Table.'` AS `T` WHERE 1 '.$Filter['SQL'];
   //echo($Query);
   

trunk/export/create_addon.php

@@ -65 +65 @@
   function ReplaceCzText($string)
   {
-    $string = mysql_escape_string($string);
+    $string = $this->Database->real_escape_string($string);
     $string = str_replace('$B', '\r\n', $string);
     $string = str_replace('$b', '\r\n', $string); 

trunk/includes/config.sample.php

@@ -31 +31 @@
     'VisiblePagingItems' => 20,
     'WebCounter' => '',
+    'Timezone' => 'Europe/Prague',
   ),
   'ExportTaskProcessPeriod' => 10,

trunk/includes/global.php

@@ -17 +17 @@
 if(file_exists(dirname(__FILE__).'/config.php')) include_once(dirname(__FILE__).'/config.php');
   else die('Nenalezen konfigurační soubor config.php ve složce includes. Vytvořte jej zkopírováním vzoru config.sample.php.');
+date_default_timezone_set($Config['Web']['Timezone']);
 include_once(dirname(__FILE__).'/Database.php');
 include_once(dirname(__FILE__).'/rss.php');
@@ -62 +63 @@
   if($User->Licence(LICENCE_USER))
   {
-    $DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team);
-    $Team = $DbResult->fetch_assoc();
-
+    //$DbResult = $System->Database->query('SELECT `Id`, `Name` FROM `Team` WHERE `Id`='.$User->Team);
+    //$Team = $DbResult->fetch_assoc();
     //echo('<span class="MenuItem">Moje překlady: <a href="">Dokončené</a> <a href="">Rozpracované</a> <a href="">Exporty</a> Tým: <a href="">'.$Team['name'].'</a></span>');
     echo('<span class="MenuItem2">'.$User->Name.' <a href="'.$System->Link('/?action=logout').'">Odhlášení</a> <a href="'.$System->Link('/Options.php').'">Nastavení</a>');
@@ -250 +250 @@
       if($User->Role != LICENCE_ANONYMOUS)
       {
+        WriteLog('Odhlášení', LOG_TYPE_USER);
         $User->Logout();
         $Message = 'Byl jsi odhlášen.';  
         $MessageType = MESSAGE_INFORMATION;
-        WriteLog('Odhlášení', LOG_TYPE_USER);
       }
     }

trunk/registrace.php

@@ -14 +14 @@
     else $Email = '';
   if(array_key_exists('Team', $_POST)) $Team = $_POST['Team'];
-    else $Team = 0;
+    else $Team = '';
   if(array_key_exists('Language', $_POST)) $Language = $_POST['Language'];
     else $Language = 1;
@@ -50 +50 @@
     <tr>
       <td>Patřím do týmu: </td>');
-      if($Team == 0) $Selected = ' selected="selected"'; 
+      if($Team == '') $Selected = ' selected="selected"'; 
         else $Selected = '';
       echo('<td><select name="Team"><option value="0"'.$Selected.'>Žádného</option>

trunk/statistic.php

@@ -19 +19 @@
   {
     $Query .= 'SELECT (SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-    ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
+    ' SELECT `T`.`Id`, `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
     ' WHERE (`Complete` = 1) AND (`Language`='.$LanguageId.') AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
     ') AS `C1`) AS `Translated`, '.
     '(SELECT COUNT(DISTINCT(`Entry`)) FROM ('.
-    ' SELECT `T`.* FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
+    ' SELECT `T`.`Id`, `T`.`Entry` FROM `'.$DbRow['TablePrefix'].'` AS `T`'.
     ' WHERE (`Language` = 0) AND (`VersionStart` <= '.$BuildNumber.') AND (`VersionEnd` >= '.$BuildNumber.')'.
     ') AS `C2`) AS `Total`, "'.$DbRow['Name'].'" AS `Name` UNION ';

trunk/team.php

@@ -263 +263 @@
   if($User->Licence(LICENCE_USER))
   {   
-    $System->Database->query('UPDATE `User` SET `Team` = 0 WHERE `ID` = '.$User->Id); 
+    $System->Database->query('UPDATE `User` SET `Team` = NULL WHERE `ID` = '.$User->Id); 
     ShowMessage('Nyní nejste členem žádného týmu.');    
     WriteLog('Uživatel vystoupil z týmu', LOG_TYPE_USER);