Changeset 859 for trunk/includes

Timestamp:

Jan 21, 2016, 10:20:04 AM (9 years ago)

Author:

chronos

Message:

• Modified: Function GetTranslationTree moved from global to Translation module where it belongs.

Location:

trunk/includes

Files:

• Global.php (modified) (3 diffs)
• System.php (modified) (4 diffs)

trunk/includes/Global.php

@@ -336 +336 @@
 }
 
-function GetTranslationTree()
-{
-  global $System;
-
-  $Result = array();
-  $Groups = array();
-  $DbResult = $System->Database->query('SELECT *, UNIX_TIMESTAMP(`LastImport`) AS `LastImportTime` FROM `Group`');
-  while($DbRow = $DbResult->fetch_assoc())
-    $Groups[T($DbRow['Name'])] = $DbRow;
-  ksort($Groups);
-  foreach($Groups as $Group)
-  {
-    $Group['Items'] = array();
-    $Group['Game'] = T($Group['Name']);
-    $Result[$Group['Id']] = $Group;
-  }
-  $DbResult = $System->Database->query('SELECT * FROM `GroupItem` ORDER BY `Group`, `Sequence`');
-  while($DbRow = $DbResult->fetch_assoc())
-  {
-    $Result[$DbRow['Group']]['Items'][] = $DbRow;
-  }
-  return($Result);
-}
-
 $Moderators = array('Překladatel', 'Moderátor', 'Administrátor');
 
@@ -459 +435 @@
 function LoadGroupIdParameter()
 {
-  global $TranslationTree;
+  global $System;
+  $TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
   if(array_key_exists('group', $_GET)) $GroupId = $_GET['group'] * 1;
@@ -556 +533 @@
 function GetIDbyName($Table)
 {
-  global $TranslationTree;
+  global $System;
+
+  $TranslationTree = $System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
   foreach($TranslationTree as $TableID => $Value)

trunk/includes/System.php

@@ -91 +91 @@
   function Run()
   {
-    global $ScriptStartTime, $TranslationTree, $StopAfterUpdateManager,
+    global $ScriptStartTime, $StopAfterUpdateManager,
       $UpdateManager;
 
@@ -116 +116 @@
       $this->ModuleManager->Start();
     }
-
-    // TODO: Global initialized variable should be removed
-    $TranslationTree = GetTranslationTree();
 
     // Initialize application modules
@@ -450 +447 @@
   function ShowTranslatedMenu()
   {
-    global $TranslationTree;
+    $TranslationTree = $this->System->ModuleManager->Modules['Translation']->GetTranslationTree();
 
     $Output = '<strong>'.T('Translate groups').':</strong><br /><div id="TranslationMenu">';
@@ -522 +519 @@
     $ScriptGenerateDuration = round(GetMicrotime() - $ScriptStartTime, 2);
 
-    $Output = '</td>'.
-      '<td class="menu2">';
-    $Output .= $this->ShowTranslatedMenu();
-    $Output .= '</td>'.
-      '</tr><tr>'.
+    $Output = '</td>';
+    if($this->System->ModuleManager->ModulePresent('Translation'))
+    {
+      $Output .= '<td class="menu2">';
+      $Output .= $this->ShowTranslatedMenu();
+      $Output .= '</td>';
+    }
+    $Output .= '</tr><tr>'.
       '<td colspan="4" class="page-bottom">'.T('Version').': '.$Version.' '.T('Revision').': '.$Revision.' ('.HumanDate($ReleaseTime).')'.
       ' &nbsp; <a href="http://svn.zdechov.net/trac/wowpreklad/browser/trunk">'.T('Source code').'</a> &nbsp; '.