import v1.1.0_beta1 | 2009-08-21
This commit is contained in:
@ -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;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user