Changeset 108 for trunk

Timestamp:

Feb 18, 2009, 8:33:41 PM (16 years ago)

Author:

george

Message:

• Upraveno: Zobrazovat v ladících běhových informacích také povolené maximální hodnoty paměti a doby běhu.

Location:

trunk

Files:

• addon/make.php (modified) (3 diffs)
• download.php (modified) (2 diffs)
• includes/global.php (modified) (1 diff)

trunk/addon/make.php

@@ -90 +90 @@
   $SelectedUsers = substr($SelectedUsers, 1);
 
-  if($SelectedUsers == '') $WhereUsers = 1; 
-    else $WhereUsers = '(User IN ('.$SelectedUsers.'))';
+  if($SelectedUsers == '')
+  {
+        $WhereUsers = 1;
+        $OrderByUserList = '';
+  } else
+  {
+        $WhereUsers = '(User IN ('.$SelectedUsers.'))';
+        $OrderByUserList = ' ORDER BY FIELD(User, '.$SelectedUsers.')';
+  }
         
   foreach($TranslationTree as $Group) 
@@ -110 +117 @@
 
       $Buffer = 'CZWOW_'.$Column['AddonFileName'].
-            '_count='.$FileIndex.'; CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';         
+            '_count='.$FileIndex.'; CZWOW_'.$Column['AddonFileName'].'_'.$FileIndex.'={';
     
-      $Query = 'SELECT T2.'.$Column['Column'].' AS Translation, T3.'.$Column['Column'].' as Original FROM (SELECT T1.entry, T1.'.$Column['Column'].' FROM (SELECT entry,'.$Column['Column'].' FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$WhereLang.' AND '.$WhereUsers.' ORDER BY FIELD(User, '.$SelectedUsers.')) AS T1 GROUP BY T1.entry) as T2 JOIN '.$Group['TablePrefix'].' AS T3 ON (T2.entry = T3.entry) AND (T3.Language = 0)';
+      $Query = 'SELECT T2.'.$Column['Column'].' AS Translation, T3.'.$Column['Column'].' as Original FROM (SELECT T1.entry, T1.'.$Column['Column'].' FROM (SELECT entry,'.$Column['Column'].' FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$WhereLang.' AND '.$WhereUsers.$OrderByUserList.') AS T1 GROUP BY T1.entry) as T2 JOIN '.$Group['TablePrefix'].' AS T3 ON (T2.entry = T3.entry) AND (T3.Language = 0)';
       $DbResult = $Database->SQLCommand($Query);
       while($Line = mysql_fetch_array($DbResult)) 
@@ -156 +163 @@
   $SelectedUsers = substr($SelectedUsers, 1);
 
-  if($SelectedUsers == '') $WhereUsers = 1; 
-    else $WhereUsers = '(User IN ('.$SelectedUsers.'))';
+  if($SelectedUsers == '')
+  {
+        $WhereUsers = 1;
+        $OrderByUserList = '';
+  } else
+  {
+        $WhereUsers = '(User IN ('.$SelectedUsers.'))';
+        $OrderByUserList = ' ORDER BY FIELD(User, '.$SelectedUsers.')';
+  }
         
   $Buffer = "local f=function(name, en, cz) CzWoW_interface[name]=cz; CzWoW_interface_entoname[en]=name; end; CzWoW_interface={ };CzWoW_interface_entoname={ };\n";
   $Group = $TranslationTree[9]; // client table
   $Column['Column'] = 'Text';
-  $Query = 'SELECT T2.'.$Column['Column'].' AS Translation, T3.'.$Column['Column'].' as Original, T3.id_text FROM (SELECT T1.entry, T1.'.$Column['Column'].' FROM (SELECT entry,'.$Column['Column'].' FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$WhereLang.' AND '.$WhereUsers.' ORDER BY FIELD(User, '.$SelectedUsers.')) AS T1 GROUP BY T1.entry) as T2 JOIN '.$Group['TablePrefix'].' AS T3 ON (T2.entry = T3.entry) AND (T3.Language = 0)';
+  $Query = 'SELECT T2.'.$Column['Column'].' AS Translation, T3.'.$Column['Column'].' as Original, T3.id_text FROM (SELECT T1.entry, T1.'.$Column['Column'].' FROM (SELECT entry,'.$Column['Column'].' FROM '.$Group['TablePrefix'].' WHERE (Complete = 1) AND '.$WhereLang.' AND '.$WhereUsers.$OrderByUserList.') AS T1 GROUP BY T1.entry) as T2 JOIN '.$Group['TablePrefix'].' AS T3 ON (T2.entry = T3.entry) AND (T3.Language = 0)';
   $DbResult = $Database->SQLCommand($Query);
   while($Line = mysql_fetch_array($DbResult)) 

trunk/download.php

@@ -6 +6 @@
   if(array_key_exists('ExportSetting', $_COOKIE)) 
     $_SESSION['ExportSetting'] = $_COOKIE['ExportSetting'];
-        else $_SESSION['ExportSetting'] = array();
+        else $_SESSION['ExportSetting'] = '';
   
 setcookie('ExportSetting', $_SESSION['ExportSetting']);
@@ -175 +175 @@
           '<a href="'.$SaveFilename.'">CzWoW_Addon.zip</a><br />'.
           'Pokud se vám zdá, že filtr na export nefunguje, vymažte si vyrovnávací paměť prohlížeče a zkuste stáhnout soubor znovu.');
-                echo('<br /><strong>Použití ve hře</strong><br />Menu addonu ve hře vyvoléte povelem /czwow.');
+                echo('<br /><strong>Použití ve hře</strong><br />Menu addonu ve hře vyvoláte povelem /czwow.');
             break;
           case 'DBC':

trunk/includes/global.php

@@ -237 +237 @@
     <tr>
     <td colspan="3" class="page-bottom">Autoři: maron, chronos &nbsp; <a href="http://wowpreklad.zdechov.net/trac/wowpreklad/browser/trunk">Zdrojové soubory</a></td></tr>');
-  if($Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s &nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).'</td></tr>');
+  if($Config['Web']['ShowRuntimeInfo'] == true) echo('<tr><td colspan="3" style="text-align: center;">Doba generování: '.$ScriptGenerateDuration.' s / '.ini_get('max_execution_time').' s &nbsp;&nbsp; Použitá paměť: '.HumanSize(memory_get_peak_usage(FALSE)).' / '.ini_get('memory_limit').'B</td></tr>');
 echo('</table>
   </body>