Changeset 571 for trunk/Modules/Export/Export.php

Timestamp:

Aug 26, 2013, 9:49:06 PM (11 years ago)

Author:

chronos

Message:

• Fixed: Configurable relative path to data source directory.
• Added: Link to show directly user export from profile page.

File:

• trunk/Modules/Export/Export.php (modified) (12 diffs)

trunk/Modules/Export/Export.php

@@ -11 +11 @@
   var $ClientVersion;
   var $OrderByUserList;
+  var $TempDir;
+  var $SourceDir;
   
   function Init()
   {
     $this->TempDir = dirname(__FILE__).'/../../'.$this->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
+    if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
     $this->TempDirRelative = $this->Config['Web']['TempFolder'].'Export/'.$this->Id.'/';
-    if(!file_exists($this->TempDir)) mkdir($this->TempDir, 0777, true);
+    $this->SourceDir = dirname(__FILE__).'/../../'.$this->Config['Web']['SourceFolder'];
+    $this->SourceDirRelative = $this->Config['Web']['SourceFolder'];
+    if(!file_exists($this->SourceDir)) mkdir($this->SourceDir, 0777, true);
   }
   
@@ -27 +32 @@
     // Filter selected users
     $this->UserNames = '';
-    $DbResult = $this->Database->query('SELECT `ExportUser`.*, `User`.`Name`, `User`.`ID` FROM `ExportUser` LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
+    $DbResult = $this->Database->query('SELECT `ExportUser`.*, `User`.`Name`, `User`.`ID` FROM `ExportUser` '.
+        'LEFT JOIN `User` ON `User`.`ID`=`ExportUser`.`User` '.
+        'WHERE `ExportUser`.`Export`='.$this->Id.' ORDER BY `ExportUser`.`Sequence`');
     while($UserLine = $DbResult->fetch_assoc())
     {
@@ -90 +97 @@
       "-- Generované tabulky: ";
     
-    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
+        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     while($Group = $DbResult->fetch_assoc())
     {
@@ -97 +105 @@
     $Buffer .= "\n\n";  
 
-    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
+        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     while($Group = $DbResult->fetch_assoc())
     {
@@ -215 +224 @@
     "  <translation>\n";
 
-    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
+    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
+        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id);
     while($Group = $DbResult->fetch_assoc())
     {
@@ -233 +243 @@
           if($GroupItem['MangosColumn'] == '') $GroupItem['MangosColumn'] = $GroupItem['Column'];
           if($Line[$GroupItem['Column']] != '')
-          $Buffer .= '        <text index="'.$GroupItem['Id'].'" name="'.$GroupItem['Column'].'">'.addslashes($Line[$GroupItem['Column']]).'</text>'."\n";
+          $Buffer .= '        <text index="'.$GroupItem['Id'].'" name="'.
+            $GroupItem['Column'].'">'.addslashes($Line[$GroupItem['Column']]).'</text>'."\n";
         }
         $Buffer .= "      </item>\n";
@@ -251 +262 @@
     $this->LoadFilters();
         
-    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
+    $DbResult = $this->Database->query('SELECT `Group`.* FROM `ExportGroup` '.
+        'JOIN `Group` ON `Group`.`Id` = `ExportGroup`.`Group` '.
+        'WHERE `ExportGroup`.`Export`='.$this->Id.' AND `Group`.`DBCFileName` != ""');
     $Output = 'Počet generovaných skupin: '.$DbResult->num_rows."\n";
     while($Group = $DbResult->fetch_assoc())
     {
       $Output .= $Group['Name'].', ';
-      if(file_exists('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) 
+      if(file_exists($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc')) 
       {
         // Load string column index list
-        $DbResult2 = $this->Database->query('SELECT * FROM `GroupItem` JOIN `GroupItemDBC` ON `GroupItem`.`Id` = `GroupItemDBC`.`GroupItem` AND `GroupItemDBC`.`ClientVersion` = '.$this->ClientVersion['Id'].'  WHERE `GroupItem`.`Group` = '.$Group['Id']);      
+        $DbResult2 = $this->Database->query('SELECT * FROM `GroupItem` '.
+                'JOIN `GroupItemDBC` ON `GroupItem`.`Id` = `GroupItemDBC`.`GroupItem` AND `GroupItemDBC`.`ClientVersion` = '.$this->ClientVersion['Id'].'  WHERE `GroupItem`.`Group` = '.$Group['Id']);      
         $ColumnIndexes = array();
         $ColumnFormat = array();
@@ -276 +290 @@
         // Open original DBC file
         $SourceDBCFile = new DBCFile();
-        $SourceDBCFile->OpenFile('../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
+        $SourceDBCFile->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc', $ColumnFormat);
         
         // Create new DBC file
@@ -322 +336 @@
           {
             $Output .= $Progress."%\r";
-echo($Output);
-$Output = '';
+            echo($Output);
+            $Output = '';
             $OldProgress = $Progress;
           }
         }   
         $NewDBCFile->Commit();              
-      } else $Output .= ShowMessage('Zdrojový soubor '.'../source/'.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n", MESSAGE_CRITICAL);
+      } else $Output .= ShowMessage('Zdrojový soubor '.$this->SourceDirRelative.$this->ClientVersion['Version'].'/dbc/'.$Group['DBCFileName'].'.dbc'.' nenalezen.'."\n", MESSAGE_CRITICAL);
     }
     $Output .= 'Hotovo <br />';
@@ -347 +361 @@
       $Output .= $Group['Name'].'... ';
       $File = new FileStream();
-      $File->OpenFile('../source/'.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
+      $File->OpenFile($this->SourceDir.$this->ClientVersion['Version'].'/lua/'.$Group['LuaFileName'].'.lua');
       $File2 = new FileStream();
       $File2->CreateFile($this->TempDir.'lua/'.$Group['LuaFileName'].'.lua');
@@ -355 +369 @@
       while($DbRow = $DbResult2->fetch_assoc())
         $LookupTable[$DbRow['ShortCut']] = $DbRow;
-      //print_r($LookupTable);
         
       while(!$File->EOF())
@@ -419 +432 @@
     $this->Creator = 'Chronos';
     $this->License = 'GNU/GPL';
-    $this->Description = 'Allow parametric export translated texts to various supported output formats';
+    $this->Description = 'Allow parametric export of translated texts to various supported output formats';
     $this->Dependencies = array();
   }