* Removed getSelectOptions, which did nothing other than send FOR UPDATE on some...

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

diff --git a/includes/WebResponse.php b/includes/WebResponse.php
index e3a6a1e..a0f7776 100644 (file)
--- a/includes/WebResponse.php
+++ b/includes/WebResponse.php
@@ -1,24 +1,31 @@
 <?php
+/**
+ * Classes used to send headers and cookies back to the user
+ *
+ * @file
+ */
+
 /**
  * Allow programs to request this object from WebRequest::response()
  * and handle all outputting (or lack of outputting) via it.
+ * @ingroup HTTP
  */
 class WebResponse {
 
-       /** 
+       /**
         * Output a HTTP header, wrapper for PHP's
         * header()
-        * @param string $string Header to output
-        * @param bool $replace Replace current similar header
+        * @param $string String: header to output
+        * @param $replace Bool: replace current similar header
         */
        public function header($string, $replace=true) {
                header($string,$replace);
        }
 
        /** Set the browser cookie
-        * @param string $name Name of cookie
-        * @param string $value Value to give cookie
-        * @param int $expire Number of seconds til cookie expires
+        * @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 ) {
                global $wgCookiePath, $wgCookiePrefix, $wgCookieDomain;
@@ -26,7 +33,7 @@ class WebResponse {
                if ( $expire == 0 ) {
                        $expire = time() + $wgCookieExpiration;
                }
-               $httpOnlySafe = wfHttpOnlySafe();
+               $httpOnlySafe = wfHttpOnlySafe() && $wgCookieHttpOnly;
                wfDebugLog( 'cookie',
                        'setcookie: "' . implode( '", "',
                                array(
@@ -36,24 +43,41 @@ class WebResponse {
                                        $wgCookiePath,
                                        $wgCookieDomain,
                                        $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( $wgCookiePrefix . $name,
+                       $value,
+                       $expire,
+                       $wgCookiePath,
+                       $wgCookieDomain,
+                       $wgCookieSecure,
+                       $httpOnlySafe );
+       }
+}
+
+
+class FauxResponse extends WebResponse {
+       private $headers;
+       private $cookies;
+
+       public function header($string, $replace=true) {
+               list($key, $val) = explode(":", $string, 2);
+
+               if($replace || !isset($this->headers[$key])) {
+                       $this->headers[$key] = $val;
+               }
+       }
+
+       public function getheader($key) {
+               return $this->headers[$key];
+       }
+
+       public function setcookie( $name, $value, $expire = 0 ) {
+               $this->cookies[$name] = $value;
+       }
+
+       public function getcookie( $name )  {
+               if ( isset($this->cookies[$name]) ) {
+                       return $this->cookies[$name];
                }
        }
 }