Bug fix: is_executable not available in Windows PHP 4.x

crazyserver · Feb 26, 2004 · aecc779 · aecc779
1 parent 026d711
commit aecc779
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 20 deletions.
diff --git a/filter/algebra/pix.php b/filter/algebra/pix.php
@@ -48,7 +48,12 @@
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
 
-            if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
+            if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
+                $texexp = str_replace('"','\"',$texexp);
+                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
+                $cmd = str_replace(' ','^ ',$cmd);
+                $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
+            } else if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
 
                 $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname ". escapeshellarg($texexp);
 
@@ -59,15 +64,6 @@
                         $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
                     break;
 
-                    case "WINNT":
-                    case "WIN32":
-                    case "Windows":
-                        $texexp = str_replace('"','\"',$texexp);
-                        $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                        $cmd = str_replace(' ','^ ',$cmd);
-                        $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
-                    break;
-
                     case "Darwin":
                         $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" ". escapeshellarg($texexp);
                     break;

diff --git a/filter/tex/pix.php b/filter/tex/pix.php
@@ -47,7 +47,12 @@
             $texexp = preg_replace('!\r\n?!',' ',$texexp);
             $texexp = '\Large ' . $texexp;
 
-            if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
+            if ((PHP_OS == "WINNT") || (PHP_OS == "WIN32") || (PHP_OS == "Windows")) {
+                $texexp = str_replace('"','\"',$texexp);
+                $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
+                $cmd = str_replace(' ','^ ',$cmd);
+                $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
+            } else if (is_executable("$CFG->dirroot/$CFG->texfilterdir/mimetex")) {   /// Use the custom binary
 
                 $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex -e $pathname ". escapeshellarg($texexp);
 
@@ -58,15 +63,6 @@
                         $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.linux\" -e \"$pathname\" ". escapeshellarg($texexp);
                     break;
 
-                    case "WINNT":
-                    case "WIN32":
-                    case "Windows":
-                        $texexp = str_replace('"','\"',$texexp);
-                        $cmd = "$CFG->dirroot/$CFG->texfilterdir/mimetex.exe";
-                        $cmd = str_replace(' ','^ ',$cmd);
-                        $cmd .= " ++ -e  \"$pathname\" \"$texexp\"";
-                    break;
-
                     case "Darwin":
                         $cmd = "\"$CFG->dirroot/$CFG->texfilterdir/mimetex.darwin\" -e \"$pathname\" ". escapeshellarg($texexp);
                     break;