When reading from meta's interwiki map, *.wikimedia.org should be set as local (e...

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 1e850e7..5b4d8bc 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -494,14 +494,17 @@ function wfMsgReplaceArgs( $message, $args ) {
        $message = str_replace( "\r", '', $message );
 
        // Replace arguments
-       if ( count( $args ) )
-               if ( is_array( $args[0] ) )
-                       foreach ( $args[0] as $key => $val )
+       if ( count( $args ) ) {
+               if ( is_array( $args[0] ) ) {
+                       foreach ( $args[0] as $key => $val ) {
                                $message = str_replace( '$' . $key, $val, $message );
-       else {
-               foreach( $args as $n => $param )
-                       $replacementKeys['$' . ($n + 1)] = $param;
-               $message = strtr( $message, $replacementKeys );
+                       }
+               } else {
+                       foreach( $args as $n => $param ) {
+                               $replacementKeys['$' . ($n + 1)] = $param;
+                       }
+                       $message = strtr( $message, $replacementKeys );
+               }
        }
 
        return $message;
@@ -550,7 +553,7 @@ function wfAbruptExit( $error = false ){
        global $wgLoadBalancer;
        static $called = false;
        if ( $called ){
-               exit();
+               exit( -1 );
        }
        $called = true;
 
@@ -571,7 +574,7 @@ function wfAbruptExit( $error = false ){
        if ( !$error ) {
                $wgLoadBalancer->closeAll();
        }
-       exit();
+       exit( -1 );
 }
 
 /**
@@ -581,6 +584,16 @@ function wfErrorExit() {
        wfAbruptExit( true );
 }
 
+/**
+ * Print a simple message and die, returning nonzero to the shell if any.
+ * Plain die() fails to return nonzero to the shell if you pass a string.
+ * @param string $msg
+ */
+function wfDie( $msg='' ) {
+       echo $msg;
+       die( -1 );
+}
+
 /**
  * Die with a backtrace
  * This is meant as a debugging aid to track down where bad data comes from.
@@ -720,7 +733,6 @@ function wfViewPrevNext( $offset, $limit, $link, $query = '', $atend = false ) {
                }
        }
 
-       $sk = $wgUser->getSkin();
        if ( 0 != $offset ) {
                $po = $offset - $limit;
                if ( $po < 0 ) { $po = 0; }
@@ -1341,49 +1353,66 @@ function swap( &$x, &$y ) {
        $y = $z;
 }
 
-function wfGetSiteNotice() {
-       global $wgSiteNotice, $wgTitle, $wgOut, $parserMemc, $wgDBname;
-       $fname = 'wfGetSiteNotice';
+function wfGetCachedNotice( $name ) {
+       global $wgOut, $parserMemc, $wgDBname;
+       $fname = 'wfGetCachedNotice';
        wfProfileIn( $fname );
-
-       $shouldParse=false;
-
-       $notice = wfMsgForContent( 'sitenotice' );
-       if( $notice == '&lt;sitenotice&gt;' || $notice == '-' ) {
-               $notice = '';
-       }
-       if( $notice == '' ) {
-               # We may also need to override a message with eg downtime info
-               # FIXME: make this work!
-               $notice = $wgSiteNotice;
-       }
-       if($notice != '-' && $notice != '') {
-               $cachednotice=$parserMemc->get("{$wgDBname}:sitenotice");
-               if (is_array($cachednotice)) {
-                       if (md5($notice)==$cachednotice['hash']) {
-                               $notice = $cachednotice['html'];
-                       } else {
-                               $shouldParse=true;
-                       }
+       
+       $needParse = false;
+       $notice = wfMsgForContent( $name );
+       if( $notice == '&lt;'. $name . ';&gt' || $notice == '-' ) {
+               wfProfileOut( $fname );
+               return( false );
+       }
+       
+       $cachedNotice = $parserMemc->get( $wgDBname . ':' . $name );
+       if( is_array( $cachedNotice ) ) {
+               if( md5( $notice ) == $cachedNotice['hash'] ) {
+                       $notice = $cachedNotice['html'];
                } else {
-                       $shouldParse=true;
+                       $needParse = true;
                }
-               if ($shouldParse) {
-                       if( is_object( $wgOut ) ) {
-                               $parsed = $wgOut->parse( $notice );
-                               $parserMemc->set("{$wgDBname}:sitenotice",
-                                       array('html' => $parsed, 'hash' => md5($notice)), 600);
-                               $notice = $parsed;
-                       } else {
-                               wfDebug( "wfGetSiteNotice called with no \$wgOut available" );
-                               $notice = '';
-                       }
+       } else {
+               $needParse = true;
+       }
+       
+       if( $needParse ) {
+               if( is_object( $wgOut ) ) {
+                       $parsed = $wgOut->parse( $notice );
+                       $parserMemc->set( $wgDBname . ':' . $name, array( 'html' => $parsed, 'hash' => md5( $notice ) ), 600 );
+                       $notice = $parsed;
+               } else {
+                       wfDebug( 'wfGetCachedNotice called for ' . $name . ' with no $wgOut available' );
+                       $notice = '';
                }
        }
+       
        wfProfileOut( $fname );
        return $notice;
 }
 
+function wfGetSiteNotice() {
+       global $wgUser, $wgSiteNotice;
+       $fname = 'wfGetSiteNotice';
+       wfProfileIn( $fname );
+       
+       if( $wgUser->isLoggedIn() ) {
+               $siteNotice = wfGetCachedNotice( 'sitenotice' );
+               $siteNotice = !$siteNotice ? $wgSiteNotice : $siteNotice;
+       } else {
+               $anonNotice = wfGetCachedNotice( 'anonnotice' );
+               if( !$anonNotice ) {
+                       $siteNotice = wfGetCachedNotice( 'sitenotice' );
+                       $siteNotice = !$siteNotice ? $wgSiteNotice : $siteNotice;
+               } else {
+                       $siteNotice = $anonNotice;
+               }
+       }
+       
+       wfProfileOut( $fname );
+       return( $siteNotice );
+}
+
 /**
  * Format an XML element with given attributes and, optionally, text content.
  * Element and attribute names are assumed to be ready for literal inclusion.
@@ -1675,8 +1704,7 @@ function wfIsWellFormedXml( $text ) {
  */
 function wfIsWellFormedXmlFragment( $text ) {
        $html =
-               '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ' .
-               '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">' .
+               Sanitizer::hackDocType() .
                '<html>' .
                $text .
                '</html>';
@@ -1763,4 +1791,23 @@ function wfRegexReplacement( $string ) {
        return $string;
 }
 
+/**
+ * Return the final portion of a pathname.
+ * Reimplemented because PHP5's basename() is buggy with multibyte text.
+ * http://bugs.php.net/bug.php?id=33898
+ *
+ * PHP's basename() only considers '\' a pathchar on Windows and Netware.
+ * We'll consider it so always, as we don't want \s in our Unix paths either.
+ * 
+ * @param string $path
+ * @return string
+ */
+function wfBaseName( $path ) {
+       if( preg_match( '#([^/\\\\]*)[/\\\\]*$#', $path, $matches ) ) {
+               return $matches[1];
+       } else {
+               return '';
+       }
+}
+
 ?>