EGroupware / egroupware

api/src/Mail/Smtp/Sql.php

Spacing +20 added lines, -20 removed lines

@@ -63,7 +63,7 @@ 
 	 *
 	 * @param string $defaultDomain =null
 	 */
-	function __construct($defaultDomain=null)
+	function __construct($defaultDomain = null)
 	{
 		parent::__construct($defaultDomain);
 
@@ -78,16 +78,16 @@ 
 	 */
 	function getAccountEmailAddress($_accountName)
 	{
-		$emailAddresses	= parent::getAccountEmailAddress($_accountName);
+		$emailAddresses = parent::getAccountEmailAddress($_accountName);
 
 		if (($account_id = $this->accounts->name2id($_accountName, 'account_lid', 'u')))
 		{
-			foreach($this->db->select(self::TABLE, 'mail_value', array(
+			foreach ($this->db->select(self::TABLE, 'mail_value', array(
 				'account_id' => $account_id,
 				'mail_type' => self::TYPE_ALIAS,
 			), __LINE__, __FILE__, false, 'ORDER BY mail_value', self::APP) as $row)
 			{
-				$emailAddresses[] = array (
+				$emailAddresses[] = array(
 					'name'		=> $emailAddresses[0]['name'],
 					'address'	=> $row['mail_value'],
 					'type'		=> 'alternate',
@@ -111,7 +111,7 @@ 
 	 * @return array with values for keys 'mailLocalAddress', 'mailAlternateAddress' (array), 'mailForwardingAddress' (array),
 	 * 	'accountStatus' ("active"), 'quotaLimit' and 'deliveryMode' ("forwardOnly")
 	 */
-	function getUserData($user, $match_uid_at_domain=false)
+	function getUserData($user, $match_uid_at_domain = false)
 	{
 		$userData = array();
 
@@ -140,7 +140,7 @@ 
 			{
 				$account_id[] = $id;
 			}
-			foreach($this->db->select(self::TABLE, 'account_id', array(
+			foreach ($this->db->select(self::TABLE, 'account_id', array(
 				'mail_type' => self::TYPE_ALIAS,
 				'mail_value' => $user,
 			), __LINE__, __FILE__, false, '', self::APP) as $row)
@@ -156,11 +156,11 @@ 
 				$userData['mailLocalAddress'] = $this->accounts->id2name($account_id, 'account_email');
 			}
 			$enabled = $forwardOnly = array();
-			foreach($this->db->select(self::TABLE, '*', array(
+			foreach ($this->db->select(self::TABLE, '*', array(
 				'account_id' => $account_id,
 			), __LINE__, __FILE__, false, 'ORDER BY mail_type,mail_value', self::APP) as $row)
 			{
-				switch($row['mail_type'])
+				switch ($row['mail_type'])
 				{
 					case self::TYPE_ENABLED:
 						$userData['accountStatus'] = $row['mail_value'];
@@ -203,11 +203,11 @@ 
 			if (is_array($account_id))
 			{
 				// add group-members for groups as forward (that way we dont need to store&update them)
-				foreach($account_id as $id)
+				foreach ($account_id as $id)
 				{
 					if ($id < 0 && ($members = $this->accounts->members($id, true)))
 					{
-						foreach($members as $member)
+						foreach ($members as $member)
 						{
 							if (($email = $this->accounts->id2name($member, 'account_email')) && !in_array($email, (array)$userData['forward']))
 							{
@@ -238,7 +238,7 @@ 
 	 * @return boolean true on success, false on error writing to ldap
 	 */
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
-		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
+		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only = false, $_setMailbox = null)
 	{
 		if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
 
@@ -257,22 +257,22 @@ 
 		if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
 		// find all invalid values: either delete or update them
 		$delete_ids = array();
-		foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
+		foreach ($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
 		{
-			switch($row['mail_type'])
+			switch ($row['mail_type'])
 			{
 				case self::TYPE_ALIAS:
-					$new_addresses =& $_mailAlternateAddress;
+					$new_addresses = & $_mailAlternateAddress;
 					// fall-throught
 				case self::TYPE_FORWARD:
-					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
+					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses = & $_mailForwardingAddress;
 					if (($key = array_search($row['mail_value'], $new_addresses)) === false)
 					{
 						$delete_ids[] = $row['mail_id'];
 					}
 					else
 					{
-						unset($new_addresses[$key]);	// no need to store
+						unset($new_addresses[$key]); // no need to store
 					}
 					break;
 
@@ -322,14 +322,14 @@ 
 			));
 		}
 		// store all new values
-		foreach($flags+array(
+		foreach ($flags + array(
 			self::TYPE_ALIAS => $_mailAlternateAddress,
 			self::TYPE_FORWARD => $_mailForwardingAddress,
 		) as $type => $values)
 		{
 			if ($values && (!$_forwarding_only || in_array($type, array(self::TYPE_FORWARD, self::TYPE_DELIVERY))))
 			{
-				foreach((array)$values as $value)
+				foreach ((array)$values as $value)
 				{
 					$this->db->insert(self::TABLE, array(
 						'account_id' => $_uidnumber,
@@ -363,11 +363,11 @@ 
 			$join .= ' JOIN '.self::TABLE.' active ON active.account_id='.self::TABLE.'.account_id AND active.mail_type='.self::TYPE_ENABLED;
 		}
 		$mailboxes = array();
-		foreach($this->db->select(self::TABLE, 'account_lid AS uid,'.self::TABLE.'.mail_value AS mailbox',
+		foreach ($this->db->select(self::TABLE, 'account_lid AS uid,'.self::TABLE.'.mail_value AS mailbox',
 			self::TABLE.'.mail_type='.self::TYPE_MAILBOX,
 			__LINE__, __FILE__, false, 'ORDER BY account_lid', self::APP, 0, $join) as $row)
 		{
-			if ($row['uid'] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($row['uid'] == 'anonymous') continue; // anonymous is never a mail-user!
 			list($mailbox) = explode('@', $row['mailbox']);
 			$mailboxes[$row['uid']] = $mailbox;
 		}

Braces +29 added lines, -7 removed lines

@@ -94,7 +94,10 @@ 
 				);
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$_accountName') returning ".array2string($emailAddresses));
+		}
 
 		return $emailAddresses;
 	}
@@ -145,7 +148,10 @@ 
 				'mail_value' => $user,
 			), __LINE__, __FILE__, false, '', self::APP) as $row)
 			{
-				if (!in_array($row['account_id'], $account_id)) $account_id[] = $row['account_id'];
+				if (!in_array($row['account_id'], $account_id))
+				{
+					$account_id[] = $row['account_id'];
+				}
 			}
 			//error_log(__METHOD__."('$user') account_id=".array2string($account_id));
 		}
@@ -218,7 +224,10 @@ 
 				}
 			}
 		}
-		if ($this->debug) error_log(__METHOD__."('$user') returning ".array2string($userData));
+		if ($this->debug)
+		{
+			error_log(__METHOD__."('$user') returning ".array2string($userData));
+		}
 
 		return $userData;
 	}
@@ -240,7 +249,10 @@ 
 	function setUserData($_uidnumber, array $_mailAlternateAddress, array $_mailForwardingAddress, $_deliveryMode,
 		$_accountStatus, $_mailLocalAddress, $_quota, $_forwarding_only=false, $_setMailbox=null)
 	{
-		if ($this->debug) error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
+		if ($this->debug)
+		{
+			error_log(__METHOD__."($_uidnumber, ".array2string($_mailAlternateAddress).', '.array2string($_mailForwardingAddress).", '$_deliveryMode', '$_accountStatus', '$_mailLocalAddress', $_quota, forwarding_only=".array2string($_forwarding_only).') '.function_backtrace());
+		}
 
 		if (!$_forwarding_only && $this->accounts->id2name($_uidnumber, 'account_email') !== $_mailLocalAddress)
 		{
@@ -254,7 +266,10 @@ 
 			self::TYPE_QUOTA => $_quota,
 		);
 		$where = array('account_id' => $_uidnumber);
-		if ($_forwarding_only) $where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
+		if ($_forwarding_only)
+		{
+			$where['mail_type'] = array(self::TYPE_FORWARD, self::TYPE_DELIVERY);
+		}
 		// find all invalid values: either delete or update them
 		$delete_ids = array();
 		foreach($this->db->select(self::TABLE, '*', $where, __LINE__, __FILE__, false, '', self::APP) as $row)
@@ -265,7 +280,10 @@ 
 					$new_addresses =& $_mailAlternateAddress;
 					// fall-throught
 				case self::TYPE_FORWARD:
-					if ($row['mail_type'] == self::TYPE_FORWARD) $new_addresses =& $_mailForwardingAddress;
+					if ($row['mail_type'] == self::TYPE_FORWARD)
+					{
+						$new_addresses =& $_mailForwardingAddress;
+					}
 					if (($key = array_search($row['mail_value'], $new_addresses)) === false)
 					{
 						$delete_ids[] = $row['mail_id'];
@@ -367,7 +385,11 @@ 
 			self::TABLE.'.mail_type='.self::TYPE_MAILBOX,
 			__LINE__, __FILE__, false, 'ORDER BY account_lid', self::APP, 0, $join) as $row)
 		{
-			if ($row['uid'] == 'anonymous') continue;	// anonymous is never a mail-user!
+			if ($row['uid'] == 'anonymous')
+			{
+				continue;
+			}
+			// anonymous is never a mail-user!
 			list($mailbox) = explode('@', $row['mailbox']);
 			$mailboxes[$row['uid']] = $mailbox;
 		}

api/src/Mail/Types.php

Spacing +7 added lines, -7 removed lines

@@ -25,10 +25,10 @@ 
 	 *
 	 * @return array classname => label pairs
 	 */
-	static public function getSMTPServerTypes($extended=true)
+	static public function getSMTPServerTypes($extended = true)
 	{
 		$retData = self::server_types(false, $extended);
-		foreach(Api\Hooks::process(array(
+		foreach (Api\Hooks::process(array(
 			'location' => 'smtp_server_types',
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
@@ -55,10 +55,10 @@ 
 	 * @param boolean $extended =true
 	 * @return array classname => label pairs
 	 */
-	static public function getIMAPServerTypes($extended=true)
+	static public function getIMAPServerTypes($extended = true)
 	{
 		$retData = self::server_types(true, $extended);
-		foreach(Api\Hooks::process(array(
+		foreach (Api\Hooks::process(array(
 			'location' => 'imap_server_types',
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
@@ -84,11 +84,11 @@ 
 	 * @param boolean $extended =false
 	 * @return array
 	 */
-	protected static function server_types($imap=true, $extended=false)
+	protected static function server_types($imap = true, $extended = false)
 	{
 		$types = array();
 		$prefix = $imap ? 'Imap' : 'Smtp';
-		foreach(scandir($dir=__DIR__.'/'.$prefix) as $file)
+		foreach (scandir($dir = __DIR__.'/'.$prefix) as $file)
 		{
 			if ($file == '..')
 			{
@@ -106,7 +106,7 @@ 
 
 			$type = array(
 				'classname' => $class_name,
-				'description' => is_callable($function=$class_name.'::description') ? call_user_func($function) : $class_name,
+				'description' => is_callable($function = $class_name.'::description') ? call_user_func($function) : $class_name,
 			);
 			if ($imap) $type['protocol'] = 'imap';
 

Braces +20 added lines, -6 removed lines

@@ -33,10 +33,14 @@ 
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
 		{
-			if ($data && $app != 'emailadmin') $retData += $data;
+			if ($data && $app != 'emailadmin')
+			{
+				$retData += $data;
+			}
 		}
 
-		uksort($retData, function($a, $b) {
+		uksort($retData, function($a, $b)
+		{
 			static $prio = array(	// not explicitly mentioned get 0
 				'EGroupware\\Api\\Mail\\Smtp' => 9,
 				'EGroupware\\Api\\Mail\\Smtp\\Sql' => 8,
@@ -63,9 +67,13 @@ 
 			'extended' => $extended,
 		), array('managementserver'), true) as $app => $data)
 		{
-			if ($data && $app != 'emailadmin') $retData += $data;
+			if ($data && $app != 'emailadmin')
+			{
+				$retData += $data;
+			}
 		}
-		uksort($retData, function($a, $b) {
+		uksort($retData, function($a, $b)
+		{
 			static $prio = array(	// not explicitly mentioned get 0
 				'EGroupware\\Api\\Mail\\Imap' => 9,
 				'managementserver_imap' => 8,
@@ -102,13 +110,19 @@ 
 			{
 				continue;
 			}
-			if (!class_exists($class_name)) continue;
+			if (!class_exists($class_name))
+			{
+				continue;
+			}
 
 			$type = array(
 				'classname' => $class_name,
 				'description' => is_callable($function=$class_name.'::description') ? call_user_func($function) : $class_name,
 			);
-			if ($imap) $type['protocol'] = 'imap';
+			if ($imap)
+			{
+				$type['protocol'] = 'imap';
+			}
 
 			$types[$class_name] = $extended ? $type : $type['description'];
 		}

api/src/Mail/Notifications.php

Spacing +9 added lines, -9 removed lines

@@ -52,7 +52,7 @@ 
 	 * @param boolean $return_empty_marker =false should we return null
 	 * @return array with values for "notify_folders", "notify_use_default"
 	 */
-	public static function read($acc_id, $account_id=null, $return_empty_marker=false)
+	public static function read($acc_id, $account_id = null, $return_empty_marker = false)
 	{
 		if (is_null($account_id))
 		{
@@ -71,7 +71,7 @@ 
 			//error_log(__METHOD__."($acc_id, ".array2string($account_id).") nothing in cache");
 		}
 		$account_specific = 0;
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			if ($row['account_id'])
 			{
@@ -109,19 +109,19 @@ 
 	{
 		if (!is_numeric($account_id) || !($account_id >= 0))
 		{
-			return 0;	// nothing to save, happens eg. in setup
+			return 0; // nothing to save, happens eg. in setup
 		}
 
 		if ($account_id && !$folders && ($default = self::read($acc_id, 0)) && $default['notify_folders'])
 		{
-			$folders[] = null;	// we need to write a marker, that user wants no notifications!
+			$folders[] = null; // we need to write a marker, that user wants no notifications!
 		}
-		$old = self::read($acc_id, $account_id, true);	// true = return empty marker
-		if ($account_id && !$old['notify_account_id']) $old['notify_folders'] = array();	// ignore returned default
+		$old = self::read($acc_id, $account_id, true); // true = return empty marker
+		if ($account_id && !$old['notify_account_id']) $old['notify_folders'] = array(); // ignore returned default
 
 		$changed = 0;
 		// insert newly added ones
-		foreach(array_diff($folders, $old['notify_folders']) as $folder)
+		foreach (array_diff($folders, $old['notify_folders']) as $folder)
 		{
 			self::$db->insert(self::TABLE, array(
 				'acc_id' => $acc_id,
@@ -156,7 +156,7 @@ 
 	 * @param int|array $account_id =null
 	 * @return int number of rows deleted
 	 */
-	public static function delete($acc_id, $account_id=null)
+	public static function delete($acc_id, $account_id = null)
 	{
 		if (!($acc_id > 0) && !isset($account_id))
 		{
@@ -169,7 +169,7 @@ 
 		self::$db->delete(self::TABLE, $where, __LINE__, __FILE__, self::APP);
 
 		// invalidate cache: we allways unset everything about an account to simplify cache handling
-		foreach($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
+		foreach ($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
 		{
 			unset(self::$cache[$acc_id]);
 		}

Braces +17 added lines, -4 removed lines

@@ -88,7 +88,10 @@ 
 			}
 		}
 		$folders = (array)self::$cache[$acc_id][$account_specific];
-		if (!$return_empty_marker && $folders == array(null)) $folders = array();
+		if (!$return_empty_marker && $folders == array(null))
+		{
+			$folders = array();
+		}
 		$result = array(
 			'notify_folders' => $folders,
 			'notify_account_id' => $account_specific,
@@ -117,7 +120,11 @@ 
 			$folders[] = null;	// we need to write a marker, that user wants no notifications!
 		}
 		$old = self::read($acc_id, $account_id, true);	// true = return empty marker
-		if ($account_id && !$old['notify_account_id']) $old['notify_folders'] = array();	// ignore returned default
+		if ($account_id && !$old['notify_account_id'])
+		{
+			$old['notify_folders'] = array();
+		}
+		// ignore returned default
 
 		$changed = 0;
 		// insert newly added ones
@@ -163,8 +170,14 @@ 
 			throw new Api\Exception\WrongParameter(__METHOD__."() no acc_id AND no account_id parameter!");
 		}
 		$where = array();
-		if ($acc_id > 0) $where['acc_id'] = $acc_id;
-		if (isset($account_id)) $where['account_id'] = $account_id;
+		if ($acc_id > 0)
+		{
+			$where['acc_id'] = $acc_id;
+		}
+		if (isset($account_id))
+		{
+			$where['account_id'] = $account_id;
+		}
 
 		self::$db->delete(self::TABLE, $where, __LINE__, __FILE__, self::APP);
 

api/asyncwrapper.php

Spacing +4 added lines, -4 removed lines

@@ -11,14 +11,14 @@
  * @version $Id$
  */
 
-$path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
+$path_to_egroupware = realpath(__DIR__.'/..'); //  need to be adapted if this script is moved somewhere else
 $php = isset($_ENV['_']) ? $_ENV['_'] : $_SERVER['_'];
 
-foreach(file($path_to_egroupware. '/header.inc.php') as $line)
+foreach (file($path_to_egroupware.'/header.inc.php') as $line)
 {
-	if(preg_match("/GLOBALS\['egw_domain']\['(.*)']/", $line, $matches))
+	if (preg_match("/GLOBALS\['egw_domain']\['(.*)']/", $line, $matches))
 	{
 		// -d memory_limit=-1 --> no memory limit
-		system($php. ' -q -d memory_limit=-1 '.$path_to_egroupware.'/api/asyncservices.php '. $matches[1]);
+		system($php.' -q -d memory_limit=-1 '.$path_to_egroupware.'/api/asyncservices.php '.$matches[1]);
 	}
 }

api/config.php

Spacing +2 added lines, -2 removed lines

@@ -32,7 +32,7 @@ 
 $etag = '"'.md5($config.$link_registry).'"';
 
 // headers to allow caching, egw_framework specifies etag on url to force reload, even with Expires header
-Api\Session::cache_control(86400);	// cache for one day
+Api\Session::cache_control(86400); // cache for one day
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -47,7 +47,7 @@ 
 $content .= 'egw.set_link_registry('.$link_registry.", undefined, egw && egw.window !== window);\n";
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

api/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -17,7 +17,7 @@ 
 $setup_info['api']['enable']    = 3;
 $setup_info['api']['app_order'] = 1;
 $setup_info['api']['license'] = 'GPL';
-$setup_info['api']['maintainer']	= $setup_info['api']['author']	= array(
+$setup_info['api']['maintainer'] = $setup_info['api']['author'] = array(
 	'name'  => 'EGroupware coreteam',
 	'email' => 'egroupware-developers@lists.sourceforge.net',
 );
@@ -126,5 +126,5 @@ 
 	'email' => 'RalfBecker@outdoor-training.de'
 );
 $setup_info['groupdav']['license'] = 'GPL';
-$setup_info['groupdav']['hooks']['preferences']	= 'EGroupware\\Api\\CalDAV\\Hooks::menus';
-$setup_info['groupdav']['hooks']['settings']	= 'EGroupware\\Api\\CalDAV\\Hooks::settings';
+$setup_info['groupdav']['hooks']['preferences'] = 'EGroupware\\Api\\CalDAV\\Hooks::menus';
+$setup_info['groupdav']['hooks']['settings'] = 'EGroupware\\Api\\CalDAV\\Hooks::settings';

api/setup/tables_current.inc.php

Spacing +302 added lines, -302 removed lines

@@ -14,58 +14,58 @@ 
 $phpgw_baseline = array(
 	'egw_config' => array(
 		'fd' => array(
-			'config_app' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'config_name' => array('type' => 'ascii','precision' => '32','nullable' => False),
+			'config_app' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'config_name' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False),
 			'config_value' => array('type' => 'text')
 		),
-		'pk' => array('config_app','config_name'),
+		'pk' => array('config_app', 'config_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
 	),
 	'egw_applications' => array(
 		'fd' => array(
-			'app_id' => array('type' => 'auto','precision' => '4','nullable' => False),
-			'app_name' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'app_enabled' => array('type' => 'int','precision' => '4','nullable' => False),
-			'app_order' => array('type' => 'int','precision' => '4','nullable' => False),
-			'app_tables' => array('type' => 'ascii','precision' => '8192','nullable' => False),
-			'app_version' => array('type' => 'ascii','precision' => '20','nullable' => False,'default' => '0.0'),
-			'app_icon' => array('type' => 'ascii','precision' => '32'),
-			'app_icon_app' => array('type' => 'ascii','precision' => '16'),
-			'app_index' => array('type' => 'ascii','precision' => '64')
+			'app_id' => array('type' => 'auto', 'precision' => '4', 'nullable' => False),
+			'app_name' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'app_enabled' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'app_order' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'app_tables' => array('type' => 'ascii', 'precision' => '8192', 'nullable' => False),
+			'app_version' => array('type' => 'ascii', 'precision' => '20', 'nullable' => False, 'default' => '0.0'),
+			'app_icon' => array('type' => 'ascii', 'precision' => '32'),
+			'app_icon_app' => array('type' => 'ascii', 'precision' => '16'),
+			'app_index' => array('type' => 'ascii', 'precision' => '64')
 		),
 		'pk' => array('app_id'),
 		'fk' => array(),
-		'ix' => array(array('app_enabled','app_order')),
+		'ix' => array(array('app_enabled', 'app_order')),
 		'uc' => array('app_name')
 	),
 	'egw_acl' => array(
 		'fd' => array(
-			'acl_appname' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'acl_location' => array('type' => 'ascii','meta' => 'account','precision' => '16','nullable' => False),
-			'acl_account' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False),
-			'acl_rights' => array('type' => 'int','precision' => '4'),
-			'acl_id' => array('type' => 'auto','nullable' => False)
+			'acl_appname' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'acl_location' => array('type' => 'ascii', 'meta' => 'account', 'precision' => '16', 'nullable' => False),
+			'acl_account' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False),
+			'acl_rights' => array('type' => 'int', 'precision' => '4'),
+			'acl_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('acl_id'),
 		'fk' => array(),
-		'ix' => array('acl_account',array('acl_location','acl_account'),array('acl_appname','acl_account')),
-		'uc' => array(array('acl_appname','acl_location','acl_account'))
+		'ix' => array('acl_account', array('acl_location', 'acl_account'), array('acl_appname', 'acl_account')),
+		'uc' => array(array('acl_appname', 'acl_location', 'acl_account'))
 	),
 	'egw_accounts' => array(
 		'fd' => array(
-			'account_id' => array('type' => 'auto','meta' => 'account-abs','nullable' => False),
-			'account_lid' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'account_pwd' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'account_lastlogin' => array('type' => 'int','precision' => '4'),
-			'account_lastloginfrom' => array('type' => 'ascii','precision' => '48','comment' => 'ip'),
-			'account_lastpwd_change' => array('type' => 'int','precision' => '4'),
-			'account_status' => array('type' => 'char','precision' => '1','nullable' => False,'default' => 'A'),
-			'account_expires' => array('type' => 'int','precision' => '4'),
-			'account_type' => array('type' => 'char','precision' => '1'),
-			'account_primary_group' => array('type' => 'int','meta' => 'group','precision' => '4','nullable' => False,'default' => '0'),
-			'account_description' => array('type' => 'varchar','precision' => '255','comment' => 'group description')
+			'account_id' => array('type' => 'auto', 'meta' => 'account-abs', 'nullable' => False),
+			'account_lid' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False),
+			'account_pwd' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'account_lastlogin' => array('type' => 'int', 'precision' => '4'),
+			'account_lastloginfrom' => array('type' => 'ascii', 'precision' => '48', 'comment' => 'ip'),
+			'account_lastpwd_change' => array('type' => 'int', 'precision' => '4'),
+			'account_status' => array('type' => 'char', 'precision' => '1', 'nullable' => False, 'default' => 'A'),
+			'account_expires' => array('type' => 'int', 'precision' => '4'),
+			'account_type' => array('type' => 'char', 'precision' => '1'),
+			'account_primary_group' => array('type' => 'int', 'meta' => 'group', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'account_description' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'group description')
 		),
 		'pk' => array('account_id'),
 		'fk' => array(),
@@ -74,39 +74,39 @@ 
 	),
 	'egw_preferences' => array(
 		'fd' => array(
-			'preference_owner' => array('type' => 'int','meta' => 'account-prefs','precision' => '4','nullable' => False),
-			'preference_app' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'preference_value' => array('type' => 'text','nullable' => False),
-			'preference_id' => array('type' => 'auto','nullable' => False)
+			'preference_owner' => array('type' => 'int', 'meta' => 'account-prefs', 'precision' => '4', 'nullable' => False),
+			'preference_app' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'preference_value' => array('type' => 'text', 'nullable' => False),
+			'preference_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('preference_id'),
 		'fk' => array(),
 		'ix' => array(),
-		'uc' => array(array('preference_owner','preference_app'))
+		'uc' => array(array('preference_owner', 'preference_app'))
 	),
 	'egw_access_log' => array(
 		'fd' => array(
-			'sessionid' => array('type' => 'auto','nullable' => False,'comment' => 'primary key'),
-			'loginid' => array('type' => 'varchar','precision' => '64','nullable' => False,'comment' => 'username used to login'),
-			'ip' => array('type' => 'ascii','precision' => '48','nullable' => False,'comment' => 'ip of user'),
-			'li' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'TS if login'),
-			'lo' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'TD of logout'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0','comment' => 'numerical account id'),
-			'session_dla' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'TS of last user action'),
-			'session_action' => array('type' => 'ascii','precision' => '64','comment' => 'menuaction or path of last user action'),
-			'session_php' => array('type' => 'ascii','precision' => '64','nullable' => False,'comment' => 'php session-id or error-message'),
-			'notification_heartbeat' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'TS of last notification request'),
-			'user_agent' => array('type' => 'ascii','precision' => '255','comment' => 'User-agent of browser/device')
+			'sessionid' => array('type' => 'auto', 'nullable' => False, 'comment' => 'primary key'),
+			'loginid' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'comment' => 'username used to login'),
+			'ip' => array('type' => 'ascii', 'precision' => '48', 'nullable' => False, 'comment' => 'ip of user'),
+			'li' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'TS if login'),
+			'lo' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'TD of logout'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'numerical account id'),
+			'session_dla' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'TS of last user action'),
+			'session_action' => array('type' => 'ascii', 'precision' => '64', 'comment' => 'menuaction or path of last user action'),
+			'session_php' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False, 'comment' => 'php session-id or error-message'),
+			'notification_heartbeat' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'TS of last notification request'),
+			'user_agent' => array('type' => 'ascii', 'precision' => '255', 'comment' => 'User-agent of browser/device')
 		),
 		'pk' => array('sessionid'),
 		'fk' => array(),
-		'ix' => array('li','lo','session_dla','session_php','notification_heartbeat',array('account_id','ip','li'),array('account_id','loginid','li')),
+		'ix' => array('li', 'lo', 'session_dla', 'session_php', 'notification_heartbeat', array('account_id', 'ip', 'li'), array('account_id', 'loginid', 'li')),
 		'uc' => array()
 	),
 	'egw_languages' => array(
 		'fd' => array(
-			'lang_id' => array('type' => 'ascii','precision' => '5','nullable' => False),
-			'lang_name' => array('type' => 'varchar','precision' => '50','nullable' => False)
+			'lang_id' => array('type' => 'ascii', 'precision' => '5', 'nullable' => False),
+			'lang_name' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False)
 		),
 		'pk' => array('lang_id'),
 		'fk' => array(),
@@ -115,62 +115,62 @@ 
 	),
 	'egw_lang' => array(
 		'fd' => array(
-			'lang' => array('type' => 'varchar','precision' => '5','nullable' => False,'default' => ''),
-			'app_name' => array('type' => 'ascii','precision' => '16','nullable' => False,'default' => 'common'),
-			'message_id' => array('type' => 'ascii','precision' => '128','nullable' => False,'default' => ''),
-			'content' => array('type' => 'varchar','precision' => '8192'),
-			'lang_id' => array('type' => 'auto','nullable' => False)
+			'lang' => array('type' => 'varchar', 'precision' => '5', 'nullable' => False, 'default' => ''),
+			'app_name' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False, 'default' => 'common'),
+			'message_id' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False, 'default' => ''),
+			'content' => array('type' => 'varchar', 'precision' => '8192'),
+			'lang_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('lang_id'),
 		'fk' => array(),
 		'ix' => array(),
-		'uc' => array(array('lang','app_name','message_id'))
+		'uc' => array(array('lang', 'app_name', 'message_id'))
 	),
 	'egw_categories' => array(
 		'fd' => array(
-			'cat_id' => array('type' => 'auto','meta' => 'category','precision' => '4','nullable' => False),
-			'cat_main' => array('type' => 'int','meta' => 'category','precision' => '4','nullable' => False,'default' => '0'),
-			'cat_parent' => array('type' => 'int','meta' => 'category','precision' => '4','nullable' => False,'default' => '0'),
-			'cat_level' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '0'),
-			'cat_owner' => array('type' => 'ascii','meta' => 'account-commasep','precision' => '255','nullable' => False,'default' => '0'),
-			'cat_access' => array('type' => 'ascii','precision' => '7'),
-			'cat_appname' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'cat_name' => array('type' => 'varchar','precision' => '150','nullable' => False),
-			'cat_description' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cat_data' => array('type' => 'varchar','precision' => '8192'),
-			'last_mod' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False)
+			'cat_id' => array('type' => 'auto', 'meta' => 'category', 'precision' => '4', 'nullable' => False),
+			'cat_main' => array('type' => 'int', 'meta' => 'category', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cat_parent' => array('type' => 'int', 'meta' => 'category', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cat_level' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '0'),
+			'cat_owner' => array('type' => 'ascii', 'meta' => 'account-commasep', 'precision' => '255', 'nullable' => False, 'default' => '0'),
+			'cat_access' => array('type' => 'ascii', 'precision' => '7'),
+			'cat_appname' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'cat_name' => array('type' => 'varchar', 'precision' => '150', 'nullable' => False),
+			'cat_description' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cat_data' => array('type' => 'varchar', 'precision' => '8192'),
+			'last_mod' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False)
 		),
 		'pk' => array('cat_id'),
 		'fk' => array(),
-		'ix' => array(array('cat_appname','cat_owner','cat_parent','cat_level')),
+		'ix' => array(array('cat_appname', 'cat_owner', 'cat_parent', 'cat_level')),
 		'uc' => array()
 	),
 	'egw_history_log' => array(
 		'fd' => array(
-			'history_id' => array('type' => 'auto','precision' => '4','nullable' => False),
-			'history_record_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'history_appname' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'history_owner' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False),
-			'history_status' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'history_new_value' => array('type' => 'text','nullable' => False),
-			'history_timestamp' => array('type' => 'timestamp','nullable' => False,'default' => 'current_timestamp'),
-			'history_old_value' => array('type' => 'text','nullable' => False),
-			'sessionid' => array('type' => 'int','precision' => '4','comment' => 'primary key to egw_access_log')
+			'history_id' => array('type' => 'auto', 'precision' => '4', 'nullable' => False),
+			'history_record_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'history_appname' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'history_owner' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False),
+			'history_status' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'history_new_value' => array('type' => 'text', 'nullable' => False),
+			'history_timestamp' => array('type' => 'timestamp', 'nullable' => False, 'default' => 'current_timestamp'),
+			'history_old_value' => array('type' => 'text', 'nullable' => False),
+			'sessionid' => array('type' => 'int', 'precision' => '4', 'comment' => 'primary key to egw_access_log')
 		),
 		'pk' => array('history_id'),
 		'fk' => array(),
-		'ix' => array(array('history_appname','history_record_id','history_id')),
+		'ix' => array(array('history_appname', 'history_record_id', 'history_id')),
 		'uc' => array()
 	),
 	'egw_async' => array(
 		'fd' => array(
-			'async_id' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'async_next' => array('type' => 'int','meta' => 'timestamp','precision' => '4','nullable' => False,'comment' => 'timestamp of next run'),
-			'async_times' => array('type' => 'ascii','precision' => '255','nullable' => False,'comment' => 'serialized array with values for keys hour,min,day,month,year'),
-			'async_method' => array('type' => 'ascii','precision' => '80','nullable' => False,'comment' => 'app.class.method class::method to execute'),
-			'async_data' => array('type' => 'varchar','precision' => '8192','nullable' => False,'comment' => 'serialized array with data to pass to method'),
-			'async_account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0','comment' => 'creator of job'),
-			'async_auto_id' => array('type' => 'auto','nullable' => False)
+			'async_id' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'async_next' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '4', 'nullable' => False, 'comment' => 'timestamp of next run'),
+			'async_times' => array('type' => 'ascii', 'precision' => '255', 'nullable' => False, 'comment' => 'serialized array with values for keys hour,min,day,month,year'),
+			'async_method' => array('type' => 'ascii', 'precision' => '80', 'nullable' => False, 'comment' => 'app.class.method class::method to execute'),
+			'async_data' => array('type' => 'varchar', 'precision' => '8192', 'nullable' => False, 'comment' => 'serialized array with data to pass to method'),
+			'async_account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'creator of job'),
+			'async_auto_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('async_auto_id'),
 		'fk' => array(),
@@ -179,226 +179,226 @@ 
 	),
 	'egw_links' => array(
 		'fd' => array(
-			'link_id' => array('type' => 'auto','nullable' => False),
-			'link_app1' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'link_id1' => array('type' => 'ascii','meta' => array("link_app1='api-accounts'" => 'account'),'precision' => '64','nullable' => False),
-			'link_app2' => array('type' => 'ascii','precision' => '16','nullable' => False),
-			'link_id2' => array('type' => 'ascii','meta' => array("link_app2='api-accounts'" => 'account'),'precision' => '64','nullable' => False),
-			'link_remark' => array('type' => 'varchar','precision' => '100'),
-			'link_lastmod' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False),
-			'link_owner' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False),
+			'link_id' => array('type' => 'auto', 'nullable' => False),
+			'link_app1' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'link_id1' => array('type' => 'ascii', 'meta' => array("link_app1='api-accounts'" => 'account'), 'precision' => '64', 'nullable' => False),
+			'link_app2' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False),
+			'link_id2' => array('type' => 'ascii', 'meta' => array("link_app2='api-accounts'" => 'account'), 'precision' => '64', 'nullable' => False),
+			'link_remark' => array('type' => 'varchar', 'precision' => '100'),
+			'link_lastmod' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'link_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False),
 			'deleted' => array('type' => 'timestamp')
 		),
 		'pk' => array('link_id'),
 		'fk' => array(),
-		'ix' => array('deleted',array('link_app1','link_id1','link_lastmod'),array('link_app2','link_id2','link_lastmod')),
+		'ix' => array('deleted', array('link_app1', 'link_id1', 'link_lastmod'), array('link_app2', 'link_id2', 'link_lastmod')),
 		'uc' => array()
 	),
 	'egw_addressbook' => array(
 		'fd' => array(
-			'contact_id' => array('type' => 'auto','nullable' => False),
-			'contact_tid' => array('type' => 'char','precision' => '1','default' => 'n'),
-			'contact_owner' => array('type' => 'int','meta' => 'account','precision' => '8','nullable' => False,'comment' => 'account or group id of the adressbook'),
-			'contact_private' => array('type' => 'int','precision' => '1','default' => '0','comment' => 'privat or personal'),
-			'cat_id' => array('type' => 'ascii','meta' => 'category','precision' => '255','comment' => 'Category(s)'),
-			'n_family' => array('type' => 'varchar','precision' => '64','comment' => 'Family name'),
-			'n_given' => array('type' => 'varchar','precision' => '64','comment' => 'Given Name'),
-			'n_middle' => array('type' => 'varchar','precision' => '64'),
-			'n_prefix' => array('type' => 'varchar','precision' => '64','comment' => 'Prefix'),
-			'n_suffix' => array('type' => 'varchar','precision' => '64','comment' => 'Suffix'),
-			'n_fn' => array('type' => 'varchar','precision' => '128','comment' => 'Full name'),
-			'n_fileas' => array('type' => 'varchar','precision' => '255','comment' => 'sort as'),
-			'contact_bday' => array('type' => 'varchar','precision' => '12','comment' => 'Birtday'),
-			'org_name' => array('type' => 'varchar','precision' => '128','comment' => 'Organisation'),
-			'org_unit' => array('type' => 'varchar','precision' => '64','comment' => 'Department'),
-			'contact_title' => array('type' => 'varchar','precision' => '64','comment' => 'jobtittle'),
-			'contact_role' => array('type' => 'varchar','precision' => '64','comment' => 'role'),
-			'contact_assistent' => array('type' => 'varchar','precision' => '64','comment' => 'Name of the Assistent (for phone number)'),
-			'contact_room' => array('type' => 'varchar','precision' => '64','comment' => 'room'),
-			'adr_one_street' => array('type' => 'varchar','precision' => '64','comment' => 'street (business)'),
-			'adr_one_street2' => array('type' => 'varchar','precision' => '64','comment' => 'street (business) - 2. line'),
-			'adr_one_locality' => array('type' => 'varchar','precision' => '64','comment' => 'city (business)'),
-			'adr_one_region' => array('type' => 'varchar','precision' => '64','comment' => 'region (business)'),
-			'adr_one_postalcode' => array('type' => 'varchar','precision' => '64','comment' => 'postalcode (business)'),
-			'adr_one_countryname' => array('type' => 'varchar','precision' => '64','comment' => 'countryname (business)'),
-			'contact_label' => array('type' => 'text','comment' => 'currently not used'),
-			'adr_two_street' => array('type' => 'varchar','precision' => '64','comment' => 'street (private)'),
-			'adr_two_street2' => array('type' => 'varchar','precision' => '64','comment' => 'street (private) - 2. line'),
-			'adr_two_locality' => array('type' => 'varchar','precision' => '64','comment' => 'city (private)'),
-			'adr_two_region' => array('type' => 'varchar','precision' => '64','comment' => 'region (private)'),
-			'adr_two_postalcode' => array('type' => 'varchar','precision' => '64','comment' => 'postalcode (private)'),
-			'adr_two_countryname' => array('type' => 'varchar','precision' => '64','comment' => 'countryname (private)'),
-			'tel_work' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number (business)'),
-			'tel_cell' => array('type' => 'varchar','precision' => '40','comment' => 'mobil phone (business)'),
-			'tel_fax' => array('type' => 'varchar','precision' => '40','comment' => 'fax-number (business)'),
-			'tel_assistent' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number assistent'),
-			'tel_car' => array('type' => 'varchar','precision' => '40'),
-			'tel_pager' => array('type' => 'varchar','precision' => '40','comment' => 'pager'),
-			'tel_home' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number (private)'),
-			'tel_fax_home' => array('type' => 'varchar','precision' => '40','comment' => 'fax-number (private)'),
-			'tel_cell_private' => array('type' => 'varchar','precision' => '40','comment' => 'mobil phone (private)'),
-			'tel_other' => array('type' => 'varchar','precision' => '40','comment' => 'other phone'),
-			'tel_prefer' => array('type' => 'varchar','precision' => '32','comment' => 'prefered phone-number'),
-			'contact_email' => array('type' => 'varchar','precision' => '128','comment' => 'email address (business)'),
-			'contact_email_home' => array('type' => 'varchar','precision' => '128','comment' => 'email address (private)'),
-			'contact_url' => array('type' => 'varchar','precision' => '128','comment' => 'website (business)'),
-			'contact_url_home' => array('type' => 'varchar','precision' => '128','comment' => 'website (private)'),
-			'contact_freebusy_uri' => array('type' => 'ascii','precision' => '128','comment' => 'freebusy-url for calendar of the contact'),
-			'contact_calendar_uri' => array('type' => 'ascii','precision' => '128','comment' => 'url for users calendar - currently not used'),
-			'contact_note' => array('type' => 'varchar','precision' => '8192','comment' => 'notes field'),
-			'contact_tz' => array('type' => 'varchar','precision' => '8','comment' => 'timezone difference'),
-			'contact_geo' => array('type' => 'ascii','precision' => '32','comment' => 'currently not used'),
-			'contact_pubkey' => array('type' => 'ascii','precision' => '16384','comment' => 'public key'),
-			'contact_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the creation'),
-			'contact_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account id of the creator'),
-			'contact_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the last modified'),
-			'contact_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id of the last modified'),
-			'contact_jpegphoto' => array('type' => 'blob','comment' => 'photo of the contact (attachment)'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id'),
-			'contact_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag of the changes'),
-			'contact_uid' => array('type' => 'ascii','precision' => '128','comment' => 'unique id of the contact'),
-			'adr_one_countrycode' => array('type' => 'ascii','precision' => '2','comment' => 'countrycode (business)'),
-			'adr_two_countrycode' => array('type' => 'ascii','precision' => '2','comment' => 'countrycode (private)'),
-			'carddav_name' => array('type' => 'ascii','precision' => '128','comment' => 'name part of CardDAV URL, if specified by client')
+			'contact_id' => array('type' => 'auto', 'nullable' => False),
+			'contact_tid' => array('type' => 'char', 'precision' => '1', 'default' => 'n'),
+			'contact_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '8', 'nullable' => False, 'comment' => 'account or group id of the adressbook'),
+			'contact_private' => array('type' => 'int', 'precision' => '1', 'default' => '0', 'comment' => 'privat or personal'),
+			'cat_id' => array('type' => 'ascii', 'meta' => 'category', 'precision' => '255', 'comment' => 'Category(s)'),
+			'n_family' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Family name'),
+			'n_given' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Given Name'),
+			'n_middle' => array('type' => 'varchar', 'precision' => '64'),
+			'n_prefix' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Prefix'),
+			'n_suffix' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Suffix'),
+			'n_fn' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'Full name'),
+			'n_fileas' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'sort as'),
+			'contact_bday' => array('type' => 'varchar', 'precision' => '12', 'comment' => 'Birtday'),
+			'org_name' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'Organisation'),
+			'org_unit' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Department'),
+			'contact_title' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'jobtittle'),
+			'contact_role' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'role'),
+			'contact_assistent' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Name of the Assistent (for phone number)'),
+			'contact_room' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'room'),
+			'adr_one_street' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (business)'),
+			'adr_one_street2' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (business) - 2. line'),
+			'adr_one_locality' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'city (business)'),
+			'adr_one_region' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'region (business)'),
+			'adr_one_postalcode' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'postalcode (business)'),
+			'adr_one_countryname' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'countryname (business)'),
+			'contact_label' => array('type' => 'text', 'comment' => 'currently not used'),
+			'adr_two_street' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (private)'),
+			'adr_two_street2' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (private) - 2. line'),
+			'adr_two_locality' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'city (private)'),
+			'adr_two_region' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'region (private)'),
+			'adr_two_postalcode' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'postalcode (private)'),
+			'adr_two_countryname' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'countryname (private)'),
+			'tel_work' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'phone-number (business)'),
+			'tel_cell' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'mobil phone (business)'),
+			'tel_fax' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'fax-number (business)'),
+			'tel_assistent' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'phone-number assistent'),
+			'tel_car' => array('type' => 'varchar', 'precision' => '40'),
+			'tel_pager' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'pager'),
+			'tel_home' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'phone-number (private)'),
+			'tel_fax_home' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'fax-number (private)'),
+			'tel_cell_private' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'mobil phone (private)'),
+			'tel_other' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'other phone'),
+			'tel_prefer' => array('type' => 'varchar', 'precision' => '32', 'comment' => 'prefered phone-number'),
+			'contact_email' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'email address (business)'),
+			'contact_email_home' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'email address (private)'),
+			'contact_url' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'website (business)'),
+			'contact_url_home' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'website (private)'),
+			'contact_freebusy_uri' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'freebusy-url for calendar of the contact'),
+			'contact_calendar_uri' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'url for users calendar - currently not used'),
+			'contact_note' => array('type' => 'varchar', 'precision' => '8192', 'comment' => 'notes field'),
+			'contact_tz' => array('type' => 'varchar', 'precision' => '8', 'comment' => 'timezone difference'),
+			'contact_geo' => array('type' => 'ascii', 'precision' => '32', 'comment' => 'currently not used'),
+			'contact_pubkey' => array('type' => 'ascii', 'precision' => '16384', 'comment' => 'public key'),
+			'contact_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of the creation'),
+			'contact_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'account id of the creator'),
+			'contact_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'timestamp of the last modified'),
+			'contact_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'account id of the last modified'),
+			'contact_jpegphoto' => array('type' => 'blob', 'comment' => 'photo of the contact (attachment)'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'account id'),
+			'contact_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag of the changes'),
+			'contact_uid' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'unique id of the contact'),
+			'adr_one_countrycode' => array('type' => 'ascii', 'precision' => '2', 'comment' => 'countrycode (business)'),
+			'adr_two_countrycode' => array('type' => 'ascii', 'precision' => '2', 'comment' => 'countrycode (private)'),
+			'carddav_name' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'name part of CardDAV URL, if specified by client')
 		),
 		'pk' => array('contact_id'),
 		'fk' => array(),
-		'ix' => array('contact_owner','cat_id','n_fileas','contact_modified','contact_uid','carddav_name',array('n_family','n_given'),array('n_given','n_family'),array('org_name','n_family','n_given')),
+		'ix' => array('contact_owner', 'cat_id', 'n_fileas', 'contact_modified', 'contact_uid', 'carddav_name', array('n_family', 'n_given'), array('n_given', 'n_family'), array('org_name', 'n_family', 'n_given')),
 		'uc' => array('account_id')
 	),
 	'egw_addressbook_extra' => array(
 		'fd' => array(
-			'contact_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'contact_owner' => array('type' => 'int','meta' => 'account','precision' => '8'),
-			'contact_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '64','nullable' => False,'comment' => 'custom-field name'),
-			'contact_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '16384','comment' => 'custom-field value'),
-			'contact_extra_id' => array('type' => 'auto','nullable' => False)
+			'contact_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'contact_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '8'),
+			'contact_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '64', 'nullable' => False, 'comment' => 'custom-field name'),
+			'contact_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '16384', 'comment' => 'custom-field value'),
+			'contact_extra_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('contact_extra_id'),
 		'fk' => array(),
-		'ix' => array('contact_name',array('contact_id','contact_name')),
+		'ix' => array('contact_name', array('contact_id', 'contact_name')),
 		'uc' => array()
 	),
 	'egw_addressbook_lists' => array(
 		'fd' => array(
-			'list_id' => array('type' => 'auto','nullable' => False),
-			'list_name' => array('type' => 'varchar','precision' => '80','nullable' => False),
-			'list_owner' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False),
-			'list_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'list_creator' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'list_uid' => array('type' => 'ascii','precision' => '128'),
-			'list_carddav_name' => array('type' => 'ascii','precision' => '128'),
-			'list_etag' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'list_modified' => array('type' => 'timestamp','nullable' => False,'default' => 'current_timestamp'),
-			'list_modifier' => array('type' => 'int','meta' => 'user','precision' => '4')
+			'list_id' => array('type' => 'auto', 'nullable' => False),
+			'list_name' => array('type' => 'varchar', 'precision' => '80', 'nullable' => False),
+			'list_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False),
+			'list_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'list_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'list_uid' => array('type' => 'ascii', 'precision' => '128'),
+			'list_carddav_name' => array('type' => 'ascii', 'precision' => '128'),
+			'list_etag' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'list_modified' => array('type' => 'timestamp', 'nullable' => False, 'default' => 'current_timestamp'),
+			'list_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4')
 		),
 		'pk' => array('list_id'),
 		'fk' => array(),
 		'ix' => array(),
-		'uc' => array('list_uid','list_carddav_name',array('list_owner','list_name'))
+		'uc' => array('list_uid', 'list_carddav_name', array('list_owner', 'list_name'))
 	),
 	'egw_addressbook2list' => array(
 		'fd' => array(
-			'contact_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'list_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'list_added' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'list_added_by' => array('type' => 'int','meta' => 'user','precision' => '4')
+			'contact_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'list_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'list_added' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'list_added_by' => array('type' => 'int', 'meta' => 'user', 'precision' => '4')
 		),
-		'pk' => array('contact_id','list_id'),
+		'pk' => array('contact_id', 'list_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
 	),
 	'egw_sqlfs' => array(
 		'fd' => array(
-			'fs_id' => array('type' => 'auto','nullable' => False),
-			'fs_dir' => array('type' => 'int','precision' => '4','nullable' => False),
-			'fs_name' => array('type' => 'varchar','precision' => '200','nullable' => False),
-			'fs_mode' => array('type' => 'int','precision' => '2','nullable' => False),
-			'fs_uid' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'default' => '0'),
-			'fs_gid' => array('type' => 'int','meta' => 'group-abs','precision' => '4','nullable' => False,'default' => '0'),
-			'fs_created' => array('type' => 'timestamp','precision' => '8','nullable' => False),
-			'fs_modified' => array('type' => 'timestamp','precision' => '8','nullable' => False),
-			'fs_mime' => array('type' => 'ascii','precision' => '96','nullable' => False),
-			'fs_size' => array('type' => 'int','precision' => '8','nullable' => False),
-			'fs_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False),
-			'fs_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'fs_active' => array('type' => 'bool','nullable' => False,'default' => 't'),
+			'fs_id' => array('type' => 'auto', 'nullable' => False),
+			'fs_dir' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'fs_name' => array('type' => 'varchar', 'precision' => '200', 'nullable' => False),
+			'fs_mode' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'fs_uid' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'fs_gid' => array('type' => 'int', 'meta' => 'group-abs', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'fs_created' => array('type' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'fs_modified' => array('type' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'fs_mime' => array('type' => 'ascii', 'precision' => '96', 'nullable' => False),
+			'fs_size' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'fs_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False),
+			'fs_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'fs_active' => array('type' => 'bool', 'nullable' => False, 'default' => 't'),
 			'fs_content' => array('type' => 'blob'),
-			'fs_link' => array('type' => 'varchar','precision' => '255')
+			'fs_link' => array('type' => 'varchar', 'precision' => '255')
 		),
 		'pk' => array('fs_id'),
 		'fk' => array(),
-		'ix' => array(array('fs_dir','fs_active','fs_name(16)')),
+		'ix' => array(array('fs_dir', 'fs_active', 'fs_name(16)')),
 		'uc' => array()
 	),
 	'egw_locks' => array(
 		'fd' => array(
-			'lock_token' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'lock_path' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'lock_expires' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False),
-			'lock_owner' => array('type' => 'varchar','precision' => '255'),
-			'lock_recursive' => array('type' => 'bool','nullable' => False,'default' => '0'),
-			'lock_write' => array('type' => 'bool','nullable' => False,'default' => '0'),
-			'lock_exclusive' => array('type' => 'bool','nullable' => False,'default' => '0'),
-			'lock_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','default' => '0'),
-			'lock_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','default' => '0'),
-			'lock_id' => array('type' => 'auto','nullable' => False)
+			'lock_token' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'lock_path' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'lock_expires' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'lock_owner' => array('type' => 'varchar', 'precision' => '255'),
+			'lock_recursive' => array('type' => 'bool', 'nullable' => False, 'default' => '0'),
+			'lock_write' => array('type' => 'bool', 'nullable' => False, 'default' => '0'),
+			'lock_exclusive' => array('type' => 'bool', 'nullable' => False, 'default' => '0'),
+			'lock_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'default' => '0'),
+			'lock_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'default' => '0'),
+			'lock_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('lock_id'),
 		'fk' => array(),
-		'ix' => array('lock_path','lock_expires'),
+		'ix' => array('lock_path', 'lock_expires'),
 		'uc' => array('lock_token')
 	),
 	'egw_sqlfs_props' => array(
 		'fd' => array(
-			'fs_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'prop_namespace' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'prop_name' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'prop_value' => array('type' => 'varchar','precision' => '16384'),
-			'prop_id' => array('type' => 'auto','nullable' => False)
+			'fs_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'prop_namespace' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'prop_name' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'prop_value' => array('type' => 'varchar', 'precision' => '16384'),
+			'prop_id' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('prop_id'),
 		'fk' => array(),
-		'ix' => array(array('fs_id','prop_namespace','prop_name')),
+		'ix' => array(array('fs_id', 'prop_namespace', 'prop_name')),
 		'uc' => array()
 	),
 	'egw_customfields' => array(
 		'fd' => array(
-			'cf_id' => array('type' => 'auto','nullable' => False),
-			'cf_app' => array('type' => 'ascii','precision' => '16','nullable' => False,'comment' => 'app-name cf belongs too'),
-			'cf_name' => array('type' => 'varchar','precision' => '128','nullable' => False,'comment' => 'internal name'),
-			'cf_label' => array('type' => 'varchar','precision' => '128','comment' => 'label to display'),
-			'cf_type' => array('type' => 'varchar','precision' => '64','nullable' => False,'default' => 'text','comment' => 'type of field'),
-			'cf_type2' => array('type' => 'varchar','precision' => '2048','comment' => 'comma-separated subtypes of app, cf is valid for'),
-			'cf_help' => array('type' => 'varchar','precision' => '256','comment' => 'helptext'),
-			'cf_values' => array('type' => 'varchar','precision' => '8096','comment' => 'json object with value label pairs'),
-			'cf_len' => array('type' => 'int','precision' => '2','comment' => 'length or columns of field'),
-			'cf_rows' => array('type' => 'int','precision' => '2','comment' => 'rows of field'),
-			'cf_order' => array('type' => 'int','precision' => '2','comment' => 'order to display fields'),
-			'cf_needed' => array('type' => 'bool','default' => '0','comment' => 'field is required'),
-			'cf_private' => array('type' => 'ascii','meta' => 'account-commasep','precision' => '2048','comment' => 'comma-separated account_id'),
-			'cf_modifier' => array('type' => 'int','meta' => 'account','precision' => '4','comment' => 'last modifier'),
-			'cf_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'last modification time'),
-			'cf_tab' => array('type' => 'varchar','precision' => '64','comment' => 'tab customfield should be shown')
+			'cf_id' => array('type' => 'auto', 'nullable' => False),
+			'cf_app' => array('type' => 'ascii', 'precision' => '16', 'nullable' => False, 'comment' => 'app-name cf belongs too'),
+			'cf_name' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False, 'comment' => 'internal name'),
+			'cf_label' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'label to display'),
+			'cf_type' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False, 'default' => 'text', 'comment' => 'type of field'),
+			'cf_type2' => array('type' => 'varchar', 'precision' => '2048', 'comment' => 'comma-separated subtypes of app, cf is valid for'),
+			'cf_help' => array('type' => 'varchar', 'precision' => '256', 'comment' => 'helptext'),
+			'cf_values' => array('type' => 'varchar', 'precision' => '8096', 'comment' => 'json object with value label pairs'),
+			'cf_len' => array('type' => 'int', 'precision' => '2', 'comment' => 'length or columns of field'),
+			'cf_rows' => array('type' => 'int', 'precision' => '2', 'comment' => 'rows of field'),
+			'cf_order' => array('type' => 'int', 'precision' => '2', 'comment' => 'order to display fields'),
+			'cf_needed' => array('type' => 'bool', 'default' => '0', 'comment' => 'field is required'),
+			'cf_private' => array('type' => 'ascii', 'meta' => 'account-commasep', 'precision' => '2048', 'comment' => 'comma-separated account_id'),
+			'cf_modifier' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'comment' => 'last modifier'),
+			'cf_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'last modification time'),
+			'cf_tab' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'tab customfield should be shown')
 		),
 		'pk' => array('cf_id'),
 		'fk' => array(),
-		'ix' => array(array('cf_app','cf_order')),
-		'uc' => array(array('cf_app','cf_name'))
+		'ix' => array(array('cf_app', 'cf_order')),
+		'uc' => array(array('cf_app', 'cf_name'))
 	),
 	'egw_sharing' => array(
 		'fd' => array(
-			'share_id' => array('type' => 'auto','nullable' => False,'comment' => 'auto-id'),
-			'share_token' => array('type' => 'ascii','precision' => '64','nullable' => False,'comment' => 'secure token'),
-			'share_path' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'path to share'),
-			'share_owner' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'owner of share'),
-			'share_expires' => array('type' => 'date','comment' => 'expire date of share'),
-			'share_writable' => array('type' => 'int','precision' => '1','nullable' => False,'default' => '0','comment' => '0=readable, 1=writable'),
-			'share_with' => array('type' => 'varchar','precision' => '4096','comment' => 'email addresses, comma seperated'),
-			'share_passwd' => array('type' => 'varchar','precision' => '128','comment' => 'optional password-hash'),
-			'share_created' => array('type' => 'timestamp','nullable' => False,'comment' => 'creation date'),
-			'share_last_accessed' => array('type' => 'timestamp','comment' => 'last access of share')
+			'share_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'auto-id'),
+			'share_token' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False, 'comment' => 'secure token'),
+			'share_path' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'path to share'),
+			'share_owner' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'owner of share'),
+			'share_expires' => array('type' => 'date', 'comment' => 'expire date of share'),
+			'share_writable' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'default' => '0', 'comment' => '0=readable, 1=writable'),
+			'share_with' => array('type' => 'varchar', 'precision' => '4096', 'comment' => 'email addresses, comma seperated'),
+			'share_passwd' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'optional password-hash'),
+			'share_created' => array('type' => 'timestamp', 'nullable' => False, 'comment' => 'creation date'),
+			'share_last_accessed' => array('type' => 'timestamp', 'comment' => 'last access of share')
 		),
 		'pk' => array('share_id'),
 		'fk' => array(),
@@ -407,49 +407,49 @@ 
 	),
 	'egw_mailaccounts' => array(
 		'fd' => array(
-			'mail_id' => array('type' => 'auto','nullable' => False,'comment' => 'the id'),
-			'account_id' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False,'comment' => 'account id of the owner, can be user AND group'),
-			'mail_type' => array('type' => 'int','precision' => '1','nullable' => False,'comment' => '0=active, 1=alias, 2=forward, 3=forwardOnly, 4=quota'),
-			'mail_value' => array('type' => 'ascii','precision' => '128','nullable' => False,'comment' => 'the value (that should be) corresponding to the mail_type')
+			'mail_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'the id'),
+			'account_id' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False, 'comment' => 'account id of the owner, can be user AND group'),
+			'mail_type' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'comment' => '0=active, 1=alias, 2=forward, 3=forwardOnly, 4=quota'),
+			'mail_value' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False, 'comment' => 'the value (that should be) corresponding to the mail_type')
 		),
 		'pk' => array('mail_id'),
 		'fk' => array(),
-		'ix' => array('mail_value',array('account_id','mail_type')),
+		'ix' => array('mail_value', array('account_id', 'mail_type')),
 		'uc' => array()
 	),
 	'egw_ea_accounts' => array(
 		'fd' => array(
-			'acc_id' => array('type' => 'auto','nullable' => False),
-			'acc_name' => array('type' => 'varchar','precision' => '80','comment' => 'description'),
-			'ident_id' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'standard identity'),
-			'acc_imap_host' => array('type' => 'ascii','precision' => '128','nullable' => False,'comment' => 'imap hostname'),
-			'acc_imap_ssl' => array('type' => 'int','precision' => '1','nullable' => False,'default' => '0','comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
-			'acc_imap_port' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '143','comment' => 'imap port'),
-			'acc_sieve_enabled' => array('type' => 'bool','default' => '0','comment' => 'sieve enabled'),
-			'acc_sieve_host' => array('type' => 'ascii','precision' => '128','comment' => 'sieve host, default imap_host'),
-			'acc_sieve_port' => array('type' => 'int','precision' => '4','default' => '4190'),
-			'acc_folder_sent' => array('type' => 'varchar','precision' => '128','comment' => 'sent folder'),
-			'acc_folder_trash' => array('type' => 'varchar','precision' => '128','comment' => 'trash folder'),
-			'acc_folder_draft' => array('type' => 'varchar','precision' => '128','comment' => 'draft folder'),
-			'acc_folder_template' => array('type' => 'varchar','precision' => '128','comment' => 'template folder'),
-			'acc_folder_archive' => array('type' => 'varchar','precision' => '128','comment' => 'archive folder'),
-			'acc_smtp_host' => array('type' => 'varchar','precision' => '128','comment' => 'smtp hostname'),
-			'acc_smtp_ssl' => array('type' => 'int','precision' => '1','nullable' => False,'default' => '0','comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
-			'acc_smtp_port' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '25','comment' => 'smtp port'),
-			'acc_smtp_type' => array('type' => 'ascii','precision' => '32','default' => 'emailadmin_smtp','comment' => 'smtp class to use'),
-			'acc_imap_type' => array('type' => 'ascii','precision' => '32','default' => 'emailadmin_imap','comment' => 'imap class to use'),
-			'acc_imap_logintype' => array('type' => 'ascii','precision' => '20','comment' => 'standard, vmailmgr, admin, uidNumber'),
-			'acc_domain' => array('type' => 'varchar','precision' => '100','comment' => 'domain name'),
-			'acc_further_identities' => array('type' => 'bool','nullable' => False,'default' => '1','comment' => '0=no, 1=yes'),
-			'acc_user_editable' => array('type' => 'bool','nullable' => False,'default' => '1','comment' => '0=no, 1=yes'),
-			'acc_sieve_ssl' => array('type' => 'int','precision' => '1','default' => '1','comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
-			'acc_modified' => array('type' => 'timestamp','nullable' => False,'default' => 'current_timestamp'),
-			'acc_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'acc_smtp_auth_session' => array('type' => 'bool','comment' => '0=no, 1=yes, use username/pw from current user'),
-			'acc_folder_junk' => array('type' => 'varchar','precision' => '128','comment' => 'junk folder'),
-			'acc_imap_default_quota' => array('type' => 'int','precision' => '4','comment' => 'default quota, if no user specific one set'),
-			'acc_imap_timeout' => array('type' => 'int','precision' => '2','comment' => 'timeout for imap connection'),
-			'acc_user_forward' => array('type' => 'bool','default' => '0','comment' => 'allow user to define forwards')
+			'acc_id' => array('type' => 'auto', 'nullable' => False),
+			'acc_name' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'description'),
+			'ident_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'standard identity'),
+			'acc_imap_host' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False, 'comment' => 'imap hostname'),
+			'acc_imap_ssl' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'default' => '0', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_imap_port' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '143', 'comment' => 'imap port'),
+			'acc_sieve_enabled' => array('type' => 'bool', 'default' => '0', 'comment' => 'sieve enabled'),
+			'acc_sieve_host' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'sieve host, default imap_host'),
+			'acc_sieve_port' => array('type' => 'int', 'precision' => '4', 'default' => '4190'),
+			'acc_folder_sent' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'sent folder'),
+			'acc_folder_trash' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'trash folder'),
+			'acc_folder_draft' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'draft folder'),
+			'acc_folder_template' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'template folder'),
+			'acc_folder_archive' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'archive folder'),
+			'acc_smtp_host' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'smtp hostname'),
+			'acc_smtp_ssl' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'default' => '0', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_smtp_port' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '25', 'comment' => 'smtp port'),
+			'acc_smtp_type' => array('type' => 'ascii', 'precision' => '32', 'default' => 'emailadmin_smtp', 'comment' => 'smtp class to use'),
+			'acc_imap_type' => array('type' => 'ascii', 'precision' => '32', 'default' => 'emailadmin_imap', 'comment' => 'imap class to use'),
+			'acc_imap_logintype' => array('type' => 'ascii', 'precision' => '20', 'comment' => 'standard, vmailmgr, admin, uidNumber'),
+			'acc_domain' => array('type' => 'varchar', 'precision' => '100', 'comment' => 'domain name'),
+			'acc_further_identities' => array('type' => 'bool', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes'),
+			'acc_user_editable' => array('type' => 'bool', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes'),
+			'acc_sieve_ssl' => array('type' => 'int', 'precision' => '1', 'default' => '1', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_modified' => array('type' => 'timestamp', 'nullable' => False, 'default' => 'current_timestamp'),
+			'acc_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'acc_smtp_auth_session' => array('type' => 'bool', 'comment' => '0=no, 1=yes, use username/pw from current user'),
+			'acc_folder_junk' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'junk folder'),
+			'acc_imap_default_quota' => array('type' => 'int', 'precision' => '4', 'comment' => 'default quota, if no user specific one set'),
+			'acc_imap_timeout' => array('type' => 'int', 'precision' => '2', 'comment' => 'timeout for imap connection'),
+			'acc_user_forward' => array('type' => 'bool', 'default' => '0', 'comment' => 'allow user to define forwards')
 		),
 		'pk' => array('acc_id'),
 		'fk' => array(),
@@ -458,29 +458,29 @@ 
 	),
 	'egw_ea_credentials' => array(
 		'fd' => array(
-			'cred_id' => array('type' => 'auto','nullable' => False),
-			'acc_id' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'into egw_ea_accounts'),
-			'cred_type' => array('type' => 'int','precision' => '1','nullable' => False,'comment' => '&1=imap, &2=smtp, &4=admin'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account_id or 0=all'),
-			'cred_username' => array('type' => 'varchar','precision' => '80','nullable' => False,'comment' => 'username'),
-			'cred_password' => array('type' => 'varchar','precision' => '80','comment' => 'password encrypted'),
-			'cred_pw_enc' => array('type' => 'int','precision' => '1','default' => '0','comment' => '0=not, 1=user pw, 2=system')
+			'cred_id' => array('type' => 'auto', 'nullable' => False),
+			'acc_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'into egw_ea_accounts'),
+			'cred_type' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'comment' => '&1=imap, &2=smtp, &4=admin'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'account_id or 0=all'),
+			'cred_username' => array('type' => 'varchar', 'precision' => '80', 'nullable' => False, 'comment' => 'username'),
+			'cred_password' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'password encrypted'),
+			'cred_pw_enc' => array('type' => 'int', 'precision' => '1', 'default' => '0', 'comment' => '0=not, 1=user pw, 2=system')
 		),
 		'pk' => array('cred_id'),
 		'fk' => array(),
 		'ix' => array(),
-		'uc' => array(array('acc_id','account_id','cred_type'))
+		'uc' => array(array('acc_id', 'account_id', 'cred_type'))
 	),
 	'egw_ea_identities' => array(
 		'fd' => array(
-			'ident_id' => array('type' => 'auto','nullable' => False),
-			'acc_id' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'for which account'),
-			'ident_realname' => array('type' => 'varchar','precision' => '128','nullable' => False,'comment' => 'real name'),
-			'ident_email' => array('type' => 'varchar','precision' => '128','comment' => 'email address'),
-			'ident_org' => array('type' => 'varchar','precision' => '128','comment' => 'organisation'),
-			'ident_signature' => array('type' => 'text','comment' => 'signature text'),
-			'account_id' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False,'default' => '0','comment' => '0=all users of give mail account'),
-			'ident_name' => array('type' => 'varchar','precision' => '128','comment' => 'name of identity to display')
+			'ident_id' => array('type' => 'auto', 'nullable' => False),
+			'acc_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'for which account'),
+			'ident_realname' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False, 'comment' => 'real name'),
+			'ident_email' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'email address'),
+			'ident_org' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'organisation'),
+			'ident_signature' => array('type' => 'text', 'comment' => 'signature text'),
+			'account_id' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => '0=all users of give mail account'),
+			'ident_name' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'name of identity to display')
 		),
 		'pk' => array('ident_id'),
 		'fk' => array(),
@@ -489,24 +489,24 @@ 
 	),
 	'egw_ea_valid' => array(
 		'fd' => array(
-			'acc_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'account_id' => array('type' => 'int','meta' => 'account','precision' => '4','nullable' => False)
+			'acc_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'account_id' => array('type' => 'int', 'meta' => 'account', 'precision' => '4', 'nullable' => False)
 		),
 		'pk' => array(),
 		'fk' => array(),
-		'ix' => array(array('account_id','acc_id')),
-		'uc' => array(array('acc_id','account_id'))
+		'ix' => array(array('account_id', 'acc_id')),
+		'uc' => array(array('acc_id', 'account_id'))
 	),
 	'egw_ea_notifications' => array(
 		'fd' => array(
-			'notif_id' => array('type' => 'auto','nullable' => False),
-			'acc_id' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'mail account'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'user account'),
-			'notif_folder' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'folder name')
+			'notif_id' => array('type' => 'auto', 'nullable' => False),
+			'acc_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'mail account'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'user account'),
+			'notif_folder' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'folder name')
 		),
 		'pk' => array('notif_id'),
 		'fk' => array(),
-		'ix' => array(array('account_id','acc_id')),
+		'ix' => array(array('account_id', 'acc_id')),
 		'uc' => array()
 	),
 );

api/setup/tables_update.inc.php

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	$tables = $GLOBALS['egw_setup']->db->table_names(true);
 	$phpgw_baseline = array();
 	include (__DIR__.'/tables_current.inc.php');
-	foreach($phpgw_baseline as $table => $definition)
+	foreach ($phpgw_baseline as $table => $definition)
 	{
 		if (!in_array($table, $tables))
 		{
@@ -41,7 +41,7 @@ 
 
 	// uninstall obsolete FelamiMail tables, if still around
 	$done = 0;
-	foreach(array_intersect($tables, array('egw_felamimail_accounts', 'egw_felamimail_displayfilter', 'egw_felamimail_signatures')) as $table)
+	foreach (array_intersect($tables, array('egw_felamimail_accounts', 'egw_felamimail_displayfilter', 'egw_felamimail_signatures')) as $table)
 	{
 		$GLOBALS['egw_setup']->oProc->DropTable($table);
 
@@ -58,7 +58,7 @@ 
  */
 function api_upgrade16_1()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_folder_archive', array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_folder_archive', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'archive folder'
@@ -74,7 +74,7 @@ 
  */
 function api_upgrade16_1_001()
 {
-	foreach(array(
+	foreach (array(
 		'cf_type' => 'egw_customfields',
 		'link_app1' => 'egw_links',
 		'link_app2' => 'egw_links',

Braces +4 added lines, -1 removed lines

@@ -45,7 +45,10 @@
 	{
 		$GLOBALS['egw_setup']->oProc->DropTable($table);
 
-		if (!$done++) $GLOBALS['egw_setup']->deregister_app('felamimail');
+		if (!$done++)
+		{
+			$GLOBALS['egw_setup']->deregister_app('felamimail');
+		}
 	}
 
 	return $GLOBALS['setup_info']['api']['currentver'] = '16.1';

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -80,7 +80,7 @@
 		'link_app2' => 'egw_links',
 	) as $col => $table)
 	{
-		$GLOBALS['egw_setup']->db->query("UPDATE $table SET $col='api-accounts' WHERE $col='home-accounts'", __LINE__, __FILE__);
+		$GLOBALS['egw_setup']->db->query("update $table SET $col='api-accounts' WHERE $col='home-accounts'", __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['api']['currentver'] = '16.1.002';
 }

api/setup/default_records.inc.php

Spacing +15 added lines, -15 removed lines

@@ -14,7 +14,7 @@ 
 
 //$oProc->m_odb->Halt_On_Error = 'yes';
 
-foreach(array(
+foreach (array(
 	'aa' => 'Afar',
 	'ab' => 'Abkhazian',
 	'af' => 'Afrikaans',
@@ -155,21 +155,21 @@ 
 	'zu' => 'Zulu',
 ) as $id => $name)
 {
-	$oProc->insert($GLOBALS['egw_setup']->languages_table,array('lang_name' => $name),array('lang_id' => $id),__LINE__,__FILE__);
+	$oProc->insert($GLOBALS['egw_setup']->languages_table, array('lang_name' => $name), array('lang_id' => $id), __LINE__, __FILE__);
 }
 
-foreach(array(
+foreach (array(
 	'sessions_checkip' => 'True',
 	'asyncservice'     => 'fallback',
 	'install_id'       => md5(microtime(true).Api\Auth::randomstring(15)),
 ) as $name => $value)
 {
-	$oProc->insert($GLOBALS['egw_setup']->config_table,array(
+	$oProc->insert($GLOBALS['egw_setup']->config_table, array(
 		'config_value' => $value,
-	),array(
+	), array(
 		'config_app' => 'phpgwapi',
 		'config_name' => $name,
-	),__LINE__,__FILE__);
+	), __LINE__, __FILE__);
 }
 
 // make sure the required sqlfs dirs are there and have the following id's
@@ -178,12 +178,12 @@ 
 	'/home' => 2,
 	'/apps' => 3,
 );
-foreach($dirs as $path => $id)
+foreach ($dirs as $path => $id)
 {
 	$nrow = array(
 		'fs_id' => $id,
 		'fs_dir'  => $path == '/' ? 0 : $dirs['/'],
-		'fs_name' => substr($path,1),
+		'fs_name' => substr($path, 1),
 		'fs_mode' => 05,
 		'fs_uid' => 0,
 		'fs_gid' => 0,
@@ -196,24 +196,24 @@ 
 		'fs_comment' => null,
 		'fs_content' => null,
 	);
-	$GLOBALS['egw_setup']->db->insert('egw_sqlfs',$nrow,false,__LINE__,__FILE__,'phpgwapi');
+	$GLOBALS['egw_setup']->db->insert('egw_sqlfs', $nrow, false, __LINE__, __FILE__, 'phpgwapi');
 }
 // PostgreSQL seems to require to update the sequenz, after manually inserting id's
-$oProc->UpdateSequence('egw_sqlfs','fs_id');
+$oProc->UpdateSequence('egw_sqlfs', 'fs_id');
 
 // Create Addressbook for Default group, by setting a group ACL from the group to itself for all rights: add, read, edit and delete
-$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-$GLOBALS['egw_setup']->add_acl('addressbook',$defaultgroup,$defaultgroup,1|2|4|8);
+$defaultgroup = $GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+$GLOBALS['egw_setup']->add_acl('addressbook', $defaultgroup, $defaultgroup, 1|2|4|8);
 
 /**
  * Create template directory and set default document_dir preference of addressbook, calendar, infolog, tracker, timesheet and projectmanager
  */
-$admins = $GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False);
+$admins = $GLOBALS['egw_setup']->add_account('Admins', 'Admin', 'Group', False, False);
 
 Vfs::$is_root = true;
 $prefs = new Api\Preferences();
 $prefs->read_repository(false);
-foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app)
+foreach (array('', 'addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app)
 {
 	if ($app && !file_exists(EGW_SERVER_ROOT.'/'.$app)) continue;
 
@@ -227,7 +227,7 @@ 
 	// set default preference for app (preserving a maybe already set document-directory)
 	if ($prefs->default[$app]['document_dir'])
 	{
-		$existing = explode(' ',$prefs->default[$app]['document_dir']);
+		$existing = explode(' ', $prefs->default[$app]['document_dir']);
 		$existing[] = $dir;
 		$dir = implode(' ', array_unique($existing));
 	}

Braces +8 added lines, -2 removed lines

@@ -215,14 +215,20 @@
 $prefs->read_repository(false);
 foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app)
 {
-	if ($app && !file_exists(EGW_SERVER_ROOT.'/'.$app)) continue;
+	if ($app && !file_exists(EGW_SERVER_ROOT.'/'.$app))
+	{
+		continue;
+	}
 
 	// create directory and set permissions: Admins writable and other readable
 	$dir = '/templates'.($app ? '/'.$app : '');
 	Vfs::mkdir($dir, 075, STREAM_MKDIR_RECURSIVE);
 	Vfs::chgrp($dir, abs($admins));
 	Vfs::chmod($dir, 075);
-	if (!$app) continue;
+	if (!$app)
+	{
+		continue;
+	}
 
 	// set default preference for app (preserving a maybe already set document-directory)
 	if ($prefs->default[$app]['document_dir'])