EGroupware / egroupware

api/setup/tables_update.inc.php

Spacing +13 added lines, -13 removed lines

@@ -26,7 +26,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))
 		{
@@ -43,7 +43,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);
 
@@ -60,7 +60,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'
@@ -76,7 +76,7 @@ 
  */
 function api_upgrade16_1_001()
 {
-	foreach(array(
+	foreach (array(
 		'cf_type' => 'egw_customfields',
 		'link_app1' => 'egw_links',
 		'link_app2' => 'egw_links',
@@ -100,10 +100,10 @@ 
  */
 function api_upgrade16_1_002()
 {
-	$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;
-	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;
 
@@ -128,7 +128,7 @@ 
 function api_upgrade16_1_003()
 {
 	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_ea_accounts', 'acc_further_identities', 'further_bool');
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_further_identities',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_further_identities', array(
 		'type' => 'int',
 		'precision' => '1',
 		'nullable' => False,
@@ -162,19 +162,19 @@ 
 		$total = 0;
 		do {
 			$n = 0;
-			foreach($GLOBALS['egw_setup']->db->query('SELECT fs_id,prop_namespace,prop_name,MAX(prop_id) AS prop_id
+			foreach ($GLOBALS['egw_setup']->db->query('SELECT fs_id,prop_namespace,prop_name,MAX(prop_id) AS prop_id
 FROM egw_sqlfs_props
 GROUP BY fs_id,prop_namespace,prop_name
 HAVING COUNT(*) > 1', __LINE__, __FILE__, 0, $junk_size, false, Api\Db::FETCH_ASSOC) as $row)
 			{
 				$prop_id = $row['prop_id'];
 				unset($row['prop_id']);
-				$GLOBALS['egw_setup']->db->delete('egw_sqlfs_props', $row+array('prop_id != '.(int)$prop_id), __LINE__, __FILE__);
+				$GLOBALS['egw_setup']->db->delete('egw_sqlfs_props', $row + array('prop_id != '.(int)$prop_id), __LINE__, __FILE__);
 				$total += $GLOBALS['egw_setup']->db->affected_rows();
 				$n++;
 			}
 		}
-		while($n == $junk_size);
+		while ($n == $junk_size);
 
 		if ($total)
 		{
@@ -210,7 +210,7 @@ 
  */
 function api_upgrade16_9()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_credentials','cred_password',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_credentials', 'cred_password', array(
 		'type' => 'varchar',
 		'precision' => '9600',
 		'comment' => 'password encrypted'
@@ -221,12 +221,12 @@ 
 
 function api_upgrade16_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_folder_ham',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_folder_ham', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'ham folder'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_spam_api',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_spam_api', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'SpamTitan API URL'

api/setup/tables_current.inc.php

Spacing +304 added lines, -304 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(),
-		'uc' => array(array('fs_id','prop_namespace','prop_name'))
+		'uc' => array(array('fs_id', 'prop_namespace', 'prop_name'))
 	),
 	'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,51 +407,51 @@ 
 	),
 	'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_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_further_identities' => array('type' => 'int','precision' => '1','nullable' => False,'default' => '1','comment' => '0=no, 1=yes, 2=only matching aliases'),
-			'acc_folder_ham' => array('type' => 'varchar','precision' => '128','comment' => 'ham folder'),
-			'acc_spam_api' => array('type' => 'varchar','precision' => '128','comment' => 'SpamTitan API URL')
+			'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_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_further_identities' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes, 2=only matching aliases'),
+			'acc_folder_ham' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'ham folder'),
+			'acc_spam_api' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'SpamTitan API URL')
 		),
 		'pk' => array('acc_id'),
 		'fk' => array(),
@@ -460,29 +460,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(),
@@ -491,24 +491,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()
 	)
 );

admin/inc/class.admin_mail.inc.php

Spacing +87 added lines, -87 removed lines

@@ -89,7 +89,7 @@ 
 	 * @var array
 	 */
 	public static $ssl_types = array(
-		self::SSL_TLS => 'TLS',	// SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
+		self::SSL_TLS => 'TLS', // SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
 		self::SSL_SSL => 'SSL',
 		self::SSL_STARTTLS => 'STARTTLS',
 		'no' => 'no',
@@ -102,7 +102,7 @@ 
 	public static $ssl2secure = array(
 		'SSL' => 'ssl',
 		'STARTTLS' => 'tls',
-		'TLS' => 'tlsv1',	// SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
+		'TLS' => 'tlsv1', // SSL with minimum TLS (no SSL v.2 or v.3), requires Horde_Imap_Client-2.16.0/Horde_Socket_Client-1.1.0
 	);
 	/**
 	 * Convert ssl-type to eMailAdmin acc_(imap|sieve|smtp)_ssl integer value
@@ -179,7 +179,7 @@ 
 	 * @param array $content
 	 * @param type $msg
 	 */
-	public function add(array $content=array(), $msg='', $msg_type='success')
+	public function add(array $content = array(), $msg = '', $msg_type = 'success')
 	{
 		// otherwise we cant switch to ckeditor in edit
 		Api\Html\CkEditorConfig::set_csp_script_src_attrs();
@@ -219,7 +219,7 @@ 
 		if ($content['button'] && key($content['button']) == 'skip_imap')
 		{
 			unset($content['button']);
-			if (!isset($content['acc_smtp_host'])) $content['acc_smtp_host'] = '';	// do manual mode right away
+			if (!isset($content['acc_smtp_host'])) $content['acc_smtp_host'] = ''; // do manual mode right away
 			return $this->smtp($content, lang('Skipping IMAP configuration!'));
 		}
 		$content['output'] = '';
@@ -233,7 +233,7 @@ 
 		if (!empty($content['acc_imap_host']))
 		{
 			$hosts = array($content['acc_imap_host'] => true);
-			if ($content['acc_imap_port'] > 0 && !in_array($content['acc_imap_port'], array(143,993)))
+			if ($content['acc_imap_port'] > 0 && !in_array($content['acc_imap_port'], array(143, 993)))
 			{
 				$ssl_type = (string)array_search($content['acc_imap_ssl'], self::$ssl2type);
 				if ($ssl_type === '') $ssl_type = 'insecure';
@@ -247,7 +247,7 @@ 
 			$content['ispdb'] = $ispdb;
 			$content['output'] .= lang('Using data from Mozilla ISPDB for provider %1', $ispdb['displayName'])."\n";
 			$hosts = array();
-			foreach($ispdb['imap'] as $server)
+			foreach ($ispdb['imap'] as $server)
 			{
 				if (!isset($hosts[$server['hostname']]))
 				{
@@ -271,13 +271,13 @@ 
 		}
 
 		// iterate over all hosts and try to connect
-		foreach($hosts as $host => $data)
+		foreach ($hosts as $host => $data)
 		{
 			$content['acc_imap_host'] = $host;
 			// by default we check SSL, STARTTLS and at last an insecure connection
 			if (!is_array($data)) $data = array('TLS' => 993, 'SSL' => 993, 'STARTTLS' => 143, 'insecure' => 143);
 
-			foreach($data as $ssl => $port)
+			foreach ($data as $ssl => $port)
 			{
 				if ($ssl === 'username') continue;
 
@@ -302,17 +302,17 @@ 
 					$content['connected'] = $connected = true;
 					break 2;
 				}
-				catch(Horde_Imap_Client_Exception $e)
+				catch (Horde_Imap_Client_Exception $e)
 				{
-					switch($e->getCode())
+					switch ($e->getCode())
 					{
 						case Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED:
 							$content['output'] .= "\n".$e->getMessage()."\n";
-							break 3;	// no need to try other SSL or non-SSL connections, if auth failed
+							break 3; // no need to try other SSL or non-SSL connections, if auth failed
 
 						case Horde_Imap_Client_Exception::SERVER_CONNECT:
 							$content['output'] .= "\n".$e->getMessage()."\n";
-							if ($ssl == 'STARTTLS') break 2;	// no need to try insecure connection on same port
+							if ($ssl == 'STARTTLS') break 2; // no need to try insecure connection on same port
 							break;
 
 						default:
@@ -321,7 +321,7 @@ 
 					}
 					if (self::$debug) _egw_log_exception($e);
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					$content['output'] .= "\n".get_class($e).': '.$e->getMessage().' ('.$e->getCode().')'."\n";
 					//$content['output'] .= $e->getTraceAsString()."\n";
 					if (self::$debug) _egw_log_exception($e);
@@ -337,7 +337,7 @@ 
 		// add validation error, if we can identify a field
 		if (!$connected && $e instanceof Horde_Imap_Client_Exception)
 		{
-			switch($e->getCode())
+			switch ($e->getCode())
 			{
 				case Horde_Imap_Client_Exception::LOGIN_AUTHENTICATIONFAILED:
 					Etemplate::set_validation_error('acc_imap_username', lang($e->getMessage()));
@@ -363,13 +363,13 @@ 
 	 * @param string $msg =''
 	 * @param Horde_Imap_Client_Socket $imap =null
 	 */
-	public function folder(array $content, $msg='', Horde_Imap_Client_Socket $imap=null)
+	public function folder(array $content, $msg = '', Horde_Imap_Client_Socket $imap = null)
 	{
 		if (isset($content['button']))
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'back':
 					return $this->add($content);
@@ -379,7 +379,7 @@ 
 			}
 		}
 		$content['msg'] = $msg;
-		if (!isset($imap)) $imap = self::imap_client ($content);
+		if (!isset($imap)) $imap = self::imap_client($content);
 
 		try {
 			//_debug_array($content);
@@ -388,7 +388,7 @@ 
 					$sel_options['acc_folder_junk'] = $sel_options['acc_folder_archive'] =
 						$sel_options['acc_folder_ham'] = self::mailboxes($imap, $content);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			$content['msg'] = $e->getMessage();
 			if (self::$debug) _egw_log_exception($e);
 		}
@@ -405,27 +405,27 @@ 
 	 * @return array with folders as key AND value
 	 * @throws Horde_Imap_Client_Exception
 	 */
-	public static function mailboxes(Horde_Imap_Client_Socket $imap, array &$content=null)
+	public static function mailboxes(Horde_Imap_Client_Socket $imap, array &$content = null)
 	{
 		// query all subscribed mailboxes
 		$mailboxes = $imap->listMailboxes('*', Horde_Imap_Client::MBOX_SUBSCRIBED, array(
 			'special_use' => true,
-			'attributes' => true,	// otherwise special_use is only queried, but not returned ;-)
+			'attributes' => true, // otherwise special_use is only queried, but not returned ;-)
 			'delimiter' => true,
 		));
 		//_debug_array($mailboxes);
 		// list mailboxes by special-use attributes
 		$folders = $attributes = $all = array();
-		foreach($mailboxes as $mailbox => $data)
+		foreach ($mailboxes as $mailbox => $data)
 		{
-			foreach($data['attributes'] as $attribute)
+			foreach ($data['attributes'] as $attribute)
 			{
 				$attributes[$attribute][] = $mailbox;
 			}
 			$folders[$mailbox] = $mailbox.': '.implode(', ', $data['attributes']);
 		}
 		// pre-select send, trash, ... folder for user, by checking special-use attributes or common name(s)
-		foreach(array(
+		foreach (array(
 			'acc_folder_sent'  => array('\\sent', 'sent'),
 			'acc_folder_trash' => array('\\trash', 'trash'),
 			'acc_folder_draft' => array('\\drafts', 'drafts'),
@@ -438,7 +438,7 @@ 
 			// first check special-use attributes
 			if (($special_use = array_shift($common_names)))
 			{
-				foreach((array)$attributes[$special_use] as $mailbox)
+				foreach ((array)$attributes[$special_use] as $mailbox)
 				{
 					if (empty($content[$name]) || strlen($mailbox) < strlen($content[$name]))
 					{
@@ -449,7 +449,7 @@ 
 			// no special use folder found, try common names
 			if (empty($content[$name]))
 			{
-				foreach($mailboxes as $mailbox => $data)
+				foreach ($mailboxes as $mailbox => $data)
 				{
 					$delimiter = !empty($data['delimiter']) ? $data['delimiter'] : '.';
 					$name_parts = explode($delimiter, strtolower($mailbox));
@@ -476,7 +476,7 @@ 
 	 * @param array $content
 	 * @param string $msg =''
 	 */
-	public function sieve(array $content, $msg='')
+	public function sieve(array $content, $msg = '')
 	{
 		static $sieve_ssl2port = array(
 			self::SSL_TLS => 5190,
@@ -490,7 +490,7 @@ 
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'back':
 					return $this->folder($content);
@@ -539,9 +539,9 @@ 
 			{
 				$data = $sieve_ssl2port;
 			}
-			foreach($data as $ssl => $ports)
+			foreach ($data as $ssl => $ports)
 			{
-				foreach((array)$ports as $port)
+				foreach ((array)$ports as $port)
 				{
 					$content['acc_sieve_ssl'] = $ssl;
 					$ssl_label = self::$ssl_types[$ssl];
@@ -559,7 +559,7 @@ 
 						));
 						// connect to sieve server
 						$sieve->connect();
-						$content['sieve_output'] .= "\n".lang('Successful connected to %1 server%2.', 'Sieve','');
+						$content['sieve_output'] .= "\n".lang('Successful connected to %1 server%2.', 'Sieve', '');
 						// and log in
 						$sieve->login($content['acc_imap_username'], $content['acc_imap_password']);
 						$content['sieve_output'] .= ' '.lang('and logged in')."\n";
@@ -569,10 +569,10 @@ 
 						return $this->smtp($content, lang('Successful connected to %1 server%2.', 'Sieve',
 							' '.lang('and logged in')));
 					}
-					catch(Horde\ManageSieve\Exception\ConnectionFailed $e) {
+					catch (Horde\ManageSieve\Exception\ConnectionFailed $e) {
 						$content['sieve_output'] .= "\n".$e->getMessage().' '.$e->details."\n";
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						$content['sieve_output'] .= "\n".get_class($e).': '.$e->getMessage().
 							($e->details ? ' '.$e->details : '').' ('.$e->getCode().')'."\n";
 						$content['sieve_output'] .= $e->getTraceAsString()."\n";
@@ -590,7 +590,7 @@ 
 		// add validation error, if we can identify a field
 		if (!$content['sieve_connected'] && $e instanceof Exception)
 		{
-			switch($e->getCode())
+			switch ($e->getCode())
 			{
 				case 61:	// connection refused
 				case 60:	// connection timed out (imap.googlemail.com returns that for none-ssl/4190/2000)
@@ -613,7 +613,7 @@ 
 	 * @param array $content
 	 * @param string $msg =''
 	 */
-	public function smtp(array $content, $msg='')
+	public function smtp(array $content, $msg = '')
 	{
 		static $smtp_ssl2port = array(
 			self::SSL_NONE => 25,
@@ -627,7 +627,7 @@ 
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'back':
 					return $this->sieve($content);
@@ -668,11 +668,11 @@ 
 					);
 				}
 			}
-			elseif($content['ispdb'] && !empty($content['ispdb']['smtp']))
+			elseif ($content['ispdb'] && !empty($content['ispdb']['smtp']))
 			{
 				$content['smtp_output'] .= lang('Using data from Mozilla ISPDB for provider %1', $content['ispdb']['displayName'])."\n";
 				$hosts = array();
-				foreach($content['ispdb']['smtp'] as $server)
+				foreach ($content['ispdb']['smtp'] as $server)
 				{
 					if (!isset($hosts[$server['hostname']]))
 					{
@@ -694,14 +694,14 @@ 
 			{
 				$hosts = $this->guess_hosts($content['ident_email'], 'smtp');
 			}
-			foreach($hosts as $host => $data)
+			foreach ($hosts as $host => $data)
 			{
 				$content['acc_smtp_host'] = $host;
 				if (!is_array($data))
 				{
 					$data = array('TLS' => 465, 'SSL' => 465, 'STARTTLS' => 587, '' => 25);
 				}
-				foreach($data as $ssl => $port)
+				foreach ($data as $ssl => $port)
 				{
 					if ($ssl === 'username') continue;
 
@@ -712,7 +712,7 @@ 
 						$content['smtp_output'] .= "\n".Api\DateTime::to('now', 'H:i:s').": Trying $ssl connection to $host:$port ...\n";
 						$content['acc_smtp_port'] = $port;
 
-						$mail = new Horde_Mail_Transport_Smtphorde($params=array(
+						$mail = new Horde_Mail_Transport_Smtphorde($params = array(
 							'username' => $content['acc_smtp_username'],
 							'password' => $content['acc_smtp_password'],
 							'host' => $content['acc_smtp_host'],
@@ -752,9 +752,9 @@ 
 					}
 					// unfortunately LOGIN_AUTHENTICATIONFAILED and SERVER_CONNECT are thrown as Horde_Mail_Exception
 					// while others are thrown as Horde_Smtp_Exception --> using common base Horde_Exception_Wrapped
-					catch(Horde_Exception_Wrapped $e)
+					catch (Horde_Exception_Wrapped $e)
 					{
-						switch($e->getCode())
+						switch ($e->getCode())
 						{
 							case Horde_Smtp_Exception::LOGIN_AUTHENTICATIONFAILED:
 							case Horde_Smtp_Exception::LOGIN_REQUIREAUTHENTICATION:
@@ -770,14 +770,14 @@ 
 						}
 						if (self::$debug) _egw_log_exception($e);
 					}
-					catch(Horde_Smtp_Exception $e)
+					catch (Horde_Smtp_Exception $e)
 					{
 						// prever $e->details over $e->getMessage() as it contains original message from SMTP server (eg. relay access denied)
 						$content['smtp_output'] .= "\n".(empty($e->details) ? $e->getMessage().' ('.$e->getCode().')' : $e->details)."\n";
 						//$content['smtp_output'] .= $e->getTraceAsString()."\n";
 						if (self::$debug) _egw_log_exception($e);
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						$content['smtp_output'] .= "\n".get_class($e).': '.$e->getMessage().' ('.$e->getCode().')'."\n";
 						//$content['smtp_output'] .= $e->getTraceAsString()."\n";
 						if (self::$debug) _egw_log_exception($e);
@@ -788,7 +788,7 @@ 
 		// add validation error, if we can identify a field
 		if (!$content['smtp_connected'] && $e instanceof Horde_Exception_Wrapped)
 		{
-			switch($e->getCode())
+			switch ($e->getCode())
 			{
 				case Horde_Smtp_Exception::LOGIN_AUTHENTICATIONFAILED:
 				case Horde_Smtp_Exception::LOGIN_REQUIREAUTHENTICATION:
@@ -822,14 +822,14 @@ 
 	 * @param string $msg =''
 	 * @param string $msg_type ='success'
 	 */
-	public function edit(array $content=null, $msg='', $msg_type='success')
+	public function edit(array $content = null, $msg = '', $msg_type = 'success')
 	{
 		// app is trying to tell something, while redirecting to wizard
-		if (empty($content) && $_GET['acc_id'] && empty($msg) && !empty( $_GET['msg']))
+		if (empty($content) && $_GET['acc_id'] && empty($msg) && !empty($_GET['msg']))
 		{
-			if (stripos($_GET['msg'],'fatal error:')!==false || $_GET['msg_type'] == 'error') $msg_type = 'error';
+			if (stripos($_GET['msg'], 'fatal error:') !== false || $_GET['msg_type'] == 'error') $msg_type = 'error';
 		}
-		if ($content['acc_id'] || (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0) ) Mail::unsetCachedObjects($content['acc_id']?$content['acc_id']:$_GET['acc_id']);
+		if ($content['acc_id'] || (isset($_GET['acc_id']) && (int)$_GET['acc_id'] > 0)) Mail::unsetCachedObjects($content['acc_id'] ? $content['acc_id'] : $_GET['acc_id']);
 		$tpl = new Etemplate('admin.mailaccount');
 
 		if (!is_array($content) || !empty($content['acc_id']) && isset($content['old_acc_id']) && $content['acc_id'] != $content['old_acc_id'])
@@ -844,7 +844,7 @@ 
 					list($content['acc_id']) = each($content['accounts']);
 					//error_log(__METHOD__.__LINE__.'.'.array2string($content['acc_id']));
 					// test if the "to be selected" acccount is imap or not
-					if (count($content['accounts'])>1 && Mail\Account::is_multiple($content['acc_id']))
+					if (count($content['accounts']) > 1 && Mail\Account::is_multiple($content['acc_id']))
 					{
 						try {
 							$account = Mail\Account::read($content['acc_id'], $content['called_for']);
@@ -855,7 +855,7 @@ 
 								//error_log(__METHOD__.__LINE__.'.'.array2string($content['acc_id']));
 							}
 						}
-						catch(Api\Exception\NotFound $e) {
+						catch (Api\Exception\NotFound $e) {
 							if (self::$debug) _egw_log_exception($e);
 						}
 					}
@@ -878,7 +878,7 @@ 
 				try {
 					$account = Mail\Account::read($content['acc_id'], $this->is_admin && $content['called_for'] ?
 						$content['called_for'] : $GLOBALS['egw_info']['user']['account_id']);
-					$account->getUserData();	// quota, aliases, forwards etc.
+					$account->getUserData(); // quota, aliases, forwards etc.
 					$content += $account->params;
 					$content['acc_sieve_enabled'] = (string)($content['acc_sieve_enabled']);
 					$content['notify_use_default'] = !$content['notify_account_id'];
@@ -889,16 +889,16 @@ 
 					$content['std_ident_id'] = $content['ident_id'];
 					$content['identities'][$content['std_ident_id']] = lang('Standard identity');
 					// change self::SSL_NONE (=0) to "no" used in sel_options
-					foreach(array('imap','smtp','sieve') as $type)
+					foreach (array('imap', 'smtp', 'sieve') as $type)
 					{
 						if (!$content['acc_'.$type.'_ssl']) $content['acc_'.$type.'_ssl'] = 'no';
 					}
 				}
-				catch(Api\Exception\NotFound $e) {
+				catch (Api\Exception\NotFound $e) {
 					if (self::$debug) _egw_log_exception($e);
 					Framework::window_close(lang('Account not found!'));
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					if (self::$debug) _egw_log_exception($e);
 					Framework::window_close($e->getMessage().' ('.get_class($e).': '.$e->getCode().')');
 				}
@@ -906,7 +906,7 @@ 
 			elseif ($content['acc_id'] === 'new')
 			{
 				$content['account_id'] = $content['called_for'];
-				$content['old_acc_id'] = $content['acc_id'];	// to not call add/wizard, if we return from to
+				$content['old_acc_id'] = $content['acc_id']; // to not call add/wizard, if we return from to
 				unset($content['tabs']);
 				return $this->add($content);
 			}
@@ -916,7 +916,7 @@ 
 		{
 			if (!isset($content['account_id'])) $content['account_id'] = array($GLOBALS['egw_info']['user']['account_id']);
 			$content['acc_user_editable'] = $content['acc_further_identities'] = true;
-			$readonlys['ident_id'] = true;	// need to create standard identity first
+			$readonlys['ident_id'] = true; // need to create standard identity first
 		}
 		if (empty($content['acc_name']))
 		{
@@ -957,7 +957,7 @@ 
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'wizard':
 					// if we just came from wizard, go back to last page/step
@@ -990,7 +990,7 @@ 
 						{
 							$content['ident_id'] = Mail\Account::save_identity(array(
 								'account_id' => $content['called_for'] ? $content['called_for'] : $GLOBALS['egw_info']['user']['account_id'],
-							)+$content);
+							) + $content);
 							$content['identities'][$content['ident_id']] = Mail\Account::identity_name($content);
 							$msg = lang('Identity saved.');
 							if ($edit_access) $msg .= ' '.lang('Switch back to standard identity to save account.');
@@ -1094,17 +1094,17 @@ 
 					catch (Horde_Imap_Client_Exception $e)
 					{
 						_egw_log_exception($e);
-						$tpl->set_validation_error('acc_imap_admin_username', $msg=lang($e->getMessage()).($e->details?', '.lang($e->details):''));
+						$tpl->set_validation_error('acc_imap_admin_username', $msg = lang($e->getMessage()).($e->details ? ', '.lang($e->details) : ''));
 						$msg_type = 'error';
-						$content['tabs'] = 'admin.mailaccount.imap';	// should happen automatic
+						$content['tabs'] = 'admin.mailaccount.imap'; // should happen automatic
 						break;
 					}
 					catch (Horde\ManageSieve\Exception\ConnectionFailed $e)
 					{
 						_egw_log_exception($e);
-						$tpl->set_validation_error('acc_sieve_port', $msg=lang($e->getMessage()));
+						$tpl->set_validation_error('acc_sieve_port', $msg = lang($e->getMessage()));
 						$msg_type = 'error';
-						$content['tabs'] = 'admin.mailaccount.sieve';	// should happen automatic
+						$content['tabs'] = 'admin.mailaccount.sieve'; // should happen automatic
 						break;
 					}
 					catch (Exception $e) {
@@ -1113,7 +1113,7 @@ 
 						$msg_type = 'error';
 					}
 					if ($content['acc_id']) Mail::unsetCachedObjects($content['acc_id']);
-					if (stripos($msg,'fatal error:')!==false) $msg_type = 'error';
+					if (stripos($msg, 'fatal error:') !== false) $msg_type = 'error';
 					Framework::refresh_opener($msg, 'emailadmin', $content['acc_id'], $new_account ? 'add' : 'update', null, null, null, $msg_type);
 					if ($button == 'save') Framework::window_close();
 					break;
@@ -1166,7 +1166,7 @@ 
 		if ($this->is_admin && (empty($content['acc_imap_username']) || empty($content['acc_imap_host']) || $content['called_for']))
 		{
 			// cant connection to imap --> allow free entries in taglists
-			foreach(array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
+			foreach (array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
 			{
 				$tpl->setElementAttribute($folder, 'allowFreeEntries', true);
 			}
@@ -1178,15 +1178,15 @@ 
 					$sel_options['acc_folder_draft'] = $sel_options['acc_folder_template'] =
 					$sel_options['acc_folder_junk'] = $sel_options['acc_folder_archive'] =
 					$sel_options['notify_folders'] = $sel_options['acc_folder_ham'] =
-						self::mailboxes(self::imap_client ($content));
+						self::mailboxes(self::imap_client($content));
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				if (self::$debug) _egw_log_exception($e);
 				// let user know what the problem is and that he can fix it using wizard or deleting
 				$msg = lang($e->getMessage())."\n\n".lang('You can use wizard to fix account settings or delete account.');
 				$msg_type = 'error';
 				// cant connection to imap --> allow free entries in taglists
-				foreach(array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
+				foreach (array('acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk') as $folder)
 				{
 					$tpl->setElementAttribute($folder, 'allowFreeEntries', true);
 				}
@@ -1259,7 +1259,7 @@ 
 			$content['acc_smtp_type'] == 'EGroupware\\Api\\Mail\\Smtp';
 		if ($readonlys['tabs']['admin.mailaccount.aliases'])
 		{
-			unset($sel_options['acc_further_identities'][2]);	// can limit identities to aliases without aliases ;-)
+			unset($sel_options['acc_further_identities'][2]); // can limit identities to aliases without aliases ;-)
 		}
 
 		// allow smtp class to disable certain features in alias tab
@@ -1298,7 +1298,7 @@ 
 		if ($content['called_for'] && $content['acc_id'] > 0)
 		{
 			$admin_actions = array();
-			foreach(Api\Hooks::process(array(
+			foreach (Api\Hooks::process(array(
 				'location' => 'emailadmin_edit',
 				'account_id' => $content['called_for'],
 				'acc_id' => $content['acc_id'],
@@ -1313,7 +1313,7 @@ 
 		//try to fix identities with no domain part set e.g. alias as identity
 		if (!strpos($content['ident_email'], '@'))
 		{
-			$content['ident_email'] = Mail::fixInvalidAliasAddress (Api\Accounts::id2name($content['acc_imap_account_id'], 'account_email'), $content['ident_email']);
+			$content['ident_email'] = Mail::fixInvalidAliasAddress(Api\Accounts::id2name($content['acc_imap_account_id'], 'account_email'), $content['ident_email']);
 		}
 
 		$tpl->exec(static::APP_CLASS.'edit', $content, $sel_options, $readonlys, $content, 2);
@@ -1325,7 +1325,7 @@ 
 	 * @param string|array &$account_id on return always array
 	 * @param boolean $back =false
 	 */
-	private static function fix_account_id_0(&$account_id=null, $back=false)
+	private static function fix_account_id_0(&$account_id = null, $back = false)
 	{
 		if (!isset($account_id)) return;
 
@@ -1333,7 +1333,7 @@ 
 		{
 			$account_id = explode(',', $account_id);
 		}
-		if (($k = array_search($back?'':'0', $account_id)) !== false)
+		if (($k = array_search($back ? '' : '0', $account_id)) !== false)
 		{
 			$account_id[$k] = $back ? '0' : '';
 		}
@@ -1346,7 +1346,7 @@ 
 	 * @param int $timeout =null default use value returned by Mail\Imap::getTimeOut()
 	 * @return Horde_Imap_Client_Socket
 	 */
-	protected static function imap_client(array $content, $timeout=null)
+	protected static function imap_client(array $content, $timeout = null)
 	{
 		return new Horde_Imap_Client_Socket(array(
 			'username' => $content['acc_imap_username'],
@@ -1368,7 +1368,7 @@ 
 	protected static function fix_ssl_order($data)
 	{
 		$ordered = array();
-		foreach(array_merge(array('TLS', 'SSL', 'STARTTLS'), array_keys($data)) as $key)
+		foreach (array_merge(array('TLS', 'SSL', 'STARTTLS'), array_keys($data)) as $key)
 		{
 			if (array_key_exists($key, $data)) $ordered[$key] = $data[$key];
 		}
@@ -1386,7 +1386,7 @@ 
 	 * @return array with values for keys 'displayName', 'imap', 'smtp', 'pop3', which each contain
 	 *	array of arrays with values for keys 'hostname', 'port', 'socketType'=(SSL|STARTTLS), 'username'=%EMAILADDRESS%
 	 */
-	protected static function mozilla_ispdb($domain, $try_mx=true)
+	protected static function mozilla_ispdb($domain, $try_mx = true)
 	{
 		if (strpos($domain, '@') !== false) list(,$domain) = explode('@', $domain);
 
@@ -1397,17 +1397,17 @@ 
 			$provider = array(
 				'displayName' => (string)$xml->emailProvider->displayName,
 			);
-			foreach($xml->emailProvider->children() as $tag => $server)
+			foreach ($xml->emailProvider->children() as $tag => $server)
 			{
 				if (!in_array($tag, array('incomingServer', 'outgoingServer'))) continue;
-				foreach($server->attributes() as $name => $value)
+				foreach ($server->attributes() as $name => $value)
 				{
 					if ($name == 'type') $type = (string)$value;
 				}
 				$data = array();
-				foreach($server as $name => $value)
+				foreach ($server as $name => $value)
 				{
-					foreach($value->children() as $tag => $val)
+					foreach ($value->children() as $tag => $val)
 					{
 						$data[$name][$tag] = (string)$val;
 					}
@@ -1416,7 +1416,7 @@ 
 				$provider[$type][] = $data;
 			}
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			// ignore own not-found exception or xml parsing execptions
 			unset($e);
 
@@ -1448,7 +1448,7 @@ 
 	 * @param string $type ='imap' 'imap' or 'smtp', used as hostname beside 'mail'
 	 * @return array of hostname => true pairs
 	 */
-	protected function guess_hosts($email, $type='imap')
+	protected function guess_hosts($email, $type = 'imap')
 	{
 		list(,$domain) = explode('@', $email);
 
@@ -1474,7 +1474,7 @@ 
 		}
 
 		// verify hosts in dns
-		foreach(array_keys($hosts) as $host)
+		foreach (array_keys($hosts) as $host)
 		{
 			if (!dns_get_record($host, DNS_A)) unset($hosts[$host]);
 		}
@@ -1511,12 +1511,12 @@ 
 				}
 
 				$ea_account = Mail\Account::read($emailadmin->acc_id, $_data['id']);
-				if (($userData = $ea_account->getUserData ()))
+				if (($userData = $ea_account->getUserData()))
 				{
 					$userData = array(
 						'acc_smtp_type' => $ea_account->acc_smtp_type,
 						'accountStatus' => $_data['status'],
-						'quotaLimit' => $_data['qouta']? $_data['qouta']: $userData['qoutaLimit'],
+						'quotaLimit' => $_data['qouta'] ? $_data['qouta'] : $userData['qoutaLimit'],
 						'mailLocalAddress' => $userData['mailLocalAddress']
 					);
 
@@ -1524,7 +1524,7 @@ 
 					{
 						$userData['mailLocalAddress'] = preg_replace('/@'.preg_quote($ea_account->acc_domain).'$/', '@'.$_data['domain'], $userData['mailLocalAddress']);
 
-						foreach($userData['mailAlternateAddress'] as &$alias)
+						foreach ($userData['mailAlternateAddress'] as &$alias)
 						{
 							$alias = preg_replace('/@'.preg_quote($ea_account->acc_domain).'$/', '@'.$_data['domain'], $alias);
 						}
@@ -1532,7 +1532,7 @@ 
 					// fullfill the saveUserData requirements
 					$userData += $ea_account->params;
 					$ea_account->saveUserData($_data['id'], $userData);
-					$msg = '#'.$_data['id'].' '.$account['account_fullname']. ' '.($userData['accountStatus'] == 'active'? lang('activated'):lang('deactivated'));
+					$msg = '#'.$_data['id'].' '.$account['account_fullname'].' '.($userData['accountStatus'] == 'active' ? lang('activated') : lang('deactivated'));
 				}
 				else
 				{