Changeset 789 for trunk

Timestamp:

Feb 10, 2014, 4:16:56 PM (11 years ago)

Author:

maron

Message:

• Added: PreferredVersion on Progress.php

Location:

trunk

Files:

• Modules/Translation/Progress.php (modified) (1 diff)
• Modules/User/User.php (modified) (2 diffs)
• includes/Version.php (modified) (1 diff)

trunk/Modules/Translation/Progress.php

@@ -70 +70 @@
 
 if(array_key_exists('Version', $_GET)) $_SESSION['StatVersion'] = $_GET['Version'];
-if(!array_key_exists('StatVersion', $_SESSION)) $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
+if(!array_key_exists('StatVersion', $_SESSION)) 
+{
+  if($this->System->User->Licence(LICENCE_USER))
+        {
+    $_SESSION['StatVersion'] = $this->System->User->PreferredVersionGame;
+  } else
+    $_SESSION['StatVersion'] = $this->System->Config['Web']['GameVersion'];
+} 
 
 if(!isset($_SESSION['language']))

trunk/Modules/User/User.php

@@ -159 +159 @@
   function Load()
   {
-    $DbResult = $this->Database->query('SELECT * FROM `User` WHERE `ID` = '.$this->Id);
+    $DbResult = $this->Database->query('SELECT `User`.`PreferredVersion`,`User`.`ID`,`User`.`Team`,`User`.`Redirecting`,`User`.`Email`,`User`.`Info`,'.
+    '`User`.`Language`,`User`.`Name`,`User`.`GM`,`ClientVersion`.`Version` AS `PreferredVersionGame` FROM `User` '.
+                'LEFT JOIN `ClientVersion` ON `ClientVersion`.`Id` = `User`.`PreferredVersion` '.
+    'WHERE `User`.`ID` = '.$this->Id);
     if($DbResult->num_rows > 0)
     {
@@ -173 +176 @@
       $this->Info = $User['Info'];
       $this->PreferredVersion = $User['PreferredVersion'];
+      $this->PreferredVersionGame = $User['PreferredVersionGame'];
     } else $this->SetAnonymous();
   }

trunk/includes/Version.php

@@ -6 +6 @@
 // and system will need database update.
 
-$Revision = 788; // Subversion revision
+$Revision = 789; // Subversion revision
 $DatabaseRevision = 787; // Database structure revision
 $ReleaseTime = '2014-02-09';