disallow embedded line breaks in ISBNs; allowing them breaks things in a most interes...

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

diff --git a/includes/Math.php b/includes/Math.php
index 6381137..30b4bfe 100644 (file)
--- a/includes/Math.php
+++ b/includes/Math.php
@@ -73,13 +73,15 @@ class MathRenderer {
                        }
 
                        $retval = substr ($contents, 0, 1);
+                       $errmsg = '';
                        if (($retval == 'C') || ($retval == 'M') || ($retval == 'L')) {
-                               if ($retval == 'C')
+                               if ($retval == 'C') {
                                        $this->conservativeness = 2;
-                               else if ($retval == 'M')
+                               } else if ($retval == 'M') {
                                        $this->conservativeness = 1;
-                               else
+                               } else {
                                        $this->conservativeness = 0;
+                               }
                                $outdata = substr ($contents, 33);
 
                                $i = strpos($outdata, "\000");
@@ -88,12 +90,13 @@ class MathRenderer {
                                $this->mathml = substr($outdata, $i+1);
                        } 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
+                               } else {
                                        $this->conservativeness = 0;
+                               }
                                $this->mathml = NULL;
                        } else if ($retval == 'X') {
                                $this->html = NULL;
@@ -106,14 +109,23 @@ class MathRenderer {
                        } 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': $errmsg = $this->_error( 'math_lexing_error', $errbit );
+                                       case 'S': $errmsg = $this->_error( 'math_syntax_error', $errbit );
+                                       case 'F': $errmsg = $this->_error( 'math_unknown_function', $errbit );
+                                       default:  $errmsg = $this->_error( 'math_unknown_error', $errbit );
                                }
                        }
 
-                       $this->hash = substr ($contents, 1, 32);
+                       if ( !$errmsg ) {
+                                $this->hash = substr ($contents, 1, 32);
+                       }
+
+                       wfRunHooks( 'MathAfterTexvc', array( &$this, &$errmsg ) );
+
+                       if ( $errmsg ) {
+                                return $errmsg;
+                       }
+
                        if (!preg_match("/^[a-f0-9]{32}$/", $this->hash)) {
                                return $this->_error( 'math_unknown_error' );
                        }
@@ -160,7 +172,6 @@ class MathRenderer {
 
        function _error( $msg, $append = '' ) {
                $mf   = htmlspecialchars( wfMsg( 'math_failure' ) );
-               $munk = htmlspecialchars( wfMsg( 'math_unknown_error' ) );
                $errmsg = htmlspecialchars( wfMsg( $msg ) );
                $source = htmlspecialchars( str_replace( "\n", ' ', $this->tex ) );
                return "<strong class='error'>$mf ($errmsg$append): $source</strong>\n";
@@ -250,14 +261,11 @@ class MathRenderer {
                return $path;
        }
 
-
-}
-
-function renderMath( $tex ) {
-       global $wgUser;
-       $math = new MathRenderer( $tex );
-       $math->setOutputMode( $wgUser->getOption('math'));
-       return $math->render();
+       public static function renderMath( $tex ) {
+               global $wgUser;
+               $math = new MathRenderer( $tex );
+               $math->setOutputMode( $wgUser->getOption('math'));
+               return $math->render();
+       }
 }
-
 ?>