Changeset 818 for trunk/Modules/Export

Timestamp:

Feb 23, 2015, 12:32:54 AM (10 years ago)

Author:

chronos

Message:

• Modified: Do not link to external jquery script which can change in future and break function.

Location:

trunk/Modules/Export

Files:

• ExportOutput.php (modified) (4 diffs)
• Progress.php (modified) (1 diff)

trunk/Modules/Export/ExportOutput.php

@@ -9 +9 @@
 function CreateZipFromDir(&$Zip, $Path, $ZipPath)
 {
-  //echo($Path.'<br />');
   $FileList = scandir($Path);
   foreach($FileList as $FileName)
@@ -15 +14 @@
     if(file_exists($Path.$FileName) and ($FileName != '.') and ($FileName != '..'))
     {
-      //echo($Path.$FileName.'<br />');
       if(is_dir($Path.$FileName)) CreateZipFromDir($Zip, $Path.$FileName.'/', $ZipPath.$FileName.'/');
         else $Zip->addFile(file_get_contents($Path.$FileName), $ZipPath.$FileName);
@@ -226 +224 @@
 }
 
-function ShowProgress($Export) {
-    global $System;
-    $Output = '';
-    $Output .= 'Fronta zpracování exportů. Zobrazuje procenta dokončení: <br /><br />';
-
-
-      $Output .= '<script src="http://code.jquery.com/jquery-latest.js"></script>'.
-               '<script>'.
-                  '$(document).ready(function() {'.
-                  'var refreshId = setInterval(function() {'.
-                  '$("#progress").load("'.$System->Link('/Modules/Export/Progress.php?RedirectId='.$_GET['ExportId']).'"); '.
-                  '}, 1000);'.
-                  '});'.
-               '</script>';
-
-
-      $Output .= ' <strong><div id="progress"></div></strong><br />';
-
-    $DbResult = $System->Database->query('SELECT * FROM `ExportTask` LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE '.
-    ' (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL AND `TimeStart` < NOW()-10000');
-    if($DbResult->num_rows > 0) {
-      $System->ModuleManager->Modules['Log']->WriteLog('ProcesTask nepracuje přes 2 hodiny, pravděpodobně nepracuje!', LOG_TYPE_ERROR);
-
-    }
-    return ($Output);
+function ShowProgress($Export)
+{
+  global $System;
+
+  $Output = '';
+  $Output .= 'Fronta zpracování exportů. Zobrazuje procenta dokončení: <br /><br />';
+
+  $Output .= '<script src="'.$System->Link('/style/jquery.js').'"></script>'.
+    '<script>'.
+    '$(document).ready(function() {'.
+    'var refreshId = setInterval(function() {'.
+    '$("#progress").load("'.$System->Link('/Modules/Export/Progress.php?RedirectId='.$_GET['ExportId']).'"); '.
+    '}, 1000);'.
+    '});'.
+    '</script>';
+
+  $Output .= ' <strong><div id="progress"></div></strong><br />';
+
+  $DbResult = $System->Database->query('SELECT * FROM `ExportTask` '.
+    'LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` '.
+    'WHERE ((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND (`TimeFinish` IS NULL) AND (`TimeStart` < (NOW() - 10000))');
+  if($DbResult->num_rows > 0)
+  {
+    $System->ModuleManager->Modules['Log']->WriteLog('ProcesTask nepracuje přes 2 hodiny, pravděpodobně nepracuje!', LOG_TYPE_ERROR);
+  }
+  return ($Output);
 }
 
@@ -285 +284 @@
   {
     $Output .= '<strong>Souhrný EXE balík: <a href="'.$System->Link('/'.$Export->TempDirRelative.'Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe').'">Instalace_CzechWoW_'.$Export->ClientVersion['Version'].'.exe</a></strong><br/>';
-
   } else {
-
     $Output .= ShowProgress($Export);
   }

trunk/Modules/Export/Progress.php

@@ -3 +3 @@
 include_once(dirname(__FILE__).'/../../includes/global.php');
 
-  $System = new System();
-  $System->DoNotShowPage = true;
-  $System->Run();
+$System = new System();
+$System->DoNotShowPage = true;
+$System->Run();
 
+$Output = '';
+if(!array_key_exists('RedirectId', $_GET)) exit;
 
-    $Output = '';
-    $DbResult = $System->Database->query('SELECT * FROM `ExportTask`'.
-    ' LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE  (`Export`.`OutputType` = 9 OR  `Export`.`OutputType` = 10 ) AND `TimeFinish` IS NULL  OR `Export` ='.$_GET['RedirectId'].' ORDER BY `Progress` DESC');// `Export`='.$Export->Id
-    while($Task = $DbResult->fetch_assoc()) {
-      $Export = '<a href="'.$System->Link('/export/?Action=View&ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
-      if ($_GET['RedirectId'] == $Task['Export'])
-        $Export = ''.$Export.' (tento)';
-      $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.ProgressBar(300, $Task['Progress']).'</div></strong><br />';
-      if ( $Task['Progress'] > 99 )   echo '<script type="text/javascript" language="JavaScript" charset="utf-8">'.
+$DbResult = $System->Database->query('SELECT * FROM `ExportTask` '.
+ 'LEFT JOIN `Export` ON `Export`.`Id` = `ExportTask`.`Export` WHERE '.
+ '((`Export`.`OutputType` = 9) OR (`Export`.`OutputType` = 10)) AND '.
+ '(`TimeFinish` IS NULL) OR (`Export` ='.($_GET['RedirectId'] * 1).') ORDER BY `Progress` DESC'); // `Export`='.$Export->Id
+while($Task = $DbResult->fetch_assoc())
+{
+  $Export = '<a href="'.$System->Link('/export/?Action=View&ExportId='.$Task['Export']).'">'.$Task['Export'].'</a>';
+  if ($_GET['RedirectId'] == $Task['Export'])
+    $Export = ''.$Export.' (tento)';
+  $Output .= ' <strong>Export '.$Export.': <div id="progress'.$Task['Export'].'">'.ProgressBar(300, $Task['Progress']).'</div></strong><br />';
+  if($Task['Progress'] > 99)
+    echo('<script type="text/javascript" language="JavaScript" charset="utf-8">'.
       'setTimeout("parent.location.href=\''.$System->Link('/export/?Action=View&Tab=7&ExportId='.$_GET['RedirectId']).'\'", 500)'.
-      '</script>';
-    }
+      '</script>');
+}
 
-    echo $Output;
-    //echo ''.ProgressBar(300, $Task['Progress']).'';
-
+echo($Output);
+//echo ''.ProgressBar(300, $Task['Progress']).'';