massive double to single quotes conversion. I have not noticed any bug after a lot...

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

diff --git a/includes/Math.php b/includes/Math.php
index 8dce2b8..f22226c 100644 (file)
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -9,11 +9,11 @@
 
 class MathRenderer {
        var $mode = MW_MATH_MODERN;
-       var $tex = "";
-       var $inputhash = "";
-       var $hash = "";
-       var $html = "";
-       var $mathml = "";
+       var $tex = '';
+       var $inputhash = '';
+       var $hash = '';
+       var $html = '';
+       var $mathml = '';
        var $conservativeness = 0;
        
        function MathRenderer( $tex ) {
@@ -37,39 +37,39 @@ class MathRenderer {
                        # Ensure that the temp and output directories are available before continuing...
                        if( !file_exists( $wgMathDirectory ) ) {
                                if( !@mkdir( $wgMathDirectory ) ) {
-                                       return $this->_error( "math_bad_output" );
+                                       return $this->_error( 'math_bad_output' );
                                }
                        } elseif( !is_dir( $wgMathDirectory ) || !is_writable( $wgMathDirectory ) ) {
-                               return $this->_error( "math_bad_output" );
+                               return $this->_error( 'math_bad_output' );
                        }
                        if( !file_exists( $wgTmpDirectory ) ) {
                                if( !@mkdir( $wgTmpDirectory ) ) {
-                                       return $this->_error( "math_bad_tmpdir" );
+                                       return $this->_error( 'math_bad_tmpdir' );
                                }
                        } elseif( !is_dir( $wgTmpDirectory ) || !is_writable( $wgTmpDirectory ) ) {
-                               return $this->_error( "math_bad_tmpdir" );
+                               return $this->_error( 'math_bad_tmpdir' );
                        }
                        
                        if( !is_executable( $wgTexvc ) ) {
-                               return $this->_error( "math_notexvc" );
+                               return $this->_error( 'math_notexvc' );
                        }
-                       $cmd = $wgTexvc." ".
-                               wfEscapeShellArg($wgTmpDirectory)." ".
-                               wfEscapeShellArg($wgMathDirectory)." ".
-                               wfEscapeShellArg($this->tex)." ".
+                       $cmd = $wgTexvc.' '.
+                               wfEscapeShellArg($wgTmpDirectory).' '.
+                               wfEscapeShellArg($wgMathDirectory).' '.
+                               wfEscapeShellArg($this->tex).' '.
                                wfEscapeShellArg($wgInputEncoding);
-                       wfDebug( "TeX: $cmd" );
+                       wfDebug( 'TeX: '.$cmd );
                        $contents = `$cmd`;
                
                        if (strlen($contents) == 0) {
-                               return $this->_error( "math_unknown_error" );
+                               return $this->_error( 'math_unknown_error' );
                        }
                        
                        $retval = substr ($contents, 0, 1);
-                       if (($retval == "C") || ($retval == "M") || ($retval == "L")) {
-                               if ($retval == "C")
+                       if (($retval == 'C') || ($retval == 'M') || ($retval == 'L')) {
+                               if ($retval == 'C')
                                        $this->conservativeness = 2;
-                               else if ($retval == "M")
+                               else if ($retval == 'M')
                                        $this->conservativeness = 1;
                                else
                                        $this->conservativeness = 0;
@@ -79,46 +79,46 @@ class MathRenderer {
                
                                $this->html = substr($outdata, 0, $i);
                                $this->mathml = substr($outdata, $i+1);
-                       } else if (($retval == "c") || ($retval == "m") || ($retval == "l"))  {
+                       } else if (($retval == 'c') || ($retval == 'm') || ($retval == 'l'))  {
                                $this->html = substr ($contents, 33);
-                               if ($retval == "c")
+                               if ($retval == 'c')
                                        $this->conservativeness = 2;
-                               else if ($retval == "m")
+                               else if ($retval == 'm')
                                        $this->conservativeness = 1;
                                else
                                        $this->conservativeness = 0;
                                $this->mathml = NULL;
-                       } else if ($retval == "X") {
+                       } else if ($retval == 'X') {
                                $outhtml = NULL;
                                $this->mathml = substr ($contents, 33);
                                $this->conservativeness = 0;
-                       } else if ($retval == "+") {
+                       } else if ($retval == '+') {
                                $this->outhtml = NULL;
                                $this->mathml = NULL;
                                $this->conservativeness = 0;
                        } else {
                                $errbit = htmlspecialchars( substr($contents, 1) );
                                switch( $retval ) {
-                                       case "E": return $this->_error( "math_lexing_error", $errbit );
-                                       case "S": return $this->_error( "math_syntax_error", $errbit );
-                                       case "F": return $this->_error( "math_unknown_function", $errbit );
-                                       default:  return $this->_error( "math_unknown_error", $errbit );
+                                       case 'E': return $this->_error( 'math_lexing_error', $errbit );
+                                       case 'S': return $this->_error( 'math_syntax_error', $errbit );
+                                       case 'F': return $this->_error( 'math_unknown_function', $errbit );
+                                       default:  return $this->_error( 'math_unknown_error', $errbit );
                                }
                        }
                
                        $this->hash = substr ($contents, 1, 32);
                        if (!preg_match("/^[a-f0-9]{32}$/", $this->hash)) {
-                               return $this->_error( "math_unknown_error" );
+                               return $this->_error( 'math_unknown_error' );
                        }
                
                        if( !file_exists( "$wgMathDirectory/{$this->hash}.png" ) ) {
-                               return $this->_error( "math_image_error" );
+                               return $this->_error( 'math_image_error' );
                        }
                        
                        # Now save it back to the DB:
-                       $outmd5_sql = pack("H32", $this->hash);
+                       $outmd5_sql = pack('H32', $this->hash);
                
-                       $md5_sql = pack("H32", $this->md5); # Binary packed, not hex
+                       $md5_sql = pack('H32', $this->md5); # Binary packed, not hex
                        
                        $dbw =& wfGetDB( DB_MASTER );
                        $dbw->replace( 'math', array( 'math_inputhash' ),
@@ -136,9 +136,9 @@ class MathRenderer {
                return $this->_doRender();
        }
        
-       function _error( $msg, $append = "" ) {
-               $mf   = htmlspecialchars( wfMsg( "math_failure" ) );
-               $munk = htmlspecialchars( wfMsg( "math_unknown_error" ) );
+       function _error( $msg, $append = '' ) {
+               $mf   = htmlspecialchars( wfMsg( 'math_failure' ) );
+               $munk = htmlspecialchars( wfMsg( 'math_unknown_error' ) );
                $errmsg = htmlspecialchars( wfMsg( $msg ) );
                $source = htmlspecialchars($this->tex);
                return "<strong class='error'>$mf ($errmsg$append): $source</strong>\n";
@@ -158,7 +158,7 @@ class MathRenderer {
 
                if( $rpage !== false ) {
                        # Tailing 0x20s can get dropped by the database, add it back on if necessary:
-                       $xhash = unpack( "H32md5", $rpage->math_outputhash . "                " );
+                       $xhash = unpack( 'H32md5', $rpage->math_outputhash . "                " );
                        $this->hash = $xhash ['md5'];
                        
                        $this->conservativeness = $rpage->math_html_conservativeness;
@@ -200,7 +200,7 @@ class MathRenderer {
 function renderMath( $tex ) {
        global $wgUser;
        $math = new MathRenderer( $tex );
-       $math->setOutputMode( $wgUser->getOption("math"));
+       $math->setOutputMode( $wgUser->getOption('math'));
        return $math->render();
 }