X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=5ff9629aa3bcf6478094e18a6268a979bd8bffac;hb=aa42646054b1e3616380a332d4420ee349e77c38;hp=60197eea9f7a64eb0d173d7ac65c7de41a780c04;hpb=1b89cd274a0d2c546736607c7fc4dea0fe219866;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 60197eea9f..5ff9629aa3 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -190,6 +190,37 @@ if ( !function_exists( 'array_diff_key' ) ) { } } +if ( !function_exists( 'array_intersect_key' ) ) { + /** + * Exists in 5.1.0+ + * Define our own array_intersect_key function + */ + function array_intersect_key( $isec, $keys ) { + $argc = func_num_args(); + + if ( $argc > 2 ) { + for ( $i = 1; $isec && $i < $argc; $i++ ) { + $arr = func_get_arg( $i ); + + foreach ( array_keys( $isec ) as $key ) { + if ( !isset( $arr[$key] ) ) + unset( $isec[$key] ); + } + } + + return $isec; + } else { + $res = array(); + foreach ( array_keys( $isec ) as $key ) { + if ( isset( $keys[$key] ) ) + $res[$key] = $isec[$key]; + } + + return $res; + } + } +} + // Support for Wietse Venema's taint feature if ( !function_exists( 'istainted' ) ) { function istainted( $var ) { @@ -312,6 +343,7 @@ function wfDebug( $text, $logonly = false ) { static $recursion = 0; static $cache = array(); // Cache of unoutputted messages + $text = wfDebugTimer() . $text; # Check for raw action using $_GET not $wgRequest, since the latter might not be initialised yet if ( isset( $_GET['action'] ) && $_GET['action'] == 'raw' && !$wgDebugRawPage ) { @@ -337,7 +369,7 @@ function wfDebug( $text, $logonly = false ) { array_map( array( $wgOut, 'debug' ), $cache ); $cache = array(); } - if ( '' != $wgDebugLogFile && !$wgProfileOnly ) { + if ( $wgDebugLogFile != '' && !$wgProfileOnly ) { # Strip unprintables; they can switch terminal modes when binary data # gets dumped, which is pretty annoying. $text = preg_replace( '![\x00-\x08\x0b\x0c\x0e-\x1f]!', ' ', $text ); @@ -346,6 +378,21 @@ function wfDebug( $text, $logonly = false ) { } } +function wfDebugTimer() { + global $wgDebugTimestamps; + if ( !$wgDebugTimestamps ) return ''; + static $start = null; + + if ( $start === null ) { + $start = microtime( true ); + $prefix = "\n$start"; + } else { + $prefix = sprintf( "%6.4f", microtime( true ) - $start ); + } + + return $prefix . ' '; +} + /** * Send a line giving PHP memory usage. * @param $exact Bool: print exact values instead of kilobytes (default: false) @@ -411,13 +458,18 @@ function wfErrorLog( $text, $file ) { // IPv6 bracketed host $protocol = $m[1]; $host = $m[2]; - $port = $m[3]; + $port = intval( $m[3] ); $prefix = isset( $m[4] ) ? $m[4] : false; + $domain = AF_INET6; } elseif ( preg_match( '!^(tcp|udp):(?://)?([a-zA-Z0-9.-]+):(\d+)(?:/(.*))?$!', $file, $m ) ) { $protocol = $m[1]; $host = $m[2]; - $port = $m[3]; + if ( !IP::isIPv4( $host ) ) { + $host = gethostbyname( $host ); + } + $port = intval( $m[3] ); $prefix = isset( $m[4] ) ? $m[4] : false; + $domain = AF_INET; } else { throw new MWException( __METHOD__.": Invalid UDP specification" ); } @@ -429,12 +481,12 @@ function wfErrorLog( $text, $file ) { } } - $sock = fsockopen( "$protocol://$host", $port ); + $sock = socket_create( $domain, SOCK_DGRAM, SOL_UDP ); if ( !$sock ) { return; } - fwrite( $sock, $text ); - fclose( $sock ); + socket_sendto( $sock, $text, strlen( $text ), 0, $host, $port ); + socket_close( $sock ); } else { wfSuppressWarnings(); $exists = file_exists( $file ); @@ -475,7 +527,7 @@ function wfLogProfilingData() { $log = sprintf( "%s\t%04.3f\t%s\n", gmdate( 'YmdHis' ), $elapsed, urldecode( $wgRequest->getRequestURL() . $forward ) ); - if ( '' != $wgDebugLogFile && ( $wgRequest->getVal('action') != 'raw' || $wgDebugRawPage ) ) { + if ( $wgDebugLogFile != '' && ( $wgRequest->getVal('action') != 'raw' || $wgDebugRawPage ) ) { wfErrorLog( $log . $prof, $wgDebugLogFile ); } } @@ -492,7 +544,7 @@ function wfReadOnly() { if ( !is_null( $wgReadOnly ) ) { return (bool)$wgReadOnly; } - if ( '' == $wgReadOnlyFile ) { + if ( $wgReadOnlyFile == '' ) { return false; } // Set $wgReadOnly for faster access next time @@ -1162,8 +1214,7 @@ function wfNumLink( $offset, $limit, $title, $query = '' ) { * @return bool Whereas client accept gzip compression */ function wfClientAcceptsGzip() { - global $wgUseGzip; - if( $wgUseGzip ) { + if( isset( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) { # FIXME: we may want to blacklist some broken browsers $m = array(); if( preg_match( @@ -1272,7 +1323,7 @@ function wfSetBit( &$dest, $bit, $state = true ) { * "days=7&limit=100". Options in the first array override options in the second. * Options set to "" will not be output. */ -function wfArrayToCGI( $array1, $array2 = NULL ) +function wfArrayToCGI( $array1, $array2 = null ) { if ( !is_null( $array2 ) ) { $array1 = $array1 + $array2; @@ -1280,8 +1331,8 @@ function wfArrayToCGI( $array1, $array2 = NULL ) $cgi = ''; foreach ( $array1 as $key => $value ) { - if ( '' !== $value ) { - if ( '' != $cgi ) { + if ( $value !== '' ) { + if ( $cgi != '' ) { $cgi .= '&'; } if ( is_array( $value ) ) { @@ -1712,7 +1763,7 @@ function mimeTypeMatch( $type, $avail ) { } elseif( array_key_exists( '*/*', $avail ) ) { return '*/*'; } else { - return NULL; + return null; } } } @@ -1754,7 +1805,7 @@ function wfNegotiateType( $cprefs, $sprefs ) { } $bestq = 0; - $besttype = NULL; + $besttype = null; foreach( array_keys( $combine ) as $type ) { if( $combine[$type] > $bestq ) { @@ -2084,9 +2135,10 @@ function &wfGetMimeMagic() { } /** - * Tries to get the system directory for temporary files. - * The TMPDIR, TMP, and TEMP environment variables are checked in sequence, - * and if none are set /tmp is returned as the generic Unix default. + * Tries to get the system directory for temporary files. For PHP >= 5.2.1, + * we'll use sys_get_temp_dir(). The TMPDIR, TMP, and TEMP environment + * variables are then checked in sequence, and if none are set /tmp is + * returned as the generic Unix default. * * NOTE: When possible, use the tempfile() function to create temporary * files to avoid race conditions on file creation, etc. @@ -2094,6 +2146,9 @@ function &wfGetMimeMagic() { * @return String */ function wfTempDir() { + if( function_exists( 'sys_get_temp_dir' ) ) { + return sys_get_temp_dir(); + } foreach( array( 'TMPDIR', 'TMP', 'TEMP' ) as $var ) { $tmp = getenv( $var ); if( $tmp && file_exists( $tmp ) && is_dir( $tmp ) && is_writable( $tmp ) ) { @@ -2236,9 +2291,7 @@ function wfSpecialList( $page, $details ) { */ function wfUrlProtocols() { global $wgUrlProtocols; - - // This function is called a lot, cache its return value - // TODO: Cache this in memcached instead? + static $retval = null; if ( !is_null( $retval ) ) return $retval; @@ -2254,7 +2307,6 @@ function wfUrlProtocols() { } else { $retval = $wgUrlProtocols; } - return $retval; } @@ -2356,45 +2408,6 @@ function wfShellExec( $cmd, &$retval=null ) { return $output; } -/** - * Executes a shell command in the background. Returns true if successful. - * - * @param $cmd String - */ -function wfShellBackgroundExec( $cmd ) { - wfDebug( "wfShellBackgroundExec: $cmd\n" ); - - if ( !wfShellExecEnabled() ) { - return false; - } - - if ( wfIsWindows() ) { - shell_exec( "start /b $cmd >nul" ); - return true; - } else { - $pid = shell_exec( "nohup $cmd > /dev/null & echo $!" ); - return (bool)$pid; - } -} - -/** - * Return true if we can execute a shell command (i.e. not safe mode, etc.) - */ -function wfShellExecEnabled() { - if( wfIniGetBool( 'safe_mode' ) ) { - wfDebug( "wfShellExec can't run in safe_mode, PHP's exec functions are too broken.\n" ); - return false; - } - $functions = explode( ',', ini_get( 'disable_functions' ) ); - $functions = array_map( 'trim', $functions ); - $functions = array_map( 'strtolower', $functions ); - if ( in_array( 'passthru', $functions ) ) { - wfDebug( "passthru is in disabled_functions\n" ); - return false; - } - return true; -} - /** * Workaround for http://bugs.php.net/bug.php?id=45132 * escapeshellarg() destroys non-ASCII characters if LANG is not a UTF-8 locale @@ -2989,6 +3002,7 @@ function &wfGetLBFactory() { /** * Find a file. * Shortcut for RepoGroup::singleton()->findFile() + * @param $title Either a string or Title object * @param $options Associative array of options: * time: requested time for an archived image, or false for the * current version. An image object will be returned which was @@ -3011,6 +3025,8 @@ function wfFindFile( $title, $options = array() ) { /** * Get an object referring to a locally registered file. * Returns a valid placeholder object if the file does not exist. + * @param $title Either a string or Title object + * @return File, or null if passed an invalid Title */ function wfLocalFile( $title ) { return RepoGroup::singleton()->getLocalRepo()->newFile( $title ); @@ -3113,21 +3129,6 @@ function wfMaxlagError( $host, $lag, $maxLag ) { } } -/** - * Displays a avglag error - * - * @param $lag Integer: avglag (actual) - * @param $avgLag Integer: avglag (requested) - */ -function wfAvglagError( $lag, $avgLag ) { - header( 'HTTP/1.1 503 Service Unavailable' ); - header( 'Retry-After: ' . max( intval( $avgLag ), 5 ) ); - header( 'X-Database-Lag: ' . intval( $lag ) ); - header( 'Content-Type: text/plain' ); - - echo "Lagged: $lag seconds average\n"; -} - /** * Throws a warning that $function is deprecated * @param $function String @@ -3187,12 +3188,13 @@ function wfWarn( $msg, $callerOffset = 1, $level = E_USER_NOTICE ) { * to use this outside maintenance scripts in its present form. * * @param $maxLag Integer + * @param $wiki mixed Wiki identifier accepted by wfGetLB * @return null */ -function wfWaitForSlaves( $maxLag ) { +function wfWaitForSlaves( $maxLag, $wiki = false ) { if( $maxLag ) { - $lb = wfGetLB(); - list( $host, $lag ) = $lb->getMaxLag(); + $lb = wfGetLB( $wiki ); + list( $host, $lag ) = $lb->getMaxLag( $wiki ); while( $lag > $maxLag ) { $name = @gethostbyaddr( $host ); if( $name !== false ) {