X-Git-Url: https://git.cyclocoop.org/%242?a=blobdiff_plain;f=includes%2FGlobalFunctions.php;h=e6fda969c51026ee70aee60f2d1271c6703dd92a;hb=12166f46b4d63d3fd3cab68cf4c7090a1646dd09;hp=4ff258d2d542a711090bad19a65dfbbbe947de6a;hpb=1cf83c086d2139619992175442085d5b7cd76bf4;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 4ff258d2d5..e6fda969c5 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -391,7 +391,7 @@ function wfArrayToCgi( $array1, $array2 = null, $prefix = '' ) {
 
 	$cgi = '';
 	foreach ( $array1 as $key => $value ) {
-		if ( !is_null($value) && $value !== false ) {
+		if ( $value !== false ) {
 			if ( $cgi != '' ) {
 				$cgi .= '&';
 			}
@@ -412,8 +412,11 @@ function wfArrayToCgi( $array1, $array2 = null, $prefix = '' ) {
 			} else {
 				if ( is_object( $value ) ) {
 					$value = $value->__toString();
+				} elseif( !is_null( $value ) ) {
+					$cgi .= urlencode( $key ) . '=' . urlencode( $value );
+				} else {
+					$cgi .= urlencode( $key );
 				}
-				$cgi .= urlencode( $key ) . '=' . urlencode( $value );
 			}
 		}
 	}
@@ -440,14 +443,15 @@ function wfCgiToArray( $query ) {
 			continue;
 		}
 		if ( strpos( $bit, '=' ) === false ) {
-			// Pieces like &qwerty become 'qwerty' => '' (at least this is what php does)
-			$key = $bit;
-			$value = '';
+			// Pieces like &qwerty become 'qwerty' => null
+			$key = urldecode( $bit );
+			$value = null;
 		} else {
 			list( $key, $value ) = explode( '=', $bit );
+			$key = urldecode( $key );
+			$value = urldecode( $value );
 		}
-		$key = urldecode( $key );
-		$value = urldecode( $value );
+
 		if ( strpos( $key, '[' ) !== false ) {
 			$keys = array_reverse( explode( '[', $key ) );
 			$key = array_pop( $keys );
@@ -472,23 +476,15 @@ function wfCgiToArray( $query ) {
  * Append a query string to an existing URL, which may or may not already
  * have query string parameters already. If so, they will be combined.
  *
+ * @deprecated in 1.20. Use Uri class.
  * @param $url String
  * @param $query Mixed: string or associative array
  * @return string
  */
 function wfAppendQuery( $url, $query ) {
-	if ( is_array( $query ) ) {
-		$query = wfArrayToCgi( $query );
-	}
-	if( $query != '' ) {
-		if( false === strpos( $url, '?' ) ) {
-			$url .= '?';
-		} else {
-			$url .= '&';
-		}
-		$url .= $query;
-	}
-	return $url;
+	$obj = new Uri( $url );
+	$obj->extendQuery( $query );
+	return $obj->toString();
 }
 
 /**
@@ -576,49 +572,13 @@ function wfExpandUrl( $url, $defaultProto = PROTO_CURRENT ) {
  * @todo Need to integrate this into wfExpandUrl (bug 32168)
  *
  * @since 1.19
+ * @deprecated
  * @param $urlParts Array URL parts, as output from wfParseUrl
  * @return string URL assembled from its component parts
  */
 function wfAssembleUrl( $urlParts ) {
-	$result = '';
-
-	if ( isset( $urlParts['delimiter'] ) ) {
-		if ( isset( $urlParts['scheme'] ) ) {
-			$result .= $urlParts['scheme'];
-		}
-
-		$result .= $urlParts['delimiter'];
-	}
-
-	if ( isset( $urlParts['host'] ) ) {
-		if ( isset( $urlParts['user'] ) ) {
-			$result .= $urlParts['user'];
-			if ( isset( $urlParts['pass'] ) ) {
-				$result .= ':' . $urlParts['pass'];
-			}
-			$result .= '@';
-		}
-
-		$result .= $urlParts['host'];
-
-		if ( isset( $urlParts['port'] ) ) {
-			$result .= ':' . $urlParts['port'];
-		}
-	}
-
-	if ( isset( $urlParts['path'] ) ) {
-		$result .= $urlParts['path'];
-	}
-
-	if ( isset( $urlParts['query'] ) ) {
-		$result .= '?' . $urlParts['query'];
-	}
-
-	if ( isset( $urlParts['fragment'] ) ) {
-		$result .= '#' . $urlParts['fragment'];
-	}
-
-	return $result;
+	$obj = new Uri( $urlParts );
+	return $obj->toString();
 }
 
 /**
@@ -765,6 +725,7 @@ function wfUrlProtocolsWithoutProtRel() {
  * 2) Handles protocols that don't use :// (e.g., mailto: and news: , as well as protocol-relative URLs) correctly
  * 3) Adds a "delimiter" element to the array, either '://', ':' or '//' (see (2))
  *
+ * @deprecated
  * @param $url String: a URL to parse
  * @return Array: bits of the URL in an associative array, per PHP docs
  */
@@ -786,6 +747,9 @@ function wfParseUrl( $url ) {
 		return false;
 	}
 
+	// parse_url() incorrectly handles schemes case-sensitively. Convert it to lowercase.
+	$bits['scheme'] = strtolower( $bits['scheme'] );
+
 	// most of the protocols are followed by ://, but mailto: and sometimes news: not, check for it
 	if ( in_array( $bits['scheme'] . '://', $wgUrlProtocols ) ) {
 		$bits['delimiter'] = '://';
@@ -1061,6 +1025,7 @@ function wfLogDBError( $text ) {
 		} else {
 			$d = date_create( "now", $logDBErrorTimeZoneObject );
 		}
+		$date = $d->format( 'D M j G:i:s T Y' );
 
 		$date = $d->format( 'D M j G:i:s T Y' );
 
@@ -1539,8 +1504,6 @@ function wfMsgGetKey( $key, $useDB = true, $langCode = false, $transform = true
 /**
  * Replace message parameter keys on the given formatted output.
  *
- * @deprecated since 1.18
- *
  * @param $message String
  * @param $args Array
  * @return string
@@ -1879,16 +1842,15 @@ function wfBacktrace() {
  * wfGetCaller( 3 ) is the parent of that.
  *
  * @param $level Int
- * @return Bool|string
+ * @return string
  */
 function wfGetCaller( $level = 2 ) {
 	$backtrace = wfDebugBacktrace( $level + 1 );
 	if ( isset( $backtrace[$level] ) ) {
 		return wfFormatStackFrame( $backtrace[$level] );
 	} else {
-		$caller = 'unknown';
+		return 'unknown';
 	}
-	return $caller;
 }
 
 /**
@@ -1912,7 +1874,7 @@ function wfGetAllCallers( $limit = 3 ) {
  * Return a string representation of frame
  *
  * @param $frame Array
- * @return Bool
+ * @return string
  */
 function wfFormatStackFrame( $frame ) {
 	return isset( $frame['class'] ) ?
@@ -2402,6 +2364,7 @@ define( 'TS_ISO_8601_BASIC', 9 );
 /**
  * Get a timestamp string in one of various formats
  *
+ * @deprecated
  * @param $outputtype Mixed: A timestamp in one of the supported formats, the
  *                    function will autodetect which format is supplied and act
  *                    accordingly.
@@ -2409,118 +2372,8 @@ define( 'TS_ISO_8601_BASIC', 9 );
  * @return Mixed: String / false The same date in the format specified in $outputtype or false
  */
 function wfTimestamp( $outputtype = TS_UNIX, $ts = 0 ) {
-	$uts = 0;
-	$da = array();
-	$strtime = '';
-
-	if ( !$ts ) { // We want to catch 0, '', null... but not date strings starting with a letter.
-		$uts = time();
-		$strtime = "@$uts";
-	} elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
-		# TS_DB
-	} elseif ( preg_match( '/^(\d{4}):(\d\d):(\d\d) (\d\d):(\d\d):(\d\d)$/D', $ts, $da ) ) {
-		# TS_EXIF
-	} elseif ( preg_match( '/^(\d{4})(\d\d)(\d\d)(\d\d)(\d\d)(\d\d)$/D', $ts, $da ) ) {
-		# TS_MW
-	} elseif ( preg_match( '/^-?\d{1,13}$/D', $ts ) ) {
-		# TS_UNIX
-		$uts = $ts;
-		$strtime = "@$ts"; // http://php.net/manual/en/datetime.formats.compound.php
-	} elseif ( preg_match( '/^\d{2}-\d{2}-\d{4} \d{2}:\d{2}:\d{2}.\d{6}$/', $ts ) ) {
-		# TS_ORACLE // session altered to DD-MM-YYYY HH24:MI:SS.FF6
-		$strtime = preg_replace( '/(\d\d)\.(\d\d)\.(\d\d)(\.(\d+))?/', "$1:$2:$3",
-				str_replace( '+00:00', 'UTC', $ts ) );
-	} elseif ( preg_match( '/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})(?:\.*\d*)?Z$/', $ts, $da ) ) {
-		# TS_ISO_8601
-	} elseif ( preg_match( '/^(\d{4})(\d{2})(\d{2})T(\d{2})(\d{2})(\d{2})(?:\.*\d*)?Z$/', $ts, $da ) ) {
-		#TS_ISO_8601_BASIC
-	} elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d*[\+\- ](\d\d)$/', $ts, $da ) ) {
-		# TS_POSTGRES
-	} elseif ( preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.*\d* GMT$/', $ts, $da ) ) {
-		# TS_POSTGRES
-	} elseif (preg_match( '/^(\d{4})\-(\d\d)\-(\d\d) (\d\d):(\d\d):(\d\d)\.\d\d\d$/', $ts, $da ) ) {
-		# TS_DB2
-	} elseif ( preg_match( '/^[ \t\r\n]*([A-Z][a-z]{2},[ \t\r\n]*)?' . # Day of week
-							'\d\d?[ \t\r\n]*[A-Z][a-z]{2}[ \t\r\n]*\d{2}(?:\d{2})?' .  # dd Mon yyyy
-							'[ \t\r\n]*\d\d[ \t\r\n]*:[ \t\r\n]*\d\d[ \t\r\n]*:[ \t\r\n]*\d\d/S', $ts ) ) { # hh:mm:ss
-		# TS_RFC2822, accepting a trailing comment. See http://www.squid-cache.org/mail-archive/squid-users/200307/0122.html / r77171
-		# The regex is a superset of rfc2822 for readability
-		$strtime = strtok( $ts, ';' );
-	} elseif ( preg_match( '/^[A-Z][a-z]{5,8}, \d\d-[A-Z][a-z]{2}-\d{2} \d\d:\d\d:\d\d/', $ts ) ) {
-		# TS_RFC850
-		$strtime = $ts;
-	} elseif ( preg_match( '/^[A-Z][a-z]{2} [A-Z][a-z]{2} +\d{1,2} \d\d:\d\d:\d\d \d{4}/', $ts ) ) {
-		# asctime
-		$strtime = $ts;
-	} else {
-		# Bogus value...
-		wfDebug("wfTimestamp() fed bogus time value: TYPE=$outputtype; VALUE=$ts\n");
-
-		return false;
-	}
-
-	static $formats = array(
-		TS_UNIX => 'U',
-		TS_MW => 'YmdHis',
-		TS_DB => 'Y-m-d H:i:s',
-		TS_ISO_8601 => 'Y-m-d\TH:i:s\Z',
-		TS_ISO_8601_BASIC => 'Ymd\THis\Z',
-		TS_EXIF => 'Y:m:d H:i:s', // This shouldn't ever be used, but is included for completeness
-		TS_RFC2822 => 'D, d M Y H:i:s',
-		TS_ORACLE => 'd-m-Y H:i:s.000000', // Was 'd-M-y h.i.s A' . ' +00:00' before r51500
-		TS_POSTGRES => 'Y-m-d H:i:s',
-		TS_DB2 => 'Y-m-d H:i:s',
-	);
-
-	if ( !isset( $formats[$outputtype] ) ) {
-		throw new MWException( 'wfTimestamp() called with illegal output type.' );
-	}
-
-	if ( function_exists( "date_create" ) ) {
-		if ( count( $da ) ) {
-			$ds = sprintf("%04d-%02d-%02dT%02d:%02d:%02d.00+00:00",
-				(int)$da[1], (int)$da[2], (int)$da[3],
-				(int)$da[4], (int)$da[5], (int)$da[6]);
-
-			$d = date_create( $ds, new DateTimeZone( 'GMT' ) );
-		} elseif ( $strtime ) {
-			$d = date_create( $strtime, new DateTimeZone( 'GMT' ) );
-		} else {
-			return false;
-		}
-
-		if ( !$d ) {
-			wfDebug("wfTimestamp() fed bogus time value: $outputtype; $ts\n");
-			return false;
-		}
-
-		$output = $d->format( $formats[$outputtype] );
-	} else {
-		if ( count( $da ) ) {
-			// Warning! gmmktime() acts oddly if the month or day is set to 0
-			// We may want to handle that explicitly at some point
-			$uts = gmmktime( (int)$da[4], (int)$da[5], (int)$da[6],
-				(int)$da[2], (int)$da[3], (int)$da[1] );
-		} elseif ( $strtime ) {
-			$uts = strtotime( $strtime );
-		}
-
-		if ( $uts === false ) {
-			wfDebug("wfTimestamp() can't parse the timestamp (non 32-bit time? Update php): $outputtype; $ts\n");
-			return false;
-		}
-
-		if ( TS_UNIX == $outputtype ) {
-			return $uts;
-		}
-		$output = gmdate( $formats[$outputtype], $uts );
-	}
-
-	if ( ( $outputtype == TS_RFC2822 ) || ( $outputtype == TS_POSTGRES ) ) {
-		$output .= ' GMT';
-	}
-
-	return $output;
+	$timestamp = new MWTimestamp( $ts );
+	return $timestamp->getTimestamp( $outputtype );
 }
 
 /**