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:
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: ActionStack.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: ActionStack.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -46,7 +46,7 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
* Constructor
|
||||
*
|
||||
* Register action stack plugin
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
@ -65,9 +65,9 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
}
|
||||
|
||||
/**
|
||||
* Push onto the stack
|
||||
*
|
||||
* @param Zend_Controller_Request_Abstract $next
|
||||
* Push onto the stack
|
||||
*
|
||||
* @param Zend_Controller_Request_Abstract $next
|
||||
* @return Zend_Controller_Action_Helper_ActionStack Provides a fluent interface
|
||||
*/
|
||||
public function pushStack(Zend_Controller_Request_Abstract $next)
|
||||
@ -78,12 +78,12 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
|
||||
/**
|
||||
* Push a new action onto the stack
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $controller
|
||||
* @param string $module
|
||||
*
|
||||
* @param string $action
|
||||
* @param string $controller
|
||||
* @param string $module
|
||||
* @param array $params
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @return Zend_Controller_Action_Helper_ActionStack
|
||||
*/
|
||||
public function actionToStack($action, $controller = null, $module = null, array $params = array())
|
||||
@ -107,7 +107,7 @@ class Zend_Controller_Action_Helper_ActionStack extends Zend_Controller_Action_H
|
||||
require_once 'Zend/Controller/Action/Exception.php';
|
||||
throw new Zend_Controller_Action_Exception('Request object not set yet');
|
||||
}
|
||||
|
||||
|
||||
$controller = (null === $controller) ? $request->getControllerName() : $controller;
|
||||
$module = (null === $module) ? $request->getModuleName() : $module;
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: AjaxContext.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: AjaxContext.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -47,7 +47,7 @@ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_H
|
||||
* Constructor
|
||||
*
|
||||
* Add HTML context
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function __construct()
|
||||
@ -60,8 +60,8 @@ class Zend_Controller_Action_Helper_AjaxContext extends Zend_Controller_Action_H
|
||||
* Initialize AJAX context switching
|
||||
*
|
||||
* Checks for XHR requests; if detected, attempts to perform context switch.
|
||||
*
|
||||
* @param string $format
|
||||
*
|
||||
* @param string $format
|
||||
* @return void
|
||||
*/
|
||||
public function initContext($format = null)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: Abstract.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -46,7 +46,7 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
|
||||
/**
|
||||
* Validate autocompletion data
|
||||
*
|
||||
*
|
||||
* @param mixed $data
|
||||
* @return boolean
|
||||
*/
|
||||
@ -54,16 +54,16 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
|
||||
/**
|
||||
* Prepare autocompletion data
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
* @return mixed
|
||||
*/
|
||||
abstract public function prepareAutoCompletion($data, $keepLayouts = false);
|
||||
|
||||
/**
|
||||
* Disable layouts and view renderer
|
||||
*
|
||||
*
|
||||
* @return Zend_Controller_Action_Helper_AutoComplete_Abstract Provides a fluent interface
|
||||
*/
|
||||
public function disableLayouts()
|
||||
@ -83,9 +83,9 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
|
||||
/**
|
||||
* Encode data to JSON
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @return string
|
||||
*/
|
||||
@ -105,11 +105,11 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
/**
|
||||
* Send autocompletion data
|
||||
*
|
||||
* Calls prepareAutoCompletion, populates response body with this
|
||||
* Calls prepareAutoCompletion, populates response body with this
|
||||
* information, and sends response.
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $keepLayouts
|
||||
* @return string|void
|
||||
*/
|
||||
public function sendAutoCompletion($data, $keepLayouts = false)
|
||||
@ -130,12 +130,12 @@ abstract class Zend_Controller_Action_Helper_AutoComplete_Abstract extends Zend_
|
||||
/**
|
||||
* Strategy pattern: allow calling helper as broker method
|
||||
*
|
||||
* Prepares autocompletion data and, if $sendNow is true, immediately sends
|
||||
* Prepares autocompletion data and, if $sendNow is true, immediately sends
|
||||
* response.
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $sendNow
|
||||
* @param bool $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param bool $sendNow
|
||||
* @param bool $keepLayouts
|
||||
* @return string|void
|
||||
*/
|
||||
public function direct($data, $sendNow = true, $keepLayouts = false)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: AutoCompleteDojo.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: AutoCompleteDojo.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -41,8 +41,8 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act
|
||||
* Validate data for autocompletion
|
||||
*
|
||||
* Stub; unused
|
||||
*
|
||||
* @param mixed $data
|
||||
*
|
||||
* @param mixed $data
|
||||
* @return boolean
|
||||
*/
|
||||
public function validateData($data)
|
||||
@ -52,9 +52,9 @@ class Zend_Controller_Action_Helper_AutoCompleteDojo extends Zend_Controller_Act
|
||||
|
||||
/**
|
||||
* Prepare data for autocompletion
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
* @return string
|
||||
*/
|
||||
public function prepareAutoCompletion($data, $keepLayouts = false)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: AutoCompleteScriptaculous.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: AutoCompleteScriptaculous.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -39,8 +39,8 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr
|
||||
{
|
||||
/**
|
||||
* Validate data for autocompletion
|
||||
*
|
||||
* @param mixed $data
|
||||
*
|
||||
* @param mixed $data
|
||||
* @return bool
|
||||
*/
|
||||
public function validateData($data)
|
||||
@ -54,9 +54,9 @@ class Zend_Controller_Action_Helper_AutoCompleteScriptaculous extends Zend_Contr
|
||||
|
||||
/**
|
||||
* Prepare data for autocompletion
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
*
|
||||
* @param mixed $data
|
||||
* @param boolean $keepLayouts
|
||||
* @throws Zend_Controller_Action_Exception
|
||||
* @return string
|
||||
*/
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: ContextSwitch.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: ContextSwitch.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -157,9 +157,9 @@ class Zend_Controller_Action_Helper_ContextSwitch extends Zend_Controller_Action
|
||||
/**
|
||||
* Initialize at start of action controller
|
||||
*
|
||||
* Reset the view script suffix to the original state, or store the
|
||||
* Reset the view script suffix to the original state, or store the
|
||||
* original state.
|
||||
*
|
||||
*
|
||||
* @return void
|
||||
*/
|
||||
public function init()
|
||||
|
@ -38,7 +38,7 @@ require_once 'Zend/Controller/Action/Helper/Abstract.php';
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: FlashMessenger.php 16971 2009-07-22 18:05:45Z mikaelkael $
|
||||
* @version $Id: FlashMessenger.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Action_Helper_Abstract implements IteratorAggregate, Countable
|
||||
{
|
||||
@ -221,10 +221,10 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio
|
||||
unset(self::$_session->{$this->_namespace});
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* getIterator() - complete the IteratorAggregate interface, for iterating
|
||||
*
|
||||
@ -255,8 +255,8 @@ class Zend_Controller_Action_Helper_FlashMessenger extends Zend_Controller_Actio
|
||||
|
||||
/**
|
||||
* Strategy pattern: proxy to addMessage()
|
||||
*
|
||||
* @param string $message
|
||||
*
|
||||
* @param string $message
|
||||
* @return void
|
||||
*/
|
||||
public function direct($message)
|
||||
|
@ -17,7 +17,7 @@
|
||||
* @subpackage Zend_Controller_Action_Helper
|
||||
* @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: Url.php 16202 2009-06-21 18:53:49Z thomas $
|
||||
* @version $Id: Url.php 18951 2009-11-12 16:26:19Z alexander $
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -62,9 +62,9 @@ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Ab
|
||||
if ($module != $this->getFrontController()->getDispatcher()->getDefaultModule()) {
|
||||
$url = $module . '/' . $url;
|
||||
}
|
||||
|
||||
|
||||
if ('' !== ($baseUrl = $this->getFrontController()->getBaseUrl())) {
|
||||
$url = $baseUrl . '/' . $url;
|
||||
$url = $baseUrl . '/' . $url;
|
||||
}
|
||||
|
||||
if (null !== $params) {
|
||||
@ -98,7 +98,7 @@ class Zend_Controller_Action_Helper_Url extends Zend_Controller_Action_Helper_Ab
|
||||
$router = $this->getFrontController()->getRouter();
|
||||
return $router->assemble($urlOptions, $name, $reset, $encode);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Perform helper when called as $this->_helper->url() from an action controller
|
||||
*
|
||||
|
Reference in New Issue
Block a user