EGroupware / egroupware

doc/config2xet.php

Spacing +8 added lines, -8 removed lines

@@ -56,7 +56,7 @@ 
 			</columns>
 			<rows>
 ';
-foreach($trs[2] as $n => $tr)
+foreach ($trs[2] as $n => $tr)
 {
 	if (strpos($tr, '{title}') || strpos($tr, '<input type="submit"')) continue;
 
@@ -64,25 +64,25 @@ 
 	{
 		die("No td tags found in $n. tr: $tr");
 	}
-	if (($commented = !empty($trs[1][$n])? $trs[1][$n] : ''))
+	if (($commented = !empty($trs[1][$n]) ? $trs[1][$n] : ''))
 	{
 		echo "\t\t\t\t$commented\n";
 	}
 	echo "\t\t\t\t<row>\n";
-	foreach($tds[2] as $t => $td)
+	foreach ($tds[2] as $t => $td)
 	{
 		if (preg_match('|^\s*<([^ >]+)\s*([^/>]+)/?>(.*)\s*$|sui', $td, $matches))
 		{
 			$attrs = preg_match_all('|\s*([^=]+)="([^"]+)"|', $matches[2], $attrs) ?
 				array_combine($attrs[1], $attrs[2]) : array();
 
-			switch($matches[1])
+			switch ($matches[1])
 			{
 				case 'input':
 				case 'textarea':
 					echo "\t\t\t\t\t<textbox id=\"".$attrs['name'].'"';
 					unset($attrs['value'], $attrs['name']);
-					foreach($attrs as $name => $value)
+					foreach ($attrs as $name => $value)
 					{
 						if ($name == 'type' && $value == 'password') $value = 'passwd';
 						echo " $name=\"$value\"";
@@ -103,14 +103,14 @@ 
 				case 'select':
 					echo "\t\t\t\t\t<select id=\"".$attrs['name'].'"';
 					unset($attrs['name']);
-					foreach($attrs as $name => $value)
+					foreach ($attrs as $name => $value)
 					{
 						echo " $name=\"$value\"";
 					}
 					echo ">\n";
 					if (preg_match_all('|<option\s+value="([^"]*)"\s*({selected_[^}]+})?>(.*)</option>|Usui', $matches[3], $options))
 					{
-						foreach($options[3] as $i => $label)
+						foreach ($options[3] as $i => $label)
 						{
 							$label = preg_replace_callback('/{lang_([^}]+)}/', function($matches)
 							{
@@ -153,7 +153,7 @@ 
 			echo "/>\n";
 			if (!$commented && !empty($matches[3]) && trim($matches[3])) echo "\t\t\t\t\t<!-- ".trim($matches[3])." -->\n";
 		}
-		elseif(!$commented)
+		elseif (!$commented)
 		{
 			echo "\t\t\t\t\t<!-- ".trim($td)." -->\n";
 		}

doc/rpm-build/header.inc.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php
 // dummy setup file
-if (strpos($_SERVER['PHP_SELF'],'/setup/') === false)
+if (strpos($_SERVER['PHP_SELF'], '/setup/') === false)
 {
         header('Location: /egroupware/setup/');
         exit;

doc/ldap/nis2rfc2307bis.php

Spacing +19 added lines, -19 removed lines

@@ -21,8 +21,8 @@ 
  * @version $Id: class.accounts.inc.php 22048 2006-07-08 21:41:42Z ralfbecker $
  */
 
-if ($argc <= 1 || in_array($argv[1],array('-v','--help')) || $argv[1] == '--accounts-dn' && $argc <= 3|| 
-	!is_readable($file = $argv[$argc-1]))
+if ($argc <= 1 || in_array($argv[1], array('-v', '--help')) || $argv[1] == '--accounts-dn' && $argc <= 3 || 
+	!is_readable($file = $argv[$argc - 1]))
 {
 	if ($file)
 	{
@@ -32,7 +32,7 @@ 
 }
 
 $lines = file($file);
-foreach($lines as $l => $line)
+foreach ($lines as $l => $line)
 {
 	$lines[$l] = rtrim($line);
 }
@@ -42,23 +42,23 @@ 
 {
 	$group2account = $argv[2];
 }
-$parts = explode('/',$group2account);
+$parts = explode('/', $group2account);
 if (count($parts) != 4)
 {
 	die("Wrong format for --group2accounts-dn, use something like '/cn=[^,]+,ou=groups/ou=accounts/'\n");
 }
 $replace_with = $parts[2]; unset($parts[2]);
-$replace = implode('/',$parts);
+$replace = implode('/', $parts);
 
 $block = array();
 $i = 0;
-$lines[] = '';	// extra empty line, if none is behind the last block
-foreach($lines as $l => $line)
+$lines[] = ''; // extra empty line, if none is behind the last block
+foreach ($lines as $l => $line)
 {
 	if ($line)
 	{
-		@list($attr,$value) = explode(': ',$line,2);
-		switch($attr)
+		@list($attr, $value) = explode(': ', $line, 2);
+		switch ($attr)
 		{
 			case 'dn':
 				$dn = $value;
@@ -70,8 +70,8 @@ 
 				$structural = $value;
 				break;
 			case 'memberUid':
-				$member_dn = 'uid='.$value.','.preg_replace($replace,$replace_with,$dn);
-				if (!in_array('dn: '.$member_dn,$lines)) continue;	// member does not exist --> ignore him!
+				$member_dn = 'uid='.$value.','.preg_replace($replace, $replace_with, $dn);
+				if (!in_array('dn: '.$member_dn, $lines)) continue; // member does not exist --> ignore him!
 				$members[] = 'member: '.$member_dn;
 				// fall-through
 			default:
@@ -84,17 +84,17 @@ 
 	if (!$block) continue;
 
 	// got a complete block
-	if (in_array('posixGroup',$objectclasses))
+	if (in_array('posixGroup', $objectclasses))
 	{
-		switch($structural)
+		switch ($structural)
 		{
 			case 'namedObject':	// regular SuSE
-				unset($objectclasses[array_search('namedObject',$objectclasses)]);
+				unset($objectclasses[array_search('namedObject', $objectclasses)]);
 				// fall-through
 			case 'posixGroup':	// nis
 				$objectclasses[] = $structural = 'groupOfNames';
-				if (!$members) $members[] = 'member: '.$dn;	// member is a required attribute!
-				$data = array_merge($members,$data);
+				if (!$members) $members[] = 'member: '.$dn; // member is a required attribute!
+				$data = array_merge($members, $data);
 				break;
 			case 'groupOfNames':	// ok, already what we want
 				break;
@@ -102,14 +102,14 @@ 
 				die("\nposixGroup dn: $dn has as structrualObjectClass $structural, not posixGroup, namedObject or groupOfNames!\n");
 		}
 		$block = array('dn: '.$dn,);
-		foreach($objectclasses as $class)
+		foreach ($objectclasses as $class)
 		{
 			$block[] = 'objectClass: '.$class;
 		}
 		$block[] = 'structuralObjectClass: '.$class;
-		$block = array_merge($block,$data);
+		$block = array_merge($block, $data);
 	}
-	echo implode("\n",$block)."\n\n";
+	echo implode("\n", $block)."\n\n";
 
 	// process next block
 	$block = $objectclasses = $members = $data = array();

doc/fix_api.php

Spacing +15 added lines, -15 removed lines

@@ -17,7 +17,7 @@ 
 
 // raw replacements
 $add_use_api = array(
-	"#use EGroupware\\\\Api;\n#" => '',	// remove evtl. use EGroupware\Api, as we add it again below
+	"#use EGroupware\\\\Api;\n#" => '', // remove evtl. use EGroupware\Api, as we add it again below
 	"#<\?php\n+\s*/\*+?(.*)\*/#msU" => "<?php\n/**$1*/\n\nuse EGroupware\\Api;",
 );
 $replace = array(
@@ -46,7 +46,7 @@ 
 // enclose class-names and static methods with some syntax check
 $class_start = '#(?<!function)([\[\s,;().!=])';
 $class_end = '(::|\\(|\\)|;|\?|:|\\s|,|$)#';
-foreach(array(
+foreach (array(
 	'accounts' => 'Api\\Accounts',
 	'acl' => 'Api\\Acl',
 	'EGW_ACL_READ' => 'Api\\Acl::READ',
@@ -189,10 +189,10 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api($file, $dry_run=false)
+function fix_api($file, $dry_run = false)
 {
 	global $prog, $replace, $add_use_api;
-	if (basename($file) == $prog) return true;	// dont fix ourself ;-)
+	if (basename($file) == $prog) return true; // dont fix ourself ;-)
 
 	if (($content = $content_in = file_get_contents($file)) === false) return false;
 
@@ -203,12 +203,12 @@ 
 	}
 	$content2 = preg_replace(array_keys($replace), array_values($replace), $content);
 
-	if ($content2 == $content_in) return true;	// nothing changed
+	if ($content2 == $content_in) return true; // nothing changed
 
 	$content = preg_replace(array_keys($add_use_api), array_values($add_use_api), $content2);
 
 	// shorten some classes, if used, with further use declarations
-	foreach(array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
+	foreach (array('Api\\Etemplate', 'Api\\Vfs', 'Api\\Acl', 'Api\\Egw', 'Api\\Framework', 'Api\\Link') as $namespace)
 	{
 		if (strpos($content, $namespace) !== false && strpos($content, 'use EGroupware\\'.$namespace) === false)
 		{
@@ -247,11 +247,11 @@ 
  * @param boolean $dry_run =false true: only echo fixed file, not fix it
  * @return boolean false on error
  */
-function fix_api_recursive($dir, $dry_run=false)
+function fix_api_recursive($dir, $dry_run = false)
 {
 	if (!is_dir($dir)) return false;
 
-	foreach(scandir($dir) as $file)
+	foreach (scandir($dir) as $file)
 	{
 		if ($file == '.' || $file == '..') continue;
 
@@ -259,13 +259,13 @@ 
 		{
 			fix_api_recursive($dir.'/'.$file, $dry_run);
 		}
-		elseif(substr($file,-4) == '.php')
+		elseif (substr($file, -4) == '.php')
 		{
-			echo "\r".str_repeat(' ',100)."\r".$dir.'/'.$file.': ';
+			echo "\r".str_repeat(' ', 100)."\r".$dir.'/'.$file.': ';
 			fix_api($dir.'/'.$file, $dry_run);
 		}
 	}
-	echo "\r".str_repeat(' ',100)."\r";
+	echo "\r".str_repeat(' ', 100)."\r";
 	return true;
 }
 
@@ -274,7 +274,7 @@ 
  *
  * @param string $error =null
  */
-function usage($error=null)
+function usage($error = null)
 {
 	global $prog;
 	echo "Usage: $prog [-h|--help] [-d|--dry-run] file(s) or dir(s)\n\n";
@@ -288,9 +288,9 @@ 
 if (!$args) usage();
 
 $dry_run = false;
-while(($arg = array_shift($args)) && $arg[0] == '-')
+while (($arg = array_shift($args)) && $arg[0] == '-')
 {
-	switch($arg)
+	switch ($arg)
 	{
 		case '-h':
 		case '--help':
@@ -323,4 +323,4 @@ 
 		fix_api_recursive($arg, $dry_run);
 	}
 }
-while(($arg = array_shift($args)));
+while (($arg = array_shift($args)));

home/setup/tables_update.inc.php

Spacing +9 added lines, -9 removed lines

@@ -41,13 +41,13 @@ 
 	// Previously all portlets were together in a sub-array, for defaults they
 	// need to be moved to top level
 	$preferences = array();
-	foreach($GLOBALS['egw_setup']->db->select('egw_preferences','preference_owner,preference_app,preference_value',array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_preferences', 'preference_owner,preference_app,preference_value', array(
 		'preference_app' => 'home',
-	),__LINE__,__FILE__) as $row)
+	), __LINE__, __FILE__) as $row)
 	{
 		$preferences[] = $row;
 	}
-	foreach($preferences as $row)
+	foreach ($preferences as $row)
 	{
 		// The following replacement is required for PostgreSQL to work
 		$app = trim($row['preference_app']);
@@ -62,21 +62,21 @@ 
 			// Too old, skip it
 			continue;
 		}
-		if($values['portlets'] && is_array($values['portlets']))
+		if ($values['portlets'] && is_array($values['portlets']))
 		{
-			foreach($values['portlets'] as $id => $settings)
+			foreach ($values['portlets'] as $id => $settings)
 			{
 				$values["portlet_$id"] = $settings;
 			}
 			unset($values['portlets']);
 		}
 		$GLOBALS['egw_setup']->db->insert(
-			'egw_preferences',array(
+			'egw_preferences', array(
 				'preference_value' => json_encode($values),
-			),array(
+			), array(
 				'preference_owner' => $row['preference_owner'],
 				'preference_app'   => $app,
-			),__LINE__,__FILE__
+			), __LINE__, __FILE__
 		);
 	}
 
@@ -91,7 +91,7 @@ 
 function home_upgrade14_1_001()
 {
 	// rename "home-accounts" to "api-accounts"
-	foreach(array('link_app1', 'link_app2') as $col)
+	foreach (array('link_app1', 'link_app2') as $col)
 	{
 		$GLOBALS['egw_setup']->db->update('egw_links', array(
 				$col => 'api-accounts',

home/index.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
 );
 
 include('../header.inc.php');
-$GLOBALS['egw_info']['flags']['nonavbar']=false;
+$GLOBALS['egw_info']['flags']['nonavbar'] = false;
 
 // Home is treated specially, so a redirect won't work.
 $home = new home_ui();

emailadmin/setup/tables_current.inc.php

Spacing +101 added lines, -101 removed lines

@@ -15,96 +15,96 @@ 
 $phpgw_baseline = array(
 	'egw_emailadmin' => array(
 		'fd' => array(
-			'ea_profile_id' => array('type' => 'auto','nullable' => False,'comment' => 'the id of the profile; in programm its used as its negative counterpart'),
-			'ea_smtp_server' => array('type' => 'varchar','precision' => '80','comment' => 'smtp server name or ip-address'),
-			'ea_smtp_type' => array('type' => 'varchar','precision' => '56','comment' => 'smtp server type; designed to specify the corresponding php class to be used/loaded'),
-			'ea_smtp_port' => array('type' => 'int','precision' => '4','comment' => 'port to be used'),
-			'ea_smtp_auth' => array('type' => 'varchar','precision' => '3','comment' => 'multistate flag to indicate authentication required'),
-			'ea_editforwardingaddress' => array('type' => 'varchar','precision' => '3','comment' => 'yes/no flag to indicate if a user is allowed to edit its own forwardingaddresses; server side restrictions must be met, and a suitable smtp server type selected'),
-			'ea_smtp_ldap_server' => array('type' => 'varchar','precision' => '80','comment' => 'unused'),
-			'ea_smtp_ldap_basedn' => array('type' => 'varchar','precision' => '200','comment' => 'unused'),
-			'ea_smtp_ldap_admindn' => array('type' => 'varchar','precision' => '200','comment' => 'unused'),
-			'ea_smtp_ldap_adminpw' => array('type' => 'varchar','precision' => '30','comment' => 'unused'),
-			'ea_smtp_ldap_use_default' => array('type' => 'varchar','precision' => '3','comment' => 'unused'),
-			'ea_imap_server' => array('type' => 'varchar','precision' => '80','comment' => 'imap server name or ip address'),
-			'ea_imap_type' => array('type' => 'varchar','precision' => '56','comment' => 'imap server type, designed to specify the corresponding mail class to be loaded/used'),
-			'ea_imap_port' => array('type' => 'int','precision' => '4','comment' => 'imap server port'),
-			'ea_imap_login_type' => array('type' => 'varchar','precision' => '20','comment' => 'logintype to be used for authentication vs. the imap server, for this profile'),
-			'ea_imap_tsl_auth' => array('type' => 'varchar','precision' => '3','comment' => 'flag to indicate wether to use certificate validation; only affects secure connections'),
-			'ea_imap_tsl_encryption' => array('type' => 'varchar','precision' => '3','comment' => 'wether to use encryption 0=none, 1=STARTTLS, 2=TLS, 3=SSL'),
-			'ea_imap_enable_cyrus' => array('type' => 'varchar','precision' => '3','comment' => 'flag to indicate if we have some server/system integration for account/email management'),
-			'ea_imap_admin_user' => array('type' => 'varchar','precision' => '40','comment' => 'use this username for authentication on administrative purposes; or timed actions (sieve) for a user'),
-			'ea_imap_admin_pw' => array('type' => 'varchar','precision' => '40','comment' => 'use this password for authentication on administrative purposes; or timed actions (sieve) for a user'),
-			'ea_imap_enable_sieve' => array('type' => 'varchar','precision' => '3','comment' => 'flag to indicate that sieve support is assumed, and may be allowed to be utilized by the users affected by this profile'),
-			'ea_imap_sieve_server' => array('type' => 'varchar','precision' => '80','comment' => 'sieve server name or ip-address'),
-			'ea_imap_sieve_port' => array('type' => 'int','precision' => '4','comment' => 'sieve server port'),
-			'ea_description' => array('type' => 'varchar','precision' => '200','comment' => 'textual descriptor used for readable distinction of profiles'),
-			'ea_default_domain' => array('type' => 'varchar','precision' => '100','comment' => 'default domain string, used when vmailmanager is used as auth type for imap (also for smtp if auth is required)'),
-			'ea_organisation_name' => array('type' => 'varchar','precision' => '100','comment' => 'textual organization string, may be used in mail header'),
-			'ea_user_defined_identities' => array('type' => 'varchar','precision' => '3','comment' => 'yes/no flag to indicate if this profile is allowing the utiliszation of user defined identities'),
-			'ea_user_defined_accounts' => array('type' => 'varchar','precision' => '3','comment' => 'yes/no flag to indicate if this profile is allowing the utilization of user defined mail accounts'),
-			'ea_order' => array('type' => 'int','precision' => '4','comment' => 'helper to define the order of the profiles'),
-			'ea_appname' => array('type' => 'varchar','precision' => '80','comment' => 'appname the profile is to be used for; of no practical use, as of my knowledge, was designed to allow notification to use a specific profile'),
-			'ea_group' => array('type' => 'varchar','precision' => '80','comment' => 'the usergroup (primary) the given profile should be applied to','meta' => 'group'),
-			'ea_user' => array('type' => 'varchar','precision' => '80','comment' => 'the user the given profile should be applied to','meta' => 'user'),
-			'ea_active' => array('type' => 'int','precision' => '4','comment' => 'flag to indicate that a profile is active'),
-			'ea_smtp_auth_username' => array('type' => 'varchar','precision' => '128','comment' => 'depending on smtp auth type, use this username for authentication; may hold a semicolon separated emailaddress, to specify the emailaddress to be used on sending e.g.:username;email@address.nfo'),
-			'ea_smtp_auth_password' => array('type' => 'varchar','precision' => '80','comment' => 'depending on smtp auth type, the password to be used for authentication'),
-			'ea_user_defined_signatures' => array('type' => 'varchar','precision' => '3','comment' => 'flag to indicate, that this profile allows its users to edit and use own signatures (rights to preferences-app needed)'),
-			'ea_default_signature' => array('type' => 'text','comment' => 'the default signature (text or html)'),
-			'ea_imap_auth_username' => array('type' => 'varchar','precision' => '80','comment' => 'depending on the imap auth type use this username for authentication purposes'),
-			'ea_imap_auth_password' => array('type' => 'varchar','precision' => '80','comment' => 'depending on the imap auth type use this password for authentication purposes'),
-			'ea_stationery_active_templates' => array('type' => 'text','comment' => 'stationery templates available for the profile')
+			'ea_profile_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'the id of the profile; in programm its used as its negative counterpart'),
+			'ea_smtp_server' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'smtp server name or ip-address'),
+			'ea_smtp_type' => array('type' => 'varchar', 'precision' => '56', 'comment' => 'smtp server type; designed to specify the corresponding php class to be used/loaded'),
+			'ea_smtp_port' => array('type' => 'int', 'precision' => '4', 'comment' => 'port to be used'),
+			'ea_smtp_auth' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'multistate flag to indicate authentication required'),
+			'ea_editforwardingaddress' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'yes/no flag to indicate if a user is allowed to edit its own forwardingaddresses; server side restrictions must be met, and a suitable smtp server type selected'),
+			'ea_smtp_ldap_server' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'unused'),
+			'ea_smtp_ldap_basedn' => array('type' => 'varchar', 'precision' => '200', 'comment' => 'unused'),
+			'ea_smtp_ldap_admindn' => array('type' => 'varchar', 'precision' => '200', 'comment' => 'unused'),
+			'ea_smtp_ldap_adminpw' => array('type' => 'varchar', 'precision' => '30', 'comment' => 'unused'),
+			'ea_smtp_ldap_use_default' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'unused'),
+			'ea_imap_server' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'imap server name or ip address'),
+			'ea_imap_type' => array('type' => 'varchar', 'precision' => '56', 'comment' => 'imap server type, designed to specify the corresponding mail class to be loaded/used'),
+			'ea_imap_port' => array('type' => 'int', 'precision' => '4', 'comment' => 'imap server port'),
+			'ea_imap_login_type' => array('type' => 'varchar', 'precision' => '20', 'comment' => 'logintype to be used for authentication vs. the imap server, for this profile'),
+			'ea_imap_tsl_auth' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'flag to indicate wether to use certificate validation; only affects secure connections'),
+			'ea_imap_tsl_encryption' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'wether to use encryption 0=none, 1=STARTTLS, 2=TLS, 3=SSL'),
+			'ea_imap_enable_cyrus' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'flag to indicate if we have some server/system integration for account/email management'),
+			'ea_imap_admin_user' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'use this username for authentication on administrative purposes; or timed actions (sieve) for a user'),
+			'ea_imap_admin_pw' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'use this password for authentication on administrative purposes; or timed actions (sieve) for a user'),
+			'ea_imap_enable_sieve' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'flag to indicate that sieve support is assumed, and may be allowed to be utilized by the users affected by this profile'),
+			'ea_imap_sieve_server' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'sieve server name or ip-address'),
+			'ea_imap_sieve_port' => array('type' => 'int', 'precision' => '4', 'comment' => 'sieve server port'),
+			'ea_description' => array('type' => 'varchar', 'precision' => '200', 'comment' => 'textual descriptor used for readable distinction of profiles'),
+			'ea_default_domain' => array('type' => 'varchar', 'precision' => '100', 'comment' => 'default domain string, used when vmailmanager is used as auth type for imap (also for smtp if auth is required)'),
+			'ea_organisation_name' => array('type' => 'varchar', 'precision' => '100', 'comment' => 'textual organization string, may be used in mail header'),
+			'ea_user_defined_identities' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'yes/no flag to indicate if this profile is allowing the utiliszation of user defined identities'),
+			'ea_user_defined_accounts' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'yes/no flag to indicate if this profile is allowing the utilization of user defined mail accounts'),
+			'ea_order' => array('type' => 'int', 'precision' => '4', 'comment' => 'helper to define the order of the profiles'),
+			'ea_appname' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'appname the profile is to be used for; of no practical use, as of my knowledge, was designed to allow notification to use a specific profile'),
+			'ea_group' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'the usergroup (primary) the given profile should be applied to', 'meta' => 'group'),
+			'ea_user' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'the user the given profile should be applied to', 'meta' => 'user'),
+			'ea_active' => array('type' => 'int', 'precision' => '4', 'comment' => 'flag to indicate that a profile is active'),
+			'ea_smtp_auth_username' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'depending on smtp auth type, use this username for authentication; may hold a semicolon separated emailaddress, to specify the emailaddress to be used on sending e.g.:username;email@address.nfo'),
+			'ea_smtp_auth_password' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'depending on smtp auth type, the password to be used for authentication'),
+			'ea_user_defined_signatures' => array('type' => 'varchar', 'precision' => '3', 'comment' => 'flag to indicate, that this profile allows its users to edit and use own signatures (rights to preferences-app needed)'),
+			'ea_default_signature' => array('type' => 'text', 'comment' => 'the default signature (text or html)'),
+			'ea_imap_auth_username' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'depending on the imap auth type use this username for authentication purposes'),
+			'ea_imap_auth_password' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'depending on the imap auth type use this password for authentication purposes'),
+			'ea_stationery_active_templates' => array('type' => 'text', 'comment' => 'stationery templates available for the profile')
 		),
 		'pk' => array('ea_profile_id'),
 		'fk' => array(),
-		'ix' => array('ea_appname','ea_group'),
+		'ix' => array('ea_appname', 'ea_group'),
 		'uc' => array()
 	),
 	'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_smtp_host' => array('type' => 'varchar','precision' => '128','comment' => 'smtp hostname'),
-			'acc_smtp_ssl' => array('type' => 'int','precision' => '1','nullable' => False,'default' => '0','comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
-			'acc_smtp_port' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '25','comment' => 'smtp port'),
-			'acc_smtp_type' => array('type' => 'ascii','precision' => '32','default' => 'emailadmin_smtp','comment' => 'smtp class to use'),
-			'acc_imap_type' => array('type' => 'ascii','precision' => '32','default' => 'emailadmin_imap','comment' => 'imap class to use'),
-			'acc_imap_logintype' => array('type' => 'ascii','precision' => '20','comment' => 'standard, vmailmgr, admin, uidNumber'),
-			'acc_domain' => array('type' => 'varchar','precision' => '100','comment' => 'domain name'),
-			'acc_further_identities' => array('type' => 'bool','nullable' => False,'default' => '1','comment' => '0=no, 1=yes'),
-			'acc_user_editable' => array('type' => 'bool','nullable' => False,'default' => '1','comment' => '0=no, 1=yes'),
-			'acc_sieve_ssl' => array('type' => 'int','precision' => '1','default' => '1','comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
-			'acc_modified' => array('type' => 'timestamp','nullable' => False,'default' => 'current_timestamp'),
-			'acc_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'acc_smtp_auth_session' => array('type' => 'bool','comment' => '0=no, 1=yes, use username/pw from current user'),
-			'acc_folder_junk' => array('type' => 'varchar','precision' => '128','comment' => 'junk folder'),
-			'acc_imap_default_quota' => array('type' => 'int','precision' => '4','comment' => 'default quota, if no user specific one set'),
-			'acc_imap_timeout' => array('type' => 'int','precision' => '2','comment' => 'timeout for imap connection'),
-			'acc_user_forward' => array('type' => 'bool','default' => '0','comment' => 'allow user to define forwards')
+			'acc_id' => array('type' => 'auto', 'nullable' => False),
+			'acc_name' => array('type' => 'varchar', 'precision' => '80', 'comment' => 'description'),
+			'ident_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'standard identity'),
+			'acc_imap_host' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False, 'comment' => 'imap hostname'),
+			'acc_imap_ssl' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'default' => '0', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_imap_port' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '143', 'comment' => 'imap port'),
+			'acc_sieve_enabled' => array('type' => 'bool', 'default' => '0', 'comment' => 'sieve enabled'),
+			'acc_sieve_host' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'sieve host, default imap_host'),
+			'acc_sieve_port' => array('type' => 'int', 'precision' => '4', 'default' => '4190'),
+			'acc_folder_sent' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'sent folder'),
+			'acc_folder_trash' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'trash folder'),
+			'acc_folder_draft' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'draft folder'),
+			'acc_folder_template' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'template folder'),
+			'acc_smtp_host' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'smtp hostname'),
+			'acc_smtp_ssl' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'default' => '0', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_smtp_port' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '25', 'comment' => 'smtp port'),
+			'acc_smtp_type' => array('type' => 'ascii', 'precision' => '32', 'default' => 'emailadmin_smtp', 'comment' => 'smtp class to use'),
+			'acc_imap_type' => array('type' => 'ascii', 'precision' => '32', 'default' => 'emailadmin_imap', 'comment' => 'imap class to use'),
+			'acc_imap_logintype' => array('type' => 'ascii', 'precision' => '20', 'comment' => 'standard, vmailmgr, admin, uidNumber'),
+			'acc_domain' => array('type' => 'varchar', 'precision' => '100', 'comment' => 'domain name'),
+			'acc_further_identities' => array('type' => 'bool', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes'),
+			'acc_user_editable' => array('type' => 'bool', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes'),
+			'acc_sieve_ssl' => array('type' => 'int', 'precision' => '1', 'default' => '1', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_modified' => array('type' => 'timestamp', 'nullable' => False, 'default' => 'current_timestamp'),
+			'acc_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'acc_smtp_auth_session' => array('type' => 'bool', 'comment' => '0=no, 1=yes, use username/pw from current user'),
+			'acc_folder_junk' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'junk folder'),
+			'acc_imap_default_quota' => array('type' => 'int', 'precision' => '4', 'comment' => 'default quota, if no user specific one set'),
+			'acc_imap_timeout' => array('type' => 'int', 'precision' => '2', 'comment' => 'timeout for imap connection'),
+			'acc_user_forward' => array('type' => 'bool', 'default' => '0', 'comment' => 'allow user to define forwards')
 		),
 		'pk' => array('acc_id'),
 		'fk' => array(),
@@ -113,29 +113,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(),
@@ -144,24 +144,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()
 	)
 );

emailadmin/setup/tables_update.inc.php

Spacing +227 added lines, -227 removed lines

@@ -14,7 +14,7 @@ 
 
 function emailadmin_upgrade0_0_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','smtpType', array('type' => 'int', 'precision' => 4));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'smtpType', array('type' => 'int', 'precision' => 4));
 
 	return $setup_info['emailadmin']['currentver'] = '0.0.4';
 }
@@ -22,7 +22,7 @@ 
 
 function emailadmin_upgrade0_0_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','defaultDomain', array('type' => 'varchar', 'precision' => 100));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'defaultDomain', array('type' => 'varchar', 'precision' => 100));
 
 	return $setup_info['emailadmin']['currentver'] = '0.0.5';
 }
@@ -30,8 +30,8 @@ 
 
 function emailadmin_upgrade0_0_5()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','organisationName', array('type' => 'varchar', 'precision' => 100));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','userDefinedAccounts', array('type' => 'varchar', 'precision' => 3));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'organisationName', array('type' => 'varchar', 'precision' => 100));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'userDefinedAccounts', array('type' => 'varchar', 'precision' => 3));
 
 	return $setup_info['emailadmin']['currentver'] = '0.0.6';
 }
@@ -39,7 +39,7 @@ 
 
 function emailadmin_upgrade0_0_6()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','oldimapcclient',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'oldimapcclient', array(
 		'type' => 'varchar',
 		'precision' => '3'
 	));
@@ -50,7 +50,7 @@ 
 
 function emailadmin_upgrade0_0_007()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_emailadmin','oldimapcclient','imapoldcclient');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_emailadmin', 'oldimapcclient', 'imapoldcclient');
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '0.0.008';
 }
@@ -64,7 +64,7 @@ 
 
 function emailadmin_upgrade1_0_0()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','editforwardingaddress',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'editforwardingaddress', array(
 		'type' => 'varchar',
 		'precision' => '3'
 	));
@@ -75,7 +75,7 @@ 
 
 function emailadmin_upgrade1_0_1()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','ea_order', array('type' => 'int', 'precision' => 4));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'ea_order', array('type' => 'int', 'precision' => 4));
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.0.2';
 }
@@ -83,8 +83,8 @@ 
 
 function emailadmin_upgrade1_0_2()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','ea_appname', array('type' => 'varchar','precision' => '80'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin','ea_group', array('type' => 'varchar','precision' => '80'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'ea_appname', array('type' => 'varchar', 'precision' => '80'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_emailadmin', 'ea_group', array('type' => 'varchar', 'precision' => '80'));
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.0.3';
 }
@@ -92,7 +92,7 @@ 
 
 function emailadmin_upgrade1_0_3()
 {
-	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_emailadmin','egw_emailadmin');
+	$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_emailadmin', 'egw_emailadmin');
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.2';
 }
@@ -100,34 +100,34 @@ 
 
 function emailadmin_upgrade1_2()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','profileID','ea_profile_id');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpServer','ea_smtp_server');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpType','ea_smtp_type');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpPort','ea_smtp_port');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpAuth','ea_smtp_auth');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','editforwardingaddress','ea_editforwardingaddress');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpLDAPServer','ea_smtp_ldap_server');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpLDAPBaseDN','ea_smtp_ldap_basedn');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpLDAPAdminDN','ea_smtp_ldap_admindn');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpLDAPAdminPW','ea_smtp_ldap_adminpw');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','smtpLDAPUseDefault','ea_smtp_ldap_use_default');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapServer','ea_imap_server');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapType','ea_imap_type');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapPort','ea_imap_port');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapLoginType','ea_imap_login_type');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapTLSAuthentication','ea_imap_tsl_auth');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapTLSEncryption','ea_imap_tsl_encryption');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapEnableCyrusAdmin','ea_imap_enable_cyrus');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapAdminUsername','ea_imap_admin_user');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapAdminPW','ea_imap_admin_pw');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapEnableSieve','ea_imap_enable_sieve');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapSieveServer','ea_imap_sieve_server');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapSievePort','ea_imap_sieve_port');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','description','ea_description');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','defaultDomain','ea_default_domain');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','organisationName','ea_organisation_name');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','userDefinedAccounts','ea_user_defined_accounts');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin','imapoldcclient','ea_imapoldcclient');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'profileID', 'ea_profile_id');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpServer', 'ea_smtp_server');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpType', 'ea_smtp_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpPort', 'ea_smtp_port');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpAuth', 'ea_smtp_auth');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'editforwardingaddress', 'ea_editforwardingaddress');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpLDAPServer', 'ea_smtp_ldap_server');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpLDAPBaseDN', 'ea_smtp_ldap_basedn');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpLDAPAdminDN', 'ea_smtp_ldap_admindn');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpLDAPAdminPW', 'ea_smtp_ldap_adminpw');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'smtpLDAPUseDefault', 'ea_smtp_ldap_use_default');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapServer', 'ea_imap_server');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapType', 'ea_imap_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapPort', 'ea_imap_port');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapLoginType', 'ea_imap_login_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapTLSAuthentication', 'ea_imap_tsl_auth');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapTLSEncryption', 'ea_imap_tsl_encryption');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapEnableCyrusAdmin', 'ea_imap_enable_cyrus');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapAdminUsername', 'ea_imap_admin_user');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapAdminPW', 'ea_imap_admin_pw');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapEnableSieve', 'ea_imap_enable_sieve');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapSieveServer', 'ea_imap_sieve_server');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapSievePort', 'ea_imap_sieve_port');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'description', 'ea_description');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'defaultDomain', 'ea_default_domain');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'organisationName', 'ea_organisation_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'userDefinedAccounts', 'ea_user_defined_accounts');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_emailadmin', 'imapoldcclient', 'ea_imapoldcclient');
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.2.001';
 }
@@ -145,45 +145,45 @@ 
 		'type' => 'varchar',
 		'precision' => '80'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_emailadmin',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_emailadmin', array(
 		'fd' => array(
-			'ea_profile_id' => array('type' => 'auto','nullable' => False),
-			'ea_smtp_server' => array('type' => 'varchar','precision' => '80'),
-			'ea_smtp_type' => array('type' => 'int','precision' => '4'),
-			'ea_smtp_port' => array('type' => 'int','precision' => '4'),
-			'ea_smtp_auth' => array('type' => 'varchar','precision' => '3'),
-			'ea_editforwardingaddress' => array('type' => 'varchar','precision' => '3'),
-			'ea_smtp_ldap_server' => array('type' => 'varchar','precision' => '80'),
-			'ea_smtp_ldap_basedn' => array('type' => 'varchar','precision' => '200'),
-			'ea_smtp_ldap_admindn' => array('type' => 'varchar','precision' => '200'),
-			'ea_smtp_ldap_adminpw' => array('type' => 'varchar','precision' => '30'),
-			'ea_smtp_ldap_use_default' => array('type' => 'varchar','precision' => '3'),
-			'ea_imap_server' => array('type' => 'varchar','precision' => '80'),
-			'ea_imap_type' => array('type' => 'int','precision' => '4'),
-			'ea_imap_port' => array('type' => 'int','precision' => '4'),
-			'ea_imap_login_type' => array('type' => 'varchar','precision' => '20'),
-			'ea_imap_tsl_auth' => array('type' => 'varchar','precision' => '3'),
-			'ea_imap_tsl_encryption' => array('type' => 'varchar','precision' => '3'),
-			'ea_imap_enable_cyrus' => array('type' => 'varchar','precision' => '3'),
-			'ea_imap_admin_user' => array('type' => 'varchar','precision' => '40'),
-			'ea_imap_admin_pw' => array('type' => 'varchar','precision' => '40'),
-			'ea_imap_enable_sieve' => array('type' => 'varchar','precision' => '3'),
-			'ea_imap_sieve_server' => array('type' => 'varchar','precision' => '80'),
-			'ea_imap_sieve_port' => array('type' => 'int','precision' => '4'),
-			'ea_description' => array('type' => 'varchar','precision' => '200'),
-			'ea_default_domain' => array('type' => 'varchar','precision' => '100'),
-			'ea_organisation_name' => array('type' => 'varchar','precision' => '100'),
-			'ea_user_defined_accounts' => array('type' => 'varchar','precision' => '3'),
-			'ea_imapoldcclient' => array('type' => 'varchar','precision' => '3'),
-			'ea_order' => array('type' => 'int','precision' => '4'),
-			'ea_appname' => array('type' => 'varchar','precision' => '80'),
-			'ea_group' => array('type' => 'varchar','precision' => '80'),
-			'ea_smtp_auth_username' => array('type' => 'varchar','precision' => '80'),
-			'ea_smtp_auth_password' => array('type' => 'varchar','precision' => '80')
+			'ea_profile_id' => array('type' => 'auto', 'nullable' => False),
+			'ea_smtp_server' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_smtp_type' => array('type' => 'int', 'precision' => '4'),
+			'ea_smtp_port' => array('type' => 'int', 'precision' => '4'),
+			'ea_smtp_auth' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_editforwardingaddress' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_smtp_ldap_server' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_smtp_ldap_basedn' => array('type' => 'varchar', 'precision' => '200'),
+			'ea_smtp_ldap_admindn' => array('type' => 'varchar', 'precision' => '200'),
+			'ea_smtp_ldap_adminpw' => array('type' => 'varchar', 'precision' => '30'),
+			'ea_smtp_ldap_use_default' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_imap_server' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_imap_type' => array('type' => 'int', 'precision' => '4'),
+			'ea_imap_port' => array('type' => 'int', 'precision' => '4'),
+			'ea_imap_login_type' => array('type' => 'varchar', 'precision' => '20'),
+			'ea_imap_tsl_auth' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_imap_tsl_encryption' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_imap_enable_cyrus' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_imap_admin_user' => array('type' => 'varchar', 'precision' => '40'),
+			'ea_imap_admin_pw' => array('type' => 'varchar', 'precision' => '40'),
+			'ea_imap_enable_sieve' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_imap_sieve_server' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_imap_sieve_port' => array('type' => 'int', 'precision' => '4'),
+			'ea_description' => array('type' => 'varchar', 'precision' => '200'),
+			'ea_default_domain' => array('type' => 'varchar', 'precision' => '100'),
+			'ea_organisation_name' => array('type' => 'varchar', 'precision' => '100'),
+			'ea_user_defined_accounts' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_imapoldcclient' => array('type' => 'varchar', 'precision' => '3'),
+			'ea_order' => array('type' => 'int', 'precision' => '4'),
+			'ea_appname' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_group' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_smtp_auth_username' => array('type' => 'varchar', 'precision' => '80'),
+			'ea_smtp_auth_password' => array('type' => 'varchar', 'precision' => '80')
 		),
 		'pk' => array('ea_profile_id'),
 		'fk' => array(),
-		'ix' => array('ea_appname','ea_group'),
+		'ix' => array('ea_appname', 'ea_group'),
 		'uc' => array()
 	));
 
@@ -199,11 +199,11 @@ 
 
 function emailadmin_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_user_defined_signatures',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_user_defined_signatures', array(
 		'type' => 'varchar',
 		'precision' => '3'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_default_signature',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_default_signature', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
@@ -214,7 +214,7 @@ 
 
 function emailadmin_upgrade1_4_001()
 {
-    $GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_user_defined_identities',array(
+    $GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_user_defined_identities', array(
         'type' => 'varchar',
         'precision' => '3'
     ));
@@ -225,26 +225,26 @@ 
 
 function emailadmin_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_user',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_user', array(
 		'type' => 'varchar',
 		'precision' => '80'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_active',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_active', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
-	$GLOBALS['phpgw_setup']->oProc->query("UPDATE egw_emailadmin set ea_user='0', ea_active=1",__LINE__,__FILE__);
+	$GLOBALS['phpgw_setup']->oProc->query("UPDATE egw_emailadmin set ea_user='0', ea_active=1", __LINE__, __FILE__);
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.5.002';
 }
 
 
 function emailadmin_upgrade1_5_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_imap_auth_username',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_imap_auth_username', array(
 		'type' => 'varchar',
 		'precision' => '80'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_imap_auth_password',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_imap_auth_password', array(
 		'type' => 'varchar',
 		'precision' => '80'
 	));
@@ -266,7 +266,7 @@ 
 
 function emailadmin_upgrade1_6()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin','ea_default_signature',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin', 'ea_default_signature', array(
 		'type' => 'text'
 	));
 
@@ -275,32 +275,32 @@ 
 
 function emailadmin_upgrade1_6_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_stationery_active_templates',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin', 'ea_stationery_active_templates', array(
 		'type' => 'text'
 	));
 
-	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.8';	// was '1.7.003';
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.8'; // was '1.7.003';
 }
 
 function emailadmin_upgrade1_7_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin','ea_imap_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin', 'ea_imap_type', array(
 		'type' => 'varchar',
 		'precision' => 56,
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin','ea_smtp_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin', 'ea_smtp_type', array(
 		'type' => 'varchar',
 		'precision' => 56,
 	));
 	foreach (array('1'=>'defaultsmtp', '2'=>'postfixldap', '3'=>'postfixinetorgperson', '4'=>'smtpplesk', '5' =>'postfixdbmailuser') as $id => $newtype)
 	{
-		$GLOBALS['egw_setup']->oProc->query('update egw_emailadmin set ea_smtp_type=\''.$newtype.'\' where ea_smtp_type=\''.$id.'\'',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->query('update egw_emailadmin set ea_smtp_type=\''.$newtype.'\' where ea_smtp_type=\''.$id.'\'', __LINE__, __FILE__);
 	}
 	foreach (array('2'=>'defaultimap', '3'=>'cyrusimap', '4'=>'dbmailqmailuser', '5'=>'pleskimap', '6' =>'dbmaildbmailuser') as $id => $newtype)
 	{
-		$GLOBALS['egw_setup']->oProc->query('update egw_emailadmin set ea_imap_type=\''.$newtype.'\' where ea_imap_type=\''.$id.'\'',__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->query('update egw_emailadmin set ea_imap_type=\''.$newtype.'\' where ea_imap_type=\''.$id.'\'', __LINE__, __FILE__);
 	}
-	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001';	// was '1.7.004';
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.001'; // was '1.7.004';
 }
 
 function emailadmin_upgrade1_8()
@@ -317,52 +317,52 @@ 
 
 function emailadmin_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_emailadmin',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_emailadmin', array(
 		'fd' => array(
-				'ea_profile_id' => array('type' => 'auto','nullable' => False),
-				'ea_smtp_server' => array('type' => 'varchar','precision' => '80'),
-				'ea_smtp_type' => array('type' => 'varchar','precision' => '56'),
-				'ea_smtp_port' => array('type' => 'int','precision' => '4'),
-				'ea_smtp_auth' => array('type' => 'varchar','precision' => '3'),
-				'ea_editforwardingaddress' => array('type' => 'varchar','precision' => '3'),
-				'ea_smtp_ldap_server' => array('type' => 'varchar','precision' => '80'),
-				'ea_smtp_ldap_basedn' => array('type' => 'varchar','precision' => '200'),
-				'ea_smtp_ldap_admindn' => array('type' => 'varchar','precision' => '200'),
-				'ea_smtp_ldap_adminpw' => array('type' => 'varchar','precision' => '30'),
-				'ea_smtp_ldap_use_default' => array('type' => 'varchar','precision' => '3'),
-				'ea_imap_server' => array('type' => 'varchar','precision' => '80'),
-				'ea_imap_type' => array('type' => 'varchar','precision' => '56'),
-				'ea_imap_port' => array('type' => 'int','precision' => '4'),
-				'ea_imap_login_type' => array('type' => 'varchar','precision' => '20'),
-				'ea_imap_tsl_auth' => array('type' => 'varchar','precision' => '3'),
-				'ea_imap_tsl_encryption' => array('type' => 'varchar','precision' => '3'),
-				'ea_imap_enable_cyrus' => array('type' => 'varchar','precision' => '3'),
-				'ea_imap_admin_user' => array('type' => 'varchar','precision' => '40'),
-				'ea_imap_admin_pw' => array('type' => 'varchar','precision' => '40'),
-				'ea_imap_enable_sieve' => array('type' => 'varchar','precision' => '3'),
-				'ea_imap_sieve_server' => array('type' => 'varchar','precision' => '80'),
-				'ea_imap_sieve_port' => array('type' => 'int','precision' => '4'),
-				'ea_description' => array('type' => 'varchar','precision' => '200'),
-				'ea_default_domain' => array('type' => 'varchar','precision' => '100'),
-				'ea_organisation_name' => array('type' => 'varchar','precision' => '100'),
-				'ea_user_defined_identities' => array('type' => 'varchar','precision' => '3'),
-				'ea_user_defined_accounts' => array('type' => 'varchar','precision' => '3'),
-				'ea_order' => array('type' => 'int','precision' => '4'),
-				'ea_appname' => array('type' => 'varchar','precision' => '80'),
-				'ea_group' => array('type' => 'varchar','precision' => '80'),
-				'ea_user' => array('type' => 'varchar','precision' => '80'),
-				'ea_active' => array('type' => 'int','precision' => '4'),
-				'ea_smtp_auth_username' => array('type' => 'varchar','precision' => '80'),
-				'ea_smtp_auth_password' => array('type' => 'varchar','precision' => '80'),
-				'ea_user_defined_signatures' => array('type' => 'varchar','precision' => '3'),
+				'ea_profile_id' => array('type' => 'auto', 'nullable' => False),
+				'ea_smtp_server' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_smtp_type' => array('type' => 'varchar', 'precision' => '56'),
+				'ea_smtp_port' => array('type' => 'int', 'precision' => '4'),
+				'ea_smtp_auth' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_editforwardingaddress' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_smtp_ldap_server' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_smtp_ldap_basedn' => array('type' => 'varchar', 'precision' => '200'),
+				'ea_smtp_ldap_admindn' => array('type' => 'varchar', 'precision' => '200'),
+				'ea_smtp_ldap_adminpw' => array('type' => 'varchar', 'precision' => '30'),
+				'ea_smtp_ldap_use_default' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_imap_server' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_imap_type' => array('type' => 'varchar', 'precision' => '56'),
+				'ea_imap_port' => array('type' => 'int', 'precision' => '4'),
+				'ea_imap_login_type' => array('type' => 'varchar', 'precision' => '20'),
+				'ea_imap_tsl_auth' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_imap_tsl_encryption' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_imap_enable_cyrus' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_imap_admin_user' => array('type' => 'varchar', 'precision' => '40'),
+				'ea_imap_admin_pw' => array('type' => 'varchar', 'precision' => '40'),
+				'ea_imap_enable_sieve' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_imap_sieve_server' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_imap_sieve_port' => array('type' => 'int', 'precision' => '4'),
+				'ea_description' => array('type' => 'varchar', 'precision' => '200'),
+				'ea_default_domain' => array('type' => 'varchar', 'precision' => '100'),
+				'ea_organisation_name' => array('type' => 'varchar', 'precision' => '100'),
+				'ea_user_defined_identities' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_user_defined_accounts' => array('type' => 'varchar', 'precision' => '3'),
+				'ea_order' => array('type' => 'int', 'precision' => '4'),
+				'ea_appname' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_group' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_user' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_active' => array('type' => 'int', 'precision' => '4'),
+				'ea_smtp_auth_username' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_smtp_auth_password' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_user_defined_signatures' => array('type' => 'varchar', 'precision' => '3'),
 				'ea_default_signature' => array('type' => 'text'),
-				'ea_imap_auth_username' => array('type' => 'varchar','precision' => '80'),
-				'ea_imap_auth_password' => array('type' => 'varchar','precision' => '80'),
+				'ea_imap_auth_username' => array('type' => 'varchar', 'precision' => '80'),
+				'ea_imap_auth_password' => array('type' => 'varchar', 'precision' => '80'),
 				'ea_stationery_active_templates' => array('type' => 'text')
 		),
 		'pk' => array('ea_profile_id'),
 		'fk' => array(),
-		'ix' => array('ea_appname','ea_group'),
+		'ix' => array('ea_appname', 'ea_group'),
 		'uc' => array()
 	));
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.002';
@@ -371,13 +371,13 @@ 
 function emailadmin_upgrade1_9_002()
 {
 	// convert serialized stationery templates setting to eTemplate store style
-	foreach($GLOBALS['egw_setup']->db->query('SELECT ea_profile_id,ea_stationery_active_templates FROM egw_emailadmin
-		WHERE ea_stationery_active_templates IS NOT NULL',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT ea_profile_id,ea_stationery_active_templates FROM egw_emailadmin
+		WHERE ea_stationery_active_templates IS NOT NULL',__LINE__, __FILE__) as $row)
 	{
-		if(is_array(($templates=unserialize($row['ea_stationery_active_templates']))))
+		if (is_array(($templates = unserialize($row['ea_stationery_active_templates']))))
 		{
-			$GLOBALS['egw_setup']->db->query('UPDATE egw_emailadmin SET ea_stationery_active_templates="'.implode(',',$templates).'"'
-				.' WHERE ea_profile_id='.(int)$row['ea_profile_id'],__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->query('UPDATE egw_emailadmin SET ea_stationery_active_templates="'.implode(',', $templates).'"'
+				.' WHERE ea_profile_id='.(int)$row['ea_profile_id'], __LINE__, __FILE__);
 		}
 		unset($templates);
 	}
@@ -387,7 +387,7 @@ 
 
 function emailadmin_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin','ea_smtp_auth_username',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_emailadmin', 'ea_smtp_auth_username', array(
 		'type' => 'varchar',
 		'precision' => '128',
 	));
@@ -402,16 +402,16 @@ 
 
 function emailadmin_upgrade1_9_005()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_mailaccounts',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_mailaccounts', array(
 		'fd' => array(
-			'mail_id' => array('type' => 'auto','nullable' => False),
-			'account_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'mail_type' => array('type' => 'int','precision' => '1','nullable' => False,'comment' => '0=active, 1=alias, 2=forward, 3=forwardOnly, 4=quota'),
-			'mail_value' => array('type' => 'varchar','precision' => '128','nullable' => False)
+			'mail_id' => array('type' => 'auto', 'nullable' => False),
+			'account_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'mail_type' => array('type' => 'int', 'precision' => '1', 'nullable' => False, 'comment' => '0=active, 1=alias, 2=forward, 3=forwardOnly, 4=quota'),
+			'mail_value' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False)
 		),
 		'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()
 	));
 
@@ -421,34 +421,34 @@ 
 
 function emailadmin_upgrade1_9_006()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_ea_accounts',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('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' => 'varchar','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' => 'varchar','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_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' => 'varchar','precision' => '32','default' => 'emailadmin_smtp','comment' => 'smtp class to use'),
-			'acc_imap_type' => array('type' => 'varchar','precision' => '32','default' => 'emailadmin_imap','comment' => 'imap class to use'),
-			'acc_imap_logintype' => array('type' => 'varchar','precision' => '20','comment' => 'standard, vmailmgr, admin, uidNumber'),
-			'acc_domain' => array('type' => 'varchar','precision' => '100','comment' => 'domain name'),
-			'acc_further_identities' => array('type' => 'bool','nullable' => False,'default' => '1','comment' => '0=no, 1=yes'),
-			'acc_user_editable' => array('type' => 'bool','nullable' => False,'default' => '1','comment' => '0=no, 1=yes'),
-			'acc_sieve_ssl' => array('type' => 'int','precision' => '1','default' => '1','comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
-			'acc_modified' => array('type' => 'timestamp','nullable' => False,'default' => 'current_timestamp'),
-			'acc_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'acc_smtp_auth_session' => array('type' => 'bool','comment' => '0=no, 1=yes, use username/pw from current user')
+			'acc_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' => 'varchar', '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' => 'varchar', '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_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' => 'varchar', 'precision' => '32', 'default' => 'emailadmin_smtp', 'comment' => 'smtp class to use'),
+			'acc_imap_type' => array('type' => 'varchar', 'precision' => '32', 'default' => 'emailadmin_imap', 'comment' => 'imap class to use'),
+			'acc_imap_logintype' => array('type' => 'varchar', 'precision' => '20', 'comment' => 'standard, vmailmgr, admin, uidNumber'),
+			'acc_domain' => array('type' => 'varchar', 'precision' => '100', 'comment' => 'domain name'),
+			'acc_further_identities' => array('type' => 'bool', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes'),
+			'acc_user_editable' => array('type' => 'bool', 'nullable' => False, 'default' => '1', 'comment' => '0=no, 1=yes'),
+			'acc_sieve_ssl' => array('type' => 'int', 'precision' => '1', 'default' => '1', 'comment' => '0=none, 1=starttls, 2=tls, 3=ssl, &8=validate certificate'),
+			'acc_modified' => array('type' => 'timestamp', 'nullable' => False, 'default' => 'current_timestamp'),
+			'acc_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'acc_smtp_auth_session' => array('type' => 'bool', 'comment' => '0=no, 1=yes, use username/pw from current user')
 		),
 		'pk' => array('acc_id'),
 		'fk' => array(),
@@ -462,20 +462,20 @@ 
 
 function emailadmin_upgrade1_9_007()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_ea_credentials',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('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'))
 	));
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.008';
@@ -484,15 +484,15 @@ 
 
 function emailadmin_upgrade1_9_008()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_ea_identities',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('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_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')
 		),
 		'pk' => array('ident_id'),
 		'fk' => array(),
@@ -506,15 +506,15 @@ 
 
 function emailadmin_upgrade1_9_009()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_ea_valid',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('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'))
 	));
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.9.010';
@@ -545,7 +545,7 @@ 
 	// migrate personal felamimail accounts, identities and signatures
 	try {
 		$db = $GLOBALS['egw_setup']->db;
-		foreach($db->select('egw_emailadmin', '*', array('ea_active' => 1), __LINE__, __FILE__, false,
+		foreach ($db->select('egw_emailadmin', '*', array('ea_active' => 1), __LINE__, __FILE__, false,
 			// order general profiles first, then group profiles and user specific ones last
 			'ORDER BY ea_group IS NULL AND ea_user IS NULL DESC,ea_group IS NULL,ea_user', 'emailadmin') as $row)
 		{
@@ -586,7 +586,7 @@ 
 					'acc_imap_type' => emailadmin_account::getIcClass($row['ea_imap_type']),
 					'acc_imap_logintype' => $row['ea_imap_login_type'],
 					'acc_imap_host' => $row['ea_imap_server'],
-					'acc_imap_ssl' => $row['ea_imap_tsl_encryption'] | ($row['ea_imap_tsl_auth'] === 'yes' ? 8 : 0),
+					'acc_imap_ssl' => $row['ea_imap_tsl_encryption']|($row['ea_imap_tsl_auth'] === 'yes' ? 8 : 0),
 					'acc_imap_port' => $row['ea_imap_port'],
 					'acc_sieve_enabled' => $row['ea_imap_enable_sieve'] == 'yes',
 					'acc_sieve_host' => $row['ea_imap_sieve_server'],
@@ -602,7 +602,7 @@ 
 					'acc_smtp_port' => $row['ea_smtp_port'],
 					'acc_domain' => $row['ea_default_domain'],
 					'acc_further_identities' => $row['ea_user_defined_identities'] == 'yes' ||
-						$row['ea_user_defined_signatures'] == 'yes',	// both together are now called identities
+						$row['ea_user_defined_signatures'] == 'yes', // both together are now called identities
 					'acc_user_editable' => false,
 					'acc_smtp_auth_session' => $row['ea_smtp_auth'] == 'ann' ||
 						$row['ea_smtp_auth'] == 'yes' && empty($row['ea_smtp_auth_username']),
@@ -645,7 +645,7 @@ 
 		}
 		// ToDo: migrate all not yet via personal fmail profiles migrated signatures
 	}
-	catch(Exception $e) {
+	catch (Exception $e) {
 		// ignore all errors, eg. because FMail is not installed
 		echo "<p>".$e->getMessage()."</p>\n";
 	}
@@ -665,7 +665,7 @@ 
  * @param string $email optional email to be used to find matching account/identity with identical email or same domain
  * @return array with ident_* and acc_id
  */
-function emailadmin_std_identity($account_id, $email=null)
+function emailadmin_std_identity($account_id, $email = null)
 {
 	if ($email) list(, $domain) = explode('@', $email);
 	return $GLOBALS['egw_setup']->db->select('egw_ea_accounts', 'egw_ea_identities.*',
@@ -692,7 +692,7 @@ 
 	{
 		try {
 			// migrate real fmail accounts, but not yet identities (fm_ic_hostname is NULL)
-			foreach($db->select('egw_felamimail_accounts', '*', 'fm_ic_hostname IS NOT NULL', __LINE__, __FILE__, false, '', 'felamimail') as $row)
+			foreach ($db->select('egw_felamimail_accounts', '*', 'fm_ic_hostname IS NOT NULL', __LINE__, __FILE__, false, '', 'felamimail') as $row)
 			{
 				$prefs = new preferences($row['fm_owner']);
 				$all_prefs = $prefs->read_repository();
@@ -722,7 +722,7 @@ 
 					'acc_name' => $row['fm_emailaddress'],
 					'ident_id' => $ident_id,
 					'acc_imap_host' => $row['fm_ic_hostname'],
-					'acc_imap_ssl' => $row['fm_ic_encryption'] | ($row['fm_ic_validatecertificate'] ? 8 : 0),
+					'acc_imap_ssl' => $row['fm_ic_encryption']|($row['fm_ic_validatecertificate'] ? 8 : 0),
 					'acc_imap_port' => $row['fm_ic_port'],
 					'acc_sieve_enabled' => $row['fm_ic_enable_sieve'],
 					'acc_sieve_host' => $row['fm_ic_sieve_server'],
@@ -761,11 +761,11 @@ 
 			}
 
 			// migrate fmail identities (fm_ic_hostname is NULL), not real fmail account done above
-			foreach($db->select('egw_felamimail_accounts', '*', 'fm_ic_hostname IS NULL', __LINE__, __FILE__, false, '', 'felamimail') as $row)
+			foreach ($db->select('egw_felamimail_accounts', '*', 'fm_ic_hostname IS NULL', __LINE__, __FILE__, false, '', 'felamimail') as $row)
 			{
 				if (!($std_identity = emailadmin_std_identity($row['fm_owner'])))
 				{
-					continue;	// no account found to add identity to
+					continue; // no account found to add identity to
 				}
 				// create standard identity for account
 				$identity = array(
@@ -783,13 +783,13 @@ 
 
 			// migrate all not yet as standard-signatures migrated signatures to identities of first migrated fmail profile
 			// completing them with realname, email and org from standard-signature of given account
-			foreach($db->select('egw_felamimail_signatures', '*',
+			foreach ($db->select('egw_felamimail_signatures', '*',
 				"fm_signatureid NOT IN (SELECT fm_signatureid FROM egw_felamimail_accounts)",
 				__LINE__, __FILE__, false, '', 'felamimail') as $row)
 			{
 				if (!($std_identity = emailadmin_std_identity($row['fm_accountid'])))
 				{
-					continue;	// ignore signatures for whos owner (fm_accountid!) we have no personal profile
+					continue; // ignore signatures for whos owner (fm_accountid!) we have no personal profile
 				}
 				$identity = $std_identity; unset($identity['ident_id']);
 				$identity['ident_realname'] = $std_identity['ident_realname'].' ('.$row['fm_description'].')';
@@ -798,7 +798,7 @@ 
 				$db->insert('egw_ea_identities', $identity, false, __LINE__, __FILE__, 'emailadmin');
 			}
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			// ignore all errors, eg. because FMail is not installed
 			echo "<p>".$e->getMessage()."</p>\n";
 		}
@@ -808,17 +808,17 @@ 
 
 function emailadmin_upgrade1_9_015()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_folder_junk',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_folder_junk', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'junk folder'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_imap_default_quota',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_imap_default_quota', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'default quota, if no user specific one set'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_imap_timeout',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_imap_timeout', array(
 		'type' => 'int',
 		'precision' => '2',
 		'comment' => 'timeout for imap connection'
@@ -830,7 +830,7 @@ 
 
 function emailadmin_upgrade1_9_016()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_identities','ident_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_identities', 'ident_name', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'name of identity to display'
@@ -842,16 +842,16 @@ 
 
 function emailadmin_upgrade1_9_017()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_ea_notifications',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('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()
 	));
 
@@ -861,13 +861,13 @@ 
 
 function emailadmin_upgrade1_9_018()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_smtp_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_smtp_type', array(
 		'type' => 'varchar',
 		'precision' => '32',
 		'default' => 'emailadmin_smtp',
 		'comment' => 'smtp class to use'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_imap_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_imap_type', array(
 		'type' => 'varchar',
 		'precision' => '32',
 		'default' => 'emailadmin_imap',
@@ -886,15 +886,15 @@ 
 
 function emailadmin_upgrade14_1()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_ea_valid',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('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'))
 	));
 
 	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '14.2';
@@ -902,7 +902,7 @@ 
 
 function emailadmin_upgrade14_2()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_mailaccounts','mail_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_mailaccounts', 'mail_value', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
@@ -915,30 +915,30 @@ 
 
 function emailadmin_upgrade14_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_imap_host',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_imap_host', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
 		'comment' => 'imap hostname'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_sieve_host',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_sieve_host', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'sieve host, default imap_host'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_smtp_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_smtp_type', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'default' => 'emailadmin_smtp',
 		'comment' => 'smtp class to use'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_imap_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_imap_type', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'default' => 'emailadmin_imap',
 		'comment' => 'imap class to use'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts','acc_imap_logintype',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_accounts', 'acc_imap_logintype', array(
 		'type' => 'ascii',
 		'precision' => '20',
 		'comment' => 'standard, vmailmgr, admin, uidNumber'
@@ -954,7 +954,7 @@ 
  */
 function emailadmin_upgrade14_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_user_forward',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_user_forward', array(
 		'type' => 'bool',
 		'default' => '0',
 		'comment' => 'allow user to define forwards'

setup/inc/class.setup_detection.inc.php

Spacing +80 added lines, -80 removed lines

@@ -27,12 +27,12 @@ 
 	{
 		$setup_info = array();
 		$d = dir(EGW_SERVER_ROOT);
-		while($entry=$d->read())
+		while ($entry = $d->read())
 		{
-			if($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT . '/' . $entry))
+			if ($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT.'/'.$entry))
 			{
-				$f = EGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
-				if (@file_exists ($f))
+				$f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php';
+				if (@file_exists($f))
 				{
 					include($f);
 					$setup_info[$entry]['filename'] = $f;
@@ -52,17 +52,17 @@ 
 	 * @param array $setup_info
 	 * @return array $setup_info
 	 */
-	function get_db_versions($setup_info=null)
+	function get_db_versions($setup_info = null)
 	{
 		try {	// catch DB errors
 			$GLOBALS['egw_setup']->set_table_names();
 
-			if($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table),true))
+			if ($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table), true))
 			{
 				/* one of these tables exists. checking for post/pre beta version */
-				if($GLOBALS['egw_setup']->applications_table != 'applications')
+				if ($GLOBALS['egw_setup']->applications_table != 'applications')
 				{
-					foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__) as $row)
+					foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', false, __LINE__, __FILE__) as $row)
 					{
 						$app = $row['app_name'];
 						if (!isset($setup_info[$app]))	// app source no longer there
@@ -82,7 +82,7 @@ 
 					{
 						// new api, dont care about old pre egroupware stuff
 					}
-					elseif(!@$setup_info['phpgwapi']['currentver'])
+					elseif (!@$setup_info['phpgwapi']['currentver'])
 					{
 						$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
 						$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
@@ -101,9 +101,9 @@ 
 				}
 				else
 				{
-					foreach($GLOBALS['egw_setup']->db->query('select * from applications') as $row)
+					foreach ($GLOBALS['egw_setup']->db->query('select * from applications') as $row)
 					{
-						if($row['app_name'] == 'admin')
+						if ($row['app_name'] == 'admin')
 						{
 							$setup_info['phpgwapi']['currentver'] = $row['app_version'];
 						}
@@ -136,25 +136,25 @@ 
 	 * 	V	Version mismatch at end of upgrade (Not used, proposed only)
 	 * 	M	Missing files at start of upgrade (Not used, proposed only)
 	 */
-	function compare_versions($setup_info,$try_downgrade=false)
+	function compare_versions($setup_info, $try_downgrade = false)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			//echo '<br>'.$value['name'].'STATUS: '.$value['status'];
 			/* Only set this if it has not already failed to upgrade - Milosch */
-			if(!( (@$value['status'] == 'F') || (@$value['status'] == 'C') ))
+			if (!((@$value['status'] == 'F') || (@$value['status'] == 'C')))
 			{
 				//if ($setup_info[$key]['currentver'] > $setup_info[$key]['version'])
-				if(!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'],@$value['version']) ||
+				if (!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'], @$value['version']) ||
 					$value['version'] == 'deleted')
 				{
 					$setup_info[$key]['status'] = 'V';
 				}
-				elseif(@$value['currentver'] == @$value['version'])
+				elseif (@$value['currentver'] == @$value['version'])
 				{
 					$setup_info[$key]['status'] = 'C';
 				}
-				elseif($GLOBALS['egw_setup']->alessthanb(@$value['currentver'],@$value['version']))
+				elseif ($GLOBALS['egw_setup']->alessthanb(@$value['currentver'], @$value['version']))
 				{
 					$setup_info[$key]['status'] = 'U';
 				}
@@ -171,35 +171,35 @@ 
 	function check_depends($setup_info)
 	{
 		/* Run the list of apps */
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			/* Does this app have any depends */
-			if(isset($value['depends']))
+			if (isset($value['depends']))
 			{
 				/* If so find out which apps it depends on */
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					/* I set this to False until we find a compatible version of this app */
 					$setup_info['depends'][$depkey]['status'] = False;
 					/* Now we loop thru the versions looking for a compatible version */
 
-					foreach($depvalue['versions'] as $depsvalue)
+					foreach ($depvalue['versions'] as $depsvalue)
 					{
 						$currentver = $setup_info[$depvalue['appname']]['currentver'];
-						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver,0,6) == '0.9.99')
+						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver, 0, 6) == '0.9.99')
 						{
 							$currentver = '0.9.14.508';
 						}
 						$major = $GLOBALS['egw_setup']->get_major($currentver);
-						if ($major >= $depsvalue || $major == $depsvalue && substr($major,0,strlen($depsvalue)+1) == $depsvalue.'.')
+						if ($major >= $depsvalue || $major == $depsvalue && substr($major, 0, strlen($depsvalue) + 1) == $depsvalue.'.')
 						{
 							$setup_info['depends'][$depkey]['status'] = True;
 						}
 						else	// check if majors are equal and minors greater or equal
 						{
 							$major_depsvalue = $GLOBALS['egw_setup']->get_major($depsvalue);
-							$tmp = explode('.',$depsvalue); $minor_depsvalue = array_pop($tmp);
-							$tmp2 = explode('.',$currentver); $minor = array_pop($tmp2);
+							$tmp = explode('.', $depsvalue); $minor_depsvalue = array_pop($tmp);
+							$tmp2 = explode('.', $currentver); $minor = array_pop($tmp2);
 							if ($major == $major_depsvalue && $minor <= $minor_depsvalue)
 							{
 								$setup_info['depends'][$depkey]['status'] = True;
@@ -212,17 +212,17 @@ 
 				 Finally, we loop through the dependencies again to look for apps that still have a failure status
 				 If we find one, we set the apps overall status as a dependency failure.
 				*/
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if ($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
 							 */
-							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
+							if ($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
 							}
@@ -244,9 +244,9 @@ 
 	 */
 	function upgrade_exclude($setup_info)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
-			if(isset($value['no_mass_update']))
+			if (isset($value['no_mass_update']))
 			{
 				unset($setup_info[$key]);
 			}
@@ -261,24 +261,24 @@ 
 	 */
 	function check_header()
 	{
-		if(!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
+		if (!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One';
 			return '1';
 		}
 		else
 		{
-			if(!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
+			if (!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (No header admin password set)';
 				return '2';
 			}
-			elseif(!@isset($GLOBALS['egw_domain']))
+			elseif (!@isset($GLOBALS['egw_domain']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Add domains to your header.inc.php)';
 				return '3';
 			}
-			elseif(@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
+			elseif (@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Upgrade your header.inc.php)';
 				return '4';
@@ -295,7 +295,7 @@ 
 	 * @param array $setup_info =null default use $GLOBALS['setup_info']
 	 * @return int 1=no database, 3=empty, 4=need upgrade, 10=complete
 	 */
-	function check_db($setup_info=null)
+	function check_db($setup_info = null)
 	{
 		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
 
@@ -303,14 +303,14 @@ 
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
 			{
 				$old = error_reporting();
-				error_reporting($old & ~E_WARNING);	// no warnings
+				error_reporting($old&~E_WARNING); // no warnings
 				$GLOBALS['egw_setup']->db->connect();
 				error_reporting($old);
 
 				$GLOBALS['egw_setup']->set_table_names();
 			}
 		}
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			// ignore error
 		}
 
@@ -319,14 +319,14 @@ 
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
 			return 1;
 		}
-		if(!isset($setup_info['api']['currentver']))
+		if (!isset($setup_info['api']['currentver']))
 		{
 			$setup_info = $this->get_db_versions($setup_info);
 		}
 		// first check new api installed and up to date
 		if (isset($setup_info['api']['currentver']))
 		{
-			if($setup_info['api']['currentver'] == $setup_info['api']['version'])
+			if ($setup_info['api']['currentver'] == $setup_info['api']['version'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Tables Complete)';
 				return 10;
@@ -340,7 +340,7 @@ 
 		// then check old phpgwapi
 		elseif (isset($setup_info['phpgwapi']['currentver']))
 		{
-			if($setup_info['phpgwapi']['currentver'] == $setup_info['phpgwapi']['version'])
+			if ($setup_info['phpgwapi']['currentver'] == $setup_info['phpgwapi']['version'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Tables Complete)';
 				return 10;
@@ -375,14 +375,14 @@ 
 	 */
 	function check_config()
 	{
-		if(@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if (@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
 
 		try {	// catch db errors
-			foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,
-				'config_name,config_value',array('config_app' => 'phpgwapi'),__LINE__,__FILE__) as $row)
+			foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,
+				'config_name,config_value', array('config_app' => 'phpgwapi'), __LINE__, __FILE__) as $row)
 			{
 				$config[$row['config_name']] = $row['config_value'];
 			}
@@ -392,21 +392,21 @@ 
 			// ignore db errors
 		}
 		$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 2 (Needs Configuration)';
-		if(!count($config))
+		if (!count($config))
 		{
 			return 1;
 		}
-		$config_errors =& $GLOBALS['egw_info']['setup']['config_errors'];
+		$config_errors = & $GLOBALS['egw_info']['setup']['config_errors'];
 		$GLOBALS['egw_info']['setup']['config_errors'] = array();
 		$error_msg = null;
-		if (!$this->check_dir($config['temp_dir'],$error_msg))
+		if (!$this->check_dir($config['temp_dir'], $error_msg))
 		{
-			$config_errors[] = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg);
+			$config_errors[] = lang("Your temporary directory '%1' %2", $config['temp_dir'], $error_msg);
 		}
 
-		if (!$this->check_dir($config['files_dir'],$error_msg,true))
+		if (!$this->check_dir($config['files_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your files directory '%1' %2",$config['files_dir'],$error_msg);
+			$config_errors[] = lang("Your files directory '%1' %2", $config['files_dir'], $error_msg);
 		}
 		// set and create the default backup_dir
 		if (@is_writeable($config['files_dir']) && empty($config['backup_dir']))
@@ -414,35 +414,35 @@ 
 			$config['backup_dir'] = $config['files_dir'].'/db_backup';
 			if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir']))
 			{
-				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 					'config_value' => $config['backup_dir'],
-				),array(
+				), array(
 					'config_app'  => 'phpgwapi',
 					'config_name' => 'backup_dir',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		if (isset($config['backup_mincount']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => $config['backup_mincount'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_mincount',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		if (isset($config['backup_files']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => (int)$config['backup_files'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_files',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
-		if (!$this->check_dir($config['backup_dir'],$error_msg,true))
+		if (!$this->check_dir($config['backup_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your backup directory '%1' %2",$config['backup_dir'],$error_msg);
+			$config_errors[] = lang("Your backup directory '%1' %2", $config['backup_dir'], $error_msg);
 		}
 		if ($config_errors)
 		{
@@ -458,19 +458,19 @@ 
 	 * @param $appname
 	 * @param $any		optional, set to True to see if any of the apps tables are installed
 	 */
-	function check_app_tables($appname,$any=False)
+	function check_app_tables($appname, $any = False)
 	{
 		$none = 0;
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(@$setup_info[$appname]['tables'])
+		if (@$setup_info[$appname]['tables'])
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
 			$tables = Array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
-				foreach($table_names as $key => $val)
+				foreach ($table_names as $key => $val)
 				{
 					$tables[] = $val['table_name'];
 				}
@@ -479,19 +479,19 @@ 
 				unset($e);
 				// ignore db error
 			}
-			foreach($copy[$appname]['tables'] as $key => $val)
+			foreach ($copy[$appname]['tables'] as $key => $val)
 			{
-				if($GLOBALS['DEBUG'])
+				if ($GLOBALS['DEBUG'])
 				{
-					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
+					echo '<br>check_app_tables(): Checking: '.$appname.',table: '.$val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if (!in_array($val, $tables) && !in_array(strtolower($val), $tables))	// names in tables might be lowercase
 				{
-					if($GLOBALS['DEBUG'])
+					if ($GLOBALS['DEBUG'])
 					{
-						echo '<br>check_app_tables(): ' . $val . ' missing!';
+						echo '<br>check_app_tables(): '.$val.' missing!';
 					}
-					if(!$any)
+					if (!$any)
 					{
 						return False;
 					}
@@ -502,9 +502,9 @@ 
 				}
 				else
 				{
-					if($any)
+					if ($any)
 					{
-						if($GLOBALS['DEBUG'])
+						if ($GLOBALS['DEBUG'])
 						{
 							echo '<br>check_app_tables(): Some tables installed';
 						}
@@ -513,9 +513,9 @@ 
 				}
 			}
 		}
-		if($none && $any)
+		if ($none && $any)
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): No tables installed';
 			}
@@ -523,7 +523,7 @@ 
 		}
 		else
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): All tables installed';
 			}
@@ -539,9 +539,9 @@ 
 	 * @param boolean $check_in_docroot =false run an optional in docroot check
 	 * @return boolean
 	 */
-	static function check_dir($dir,&$msg,$check_in_docroot=false)
+	static function check_dir($dir, &$msg, $check_in_docroot = false)
 	{
-		if (!@is_dir($dir) && !@mkdir($dir,0700,true))
+		if (!@is_dir($dir) && !@mkdir($dir, 0700, true))
 		{
 			$msg = lang('does not exist');
 			return false;
@@ -553,16 +553,16 @@ 
 		}
 		if ($check_in_docroot)
 		{
-			$docroots = array(realpath(EGW_SERVER_ROOT),realpath($_SERVER['DOCUMENT_ROOT']));
+			$docroots = array(realpath(EGW_SERVER_ROOT), realpath($_SERVER['DOCUMENT_ROOT']));
 			$dir = realpath($dir);
 
 			foreach ($docroots as $docroot)
 			{
 				$len = strlen($docroot);
 
-				if ($docroot == substr($dir,0,$len) && $len>0)
+				if ($docroot == substr($dir, 0, $len) && $len > 0)
 				{
-					$rest = substr($dir,$len);
+					$rest = substr($dir, $len);
 
 					if (!strlen($rest) || $rest[0] == DIRECTORY_SEPARATOR)
 					{