Changeset 579 for trunk

Timestamp:

Sep 11, 2013, 11:30:14 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Various errors related to old global variables.

Location:

trunk

Files:

• Modules/Team/Team.php (modified) (1 diff)
• Modules/Translation/Comparison.php (modified) (2 diffs)
• Modules/Translation/Save.php (modified) (11 diffs)
• Modules/User/User.php (modified) (1 diff)
• Todo.txt (modified) (1 diff)
• action.php (deleted)
• admin/index.php (modified) (1 diff)
• admin/install.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)
• includes/global.php (modified) (1 diff)
• includes/system.php (modified) (1 diff)

trunk/Modules/Team/Team.php

@@ -27 +27 @@
 }
 
-include_once('../../img_level.php');
+include_once(dirname(__FILE__).'/../../img_level.php');
 
 class PageTeam extends Page

trunk/Modules/Translation/Comparison.php

@@ -40 +40 @@
         function Show()
         {
-                global $User, $Config, $TranslationTree;
+                global $TranslationTree;
         
     $Output = 'Text je porovnáván vždy ku předešlému (vlevo). Změny jsou zvýrazněny <span class="edit">barvou.</span><br /><br />';
@@ -54 +54 @@
                                 $TextID1 = $_GET['ID1'];
                                 $TextID2 = $_GET['ID2'];
-                                $WhereID = ' AND ((`'.$Table.'`.`ID` = '.$TextID1.') OR (`'.$Table.'`.`ID` = '.$TextID2.') OR (`'.$Table.'`.`Language` = '.$Config['OriginalLanguage'].'))';
+                                $WhereID = ' AND ((`'.$Table.'`.`ID` = '.$TextID1.') OR (`'.$Table.'`.`ID` = '.$TextID2.') OR (`'.$Table.'`.`Language` = '.$this->System->Config['OriginalLanguage'].'))';
                         } else $WhereID = '';
         

trunk/Modules/Translation/Save.php

@@ -5 +5 @@
   function Show()
   {
-        global $System, $User, $Config, $TranslationTree;
+        global $TranslationTree;
         
         $Output = '';
@@ -11 +11 @@
         
         unset($Message);
-        $System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
+        $this->System->ModuleManager->Modules['FrontPage']->HandleLoginForm();
         if(isset($Message)) $Output .= ShowMessage($Message, $MessageType);
         
@@ -17 +17 @@
         $Group = $TranslationTree[$GroupId];
         $Table = $Group['TablePrefix'];
-        if($User->Licence(LICENCE_USER))
+        if($this->System->User->Licence(LICENCE_USER))
         {
                 if(array_key_exists('ID', $_POST) and is_numeric($_POST['ID']))
@@ -28 +28 @@
         
                         // Get source text record from database by ID
-                        $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
+                        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE `ID`='.$TextID);
                         if($DbResult->num_rows > 0)
                         {
@@ -34 +34 @@
         
                                 // Get data for english original
-                                $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].
-                                                ') AND (`Language` = '.$Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].
+                                $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Entry`='.$SourceText['Entry'].
+                                                ') AND (`Language` = '.$this->System->Config['OriginalLanguage'].') AND (`VersionStart` = '.$SourceText['VersionStart'].
                                                 ') AND (`VersionEnd` = '.$SourceText['VersionEnd'].')');
                                 if($DbResult->num_rows > 0)
@@ -48 +48 @@
                                         if(substr($Filter, 0, 3) == ' OR') $Filter = ' AND ('.substr($Filter, 3).')';
         
-                                        $DbResult = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$Config['OriginalLanguage'].')'.$Filter);
+                                        $DbResult = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`Language` = '.$this->System->Config['OriginalLanguage'].')'.$Filter);
                                         while($EnglishFound = $DbResult->fetch_assoc())
                                         {
                                                 // Get user translation paired to found english item entry
-                                                $DbResult2 = $System->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$User->Id.
+                                                $DbResult2 = $this->Database->query('SELECT * FROM `'.$Table.'` WHERE (`User` = '.$this->System->User->Id.
                                                                 ') AND (`Entry` = '.$EnglishFound['Entry'].') AND (`VersionStart` = '.$EnglishFound['VersionStart'].
                                                                 ') AND (`VersionEnd` = '.$EnglishFound['VersionEnd'].')');
@@ -98 +98 @@
         
                                                         // Update user translation
-                                                        $System->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
+                                                        $this->Database->query('UPDATE `'.$Table.'` SET '.$Values.' WHERE `ID` = '.$ExistedText['ID']);
         
                                                         $Output .= 'Změny v překladu <a href="form.php?group='.$GroupId.'&amp;ID='.$ExistedText['ID'].'">'.$ExistedText['ID'].'</a> ('.$ExistedText['Entry'].') uloženy jako '.$CompleteText[$NewComplete].'.<br />';
@@ -106 +106 @@
                                                         // Insert new user translation
                                                         $Columns = '`Entry`, `VersionStart`, `VersionEnd`, `Language`, `User`, `Take`, `ModifyTime`';
-                                                        $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.$EnglishFound['VersionEnd'].', '.$Language.', '.$User->Id.', '.$SourceText['ID'].', NOW()';
+                                                        $Values = $EnglishFound['Entry'].', '.$EnglishFound['VersionStart'].', '.$EnglishFound['VersionEnd'].', '.$Language.', '.$this->System->User->Id.', '.$SourceText['ID'].', NOW()';
         
                                                         $CompleteParts = 0;
@@ -145 +145 @@
                                                         $Values .= ', '.$NewComplete.', '.$CompleteParts;
         
-                                                        $System->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
-                                                        $LastID = $System->Database->insert_id;
+                                                        $this->Database->query('INSERT INTO `'.$Table.'` ('.$Columns.') VALUES ('.$Values.')');
+                                                        $LastID = $this->Database->insert_id;
         
                                                         $Output .= 'Text <a href="form.php?group='.$GroupId.'&amp;ID='.$LastID.'">'.$LastID.'</a> ze skupiny <a href="TranslationList.php?group='.$GroupId.'&amp;user=0&amp;action=filter">'.$TranslationTree[$GroupId]['Name'].'</a> uložen jako '.$CompleteText[$NewComplete].'. Převzat z <a href="form.php?group='.$GroupId.'&amp;ID='.$TextID.'">'.$TextID.'</a>.<br/>';
@@ -162 +162 @@
                         $next = FollowingTran($TextID, $Table, $GroupId);
                         $Output .= '<br /><br />';
-                        $DbResult = $System->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$User->Id);
+                        $DbResult = $this->Database->query('SELECT `Redirecting` FROM `User` WHERE `ID`='.$this->System->User->Id);
                         $redirecting = $DbResult->fetch_assoc();
         
@@ -186 +186 @@
                         }
         
-                        $Output .= 'Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.$System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
+                        $Output .= 'Z této stránky můžete být automaticky přesměrování. Nastavit kam chcete být přesměrování si můžete v <a href="'.$this->System->Link('/Options.php').'" title="Nastavení uživatele">Nastavení</a>';
         
                         // Update flag for experience info load
-                        $System->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$User->Id);
+                        $this->Database->query('UPDATE `User` SET `NeedUpdate` = 1 WHERE `ID` = '.$this->System->User->Id);
                 } else $Output .= ShowMessage('Položka nenalezena', MESSAGE_CRITICAL);
         } else

trunk/Modules/User/User.php

@@ -21 +21 @@
         function Start()
         {
-                global $User;
-                
                 $this->System->User = new User($this->System);
     $this->System->RegisterPage('userlist.php', 'PageUserList');

trunk/Todo.txt

@@ -11 +11 @@
 * AoWoW export only per standard 
 * Internal user messaging
-* 

trunk/admin/index.php

@@ -12 +12 @@
   '<a href="https://'.$Config['Web']['Host'].'/phpmyadmin/">Správa databáze</a><br/>'.
   '<small>Rozhraní phpMyAdmin pro přímou správu databáze</small><br/><br/>'.
-  '<a href="'.$System->Link('/action.php?action=dbkit').'">DB opravy</a><br/>'.
-  '<small>Opravy databáze</small><br/><br/>'.
   '<a href="'.$System->Link('/import/').'">Import textů</a><br/>'.
   '<small>Načtení zdrojových textů do databáze</small><br/><br/>'.

trunk/admin/install.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/../includes/Database.php');
 include_once(dirname(__FILE__).'/../includes/AppModule.php');
+include_once(dirname(__FILE__).'/../includes/Base.php');
 include_once(dirname(__FILE__).'/../includes/system.php');
 include_once(dirname(__FILE__).'/../includes/Update.php');

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 578; // Subversion revision
+$Revision = 579; // Subversion revision
 $DatabaseRevision = 574; // Database structure revision 
 $ReleaseTime = '2013-09-11';

trunk/includes/global.php

@@ -39 +39 @@
   $System->DoNotShowPage = true;
         $System->Run();
+  $User = $System->User; // Back compatibility, will be removed
 }
 

trunk/includes/system.php

@@ -145 +145 @@
     $this->ModuleManager->RegisterModule(new ModuleFrontPage($System));
     $this->ModuleManager->StartAll();
-    $User = &$this->User; // Back compatibility, will be removed
     
     $this->BaseView = new BaseView($this);