tweet_live: comparison web/lib/Zend/Navigation/Page/Mvc.php

equal deleted inserted replaced

-:5e7a0fedabdf
+:877f952ae2bd
 * to license@zend.com so we can send you a copy immediately.
 *
 * @category   Zend
 * @package    Zend_Navigation
 * @subpackage Page
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
-* @version    $Id: Mvc.php 20096 2010-01-06 02:05:09Z bkarwin $
+* @version    $Id: Mvc.php 25213 2013-01-11 08:19:09Z frosch $
 */
 /**
 * @see Zend_Navigation_Page
 */
 * name and route params to assemble the href
 *
 * @category   Zend
 * @package    Zend_Navigation
 * @subpackage Page
-* @copyright  Copyright (c) 2005-2010 Zend Technologies USA Inc. (http://www.zend.com)
+* @copyright  Copyright (c) 2005-2012 Zend Technologies USA Inc. (http://www.zend.com)
 * @license    http://framework.zend.com/license/new-bsd     New BSD License
 */
 class Zend_Navigation_Page_Mvc extends Zend_Navigation_Page
 {
 /**
 * @var bool
 */
 protected $_resetParams = true;
 /**
+* Whether href should be encoded when assembling URL
+*
+* @see getHref()
+* @var bool
+*/
+protected $_encodeUrl = true;
+/**
+* Whether this page should be considered active
+*
+* @var bool
+*/
+protected $_active = null;
+/**
+* Scheme to use when assembling URL
+*
+* @see getHref()
+* @var string
+*/
+protected $_scheme;
+/**
 * Cached href
 *
 * The use of this variable minimizes execution time when getHref() is
 * called more than once during the lifetime of a request. If a property
 * is updated, the cache is invalidated.
 *
 * @see getHref()
 * @var Zend_Controller_Action_Helper_Url
 */
 protected static $_urlHelper = null;
+/**
+* View helper for assembling URLs with schemes
+*
+* @see getHref()
+* @var Zend_View_Helper_ServerUrl
+*/
+protected static $_schemeHelper = null;
 // Accessors:
 /**
 * Returns whether page should be considered active or not
 *                          false.
 * @return bool             whether page should be considered active or not
 */
 public function isActive($recursive = false)
 {
-if (!$this->_active) {
+if (null === $this->_active) {
-$front = Zend_Controller_Front::getInstance();
+$front     = Zend_Controller_Front::getInstance();
-$reqParams = $front->getRequest()->getParams();
+$request   = $front->getRequest();
+$reqParams = array();
-if (!array_key_exists('module', $reqParams)) {
+if ($request) {
-$reqParams['module'] = $front->getDefaultModule();
+$reqParams = $request->getParams();
+if (!array_key_exists('module', $reqParams)) {
+$reqParams['module'] = $front->getDefaultModule();
+}
 }
 $myParams = $this->_params;
+if ($this->_route) {
+$route = $front->getRouter()->getRoute($this->_route);
+if(method_exists($route, 'getDefaults')) {
+$myParams = array_merge($route->getDefaults(), $myParams);
+}
+}
 if (null !== $this->_module) {
 $myParams['module'] = $this->_module;
-} else {
+} elseif(!array_key_exists('module', $myParams)) {
 $myParams['module'] = $front->getDefaultModule();
 }
 if (null !== $this->_controller) {
 $myParams['controller'] = $this->_controller;
-} else {
+} elseif(!array_key_exists('controller', $myParams)) {
 $myParams['controller'] = $front->getDefaultControllerName();
 }
 if (null !== $this->_action) {
 $myParams['action'] = $this->_action;
-} else {
+} elseif(!array_key_exists('action', $myParams)) {
 $myParams['action'] = $front->getDefaultAction();
+}
+foreach($myParams as $key => $value) {
+if(null === $value) {
+unset($myParams[$key]);
+}
 }
 if (count(array_intersect_assoc($reqParams, $myParams)) ==
 count($myParams)) {
 $this->_active = true;
 return true;
 }
+$this->_active = false;
 }
 return parent::isActive($recursive);
 }
 $params['action'] = $param;
 }
 $url = self::$_urlHelper->url($params,
 $this->getRoute(),
-$this->getResetParams());
+$this->getResetParams(),
+$this->getEncodeUrl());
+// Use scheme?
+$scheme = $this->getScheme();
+if (null !== $scheme) {
+if (null === self::$_schemeHelper) {
+require_once 'Zend/View/Helper/ServerUrl.php';
+self::$_schemeHelper = new Zend_View_Helper_ServerUrl();
+}
+$url = self::$_schemeHelper->setScheme($scheme)->serverUrl($url);
+}
+// Add the fragment identifier if it is set
+$fragment = $this->getFragment();
+if (null !== $fragment) {
+$url .= '#' . $fragment;
+}
 return $this->_hrefCache = $url;
 }
 /**
 * Sets action name to use when assembling URL
 {
 return $this->_module;
 }
 /**
-* Sets params to use when assembling URL
+* Set multiple parameters (to use when assembling URL) at once
 *
-* @see getHref()
+* URL options passed to the url action helper for assembling URLs.
-*
+* Overwrites any previously set parameters!
-* @param  array|null $params        [optional] page params. Default is null
+*
-*                                   which sets no params.
+* @see getHref()
-* @return Zend_Navigation_Page_Mvc  fluent interface, returns self
+*
+* @param  array|null $params           [optional] paramters as array
+*                                      ('name' => 'value'). Default is null
+*                                      which clears all params.
+* @return Zend_Navigation_Page_Mvc     fluent interface, returns self
 */
 public function setParams(array $params = null)
 {
-if (null === $params) {
+$this->clearParams();
-$this->_params = array();
-} else {
+if (is_array($params)) {
-// TODO: do this more intelligently?
+$this->addParams($params);
-$this->_params = $params;
+}
-}
+return $this;
-$this->_hrefCache = null;
+}
-return $this;
-}
+/**
+* Set parameter (to use when assembling URL)
-/**
+*
-* Returns params to use when assembling URL
+* URL option passed to the url action helper for assembling URLs.
 *
 * @see getHref()
 *
-* @return array  page params
+* @param  string $name                 parameter name
+* @param  mixed $value                 parameter value
+* @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+*/
+public function setParam($name, $value)
+{
+$name = (string) $name;
+$this->_params[$name] = $value;
+$this->_hrefCache = null;
+return $this;
+}
+/**
+* Add multiple parameters (to use when assembling URL) at once
+*
+* URL options passed to the url action helper for assembling URLs.
+*
+* @see getHref()
+*
+* @param  array $params                paramters as array ('name' => 'value')
+* @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+*/
+public function addParams(array $params)
+{
+foreach ($params as $name => $value) {
+$this->setParam($name, $value);
+}
+return $this;
+}
+/**
+* Remove parameter (to use when assembling URL)
+*
+* @see getHref()
+*
+* @param  string $name
+* @return bool
+*/
+public function removeParam($name)
+{
+if (array_key_exists($name, $this->_params)) {
+unset($this->_params[$name]);
+$this->_hrefCache = null;
+return true;
+}
+return false;
+}
+/**
+* Clear all parameters (to use when assembling URL)
+*
+* @see getHref()
+*
+* @return Zend_Navigation_Page_Mvc     fluent interface, returns self
+*/
+public function clearParams()
+{
+$this->_params = array();
+$this->_hrefCache = null;
+return $this;
+}
+/**
+* Retrieve all parameters (to use when assembling URL)
+*
+* @see getHref()
+*
+* @return array                        parameters as array ('name' => 'value')
 */
 public function getParams()
 {
 return $this->_params;
+}
+/**
+* Retrieve a single parameter (to use when assembling URL)
+*
+* @see getHref()
+*
+* @param  string $name                 parameter name
+* @return mixed
+*/
+public function getParam($name)
+{
+$name = (string) $name;
+if (!array_key_exists($name, $this->_params)) {
+return null;
+}
+return $this->_params[$name];
 }
 /**
 * Sets route name to use when assembling URL
 *
 {
 return $this->_resetParams;
 }
 /**
+* Sets whether href should be encoded when assembling URL
+*
+* @see getHref()
+*
+* @param bool $resetParams         whether href should be encoded when
+*                                  assembling URL
+* @return Zend_Navigation_Page_Mvc fluent interface, returns self
+*/
+public function setEncodeUrl($encodeUrl)
+{
+$this->_encodeUrl = (bool) $encodeUrl;
+$this->_hrefCache = null;
+return $this;
+}
+/**
+* Returns whether herf should be encoded when assembling URL
+*
+* @see getHref()
+*
+* @return bool whether herf should be encoded when assembling URL
+*/
+public function getEncodeUrl()
+{
+return $this->_encodeUrl;
+}
+/**
+* Sets scheme to use when assembling URL
+*
+* @see getHref()
+*
+* @param  string|null $scheme        scheme
+* @return Zend_Navigation_Page_Mvc   fluent interface, returns self
+*/
+public function setScheme($scheme)
+{
+if (null !== $scheme && !is_string($scheme)) {
+require_once 'Zend/Navigation/Exception.php';
+throw new Zend_Navigation_Exception(
+'Invalid argument: $scheme must be a string or null'
+);
+}
+$this->_scheme = $scheme;
+return $this;
+}
+/**
+* Returns scheme to use when assembling URL
+*
+* @see getHref()
+*
+* @return string|null  scheme or null
+*/
+public function getScheme()
+{
+return $this->_scheme;
+}
+/**
 * Sets action helper for assembling URLs
 *
 * @see getHref()
 *
 * @param  Zend_Controller_Action_Helper_Url $uh  URL helper
 * @return void
 */
 public static function setUrlHelper(Zend_Controller_Action_Helper_Url $uh)
 {
 self::$_urlHelper = $uh;
+}
+/**
+* Sets view helper for assembling URLs with schemes
+*
+* @see getHref()
+*
+* @param  Zend_View_Helper_ServerUrl $sh   scheme helper
+* @return void
+*/
+public static function setSchemeHelper(Zend_View_Helper_ServerUrl $sh)
+{
+self::$_schemeHelper = $sh;
 }
 // Public methods:
 /**
 'action'       => $this->getAction(),
 'controller'   => $this->getController(),
 'module'       => $this->getModule(),
 'params'       => $this->getParams(),
 'route'        => $this->getRoute(),
-'reset_params' => $this->getResetParams()
+'reset_params' => $this->getResetParams(),
-));
+'encodeUrl'    => $this->getEncodeUrl(),
+'scheme'       => $this->getScheme(),
+)
+);
 }
 }

changeset 807	877f952ae2bd
parent 207	621fa6caec0c
child 1230	68c69c656a2c