Fixing E_NOTICE

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

diff --git a/includes/Exception.php b/includes/Exception.php
index 3756fb7..742a8de 100644 (file)
--- a/includes/Exception.php
+++ b/includes/Exception.php
@@ -4,19 +4,62 @@
  * MediaWiki exception
  * @addtogroup Exception
  */
-class MWException extends Exception
-{
+class MWException extends Exception {
+
+       /**
+        * Should the exception use $wgOut to output the error ?
+        * @return bool
+        */
        function useOutputPage() {
                return !empty( $GLOBALS['wgFullyInitialised'] ) && 
                        !empty( $GLOBALS['wgArticle'] ) && !empty( $GLOBALS['wgTitle'] );
        }
 
+       /**
+        * Can the extension use wfMsg() to get i18n messages ?
+        * @return bool
+        */
        function useMessageCache() {
                global $wgLang;
                return is_object( $wgLang );
        }
 
-       /** Get a message from i18n */
+       /**
+        * Run hook to allow extensions to modify the text of the exception
+        *
+        * @param String $name class name of the exception
+        * @param Array $args arguments to pass to the callback functions
+        * @return mixed string to output or null if any hook has been called
+        */
+       function runHooks( $name, $args = array() ) {
+               global $wgExceptionHooks;
+               if( !isset( $wgExceptionHooks ) || !is_array( $wgExceptionHooks ) ) 
+                       return; // Just silently ignore
+               if( !array_key_exists( $name, $wgExceptionHooks ) || !is_array( $wgExceptionHooks[ $name ] ) )
+                       return;
+               $hooks = $wgExceptionHooks[ $name ];
+               $callargs = array_merge( array( $this ), $args );
+
+               foreach( $hooks as $hook ) {
+                       if( is_string( $hook ) || ( is_array( $hook ) && count( $hook ) >= 2 && is_string( $hook[0] ) ) ) {     //'function' or array( 'class', hook' )
+                               $result = call_user_func_array( $hook, $callargs );
+                       } else {
+                               $result = null;
+                       }
+                       if( is_string( $result ) )
+                               return $result;
+               }
+       }
+
+       /**
+        * Get a message from i18n
+        *
+        * @param String $key message name
+        * @param String $fallback default message if the message cache can't be
+        *                         called by the exception
+        * The function also has other parameters that are arguments for the message
+        * @return String message with arguments replaced
+        */
        function msg( $key, $fallback /*[, params...] */ ) {
                $args = array_slice( func_get_args(), 2 );
                if ( $this->useMessageCache() ) {
@@ -26,7 +69,13 @@ class MWException extends Exception
                }
        }
 
-       /* If wgShowExceptionDetails, return a HTML message with a backtrace to the error. */
+       /**
+        * If $wgShowExceptionDetails is true, return a HTML message with a 
+        * backtrace to the error, otherwise show a message to ask to set it to true
+        * to show that information.
+        *
+        * @return String html to output
+        */
        function getHTML() {
                global $wgShowExceptionDetails;
                if( $wgShowExceptionDetails ) {
@@ -40,7 +89,10 @@ class MWException extends Exception
                }
        }
 
-       /* If wgShowExceptionDetails, return a text message with a backtrace to the error */
+       /**
+        * If $wgShowExceptionDetails is true, return a text message with a 
+        * backtrace to the error.
+        */
        function getText() {
                global $wgShowExceptionDetails;
                if( $wgShowExceptionDetails ) {
@@ -62,8 +114,11 @@ class MWException extends Exception
                }
        }
 
-       /** Return the requested URL and point to file and line number from which the
+       /**
+        * Return the requested URL and point to file and line number from which the
         * exception occured
+        *
+        * @return string
         */
        function getLogMessage() {
                global $wgRequest;
@@ -83,16 +138,24 @@ class MWException extends Exception
                        $wgOut->enableClientCache( false );
                        $wgOut->redirect( '' );
                        $wgOut->clearHTML();
-                       $wgOut->addHTML( $this->getHTML() );
+                       if( $hookResult = $this->runHooks( get_class( $this ) ) ) {
+                               $wgOut->addHTML( $hookResult );
+                       } else {
+                               $wgOut->addHTML( $this->getHTML() );
+                       }
                        $wgOut->output();
                } else {
+                       if( $hookResult = $this->runHooks( get_class( $this ) . "Raw" ) ) {
+                               die( $hookResult );
+                       }
                        echo $this->htmlHeader();
                        echo $this->getHTML();
                        echo $this->htmlFooter();
                }
        }
 
-       /* Output a report about the exception and takes care of formatting.
+       /**
+        * Output a report about the exception and takes care of formatting.
         * It will be either HTML or plain text based on $wgCommandLineMode.
         */
        function report() {
@@ -108,6 +171,10 @@ class MWException extends Exception
                }
        }
 
+       /**
+        * Send headers and output the beginning of the html page if not using
+        * $wgOut to output the exception.
+        */
        function htmlHeader() {
                global $wgLogo, $wgSitename, $wgOutputEncoding;
 
@@ -128,10 +195,12 @@ class MWException extends Exception
                ";
        }
 
+       /**
+        * print the end of the html page if not using $wgOut.
+        */
        function htmlFooter() {
                echo "</body></html>";
        }
-
 }
 
 /**