Changeset 526

Timestamp:

Feb 20, 2013, 11:45:54 PM (12 years ago)

Author:

chronos

Message:

• Opraveno: Kontrola verze klienta při exportu.

Location:

trunk

Files:

• export/export.php (modified) (3 diffs)
• export/index.php (modified) (2 diffs)
• includes/Page.php (modified) (1 diff)
• includes/Version.php (modified) (1 diff)

trunk/export/export.php

@@ -35 +35 @@
     $this->UserNames = substr($this->UserNames, 2);      
    
-    $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
-    $this->ClientVersion = $DbResult->fetch_assoc();    
+    if($this->Export['ClientVersion'] != '')
+    {
+      $DbResult = $this->Database->query('SELECT * FROM `ClientVersion` WHERE `Id`='.$this->Export['ClientVersion']);
+      $this->ClientVersion = $DbResult->fetch_assoc();
+    } else $this->ClientVersion = '';    
   }
   
   function BuildQuery($Group, $Columns = '', $Version = '')
   {
-    global $TranslationTree;
+    global $TranslationTree, $Config;
     
     if ($Version <> '') 
@@ -140 +143 @@
     global $Config, $TranslationTree, $AoWoWconf;
   
-    require_once('../aowow/configs/config.php');
+    //require_once('../aowow/configs/config.php');
   
     $Buffer = $this->ExportToMangosSQL();
@@ -196 +199 @@
     global $TranslationTree, $User;
   
-    $this->LoadFilters($this->Id);
+    $this->LoadFilters();
 
     $Buffer = '<?xml version="1.0" encoding="utf-8"?>'."\n".

trunk/export/index.php

@@ -580 +580 @@
   $Export->Id = $_GET['ExportId'];
   $Export->Init();
-  if($Export->ClientVersion == '') $Output = ShowMessage('Nebyla vybrána verze klienta', MESSAGE_CRITICAL);
-  else {
-        $Export->LoadFilters();
-  
-  if($Export->ClientVersion['BuildNumber'] == '') $Output = ShowMessage('Nebyla vybrána verze klienta', MESSAGE_CRITICAL);
+        $Export->LoadFilters();
+  
+  if(($Export->Export['ClientVersion'] == '') or ($Export->ClientVersion['BuildNumber'] == '')) 
+        $Output = ShowMessage('Nebyla vybrána verze klienta', MESSAGE_CRITICAL);
   else {
         $GroupListQuery = 'SELECT `Group`.* FROM `Group` '.
@@ -640 +639 @@
   $Output .= '<tr><td><strong>Celkem</strong></td><td><strong>'.$Translated.'</strong></td><td><strong>'.$Total.'</strong></td><td><strong>'.ProgressBar(150, round($Percent, 2)).'</strong></td></tr>';
   $Output .= '</table>';
-  }
   }
   return($Output);

trunk/includes/Page.php

@@ -157 +157 @@
   while($DbUser = $DbResult->fetch_assoc())
   {
-    $Name = '<a href="user.php?user='.$DbUser['ID'].'">'.$DbUser['Name'].'</a>';
+    $Name = '<a href="'.$System->Link('/user.php?user='.$DbUser['ID']).'">'.$DbUser['Name'].'</a>';
     $Output .= '<strong>'.$Name.'</strong><br />';
   }

trunk/includes/Version.php

@@ -1 +1 @@
 <?php
 
-$Revision = 525; // Subversion revision
+$Revision = 526; // Subversion revision
 $DatabaseRevision = 524; 
 $ReleaseTime = '2013-02-20';