Changeset 811 for trunk/Modules/Export

Timestamp:

May 28, 2014, 11:00:26 PM (10 years ago)

Author:

chronos

Message:

• Added: Better handling of repeater false referrer links. Now use manual BlackList table for checking which IP source is blocked.

File:

• trunk/Modules/Export/ProcessTask.php (modified) (17 diffs)

trunk/Modules/Export/ProcessTask.php

@@ -6 +6 @@
 include_once(dirname(__FILE__).'/../../includes/zip.lib.php');
 
-include_once('Export.php');    
-include_once('ExportOutput.php');    
+include_once('Export.php');
+include_once('ExportOutput.php');
 
 //LoadCommandLineParameters();
@@ -25 +25 @@
         {
           $Dir = opendir($deldir.'/') ;
-          while(($File = readdir($Dir)) !== false) 
+          while(($File = readdir($Dir)) !== false)
           {
             if(($File != '..') and ($File != '.') and (!is_dir("$File"))) unlink($deldir.'/'.$File);
@@ -38 +38 @@
   if (file_exists($dst)) DeleteOldFiles($dst);
   if (is_dir($src)) {
-    if (!file_exists($dst)) mkdir($dst, 0777, true); 
+    if (!file_exists($dst)) mkdir($dst, 0777, true);
     $files = scandir($src);
     foreach ($files as $file)
-    if ($file != "." && $file != ".." and (!is_dir("$src/$file"))) rcopy("$src/$file", "$dst/$file"); 
+    if ($file != "." && $file != ".." and (!is_dir("$src/$file"))) rcopy("$src/$file", "$dst/$file");
   }
   else if (file_exists($src)) copy($src, $dst);
@@ -51 +51 @@
   $patch = 'Z:'.$patch;
   return $patch;
-}      
+}
 
 function MPQPack($packdir) {
@@ -58 +58 @@
   {
     $Dir = opendir($packdir.DIRECTORY_SEPARATOR) ;
-    while(($File = readdir($Dir)) !== false) 
-    {
-      if(($File != '..') and ($File != '.')) {           
+    while(($File = readdir($Dir)) !== false)
+    {
+      if(($File != '..') and ($File != '.')) {
         $File = str_replace('/',DIRECTORY_SEPARATOR,$File);
         $InDir = '';
@@ -78 +78 @@
             $InDir = 'Interface\\\\GlueXML\\\\';
         }
-       
+
         if (DIRECTORY_SEPARATOR == '/') // linux
           echo exec('wine cmd /C mpq.exe "'.GetWinZPatch($packdir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR).'patch-5.MPQ" '.$InDir.basename($File).' "'.GetWinZPatch($packdir.DIRECTORY_SEPARATOR).$File.'" ');
-  
+
         if (DIRECTORY_SEPARATOR == '\\') // windows
           echo exec('mpq.exe "'.$packdir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.'patch-5.MPQ" '.$InDir.basename($File).' "'.$packdir.DIRECTORY_SEPARATOR.$File.'" ');
-  
+
         echo "\n";
       }
@@ -97 +97 @@
   $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
     ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 9 AND `ExportTask`.`TimeFinish` IS NULL');
-  while($DbRow = $DbResult->fetch_assoc()) 
+  while($DbRow = $DbResult->fetch_assoc())
   {
     echo(StrFTime("%d/%m/%Y %H:%M:%S", time()).': Generování DBC souborů pro export '.$DbRow['ExportId'].'.. '."\n");
-    if($DbRow['ExportId'] != '') 
-    {     
-      try 
+    if($DbRow['ExportId'] != '')
+    {
+      try
       {
         $Export = new Export($System);
@@ -111 +111 @@
 
         echo('Mazání starých souborů...'."\n");
-        
+
         // Delete old files
         DeleteOldFiles($Export->TempDir.'dbc');
@@ -117 +117 @@
 
         SetProgress($Export,20);
-        if(function_exists('gzcompress')) 
+        if(function_exists('gzcompress'))
         {
           $Export->ExportToDBC();
@@ -126 +126 @@
         } else echo('Funkce pro tvorbu Zip souboru není podporována!'."\n");
         $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$Export->Id);
-      } catch (Exception $e) 
+      } catch (Exception $e)
       {
         echo 'Caught exception: ',  $e->getMessage(), "\n";
@@ -141 +141 @@
   $DbResult = $System->Database->query('SELECT `ExportTask`.`Export`, `Export`.`Id` AS `ExportId` FROM `ExportTask`'.
     ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE `Export`.`OutputType` = 10 AND `ExportTask`.`TimeFinish` IS NULL');
-  while($DbRow = $DbResult->fetch_assoc()) 
+  while($DbRow = $DbResult->fetch_assoc())
   {
     echo(StrFTime("%d/%m/%Y %H:%M:%S", time()).': Generování EXE souboru pro export '.$DbRow['ExportId'].'.. '."\n");
-    if($DbRow['ExportId'] != '') 
-    {     
-      try 
+    if($DbRow['ExportId'] != '')
+    {
+      try
       {
      // echo shell_exec('"'.dirname(__FILE__).'./client_cz_export.sh" '.$DbRow['ExportId'].'');
@@ -157 +157 @@
 
         $nsifile = 'install.nsi';
-        
+
         // Delete old files
         SetProgress($Export,1);
@@ -164 +164 @@
         DeleteOldFiles($Export->TempDir.'lua');
         DeleteOldFiles($Export->TempDir.'CzWoW');
-        
+
         //copy need files
         SetProgress($Export,5);
@@ -173 +173 @@
         rcopy('files/'.$Export->ClientVersion['Version'].'/CzWoW/', $Export->TempDir.'CzWoW/');
         rcopy('files/WoW.ico', $Export->TempDir.'WoW.ico');
-        rcopy('files/Fonts/', $Export->TempDir.'Fonts/');       
-              
+        rcopy('files/Fonts/', $Export->TempDir.'Fonts/');
+
         SetProgress($Export,10);
         echo('Export lua...'."\n");
@@ -184 +184 @@
         echo('Export dbc...'."\n");
         $Export->ExportToDBC();
-      
+
         echo('Create readme...'."\n");
         SetProgress($Export,60);
@@ -191 +191 @@
         $File->WriteLine($Export->GetReadme());
         unset($File);
-        
+
         echo('Packing files...'."\n");
         SetProgress($Export,70);
@@ -203 +203 @@
         if (DIRECTORY_SEPARATOR == '/') // linux
           echo exec('makensis '.$workdir.$nsifile);
-  
+
         if (DIRECTORY_SEPARATOR == '\\') // windows
-          echo exec('"'.$workdir.$nsifile.'" '); //"c:\Program Files (x86)\NSIS\makensisw.exe" /Xscriptcmd 
+          echo exec('"'.$workdir.$nsifile.'" '); //"c:\Program Files (x86)\NSIS\makensisw.exe" /Xscriptcmd
 
         SetProgress($Export,100);
         echo ("\n"."Hotovo"."\n");
         $System->Database->query('UPDATE `ExportTask` SET `TimeFinish`=NOW() WHERE `Export`='.$DbRow['Export']);
-      } catch (Exception $e) 
+      } catch (Exception $e)
       {
         echo 'Caught exception: ',  $e->getMessage(), "\n";