Revert r19877; no reason is given for it but it breaks things such as parameter subst...

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

diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 736e215..b08fd4e 100644 (file)
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1,7 +1,6 @@
 <?php
 /**
  * Deal with importing all those nasssty globals and things
- * @package MediaWiki
  */
 
 # Copyright (C) 2003 Brion Vibber <brion@pobox.com>
@@ -32,18 +31,33 @@
  * you want to pass arbitrary data to some function in place of the web
  * input.
  *
- * @package MediaWiki
  */
+
+/**
+ * Some entry points may use this file without first enabling the 
+ * autoloader.
+ */
+if ( !function_exists( '__autoload' ) ) {
+       require_once( dirname(__FILE__) . '/normal/UtfNormal.php' );
+}
+
 class WebRequest {
-       function WebRequest() {
+       function __construct() {
                $this->checkMagicQuotes();
                global $wgUsePathInfo;
-               if( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') && $wgUsePathInfo ) {
-                       # Stuff it!
-                       $_GET['title'] = $_REQUEST['title'] =
-                               substr( $_SERVER['PATH_INFO'], 1 );
+               if ( $wgUsePathInfo ) {
+                       if ( isset( $_SERVER['ORIG_PATH_INFO'] ) && $_SERVER['ORIG_PATH_INFO'] != '' ) {
+                               # Mangled PATH_INFO
+                               # http://bugs.php.net/bug.php?id=31892
+                               # Also reported when ini_get('cgi.fix_pathinfo')==false
+                               $_GET['title'] = $_REQUEST['title'] = substr( $_SERVER['ORIG_PATH_INFO'], 1 );
+                       } elseif ( isset( $_SERVER['PATH_INFO'] ) && ($_SERVER['PATH_INFO'] != '') && $wgUsePathInfo ) {
+                               $_GET['title'] = $_REQUEST['title'] = substr( $_SERVER['PATH_INFO'], 1 );
+                       }
                }
        }
+       
+       private $_response;
 
        /**
         * Recursively strips slashes from the given array;
@@ -117,7 +131,6 @@ class WebRequest {
                                        $data = $wgContLang->checkTitleEncoding( $data );
                                }
                        }
-                       require_once( 'normal/UtfNormal.php' );
                        $data = $this->normalizeUnicode( $data );
                        return $data;
                } else {
@@ -288,10 +301,15 @@ class WebRequest {
         * Returns true if there is a session cookie set.
         * This does not necessarily mean that the user is logged in!
         *
+        * If you want to check for an open session, use session_id()
+        * instead; that will also tell you if the session was opened
+        * during the current request (in which case the cookie will
+        * be sent back to the client at the end of the script run).
+        *
         * @return bool
         */
        function checkSessionCookie() {
-               return isset( $_COOKIE[ini_get('session.name')] );
+               return isset( $_COOKIE[session_name()] );
        }
 
        /**
@@ -299,7 +317,20 @@ class WebRequest {
         * @return string
         */
        function getRequestURL() {
-               $base = $_SERVER['REQUEST_URI'];
+               if( isset( $_SERVER['REQUEST_URI'] ) ) {
+                       $base = $_SERVER['REQUEST_URI'];
+               } elseif( isset( $_SERVER['SCRIPT_NAME'] ) ) {
+                       // Probably IIS; doesn't set REQUEST_URI
+                       $base = $_SERVER['SCRIPT_NAME'];
+                       if( isset( $_SERVER['QUERY_STRING'] ) && $_SERVER['QUERY_STRING'] != '' ) {
+                               $base .= '?' . $_SERVER['QUERY_STRING'];
+                       }
+               } else {
+                       // This shouldn't happen!
+                       throw new MWException( "Web server doesn't provide either " .
+                               "REQUEST_URI or SCRIPT_NAME. Report details of your " .
+                               "web server configuration to http://bugzilla.wikimedia.org/" );
+               }
                if( $base{0} == '/' ) {
                        return $base;
                } else {
@@ -437,12 +468,24 @@ class WebRequest {
                wfDebug( "WebRequest::getFileName() '" . $_FILES[$key]['name'] . "' normalized to '$name'\n" );
                return $name;
        }
+       
+       /**
+        * Return a handle to WebResponse style object, for setting cookies, 
+        * headers and other stuff, for Request being worked on.
+        */
+       function response() {
+               /* Lazy initialization of response object for this request */
+               if (!is_object($this->_response)) {
+                       $this->_response = new WebResponse;
+               } 
+               return $this->_response;
+       }
+       
 }
 
 /**
  * WebRequest clone which takes values from a provided array.
  *
- * @package MediaWiki
  */
 class FauxRequest extends WebRequest {
        var $data = null;
@@ -452,7 +495,7 @@ class FauxRequest extends WebRequest {
                if( is_array( $data ) ) {
                        $this->data = $data;
                } else {
-                       wfDebugDieBacktrace( "FauxRequest() got bogus data" );
+                       throw new MWException( "FauxRequest() got bogus data" );
                }
                $this->wasPosted = $wasPosted;
        }
@@ -479,11 +522,11 @@ class FauxRequest extends WebRequest {
        }
 
        function getRequestURL() {
-               wfDebugDieBacktrace( 'FauxRequest::getRequestURL() not implemented' );
+               throw new MWException( 'FauxRequest::getRequestURL() not implemented' );
        }
 
        function appendQuery( $query ) {
-               wfDebugDieBacktrace( 'FauxRequest::appendQuery() not implemented' );
+               throw new MWException( 'FauxRequest::appendQuery() not implemented' );
        }
 
 }