aimeos / ai-client-html

client/html/src/Client/Html/Locale/Select/Standard.php

Indentation +355 added lines, -355 removed lines

@@ -19,360 +19,360 @@
  * @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/locale/select/standard/subparts
-	 * List of HTML sub-clients rendered within the locale select 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.09
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/locale/select/standard/subparts';
-
-	/** client/html/locale/select/language/name
-	 * Name of the language part used by the locale selector client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Locale\Select\Language\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.09
-	 * @category Developer
-	 */
-
-	/** client/html/locale/select/currency/name
-	 * Name of the currency part used by the locale selector client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Locale\Select\Currency\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.09
-	 * @category Developer
-	 */
-	private $subPartNames = array( 'language', 'currency' );
-	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->selectBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->selectErrorList = $view->get( 'selectErrorList', 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->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
-		}
-
-		/** client/html/locale/select/standard/template-body
-		 * Relative path to the HTML body template of the locale select 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.09
-		 * @category Developer
-		 * @see client/html/locale/select/standard/template-header
-		 */
-		$tplconf = 'client/html/locale/select/standard/template-body';
-		$default = 'locale/select/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->selectHeader = $html;
-
-			/** client/html/locale/select/standard/template-header
-			 * Relative path to the HTML header template of the locale select 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.09
-			 * @category Developer
-			 * @see client/html/locale/select/standard/template-body
-			 */
-			$tplconf = 'client/html/locale/select/standard/template-header';
-			$default = 'locale/select/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/locale/select/decorators/excludes
-		 * Excludes decorators added by the "common" option from the locale select 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/locale/select/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/locale/select/decorators/global
-		 * @see client/html/locale/select/decorators/local
-		 */
-
-		/** client/html/locale/select/decorators/global
-		 * Adds a list of globally available decorators only to the locale select 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/locale/select/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/locale/select/decorators/excludes
-		 * @see client/html/locale/select/decorators/local
-		 */
-
-		/** client/html/locale/select/decorators/local
-		 * Adds a list of local decorators only to the locale select 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\Locale\Decorator\*") around the html client.
-		 *
-		 *  client/html/locale/select/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Locale\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/locale/select/decorators/excludes
-		 * @see client/html/locale/select/decorators/global
-		 */
-		return $this->createSubClient( 'locale/select/' . $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 ) )
-		{
-			$map = array();
-			$context = $this->getContext();
-			$config = $context->getConfig();
-			$locale = $context->getLocale();
-
-			/** client/html/locale/select/language/param-name
-			 * Name of the parameter that contains the language ID value
-			 *
-			 * Frameworks and applications normally use its own predefined parameter
-			 * that contains the current language ID if they are multi-language
-			 * capable. To adapt the Aimeos parameter name to the already used name,
-			 * you are able to configure it by using this setting.
-			 *
-			 * @param string Parameter name for language ID
-			 * @since 2015.06
-			 * @see client/html/locale/select/currency/param-name
-			 */
-			$langname = $config->get( 'client/html/locale/select/language/param-name', 'loc_languageid' );
-
-			/** client/html/locale/select/currency/param-name
-			 * Name of the parameter that contains the currency ID value
-			 *
-			 * Frameworks and applications normally use its own predefined parameter
-			 * that contains the current currency ID if they already support multiple
-			 * currencies. To adapt the Aimeos parameter name to the already used name,
-			 * you are able to configure it by using this setting.
-			 *
-			 * @param string Parameter name for currency ID
-			 * @since 2015.06
-			 * @see client/html/locale/select/language/param-name
-			 */
-			$curname = $config->get( 'client/html/locale/select/currency/param-name', 'loc_currencyid' );
-
-
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
-
-			$search = $manager->createSearch( true );
-			$search->setSortations( array( $search->sort( '+', 'locale.position' ) ) );
-
-			foreach( $manager->searchItems( $search ) as $item )
-			{
-				$curId = $item->getCurrencyId();
-				$langId = $item->getLanguageId();
-				$map[$langId][$curId] = array( $langname => $langId, $curname => $curId );
-			}
-
-			$params = $view->param();
-
-			$view->selectMap = $map;
-			$view->selectParams = $params;
-			$view->selectLanguageId = $locale->getLanguageId();
-			$view->selectCurrencyId = $locale->getCurrencyId();
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
+    /** client/html/locale/select/standard/subparts
+     * List of HTML sub-clients rendered within the locale select 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.09
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/locale/select/standard/subparts';
+
+    /** client/html/locale/select/language/name
+     * Name of the language part used by the locale selector client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Locale\Select\Language\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.09
+     * @category Developer
+     */
+
+    /** client/html/locale/select/currency/name
+     * Name of the currency part used by the locale selector client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Locale\Select\Currency\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.09
+     * @category Developer
+     */
+    private $subPartNames = array( 'language', 'currency' );
+    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->selectBody = $html;
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->selectErrorList = $view->get( 'selectErrorList', 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->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+        }
+
+        /** client/html/locale/select/standard/template-body
+         * Relative path to the HTML body template of the locale select 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.09
+         * @category Developer
+         * @see client/html/locale/select/standard/template-header
+         */
+        $tplconf = 'client/html/locale/select/standard/template-body';
+        $default = 'locale/select/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->selectHeader = $html;
+
+            /** client/html/locale/select/standard/template-header
+             * Relative path to the HTML header template of the locale select 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.09
+             * @category Developer
+             * @see client/html/locale/select/standard/template-body
+             */
+            $tplconf = 'client/html/locale/select/standard/template-header';
+            $default = 'locale/select/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/locale/select/decorators/excludes
+         * Excludes decorators added by the "common" option from the locale select 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/locale/select/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/locale/select/decorators/global
+         * @see client/html/locale/select/decorators/local
+         */
+
+        /** client/html/locale/select/decorators/global
+         * Adds a list of globally available decorators only to the locale select 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/locale/select/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/locale/select/decorators/excludes
+         * @see client/html/locale/select/decorators/local
+         */
+
+        /** client/html/locale/select/decorators/local
+         * Adds a list of local decorators only to the locale select 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\Locale\Decorator\*") around the html client.
+         *
+         *  client/html/locale/select/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Locale\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/locale/select/decorators/excludes
+         * @see client/html/locale/select/decorators/global
+         */
+        return $this->createSubClient( 'locale/select/' . $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 ) )
+        {
+            $map = array();
+            $context = $this->getContext();
+            $config = $context->getConfig();
+            $locale = $context->getLocale();
+
+            /** client/html/locale/select/language/param-name
+             * Name of the parameter that contains the language ID value
+             *
+             * Frameworks and applications normally use its own predefined parameter
+             * that contains the current language ID if they are multi-language
+             * capable. To adapt the Aimeos parameter name to the already used name,
+             * you are able to configure it by using this setting.
+             *
+             * @param string Parameter name for language ID
+             * @since 2015.06
+             * @see client/html/locale/select/currency/param-name
+             */
+            $langname = $config->get( 'client/html/locale/select/language/param-name', 'loc_languageid' );
+
+            /** client/html/locale/select/currency/param-name
+             * Name of the parameter that contains the currency ID value
+             *
+             * Frameworks and applications normally use its own predefined parameter
+             * that contains the current currency ID if they already support multiple
+             * currencies. To adapt the Aimeos parameter name to the already used name,
+             * you are able to configure it by using this setting.
+             *
+             * @param string Parameter name for currency ID
+             * @since 2015.06
+             * @see client/html/locale/select/language/param-name
+             */
+            $curname = $config->get( 'client/html/locale/select/currency/param-name', 'loc_currencyid' );
+
+
+            $manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+
+            $search = $manager->createSearch( true );
+            $search->setSortations( array( $search->sort( '+', 'locale.position' ) ) );
+
+            foreach( $manager->searchItems( $search ) as $item )
+            {
+                $curId = $item->getCurrencyId();
+                $langId = $item->getLanguageId();
+                $map[$langId][$curId] = array( $langname => $langId, $curname => $curId );
+            }
+
+            $params = $view->param();
+
+            $view->selectMap = $map;
+            $view->selectParams = $params;
+            $view->selectLanguageId = $locale->getLanguageId();
+            $view->selectCurrencyId = $locale->getCurrencyId();
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +38 added lines, -38 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2014.09
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'language', 'currency' );
+	private $subPartNames = array('language', 'currency');
 	private $cache;
 
 
@@ -90,42 +90,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->selectBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->selectErrorList = $view->get('selectErrorList', 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->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->selectErrorList = $view->get('selectErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->selectErrorList = $view->get('selectErrorList', 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->selectErrorList = $view->get( 'selectErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->selectErrorList = $view->get('selectErrorList', array()) + $error;
 		}
 
 		/** client/html/locale/select/standard/template-body
@@ -151,7 +151,7 @@ 
 		$tplconf = 'client/html/locale/select/standard/template-body';
 		$default = 'locale/select/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -163,15 +163,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->selectHeader = $html;
 
@@ -199,11 +199,11 @@ 
 			$tplconf = 'client/html/locale/select/standard/template-header';
 			$default = 'locale/select/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());
 		}
 	}
 
@@ -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/locale/select/decorators/excludes
 		 * Excludes decorators added by the "common" option from the locale select html client
@@ -290,7 +290,7 @@ 
 		 * @see client/html/locale/select/decorators/excludes
 		 * @see client/html/locale/select/decorators/global
 		 */
-		return $this->createSubClient( 'locale/select/' . $type, $name );
+		return $this->createSubClient('locale/select/'.$type, $name);
 	}
 
 
@@ -301,7 +301,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -313,9 +313,9 @@ 
 	 * @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))
 		{
 			$map = array();
 			$context = $this->getContext();
@@ -334,7 +334,7 @@ 
 			 * @since 2015.06
 			 * @see client/html/locale/select/currency/param-name
 			 */
-			$langname = $config->get( 'client/html/locale/select/language/param-name', 'loc_languageid' );
+			$langname = $config->get('client/html/locale/select/language/param-name', 'loc_languageid');
 
 			/** client/html/locale/select/currency/param-name
 			 * Name of the parameter that contains the currency ID value
@@ -348,19 +348,19 @@ 
 			 * @since 2015.06
 			 * @see client/html/locale/select/language/param-name
 			 */
-			$curname = $config->get( 'client/html/locale/select/currency/param-name', 'loc_currencyid' );
+			$curname = $config->get('client/html/locale/select/currency/param-name', 'loc_currencyid');
 
 
-			$manager = \Aimeos\MShop\Factory::createManager( $context, 'locale' );
+			$manager = \Aimeos\MShop\Factory::createManager($context, 'locale');
 
-			$search = $manager->createSearch( true );
-			$search->setSortations( array( $search->sort( '+', 'locale.position' ) ) );
+			$search = $manager->createSearch(true);
+			$search->setSortations(array($search->sort('+', 'locale.position')));
 
-			foreach( $manager->searchItems( $search ) as $item )
+			foreach ($manager->searchItems($search) as $item)
 			{
 				$curId = $item->getCurrencyId();
 				$langId = $item->getLanguageId();
-				$map[$langId][$curId] = array( $langname => $langId, $curname => $curId );
+				$map[$langId][$curId] = array($langname => $langId, $curname => $curId);
 			}
 
 			$params = $view->param();

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/Locale/Select/Language/Standard.php

Spacing +16 added lines, -16 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->languageBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/locale/select/language/standard/template-body';
 		$default = 'locale/select/language-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -112,13 +112,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->languageHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/locale/select/language/standard/template-header';
 		$default = 'locale/select/language-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -157,7 +157,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/locale/select/language/decorators/excludes
 		 * Excludes decorators added by the "common" option from the locale select language html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/locale/select/language/decorators/global
 		 */
 
-		return $this->createSubClient( 'locale/select/language/' . $type, $name );
+		return $this->createSubClient('locale/select/language/'.$type, $name);
 	}
 
 
@@ -249,10 +249,10 @@ 
 		$config = $context->getConfig();
 		$session = $context->getSession();
 
-		$name = $config->get( 'client/html/locale/select/language/param-name', 'loc_languageid' );
+		$name = $config->get('client/html/locale/select/language/param-name', 'loc_languageid');
 
-		if( ( $languageId = $view->param( $name ) ) !== null ) {
-			$session->set( 'aimeos/locale/languageid', $languageId );
+		if (($languageId = $view->param($name)) !== null) {
+			$session->set('aimeos/locale/languageid', $languageId);
 		}
 
 		parent::process();
@@ -266,6 +266,6 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 }

Indentation +226 added lines, -226 removed lines

@@ -19,253 +19,253 @@
  * @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/locale/select/language/standard/subparts
-	 * List of HTML sub-clients rendered within the locale select language 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.09
-	 * @category Developer
-	 */
-	private $subPartPath = 'client/html/locale/select/language/standard/subparts';
-	private $subPartNames = array();
+    /** client/html/locale/select/language/standard/subparts
+     * List of HTML sub-clients rendered within the locale select language 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.09
+     * @category Developer
+     */
+    private $subPartPath = 'client/html/locale/select/language/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 );
+    /**
+     * 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->languageBody = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->languageBody = $html;
 
-		/** client/html/locale/select/language/standard/template-body
-		 * Relative path to the HTML body template of the locale select language 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.09
-		 * @category Developer
-		 * @see client/html/locale/select/language/standard/template-header
-		 */
-		$tplconf = 'client/html/locale/select/language/standard/template-body';
-		$default = 'locale/select/language-body-default.php';
+        /** client/html/locale/select/language/standard/template-body
+         * Relative path to the HTML body template of the locale select language 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.09
+         * @category Developer
+         * @see client/html/locale/select/language/standard/template-header
+         */
+        $tplconf = 'client/html/locale/select/language/standard/template-body';
+        $default = 'locale/select/language-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->languageHeader = $html;
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->languageHeader = $html;
 
-		/** client/html/locale/select/language/standard/template-header
-		 * Relative path to the HTML header template of the locale select language 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.09
-		 * @category Developer
-		 * @see client/html/locale/select/language/standard/template-body
-		 */
-		$tplconf = 'client/html/locale/select/language/standard/template-header';
-		$default = 'locale/select/language-header-default.php';
+        /** client/html/locale/select/language/standard/template-header
+         * Relative path to the HTML header template of the locale select language 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.09
+         * @category Developer
+         * @see client/html/locale/select/language/standard/template-body
+         */
+        $tplconf = 'client/html/locale/select/language/standard/template-header';
+        $default = 'locale/select/language-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/locale/select/language/decorators/excludes
-		 * Excludes decorators added by the "common" option from the locale select language 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/locale/select/language/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/locale/select/language/decorators/global
-		 * @see client/html/locale/select/language/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/locale/select/language/decorators/excludes
+         * Excludes decorators added by the "common" option from the locale select language 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/locale/select/language/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/locale/select/language/decorators/global
+         * @see client/html/locale/select/language/decorators/local
+         */
 
-		/** client/html/locale/select/language/decorators/global
-		 * Adds a list of globally available decorators only to the locale select language 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/locale/select/language/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/locale/select/language/decorators/excludes
-		 * @see client/html/locale/select/language/decorators/local
-		 */
+        /** client/html/locale/select/language/decorators/global
+         * Adds a list of globally available decorators only to the locale select language 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/locale/select/language/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/locale/select/language/decorators/excludes
+         * @see client/html/locale/select/language/decorators/local
+         */
 
-		/** client/html/locale/select/language/decorators/local
-		 * Adds a list of local decorators only to the locale select language 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\Checkout\Decorator\*") around the html client.
-		 *
-		 *  client/html/locale/select/language/decorators/local = array( 'decorator2' )
-		 *
-		 * This would add the decorator named "decorator2" defined by
-		 * "\Aimeos\Client\Html\Checkout\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/locale/select/language/decorators/excludes
-		 * @see client/html/locale/select/language/decorators/global
-		 */
+        /** client/html/locale/select/language/decorators/local
+         * Adds a list of local decorators only to the locale select language 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\Checkout\Decorator\*") around the html client.
+         *
+         *  client/html/locale/select/language/decorators/local = array( 'decorator2' )
+         *
+         * This would add the decorator named "decorator2" defined by
+         * "\Aimeos\Client\Html\Checkout\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/locale/select/language/decorators/excludes
+         * @see client/html/locale/select/language/decorators/global
+         */
 
-		return $this->createSubClient( 'locale/select/language/' . $type, $name );
-	}
+        return $this->createSubClient( 'locale/select/language/' . $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();
-		$config = $context->getConfig();
-		$session = $context->getSession();
+    /**
+     * 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();
+        $config = $context->getConfig();
+        $session = $context->getSession();
 
-		$name = $config->get( 'client/html/locale/select/language/param-name', 'loc_languageid' );
+        $name = $config->get( 'client/html/locale/select/language/param-name', 'loc_languageid' );
 
-		if( ( $languageId = $view->param( $name ) ) !== null ) {
-			$session->set( 'aimeos/locale/languageid', $languageId );
-		}
+        if( ( $languageId = $view->param( $name ) ) !== null ) {
+            $session->set( 'aimeos/locale/languageid', $languageId );
+        }
 
-		parent::process();
-	}
+        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 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/src/Client/Html/Factory.php

Indentation +35 added lines, -35 removed lines

@@ -19,48 +19,48 @@
  */
 class Factory
 {
-	/**
-	 * Creates a new client object.
-	 *
-	 * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
-	 * @param array List of file system paths where the templates are stored
-	 * @param string $type Type of the client, e.g 'account/favorite' for \Aimeos\Client\Html\Account\Favorite\Standard
-	 * @param string|null $name Client name (default: "Standard")
-	 * @return \Aimeos\Client\Html\Iface HTML client 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, $type, $name = null )
-	{
-		if( empty( $type ) ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Client HTML type is empty' ) );
-		}
+    /**
+     * Creates a new client object.
+     *
+     * @param \Aimeos\MShop\Context\Item\Iface $context Shop context instance with necessary objects
+     * @param array List of file system paths where the templates are stored
+     * @param string $type Type of the client, e.g 'account/favorite' for \Aimeos\Client\Html\Account\Favorite\Standard
+     * @param string|null $name Client name (default: "Standard")
+     * @return \Aimeos\Client\Html\Iface HTML client 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, $type, $name = null )
+    {
+        if( empty( $type ) ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Client HTML type is empty' ) );
+        }
 
-		$parts = explode( '/', $type );
+        $parts = explode( '/', $type );
 
-		if( count( $parts ) !== 2 ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Client type "%1$s" must consist of two parts separated by "/"', $type ) );
-		}
+        if( count( $parts ) !== 2 ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Client type "%1$s" must consist of two parts separated by "/"', $type ) );
+        }
 
-		foreach( $parts as $part )
-		{
-			if( ctype_alnum( $part ) === false ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in client name "%1$s" in "%2$s"', $part, $type ) );
-			}
-		}
+        foreach( $parts as $part )
+        {
+            if( ctype_alnum( $part ) === false ) {
+                throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in client name "%1$s" in "%2$s"', $part, $type ) );
+            }
+        }
 
-		$factory = '\\Aimeos\\Client\\Html\\' . ucwords( $parts[0] ) . '\\' . ucwords( $parts[1] ) . '\\Factory';
+        $factory = '\\Aimeos\\Client\\Html\\' . ucwords( $parts[0] ) . '\\' . ucwords( $parts[1] ) . '\\Factory';
 
-		if( class_exists( $factory ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
-		}
+        if( class_exists( $factory ) === false ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+        }
 
-		$client = @call_user_func_array( array( $factory, 'createClient' ), array( $context, $templatePaths, $name ) );
+        $client = @call_user_func_array( array( $factory, 'createClient' ), array( $context, $templatePaths, $name ) );
 
-		if( $client === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
-		}
+        if( $client === false ) {
+            throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+        }
 
-		return $client;
-	}
+        return $client;
+    }
 
 }
\ No newline at end of file

Spacing +15 added lines, -15 removed lines

@@ -29,35 +29,35 @@
 	 * @return \Aimeos\Client\Html\Iface HTML client 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, $type, $name = null )
+	public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $type, $name = null)
 	{
-		if( empty( $type ) ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Client HTML type is empty' ) );
+		if (empty($type)) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Client HTML type is empty'));
 		}
 
-		$parts = explode( '/', $type );
+		$parts = explode('/', $type);
 
-		if( count( $parts ) !== 2 ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Client type "%1$s" must consist of two parts separated by "/"', $type ) );
+		if (count($parts) !== 2) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Client type "%1$s" must consist of two parts separated by "/"', $type));
 		}
 
-		foreach( $parts as $part )
+		foreach ($parts as $part)
 		{
-			if( ctype_alnum( $part ) === false ) {
-				throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in client name "%1$s" in "%2$s"', $part, $type ) );
+			if (ctype_alnum($part) === false) {
+				throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in client name "%1$s" in "%2$s"', $part, $type));
 			}
 		}
 
-		$factory = '\\Aimeos\\Client\\Html\\' . ucwords( $parts[0] ) . '\\' . ucwords( $parts[1] ) . '\\Factory';
+		$factory = '\\Aimeos\\Client\\Html\\'.ucwords($parts[0]).'\\'.ucwords($parts[1]).'\\Factory';
 
-		if( class_exists( $factory ) === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Class "%1$s" not available', $factory ) );
+		if (class_exists($factory) === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Class "%1$s" not available', $factory));
 		}
 
-		$client = @call_user_func_array( array( $factory, 'createClient' ), array( $context, $templatePaths, $name ) );
+		$client = @call_user_func_array(array($factory, 'createClient'), array($context, $templatePaths, $name));
 
-		if( $client === false ) {
-			throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid factory "%1$s"', $factory ) );
+		if ($client === false) {
+			throw new \Aimeos\Client\Html\Exception(sprintf('Invalid factory "%1$s"', $factory));
 		}
 
 		return $client;

client/html/src/Client/Html/Basket/Base.php

Indentation +54 added lines, -54 removed lines

@@ -19,66 +19,66 @@
  * @subpackage Html
  */
 abstract class Base
-	extends \Aimeos\Client\Html\Common\Client\Factory\Base
+    extends \Aimeos\Client\Html\Common\Client\Factory\Base
 {
-	/**
-	 * Removes all cached basket parts from the cache.
-	 */
-	protected function clearCached()
-	{
-		$session = $this->getContext()->getSession();
+    /**
+     * Removes all cached basket parts from the cache.
+     */
+    protected function clearCached()
+    {
+        $session = $this->getContext()->getSession();
 
-		foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
-			$session->set( $key, null );
-		}
-	}
+        foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
+            $session->set( $key, null );
+        }
+    }
 
 
-	/**
-	 * Returns the basket cache entry from the cache if available.
-	 *
-	 * @param string $key Path to the requested cache entry
-	 * @param mixed $default Value returned if requested key isn't found
-	 * @return mixed Value associated to the requested key. If no value for the
-	 *	key is found in the cache, the given default value is returned
-	 */
-	protected function getBasketCached( $key, $default = null )
-	{
-		return $this->getContext()->getSession()->get( $key, $default );
-	}
+    /**
+     * Returns the basket cache entry from the cache if available.
+     *
+     * @param string $key Path to the requested cache entry
+     * @param mixed $default Value returned if requested key isn't found
+     * @return mixed Value associated to the requested key. If no value for the
+     *	key is found in the cache, the given default value is returned
+     */
+    protected function getBasketCached( $key, $default = null )
+    {
+        return $this->getContext()->getSession()->get( $key, $default );
+    }
 
 
-	/**
-	 * Adds or overwrite a cache entry for the given key and value.
-	 *
-	 * @param string $key Path the cache entry should be stored in
-	 * @param mixed $value Value stored in the cache for the path
-	 */
-	protected function setBasketCached( $key, $value )
-	{
-		$context = $this->getContext();
+    /**
+     * Adds or overwrite a cache entry for the given key and value.
+     *
+     * @param string $key Path the cache entry should be stored in
+     * @param mixed $value Value stored in the cache for the path
+     */
+    protected function setBasketCached( $key, $value )
+    {
+        $context = $this->getContext();
 
-		/** client/html/basket/cache/enable
-		 * Enables or disables caching of the basket content
-		 *
-		 * For performance reasons, the content of the small baskets is cached
-		 * in the session of the customer. The cache is updated each time the
-		 * basket content changes either by adding, deleting or editing products.
-		 *
-		 * To ease development, the caching can be disabled but you shouldn't
-		 * disable it in your production environment!
-		 *
-		 * @param boolean True to enable, false to disable basket content caching
-		 * @category Developer
-		 * @since 2014.11
-		 */
-		if( $context->getConfig()->get( 'client/html/basket/cache/enable', true ) != false )
-		{
-			$session = $context->getSession();
+        /** client/html/basket/cache/enable
+         * Enables or disables caching of the basket content
+         *
+         * For performance reasons, the content of the small baskets is cached
+         * in the session of the customer. The cache is updated each time the
+         * basket content changes either by adding, deleting or editing products.
+         *
+         * To ease development, the caching can be disabled but you shouldn't
+         * disable it in your production environment!
+         *
+         * @param boolean True to enable, false to disable basket content caching
+         * @category Developer
+         * @since 2014.11
+         */
+        if( $context->getConfig()->get( 'client/html/basket/cache/enable', true ) != false )
+        {
+            $session = $context->getSession();
 
-			$cached = $session->get( 'aimeos/basket/cache', array() ) + array( $key => true );
-			$session->set( 'aimeos/basket/cache', $cached );
-			$session->set( $key, $value );
-		}
-	}
+            $cached = $session->get( 'aimeos/basket/cache', array() ) + array( $key => true );
+            $session->set( 'aimeos/basket/cache', $cached );
+            $session->set( $key, $value );
+        }
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -28,8 +28,8 @@ 
 	{
 		$session = $this->getContext()->getSession();
 
-		foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) {
-			$session->set( $key, null );
+		foreach ($session->get('aimeos/basket/cache', array()) as $key => $value) {
+			$session->set($key, null);
 		}
 	}
 
@@ -42,9 +42,9 @@ 
 	 * @return mixed Value associated to the requested key. If no value for the
 	 *	key is found in the cache, the given default value is returned
 	 */
-	protected function getBasketCached( $key, $default = null )
+	protected function getBasketCached($key, $default = null)
 	{
-		return $this->getContext()->getSession()->get( $key, $default );
+		return $this->getContext()->getSession()->get($key, $default);
 	}
 
 
@@ -54,7 +54,7 @@ 
 	 * @param string $key Path the cache entry should be stored in
 	 * @param mixed $value Value stored in the cache for the path
 	 */
-	protected function setBasketCached( $key, $value )
+	protected function setBasketCached($key, $value)
 	{
 		$context = $this->getContext();
 
@@ -72,13 +72,13 @@ 
 		 * @category Developer
 		 * @since 2014.11
 		 */
-		if( $context->getConfig()->get( 'client/html/basket/cache/enable', true ) != false )
+		if ($context->getConfig()->get('client/html/basket/cache/enable', true) != false)
 		{
 			$session = $context->getSession();
 
-			$cached = $session->get( 'aimeos/basket/cache', array() ) + array( $key => true );
-			$session->set( 'aimeos/basket/cache', $cached );
-			$session->set( $key, $value );
+			$cached = $session->get('aimeos/basket/cache', array()) + array($key => true);
+			$session->set('aimeos/basket/cache', $cached);
+			$session->set($key, $value);
 		}
 	}
 }

client/html/src/Client/Html/Basket/Standard/Coupon/Standard.php

Indentation +287 added lines, -287 removed lines

@@ -19,292 +19,292 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Basket\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Basket\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/standard/coupon/standard/subparts
-	 * List of HTML sub-clients rendered within the basket standard coupon 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/basket/standard/coupon/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->couponBody = $html;
-
-		/** client/html/basket/standard/coupon/standard/template-body
-		 * Relative path to the HTML body template of the basket standard coupon 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/basket/standard/coupon/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/standard/coupon/standard/template-body';
-		$default = 'basket/standard/coupon-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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->couponHeader = $html;
-
-		/** client/html/basket/standard/coupon/standard/template-header
-		 * Relative path to the HTML header template of the basket standard coupon 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/basket/standard/coupon/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/standard/coupon/standard/template-header';
-		$default = 'basket/standard/coupon-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/basket/standard/coupon/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket standard coupon 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/basket/standard/coupon/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/basket/standard/coupon/decorators/global
-		 * @see client/html/basket/standard/coupon/decorators/local
-		 */
-
-		/** client/html/basket/standard/coupon/decorators/global
-		 * Adds a list of globally available decorators only to the basket standard coupon 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/basket/standard/coupon/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/basket/standard/coupon/decorators/excludes
-		 * @see client/html/basket/standard/coupon/decorators/local
-		 */
-
-		/** client/html/basket/standard/coupon/decorators/local
-		 * Adds a list of local decorators only to the basket standard coupon 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/basket/standard/coupon/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/basket/standard/coupon/decorators/excludes
-		 * @see client/html/basket/standard/coupon/decorators/global
-		 */
-		return $this->createSubClient( 'basket/standard/coupon/' . $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();
-
-		switch( $view->param( 'b_action' ) )
-		{
-			case 'coupon-delete':
-
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
-				{
-					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-					$cntl->deleteCoupon( $coupon );
-				}
-
-				break;
-
-			default:
-
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
-				{
-					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-
-					/** client/html/basket/standard/coupon/allowed
-					 * Number of coupon codes a customer is allowed to enter
-					 *
-					 * This configuration option enables shop owners to limit the number of coupon
-					 * codes that can be added by a customer to his current basket. By default, only
-					 * one coupon code is allowed per order.
-					 *
-					 * Coupon codes are valid until a payed order is placed by the customer. The
-					 * "count" of the codes is decreased afterwards. If codes are not personalized
-					 * the codes can be reused in the next order until their "count" reaches zero.
-					 *
-					 * @param integer Positive number of coupon codes including zero
-					 * @since 2014.05
-					 * @category User
-					 * @category Developer
-					 */
-					$allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 );
-
-					if( $allowed <= count( $cntl->get()->getCoupons() ) ) {
-						throw new \Aimeos\Client\Html\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
-					}
-
-					$cntl->addCoupon( $coupon );
-				}
-
-				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 );
-	}
+    /** client/html/basket/standard/coupon/standard/subparts
+     * List of HTML sub-clients rendered within the basket standard coupon 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/basket/standard/coupon/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->couponBody = $html;
+
+        /** client/html/basket/standard/coupon/standard/template-body
+         * Relative path to the HTML body template of the basket standard coupon 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/basket/standard/coupon/standard/template-header
+         */
+        $tplconf = 'client/html/basket/standard/coupon/standard/template-body';
+        $default = 'basket/standard/coupon-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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->couponHeader = $html;
+
+        /** client/html/basket/standard/coupon/standard/template-header
+         * Relative path to the HTML header template of the basket standard coupon 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/basket/standard/coupon/standard/template-body
+         */
+        $tplconf = 'client/html/basket/standard/coupon/standard/template-header';
+        $default = 'basket/standard/coupon-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/basket/standard/coupon/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket standard coupon 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/basket/standard/coupon/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/basket/standard/coupon/decorators/global
+         * @see client/html/basket/standard/coupon/decorators/local
+         */
+
+        /** client/html/basket/standard/coupon/decorators/global
+         * Adds a list of globally available decorators only to the basket standard coupon 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/basket/standard/coupon/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/basket/standard/coupon/decorators/excludes
+         * @see client/html/basket/standard/coupon/decorators/local
+         */
+
+        /** client/html/basket/standard/coupon/decorators/local
+         * Adds a list of local decorators only to the basket standard coupon 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/basket/standard/coupon/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/basket/standard/coupon/decorators/excludes
+         * @see client/html/basket/standard/coupon/decorators/global
+         */
+        return $this->createSubClient( 'basket/standard/coupon/' . $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();
+
+        switch( $view->param( 'b_action' ) )
+        {
+            case 'coupon-delete':
+
+                if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+                {
+                    $this->clearCached();
+                    $cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+                    $cntl->deleteCoupon( $coupon );
+                }
+
+                break;
+
+            default:
+
+                if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+                {
+                    $this->clearCached();
+                    $cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+
+                    /** client/html/basket/standard/coupon/allowed
+                     * Number of coupon codes a customer is allowed to enter
+                     *
+                     * This configuration option enables shop owners to limit the number of coupon
+                     * codes that can be added by a customer to his current basket. By default, only
+                     * one coupon code is allowed per order.
+                     *
+                     * Coupon codes are valid until a payed order is placed by the customer. The
+                     * "count" of the codes is decreased afterwards. If codes are not personalized
+                     * the codes can be reused in the next order until their "count" reaches zero.
+                     *
+                     * @param integer Positive number of coupon codes including zero
+                     * @since 2014.05
+                     * @category User
+                     * @category Developer
+                     */
+                    $allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 );
+
+                    if( $allowed <= count( $cntl->get()->getCoupons() ) ) {
+                        throw new \Aimeos\Client\Html\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
+                    }
+
+                    $cntl->addCoupon( $coupon );
+                }
+
+                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 );
+    }
 }
\ No newline at end of file

Spacing +23 added lines, -23 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->couponBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/basket/standard/coupon/standard/template-body';
 		$default = 'basket/standard/coupon-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -112,13 +112,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->couponHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/basket/standard/coupon/standard/template-header';
 		$default = 'basket/standard/coupon-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -157,7 +157,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/basket/standard/coupon/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket standard coupon html client
@@ -232,7 +232,7 @@ 
 		 * @see client/html/basket/standard/coupon/decorators/excludes
 		 * @see client/html/basket/standard/coupon/decorators/global
 		 */
-		return $this->createSubClient( 'basket/standard/coupon/' . $type, $name );
+		return $this->createSubClient('basket/standard/coupon/'.$type, $name);
 	}
 
 
@@ -246,25 +246,25 @@ 
 		$view = $this->getView();
 		$context = $this->getContext();
 
-		switch( $view->param( 'b_action' ) )
+		switch ($view->param('b_action'))
 		{
 			case 'coupon-delete':
 
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+				if (($coupon = $view->param('b_coupon')) != '')
 				{
 					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-					$cntl->deleteCoupon( $coupon );
+					$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+					$cntl->deleteCoupon($coupon);
 				}
 
 				break;
 
 			default:
 
-				if( ( $coupon = $view->param( 'b_coupon' ) ) != '' )
+				if (($coupon = $view->param('b_coupon')) != '')
 				{
 					$this->clearCached();
-					$cntl = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+					$cntl = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
 
 					/** client/html/basket/standard/coupon/allowed
 					 * Number of coupon codes a customer is allowed to enter
@@ -282,13 +282,13 @@ 
 					 * @category User
 					 * @category Developer
 					 */
-					$allowed = $context->getConfig()->get( 'client/html/basket/standard/coupon/allowed', 1 );
+					$allowed = $context->getConfig()->get('client/html/basket/standard/coupon/allowed', 1);
 
-					if( $allowed <= count( $cntl->get()->getCoupons() ) ) {
-						throw new \Aimeos\Client\Html\Exception( sprintf( 'Number of coupon codes exceeds the limit' ) );
+					if ($allowed <= count($cntl->get()->getCoupons())) {
+						throw new \Aimeos\Client\Html\Exception(sprintf('Number of coupon codes exceeds the limit'));
 					}
 
-					$cntl->addCoupon( $coupon );
+					$cntl->addCoupon($coupon);
 				}
 
 				break;
@@ -305,6 +305,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

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

client/html/src/Client/Html/Basket/Standard/Detail/Standard.php

Indentation +240 added lines, -240 removed lines

@@ -19,268 +19,268 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Common\Summary\Detail\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Common\Summary\Detail\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/standard/detail/standard/subparts
-	 * List of HTML sub-clients rendered within the basket standard 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/basket/standard/detail/standard/subparts';
-	private $subPartNames = array();
-	private $cache;
+    /** client/html/basket/standard/detail/standard/subparts
+     * List of HTML sub-clients rendered within the basket standard 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/basket/standard/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/basket/standard/detail/standard/template-body
-		 * Relative path to the HTML body template of the basket standard 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/basket/standard/detail/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/standard/detail/standard/template-body';
-		$default = 'common/summary/detail-body-default.php';
+        /** client/html/basket/standard/detail/standard/template-body
+         * Relative path to the HTML body template of the basket standard 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/basket/standard/detail/standard/template-header
+         */
+        $tplconf = 'client/html/basket/standard/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|null 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|null 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/basket/standard/detail/standard/template-header
-		 * Relative path to the HTML header template of the basket standard 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/basket/standard/detail/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/standard/detail/standard/template-header';
-		$default = 'common/summary/detail-header-default.php';
+        /** client/html/basket/standard/detail/standard/template-header
+         * Relative path to the HTML header template of the basket standard 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/basket/standard/detail/standard/template-body
+         */
+        $tplconf = 'client/html/basket/standard/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/basket/standard/detail/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket standard 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/basket/standard/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/basket/standard/detail/decorators/global
-		 * @see client/html/basket/standard/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/basket/standard/detail/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket standard 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/basket/standard/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/basket/standard/detail/decorators/global
+         * @see client/html/basket/standard/detail/decorators/local
+         */
 
-		/** client/html/basket/standard/detail/decorators/global
-		 * Adds a list of globally available decorators only to the basket standard 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/basket/standard/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/basket/standard/detail/decorators/excludes
-		 * @see client/html/basket/standard/detail/decorators/local
-		 */
+        /** client/html/basket/standard/detail/decorators/global
+         * Adds a list of globally available decorators only to the basket standard 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/basket/standard/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/basket/standard/detail/decorators/excludes
+         * @see client/html/basket/standard/detail/decorators/local
+         */
 
-		/** client/html/basket/standard/detail/decorators/local
-		 * Adds a list of local decorators only to the basket standard 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/basket/standard/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/basket/standard/detail/decorators/excludes
-		 * @see client/html/basket/standard/detail/decorators/global
-		 */
-		return $this->createSubClient( 'basket/standard/detail/' . $type, $name );
-	}
+        /** client/html/basket/standard/detail/decorators/local
+         * Adds a list of local decorators only to the basket standard 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/basket/standard/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/basket/standard/detail/decorators/excludes
+         * @see client/html/basket/standard/detail/decorators/global
+         */
+        return $this->createSubClient( 'basket/standard/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 )
-	{
-		$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 )
+    {
+        $view = parent::setViewParams( $view );
 
-		if( !isset( $this->cache ) )
-		{
-			$basket = $view->standardBasket;
+        if( !isset( $this->cache ) )
+        {
+            $basket = $view->standardBasket;
 
-			$target = $view->config( 'client/html/checkout/standard/url/target' );
-			$cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
-			$action = $view->config( 'client/html/checkout/standard/url/action', 'index' );
-			$config = $view->config( 'client/html/checkout/standard/url/config', array() );
+            $target = $view->config( 'client/html/checkout/standard/url/target' );
+            $cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
+            $action = $view->config( 'client/html/checkout/standard/url/action', 'index' );
+            $config = $view->config( 'client/html/checkout/standard/url/config', array() );
 
-			$view->summaryParams = $view->get( 'standardParams', array() );
-			$view->summaryUrlServicePayment = $view->url( $target, $cntl, $action, array( 'c_step' => 'payment' ), array(), $config );
-			$view->summaryUrlServiceDelivery = $view->url( $target, $cntl, $action, array( 'c_step' => 'delivery' ), array(), $config );
-			$view->summaryTaxRates = $this->getTaxRates( $basket );
-			$view->summaryEnableModify = true;
-			$view->summaryBasket = $basket;
+            $view->summaryParams = $view->get( 'standardParams', array() );
+            $view->summaryUrlServicePayment = $view->url( $target, $cntl, $action, array( 'c_step' => 'payment' ), array(), $config );
+            $view->summaryUrlServiceDelivery = $view->url( $target, $cntl, $action, array( 'c_step' => 'delivery' ), array(), $config );
+            $view->summaryTaxRates = $this->getTaxRates( $basket );
+            $view->summaryEnableModify = true;
+            $view->summaryBasket = $basket;
 
-			$this->cache = $view;
-		}
+            $this->cache = $view;
+        }
 
-		return $this->cache;
-	}
+        return $this->cache;
+    }
 }
\ No newline at end of file

Spacing +24 added lines, -24 removed lines

@@ -68,13 +68,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;
 
@@ -102,7 +102,7 @@ 
 		$tplconf = 'client/html/basket/standard/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));
 	}
 
 
@@ -114,13 +114,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;
 
@@ -149,7 +149,7 @@ 
 		$tplconf = 'client/html/basket/standard/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));
 	}
 
 
@@ -160,7 +160,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/basket/standard/detail/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket standard detail html client
@@ -235,7 +235,7 @@ 
 		 * @see client/html/basket/standard/detail/decorators/excludes
 		 * @see client/html/basket/standard/detail/decorators/global
 		 */
-		return $this->createSubClient( 'basket/standard/detail/' . $type, $name );
+		return $this->createSubClient('basket/standard/detail/'.$type, $name);
 	}
 
 
@@ -246,7 +246,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -258,23 +258,23 @@ 
 	 * @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)
 	{
-		$view = parent::setViewParams( $view );
+		$view = parent::setViewParams($view);
 
-		if( !isset( $this->cache ) )
+		if (!isset($this->cache))
 		{
 			$basket = $view->standardBasket;
 
-			$target = $view->config( 'client/html/checkout/standard/url/target' );
-			$cntl = $view->config( 'client/html/checkout/standard/url/controller', 'checkout' );
-			$action = $view->config( 'client/html/checkout/standard/url/action', 'index' );
-			$config = $view->config( 'client/html/checkout/standard/url/config', array() );
+			$target = $view->config('client/html/checkout/standard/url/target');
+			$cntl = $view->config('client/html/checkout/standard/url/controller', 'checkout');
+			$action = $view->config('client/html/checkout/standard/url/action', 'index');
+			$config = $view->config('client/html/checkout/standard/url/config', array());
 
-			$view->summaryParams = $view->get( 'standardParams', array() );
-			$view->summaryUrlServicePayment = $view->url( $target, $cntl, $action, array( 'c_step' => 'payment' ), array(), $config );
-			$view->summaryUrlServiceDelivery = $view->url( $target, $cntl, $action, array( 'c_step' => 'delivery' ), array(), $config );
-			$view->summaryTaxRates = $this->getTaxRates( $basket );
+			$view->summaryParams = $view->get('standardParams', array());
+			$view->summaryUrlServicePayment = $view->url($target, $cntl, $action, array('c_step' => 'payment'), array(), $config);
+			$view->summaryUrlServiceDelivery = $view->url($target, $cntl, $action, array('c_step' => 'delivery'), array(), $config);
+			$view->summaryTaxRates = $this->getTaxRates($basket);
 			$view->summaryEnableModify = true;
 			$view->summaryBasket = $basket;
 

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

client/html/src/Client/Html/Basket/Standard/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 standard basket 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/basket/standard/name
-		 * Class name of the used basket standard 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\Basket\Standard\Standard
-		 *
-		 * and you want to replace it with your own version named
-		 *
-		 *  \Aimeos\Client\Html\Basket\Standard\Mybasket
-		 *
-		 * then you have to set the this configuration option:
-		 *
-		 *  client/html/basket/standard/name = Mybasket
-		 *
-		 * 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 "MyBasket"!
-		 *
-		 * @param string Last part of the class name
-		 * @since 2014.03
-		 * @category Developer
-		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/basket/standard/name', 'Standard' );
-		}
+    /**
+     * Creates a standard basket 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/basket/standard/name
+         * Class name of the used basket standard 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\Basket\Standard\Standard
+         *
+         * and you want to replace it with your own version named
+         *
+         *  \Aimeos\Client\Html\Basket\Standard\Mybasket
+         *
+         * then you have to set the this configuration option:
+         *
+         *  client/html/basket/standard/name = Mybasket
+         *
+         * 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 "MyBasket"!
+         *
+         * @param string Last part of the class name
+         * @since 2014.03
+         * @category Developer
+         */
+        if( $name === null ) {
+            $name = $context->getConfig()->get( 'client/html/basket/standard/name', 'Standard' );
+        }
 
-		if( ctype_alnum( $name ) === false )
-		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Basket\\Standard\\' . $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\\Basket\\Standard\\' . $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\\Basket\\Standard\\' . $name;
+        $iface = '\\Aimeos\\Client\\Html\\Iface';
+        $classname = '\\Aimeos\\Client\\Html\\Basket\\Standard\\' . $name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+        $client = self::createClientBase( $context, $classname, $iface, $templatePaths );
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'basket/standard' );
-	}
+        return self::addClientDecorators( $context, $client, $templatePaths, 'basket/standard' );
+    }
 }
 

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/basket/standard/name
 		 * Class name of the used basket standard client implementation
@@ -66,22 +66,22 @@ 
 		 * @since 2014.03
 		 * @category Developer
 		 */
-		if( $name === null ) {
-			$name = $context->getConfig()->get( 'client/html/basket/standard/name', 'Standard' );
+		if ($name === null) {
+			$name = $context->getConfig()->get('client/html/basket/standard/name', 'Standard');
 		}
 
-		if( ctype_alnum( $name ) === false )
+		if (ctype_alnum($name) === false)
 		{
-			$classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Basket\\Standard\\' . $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\\Basket\\Standard\\'.$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\\Basket\\Standard\\' . $name;
+		$classname = '\\Aimeos\\Client\\Html\\Basket\\Standard\\'.$name;
 
-		$client = self::createClientBase( $context, $classname, $iface, $templatePaths );
+		$client = self::createClientBase($context, $classname, $iface, $templatePaths);
 
-		return self::addClientDecorators( $context, $client, $templatePaths, 'basket/standard' );
+		return self::addClientDecorators($context, $client, $templatePaths, 'basket/standard');
 	}
 }
 

client/html/src/Client/Html/Basket/Standard/Standard.php

Braces +11 added lines, -22 removed lines

@@ -104,23 +104,19 @@ 
 				$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
 			}
 			$view->standardBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -174,8 +170,7 @@ 
 				$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
 			}
 			$view->standardHeader = $html;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 			return '';
@@ -357,31 +352,26 @@ 
 
 			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
 			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		} catch( \Aimeos\Client\Html\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		} catch( \Aimeos\Controller\Frontend\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+		} catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
 		{
 			$errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
 
 			$view->summaryErrorCodes = $e->getErrorCodes();
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
-		}
-		catch( \Aimeos\MShop\Exception $e )
+		} catch( \Aimeos\MShop\Exception $e )
 		{
 			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
 			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
 
@@ -423,8 +413,7 @@ 
 				$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
 				$action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
 				$config = $view->config( 'client/html/catalog/detail/url/config', array() );
-			}
-			else
+			} else
 			{
 				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
 

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{

Indentation +531 added lines, -531 removed lines

@@ -19,536 +19,536 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Basket\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Basket\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/standard/standard/subparts
-	 * List of HTML sub-clients rendered within the basket standard 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/basket/standard/standard/subparts';
-
-	/** client/html/basket/standard/detail/name
-	 * Name of the detail part used by the basket standard detail client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\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 2014.03
-	 * @category Developer
-	 */
-
-	/** client/html/basket/standard/coupon/name
-	 * Name of the detail part used by the basket standard coupon client implementation
-	 *
-	 * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\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 2014.03
-	 * @category Developer
-	 */
-	private $subPartNames = array( 'detail', 'coupon' );
-	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->standardBody = $html;
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-
-		/** client/html/basket/standard/standard/template-body
-		 * Relative path to the HTML body template of the basket standard 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/basket/standard/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/standard/standard/template-body';
-		$default = 'basket/standard/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->standardHeader = $html;
-		}
-		catch( \Exception $e )
-		{
-			$this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
-			return '';
-		}
-
-		/** client/html/basket/standard/standard/template-header
-		 * Relative path to the HTML header template of the basket standard 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/basket/standard/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/standard/standard/template-header';
-		$default = 'basket/standard/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/basket/standard/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket standard 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/basket/standard/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/basket/standard/decorators/global
-		 * @see client/html/basket/standard/decorators/local
-		 */
-
-		/** client/html/basket/standard/decorators/global
-		 * Adds a list of globally available decorators only to the basket standard 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/basket/standard/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/basket/standard/decorators/excludes
-		 * @see client/html/basket/standard/decorators/local
-		 */
-
-		/** client/html/basket/standard/decorators/local
-		 * Adds a list of local decorators only to the basket standard 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/basket/standard/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 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/standard/decorators/excludes
-		 * @see client/html/basket/standard/decorators/global
-		 */
-
-		return $this->createSubClient( 'basket/standard/' . $type, $name );
-	}
-
-
-	/**
-	 * Sets the necessary parameter values in the view.
-	 */
-	public function process()
-	{
-		$view = $this->getView();
-		$context = $this->getContext();
-
-		try
-		{
-			$options = array(
-
-				/** client/html/basket/require-stock
-				 * Customers can order products only if there are enough products in stock
-				 *
-				 * Checks that the requested product quantity is in stock before
-				 * the customer can add them to his basket and order them. If there
-				 * are not enough products available, the customer will get a notice.
-				 *
-				 * @param boolean True if products must be in stock, false if products can be sold without stock
-				 * @since 2014.03
-				 * @category Developer
-				 * @category User
-				 */
-				'stock' => $view->config( 'client/html/basket/require-stock', true ),
-
-				/** client/html/basket/require-variant
-				 * A variant of a selection product must be chosen
-				 *
-				 * Selection products normally consist of several article variants and by default
-				 * exactly one article variant of a selection product can be put into the basket.
-				 *
-				 * By setting this option to false, the selection product including the chosen
-				 * attributes (if any attribute values were selected) can be put into the basket
-				 * as well. This makes it possible to get all articles or a subset of articles
-				 * (e.g. all of a color) at once.
-				 *
-				 * @param boolean True if a variant must be chosen, false if also the selection product with attributes can be added
-				 * @since 2014.03
-				 * @category Developer
-				 * @category User
-				 */
-				'variant' => $view->config( 'client/html/basket/require-variant', true ),
-			);
-
-			switch( $view->param( 'b_action' ) )
-			{
-				case 'add':
-					$this->addProducts( $view, $options );
-					break;
-				case 'delete':
-					$this->deleteProducts( $view );
-					break;
-				default:
-					$this->editProducts( $view, $options );
-			}
-
-			parent::process();
-
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
-		}
-		catch( \Aimeos\Client\Html\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
-		{
-			$errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
-
-			$view->summaryErrorCodes = $e->getErrorCodes();
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
-		}
-		catch( \Aimeos\MShop\Exception $e )
-		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
-		}
-	}
-
-
-	/**
-	 * 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();
-			$site = $context->getLocale()->getSite()->getCode();
-
-			if( ( $params = $context->getSession()->get( 'aimeos/catalog/detail/params/last' . $site ) ) !== null )
-			{
-				$target = $view->config( 'client/html/catalog/detail/url/target' );
-				$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
-				$action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
-				$config = $view->config( 'client/html/catalog/detail/url/config', array() );
-			}
-			else
-			{
-				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
-
-				$target = $view->config( 'client/html/catalog/lists/url/target' );
-				$controller = $view->config( 'client/html/catalog/lists/url/controller', 'catalog' );
-				$action = $view->config( 'client/html/catalog/lists/url/action', 'list' );
-				$config = $view->config( 'client/html/catalog/lists/url/config', array() );
-
-			}
-
-			if( empty( $params ) === false )
-			{
-				$view->standardParams = $this->getClientParams( $view->param() );
-				$view->standardBackUrl = $view->url( $target, $controller, $action, $params, array(), $config );
-			}
-
-			$view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->get();
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
-
-
-	/**
-	 * Adds the products specified by the view parameters to the basket.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $options List of options for addProducts() in basket controller
-	 */
-	protected function addProducts( \Aimeos\MW\View\Iface $view, array $options )
-	{
-		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-
-		if( ( $prodid = $view->param( 'b_prodid', '' ) ) !== '' )
-		{
-			$products[] = array(
-				'prodid' => $prodid,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrvarid' => array_filter( (array) $view->param( 'b_attrvarid', array() ) ),
-				'attrconfid' => array_filter( (array) $view->param( 'b_attrconfid', array() ) ),
-				'attrhideid' => array_filter( (array) $view->param( 'b_attrhideid', array() ) ),
-				'attrcustid' => array_filter( (array) $view->param( 'b_attrcustid', array() ) ),
-				'warehouse' => $view->param( 'b_warehouse', 'default' ),
-			);
-		}
-
-		foreach( $products as $values ) {
-			$this->addProduct( $controller, $values, $options );
-		}
-	}
-
-
-	/**
-	 * Adds a single product specified by its values to the basket.
-	 *
-	 * @param \Aimeos\Controller\Frontend\Basket\Iface $controller Basket frontend controller
-	 * @param array $values Associative list of key/value pairs from the view specifying the product
-	 * @param array $options List of options for addProducts() in basket frontend controller
-	 */
-	protected function addProduct( \Aimeos\Controller\Frontend\Basket\Iface $controller, array $values, array $options )
-	{
-		$controller->addProduct(
-			( isset( $values['prodid'] ) ? (string) $values['prodid'] : '' ),
-			( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
-			$options,
-			( isset( $values['attrvarid'] ) ? array_filter( (array) $values['attrvarid'] ) : array() ),
-			( isset( $values['attrconfid'] ) ? array_filter( (array) $values['attrconfid'] ) : array() ),
-			( isset( $values['attrhideid'] ) ? array_filter( (array) $values['attrhideid'] ) : array() ),
-			( isset( $values['attrcustid'] ) ? array_filter( (array) $values['attrcustid'] ) : array() ),
-			( isset( $values['warehouse'] ) ? (string) $values['warehouse'] : 'default' )
-		);
-	}
-
-
-	/**
-	 * Removes the products specified by the view parameters from the basket.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 */
-	protected function deleteProducts( \Aimeos\MW\View\Iface $view )
-	{
-		$this->clearCached();
-		$products = (array) $view->param( 'b_position', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-
-		foreach( $products as $position ) {
-			$controller->deleteProduct( $position );
-		}
-	}
-
-
-	/**
-	 * Edits the products specified by the view parameters to the basket.
-	 *
-	 * @param \Aimeos\MW\View\Iface $view View object
-	 * @param array $options List of options for editProducts() in basket controller
-	 */
-	protected function editProducts( \Aimeos\MW\View\Iface $view, array $options )
-	{
-		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
-
-		if( ( $position = $view->param( 'b_position', '' ) ) !== '' )
-		{
-			$products[] = array(
-				'position' => $position,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrconf-code' => array_filter( (array) $view->param( 'b_attrconfcode', array() ) )
-			);
-		}
-
-		foreach( $products as $values )
-		{
-			$controller->editProduct(
-				( isset( $values['position'] ) ? (int) $values['position'] : 0 ),
-				( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
-				$options,
-				( isset( $values['attrconf-code'] ) ? array_filter( (array) $values['attrconf-code'] ) : array() )
-			);
-		}
-	}
+    /** client/html/basket/standard/standard/subparts
+     * List of HTML sub-clients rendered within the basket standard 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/basket/standard/standard/subparts';
+
+    /** client/html/basket/standard/detail/name
+     * Name of the detail part used by the basket standard detail client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\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 2014.03
+     * @category Developer
+     */
+
+    /** client/html/basket/standard/coupon/name
+     * Name of the detail part used by the basket standard coupon client implementation
+     *
+     * Use "Myname" if your class is named "\Aimeos\Client\Html\Basket\Standard\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 2014.03
+     * @category Developer
+     */
+    private $subPartNames = array( 'detail', 'coupon' );
+    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->standardBody = $html;
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+
+        /** client/html/basket/standard/standard/template-body
+         * Relative path to the HTML body template of the basket standard 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/basket/standard/standard/template-header
+         */
+        $tplconf = 'client/html/basket/standard/standard/template-body';
+        $default = 'basket/standard/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->standardHeader = $html;
+        }
+        catch( \Exception $e )
+        {
+            $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() );
+            return '';
+        }
+
+        /** client/html/basket/standard/standard/template-header
+         * Relative path to the HTML header template of the basket standard 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/basket/standard/standard/template-body
+         */
+        $tplconf = 'client/html/basket/standard/standard/template-header';
+        $default = 'basket/standard/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/basket/standard/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket standard 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/basket/standard/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/basket/standard/decorators/global
+         * @see client/html/basket/standard/decorators/local
+         */
+
+        /** client/html/basket/standard/decorators/global
+         * Adds a list of globally available decorators only to the basket standard 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/basket/standard/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/basket/standard/decorators/excludes
+         * @see client/html/basket/standard/decorators/local
+         */
+
+        /** client/html/basket/standard/decorators/local
+         * Adds a list of local decorators only to the basket standard 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/basket/standard/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 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/standard/decorators/excludes
+         * @see client/html/basket/standard/decorators/global
+         */
+
+        return $this->createSubClient( 'basket/standard/' . $type, $name );
+    }
+
+
+    /**
+     * Sets the necessary parameter values in the view.
+     */
+    public function process()
+    {
+        $view = $this->getView();
+        $context = $this->getContext();
+
+        try
+        {
+            $options = array(
+
+                /** client/html/basket/require-stock
+                 * Customers can order products only if there are enough products in stock
+                 *
+                 * Checks that the requested product quantity is in stock before
+                 * the customer can add them to his basket and order them. If there
+                 * are not enough products available, the customer will get a notice.
+                 *
+                 * @param boolean True if products must be in stock, false if products can be sold without stock
+                 * @since 2014.03
+                 * @category Developer
+                 * @category User
+                 */
+                'stock' => $view->config( 'client/html/basket/require-stock', true ),
+
+                /** client/html/basket/require-variant
+                 * A variant of a selection product must be chosen
+                 *
+                 * Selection products normally consist of several article variants and by default
+                 * exactly one article variant of a selection product can be put into the basket.
+                 *
+                 * By setting this option to false, the selection product including the chosen
+                 * attributes (if any attribute values were selected) can be put into the basket
+                 * as well. This makes it possible to get all articles or a subset of articles
+                 * (e.g. all of a color) at once.
+                 *
+                 * @param boolean True if a variant must be chosen, false if also the selection product with attributes can be added
+                 * @since 2014.03
+                 * @category Developer
+                 * @category User
+                 */
+                'variant' => $view->config( 'client/html/basket/require-variant', true ),
+            );
+
+            switch( $view->param( 'b_action' ) )
+            {
+                case 'add':
+                    $this->addProducts( $view, $options );
+                    break;
+                case 'delete':
+                    $this->deleteProducts( $view );
+                    break;
+                default:
+                    $this->editProducts( $view, $options );
+            }
+
+            parent::process();
+
+            $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
+            $controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
+        }
+        catch( \Aimeos\Client\Html\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\Controller\Frontend\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+        catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+        {
+            $errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
+
+            $view->summaryErrorCodes = $e->getErrorCodes();
+            $view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
+        }
+        catch( \Aimeos\MShop\Exception $e )
+        {
+            $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
+            $view->standardErrorList = $view->get( 'standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+        }
+    }
+
+
+    /**
+     * 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();
+            $site = $context->getLocale()->getSite()->getCode();
+
+            if( ( $params = $context->getSession()->get( 'aimeos/catalog/detail/params/last' . $site ) ) !== null )
+            {
+                $target = $view->config( 'client/html/catalog/detail/url/target' );
+                $controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
+                $action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
+                $config = $view->config( 'client/html/catalog/detail/url/config', array() );
+            }
+            else
+            {
+                $params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
+
+                $target = $view->config( 'client/html/catalog/lists/url/target' );
+                $controller = $view->config( 'client/html/catalog/lists/url/controller', 'catalog' );
+                $action = $view->config( 'client/html/catalog/lists/url/action', 'list' );
+                $config = $view->config( 'client/html/catalog/lists/url/config', array() );
+
+            }
+
+            if( empty( $params ) === false )
+            {
+                $view->standardParams = $this->getClientParams( $view->param() );
+                $view->standardBackUrl = $view->url( $target, $controller, $action, $params, array(), $config );
+            }
+
+            $view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->get();
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
+
+
+    /**
+     * Adds the products specified by the view parameters to the basket.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $options List of options for addProducts() in basket controller
+     */
+    protected function addProducts( \Aimeos\MW\View\Iface $view, array $options )
+    {
+        $this->clearCached();
+        $products = (array) $view->param( 'b_prod', array() );
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+
+        if( ( $prodid = $view->param( 'b_prodid', '' ) ) !== '' )
+        {
+            $products[] = array(
+                'prodid' => $prodid,
+                'quantity' => $view->param( 'b_quantity', 1 ),
+                'attrvarid' => array_filter( (array) $view->param( 'b_attrvarid', array() ) ),
+                'attrconfid' => array_filter( (array) $view->param( 'b_attrconfid', array() ) ),
+                'attrhideid' => array_filter( (array) $view->param( 'b_attrhideid', array() ) ),
+                'attrcustid' => array_filter( (array) $view->param( 'b_attrcustid', array() ) ),
+                'warehouse' => $view->param( 'b_warehouse', 'default' ),
+            );
+        }
+
+        foreach( $products as $values ) {
+            $this->addProduct( $controller, $values, $options );
+        }
+    }
+
+
+    /**
+     * Adds a single product specified by its values to the basket.
+     *
+     * @param \Aimeos\Controller\Frontend\Basket\Iface $controller Basket frontend controller
+     * @param array $values Associative list of key/value pairs from the view specifying the product
+     * @param array $options List of options for addProducts() in basket frontend controller
+     */
+    protected function addProduct( \Aimeos\Controller\Frontend\Basket\Iface $controller, array $values, array $options )
+    {
+        $controller->addProduct(
+            ( isset( $values['prodid'] ) ? (string) $values['prodid'] : '' ),
+            ( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+            $options,
+            ( isset( $values['attrvarid'] ) ? array_filter( (array) $values['attrvarid'] ) : array() ),
+            ( isset( $values['attrconfid'] ) ? array_filter( (array) $values['attrconfid'] ) : array() ),
+            ( isset( $values['attrhideid'] ) ? array_filter( (array) $values['attrhideid'] ) : array() ),
+            ( isset( $values['attrcustid'] ) ? array_filter( (array) $values['attrcustid'] ) : array() ),
+            ( isset( $values['warehouse'] ) ? (string) $values['warehouse'] : 'default' )
+        );
+    }
+
+
+    /**
+     * Removes the products specified by the view parameters from the basket.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     */
+    protected function deleteProducts( \Aimeos\MW\View\Iface $view )
+    {
+        $this->clearCached();
+        $products = (array) $view->param( 'b_position', array() );
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+
+        foreach( $products as $position ) {
+            $controller->deleteProduct( $position );
+        }
+    }
+
+
+    /**
+     * Edits the products specified by the view parameters to the basket.
+     *
+     * @param \Aimeos\MW\View\Iface $view View object
+     * @param array $options List of options for editProducts() in basket controller
+     */
+    protected function editProducts( \Aimeos\MW\View\Iface $view, array $options )
+    {
+        $this->clearCached();
+        $products = (array) $view->param( 'b_prod', array() );
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+
+        if( ( $position = $view->param( 'b_position', '' ) ) !== '' )
+        {
+            $products[] = array(
+                'position' => $position,
+                'quantity' => $view->param( 'b_quantity', 1 ),
+                'attrconf-code' => array_filter( (array) $view->param( 'b_attrconfcode', array() ) )
+            );
+        }
+
+        foreach( $products as $values )
+        {
+            $controller->editProduct(
+                ( isset( $values['position'] ) ? (int) $values['position'] : 0 ),
+                ( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+                $options,
+                ( isset( $values['attrconf-code'] ) ? array_filter( (array) $values['attrconf-code'] ) : array() )
+            );
+        }
+    }
 }
\ No newline at end of file

Spacing +105 added lines, -105 removed lines

@@ -78,7 +78,7 @@ 
 	 * @since 2014.03
 	 * @category Developer
 	 */
-	private $subPartNames = array( 'detail', 'coupon' );
+	private $subPartNames = array('detail', 'coupon');
 	private $cache;
 
 
@@ -90,42 +90,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->standardBody = $html;
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('client', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
 
 		/** client/html/basket/standard/standard/template-body
@@ -151,7 +151,7 @@ 
 		$tplconf = 'client/html/basket/standard/standard/template-body';
 		$default = 'basket/standard/body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -163,21 +163,21 @@ 
 	 * @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->standardHeader = $html;
 		}
-		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());
 			return '';
 		}
 
@@ -205,7 +205,7 @@ 
 		$tplconf = 'client/html/basket/standard/standard/template-header';
 		$default = 'basket/standard/header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -216,7 +216,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/basket/standard/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket standard html client
@@ -292,7 +292,7 @@ 
 		 * @see client/html/basket/standard/decorators/global
 		 */
 
-		return $this->createSubClient( 'basket/standard/' . $type, $name );
+		return $this->createSubClient('basket/standard/'.$type, $name);
 	}
 
 
@@ -320,7 +320,7 @@ 
 				 * @category Developer
 				 * @category User
 				 */
-				'stock' => $view->config( 'client/html/basket/require-stock', true ),
+				'stock' => $view->config('client/html/basket/require-stock', true),
 
 				/** client/html/basket/require-variant
 				 * A variant of a selection product must be chosen
@@ -338,55 +338,55 @@ 
 				 * @category Developer
 				 * @category User
 				 */
-				'variant' => $view->config( 'client/html/basket/require-variant', true ),
+				'variant' => $view->config('client/html/basket/require-variant', true),
 			);
 
-			switch( $view->param( 'b_action' ) )
+			switch ($view->param('b_action'))
 			{
 				case 'add':
-					$this->addProducts( $view, $options );
+					$this->addProducts($view, $options);
 					break;
 				case 'delete':
-					$this->deleteProducts( $view );
+					$this->deleteProducts($view);
 					break;
 				default:
-					$this->editProducts( $view, $options );
+					$this->editProducts($view, $options);
 			}
 
 			parent::process();
 
-			$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' );
-			$controller->get()->check( \Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT );
+			$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket');
+			$controller->get()->check(\Aimeos\MShop\Order\Item\Base\Base::PARTS_PRODUCT);
 		}
-		catch( \Aimeos\Client\Html\Exception $e )
+		catch (\Aimeos\Client\Html\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\Controller\Frontend\Exception $e )
+		catch (\Aimeos\Controller\Frontend\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('controller/frontend', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
-		catch( \Aimeos\MShop\Plugin\Provider\Exception $e )
+		catch (\Aimeos\MShop\Plugin\Provider\Exception $e)
 		{
-			$errors = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$errors = array_merge( $errors, $this->translatePluginErrorCodes( $e->getErrorCodes() ) );
+			$errors = array($context->getI18n()->dt('mshop', $e->getMessage()));
+			$errors = array_merge($errors, $this->translatePluginErrorCodes($e->getErrorCodes()));
 
 			$view->summaryErrorCodes = $e->getErrorCodes();
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $errors;
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $errors;
 		}
-		catch( \Aimeos\MShop\Exception $e )
+		catch (\Aimeos\MShop\Exception $e)
 		{
-			$error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) );
-			$view->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('mshop', $e->getMessage()));
+			$view->standardErrorList = $view->get('standardErrorList', 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->standardErrorList = $view->get( 'standardErrorList', array() ) + $error;
+			$error = array($context->getI18n()->dt('client', 'A non-recoverable error occured'));
+			$view->standardErrorList = $view->get('standardErrorList', array()) + $error;
 		}
 	}
 
@@ -398,7 +398,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -410,38 +410,38 @@ 
 	 * @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();
 			$site = $context->getLocale()->getSite()->getCode();
 
-			if( ( $params = $context->getSession()->get( 'aimeos/catalog/detail/params/last' . $site ) ) !== null )
+			if (($params = $context->getSession()->get('aimeos/catalog/detail/params/last'.$site)) !== null)
 			{
-				$target = $view->config( 'client/html/catalog/detail/url/target' );
-				$controller = $view->config( 'client/html/catalog/detail/url/controller', 'catalog' );
-				$action = $view->config( 'client/html/catalog/detail/url/action', 'detail' );
-				$config = $view->config( 'client/html/catalog/detail/url/config', array() );
+				$target = $view->config('client/html/catalog/detail/url/target');
+				$controller = $view->config('client/html/catalog/detail/url/controller', 'catalog');
+				$action = $view->config('client/html/catalog/detail/url/action', 'detail');
+				$config = $view->config('client/html/catalog/detail/url/config', array());
 			}
 			else
 			{
-				$params = $context->getSession()->get( 'aimeos/catalog/lists/params/last' . $site, array() );
+				$params = $context->getSession()->get('aimeos/catalog/lists/params/last'.$site, array());
 
-				$target = $view->config( 'client/html/catalog/lists/url/target' );
-				$controller = $view->config( 'client/html/catalog/lists/url/controller', 'catalog' );
-				$action = $view->config( 'client/html/catalog/lists/url/action', 'list' );
-				$config = $view->config( 'client/html/catalog/lists/url/config', array() );
+				$target = $view->config('client/html/catalog/lists/url/target');
+				$controller = $view->config('client/html/catalog/lists/url/controller', 'catalog');
+				$action = $view->config('client/html/catalog/lists/url/action', 'list');
+				$config = $view->config('client/html/catalog/lists/url/config', array());
 
 			}
 
-			if( empty( $params ) === false )
+			if (empty($params) === false)
 			{
-				$view->standardParams = $this->getClientParams( $view->param() );
-				$view->standardBackUrl = $view->url( $target, $controller, $action, $params, array(), $config );
+				$view->standardParams = $this->getClientParams($view->param());
+				$view->standardBackUrl = $view->url($target, $controller, $action, $params, array(), $config);
 			}
 
-			$view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->get();
+			$view->standardBasket = \Aimeos\Controller\Frontend\Factory::createController($context, 'basket')->get();
 
 			$this->cache = $view;
 		}
@@ -456,27 +456,27 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param array $options List of options for addProducts() in basket controller
 	 */
-	protected function addProducts( \Aimeos\MW\View\Iface $view, array $options )
+	protected function addProducts(\Aimeos\MW\View\Iface $view, array $options)
 	{
 		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+		$products = (array) $view->param('b_prod', array());
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
-		if( ( $prodid = $view->param( 'b_prodid', '' ) ) !== '' )
+		if (($prodid = $view->param('b_prodid', '')) !== '')
 		{
 			$products[] = array(
 				'prodid' => $prodid,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrvarid' => array_filter( (array) $view->param( 'b_attrvarid', array() ) ),
-				'attrconfid' => array_filter( (array) $view->param( 'b_attrconfid', array() ) ),
-				'attrhideid' => array_filter( (array) $view->param( 'b_attrhideid', array() ) ),
-				'attrcustid' => array_filter( (array) $view->param( 'b_attrcustid', array() ) ),
-				'warehouse' => $view->param( 'b_warehouse', 'default' ),
+				'quantity' => $view->param('b_quantity', 1),
+				'attrvarid' => array_filter((array) $view->param('b_attrvarid', array())),
+				'attrconfid' => array_filter((array) $view->param('b_attrconfid', array())),
+				'attrhideid' => array_filter((array) $view->param('b_attrhideid', array())),
+				'attrcustid' => array_filter((array) $view->param('b_attrcustid', array())),
+				'warehouse' => $view->param('b_warehouse', 'default'),
 			);
 		}
 
-		foreach( $products as $values ) {
-			$this->addProduct( $controller, $values, $options );
+		foreach ($products as $values) {
+			$this->addProduct($controller, $values, $options);
 		}
 	}
 
@@ -488,17 +488,17 @@ 
 	 * @param array $values Associative list of key/value pairs from the view specifying the product
 	 * @param array $options List of options for addProducts() in basket frontend controller
 	 */
-	protected function addProduct( \Aimeos\Controller\Frontend\Basket\Iface $controller, array $values, array $options )
+	protected function addProduct(\Aimeos\Controller\Frontend\Basket\Iface $controller, array $values, array $options)
 	{
 		$controller->addProduct(
-			( isset( $values['prodid'] ) ? (string) $values['prodid'] : '' ),
-			( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+			(isset($values['prodid']) ? (string) $values['prodid'] : ''),
+			(isset($values['quantity']) ? (int) $values['quantity'] : 1),
 			$options,
-			( isset( $values['attrvarid'] ) ? array_filter( (array) $values['attrvarid'] ) : array() ),
-			( isset( $values['attrconfid'] ) ? array_filter( (array) $values['attrconfid'] ) : array() ),
-			( isset( $values['attrhideid'] ) ? array_filter( (array) $values['attrhideid'] ) : array() ),
-			( isset( $values['attrcustid'] ) ? array_filter( (array) $values['attrcustid'] ) : array() ),
-			( isset( $values['warehouse'] ) ? (string) $values['warehouse'] : 'default' )
+			(isset($values['attrvarid']) ? array_filter((array) $values['attrvarid']) : array()),
+			(isset($values['attrconfid']) ? array_filter((array) $values['attrconfid']) : array()),
+			(isset($values['attrhideid']) ? array_filter((array) $values['attrhideid']) : array()),
+			(isset($values['attrcustid']) ? array_filter((array) $values['attrcustid']) : array()),
+			(isset($values['warehouse']) ? (string) $values['warehouse'] : 'default')
 		);
 	}
 
@@ -508,14 +508,14 @@ 
 	 *
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 */
-	protected function deleteProducts( \Aimeos\MW\View\Iface $view )
+	protected function deleteProducts(\Aimeos\MW\View\Iface $view)
 	{
 		$this->clearCached();
-		$products = (array) $view->param( 'b_position', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+		$products = (array) $view->param('b_position', array());
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
-		foreach( $products as $position ) {
-			$controller->deleteProduct( $position );
+		foreach ($products as $position) {
+			$controller->deleteProduct($position);
 		}
 	}
 
@@ -526,28 +526,28 @@ 
 	 * @param \Aimeos\MW\View\Iface $view View object
 	 * @param array $options List of options for editProducts() in basket controller
 	 */
-	protected function editProducts( \Aimeos\MW\View\Iface $view, array $options )
+	protected function editProducts(\Aimeos\MW\View\Iface $view, array $options)
 	{
 		$this->clearCached();
-		$products = (array) $view->param( 'b_prod', array() );
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $this->getContext(), 'basket' );
+		$products = (array) $view->param('b_prod', array());
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($this->getContext(), 'basket');
 
-		if( ( $position = $view->param( 'b_position', '' ) ) !== '' )
+		if (($position = $view->param('b_position', '')) !== '')
 		{
 			$products[] = array(
 				'position' => $position,
-				'quantity' => $view->param( 'b_quantity', 1 ),
-				'attrconf-code' => array_filter( (array) $view->param( 'b_attrconfcode', array() ) )
+				'quantity' => $view->param('b_quantity', 1),
+				'attrconf-code' => array_filter((array) $view->param('b_attrconfcode', array()))
 			);
 		}
 
-		foreach( $products as $values )
+		foreach ($products as $values)
 		{
 			$controller->editProduct(
-				( isset( $values['position'] ) ? (int) $values['position'] : 0 ),
-				( isset( $values['quantity'] ) ? (int) $values['quantity'] : 1 ),
+				(isset($values['position']) ? (int) $values['position'] : 0),
+				(isset($values['quantity']) ? (int) $values['quantity'] : 1),
 				$options,
-				( isset( $values['attrconf-code'] ) ? array_filter( (array) $values['attrconf-code'] ) : array() )
+				(isset($values['attrconf-code']) ? array_filter((array) $values['attrconf-code']) : array())
 			);
 		}
 	}

client/html/src/Client/Html/Basket/Related/Bought/Standard.php

Indentation +375 added lines, -375 removed lines

@@ -18,380 +18,380 @@
  * @subpackage Html
  */
 class Standard
-	extends \Aimeos\Client\Html\Basket\Base
-	implements \Aimeos\Client\Html\Common\Client\Factory\Iface
+    extends \Aimeos\Client\Html\Basket\Base
+    implements \Aimeos\Client\Html\Common\Client\Factory\Iface
 {
-	/** client/html/basket/related/bought/standard/subparts
-	 * List of HTML sub-clients rendered within the basket related bought 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/basket/related/bought/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 );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
-		}
-		$view->boughtBody = $html;
-
-		/** client/html/basket/related/bought/standard/template-body
-		 * Relative path to the HTML body template of the basket related bought 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/basket/related/bought/standard/template-header
-		 */
-		$tplconf = 'client/html/basket/related/bought/standard/template-body';
-		$default = 'basket/related/bought-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 )
-	{
-		$view = $this->setViewParams( $this->getView(), $tags, $expire );
-
-		$html = '';
-		foreach( $this->getSubClients() as $subclient ) {
-			$html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
-		}
-		$view->boughtHeader = $html;
-
-		/** client/html/basket/related/bought/standard/template-header
-		 * Relative path to the HTML header template of the basket related bought 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/basket/related/bought/standard/template-body
-		 */
-		$tplconf = 'client/html/basket/related/bought/standard/template-header';
-		$default = 'basket/related/bought-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/basket/related/bought/decorators/excludes
-		 * Excludes decorators added by the "common" option from the basket related bought 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/basket/related/bought/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/basket/related/bought/decorators/global
-		 * @see client/html/basket/related/bought/decorators/local
-		 */
-
-		/** client/html/basket/related/bought/decorators/global
-		 * Adds a list of globally available decorators only to the basket related bought 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/basket/related/bought/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/basket/related/bought/decorators/excludes
-		 * @see client/html/basket/related/bought/decorators/local
-		 */
-
-		/** client/html/basket/related/bought/decorators/local
-		 * Adds a list of local decorators only to the basket related bought 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/basket/related/bought/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 2014.05
-		 * @category Developer
-		 * @see client/html/common/decorators/default
-		 * @see client/html/basket/related/bought/decorators/excludes
-		 * @see client/html/basket/related/bought/decorators/global
-		 */
-
-		return $this->createSubClient( 'basket/related/bought/' . $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 ) )
-		{
-			if( isset( $view->relatedBasket ) )
-			{
-				$refIds = $items = array();
-				$context = $this->getContext();
-
-				$prodIds = $this->getProductIdsFromBasket( $view->relatedBasket );
-
-				foreach( $this->getListItems( $prodIds ) as $listItem )
-				{
-					$refId = $listItem->getRefId();
-
-					if( !isset( $prodIds[$refId] ) ) {
-						$refIds[$refId] = $refId;
-					}
-				}
-
-				$products = $this->getProductItems( $refIds );
-
-				foreach( $refIds as $id )
-				{
-					if( isset( $products[$id] ) ) {
-						$items[$id] = $products[$id];
-					}
-				}
-
-				/** client/html/basket/related/bought/standard/limit
-				 * Number of items in the list of bought together products
-				 *
-				 * This option limits the number of suggested products in the
-				 * list of bought together products. The suggested items are
-				 * calculated using the products that are in the current basket
-				 * of the customer.
-				 *
-				 * Note: You need to start the job controller for calculating
-				 * the bought together products regularly to get up to date
-				 * product suggestions.
-				 *
-				 * @param integer Number of products
-				 * @since 2014.09
-				 */
-				$size = $context->getConfig()->get( 'client/html/basket/related/bought/standard/limit', 6 );
-
-
-				$view->boughtItems = array_slice( $items, 0, $size, true );
-			}
-
-			$this->cache = $view;
-		}
-
-		return $this->cache;
-	}
-
-
-	/**
-	 * Returns the list items of type "bought-together" associated to the given product IDs.
-	 *
-	 * @param string[] $prodIds List of product IDs
-	 * @return \Aimeos\MShop\Product\Item\Lists\Iface[] List of product list items
-	 */
-	protected function getListItems( array $prodIds )
-	{
-		$typeItem = $this->getTypeItem( 'product/lists/type', 'product', 'bought-together' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
-
-		$search = $manager->createSearch( true );
-		$expr = array(
-				$search->compare( '==', 'product.lists.parentid', $prodIds ),
-				$search->compare( '==', 'product.lists.typeid', $typeItem->getId() ),
-				$search->compare( '==', 'product.lists.domain', 'product' ),
-				$search->getConditions(),
-		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'product.lists.position' ) ) );
-
-		return $manager->searchItems( $search );
-	}
-
-
-	/**
-	 * Returns the IDs of the products in the current basket.
-	 *
-	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
-	 * @return string[] List of product IDs
-	 */
-	protected function getProductIdsFromBasket( \Aimeos\MShop\Order\Item\Base\Iface $basket )
-	{
-		$list = array();
-
-		foreach( $basket->getProducts() as $orderProduct )
-		{
-			$list[ $orderProduct->getProductId() ] = true;
-
-			foreach( $orderProduct->getProducts() as $subProduct ) {
-				$list[ $subProduct->getProductId() ] = true;
-			}
-		}
-
-		return array_keys( $list );
-	}
-
-
-	/**
-	 * Returns the product items for the given IDs.
-	 *
-	 * @param string[] $ids List of product IDs
-	 * @return \Aimeos\MShop\Product\Item\Iface[] List of product items
-	 */
-	protected function getProductItems( array $ids )
-	{
-		$context = $this->getContext();
-		$config = $context->getConfig();
-
-		/** client/html/basket/related/bought/standard/domains
-		 * The list of domain names whose items should be available in the template for the products
-		 *
-		 * The templates rendering product details usually add the images,
-		 * prices and texts, etc. 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
-		 */
-		$domains = array( 'text', 'price', 'media' );
-		$domains = $config->get( 'client/html/basket/related/bought/standard/domains', $domains );
-
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
-
-		return $controller->getProductItems( $ids, $domains );
-	}
+    /** client/html/basket/related/bought/standard/subparts
+     * List of HTML sub-clients rendered within the basket related bought 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/basket/related/bought/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 );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire );
+        }
+        $view->boughtBody = $html;
+
+        /** client/html/basket/related/bought/standard/template-body
+         * Relative path to the HTML body template of the basket related bought 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/basket/related/bought/standard/template-header
+         */
+        $tplconf = 'client/html/basket/related/bought/standard/template-body';
+        $default = 'basket/related/bought-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 )
+    {
+        $view = $this->setViewParams( $this->getView(), $tags, $expire );
+
+        $html = '';
+        foreach( $this->getSubClients() as $subclient ) {
+            $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire );
+        }
+        $view->boughtHeader = $html;
+
+        /** client/html/basket/related/bought/standard/template-header
+         * Relative path to the HTML header template of the basket related bought 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/basket/related/bought/standard/template-body
+         */
+        $tplconf = 'client/html/basket/related/bought/standard/template-header';
+        $default = 'basket/related/bought-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/basket/related/bought/decorators/excludes
+         * Excludes decorators added by the "common" option from the basket related bought 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/basket/related/bought/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/basket/related/bought/decorators/global
+         * @see client/html/basket/related/bought/decorators/local
+         */
+
+        /** client/html/basket/related/bought/decorators/global
+         * Adds a list of globally available decorators only to the basket related bought 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/basket/related/bought/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/basket/related/bought/decorators/excludes
+         * @see client/html/basket/related/bought/decorators/local
+         */
+
+        /** client/html/basket/related/bought/decorators/local
+         * Adds a list of local decorators only to the basket related bought 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/basket/related/bought/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 2014.05
+         * @category Developer
+         * @see client/html/common/decorators/default
+         * @see client/html/basket/related/bought/decorators/excludes
+         * @see client/html/basket/related/bought/decorators/global
+         */
+
+        return $this->createSubClient( 'basket/related/bought/' . $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 ) )
+        {
+            if( isset( $view->relatedBasket ) )
+            {
+                $refIds = $items = array();
+                $context = $this->getContext();
+
+                $prodIds = $this->getProductIdsFromBasket( $view->relatedBasket );
+
+                foreach( $this->getListItems( $prodIds ) as $listItem )
+                {
+                    $refId = $listItem->getRefId();
+
+                    if( !isset( $prodIds[$refId] ) ) {
+                        $refIds[$refId] = $refId;
+                    }
+                }
+
+                $products = $this->getProductItems( $refIds );
+
+                foreach( $refIds as $id )
+                {
+                    if( isset( $products[$id] ) ) {
+                        $items[$id] = $products[$id];
+                    }
+                }
+
+                /** client/html/basket/related/bought/standard/limit
+                 * Number of items in the list of bought together products
+                 *
+                 * This option limits the number of suggested products in the
+                 * list of bought together products. The suggested items are
+                 * calculated using the products that are in the current basket
+                 * of the customer.
+                 *
+                 * Note: You need to start the job controller for calculating
+                 * the bought together products regularly to get up to date
+                 * product suggestions.
+                 *
+                 * @param integer Number of products
+                 * @since 2014.09
+                 */
+                $size = $context->getConfig()->get( 'client/html/basket/related/bought/standard/limit', 6 );
+
+
+                $view->boughtItems = array_slice( $items, 0, $size, true );
+            }
+
+            $this->cache = $view;
+        }
+
+        return $this->cache;
+    }
+
+
+    /**
+     * Returns the list items of type "bought-together" associated to the given product IDs.
+     *
+     * @param string[] $prodIds List of product IDs
+     * @return \Aimeos\MShop\Product\Item\Lists\Iface[] List of product list items
+     */
+    protected function getListItems( array $prodIds )
+    {
+        $typeItem = $this->getTypeItem( 'product/lists/type', 'product', 'bought-together' );
+        $manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+
+        $search = $manager->createSearch( true );
+        $expr = array(
+                $search->compare( '==', 'product.lists.parentid', $prodIds ),
+                $search->compare( '==', 'product.lists.typeid', $typeItem->getId() ),
+                $search->compare( '==', 'product.lists.domain', 'product' ),
+                $search->getConditions(),
+        );
+        $search->setConditions( $search->combine( '&&', $expr ) );
+        $search->setSortations( array( $search->sort( '+', 'product.lists.position' ) ) );
+
+        return $manager->searchItems( $search );
+    }
+
+
+    /**
+     * Returns the IDs of the products in the current basket.
+     *
+     * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
+     * @return string[] List of product IDs
+     */
+    protected function getProductIdsFromBasket( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+    {
+        $list = array();
+
+        foreach( $basket->getProducts() as $orderProduct )
+        {
+            $list[ $orderProduct->getProductId() ] = true;
+
+            foreach( $orderProduct->getProducts() as $subProduct ) {
+                $list[ $subProduct->getProductId() ] = true;
+            }
+        }
+
+        return array_keys( $list );
+    }
+
+
+    /**
+     * Returns the product items for the given IDs.
+     *
+     * @param string[] $ids List of product IDs
+     * @return \Aimeos\MShop\Product\Item\Iface[] List of product items
+     */
+    protected function getProductItems( array $ids )
+    {
+        $context = $this->getContext();
+        $config = $context->getConfig();
+
+        /** client/html/basket/related/bought/standard/domains
+         * The list of domain names whose items should be available in the template for the products
+         *
+         * The templates rendering product details usually add the images,
+         * prices and texts, etc. 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
+         */
+        $domains = array( 'text', 'price', 'media' );
+        $domains = $config->get( 'client/html/basket/related/bought/standard/domains', $domains );
+
+        $controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+
+        return $controller->getProductItems( $ids, $domains );
+    }
 }
\ No newline at end of file

Spacing +45 added lines, -45 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->boughtBody = $html;
 
@@ -100,7 +100,7 @@ 
 		$tplconf = 'client/html/basket/related/bought/standard/template-body';
 		$default = 'basket/related/bought-body-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -112,13 +112,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->boughtHeader = $html;
 
@@ -146,7 +146,7 @@ 
 		$tplconf = 'client/html/basket/related/bought/standard/template-header';
 		$default = 'basket/related/bought-header-default.php';
 
-		return $view->render( $view->config( $tplconf, $default ) );
+		return $view->render($view->config($tplconf, $default));
 	}
 
 
@@ -157,7 +157,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/basket/related/bought/decorators/excludes
 		 * Excludes decorators added by the "common" option from the basket related bought html client
@@ -233,7 +233,7 @@ 
 		 * @see client/html/basket/related/bought/decorators/global
 		 */
 
-		return $this->createSubClient( 'basket/related/bought/' . $type, $name );
+		return $this->createSubClient('basket/related/bought/'.$type, $name);
 	}
 
 
@@ -244,7 +244,7 @@ 
 	 */
 	protected function getSubClientNames()
 	{
-		return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames );
+		return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames);
 	}
 
 
@@ -256,31 +256,31 @@ 
 	 * @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))
 		{
-			if( isset( $view->relatedBasket ) )
+			if (isset($view->relatedBasket))
 			{
 				$refIds = $items = array();
 				$context = $this->getContext();
 
-				$prodIds = $this->getProductIdsFromBasket( $view->relatedBasket );
+				$prodIds = $this->getProductIdsFromBasket($view->relatedBasket);
 
-				foreach( $this->getListItems( $prodIds ) as $listItem )
+				foreach ($this->getListItems($prodIds) as $listItem)
 				{
 					$refId = $listItem->getRefId();
 
-					if( !isset( $prodIds[$refId] ) ) {
+					if (!isset($prodIds[$refId])) {
 						$refIds[$refId] = $refId;
 					}
 				}
 
-				$products = $this->getProductItems( $refIds );
+				$products = $this->getProductItems($refIds);
 
-				foreach( $refIds as $id )
+				foreach ($refIds as $id)
 				{
-					if( isset( $products[$id] ) ) {
+					if (isset($products[$id])) {
 						$items[$id] = $products[$id];
 					}
 				}
@@ -300,10 +300,10 @@ 
 				 * @param integer Number of products
 				 * @since 2014.09
 				 */
-				$size = $context->getConfig()->get( 'client/html/basket/related/bought/standard/limit', 6 );
+				$size = $context->getConfig()->get('client/html/basket/related/bought/standard/limit', 6);
 
 
-				$view->boughtItems = array_slice( $items, 0, $size, true );
+				$view->boughtItems = array_slice($items, 0, $size, true);
 			}
 
 			$this->cache = $view;
@@ -319,22 +319,22 @@ 
 	 * @param string[] $prodIds List of product IDs
 	 * @return \Aimeos\MShop\Product\Item\Lists\Iface[] List of product list items
 	 */
-	protected function getListItems( array $prodIds )
+	protected function getListItems(array $prodIds)
 	{
-		$typeItem = $this->getTypeItem( 'product/lists/type', 'product', 'bought-together' );
-		$manager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'product/lists' );
+		$typeItem = $this->getTypeItem('product/lists/type', 'product', 'bought-together');
+		$manager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'product/lists');
 
-		$search = $manager->createSearch( true );
+		$search = $manager->createSearch(true);
 		$expr = array(
-				$search->compare( '==', 'product.lists.parentid', $prodIds ),
-				$search->compare( '==', 'product.lists.typeid', $typeItem->getId() ),
-				$search->compare( '==', 'product.lists.domain', 'product' ),
+				$search->compare('==', 'product.lists.parentid', $prodIds),
+				$search->compare('==', 'product.lists.typeid', $typeItem->getId()),
+				$search->compare('==', 'product.lists.domain', 'product'),
 				$search->getConditions(),
 		);
-		$search->setConditions( $search->combine( '&&', $expr ) );
-		$search->setSortations( array( $search->sort( '+', 'product.lists.position' ) ) );
+		$search->setConditions($search->combine('&&', $expr));
+		$search->setSortations(array($search->sort('+', 'product.lists.position')));
 
-		return $manager->searchItems( $search );
+		return $manager->searchItems($search);
 	}
 
 
@@ -344,20 +344,20 @@ 
 	 * @param \Aimeos\MShop\Order\Item\Base\Iface $basket Basket object
 	 * @return string[] List of product IDs
 	 */
-	protected function getProductIdsFromBasket( \Aimeos\MShop\Order\Item\Base\Iface $basket )
+	protected function getProductIdsFromBasket(\Aimeos\MShop\Order\Item\Base\Iface $basket)
 	{
 		$list = array();
 
-		foreach( $basket->getProducts() as $orderProduct )
+		foreach ($basket->getProducts() as $orderProduct)
 		{
-			$list[ $orderProduct->getProductId() ] = true;
+			$list[$orderProduct->getProductId()] = true;
 
-			foreach( $orderProduct->getProducts() as $subProduct ) {
-				$list[ $subProduct->getProductId() ] = true;
+			foreach ($orderProduct->getProducts() as $subProduct) {
+				$list[$subProduct->getProductId()] = true;
 			}
 		}
 
-		return array_keys( $list );
+		return array_keys($list);
 	}
 
 
@@ -367,7 +367,7 @@ 
 	 * @param string[] $ids List of product IDs
 	 * @return \Aimeos\MShop\Product\Item\Iface[] List of product items
 	 */
-	protected function getProductItems( array $ids )
+	protected function getProductItems(array $ids)
 	{
 		$context = $this->getContext();
 		$config = $context->getConfig();
@@ -387,11 +387,11 @@ 
 		 * @since 2014.09
 		 * @category Developer
 		 */
-		$domains = array( 'text', 'price', 'media' );
-		$domains = $config->get( 'client/html/basket/related/bought/standard/domains', $domains );
+		$domains = array('text', 'price', 'media');
+		$domains = $config->get('client/html/basket/related/bought/standard/domains', $domains);
 
-		$controller = \Aimeos\Controller\Frontend\Factory::createController( $context, 'catalog' );
+		$controller = \Aimeos\Controller\Frontend\Factory::createController($context, 'catalog');
 
-		return $controller->getProductItems( $ids, $domains );
+		return $controller->getProductItems($ids, $domains);
 	}
 }
\ No newline at end of file

Doc Comments +1 added lines, -1 removed lines

@@ -110,7 +110,7 @@
 	 * @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
+	 * @return string String including HTML tags for the header on error
 	 */
 	public function getHeader( $uid = '', array &$tags = array(), &$expire = null )
 	{