Changeset 899 for trunk/Modules

Timestamp:

Aug 30, 2023, 10:46:15 PM (16 months ago)

Author:

chronos

Message:

• Fixed: Process task export error.

Location:

trunk/Modules/Export

Files:

• Export.php (modified) (2 diffs)
• ProcessTask.php (modified) (2 diffs)

trunk/Modules/Export/Export.php

@@ -298 +298 @@
   function HaveVariable($String1, $String2, $StartChar = '$')
   {
-    if (strpos($String1, $StartChar) !== false)
+    if (($String1 != '') and (strpos($String1, $StartChar) !== false))
     {
       while (strpos($String1, $StartChar) !== false)
@@ -311 +311 @@
         if (strpos($Variable, chr(10))) $Variable = substr($Variable, 0, strpos($Variable, chr(10)));
 
-        if (($Variable != '') and (strpos($String2, $Variable) === false))
+        if (($Variable != '') and (($String2 == '') or (strpos($String2, $Variable) === false)))
         {
           return false;

trunk/Modules/Export/ProcessTask.php

@@ -65 +65 @@
       while (($File = readdir($Dir)) !== false)
       {
-        if (($File != '..') and ($File != '.')) {
+        if (($File != '..') and ($File != '.')) 
+        {
           $File = str_replace('/', DIRECTORY_SEPARATOR, $File);
           $InDir = '';
-          if (strpos($packdir, 'dbc') !== false) {
+          if (strpos($packdir, 'dbc') !== false) 
+          {
             $InDir = 'DBFilesClient\\';
             if (DIRECTORY_SEPARATOR == '/') // linux
               $InDir = 'DBFilesClient\\\\';
           }
-          if (strpos($packdir.$File, 'luaGlobal') !== false) {
+          if (strpos($packdir.$File, 'luaGlobal') !== false)
+          {
             $InDir = 'Interface\\FrameXML\\';
             if (DIRECTORY_SEPARATOR == '/') // linux
               $InDir = 'Interface\\\\FrameXML\\\\';
           }
-          if (strpos($packdir.$File, 'luaGlue') !== false) {
+          if (strpos($packdir.$File, 'luaGlue') !== false)
+          {
             $InDir = 'Interface\\GlueXML\\';
             if (DIRECTORY_SEPARATOR == '/') // linux
@@ -85 +89 @@
 
           if (DIRECTORY_SEPARATOR == '/') // linux
-            echo exec('wine cmd /C mpq.exe "'.$this->GetWinZPatch($packdir.DIRECTORY_SEPARATOR.
+          {
+            echo(exec('wine mpq.exe "'.$this->GetWinZPatch($packdir.DIRECTORY_SEPARATOR.
               '..'.DIRECTORY_SEPARATOR).'patch-5.MPQ" '.$InDir.basename($File).' "'.
-              $this->GetWinZPatch($packdir.DIRECTORY_SEPARATOR).$File.'" ');
-
+              $this->GetWinZPatch($packdir.DIRECTORY_SEPARATOR).$File.'" '));
+          } else
           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";
+          {
+            echo(exec('mpq.exe "'.$packdir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR.
+              'patch-5.MPQ" '.$InDir.basename($File).' "'.$packdir.DIRECTORY_SEPARATOR.$File.'" '));
+          }
+
+          echo("\n");
         }
       }