X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FException.php;h=ddcd739152c381127b78bd5765fdd36005bbc39f;hb=e46c9a91fd9ab6f9e1e41ffbfb31551a92b95307;hp=81cf12f6d9d1d88c8f911b727d6a98400fb00d35;hpb=f9619da3f02b4759ae92250c483d4bf14dfd9ee8;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Exception.php b/includes/Exception.php index 81cf12f6d9..ddcd739152 100644 --- a/includes/Exception.php +++ b/includes/Exception.php @@ -1,20 +1,74 @@ useMessageCache() && + !empty( $GLOBALS['wgFullyInitialised'] ) && + ( !empty( $GLOBALS['wgArticle'] ) || ( !empty( $GLOBALS['wgOut'] ) && !$GLOBALS['wgOut']->isArticle() ) ) && + !empty( $GLOBALS['wgTitle'] ); } + /** + * Can the extension use wfMsg() to get i18n messages ? + * @return bool + */ function useMessageCache() { global $wgLang; + foreach ( $this->getTrace() as $frame ) { + if ( isset( $frame['class'] ) && $frame['class'] === 'LocalisationCache' ) { + return false; + } + } return is_object( $wgLang ); } + /** + * Run hook to allow extensions to modify the text of the exception + * + * @param $name String: class name of the exception + * @param $args Array: 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 $key String: message name + * @param $fallback String: 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() ) { @@ -24,29 +78,42 @@ class MWException extends Exception } } + /** + * 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 ) { - return '
' . htmlspecialchars( $this->getMessage() ) . + return '
' . nl2br( htmlspecialchars( $this->getMessage() ) ) . '
Backtrace:
' . nl2br( htmlspecialchars( $this->getTraceAsString() ) ) . "
\n"; } else { return "Set \$wgShowExceptionDetails = true; " . - "in LocalSettings.php to show detailed debugging information.
"; + "at the bottom of LocalSettings.php to show detailed " . + "debugging information."; } } + /** + * If $wgShowExceptionDetails is true, return a text message with a + * backtrace to the error. + */ function getText() { global $wgShowExceptionDetails; if( $wgShowExceptionDetails ) { return $this->getMessage() . "\nBacktrace:\n" . $this->getTraceAsString() . "\n"; } else { - return "Set \$wgShowExceptionDetails = true; " . - "in LocalSettings.php to show detailed debugging information.
"; + return "Set \$wgShowExceptionDetails = true; " . + "in LocalSettings.php to show detailed debugging information.\n"; } } - + + /* Return titles of this error page */ function getPageTitle() { if ( $this->useMessageCache() ) { return wfMsg( 'internalerror' ); @@ -55,50 +122,80 @@ class MWException extends Exception return "$wgSitename error"; } } - + + /** + * Return the requested URL and point to file and line number from which the + * exception occured + * + * @return String + */ function getLogMessage() { global $wgRequest; $file = $this->getFile(); $line = $this->getLine(); $message = $this->getMessage(); - return $wgRequest->getRequestURL() . " Exception from line $line of $file: $message"; + if ( isset( $wgRequest ) ) { + $url = $wgRequest->getRequestURL(); + if ( !$url ) { + $url = '[no URL]'; + } + } else { + $url = '[no req]'; + } + + return "$url Exception from line $line of $file: $message"; } - + + /** Output the exception report using HTML */ function reportHTML() { global $wgOut; if ( $this->useOutputPage() ) { $wgOut->setPageTitle( $this->getPageTitle() ); - $wgOut->setRobotpolicy( "noindex,nofollow" ); + $wgOut->setRobotPolicy( "noindex,nofollow" ); $wgOut->setArticleRelated( false ); $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 { - echo $this->htmlHeader(); - echo $this->getHTML(); - echo $this->htmlFooter(); + if( $hookResult = $this->runHooks( get_class( $this ) . "Raw" ) ) { + die( $hookResult ); + } + if ( defined( 'MEDIAWIKI_INSTALL' ) || $this->htmlBodyOnly() ) { + echo $this->getHTML(); + } else { + echo $this->htmlHeader(); + echo $this->getHTML(); + echo $this->htmlFooter(); + } } } - - function reportText() { - echo $this->getText(); - } + /** + * Output a report about the exception and takes care of formatting. + * It will be either HTML or plain text based on isCommandLine(). + */ function report() { - global $wgCommandLineMode; - if ( $wgCommandLineMode ) { - $this->reportText(); + $log = $this->getLogMessage(); + if ( $log ) { + wfDebugLog( 'exception', $log ); + } + if ( self::isCommandLine() ) { + wfPrintError( $this->getText() ); } else { - $log = $this->getLogMessage(); - if ( $log ) { - wfDebugLog( 'exception', $log ); - } $this->reportHTML(); } } + /** + * Send headers and output the beginning of the html page if not using + * $wgOut to output the exception. + */ function htmlHeader() { global $wgLogo, $wgSitename, $wgOutputEncoding; @@ -110,25 +207,38 @@ class MWException extends Exception header( 'Pragma: nocache' ); } $title = $this->getPageTitle(); - echo " + return "