typo

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

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index e5f6f4c..31b72a7 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -302,7 +302,7 @@ function logProfilingData() {
                        $forward .= ' from ' . $_SERVER['HTTP_FROM'];
                if( $forward )
                        $forward = "\t(proxied via {$_SERVER['REMOTE_ADDR']}{$forward})";
-               if($wgUser->getId() == 0)
+               if( $wgUser->isAnon() )
                        $forward .= ' anon';
                $log = sprintf( "%s\t%04.3f\t%s\n",
                  gmdate( 'YmdHis' ), $elapsed,
@@ -399,7 +399,11 @@ function wfMsgReal( $key, $args, $useDB, $forContent=false ) {
                }
 
                wfSuppressWarnings();
-               $message = $lang->getMessage( $key );
+               if( is_object( $lang ) ) {
+                       $message = $lang->getMessage( $key );
+               } else {
+                       $message = '';
+               }
                wfRestoreWarnings();
                if(!$message)
                        $message = Language::getMessage($key);
@@ -471,12 +475,21 @@ function wfDebugDieBacktrace( $msg = '' ) {
                }
                $backtrace = debug_backtrace();
                foreach( $backtrace as $call ) {
-                       $f = explode( DIRECTORY_SEPARATOR, $call['file'] );
-                       $file = $f[count($f)-1];
+                       if( isset( $call['file'] ) ) {
+                               $f = explode( DIRECTORY_SEPARATOR, $call['file'] );
+                               $file = $f[count($f)-1];
+                       } else {
+                               $file = '-';
+                       }
+                       if( isset( $call['line'] ) ) {
+                               $line = $call['line'];
+                       } else {
+                               $line = '-';
+                       }
                        if ( $wgCommandLineMode ) {
-                               $msg .= "$file line {$call['line']} calls ";
+                               $msg .= "$file line $line calls ";
                        } else {
-                               $msg .= '<li>' . $file . ' line ' . $call['line'] . ' calls ';
+                               $msg .= '<li>' . $file . ' line ' . $line . ' calls ';
                        }
                        if( !empty( $call['class'] ) ) $msg .= $call['class'] . '::';
                        $msg .= $call['function'] . '()';
@@ -612,7 +625,7 @@ function wfCheckLimits( $deflimit = 50, $optionname = 'rclimit' ) {
  */
 function wfEscapeWikiText( $text ) {
        $text = str_replace( 
-               array( '[',             '|',      "'",     'ISBN '        , '://'         , "\n=", '{{' ),
+               array( '[',             '|',      '\'',    'ISBN '        , '://'         , "\n=", '{{' ),
                array( '&#91;', '&#124;', '&#39;', 'ISBN&#32;', '&#58;//' , "\n&#61;", '&#123;&#123;' ),
                htmlspecialchars($text) );
        return $text;
@@ -770,7 +783,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
          wfEscapeShellArg( $yourtextName );
        $handle = popen( $cmd, 'r' );
 
-       if( fgets( $handle ) ){
+       if( fgets( $handle, 1024 ) ){
                $conflict = true;
        } else {
                $conflict = false;
@@ -799,7 +812,7 @@ function wfMerge( $old, $mine, $yours, &$result ){
  */
 function wfVarDump( $var ) {
        global $wgOut;
-       $s = str_replace("\n","<br>\n", var_export( $var, true ) . "\n");
+       $s = str_replace("\n","<br />\n", var_export( $var, true ) . "\n");
        if ( headers_sent() || !@is_object( $wgOut ) ) {
                print $s;
        } else {
@@ -820,7 +833,7 @@ function wfHttpError( $code, $label, $desc ) {
        # Don't send content if it's a HEAD request.
        if( $_SERVER['REQUEST_METHOD'] == 'HEAD' ) {
                header( 'Content-type: text/plain' );
-               print "$desc\n";
+               print $desc."\n";
        }
 }
 
@@ -947,25 +960,6 @@ function wfTimestampNow() {
        return wfTimestamp( TS_MW, time() );
 }
 
-/**
- * Convenience function; adds seconds to a MediaWiki timestamp.
- * @return string
- */
-function wfTimestampPlus ( $ts, $moreseconds ) {
-       return gmdate( 'YmdHis', wfTimestamp( TS_UNIX, $ts ) + $moreseconds );
-}
-
-/**
- * Sorting hack for MySQL 3, which doesn't use index sorts for DESC
- */
-function wfInvertTimestamp( $ts ) {
-       return strtr(
-               $ts,
-               '0123456789',
-               '9876543210'
-       );
-}
-
 /**
  * Reference-counted warning suppression
  */
@@ -1003,6 +997,8 @@ define('TS_UNIX',0);
 define('TS_MW',1);     
 /** Standard database timestamp (yyyy-mm-dd hh:mm:ss) */
 define('TS_DB',2);
+/** For HTTP and e-mail headers -- output only */
+define('TS_RFC2822', 3 );
 
 /**
  * @todo document
@@ -1019,6 +1015,10 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) {
        } elseif (preg_match("/^(\d{1,13})$/",$ts,$datearray)) {
                # TS_UNIX
                $uts=$ts;
+       } else {
+               # Bogus value; fall back to the epoch...
+               wfDebug("wfTimestamp() given bogus time value.\n");
+               $uts = 0;
        }
 
        if ($ts==0)
@@ -1026,15 +1026,14 @@ function wfTimestamp($outputtype=TS_UNIX,$ts=0) {
        switch($outputtype) {
        case TS_UNIX:
                return $uts;
-               break;
        case TS_MW:
                return gmdate( 'YmdHis', $uts );
-               break;
        case TS_DB:
                return gmdate( 'Y-m-d H:i:s', $uts );
-               break;
+       case TS_RFC2822:
+               return gmdate( 'D, d M Y H:i:s', $uts ) . ' GMT';
        default:
-               return;
+               wfDebugDieBacktrace( 'wfTimestamp() called with illegal output type.');
        }
 }
 
@@ -1052,4 +1051,37 @@ function wfIsWindows() {
        }   
 } 
 
+/**
+ * Swap two variables
+ */
+function swap( &$x, &$y ) {
+       $z = $x;
+       $x = $y;
+       $y = $z;
+}
+
+function wfGetSiteNotice() {
+       global $wgSiteNotice, $wgTitle, $wgOut;
+       $fname = 'wfGetSiteNotice';
+       wfProfileIn( $fname );
+
+       $notice = wfMsg( 'sitenotice' );
+       if($notice == '&lt;sitenotice&gt;') $notice = '';
+       # Allow individual wikis to turn it off
+       if ( $notice == '-' ) {
+               $notice = '';
+       } else {
+               if ($notice == '') {
+                       $notice = $wgSiteNotice;
+               }
+               if($notice != '-' && $notice != '') {
+                       $specialparser = new Parser();
+                       $parserOutput = $specialparser->parse( $notice, $wgTitle, $wgOut->mParserOptions, false );
+                       $notice = $parserOutput->getText();
+               }
+       }
+       wfProfileOut( $fname );
+       return $notice;
+}
+
 ?>