aimeos / ai-ezpublish

lib/custom/tests/TestHelper.php

Indentation +78 added lines, -78 removed lines

@@ -8,125 +8,125 @@
  */
 class TestHelper
 {
-	private static $aimeos;
-	private static $context = array();
+    private static $aimeos;
+    private static $context = array();
 
 
-	public static function bootstrap()
-	{
-		$aimeos = self::getAimeos();
+    public static function bootstrap()
+    {
+        $aimeos = self::getAimeos();
 
-		$includepaths = $aimeos->getIncludePaths();
-		$includepaths[] = get_include_path();
-		set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
-	}
+        $includepaths = $aimeos->getIncludePaths();
+        $includepaths[] = get_include_path();
+        set_include_path( implode( PATH_SEPARATOR, $includepaths ) );
+    }
 
 
-	public static function getContext( $site = 'unittest' )
-	{
-		if( !isset( self::$context[$site] ) ) {
-			self::$context[$site] = self::createContext( $site );
-		}
+    public static function getContext( $site = 'unittest' )
+    {
+        if( !isset( self::$context[$site] ) ) {
+            self::$context[$site] = self::createContext( $site );
+        }
 
-		return clone self::$context[$site];
-	}
+        return clone self::$context[$site];
+    }
 
 
-	private static function getAimeos()
-	{
-		if( !isset( self::$aimeos ) )
-		{
-			require_once 'Bootstrap.php';
-			spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
+    private static function getAimeos()
+    {
+        if( !isset( self::$aimeos ) )
+        {
+            require_once 'Bootstrap.php';
+            spl_autoload_register( 'Aimeos\\Bootstrap::autoload' );
 
-			$extdir = dirname( dirname( dirname( __DIR__ ) ) );
-			self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
-		}
+            $extdir = dirname( dirname( dirname( __DIR__ ) ) );
+            self::$aimeos = new \Aimeos\Bootstrap( array( $extdir ), true );
+        }
 
-		return self::$aimeos;
-	}
+        return self::$aimeos;
+    }
 
 
-	/**
-	 * @param string $site
-	 */
-	private static function createContext( $site )
-	{
-		$ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
-		$aimeos = self::getAimeos();
+    /**
+     * @param string $site
+     */
+    private static function createContext( $site )
+    {
+        $ctx = new \Aimeos\MShop\Context\Item\Ezpublish();
+        $aimeos = self::getAimeos();
 
 
-		$paths = $aimeos->getConfigPaths();
-		$paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
+        $paths = $aimeos->getConfigPaths();
+        $paths[] = __DIR__ . DIRECTORY_SEPARATOR . 'config';
 
-		$conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
-		$ctx->setConfig( $conf );
+        $conf = new \Aimeos\MW\Config\PHPArray( array(), $paths );
+        $ctx->setConfig( $conf );
 
 
-		$dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
-		$ctx->setDatabaseManager( $dbm );
+        $dbm = new \Aimeos\MW\DB\Manager\DBAL( $conf );
+        $ctx->setDatabaseManager( $dbm );
 
 
-		$logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
-		$ctx->setLogger( $logger );
+        $logger = new \Aimeos\MW\Logger\File( $site . '.log', \Aimeos\MW\Logger\Base::DEBUG );
+        $ctx->setLogger( $logger );
 
 
-		$cache = new \Aimeos\MW\Cache\None();
-		$ctx->setCache( $cache );
+        $cache = new \Aimeos\MW\Cache\None();
+        $ctx->setCache( $cache );
 
 
-		$i18n = new \Aimeos\MW\Translation\None( 'de' );
-		$ctx->setI18n( array( 'de' => $i18n ) );
+        $i18n = new \Aimeos\MW\Translation\None( 'de' );
+        $ctx->setI18n( array( 'de' => $i18n ) );
 
 
-		$session = new \Aimeos\MW\Session\None();
-		$ctx->setSession( $session );
+        $session = new \Aimeos\MW\Session\None();
+        $ctx->setSession( $session );
 
 
-		$localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
-		$localeItem = $localeManager->bootstrap( $site, '', '', false );
+        $localeManager = \Aimeos\MShop\Locale\Manager\Factory::createManager( $ctx );
+        $localeItem = $localeManager->bootstrap( $site, '', '', false );
 
-		$ctx->setLocale( $localeItem );
+        $ctx->setLocale( $localeItem );
 
-		$ctx->setEditor( 'ai-ezpublish:unittest' );
+        $ctx->setEditor( 'ai-ezpublish:unittest' );
 
 
-		$ctx->setEzUser( function( $code, $email, $password ) use ( $ctx ) {
+        $ctx->setEzUser( function( $code, $email, $password ) use ( $ctx ) {
 
-			$id = mt_rand( -0x7fffffff,-1 );
-			$dbm = $ctx->getDatabaseManager();
-			$dbconf = $ctx->getConfig()->get( 'resource/db-customer' );
-			$dbname = ( $dbconf ? 'db-customer' : 'db' );
-			$conn = $dbm->acquire( $dbname );
+            $id = mt_rand( -0x7fffffff,-1 );
+            $dbm = $ctx->getDatabaseManager();
+            $dbconf = $ctx->getConfig()->get( 'resource/db-customer' );
+            $dbname = ( $dbconf ? 'db-customer' : 'db' );
+            $conn = $dbm->acquire( $dbname );
 
-			try
-			{
-				$stmt = $conn->create( 'INSERT INTO "ezuser" (
+            try
+            {
+                $stmt = $conn->create( 'INSERT INTO "ezuser" (
 					"contentobject_id", "email", "login", "login_normalized", "password_hash", "password_hash_type"
 				) VALUES (
 					?, ?, ?, ?, ?, 5
 				)' );
 
-				$stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-				$stmt->bind( 2, $email );
-				$stmt->bind( 3, $code );
-				$stmt->bind( 4, $code );
-				$stmt->bind( 5, $password );
+                $stmt->bind( 1, $id, \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+                $stmt->bind( 2, $email );
+                $stmt->bind( 3, $code );
+                $stmt->bind( 4, $code );
+                $stmt->bind( 5, $password );
 
-				$stmt->execute()->finish();
+                $stmt->execute()->finish();
 
-				$dbm->release( $conn, $dbname );
-			}
-			catch( \Exception $e )
-			{
-				$dbm->release( $conn, $dbname );
-				throw $e;
-			}
+                $dbm->release( $conn, $dbname );
+            }
+            catch( \Exception $e )
+            {
+                $dbm->release( $conn, $dbname );
+                throw $e;
+            }
 
-			return $id;
-		} );
+            return $id;
+        } );
 
 
-		return $ctx;
-	}
+        return $ctx;
+    }
 }

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 $ezUser;
-
-
-	/**
-	 * Sets the user creating function
-	 *
-	 * @param \Closure $userfcn Function to create a new user and return its ID
-	 * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
-	 */
-	public function setEzUser( \Closure $userfcn )
-	{
-		$this->ezUser = $userfcn;
-		return $this;
-	}
-
-
-	/**
-	 * Returns the user creating function
-	 *
-	 * @return \Closure Function to create a new user and return its ID
-	 */
-	public function getEzUser()
-	{
-		if( !isset( $this->ezUser ) ) {
-			throw new \Aimeos\MShop\Exception( sprintf( 'eZ user function not available' ) );
-		}
-
-		return $this->ezUser;
-	}
+    private $ezUser;
+
+
+    /**
+     * Sets the user creating function
+     *
+     * @param \Closure $userfcn Function to create a new user and return its ID
+     * @return \Aimeos\MShop\Context\Item\Iface Context item for chaining method calls
+     */
+    public function setEzUser( \Closure $userfcn )
+    {
+        $this->ezUser = $userfcn;
+        return $this;
+    }
+
+
+    /**
+     * Returns the user creating function
+     *
+     * @return \Closure Function to create a new user and return its ID
+     */
+    public function getEzUser()
+    {
+        if( !isset( $this->ezUser ) ) {
+            throw new \Aimeos\MShop\Exception( sprintf( 'eZ user function not available' ) );
+        }
+
+        return $this->ezUser;
+    }
 }

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

Indentation +172 added lines, -172 removed lines

@@ -18,177 +18,177 @@
  * @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, 'mshop/customer/manager/lists/ezpublish/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->searchConfig, $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 ) );
-	}
-
-
-	/**
-	 * 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, 'mshop/customer/manager/lists/ezpublish/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->searchConfig, $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 ) );
+    }
+
+
+    /**
+     * 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;
+    }
 }

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, 'mshop/customer/manager/lists/type/ezpublish/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->searchConfig, $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, 'mshop/customer/manager/lists/type/ezpublish/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->searchConfig, $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;
+    }
 }

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

Indentation +2 added lines, -2 removed lines

@@ -18,7 +18,7 @@
  * @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
 {
 }

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

Indentation +436 added lines, -436 removed lines

@@ -18,441 +18,441 @@
  * @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' => 'ezu."status"',
-			'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 );
-		}
-	}
-
-
-	/**
-	 * Removes multiple items specified by ids in the array.
-	 *
-	 * @param array $ids List of IDs
-	 */
-	public function deleteItems( array $ids )
-	{
-		$path = 'mshop/customer/manager/ezpublish/delete';
-		$this->deleteItemsBase( $ids, $path, false, 'contentobject_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 );
-	}
-
-
-	/**
-	 * Instantiates a new customer item object.
-	 *
-	 * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
-	 */
-	public function createItem()
-	{
-		return $this->createItemBase();
-	}
-
-
-	/**
-	 * 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 ) );
-		}
-
-		if( $item->getId() === null )
-		{
-			$fcn = $context->getEzUser();
-			$contentId = $fcn( $item->getCode(), $item->getPaymentAddress()->getEmail(), $item->getPassword() );
-			$item->setId( $contentId );
-		}
-
-		$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();
-
-			/** mshop/customer/manager/ezpublish/update
-			 * Updates an existing customer record in the database
-			 *
-			 * Items which already have an ID (i.e. the ID is not NULL) will
-			 * be updated in the database.
-			 *
-			 * The SQL statement must be a string suitable for being used as
-			 * prepared statement. It must include question marks for binding
-			 * the values from the customer item to the statement before they are
-			 * sent to the database server. The order of the columns must
-			 * correspond to the order in the saveItems() method, so the
-			 * correct values are bound to the columns.
-			 *
-			 * The SQL statement should conform to the ANSI standard to be
-			 * compatible with most relational database systems. This also
-			 * includes using double quotes for table and column names.
-			 *
-			 * @param string SQL statement for updating records
-			 * @since 2016.07
-			 * @category Developer
-			 * @see mshop/customer/manager/ezpublish/insert
-			 * @see mshop/customer/manager/ezpublish/newid
-			 * @see mshop/customer/manager/ezpublish/delete
-			 * @see mshop/customer/manager/ezpublish/search
-			 * @see mshop/customer/manager/ezpublish/count
-			 */
-			$path = 'mshop/customer/manager/ezpublish/update';
-
-			$stmt = $this->getCachedStatement( $conn, $path );
-
-			$stmt->bind( 1, $item->getCode() ); // login normalized
-			$stmt->bind( 2, $item->getCode() ); // login
-			$stmt->bind( 3, $billingAddress->getCompany() );
-			$stmt->bind( 4, $billingAddress->getVatID() );
-			$stmt->bind( 5, $billingAddress->getSalutation() );
-			$stmt->bind( 6, $billingAddress->getTitle() );
-			$stmt->bind( 7, $billingAddress->getFirstname() );
-			$stmt->bind( 8, $billingAddress->getLastname() );
-			$stmt->bind( 9, $billingAddress->getAddress1() );
-			$stmt->bind( 10, $billingAddress->getAddress2() );
-			$stmt->bind( 11, $billingAddress->getAddress3() );
-			$stmt->bind( 12, $billingAddress->getPostal() );
-			$stmt->bind( 13, $billingAddress->getCity() );
-			$stmt->bind( 14, $billingAddress->getState() );
-			$stmt->bind( 15, $billingAddress->getCountryId() );
-			$stmt->bind( 16, $billingAddress->getLanguageId() );
-			$stmt->bind( 17, $billingAddress->getTelephone() );
-			$stmt->bind( 18, $billingAddress->getEmail() );
-			$stmt->bind( 19, $billingAddress->getTelefax() );
-			$stmt->bind( 20, $billingAddress->getWebsite() );
-			$stmt->bind( 21, $item->getBirthday() );
-			$stmt->bind( 22, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
-			$stmt->bind( 23, $item->getDateVerified() );
-			$stmt->bind( 24, $item->getPassword() );
-			$stmt->bind( 25, $date ); // Modification time
-			$stmt->bind( 26, $context->getEditor() );
-			$stmt->bind( 27, $ctime ); // Creation time
-			$stmt->bind( 28, $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;
-			}
-
-			$dbm->release( $conn, $dbname );
-		}
-		catch( \Exception $e )
-		{
-			$dbm->release( $conn, $dbname  );
-			throw $e;
-		}
-
-		return $this->buildItems( $map, $ref, 'customer' );
-	}
-
-
-	/**
-	 * 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 ) );
-	}
-
-
-	/**
-	 * 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' );
-		}
-
-		$helper = $this->getPasswordHelper();
-		$address = $this->addressManager->createItem();
-
-		return new \Aimeos\MShop\Customer\Item\Standard( $address, $values, $listItems, $refItems, null, $helper );
-	}
+    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' => 'ezu."status"',
+            '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 );
+        }
+    }
+
+
+    /**
+     * Removes multiple items specified by ids in the array.
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        $path = 'mshop/customer/manager/ezpublish/delete';
+        $this->deleteItemsBase( $ids, $path, false, 'contentobject_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 );
+    }
+
+
+    /**
+     * Instantiates a new customer item object.
+     *
+     * @return \Aimeos\MShop\Customer\Item\Iface New customer item object
+     */
+    public function createItem()
+    {
+        return $this->createItemBase();
+    }
+
+
+    /**
+     * 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 ) );
+        }
+
+        if( $item->getId() === null )
+        {
+            $fcn = $context->getEzUser();
+            $contentId = $fcn( $item->getCode(), $item->getPaymentAddress()->getEmail(), $item->getPassword() );
+            $item->setId( $contentId );
+        }
+
+        $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();
+
+            /** mshop/customer/manager/ezpublish/update
+             * Updates an existing customer record in the database
+             *
+             * Items which already have an ID (i.e. the ID is not NULL) will
+             * be updated in the database.
+             *
+             * The SQL statement must be a string suitable for being used as
+             * prepared statement. It must include question marks for binding
+             * the values from the customer item to the statement before they are
+             * sent to the database server. The order of the columns must
+             * correspond to the order in the saveItems() method, so the
+             * correct values are bound to the columns.
+             *
+             * The SQL statement should conform to the ANSI standard to be
+             * compatible with most relational database systems. This also
+             * includes using double quotes for table and column names.
+             *
+             * @param string SQL statement for updating records
+             * @since 2016.07
+             * @category Developer
+             * @see mshop/customer/manager/ezpublish/insert
+             * @see mshop/customer/manager/ezpublish/newid
+             * @see mshop/customer/manager/ezpublish/delete
+             * @see mshop/customer/manager/ezpublish/search
+             * @see mshop/customer/manager/ezpublish/count
+             */
+            $path = 'mshop/customer/manager/ezpublish/update';
+
+            $stmt = $this->getCachedStatement( $conn, $path );
+
+            $stmt->bind( 1, $item->getCode() ); // login normalized
+            $stmt->bind( 2, $item->getCode() ); // login
+            $stmt->bind( 3, $billingAddress->getCompany() );
+            $stmt->bind( 4, $billingAddress->getVatID() );
+            $stmt->bind( 5, $billingAddress->getSalutation() );
+            $stmt->bind( 6, $billingAddress->getTitle() );
+            $stmt->bind( 7, $billingAddress->getFirstname() );
+            $stmt->bind( 8, $billingAddress->getLastname() );
+            $stmt->bind( 9, $billingAddress->getAddress1() );
+            $stmt->bind( 10, $billingAddress->getAddress2() );
+            $stmt->bind( 11, $billingAddress->getAddress3() );
+            $stmt->bind( 12, $billingAddress->getPostal() );
+            $stmt->bind( 13, $billingAddress->getCity() );
+            $stmt->bind( 14, $billingAddress->getState() );
+            $stmt->bind( 15, $billingAddress->getCountryId() );
+            $stmt->bind( 16, $billingAddress->getLanguageId() );
+            $stmt->bind( 17, $billingAddress->getTelephone() );
+            $stmt->bind( 18, $billingAddress->getEmail() );
+            $stmt->bind( 19, $billingAddress->getTelefax() );
+            $stmt->bind( 20, $billingAddress->getWebsite() );
+            $stmt->bind( 21, $item->getBirthday() );
+            $stmt->bind( 22, $item->getStatus(), \Aimeos\MW\DB\Statement\Base::PARAM_INT );
+            $stmt->bind( 23, $item->getDateVerified() );
+            $stmt->bind( 24, $item->getPassword() );
+            $stmt->bind( 25, $date ); // Modification time
+            $stmt->bind( 26, $context->getEditor() );
+            $stmt->bind( 27, $ctime ); // Creation time
+            $stmt->bind( 28, $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;
+            }
+
+            $dbm->release( $conn, $dbname );
+        }
+        catch( \Exception $e )
+        {
+            $dbm->release( $conn, $dbname  );
+            throw $e;
+        }
+
+        return $this->buildItems( $map, $ref, 'customer' );
+    }
+
+
+    /**
+     * 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 ) );
+    }
+
+
+    /**
+     * 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' );
+        }
+
+        $helper = $this->getPasswordHelper();
+        $address = $this->addressManager->createItem();
+
+        return new \Aimeos\MShop\Customer\Item\Standard( $address, $values, $listItems, $refItems, null, $helper );
+    }
 }

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

Indentation +245 added lines, -245 removed lines

@@ -18,263 +18,263 @@
  * @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 )
-	{
-		$path = 'mshop/customer/manager/address/ezpublish/delete';
-		$this->deleteItemsBase( $ids, $path, false );
-	}
+    /**
+     * Removes multiple items specified by ids in the array.
+     *
+     * @param array $ids List of IDs
+     */
+    public function deleteItems( array $ids )
+    {
+        $path = 'mshop/customer/manager/address/ezpublish/delete';
+        $this->deleteItemsBase( $ids, $path, 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->searchConfig, $path, array(), $withsub );
-	}
+        return $this->getSearchAttributesBase( $this->searchConfig, $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;
+    }
 }

lib/custom/setup/EzuserAddAddress.php

Indentation +116 added lines, -116 removed lines

@@ -14,120 +14,120 @@
  */
 class EzuserAddAddress extends \Aimeos\MW\Setup\Task\TablesCreateMShop
 {
-	/**
-	 * Returns the list of task names which depends on this task.
-	 *
-	 * @return array List of task names
-	 */
-	public function getPostDependencies()
-	{
-		return array();
-	}
-
-
-	/**
-	 * Migrate database schema
-	 */
-	public function migrate()
-	{
-		$this->msg( 'Adding address fields to ezuser table', 0 );
-
-		$dbal = $this->getConnection( 'db-customer' )->getRawObject();
-
-		if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
-			throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
-		}
-
-
-		$fromSchema = $dbal->getSchemaManager()->createSchema();
-		$comparator = new \Doctrine\DBAL\Schema\Comparator();
-		$toSchema = clone $fromSchema;
-
-		$this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
-		$sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
-
-		if( $sql !== array() )
-		{
-			$this->executeList( $sql, 'db-customer' );
-			$this->status( 'done' );
-		}
-		else
-		{
-			$this->status( 'OK' );
-		}
-	}
-
-
-	/**
-	 * Adds the missing columns to the table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table Table object
-	 * @return \Doctrine\DBAL\Schema\Table Updated table object
-	 */
-	protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
-	{
-		$columns = array(
-			'company' => array( 'string', array( 'length' => 100 ) ),
-			'vatid' => array( 'string', array( 'length' => 32 ) ),
-			'salutation' => array( 'string', array( 'length' => 8 ) ),
-			'title' => array( 'string', array( 'length' => 64 ) ),
-			'firstname' => array( 'string', array( 'length' => 64 ) ),
-			'address1' => array( 'string', array( 'length' => 255 ) ),
-			'address2' => array( 'string', array( 'length' => 255 ) ),
-			'address3' => array( 'string', array( 'length' => 255 ) ),
-			'postal' => array( 'string', array( 'length' => 16 ) ),
-			'city' => array( 'string', array( 'length' => 255 ) ),
-			'state' => array( 'string', array( 'length' => 255 ) ),
-			'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
-			'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
-			'telephone' => array( 'string', array( 'length' => 32 ) ),
-			'telefax' => array( 'string', array( 'length' => 32 ) ),
-			'website' => array( 'string', array( 'length' => 255 ) ),
-			'birthday' => array( 'date', array( 'notnull' => false ) ),
-			'vdate' => array( 'date', array( 'notnull' => false ) ),
-			'status' => array( 'smallint', array() ),
-			'mtime' => array( 'datetime', array() ),
-			'ctime' => array( 'datetime', array() ),
-			'editor' => array( 'string', array( 'length' => 255 ) ),
-		);
-
-		foreach( $columns as $name => $def )
-		{
-			if( $table->hasColumn( $name ) === false ) {
-				$table->addColumn( $name, $def[0], $def[1] );
-			}
-		}
-
-		return $table;
-	}
-
-
-	/**
-	 * Adds the missing indexes to the table
-	 *
-	 * @param \Doctrine\DBAL\Schema\Table $table Table object
-	 * @return \Doctrine\DBAL\Schema\Table Updated table object
-	 */
-	protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
-	{
-		$indexes = array(
-			'idx_ezpus_langid' => array( 'langid' ),
-			'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
-			'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
-			'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
-			'idx_ezpus_lastname' => array( 'lastname' ),
-			'idx_ezpus_address1' => array( 'address1' ),
-			'idx_ezpus_postal' => array( 'postal' ),
-			'idx_ezpus_city' => array( 'city' ),
-		);
-
-		foreach( $indexes as $name => $def )
-		{
-			if( $table->hasIndex( $name ) === false ) {
-				$table->addIndex( $def, $name );
-			}
-		}
-
-		return $table;
-	}
+    /**
+     * Returns the list of task names which depends on this task.
+     *
+     * @return array List of task names
+     */
+    public function getPostDependencies()
+    {
+        return array();
+    }
+
+
+    /**
+     * Migrate database schema
+     */
+    public function migrate()
+    {
+        $this->msg( 'Adding address fields to ezuser table', 0 );
+
+        $dbal = $this->getConnection( 'db-customer' )->getRawObject();
+
+        if( !( $dbal instanceof \Doctrine\DBAL\Connection ) ) {
+            throw new \Aimeos\MW\Setup\Exception( 'Not a DBAL connection' );
+        }
+
+
+        $fromSchema = $dbal->getSchemaManager()->createSchema();
+        $comparator = new \Doctrine\DBAL\Schema\Comparator();
+        $toSchema = clone $fromSchema;
+
+        $this->addIndexes( $this->addColumns( $toSchema->getTable( 'ezuser' ) ) );
+        $sql = $fromSchema->getMigrateToSql( $toSchema, $dbal->getDatabasePlatform() );
+
+        if( $sql !== array() )
+        {
+            $this->executeList( $sql, 'db-customer' );
+            $this->status( 'done' );
+        }
+        else
+        {
+            $this->status( 'OK' );
+        }
+    }
+
+
+    /**
+     * Adds the missing columns to the table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table Table object
+     * @return \Doctrine\DBAL\Schema\Table Updated table object
+     */
+    protected function addColumns( \Doctrine\DBAL\Schema\Table $table )
+    {
+        $columns = array(
+            'company' => array( 'string', array( 'length' => 100 ) ),
+            'vatid' => array( 'string', array( 'length' => 32 ) ),
+            'salutation' => array( 'string', array( 'length' => 8 ) ),
+            'title' => array( 'string', array( 'length' => 64 ) ),
+            'firstname' => array( 'string', array( 'length' => 64 ) ),
+            'address1' => array( 'string', array( 'length' => 255 ) ),
+            'address2' => array( 'string', array( 'length' => 255 ) ),
+            'address3' => array( 'string', array( 'length' => 255 ) ),
+            'postal' => array( 'string', array( 'length' => 16 ) ),
+            'city' => array( 'string', array( 'length' => 255 ) ),
+            'state' => array( 'string', array( 'length' => 255 ) ),
+            'langid' => array( 'string', array( 'length' => 5, 'notnull' => false ) ),
+            'countryid' => array( 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) ),
+            'telephone' => array( 'string', array( 'length' => 32 ) ),
+            'telefax' => array( 'string', array( 'length' => 32 ) ),
+            'website' => array( 'string', array( 'length' => 255 ) ),
+            'birthday' => array( 'date', array( 'notnull' => false ) ),
+            'vdate' => array( 'date', array( 'notnull' => false ) ),
+            'status' => array( 'smallint', array() ),
+            'mtime' => array( 'datetime', array() ),
+            'ctime' => array( 'datetime', array() ),
+            'editor' => array( 'string', array( 'length' => 255 ) ),
+        );
+
+        foreach( $columns as $name => $def )
+        {
+            if( $table->hasColumn( $name ) === false ) {
+                $table->addColumn( $name, $def[0], $def[1] );
+            }
+        }
+
+        return $table;
+    }
+
+
+    /**
+     * Adds the missing indexes to the table
+     *
+     * @param \Doctrine\DBAL\Schema\Table $table Table object
+     * @return \Doctrine\DBAL\Schema\Table Updated table object
+     */
+    protected function addIndexes( \Doctrine\DBAL\Schema\Table $table )
+    {
+        $indexes = array(
+            'idx_ezpus_langid' => array( 'langid' ),
+            'idx_ezpus_status_ln_fn' => array( 'status', 'lastname', 'firstname' ),
+            'idx_ezpus_status_ad1_ad2' => array( 'status', 'address1', 'address2' ),
+            'idx_ezpus_status_postal_city' => array( 'status', 'postal', 'city' ),
+            'idx_ezpus_lastname' => array( 'lastname' ),
+            'idx_ezpus_address1' => array( 'address1' ),
+            'idx_ezpus_postal' => array( 'postal' ),
+            'idx_ezpus_city' => array( 'city' ),
+        );
+
+        foreach( $indexes as $name => $def )
+        {
+            if( $table->hasIndex( $name ) === false ) {
+                $table->addIndex( $def, $name );
+            }
+        }
+
+        return $table;
+    }
 }

lib/custom/setup/default/schema/customer.php

Indentation +121 added lines, -121 removed lines

@@ -7,125 +7,125 @@
 
 
 return array(
-	'table' => array(
-		'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser' );
-
-			$table->addColumn( 'contentobject_id', 'integer', array() );
-			$table->addColumn( 'email', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) );
-			$table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) );
-			$table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) );
-
-			$table->setPrimaryKey( array( 'contentobject_id' ) );
-			$table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' );
-
-			return $schema;
-		},
-
-		'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_address' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$table->addColumn( 'company', 'string', array( 'length' => 100 ) );
-			$table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
-			$table->addColumn( 'title', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
-			$table->addColumn( 'address1', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'address2', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'address3', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
-			$table->addColumn( 'city', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'state', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
-			$table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
-			$table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'email', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'website', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'flag', 'integer', array() );
-			$table->addColumn( 'pos', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array('length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' );
-			$table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' );
-			$table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' );
-			$table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' );
-			$table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' );
-			$table->addIndex( array( 'city' ), 'idx_ezpad_city' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' );
-
-			return $schema;
-		},
-
-		'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_list_type' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'code', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'label', 'string', array( 'length' => 255 ) );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' );
-			$table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' );
-			$table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' );
-			$table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' );
-
-			return $schema;
-		},
-
-		'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
-
-			$table = $schema->createTable( 'ezuser_list' );
-
-			$table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
-			$table->addColumn( 'parentid', 'integer', array() );
-			$table->addColumn( 'siteid', 'integer', array() );
-			$table->addColumn( 'typeid', 'integer', array() );
-			$table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
-			$table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
-			$table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
-			$table->addColumn( 'pos', 'integer', array() );
-			$table->addColumn( 'status', 'smallint', array() );
-			$table->addColumn( 'mtime', 'datetime', array() );
-			$table->addColumn( 'ctime', 'datetime', array() );
-			$table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
-
-			$table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' );
-			$table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' );
-			$table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' );
-			$table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' );
-			$table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' );
-			$table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' );
-
-			$table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' );
-
-			$table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ),
-				array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' );
-
-			return $schema;
-		},
-	),
+    'table' => array(
+        'ezuser' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser' );
+
+            $table->addColumn( 'contentobject_id', 'integer', array() );
+            $table->addColumn( 'email', 'string', array( 'length' => 150 ) );
+            $table->addColumn( 'login', 'string', array( 'length' => 150 ) );
+            $table->addColumn( 'login_normalized', 'string', array( 'length' => 150 ) );
+            $table->addColumn( 'password_hash', 'string', array( 'length' => 50 ) );
+            $table->addColumn( 'password_hash_type', 'integer', array( 'default' => 1 ) );
+
+            $table->setPrimaryKey( array( 'contentobject_id' ) );
+            $table->addUniqueIndex( array( 'login_normalized' ), 'ezuser_login' );
+
+            return $schema;
+        },
+
+        'ezuser_address' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser_address' );
+
+            $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
+            $table->addColumn( 'siteid', 'integer', array() );
+            $table->addColumn( 'parentid', 'integer', array() );
+            $table->addColumn( 'company', 'string', array( 'length' => 100 ) );
+            $table->addColumn( 'vatid', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'salutation', 'string', array( 'length' => 8 ) );
+            $table->addColumn( 'title', 'string', array( 'length' => 64 ) );
+            $table->addColumn( 'firstname', 'string', array( 'length' => 64 ) );
+            $table->addColumn( 'lastname', 'string', array( 'length' => 64 ) );
+            $table->addColumn( 'address1', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'address2', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'address3', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'postal', 'string', array( 'length' => 16 ) );
+            $table->addColumn( 'city', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'state', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'langid', 'string', array( 'length' => 5, 'notnull' => false ) );
+            $table->addColumn( 'countryid', 'string', array( 'length' => 2, 'notnull' => false, 'fixed' => true ) );
+            $table->addColumn( 'telephone', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'email', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'telefax', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'website', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'flag', 'integer', array() );
+            $table->addColumn( 'pos', 'smallint', array() );
+            $table->addColumn( 'mtime', 'datetime', array() );
+            $table->addColumn( 'ctime', 'datetime', array() );
+            $table->addColumn( 'editor', 'string', array('length' => 255 ) );
+
+            $table->setPrimaryKey( array( 'id' ), 'pk_ezpad_id' );
+            $table->addIndex( array( 'lastname', 'firstname' ), 'idx_ezpad_ln_fn' );
+            $table->addIndex( array( 'address1', 'address2' ), 'idx_ezpad_ad1_ad2' );
+            $table->addIndex( array( 'postal', 'city' ), 'idx_ezpad_post_ci' );
+            $table->addIndex( array( 'parentid' ), 'idx_ezpad_pid' );
+            $table->addIndex( array( 'city' ), 'idx_ezpad_city' );
+
+            $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
+                array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpad_pid' );
+
+            return $schema;
+        },
+
+        'ezuser_list_type' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser_list_type' );
+
+            $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
+            $table->addColumn( 'siteid', 'integer', array() );
+            $table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'code', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'label', 'string', array( 'length' => 255 ) );
+            $table->addColumn( 'status', 'smallint', array() );
+            $table->addColumn( 'mtime', 'datetime', array() );
+            $table->addColumn( 'ctime', 'datetime', array() );
+            $table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+
+            $table->setPrimaryKey( array( 'id' ), 'pk_ezplity_id' );
+            $table->addUniqueIndex( array( 'siteid', 'domain', 'code' ), 'unq_ezplity_sid_dom_code' );
+            $table->addIndex( array( 'siteid', 'status' ), 'idx_ezplity_sid_status' );
+            $table->addIndex( array( 'siteid', 'label' ), 'idx_ezplity_sid_label' );
+            $table->addIndex( array( 'siteid', 'code' ), 'idx_ezplity_sid_code' );
+
+            return $schema;
+        },
+
+        'ezuser_list' => function ( \Doctrine\DBAL\Schema\Schema $schema ) {
+
+            $table = $schema->createTable( 'ezuser_list' );
+
+            $table->addColumn( 'id', 'integer', array( 'autoincrement' => true ) );
+            $table->addColumn( 'parentid', 'integer', array() );
+            $table->addColumn( 'siteid', 'integer', array() );
+            $table->addColumn( 'typeid', 'integer', array() );
+            $table->addColumn( 'domain', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'refid', 'string', array( 'length' => 32 ) );
+            $table->addColumn( 'start', 'datetime', array( 'notnull' => false ) );
+            $table->addColumn( 'end', 'datetime', array( 'notnull' => false ) );
+            $table->addColumn( 'config', 'text', array( 'length' => 0xffff ) );
+            $table->addColumn( 'pos', 'integer', array() );
+            $table->addColumn( 'status', 'smallint', array() );
+            $table->addColumn( 'mtime', 'datetime', array() );
+            $table->addColumn( 'ctime', 'datetime', array() );
+            $table->addColumn( 'editor', 'string', array( 'length' => 255 ) );
+
+            $table->setPrimaryKey( array( 'id' ), 'pk_ezpli_id' );
+            $table->addUniqueIndex( array( 'siteid', 'domain', 'refid', 'typeid', 'parentid' ), 'unq_ezpli_sid_dm_rid_tid_pid' );
+            $table->addIndex( array( 'siteid', 'status', 'start', 'end' ), 'idx_ezpli_sid_stat_start_end' );
+            $table->addIndex( array( 'parentid', 'siteid', 'refid', 'domain', 'typeid' ), 'idx_ezpli_pid_sid_rid_dom_tid' );
+            $table->addIndex( array( 'parentid', 'siteid', 'start' ), 'idx_ezpli_pid_sid_start' );
+            $table->addIndex( array( 'parentid', 'siteid', 'end' ), 'idx_ezpli_pid_sid_end' );
+            $table->addIndex( array( 'parentid', 'siteid', 'pos' ), 'idx_ezpli_pid_sid_pos' );
+
+            $table->addForeignKeyConstraint( 'ezuser', array( 'parentid' ), array( 'contentobject_id' ),
+                array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_pid' );
+
+            $table->addForeignKeyConstraint( 'ezuser_list_type', array( 'typeid' ), array( 'id' ),
+                array( 'onUpdate' => 'CASCADE', 'onDelete' => 'CASCADE' ), 'fk_ezpli_typeid' );
+
+            return $schema;
+        },
+    ),
 );