From ca32f08966f1b51fcb19460f0996bb0c4048e6fe Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 3 Dec 2011 13:29:22 +0100
Subject: Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing
---
 includes/WebResponse.php | 130 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 94 insertions(+), 36 deletions(-)

(limited to 'includes/WebResponse.php')

diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index 2b1ec04c..1101d75d 100644
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -2,6 +2,21 @@
 /**
  * Classes used to send headers and cookies back to the user
  *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
  * @file
  */
 
@@ -17,78 +32,121 @@ class WebResponse {
 	 * header()
 	 * @param $string String: header to output
 	 * @param $replace Bool: replace current similar header
+	 * @param $http_response_code null|int Forces the HTTP response code to the specified value.
 	 */
-	public function header($string, $replace=true) {
-		header($string,$replace);
+	public function header( $string, $replace = true, $http_response_code = null ) {
+		header( $string, $replace, $http_response_code );
 	}
 
-	/** Set the browser cookie
+	/**
+	 * Set the browser cookie
 	 * @param $name String: name of cookie
 	 * @param $value String: value to give cookie
 	 * @param $expire Int: number of seconds til cookie expires
+	 * @param $prefix String: Prefix to use, if not $wgCookiePrefix (use '' for no prefix)
+	 * @param @domain String: Cookie domain to use, if not $wgCookieDomain
 	 */
-	public function setcookie( $name, $value, $expire = 0 ) {
+	public function setcookie( $name, $value, $expire = 0, $prefix = null, $domain = null ) {
 		global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
 		global $wgCookieSecure,$wgCookieExpiration, $wgCookieHttpOnly;
 		if ( $expire == 0 ) {
 			$expire = time() + $wgCookieExpiration;
 		}
-		$httpOnlySafe = wfHttpOnlySafe();
+		if( $prefix === null ) {
+			$prefix = $wgCookiePrefix;
+		}
+		if( $domain === null ) {
+			$domain = $wgCookieDomain;
+		}
+		$httpOnlySafe = wfHttpOnlySafe() && $wgCookieHttpOnly;
 		wfDebugLog( 'cookie',
 			'setcookie: "' . implode( '", "',
 				array(
-					$wgCookiePrefix . $name,
+					$prefix . $name,
 					$value,
 					$expire,
 					$wgCookiePath,
-					$wgCookieDomain,
+					$domain,
 					$wgCookieSecure,
-					$httpOnlySafe && $wgCookieHttpOnly ) ) . '"' );
-		if( $httpOnlySafe && isset( $wgCookieHttpOnly ) ) {
-			setcookie( $wgCookiePrefix . $name,
-				$value,
-				$expire,
-				$wgCookiePath,
-				$wgCookieDomain,
-				$wgCookieSecure,
-				$wgCookieHttpOnly );
-		} else {
-			// setcookie() fails on PHP 5.1 if you give it future-compat paramters.
-			// stab stab!
-			setcookie( $wgCookiePrefix . $name,
-				$value,
-				$expire,
-				$wgCookiePath,
-				$wgCookieDomain,
-				$wgCookieSecure );
-		}
+					$httpOnlySafe ) ) . '"' );
+		setcookie( $prefix . $name,
+			$value,
+			$expire,
+			$wgCookiePath,
+			$domain,
+			$wgCookieSecure,
+			$httpOnlySafe );
 	}
 }
 
-
+/**
+ * @ingroup HTTP
+ */
 class FauxResponse extends WebResponse {
 	private $headers;
 	private $cookies;
+	private $code;
+
+	/**
+	 * Stores a HTTP header
+	 * @param $string String: header to output
+	 * @param $replace Bool: replace current similar header
+	 * @param $http_response_code null|int Forces the HTTP response code to the specified value.
+	 */
+	public function header( $string, $replace = true, $http_response_code = null ) {
+		if ( substr( $string, 0, 5 ) == 'HTTP/' ) {
+			$parts = explode( ' ', $string, 3 );
+			$this->code = intval( $parts[1] );
+		} else {
+			list( $key, $val ) = array_map( 'trim', explode( ":", $string, 2 ) );
 
-	public function header($string, $replace=true) {
-		list($key, $val) = explode(":", $string, 2);
+			if( $replace || !isset( $this->headers[$key] ) ) {
+				$this->headers[$key] = $val;
+			}
+		}
 
-		if($replace || !isset($this->headers[$key])) {
-			$this->headers[$key] = $val;
+		if ( $http_response_code !== null ) {
+			$this->code = intval( $http_response_code );
 		}
 	}
 
-	public function getheader($key) {
-		return $this->headers[$key];
+	/**
+	 * @param $key string
+	 * @return string
+	 */
+	public function getheader( $key ) {
+		if ( isset( $this->headers[$key] ) ) {
+			return $this->headers[$key];
+		}
+		return null;
+	}
+
+	/**
+	 * Get the HTTP response code, null if not set
+	 *
+	 * @return Int or null
+	 */
+	public function getStatusCode() {
+		return $this->code;
 	}
 
-	public function setcookie( $name, $value, $expire = 0 ) {
+	/**
+	 * @param $name String: name of cookie
+	 * @param $value String: value to give cookie
+	 * @param $expire Int: number of seconds til cookie expires
+	 */
+	public function setcookie( $name, $value, $expire = 0, $prefix = null, $domain = null ) {
 		$this->cookies[$name] = $value;
 	}
 
+	/**
+	 * @param $name string
+	 * @return string
+	 */
 	public function getcookie( $name )  {
-		if ( isset($this->cookies[$name]) ) {
+		if ( isset( $this->cookies[$name] ) ) {
 			return $this->cookies[$name];
 		}
+		return null;
 	}
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf