aimeos / ai-client-html

client/html/src/Client/Html/Account/History/Order/Detail/Standard.php

Spacing +18 added lines, -18 removed lines

@@ -67,13 +67,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->detailBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/account/history/order/detail/standard/template-body';
 		$default = 'common/summary/detail-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,13 +113,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->detailHeader = $html;
 
@@ -148,7 +148,7 @@ 
 		$tplconf = 'client/html/account/history/order/detail/standard/template-header';
 		$default = 'common/summary/detail-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -159,7 +159,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/history/order/detail/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history order detail html client
@@ -234,7 +234,7 @@ 
 		 * @see client/html/account/history/order/detail/decorators/excludes
 		 * @see client/html/account/history/order/detail/decorators/global
 		 */
-		return $this->createSubClient( 'account/history/order/detail/' . $type, $name );
+		return $this->createSubClient('account/history/order/detail/'.$type, $name);
 	}
 
 
@@ -245,7 +245,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -257,17 +257,17 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
-			$view = parent::setViewParams( $view );
+			$view = parent::setViewParams($view);
 
-			if( $view->orderItem->getPaymentStatus() >= $this->getDownloadPaymentStatus() ) {
+			if ($view->orderItem->getPaymentStatus() >= $this->getDownloadPaymentStatus()) {
 				$view->summaryShowDownloadAttributes = true;
 			}
 
-			$view->summaryTaxRates = $this->getTaxRates( $view->summaryBasket );
+			$view->summaryTaxRates = $this->getTaxRates($view->summaryBasket);
 
 			$this->cache = $view;
 		}

Indentation +232 added lines, -232 removed lines

@@ -19,259 +19,259 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Summary\Detail\Base
+    extends \Aimeos\Client\Html\Common\Summary\Detail\Base
 {
-	/** client/html/account/history/order/detail/standard/subparts
-	 * List of HTML sub-clients rendered within the account history order detail section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2015.11
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/account/history/order/detail/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/account/history/order/detail/standard/subparts
+     * List of HTML sub-clients rendered within the account history order detail section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2015.11
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/account/history/order/detail/standard/subparts';
+    private $subPartNames = array();
+    private $cache;
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string HTML code
-	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string HTML code
+     */
+    public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->detailBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->detailBody = $html;
 
-		/** client/html/account/history/order/detail/standard/template-body
-		 * Relative path to the HTML body template of the account history order detail client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * (second one) should be replaced by the name of the new class in lower
-		 * case.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2015.11
-		 * @category Developer
-		 * @see client/html/account/history/order/detail/standard/template-header
-		 */
-		$tplconf = 'client/html/account/history/order/detail/standard/template-body';
-		$default = 'common/summary/detail-body-default.php';
+        /** client/html/account/history/order/detail/standard/template-body
+         * Relative path to the HTML body template of the account history order detail client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * (second one) should be replaced by the name of the new class in lower
+         * case.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2015.11
+         * @category Developer
+         * @see client/html/account/history/order/detail/standard/template-header
+         */
+        $tplconf = 'client/html/account/history/order/detail/standard/template-body';
+        $default = 'common/summary/detail-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string String including HTML tags for the header on error
-	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string String including HTML tags for the header on error
+     */
+    public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->detailHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->detailHeader = $html;
 
-		/** client/html/account/history/order/detail/standard/template-header
-		 * Relative path to the HTML header template of the account history order detail client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * (second one) should be replaced by the name of the new class in lower
-		 * case.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2015.11
-		 * @category Developer
-		 * @see client/html/account/history/order/detail/standard/template-body
-		 */
-		$tplconf = 'client/html/account/history/order/detail/standard/template-header';
-		$default = 'common/summary/detail-header-default.php';
+        /** client/html/account/history/order/detail/standard/template-header
+         * Relative path to the HTML header template of the account history order detail client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * (second one) should be replaced by the name of the new class in lower
+         * case.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2015.11
+         * @category Developer
+         * @see client/html/account/history/order/detail/standard/template-body
+         */
+        $tplconf = 'client/html/account/history/order/detail/standard/template-header';
+        $default = 'common/summary/detail-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @param string|null $name Name of the sub-client (Default if null)
-	 * @return \Aimeos\Client\Html\Iface Sub-client object
-	 */
-	public function getSubClient( $type, $name = null )
-	{
-		/** client/html/account/history/order/detail/decorators/excludes
-		 * Excludes decorators added by the "common" option from the account history order detail html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/account/history/order/detail/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/detail/decorators/global
-		 * @see client/html/account/history/order/detail/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @param string|null $name Name of the sub-client (Default if null)
+     * @return \Aimeos\Client\Html\Iface Sub-client object
+     */
+    public function getSubClient( $type, $name = null )
+    {
+        /** client/html/account/history/order/detail/decorators/excludes
+         * Excludes decorators added by the "common" option from the account history order detail html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/account/history/order/detail/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/detail/decorators/global
+         * @see client/html/account/history/order/detail/decorators/local
+         */
 
-		/** client/html/account/history/order/detail/decorators/global
-		 * Adds a list of globally available decorators only to the account history order detail html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/order/detail/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/detail/decorators/excludes
-		 * @see client/html/account/history/order/detail/decorators/local
-		 */
+        /** client/html/account/history/order/detail/decorators/global
+         * Adds a list of globally available decorators only to the account history order detail html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/order/detail/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/detail/decorators/excludes
+         * @see client/html/account/history/order/detail/decorators/local
+         */
 
-		/** client/html/account/history/order/detail/decorators/local
-		 * Adds a list of local decorators only to the account history order detail html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/order/detail/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/detail/decorators/excludes
-		 * @see client/html/account/history/order/detail/decorators/global
-		 */
-		return $this->createSubClient( 'account/history/order/detail/' . $type, $name );
-	}
+        /** client/html/account/history/order/detail/decorators/local
+         * Adds a list of local decorators only to the account history order detail html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/order/detail/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/detail/decorators/excludes
+         * @see client/html/account/history/order/detail/decorators/global
+         */
+        return $this->createSubClient( 'account/history/order/detail/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 
 
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return \Aimeos\MW\View\Iface Modified view object
-	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$view = parent::setViewParams( $view );
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return \Aimeos\MW\View\Iface Modified view object
+     */
+    protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $view = parent::setViewParams( $view );
 
-			if( $view->orderItem->getPaymentStatus() >= $this->getDownloadPaymentStatus() ) {
-				$view->summaryShowDownloadAttributes = true;
-			}
+            if( $view->orderItem->getPaymentStatus() >= $this->getDownloadPaymentStatus() ) {
+                $view->summaryShowDownloadAttributes = true;
+            }
 
-			$view->summaryTaxRates = $this->getTaxRates( $view->summaryBasket );
+            $view->summaryTaxRates = $this->getTaxRates( $view->summaryBasket );
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

client/html/src/Client/Html/Account/History/Order/Standard.php

Spacing +31 added lines, -31 removed lines

@@ -100,7 +100,7 @@ 
 	 * @since 2015.02
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'address', 'service', 'coupon', 'detail' );
+	private $subPartNames = array('address', 'service', 'coupon', 'detail');
 
 	private $cache;
 
@@ -113,19 +113,19 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$view = $this->getView();
 
-		if( $view->param( 'his_action' ) != 'order' ) {
+		if ($view->param('his_action') != 'order') {
 			return '';
 		}
 
-		$view = $this->setViewParams( $view, $tags, $expire );
+		$view = $this->setViewParams($view, $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->orderBody = $html;
 
@@ -152,7 +152,7 @@ 
 		$tplconf = 'client/html/account/history/order/standard/template-body';
 		$default = 'account/history/order-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -164,19 +164,19 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$view = $this->getView();
 
-		if( $view->param( 'his_action' ) != 'order' ) {
+		if ($view->param('his_action') != 'order') {
 			return '';
 		}
 
-		$view = $this->setViewParams( $view, $tags, $expire );
+		$view = $this->setViewParams($view, $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->orderHeader = $html;
 
@@ -204,7 +204,7 @@ 
 		$tplconf = 'client/html/account/history/order/standard/template-header';
 		$default = 'account/history/order-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -215,7 +215,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/history/order/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history order html client
@@ -291,7 +291,7 @@ 
 		 * @see client/html/account/history/order/decorators/global
 		 */
 
-		return $this->createSubClient( 'account/history/order/' . $type, $name );
+		return $this->createSubClient('account/history/order/'.$type, $name);
 	}
 
 
@@ -302,7 +302,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -314,35 +314,35 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$context = $this->getContext();
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order');
 
-			$orderId = $view->param( 'his_id', null );
+			$orderId = $view->param('his_id', null);
 
-			if( $orderId !== null )
+			if ($orderId !== null)
 			{
-				$search = $manager->createSearch( true );
+				$search = $manager->createSearch(true);
 				$expr = array(
 					$search->getConditions(),
-					$search->compare( '==', 'order.id', $orderId ),
-					$search->compare( '==', 'order.base.customerid', $context->getUserId() ),
+					$search->compare('==', 'order.id', $orderId),
+					$search->compare('==', 'order.base.customerid', $context->getUserId()),
 				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
+				$search->setConditions($search->combine('&&', $expr));
 
-				$orderItems = $manager->searchItems( $search );
+				$orderItems = $manager->searchItems($search);
 
-				if( ( $orderItem = reset( $orderItems ) ) === false )
+				if (($orderItem = reset($orderItems)) === false)
 				{
-					$msg = $view->translate( 'client', 'Order with ID "%1$s" not found' );
-					throw new \Aimeos\Client\Html\Exception( sprintf( $msg, $orderId ) );
+					$msg = $view->translate('client', 'Order with ID "%1$s" not found');
+					throw new \Aimeos\Client\Html\Exception(sprintf($msg, $orderId));
 				}
 
-				$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-				$view->summaryBasket = $baseManager->load( $orderItem->getBaseId() );
+				$baseManager = \Aimeos\MShop\Factory::createManager($context, 'order/base');
+				$view->summaryBasket = $baseManager->load($orderItem->getBaseId());
 				$view->orderItem = $orderItem;
 			}
 

Indentation +331 added lines, -331 removed lines

@@ -19,336 +19,336 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/account/history/order/standard/subparts
-	 * List of HTML sub-clients rendered within the account history order section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2015.02
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/account/history/order/standard/subparts';
-
-	/** client/html/account/history/order/address/name
-	 * Name of the address part used by the account history order client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Address\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2015.02
-	 * @category Developer
-	 */
-
-	/** client/html/account/history/order/service/name
-	 * Name of the service part used by the account history order client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Service\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2015.02
-	 * @category Developer
-	 */
-
-	/** client/html/account/history/order/coupon/name
-	 * Name of the coupon part used by the account history order client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Coupon\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2015.02
-	 * @category Developer
-	 */
-
-	/** client/html/account/history/order/detail/name
-	 * Name of the detail part used by the account history order client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Detail\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2015.02
-	 * @category Developer
-	 */
-	private $subPartNames = array( 'address', 'service', 'coupon', 'detail' );
-
-	private $cache;
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string HTML code
-	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$view = $this->getView();
-
-		if( $view->param( 'his_action' ) != 'order' ) {
-			return '';
-		}
-
-		$view = $this->setViewParams( $view, $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->orderBody = $html;
-
-		/** client/html/account/history/order/standard/template-body
-		 * Relative path to the HTML body template of the account history order client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2015.02
-		 * @category Developer
-		 * @see client/html/account/history/order/standard/template-header
-		 */
-		$tplconf = 'client/html/account/history/order/standard/template-body';
-		$default = 'account/history/order-body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string String including HTML tags for the header on error
-	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$view = $this->getView();
-
-		if( $view->param( 'his_action' ) != 'order' ) {
-			return '';
-		}
-
-		$view = $this->setViewParams( $view, $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->orderHeader = $html;
-
-		/** client/html/account/history/order/standard/template-header
-		 * Relative path to the HTML header template of the account history order client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2015.02
-		 * @category Developer
-		 * @see client/html/account/history/order/standard/template-body
-		 */
-		$tplconf = 'client/html/account/history/order/standard/template-header';
-		$default = 'account/history/order-header-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @param string|null $name Name of the sub-client (Default if null)
-	 * @return \Aimeos\Client\Html\Iface Sub-client object
-	 */
-	public function getSubClient( $type, $name = null )
-	{
-		/** client/html/account/history/order/decorators/excludes
-		 * Excludes decorators added by the "common" option from the account history order html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/account/history/order/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/decorators/global
-		 * @see client/html/account/history/order/decorators/local
-		 */
-
-		/** client/html/account/history/order/decorators/global
-		 * Adds a list of globally available decorators only to the account history order html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/order/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/decorators/excludes
-		 * @see client/html/account/history/order/decorators/local
-		 */
-
-		/** client/html/account/history/order/decorators/local
-		 * Adds a list of local decorators only to the account history order html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/order/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/decorators/excludes
-		 * @see client/html/account/history/order/decorators/global
-		 */
-
-		return $this->createSubClient( 'account/history/order/' . $type, $name );
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
-
-
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return \Aimeos\MW\View\Iface Modified view object
-	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$context = $this->getContext();
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
-
-			$orderId = $view->param( 'his_id', null );
-
-			if( $orderId !== null )
-			{
-				$search = $manager->createSearch( true );
-				$expr = array(
-					$search->getConditions(),
-					$search->compare( '==', 'order.id', $orderId ),
-					$search->compare( '==', 'order.base.customerid', $context->getUserId() ),
-				);
-				$search->setConditions( $search->combine( '&&', $expr ) );
-
-				$orderItems = $manager->searchItems( $search );
-
-				if( ( $orderItem = reset( $orderItems ) ) === false )
-				{
-					$msg = $view->translate( 'client', 'Order with ID "%1$s" not found' );
-					throw new \Aimeos\Client\Html\Exception( sprintf( $msg, $orderId ) );
-				}
-
-				$baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
-				$view->summaryBasket = $baseManager->load( $orderItem->getBaseId() );
-				$view->orderItem = $orderItem;
-			}
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
+    /** client/html/account/history/order/standard/subparts
+     * List of HTML sub-clients rendered within the account history order section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2015.02
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/account/history/order/standard/subparts';
+
+    /** client/html/account/history/order/address/name
+     * Name of the address part used by the account history order client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Address\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2015.02
+     * @category Developer
+     */
+
+    /** client/html/account/history/order/service/name
+     * Name of the service part used by the account history order client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Service\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2015.02
+     * @category Developer
+     */
+
+    /** client/html/account/history/order/coupon/name
+     * Name of the coupon part used by the account history order client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Coupon\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2015.02
+     * @category Developer
+     */
+
+    /** client/html/account/history/order/detail/name
+     * Name of the detail part used by the account history order client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Detail\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2015.02
+     * @category Developer
+     */
+    private $subPartNames = array( 'address', 'service', 'coupon', 'detail' );
+
+    private $cache;
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string HTML code
+     */
+    public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $view = $this->getView();
+
+        if( $view->param( 'his_action' ) != 'order' ) {
+            return '';
+        }
+
+        $view = $this->setViewParams( $view, $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->orderBody = $html;
+
+        /** client/html/account/history/order/standard/template-body
+         * Relative path to the HTML body template of the account history order client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2015.02
+         * @category Developer
+         * @see client/html/account/history/order/standard/template-header
+         */
+        $tplconf = 'client/html/account/history/order/standard/template-body';
+        $default = 'account/history/order-body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string String including HTML tags for the header on error
+     */
+    public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $view = $this->getView();
+
+        if( $view->param( 'his_action' ) != 'order' ) {
+            return '';
+        }
+
+        $view = $this->setViewParams( $view, $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->orderHeader = $html;
+
+        /** client/html/account/history/order/standard/template-header
+         * Relative path to the HTML header template of the account history order client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2015.02
+         * @category Developer
+         * @see client/html/account/history/order/standard/template-body
+         */
+        $tplconf = 'client/html/account/history/order/standard/template-header';
+        $default = 'account/history/order-header-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @param string|null $name Name of the sub-client (Default if null)
+     * @return \Aimeos\Client\Html\Iface Sub-client object
+     */
+    public function getSubClient( $type, $name = null )
+    {
+        /** client/html/account/history/order/decorators/excludes
+         * Excludes decorators added by the "common" option from the account history order html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/account/history/order/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/decorators/global
+         * @see client/html/account/history/order/decorators/local
+         */
+
+        /** client/html/account/history/order/decorators/global
+         * Adds a list of globally available decorators only to the account history order html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/order/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/decorators/excludes
+         * @see client/html/account/history/order/decorators/local
+         */
+
+        /** client/html/account/history/order/decorators/local
+         * Adds a list of local decorators only to the account history order html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/order/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/decorators/excludes
+         * @see client/html/account/history/order/decorators/global
+         */
+
+        return $this->createSubClient( 'account/history/order/' . $type, $name );
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
+
+
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return \Aimeos\MW\View\Iface Modified view object
+     */
+    protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $context = $this->getContext();
+            $manager = \Aimeos\MShop\Factory::createManager( $context, 'order' );
+
+            $orderId = $view->param( 'his_id', null );
+
+            if( $orderId !== null )
+            {
+                $search = $manager->createSearch( true );
+                $expr = array(
+                    $search->getConditions(),
+                    $search->compare( '==', 'order.id', $orderId ),
+                    $search->compare( '==', 'order.base.customerid', $context->getUserId() ),
+                );
+                $search->setConditions( $search->combine( '&&', $expr ) );
+
+                $orderItems = $manager->searchItems( $search );
+
+                if( ( $orderItem = reset( $orderItems ) ) === false )
+                {
+                    $msg = $view->translate( 'client', 'Order with ID "%1$s" not found' );
+                    throw new \Aimeos\Client\Html\Exception( sprintf( $msg, $orderId ) );
+                }
+
+                $baseManager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' );
+                $view->summaryBasket = $baseManager->load( $orderItem->getBaseId() );
+                $view->orderItem = $orderItem;
+            }
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
 }
\ No newline at end of file

client/html/src/Client/Html/Account/History/Order/Address/Standard.php

Spacing +13 added lines, -13 removed lines

@@ -67,13 +67,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 		}
 		$view->addressBody = $html;
 
@@ -101,7 +101,7 @@ 
 		$tplconf = 'client/html/account/history/order/address/standard/template-body';
 		$default = 'common/summary/address-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -113,13 +113,13 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
+		$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+		foreach ($this->getSubClients() as $subclient) {
+			$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 		}
 		$view->addressHeader = $html;
 
@@ -148,7 +148,7 @@ 
 		$tplconf = 'client/html/account/history/order/address/standard/template-header';
 		$default = 'common/summary/address-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -159,7 +159,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/history/order/address/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history order address html client
@@ -234,7 +234,7 @@ 
 		 * @see client/html/account/history/order/address/decorators/excludes
 		 * @see client/html/account/history/order/address/decorators/global
 		 */
-		return $this->createSubClient( 'account/history/order/address/' . $type, $name );
+		return $this->createSubClient('account/history/order/address/'.$type, $name);
 	}
 
 
@@ -245,6 +245,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

Indentation +227 added lines, -227 removed lines

@@ -19,232 +19,232 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Summary\Address\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Summary\Address\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/account/history/order/address/standard/subparts
-	 * List of HTML sub-clients rendered within the account history order address section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2015.11
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/account/history/order/address/standard/subparts';
-	private $subPartNames = array();
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string HTML code
-	*/
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->addressBody = $html;
-
-		/** client/html/account/history/order/address/standard/template-body
-		 * Relative path to the HTML body template of the account history order address client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * (second one) should be replaced by the name of the new class in lower
-		 * case.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2015.11
-		 * @category Developer
-		 * @see client/html/account/history/order/address/standard/template-header
-		 */
-		$tplconf = 'client/html/account/history/order/address/standard/template-body';
-		$default = 'common/summary/address-body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string String including HTML tags for the header on error
-	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->addressHeader = $html;
-
-		/** client/html/account/history/order/address/standard/template-header
-		 * Relative path to the HTML header template of the account history order address client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the HTML code that is inserted into the HTML page header
-		 * of the rendered page in the frontend. The configuration string is the
-		 * path to the template file relative to the templates directory (usually
-		 * in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * (second one) should be replaced by the name of the new class in lower
-		 * case.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page head
-		 * @since 2015.11
-		 * @category Developer
-		 * @see client/html/account/history/order/address/standard/template-body
-		 */
-		$tplconf = 'client/html/account/history/order/address/standard/template-header';
-		$default = 'common/summary/address-header-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @param string|null $name Name of the sub-client (Default if null)
-	 * @return \Aimeos\Client\Html\Iface Sub-client object
-	 */
-	public function getSubClient( $type, $name = null )
-	{
-		/** client/html/account/history/order/address/decorators/excludes
-		 * Excludes decorators added by the "common" option from the account history order address html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/account/history/order/address/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/address/decorators/global
-		 * @see client/html/account/history/order/address/decorators/local
-		 */
-
-		/** client/html/account/history/order/address/decorators/global
-		 * Adds a list of globally available decorators only to the account history order address html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/order/address/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/address/decorators/excludes
-		 * @see client/html/account/history/order/address/decorators/local
-		 */
-
-		/** client/html/account/history/order/address/decorators/local
-		 * Adds a list of local decorators only to the account history order address html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/order/address/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2015.08
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/order/address/decorators/excludes
-		 * @see client/html/account/history/order/address/decorators/global
-		 */
-		return $this->createSubClient( 'account/history/order/address/' . $type, $name );
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /** client/html/account/history/order/address/standard/subparts
+     * List of HTML sub-clients rendered within the account history order address section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2015.11
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/account/history/order/address/standard/subparts';
+    private $subPartNames = array();
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string HTML code
+     */
+    public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->addressBody = $html;
+
+        /** client/html/account/history/order/address/standard/template-body
+         * Relative path to the HTML body template of the account history order address client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * (second one) should be replaced by the name of the new class in lower
+         * case.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2015.11
+         * @category Developer
+         * @see client/html/account/history/order/address/standard/template-header
+         */
+        $tplconf = 'client/html/account/history/order/address/standard/template-body';
+        $default = 'common/summary/address-body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string String including HTML tags for the header on error
+     */
+    public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->addressHeader = $html;
+
+        /** client/html/account/history/order/address/standard/template-header
+         * Relative path to the HTML header template of the account history order address client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the HTML code that is inserted into the HTML page header
+         * of the rendered page in the frontend. The configuration string is the
+         * path to the template file relative to the templates directory (usually
+         * in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * (second one) should be replaced by the name of the new class in lower
+         * case.
+         *
+         * @param string Relative path to the template creating code for the HTML page head
+         * @since 2015.11
+         * @category Developer
+         * @see client/html/account/history/order/address/standard/template-body
+         */
+        $tplconf = 'client/html/account/history/order/address/standard/template-header';
+        $default = 'common/summary/address-header-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @param string|null $name Name of the sub-client (Default if null)
+     * @return \Aimeos\Client\Html\Iface Sub-client object
+     */
+    public function getSubClient( $type, $name = null )
+    {
+        /** client/html/account/history/order/address/decorators/excludes
+         * Excludes decorators added by the "common" option from the account history order address html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/account/history/order/address/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/address/decorators/global
+         * @see client/html/account/history/order/address/decorators/local
+         */
+
+        /** client/html/account/history/order/address/decorators/global
+         * Adds a list of globally available decorators only to the account history order address html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/order/address/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/address/decorators/excludes
+         * @see client/html/account/history/order/address/decorators/local
+         */
+
+        /** client/html/account/history/order/address/decorators/local
+         * Adds a list of local decorators only to the account history order address html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Basket\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/order/address/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Basket\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2015.08
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/order/address/decorators/excludes
+         * @see client/html/account/history/order/address/decorators/global
+         */
+        return $this->createSubClient( 'account/history/order/address/' . $type, $name );
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 }
\ No newline at end of file

client/html/src/Client/Html/Account/History/Factory.php

Indentation +59 added lines, -59 removed lines

@@ -19,69 +19,69 @@
  * @subpackage Html
  */
 class Factory
-	extends \Aimeos\Client\Html\Common\Factory\Base
-	implements \Aimeos\Client\Html\Common\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Factory\Base
+    implements \Aimeos\Client\Html\Common\Factory\Iface
 {
-	/**
-	 * Creates a account history client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
-	 * @param array $templatePaths List of file system paths where the templates are stored
-	 * @param string|null $name Client name (default: "Standard")
-	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
-	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
-	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
-	{
-		/** client/html/account/history/name
-		 * Class name of the used account history client implementation
-		 *
-		 * Each default HTML client can be replace by an alternative imlementation.
-		 * To use this implementation, you have to set the last part of the class
-		 * name as configuration value so the client factory knows which class it
-		 * has to instantiate.
-		 *
-		 * For example, if the name of the default class is
-		 *
-		 *  \Aimeos\Client\Html\Account\History\Standard
-		 *
-		 * and you want to replace it with your own version named
-		 *
-		 *  \Aimeos\Client\Html\Account\History\Myhistory
-		 *
-		 * then you have to set the this configuration option:
-		 *
-		 *  client/html/account/history/name = Myhistory
-		 *
-		 * The value is the last part of your own class name and it's case sensitive,
-		 * so take care that the configuration value is exactly named like the last
-		 * part of the class name.
-		 *
-		 * The allowed characters of the class name are A-Z, a-z and 0-9. No other
-		 * characters are possible! You should always start the last part of the class
-		 * name with an upper case character and continue only with lower case characters
-		 * or numbers. Avoid chamel case names like "MyHistory"!
-		 *
-		 * @param string Last part of the class name
-		 * @since 2014.03
-		 * @category Developer
-		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/account/history/name', 'Standard' );
-		}
+    /**
+     * Creates a account history client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
+     * @param array $templatePaths List of file system paths where the templates are stored
+     * @param string|null $name Client name (default: "Standard")
+     * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
+     * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
+     */
+    public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+    {
+        /** client/html/account/history/name
+         * Class name of the used account history client implementation
+         *
+         * Each default HTML client can be replace by an alternative imlementation.
+         * To use this implementation, you have to set the last part of the class
+         * name as configuration value so the client factory knows which class it
+         * has to instantiate.
+         *
+         * For example, if the name of the default class is
+         *
+         *  \Aimeos\Client\Html\Account\History\Standard
+         *
+         * and you want to replace it with your own version named
+         *
+         *  \Aimeos\Client\Html\Account\History\Myhistory
+         *
+         * then you have to set the this configuration option:
+         *
+         *  client/html/account/history/name = Myhistory
+         *
+         * The value is the last part of your own class name and it's case sensitive,
+         * so take care that the configuration value is exactly named like the last
+         * part of the class name.
+         *
+         * The allowed characters of the class name are A-Z, a-z and 0-9. No other
+         * characters are possible! You should always start the last part of the class
+         * name with an upper case character and continue only with lower case characters
+         * or numbers. Avoid chamel case names like "MyHistory"!
+         *
+         * @param string Last part of the class name
+         * @since 2014.03
+         * @category Developer
+         */
+        if( $name === null ) {
+            $name = $context->getConfig()->get( 'client/html/account/history/name', 'Standard' );
+        }
 
-		if( ctype_alnum( $name ) === false )
-		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\History\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
-		}
+        if( ctype_alnum( $name ) === false )
+        {
+            $classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\History\\' . $name : '<not a string>';
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+        }
 
-		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Account\\History\\' . $name;
+        $iface = '\\Aimeos\\Client\\Html\\Iface';
+        $classname = '\\Aimeos\\Client\\Html\\Account\\History\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+        $client = self::createClientBase( $context, $classname, $iface, $templatePaths );
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'account/history' );
-	}
+        return self::addClientDecorators( $context, $client, $templatePaths, 'account/history' );
+    }
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
 	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null)
 	{
 		/** client/html/account/history/name
 		 * Class name of the used account history client implementation
@@ -66,22 +66,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/account/history/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/account/history/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\History\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\Html\\Account\\History\\'.$name : '<not a string>';
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Account\\History\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Account\\History\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'account/history' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'account/history');
 	}
 
 }
\ No newline at end of file

client/html/src/Client/Html/Account/History/Standard.php

Indentation +262 added lines, -262 removed lines

@@ -19,288 +19,288 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Iface
 {
-	/** client/html/account/history/standard/subparts
-	 * List of HTML sub-clients rendered within the account history section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/account/history/standard/subparts';
+    /** client/html/account/history/standard/subparts
+     * List of HTML sub-clients rendered within the account history section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/account/history/standard/subparts';
 
-	/** client/html/account/history/lists/name
-	 * Name of the list part used by the account history client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Lists\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2014.03
-	 * @category Developer
-	 */
+    /** client/html/account/history/lists/name
+     * Name of the list part used by the account history client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Lists\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2014.03
+     * @category Developer
+     */
 
-	/** client/html/account/history/order/name
-	 * Name of the order part used by the account history client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Myname".
-	 * The name is case-sensitive and you should avoid camel case names like "MyName".
-	 *
-	 * @param string Last part of the client class name
-	 * @since 2015.02
-	 * @category Developer
-	 */
-	private $subPartNames = array( 'lists', 'order' );
+    /** client/html/account/history/order/name
+     * Name of the order part used by the account history client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Account\History\Order\Myname".
+     * The name is case-sensitive and you should avoid camel case names like "MyName".
+     *
+     * @param string Last part of the client class name
+     * @since 2015.02
+     * @category Developer
+     */
+    private $subPartNames = array( 'lists', 'order' );
 
 
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string HTML code
-	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$context = $this->getContext();
-		$view = $this->getView();
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string HTML code
+     */
+    public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $context = $this->getContext();
+        $view = $this->getView();
 
-		try
-		{
-			$view = $this->setViewParams( $view, $tags, $expire );
+        try
+        {
+            $view = $this->setViewParams( $view, $tags, $expire );
 
-			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-			}
-			$view->historyBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
-		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+            $html = '';
+            foreach( $this->getSubClients() as $subclient ) {
+                $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+            }
+            $view->historyBody = $html;
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+        }
+        catch( \Exception $e )
+        {
+            $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
-		}
+            $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
+            $view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+        }
 
-		/** client/html/account/history/standard/template-body
-		 * Relative path to the HTML body template of the account history client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/account/history/standard/template-header
-		 */
-		$tplconf = 'client/html/account/history/standard/template-body';
-		$default = 'account/history/body-default.php';
+        /** client/html/account/history/standard/template-body
+         * Relative path to the HTML body template of the account history client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/account/history/standard/template-header
+         */
+        $tplconf = 'client/html/account/history/standard/template-body';
+        $default = 'account/history/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
 
 
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string|null String including HTML tags for the header on error
-	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		try
-		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string|null String including HTML tags for the header on error
+     */
+    public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        try
+        {
+            $view = $this->setViewParams( $this->getView(), $tags, $expire );
 
-			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-			}
-			$view->historyHeader = $html;
+            $html = '';
+            foreach( $this->getSubClients() as $subclient ) {
+                $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+            }
+            $view->historyHeader = $html;
 
-			/** client/html/account/history/standard/template-header
-			 * Relative path to the HTML header template of the account history client.
-			 *
-			 * The template file contains the HTML code and processing instructions
-			 * to generate the HTML code that is inserted into the HTML page header
-			 * of the rendered page in the frontend. The configuration string is the
-			 * path to the template file relative to the templates directory (usually
-			 * in client/html/templates).
-			 *
-			 * You can overwrite the template file configuration in extensions and
-			 * provide alternative templates. These alternative templates should be
-			 * named like the default one but with the string "standard" replaced by
-			 * an unique name. You may use the name of your project for this. If
-			 * you've implemented an alternative client class as well, "standard"
-			 * should be replaced by the name of the new class.
-			 *
-			 * @param string Relative path to the template creating code for the HTML page head
-			 * @since 2014.03
-			 * @category Developer
-			 * @see client/html/account/history/standard/template-body
-			 */
-			$tplconf = 'client/html/account/history/standard/template-header';
-			$default = 'account/history/header-default.php';
+            /** client/html/account/history/standard/template-header
+             * Relative path to the HTML header template of the account history client.
+             *
+             * The template file contains the HTML code and processing instructions
+             * to generate the HTML code that is inserted into the HTML page header
+             * of the rendered page in the frontend. The configuration string is the
+             * path to the template file relative to the templates directory (usually
+             * in client/html/templates).
+             *
+             * You can overwrite the template file configuration in extensions and
+             * provide alternative templates. These alternative templates should be
+             * named like the default one but with the string "standard" replaced by
+             * an unique name. You may use the name of your project for this. If
+             * you've implemented an alternative client class as well, "standard"
+             * should be replaced by the name of the new class.
+             *
+             * @param string Relative path to the template creating code for the HTML page head
+             * @since 2014.03
+             * @category Developer
+             * @see client/html/account/history/standard/template-body
+             */
+            $tplconf = 'client/html/account/history/standard/template-header';
+            $default = 'account/history/header-default.php';
 
-			return $view->render( $view->config( $tplconf, $default ) );
-		}
-		catch( \Exception $e )
-		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-		}
-	}
+            return $view->render( $view->config( $tplconf, $default ) );
+        }
+        catch( \Exception $e )
+        {
+            $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+        }
+    }
 
 
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @param string|null $name Name of the sub-client (Default if null)
-	 * @return \Aimeos\Client\Html\Iface Sub-client object
-	 */
-	public function getSubClient( $type, $name = null )
-	{
-		/** client/html/account/history/decorators/excludes
-		 * Excludes decorators added by the "common" option from the account history html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/account/history/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/decorators/global
-		 * @see client/html/account/history/decorators/local
-		 */
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @param string|null $name Name of the sub-client (Default if null)
+     * @return \Aimeos\Client\Html\Iface Sub-client object
+     */
+    public function getSubClient( $type, $name = null )
+    {
+        /** client/html/account/history/decorators/excludes
+         * Excludes decorators added by the "common" option from the account history html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/account/history/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/decorators/global
+         * @see client/html/account/history/decorators/local
+         */
 
-		/** client/html/account/history/decorators/global
-		 * Adds a list of globally available decorators only to the account history html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/decorators/excludes
-		 * @see client/html/account/history/decorators/local
-		 */
+        /** client/html/account/history/decorators/global
+         * Adds a list of globally available decorators only to the account history html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/decorators/excludes
+         * @see client/html/account/history/decorators/local
+         */
 
-		/** client/html/account/history/decorators/local
-		 * Adds a list of local decorators only to the account history html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/history/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/history/decorators/excludes
-		 * @see client/html/account/history/decorators/global
-		 */
+        /** client/html/account/history/decorators/local
+         * Adds a list of local decorators only to the account history html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
+         *
+         *  client/html/account/history/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/history/decorators/excludes
+         * @see client/html/account/history/decorators/global
+         */
 
-		return $this->createSubClient( 'account/history/' . $type, $name );
-	}
+        return $this->createSubClient( 'account/history/' . $type, $name );
+    }
 
 
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
 }
\ No newline at end of file

Spacing +29 added lines, -29 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2015.02
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'lists', 'order' );
+	private $subPartNames = array('lists', 'order');
 
 
 	/**
@@ -89,42 +89,42 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
 
 		try
 		{
-			$view = $this->setViewParams( $view, $tags, $expire );
+			$view = $this->setViewParams($view, $tags, $expire);
 
 			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 			}
 			$view->historyBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->historyErrorList = $view->get('historyErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->historyErrorList = $view->get('historyErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->historyErrorList = $view->get('historyErrorList', array()) + $error;
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->historyErrorList = $view->get( 'historyErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->historyErrorList = $view->get('historyErrorList', array()) + $error;
 		}
 
 		/** client/html/account/history/standard/template-body
@@ -150,7 +150,7 @@ 
 		$tplconf = 'client/html/account/history/standard/template-body';
 		$default = 'account/history/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -162,15 +162,15 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		try
 		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
+			$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 			}
 			$view->historyHeader = $html;
 
@@ -198,11 +198,11 @@ 
 			$tplconf = 'client/html/account/history/standard/template-header';
 			$default = 'account/history/header-default.php';
 
-			return $view->render( $view->config( $tplconf, $default ) );
+			return $view->render($view->config($tplconf, $default));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$this->getContext()->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 		}
 	}
 
@@ -214,7 +214,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/history/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account history html client
@@ -290,7 +290,7 @@ 
 		 * @see client/html/account/history/decorators/global
 		 */
 
-		return $this->createSubClient( 'account/history/' . $type, $name );
+		return $this->createSubClient('account/history/'.$type, $name);
 	}
 
 
@@ -301,6 +301,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }
\ No newline at end of file

Braces +5 added lines, -10 removed lines

@@ -82,23 +82,19 @@ 
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 			}
 			$view->watchBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -178,8 +174,7 @@ 
 			$default = 'account/watch/header-default.php';
 
 			return $view->render( $view->config( $tplconf, $default ) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 		}

client/html/src/Client/Html/Account/Download/Factory.php

Indentation +59 added lines, -59 removed lines

@@ -18,69 +18,69 @@
  * @subpackage Html
  */
 class Factory
-	extends \Aimeos\Client\Html\Common\Factory\Base
-	implements \Aimeos\Client\Html\Common\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Factory\Base
+    implements \Aimeos\Client\Html\Common\Factory\Iface
 {
-	/**
-	 * Creates a account download client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
-	 * @param array $templatePaths List of file system paths where the templates are stored
-	 * @param string|null $name Client name (default: "Standard")
-	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
-	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
-	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
-	{
-		/** client/html/account/download/name
-		 * Class name of the used account download client implementation
-		 *
-		 * Each default HTML client can be replace by an alternative imlementation.
-		 * To use this implementation, you have to set the last part of the class
-		 * name as configuration value so the client factory knows which class it
-		 * has to instantiate.
-		 *
-		 * For example, if the name of the default class is
-		 *
-		 *  \Aimeos\Client\Html\Account\Download\Standard
-		 *
-		 * and you want to replace it with your own version named
-		 *
-		 *  \Aimeos\Client\Html\Account\Download\Mydownload
-		 *
-		 * then you have to set the this configuration option:
-		 *
-		 *  client/html/account/download/name = Mydownload
-		 *
-		 * The value is the last part of your own class name and it's case sensitive,
-		 * so take care that the configuration value is exactly named like the last
-		 * part of the class name.
-		 *
-		 * The allowed characters of the class name are A-Z, a-z and 0-9. No other
-		 * characters are possible! You should always start the last part of the class
-		 * name with an upper case character and continue only with lower case characters
-		 * or numbers. Avoid chamel case names like "MyDownload"!
-		 *
-		 * @param string Last part of the class name
-		 * @since 2014.03
-		 * @category Developer
-		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/account/download/name', 'Standard' );
-		}
+    /**
+     * Creates a account download client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
+     * @param array $templatePaths List of file system paths where the templates are stored
+     * @param string|null $name Client name (default: "Standard")
+     * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
+     * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
+     */
+    public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+    {
+        /** client/html/account/download/name
+         * Class name of the used account download client implementation
+         *
+         * Each default HTML client can be replace by an alternative imlementation.
+         * To use this implementation, you have to set the last part of the class
+         * name as configuration value so the client factory knows which class it
+         * has to instantiate.
+         *
+         * For example, if the name of the default class is
+         *
+         *  \Aimeos\Client\Html\Account\Download\Standard
+         *
+         * and you want to replace it with your own version named
+         *
+         *  \Aimeos\Client\Html\Account\Download\Mydownload
+         *
+         * then you have to set the this configuration option:
+         *
+         *  client/html/account/download/name = Mydownload
+         *
+         * The value is the last part of your own class name and it's case sensitive,
+         * so take care that the configuration value is exactly named like the last
+         * part of the class name.
+         *
+         * The allowed characters of the class name are A-Z, a-z and 0-9. No other
+         * characters are possible! You should always start the last part of the class
+         * name with an upper case character and continue only with lower case characters
+         * or numbers. Avoid chamel case names like "MyDownload"!
+         *
+         * @param string Last part of the class name
+         * @since 2014.03
+         * @category Developer
+         */
+        if( $name === null ) {
+            $name = $context->getConfig()->get( 'client/html/account/download/name', 'Standard' );
+        }
 
-		if( ctype_alnum( $name ) === false )
-		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\Download\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
-		}
+        if( ctype_alnum( $name ) === false )
+        {
+            $classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\Download\\' . $name : '<not a string>';
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+        }
 
-		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Account\\Download\\' . $name;
+        $iface = '\\Aimeos\\Client\\Html\\Iface';
+        $classname = '\\Aimeos\\Client\\Html\\Account\\Download\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+        $client = self::createClientBase( $context, $classname, $iface, $templatePaths );
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'account/download' );
-	}
+        return self::addClientDecorators( $context, $client, $templatePaths, 'account/download' );
+    }
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -30,7 +30,7 @@ 
 	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
 	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null)
 	{
 		/** client/html/account/download/name
 		 * Class name of the used account download client implementation
@@ -65,22 +65,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/account/download/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/account/download/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\Download\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\Html\\Account\\Download\\'.$name : '<not a string>';
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Account\\Download\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Account\\Download\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'account/download' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'account/download');
 	}
 
 }
\ No newline at end of file

client/html/src/Client/Html/Account/Download/Standard.php

Indentation +360 added lines, -360 removed lines

@@ -18,365 +18,365 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/account/download/standard/subparts
-	 * List of HTML sub-clients rendered within the account download section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2016.02
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/account/download/standard/subparts';
-	private $subPartNames = array();
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string HTML code
-	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		return '';
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string|null String including HTML tags for the header on error
-	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		return '';
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @param string|null $name Name of the sub-client (Default if null)
-	 * @return \Aimeos\Client\Html\Iface Sub-client object
-	 */
-	public function getSubClient( $type, $name = null )
-	{
-		/** client/html/account/download/decorators/excludes
-		 * Excludes decorators added by the "common" option from the account download html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/account/download/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2016.02
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/download/decorators/global
-		 * @see client/html/account/download/decorators/local
-		 */
-
-		/** client/html/account/download/decorators/global
-		 * Adds a list of globally available decorators only to the account download html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/download/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2016.02
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/download/decorators/excludes
-		 * @see client/html/account/download/decorators/local
-		 */
-
-		/** client/html/account/download/decorators/local
-		 * Adds a list of local decorators only to the account download html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/download/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2016.02
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/download/decorators/excludes
-		 * @see client/html/account/download/decorators/global
-		 */
-		return $this->createSubClient( 'account/download/' . $type, $name );
-	}
-
-
-	/**
-	 * Processes the input, e.g. store given values.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$context = $this->getContext();
-
-		try
-		{
-			$view = $this->getView();
-			$id = $view->param( 'dl_id' );
-			$customerId = $context->getUserId();
-
-			if( $this->checkAccess( $customerId, $id ) === false )
-			{
-				$view->response()->withStatus( 401 );
-				return;
-			}
-
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' );
-			$item = $manager->getItem( $id );
-
-			if( $this->checkDownload( $context->getUserId(), $id ) === true ) {
-				$this->addDownload( $item );
-			} else {
-				$view->response()->withStatus( 403 );
-			}
-
-			parent::process();
-		}
-		catch( \Exception $e )
-		{
-			$context->getLogger()->log( $e->getMessage() );
-		}
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
-
-
-	/**
-	 * Adds the necessary headers and the download content to the reponse object
-	 *
-	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item Order product attribute item with file reference
-	 */
-	protected function addDownload( \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item )
-	{
-		$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
-		$response = $this->getView()->response();
-		$value = (string) $item->getValue();
-
-		if( $fs->has( $value ) )
-		{
-			$name = $item->getName();
-
-			if( pathinfo( $name, PATHINFO_EXTENSION ) == null
-					&& ( $ext = pathinfo( $value, PATHINFO_EXTENSION ) ) != null
-			) {
-				$name .= '.' . $ext;
-			}
-
-			$response->withHeader( 'Content-Description', 'File Transfer' );
-			$response->withHeader( 'Content-Type', 'application/octet-stream' );
-			$response->withHeader( 'Content-Disposition', 'attachment; filename="' . $name . '"' );
-			$response->withHeader( 'Content-Length', (string) $fs->size( $value ) );
-			$response->withHeader( 'Cache-Control', 'must-revalidate' );
-			$response->withHeader( 'Pragma', 'private' );
-			$response->withHeader( 'Expires', '0' );
-
-			$response->withBody( $response->createStream( $fs->reads( $value ) ) );
-		}
-		elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
-		{
-			$response->withHeader( 'Location', $value );
-			$response->withStatus( 303 );
-		}
-		else
-		{
-			$response->withStatus( 404 );
-		}
-	}
-
-
-	/**
-	 * Checks if the customer is allowed to download the file
-	 *
-	 * @param string $customerId Unique customer ID
-	 * @param string $id Unique order base product attribute ID referencing the download file
-	 * @return boolean True if download is allowed, false if not
-	 */
-	protected function checkAccess( $customerId, $id )
-	{
-		if( $customerId !== null && $id !== null )
-		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base' );
-
-			$search = $manager->createSearch();
-			$expr = array(
-				$search->compare( '==', 'order.base.customerid', $customerId ),
-				$search->compare( '==', 'order.base.product.attribute.id', $id ),
-			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSlice( 0, 1 );
-
-			if( count( $manager->searchItems( $search ) ) > 0 ) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Updates the download counter for the downloaded file
-	 *
-	 * @param string $customerId Unique customer ID
-	 * @param string $id Unique order base product attribute ID referencing the download file
-	 * @return boolean True if download is allowed, false if not
-	 */
-	protected function checkDownload( $customerId, $id )
-	{
-		$context = $this->getContext();
-
-		/** client/html/account/download/maxcount
-		 * Maximum number of file downloads allowed for an ordered product
-		 *
-		 * This configuration setting enables you to limit the number of downloads
-		 * of a product download file. The count is the maximum number for each
-		 * bought product and customer, i.e. setting the count to "3" allows
-		 * a customer to download the bought product file up to three times.
-		 *
-		 * The default value of null enforces no limit.
-		 *
-		 * @param integer Maximum number of downloads
-		 * @since 2016.02
-		 * @category Developer
-		 * @category User
-		 */
-		$maxcnt = $context->getConfig()->get( 'client/html/account/download/maxcount' );
-
-		$listItem = $this->getListItem( $customerId, $id );
-		$config = $listItem->getConfig();
-
-		if( !isset( $config['count'] ) ) {
-			$config['count'] = 0;
-		}
-
-		if( $maxcnt === null || ((int) $config['count']) < $maxcnt )
-		{
-			$config['count']++;
-			$listItem->setConfig( $config );
-
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
-			$manager->saveItem( $listItem, false );
-
-			return true;
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * Returns the list item storing the download counter
-	 *
-	 * @param string $customerId Unique customer ID
-	 * @param string $refId Unique order base product attribute ID referencing the download file
-	 * @return \Aimeos\MSho\Common\Item\Lists\Iface List item object
-	 */
-	protected function getListItem( $customerId, $refId )
-	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
-
-		$search = $manager->createSearch();
-		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $customerId ),
-			$search->compare( '==', 'customer.lists.refid', $refId ),
-			$search->compare( '==', 'customer.lists.domain', 'order' ),
-			$search->compare( '==', 'customer.lists.type.domain', 'order' ),
-			$search->compare( '==', 'customer.lists.type.code', 'download' ),
-		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-
-		$listItems = $manager->searchItems( $search );
-
-		if( ( $listItem = reset( $listItems ) ) === false )
-		{
-			$listItem = $manager->createItem();
-			$listItem->setTypeId( $this->getTypeItem( 'customer/lists/type', 'order', 'download' )->getId() );
-			$listItem->setParentId( $customerId );
-			$listItem->setDomain( 'order' );
-			$listItem->setRefId( $refId );
-		}
-
-		return $listItem;
-	}
+    /** client/html/account/download/standard/subparts
+     * List of HTML sub-clients rendered within the account download section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2016.02
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/account/download/standard/subparts';
+    private $subPartNames = array();
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string HTML code
+     */
+    public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        return '';
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string|null String including HTML tags for the header on error
+     */
+    public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        return '';
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @param string|null $name Name of the sub-client (Default if null)
+     * @return \Aimeos\Client\Html\Iface Sub-client object
+     */
+    public function getSubClient( $type, $name = null )
+    {
+        /** client/html/account/download/decorators/excludes
+         * Excludes decorators added by the "common" option from the account download html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/account/download/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2016.02
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/download/decorators/global
+         * @see client/html/account/download/decorators/local
+         */
+
+        /** client/html/account/download/decorators/global
+         * Adds a list of globally available decorators only to the account download html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/account/download/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2016.02
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/download/decorators/excludes
+         * @see client/html/account/download/decorators/local
+         */
+
+        /** client/html/account/download/decorators/local
+         * Adds a list of local decorators only to the account download html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
+         *
+         *  client/html/account/download/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2016.02
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/download/decorators/excludes
+         * @see client/html/account/download/decorators/global
+         */
+        return $this->createSubClient( 'account/download/' . $type, $name );
+    }
+
+
+    /**
+     * Processes the input, e.g. store given values.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $context = $this->getContext();
+
+        try
+        {
+            $view = $this->getView();
+            $id = $view->param( 'dl_id' );
+            $customerId = $context->getUserId();
+
+            if( $this->checkAccess( $customerId, $id ) === false )
+            {
+                $view->response()->withStatus( 401 );
+                return;
+            }
+
+            $manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' );
+            $item = $manager->getItem( $id );
+
+            if( $this->checkDownload( $context->getUserId(), $id ) === true ) {
+                $this->addDownload( $item );
+            } else {
+                $view->response()->withStatus( 403 );
+            }
+
+            parent::process();
+        }
+        catch( \Exception $e )
+        {
+            $context->getLogger()->log( $e->getMessage() );
+        }
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
+
+
+    /**
+     * Adds the necessary headers and the download content to the reponse object
+     *
+     * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item Order product attribute item with file reference
+     */
+    protected function addDownload( \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item )
+    {
+        $fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+        $response = $this->getView()->response();
+        $value = (string) $item->getValue();
+
+        if( $fs->has( $value ) )
+        {
+            $name = $item->getName();
+
+            if( pathinfo( $name, PATHINFO_EXTENSION ) == null
+                    && ( $ext = pathinfo( $value, PATHINFO_EXTENSION ) ) != null
+            ) {
+                $name .= '.' . $ext;
+            }
+
+            $response->withHeader( 'Content-Description', 'File Transfer' );
+            $response->withHeader( 'Content-Type', 'application/octet-stream' );
+            $response->withHeader( 'Content-Disposition', 'attachment; filename="' . $name . '"' );
+            $response->withHeader( 'Content-Length', (string) $fs->size( $value ) );
+            $response->withHeader( 'Cache-Control', 'must-revalidate' );
+            $response->withHeader( 'Pragma', 'private' );
+            $response->withHeader( 'Expires', '0' );
+
+            $response->withBody( $response->createStream( $fs->reads( $value ) ) );
+        }
+        elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
+        {
+            $response->withHeader( 'Location', $value );
+            $response->withStatus( 303 );
+        }
+        else
+        {
+            $response->withStatus( 404 );
+        }
+    }
+
+
+    /**
+     * Checks if the customer is allowed to download the file
+     *
+     * @param string $customerId Unique customer ID
+     * @param string $id Unique order base product attribute ID referencing the download file
+     * @return boolean True if download is allowed, false if not
+     */
+    protected function checkAccess( $customerId, $id )
+    {
+        if( $customerId !== null && $id !== null )
+        {
+            $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base' );
+
+            $search = $manager->createSearch();
+            $expr = array(
+                $search->compare( '==', 'order.base.customerid', $customerId ),
+                $search->compare( '==', 'order.base.product.attribute.id', $id ),
+            );
+            $search->setConditions( $search->combine( '&&', $expr ) );
+            $search->setSlice( 0, 1 );
+
+            if( count( $manager->searchItems( $search ) ) > 0 ) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Updates the download counter for the downloaded file
+     *
+     * @param string $customerId Unique customer ID
+     * @param string $id Unique order base product attribute ID referencing the download file
+     * @return boolean True if download is allowed, false if not
+     */
+    protected function checkDownload( $customerId, $id )
+    {
+        $context = $this->getContext();
+
+        /** client/html/account/download/maxcount
+         * Maximum number of file downloads allowed for an ordered product
+         *
+         * This configuration setting enables you to limit the number of downloads
+         * of a product download file. The count is the maximum number for each
+         * bought product and customer, i.e. setting the count to "3" allows
+         * a customer to download the bought product file up to three times.
+         *
+         * The default value of null enforces no limit.
+         *
+         * @param integer Maximum number of downloads
+         * @since 2016.02
+         * @category Developer
+         * @category User
+         */
+        $maxcnt = $context->getConfig()->get( 'client/html/account/download/maxcount' );
+
+        $listItem = $this->getListItem( $customerId, $id );
+        $config = $listItem->getConfig();
+
+        if( !isset( $config['count'] ) ) {
+            $config['count'] = 0;
+        }
+
+        if( $maxcnt === null || ((int) $config['count']) < $maxcnt )
+        {
+            $config['count']++;
+            $listItem->setConfig( $config );
+
+            $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+            $manager->saveItem( $listItem, false );
+
+            return true;
+        }
+
+        return false;
+    }
+
+
+    /**
+     * Returns the list item storing the download counter
+     *
+     * @param string $customerId Unique customer ID
+     * @param string $refId Unique order base product attribute ID referencing the download file
+     * @return \Aimeos\MSho\Common\Item\Lists\Iface List item object
+     */
+    protected function getListItem( $customerId, $refId )
+    {
+        $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
+
+        $search = $manager->createSearch();
+        $expr = array(
+            $search->compare( '==', 'customer.lists.parentid', $customerId ),
+            $search->compare( '==', 'customer.lists.refid', $refId ),
+            $search->compare( '==', 'customer.lists.domain', 'order' ),
+            $search->compare( '==', 'customer.lists.type.domain', 'order' ),
+            $search->compare( '==', 'customer.lists.type.code', 'download' ),
+        );
+        $search->setConditions( $search->combine( '&&', $expr ) );
+
+        $listItems = $manager->searchItems( $search );
+
+        if( ( $listItem = reset( $listItems ) ) === false )
+        {
+            $listItem = $manager->createItem();
+            $listItem->setTypeId( $this->getTypeItem( 'customer/lists/type', 'order', 'download' )->getId() );
+            $listItem->setParentId( $customerId );
+            $listItem->setDomain( 'order' );
+            $listItem->setRefId( $refId );
+        }
+
+        return $listItem;
+    }
 }
\ No newline at end of file

Spacing +63 added lines, -63 removed lines

@@ -66,7 +66,7 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
 		return '';
 	}
@@ -80,7 +80,7 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		return '';
 	}
@@ -93,7 +93,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/download/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account download html client
@@ -168,7 +168,7 @@ 
 		 * @see client/html/account/download/decorators/excludes
 		 * @see client/html/account/download/decorators/global
 		 */
-		return $this->createSubClient( 'account/download/' . $type, $name );
+		return $this->createSubClient('account/download/'.$type, $name);
 	}
 
 
@@ -184,29 +184,29 @@ 
 		try
 		{
 			$view = $this->getView();
-			$id = $view->param( 'dl_id' );
+			$id = $view->param('dl_id');
 			$customerId = $context->getUserId();
 
-			if( $this->checkAccess( $customerId, $id ) === false )
+			if ($this->checkAccess($customerId, $id) === false)
 			{
-				$view->response()->withStatus( 401 );
+				$view->response()->withStatus(401);
 				return;
 			}
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base/product/attribute' );
-			$item = $manager->getItem( $id );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'order/base/product/attribute');
+			$item = $manager->getItem($id);
 
-			if( $this->checkDownload( $context->getUserId(), $id ) === true ) {
-				$this->addDownload( $item );
+			if ($this->checkDownload($context->getUserId(), $id) === true) {
+				$this->addDownload($item);
 			} else {
-				$view->response()->withStatus( 403 );
+				$view->response()->withStatus(403);
 			}
 
 			parent::process();
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() );
+			$context->getLogger()->log($e->getMessage());
 		}
 	}
 
@@ -218,7 +218,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -227,40 +227,40 @@ 
 	 *
 	 * @param \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item Order product attribute item with file reference
 	 */
-	protected function addDownload( \Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item )
+	protected function addDownload(\Aimeos\MShop\Order\Item\Base\Product\Attribute\Iface $item)
 	{
-		$fs = $this->getContext()->getFilesystemManager()->get( 'fs-secure' );
+		$fs = $this->getContext()->getFilesystemManager()->get('fs-secure');
 		$response = $this->getView()->response();
 		$value = (string) $item->getValue();
 
-		if( $fs->has( $value ) )
+		if ($fs->has($value))
 		{
 			$name = $item->getName();
 
-			if( pathinfo( $name, PATHINFO_EXTENSION ) == null
-					&& ( $ext = pathinfo( $value, PATHINFO_EXTENSION ) ) != null
+			if (pathinfo($name, PATHINFO_EXTENSION) == null
+					&& ($ext = pathinfo($value, PATHINFO_EXTENSION)) != null
 			) {
-				$name .= '.' . $ext;
+				$name .= '.'.$ext;
 			}
 
-			$response->withHeader( 'Content-Description', 'File Transfer' );
-			$response->withHeader( 'Content-Type', 'application/octet-stream' );
-			$response->withHeader( 'Content-Disposition', 'attachment; filename="' . $name . '"' );
-			$response->withHeader( 'Content-Length', (string) $fs->size( $value ) );
-			$response->withHeader( 'Cache-Control', 'must-revalidate' );
-			$response->withHeader( 'Pragma', 'private' );
-			$response->withHeader( 'Expires', '0' );
+			$response->withHeader('Content-Description', 'File Transfer');
+			$response->withHeader('Content-Type', 'application/octet-stream');
+			$response->withHeader('Content-Disposition', 'attachment; filename="'.$name.'"');
+			$response->withHeader('Content-Length', (string) $fs->size($value));
+			$response->withHeader('Cache-Control', 'must-revalidate');
+			$response->withHeader('Pragma', 'private');
+			$response->withHeader('Expires', '0');
 
-			$response->withBody( $response->createStream( $fs->reads( $value ) ) );
+			$response->withBody($response->createStream($fs->reads($value)));
 		}
-		elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
+		elseif (filter_var($value, FILTER_VALIDATE_URL) !== false)
 		{
-			$response->withHeader( 'Location', $value );
-			$response->withStatus( 303 );
+			$response->withHeader('Location', $value);
+			$response->withStatus(303);
 		}
 		else
 		{
-			$response->withStatus( 404 );
+			$response->withStatus(404);
 		}
 	}
 
@@ -272,21 +272,21 @@ 
 	 * @param string $id Unique order base product attribute ID referencing the download file
 	 * @return boolean True if download is allowed, false if not
 	 */
-	protected function checkAccess( $customerId, $id )
+	protected function checkAccess($customerId, $id)
 	{
-		if( $customerId !== null && $id !== null )
+		if ($customerId !== null && $id !== null)
 		{
-			$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'order/base' );
+			$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'order/base');
 
 			$search = $manager->createSearch();
 			$expr = array(
-				$search->compare( '==', 'order.base.customerid', $customerId ),
-				$search->compare( '==', 'order.base.product.attribute.id', $id ),
+				$search->compare('==', 'order.base.customerid', $customerId),
+				$search->compare('==', 'order.base.product.attribute.id', $id),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSlice( 0, 1 );
+			$search->setConditions($search->combine('&&', $expr));
+			$search->setSlice(0, 1);
 
-			if( count( $manager->searchItems( $search ) ) > 0 ) {
+			if (count($manager->searchItems($search)) > 0) {
 				return true;
 			}
 		}
@@ -302,7 +302,7 @@ 
 	 * @param string $id Unique order base product attribute ID referencing the download file
 	 * @return boolean True if download is allowed, false if not
 	 */
-	protected function checkDownload( $customerId, $id )
+	protected function checkDownload($customerId, $id)
 	{
 		$context = $this->getContext();
 
@@ -321,22 +321,22 @@ 
 		 * @category Developer
 		 * @category User
 		 */
-		$maxcnt = $context->getConfig()->get( 'client/html/account/download/maxcount' );
+		$maxcnt = $context->getConfig()->get('client/html/account/download/maxcount');
 
-		$listItem = $this->getListItem( $customerId, $id );
+		$listItem = $this->getListItem($customerId, $id);
 		$config = $listItem->getConfig();
 
-		if( !isset( $config['count'] ) ) {
+		if (!isset($config['count'])) {
 			$config['count'] = 0;
 		}
 
-		if( $maxcnt === null || ((int) $config['count']) < $maxcnt )
+		if ($maxcnt === null || ((int) $config['count']) < $maxcnt)
 		{
 			$config['count']++;
-			$listItem->setConfig( $config );
+			$listItem->setConfig($config);
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
-			$manager->saveItem( $listItem, false );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
+			$manager->saveItem($listItem, false);
 
 			return true;
 		}
@@ -352,29 +352,29 @@ 
 	 * @param string $refId Unique order base product attribute ID referencing the download file
 	 * @return \Aimeos\MSho\Common\Item\Lists\Iface List item object
 	 */
-	protected function getListItem( $customerId, $refId )
+	protected function getListItem($customerId, $refId)
 	{
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'customer/lists' );
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'customer/lists');
 
 		$search = $manager->createSearch();
 		$expr = array(
-			$search->compare( '==', 'customer.lists.parentid', $customerId ),
-			$search->compare( '==', 'customer.lists.refid', $refId ),
-			$search->compare( '==', 'customer.lists.domain', 'order' ),
-			$search->compare( '==', 'customer.lists.type.domain', 'order' ),
-			$search->compare( '==', 'customer.lists.type.code', 'download' ),
+			$search->compare('==', 'customer.lists.parentid', $customerId),
+			$search->compare('==', 'customer.lists.refid', $refId),
+			$search->compare('==', 'customer.lists.domain', 'order'),
+			$search->compare('==', 'customer.lists.type.domain', 'order'),
+			$search->compare('==', 'customer.lists.type.code', 'download'),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
+		$search->setConditions($search->combine('&&', $expr));
 
-		$listItems = $manager->searchItems( $search );
+		$listItems = $manager->searchItems($search);
 
-		if( ( $listItem = reset( $listItems ) ) === false )
+		if (($listItem = reset($listItems)) === false)
 		{
 			$listItem = $manager->createItem();
-			$listItem->setTypeId( $this->getTypeItem( 'customer/lists/type', 'order', 'download' )->getId() );
-			$listItem->setParentId( $customerId );
-			$listItem->setDomain( 'order' );
-			$listItem->setRefId( $refId );
+			$listItem->setTypeId($this->getTypeItem('customer/lists/type', 'order', 'download')->getId());
+			$listItem->setParentId($customerId);
+			$listItem->setDomain('order');
+			$listItem->setRefId($refId);
 		}
 
 		return $listItem;

Braces +3 added lines, -6 removed lines

@@ -203,8 +203,7 @@ 
 			}
 
 			parent::process();
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() );
 		}
@@ -252,13 +251,11 @@ 
 			$response->withHeader( 'Expires', '0' );
 
 			$response->withBody( $response->createStream( $fs->reads( $value ) ) );
-		}
-		elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
+		} elseif( filter_var( $value, FILTER_VALIDATE_URL ) !== false )
 		{
 			$response->withHeader( 'Location', $value );
 			$response->withStatus( 303 );
-		}
-		else
+		} else
 		{
 			$response->withStatus( 404 );
 		}

client/html/src/Client/Html/Account/Watch/Factory.php

Indentation +59 added lines, -59 removed lines

@@ -19,69 +19,69 @@
  * @subpackage Html
  */
 class Factory
-	extends \Aimeos\Client\Html\Common\Factory\Base
-	implements \Aimeos\Client\Html\Common\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Factory\Base
+    implements \Aimeos\Client\Html\Common\Factory\Iface
 {
-	/**
-	 * Creates a account watch client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
-	 * @param array $templatePaths List of file system paths where the templates are stored
-	 * @param string|null $name Client name (default: "Standard")
-	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
-	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
-	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
-	{
-		/** client/html/account/watch/name
-		 * Class name of the used account watch client implementation
-		 *
-		 * Each default HTML client can be replace by an alternative imlementation.
-		 * To use this implementation, you have to set the last part of the class
-		 * name as configuration value so the client factory knows which class it
-		 * has to instantiate.
-		 *
-		 * For example, if the name of the default class is
-		 *
-		 *  \Aimeos\Client\Html\Account\Watch\Standard
-		 *
-		 * and you want to replace it with your own version named
-		 *
-		 *  \Aimeos\Client\Html\Account\Watch\Mywatch
-		 *
-		 * then you have to set the this configuration option:
-		 *
-		 *  client/html/account/watch/name = Mywatch
-		 *
-		 * The value is the last part of your own class name and it's case sensitive,
-		 * so take care that the configuration value is exactly named like the last
-		 * part of the class name.
-		 *
-		 * The allowed characters of the class name are A-Z, a-z and 0-9. No other
-		 * characters are possible! You should always start the last part of the class
-		 * name with an upper case character and continue only with lower case characters
-		 * or numbers. Avoid chamel case names like "MyWatch"!
-		 *
-		 * @param string Last part of the class name
-		 * @since 2014.03
-		 * @category Developer
-		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/account/watch/name', 'Standard' );
-		}
+    /**
+     * Creates a account watch client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
+     * @param array $templatePaths List of file system paths where the templates are stored
+     * @param string|null $name Client name (default: "Standard")
+     * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
+     * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
+     */
+    public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+    {
+        /** client/html/account/watch/name
+         * Class name of the used account watch client implementation
+         *
+         * Each default HTML client can be replace by an alternative imlementation.
+         * To use this implementation, you have to set the last part of the class
+         * name as configuration value so the client factory knows which class it
+         * has to instantiate.
+         *
+         * For example, if the name of the default class is
+         *
+         *  \Aimeos\Client\Html\Account\Watch\Standard
+         *
+         * and you want to replace it with your own version named
+         *
+         *  \Aimeos\Client\Html\Account\Watch\Mywatch
+         *
+         * then you have to set the this configuration option:
+         *
+         *  client/html/account/watch/name = Mywatch
+         *
+         * The value is the last part of your own class name and it's case sensitive,
+         * so take care that the configuration value is exactly named like the last
+         * part of the class name.
+         *
+         * The allowed characters of the class name are A-Z, a-z and 0-9. No other
+         * characters are possible! You should always start the last part of the class
+         * name with an upper case character and continue only with lower case characters
+         * or numbers. Avoid chamel case names like "MyWatch"!
+         *
+         * @param string Last part of the class name
+         * @since 2014.03
+         * @category Developer
+         */
+        if( $name === null ) {
+            $name = $context->getConfig()->get( 'client/html/account/watch/name', 'Standard' );
+        }
 
-		if( ctype_alnum( $name ) === false )
-		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\Watch\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
-		}
+        if( ctype_alnum( $name ) === false )
+        {
+            $classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\Watch\\' . $name : '<not a string>';
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+        }
 
-		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Account\\Watch\\' . $name;
+        $iface = '\\Aimeos\\Client\\Html\\Iface';
+        $classname = '\\Aimeos\\Client\\Html\\Account\\Watch\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+        $client = self::createClientBase( $context, $classname, $iface, $templatePaths );
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'account/watch' );
-	}
+        return self::addClientDecorators( $context, $client, $templatePaths, 'account/watch' );
+    }
 
 }
\ No newline at end of file

Spacing +9 added lines, -9 removed lines

@@ -31,7 +31,7 @@ 
 	 * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface
 	 * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails
 	 */
-	public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null)
 	{
 		/** client/html/account/watch/name
 		 * Class name of the used account watch client implementation
@@ -66,22 +66,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/account/watch/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/account/watch/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Account\\Watch\\' . $name : '<not a string>';
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) );
+			$classname = is_string($name) ? '\\Aimeos\\Client\\Html\\Account\\Watch\\'.$name : '<not a string>';
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname));
 		}
 
 		$iface = '\\Aimeos\\Client\\Html\\Iface';
-		$classname = '\\Aimeos\\Client\\Html\\Account\\Watch\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Account\\Watch\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'account/watch' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'account/watch');
 	}
 
 }
\ No newline at end of file

client/html/src/Client/Html/Account/Watch/Standard.php

Indentation +527 added lines, -527 removed lines

@@ -19,532 +19,532 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/account/watch/standard/subparts
-	 * List of HTML sub-clients rendered within the account watch section
-	 *
-	 * The output of the frontend is composed of the code generated by the HTML
-	 * clients. Each HTML client can consist of serveral (or none) sub-clients
-	 * that are responsible for rendering certain sub-parts of the output. The
-	 * sub-clients can contain HTML clients themselves and therefore a
-	 * hierarchical tree of HTML clients is composed. Each HTML client creates
-	 * the output that is placed inside the container of its parent.
-	 *
-	 * At first, always the HTML code generated by the parent is printed, then
-	 * the HTML code of its sub-clients. The order of the HTML sub-clients
-	 * determines the order of the output of these sub-clients inside the parent
-	 * container. If the configured list of clients is
-	 *
-	 *  array( "subclient1", "subclient2" )
-	 *
-	 * you can easily change the order of the output by reordering the subparts:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
-	 *
-	 * You can also remove one or more parts if they shouldn't be rendered:
-	 *
-	 *  client/html/<clients>/subparts = array( "subclient1" )
-	 *
-	 * As the clients only generates structural HTML, the layout defined via CSS
-	 * should support adding, removing or reordering content by a fluid like
-	 * design.
-	 *
-	 * @param array List of sub-client names
-	 * @since 2014.03
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/account/watch/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
-
-
-	/**
-	 * Returns the HTML code for insertion into the body.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string HTML code
-	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		$context = $this->getContext();
-		$view = $this->getView();
-
-		try
-		{
-			$view = $this->setViewParams( $view, $tags, $expire );
-
-			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-			}
-			$view->watchBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
-		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-
-		/** client/html/account/watch/standard/template-body
-		 * Relative path to the HTML body template of the account watch client.
-		 *
-		 * The template file contains the HTML code and processing instructions
-		 * to generate the result shown in the body of the frontend. The
-		 * configuration string is the path to the template file relative
-		 * to the templates directory (usually in client/html/templates).
-		 *
-		 * You can overwrite the template file configuration in extensions and
-		 * provide alternative templates. These alternative templates should be
-		 * named like the default one but with the string "standard" replaced by
-		 * an unique name. You may use the name of your project for this. If
-		 * you've implemented an alternative client class as well, "standard"
-		 * should be replaced by the name of the new class.
-		 *
-		 * @param string Relative path to the template creating code for the HTML page body
-		 * @since 2014.03
-		 * @category Developer
-		 * @see client/html/account/watch/standard/template-header
-		 */
-		$tplconf = 'client/html/account/watch/standard/template-body';
-		$default = 'account/watch/body-default.php';
-
-		return $view->render( $view->config( $tplconf, $default ) );
-	}
-
-
-	/**
-	 * Returns the HTML string for insertion into the header.
-	 *
-	 * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return string|null String including HTML tags for the header on error
-	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
-	{
-		try
-		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-			}
-			$view->watchHeader = $html;
-
-			/** client/html/account/watch/standard/template-header
-			 * Relative path to the HTML header template of the account watch client.
-			 *
-			 * The template file contains the HTML code and processing instructions
-			 * to generate the HTML code that is inserted into the HTML page header
-			 * of the rendered page in the frontend. The configuration string is the
-			 * path to the template file relative to the templates directory (usually
-			 * in client/html/templates).
-			 *
-			 * You can overwrite the template file configuration in extensions and
-			 * provide alternative templates. These alternative templates should be
-			 * named like the default one but with the string "standard" replaced by
-			 * an unique name. You may use the name of your project for this. If
-			 * you've implemented an alternative client class as well, "standard"
-			 * should be replaced by the name of the new class.
-			 *
-			 * @param string Relative path to the template creating code for the HTML page head
-			 * @since 2014.03
-			 * @category Developer
-			 * @see client/html/account/watch/standard/template-body
-			 */
-			$tplconf = 'client/html/account/watch/standard/template-header';
-			$default = 'account/watch/header-default.php';
-
-			return $view->render( $view->config( $tplconf, $default ) );
-		}
-		catch( \Exception $e )
-		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-		}
-	}
-
-
-	/**
-	 * Returns the sub-client given by its name.
-	 *
-	 * @param string $type Name of the client type
-	 * @param string|null $name Name of the sub-client (Default if null)
-	 * @return \Aimeos\Client\Html\Iface Sub-client object
-	 */
-	public function getSubClient( $type, $name = null )
-	{
-		/** client/html/account/watch/decorators/excludes
-		 * Excludes decorators added by the "common" option from the account watch html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to remove a decorator added via
-		 * "client/html/common/decorators/default" before they are wrapped
-		 * around the html client.
-		 *
-		 *  client/html/account/watch/decorators/excludes = array( 'decorator1' )
-		 *
-		 * This would remove the decorator named "decorator1" from the list of
-		 * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
-		 * "client/html/common/decorators/default" to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/watch/decorators/global
-		 * @see client/html/account/watch/decorators/local
-		 */
-
-		/** client/html/account/watch/decorators/global
-		 * Adds a list of globally available decorators only to the account watch html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap global decorators
-		 * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/watch/decorators/global = array( 'decorator1' )
-		 *
-		 * This would add the decorator named "decorator1" defined by
-		 * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/watch/decorators/excludes
-		 * @see client/html/account/watch/decorators/local
-		 */
-
-		/** client/html/account/watch/decorators/local
-		 * Adds a list of local decorators only to the account watch html client
-		 *
-		 * Decorators extend the functionality of a class by adding new aspects
-		 * (e.g. log what is currently done), executing the methods of the underlying
-		 * class only in certain conditions (e.g. only for logged in users) or
-		 * modify what is returned to the caller.
-		 *
-		 * This option allows you to wrap local decorators
-		 * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
-		 *
-		 *  client/html/account/watch/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
-		 *
-		 * @param array List of decorator names
-		 * @since 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/account/watch/decorators/excludes
-		 * @see client/html/account/watch/decorators/global
-		 */
-
-		return $this->createSubClient( 'account/watch/' . $type, $name );
-	}
-
-
-	/**
-	 * Processes the input, e.g. store given values.
-	 * A view must be available and this method doesn't generate any output
-	 * besides setting view variables.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$context = $this->getContext();
-		$ids = $view->param( 'wat_id', array() );
-
-		if( $context->getUserId() != null && !empty( $ids ) )
-		{
-			$typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'watch' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
-
-			$search = $manager->createSearch();
-			$expr = array(
-				$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-				$search->compare( '==', 'customer.lists.refid', $ids ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
-				$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
-			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-
-			$items = array();
-			foreach( $manager->searchItems( $search ) as $item ) {
-				$items[$item->getRefId()] = $item;
-			}
-
-
-			switch( $view->param( 'wat_action' ) )
-			{
-				case 'add':
-
-					$search = $manager->createSearch();
-					$expr = array(
-						$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-						$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
-						$search->compare( '==', 'customer.lists.domain', 'product' ),
-					);
-					$search->setConditions( $search->combine( '&&', $expr ) );
-					$search->setSlice( 0, 0 );
-
-					$total = 0;
-					$manager->searchItems( $search, array(), $total );
-
-					/** client/html/account/watch/standard/maxitems
-					 * Maximum number of products that can be watched in parallel
-					 *
-					 * This option limits the number of products that can be watched
-					 * after the users added the products to their watch list.
-					 * It must be a positive integer value greater than 0.
-					 *
-					 * Note: It's recommended to set this value not too high as this
-					 * leads to a high memory consumption when the e-mails are generated
-					 * to notify the customers. The memory used will up to 100*maxitems
-					 * of the footprint of one product item including the associated
-					 * texts, prices and media.
-					 *
-					 * @param integer Number of products
-					 * @since 2014.09
-					 * @category User
-					 * @category Developer
-					 */
-					$max = $context->getConfig()->get( 'client/html/account/watch/standard/maxitems', 100 );
-
-					$item = $manager->createItem();
-					$item->setParentId( $context->getUserId() );
-					$item->setTypeId( $typeItem->getId() );
-					$item->setDomain( 'product' );
-					$item->setStatus( 1 );
-
-					foreach( (array) $view->param( 'wat_id', array() ) as $id )
-					{
-						if( $total >= $max )
-						{
-							$error = array( sprintf( $context->getI18n()->dt( 'client', 'You can only watch up to %1$s products' ), $max ) );
-							$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-							break;
-						}
-
-						if( !isset( $items[$id] ) )
-						{
-							$item->setId( null );
-							$item->setRefId( $id );
-
-							$manager->saveItem( $item );
-							$manager->moveItem( $item->getId() );
-
-							$total++;
-						}
-					}
-
-					break;
-
-				case 'edit':
-
-					foreach( (array) $view->param( 'wat_id', array() ) as $id )
-					{
-						if( isset( $items[$id] ) )
-						{
-							$item = $items[$id];
-
-							$config = array(
-								'timeframe' => $view->param( 'wat_timeframe', 7 ),
-								'pricevalue' => $view->param( 'wat_pricevalue', '0.00' ),
-								'price' => $view->param( 'wat_price', 0 ),
-								'stock' => $view->param( 'wat_stock', 0 ),
-								'currency' => $context->getLocale()->getCurrencyId(),
-							);
-							$time = time() + ( $config['timeframe'] + 1 ) * 86400;
-
-							$item->setDateEnd( date( 'Y-m-d 00:00:00', $time ) );
-							$item->setConfig( $config );
-
-							$manager->saveItem( $item );
-						}
-					}
-
-					break;
-
-				case 'delete':
-
-					$listIds = array();
-
-					foreach( (array) $view->param( 'wat_id', array() ) as $id )
-					{
-						if( isset( $items[$id] ) ) {
-							$listIds[] = $items[$id]->getId();
-						}
-					}
-
-					$manager->deleteItems( $listIds );
-					break;
-			}
-		}
-
-		parent::process();
-	}
-
-
-	/**
-	 * Returns the list of sub-client names configured for the client.
-	 *
-	 * @return array List of HTML client names
-	 */
-	protected function getSubClientNames()
-	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
-	}
-
-
-	/**
-	 * Returns the sanitized page from the parameters for the product list.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
-	 * @return integer Page number starting from 1
-	 */
-	protected function getProductListPage( \Aimeos\MW\View\Iface $view )
-	{
-		$page = (int) $view->param( 'wat_page', 1 );
-		return ( $page < 1 ? 1 : $page );
-	}
-
-
-	/**
-	 * Returns the sanitized page size from the parameters for the product list.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
-	 * @return integer Page size
-	 */
-	protected function getProductListSize( \Aimeos\MW\View\Iface $view )
-	{
-		/** client/html/account/watch/size
-		 * The number of products shown in a list page for watch products
-		 *
-		 * Limits the number of products that is shown in the list pages to the
-		 * given value. If more products are available, the products are split
-		 * into bunches which will be shown on their own list page. The user is
-		 * able to move to the next page (or previous one if it's not the first)
-		 * to display the next (or previous) products.
-		 *
-		 * The value must be an integer number from 1 to 100. Negative values as
-		 * well as values above 100 are not allowed. The value can be overwritten
-		 * per request if the "l_size" parameter is part of the URL.
-		 *
-		 * @param integer Number of products
-		 * @since 2014.09
-		 * @category User
-		 * @category Developer
-		 * @see client/html/catalog/lists/size
-		 */
-		$defaultSize = $this->getContext()->getConfig()->get( 'client/html/account/watch/size', 48 );
-
-		$size = (int) $view->param( 'watch-size', $defaultSize );
-		return ( $size < 1 || $size > 100 ? $defaultSize : $size );
-	}
-
-
-	/**
-	 * Sets the necessary parameter values in the view.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
-	 * @param array &$tags Result array for the list of tags that are associated to the output
-	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
-	 * @return \Aimeos\MW\View\Iface Modified view object
-	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
-	{
-		if( !isset( $this->cache ) )
-		{
-			$total = 0;
-			$productIds = array();
-			$context = $this->getContext();
-			$typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'watch' );
-
-			$size = $this->getProductListSize( $view );
-			$current = $this->getProductListPage( $view );
-			$last = ( $total != 0 ? ceil( $total / $size ) : 1 );
-
-
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
-
-			$search = $manager->createSearch();
-			$expr = array(
-				$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-				$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
-			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSortations( array( $search->sort( '-', 'customer.lists.position' ) ) );
-			$search->setSlice( ( $current - 1 ) * $size, $size );
-
-			$view->watchListItems = $manager->searchItems( $search, array(), $total );
-
-
-			/** client/html/account/watch/domains
-			 * A list of domain names whose items should be available in the account watch view template
-			 *
-			 * The templates rendering product details usually add the images,
-			 * prices and texts associated to the product item. If you want to
-			 * display additional or less content, you can configure your own
-			 * list of domains (attribute, media, price, product, text, etc. are
-			 * domains) whose items are fetched from the storage. Please keep
-			 * in mind that the more domains you add to the configuration, the
-			 * more time is required for fetching the content!
-			 *
-			 * @param array List of domain names
-			 * @since 2014.09
-			 * @category Developer
-			 * @see client/html/catalog/domains
-			 */
-			$default = array( 'text', 'price', 'media' );
-			$domains = $context->getConfig()->get( 'client/html/account/watch/domains', $default );
-
-			foreach( $view->watchListItems as $listItem ) {
-				$productIds[] = $listItem->getRefId();
-			}
-
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-
-			$view->watchProductItems = $controller->getProductItems( $productIds, $domains );
-			$view->watchPageFirst = 1;
-			$view->watchPagePrev = ( $current > 1 ? $current - 1 : 1 );
-			$view->watchPageNext = ( $current < $last ? $current + 1 : $last );
-			$view->watchPageLast = $last;
-			$view->watchPageCurr = $current;
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
+    /** client/html/account/watch/standard/subparts
+     * List of HTML sub-clients rendered within the account watch section
+     *
+     * The output of the frontend is composed of the code generated by the HTML
+     * clients. Each HTML client can consist of serveral (or none) sub-clients
+     * that are responsible for rendering certain sub-parts of the output. The
+     * sub-clients can contain HTML clients themselves and therefore a
+     * hierarchical tree of HTML clients is composed. Each HTML client creates
+     * the output that is placed inside the container of its parent.
+     *
+     * At first, always the HTML code generated by the parent is printed, then
+     * the HTML code of its sub-clients. The order of the HTML sub-clients
+     * determines the order of the output of these sub-clients inside the parent
+     * container. If the configured list of clients is
+     *
+     *  array( "subclient1", "subclient2" )
+     *
+     * you can easily change the order of the output by reordering the subparts:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1", "subclient2" )
+     *
+     * You can also remove one or more parts if they shouldn't be rendered:
+     *
+     *  client/html/<clients>/subparts = array( "subclient1" )
+     *
+     * As the clients only generates structural HTML, the layout defined via CSS
+     * should support adding, removing or reordering content by a fluid like
+     * design.
+     *
+     * @param array List of sub-client names
+     * @since 2014.03
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/account/watch/standard/subparts';
+    private $subPartNames = array();
+    private $cache;
+
+
+    /**
+     * Returns the HTML code for insertion into the body.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string HTML code
+     */
+    public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        $context = $this->getContext();
+        $view = $this->getView();
+
+        try
+        {
+            $view = $this->setViewParams( $view, $tags, $expire );
+
+            $html = '';
+            foreach( $this->getSubClients() as $subclient ) {
+                $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+            }
+            $view->watchBody = $html;
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+        }
+        catch( \Exception $e )
+        {
+            $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+
+            $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
+            $view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+        }
+
+        /** client/html/account/watch/standard/template-body
+         * Relative path to the HTML body template of the account watch client.
+         *
+         * The template file contains the HTML code and processing instructions
+         * to generate the result shown in the body of the frontend. The
+         * configuration string is the path to the template file relative
+         * to the templates directory (usually in client/html/templates).
+         *
+         * You can overwrite the template file configuration in extensions and
+         * provide alternative templates. These alternative templates should be
+         * named like the default one but with the string "standard" replaced by
+         * an unique name. You may use the name of your project for this. If
+         * you've implemented an alternative client class as well, "standard"
+         * should be replaced by the name of the new class.
+         *
+         * @param string Relative path to the template creating code for the HTML page body
+         * @since 2014.03
+         * @category Developer
+         * @see client/html/account/watch/standard/template-header
+         */
+        $tplconf = 'client/html/account/watch/standard/template-body';
+        $default = 'account/watch/body-default.php';
+
+        return $view->render( $view->config( $tplconf, $default ) );
+    }
+
+
+    /**
+     * Returns the HTML string for insertion into the header.
+     *
+     * @param string $uid Unique identifier for the output if the content is placed more than once on the same page
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return string|null String including HTML tags for the header on error
+     */
+    public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+    {
+        try
+        {
+            $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+            $html = '';
+            foreach( $this->getSubClients() as $subclient ) {
+                $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+            }
+            $view->watchHeader = $html;
+
+            /** client/html/account/watch/standard/template-header
+             * Relative path to the HTML header template of the account watch client.
+             *
+             * The template file contains the HTML code and processing instructions
+             * to generate the HTML code that is inserted into the HTML page header
+             * of the rendered page in the frontend. The configuration string is the
+             * path to the template file relative to the templates directory (usually
+             * in client/html/templates).
+             *
+             * You can overwrite the template file configuration in extensions and
+             * provide alternative templates. These alternative templates should be
+             * named like the default one but with the string "standard" replaced by
+             * an unique name. You may use the name of your project for this. If
+             * you've implemented an alternative client class as well, "standard"
+             * should be replaced by the name of the new class.
+             *
+             * @param string Relative path to the template creating code for the HTML page head
+             * @since 2014.03
+             * @category Developer
+             * @see client/html/account/watch/standard/template-body
+             */
+            $tplconf = 'client/html/account/watch/standard/template-header';
+            $default = 'account/watch/header-default.php';
+
+            return $view->render( $view->config( $tplconf, $default ) );
+        }
+        catch( \Exception $e )
+        {
+            $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+        }
+    }
+
+
+    /**
+     * Returns the sub-client given by its name.
+     *
+     * @param string $type Name of the client type
+     * @param string|null $name Name of the sub-client (Default if null)
+     * @return \Aimeos\Client\Html\Iface Sub-client object
+     */
+    public function getSubClient( $type, $name = null )
+    {
+        /** client/html/account/watch/decorators/excludes
+         * Excludes decorators added by the "common" option from the account watch html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to remove a decorator added via
+         * "client/html/common/decorators/default" before they are wrapped
+         * around the html client.
+         *
+         *  client/html/account/watch/decorators/excludes = array( 'decorator1' )
+         *
+         * This would remove the decorator named "decorator1" from the list of
+         * common decorators ("\Aimeos\Client\Html\Common\Decorator\*") added via
+         * "client/html/common/decorators/default" to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/watch/decorators/global
+         * @see client/html/account/watch/decorators/local
+         */
+
+        /** client/html/account/watch/decorators/global
+         * Adds a list of globally available decorators only to the account watch html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap global decorators
+         * ("\Aimeos\Client\Html\Common\Decorator\*") around the html client.
+         *
+         *  client/html/account/watch/decorators/global = array( 'decorator1' )
+         *
+         * This would add the decorator named "decorator1" defined by
+         * "\Aimeos\Client\Html\Common\Decorator\Decorator1" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/watch/decorators/excludes
+         * @see client/html/account/watch/decorators/local
+         */
+
+        /** client/html/account/watch/decorators/local
+         * Adds a list of local decorators only to the account watch html client
+         *
+         * Decorators extend the functionality of a class by adding new aspects
+         * (e.g. log what is currently done), executing the methods of the underlying
+         * class only in certain conditions (e.g. only for logged in users) or
+         * modify what is returned to the caller.
+         *
+         * This option allows you to wrap local decorators
+         * ("\Aimeos\Client\Html\Account\Decorator\*") around the html client.
+         *
+         *  client/html/account/watch/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Account\Decorator\Decorator2" only to the html client.
+         *
+         * @param array List of decorator names
+         * @since 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/account/watch/decorators/excludes
+         * @see client/html/account/watch/decorators/global
+         */
+
+        return $this->createSubClient( 'account/watch/' . $type, $name );
+    }
+
+
+    /**
+     * Processes the input, e.g. store given values.
+     * A view must be available and this method doesn't generate any output
+     * besides setting view variables.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $context = $this->getContext();
+        $ids = $view->param( 'wat_id', array() );
+
+        if( $context->getUserId() != null && !empty( $ids ) )
+        {
+            $typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'watch' );
+            $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+
+            $search = $manager->createSearch();
+            $expr = array(
+                $search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
+                $search->compare( '==', 'customer.lists.refid', $ids ),
+                $search->compare( '==', 'customer.lists.domain', 'product' ),
+                $search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
+            );
+            $search->setConditions( $search->combine( '&&', $expr ) );
+
+            $items = array();
+            foreach( $manager->searchItems( $search ) as $item ) {
+                $items[$item->getRefId()] = $item;
+            }
+
+
+            switch( $view->param( 'wat_action' ) )
+            {
+                case 'add':
+
+                    $search = $manager->createSearch();
+                    $expr = array(
+                        $search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
+                        $search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
+                        $search->compare( '==', 'customer.lists.domain', 'product' ),
+                    );
+                    $search->setConditions( $search->combine( '&&', $expr ) );
+                    $search->setSlice( 0, 0 );
+
+                    $total = 0;
+                    $manager->searchItems( $search, array(), $total );
+
+                    /** client/html/account/watch/standard/maxitems
+                     * Maximum number of products that can be watched in parallel
+                     *
+                     * This option limits the number of products that can be watched
+                     * after the users added the products to their watch list.
+                     * It must be a positive integer value greater than 0.
+                     *
+                     * Note: It's recommended to set this value not too high as this
+                     * leads to a high memory consumption when the e-mails are generated
+                     * to notify the customers. The memory used will up to 100*maxitems
+                     * of the footprint of one product item including the associated
+                     * texts, prices and media.
+                     *
+                     * @param integer Number of products
+                     * @since 2014.09
+                     * @category User
+                     * @category Developer
+                     */
+                    $max = $context->getConfig()->get( 'client/html/account/watch/standard/maxitems', 100 );
+
+                    $item = $manager->createItem();
+                    $item->setParentId( $context->getUserId() );
+                    $item->setTypeId( $typeItem->getId() );
+                    $item->setDomain( 'product' );
+                    $item->setStatus( 1 );
+
+                    foreach( (array) $view->param( 'wat_id', array() ) as $id )
+                    {
+                        if( $total >= $max )
+                        {
+                            $error = array( sprintf( $context->getI18n()->dt( 'client', 'You can only watch up to %1$s products' ), $max ) );
+                            $view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+                            break;
+                        }
+
+                        if( !isset( $items[$id] ) )
+                        {
+                            $item->setId( null );
+                            $item->setRefId( $id );
+
+                            $manager->saveItem( $item );
+                            $manager->moveItem( $item->getId() );
+
+                            $total++;
+                        }
+                    }
+
+                    break;
+
+                case 'edit':
+
+                    foreach( (array) $view->param( 'wat_id', array() ) as $id )
+                    {
+                        if( isset( $items[$id] ) )
+                        {
+                            $item = $items[$id];
+
+                            $config = array(
+                                'timeframe' => $view->param( 'wat_timeframe', 7 ),
+                                'pricevalue' => $view->param( 'wat_pricevalue', '0.00' ),
+                                'price' => $view->param( 'wat_price', 0 ),
+                                'stock' => $view->param( 'wat_stock', 0 ),
+                                'currency' => $context->getLocale()->getCurrencyId(),
+                            );
+                            $time = time() + ( $config['timeframe'] + 1 ) * 86400;
+
+                            $item->setDateEnd( date( 'Y-m-d 00:00:00', $time ) );
+                            $item->setConfig( $config );
+
+                            $manager->saveItem( $item );
+                        }
+                    }
+
+                    break;
+
+                case 'delete':
+
+                    $listIds = array();
+
+                    foreach( (array) $view->param( 'wat_id', array() ) as $id )
+                    {
+                        if( isset( $items[$id] ) ) {
+                            $listIds[] = $items[$id]->getId();
+                        }
+                    }
+
+                    $manager->deleteItems( $listIds );
+                    break;
+            }
+        }
+
+        parent::process();
+    }
+
+
+    /**
+     * Returns the list of sub-client names configured for the client.
+     *
+     * @return array List of HTML client names
+     */
+    protected function getSubClientNames()
+    {
+        return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+    }
+
+
+    /**
+     * Returns the sanitized page from the parameters for the product list.
+     *
+     * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
+     * @return integer Page number starting from 1
+     */
+    protected function getProductListPage( \Aimeos\MW\View\Iface $view )
+    {
+        $page = (int) $view->param( 'wat_page', 1 );
+        return ( $page < 1 ? 1 : $page );
+    }
+
+
+    /**
+     * Returns the sanitized page size from the parameters for the product list.
+     *
+     * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
+     * @return integer Page size
+     */
+    protected function getProductListSize( \Aimeos\MW\View\Iface $view )
+    {
+        /** client/html/account/watch/size
+         * The number of products shown in a list page for watch products
+         *
+         * Limits the number of products that is shown in the list pages to the
+         * given value. If more products are available, the products are split
+         * into bunches which will be shown on their own list page. The user is
+         * able to move to the next page (or previous one if it's not the first)
+         * to display the next (or previous) products.
+         *
+         * The value must be an integer number from 1 to 100. Negative values as
+         * well as values above 100 are not allowed. The value can be overwritten
+         * per request if the "l_size" parameter is part of the URL.
+         *
+         * @param integer Number of products
+         * @since 2014.09
+         * @category User
+         * @category Developer
+         * @see client/html/catalog/lists/size
+         */
+        $defaultSize = $this->getContext()->getConfig()->get( 'client/html/account/watch/size', 48 );
+
+        $size = (int) $view->param( 'watch-size', $defaultSize );
+        return ( $size < 1 || $size > 100 ? $defaultSize : $size );
+    }
+
+
+    /**
+     * Sets the necessary parameter values in the view.
+     *
+     * @param \Aimeos\MW\View\Iface $view The view object which generates the HTML output
+     * @param array &$tags Result array for the list of tags that are associated to the output
+     * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
+     * @return \Aimeos\MW\View\Iface Modified view object
+     */
+    protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+    {
+        if( !isset( $this->cache ) )
+        {
+            $total = 0;
+            $productIds = array();
+            $context = $this->getContext();
+            $typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'watch' );
+
+            $size = $this->getProductListSize( $view );
+            $current = $this->getProductListPage( $view );
+            $last = ( $total != 0 ? ceil( $total / $size ) : 1 );
+
+
+            $manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+
+            $search = $manager->createSearch();
+            $expr = array(
+                $search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
+                $search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
+                $search->compare( '==', 'customer.lists.domain', 'product' ),
+            );
+            $search->setConditions( $search->combine( '&&', $expr ) );
+            $search->setSortations( array( $search->sort( '-', 'customer.lists.position' ) ) );
+            $search->setSlice( ( $current - 1 ) * $size, $size );
+
+            $view->watchListItems = $manager->searchItems( $search, array(), $total );
+
+
+            /** client/html/account/watch/domains
+             * A list of domain names whose items should be available in the account watch view template
+             *
+             * The templates rendering product details usually add the images,
+             * prices and texts associated to the product item. If you want to
+             * display additional or less content, you can configure your own
+             * list of domains (attribute, media, price, product, text, etc. are
+             * domains) whose items are fetched from the storage. Please keep
+             * in mind that the more domains you add to the configuration, the
+             * more time is required for fetching the content!
+             *
+             * @param array List of domain names
+             * @since 2014.09
+             * @category Developer
+             * @see client/html/catalog/domains
+             */
+            $default = array( 'text', 'price', 'media' );
+            $domains = $context->getConfig()->get( 'client/html/account/watch/domains', $default );
+
+            foreach( $view->watchListItems as $listItem ) {
+                $productIds[] = $listItem->getRefId();
+            }
+
+            $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+
+            $view->watchProductItems = $controller->getProductItems( $productIds, $domains );
+            $view->watchPageFirst = 1;
+            $view->watchPagePrev = ( $current > 1 ? $current - 1 : 1 );
+            $view->watchPageNext = ( $current < $last ? $current + 1 : $last );
+            $view->watchPageLast = $last;
+            $view->watchPageCurr = $current;
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +100 added lines, -100 removed lines

@@ -68,42 +68,42 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string HTML code
 	 */
-	public function getBody( $uid = '', array &$tags = array(), &$expire = null )
+	public function getBody($uid = '', array &$tags = array(), &$expire = null)
 	{
 		$context = $this->getContext();
 		$view = $this->getView();
 
 		try
 		{
-			$view = $this->setViewParams( $view, $tags, $expire );
+			$view = $this->setViewParams($view, $tags, $expire);
 
 			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getBody($uid, $tags, $expire);
 			}
 			$view->watchBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->watchErrorList = $view->get('watchErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->watchErrorList = $view->get('watchErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->watchErrorList = $view->get('watchErrorList', array()) + $error;
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 
-			$error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) );
-			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->watchErrorList = $view->get('watchErrorList', array()) + $error;
 		}
 
 		/** client/html/account/watch/standard/template-body
@@ -129,7 +129,7 @@ 
 		$tplconf = 'client/html/account/watch/standard/template-body';
 		$default = 'account/watch/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -141,15 +141,15 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return string|null String including HTML tags for the header on error
 	 */
-	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
+	public function getHeader($uid = '', array &$tags = array(), &$expire = null)
 	{
 		try
 		{
-			$view = $this->setViewParams( $this->getView(), $tags, $expire );
+			$view = $this->setViewParams($this->getView(), $tags, $expire);
 
 			$html = '';
-			foreach( $this->getSubClients() as $subclient ) {
-				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+			foreach ($this->getSubClients() as $subclient) {
+				$html .= $subclient->setView($view)->getHeader($uid, $tags, $expire);
 			}
 			$view->watchHeader = $html;
 
@@ -177,11 +177,11 @@ 
 			$tplconf = 'client/html/account/watch/standard/template-header';
 			$default = 'account/watch/header-default.php';
 
-			return $view->render( $view->config( $tplconf, $default ) );
+			return $view->render($view->config($tplconf, $default));
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+			$this->getContext()->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString());
 		}
 	}
 
@@ -193,7 +193,7 @@ 
 	 * @param string|null $name Name of the sub-client (Default if null)
 	 * @return \Aimeos\Client\Html\Iface Sub-client object
 	 */
-	public function getSubClient( $type, $name = null )
+	public function getSubClient($type, $name = null)
 	{
 		/** client/html/account/watch/decorators/excludes
 		 * Excludes decorators added by the "common" option from the account watch html client
@@ -269,7 +269,7 @@ 
 		 * @see client/html/account/watch/decorators/global
 		 */
 
-		return $this->createSubClient( 'account/watch/' . $type, $name );
+		return $this->createSubClient('account/watch/'.$type, $name);
 	}
 
 
@@ -282,43 +282,43 @@ 
 	{
 		$view = $this->getView();
 		$context = $this->getContext();
-		$ids = $view->param( 'wat_id', array() );
+		$ids = $view->param('wat_id', array());
 
-		if( $context->getUserId() != null && !empty( $ids ) )
+		if ($context->getUserId() != null && !empty($ids))
 		{
-			$typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'watch' );
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+			$typeItem = $this->getTypeItem('customer/lists/type', 'product', 'watch');
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 			$search = $manager->createSearch();
 			$expr = array(
-				$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-				$search->compare( '==', 'customer.lists.refid', $ids ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
-				$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
+				$search->compare('==', 'customer.lists.parentid', $context->getUserId()),
+				$search->compare('==', 'customer.lists.refid', $ids),
+				$search->compare('==', 'customer.lists.domain', 'product'),
+				$search->compare('==', 'customer.lists.typeid', $typeItem->getId()),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
+			$search->setConditions($search->combine('&&', $expr));
 
 			$items = array();
-			foreach( $manager->searchItems( $search ) as $item ) {
+			foreach ($manager->searchItems($search) as $item) {
 				$items[$item->getRefId()] = $item;
 			}
 
 
-			switch( $view->param( 'wat_action' ) )
+			switch ($view->param('wat_action'))
 			{
 				case 'add':
 
 					$search = $manager->createSearch();
 					$expr = array(
-						$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-						$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
-						$search->compare( '==', 'customer.lists.domain', 'product' ),
+						$search->compare('==', 'customer.lists.parentid', $context->getUserId()),
+						$search->compare('==', 'customer.lists.typeid', $typeItem->getId()),
+						$search->compare('==', 'customer.lists.domain', 'product'),
 					);
-					$search->setConditions( $search->combine( '&&', $expr ) );
-					$search->setSlice( 0, 0 );
+					$search->setConditions($search->combine('&&', $expr));
+					$search->setSlice(0, 0);
 
 					$total = 0;
-					$manager->searchItems( $search, array(), $total );
+					$manager->searchItems($search, array(), $total);
 
 					/** client/html/account/watch/standard/maxitems
 					 * Maximum number of products that can be watched in parallel
@@ -338,30 +338,30 @@ 
 					 * @category User
 					 * @category Developer
 					 */
-					$max = $context->getConfig()->get( 'client/html/account/watch/standard/maxitems', 100 );
+					$max = $context->getConfig()->get('client/html/account/watch/standard/maxitems', 100);
 
 					$item = $manager->createItem();
-					$item->setParentId( $context->getUserId() );
-					$item->setTypeId( $typeItem->getId() );
-					$item->setDomain( 'product' );
-					$item->setStatus( 1 );
+					$item->setParentId($context->getUserId());
+					$item->setTypeId($typeItem->getId());
+					$item->setDomain('product');
+					$item->setStatus(1);
 
-					foreach( (array) $view->param( 'wat_id', array() ) as $id )
+					foreach ((array) $view->param('wat_id', array()) as $id)
 					{
-						if( $total >= $max )
+						if ($total >= $max)
 						{
-							$error = array( sprintf( $context->getI18n()->dt( 'client', 'You can only watch up to %1$s products' ), $max ) );
-							$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
+							$error = array(sprintf($context->getI18n()->dt('client', 'You can only watch up to %1$s products'), $max));
+							$view->watchErrorList = $view->get('watchErrorList', array()) + $error;
 							break;
 						}
 
-						if( !isset( $items[$id] ) )
+						if (!isset($items[$id]))
 						{
-							$item->setId( null );
-							$item->setRefId( $id );
+							$item->setId(null);
+							$item->setRefId($id);
 
-							$manager->saveItem( $item );
-							$manager->moveItem( $item->getId() );
+							$manager->saveItem($item);
+							$manager->moveItem($item->getId());
 
 							$total++;
 						}
@@ -371,25 +371,25 @@ 
 
 				case 'edit':
 
-					foreach( (array) $view->param( 'wat_id', array() ) as $id )
+					foreach ((array) $view->param('wat_id', array()) as $id)
 					{
-						if( isset( $items[$id] ) )
+						if (isset($items[$id]))
 						{
 							$item = $items[$id];
 
 							$config = array(
-								'timeframe' => $view->param( 'wat_timeframe', 7 ),
-								'pricevalue' => $view->param( 'wat_pricevalue', '0.00' ),
-								'price' => $view->param( 'wat_price', 0 ),
-								'stock' => $view->param( 'wat_stock', 0 ),
+								'timeframe' => $view->param('wat_timeframe', 7),
+								'pricevalue' => $view->param('wat_pricevalue', '0.00'),
+								'price' => $view->param('wat_price', 0),
+								'stock' => $view->param('wat_stock', 0),
 								'currency' => $context->getLocale()->getCurrencyId(),
 							);
-							$time = time() + ( $config['timeframe'] + 1 ) * 86400;
+							$time = time() + ($config['timeframe'] + 1) * 86400;
 
-							$item->setDateEnd( date( 'Y-m-d 00:00:00', $time ) );
-							$item->setConfig( $config );
+							$item->setDateEnd(date('Y-m-d 00:00:00', $time));
+							$item->setConfig($config);
 
-							$manager->saveItem( $item );
+							$manager->saveItem($item);
 						}
 					}
 
@@ -399,14 +399,14 @@ 
 
 					$listIds = array();
 
-					foreach( (array) $view->param( 'wat_id', array() ) as $id )
+					foreach ((array) $view->param('wat_id', array()) as $id)
 					{
-						if( isset( $items[$id] ) ) {
+						if (isset($items[$id])) {
 							$listIds[] = $items[$id]->getId();
 						}
 					}
 
-					$manager->deleteItems( $listIds );
+					$manager->deleteItems($listIds);
 					break;
 			}
 		}
@@ -422,7 +422,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -432,10 +432,10 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Page number starting from 1
 	 */
-	protected function getProductListPage( \Aimeos\MW\View\Iface $view )
+	protected function getProductListPage(\Aimeos\MW\View\Iface $view)
 	{
-		$page = (int) $view->param( 'wat_page', 1 );
-		return ( $page < 1 ? 1 : $page );
+		$page = (int) $view->param('wat_page', 1);
+		return ($page < 1 ? 1 : $page);
 	}
 
 
@@ -445,7 +445,7 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View instance with helper for retrieving the required parameters
 	 * @return integer Page size
 	 */
-	protected function getProductListSize( \Aimeos\MW\View\Iface $view )
+	protected function getProductListSize(\Aimeos\MW\View\Iface $view)
 	{
 		/** client/html/account/watch/size
 		 * The number of products shown in a list page for watch products
@@ -466,10 +466,10 @@ 
 		 * @category Developer
 		 * @see client/html/catalog/lists/size
 		 */
-		$defaultSize = $this->getContext()->getConfig()->get( 'client/html/account/watch/size', 48 );
+		$defaultSize = $this->getContext()->getConfig()->get('client/html/account/watch/size', 48);
 
-		$size = (int) $view->param( 'watch-size', $defaultSize );
-		return ( $size < 1 || $size > 100 ? $defaultSize : $size );
+		$size = (int) $view->param('watch-size', $defaultSize);
+		return ($size < 1 || $size > 100 ? $defaultSize : $size);
 	}
 
 
@@ -481,33 +481,33 @@ 
 	 * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry)
 	 * @return \Aimeos\MW\View\Iface Modified view object
 	 */
-	protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null )
+	protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null)
 	{
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$total = 0;
 			$productIds = array();
 			$context = $this->getContext();
-			$typeItem = $this->getTypeItem( 'customer/lists/type', 'product', 'watch' );
+			$typeItem = $this->getTypeItem('customer/lists/type', 'product', 'watch');
 
-			$size = $this->getProductListSize( $view );
-			$current = $this->getProductListPage( $view );
-			$last = ( $total != 0 ? ceil( $total / $size ) : 1 );
+			$size = $this->getProductListSize($view);
+			$current = $this->getProductListPage($view);
+			$last = ($total != 0 ? ceil($total / $size) : 1);
 
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'customer/lists' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'customer/lists');
 
 			$search = $manager->createSearch();
 			$expr = array(
-				$search->compare( '==', 'customer.lists.parentid', $context->getUserId() ),
-				$search->compare( '==', 'customer.lists.typeid', $typeItem->getId() ),
-				$search->compare( '==', 'customer.lists.domain', 'product' ),
+				$search->compare('==', 'customer.lists.parentid', $context->getUserId()),
+				$search->compare('==', 'customer.lists.typeid', $typeItem->getId()),
+				$search->compare('==', 'customer.lists.domain', 'product'),
 			);
-			$search->setConditions( $search->combine( '&&', $expr ) );
-			$search->setSortations( array( $search->sort( '-', 'customer.lists.position' ) ) );
-			$search->setSlice( ( $current - 1 ) * $size, $size );
+			$search->setConditions($search->combine('&&', $expr));
+			$search->setSortations(array($search->sort('-', 'customer.lists.position')));
+			$search->setSlice(($current - 1) * $size, $size);
 
-			$view->watchListItems = $manager->searchItems( $search, array(), $total );
+			$view->watchListItems = $manager->searchItems($search, array(), $total);
 
 
 			/** client/html/account/watch/domains
@@ -526,19 +526,19 @@ 
 			 * @category Developer
 			 * @see client/html/catalog/domains
 			 */
-			$default = array( 'text', 'price', 'media' );
-			$domains = $context->getConfig()->get( 'client/html/account/watch/domains', $default );
+			$default = array('text', 'price', 'media');
+			$domains = $context->getConfig()->get('client/html/account/watch/domains', $default);
 
-			foreach( $view->watchListItems as $listItem ) {
+			foreach ($view->watchListItems as $listItem) {
 				$productIds[] = $listItem->getRefId();
 			}
 
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-			$view->watchProductItems = $controller->getProductItems( $productIds, $domains );
+			$view->watchProductItems = $controller->getProductItems($productIds, $domains);
 			$view->watchPageFirst = 1;
-			$view->watchPagePrev = ( $current > 1 ? $current - 1 : 1 );
-			$view->watchPageNext = ( $current < $last ? $current + 1 : $last );
+			$view->watchPagePrev = ($current > 1 ? $current - 1 : 1);
+			$view->watchPageNext = ($current < $last ? $current + 1 : $last);
 			$view->watchPageLast = $last;
 			$view->watchPageCurr = $current;
 

Braces +5 added lines, -10 removed lines

@@ -82,23 +82,19 @@ 
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 			}
 			$view->watchBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->watchErrorList = $view->get( 'watchErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -178,8 +174,7 @@ 
 			$default = 'account/watch/header-default.php';
 
 			return $view->render( $view->config( $tplconf, $default ) );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 		}