aimeos / ai-ezpublish

lib/custom/src/MShop/Customer/Item/Ezpublish.php

Indentation +30 added lines, -30 removed lines

@@ -19,34 +19,34 @@
  */
 class Ezpublish extends Standard implements Iface
 {
-	private $password = null;
-
-
-	/**
-	 * Returns the password of the customer item
-	 *
-	 * @return string
-	 */
-	public function getPassword()
-	{
-		return $this->password;
-	}
-
-
-	/**
-	 * Sets the password of the customer item
-	 *
-	 * @param string $value password of the customer item
-	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
-	 */
-	public function setPassword( $value )
-	{
-		if( $value !== '' && $value != $this->getPassword() )
-		{
-			$this->password = (string) $value;
-			$this->setModified();
-		}
-
-		return $this;
-	}
+    private $password = null;
+
+
+    /**
+     * Returns the password of the customer item
+     *
+     * @return string
+     */
+    public function getPassword()
+    {
+        return $this->password;
+    }
+
+
+    /**
+     * Sets the password of the customer item
+     *
+     * @param string $value password of the customer item
+     * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
+     */
+    public function setPassword( $value )
+    {
+        if( $value !== '' && $value != $this->getPassword() )
+        {
+            $this->password = (string) $value;
+            $this->setModified();
+        }
+
+        return $this;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -39,9 +39,9 @@
 	 * @param string $value password of the customer item
 	 * @return \Aimeos\MShop\Customer\Item\Iface Customer item for chaining method calls
 	 */
-	public function setPassword( $value )
+	public function setPassword($value)
 	{
-		if( $value !== '' && $value != $this->getPassword() )
+		if ($value !== '' && $value != $this->getPassword())
 		{
 			$this->password = (string) $value;
 			$this->setModified();

lib/custom/src/MShop/Customer/Manager/Lists/Ezpublish.php

Indentation +193 added lines, -193 removed lines

@@ -18,198 +18,198 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Lists\Standard
-	implements \Aimeos\MShop\Customer\Manager\Lists\Iface, \Aimeos\MShop\Common\Manager\Lists\Iface
+    extends \Aimeos\MShop\Customer\Manager\Lists\Standard
+    implements \Aimeos\MShop\Customer\Manager\Lists\Iface, \Aimeos\MShop\Common\Manager\Lists\Iface
 {
-	private $searchConfig = array(
-		'customer.lists.id'=> array(
-			'code'=>'customer.lists.id',
-			'internalcode'=>'ezuli."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )' ),
-			'label'=>'Customer list ID',
-			'type'=> 'integer',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.siteid'=> array(
-			'code'=>'customer.lists.siteid',
-			'internalcode'=>'ezuli."siteid"',
-			'label'=>'Customer list site ID',
-			'type'=> 'integer',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.parentid'=> array(
-			'code'=>'customer.lists.parentid',
-			'internalcode'=>'ezuli."parentid"',
-			'label'=>'Customer list parent ID',
-			'type'=> 'integer',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.domain'=> array(
-			'code'=>'customer.lists.domain',
-			'internalcode'=>'ezuli."domain"',
-			'label'=>'Customer list domain',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.typeid' => array(
-			'code'=>'customer.lists.typeid',
-			'internalcode'=>'ezuli."typeid"',
-			'label'=>'Customer list type ID',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.refid'=> array(
-			'code'=>'customer.lists.refid',
-			'internalcode'=>'ezuli."refid"',
-			'label'=>'Customer list reference ID',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.datestart' => array(
-			'code'=>'customer.lists.datestart',
-			'internalcode'=>'ezuli."start"',
-			'label'=>'Customer list start date/time',
-			'type'=> 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.dateend' => array(
-			'code'=>'customer.lists.dateend',
-			'internalcode'=>'ezuli."end"',
-			'label'=>'Customer list end date/time',
-			'type'=> 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.config' => array(
-			'code'=>'customer.lists.config',
-			'internalcode'=>'ezuli."config"',
-			'label'=>'Customer list position',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.position' => array(
-			'code'=>'customer.lists.position',
-			'internalcode'=>'ezuli."pos"',
-			'label'=>'Customer list position',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.lists.status' => array(
-			'code'=>'customer.lists.status',
-			'internalcode'=>'ezuli."status"',
-			'label'=>'Customer list status',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.lists.ctime'=> array(
-			'code'=>'customer.lists.ctime',
-			'internalcode'=>'ezuli."ctime"',
-			'label'=>'Customer list create date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.mtime'=> array(
-			'code'=>'customer.lists.mtime',
-			'internalcode'=>'ezuli."mtime"',
-			'label'=>'Customer list modification date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.editor'=> array(
-			'code'=>'customer.lists.editor',
-			'internalcode'=>'ezuli."editor"',
-			'label'=>'Customer list editor',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-
-	/**
-	 * Removes old entries from the storage.
-	 *
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
-	 */
-	public function cleanup( array $siteids )
-	{
-		$path = 'mshop/customer/manager/lists/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-
-		$this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' );
-	}
-
-
-	/**
-	 * Returns the list attributes that can be used for searching.
-	 *
-	 * @param boolean $withsub Return also attributes of sub-managers if true
-	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
-	 */
-	public function getSearchAttributes( $withsub = true )
-	{
-		$path = 'mshop/customer/manager/lists/submanagers';
-
-		return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array( 'type' ), $withsub );
-	}
-
-
-	/**
-	 * Returns a new manager for customer extensions
-	 *
-	 * @param string $manager Name of the sub manager type in lower case
-	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
-	 */
-	public function getSubManager( $manager, $name = null )
-	{
-		return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Updates or adds a common list item object.
-	 *
-	 * @param \Aimeos\MShop\Common\Item\Lists\Iface $item List item object which should be saved
-	 * @param boolean $fetch True if the new ID should be returned in the item
-	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
-	{
-		$iface = '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface';
-		if( !( $item instanceof $iface ) ) {
-			throw new \Aimeos\MShop\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
-		}
-
-		if( $item->getDomain() === 'customer/group' ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Adding groups to customers is not supported, please use the eZ Publish backend' ) );
-		}
-
-		parent::saveItem( $item, $fetch );
-	}
-
-
-	/**
-	 * Returns the config path for retrieving the configuration values.
-	 *
-	 * @return string Configuration path (mshop/customer/manager/lists/ezpublish/)
-	 */
-	protected function getConfigPath()
-	{
-		return 'mshop/customer/manager/lists/ezpublish/';
-	}
-
-
-	/**
-	 * Returns the search configuration for searching items.
-	 *
-	 * @return array Associative list of search keys and search definitions
-	 */
-	protected function getSearchConfig()
-	{
-		return $this->searchConfig;
-	}
+    private $searchConfig = array(
+        'customer.lists.id'=> array(
+            'code'=>'customer.lists.id',
+            'internalcode'=>'ezuli."id"',
+            'internaldeps' => array( 'LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )' ),
+            'label'=>'Customer list ID',
+            'type'=> 'integer',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.siteid'=> array(
+            'code'=>'customer.lists.siteid',
+            'internalcode'=>'ezuli."siteid"',
+            'label'=>'Customer list site ID',
+            'type'=> 'integer',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.parentid'=> array(
+            'code'=>'customer.lists.parentid',
+            'internalcode'=>'ezuli."parentid"',
+            'label'=>'Customer list parent ID',
+            'type'=> 'integer',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.domain'=> array(
+            'code'=>'customer.lists.domain',
+            'internalcode'=>'ezuli."domain"',
+            'label'=>'Customer list domain',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.typeid' => array(
+            'code'=>'customer.lists.typeid',
+            'internalcode'=>'ezuli."typeid"',
+            'label'=>'Customer list type ID',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.refid'=> array(
+            'code'=>'customer.lists.refid',
+            'internalcode'=>'ezuli."refid"',
+            'label'=>'Customer list reference ID',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.datestart' => array(
+            'code'=>'customer.lists.datestart',
+            'internalcode'=>'ezuli."start"',
+            'label'=>'Customer list start date/time',
+            'type'=> 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.dateend' => array(
+            'code'=>'customer.lists.dateend',
+            'internalcode'=>'ezuli."end"',
+            'label'=>'Customer list end date/time',
+            'type'=> 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.config' => array(
+            'code'=>'customer.lists.config',
+            'internalcode'=>'ezuli."config"',
+            'label'=>'Customer list position',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.position' => array(
+            'code'=>'customer.lists.position',
+            'internalcode'=>'ezuli."pos"',
+            'label'=>'Customer list position',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.lists.status' => array(
+            'code'=>'customer.lists.status',
+            'internalcode'=>'ezuli."status"',
+            'label'=>'Customer list status',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.lists.ctime'=> array(
+            'code'=>'customer.lists.ctime',
+            'internalcode'=>'ezuli."ctime"',
+            'label'=>'Customer list create date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.mtime'=> array(
+            'code'=>'customer.lists.mtime',
+            'internalcode'=>'ezuli."mtime"',
+            'label'=>'Customer list modification date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.editor'=> array(
+            'code'=>'customer.lists.editor',
+            'internalcode'=>'ezuli."editor"',
+            'label'=>'Customer list editor',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+
+    /**
+     * Removes old entries from the storage.
+     *
+     * @param array $siteids List of IDs for sites whose entries should be deleted
+     */
+    public function cleanup( array $siteids )
+    {
+        $path = 'mshop/customer/manager/lists/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
+            $this->getSubManager( $domain )->cleanup( $siteids );
+        }
+
+        $this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' );
+    }
+
+
+    /**
+     * Returns the list attributes that can be used for searching.
+     *
+     * @param boolean $withsub Return also attributes of sub-managers if true
+     * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
+     */
+    public function getSearchAttributes( $withsub = true )
+    {
+        $path = 'mshop/customer/manager/lists/submanagers';
+
+        return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array( 'type' ), $withsub );
+    }
+
+
+    /**
+     * Returns a new manager for customer extensions
+     *
+     * @param string $manager Name of the sub manager type in lower case
+     * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
+     * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
+     */
+    public function getSubManager( $manager, $name = null )
+    {
+        return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Updates or adds a common list item object.
+     *
+     * @param \Aimeos\MShop\Common\Item\Lists\Iface $item List item object which should be saved
+     * @param boolean $fetch True if the new ID should be returned in the item
+     */
+    public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+    {
+        $iface = '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface';
+        if( !( $item instanceof $iface ) ) {
+            throw new \Aimeos\MShop\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
+        }
+
+        if( $item->getDomain() === 'customer/group' ) {
+            throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Adding groups to customers is not supported, please use the eZ Publish backend' ) );
+        }
+
+        parent::saveItem( $item, $fetch );
+    }
+
+
+    /**
+     * Returns the config path for retrieving the configuration values.
+     *
+     * @return string Configuration path (mshop/customer/manager/lists/ezpublish/)
+     */
+    protected function getConfigPath()
+    {
+        return 'mshop/customer/manager/lists/ezpublish/';
+    }
+
+
+    /**
+     * Returns the search configuration for searching items.
+     *
+     * @return array Associative list of search keys and search definitions
+     */
+    protected function getSearchConfig()
+    {
+        return $this->searchConfig;
+    }
 }

Spacing +15 added lines, -15 removed lines

@@ -25,7 +25,7 @@ 
 		'customer.lists.id'=> array(
 			'code'=>'customer.lists.id',
 			'internalcode'=>'ezuli."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )' ),
+			'internaldeps' => array('LEFT JOIN "ezuser_list" AS ezuli ON ( ezu."id" = ezuli."parentid" )'),
 			'label'=>'Customer list ID',
 			'type'=> 'integer',
 			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -133,14 +133,14 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/lists/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'type' ) ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array('type')) as $domain) {
+			$this->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' );
+		$this->cleanupBase($siteids, $this->getConfigPath().'delete');
 	}
 
 
@@ -150,11 +150,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/lists/submanagers';
 
-		return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array( 'type' ), $withsub );
+		return $this->getSearchAttributesBase($this->getSearchConfig(), $path, array('type'), $withsub);
 	}
 
 
@@ -165,9 +165,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'lists/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer', 'lists/'.$manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 
@@ -177,18 +177,18 @@ 
 	 * @param \Aimeos\MShop\Common\Item\Lists\Iface $item List item object which should be saved
 	 * @param boolean $fetch True if the new ID should be returned in the item
 	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
 	{
 		$iface = '\\Aimeos\\MShop\\Common\\Item\\Lists\\Iface';
-		if( !( $item instanceof $iface ) ) {
-			throw new \Aimeos\MShop\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
+		if (!($item instanceof $iface)) {
+			throw new \Aimeos\MShop\Exception(sprintf('Object is not of required type "%1$s"', $iface));
 		}
 
-		if( $item->getDomain() === 'customer/group' ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Adding groups to customers is not supported, please use the eZ Publish backend' ) );
+		if ($item->getDomain() === 'customer/group') {
+			throw new \Aimeos\MShop\Customer\Exception(sprintf('Adding groups to customers is not supported, please use the eZ Publish backend'));
 		}
 
-		parent::saveItem( $item, $fetch );
+		parent::saveItem($item, $fetch);
 	}
 
 

lib/custom/src/MShop/Customer/Manager/Lists/Type/Ezpublish.php

Indentation +135 added lines, -135 removed lines

@@ -18,140 +18,140 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Lists\Type\Standard
-	implements \Aimeos\MShop\Customer\Manager\Lists\Type\Iface
+    extends \Aimeos\MShop\Customer\Manager\Lists\Type\Standard
+    implements \Aimeos\MShop\Customer\Manager\Lists\Type\Iface
 {
-	private $searchConfig = array(
-		'customer.lists.type.id' => array(
-			'code'=>'customer.lists.type.id',
-			'internalcode'=>'ezulity."id"',
-			'internaldeps'=>array( 'LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )' ),
-			'label'=>'Customer list type ID',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.type.siteid' => array(
-			'code'=>'customer.lists.type.siteid',
-			'internalcode'=>'ezulity."siteid"',
-			'label'=>'Customer list type site ID',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		'customer.lists.type.code' => array(
-			'code'=>'customer.lists.type.code',
-			'internalcode'=>'ezulity."code"',
-			'label'=>'Customer list type code',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.domain' => array(
-			'code'=>'customer.lists.type.domain',
-			'internalcode'=>'ezulity."domain"',
-			'label'=>'Customer list type domain',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.label' => array(
-			'code'=>'customer.lists.type.label',
-			'internalcode'=>'ezulity."label"',
-			'label'=>'Customer list type label',
-			'type'=> 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.status' => array(
-			'code'=>'customer.lists.type.status',
-			'internalcode'=>'ezulity."status"',
-			'label'=>'Customer list type status',
-			'type'=> 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.lists.type.ctime'=> array(
-			'code'=>'customer.lists.type.ctime',
-			'internalcode'=>'ezulity."ctime"',
-			'label'=>'Customer list type create date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.mtime'=> array(
-			'code'=>'customer.lists.type.mtime',
-			'internalcode'=>'ezulity."mtime"',
-			'label'=>'Customer list type modification date/time',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lists.type.editor'=> array(
-			'code'=>'customer.lists.type.editor',
-			'internalcode'=>'ezulity."editor"',
-			'label'=>'Customer list type editor',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-
-	/**
-	 * Removes old entries from the storage.
-	 *
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
-	 */
-	public function cleanup( array $siteids )
-	{
-		$path = 'mshop/customer/manager/lists/type/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-
-		$this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' );
-	}
-
-
-	/**
-	 * Returns the list attributes that can be used for searching.
-	 *
-	 * @param boolean $withsub Return also attributes of sub-managers if true
-	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
-	 */
-	public function getSearchAttributes( $withsub = true )
-	{
-		$path = 'mshop/customer/manager/lists/type/submanagers';
-
-		return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array(), $withsub );
-	}
-
-
-	/**
-	 * Returns a new manager for customer extensions
-	 *
-	 * @param string $manager Name of the sub manager type in lower case
-	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
-	 */
-	public function getSubManager( $manager, $name = null )
-	{
-		return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Returns the config path for retrieving the configuration values.
-	 *
-	 * @return string Configuration path (mshop/customer/manager/lists/type/ezpublish/)
-	 */
-	protected function getConfigPath()
-	{
-		return 'mshop/customer/manager/lists/type/ezpublish/';
-	}
-
-
-	/**
-	 * Returns the search configuration for searching items.
-	 *
-	 * @return array Associative list of search keys and search definitions
-	 */
-	protected function getSearchConfig()
-	{
-		return $this->searchConfig;
-	}
+    private $searchConfig = array(
+        'customer.lists.type.id' => array(
+            'code'=>'customer.lists.type.id',
+            'internalcode'=>'ezulity."id"',
+            'internaldeps'=>array( 'LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )' ),
+            'label'=>'Customer list type ID',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.type.siteid' => array(
+            'code'=>'customer.lists.type.siteid',
+            'internalcode'=>'ezulity."siteid"',
+            'label'=>'Customer list type site ID',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        'customer.lists.type.code' => array(
+            'code'=>'customer.lists.type.code',
+            'internalcode'=>'ezulity."code"',
+            'label'=>'Customer list type code',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.domain' => array(
+            'code'=>'customer.lists.type.domain',
+            'internalcode'=>'ezulity."domain"',
+            'label'=>'Customer list type domain',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.label' => array(
+            'code'=>'customer.lists.type.label',
+            'internalcode'=>'ezulity."label"',
+            'label'=>'Customer list type label',
+            'type'=> 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.status' => array(
+            'code'=>'customer.lists.type.status',
+            'internalcode'=>'ezulity."status"',
+            'label'=>'Customer list type status',
+            'type'=> 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.lists.type.ctime'=> array(
+            'code'=>'customer.lists.type.ctime',
+            'internalcode'=>'ezulity."ctime"',
+            'label'=>'Customer list type create date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.mtime'=> array(
+            'code'=>'customer.lists.type.mtime',
+            'internalcode'=>'ezulity."mtime"',
+            'label'=>'Customer list type modification date/time',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lists.type.editor'=> array(
+            'code'=>'customer.lists.type.editor',
+            'internalcode'=>'ezulity."editor"',
+            'label'=>'Customer list type editor',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+
+    /**
+     * Removes old entries from the storage.
+     *
+     * @param array $siteids List of IDs for sites whose entries should be deleted
+     */
+    public function cleanup( array $siteids )
+    {
+        $path = 'mshop/customer/manager/lists/type/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
+            $this->getSubManager( $domain )->cleanup( $siteids );
+        }
+
+        $this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' );
+    }
+
+
+    /**
+     * Returns the list attributes that can be used for searching.
+     *
+     * @param boolean $withsub Return also attributes of sub-managers if true
+     * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
+     */
+    public function getSearchAttributes( $withsub = true )
+    {
+        $path = 'mshop/customer/manager/lists/type/submanagers';
+
+        return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array(), $withsub );
+    }
+
+
+    /**
+     * Returns a new manager for customer extensions
+     *
+     * @param string $manager Name of the sub manager type in lower case
+     * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
+     * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
+     */
+    public function getSubManager( $manager, $name = null )
+    {
+        return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Returns the config path for retrieving the configuration values.
+     *
+     * @return string Configuration path (mshop/customer/manager/lists/type/ezpublish/)
+     */
+    protected function getConfigPath()
+    {
+        return 'mshop/customer/manager/lists/type/ezpublish/';
+    }
+
+
+    /**
+     * Returns the search configuration for searching items.
+     *
+     * @return array Associative list of search keys and search definitions
+     */
+    protected function getSearchConfig()
+    {
+        return $this->searchConfig;
+    }
 }

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 		'customer.lists.type.id' => array(
 			'code'=>'customer.lists.type.id',
 			'internalcode'=>'ezulity."id"',
-			'internaldeps'=>array( 'LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )' ),
+			'internaldeps'=>array('LEFT JOIN "ezuser_list_type" AS ezulity ON ( ezuli."typeid" = ezulity."id" )'),
 			'label'=>'Customer list type ID',
 			'type'=> 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
@@ -96,14 +96,14 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/lists/type/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) {
+			$this->getSubManager($domain)->cleanup($siteids);
 		}
 
-		$this->cleanupBase( $siteids, $this->getConfigPath() . 'delete' );
+		$this->cleanupBase($siteids, $this->getConfigPath().'delete');
 	}
 
 
@@ -113,11 +113,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/lists/type/submanagers';
 
-		return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array(), $withsub );
+		return $this->getSearchAttributesBase($this->getSearchConfig(), $path, array(), $withsub);
 	}
 
 
@@ -128,9 +128,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'lists/type/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer', 'lists/type/'.$manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 

lib/custom/src/MShop/Customer/Manager/Address/Ezpublish.php

Indentation +244 added lines, -244 removed lines

@@ -18,262 +18,262 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Address\Standard
-	implements \Aimeos\MShop\Customer\Manager\Address\Iface
+    extends \Aimeos\MShop\Customer\Manager\Address\Standard
+    implements \Aimeos\MShop\Customer\Manager\Address\Iface
 {
-	private $searchConfig = array(
-		'customer.address.id' => array(
-			'label' => 'Customer address ID',
-			'code' => 'customer.address.id',
-			'internalcode' => 'ezuad."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ),
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-			'public' => false,
-		),
-		// site ID is not available
-		'customer.address.refid' => array(
-			'label' => 'Customer address parent ID',
-			'code' => 'customer.address.parentid',
-			'internalcode' => 'ezuad."parentid"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-			'public' => false,
-		),
-		'customer.address.company'=> array(
-			'label' => 'Customer address company',
-			'code' => 'customer.address.company',
-			'internalcode' => 'ezuad."company"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.vatid'=> array(
-			'label' => 'Customer address VAT ID',
-			'code' => 'customer.address.vatid',
-			'internalcode' => 'ezuad."vatid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.salutation' => array(
-			'label' => 'Customer address salutation',
-			'code' => 'customer.address.salutation',
-			'internalcode' => 'ezuad."salutation"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.title' => array(
-			'label' => 'Customer address title',
-			'code' => 'customer.address.title',
-			'internalcode' => 'ezuad."title"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.firstname' => array(
-			'label' => 'Customer address firstname',
-			'code' => 'customer.address.firstname',
-			'internalcode' => 'ezuad."firstname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.lastname' => array(
-			'label' => 'Customer address lastname',
-			'code' => 'customer.address.lastname',
-			'internalcode' => 'ezuad."lastname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.address1' => array(
-			'label' => 'Customer address address part one',
-			'code' => 'customer.address.address1',
-			'internalcode' => 'ezuad."address1"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.address2' => array(
-			'label' => 'Customer address address part two',
-			'code' => 'customer.address.address2',
-			'internalcode' => 'ezuad."address2"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.address3' => array(
-			'label' => 'Customer address address part three',
-			'code' => 'customer.address.address3',
-			'internalcode' => 'ezuad."address3"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.postal' => array(
-			'label' => 'Customer address postal',
-			'code' => 'customer.address.postal',
-			'internalcode' => 'ezuad."postal"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.city' => array(
-			'label' => 'Customer address city',
-			'code' => 'customer.address.city',
-			'internalcode' => 'ezuad."city"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.state' => array(
-			'label' => 'Customer address state',
-			'code' => 'customer.address.state',
-			'internalcode' => 'ezuad."state"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.languageid' => array(
-			'label' => 'Customer address language',
-			'code' => 'customer.address.languageid',
-			'internalcode' => 'ezuad."langid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.countryid' => array(
-			'label' => 'Customer address country',
-			'code' => 'customer.address.countryid',
-			'internalcode' => 'ezuad."countryid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.telephone' => array(
-			'label' => 'Customer address telephone',
-			'code' => 'customer.address.telephone',
-			'internalcode' => 'ezuad."telephone"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.email' => array(
-			'label' => 'Customer address email',
-			'code' => 'customer.address.email',
-			'internalcode' => 'ezuad."email"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.telefax' => array(
-			'label' => 'Customer address telefax',
-			'code' => 'customer.address.telefax',
-			'internalcode' => 'ezuad."telefax"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.website' => array(
-			'label' => 'Customer address website',
-			'code' => 'customer.address.website',
-			'internalcode' => 'ezuad."website"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.flag' => array(
-			'label' => 'Customer address flag',
-			'code' => 'customer.address.flag',
-			'internalcode' => 'ezuad."flag"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.address.position' => array(
-			'label' => 'Customer address position',
-			'code' => 'customer.address.position',
-			'internalcode' => 'ezuad."pos"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.address.ctime'=> array(
-			'label'=>'Customer address create date/time',
-			'code'=>'customer.address.ctime',
-			'internalcode'=>'ezuad."ctime"',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.mtime'=> array(
-			'label'=>'Customer address modification date/time',
-			'code'=>'customer.address.mtime',
-			'internalcode'=>'ezuad."mtime"',
-			'type'=> 'datetime',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address.editor'=> array(
-			'label'=>'Customer address editor',
-			'code'=>'customer.address.editor',
-			'internalcode'=>'ezuad."editor"',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
+    private $searchConfig = array(
+        'customer.address.id' => array(
+            'label' => 'Customer address ID',
+            'code' => 'customer.address.id',
+            'internalcode' => 'ezuad."id"',
+            'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ),
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+            'public' => false,
+        ),
+        // site ID is not available
+        'customer.address.refid' => array(
+            'label' => 'Customer address parent ID',
+            'code' => 'customer.address.parentid',
+            'internalcode' => 'ezuad."parentid"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+            'public' => false,
+        ),
+        'customer.address.company'=> array(
+            'label' => 'Customer address company',
+            'code' => 'customer.address.company',
+            'internalcode' => 'ezuad."company"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.vatid'=> array(
+            'label' => 'Customer address VAT ID',
+            'code' => 'customer.address.vatid',
+            'internalcode' => 'ezuad."vatid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.salutation' => array(
+            'label' => 'Customer address salutation',
+            'code' => 'customer.address.salutation',
+            'internalcode' => 'ezuad."salutation"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.title' => array(
+            'label' => 'Customer address title',
+            'code' => 'customer.address.title',
+            'internalcode' => 'ezuad."title"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.firstname' => array(
+            'label' => 'Customer address firstname',
+            'code' => 'customer.address.firstname',
+            'internalcode' => 'ezuad."firstname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.lastname' => array(
+            'label' => 'Customer address lastname',
+            'code' => 'customer.address.lastname',
+            'internalcode' => 'ezuad."lastname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.address1' => array(
+            'label' => 'Customer address address part one',
+            'code' => 'customer.address.address1',
+            'internalcode' => 'ezuad."address1"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.address2' => array(
+            'label' => 'Customer address address part two',
+            'code' => 'customer.address.address2',
+            'internalcode' => 'ezuad."address2"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.address3' => array(
+            'label' => 'Customer address address part three',
+            'code' => 'customer.address.address3',
+            'internalcode' => 'ezuad."address3"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.postal' => array(
+            'label' => 'Customer address postal',
+            'code' => 'customer.address.postal',
+            'internalcode' => 'ezuad."postal"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.city' => array(
+            'label' => 'Customer address city',
+            'code' => 'customer.address.city',
+            'internalcode' => 'ezuad."city"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.state' => array(
+            'label' => 'Customer address state',
+            'code' => 'customer.address.state',
+            'internalcode' => 'ezuad."state"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.languageid' => array(
+            'label' => 'Customer address language',
+            'code' => 'customer.address.languageid',
+            'internalcode' => 'ezuad."langid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.countryid' => array(
+            'label' => 'Customer address country',
+            'code' => 'customer.address.countryid',
+            'internalcode' => 'ezuad."countryid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.telephone' => array(
+            'label' => 'Customer address telephone',
+            'code' => 'customer.address.telephone',
+            'internalcode' => 'ezuad."telephone"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.email' => array(
+            'label' => 'Customer address email',
+            'code' => 'customer.address.email',
+            'internalcode' => 'ezuad."email"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.telefax' => array(
+            'label' => 'Customer address telefax',
+            'code' => 'customer.address.telefax',
+            'internalcode' => 'ezuad."telefax"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.website' => array(
+            'label' => 'Customer address website',
+            'code' => 'customer.address.website',
+            'internalcode' => 'ezuad."website"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.flag' => array(
+            'label' => 'Customer address flag',
+            'code' => 'customer.address.flag',
+            'internalcode' => 'ezuad."flag"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.address.position' => array(
+            'label' => 'Customer address position',
+            'code' => 'customer.address.position',
+            'internalcode' => 'ezuad."pos"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.address.ctime'=> array(
+            'label'=>'Customer address create date/time',
+            'code'=>'customer.address.ctime',
+            'internalcode'=>'ezuad."ctime"',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.mtime'=> array(
+            'label'=>'Customer address modification date/time',
+            'code'=>'customer.address.mtime',
+            'internalcode'=>'ezuad."mtime"',
+            'type'=> 'datetime',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address.editor'=> array(
+            'label'=>'Customer address editor',
+            'code'=>'customer.address.editor',
+            'internalcode'=>'ezuad."editor"',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
 
 
-	/**
-	 * Removes old entries from the storage.
-	 *
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
-	 */
-	public function cleanup( array $siteids )
-	{
-		$path = 'mshop/customer/manager/address/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-	}
+    /**
+     * Removes old entries from the storage.
+     *
+     * @param array $siteids List of IDs for sites whose entries should be deleted
+     */
+    public function cleanup( array $siteids )
+    {
+        $path = 'mshop/customer/manager/address/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
+            $this->getSubManager( $domain )->cleanup( $siteids );
+        }
+    }
 
 
-	/**
-	 * Removes multiple items specified by ids in the array.
-	 *
-	 * @param array $ids List of IDs
-	 */
-	public function deleteItems( array $ids )
-	{
-		$this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete', false );
-	}
+    /**
+     * Removes multiple items specified by ids in the array.
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        $this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete', false );
+    }
 
 
-	/**
-	 * Returns the list attributes that can be used for searching.
-	 *
-	 * @param boolean $withsub Return also attributes of sub-managers if true
-	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
-	 */
-	public function getSearchAttributes( $withsub = true )
-	{
-		$path = 'mshop/customer/manager/address/submanagers';
+    /**
+     * Returns the list attributes that can be used for searching.
+     *
+     * @param boolean $withsub Return also attributes of sub-managers if true
+     * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
+     */
+    public function getSearchAttributes( $withsub = true )
+    {
+        $path = 'mshop/customer/manager/address/submanagers';
 
-		return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array(), $withsub );
-	}
+        return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array(), $withsub );
+    }
 
 
-	/**
-	 * Returns a new manager for customer extensions
-	 *
-	 * @param string $manager Name of the sub manager type in lower case
-	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
-	 */
-	public function getSubManager( $manager, $name = null )
-	{
-		return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
+    /**
+     * Returns a new manager for customer extensions
+     *
+     * @param string $manager Name of the sub manager type in lower case
+     * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
+     * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
+     */
+    public function getSubManager( $manager, $name = null )
+    {
+        return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
 
 
-	/**
-	 * Returns the config path for retrieving the configuration values.
-	 *
-	 * @return string Configuration path (mshop/customer/manager/address/ezpublish/)
-	 */
-	protected function getConfigPath()
-	{
-		return 'mshop/customer/manager/address/ezpublish/';
-	}
+    /**
+     * Returns the config path for retrieving the configuration values.
+     *
+     * @return string Configuration path (mshop/customer/manager/address/ezpublish/)
+     */
+    protected function getConfigPath()
+    {
+        return 'mshop/customer/manager/address/ezpublish/';
+    }
 
 
-	/**
-	 * Returns the search configuration for searching items.
-	 *
-	 * @return array Associative list of search keys and search definitions
-	 */
-	protected function getSearchConfig()
-	{
-		return $this->searchConfig;
-	}
+    /**
+     * Returns the search configuration for searching items.
+     *
+     * @return array Associative list of search keys and search definitions
+     */
+    protected function getSearchConfig()
+    {
+        return $this->searchConfig;
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 			'label' => 'Customer address ID',
 			'code' => 'customer.address.id',
 			'internalcode' => 'ezuad."id"',
-			'internaldeps' => array( 'LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )' ),
+			'internaldeps' => array('LEFT JOIN "ezuser_address" AS ezuad ON ( ezu."contentobject_id" = ezuad."parentid" )'),
 			'type' => 'integer',
 			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
 			'public' => false,
@@ -209,11 +209,11 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/address/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array() ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array()) as $domain) {
+			$this->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -223,9 +223,9 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
-		$this->deleteItemsBase( $ids, $this->getConfigPath() . 'delete', false );
+		$this->deleteItemsBase($ids, $this->getConfigPath().'delete', false);
 	}
 
 
@@ -235,11 +235,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/address/submanagers';
 
-		return $this->getSearchAttributesBase( $this->getSearchConfig(), $path, array(), $withsub );
+		return $this->getSearchAttributesBase($this->getSearchConfig(), $path, array(), $withsub);
 	}
 
 
@@ -250,9 +250,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', 'address/' . $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer', 'address/'.$manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 

lib/custom/src/MShop/Customer/Manager/Ezpublish.php

Indentation +456 added lines, -456 removed lines

@@ -18,461 +18,461 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Standard
+    extends \Aimeos\MShop\Customer\Manager\Standard
 {
-	private $searchConfig = array(
-		'customer.id' => array(
-			'label' => 'Customer ID',
-			'code' => 'customer.id',
-			'internalcode' => 'ezu."contentobject_id"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
-		),
-		// customer.siteid is not available
-		'customer.label' => array(
-			'label' => 'Customer label',
-			'code' => 'customer.label',
-			'internalcode' => 'ezu."login"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
-		),
-		'customer.code' => array(
-			'label' => 'Customer username',
-			'code' => 'customer.code',
-			'internalcode' => 'ezu."login_normalized"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
-		),
-		'customer.salutation' => array(
-			'label' => 'Customer salutation',
-			'code' => 'customer.salutation',
-			'internalcode' => 'ezu."salutation"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.company'=> array(
-			'label' => 'Customer company',
-			'code' => 'customer.company',
-			'internalcode' => 'ezu."company"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.vatid'=> array(
-			'label' => 'Customer VAT ID',
-			'code' => 'customer.vatid',
-			'internalcode' => 'ezu."vatid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.title' => array(
-			'label' => 'Customer title',
-			'code' => 'customer.title',
-			'internalcode' => 'ezu."title"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.firstname' => array(
-			'label' => 'Customer firstname',
-			'code' => 'customer.firstname',
-			'internalcode' => 'ezu."firstname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.lastname' => array(
-			'label' => 'Customer lastname',
-			'code' => 'customer.lastname',
-			'internalcode' => 'ezu."lastname"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address1' => array(
-			'label' => 'Customer address part one',
-			'code' => 'customer.address1',
-			'internalcode' => 'ezu."address1"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address2' => array(
-			'label' => 'Customer address part two',
-			'code' => 'customer.address2',
-			'internalcode' => 'ezu."address2"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.address3' => array(
-			'label' => 'Customer address part three',
-			'code' => 'customer.address3',
-			'internalcode' => 'ezu."address3"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.postal' => array(
-			'label' => 'Customer postal',
-			'code' => 'customer.postal',
-			'internalcode' => 'ezu."postal"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.city' => array(
-			'label' => 'Customer city',
-			'code' => 'customer.city',
-			'internalcode' => 'ezu."city"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.state' => array(
-			'label' => 'Customer state',
-			'code' => 'customer.state',
-			'internalcode' => 'ezu."state"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.languageid' => array(
-			'label' => 'Customer language',
-			'code' => 'customer.languageid',
-			'internalcode' => 'ezu."langid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.countryid' => array(
-			'label' => 'Customer country',
-			'code' => 'customer.countryid',
-			'internalcode' => 'ezu."countryid"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.telephone' => array(
-			'label' => 'Customer telephone',
-			'code' => 'customer.telephone',
-			'internalcode' => 'ezu."telephone"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.email' => array(
-			'label' => 'Customer email',
-			'code' => 'customer.email',
-			'internalcode' => 'ezu."email"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.telefax' => array(
-			'label' => 'Customer telefax',
-			'code' => 'customer.telefax',
-			'internalcode' => 'ezu."telefax"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.website' => array(
-			'label' => 'Customer website',
-			'code' => 'customer.website',
-			'internalcode' => 'ezu."website"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.birthday' => array(
-			'label' => 'Customer birthday',
-			'code' => 'customer.birthday',
-			'internalcode' => 'ezu."birthday"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.password'=> array(
-			'label' => 'Customer password',
-			'code' => 'customer.password',
-			'internalcode' => 'ezu."password_hash"',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.status'=> array(
-			'label' => 'Customer status',
-			'code' => 'customer.status',
-			'internalcode' => 'ezs."is_enabled"',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
-		),
-		'customer.dateverified'=> array(
-			'label' => 'Customer verification date',
-			'code' => 'customer.dateverified',
-			'internalcode' => 'ezu."vdate"',
-			'type' => 'date',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.ctime'=> array(
-			'label' => 'Customer creation time',
-			'code' => 'customer.ctime',
-			'internalcode' => 'ezu."ctime"',
-			'type' => 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.mtime'=> array(
-			'label' => 'Customer modification time',
-			'code' => 'customer.mtime',
-			'internalcode' => 'ezu."mtime"',
-			'type' => 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.editor'=> array(
-			'label'=>'Customer editor',
-			'code'=>'customer.editor',
-			'internalcode' => 'ezu."editor"',
-			'type'=> 'string',
-			'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-	private $addressManager;
-
-
-	/**
-	 * Removes old entries from the storage.
-	 *
-	 * @param array $siteids List of IDs for sites whose entries should be deleted
-	 */
-	public function cleanup( array $siteids )
-	{
-		$path = 'mshop/customer/manager/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
-		}
-	}
-
-
-	/**
-	 * Instantiates a new customer item object.
-	 *
-	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
-	 */
-	public function createItem()
-	{
-		return $this->createItemBase();
-	}
-
-
-	/**
-	 * Removes multiple items specified by ids in the array.
-	 *
-	 * @param array $ids List of IDs
-	 */
-	public function deleteItems( array $ids )
-	{
-		$service = $this->getContext()->getEzUserService();
-
-		foreach( $ids as $id ) {
-			$service->deleteUser( $service->loadUser( $id ) );
-		}
-	}
-
-
-	/**
-	 * Returns the list attributes that can be used for searching.
-	 *
-	 * @param boolean $withsub Return also attributes of sub-managers if true
-	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
-	 */
-	public function getSearchAttributes( $withsub = true )
-	{
-		$path = 'mshop/customer/manager/submanagers';
-
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
-	}
-
-
-	/**
-	 * Returns a new manager for customer extensions
-	 *
-	 * @param string $manager Name of the sub manager type in lower case
-	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
-	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
-	 */
-	public function getSubManager( $manager, $name = null )
-	{
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Saves a customer item object.
-	 *
-	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
-	 * @param boolean $fetch True if the new ID should be returned in the item
-	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
-	{
-		$iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface';
-		if( !( $item instanceof $iface ) ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
-		}
-
-		if( !$item->isModified() ) { return; }
-
-		$context = $this->getContext();
-
-		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( !is_a( $context, $class ) ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $class ) );
-		}
-
-		$service = $context->getEzUserService();
-		$email = $item->getPaymentAddress()->getEmail();
-
-		if( $item->getId() !== null )
-		{
-			$struct = $service->newUserUpdateStruct();
-			$struct->password = $item->getPassword();
-			$struct->enabled = $item->getStatus();
-			$struct->email = $email;
-
-			$user = $service->loadUser( $item->getId() );
-			$service->updateUser( $user, $struct );
-		}
-		else
-		{
-			$struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' );
-			$struct->enabled = $item->getStatus();
-
-			$user = $service->createUser( $struct, array() );
-			$item->setId( $user->getUserId() );
-		}
-
-		$dbm = $context->getDatabaseManager();
-		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
-
-		try
-		{
-			$date = date( 'Y-m-d H:i:s' );
-			$ctime = ( $item->getTimeCreated() ? $item->getTimeCreated() : $date );
-			$billingAddress = $item->getPaymentAddress();
-
-			$path = 'mshop/customer/manager/ezpublish/update';
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $billingAddress->getCompany() );
-			$stmt->bind( 2, $billingAddress->getVatID() );
-			$stmt->bind( 3, $billingAddress->getSalutation() );
-			$stmt->bind( 4, $billingAddress->getTitle() );
-			$stmt->bind( 5, $billingAddress->getFirstname() );
-			$stmt->bind( 6, $billingAddress->getLastname() );
-			$stmt->bind( 7, $billingAddress->getAddress1() );
-			$stmt->bind( 8, $billingAddress->getAddress2() );
-			$stmt->bind( 9, $billingAddress->getAddress3() );
-			$stmt->bind( 10, $billingAddress->getPostal() );
-			$stmt->bind( 11, $billingAddress->getCity() );
-			$stmt->bind( 12, $billingAddress->getState() );
-			$stmt->bind( 13, $billingAddress->getCountryId() );
-			$stmt->bind( 14, $billingAddress->getLanguageId() );
-			$stmt->bind( 15, $billingAddress->getTelephone() );
-			$stmt->bind( 16, $billingAddress->getTelefax() );
-			$stmt->bind( 17, $billingAddress->getWebsite() );
-			$stmt->bind( 18, $item->getBirthday() );
-			$stmt->bind( 19, $item->getDateVerified() );
-			$stmt->bind( 20, $date ); // Modification time
-			$stmt->bind( 21, $context->getEditor() );
-			$stmt->bind( 22, $ctime ); // Creation time
-			$stmt->bind( 23, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-
-			$stmt->execute()->finish();
-
-			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
-		{
-			$dbm->release( $conn, $dbname );
-			throw $e;
-		}
-	}
-
-
-	/**
-	 * Returns the item objects matched by the given search criteria.
-	 *
-	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
-	 * @param integer &$total Number of items that are available in total
-	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
-	 * @throws \Aimeos\MShop\Customer\Exception If creating items failed
-	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null )
-	{
-		$dbm = $this->getContext()->getDatabaseManager();
-		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
-		$map = array();
-
-		try
-		{
-			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = 'mshop/customer/manager/ezpublish/search';
-			$cfgPathCount = 'mshop/customer/manager/ezpublish/count';
-			$required = array( 'customer' );
-
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
-
-			while( ( $row = $results->fetch() ) !== false )
-			{
-				$map[ $row['customer.id'] ] = $row;
-				$map[ $row['customer.id'] ]['groups'] = array();
-			}
-
-
-			$path = 'mshop/customer/manager/ezpublish/groups';
-			$stmt = $conn->create( $this->getGroupSql( array_keys( $map ), $path ) );
-			$results = $stmt->execute();
-
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[ $row['contentobject_id'] ]['groups'][] = $row['role_id'];
-			}
-
-			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
-		{
-			$dbm->release( $conn, $dbname  );
-			throw $e;
-		}
-
-		return $this->buildItems( $map, $ref, 'customer' );
-	}
-
-
-	/**
-	 * Creates a new customer item.
-	 *
-	 * @param array $values List of attributes for customer item
-	 * @param array $listItems List items associated to the customer item
-	 * @param array $refItems Items referenced by the customer item via the list items
-	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
-	 */
-	protected function createItemBase( array $values = array(), array $listItems = array(), array $refItems = array() )
-	{
-		if( !isset( $this->addressManager ) ) {
-			$this->addressManager = $this->getSubManager( 'address' );
-		}
-
-		$address = $this->addressManager->createItem();
-
-		return new \Aimeos\MShop\Customer\Item\Ezpublish( $address, $values, $listItems, $refItems );
-	}
-
-
-	/**
-	 * Returns the SQL statement for retrieving the customer group IDs
-	 *
-	 * @param array $ids List of customer IDs
-	 * @param string $cfgpath Configuration path to the SQL statement
-	 * @return string SQL statement ready for execution
-	 */
-	protected function getGroupSql( array $ids, $cfgpath )
-	{
-		if( empty( $ids ) ) { return '1=1'; }
-
-		$search = $this->createSearch();
-		$search->setConditions( $search->compare( '==', 'id', $ids ) );
-
-		$types = array( 'id' => \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-		$translations = array( 'id' => '"contentobject_id"' );
-
-		$cond = $search->getConditionString( $types, $translations );
-
-		return str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) );
-	}
+    private $searchConfig = array(
+        'customer.id' => array(
+            'label' => 'Customer ID',
+            'code' => 'customer.id',
+            'internalcode' => 'ezu."contentobject_id"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
+        ),
+        // customer.siteid is not available
+        'customer.label' => array(
+            'label' => 'Customer label',
+            'code' => 'customer.label',
+            'internalcode' => 'ezu."login"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
+        ),
+        'customer.code' => array(
+            'label' => 'Customer username',
+            'code' => 'customer.code',
+            'internalcode' => 'ezu."login_normalized"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR
+        ),
+        'customer.salutation' => array(
+            'label' => 'Customer salutation',
+            'code' => 'customer.salutation',
+            'internalcode' => 'ezu."salutation"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.company'=> array(
+            'label' => 'Customer company',
+            'code' => 'customer.company',
+            'internalcode' => 'ezu."company"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.vatid'=> array(
+            'label' => 'Customer VAT ID',
+            'code' => 'customer.vatid',
+            'internalcode' => 'ezu."vatid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.title' => array(
+            'label' => 'Customer title',
+            'code' => 'customer.title',
+            'internalcode' => 'ezu."title"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.firstname' => array(
+            'label' => 'Customer firstname',
+            'code' => 'customer.firstname',
+            'internalcode' => 'ezu."firstname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.lastname' => array(
+            'label' => 'Customer lastname',
+            'code' => 'customer.lastname',
+            'internalcode' => 'ezu."lastname"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address1' => array(
+            'label' => 'Customer address part one',
+            'code' => 'customer.address1',
+            'internalcode' => 'ezu."address1"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address2' => array(
+            'label' => 'Customer address part two',
+            'code' => 'customer.address2',
+            'internalcode' => 'ezu."address2"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.address3' => array(
+            'label' => 'Customer address part three',
+            'code' => 'customer.address3',
+            'internalcode' => 'ezu."address3"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.postal' => array(
+            'label' => 'Customer postal',
+            'code' => 'customer.postal',
+            'internalcode' => 'ezu."postal"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.city' => array(
+            'label' => 'Customer city',
+            'code' => 'customer.city',
+            'internalcode' => 'ezu."city"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.state' => array(
+            'label' => 'Customer state',
+            'code' => 'customer.state',
+            'internalcode' => 'ezu."state"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.languageid' => array(
+            'label' => 'Customer language',
+            'code' => 'customer.languageid',
+            'internalcode' => 'ezu."langid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.countryid' => array(
+            'label' => 'Customer country',
+            'code' => 'customer.countryid',
+            'internalcode' => 'ezu."countryid"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.telephone' => array(
+            'label' => 'Customer telephone',
+            'code' => 'customer.telephone',
+            'internalcode' => 'ezu."telephone"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.email' => array(
+            'label' => 'Customer email',
+            'code' => 'customer.email',
+            'internalcode' => 'ezu."email"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.telefax' => array(
+            'label' => 'Customer telefax',
+            'code' => 'customer.telefax',
+            'internalcode' => 'ezu."telefax"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.website' => array(
+            'label' => 'Customer website',
+            'code' => 'customer.website',
+            'internalcode' => 'ezu."website"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.birthday' => array(
+            'label' => 'Customer birthday',
+            'code' => 'customer.birthday',
+            'internalcode' => 'ezu."birthday"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.password'=> array(
+            'label' => 'Customer password',
+            'code' => 'customer.password',
+            'internalcode' => 'ezu."password_hash"',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.status'=> array(
+            'label' => 'Customer status',
+            'code' => 'customer.status',
+            'internalcode' => 'ezs."is_enabled"',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT
+        ),
+        'customer.dateverified'=> array(
+            'label' => 'Customer verification date',
+            'code' => 'customer.dateverified',
+            'internalcode' => 'ezu."vdate"',
+            'type' => 'date',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.ctime'=> array(
+            'label' => 'Customer creation time',
+            'code' => 'customer.ctime',
+            'internalcode' => 'ezu."ctime"',
+            'type' => 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.mtime'=> array(
+            'label' => 'Customer modification time',
+            'code' => 'customer.mtime',
+            'internalcode' => 'ezu."mtime"',
+            'type' => 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.editor'=> array(
+            'label'=>'Customer editor',
+            'code'=>'customer.editor',
+            'internalcode' => 'ezu."editor"',
+            'type'=> 'string',
+            'internaltype'=> \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+    private $addressManager;
+
+
+    /**
+     * Removes old entries from the storage.
+     *
+     * @param array $siteids List of IDs for sites whose entries should be deleted
+     */
+    public function cleanup( array $siteids )
+    {
+        $path = 'mshop/customer/manager/submanagers';
+        foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) {
+            $this->getSubManager( $domain )->cleanup( $siteids );
+        }
+    }
+
+
+    /**
+     * Instantiates a new customer item object.
+     *
+     * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
+     */
+    public function createItem()
+    {
+        return $this->createItemBase();
+    }
+
+
+    /**
+     * Removes multiple items specified by ids in the array.
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        $service = $this->getContext()->getEzUserService();
+
+        foreach( $ids as $id ) {
+            $service->deleteUser( $service->loadUser( $id ) );
+        }
+    }
+
+
+    /**
+     * Returns the list attributes that can be used for searching.
+     *
+     * @param boolean $withsub Return also attributes of sub-managers if true
+     * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
+     */
+    public function getSearchAttributes( $withsub = true )
+    {
+        $path = 'mshop/customer/manager/submanagers';
+
+        return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
+    }
+
+
+    /**
+     * Returns a new manager for customer extensions
+     *
+     * @param string $manager Name of the sub manager type in lower case
+     * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
+     * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
+     */
+    public function getSubManager( $manager, $name = null )
+    {
+        return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Saves a customer item object.
+     *
+     * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
+     * @param boolean $fetch True if the new ID should be returned in the item
+     */
+    public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+    {
+        $iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface';
+        if( !( $item instanceof $iface ) ) {
+            throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
+        }
+
+        if( !$item->isModified() ) { return; }
+
+        $context = $this->getContext();
+
+        $class = '\Aimeos\MShop\Context\Item\Ezpublish';
+        if( !is_a( $context, $class ) ) {
+            throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $class ) );
+        }
+
+        $service = $context->getEzUserService();
+        $email = $item->getPaymentAddress()->getEmail();
+
+        if( $item->getId() !== null )
+        {
+            $struct = $service->newUserUpdateStruct();
+            $struct->password = $item->getPassword();
+            $struct->enabled = $item->getStatus();
+            $struct->email = $email;
+
+            $user = $service->loadUser( $item->getId() );
+            $service->updateUser( $user, $struct );
+        }
+        else
+        {
+            $struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' );
+            $struct->enabled = $item->getStatus();
+
+            $user = $service->createUser( $struct, array() );
+            $item->setId( $user->getUserId() );
+        }
+
+        $dbm = $context->getDatabaseManager();
+        $dbname = $this->getResourceName();
+        $conn = $dbm->acquire( $dbname );
+
+        try
+        {
+            $date = date( 'Y-m-d H:i:s' );
+            $ctime = ( $item->getTimeCreated() ? $item->getTimeCreated() : $date );
+            $billingAddress = $item->getPaymentAddress();
+
+            $path = 'mshop/customer/manager/ezpublish/update';
+            $stmt = $this->getCachedStatement( $conn, $path );
+
+            $stmt->bind( 1, $billingAddress->getCompany() );
+            $stmt->bind( 2, $billingAddress->getVatID() );
+            $stmt->bind( 3, $billingAddress->getSalutation() );
+            $stmt->bind( 4, $billingAddress->getTitle() );
+            $stmt->bind( 5, $billingAddress->getFirstname() );
+            $stmt->bind( 6, $billingAddress->getLastname() );
+            $stmt->bind( 7, $billingAddress->getAddress1() );
+            $stmt->bind( 8, $billingAddress->getAddress2() );
+            $stmt->bind( 9, $billingAddress->getAddress3() );
+            $stmt->bind( 10, $billingAddress->getPostal() );
+            $stmt->bind( 11, $billingAddress->getCity() );
+            $stmt->bind( 12, $billingAddress->getState() );
+            $stmt->bind( 13, $billingAddress->getCountryId() );
+            $stmt->bind( 14, $billingAddress->getLanguageId() );
+            $stmt->bind( 15, $billingAddress->getTelephone() );
+            $stmt->bind( 16, $billingAddress->getTelefax() );
+            $stmt->bind( 17, $billingAddress->getWebsite() );
+            $stmt->bind( 18, $item->getBirthday() );
+            $stmt->bind( 19, $item->getDateVerified() );
+            $stmt->bind( 20, $date ); // Modification time
+            $stmt->bind( 21, $context->getEditor() );
+            $stmt->bind( 22, $ctime ); // Creation time
+            $stmt->bind( 23, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+
+            $stmt->execute()->finish();
+
+            $dbm->release( $conn, $dbname );
+        }
+        catch( \Exception $e )
+        {
+            $dbm->release( $conn, $dbname );
+            throw $e;
+        }
+    }
+
+
+    /**
+     * Returns the item objects matched by the given search criteria.
+     *
+     * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
+     * @param integer &$total Number of items that are available in total
+     * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
+     * @throws \Aimeos\MShop\Customer\Exception If creating items failed
+     */
+    public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null )
+    {
+        $dbm = $this->getContext()->getDatabaseManager();
+        $dbname = $this->getResourceName();
+        $conn = $dbm->acquire( $dbname );
+        $map = array();
+
+        try
+        {
+            $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
+            $cfgPathSearch = 'mshop/customer/manager/ezpublish/search';
+            $cfgPathCount = 'mshop/customer/manager/ezpublish/count';
+            $required = array( 'customer' );
+
+            $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+
+            while( ( $row = $results->fetch() ) !== false )
+            {
+                $map[ $row['customer.id'] ] = $row;
+                $map[ $row['customer.id'] ]['groups'] = array();
+            }
+
+
+            $path = 'mshop/customer/manager/ezpublish/groups';
+            $stmt = $conn->create( $this->getGroupSql( array_keys( $map ), $path ) );
+            $results = $stmt->execute();
+
+            while( ( $row = $results->fetch() ) !== false ) {
+                $map[ $row['contentobject_id'] ]['groups'][] = $row['role_id'];
+            }
+
+            $dbm->release( $conn, $dbname );
+        }
+        catch( \Exception $e )
+        {
+            $dbm->release( $conn, $dbname  );
+            throw $e;
+        }
+
+        return $this->buildItems( $map, $ref, 'customer' );
+    }
+
+
+    /**
+     * Creates a new customer item.
+     *
+     * @param array $values List of attributes for customer item
+     * @param array $listItems List items associated to the customer item
+     * @param array $refItems Items referenced by the customer item via the list items
+     * @return \Aimeos\MShop\Customer\Item\Iface New customer item
+     */
+    protected function createItemBase( array $values = array(), array $listItems = array(), array $refItems = array() )
+    {
+        if( !isset( $this->addressManager ) ) {
+            $this->addressManager = $this->getSubManager( 'address' );
+        }
+
+        $address = $this->addressManager->createItem();
+
+        return new \Aimeos\MShop\Customer\Item\Ezpublish( $address, $values, $listItems, $refItems );
+    }
+
+
+    /**
+     * Returns the SQL statement for retrieving the customer group IDs
+     *
+     * @param array $ids List of customer IDs
+     * @param string $cfgpath Configuration path to the SQL statement
+     * @return string SQL statement ready for execution
+     */
+    protected function getGroupSql( array $ids, $cfgpath )
+    {
+        if( empty( $ids ) ) { return '1=1'; }
+
+        $search = $this->createSearch();
+        $search->setConditions( $search->compare( '==', 'id', $ids ) );
+
+        $types = array( 'id' => \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+        $translations = array( 'id' => '"contentobject_id"' );
+
+        $cond = $search->getConditionString( $types, $translations );
+
+        return str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) );
+    }
 }

Spacing +78 added lines, -78 removed lines

@@ -228,11 +228,11 @@ 
 	 *
 	 * @param array $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 		$path = 'mshop/customer/manager/submanagers';
-		foreach( $this->getContext()->getConfig()->get( $path, array( 'address', 'lists' ) ) as $domain ) {
-			$this->getSubManager( $domain )->cleanup( $siteids );
+		foreach ($this->getContext()->getConfig()->get($path, array('address', 'lists')) as $domain) {
+			$this->getSubManager($domain)->cleanup($siteids);
 		}
 	}
 
@@ -253,12 +253,12 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
 		$service = $this->getContext()->getEzUserService();
 
-		foreach( $ids as $id ) {
-			$service->deleteUser( $service->loadUser( $id ) );
+		foreach ($ids as $id) {
+			$service->deleteUser($service->loadUser($id));
 		}
 	}
 
@@ -269,11 +269,11 @@ 
 	 * @param boolean $withsub Return also attributes of sub-managers if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array( 'address', 'lists' ), $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array('address', 'lists'), $withsub);
 	}
 
 
@@ -284,9 +284,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return mixed Manager for different extensions, e.g stock, tags, locations, etc.
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer', $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer', $manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 
@@ -296,88 +296,88 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Iface $item Customer item object
 	 * @param boolean $fetch True if the new ID should be returned in the item
 	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
 	{
 		$iface = '\\Aimeos\\MShop\\Customer\\Item\\Iface';
-		if( !( $item instanceof $iface ) ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $iface ) );
+		if (!($item instanceof $iface)) {
+			throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $iface));
 		}
 
-		if( !$item->isModified() ) { return; }
+		if (!$item->isModified()) { return; }
 
 		$context = $this->getContext();
 
 		$class = '\Aimeos\MShop\Context\Item\Ezpublish';
-		if( !is_a( $context, $class ) ) {
-			throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Object is not of required type "%1$s"', $class ) );
+		if (!is_a($context, $class)) {
+			throw new \Aimeos\MShop\Customer\Exception(sprintf('Object is not of required type "%1$s"', $class));
 		}
 
 		$service = $context->getEzUserService();
 		$email = $item->getPaymentAddress()->getEmail();
 
-		if( $item->getId() !== null )
+		if ($item->getId() !== null)
 		{
 			$struct = $service->newUserUpdateStruct();
 			$struct->password = $item->getPassword();
 			$struct->enabled = $item->getStatus();
 			$struct->email = $email;
 
-			$user = $service->loadUser( $item->getId() );
-			$service->updateUser( $user, $struct );
+			$user = $service->loadUser($item->getId());
+			$service->updateUser($user, $struct);
 		}
 		else
 		{
-			$struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' );
+			$struct = $service->newUserCreateStruct($item->getCode(), $email, $item->getPassword(), 'eng-GB');
 			$struct->enabled = $item->getStatus();
 
-			$user = $service->createUser( $struct, array() );
-			$item->setId( $user->getUserId() );
+			$user = $service->createUser($struct, array());
+			$item->setId($user->getUserId());
 		}
 
 		$dbm = $context->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 
 		try
 		{
-			$date = date( 'Y-m-d H:i:s' );
-			$ctime = ( $item->getTimeCreated() ? $item->getTimeCreated() : $date );
+			$date = date('Y-m-d H:i:s');
+			$ctime = ($item->getTimeCreated() ? $item->getTimeCreated() : $date);
 			$billingAddress = $item->getPaymentAddress();
 
 			$path = 'mshop/customer/manager/ezpublish/update';
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $billingAddress->getCompany() );
-			$stmt->bind( 2, $billingAddress->getVatID() );
-			$stmt->bind( 3, $billingAddress->getSalutation() );
-			$stmt->bind( 4, $billingAddress->getTitle() );
-			$stmt->bind( 5, $billingAddress->getFirstname() );
-			$stmt->bind( 6, $billingAddress->getLastname() );
-			$stmt->bind( 7, $billingAddress->getAddress1() );
-			$stmt->bind( 8, $billingAddress->getAddress2() );
-			$stmt->bind( 9, $billingAddress->getAddress3() );
-			$stmt->bind( 10, $billingAddress->getPostal() );
-			$stmt->bind( 11, $billingAddress->getCity() );
-			$stmt->bind( 12, $billingAddress->getState() );
-			$stmt->bind( 13, $billingAddress->getCountryId() );
-			$stmt->bind( 14, $billingAddress->getLanguageId() );
-			$stmt->bind( 15, $billingAddress->getTelephone() );
-			$stmt->bind( 16, $billingAddress->getTelefax() );
-			$stmt->bind( 17, $billingAddress->getWebsite() );
-			$stmt->bind( 18, $item->getBirthday() );
-			$stmt->bind( 19, $item->getDateVerified() );
-			$stmt->bind( 20, $date ); // Modification time
-			$stmt->bind( 21, $context->getEditor() );
-			$stmt->bind( 22, $ctime ); // Creation time
-			$stmt->bind( 23, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+			$stmt = $this->getCachedStatement($conn, $path);
+
+			$stmt->bind(1, $billingAddress->getCompany());
+			$stmt->bind(2, $billingAddress->getVatID());
+			$stmt->bind(3, $billingAddress->getSalutation());
+			$stmt->bind(4, $billingAddress->getTitle());
+			$stmt->bind(5, $billingAddress->getFirstname());
+			$stmt->bind(6, $billingAddress->getLastname());
+			$stmt->bind(7, $billingAddress->getAddress1());
+			$stmt->bind(8, $billingAddress->getAddress2());
+			$stmt->bind(9, $billingAddress->getAddress3());
+			$stmt->bind(10, $billingAddress->getPostal());
+			$stmt->bind(11, $billingAddress->getCity());
+			$stmt->bind(12, $billingAddress->getState());
+			$stmt->bind(13, $billingAddress->getCountryId());
+			$stmt->bind(14, $billingAddress->getLanguageId());
+			$stmt->bind(15, $billingAddress->getTelephone());
+			$stmt->bind(16, $billingAddress->getTelefax());
+			$stmt->bind(17, $billingAddress->getWebsite());
+			$stmt->bind(18, $item->getBirthday());
+			$stmt->bind(19, $item->getDateVerified());
+			$stmt->bind(20, $date); // Modification time
+			$stmt->bind(21, $context->getEditor());
+			$stmt->bind(22, $ctime); // Creation time
+			$stmt->bind(23, $item->getId(), \Aimeos\MW\DB\Statement\Base::PARAM_INT);
 
 			$stmt->execute()->finish();
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 	}
@@ -391,11 +391,11 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Iface
 	 * @throws \Aimeos\MShop\Customer\Exception If creating items failed
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null)
 	{
 		$dbm = $this->getContext()->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 		$map = array();
 
 		try
@@ -403,34 +403,34 @@ 
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 			$cfgPathSearch = 'mshop/customer/manager/ezpublish/search';
 			$cfgPathCount = 'mshop/customer/manager/ezpublish/count';
-			$required = array( 'customer' );
+			$required = array('customer');
 
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
 
-			while( ( $row = $results->fetch() ) !== false )
+			while (($row = $results->fetch()) !== false)
 			{
-				$map[ $row['customer.id'] ] = $row;
-				$map[ $row['customer.id'] ]['groups'] = array();
+				$map[$row['customer.id']] = $row;
+				$map[$row['customer.id']]['groups'] = array();
 			}
 
 
 			$path = 'mshop/customer/manager/ezpublish/groups';
-			$stmt = $conn->create( $this->getGroupSql( array_keys( $map ), $path ) );
+			$stmt = $conn->create($this->getGroupSql(array_keys($map), $path));
 			$results = $stmt->execute();
 
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[ $row['contentobject_id'] ]['groups'][] = $row['role_id'];
+			while (($row = $results->fetch()) !== false) {
+				$map[$row['contentobject_id']]['groups'][] = $row['role_id'];
 			}
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname  );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 
-		return $this->buildItems( $map, $ref, 'customer' );
+		return $this->buildItems($map, $ref, 'customer');
 	}
 
 
@@ -442,15 +442,15 @@ 
 	 * @param array $refItems Items referenced by the customer item via the list items
 	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item
 	 */
-	protected function createItemBase( array $values = array(), array $listItems = array(), array $refItems = array() )
+	protected function createItemBase(array $values = array(), array $listItems = array(), array $refItems = array())
 	{
-		if( !isset( $this->addressManager ) ) {
-			$this->addressManager = $this->getSubManager( 'address' );
+		if (!isset($this->addressManager)) {
+			$this->addressManager = $this->getSubManager('address');
 		}
 
 		$address = $this->addressManager->createItem();
 
-		return new \Aimeos\MShop\Customer\Item\Ezpublish( $address, $values, $listItems, $refItems );
+		return new \Aimeos\MShop\Customer\Item\Ezpublish($address, $values, $listItems, $refItems);
 	}
 
 
@@ -461,18 +461,18 @@ 
 	 * @param string $cfgpath Configuration path to the SQL statement
 	 * @return string SQL statement ready for execution
 	 */
-	protected function getGroupSql( array $ids, $cfgpath )
+	protected function getGroupSql(array $ids, $cfgpath)
 	{
-		if( empty( $ids ) ) { return '1=1'; }
+		if (empty($ids)) { return '1=1'; }
 
 		$search = $this->createSearch();
-		$search->setConditions( $search->compare( '==', 'id', $ids ) );
+		$search->setConditions($search->compare('==', 'id', $ids));
 
-		$types = array( 'id' => \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-		$translations = array( 'id' => '"contentobject_id"' );
+		$types = array('id' => \Aimeos\MW\DB\Statement\Base::PARAM_INT);
+		$translations = array('id' => '"contentobject_id"');
 
-		$cond = $search->getConditionString( $types, $translations );
+		$cond = $search->getConditionString($types, $translations);
 
-		return str_replace( ':cond', $cond, $this->getSqlConfig( $cfgpath ) );
+		return str_replace(':cond', $cond, $this->getSqlConfig($cfgpath));
 	}
 }

Braces +3 added lines, -6 removed lines

@@ -324,8 +324,7 @@ 
 
 			$user = $service->loadUser( $item->getId() );
 			$service->updateUser( $user, $struct );
-		}
-		else
+		} else
 		{
 			$struct = $service->newUserCreateStruct( $item->getCode(), $email, $item->getPassword(), 'eng-GB' );
 			$struct->enabled = $item->getStatus();
@@ -374,8 +373,7 @@ 
 			$stmt->execute()->finish();
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname );
 			throw $e;
@@ -423,8 +421,7 @@ 
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname  );
 			throw $e;

lib/custom/src/MShop/Customer/Manager/Group/Ezpublish.php

Indentation +149 added lines, -149 removed lines

@@ -18,154 +18,154 @@
  * @subpackage Customer
  */
 class Ezpublish
-	extends \Aimeos\MShop\Customer\Manager\Group\Standard
-	implements \Aimeos\MShop\Customer\Manager\Group\Iface
+    extends \Aimeos\MShop\Customer\Manager\Group\Standard
+    implements \Aimeos\MShop\Customer\Manager\Group\Iface
 {
-	private $searchConfig = array(
-		'customer.group.id' => array(
-			'code' => 'customer.group.id',
-			'internalcode' => 'ezro."id"',
-			'label' => 'Customer group ID',
-			'type' => 'integer',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.group.code' => array(
-			'code' => 'customer.group.code',
-			'internalcode' => 'ezro."id"',
-			'label' => 'Customer group code',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
-		),
-		'customer.group.label' => array(
-			'code' => 'customer.group.label',
-			'internalcode' => 'ezro."name"',
-			'label' => 'Customer group label',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.group.ctime'=> array(
-			'code' => 'customer.group.ctime',
-			'internalcode' => '\'0\'',
-			'label' => 'Customer group creation time',
-			'type' => 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.group.mtime'=> array(
-			'code' => 'customer.group.mtime',
-			'internalcode' => '\'0\'',
-			'label' => 'Customer group modification time',
-			'type' => 'datetime',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-		'customer.group.editor'=> array(
-			'code' => 'customer.group.editor',
-			'internalcode' => '\'0\'',
-			'label' => 'Customer group editor',
-			'type' => 'string',
-			'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
-		),
-	);
-
-
-	/**
-	 * Removes old entries from the database
-	 *
-	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
-	 */
-	public function cleanup( array $siteids )
-	{
-	}
-
-
-	/**
-	 * Removes multiple items specified by their IDs
-	 *
-	 * @param array $ids List of IDs
-	 */
-	public function deleteItems( array $ids )
-	{
-		throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Deleting groups is not supported, please use the eZ Publish backend' ) );
-	}
-
-
-	/**
-	 * Returns the attributes that can be used for searching
-	 *
-	 * @param boolean $withsub Return attributes of sub-managers too if true
-	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
-	 */
-	public function getSearchAttributes( $withsub = true )
-	{
-		$path = 'mshop/customer/manager/group/submanagers';
-
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
-	}
-
-
-	/**
-	 * Returns a new manager for customer group extensions
-	 *
-	 * @param string $manager Name of the sub manager type in lower case
-	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
-	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions
-	 */
-	public function getSubManager( $manager, $name = null )
-	{
-		return $this->getSubManagerBase( 'customer/group', $manager, ( $name === null ? 'Ezpublish' : $name ) );
-	}
-
-
-	/**
-	 * Inserts a new or updates an existing customer group item
-	 *
-	 * @param \Aimeos\MShop\Customer\Item\Group\Iface $item Customer group item
-	 * @param boolean $fetch True if the new ID should be returned in the item
-	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
-	{
-		throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Saving groups is not supported, please use the eZ Publish backend' ) );
-	}
-
-
-	/**
-	 * Returns the item objects matched by the given search criteria.
-	 *
-	 * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
-	 * @param array $ref List of domain items that should be fetched too
-	 * @param integer &$total Number of items that are available in total
-	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Group\Iface
-	 * @throws \Aimeos\MShop\Exception If retrieving items failed
-	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null )
-	{
-		$map = array();
-		$context = $this->getContext();
-
-		$dbm = $context->getDatabaseManager();
-		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
-
-		try
-		{
-			$required = array( 'customer.group' );
-			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
-			$cfgPathSearch = 'mshop/customer/manager/group/ezpublish/search';
-			$cfgPathCount = 'mshop/customer/manager/group/ezpublish/count';
-
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
-
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[$row['customer.group.id']] = $this->createItemBase( $row );
-			}
-
-			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
-		{
-			$dbm->release( $conn, $dbname );
-			throw $e;
-		}
-
-		return $map;
-	}
+    private $searchConfig = array(
+        'customer.group.id' => array(
+            'code' => 'customer.group.id',
+            'internalcode' => 'ezro."id"',
+            'label' => 'Customer group ID',
+            'type' => 'integer',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.group.code' => array(
+            'code' => 'customer.group.code',
+            'internalcode' => 'ezro."id"',
+            'label' => 'Customer group code',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_INT,
+        ),
+        'customer.group.label' => array(
+            'code' => 'customer.group.label',
+            'internalcode' => 'ezro."name"',
+            'label' => 'Customer group label',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.group.ctime'=> array(
+            'code' => 'customer.group.ctime',
+            'internalcode' => '\'0\'',
+            'label' => 'Customer group creation time',
+            'type' => 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.group.mtime'=> array(
+            'code' => 'customer.group.mtime',
+            'internalcode' => '\'0\'',
+            'label' => 'Customer group modification time',
+            'type' => 'datetime',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+        'customer.group.editor'=> array(
+            'code' => 'customer.group.editor',
+            'internalcode' => '\'0\'',
+            'label' => 'Customer group editor',
+            'type' => 'string',
+            'internaltype' => \Aimeos\MW\DB\Statement\Base::PARAM_STR,
+        ),
+    );
+
+
+    /**
+     * Removes old entries from the database
+     *
+     * @param integer[] $siteids List of IDs for sites whose entries should be deleted
+     */
+    public function cleanup( array $siteids )
+    {
+    }
+
+
+    /**
+     * Removes multiple items specified by their IDs
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Deleting groups is not supported, please use the eZ Publish backend' ) );
+    }
+
+
+    /**
+     * Returns the attributes that can be used for searching
+     *
+     * @param boolean $withsub Return attributes of sub-managers too if true
+     * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
+     */
+    public function getSearchAttributes( $withsub = true )
+    {
+        $path = 'mshop/customer/manager/group/submanagers';
+
+        return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
+    }
+
+
+    /**
+     * Returns a new manager for customer group extensions
+     *
+     * @param string $manager Name of the sub manager type in lower case
+     * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
+     * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions
+     */
+    public function getSubManager( $manager, $name = null )
+    {
+        return $this->getSubManagerBase( 'customer/group', $manager, ( $name === null ? 'Ezpublish' : $name ) );
+    }
+
+
+    /**
+     * Inserts a new or updates an existing customer group item
+     *
+     * @param \Aimeos\MShop\Customer\Item\Group\Iface $item Customer group item
+     * @param boolean $fetch True if the new ID should be returned in the item
+     */
+    public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+    {
+        throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Saving groups is not supported, please use the eZ Publish backend' ) );
+    }
+
+
+    /**
+     * Returns the item objects matched by the given search criteria.
+     *
+     * @param \Aimeos\MW\Criteria\Iface $search Search criteria object
+     * @param array $ref List of domain items that should be fetched too
+     * @param integer &$total Number of items that are available in total
+     * @return array List of items implementing \Aimeos\MShop\Customer\Item\Group\Iface
+     * @throws \Aimeos\MShop\Exception If retrieving items failed
+     */
+    public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null )
+    {
+        $map = array();
+        $context = $this->getContext();
+
+        $dbm = $context->getDatabaseManager();
+        $dbname = $this->getResourceName();
+        $conn = $dbm->acquire( $dbname );
+
+        try
+        {
+            $required = array( 'customer.group' );
+            $level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
+            $cfgPathSearch = 'mshop/customer/manager/group/ezpublish/search';
+            $cfgPathCount = 'mshop/customer/manager/group/ezpublish/count';
+
+            $results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+
+            while( ( $row = $results->fetch() ) !== false ) {
+                $map[$row['customer.group.id']] = $this->createItemBase( $row );
+            }
+
+            $dbm->release( $conn, $dbname );
+        }
+        catch( \Exception $e )
+        {
+            $dbm->release( $conn, $dbname );
+            throw $e;
+        }
+
+        return $map;
+    }
 }

Spacing +18 added lines, -18 removed lines

@@ -72,7 +72,7 @@ 
 	 *
 	 * @param integer[] $siteids List of IDs for sites whose entries should be deleted
 	 */
-	public function cleanup( array $siteids )
+	public function cleanup(array $siteids)
 	{
 	}
 
@@ -82,9 +82,9 @@ 
 	 *
 	 * @param array $ids List of IDs
 	 */
-	public function deleteItems( array $ids )
+	public function deleteItems(array $ids)
 	{
-		throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Deleting groups is not supported, please use the eZ Publish backend' ) );
+		throw new \Aimeos\MShop\Customer\Exception(sprintf('Deleting groups is not supported, please use the eZ Publish backend'));
 	}
 
 
@@ -94,11 +94,11 @@ 
 	 * @param boolean $withsub Return attributes of sub-managers too if true
 	 * @return array List of attribute items implementing \Aimeos\MW\Criteria\Attribute\Iface
 	 */
-	public function getSearchAttributes( $withsub = true )
+	public function getSearchAttributes($withsub = true)
 	{
 		$path = 'mshop/customer/manager/group/submanagers';
 
-		return $this->getSearchAttributesBase( $this->searchConfig, $path, array(), $withsub );
+		return $this->getSearchAttributesBase($this->searchConfig, $path, array(), $withsub);
 	}
 
 
@@ -109,9 +109,9 @@ 
 	 * @param string|null $name Name of the implementation, will be from configuration (or Default) if null
 	 * @return \Aimeos\MShop\Common\Manager\Iface Manager for different extensions
 	 */
-	public function getSubManager( $manager, $name = null )
+	public function getSubManager($manager, $name = null)
 	{
-		return $this->getSubManagerBase( 'customer/group', $manager, ( $name === null ? 'Ezpublish' : $name ) );
+		return $this->getSubManagerBase('customer/group', $manager, ($name === null ? 'Ezpublish' : $name));
 	}
 
 
@@ -121,9 +121,9 @@ 
 	 * @param \Aimeos\MShop\Customer\Item\Group\Iface $item Customer group item
 	 * @param boolean $fetch True if the new ID should be returned in the item
 	 */
-	public function saveItem( \Aimeos\MShop\Common\Item\Iface $item, $fetch = true )
+	public function saveItem(\Aimeos\MShop\Common\Item\Iface $item, $fetch = true)
 	{
-		throw new \Aimeos\MShop\Customer\Exception( sprintf( 'Saving groups is not supported, please use the eZ Publish backend' ) );
+		throw new \Aimeos\MShop\Customer\Exception(sprintf('Saving groups is not supported, please use the eZ Publish backend'));
 	}
 
 
@@ -136,33 +136,33 @@ 
 	 * @return array List of items implementing \Aimeos\MShop\Customer\Item\Group\Iface
 	 * @throws \Aimeos\MShop\Exception If retrieving items failed
 	 */
-	public function searchItems( \Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null )
+	public function searchItems(\Aimeos\MW\Criteria\Iface $search, array $ref = array(), &$total = null)
 	{
 		$map = array();
 		$context = $this->getContext();
 
 		$dbm = $context->getDatabaseManager();
 		$dbname = $this->getResourceName();
-		$conn = $dbm->acquire( $dbname );
+		$conn = $dbm->acquire($dbname);
 
 		try
 		{
-			$required = array( 'customer.group' );
+			$required = array('customer.group');
 			$level = \Aimeos\MShop\Locale\Manager\Base::SITE_ALL;
 			$cfgPathSearch = 'mshop/customer/manager/group/ezpublish/search';
 			$cfgPathCount = 'mshop/customer/manager/group/ezpublish/count';
 
-			$results = $this->searchItemsBase( $conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level );
+			$results = $this->searchItemsBase($conn, $search, $cfgPathSearch, $cfgPathCount, $required, $total, $level);
 
-			while( ( $row = $results->fetch() ) !== false ) {
-				$map[$row['customer.group.id']] = $this->createItemBase( $row );
+			while (($row = $results->fetch()) !== false) {
+				$map[$row['customer.group.id']] = $this->createItemBase($row);
 			}
 
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 		}
-		catch( \Exception $e )
+		catch (\Exception $e)
 		{
-			$dbm->release( $conn, $dbname );
+			$dbm->release($conn, $dbname);
 			throw $e;
 		}
 

Braces +1 added lines, -2 removed lines

@@ -159,8 +159,7 @@
 			}
 
 			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
+		} catch( \Exception $e )
 		{
 			$dbm->release( $conn, $dbname );
 			throw $e;

lib/custom/src/MShop/Context/Item/Ezpublish.php

Indentation +29 added lines, -29 removed lines

@@ -19,33 +19,33 @@
  */
 class Ezpublish extends \Aimeos\MShop\Context\Item\Standard
 {
-	private $ezUserService;
-
-
-	/**
-	 * Sets the eZ user service object
-	 *
-	 * @param \eZ\Publish\API\Repository\UserService $service eZ user service object
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
-	 */
-	public function setEzUserService( \eZ\Publish\API\Repository\UserService $service )
-	{
-		$this->ezUserService = $service;
-		return $this;
-	}
-
-
-	/**
-	 * Returns the eZ user service object
-	 *
-	 * @return \eZ\Publish\API\Repository\UserService eZ user service object
-	 */
-	public function getEzUserService()
-	{
-		if( !isset( $this->ezUserService ) ) {
-			throw new \Aimeos\MShop\Exception( sprintf( 'eZ user service not available' ) );
-		}
-
-		return $this->ezUserService;
-	}
+    private $ezUserService;
+
+
+    /**
+     * Sets the eZ user service object
+     *
+     * @param \eZ\Publish\API\Repository\UserService $service eZ user service object
+     * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
+     */
+    public function setEzUserService( \eZ\Publish\API\Repository\UserService $service )
+    {
+        $this->ezUserService = $service;
+        return $this;
+    }
+
+
+    /**
+     * Returns the eZ user service object
+     *
+     * @return \eZ\Publish\API\Repository\UserService eZ user service object
+     */
+    public function getEzUserService()
+    {
+        if( !isset( $this->ezUserService ) ) {
+            throw new \Aimeos\MShop\Exception( sprintf( 'eZ user service not available' ) );
+        }
+
+        return $this->ezUserService;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -28,7 +28,7 @@ 
 	 * @param \eZ\Publish\API\Repository\UserService $service eZ user service object
 	 * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
 	 */
-	public function setEzUserService( \eZ\Publish\API\Repository\UserService $service )
+	public function setEzUserService(\eZ\Publish\API\Repository\UserService $service)
 	{
 		$this->ezUserService = $service;
 		return $this;
@@ -42,8 +42,8 @@ 
 	 */
 	public function getEzUserService()
 	{
-		if( !isset( $this->ezUserService ) ) {
-			throw new \Aimeos\MShop\Exception( sprintf( 'eZ user service not available' ) );
+		if (!isset($this->ezUserService)) {
+			throw new \Aimeos\MShop\Exception(sprintf('eZ user service not available'));
 		}
 
 		return $this->ezUserService;