Fixed extension function parameter passing

[lhc/web/wiklou.git] / includes / Math.php

diff --git a/includes/Math.php b/includes/Math.php
index 3506394..ef6c603 100644 (file)
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -31,7 +31,7 @@ class MathRenderer {
        }
 
        function render() {
-               global $wgMathDirectory, $wgTmpDirectory, $wgInputEncoding;
+               global $wgTmpDirectory, $wgInputEncoding;
                global $wgTexvc;
                $fname = 'MathRenderer::render';
        
@@ -42,13 +42,6 @@ class MathRenderer {
                
                if( !$this->_recall() ) {
                        # Ensure that the temp and output directories are available before continuing...
-                       if( !file_exists( $wgMathDirectory ) ) {
-                               if( !@mkdir( $wgMathDirectory ) ) {
-                                       return $this->_error( 'math_bad_output' );
-                               }
-                       } elseif( !is_dir( $wgMathDirectory ) || !is_writable( $wgMathDirectory ) ) {
-                               return $this->_error( 'math_bad_output' );
-                       }
                        if( !file_exists( $wgTmpDirectory ) ) {
                                if( !@mkdir( $wgTmpDirectory ) ) {
                                        return $this->_error( 'math_bad_tmpdir' );
@@ -57,16 +50,23 @@ class MathRenderer {
                                return $this->_error( 'math_bad_tmpdir' );
                        }
                        
-                       if( !is_executable( $wgTexvc ) ) {
+                       if( function_exists( 'is_executable' ) && !is_executable( $wgTexvc ) ) {
                                return $this->_error( 'math_notexvc' );
                        }
-                       $cmd = $wgTexvc.' '.
-                               wfEscapeShellArg($wgTmpDirectory).' '.
-                               wfEscapeShellArg($wgMathDirectory).' '.
-                               wfEscapeShellArg($this->tex).' '.
-                               wfEscapeShellArg($wgInputEncoding);
-                       wfDebug( 'TeX: '.$cmd );
+                       $cmd = $wgTexvc . ' ' . 
+                                       escapeshellarg( $wgTmpDirectory ).' '.
+                                       escapeshellarg( $wgTmpDirectory ).' '.
+                                       escapeshellarg( $this->tex ).' '.
+                                       escapeshellarg( $wgInputEncoding );
+                                       
+                       if ( wfIsWindows() ) {
+                               # Invoke it within cygwin sh, because texvc expects sh features in its default shell
+                               $cmd = 'sh -c ' . wfEscapeShellArg( $cmd );
+                       } 
+
+                       wfDebug( "TeX: $cmd\n" );
                        $contents = `$cmd`;
+                       wfDebug( "TeX output:\n $contents\n---\n" );
                
                        if (strlen($contents) == 0) {
                                return $this->_error( 'math_unknown_error' );
@@ -118,10 +118,23 @@ class MathRenderer {
                                return $this->_error( 'math_unknown_error' );
                        }
                
-                       if( !file_exists( "$wgMathDirectory/{$this->hash}.png" ) ) {
+                       if( !file_exists( "$wgTmpDirectory/{$this->hash}.png" ) ) {
                                return $this->_error( 'math_image_error' );
                        }
                        
+                       $hashpath = $this->_getHashPath();
+                       if( !file_exists( $hashpath ) ) {
+                               if( !@wfMkdirParents( $hashpath, 0755 ) ) {
+                                       return $this->_error( 'math_bad_output' );
+                               }
+                       } elseif( !is_dir( $hashpath ) || !is_writable( $hashpath ) ) {
+                               return $this->_error( 'math_bad_output' );
+                       }
+                       
+                       if( !rename( "$wgTmpDirectory/{$this->hash}.png", "$hashpath/{$this->hash}.png" ) ) {
+                               return $this->_error( 'math_output_error' );
+                       }
+                       
                        # Now save it back to the DB:
                        if ( !wfReadOnly() ) {
                                $outmd5_sql = pack('H32', $this->hash);
@@ -174,9 +187,29 @@ class MathRenderer {
                        $this->html = $rpage->math_html;
                        $this->mathml = $rpage->math_mathml;
                        
-                       if( file_exists( "$wgMathDirectory/{$this->hash}.png" ) ) {
+                       if( file_exists( $this->_getHashPath() . "/{$this->hash}.png" ) ) {
                                return true;
                        }
+
+                       if( file_exists( $wgMathDirectory . "/{$this->hash}.png" ) ) {
+                               $hashpath = $this->_getHashPath();
+
+                               if( !file_exists( $hashpath ) ) {
+                                       if( !@wfMkdirParents( $hashpath, 0755 ) ) {
+                                               return false;
+                                       }
+                               } elseif( !is_dir( $hashpath ) || !is_writable( $hashpath ) ) {
+                                       return false;
+                               }
+                               if ( function_exists( "link" ) ) {
+                                       return link ( $wgMathDirectory . "/{$this->hash}.png",
+                                                       $hashpath . "/{$this->hash}.png" );
+                               } else {
+                                       return rename ( $wgMathDirectory . "/{$this->hash}.png",
+                                                       $hashpath . "/{$this->hash}.png" );
+                               }
+                       }
+                               
                }
                
                # Missing from the database and/or the render cache
@@ -201,11 +234,23 @@ class MathRenderer {
 
        function _linkToMathImage() {
                global $wgMathPath;
-               $url = htmlspecialchars( "$wgMathPath/{$this->hash}.png" );
+               $url = htmlspecialchars( "$wgMathPath/" . substr($this->hash, 0, 1)
+                                       .'/'. substr($this->hash, 1, 1) .'/'. substr($this->hash, 2, 1)
+                                       . "/{$this->hash}.png" );
                $alt = trim(str_replace("\n", ' ', htmlspecialchars( $this->tex )));
                return "<img class='tex' src=\"$url\" alt=\"$alt\" />";
        }
 
+       function _getHashPath() {
+               global $wgMathDirectory;
+               $path = $wgMathDirectory .'/'. substr($this->hash, 0, 1)
+                                       .'/'. substr($this->hash, 1, 1)
+                                       .'/'. substr($this->hash, 2, 1);
+               wfDebug( "TeX: getHashPath, hash is: $this->hash, path is: $path\n" );
+               return $path;
+       }
+
+
 }
 
 function renderMath( $tex ) {