import v2.0.0.0_RC3 | 2012-07-01
https://github.com/lucanos/CommunityID -> http://www.itadmins.net/archives/357
This commit is contained in:
@ -16,7 +16,7 @@
|
||||
* @package Zend_Controller
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Abstract.php 16541 2009-07-07 06:59:03Z bkarwin $
|
||||
* @version $Id: Abstract.php 18175 2009-09-17 17:05:48Z matthew $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -321,6 +321,17 @@ abstract class Zend_Controller_Request_Abstract
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Unset all user parameters
|
||||
*
|
||||
* @return Zend_Controller_Request_Abstract
|
||||
*/
|
||||
public function clearParams()
|
||||
{
|
||||
$this->_params = array();
|
||||
return $this;
|
||||
}
|
||||
|
||||
/**
|
||||
* Set flag indicating whether or not request has been dispatched
|
||||
*
|
||||
|
@ -16,7 +16,7 @@
|
||||
* @package Zend_Controller
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Http.php 16933 2009-07-21 20:24:35Z matthew $
|
||||
* @version $Id: Http.php 19077 2009-11-20 00:29:56Z matthew $
|
||||
*/
|
||||
|
||||
/** Zend_Controller_Request_Abstract */
|
||||
@ -84,6 +84,12 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
|
||||
*/
|
||||
protected $_params = array();
|
||||
|
||||
/**
|
||||
* Raw request body
|
||||
* @var string|false
|
||||
*/
|
||||
protected $_rawBody;
|
||||
|
||||
/**
|
||||
* Alias keys for request parameters
|
||||
* @var array
|
||||
@ -386,6 +392,14 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
|
||||
if ($requestUri === null) {
|
||||
if (isset($_SERVER['HTTP_X_REWRITE_URL'])) { // check this first so IIS will catch
|
||||
$requestUri = $_SERVER['HTTP_X_REWRITE_URL'];
|
||||
} elseif (
|
||||
// IIS7 with URL Rewrite: make sure we get the unencoded url (double slash problem)
|
||||
isset($_SERVER['IIS_WasUrlRewritten'])
|
||||
&& $_SERVER['IIS_WasUrlRewritten'] == '1'
|
||||
&& isset($_SERVER['UNENCODED_URL'])
|
||||
&& $_SERVER['UNENCODED_URL'] != ''
|
||||
) {
|
||||
$requestUri = $_SERVER['UNENCODED_URL'];
|
||||
} elseif (isset($_SERVER['REQUEST_URI'])) {
|
||||
$requestUri = $_SERVER['REQUEST_URI'];
|
||||
// Http proxy reqs setup request uri with scheme and host [and port] + the url path, only use url path
|
||||
@ -708,18 +722,25 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
|
||||
* Retrieve an array of parameters
|
||||
*
|
||||
* Retrieves a merged array of parameters, with precedence of userland
|
||||
* params (see {@link setParam()}), $_GET, $POST (i.e., values in the
|
||||
* params (see {@link setParam()}), $_GET, $_POST (i.e., values in the
|
||||
* userland params will take precedence over all others).
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getParams()
|
||||
{
|
||||
$return = $this->_params;
|
||||
if (isset($_GET) && is_array($_GET)) {
|
||||
$return = $this->_params;
|
||||
$paramSources = $this->getParamSources();
|
||||
if (in_array('_GET', $paramSources)
|
||||
&& isset($_GET)
|
||||
&& is_array($_GET)
|
||||
) {
|
||||
$return += $_GET;
|
||||
}
|
||||
if (isset($_POST) && is_array($_POST)) {
|
||||
if (in_array('_POST', $paramSources)
|
||||
&& isset($_POST)
|
||||
&& is_array($_POST)
|
||||
) {
|
||||
$return += $_POST;
|
||||
}
|
||||
return $return;
|
||||
@ -919,13 +940,16 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
|
||||
*/
|
||||
public function getRawBody()
|
||||
{
|
||||
$body = file_get_contents('php://input');
|
||||
if (null === $this->_rawBody) {
|
||||
$body = file_get_contents('php://input');
|
||||
|
||||
if (strlen(trim($body)) > 0) {
|
||||
return $body;
|
||||
if (strlen(trim($body)) > 0) {
|
||||
$this->_rawBody = $body;
|
||||
} else {
|
||||
$this->_rawBody = false;
|
||||
}
|
||||
}
|
||||
|
||||
return false;
|
||||
return $this->_rawBody;
|
||||
}
|
||||
|
||||
/**
|
||||
|
@ -16,7 +16,7 @@
|
||||
* @package Zend_Controller
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: HttpTestCase.php 16541 2009-07-07 06:59:03Z bkarwin $
|
||||
* @version $Id: HttpTestCase.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -45,7 +45,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
* Request method
|
||||
* @var string
|
||||
*/
|
||||
protected $_method;
|
||||
protected $_method = 'GET';
|
||||
|
||||
/**
|
||||
* Raw POST body
|
||||
@ -68,7 +68,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Clear GET values
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function clearQuery()
|
||||
@ -79,7 +79,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Clear POST values
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function clearPost()
|
||||
@ -90,8 +90,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Set raw POST body
|
||||
*
|
||||
* @param string $content
|
||||
*
|
||||
* @param string $content
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function setRawBody($content)
|
||||
@ -102,7 +102,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Get RAW POST body
|
||||
*
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
public function getRawBody()
|
||||
@ -112,7 +112,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Clear raw POST body
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function clearRawBody()
|
||||
@ -123,9 +123,9 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Set a cookie
|
||||
*
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
*
|
||||
* @param string $key
|
||||
* @param mixed $value
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function setCookie($key, $value)
|
||||
@ -136,8 +136,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Set multiple cookies at once
|
||||
*
|
||||
* @param array $cookies
|
||||
*
|
||||
* @param array $cookies
|
||||
* @return void
|
||||
*/
|
||||
public function setCookies(array $cookies)
|
||||
@ -150,7 +150,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Clear all cookies
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function clearCookies()
|
||||
@ -161,8 +161,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Set request method
|
||||
*
|
||||
* @param string $type
|
||||
*
|
||||
* @param string $type
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function setMethod($type)
|
||||
@ -178,7 +178,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Get request method
|
||||
*
|
||||
*
|
||||
* @return string|null
|
||||
*/
|
||||
public function getMethod()
|
||||
@ -188,9 +188,9 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Set a request header
|
||||
*
|
||||
* @param string $key
|
||||
* @param string $value
|
||||
*
|
||||
* @param string $key
|
||||
* @param string $value
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function setHeader($key, $value)
|
||||
@ -202,8 +202,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Set request headers
|
||||
*
|
||||
* @param array $headers
|
||||
*
|
||||
* @param array $headers
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function setHeaders(array $headers)
|
||||
@ -216,9 +216,9 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Get request header
|
||||
*
|
||||
* @param string $header
|
||||
* @param mixed $default
|
||||
*
|
||||
* @param string $header
|
||||
* @param mixed $default
|
||||
* @return string|null
|
||||
*/
|
||||
public function getHeader($header, $default = null)
|
||||
@ -232,7 +232,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Get all request headers
|
||||
*
|
||||
*
|
||||
* @return array
|
||||
*/
|
||||
public function getHeaders()
|
||||
@ -242,7 +242,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Clear request headers
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Request_HttpTestCase
|
||||
*/
|
||||
public function clearHeaders()
|
||||
@ -253,7 +253,7 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Get REQUEST_URI
|
||||
*
|
||||
*
|
||||
* @return null|string
|
||||
*/
|
||||
public function getRequestUri()
|
||||
@ -263,8 +263,8 @@ class Zend_Controller_Request_HttpTestCase extends Zend_Controller_Request_Http
|
||||
|
||||
/**
|
||||
* Normalize a header name for setting and retrieval
|
||||
*
|
||||
* @param string $name
|
||||
*
|
||||
* @param string $name
|
||||
* @return string
|
||||
*/
|
||||
protected function _normalizeHeaderName($name)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Request
|
||||
* @copyright Copyright (c) 2005-2009 Zend Technologies USA Inc. (http://www.zend.com)
|
||||
* @license http://framework.zend.com/license/new-bsd New BSD License
|
||||
* @version $Id: Simple.php 16541 2009-07-07 06:59:03Z bkarwin $
|
||||
* @version $Id: Simple.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/** Zend_Controller_Request_Abstract */
|
||||
@ -32,24 +32,24 @@ require_once 'Zend/Controller/Request/Abstract.php';
|
||||
*/
|
||||
class Zend_Controller_Request_Simple extends Zend_Controller_Request_Abstract
|
||||
{
|
||||
|
||||
|
||||
public function __construct($action = null, $controller = null, $module = null, array $params = array())
|
||||
{
|
||||
if ($action) {
|
||||
$this->setActionName($action);
|
||||
}
|
||||
|
||||
|
||||
if ($controller) {
|
||||
$this->setControllerName($controller);
|
||||
}
|
||||
|
||||
|
||||
if ($module) {
|
||||
$this->setModuleName($module);
|
||||
}
|
||||
|
||||
|
||||
if ($params) {
|
||||
$this->setParams($params);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user