aimeos / ai-client-html

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

Spacing +31 added lines, -31 removed lines

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

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

Spacing +13 added lines, -13 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +29 added lines, -29 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +63 added lines, -63 removed lines

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

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

Spacing +9 added lines, -9 removed lines

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

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

Spacing +100 added lines, -100 removed lines

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

client/html/src/Client/Html/Email/Delivery/Html/Summary/Service/Standard.php

Spacing +13 added lines, -13 removed lines

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