6543/CommunityID
1
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

import v1.1.0_beta1 | 2009-08-21

Browse Source
This commit is contained in:
6543
2019-07-17 22:16:19 +02:00
parent 2c1152f0d3
commit 8dee6b1a10
2306 changed files with 251360 additions and 23428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
libs/Zend/Controller/Action.php
View File

@ -18,10 +18,19 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Controller_Action_HelperBroker */
/**
* @see Zend_Controller_Action_HelperBroker
*/
require_once 'Zend/Controller/Action/HelperBroker.php';
/** Zend_Controller_Front */
/**
* @see Zend_Controller_Action_Interface
*/
require_once 'Zend/Controller/Action/Interface.php';
/**
* @see Zend_Controller_Front
*/
require_once 'Zend/Controller/Front.php';
/**
@ -30,7 +39,7 @@ require_once 'Zend/Controller/Front.php';
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
abstract class Zend_Controller_Action
abstract class Zend_Controller_Action implements Zend_Controller_Action_Interface
{
/**
* @var array of existing class methods
@ -462,19 +471,19 @@ abstract class Zend_Controller_Action
* overridden to implement magic (dynamic) actions, or provide run-time
* dispatching.
*
* @param string $methodName
* @param array $args
* @param string $methodName
* @param array $args
* @return void
* @throws Zend_Controller_Action_Exception
*/
public function __call($methodName, $args)
{
require_once 'Zend/Controller/Action/Exception.php';
if ('Action' == substr($methodName, -6)) {
require_once 'Zend/Controller/Action/Exception.php';
$action = substr($methodName, 0, strlen($methodName) - 6);
require_once 'Zend/Controller/Action/Exception.php';
throw new Zend_Controller_Action_Exception(sprintf('Action "%s" does not exist and was not trapped in __call()', $action), 404);
}
require_once 'Zend/Controller/Action/Exception.php';
throw new Zend_Controller_Action_Exception(sprintf('Method "%s" does not exist and was not trapped in __call()', $methodName), 500);
}

9
libs/Zend/Controller/Action/Helper/Abstract.php
View File

@ -19,18 +19,11 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
* @see Zend_Controller_Exception
*/
require_once 'Zend/Controller/Action/Exception.php';
/**
* @see Zend_Controller_Action
*/
require_once 'Zend/Controller/Action.php';
/**
* @category Zend
* @package Zend_Controller
@ -76,7 +69,7 @@ abstract class Zend_Controller_Action_Helper_Abstract
/**
* Retrieve front controller instance
*
*
* @return Zend_Controller_Front
*/
public function getFrontController()

28
libs/Zend/Controller/Action/Helper/ContextSwitch.php
View File

@ -17,7 +17,7 @@
* @subpackage Zend_Controller_Action_Helper
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: ContextSwitch.php 12315 2008-11-05 22:31:23Z sidhighwind $
* @version $Id: ContextSwitch.php 12811 2008-11-24 20:44:26Z matthew $
*/
/**
@ -114,6 +114,12 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action
*/
protected $_viewRenderer;
/**
* Original view suffix prior to detecting context switch
* @var string
*/
protected $_viewSuffixOrig;
/**
* Constructor
*
@ -144,6 +150,25 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action
)
));
}
$this->init();
}
/**
* Initialize at start of action controller
*
* Reset the view script suffix to the original state, or store the
* original state.
*
* @return void
*/
public function init()
{
if (null === $this->_viewSuffixOrig) {
$this->_viewSuffixOrig = $this->_getViewRenderer()->getViewSuffix();
} else {
$this->_getViewRenderer()->setViewSuffix($this->_viewSuffixOrig);
}
}
/**
@ -248,6 +273,7 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action
}
$suffix = $this->getSuffix($context);
$this->_getViewRenderer()->setViewSuffix($suffix);
$headers = $this->getHeaders($context);

37
libs/Zend/Controller/Action/Helper/Json.php
View File

@ -17,7 +17,7 @@
* @subpackage Zend_Controller_Action_Helper
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
* @version $Id: Json.php 9098 2008-03-30 19:29:10Z thomas $
* @version $Id: Json.php 15052 2009-04-21 15:34:02Z matthew $
*/
/**
@ -46,12 +46,19 @@ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_A
/**
* Create JSON response
*
* Encodes and returns data to JSON. Content-Type header set to
* 'application/json', and disables layouts and viewRenderer (if being
* Encodes and returns data to JSON. Content-Type header set to
* 'application/json', and disables layouts and viewRenderer (if being
* used).
*
* @param mixed $data
* @param boolean $keepLayouts
* @param boolean|array $keepLayouts
* NOTE: if boolean, establish $keepLayouts to true|false
* if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
* if $keepLayouts and parmas for Zend_Json::encode are required
* then, the array can contains a 'keepLayout'=>true|false
* that will not be passed to Zend_Json::encode method but will be passed
* to Zend_View_Helper_Json
* @throws Zend_Controller_Action_Helper_Json
* @return string
*/
@ -77,9 +84,15 @@ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_A
/**
* Encode JSON response and immediately send
*
* @param mixed $data
* @param boolean $keepLayouts
*
* @param mixed $data
* @param boolean|array $keepLayouts
* NOTE: if boolean, establish $keepLayouts to true|false
* if array, admit params for Zend_Json::encode as enableJsonExprFinder=>true|false
* if $keepLayouts and parmas for Zend_Json::encode are required
* then, the array can contains a 'keepLayout'=>true|false
* that will not be passed to Zend_Json::encode method but will be passed
* to Zend_View_Helper_Json
* @return string|void
*/
public function sendJson($data, $keepLayouts = false)
@ -99,12 +112,12 @@ class Zend_Controller_Action_Helper_Json extends Zend_Controller_Action_Helper_A
/**
* Strategy pattern: call helper as helper broker method
*
* Allows encoding JSON. If $sendNow is true, immediately sends JSON
* response.
*
* @param mixed $data
* @param boolean $sendNow
* @param boolean $keepLayouts
* Allows encoding JSON. If $sendNow is true, immediately sends JSON
* response.
*
* @param mixed $data
* @param boolean $sendNow
* @param boolean $keepLayouts
* @return string|void
*/
public function direct($data, $sendNow = true, $keepLayouts = false)

64
libs/Zend/Controller/Action/Helper/Redirector.php
View File

@ -19,11 +19,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
* @see Zend_Controller_Action_Exception
*/
require_once 'Zend/Controller/Action/Exception.php';
/**
* @see Zend_Controller_Action_Helper_Abstract
*/
@ -69,6 +64,12 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
*/
protected $_useAbsoluteUri = false;
/**
* Whether or not to close the session before exiting
* @var boolean
*/
protected $_closeSessionOnExit = true;
/**
* Retrieve HTTP status code to emit on {@link _redirect()} call
*
@ -90,10 +91,7 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
{
$code = (int)$code;
if ((300 > $code) || (307 < $code) || (304 == $code) || (306 == $code)) {
/**
* @see Zend_Controller_Exception
*/
require_once 'Zend/Controller/Exception.php';
require_once 'Zend/Controller/Action/Exception.php';
throw new Zend_Controller_Action_Exception('Invalid redirect HTTP status code (' . $code . ')');
}
@ -158,6 +156,29 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
return $this;
}
/**
* Retrieve flag for whether or not {@link redirectAndExit()} shall close the session before
* exiting.
*
* @return boolean
*/
public function getCloseSessionOnExit()
{
return $this->_closeSessionOnExit;
}
/**
* Set flag for whether or not {@link redirectAndExit()} shall close the session before exiting.
*
* @param boolean $flag
* @return Zend_Controller_Action_Helper_Redirector Provides a fluent interface
*/
public function setCloseSessionOnExit($flag)
{
$this->_closeSessionOnExit = ($flag) ? true : false;
return $this;
}
/**
* Return use absolute URI flag
*
@ -256,8 +277,8 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
if (null === $module) {
$module = $curModule;
}
}
if ($module == $dispatcher->getDefaultModule()) {
$module = '';
}
@ -325,9 +346,6 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
// prevent header injections
$url = str_replace(array("\n", "\r"), '', $url);
$exit = $this->getExit();
$prependBase = $this->getPrependBase();
$code = $this->getCode();
if (null !== $options) {
if (isset($options['exit'])) {
$this->setExit(($options['exit']) ? true : false);
@ -455,11 +473,13 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
*/
public function redirectAndExit()
{
// Close session, if started
if (class_exists('Zend_Session', false) && Zend_Session::isStarted()) {
Zend_Session::writeClose();
} elseif (isset($_SESSION)) {
session_write_close();
if ($this->getCloseSessionOnExit()) {
// Close session, if started
if (class_exists('Zend_Session', false) && Zend_Session::isStarted()) {
Zend_Session::writeClose();
} elseif (isset($_SESSION)) {
session_write_close();
}
}
$this->getResponse()->sendHeaders();
@ -485,9 +505,9 @@ class Zend_Controller_Action_Helper_Redirector extends Zend_Controller_Action_He
* Overloading
*
* Overloading for old 'goto', 'setGoto', and 'gotoAndExit' methods
*
* @param string $method
* @param array $args
*
* @param string $method
* @param array $args
* @return mixed
* @throws Zend_Controller_Action_Exception for invalid methods
*/

6
libs/Zend/Controller/Action/Helper/ViewRenderer.php
View File

@ -281,7 +281,7 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
$this->_inflector->setStaticRuleReference('moduleDir', $this->_moduleDir) // moduleDir must be specified before the less specific 'module'
->addRules(array(
':module' => array('Word_CamelCaseToDash', 'StringToLower'),
':controller' => array('Word_CamelCaseToDash', new Zend_Filter_Word_UnderscoreToSeparator('/'), 'StringToLower'),
':controller' => array('Word_CamelCaseToDash', new Zend_Filter_Word_UnderscoreToSeparator('/'), 'StringToLower', new Zend_Filter_PregReplace('/\./', '-')),
':action' => array('Word_CamelCaseToDash', new Zend_Filter_PregReplace('#[^a-z0-9' . preg_quote('/', '#') . ']+#i', '-'), 'StringToLower'),
))
->setStaticRuleReference('suffix', $this->_viewSuffix)
@ -391,7 +391,7 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
$parts = array(
'module' => (($moduleName = $request->getModuleName()) != '') ? $dispatcher->formatModuleName($moduleName) : $moduleName,
'controller' => substr($dispatcher->formatControllerName($request->getControllerName()), 0, -10),
'controller' => $request->getControllerName(),
'action' => $dispatcher->formatActionName($request->getActionName())
);
@ -844,7 +844,7 @@ class Zend_Controller_Action_Helper_ViewRenderer extends Zend_Controller_Action_
$request = $this->getRequest();
$dispatcher = $this->_frontController->getDispatcher();
$module = $dispatcher->formatModuleName($request->getModuleName());
$controller = substr($dispatcher->formatControllerName($request->getControllerName()), 0, -10);
$controller = $request->getControllerName();
$action = $dispatcher->formatActionName($request->getActionName());
$params = compact('module', 'controller', 'action');

68
libs/Zend/Controller/Action/Interface.php Normal file
View File

@ -0,0 +1,68 @@
<?php
/**
* Zend Framework
*
* LICENSE
*
* This source file is subject to the new BSD license that is bundled
* with this package in the file LICENSE.txt.
* It is also available through the world-wide-web at this URL:
* http://framework.zend.com/license/new-bsd
* If you did not receive a copy of the license and are unable to
* obtain it through the world-wide-web, please send an email
* to license@zend.com so we can send you a copy immediately.
*
* @category Zend
* @package Zend_Controller
* @subpackage Zend_Controller_Action
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/**
* @category Zend
* @package Zend_Controller
* @subpackage Zend_Controller_Action
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
interface Zend_Controller_Action_Interface
{
/**
* Class constructor
*
* The request and response objects should be registered with the
* controller, as should be any additional optional arguments; these will be
* available via {@link getRequest()}, {@link getResponse()}, and
* {@link getInvokeArgs()}, respectively.
*
* When overriding the constructor, please consider this usage as a best
* practice and ensure that each is registered appropriately; the easiest
* way to do so is to simply call parent::__construct($request, $response,
* $invokeArgs).
*
* After the request, response, and invokeArgs are set, the
* {@link $_helper helper broker} is initialized.
*
* Finally, {@link init()} is called as the final action of
* instantiation, and may be safely overridden to perform initialization
* tasks; as a general rule, override {@link init()} instead of the
* constructor to customize an action controller's instantiation.
*
* @param Zend_Controller_Request_Abstract $request
* @param Zend_Controller_Response_Abstract $response
* @param array $invokeArgs Any additional invocation arguments
* @return void
*/
public function __construct(Zend_Controller_Request_Abstract $request,
Zend_Controller_Response_Abstract $response,
array $invokeArgs = array());
/**
* Dispatch the requested action
*
* @param string $action Method name of action
* @return void
*/
public function dispatch($action);
}

15
libs/Zend/Controller/Dispatcher/Standard.php
View File

@ -134,8 +134,8 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs
/**
* Remove a controller directory by module name
*
* @param string $module
*
* @param string $module
* @return bool
*/
public function removeControllerDirectory($module)
@ -259,9 +259,12 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs
* arguments; throw exception if it's not an action controller
*/
$controller = new $className($request, $this->getResponse(), $this->getParams());
if (!$controller instanceof Zend_Controller_Action) {
if (!($controller instanceof Zend_Controller_Action_Interface) &&
!($controller instanceof Zend_Controller_Action)) {
require_once 'Zend/Controller/Dispatcher/Exception.php';
throw new Zend_Controller_Dispatcher_Exception("Controller '$className' is not an instance of Zend_Controller_Action");
throw new Zend_Controller_Dispatcher_Exception(
'Controller "' . $className . '" is not an instance of Zend_Controller_Action_Interface'
);
}
/**
@ -319,8 +322,8 @@ class Zend_Controller_Dispatcher_Standard extends Zend_Controller_Dispatcher_Abs
public function loadClass($className)
{
$finalClass = $className;
if (($this->_defaultModule != $this->_curModule)
|| $this->getParam('prefixDefaultModule'))
if (($this->_defaultModule != $this->_curModule)
|| $this->getParam('prefixDefaultModule'))
{
$finalClass = $this->formatClassName($this->_curModule, $className);
}

41
libs/Zend/Controller/Front.php
View File

@ -25,9 +25,6 @@ require_once 'Zend/Loader.php';
/** Zend_Controller_Action_HelperBroker */
require_once 'Zend/Controller/Action/HelperBroker.php';
/** Zend_Controller_Exception */
require_once 'Zend/Controller/Exception.php';
/** Zend_Controller_Plugin_Broker */
require_once 'Zend/Controller/Plugin/Broker.php';
@ -135,8 +132,8 @@ class Zend_Controller_Front
}
/**
* Enforce singleton; disallow cloning
*
* Enforce singleton; disallow cloning
*
* @return void
*/
private function __clone()
@ -265,9 +262,9 @@ class Zend_Controller_Front
}
/**
* Remove a controller directory by module name
*
* @param string $module
* Remove a controller directory by module name
*
* @param string $module
* @return bool
*/
public function removeControllerDirectory($module)
@ -290,6 +287,7 @@ class Zend_Controller_Front
try{
$dir = new DirectoryIterator($path);
}catch(Exception $e){
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception("Directory $path not readable");
}
foreach ($dir as $file) {
@ -313,8 +311,8 @@ class Zend_Controller_Front
/**
* Return the path to a module directory (but not the controllers directory within)
*
* @param string $module
*
* @param string $module
* @return string|null
*/
public function getModuleDirectory($module = null)
@ -444,10 +442,14 @@ class Zend_Controller_Front
public function setRequest($request)
{
if (is_string($request)) {
Zend_Loader::loadClass($request);
if (!class_exists($request)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($request);
}
$request = new $request();
}
if (!$request instanceof Zend_Controller_Request_Abstract) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Invalid request class');
}
@ -482,11 +484,15 @@ class Zend_Controller_Front
public function setRouter($router)
{
if (is_string($router)) {
Zend_Loader::loadClass($router);
if (!class_exists($router)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($router);
}
$router = new $router();
}
if (!$router instanceof Zend_Controller_Router_Interface) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Invalid router class');
}
@ -536,6 +542,7 @@ class Zend_Controller_Front
public function setBaseUrl($base = null)
{
if (!is_string($base) && (null !== $base)) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Rewrite base must be a string');
}
@ -609,10 +616,14 @@ class Zend_Controller_Front
public function setResponse($response)
{
if (is_string($response)) {
Zend_Loader::loadClass($response);
if (!class_exists($response)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($response);
}
$response = new $response();
}
if (!$response instanceof Zend_Controller_Response_Abstract) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Invalid response class');
}
@ -775,8 +786,8 @@ class Zend_Controller_Front
* Default behaviour is to trap them in the response object; call this
* method to have them thrown.
*
* Passing no value will return the current value of the flag; passing a
* boolean true or false value will set the flag and return the current
* Passing no value will return the current value of the flag; passing a
* boolean true or false value will set the flag and return the current
* object instance.
*
* @param boolean $flag Defaults to null (return flag state)

7
libs/Zend/Controller/Plugin/Broker.php
View File

@ -19,10 +19,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Controller_Exception */
require_once 'Zend/Controller/Exception.php';
/** Zend_Controller_Plugin_Abstract */
require_once 'Zend/Controller/Plugin/Abstract.php';
@ -54,6 +50,7 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract
public function registerPlugin(Zend_Controller_Plugin_Abstract $plugin, $stackIndex = null)
{
if (false !== array_search($plugin, $this->_plugins, true)) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Plugin already registered');
}
@ -61,6 +58,7 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract
if ($stackIndex) {
if (isset($this->_plugins[$stackIndex])) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Plugin with stackIndex "' . $stackIndex . '" already registered');
}
$this->_plugins[$stackIndex] = $plugin;
@ -98,6 +96,7 @@ class Zend_Controller_Plugin_Broker extends Zend_Controller_Plugin_Abstract
// Given a plugin object, find it in the array
$key = array_search($plugin, $this->_plugins, true);
if (false === $key) {
require_once 'Zend/Controller/Exception.php';
throw new Zend_Controller_Exception('Plugin never registered.');
}
unset($this->_plugins[$key]);

6
libs/Zend/Controller/Request/Abstract.php
View File

@ -149,6 +149,12 @@ abstract class Zend_Controller_Request_Abstract
public function setActionName($value)
{
$this->_action = $value;
/**
* @see ZF-3465
*/
if (null === $value) {
$this->setParam($this->getActionKey(), $value);
}
return $this;
}

3
libs/Zend/Controller/Request/Apache404.php
View File

@ -18,9 +18,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Controller_Request_Exception */
require_once 'Zend/Controller/Request/Exception.php';
/** Zend_Controller_Request_Http */
require_once 'Zend/Controller/Request/Http.php';

46
libs/Zend/Controller/Request/Http.php
View File

@ -18,9 +18,6 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Controller_Request_Exception */
require_once 'Zend/Controller/Request/Exception.php';
/** Zend_Controller_Request_Abstract */
require_once 'Zend/Controller/Request/Abstract.php';
@ -43,7 +40,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
*
*/
const SCHEME_HTTP = 'http';
/**
* Scheme for https
*
@ -237,9 +234,9 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
/**
* Set GET values
*
* @param string|array $spec
* @param null|mixed $value
*
* @param string|array $spec
* @param null|mixed $value
* @return Zend_Controller_Request_Http
*/
public function setQuery($spec, $value = null)
@ -279,9 +276,9 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
/**
* Set POST values
*
* @param string|array $spec
* @param null|mixed $value
*
* @param string|array $spec
* @param null|mixed $value
* @return Zend_Controller_Request_Http
*/
public function setPost($spec, $value = null)
@ -390,6 +387,11 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
$requestUri = $_SERVER['HTTP_X_REWRITE_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
$schemeAndHttpHost = $this->getScheme() . '://' . $this->getHttpHost();
if (strpos($requestUri, $schemeAndHttpHost) === 0) {
$requestUri = substr($requestUri, strlen($schemeAndHttpHost));
}
} elseif (isset($_SERVER['ORIG_PATH_INFO'])) { // IIS 5.0, PHP as CGI
$requestUri = $_SERVER['ORIG_PATH_INFO'];
if (!empty($_SERVER['QUERY_STRING'])) {
@ -554,7 +556,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
$basePath = $baseUrl;
}
}
if (substr(PHP_OS, 0, 3) === 'WIN') {
$basePath = str_replace('\\', '/', $basePath);
}
@ -632,8 +634,8 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
* Set allowed parameter sources
*
* Can be empty array, or contain one or more of '_GET' or '_POST'.
*
* @param array $paramSoures
*
* @param array $paramSoures
* @return Zend_Controller_Request_Http
*/
public function setParamSources(array $paramSources = array())
@ -644,7 +646,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
/**
* Get list of allowed parameter sources
*
*
* @return array
*/
public function getParamSources()
@ -872,7 +874,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
return false;
}
/**
* Is the request a Javascript XMLHttpRequest?
*
@ -887,7 +889,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
/**
* Is this a Flash request?
*
*
* @return bool
*/
public function isFlashRequest()
@ -895,7 +897,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
$header = strtolower($this->getHeader('USER_AGENT'));
return (strstr($header, ' flash')) ? true : false;
}
/**
* Is https secure request
*
@ -905,7 +907,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
{
return ($this->getScheme() === self::SCHEME_HTTPS);
}
/**
* Return the raw body of the request, if present
*
@ -955,7 +957,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
return false;
}
/**
* Get the request URI scheme
*
@ -965,7 +967,7 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
{
return ($this->getServer('HTTPS') == 'on') ? self::SCHEME_HTTPS : self::SCHEME_HTTP;
}
/**
* Get the HTTP host.
*
@ -981,10 +983,10 @@ class Zend_Controller_Request_Http extends Zend_Controller_Request_Abstract
if (!empty($host)) {
return $host;
}
$scheme = $this->getScheme();
$name = $this->getServer('SERVER_NAME');
$port = $this->getServer('SERVER_PORT');
$port = $this->getServer('SERVER_PORT');
if (($scheme == self::SCHEME_HTTP && $port == 80) || ($scheme == self::SCHEME_HTTPS && $port == 443)) {
return $name;

114
libs/Zend/Controller/Router/Rewrite.php
View File

@ -15,13 +15,10 @@
* @package Zend_Controller
* @subpackage Router
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id: Rewrite.php 12108 2008-10-24 13:02:56Z dasprid $
* @version $Id: Rewrite.php 15577 2009-05-14 12:43:34Z matthew $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Loader */
require_once 'Zend/Loader.php';
/** Zend_Controller_Router_Abstract */
require_once 'Zend/Controller/Router/Abstract.php';
@ -42,18 +39,21 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
/**
* Whether or not to use default routes
*
* @var boolean
*/
protected $_useDefaultRoutes = true;
/**
* Array of routes to match against
*
* @var array
*/
protected $_routes = array();
/**
* Currently matched route
*
* @var Zend_Controller_Router_Route_Interface
*/
protected $_currentRoute = null;
@ -67,11 +67,12 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
/**
* Add default routes which are used to mimic basic router behaviour
*
* @return Zend_Controller_Router_Rewrite
*/
public function addDefaultRoutes()
{
if (!$this->hasRoute('default')) {
$dispatcher = $this->getFrontController()->getDispatcher();
$request = $this->getFrontController()->getRequest();
@ -80,15 +81,18 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
$this->_routes = array_merge(array('default' => $compat), $this->_routes);
}
return $this;
}
/**
* Add route to the route chain
*
* If route implements Zend_Controller_Request_Aware interface it is initialized with a request object
* If route contains method setRequest(), it is initialized with a request object
*
* @param string $name Name of the route
* @param Zend_Controller_Router_Route_Interface Route
* @param string $name Name of the route
* @param Zend_Controller_Router_Route_Interface $route Instance of the route
* @return Zend_Controller_Router_Rewrite
*/
public function addRoute($name, Zend_Controller_Router_Route_Interface $route)
{
@ -104,12 +108,14 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
/**
* Add routes to the route chain
*
* @param array $routes Array of routes with names as keys and routes as values
* @param array $routes Array of routes with names as keys and routes as values
* @return Zend_Controller_Router_Rewrite
*/
public function addRoutes($routes) {
foreach ($routes as $name => $route) {
$this->addRoute($name, $route);
}
return $this;
}
@ -132,9 +138,10 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
* $router = new Zend_Controller_Router_Rewrite();
* $router->addConfig($config, 'routes');
*
* @param Zend_Config $config Configuration object
* @param string $section Name of the config section containing route's definitions
* @param Zend_Config $config Configuration object
* @param string $section Name of the config section containing route's definitions
* @throws Zend_Controller_Router_Exception
* @return Zend_Controller_Router_Rewrite
*/
public function addConfig(Zend_Config $config, $section = null)
{
@ -143,13 +150,32 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception("No route configuration in section '{$section}'");
}
$config = $config->{$section};
}
foreach ($config as $name => $info) {
$route = $this->_getRouteFromConfig($info);
if (isset($info->chains) && $info->chains instanceof Zend_Config) {
if ($route instanceof Zend_Controller_Router_Route_Chain) {
if (!isset($info->chain)) {
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception("No chain defined");
}
if ($info->chain instanceof Zend_Config) {
$childRouteNames = $info->chain;
} else {
$childRouteNames = explode(',', $info->chain);
}
foreach ($childRouteNames as $childRouteName) {
$childRoute = $this->getRoute(trim($childRouteName));
$route->chain($childRoute);
}
$this->addRoute($name, $route);
} elseif (isset($info->chains) && $info->chains instanceof Zend_Config) {
$this->_addChainRoutesFromConfig($name, $route, $info->chains);
} else {
$this->addRoute($name, $route);
@ -168,9 +194,16 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
protected function _getRouteFromConfig(Zend_Config $info)
{
$class = (isset($info->type)) ? $info->type : 'Zend_Controller_Router_Route';
Zend_Loader::loadClass($class);
if (!class_exists($class)) {
require_once 'Zend/Loader.php';
Zend_Loader::loadClass($class);
}
$route = call_user_func(array($class, 'getInstance'), $info);
if (isset($info->abstract) && $info->abstract && method_exists($route, 'isAbstract')) {
$route->isAbstract(true);
}
return $route;
}
@ -178,9 +211,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
/**
* Add chain routes from a config route
*
* @todo Add recursive chaining (not required yet, but later when path
* route chaining is done)
*
* @param string $name
* @param Zend_Controller_Router_Route_Interface $route
* @param Zend_Config $childRoutesInfo
@ -191,44 +221,66 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
Zend_Config $childRoutesInfo)
{
foreach ($childRoutesInfo as $childRouteName => $childRouteInfo) {
$childRoute = $this->_getRouteFromConfig($childRouteInfo);
if (is_string($childRouteInfo)) {
$childRouteName = $childRouteInfo;
$childRoute = $this->getRoute($childRouteName);
} else {
$childRoute = $this->_getRouteFromConfig($childRouteInfo);
}
$chainRoute = $route->chain($childRoute);
$chainName = $name . '-' . $childRouteName;
if ($route instanceof Zend_Controller_Router_Route_Chain) {
$chainRoute = clone $route;
$chainRoute->chain($childRoute);
} else {
$chainRoute = $route->chain($childRoute);
}
$this->addRoute($chainName, $chainRoute);
$chainName = $name . '-' . $childRouteName;
if (isset($childRouteInfo->chains)) {
$this->_addChainRoutesFromConfig($chainName, $chainRoute, $childRouteInfo->chains);
} else {
$this->addRoute($chainName, $chainRoute);
}
}
}
/**
* Remove a route from the route chain
*
* @param string $name Name of the route
* @param string $name Name of the route
* @throws Zend_Controller_Router_Exception
* @return Zend_Controller_Router_Rewrite
*/
public function removeRoute($name) {
public function removeRoute($name)
{
if (!isset($this->_routes[$name])) {
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception("Route $name is not defined");
}
unset($this->_routes[$name]);
return $this;
}
/**
* Remove all standard default routes
*
* @param Zend_Controller_Router_Route_Interface Route
* @param Zend_Controller_Router_Route_Interface Route
* @return Zend_Controller_Router_Rewrite
*/
public function removeDefaultRoutes() {
public function removeDefaultRoutes()
{
$this->_useDefaultRoutes = false;
return $this;
}
/**
* Check if named route exists
*
* @param string $name Name of the route
* @param string $name Name of the route
* @return boolean
*/
public function hasRoute($name)
@ -249,6 +301,7 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception("Route $name is not defined");
}
return $this->_routes[$name];
}
@ -301,7 +354,6 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
*/
public function route(Zend_Controller_Request_Abstract $request)
{
if (!$request instanceof Zend_Controller_Request_Http) {
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception('Zend_Controller_Router_Rewrite requires a Zend_Controller_Request_Http-based request object');
@ -311,8 +363,12 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
$this->addDefaultRoutes();
}
/** Find the matching route */
// Find the matching route
foreach (array_reverse($this->_routes) as $name => $route) {
// TODO: Should be an interface method. Hack for 1.0 BC
if (method_exists($route, 'isAbstract') && $route->isAbstract()) {
continue;
}
// TODO: Should be an interface method. Hack for 1.0 BC
if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
@ -396,4 +452,4 @@ class Zend_Controller_Router_Rewrite extends Zend_Controller_Router_Abstract
return $this;
}
}
}

331
libs/Zend/Controller/Router/Route.php
View File

@ -15,7 +15,7 @@
* @package Zend_Controller
* @subpackage Router
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id: Route.php 11073 2008-08-26 16:29:59Z dasprid $
* @version $Id: Route.php 15464 2009-05-09 16:34:07Z dasprid $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -33,6 +33,47 @@ require_once 'Zend/Controller/Router/Route/Abstract.php';
*/
class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
{
/**
* Default translator
*
* @var Zend_Translate
*/
protected static $_defaultTranslator;
/**
* Translator
*
* @var Zend_Translate
*/
protected $_translator;
/**
* Default locale
*
* @var mixed
*/
protected static $_defaultLocale;
/**
* Locale
*
* @var mixed
*/
protected $_locale;
/**
* Wether this is a translated route or not
*
* @var boolean
*/
protected $_isTranslated = false;
/**
* Translatable variables
*
* @var array
*/
protected $_translatable = array();
protected $_urlVariable = ':';
protected $_urlDelimiter = '/';
@ -111,31 +152,47 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
* @param string $route Map used to match with later submitted URL path
* @param array $defaults Defaults for map variables with keys as variable names
* @param array $reqs Regular expression requirements for variables (keys as variable names)
* @param array $reqs Regular expression requirements for variables (keys as variable names)
* @param Zend_Translate $translator Translator to use for this instance
*/
public function __construct($route, $defaults = array(), $reqs = array())
public function __construct($route, $defaults = array(), $reqs = array(), Zend_Translate $translator = null, $locale = null)
{
$route = trim($route, $this->_urlDelimiter);
$this->_defaults = (array) $defaults;
$route = trim($route, $this->_urlDelimiter);
$this->_defaults = (array) $defaults;
$this->_requirements = (array) $reqs;
$this->_translator = $translator;
$this->_locale = $locale;
if ($route != '') {
if ($route !== '') {
foreach (explode($this->_urlDelimiter, $route) as $pos => $part) {
if (substr($part, 0, 1) == $this->_urlVariable) {
if (substr($part, 0, 1) == $this->_urlVariable && substr($part, 1, 1) != $this->_urlVariable) {
$name = substr($part, 1);
$this->_parts[$pos] = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
if (substr($name, 0, 1) === '@' && substr($name, 1, 1) !== '@') {
$name = substr($name, 1);
$this->_translatable[] = $name;
$this->_isTranslated = true;
}
$this->_parts[$pos] = (isset($reqs[$name]) ? $reqs[$name] : $this->_defaultRegex);
$this->_variables[$pos] = $name;
} else {
if (substr($part, 0, 1) == $this->_urlVariable) {
$part = substr($part, 1);
}
if (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@') {
$this->_isTranslated = true;
}
$this->_parts[$pos] = $part;
if ($part != '*') $this->_staticCount++;
if ($part !== '*') {
$this->_staticCount++;
}
}
}
}
}
/**
@ -145,25 +202,35 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
* @param string $path Path used to match against this routing map
* @return array|false An array of assigned values or a false on a mismatch
*/
public function match($path)
public function match($path, $partial = false)
{
$pathStaticCount = 0;
$values = array();
$path = trim($path, $this->_urlDelimiter);
if ($this->_isTranslated) {
$translateMessages = $this->getTranslator()->getMessages();
}
if ($path != '') {
$pathStaticCount = 0;
$values = array();
$matchedPath = '';
if (!$partial) {
$path = trim($path, $this->_urlDelimiter);
}
if ($path !== '') {
$path = explode($this->_urlDelimiter, $path);
foreach ($path as $pos => $pathPart) {
// Path is longer than a route, it's not a match
if (!array_key_exists($pos, $this->_parts)) {
return false;
if ($partial) {
break;
} else {
return false;
}
}
$matchedPath .= $pathPart . $this->_urlDelimiter;
// If it's a wildcard, get the rest of URL as wildcard data and stop matching
if ($this->_parts[$pos] == '*') {
$count = count($path);
@ -176,16 +243,32 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
break;
}
$name = isset($this->_variables[$pos]) ? $this->_variables[$pos] : null;
$name = isset($this->_variables[$pos]) ? $this->_variables[$pos] : null;
$pathPart = urldecode($pathPart);
// Translate value if required
$part = $this->_parts[$pos];
if ($this->_isTranslated && (substr($part, 0, 1) === '@' && substr($part, 1, 1) !== '@' && $name === null) || $name !== null && in_array($name, $this->_translatable)) {
if (substr($part, 0, 1) === '@') {
$part = substr($part, 1);
}
if (($originalPathPart = array_search($pathPart, $translateMessages)) !== false) {
$pathPart = $originalPathPart;
}
}
if (substr($part, 0, 2) === '@@') {
$part = substr($part, 1);
}
// If it's a static part, match directly
if ($name === null && $this->_parts[$pos] != $pathPart) {
if ($name === null && $part != $pathPart) {
return false;
}
// If it's a variable with requirement, match a regex. If not - everything matches
if ($this->_parts[$pos] !== null && !preg_match($this->_regexDelimiter . '^' . $this->_parts[$pos] . '$' . $this->_regexDelimiter . 'iu', $pathPart)) {
if ($part !== null && !preg_match($this->_regexDelimiter . '^' . $part . '$' . $this->_regexDelimiter . 'iu', $pathPart)) {
return false;
}
@ -194,10 +277,8 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
$values[$name] = $pathPart;
} else {
$pathStaticCount++;
}
}
}
}
// Check if all static mappings have been matched
@ -213,6 +294,8 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
return false;
}
}
$this->setMatchedPath(rtrim($matchedPath, $this->_urlDelimiter));
$this->_values = $values;
@ -227,14 +310,23 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
* @param boolean $reset Whether or not to set route defaults with those provided in $data
* @return string Route path with user submitted parameters
*/
public function assemble($data = array(), $reset = false, $encode = false)
public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
{
$url = array();
if ($this->_isTranslated) {
$translator = $this->getTranslator();
if (isset($data['@locale'])) {
$locale = $data['@locale'];
unset($data['@locale']);
} else {
$locale = $this->getLocale();
}
}
$url = array();
$flag = false;
foreach ($this->_parts as $key => $part) {
$name = isset($this->_variables[$key]) ? $this->_variables[$key] : null;
$useDefault = false;
@ -243,24 +335,39 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
}
if (isset($name)) {
if (isset($data[$name]) && !$useDefault) {
$url[$key] = $data[$name];
$value = $data[$name];
unset($data[$name]);
} elseif (!$reset && !$useDefault && isset($this->_values[$name])) {
$url[$key] = $this->_values[$name];
$value = $this->_values[$name];
} elseif (!$reset && !$useDefault && isset($this->_wildcardData[$name])) {
$url[$key] = $this->_wildcardData[$name];
$value = $this->_wildcardData[$name];
} elseif (isset($this->_defaults[$name])) {
$url[$key] = $this->_defaults[$name];
$value = $this->_defaults[$name];
} else {
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception($name . ' is not specified');
}
if ($this->_isTranslated && in_array($name, $this->_translatable)) {
$url[$key] = $translator->translate($value, $locale);
} else {
$url[$key] = $value;
}
} elseif ($part != '*') {
$url[$key] = $part;
if ($this->_isTranslated && substr($part, 0, 1) === '@') {
if (substr($part, 1, 1) !== '@') {
$url[$key] = $translator->translate(substr($part, 1), $locale);
} else {
$url[$key] = substr($part, 1);
}
} else {
if (substr($part, 0, 2) === '@@') {
$part = substr($part, 1);
}
$url[$key] = $part;
}
} else {
if (!$reset) $data += $this->_wildcardData;
foreach ($data as $var => $value) {
@ -271,13 +378,22 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
}
}
}
}
$return = '';
foreach (array_reverse($url, true) as $key => $value) {
if ($flag || !isset($this->_variables[$key]) || $value !== $this->getDefault($this->_variables[$key])) {
$defaultValue = null;
if (isset($this->_variables[$key])) {
$defaultValue = $this->getDefault($this->_variables[$key]);
if ($this->_isTranslated && $defaultValue !== null && isset($this->_translatable[$this->_variables[$key]])) {
$defaultValue = $translator->translate($defaultValue, $locale);
}
}
if ($flag || $value !== $defaultValue || $partial) {
if ($encode) $value = urlencode($value);
$return = $this->_urlDelimiter . $value . $return;
$flag = true;
@ -309,5 +425,132 @@ class Zend_Controller_Router_Route extends Zend_Controller_Router_Route_Abstract
public function getDefaults() {
return $this->_defaults;
}
/**
* Get all variables which are used by the route
*
* @return array
*/
public function getVariables()
{
return $this->_variables;
}
/**
* Set a default translator
*
* @param Zend_Translate $translator
* @return void
*/
public static function setDefaultTranslator(Zend_Translate $translator = null)
{
self::$_defaultTranslator = $translator;
}
/**
* Get the default translator
*
* @return Zend_Translate
*/
public static function getDefaultTranslator()
{
return self::$_defaultTranslator;
}
/**
* Set a translator
*
* @param Zend_Translate $translator
* @return void
*/
public function setTranslator(Zend_Translate $translator)
{
$this->_translator = $translator;
}
/**
* Get the translator
*
* @throws Zend_Controller_Router_Exception When no translator can be found
* @return Zend_Translate
*/
public function getTranslator()
{
if ($this->_translator !== null) {
return $this->_translator;
} else if (($translator = self::getDefaultTranslator()) !== null) {
return $translator;
} else {
try {
$translator = Zend_Registry::get('Zend_Translate');
} catch (Zend_Exception $e) {
$translator = null;
}
if ($translator instanceof Zend_Translate) {
return $translator;
}
}
require_once 'Zend/Controller/Router/Exception.php';
throw new Zend_Controller_Router_Exception('Could not find a translator');
}
/**
* Set a default locale
*
* @param mixed $locale
* @return void
*/
public static function setDefaultLocale($locale = null)
{
self::$_defaultLocale = $locale;
}
/**
* Get the default locale
*
* @return mixed
*/
public static function getDefaultLocale()
{
return self::$_defaultLocale;
}
/**
* Set a locale
*
* @param mixed $locale
* @return void
*/
public function setLocale($locale)
{
$this->_locale = $locale;
}
/**
* Get the locale
*
* @return mixed
*/
public function getLocale()
{
if ($this->_locale !== null) {
return $this->_locale;
} else if (($locale = self::getDefaultLocale()) !== null) {
return $locale;
} else {
try {
$locale = Zend_Registry::get('Zend_Locale');
} catch (Zend_Exception $e) {
$locale = null;
}
if ($locale !== null) {
return $locale;
}
}
return null;
}
}

70
libs/Zend/Controller/Router/Route/Abstract.php
View File

@ -19,7 +19,9 @@
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
/** Zend_Controller_Router_Route_Interface */
/**
* @see Zend_Controller_Router_Route_Interface
*/
require_once 'Zend/Controller/Router/Route/Interface.php';
/**
@ -34,12 +36,74 @@ require_once 'Zend/Controller/Router/Route/Interface.php';
*/
abstract class Zend_Controller_Router_Route_Abstract implements Zend_Controller_Router_Route_Interface
{
/**
* Wether this route is abstract or not
*
* @var boolean
*/
protected $_isAbstract = false;
public function getVersion() {
/**
* Path matched by this route
*
* @var string
*/
protected $_matchedPath = null;
/**
* Get the version of the route
*
* @return integer
*/
public function getVersion()
{
return 2;
}
public function chain(Zend_Controller_Router_Route_Interface $route, $separator = '/')
/**
* Set partially matched path
*
* @param string $path
* @return void
*/
public function setMatchedPath($path)
{
$this->_matchedPath = $path;
}
/**
* Get partially matched path
*
* @return string
*/
public function getMatchedPath()
{
return $this->_matchedPath;
}
/**
* Check or set wether this is an abstract route or not
*
* @param boolean $flag
* @return boolean
*/
public function isAbstract($flag = null)
{
if ($flag !== null) {
$this->_isAbstract = $flag;
}
return $this->_isAbstract;
}
/**
* Create a new chain
*
* @param Zend_Controller_Router_Route_Abstract $route
* @param string $separator
* @return Zend_Controller_Router_Route_Chain
*/
public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/')
{
require_once 'Zend/Controller/Router/Route/Chain.php';

71
libs/Zend/Controller/Router/Route/Chain.php
View File

@ -32,7 +32,6 @@ require_once 'Zend/Controller/Router/Route/Abstract.php';
*/
class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Abstract
{
protected $_routes = array();
protected $_separators = array();
@ -42,11 +41,21 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
* @param Zend_Config $config Configuration object
*/
public static function getInstance(Zend_Config $config)
{ }
public function chain(Zend_Controller_Router_Route_Interface $route, $separator = '/') {
$this->_routes[] = $route;
{
$defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
return new self($config->route, $defs);
}
/**
* Add a route to this chain
*
* @param Zend_Controller_Router_Route_Abstract $route
* @param string $separator
* @return Zend_Controller_Router_Route_Chain
*/
public function chain(Zend_Controller_Router_Route_Abstract $route, $separator = '/')
{
$this->_routes[] = $route;
$this->_separators[] = $separator;
return $this;
@ -57,30 +66,53 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
* Matches a user submitted path with a previously defined route.
* Assigns and returns an array of defaults on a successful match.
*
* @param Zend_Controller_Request_Http $request Request to get the path info from
* @param Zend_Controller_Request_Http $request Request to get the path info from
* @return array|false An array of assigned values or a false on a mismatch
*/
public function match($request, $partial = null)
{
$path = $request->getPathInfo();
$values = array();
$path = trim($request->getPathInfo(), '/');
$subPath = $path;
$values = array();
foreach ($this->_routes as $key => $route) {
if ($key > 0 && $matchedPath !== null) {
$separator = substr($subPath, 0, strlen($this->_separators[$key]));
if ($separator !== $this->_separators[$key]) {
return false;
}
$subPath = substr($subPath, strlen($separator));
}
// TODO: Should be an interface method. Hack for 1.0 BC
if (!method_exists($route, 'getVersion') || $route->getVersion() == 1) {
$match = $request->getPathInfo();
$match = $subPath;
} else {
$match = $request;
$request->setPathInfo($subPath);
$match = $request;
}
$res = $route->match($match);
if ($res === false) return false;
$res = $route->match($match, true);
if ($res === false) {
return false;
}
$matchedPath = $route->getMatchedPath();
if ($matchedPath !== null) {
$subPath = substr($subPath, strlen($matchedPath));
$separator = substr($subPath, 0, strlen($this->_separators[$key]));
}
$values = $res + $values;
}
$request->setPathInfo($path);
if ($subPath !== '' && $subPath !== false) {
return false;
}
return $values;
@ -94,14 +126,15 @@ class Zend_Controller_Router_Route_Chain extends Zend_Controller_Router_Route_Ab
*/
public function assemble($data = array(), $reset = false, $encode = false)
{
$value = '';
$value = '';
$numRoutes = count($this->_routes);
foreach ($this->_routes as $key => $route) {
if ($key > 0) {
$value .= $this->_separators[$key];
}
$value .= $route->assemble($data, $reset, $encode);
$value .= $route->assemble($data, $reset, $encode, (($numRoutes - 1) > $key));
if (method_exists($route, 'getVariables')) {
$variables = $route->getVariables();

4
libs/Zend/Controller/Router/Route/Hostname.php
View File

@ -248,7 +248,7 @@ class Zend_Controller_Router_Route_Hostname extends Zend_Controller_Router_Route
* @param boolean $reset Whether or not to set route defaults with those provided in $data
* @return string Route path with user submitted parameters
*/
public function assemble($data = array(), $reset = false, $encode = false)
public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
{
$host = array();
$flag = false;
@ -281,7 +281,7 @@ class Zend_Controller_Router_Route_Hostname extends Zend_Controller_Router_Route
$return = '';
foreach (array_reverse($host, true) as $key => $value) {
if ($flag || !isset($this->_variables[$key]) || $value !== $this->getDefault($this->_variables[$key])) {
if ($flag || !isset($this->_variables[$key]) || $value !== $this->getDefault($this->_variables[$key]) || $partial) {
if ($encode) $value = urlencode($value);
$return = '.' . $value . $return;
$flag = true;

27
libs/Zend/Controller/Router/Route/Module.php
View File

@ -15,7 +15,7 @@
* @package Zend_Controller
* @subpackage Router
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id: Module.php 12310 2008-11-05 20:49:16Z dasprid $
* @version $Id: Module.php 15461 2009-05-09 15:54:21Z dasprid $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -78,8 +78,13 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
*/
public static function getInstance(Zend_Config $config)
{
$defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
return new self($defs);
$frontController = Zend_Controller_Front::getInstance();
$defs = ($config->defaults instanceof Zend_Config) ? $config->defaults->toArray() : array();
$dispatcher = $frontController->getDispatcher();
$request = $frontController->getRequest();
return new self($defs, $dispatcher, $request);
}
/**
@ -139,16 +144,20 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
* @param string $path Path used to match against this routing map
* @return array An array of assigned values or a false on a mismatch
*/
public function match($path)
public function match($path, $partial = false)
{
$this->_setRequestKeys();
$values = array();
$params = array();
$path = trim($path, self::URI_DELIMITER);
if (!$partial) {
$path = trim($path, self::URI_DELIMITER);
} else {
$matchedPath = $path;
}
if ($path != '') {
$path = explode(self::URI_DELIMITER, $path);
if ($this->_dispatcher && $this->_dispatcher->isValidModule($path[0])) {
@ -172,6 +181,10 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
}
}
}
if ($partial) {
$this->setMatchedPath($matchedPath);
}
$this->_values = $values + $params;
@ -185,7 +198,7 @@ class Zend_Controller_Router_Route_Module extends Zend_Controller_Router_Route_A
* @param bool $reset Weither to reset the current params
* @return string Route path with user submitted parameters
*/
public function assemble($data = array(), $reset = false, $encode = true)
public function assemble($data = array(), $reset = false, $encode = true, $partial = false)
{
if (!$this->_keysSet) {
$this->_setRequestKeys();

71
libs/Zend/Controller/Router/Route/Regex.php
View File

@ -15,7 +15,7 @@
* @package Zend_Controller
* @subpackage Router
* @copyright Copyright (c) 2005-2008 Zend Technologies USA Inc. (http://www.zend.com)
* @version $Id: Regex.php 12525 2008-11-10 20:18:32Z ralph $
* @version $Id: Regex.php 15461 2009-05-09 15:54:21Z dasprid $
* @license http://framework.zend.com/license/new-bsd New BSD License
*/
@ -53,10 +53,10 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
public function __construct($route, $defaults = array(), $map = array(), $reverse = null)
{
$this->_regex = '#^' . $route . '$#i';
$this->_regex = $route;
$this->_defaults = (array) $defaults;
$this->_map = (array) $map;
$this->_reverse = $reverse;
$this->_map = (array) $map;
$this->_reverse = $reverse;
}
public function getVersion() {
@ -67,15 +67,27 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
* Matches a user submitted path with a previously defined route.
* Assigns and returns an array of defaults on a successful match.
*
* @param string $path Path used to match against this routing map
* @return array|false An array of assigned values or a false on a mismatch
* @param string $path Path used to match against this routing map
* @return array|false An array of assigned values or a false on a mismatch
*/
public function match($path)
public function match($path, $partial = false)
{
$path = trim(urldecode($path), '/');
$res = preg_match($this->_regex, $path, $values);
if ($res === 0) return false;
if (!$partial) {
$path = trim(urldecode($path), '/');
$regex = '#^' . $this->_regex . '$#i';
} else {
$regex = '#^' . $this->_regex . '#i';
}
$res = preg_match($regex, $path, $values);
if ($res === 0) {
return false;
}
if ($partial) {
$this->setMatchedPath($values[0]);
}
// array_filter_key()? Why isn't this in a standard PHP function set yet? :)
foreach ($values as $i => $value) {
@ -86,10 +98,9 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
$this->_values = $values;
$values = $this->_getMappedValues($values);
$values = $this->_getMappedValues($values);
$defaults = $this->_getMappedValues($this->_defaults, false, true);
$return = $values + $defaults;
$return = $values + $defaults;
return $return;
}
@ -103,10 +114,10 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
* indexed numerically then every associative key will be stripped. Vice versa if reversed
* is set to true.
*
* @param array $values Indexed or associative array of values to map
* @param boolean $reversed False means translation of index to association. True means reverse.
* @param boolean $preserve Should wrong type of keys be preserved or stripped.
* @return array An array of mapped values
* @param array $values Indexed or associative array of values to map
* @param boolean $reversed False means translation of index to association. True means reverse.
* @param boolean $preserve Should wrong type of keys be preserved or stripped.
* @return array An array of mapped values
*/
protected function _getMappedValues($values, $reversed = false, $preserve = false)
{
@ -140,10 +151,10 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
/**
* Assembles a URL path defined by this route
*
* @param array $data An array of name (or index) and value pairs used as parameters
* @param array $data An array of name (or index) and value pairs used as parameters
* @return string Route path with user submitted parameters
*/
public function assemble($data = array(), $reset = false, $encode = false)
public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
{
if ($this->_reverse === null) {
require_once 'Zend/Controller/Router/Exception.php';
@ -208,6 +219,26 @@ class Zend_Controller_Router_Route_Regex extends Zend_Controller_Router_Route_Ab
public function getDefaults() {
return $this->_defaults;
}
/**
* Get all variables which are used by the route
*
* @return array
*/
public function getVariables()
{
$variables = array();
foreach ($this->_map as $key => $value) {
if (is_numeric($key)) {
$variables[] = $value;
} else {
$variables[] = $key;
}
}
return $variables;
}
/**
* _arrayMergeNumericKeys() - allows for a strict key (numeric's included) array_merge.

16
libs/Zend/Controller/Router/Route/Static.php
View File

@ -72,11 +72,19 @@ class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_A
* @param string $path Path used to match against this routing map
* @return array|false An array of assigned values or a false on a mismatch
*/
public function match($path)
public function match($path, $partial = false)
{
if (trim($path, '/') == $this->_route) {
return $this->_defaults;
if ($partial) {
if (substr($path, 0, strlen($this->_route)) === $this->_route) {
$this->setMatchedPath($this->_route);
return $this->_defaults;
}
} else {
if (trim($path, '/') == $this->_route) {
return $this->_defaults;
}
}
return false;
}
@ -86,7 +94,7 @@ class Zend_Controller_Router_Route_Static extends Zend_Controller_Router_Route_A
* @param array $data An array of variable and value pairs used as parameters
* @return string Route path with user submitted parameters
*/
public function assemble($data = array(), $reset = false, $encode = false)
public function assemble($data = array(), $reset = false, $encode = false, $partial = false)
{
return $this->_route;
}