EGroupware / egroupware

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

Indentation +5 added lines, -5 removed lines

@@ -214,12 +214,12 @@
 
 function emailadmin_upgrade1_4_001()
 {
-    $GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_user_defined_identities',array(
-        'type' => 'varchar',
-        'precision' => '3'
-    ));
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_emailadmin','ea_user_defined_identities',array(
+		'type' => 'varchar',
+		'precision' => '3'
+	));
 
-    return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.5.001';
+	return $GLOBALS['setup_info']['emailadmin']['currentver'] = '1.5.001';
 }
 
 

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'

Braces +16 added lines, -4 removed lines

@@ -611,7 +611,10 @@ 
 				$acc_id = $db->get_last_insert_id('egw_ea_accounts', 'acc_id');
 
 				// remember acc_id by owner, to be able to base credential only profiles on them
-				if ($owner <= 0 && !isset($acc_ids[$owner])) $acc_ids[(string)$owner] = $acc_id;
+				if ($owner <= 0 && !isset($acc_ids[$owner]))
+				{
+					$acc_ids[(string)$owner] = $acc_id;
+				}
 
 				// update above created identity with account acc_id
 				$db->update('egw_ea_identities', array('acc_id' => $acc_id), array('ident_id' => $ident_id), __LINE__, __FILE__, 'emailadmin');
@@ -623,7 +626,10 @@ 
 				), false, __LINE__, __FILE__, 'emailadmin');
 			}
 			// credentials are either stored for specific user or all users (account_id=0), not group-specific
-			if (!($owner > 0)) $owner = 0;
+			if (!($owner > 0))
+			{
+				$owner = 0;
+			}
 			// add imap credentials if necessary
 			$cred_type = $row['ea_smpt_auth'] != 'no' && $row['ea_imap_auth_username'] && $row['ea_smtp_auth_username'] &&
 				$row['ea_imap_auth_username'] == $row['ea_smtp_auth_username'] &&
@@ -667,7 +673,10 @@ 
  */
 function emailadmin_std_identity($account_id, $email=null)
 {
-	if ($email) list(, $domain) = explode('@', $email);
+	if ($email)
+	{
+		list(, $domain) = explode('@', $email);
+	}
 	return $GLOBALS['egw_setup']->db->select('egw_ea_accounts', 'egw_ea_identities.*',
 		'egw_ea_valid.account_id IN (0,'.(int)$account_id.') AND egw_ea_identities.account_id IN (0,'.(int)$account_id.')',
 		__LINE__, __FILE__, 0,
@@ -739,7 +748,10 @@ 
 				$db->insert('egw_ea_accounts', $account, false, __LINE__, __FILE__, 'emailadmin');
 				$acc_id = $db->get_last_insert_id('egw_ea_accounts', 'acc_id');
 				$identity['acc_id'] = $acc_id;
-				if (!isset($std_identity[$row['fm_owner']])) $std_identity[$row['fm_owner']] = $identity;
+				if (!isset($std_identity[$row['fm_owner']]))
+				{
+					$std_identity[$row['fm_owner']] = $identity;
+				}
 				// update above created identity with account acc_id
 				$db->update('egw_ea_identities', array('acc_id' => $acc_id), array('ident_id' => $ident_id), __LINE__, __FILE__, 'emailadmin');
 

doc/rpm-build/checkout-build-archives.php

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

@@ -403,7 +403,7 @@ 
 	}
 
 	$archives = config_translate('upload');
-	echo "Uploading $archives to $config[upload_url]\n";
+	echo "uploading $archives to $config[upload_url]\n";
 
 	foreach(glob($archives, GLOB_BRACE) as $path)
 	{
@@ -429,7 +429,7 @@ 
 		{
 			continue;
 		}
-		if ($verbose) echo "Uploading $path as $content_type\n";
+		if ($verbose) echo "uploading $path as $content_type\n";
 		$name = basename($path);
 		github_api($config['upload_url'], array(
 			'name' => $name,
@@ -492,7 +492,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -726,7 +726,7 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -807,7 +807,7 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose) echo "updated $path\n";
 				++$n;
 			}
 		}
@@ -942,7 +942,7 @@ 
 	}
 	foreach($config['types'] as $type)
 	{
-		echo "Creating $type archives\n";
+		echo "creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
@@ -1064,7 +1064,7 @@ 
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
-		echo "Running $cmd\n";
+		echo "running $cmd\n";
 		run_cmd($cmd);
 	}
 	// fix permissions

Doc Comments +2 added lines, -1 removed lines

@@ -562,6 +562,7 @@ 
  *
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
+ * @return string
  */
 function config_translate($name, $value=null)
 {
@@ -1336,7 +1337,7 @@ 
  * 2b) otherwise throws with $cmd as message and exit-code
  *
  * @param string $cmd
- * @param array& $output=null $output of command, only if !$verbose !!!
+ * @param array& $output $output of command, only if !$verbose !!!
  * @param int|array $no_bailout =null exit code(s) to NOT bail out
  * @throws Exception on non-zero exit-code not matching $no_bailout
  * @return int exit code of $cmd

Spacing +176 added lines, -176 removed lines

@@ -13,15 +13,15 @@ 
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
-date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
+date_default_timezone_set('Europe/Berlin'); // to get ride of 5.3 warnings
 
 $verbose = 0;
 $config = array(
 	'packagename' => 'egroupware-epl',
-	'version' => '17.1',        // '17.1'
+	'version' => '17.1', // '17.1'
 	'packaging' => date('Ymd'), // '20160520'
-	'branch'  => 'master',        // checked out branch
-	'tag' => '$version.$packaging',	// name of tag
+	'branch'  => 'master', // checked out branch
+	'tag' => '$version.$packaging', // name of tag
 	'checkoutdir' => realpath(__DIR__.'/../..'),
 	'egw_buildroot' => '/tmp/build_root/epl_17.1_buildroot',
 	'sourcedir' => '/home/download/stylite-epl/egroupware-epl-17.1',
@@ -33,11 +33,11 @@ 
 	'svnalias' => 'aliases/default-ssh',    // default alias
 	'extra' => array('$stylitebase/$svnbranch/stylite', '$stylitebase/$svnbranch/esyncpro', '$stylitebase/trunk/archive'),//, '$stylitebase/$svnbranch/groups'), //,'svn+ssh://stylite@svn.stylite.de/stylite/trunk/eventmgr'),
 	*/
-	'extra' => array('functions' => array('stylite'), 'esyncpro', 'archive',	// create an extra archive for given apps
+	'extra' => array('functions' => array('stylite'), 'esyncpro', 'archive', // create an extra archive for given apps
 		// these apps are placed in egroupware-epl-contrib archive
 		'contrib' => array('phpgwapi', 'etemplate', 'jdots', 'phpbrain', 'wiki', 'sambaadmin', 'sitemgr', 'phpfreechat')),
-	'aliasdir' => 'egroupware',             // directory created by the alias
-	'types' => array('tar.bz2','tar.gz','zip','all.tar.bz2'),
+	'aliasdir' => 'egroupware', // directory created by the alias
+	'types' => array('tar.bz2', 'tar.gz', 'zip', 'all.tar.bz2'),
 	// add given extra-apps or (uncompressed!) archives to above all.tar.bz2 archive
 	'all-add' => array('contrib', '/home/stylite/epl-trunk/phpfreechat_data_public.tar'),
 	// diverse binaries we need
@@ -57,8 +57,8 @@ 
 	'after-checkout' => 'rm -rf */source */templates/*/source',
 	'packager' => 'build@egroupware.org',
 	'obs' => '/home/stylite/obs/stylite-epl-trunk',
-	'obs_package_alias' => '',	// name used in obs package, if different from packagename
-	'changelog' => false,   // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
+	'obs_package_alias' => '', // name used in obs package, if different from packagename
+	'changelog' => false, // eg. '* 1. Zeile\n* 2. Zeile' for debian.changes
 	'changelog_packager' => 'Ralf Becker <rb@egroupware.org>',
 	'editchangelog' => '* ',
 	//'sfuser' => 'ralfbecker',
@@ -67,23 +67,23 @@ 
 	'upload' => '$sourcedir/*egroupware-epl{,-contrib}-$version.$packaging*',
 	'copychangelog' => '$sourcedir/README', //'$sfuser,egroupware@frs.sourceforge.net:/home/frs/project/e/eg/egroupware/README',
 	'skip' => array(),
-	'run' => array('checkout','editchangelog','tag','copy','virusscan','create','sign','obs','copychangelog'),
+	'run' => array('checkout', 'editchangelog', 'tag', 'copy', 'virusscan', 'create', 'sign', 'obs', 'copychangelog'),
 	'patchCmd' => '# run cmd after copy eg. "cd $egw_buildroot; patch -p1 /path/to/patch"',
-	'github_user' => 'ralfbecker',	// Github user for following token
-	'github_token' => '',	// Github repo personal access token from above user
+	'github_user' => 'ralfbecker', // Github user for following token
+	'github_token' => '', // Github repo personal access token from above user
 );
 
 // process config from command line
 $argv = $_SERVER['argv'];
 $prog = array_shift($argv);
 
-while(($arg = array_shift($argv)))
+while (($arg = array_shift($argv)))
 {
 	if ($arg == '-v' || $arg == '--verbose')
 	{
 		++$verbose;
 	}
-	elseif($arg == '-h' || $arg == '--help')
+	elseif ($arg == '-h' || $arg == '--help')
 	{
 		if (in_array('editchangelog', $config['skip']) || !in_array('editchangelog', $config['run']))
 		{
@@ -91,10 +91,10 @@ 
 		}
 		usage();
 	}
-	elseif(substr($arg,0,2) == '--' && isset($config[$name=substr($arg,2)]))
+	elseif (substr($arg, 0, 2) == '--' && isset($config[$name = substr($arg, 2)]))
 	{
 		$value = array_shift($argv);
-		switch($name)
+		switch ($name)
 		{
 			case 'extra':	// stored as array and allow to add/delete items with +/- prefix
 			case 'types':
@@ -117,7 +117,7 @@ 
 				{
 					$value = array_unique(preg_split('/[ ,]+/', $value));
 				}
-				switch($op)
+				switch ($op)
 				{
 					case '+':
 						$config[$name] = array_unique(array_merge($config[$name], $value));
@@ -135,14 +135,14 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value) array_unshift($config['run'], $name);
 				break;
 
 			case 'editchangelog':
 				$config[$name] = $value ? $value : true;
-				if (!in_array('editchangelog',$config['run']))
+				if (!in_array('editchangelog', $config['run']))
 				{
-					array_unshift($config['run'],'editchangelog');
+					array_unshift($config['run'], 'editchangelog');
 				}
 				break;
 
@@ -151,7 +151,7 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs', $config['run'])) $config['run'][] = 'obs';
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -169,16 +169,16 @@ 
 }
 $svn = $config['svn'];
 
-$run = array_diff($config['run'],$config['skip']);
+$run = array_diff($config['run'], $config['skip']);
 
 // if we dont edit the changelog, set packaging from changelog
 if (!in_array('editchangelog', $run))
 {
 	parse_current_changelog(true);
 }
-foreach($run as $func)
+foreach ($run as $func)
 {
-	chdir(dirname(__FILE__));	// make relative filenames work, if other command changes dir
+	chdir(dirname(__FILE__)); // make relative filenames work, if other command changes dir
 	call_user_func('do_'.$func);
 }
 
@@ -193,7 +193,7 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_git($_path, $log_pattern=null, &$last_tag=null, $prefix='* ')
+function get_changelog_from_git($_path, $log_pattern = null, &$last_tag = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
 	global $config;
@@ -215,7 +215,7 @@ 
 		$output = null;
 		run_cmd($cmd, $output);
 
-		foreach($output as $line)
+		foreach ($output as $line)
 		{
 			if (substr($line, 0, 4) == "    " && ($msg = _match_log_pattern(substr($line, 4), $log_pattern, $prefix)))
 			{
@@ -248,13 +248,13 @@ 
 	{
 		throw new Exception("checkout directory '{$config['checkoutdir']} does NOT exists or is NO directory!");
 	}
-	if (!($mrconfig = file_get_contents($path=$config['checkoutdir'].'/.mrconfig')))
+	if (!($mrconfig = file_get_contents($path = $config['checkoutdir'].'/.mrconfig')))
 	{
 		throw new Exception("$path not found!");
 	}
 	$module = $baseurl = null;
 	$modules = array();
-	foreach(explode("\n", $mrconfig) as $line)
+	foreach (explode("\n", $mrconfig) as $line)
 	{
 		$matches = null;
 		if (isset($baseurl))
@@ -343,9 +343,9 @@ 
 	}
 	chdir($config['checkoutdir']);
 
-	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
+	$config['tag'] = config_translate('tag'); // allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag'])) return; // otherwise we copy everything in svn root!
 
 	echo "Creating tag and pushing $config[tag]\n";
 
@@ -360,7 +360,7 @@ 
 	// might require more then one run, as pushed tags need to be picked up by packagist
 	$output = $ret = null;
 	$timeout = 10;
-	for($try=1; $try < 10 && run_cmd($config['composer'].' update egroupware/\*', $output, 2); ++$try)
+	for ($try = 1; $try < 10 && run_cmd($config['composer'].' update egroupware/\*', $output, 2); ++$try)
 	{
 		echo "$try. retry in $timeout seconds ...\n";
 		sleep($timeout);
@@ -379,7 +379,7 @@ 
 {
 	global $config;
 
-	if (!($json = file_get_contents($path=$config['checkoutdir'].'/composer.json')))
+	if (!($json = file_get_contents($path = $config['checkoutdir'].'/composer.json')))
 	{
 		throw new Exception("Can NOT read $path to update with new version!");
 	}
@@ -406,7 +406,7 @@ 
  */
 function do_release()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	// push local changes to Github incl. tag (tags of apps are already pushed by do_tag)
 	if ($verbose) echo "Pushing changes and tags\n";
@@ -431,7 +431,7 @@ 
 		'body' => $config['changelog'],
 	);
 	$response = github_api("/repos/EGroupware/egroupware/releases", $data);
-	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']);	// remove {?name,label} template
+	$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response['upload_url']); // remove {?name,label} template
 
 	do_upload();
 }
@@ -441,33 +441,33 @@ 
  */
 function do_upload()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (empty($config['upload_url']))
 	{
 		$response = github_api("/repos/EGroupware/egroupware/releases", array(), 'GET');
-		$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response[0]['upload_url']);	// remove {?name,label} template
+		$config['upload_url'] = preg_replace('/{\?[^}]+}$/', '', $response[0]['upload_url']); // remove {?name,label} template
 	}
 
 	$archives = config_translate('upload');
 	echo "Uploading $archives to $config[upload_url]\n";
 
-	foreach(glob($archives, GLOB_BRACE) as $path)
+	foreach (glob($archives, GLOB_BRACE) as $path)
 	{
 		$label = null;
 		if (substr($path, -4) == '.zip')
 		{
 			$content_type = 'application/zip';
 		}
-		elseif(substr($path, -7) == '.tar.gz')
+		elseif (substr($path, -7) == '.tar.gz')
 		{
 			$content_type = 'application/x-gzip';
 		}
-		elseif(substr($path, -8) == '.tar.bz2')
+		elseif (substr($path, -8) == '.tar.bz2')
 		{
 			$content_type = 'application/x-bzip2';
 		}
-		elseif(substr($path, -8) == '.txt.asc')
+		elseif (substr($path, -8) == '.txt.asc')
 		{
 			$content_type = 'text/plain';
 			$label = 'Signed hashes of downloads';
@@ -486,7 +486,7 @@ 
 
 	if (!empty($config['release']))
 	{
-		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
+		$target = config_translate('release'); // allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
 		if ($verbose) echo $cmd."\n";
 		passthru($cmd);
@@ -504,7 +504,7 @@ 
  * @throws Exception
  * @return array with response
  */
-function github_api($_url, $data, $method='POST', $upload=null, $content_type=null)
+function github_api($_url, $data, $method = 'POST', $upload = null, $content_type = null)
 {
 	global $config, $verbose;
 
@@ -517,7 +517,7 @@ 
 	curl_setopt($c, CURLOPT_TIMEOUT, 240);
 	curl_setopt($c, CURLOPT_FOLLOWLOCATION, true);
 
-	switch($method)
+	switch ($method)
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
@@ -525,13 +525,13 @@ 
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if (count($data)) $url .= '?'.http_build_query($data);
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
@@ -539,7 +539,7 @@ 
 	curl_setopt($c, CURLOPT_URL, $url);
 
 	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if ($verbose) echo "Sending $method request to $url ".(isset($short_data) && $method != 'GET' ? $short_data : '')."\n";
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -547,7 +547,7 @@ 
 		curl_setopt($c, CURLOPT_HEADER, true);
 		curl_setopt($c, CURLOPT_RETURNTRANSFER, false);
 		curl_exec($c);
-		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
+		throw new Exception("$method request to $url failed ".(isset($short_data) && $method != 'GET' ? $short_data : ''));
 	}
 
 	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
@@ -563,7 +563,7 @@ 
  * @param string $name
  * @param string $value =null value to use, default $config[$name]
  */
-function config_translate($name, $value=null)
+function config_translate($name, $value = null)
 {
 	global $config;
 
@@ -571,7 +571,7 @@ 
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
-		foreach($config as $n => $val)
+		foreach ($config as $n => $val)
 		{
 			if (is_string($val)) $translate['$'.$n] = $val;
 		}
@@ -597,7 +597,7 @@ 
  */
 function do_editchangelog()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Querying changelog from Git/SVN\n";
 	if (!isset($config['modules']))
@@ -607,7 +607,7 @@ 
 	// query changelog per repo
 	$changelog = '';
 	$last_tag = null;
-	foreach($config['modules'] as $branch_url => $modules)
+	foreach ($config['modules'] as $branch_url => $modules)
 	{
 		$revision = null;
 		if (substr($branch_url, -4) == '.git')
@@ -624,15 +624,15 @@ 
 	{
 		$changelog = "Could not query changelog for $config[version], eg. no last tag found!\n";
 	}
-	$logfile = tempnam('/tmp','checkout-build-archives');
-	file_put_contents($logfile,$changelog);
+	$logfile = tempnam('/tmp', 'checkout-build-archives');
+	file_put_contents($logfile, $changelog);
 	$cmd = $config['editor'].' '.escapeshellarg($logfile);
 	passthru($cmd);
 	$config['changelog'] = file_get_contents($logfile);
 	// remove trailing newlines
-	while (substr($config['changelog'],-1) == "\n")
+	while (substr($config['changelog'], -1) == "\n")
 	{
-		$config['changelog'] = substr($config['changelog'],0,-1);
+		$config['changelog'] = substr($config['changelog'], 0, -1);
 	}
 	// allow user to abort, by deleting the changelog
 	if (strlen($config['changelog']) <= 2)
@@ -647,7 +647,7 @@ 
 	}
 	file_put_contents($changelog, update_changelog(file_get_contents($changelog)));
 
-	update_api_setup($api_setup=$config['checkoutdir'].'/api/setup/setup.inc.php');
+	update_api_setup($api_setup = $config['checkoutdir'].'/api/setup/setup.inc.php');
 
 	if (file_exists($config['checkoutdir'].'/.git'))
 	{
@@ -660,7 +660,7 @@ 
 	run_cmd($cmd);
 
 	// update obs changelogs (so all changlogs are updated in case of a later error and changelog step can be skiped)
-	do_obs(true);	// true: only update debian.changes in obs checkouts
+	do_obs(true); // true: only update debian.changes in obs checkouts
 }
 
 /**
@@ -674,41 +674,41 @@ 
  * @param string $prefix ='* ' prefix, which if not presend should be added to all log messages
  * @return string with changelog
  */
-function get_changelog_from_svn($branch_url, $log_pattern=null, &$revision=null, $prefix='* ')
+function get_changelog_from_svn($branch_url, $log_pattern = null, &$revision = null, $prefix = '* ')
 {
 	//echo __FUNCTION__."('$branch_url','$log_pattern','$revision','$prefix')\n";
-	global $config,$verbose,$svn;
+	global $config, $verbose, $svn;
 
 	if (is_null($revision))
 	{
-		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
+		list($tags_url, $branch) = preg_split('#/(branches/|trunk)#', $branch_url);
 		if (empty($branch)) $branch = $config['version'];
 		$tags_url .= '/tags';
-		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
+		$pattern = '|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
-		$revision = get_last_svn_tag($tags_url,$pattern,$matches);
+		$revision = get_last_svn_tag($tags_url, $pattern, $matches);
 		$tag = $matches[1];
 	}
-	elseif(!is_numeric($revision))
+	elseif (!is_numeric($revision))
 	{
-		$revision = get_last_svn_tag($tags_url,$tag=$revision);
+		$revision = get_last_svn_tag($tags_url, $tag = $revision);
 	}
 	$cmd = $svn.' log --xml -r '.escapeshellarg($revision.':HEAD').' '.escapeshellarg($branch_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for log from r$revision".($tag ? " ($tag)" : '').":\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$message = '';
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue; // no match --> ignore
 
 		$message .= $msg."\n";
 	}
@@ -725,25 +725,25 @@ 
  * @param string $prefix ='* '
  * @return string
  */
-function _match_log_pattern($msg, $log_pattern, $prefix='* ')
+function _match_log_pattern($msg, $log_pattern, $prefix = '* ')
 {
 	$pattern_len = strlen($log_pattern);
 	$prefix_len = strlen($prefix);
 
 	$matches = null;
-	if ($log_pattern[0] == '/' && preg_match($log_pattern,$msg,$matches))
+	if ($log_pattern[0] == '/' && preg_match($log_pattern, $msg, $matches))
 	{
 		$msg = $matches[1];
 	}
-	elseif($log_pattern && $log_pattern[0] != '/' && substr($msg,0,$pattern_len) == $log_pattern)
+	elseif ($log_pattern && $log_pattern[0] != '/' && substr($msg, 0, $pattern_len) == $log_pattern)
 	{
-		list($msg) = explode("\n",$msg);
+		list($msg) = explode("\n", $msg);
 	}
-	elseif($log_pattern)
+	elseif ($log_pattern)
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg, 0, $prefix_len) != $prefix) $msg = $prefix.$msg;
 
 	return $msg;
 }
@@ -757,30 +757,30 @@ 
  * @param array &$matches=null on return matches of preg_match
  * @return int revision of last svn tag matching pattern
  */
-function get_last_svn_tag($tags_url,$pattern,&$matches=null)
+function get_last_svn_tag($tags_url, $pattern, &$matches = null)
 {
-	global $verbose,$svn;
+	global $verbose, $svn;
 
 	$cmd = $svn.' log --xml --limit 40 -v '.escapeshellarg($tags_url);
 	if (($v = $verbose))
 	{
 		echo "Querying SVN for last tags\n$cmd\n";
-		$verbose = false;	// otherwise no $output!
+		$verbose = false; // otherwise no $output!
 	}
 	$output = array();
-	run_cmd($cmd,$output);
+	run_cmd($cmd, $output);
 	$verbose = $v;
-	array_shift($output);	// remove the command
+	array_shift($output); // remove the command
 
-	$xml = simplexml_load_string($output=implode("\n",$output));
+	$xml = simplexml_load_string($output = implode("\n", $output));
 	$is_regexp = $pattern[0] == substr($pattern, -1);
-	foreach($xml as $log)
+	foreach ($xml as $log)
 	{
 		//print_r($log);
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose) echo "Revision {$log['revision']} matches".($matches ? ': '.$matches[1] : '')."\n";
 			return (int)$log['revision'];
 		}
 	}
@@ -792,9 +792,9 @@ 
  *
  * @param boolean $only_update_changelog =false true update debian.changes, but nothing else, nor commit it
  */
-function do_obs($only_update_changelog=false)
+function do_obs($only_update_changelog = false)
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!is_dir($config['obs']))
 	{
@@ -804,25 +804,25 @@ 
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
-	foreach(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
+	foreach (new RecursiveIteratorIterator(new RecursiveDirectoryIterator($config['obs'])) as $path)
 	{
 		if (basename(dirname($path)) == '.osc' ||
 			!preg_match('/\/('.preg_quote($config['packagename']).
 				($config['obs_package_alias'] ? '|'.preg_quote($config['obs_package_alias']) : '').
-				')[a-z-]*-('.preg_quote($config['version']).'|trunk)/',$path))
+				')[a-z-]*-('.preg_quote($config['version']).'|trunk)/', $path))
 		{
 			continue;
 		}
 		$matches = null;
-		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/',$path,$matches) &&
-			file_exists($new_name=$config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
+		if (preg_match('/\/('.preg_quote($config['packagename']).'[a-z-]*)-'.preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/', $path, $matches) &&
+			file_exists($new_name = $config['sourcedir'].'/'.$matches[1].'-'.$config['version'].'.'.$config['packaging'].$matches[2]))
 		{
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
 				if ($verbose) echo "rm $path\n";
 			}
-			copy($new_name,dirname($path).'/'.basename($new_name));
+			copy($new_name, dirname($path).'/'.basename($new_name));
 			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
 			++$n;
 		}
@@ -832,35 +832,35 @@ 
 			$config['changelog'] = parse_current_changelog();
 		}
 		// updating dsc, spec and changelog files
-		if (!$only_update_changelog && (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec') ||
+		if (!$only_update_changelog && (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec') ||
 			!empty($config['changelog']) && basename($path) == 'debian.changes')
 		{
 			$content = $content_was = file_get_contents($path);
 
-			if (substr($path,-4) == '.dsc' || substr($path,-5) == '.spec')
+			if (substr($path, -4) == '.dsc' || substr($path, -5) == '.spec')
 			{
-				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m','Version: '.$config['version'].'.'.$config['packaging'],$content);
+				$content = preg_replace('/^Version: '.preg_quote($config['version']).'\.[0-9.]+[0-9]/m', 'Version: '.$config['version'].'.'.$config['packaging'], $content);
 			}
-			if (substr($path,-4) == '.dsc')
+			if (substr($path, -4) == '.dsc')
 			{
 				$content = preg_replace('/^(Debtransform-Tar: '.preg_quote($config['packagename']).'[a-z-]*)-'.
 					preg_quote($config['version']).'\.[0-9.]+[0-9](\.tar\.(gz|bz2))$/m',
-					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2',$content);
+					'\\1-'.$config['version'].'.'.$config['packaging'].'\\2', $content);
 			}
-			if (basename($path) == 'debian.changes' && strpos($content,$config['version'].'.'.$config['packaging']) === false)
+			if (basename($path) == 'debian.changes' && strpos($content, $config['version'].'.'.$config['packaging']) === false)
 			{
 				$content = update_changelog($content);
 			}
-			if (!empty($config['changelog']) && substr($path,-5) == '.spec' &&
-				($pos_changelog = strpos($content,'%changelog')) !== false)
+			if (!empty($config['changelog']) && substr($path, -5) == '.spec' &&
+				($pos_changelog = strpos($content, '%changelog')) !== false)
 			{
 				$pos_changelog += strlen("%changelog\n");
-				$content = substr($content,0,$pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
-					$config['changelog']."\n".substr($content,$pos_changelog);
+				$content = substr($content, 0, $pos_changelog).' *'.date('D M d Y').' '.$config['changelog_packager']."\n".
+					$config['changelog']."\n".substr($content, $pos_changelog);
 			}
 			if ($content != $content_was)
 			{
-				file_put_contents($path,$content);
+				file_put_contents($path, $content);
 				if ($verbose) echo "Updated $path\n";
 				++$n;
 			}
@@ -881,33 +881,33 @@ 
  * @param boolean $set_packaging =false true: set packaging from last changelog entry
  * @return string changelog entries without header and footer lines
  */
-function parse_current_changelog($set_packaging=false)
+function parse_current_changelog($set_packaging = false)
 {
 	global $config;
 
 	$changelog = file_get_contents($config['checkoutdir'].'/doc/rpm-build/debian.changes');
 	$lines = explode("\n", $changelog, 100);
 	$matches = null;
-	foreach($lines as $n => $line)
+	foreach ($lines as $n => $line)
 	{
-		if (preg_match($preg='/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
+		if (preg_match($preg = '/^'.preg_quote($config['packagename']).' \('.preg_quote($config['version']).'\.'.
 			($set_packaging ? '([0-9]+)' : preg_quote($config['packaging'])).'/', $line, $matches))
 		{
 			if ($set_packaging)
 			{
 				$config['packaging'] = $matches[1];
 			}
-			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
+			$n += empty($lines[$n + 1]) ? 2 : 1; // overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while ($lines[$n])	// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
 				++$n;
 			}
-			return substr($logentry, 0, -1);	// remove training "\n"
+			return substr($logentry, 0, -1); // remove training "\n"
 		}
 	}
-	return null;	// paragraph for current version NOT found
+	return null; // paragraph for current version NOT found
 }
 
 /**
@@ -921,8 +921,8 @@ 
 	global $config;
 
 	list($header) = explode("\n", $content);
-	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/', '('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
+	if (substr($config['changelog'], 0, 2) != '  ') $config['changelog'] = '  '.implode("\n  ", explode("\n", $config['changelog']));
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -960,9 +960,9 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
@@ -981,7 +981,7 @@ 
 	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
-	unlink($sumsfile);	// delete the unsigned file
+	unlink($sumsfile); // delete the unsigned file
 }
 
 /**
@@ -991,22 +991,22 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'], 0755, true);
+	if (substr($config['sourcedir'], 0, 2) == '~/')	// sha1_file cant deal with '~/rpm'
 	{
-		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
+		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'], 1);
 	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
 	chdir($config['egw_buildroot']);
 
-	if($config['extra'])
+	if ($config['extra'])
 	{
 		$exclude = $exclude_all = array();
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
-			foreach((array)$modules as $module)
+			foreach ((array)$modules as $module)
 			{
 				$exclude[] = basename($module);
 				if (!empty($config['all-add']) && !in_array($module, $config['all-add']) && (is_int($name) || !in_array($name, $config['all-add'])))
@@ -1016,24 +1016,24 @@ 
 			}
 		}
 		$exclude_extra = ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude);
-		$exclude_all_extra =  $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
+		$exclude_all_extra = $exclude_all ? ' --exclude=egroupware/'.implode(' --exclude=egroupware/', $exclude_all) : '';
 	}
-	foreach($config['types'] as $type)
+	foreach ($config['types'] as $type)
 	{
 		echo "Creating $type archives\n";
 		$tar_type = $type == 'tar.bz2' ? 'j' : 'z';
 
 		$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-		switch($type)
+		switch ($type)
 		{
 			case 'all.tar.bz2':	// single tar-ball for debian builds not easily supporting to use multiple
 				$file = $config['sourcedir'].'/'.$config['packagename'].'-all-'.$config['version'].'.'.$config['packaging'].'.tar';
 				$cmd = $config['tar'].' --owner=root --group=root -cf '.$file.$exclude_all_extra.' egroupware';
 				if (!empty($config['all-add']))
 				{
-					foreach((array)$config['all-add'] as $add)
+					foreach ((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
+						if (substr($add, -4) != '.tar') continue; // probably a module
 						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
@@ -1057,15 +1057,15 @@ 
 		run_cmd($cmd);
 		$sums .= sha1_file($file)."\t".basename($file)."\n";
 
-		foreach($config['extra'] as $name => $modules)
+		foreach ($config['extra'] as $name => $modules)
 		{
 			if (is_numeric($name)) $name = $modules;
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
-			switch($type)
+			switch ($type)
 			{
 				case 'all.tar.bz2':
-					break;	// nothing to do
+					break; // nothing to do
 				case 'tar.bz2':
 				case 'tar.gz':
 					$cmd = $config['tar'].' --owner=root --group=root -c'.$tar_type.'f '.$file.$dirs;
@@ -1080,7 +1080,7 @@ 
 		}
 	}
 	// writing sha1sum file
-	file_put_contents($sumsfile,$sums);
+	file_put_contents($sumsfile, $sums);
 }
 
 /**
@@ -1088,7 +1088,7 @@ 
  */
 function do_virusscan()
 {
-	global $config,$verbose;
+	global $config, $verbose;
 
 	if (!file_exists($config['clamscan']) || !is_executable($config['clamscan']))
 	{
@@ -1102,7 +1102,7 @@ 
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
 		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
 		$output = null;
-		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
+		run_cmd($cmd, $output, 1); // 1 = ignore already up to date database
 	}
 	echo "Starting virusscan\n";
 	$cmd = $config['clamscan'].' --quiet -r '.$config['egw_buildroot'];
@@ -1159,12 +1159,12 @@ 
  */
 function do_svncheckout()
 {
-	global $config,$svn;
+	global $config, $svn;
 
 	echo "Starting svn checkout/update\n";
 	if (!file_exists($config['checkoutdir']))
 	{
-		mkdir($config['checkoutdir'],0755,true);
+		mkdir($config['checkoutdir'], 0755, true);
 	}
 	elseif (!is_dir($config['checkoutdir']) || !is_writable($config['checkoutdir']))
 	{
@@ -1179,17 +1179,17 @@ 
 		{
 			get_modules_per_repo();
 		}
-		$config['svntag'] = config_translate('svntag');	// in case svntag command did not run, translate tag name
+		$config['svntag'] = config_translate('svntag'); // in case svntag command did not run, translate tag name
 
 		if (file_exists($config['aliasdir']))
 		{
-			system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout, as we dont implement switching tags
+			system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout, as we dont implement switching tags
 			clearstatcache();
 		}
-		foreach($config['modules'] as $repo => $modules)
+		foreach ($config['modules'] as $repo => $modules)
 		{
 			$cmd = $svn.' co ';
-			foreach($modules as $path => $url)
+			foreach ($modules as $path => $url)
 			{
 				if ($path == $config['aliasdir'])
 				{
@@ -1199,7 +1199,7 @@ 
 					$cmd = $svn.' co ';
 					continue;
 				}
-				if(file_exists($config['aliasdir']))
+				if (file_exists($config['aliasdir']))
 				{
 					die("'egroupware' applications must be first one in externals!\n");
 				}
@@ -1217,16 +1217,16 @@ 
 			// check if correct branch
 			$cmd = 'LANG=C '.$svn.' info';
 			$output = $ret = null;
-			exec($cmd,$output,$ret);
-			foreach($output as $line)
+			exec($cmd, $output, $ret);
+			foreach ($output as $line)
 			{
-				if ($ret || substr($line,0,5) == 'URL: ')
+				if ($ret || substr($line, 0, 5) == 'URL: ')
 				{
-					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					$url = substr($line, 5);
+					if ($ret || substr($url, 0, strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
-						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
+						system('/bin/rm -rf .svn '.$config['aliasdir']); // --> remove the whole checkout
 						clearstatcache();
 					}
 					break;
@@ -1238,10 +1238,10 @@ 
 		run_cmd($cmd);
 
 		chdir($config['aliasdir']);
-		foreach($config['extra'] as $module)
+		foreach ($config['extra'] as $module)
 		{
-			$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-			$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+			$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+			$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 			$url .= $module;
 			$cmd = $svn.' co '.$url;
 			run_cmd($cmd);
@@ -1266,7 +1266,7 @@ 
  */
 function get_modules_per_svn_repo()
 {
-	global $config,$svn,$verbose;
+	global $config, $svn, $verbose;
 
 	// process alias/externals
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
@@ -1274,27 +1274,27 @@ 
 	$cmd = $svn.' propget svn:externals --strict '.$url;
 	if ($verbose) echo $cmd."\n";
 	$output = $ret = null;
-	exec($cmd,$output,$ret);
+	exec($cmd, $output, $ret);
 	$config['modules'] = array();
-	foreach($output as $line)
+	foreach ($output as $line)
 	{
 		$line = trim($line);
 		if (empty($line) || $line[0] == '#') continue;
-		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
+		list($path, $url) = preg_split('/[ \t\r\n]+/', $line);
 		$matches = null;
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
-	foreach($config['extra'] as $module)
+	foreach ($config['extra'] as $module)
 	{
-		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
-		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
+		$module = config_translate(null, $module); // allow to use config vars like $svnbranch in module
+		$url = strpos($module, '://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module, '://') !== false) $module = basename($module);
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/', $url, $matches)) die("Invalid SVN URL: $url\n");
 		$repo = $matches[1];
 		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
@@ -1308,11 +1308,11 @@ 
  */
 function do_svntag()
 {
-	global $config,$svn;
+	global $config, $svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag'])) return; // otherwise we copy everything in svn root!
 
-	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
+	$config['svntag'] = config_translate('svntag'); // allow to use config vars like $version in tag
 
 	echo "Creating SVN tag $config[svntag]\n";
 	if (!isset($config['modules']))
@@ -1320,9 +1320,9 @@ 
 		get_modules_per_repo();
 	}
 	// create tags (per repo)
-	foreach($config['modules'] as $repo => $modules)
+	foreach ($config['modules'] as $repo => $modules)
 	{
-		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ',$modules).' '.$repo.'/'.$config['svntag'].'/';
+		$cmd = $svn.' cp --parents -m '.escapeshellarg('Creating '.$config['svntag']).' '.implode(' ', $modules).' '.$repo.'/'.$config['svntag'].'/';
 		run_cmd($cmd);
 	}
 }
@@ -1341,7 +1341,7 @@ 
  * @throws Exception on non-zero exit-code not matching $no_bailout
  * @return int exit code of $cmd
  */
-function run_cmd($cmd,array &$output=null,$no_bailout=null)
+function run_cmd($cmd, array &$output = null, $no_bailout = null)
 {
 	global $verbose;
 
@@ -1349,18 +1349,18 @@ 
 	{
 		echo $cmd."\n";
 		$ret = null;
-		system($cmd,$ret);
+		system($cmd, $ret);
 	}
 	else
 	{
 		$output[] = $cmd;
-		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		exec($cmd, $output, $ret);
+		if ($verbose) echo implode("\n", $output)."\n";
 	}
-	if ($ret && !in_array($ret,(array)$no_bailout))
+	if ($ret && !in_array($ret, (array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
-		throw new Exception("Error during '$cmd' --> aborting",$ret);
+		if (!$verbose) echo implode("\n", $output)."\n";
+		throw new Exception("Error during '$cmd' --> aborting", $ret);
 	}
 	return $ret;
 }
@@ -1387,7 +1387,7 @@ 
 			return 'NULL';
 		case 'object':
 		case 'array':
-			return str_replace(array("\n",'    '/*,'Array'*/),'',print_r($var,true));
+			return str_replace(array("\n", '    '/*,'Array'*/), '', print_r($var, true));
 	}
 	return 'UNKNOWN TYPE!';
 }
@@ -1397,9 +1397,9 @@ 
  *
  * @param string $error =null optional error-message
  */
-function usage($error=null)
+function usage($error = null)
 {
-	global $prog,$config,$verbose;
+	global $prog, $config, $verbose;
 
 	echo "Usage: $prog [-h|--help] [-v|--verbose] [options, ...]\n\n";
 	echo "options and their defaults:\n";
@@ -1409,12 +1409,12 @@ 
 	}
 	else
 	{
-		unset($config['modules']);	// they give an error, because of nested array and are quite lengthy
+		unset($config['modules']); // they give an error, because of nested array and are quite lengthy
 	}
-	foreach($config as $name => $default)
+	foreach ($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
-		echo '--'.str_pad($name,20).$default."\n";
+		if (is_array($default)) $default = json_encode($default, JSON_UNESCAPED_SLASHES);
+		echo '--'.str_pad($name, 20).$default."\n";
 	}
 	if ($error)
 	{

Braces +236 added lines, -58 removed lines

@@ -9,10 +9,13 @@ 
  * @copyright (c) 2009-19 by Ralf Becker <rb@egroupware.org>
  */
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling setup-cli as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling setup-cli as web-page
 {
 	die('<h1>checkout-build-archives.php must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 date_default_timezone_set('Europe/Berlin');	// to get ride of 5.3 warnings
 
 $verbose = 0;
@@ -135,7 +138,10 @@ 
 			case 'release':
 			case 'copychangelog':
 				$config[$name] = $value;
-				if ($value) array_unshift($config['run'],$name);
+				if ($value)
+				{
+					array_unshift($config['run'],$name);
+				}
 				break;
 
 			case 'editchangelog':
@@ -151,7 +157,10 @@ 
 				{
 					usage("Path '$value' not found!");
 				}
-				if (!in_array('obs',$config['run'])) $config['run'][] = 'obs';
+				if (!in_array('obs',$config['run']))
+				{
+					$config['run'][] = 'obs';
+				}
 				// fall through
 			default:
 				$config[$name] = $value;
@@ -211,7 +220,10 @@ 
 	if (!empty($last_tag))
 	{
 		$cmd = $config['git'].' log '.escapeshellarg($last_tag.'..HEAD');
-		if (getcwd() != $path) $cmd = 'cd '.$path.'; '.$cmd;
+		if (getcwd() != $path)
+		{
+			$cmd = 'cd '.$path.'; '.$cmd;
+		}
 		$output = null;
 		run_cmd($cmd, $output);
 
@@ -242,7 +254,10 @@ 
 {
 	global $config, $verbose;
 
-	if ($verbose) echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	if ($verbose)
+	{
+		echo "Get modules from .mrconfig in checkoutdir $config[checkoutdir]\n";
+	}
 
 	if (!is_dir($config['checkoutdir']))
 	{
@@ -273,12 +288,21 @@ 
 		elseif (isset($module) && preg_match('/^checkout\s*=\s*(git\s+clone\s+(-b\s+[0-9.]+\s+)?((git|http)[^ ]+)|svn\s+checkout\s+((svn|http)[^ ]+))/', $line, $matches))
 		{
 			$repo = $url = substr($matches[1], 0, 3) == 'svn' ? $matches[5] : $matches[3];
-			if (substr($matches[1], 0, 3) == 'svn') $repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			if (substr($matches[1], 0, 3) == 'svn')
+			{
+				$repo = preg_replace('#/(trunk|branches)/.*$#', '', $repo);
+			}
 			$modules[$repo][$config['aliasdir'].($module ? '/'.$module : '')] = $url;
-			if ($module === '' && !isset($baseurl)) $baseurl = str_replace('/egroupware.git', '', $url);
+			if ($module === '' && !isset($baseurl))
+			{
+				$baseurl = str_replace('/egroupware.git', '', $url);
+			}
 		}
 	}
-	if ($verbose) print_r($modules);
+	if ($verbose)
+	{
+		print_r($modules);
+	}
 	return $modules;
 }
 
@@ -345,7 +369,11 @@ 
 
 	$config['tag'] = config_translate('tag');	// allow to use config vars like $version in tag
 
-	if (empty($config['tag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['tag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	echo "Creating tag and pushing $config[tag]\n";
 
@@ -409,7 +437,10 @@ 
 	global $config,$verbose;
 
 	// push local changes to Github incl. tag (tags of apps are already pushed by do_tag)
-	if ($verbose) echo "Pushing changes and tags\n";
+	if ($verbose)
+	{
+		echo "Pushing changes and tags\n";
+	}
 	chdir($config['checkoutdir']);
 	run_cmd($config['git'].' push');
 	$tag = config_translate('tag');
@@ -476,7 +507,10 @@ 
 		{
 			continue;
 		}
-		if ($verbose) echo "Uploading $path as $content_type\n";
+		if ($verbose)
+		{
+			echo "Uploading $path as $content_type\n";
+		}
 		$name = basename($path);
 		github_api($config['upload_url'], array(
 			'name' => $name,
@@ -488,7 +522,10 @@ 
 	{
 		$target = config_translate('release');	// allow to use config vars like $svnbranch in module
 		$cmd = $config['rsync'].' '.$archives.' '.$target;
-		if ($verbose) echo $cmd."\n";
+		if ($verbose)
+		{
+			echo $cmd."\n";
+		}
 		passthru($cmd);
 	}
 }
@@ -521,25 +558,40 @@ 
 	{
 		case 'POST':
 			curl_setopt($c, CURLOPT_POST, true);
-			if (is_array($data)) $data = json_encode($data, JSON_FORCE_OBJECT);
+			if (is_array($data))
+			{
+				$data = json_encode($data, JSON_FORCE_OBJECT);
+			}
 			curl_setopt($c, CURLOPT_POSTFIELDS, $data);
 			break;
 		case 'GET':
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		case 'FILE':
 			curl_setopt($c, CURLOPT_HTTPHEADER, array("Content-type: $content_type"));
 			curl_setopt($c, CURLOPT_POST, true);
 			curl_setopt($c, CURLOPT_POSTFIELDS, file_get_contents($upload));
-			if(count($data)) $url .= '?' . http_build_query($data);
+			if(count($data))
+			{
+				$url .= '?' . http_build_query($data);
+			}
 			break;
 		default:
 			throw new Exception(__FUNCTION__.": Unknown/unimplemented method=$method!");
 	}
 	curl_setopt($c, CURLOPT_URL, $url);
 
-	if (is_string($data)) $short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
-	if ($verbose) echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	if (is_string($data))
+	{
+		$short_data = strlen($data) > 100 ? substr($data, 0, 100).' ...' : $data;
+	}
+	if ($verbose)
+	{
+		echo "Sending $method request to $url ".(isset($short_data)&&$method!='GET'?$short_data:'')."\n";
+	}
 
 	if (($response = curl_exec($c)) === false)
 	{
@@ -550,7 +602,10 @@ 
 		throw new Exception("$method request to $url failed ".(isset($short_data)&&$method!='GET'?$short_data:''));
 	}
 
-	if ($verbose) echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	if ($verbose)
+	{
+		echo (strlen($response) > 200 ? substr($response, 0, 200).' ...' : $response)."\n";
+	}
 
 	curl_close($c);
 
@@ -567,13 +622,19 @@ 
 {
 	global $config;
 
-	if (!isset($value)) $value = $config[$name];
+	if (!isset($value))
+	{
+		$value = $config[$name];
+	}
 	if (is_string($value) && strpos($value, '$') !== false)
 	{
 		$translate = array();
 		foreach($config as $n => $val)
 		{
-			if (is_string($val)) $translate['$'.$n] = $val;
+			if (is_string($val))
+			{
+				$translate['$'.$n] = $val;
+			}
 		}
 		$value = strtr($value, $translate);
 	}
@@ -682,7 +743,10 @@ 
 	if (is_null($revision))
 	{
 		list($tags_url,$branch) = preg_split('#/(branches/|trunk)#',$branch_url);
-		if (empty($branch)) $branch = $config['version'];
+		if (empty($branch))
+		{
+			$branch = $config['version'];
+		}
 		$tags_url .= '/tags';
 		$pattern='|/tags/('.preg_quote($config['version'], '|').'\.[0-9.]+)|';
 		$matches = null;
@@ -708,11 +772,18 @@ 
 	$message = '';
 	foreach($xml as $log)
 	{
-		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix))) continue;	// no match --> ignore
+		if (!($msg = _match_log_pattern($log->msg, $log_pattern, $prefix)))
+		{
+			continue;
+		}
+		// no match --> ignore
 
 		$message .= $msg."\n";
 	}
-	if ($verbose) echo $message;
+	if ($verbose)
+	{
+		echo $message;
+	}
 
 	return $message;
 }
@@ -743,7 +814,10 @@ 
 	{
 		return null;
 	}
-	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix) $msg = $prefix.$msg;
+	if ($prefix_len && substr($msg,0,$prefix_len) != $prefix)
+	{
+		$msg = $prefix.$msg;
+	}
 
 	return $msg;
 }
@@ -780,7 +854,10 @@ 
 		if (!$is_regexp && strpos($log->paths->path, $pattern) !== false ||
 			$is_regexp && preg_match($pattern, $log->paths->path, $matches))
 		{
-			if ($verbose) echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			if ($verbose)
+			{
+				echo "Revision {$log['revision']} matches".($matches?': '.$matches[1] : '')."\n";
+			}
 			return (int)$log['revision'];
 		}
 	}
@@ -800,7 +877,10 @@ 
 	{
 		usage("Path '$config[obs]' not found!");
 	}
-	if ($verbose) echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	if ($verbose)
+	{
+		echo $only_update_changelog ? "Updating OBS changelogs\n" : "Updating OBS checkout\n";
+	}
 	run_cmd('osc up '.$config['obs']);
 
 	$n = 0;
@@ -820,10 +900,16 @@ 
 			if (basename($path) != basename($new_name))
 			{
 				unlink($path);
-				if ($verbose) echo "rm $path\n";
+				if ($verbose)
+				{
+					echo "rm $path\n";
+				}
 			}
 			copy($new_name,dirname($path).'/'.basename($new_name));
-			if ($verbose) echo "cp $new_name ".dirname($path)."/\n";
+			if ($verbose)
+			{
+				echo "cp $new_name ".dirname($path)."/\n";
+			}
 			++$n;
 		}
 		// if we have no changelog (eg. because commands run separate), try parsing it from changelog file
@@ -861,7 +947,10 @@ 
 			if ($content != $content_was)
 			{
 				file_put_contents($path,$content);
-				if ($verbose) echo "Updated $path\n";
+				if ($verbose)
+				{
+					echo "Updated $path\n";
+				}
 				++$n;
 			}
 		}
@@ -899,9 +988,12 @@ 
 			}
 			$n += empty($lines[$n+1]) ? 2 : 1;	// overead empty line behind header
 			$logentry = '';
-			while($lines[$n])	// entry is terminated by empty line
+			while($lines[$n])
+			{
+				// entry is terminated by empty line
 			{
 				$logentry .= (substr($lines[$n], 0, 2) == '  ' ? substr($lines[$n], 2) : $lines[$n])."\n";
+			}
 				++$n;
 			}
 			return substr($logentry, 0, -1);	// remove training "\n"
@@ -922,7 +1014,10 @@ 
 
 	list($header) = explode("\n", $content);
 	$new_header = preg_replace('/\('.preg_quote($config['version']).'\.[0-9.]+[0-9](.*)\)/','('.$config['version'].'.'.$config['packaging'].'\\1)', $header);
-	if (substr($config['changelog'],0,2) != '  ') $config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	if (substr($config['changelog'],0,2) != '  ')
+	{
+		$config['changelog'] = '  '.implode("\n  ",explode("\n",$config['changelog']));
+	}
 	$content = $new_header."\n\n".$config['changelog'].
 		"\n\n -- ".$config['changelog_packager'].'  '.date('r')."\n\n".$content;
 
@@ -960,10 +1055,13 @@ 
 {
 	global $config;
 
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 
 	if (!file_exists($sumsfile))
@@ -974,11 +1072,17 @@ 
 	// signing it
 	if (empty($config['gpg']) || !file_exists($config['gpg']))
 	{
-		if (!empty($config['gpg'])) echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		if (!empty($config['gpg']))
+		{
+			echo "{$config['gpg']} not found --> skipping signing sha1sum file!\n";
+		}
 		return;
 	}
 	echo "Signing sha1sum file:\n";
-	if (file_exists($sumsfile.'.asc')) unlink($sumsfile.'.asc');
+	if (file_exists($sumsfile.'.asc'))
+	{
+		unlink($sumsfile.'.asc');
+	}
 	$cmd = $config['gpg'].' --local-user '.$config['packager'].' --clearsign '.$sumsfile;
 	run_cmd($cmd);
 	unlink($sumsfile);	// delete the unsigned file
@@ -991,11 +1095,17 @@ 
 {
 	global $config;
 
-	if (!file_exists($config['sourcedir'])) mkdir($config['sourcedir'],0755,true);
-	if (substr($config['sourcedir'],0,2) == '~/')	// sha1_file cant deal with '~/rpm'
+	if (!file_exists($config['sourcedir']))
+	{
+		mkdir($config['sourcedir'],0755,true);
+	}
+	if (substr($config['sourcedir'],0,2) == '~/')
+	{
+		// sha1_file cant deal with '~/rpm'
 	{
 		$config['sourcedir'] = getenv('HOME').substr($config['sourcedir'],1);
 	}
+	}
 	$sumsfile = $config['sourcedir'].'/sha1sum-'.$config['packagename'].'-'.$config['version'].'.'.$config['packaging'].'.txt';
 	$sums = '';
 
@@ -1033,12 +1143,22 @@ 
 				{
 					foreach((array)$config['all-add'] as $add)
 					{
-						if (substr($add, -4) != '.tar') continue;	// probably a module
-						if (!($tar = realpath($add))) throw new Exception("File '$add' not found!");
+						if (substr($add, -4) != '.tar')
+						{
+							continue;
+						}
+						// probably a module
+						if (!($tar = realpath($add)))
+						{
+							throw new Exception("File '$add' not found!");
+						}
 						$cmd .= '; '.$config['tar'].' --owner=root --group=root -Af '.$file.' '.$tar;
 					}
 				}
-				if (file_exists($file.'.bz2')) $cmd .= '; rm -f '.$file.'.bz2';
+				if (file_exists($file.'.bz2'))
+				{
+					$cmd .= '; rm -f '.$file.'.bz2';
+				}
 				$cmd .= '; '.$config['bzip2'].' '.$file;
 				// run cmd now and continue without adding all tar-ball to sums, as we dont want to publish it
 				run_cmd($cmd);
@@ -1059,7 +1179,10 @@ 
 
 		foreach($config['extra'] as $name => $modules)
 		{
-			if (is_numeric($name)) $name = $modules;
+			if (is_numeric($name))
+			{
+				$name = $modules;
+			}
 			$dirs = ' egroupware/'.implode(' egroupware/', (array)$modules);
 			$file = $config['sourcedir'].'/'.$config['packagename'].'-'.$name.'-'.$config['version'].'.'.$config['packaging'].'.'.$type;
 			switch($type)
@@ -1100,7 +1223,10 @@ 
 	{
 		echo "Updating virus signatures\n";
 		$cmd = '/usr/bin/sudo '.$config['freshclam'];
-		if (!$verbose && function_exists('posix_getuid') && posix_getuid()) echo $cmd."\n";
+		if (!$verbose && function_exists('posix_getuid') && posix_getuid())
+		{
+			echo $cmd."\n";
+		}
 		$output = null;
 		run_cmd($cmd,$output,1);	// 1 = ignore already up to date database
 	}
@@ -1128,7 +1254,10 @@ 
 	}
 
 	// we need to stash uncommited changes like .mrconfig, before copying
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("cd $config[checkoutdir]; git stash");
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("cd $config[checkoutdir]; git stash");
+	}
 
 	try {
 		$cmd = '/usr/bin/rsync -r --delete --delete-excluded --exclude .svn --exclude .git\* --exclude .mrconfig --exclude node_modules/ --exclude tests '.$config['checkoutdir'].'/ '.$config['egw_buildroot'].'/'.$config['aliasdir'].'/';
@@ -1137,8 +1266,14 @@ 
 	catch (Exception $e) {
 		// catch failures to pop stash, before throwing exception
 	}
-	if (file_exists($config['checkoutdir'].'/.git')) run_cmd("git stash pop");
-	if (isset($e)) throw $e;
+	if (file_exists($config['checkoutdir'].'/.git'))
+	{
+		run_cmd("git stash pop");
+	}
+	if (isset($e))
+	{
+		throw $e;
+	}
 
 	if (($cmd = config_translate('patchCmd')) && $cmd[0] != '#')
 	{
@@ -1223,9 +1358,12 @@ 
 				if ($ret || substr($line,0,5) == 'URL: ')
 				{
 					$url = substr($line,5);
-					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)	// wrong branch (or no svn dir)
+					if ($ret || substr($url,0,strlen($svnbranch)) != $svnbranch)
+					{
+						// wrong branch (or no svn dir)
 					{
 						echo "Checkout is of wrong branch --> deleting it\n";
+					}
 						system('/bin/rm -rf .svn '.$config['aliasdir']);	// --> remove the whole checkout
 						clearstatcache();
 					}
@@ -1272,19 +1410,31 @@ 
 	$svnbranch = $config['svnbase'].'/'.$config['svnbranch'];
 	$url = $svnbranch.'/'.$config['svnalias'];
 	$cmd = $svn.' propget svn:externals --strict '.$url;
-	if ($verbose) echo $cmd."\n";
+	if ($verbose)
+	{
+		echo $cmd."\n";
+	}
 	$output = $ret = null;
 	exec($cmd,$output,$ret);
 	$config['modules'] = array();
 	foreach($output as $line)
 	{
 		$line = trim($line);
-		if (empty($line) || $line[0] == '#') continue;
+		if (empty($line) || $line[0] == '#')
+		{
+			continue;
+		}
 		list($path,$url) = preg_split('/[ \t\r\n]+/',$line);
 		$matches = null;
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		if ($repo == 'http://svn.egroupware.org/egroupware')
+		{
+			$repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		}
 		$config['modules'][$repo][$path] = $url;
 	}
 	// process extra modules
@@ -1293,13 +1443,25 @@ 
 		$module = config_translate(null, $module);	// allow to use config vars like $svnbranch in module
 		$url = strpos($module,'://') === false ? $svnbranch.'/' : '';
 		$url .= $module;
-		if (strpos($module,'://') !== false) $module = basename($module);
-		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches)) die("Invalid SVN URL: $url\n");
+		if (strpos($module,'://') !== false)
+		{
+			$module = basename($module);
+		}
+		if (!preg_match('/([a-z+]+:\/\/[a-z@.]+\/[a-z]+)\/(branches|tags|trunk)/',$url,$matches))
+		{
+			die("Invalid SVN URL: $url\n");
+		}
 		$repo = $matches[1];
-		if ($repo == 'http://svn.egroupware.org/egroupware') $repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		if ($repo == 'http://svn.egroupware.org/egroupware')
+		{
+			$repo = 'svn+ssh://svn@dev.egroupware.org/egroupware';
+		}
 		$config['modules'][$repo][$config['aliasdir'].'/'.$module] = $url;
 	}
-	if ($verbose) print_r($config['modules']);
+	if ($verbose)
+	{
+		print_r($config['modules']);
+	}
 	return $config['modules'];
 }
 
@@ -1310,7 +1472,11 @@ 
 {
 	global $config,$svn;
 
-	if (empty($config['svntag'])) return;	// otherwise we copy everything in svn root!
+	if (empty($config['svntag']))
+	{
+		return;
+	}
+	// otherwise we copy everything in svn root!
 
 	$config['svntag'] = config_translate('svntag');	// allow to use config vars like $version in tag
 
@@ -1355,11 +1521,17 @@ 
 	{
 		$output[] = $cmd;
 		exec($cmd,$output,$ret);
-		if ($verbose) echo implode("\n",$output)."\n";
+		if ($verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 	}
 	if ($ret && !in_array($ret,(array)$no_bailout))
 	{
-		if (!$verbose) echo implode("\n",$output)."\n";
+		if (!$verbose)
+		{
+			echo implode("\n",$output)."\n";
+		}
 		throw new Exception("Error during '$cmd' --> aborting",$ret);
 	}
 	return $ret;
@@ -1405,7 +1577,10 @@ 
 	echo "options and their defaults:\n";
 	if ($verbose)
 	{
-		if (!isset($config['modules'])) $config['modules'] = get_modules_per_repo();
+		if (!isset($config['modules']))
+		{
+			$config['modules'] = get_modules_per_repo();
+		}
 	}
 	else
 	{
@@ -1413,7 +1588,10 @@ 
 	}
 	foreach($config as $name => $default)
 	{
-		if (is_array($default)) $default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		if (is_array($default))
+		{
+			$default = json_encode ($default, JSON_UNESCAPED_SLASHES);
+		}
 		echo '--'.str_pad($name,20).$default."\n";
 	}
 	if ($error)

api/src/CalDAV.php

Indentation +1 added lines, -1 removed lines

@@ -2033,7 +2033,7 @@
 	 *
 	 * Reimplemented to add logging
 	 *
-     * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
+	 * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	 */
 	function ServeRequest($prefix=null)
 	{

Doc Comments +9 added lines, -7 removed lines

@@ -311,6 +311,8 @@ 
 	 * @param string $path
 	 * @param array &$dav
 	 * @param array &$allow
+	 * @param integer[] $dav
+	 * @param boolean $allow
 	 */
 	function OPTIONS($path, &$dav, &$allow)
 	{
@@ -1380,7 +1382,7 @@ 
 	 * @param int|string $id
 	 * @param array $attach array of array with values for keys 'name', 'params', 'value'
 	 * @param boolean $delete_via_put
-	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
+	 * @return null|false false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
 	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
 	{
@@ -1584,7 +1586,7 @@ 
 	 * @param string $managed_id
 	 * @param string $app =null app-name to check against path
 	 * @param string|int $id =null id to check agains path
-	 * @return string|boolean "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
+	 * @return false|string "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
 	 */
 	static public function managed_id2path($managed_id, $app=null, $id=null)
 	{
@@ -1783,7 +1785,7 @@ 
 	 * MKCOL method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function MKCOL($options)
 	{
@@ -1796,7 +1798,7 @@ 
 	 * MOVE method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function MOVE($options)
 	{
@@ -1809,7 +1811,7 @@ 
 	 * COPY method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function COPY($options, $del=false)
 	{
@@ -1822,7 +1824,7 @@ 
 	 * LOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string|boolean   true on success
 	 */
 	function LOCK(&$options)
 	{
@@ -1856,7 +1858,7 @@ 
 	 * UNLOCK method handler
 	 *
 	 * @param  array  general parameter passing array
-	 * @return bool   true on success
+	 * @return string   true on success
 	 */
 	function UNLOCK(&$options)
 	{

Braces +260 added lines, -64 removed lines

@@ -222,11 +222,20 @@ 
 	function __construct()
 	{
 		// log which CalDAVTester test is currently running, set as User-Agent header
-		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/') error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+		if (substr($_SERVER['HTTP_USER_AGENT'], 0, 14) == 'scripts/tests/')
+		{
+			error_log('****** '.$_SERVER['HTTP_USER_AGENT']);
+		}
 
-		if (!$this->debug) $this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
+		if (!$this->debug)
+		{
+			$this->debug = (int)$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level'];
+		}
 
-		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
+		if ($this->debug > 2)
+		{
+			error_log('groupdav: $_SERVER='.array2string($_SERVER));
+		}
 
 		// setting our own exception handler, to be able to still log the requests
 		set_exception_handler(array(__CLASS__,'exception_handler'));
@@ -254,7 +263,10 @@ 
 				$this->crrnd = true; // Older Apple Addressbook.app does not cope with namespace redundancy
 				break;
 		}
-		if ($this->debug) error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
+		}
 
 		// adding EGroupware version to X-Dav-Powered-By header eg. "EGroupware 1.8.001 CalDAV/CardDAV/GroupDAV server"
 		$this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
@@ -300,7 +312,10 @@ 
 	 */
 	function app_handler($app)
 	{
-		if (isset($this->root[$app]['app'])) $app = $this->root[$app]['app'];
+		if (isset($this->root[$app]['app']))
+		{
+			$app = $this->root[$app]['app'];
+		}
 
 		return Handler::app_handler($app,$this);
 	}
@@ -317,22 +332,34 @@ 
 		unset($allow);	// not used, but required by function signature
 
 		// locking support
-		if (!in_array('2', $dav)) $dav[] = '2';
+		if (!in_array('2', $dav))
+		{
+			$dav[] = '2';
+		}
 
-		if (preg_match('#/(calendar(-[^/]+)?|inbox|outbox)/#', $path))	// eg. /<username>/calendar-<otheruser>/
+		if (preg_match('#/(calendar(-[^/]+)?|inbox|outbox)/#', $path))
+		{
+			// eg. /<username>/calendar-<otheruser>/
 		{
 			$app = 'calendar';
 		}
-		elseif (preg_match('#/addressbook(-[^/]+)?/#', $path))	// eg. /<username>/addressbook-<otheruser>/
+		}
+		elseif (preg_match('#/addressbook(-[^/]+)?/#', $path))
+		{
+			// eg. /<username>/addressbook-<otheruser>/
 		{
 			$app = 'addressbook';
 		}
+		}
 		// CalDAV and CardDAV
 		$dav[] = 'access-control';
 
-		if ($app !== 'addressbook')	// CalDAV
+		if ($app !== 'addressbook')
+		{
+			// CalDAV
 		{
 			$dav[] = 'calendar-access';
+		}
 			$dav[] = 'calendar-auto-schedule';
 			$dav[] = 'calendar-proxy';
 			// required by iOS iCal to use principal-property-search to autocomplete participants (and locations)
@@ -349,9 +376,13 @@ 
 			//$dav[] = 'calendarserver-sharing';
 			//$dav[] = 'calendarserver-sharing-no-scheduling';
 		}
-		if ($app !== 'calendar')	// CardDAV
+		if ($app !== 'calendar')
 		{
-			$dav[] = 'addressbook';	// CardDAV uses "addressbook" NOT "addressbook-access"
+			// CardDAV
+		{
+			$dav[] = 'addressbook';
+		}
+		// CardDAV uses "addressbook" NOT "addressbook-access"
 		}
 		//error_log(__METHOD__."('$path') --> app='$app' --> DAV: ".implode(', ', $dav));
 	}
@@ -365,7 +396,10 @@ 
 	 */
 	function PROPFIND(&$options, &$files, $method='PROPFIND')
 	{
-		if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__CLASS__."::$method(".array2string($options).')');
+		}
 
 		// make options (readonly) available to all class methods, eg. prop_requested
 		$this->propfind_options = $options;
@@ -374,18 +408,27 @@ 
 		$id = $app = $user = $user_prefix = null;
 		if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0)
 		{
-			if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
+			if ($this->debug > 1)
+			{
+				error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
+			}
 			return '404 Not Found';
 		}
-		if ($this->debug > 1) error_log(__CLASS__."::$method(path='$options[path]'): user='$user', user_prefix='$user_prefix', app='$app', id='$id'");
+		if ($this->debug > 1)
+		{
+			error_log(__CLASS__."::$method(path='$options[path]'): user='$user', user_prefix='$user_prefix', app='$app', id='$id'");
+		}
 
 		$files = array('files' => array());
 		$path = $user_prefix = $this->_slashify($user_prefix);
 
-		if (!$app)	// user root folder containing apps
+		if (!$app)
+		{
+			// user root folder containing apps
 		{
 			// add root with current users apps
 			$this->add_home($files, $path, $user, $options['depth']);
+		}
 
 			if ($path == '/')
 			{
@@ -417,16 +460,22 @@ 
 		}
 		if ($app != 'principals' && !isset($GLOBALS['egw_info']['user']['apps'][$this->root[$app]['app'] ? $this->root[$app]['app'] : $app]))
 		{
-			if ($this->debug) error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
+			if ($this->debug)
+			{
+				error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
+			}
 			return "403 Forbidden: no app rights for '$app'";	// no rights for the given app
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			if ($method != 'REPORT' && !$id)	// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
+			if ($method != 'REPORT' && !$id)
+			{
+				// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
 			{
 				// KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
 				$files['files'][0] = $this->add_app($app,$app=='addressbook'&&$handler->get_agent()=='kde',$user,
 					$this->_slashify($options['path']));
+			}
 
 				// Hack for iOS 5.0.1 addressbook to stop asking directory gateway permissions with depth != 0
 				// values for depth are 0, 1, "infinit" or not set which has to be interpreted as "infinit"
@@ -436,7 +485,11 @@ 
 					$this->log(__CLASS__."::$method(".array2string($options).') Enabling hack for iOS 5.0.1 addressbook: force Depth: 0 on PROPFIND for directory gateway!');
 					return true;
 				}
-				if (!$options['depth']) return true;	// depth 0 --> show only the self url
+				if (!$options['depth'])
+				{
+					return true;
+				}
+				// depth 0 --> show only the self url
 			}
 			return $handler->propfind($this->_slashify($options['path']),$options,$files,$user,$id);
 		}
@@ -457,7 +510,10 @@ 
 		// resourcetype: collection
 		$props['resourcetype'][] = self::mkprop('collection','');
 
-		if (!isset($props['getcontenttype'])) $props['getcontenttype'] = 'httpd/unix-directory';
+		if (!isset($props['getcontenttype']))
+		{
+			$props['getcontenttype'] = 'httpd/unix-directory';
+		}
 
 		return $this->add_resource($path, $props, $privileges, $supported_privileges);
 	}
@@ -489,11 +545,17 @@ 
 			'resourcetype'     => '',
 		) as $name => $default)
 		{
-			if (!isset($props[$name])) $props[$name] = $default;
+			if (!isset($props[$name]))
+			{
+				$props[$name] = $default;
+			}
 		}
 
 		// if requested add privileges
-		if (is_null($supported_privileges)) $supported_privileges = $this->supported_privileges;
+		if (is_null($supported_privileges))
+		{
+			$supported_privileges = $this->supported_privileges;
+		}
 		if ($this->prop_requested('current-user-privilege-set') === true)
 		{
 			foreach($privileges as $name)
@@ -514,7 +576,10 @@ 
 			$props['owner'] = '';
 		}
 
-		if ($this->debug > 1) error_log(__METHOD__."(path='$path', props=".array2string($props).')');
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__."(path='$path', props=".array2string($props).')');
+		}
 
 		// convert simple associative properties to HTTP_WebDAV_Server ones
 		foreach($props as $name => &$prop)
@@ -554,7 +619,10 @@ 
 		{
 			foreach($data as $name => $data)
 			{
-				if ($name[0] == '*') continue;
+				if ($name[0] == '*')
+				{
+					continue;
+				}
 				if (is_array($data) && $data['*only*'] && strpos($path, $data['*only*']) === false)
 				{
 					continue;	// wrong path
@@ -668,8 +736,15 @@ 
 		{
 			foreach($this->root as $app => $data)
 			{
-				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue;	// no rights for the given app
-				if (!empty($data['user-only']) && ($path == '/' || $user < 0)) continue;
+				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app])
+				{
+					continue;
+				}
+				// no rights for the given app
+				if (!empty($data['user-only']) && ($path == '/' || $user < 0))
+				{
+					continue;
+				}
 
 				$files['files'][] = $this->add_app($app,false,$user,$path.$app.'/');
 
@@ -705,7 +780,10 @@ 
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
-			if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
+			if ($this->debug)
+			{
+				error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
+			}
 			return "403 Forbidden: no app rights for 'resources'";	// no rights for the given app
 		}
 		list(,$what) = explode('/', $path);
@@ -744,10 +822,13 @@ 
 	{
 		// currently only show shared calendars/addressbooks for current user and not in the root
 		if ($path == '/' || $user != $GLOBALS['egw_info']['user']['account_id'] ||
-			!isset($GLOBALS['egw_info']['user']['apps'][$app]))	// also avoids principals, inbox and outbox
+			!isset($GLOBALS['egw_info']['user']['apps'][$app]))
+		{
+			// also avoids principals, inbox and outbox
 		{
 			return true;
 		}
+		}
 		$handler = $this->app_handler($app);
 		if (($shared = $handler->get_shared()))
 		{
@@ -755,7 +836,10 @@ 
 			{
 				$file = $this->add_app($app,false,$id,$path.$owner.'/');
 				// mark other users calendar as shared (iOS 5.0.1 AB does NOT display AB marked as shared!)
-				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				if ($app == 'calendar')
+				{
+					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				}
 				$files[] = $file;
 			}
 		}
@@ -791,7 +875,10 @@ 
 			{
 				$name = $this->accounts->id2name($account,'account_fullname');
 			}
-			if (empty($name)) $name = '#'.$account;
+			if (empty($name))
+			{
+				$name = '#'.$account;
+			}
 		}
 		return $name;
 	}
@@ -807,7 +894,10 @@ 
 	 */
 	protected function add_app($app,$no_extra_types=false,$user=null,$path='/')
 	{
-		if ($this->debug) error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
+		}
 		$user_preferences = $GLOBALS['egw_info']['user']['preferences'];
 		if (is_string($user) && $user[0] == 'r' && ($resource = Principals::read_resource(substr($user, 1))))
 		{
@@ -831,7 +921,10 @@ 
 			$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
 			$principalType = 'users';
 		}
-		if (!isset($displayname)) $displayname = $this->account_name($user);
+		if (!isset($displayname))
+		{
+			$displayname = $this->account_name($user);
+		}
 
 		$props = array(
 			'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
@@ -864,10 +957,13 @@ 
 
 		// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
 		// leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
-		if ($app && !in_array($app,array('inbox','outbox','principals')))	// not on inbox, outbox or principals
+		if ($app && !in_array($app,array('inbox','outbox','principals')))
+		{
+			// not on inbox, outbox or principals
 		{
 			$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
 		}
+		}
 
 		// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
 		$ns = null;
@@ -961,7 +1057,10 @@ 
 	 */
 	function REPORT(&$options, &$files)
 	{
-		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return $this->PROPFIND($options,$files,'REPORT');
 	}
@@ -984,7 +1083,10 @@ 
 	 */
 	function GET(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals')
@@ -1222,7 +1324,10 @@ 
 			$_GET['add-member'] = '';	// otherwise we give no Location header
 			return $this->PUT($options);
 		}
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		$this->_parse_path($options['path'],$id,$app,$user);
@@ -1393,7 +1498,11 @@ 
 			error_log(__METHOD__."('$app', $id, ...) no rights to update attachments");
 			return;	// no rights --> nothing to do
 		}
-		if (!is_array($attach)) $attach = array();	// could be PEAR_Error if not set
+		if (!is_array($attach))
+		{
+			$attach = array();
+		}
+		// could be PEAR_Error if not set
 
 		if ($delete_via_put)
 		{
@@ -1438,7 +1547,11 @@ 
 					// reuse valid managed-id --> symlink attachment
 					if (Vfs::file_exists($link))
 					{
-						if (Vfs::readlink($link) === $path) continue;	// no need to recreate identical link
+						if (Vfs::readlink($link) === $path)
+						{
+							continue;
+						}
+						// no need to recreate identical link
 						Vfs::unlink($link);		// symlink will fail, if $link exists
 					}
 					if (!Vfs::symlink($path, $link))
@@ -1478,7 +1591,11 @@ 
 	{
 		$filename = empty($_filename) ? 'attachment' : Vfs::basename($_filename);
 
-		if (strpos($mime, ';')) list($mime) = explode(';', $mime);	// in case it contains eg. charset info
+		if (strpos($mime, ';'))
+		{
+			list($mime) = explode(';', $mime);
+		}
+		// in case it contains eg. charset info
 
 		$ext = !empty($mime) ? MimeMagic::mime2ext($mime) : '';
 
@@ -1497,9 +1614,15 @@ 
 		for($i = 1; $i < 100; ++$i)
 		{
 			$path = Link::vfs_path($app, $id, $filename.($i > 1 ? '-'.$i : '').$ext, true);
-			if (!Vfs::stat($path)) break;
+			if (!Vfs::stat($path))
+			{
+				break;
+			}
+		}
+		if ($i >= 100)
+		{
+			return null;
 		}
-		if ($i >= 100) return null;
 
 		if (!($dir = Vfs::dirname($path)) || !Vfs::file_exists($dir) && !Vfs::mkdir($dir, 0777, STREAM_MKDIR_RECURSIVE))
 		{
@@ -1549,7 +1672,11 @@ 
 			// handle symlinks --> return target size and mime-type
 			if (($target = Vfs::readlink($path)))
 			{
-				if (!($stat = Vfs::stat($target))) continue;	// broken or inaccessible symlink
+				if (!($stat = Vfs::stat($target)))
+				{
+					continue;
+				}
+				// broken or inaccessible symlink
 
 				// check if target is in /apps, probably reused MANAGED-ID --> return it
 				if (substr($target, 0, 6) == '/apps/')
@@ -1641,14 +1768,20 @@ 
 	 */
 	function PROPPATCH(&$options)
 	{
-		if ($this->debug) error_log(__METHOD__."(".array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__."(".array2string($options).')');
+		}
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
 		self::_parse_path($options['path'],$id,$app,$user,$user_prefix);	// allways returns false if eg. !$id
 		if ($app == 'principals' || $id || $options['path'] == '/')
 		{
-			if ($this->debug > 1) error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
+			if ($this->debug > 1)
+			{
+				error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
+			}
 			foreach($options['props'] as &$prop)
 			{
 				$prop['status'] = '403 Forbidden';
@@ -1673,11 +1806,14 @@ 
 						self::$proppatch_props[$prop['name']] == $prop['ns'] ? '' : ':'.$prop['ns']);
 				}
 				//error_log("preferences['user']['$app']['$name']=".array2string($GLOBALS['egw_info']['user']['preferences'][$app][$name]).($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'] ? ' !== ':' === ')."prop['val']=".array2string($prop['val']));
-				if ($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'])	// nothing to change otherwise
+				if ($GLOBALS['egw_info']['user']['preferences'][$app][$name] !== $prop['val'])
+				{
+					// nothing to change otherwise
 				{
 					if (isset($prop['val']))
 					{
 						$GLOBALS['egw']->preferences->add($app, $name, $prop['val']);
+				}
 					}
 					else
 					{
@@ -1729,7 +1865,10 @@ 
 			}
 		}
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = $prefix = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user,$prefix))
@@ -1741,7 +1880,10 @@ 
 			$status = $handler->put($options,$id,$user,$prefix);
 
 			// set default stati: true --> 204 No Content, false --> should be already handled
-			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
+			if (is_bool($status))
+			{
+				$status = $status ? '204 No Content' : '400 Something went wrong';
+			}
 
 			// check/handle Prefer: return-representation
 			if ($status[0] === '2' || $status === true)
@@ -1765,7 +1907,10 @@ 
 	 */
 	function DELETE($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		$id = $app = $user = null;
 		if (!$this->_parse_path($options['path'],$id,$app,$user))
@@ -1776,7 +1921,10 @@ 
 		{
 			$status = $handler->delete($options,$id,$user);
 			// set default stati: true --> 204 No Content, false --> should be already handled
-			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
+			if (is_bool($status))
+			{
+				$status = $status ? '204 No Content' : '400 Something went wrong';
+			}
 			return $status;
 		}
 		return '501 Not Implemented';
@@ -1790,7 +1938,10 @@ 
 	 */
 	function MKCOL($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1803,7 +1954,10 @@ 
 	 */
 	function MOVE($options)
 	{
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1816,7 +1970,10 @@ 
 	 */
 	function COPY($options, $del=false)
 	{
-		if ($this->debug) error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
+		if ($this->debug)
+		{
+			error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
+		}
 
 		return '501 Not Implemented';
 	}
@@ -1833,7 +1990,10 @@ 
 		self::_parse_path($options['path'],$id,$app,$user);
 		$path = Vfs::app_entry_lock_path($app,$id);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$path");
+		}
 
 		// get the app handler, to check if the user has edit access to the entry (required to make locks)
 		$handler = self::app_handler($app);
@@ -1848,10 +2008,13 @@ 
 		// dont know why, but HTTP_WebDAV_Server passes the owner in D:href tags, which get's passed unchanged to checkLock/PROPFIND
 		// that's wrong according to the standard and cadaver does not show it on discover --> strip_tags removes eventual tags
 		if (($ret = Vfs::lock($path,$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))		// false = no ACL check
+			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))
+		{
+			// false = no ACL check
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
+		}
 		return $ret;
 	}
 
@@ -1867,7 +2030,10 @@ 
 		self::_parse_path($options['path'],$id,$app,$user);
 		$path = Vfs::app_entry_lock_path($app,$id);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$path");
+		}
 		return Vfs::unlock($path,$options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
@@ -1896,7 +2062,10 @@ 
 		$id = $app = $user = null;
 		self::_parse_path($options['path'],$id,$app,$user);
 
-		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
+		if ($this->debug)
+		{
+			error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
+		}
 
 		$options['errors'] = array();
 		switch ($app)
@@ -1959,7 +2128,10 @@ 
 			$user = array_shift($parts);
 		}
 
-		if (!isset($app)) $app = array_shift($parts);
+		if (!isset($app))
+		{
+			$app = array_shift($parts);
+		}
 
 		// /addressbook-accounts/
 		if (!$account_id && $app == 'addressbook-accounts')
@@ -2052,7 +2224,10 @@ 
 		}
 		parent::ServeRequest($prefix);
 
-		if (self::$request_starttime) self::log_request();
+		if (self::$request_starttime)
+		{
+			self::log_request();
+		}
 	}
 
 	/**
@@ -2119,11 +2294,23 @@ 
 			{
 				$content .= $line."\n";
 			}
-			if (($c = ob_get_flush())) $content .= "\n";
-			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			if (($c = ob_get_flush()))
+			{
+				$content .= "\n";
+			}
+			if (self::$log_level !== 'f' && strlen($c) > 1536)
+			{
+				$c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			}
 			$content .= $c;
-			if ($extra) $content .= $extra;
-			if ($this->to_log) $content .= "\n### ".implode("\n### ", $this->to_log)."\n";
+			if ($extra)
+			{
+				$content .= $extra;
+			}
+			if ($this->to_log)
+			{
+				$content .= "\n### ".implode("\n### ", $this->to_log)."\n";
+			}
 			$content .= $this->_http_status[0] == '4' && substr($this->_http_status,0,3) != '412' ||
 				$this->_http_status[0] == '5' ? '###' : '***';	// mark failed requests with ###, instead of ***
 			$content .= sprintf(' %s --> "%s" took %5.3f s',$_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD']=='REPORT'?' '.$this->propfind_options['root']['name']:'').' '.$_SERVER['PATH_INFO'],$this->_http_status,microtime(true)-self::$request_starttime)."\n\n";
@@ -2181,8 +2368,14 @@ 
 	 */
 	protected static function add_prop(\XMLWriter $xml, $props)
 	{
-		if (is_string($props)) $props = self::mkprop($props, '');
-		if (isset($props['name'])) $props = array($props);
+		if (is_string($props))
+		{
+			$props = self::mkprop($props, '');
+		}
+		if (isset($props['name']))
+		{
+			$props = array($props);
+		}
 
 		foreach($props as $prop)
 		{
@@ -2269,7 +2462,10 @@ 
 	 */
 	static function generate_uid($_appName, $_eventID)
 	{
-		if(empty($_appName) || empty($_eventID)) return false;
+		if(empty($_appName) || empty($_eventID))
+		{
+			return false;
+		}
 
 		return $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
 	}

Spacing +184 added lines, -184 removed lines

@@ -117,12 +117,12 @@ 
 		'inbox' => array(
 			'resourcetype' => array(self::CALDAV => 'schedule-inbox'),
 			'app' => 'calendar',
-			'user-only' => true,	// display just in user home
+			'user-only' => true, // display just in user home
 		),
 		'outbox' => array(
 			'resourcetype' => array(self::CALDAV => 'schedule-outbox'),
 			'app' => 'calendar',
-			'user-only' => true,	// display just in user home
+			'user-only' => true, // display just in user home
 		),
 		'infolog' => array(
 			'resourcetype' => array(self::GROUPDAV => 'vtodo-collection', self::CALDAV => 'calendar'),
@@ -229,14 +229,14 @@ 
 		if ($this->debug > 2) error_log('groupdav: $_SERVER='.array2string($_SERVER));
 
 		// setting our own exception handler, to be able to still log the requests
-		set_exception_handler(array(__CLASS__,'exception_handler'));
+		set_exception_handler(array(__CLASS__, 'exception_handler'));
 
 		// crrnd: client refuses redundand namespace declarations
 		// setting redundand namespaces as the default for (Cal|Card|Group)DAV, as the majority of the clients either require or can live with it
 		$this->crrnd = false;
 
 		// identify clients, which do NOT support path AND full url in <D:href> of PROPFIND request
-		switch(($agent = Handler::get_agent()))
+		switch (($agent = Handler::get_agent()))
 		{
 			case 'kde':	// KAddressbook (at least in 3.5 can NOT subscribe / does NOT find addressbook)
 				$this->client_require_href_as_url = true;
@@ -257,12 +257,12 @@ 
 		if ($this->debug) error_log(__METHOD__."() HTTP_USER_AGENT='$_SERVER[HTTP_USER_AGENT]' --> '$agent' --> client_requires_href_as_url=$this->client_require_href_as_url, crrnd(client refuses redundand namespace declarations)=$this->crrnd");
 
 		// adding EGroupware version to X-Dav-Powered-By header eg. "EGroupware 1.8.001 CalDAV/CardDAV/GroupDAV server"
-		$this->dav_powered_by = str_replace('EGroupware','EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
+		$this->dav_powered_by = str_replace('EGroupware', 'EGroupware '.$GLOBALS['egw_info']['server']['versions']['phpgwapi'],
 			$this->dav_powered_by);
 
 		parent::__construct();
 		// hack to allow to use query parameters in WebDAV, which HTTP_WebDAV_Server interprets as part of the path
-		list($this->_SERVER['REQUEST_URI']) = explode('?',$this->_SERVER['REQUEST_URI']);
+		list($this->_SERVER['REQUEST_URI']) = explode('?', $this->_SERVER['REQUEST_URI']);
 		/*if (substr($this->_SERVER['REQUEST_URI'],-13) == '/;add-member/')
 		{
 			$_GET['add-member'] = '';
@@ -277,15 +277,15 @@ 
 		}
 		else
 		{
-			$this->current_user_principal = (@$_SERVER["HTTPS"] === "on" ? "https:" : "http:") .
-				'//' . $_SERVER['HTTP_HOST'] . $_SERVER['SCRIPT_NAME'] . '/';
+			$this->current_user_principal = (@$_SERVER["HTTPS"] === "on" ? "https:" : "http:").
+				'//'.$_SERVER['HTTP_HOST'].$_SERVER['SCRIPT_NAME'].'/';
 		}
 		$this->current_user_principal .= 'principals/users/'.$GLOBALS['egw_info']['user']['account_lid'].'/';
 
 		// if client requires pathes instead of URLs
 		if (!$this->client_require_href_as_url)
 		{
-			$this->current_user_principal = parse_url($this->current_user_principal,PHP_URL_PATH);
+			$this->current_user_principal = parse_url($this->current_user_principal, PHP_URL_PATH);
 		}
 		$this->accounts = $GLOBALS['egw']->accounts;
 
@@ -302,7 +302,7 @@ 
 	{
 		if (isset($this->root[$app]['app'])) $app = $this->root[$app]['app'];
 
-		return Handler::app_handler($app,$this);
+		return Handler::app_handler($app, $this);
 	}
 
 	/**
@@ -314,7 +314,7 @@ 
 	 */
 	function OPTIONS($path, &$dav, &$allow)
 	{
-		unset($allow);	// not used, but required by function signature
+		unset($allow); // not used, but required by function signature
 
 		// locking support
 		if (!in_array('2', $dav)) $dav[] = '2';
@@ -351,7 +351,7 @@ 
 		}
 		if ($app !== 'calendar')	// CardDAV
 		{
-			$dav[] = 'addressbook';	// CardDAV uses "addressbook" NOT "addressbook-access"
+			$dav[] = 'addressbook'; // CardDAV uses "addressbook" NOT "addressbook-access"
 		}
 		//error_log(__METHOD__."('$path') --> app='$app' --> DAV: ".implode(', ', $dav));
 	}
@@ -363,7 +363,7 @@ 
 	 * @param  array  return array for file properties
 	 * @return bool   true on success
 	 */
-	function PROPFIND(&$options, &$files, $method='PROPFIND')
+	function PROPFIND(&$options, &$files, $method = 'PROPFIND')
 	{
 		if ($this->debug) error_log(__CLASS__."::$method(".array2string($options).')');
 
@@ -372,7 +372,7 @@ 
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
-		if (!self::_parse_path($options['path'],$id,$app,$user,$user_prefix) && $app && !$user && $user !== 0)
+		if (!self::_parse_path($options['path'], $id, $app, $user, $user_prefix) && $app && !$user && $user !== 0)
 		{
 			if ($this->debug > 1) error_log(__CLASS__."::$method: user='$user', app='$app', id='$id': 404 not found!");
 			return '404 Not Found';
@@ -404,9 +404,9 @@ 
 				$files['files'][] = $this->add_collection('/principals/', array(
 					'displayname' => lang('Accounts'),
 				));
-				foreach($this->accounts->search(array('type' => 'both','order'=>'account_lid')) as $account)
+				foreach ($this->accounts->search(array('type' => 'both', 'order'=>'account_lid')) as $account)
 				{
-					$this->add_home($files, $path.$account['account_lid'].'/', $account['account_id'], $options['depth'] == 'infinity' ? 'infinity' : $options['depth']-1);
+					$this->add_home($files, $path.$account['account_lid'].'/', $account['account_id'], $options['depth'] == 'infinity' ? 'infinity' : $options['depth'] - 1);
 				}
 			}
 			return true;
@@ -418,14 +418,14 @@ 
 		if ($app != 'principals' && !isset($GLOBALS['egw_info']['user']['apps'][$this->root[$app]['app'] ? $this->root[$app]['app'] : $app]))
 		{
 			if ($this->debug) error_log(__CLASS__."::$method(path=$options[path]) 403 Forbidden: no app rights for '$app'");
-			return "403 Forbidden: no app rights for '$app'";	// no rights for the given app
+			return "403 Forbidden: no app rights for '$app'"; // no rights for the given app
 		}
 		if (($handler = self::app_handler($app)))
 		{
 			if ($method != 'REPORT' && !$id)	// no self URL for REPORT requests (only PROPFIND) or propfinds on an id
 			{
 				// KAddressbook doubles the folder, if the self URL contains the GroupDAV/CalDAV resourcetypes
-				$files['files'][0] = $this->add_app($app,$app=='addressbook'&&$handler->get_agent()=='kde',$user,
+				$files['files'][0] = $this->add_app($app, $app == 'addressbook' && $handler->get_agent() == 'kde', $user,
 					$this->_slashify($options['path']));
 
 				// Hack for iOS 5.0.1 addressbook to stop asking directory gateway permissions with depth != 0
@@ -436,9 +436,9 @@ 
 					$this->log(__CLASS__."::$method(".array2string($options).') Enabling hack for iOS 5.0.1 addressbook: force Depth: 0 on PROPFIND for directory gateway!');
 					return true;
 				}
-				if (!$options['depth']) return true;	// depth 0 --> show only the self url
+				if (!$options['depth']) return true; // depth 0 --> show only the self url
 			}
-			return $handler->propfind($this->_slashify($options['path']),$options,$files,$user,$id);
+			return $handler->propfind($this->_slashify($options['path']), $options, $files, $user, $id);
 		}
 		return '501 Not Implemented';
 	}
@@ -452,10 +452,10 @@ 
 	 * @param array $supported_privileges =null default $this->supported_privileges
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	public function add_collection($path, array $props = array(), array $privileges=array('read','read-acl','read-current-user-privilege-set'), array $supported_privileges=null)
+	public function add_collection($path, array $props = array(), array $privileges = array('read', 'read-acl', 'read-current-user-privilege-set'), array $supported_privileges = null)
 	{
 		// resourcetype: collection
-		$props['resourcetype'][] = self::mkprop('collection','');
+		$props['resourcetype'][] = self::mkprop('collection', '');
 
 		if (!isset($props['getcontenttype'])) $props['getcontenttype'] = 'httpd/unix-directory';
 
@@ -471,16 +471,16 @@ 
 	 * @param array $supported_privileges =null default $this->supported_privileges
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	public function add_resource($path, array $props = array(), array $privileges=array('read','read-current-user-privilege-set'), array $supported_privileges=null)
+	public function add_resource($path, array $props = array(), array $privileges = array('read', 'read-current-user-privilege-set'), array $supported_privileges = null)
 	{
 		// props for all collections: current-user-principal and principal-collection-set
 		$props['current-user-principal'] = array(
-			self::mkprop('href',$this->current_user_principal));
+			self::mkprop('href', $this->current_user_principal));
 		$props['principal-collection-set'] = array(
-			self::mkprop('href',$this->base_uri.'/principals/'));
+			self::mkprop('href', $this->base_uri.'/principals/'));
 
 		// required props per WebDAV standard
-		foreach(array(
+		foreach (array(
 			'displayname'      => basename($path),
 			'getetag'          => 'none',
 			'getcontentlength' => '',
@@ -496,7 +496,7 @@ 
 		if (is_null($supported_privileges)) $supported_privileges = $this->supported_privileges;
 		if ($this->prop_requested('current-user-privilege-set') === true)
 		{
-			foreach($privileges as $name)
+			foreach ($privileges as $name)
 			{
 				$props['current-user-privilege-set'][] = self::mkprop('privilege', array(
 					is_array($name) ? self::mkprop($name['ns'], $name['name'], '') : self::mkprop($name, '')));
@@ -504,7 +504,7 @@ 
 		}
 		if ($this->prop_requested('supported-privilege-set') === true)
 		{
-			foreach($supported_privileges as $name => $data)
+			foreach ($supported_privileges as $name => $data)
 			{
 				$props['supported-privilege-set'][] = $this->supported_privilege($name, $data, $path);
 			}
@@ -517,7 +517,7 @@ 
 		if ($this->debug > 1) error_log(__METHOD__."(path='$path', props=".array2string($props).')');
 
 		// convert simple associative properties to HTTP_WebDAV_Server ones
-		foreach($props as $name => &$prop)
+		foreach ($props as $name => &$prop)
 		{
 			if (!is_array($prop) || !isset($prop['name']))
 			{
@@ -544,7 +544,7 @@ 
 	 * @param string $path =null path to match with $data['*only*']
 	 * @return array of self::mkprop() arrays
 	 */
-	protected function supported_privilege($name, $data, $path=null)
+	protected function supported_privilege($name, $data, $path = null)
 	{
 		$props = array();
 		$props[] = self::mkprop('privilege', array(is_array($data) && $data['*ns*'] ?
@@ -552,12 +552,12 @@ 
 		$props[] = self::mkprop('description', is_array($data) ? $data['*description*'] : $data);
 		if (is_array($data))
 		{
-			foreach($data as $name => $data)
+			foreach ($data as $name => $data)
 			{
 				if ($name[0] == '*') continue;
 				if (is_array($data) && $data['*only*'] && strpos($path, $data['*only*']) === false)
 				{
-					continue;	// wrong path
+					continue; // wrong path
 				}
 				$props[] = $this->supported_privilege($name, $data, $path);
 			}
@@ -573,20 +573,20 @@ 
 	 * @param boolean $return_prop =false if true return the property array with values for 'name', 'xmlns', 'attrs', 'children'
 	 * @return boolean|string|array true: $name explicitly requested (or autoindex), "all": allprop or "names": propname requested, false: $name was not requested
 	 */
-	function prop_requested($name, $ns=null, $return_prop=false)
+	function prop_requested($name, $ns = null, $return_prop = false)
 	{
 		if (!is_array($this->propfind_options) || !isset($this->propfind_options['props']))
 		{
-			$ret = true;	// no props set, should happen only in autoindex, we return true to show all available props
+			$ret = true; // no props set, should happen only in autoindex, we return true to show all available props
 		}
 		elseif (!is_array($this->propfind_options['props']))
 		{
-			$ret = $this->propfind_options['props'];	// "all": allprop or "names": propname
+			$ret = $this->propfind_options['props']; // "all": allprop or "names": propname
 		}
 		else
 		{
 			$ret = false;
-			foreach($this->propfind_options['props'] as $prop)
+			foreach ($this->propfind_options['props'] as $prop)
 			{
 				if ($prop['name'] == $name && (is_null($ns) || $prop['xmlns'] == $ns))
 				{
@@ -621,7 +621,7 @@ 
 		$account = $this->accounts->read($account_lid);
 
 		$calendar_user_address_set = array(
-			self::mkprop('href','urn:uuid:'.$account['account_lid']),
+			self::mkprop('href', 'urn:uuid:'.$account['account_lid']),
 		);
 		if ($user < 0)
 		{
@@ -632,29 +632,29 @@ 
 		{
 			$principalType = 'users';
 			$displayname = $account['account_fullname'];
-			$calendar_user_address_set[] = self::mkprop('href','mailto:'.$account['account_email']);
+			$calendar_user_address_set[] = self::mkprop('href', 'mailto:'.$account['account_email']);
 		}
-		$calendar_user_address_set[] = self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
+		$calendar_user_address_set[] = self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account['account_lid'].'/');
 
 		if ($depth && $path == '/')
 		{
 			$displayname = 'EGroupware (Cal|Card|Group)DAV server';
 		}
 
-		$displayname = Translation::convert($displayname, Translation::charset(),'utf-8');
+		$displayname = Translation::convert($displayname, Translation::charset(), 'utf-8');
 		// self url
 		$props = array(
 			'displayname' => $displayname,
-			'owner' => $path == '/' ? '' : array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
+			'owner' => $path == '/' ? '' : array(self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
 		);
 
 		if ($path != '/')
 		{
 			// add props modifyable via proppatch from client, eg. jqcalendar stores it's preferences there
-			foreach((array)$GLOBALS['egw_info']['user']['preferences']['groupdav'] as $name => $value)
+			foreach ((array)$GLOBALS['egw_info']['user']['preferences']['groupdav'] as $name => $value)
 			{
-				list($prop,$prop4path,$ns) = explode(':', $name, 3);
-				if ($prop4path == $path && (!in_array($ns,self::$ns_needs_explicit_named_props) ||
+				list($prop, $prop4path, $ns) = explode(':', $name, 3);
+				if ($prop4path == $path && (!in_array($ns, self::$ns_needs_explicit_named_props) ||
 					isset(self::$proppatch_props[$prop]) && self::$proppatch_props[$prop] === $ns))
 				{
 					$props[] = self::mkprop($ns, $prop, $value);
@@ -666,19 +666,19 @@ 
 
 		if ($depth)
 		{
-			foreach($this->root as $app => $data)
+			foreach ($this->root as $app => $data)
 			{
-				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue;	// no rights for the given app
+				if (!$GLOBALS['egw_info']['user']['apps'][$data['app'] ? $data['app'] : $app]) continue; // no rights for the given app
 				if (!empty($data['user-only']) && ($path == '/' || $user < 0)) continue;
 
-				$files['files'][] = $this->add_app($app,false,$user,$path.$app.'/');
+				$files['files'][] = $this->add_app($app, false, $user, $path.$app.'/');
 
 				// only add global /addressbook-accounts/ as the one in home-set is added (and controled) by add_shared
 				if ($path == '/' && $app == 'addressbook' &&
 					$GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== '1')
 				{
-					$file = $this->add_app($app,false,0,$path.$app.'-accounts/');
-					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+					$file = $this->add_app($app, false, 0, $path.$app.'-accounts/');
+					$file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER, 'shared', '');
 					$files['files'][] = $file;
 				}
 				// added shared calendars or addressbooks
@@ -701,12 +701,12 @@ 
 	 * @param int $depth =0
 	 * @return string|boolean http status or true|false
 	 */
-	protected function add_resources_collection(array &$files, $path, $depth=0)
+	protected function add_resources_collection(array &$files, $path, $depth = 0)
 	{
 		if (!isset($GLOBALS['egw_info']['user']['apps']['resources']))
 		{
 			if ($this->debug) error_log(__METHOD__."(path=$path) 403 Forbidden: no app rights for 'resources'");
-			return "403 Forbidden: no app rights for 'resources'";	// no rights for the given app
+			return "403 Forbidden: no app rights for 'resources'"; // no rights for the given app
 		}
 		list(,$what) = explode('/', $path);
 		if (($is_location = ($what == 'locations')))
@@ -719,7 +719,7 @@ 
 		}
 		if ($depth)
 		{
-			foreach(Principals::get_resources() as $resource)
+			foreach (Principals::get_resources() as $resource)
 			{
 				if ($is_location == Principals::resource_is_location($resource))
 				{
@@ -751,11 +751,11 @@ 
 		$handler = $this->app_handler($app);
 		if (($shared = $handler->get_shared()))
 		{
-			foreach($shared as $id => $owner)
+			foreach ($shared as $id => $owner)
 			{
-				$file = $this->add_app($app,false,$id,$path.$owner.'/');
+				$file = $this->add_app($app, false, $id, $path.$owner.'/');
 				// mark other users calendar as shared (iOS 5.0.1 AB does NOT display AB marked as shared!)
-				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER,'shared','');
+				if ($app == 'calendar') $file['props']['resourcetype']['val'][] = self::mkprop(self::CALENDARSERVER, 'shared', '');
 				$files[] = $file;
 			}
 		}
@@ -785,11 +785,11 @@ 
 		{
 			if ($account < 0)
 			{
-				$name = lang('Group').' '.$this->accounts->id2name($account,'account_lid');
+				$name = lang('Group').' '.$this->accounts->id2name($account, 'account_lid');
 			}
 			else
 			{
-				$name = $this->accounts->id2name($account,'account_fullname');
+				$name = $this->accounts->id2name($account, 'account_fullname');
 			}
 			if (empty($name)) $name = '#'.$account;
 		}
@@ -805,7 +805,7 @@ 
 	 * @param string $path ='/'
 	 * @return array with values for keys 'path' and 'props'
 	 */
-	protected function add_app($app,$no_extra_types=false,$user=null,$path='/')
+	protected function add_app($app, $no_extra_types = false, $user = null, $path = '/')
 	{
 		if ($this->debug) error_log(__METHOD__."(app='$app', no_extra_types=$no_extra_types, user='$user', path='$path')");
 		$user_preferences = $GLOBALS['egw_info']['user']['preferences'];
@@ -834,7 +834,7 @@ 
 		if (!isset($displayname)) $displayname = $this->account_name($user);
 
 		$props = array(
-			'owner' => array(self::mkprop('href',$this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
+			'owner' => array(self::mkprop('href', $this->base_uri.'/principals/'.$principalType.'/'.$account_lid.'/')),
 		);
 
 		switch ($app)
@@ -851,7 +851,7 @@ 
 					$props['displayname'] = lang('All addressbooks');
 					break;
 				}
-				elseif(!$user && $GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== '1')
+				elseif (!$user && $GLOBALS['egw_info']['user']['preferences']['addressbook']['hide_accounts'] !== '1')
 				{
 					unset($props['owner']);
 					$props['displayname'] = lang($app).' '.lang('Accounts');
@@ -864,40 +864,40 @@ 
 
 		// rfc 5995 (Use POST to add members to WebDAV collections): we use collection path with add-member query param
 		// leaving it switched off, until further testing, because OS X iCal seem to ignore it and OS X Addressbook uses POST to full URL without ?add-member
-		if ($app && !in_array($app,array('inbox','outbox','principals')))	// not on inbox, outbox or principals
+		if ($app && !in_array($app, array('inbox', 'outbox', 'principals')))	// not on inbox, outbox or principals
 		{
-			$props['add-member'][] = self::mkprop('href',$this->base_uri.$path.'?add-member');
+			$props['add-member'][] = self::mkprop('href', $this->base_uri.$path.'?add-member');
 		}
 
 		// add props modifyable via proppatch from client, eg. calendar-color, see self::$proppatch_props
 		$ns = null;
-		foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $name => $value)
 		{
 			unset($ns);
-			list($prop,$prop4user,$ns) = explode(':', $name, 3);
+			list($prop, $prop4user, $ns) = explode(':', $name, 3);
 			if ($prop4user == (string)$user && isset(self::$proppatch_props[$prop]) && !isset($ns))
 			{
 				$props[$prop] = self::mkprop(self::$proppatch_props[$prop], $prop, $value);
 				//error_log(__METHOD__."() explicit ".self::$proppatch_props[$prop].":$prop=".array2string($value));
 			}
 			// props in arbitrary namespaces not mentioned in self::$ns_needs_explicit_named_props
-			elseif(isset($ns) && !in_array($ns,self::$ns_needs_explicit_named_props))
+			elseif (isset($ns) && !in_array($ns, self::$ns_needs_explicit_named_props))
 			{
 				$props[] = self::mkprop($ns, $prop, $value);
 				//error_log(__METHOD__."() arbitrary $ns:$prop=".array2string($value));
 			}
 		}
 
-		foreach((array)$this->root[$app] as $prop => $values)
+		foreach ((array)$this->root[$app] as $prop => $values)
 		{
-			switch($prop)
+			switch ($prop)
 			{
 				case 'resourcetype';
 					if (!$no_extra_types)
 					{
-						foreach($this->root[$app]['resourcetype'] as $ns => $type)
+						foreach ($this->root[$app]['resourcetype'] as $ns => $type)
 						{
-							$props['resourcetype'][] = self::mkprop($ns,$type,'');
+							$props['resourcetype'][] = self::mkprop($ns, $type, '');
 						}
 						// add /addressbook/ as directory gateway
 						if ($path == '/addressbook/')
@@ -908,13 +908,13 @@ 
 					break;
 				case 'app':
 				case 'user-only':
-					break;	// no props, already handled
+					break; // no props, already handled
 				default:
 					if (is_array($values))
 					{
-						foreach($values as $ns => $value)
+						foreach ($values as $ns => $value)
 						{
-							$props[$prop] = self::mkprop($ns,$prop,$value);
+							$props[$prop] = self::mkprop($ns, $prop, $value);
 						}
 					}
 					else
@@ -927,20 +927,20 @@ 
 		// add other handler specific properties
 		if (($handler = self::app_handler($app)))
 		{
-			if (method_exists($handler,'extra_properties'))
+			if (method_exists($handler, 'extra_properties'))
 			{
 				$props = $handler->extra_properties($props, $displayname, $this->base_uri, $user, $path);
 			}
 			// add ctag if handler implements it
-			if (method_exists($handler,'getctag') && $this->prop_requested('getctag') === true)
+			if (method_exists($handler, 'getctag') && $this->prop_requested('getctag') === true)
 			{
 				$props['getctag'] = self::mkprop(
-					self::CALENDARSERVER,'getctag',$handler->getctag($path,$user));
+					self::CALENDARSERVER, 'getctag', $handler->getctag($path, $user));
 			}
 			// add sync-token url if handler supports sync-collection report
 			if (isset($props['supported-report-set']['sync-collection']) && $this->prop_requested('sync-token') === true)
 			{
-				$props['sync-token'] = $handler->get_sync_token($path,$user);
+				$props['sync-token'] = $handler->get_sync_token($path, $user);
 			}
 		}
 		if ($handler && !is_null($user))
@@ -963,7 +963,7 @@ 
 	{
 		if ($this->debug > 1) error_log(__METHOD__.'('.array2string($options).')');
 
-		return $this->PROPFIND($options,$files,'REPORT');
+		return $this->PROPFIND($options, $files, 'REPORT');
 	}
 
 	/**
@@ -987,13 +987,13 @@ 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user) || $app == 'principals')
+		if (!$this->_parse_path($options['path'], $id, $app, $user) || $app == 'principals')
 		{
 			return $this->autoindex($options);
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			return $handler->get($options,$id,$user);
+			return $handler->get($options, $id, $user);
 		}
 		error_log(__METHOD__."(".array2string($options).") 501 Not Implemented");
 		return '501 Not Implemented';
@@ -1011,9 +1011,9 @@ 
 			'depth' => 1,
 		);
 		$files = array();
-		if (($ret = $this->PROPFIND($propfind_options,$files)) !== true)
+		if (($ret = $this->PROPFIND($propfind_options, $files)) !== true)
 		{
-			return $ret;	// no collection
+			return $ret; // no collection
 		}
 		header('Content-type: text/html; charset='.Translation::charset());
 		echo "<html>\n<head>\n\t<title>".'EGroupware (Cal|Card|Group)DAV server '.htmlspecialchars($options['path'])."</title>\n";
@@ -1024,10 +1024,10 @@ 
 
 		echo '<h1>(Cal|Card|Group)DAV ';
 		$path = '/groupdav.php';
-		foreach(explode('/',$this->_unslashify($options['path'])) as $n => $name)
+		foreach (explode('/', $this->_unslashify($options['path'])) as $n => $name)
 		{
 			$path .= ($n != 1 ? '/' : '').$name;
-			echo Html::a_href(htmlspecialchars($name.'/'),$path);
+			echo Html::a_href(htmlspecialchars($name.'/'), $path);
 		}
 		echo "</h1>\n";
 
@@ -1047,18 +1047,18 @@ 
 		);
 		$n = 0;
 		$collection_props = null;
-		foreach($files['files'] as $file)
+		foreach ($files['files'] as $file)
 		{
 			if (!isset($collection_props))
 			{
 				$collection_props = $this->props2array($file['props']);
 				echo '<h3>'.lang('Collection listing').': '.htmlspecialchars($collection_props['DAV:displayname'])."</h3>\n";
-				continue;	// own entry --> displaying properies later
+				continue; // own entry --> displaying properies later
 			}
-			if(!$n++)
+			if (!$n++)
 			{
 				echo "<table>\n\t<tr class='th'>\n\t\t<th>#</th>\n\t\t<th>".lang('Name')."</th>";
-				foreach($props2show as $label)
+				foreach ($props2show as $label)
 				{
 					echo "\t\t<th>".lang($label)."</th>\n";
 				}
@@ -1068,9 +1068,9 @@ 
 			//echo $file['path']; _debug_array($props);
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 
-			if (substr($file['path'],-1) == '/')
+			if (substr($file['path'], -1) == '/')
 			{
-				$name = basename(substr($file['path'],0,-1)).'/';
+				$name = basename(substr($file['path'], 0, -1)).'/';
 			}
 			else
 			{
@@ -1078,14 +1078,14 @@ 
 			}
 
 			echo "\t<tr class='$class'>\n\t\t<td>$n</td>\n\t\t<td>".
-				Html::a_href(htmlspecialchars($name),'/groupdav.php'.strtr($file['path'], array(
+				Html::a_href(htmlspecialchars($name), '/groupdav.php'.strtr($file['path'], array(
 					'%' => '%25',
 					'#' => '%23',
 					'?' => '%3F',
 				)))."</td>\n";
-			foreach($props2show as $prop => $label)
+			foreach ($props2show as $prop => $label)
 			{
-				echo "\t\t<td>".($prop=='DAV:getlastmodified'&&!empty($props[$prop])?date('Y-m-d H:i:s',$props[$prop]):$props[$prop])."</td>\n";
+				echo "\t\t<td>".($prop == 'DAV:getlastmodified' && !empty($props[$prop]) ?date('Y-m-d H:i:s', $props[$prop]) : $props[$prop])."</td>\n";
 			}
 			echo "\t</tr>\n";
 		}
@@ -1099,7 +1099,7 @@ 
 		}
 		echo '<h3>'.lang('Properties')."</h3>\n";
 		echo "<table>\n\t<tr class='th'><th>".lang('Namespace')."</th><th>".lang('Name')."</th><th>".lang('Value')."</th></tr>\n";
-		foreach($collection_props as $name => $value)
+		foreach ($collection_props as $name => $value)
 		{
 			$class = $class == 'row_on' ? 'row_off' : 'row_on';
 			$parts = explode(':', $name);
@@ -1149,11 +1149,11 @@ 
 				'wrap'            => 0,
 			));
 		}
-		if (($href=preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i',$value)))
+		if (($href = preg_match('/\<(D:)?href\>[^<]+\<\/(D:)?href\>/i', $value)))
 		{
-			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/','/').')?([^<]+)\<\/(D:)?href\>/i','<\\1href><a href="\\2\\3">\\3</a></\\4href>',$value);
+			$value = preg_replace('/\<(D:)?href\>('.preg_quote($this->base_uri.'/', '/').')?([^<]+)\<\/(D:)?href\>/i', '<\\1href><a href="\\2\\3">\\3</a></\\4href>', $value);
 		}
-		$ret = $value[0] == '<'  || strpos($value, "\n") !== false ? '<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
+		$ret = $value[0] == '<' || strpos($value, "\n") !== false ? '<pre>'.htmlspecialchars($value).'</pre>' : htmlspecialchars($value);
 
 		if ($href)
 		{
@@ -1171,10 +1171,10 @@ 
 	protected function props2array(array $props)
 	{
 		$arr = array();
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			$ns_hash = array('DAV:' => 'D');
-			switch($prop['ns'])
+			switch ($prop['ns'])
 			{
 				case 'DAV:';
 					$ns = 'DAV';
@@ -1193,10 +1193,10 @@ 
 			}
 			if (is_array($prop['val']))
 			{
-				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs='', $ns_hash);
+				$prop['val'] = $this->_hierarchical_prop_encode($prop['val'], $prop['ns'], $ns_defs = '', $ns_hash);
 				// hack to show real namespaces instead of not (visibly) defined shortcuts
 				unset($ns_hash['DAV:']);
-				$value = strtr($v=$this->prop_value($prop['val']),array_flip($ns_hash));
+				$value = strtr($v = $this->prop_value($prop['val']), array_flip($ns_hash));
 			}
 			else
 			{
@@ -1219,13 +1219,13 @@ 
 		// POST to the collection URL plus a UID like name component (like for regular PUT) to create new entrys
 		if (isset($_GET['add-member']) || Handler::get_agent() == 'cfnetwork')
 		{
-			$_GET['add-member'] = '';	// otherwise we give no Location header
+			$_GET['add-member'] = ''; // otherwise we give no Location header
 			return $this->PUT($options);
 		}
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		$this->_parse_path($options['path'],$id,$app,$user);
+		$this->_parse_path($options['path'], $id, $app, $user);
 
 		if (($handler = self::app_handler($app)))
 		{
@@ -1241,12 +1241,12 @@ 
 				if (isset($options['stream']))
 				{
 					$options['content'] = '';
-					while(!feof($options['stream']))
+					while (!feof($options['stream']))
 					{
-						$options['content'] .= fread($options['stream'],8192);
+						$options['content'] .= fread($options['stream'], 8192);
 					}
 				}
-				return $handler->post($options,$id,$user);
+				return $handler->post($options, $id, $user);
 			}
 		}
 		return '501 Not Implemented';
@@ -1285,7 +1285,7 @@ 
 			return '403 Forbidden';
 		}
 
-		switch($action)
+		switch ($action)
 		{
 			case 'attachment-add':
 				$matches = null;
@@ -1297,8 +1297,8 @@ 
 				}
 				$path = null;
 				if (!($to = self::fopen_attachment($handler->app, $handler->get_id($entry), $filename, $this->_SERVER['CONTENT_TYPE'], $path)) ||
-					isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
-					isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)
+					isset($options['stream']) && ($copied = stream_copy_to_stream($options['stream'], $to)) === false ||
+					isset($options['content']) && ($copied = fwrite($to, $options['content'])) === false)
 				{
 					return '403 Forbidden';
 				}
@@ -1341,8 +1341,8 @@ 
 						}
 					}
 					if (!($to = Vfs::fopen($path, 'w')) ||
-						isset($options['stream']) && ($copied=stream_copy_to_stream($options['stream'], $to)) === false ||
-						isset($options['content']) && ($copied=fwrite($to, $options['content'])) === false)
+						isset($options['stream']) && ($copied = stream_copy_to_stream($options['stream'], $to)) === false ||
+						isset($options['content']) && ($copied = fwrite($to, $options['content'])) === false)
 					{
 						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id-parameter', ''));
 						return '403 Forbidden';
@@ -1384,23 +1384,23 @@ 
 	 * @param boolean $delete_via_put
 	 * @return boolean false on error, eg. invalid managed id, for false an xml-error body has been send
 	 */
-	public static function handle_attach($app, $id, $attach, $delete_via_put=false)
+	public static function handle_attach($app, $id, $attach, $delete_via_put = false)
 	{
 		//error_log(__METHOD__."('$app', $id, attach=".array2string($attach).", delete_via_put=".array2string($delete_via_put).')');
 
 		if (!Link::file_access($app, $id, Acl::EDIT))
 		{
 			error_log(__METHOD__."('$app', $id, ...) no rights to update attachments");
-			return;	// no rights --> nothing to do
+			return; // no rights --> nothing to do
 		}
-		if (!is_array($attach)) $attach = array();	// could be PEAR_Error if not set
+		if (!is_array($attach)) $attach = array(); // could be PEAR_Error if not set
 
 		if ($delete_via_put)
 		{
-			foreach(Vfs::find(Link::vfs_path($app, $id, '', true), array('type' => 'F')) as $path)
+			foreach (Vfs::find(Link::vfs_path($app, $id, '', true), array('type' => 'F')) as $path)
 			{
 				$found = false;
-				foreach($attach as $key => $attr)
+				foreach ($attach as $key => $attr)
 				{
 					if ($attr['params']['MANAGED-ID'] === self::path2managed_id($path))
 					{
@@ -1417,7 +1417,7 @@ 
 			}
 		}
 		// turn inline attachments into managed ones
-		foreach($attach as $key => $attr)
+		foreach ($attach as $key => $attr)
 		{
 			if (!empty($attr['params']['FMTTYPE']))
 			{
@@ -1430,7 +1430,7 @@ 
 						self::xml_error(self::mkprop(self::CALDAV, 'valid-managed-id', ''));
 						return false;
 					}
-					if($path == ($link = Link::vfs_path($app, $id, Vfs::basename($path))))
+					if ($path == ($link = Link::vfs_path($app, $id, Vfs::basename($path))))
 					{
 						error_log(__METHOD__."('$app', $id, ...) trying to modify existing MANAGED-ID --> ignored! ".array2string($attr));
 						continue;
@@ -1438,8 +1438,8 @@ 
 					// reuse valid managed-id --> symlink attachment
 					if (Vfs::file_exists($link))
 					{
-						if (Vfs::readlink($link) === $path) continue;	// no need to recreate identical link
-						Vfs::unlink($link);		// symlink will fail, if $link exists
+						if (Vfs::readlink($link) === $path) continue; // no need to recreate identical link
+						Vfs::unlink($link); // symlink will fail, if $link exists
 					}
 					if (!Vfs::symlink($path, $link))
 					{
@@ -1447,7 +1447,7 @@ 
 					}
 					continue;
 				}
-				if (!($to = self::fopen_attachment($app, $id, $filename=$attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
+				if (!($to = self::fopen_attachment($app, $id, $filename = $attr['params']['FILENAME'], $attr['params']['FMTTYPE'], $path)) ||
 					// Horde Icalendar does NOT decode automatic
 					(/*$copied=*/fwrite($to, $attr['params']['ENCODING'] == 'BASE64' ? base64_decode($attr['value']) : $attr['value'])) === false)
 				{
@@ -1474,16 +1474,16 @@ 
 	 * @param string &$path =null on return path opened
 	 * @return resource
 	 */
-	protected static function fopen_attachment($app, $id, $_filename, $mime=null, &$path=null)
+	protected static function fopen_attachment($app, $id, $_filename, $mime = null, &$path = null)
 	{
 		$filename = empty($_filename) ? 'attachment' : Vfs::basename($_filename);
 
-		if (strpos($mime, ';')) list($mime) = explode(';', $mime);	// in case it contains eg. charset info
+		if (strpos($mime, ';')) list($mime) = explode(';', $mime); // in case it contains eg. charset info
 
 		$ext = !empty($mime) ? MimeMagic::mime2ext($mime) : '';
 
 		$matches = null;
-		if (!$ext || substr($filename, -strlen($ext)-1) == '.'.$ext ||
+		if (!$ext || substr($filename, -strlen($ext) - 1) == '.'.$ext ||
 			preg_match('/\.([^.]+)$/', $filename, $matches) && MimeMagic::ext2mime($matches[1]) == $mime)
 		{
 			$parts = explode('.', $filename);
@@ -1494,7 +1494,7 @@ 
 		{
 			$ext = '.'.$ext;
 		}
-		for($i = 1; $i < 100; ++$i)
+		for ($i = 1; $i < 100; ++$i)
 		{
 			$path = Link::vfs_path($app, $id, $filename.($i > 1 ? '-'.$i : '').$ext, true);
 			if (!Vfs::stat($path)) break;
@@ -1540,16 +1540,16 @@ 
 	 */
 	public static function add_attach($app, $id, array &$attributes, array &$parameters)
 	{
-		foreach(Vfs::find(Link::vfs_path($app, $id, '', true), array(
+		foreach (Vfs::find(Link::vfs_path($app, $id, '', true), array(
 			'type' => 'F',
 			'need_mime' => true,
-			'maxdepth' => 10,	// set a limit to not run into an infinit recursion
+			'maxdepth' => 10, // set a limit to not run into an infinit recursion
 		), true) as $path => $stat)
 		{
 			// handle symlinks --> return target size and mime-type
 			if (($target = Vfs::readlink($path)))
 			{
-				if (!($stat = Vfs::stat($target))) continue;	// broken or inaccessible symlink
+				if (!($stat = Vfs::stat($target))) continue; // broken or inaccessible symlink
 
 				// check if target is in /apps, probably reused MANAGED-ID --> return it
 				if (substr($target, 0, 6) == '/apps/')
@@ -1561,7 +1561,7 @@ 
 			$parameters['ATTACH'][] = array(
 				'MANAGED-ID' => self::path2managed_id($path),
 				'FMTTYPE'    => $stat['mime'],
-				'SIZE'       => (string)$stat['size'],	// Horde_Icalendar renders int as empty string
+				'SIZE'       => (string)$stat['size'], // Horde_Icalendar renders int as empty string
 				'FILENAME'   => Vfs::basename($path),
 			);
 			// if we have attachments, set X-attribute to enable deleting them by put
@@ -1589,7 +1589,7 @@ 
 	 * @param string|int $id =null id to check agains path
 	 * @return string|boolean "/apps/$app/$id/something" or false if not found or not belonging to given $app/$id
 	 */
-	static public function managed_id2path($managed_id, $app=null, $id=null)
+	static public function managed_id2path($managed_id, $app = null, $id = null)
 	{
 		$path = base64_decode($managed_id);
 
@@ -1599,7 +1599,7 @@ 
 		}
 		elseif (!empty($app) && !empty($id))
 		{
-			list(,,$a,$i) = explode('/', $path);
+			list(,, $a, $i) = explode('/', $path);
 			if ($a !== $app || $i !== (string)$id)
 			{
 				$path = false;
@@ -1627,7 +1627,7 @@ 
 		'displayname' => self::DAV,
 		'calendar-description' => self::CALDAV,
 		'addressbook-description' => self::CARDDAV,
-		'calendar-color' => self::ICAL,	// only mentioned that old prefs still work
+		'calendar-color' => self::ICAL, // only mentioned that old prefs still work
 		'calendar-order' => self::ICAL,
 		'default-alarm-vevent-date' => self::CALDAV,
 		'default-alarm-vevent-datetime' => self::CALDAV,
@@ -1645,11 +1645,11 @@ 
 
 		// parse path in form [/account_lid]/app[/more]
 		$id = $app = $user = $user_prefix = null;
-		self::_parse_path($options['path'],$id,$app,$user,$user_prefix);	// allways returns false if eg. !$id
+		self::_parse_path($options['path'], $id, $app, $user, $user_prefix); // allways returns false if eg. !$id
 		if ($app == 'principals' || $id || $options['path'] == '/')
 		{
 			if ($this->debug > 1) error_log(__METHOD__.": user='$user', app='$app', id='$id': 404 not found!");
-			foreach($options['props'] as &$prop)
+			foreach ($options['props'] as &$prop)
 			{
 				$prop['status'] = '403 Forbidden';
 			}
@@ -1657,10 +1657,10 @@ 
 		}
 		// store selected props in preferences, eg. calendar-color, see self::$proppatch_props
 		$need_save = array();
-		foreach($options['props'] as &$prop)
+		foreach ($options['props'] as &$prop)
 		{
 			if ((isset(self::$proppatch_props[$prop['name']]) && self::$proppatch_props[$prop['name']] === $prop['xmlns'] ||
-				!in_array($prop['xmlns'],self::$ns_needs_explicit_named_props)))
+				!in_array($prop['xmlns'], self::$ns_needs_explicit_named_props)))
 			{
 				if (!$app)
 				{
@@ -1689,7 +1689,7 @@ 
 			}
 			else
 			{
-				$prop['status'] = '409 Conflict';	// could also be "403 Forbidden"
+				$prop['status'] = '409 Conflict'; // could also be "403 Forbidden"
 			}
 		}
 		if ($need_save)
@@ -1698,7 +1698,7 @@ 
 			// call calendar-hook, if default-alarms are changed, to sync them to calendar prefs
 			if (class_exists('calendar_hooks'))
 			{
-				foreach($need_save as $name)
+				foreach ($need_save as $name)
 				{
 					list($name) = explode(':', $name);
 					if (in_array($name, array('default-alarm-vevent-date', 'default-alarm-vevent-datetime')))
@@ -1723,22 +1723,22 @@ 
 		if (isset($options['stream']))
 		{
 			$options['content'] = '';
-			while(!feof($options['stream']))
+			while (!feof($options['stream']))
 			{
-				$options['content'] .= fread($options['stream'],8192);
+				$options['content'] .= fread($options['stream'], 8192);
 			}
 		}
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = $prefix = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user,$prefix))
+		if (!$this->_parse_path($options['path'], $id, $app, $user, $prefix))
 		{
 			return '404 Not Found';
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			$status = $handler->put($options,$id,$user,$prefix);
+			$status = $handler->put($options, $id, $user, $prefix);
 
 			// set default stati: true --> 204 No Content, false --> should be already handled
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
@@ -1768,13 +1768,13 @@ 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).')');
 
 		$id = $app = $user = null;
-		if (!$this->_parse_path($options['path'],$id,$app,$user))
+		if (!$this->_parse_path($options['path'], $id, $app, $user))
 		{
 			return '404 Not Found';
 		}
 		if (($handler = self::app_handler($app)))
 		{
-			$status = $handler->delete($options,$id,$user);
+			$status = $handler->delete($options, $id, $user);
 			// set default stati: true --> 204 No Content, false --> should be already handled
 			if (is_bool($status)) $status = $status ? '204 No Content' : '400 Something went wrong';
 			return $status;
@@ -1814,7 +1814,7 @@ 
 	 * @param  array  general parameter passing array
 	 * @return bool   true on success
 	 */
-	function COPY($options, $del=false)
+	function COPY($options, $del = false)
 	{
 		if ($this->debug) error_log('self::'.($del ? 'MOVE' : 'COPY').'('.array2string($options).')');
 
@@ -1830,8 +1830,8 @@ 
 	function LOCK(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
-		$path = Vfs::app_entry_lock_path($app,$id);
+		self::_parse_path($options['path'], $id, $app, $user);
+		$path = Vfs::app_entry_lock_path($app, $id);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
 
@@ -1839,16 +1839,16 @@ 
 		$handler = self::app_handler($app);
 
 		// TODO recursive locks on directories not supported yet
-		if (!$id || !empty($options['depth']) || !$handler->check_access(Acl::EDIT,$id))
+		if (!$id || !empty($options['depth']) || !$handler->check_access(Acl::EDIT, $id))
 		{
 			return '409 Conflict';
 		}
-		$options['timeout'] = time()+300; // 5min. hardcoded
+		$options['timeout'] = time() + 300; // 5min. hardcoded
 
 		// dont know why, but HTTP_WebDAV_Server passes the owner in D:href tags, which get's passed unchanged to checkLock/PROPFIND
 		// that's wrong according to the standard and cadaver does not show it on discover --> strip_tags removes eventual tags
-		if (($ret = Vfs::lock($path,$options['locktoken'],$options['timeout'],strip_tags($options['owner']),
-			$options['scope'],$options['type'],isset($options['update']),false)) && !isset($options['update']))		// false = no ACL check
+		if (($ret = Vfs::lock($path, $options['locktoken'], $options['timeout'], strip_tags($options['owner']),
+			$options['scope'], $options['type'], isset($options['update']), false)) && !isset($options['update']))		// false = no ACL check
 		{
 			return $ret ? '200 OK' : '409 Conflict';
 		}
@@ -1864,11 +1864,11 @@ 
 	function UNLOCK(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
-		$path = Vfs::app_entry_lock_path($app,$id);
+		self::_parse_path($options['path'], $id, $app, $user);
+		$path = Vfs::app_entry_lock_path($app, $id);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$path");
-		return Vfs::unlock($path,$options['token']) ? '204 No Content' : '409 Conflict';
+		return Vfs::unlock($path, $options['token']) ? '204 No Content' : '409 Conflict';
 	}
 
 	/**
@@ -1880,7 +1880,7 @@ 
 	function checkLock($path)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($path,$id,$app,$user);
+		self::_parse_path($path, $id, $app, $user);
 
 		return Vfs::checkLock(Vfs::app_entry_lock_path($app, $id));
 	}
@@ -1894,7 +1894,7 @@ 
 	function ACL(&$options)
 	{
 		$id = $app = $user = null;
-		self::_parse_path($options['path'],$id,$app,$user);
+		self::_parse_path($options['path'], $id, $app, $user);
 
 		if ($this->debug) error_log(__METHOD__.'('.array2string($options).") path=$options[path]");
 
@@ -1924,7 +1924,7 @@ 
 	 * @param string &$user_prefix =null
 	 * @return boolean true on success, false on error
 	 */
-	function _parse_path($path,&$id,&$app,&$user,&$user_prefix=null)
+	function _parse_path($path, &$id, &$app, &$user, &$user_prefix = null)
 	{
 		if ($this->debug)
 		{
@@ -1953,7 +1953,7 @@ 
 			}
 		}
 		elseif (($account_id = $this->accounts->name2id($parts[0], 'account_lid')) ||
-			($account_id = $this->accounts->name2id($parts[0]=urldecode($parts[0]))))
+			($account_id = $this->accounts->name2id($parts[0] = urldecode($parts[0]))))
 		{
 			// /$user/$app/...
 			$user = array_shift($parts);
@@ -1977,7 +1977,7 @@ 
 			{
 				$account_id = 0;
 			}
-			elseif($app == 'resource' || $app == 'location')
+			elseif ($app == 'resource' || $app == 'location')
 			{
 				if (!Principals::read_resource($res_id = (int)$username))
 				{
@@ -1987,7 +1987,7 @@ 
 				$app = 'calendar';
 			}
 			elseif (!($account_id = $this->accounts->name2id($username, 'account_lid')) &&
-					!($account_id = $this->accounts->name2id($username=urldecode($username))))
+					!($account_id = $this->accounts->name2id($username = urldecode($username))))
 			{
 				return false;
 			}
@@ -2017,11 +2017,11 @@ 
 		));
 
 		$ok = ($id || isset($_GET['add-member']) && $_SERVER['REQUEST_METHOD'] == 'POST') &&
-			($user || $user === 0) && in_array($app,array('addressbook','calendar','infolog','principals'));
+			($user || $user === 0) && in_array($app, array('addressbook', 'calendar', 'infolog', 'principals'));
 
 		if ($this->debug)
 		{
-			error_log(__METHOD__."('$path') returning " . ($ok ? 'true' : 'false') . ": id='$id', app='$app', user='$user', user_prefix='$user_prefix'");
+			error_log(__METHOD__."('$path') returning ".($ok ? 'true' : 'false').": id='$id', app='$app', user='$user', user_prefix='$user_prefix'");
 		}
 		return $ok;
 	}
@@ -2043,9 +2043,9 @@ 
 	 *
      * @param  $prefix =null prefix filesystem path with given path, eg. "/webdav" for owncloud 4.5 remote.php
 	 */
-	function ServeRequest($prefix=null)
+	function ServeRequest($prefix = null)
 	{
-		if ((self::$log_level=$GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
+		if ((self::$log_level = $GLOBALS['egw_info']['user']['preferences']['groupdav']['debug_level']) === 'r' ||
 			self::$log_level === 'f' || $this->debug)
 		{
 			self::$request_starttime = microtime(true);
@@ -2076,7 +2076,7 @@ 
 	 *
 	 * @param string $extra ='' extra text to add below request-log, eg. exception thrown
 	 */
-	protected function log_request($extra='')
+	protected function log_request($extra = '')
 	{
 		if (self::$request_starttime)
 		{
@@ -2103,13 +2103,13 @@ 
 			}
 			$content .= $_SERVER['REQUEST_METHOD'].' '.$_SERVER['REQUEST_URI'].' HTTP/1.1'."\n";
 			// reconstruct headers
-			foreach($_SERVER as $name => $value)
+			foreach ($_SERVER as $name => $value)
 			{
-				list($type,$name) = explode('_',$name,2);
+				list($type, $name) = explode('_', $name, 2);
 				if ($type == 'HTTP' || $type == 'CONTENT')
 				{
-					$content .= str_replace(' ','-',ucwords(strtolower(($type=='HTTP'?'':$type.' ').str_replace('_',' ',$name)))).
-						': '.($name=='AUTHORIZATION'?'Basic ***************':$value)."\n";
+					$content .= str_replace(' ', '-', ucwords(strtolower(($type == 'HTTP' ? '' : $type.' ').str_replace('_', ' ', $name)))).
+						': '.($name == 'AUTHORIZATION' ? 'Basic ***************' : $value)."\n";
 				}
 			}
 			$content .= "\n";
@@ -2120,29 +2120,29 @@ 
 			$content .= 'HTTP/1.1 '.$this->_http_status."\n";
 			$content .= 'Date: '.str_replace('+0000', 'GMT', gmdate('r'))."\n";
 			$content .= 'Server: '.$_SERVER['SERVER_SOFTWARE']."\n";
-			foreach(headers_list() as $line)
+			foreach (headers_list() as $line)
 			{
 				$content .= $line."\n";
 			}
 			if (($c = ob_get_flush())) $content .= "\n";
-			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c,0,1536)."\n*** LOG TRUNKATED\n";
+			if (self::$log_level !== 'f' && strlen($c) > 1536) $c = substr($c, 0, 1536)."\n*** LOG TRUNKATED\n";
 			$content .= $c;
 			if ($extra) $content .= $extra;
 			if ($this->to_log) $content .= "\n### ".implode("\n### ", $this->to_log)."\n";
-			$content .= $this->_http_status[0] == '4' && substr($this->_http_status,0,3) != '412' ||
-				$this->_http_status[0] == '5' ? '###' : '***';	// mark failed requests with ###, instead of ***
-			$content .= sprintf(' %s --> "%s" took %5.3f s',$_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD']=='REPORT'?' '.$this->propfind_options['root']['name']:'').' '.$_SERVER['PATH_INFO'],$this->_http_status,microtime(true)-self::$request_starttime)."\n\n";
+			$content .= $this->_http_status[0] == '4' && substr($this->_http_status, 0, 3) != '412' ||
+				$this->_http_status[0] == '5' ? '###' : '***'; // mark failed requests with ###, instead of ***
+			$content .= sprintf(' %s --> "%s" took %5.3f s', $_SERVER['REQUEST_METHOD'].($_SERVER['REQUEST_METHOD'] == 'REPORT' ? ' '.$this->propfind_options['root']['name'] : '').' '.$_SERVER['PATH_INFO'], $this->_http_status, microtime(true) - self::$request_starttime)."\n\n";
 
-			if ($msg_file && ($f = fopen($msg_file,'a')))
+			if ($msg_file && ($f = fopen($msg_file, 'a')))
 			{
-				flock($f,LOCK_EX);
-				fwrite($f,$content);
-				flock($f,LOCK_UN);
+				flock($f, LOCK_EX);
+				fwrite($f, $content);
+				flock($f, LOCK_UN);
 				fclose($f);
 			}
 			else
 			{
-				foreach(explode("\n",$content) as $line)
+				foreach (explode("\n", $content) as $line)
 				{
 					error_log($line);
 				}
@@ -2156,7 +2156,7 @@ 
 	 * @param string|array $xml_error string with name for empty element in DAV NS or array with props
 	 * @param string $human_readable =null human readable error message
 	 */
-	public static function xml_error($xml_error, $human_readable=null)
+	public static function xml_error($xml_error, $human_readable = null)
 	{
 		header('Content-type: application/xml; charset=utf-8');
 
@@ -2173,7 +2173,7 @@ 
 			$xml->writeElement('responsedescription', $human_readable);
 		}
 
-		$xml->endElement();	// DAV:error
+		$xml->endElement(); // DAV:error
 		$xml->endDocument();
 		echo $xml->outputMemory();
 	}
@@ -2189,7 +2189,7 @@ 
 		if (is_string($props)) $props = self::mkprop($props, '');
 		if (isset($props['name'])) $props = array($props);
 
-		foreach($props as $prop)
+		foreach ($props as $prop)
 		{
 			if (isset($prop['ns']) && $prop['ns'] !== 'DAV:')
 			{
@@ -2241,7 +2241,7 @@ 
 	{
 		// logging exception as regular egw_execption_hander does
 		$headline = null;
-		_egw_log_exception($e,$headline);
+		_egw_log_exception($e, $headline);
 
 		// exception handler sending message back to the client as basic auth message
 		$error = str_replace(array("\r", "\n"), array('', ' | '), $e->getMessage());
@@ -2252,7 +2252,7 @@ 
 		// if our own logging is active, log the request plus a trace, if enabled in server-config
 		if (self::$request_starttime && isset(self::$instance))
 		{
-			self::$instance->_http_status = '401 Unauthorized';	// to correctly log it
+			self::$instance->_http_status = '401 Unauthorized'; // to correctly log it
 			if ($GLOBALS['egw_info']['server']['exception_show_trace'])
 			{
 				self::$instance->log_request("\n".$e->getTraceAsString()."\n");
@@ -2274,7 +2274,7 @@ 
 	 */
 	static function generate_uid($_appName, $_eventID)
 	{
-		if(empty($_appName) || empty($_eventID)) return false;
+		if (empty($_appName) || empty($_eventID)) return false;
 
 		return $_appName.'-'.$_eventID.'-'.$GLOBALS['egw_info']['server']['install_id'];
 	}

resources/inc/class.resources_acl_ui.inc.php

Spacing +39 added lines, -39 removed lines

@@ -51,30 +51,30 @@ 
 	 */
 	public function index($content = array())
 	{
-		if (!$GLOBALS['egw']->acl->check('run',1,'admin'))
+		if (!$GLOBALS['egw']->acl->check('run', 1, 'admin'))
 		{
 			$this->deny();
 		}
 
 		$content['nm'] = array(
-			'get_rows'      =>	'resources.resources_acl_ui.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+			'get_rows'      =>	'resources.resources_acl_ui.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
 			'no_search'      => True,
-			'no_filter'      => True,        // I  disable the 1. filter
-			'no_filter2'     => True,        // I  disable the 2. filter (params are the same as for filter)
-			'no_cat'         => True,        // I  disable the cat-selectbox
-			'row_id'         => 'id',    // I  key into row content to set it's value as row-id, eg. 'id'
-			'parent_id'      =>	'parent',// I  key into row content of children linking them to their parent, also used as col_filter to query children
-			'dataStorePrefix'=> 'categories',// Avoid conflict with user list when in admin
-			'actions'        => self::get_actions(),    // I  array with actions, see nextmatch_widget::egw_actions
+			'no_filter'      => True, // I  disable the 1. filter
+			'no_filter2'     => True, // I  disable the 2. filter (params are the same as for filter)
+			'no_cat'         => True, // I  disable the cat-selectbox
+			'row_id'         => 'id', // I  key into row content to set it's value as row-id, eg. 'id'
+			'parent_id'      =>	'parent', // I  key into row content of children linking them to their parent, also used as col_filter to query children
+			'dataStorePrefix'=> 'categories', // Avoid conflict with user list when in admin
+			'actions'        => self::get_actions(), // I  array with actions, see nextmatch_widget::egw_actions
 			'placeholder_actions' => array('add')    //  I Array Optional list of actions allowed on the placeholder.  If not provided, it's ["add"].
 		);
 		$template = new Etemplate('resources.acl');
-		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['resources']['title'] . ' - ' . lang('Configure Access Permissions');
+		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps']['resources']['title'].' - '.lang('Configure Access Permissions');
 
 		$template->exec(__METHOD__, $content, $sel_options, $readonlys);
 	}
 	
-	protected static function get_actions($appname='resources') {
+	protected static function get_actions($appname = 'resources') {
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -83,7 +83,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=resources.resources_acl_ui.edit&cat_id=$id',
 				'popup' => '600x420',
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'add' => array(
 				'caption' => 'Add',
@@ -106,42 +106,42 @@ 
 	 * @param array &$readonlys eg. to disable buttons based on Acl, not use here, maybe in a derived class
 	 * @return int total number of rows
 	 */
-	public function get_rows(&$query,&$rows,&$readonlys)
+	public function get_rows(&$query, &$rows, &$readonlys)
 	{
 
-		Api\Cache::setSession('resources','acl-nm',$query);
+		Api\Cache::setSession('resources', 'acl-nm', $query);
 
-		if($query['filter'] > 0 || $query['col_filter']['owner'])
+		if ($query['filter'] > 0 || $query['col_filter']['owner'])
 		{
 			$owner = $query['col_filter']['owner'] ? $query['col_filter']['owner'] : $query['filter'];
 		}
 
-		$cats = new Api\Categories($owner,'resources');
+		$cats = new Api\Categories($owner, 'resources');
 		$parent = $query['search'] ? false : 0;
-		$rows = $cats->return_sorted_array($query['start'],false,$query['search'],$query['sort'],$query['order'],'all_no_acl',$parent,true,$filter);
+		$rows = $cats->return_sorted_array($query['start'], false, $query['search'], $query['sort'], $query['order'], 'all_no_acl', $parent, true, $filter);
 		$count = $cats->total_records;
 
 
 		$config = Api\Config::read('resources');
 		$location_cats = $config['location_cats'] ? explode(',', $config['location_cats']) : array();
 
-		foreach($rows as $key => &$row)
+		foreach ($rows as $key => &$row)
 		{
-			$row['owner'] = explode(',',$row['owner']);
+			$row['owner'] = explode(',', $row['owner']);
 
-			$row['level_spacer'] = str_repeat('    ',$row['level']);
+			$row['level_spacer'] = str_repeat('    ', $row['level']);
 			$row['location'] = (in_array($row['id'], $location_cats));
 
 			if ($row['data']['icon'])
 			{
-				$row['icon_url'] = $GLOBALS['egw_info']['server']['webserver_url'].  resources_bo::ICON_PATH.'/'.$row['data']['icon'];
+				$row['icon_url'] = $GLOBALS['egw_info']['server']['webserver_url'].resources_bo::ICON_PATH.'/'.$row['data']['icon'];
 			}
 			
 			$row['subs'] = count($row['children']);
 
 			$row['class'] = 'level'.$row['level'];
 
-			foreach(self::$acl_map  as $field => $acl)
+			foreach (self::$acl_map  as $field => $acl)
 			{
 				$row[$field] = $GLOBALS['egw']->acl->get_ids_for_location('L'.$row['id'], $acl, 'resources');
 			}
@@ -158,9 +158,9 @@ 
 	 * @param array $content = null
 	 * @param string $msg = ''
 	 */
-	public function edit(array $content=null,$msg='')
+	public function edit(array $content = null, $msg = '')
 	{
-		if (!$GLOBALS['egw']->acl->check('run',1,'admin'))
+		if (!$GLOBALS['egw']->acl->check('run', 1, 'admin'))
 		{
 			$this->deny();
 		}
@@ -178,34 +178,34 @@ 
 		}
 		elseif ($content['button'])
 		{
-			$cats = new Categories($content['owner'] ? $content['owner'] : Categories::GLOBAL_ACCOUNT,'resources');
+			$cats = new Categories($content['owner'] ? $content['owner'] : Categories::GLOBAL_ACCOUNT, 'resources');
 
 			list($button) = each($content['button']);
 			unset($content['button']);
 
 			$refresh_app = 'admin';
 
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if (is_array($content['owner'])) $content['owner'] = implode(',', $content['owner']);
+					if ($content['owner'] == '') $content['owner'] = 0;
 					if ($content['id'])
 					{
 
-						$data = $cats->id2name($content['id'],'data');
+						$data = $cats->id2name($content['id'], 'data');
 						try {
 							$cats->edit($content);
 							resources_acl_bo::set_rights(
 								$content['id'], $content['read'], $content['write'], $content['calread'], $content['calwrite'], Array($content['admin'])
 							);
-							if($content['location'])
+							if ($content['location'])
 							{
 								$location_cats[] = $content['id'];
 								$location_cats = array_unique($location_cats);
 							}
-							else if(($key = array_search($content['id'], $location_cats)) !== false)
+							else if (($key = array_search($content['id'], $location_cats)) !== false)
 							{
 								unset($location_cats[$key]);
 							}
@@ -214,7 +214,7 @@ 
 						}
 						catch (Api\Exception\WrongUserinput $e)
 						{
-							$msg = lang('Unwilling to save category with current settings. Check for inconsistency:').$e->getMessage();	// display conflicts etc.
+							$msg = lang('Unwilling to save category with current settings. Check for inconsistency:').$e->getMessage(); // display conflicts etc.
 						}
 					}
 					else
@@ -234,32 +234,32 @@ 
 		}
 
 		$content['appname'] = 'resources';
-		if($content['data']['icon'])
+		if ($content['data']['icon'])
 		{
-			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
+			$content['icon_url'] = $content['base_url'].$content['data']['icon'];
 		}
 
 
-		foreach(self::$acl_map as $field => $acl)
+		foreach (self::$acl_map as $field => $acl)
 		{
 			$content[$field] = $GLOBALS['egw']->acl->get_ids_for_location('L'.$content['id'], $acl, 'resources');
 		}
 
 		// Make sure $content['admin'] is an array otherwise it wont show up values in the multiselectbox
-		if($content['admin'] == 0)
+		if ($content['admin'] == 0)
 		{
 			unset($content['admin']);
 		}
 		else if (!is_array($content['admin']))
 		{
-			$content['admin'] = explode(',',$content['admin']);
+			$content['admin'] = explode(',', $content['admin']);
 		}
 
 		// Location
-		$content['location'] = in_array($content['id'],$location_cats);
+		$content['location'] = in_array($content['id'], $location_cats);
 
 		$tmpl = new Etemplate('resources.acl_edit');
-		$tmpl->exec('resources.resources_acl_ui.edit',$content,$sel_options,$readonlys,$content,2);
+		$tmpl->exec('resources.resources_acl_ui.edit', $content, $sel_options, $readonlys, $content, 2);
 	}
 
 	function deny()

Braces +10 added lines, -3 removed lines

@@ -74,7 +74,8 @@ 
 		$template->exec(__METHOD__, $content, $sel_options, $readonlys);
 	}
 	
-	protected static function get_actions($appname='resources') {
+	protected static function get_actions($appname='resources')
+	{
 
 		$actions = array(
 			'open' => array(        // does edit if allowed, otherwise view
@@ -189,8 +190,14 @@ 
 			{
 				case 'save':
 				case 'apply':
-					if(is_array($content['owner'])) $content['owner'] = implode(',',$content['owner']);
-					if($content['owner'] == '') $content['owner'] = 0;
+					if(is_array($content['owner']))
+					{
+						$content['owner'] = implode(',',$content['owner']);
+					}
+					if($content['owner'] == '')
+					{
+						$content['owner'] = 0;
+					}
 					if ($content['id'])
 					{
 

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

@@ -198,7 +198,7 @@
 						try {
 							$cats->edit($content);
 							resources_acl_bo::set_rights(
-								$content['id'], $content['read'], $content['write'], $content['calread'], $content['calwrite'], Array($content['admin'])
+								$content['id'], $content['read'], $content['write'], $content['calread'], $content['calwrite'], array($content['admin'])
 							);
 							if($content['location'])
 							{

api/src/Db/Pdo.php

Doc Comments +1 added lines, -1 removed lines

@@ -130,7 +130,7 @@
 	/**
 	 * Just a little abstration 'til I know how to organise stuff like that with PDO
 	 *
-	 * @param mixed $time
+	 * @param integer $time
 	 * @return string Y-m-d H:i:s
 	 */
 	static public function _pdo_timestamp($time)

Spacing +9 added lines, -9 removed lines

@@ -72,7 +72,7 @@ 
 	{
 		$egw_db = isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
-		switch($egw_db->Type)
+		switch ($egw_db->Type)
 		{
 			case 'mysqli':
 			case 'mysqlt':
@@ -90,17 +90,17 @@ 
 
 		$dsn = self::$pdo_type.':dbname='.$egw_db->Database.($host ? ';host='.$host.($egw_db->Port ? ';port='.$egw_db->Port : '') : '');
 		// check once if pdo extension and DB specific driver is loaded or can be loaded
-		static $pdo_available=null;
+		static $pdo_available = null;
 		if (is_null($pdo_available))
 		{
-			foreach(array('pdo','pdo_'.self::$pdo_type) as $ext)
+			foreach (array('pdo', 'pdo_'.self::$pdo_type) as $ext)
 			{
-				check_load_extension($ext,true);	// true = throw Exception
+				check_load_extension($ext, true); // true = throw Exception
 			}
 			$pdo_available = true;
 		}
 		// set client charset of the connection
-		switch(self::$pdo_type)
+		switch (self::$pdo_type)
 		{
 			case 'mysql':
 				$dsn .= ';charset=utf8';
@@ -110,15 +110,15 @@ 
 				break;
 		}
 		try {
-			self::$pdo = new \PDO($dsn,$egw_db->User,$egw_db->Password,array(
+			self::$pdo = new \PDO($dsn, $egw_db->User, $egw_db->Password, array(
 				\PDO::ATTR_ERRMODE=>\PDO::ERRMODE_EXCEPTION,
 			));
 		}
-		catch(\PDOException $e)
+		catch (\PDOException $e)
 		{
 			unset($e);
 			// Exception reveals password, so we ignore the exception and connect again without pw, to get the right exception without pw
-			self::$pdo = new \PDO($dsn,$egw_db->User,'$egw_db->Password');
+			self::$pdo = new \PDO($dsn, $egw_db->User, '$egw_db->Password');
 		}
 		if ($query)
 		{
@@ -137,7 +137,7 @@ 
 	{
 		if (is_numeric($time))
 		{
-			$time = date('Y-m-d H:i:s',$time);
+			$time = date('Y-m-d H:i:s', $time);
 		}
 		return $time;
 	}

api/src/Mail/hash_pbkdf2.php

Braces +6 added lines, -3 removed lines

@@ -13,15 +13,18 @@
 		// Number of blocks needed to create the derived key
 		$blocks = ceil($length / strlen(hash($algorithm, null, true)));
 		$digest = '';
-		for ($i = 1; $i <= $blocks; ++$i) {
+		for ($i = 1; $i <= $blocks; ++$i)
+		{
 			$ib = $block = hash_hmac($algorithm, $salt.pack('N', $i), $password, true);
 			// Iterations
-			for ($j = 1; $j < $iterations; ++$j) {
+			for ($j = 1; $j < $iterations; ++$j)
+			{
 				$ib ^= ($block = hash_hmac($algorithm, $block, $password, true));
 			}
 			$digest .= $ib;
 		}
-		if (!$rawOutput) {
+		if (!$rawOutput)
+		{
 			$digest = bin2hex($digest);
 		}
 		return substr($digest, 0, $length);

api/src/Preferences.php

Doc Comments +1 added lines, -1 removed lines

@@ -961,7 +961,7 @@
 	 *
 	 * This method uses the language and nationalty set in the users common prefs.
 	 *
-	 * @param $category =LC_MESSAGES category to set, see setlocal function
+	 * @param integer $category =LC_MESSAGES category to set, see setlocal function
 	 * @param $charset =null default system charset
 	 * @return string the local (or best estimate) set
 	 */

Spacing +98 added lines, -98 removed lines

@@ -95,7 +95,7 @@ 
 	const TABLE = 'egw_preferences';
 	var $table = self::TABLE;
 
-	var $values,$vars;	// standard notify substitues, will be set by standard_substitues()
+	var $values, $vars; // standard notify substitues, will be set by standard_substitues()
 
 	/**
 	 * Contstructor
@@ -163,7 +163,7 @@ 
 			case self::FORCED_ID:
 				return 'forced';
 		}
-		return $this->account_id < self::DEFAULT_ID ? $this->account_id-self::DEFAULT_ID : $this->account_id;
+		return $this->account_id < self::DEFAULT_ID ? $this->account_id - self::DEFAULT_ID : $this->account_id;
 	}
 
 	/**
@@ -193,21 +193,21 @@ 
 	{
 		$prefs = Cache::getInstance(__CLASS__, $ids);
 		$db_read = array();
-		foreach((array)$ids as $id)
+		foreach ((array)$ids as $id)
 		{
 			// if prefs are not returned, null or not an array, read them from db
 			if (!isset($prefs[$id]) && !is_array($prefs[$id])) $db_read[] = $id;
 		}
 		if ($db_read)
 		{
-			foreach($this->db->select($this->table,'*',array('preference_owner' => $db_read),__LINE__,__FILE__) as $row)
+			foreach ($this->db->select($this->table, '*', array('preference_owner' => $db_read), __LINE__, __FILE__) as $row)
 			{
 				// The following replacement is required for PostgreSQL to work
 				$app = trim($row['preference_app']);
 
 				$prefs[$row['preference_owner']][$app] = self::unserialize($row['preference_value']);
 			}
-			foreach($db_read as $id)
+			foreach ($db_read as $id)
 			{
 				if (!isset($prefs[$id])) $prefs[$id] = array();
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
@@ -226,7 +226,7 @@ 
 	 * @param boolean $use_standard_values =true should the standard values are used
 	 * @return string with parsed notify-msg
 	 */
-	function parse_notify($msg,$values=array(),$use_standard_values=True)
+	function parse_notify($msg, $values = array(), $use_standard_values = True)
 	{
 		$vals = $values ? $values : array();
 
@@ -235,13 +235,13 @@ 
 			$vals += $this->values;
 		}
 		$replace = $with = array();
-		foreach($vals as $key => $val)
+		foreach ($vals as $key => $val)
 		{
 			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
-		return str_replace($replace,$with,$msg);
+		return str_replace($replace, $with, $msg);
 	}
 
 	/**
@@ -253,9 +253,9 @@ 
 	 * @param boolean $un_lang =false if true translate back
 	 * @return string
 	 */
-	function lang_notify($msg,$vals=array(),$un_lang=False)
+	function lang_notify($msg, $vals = array(), $un_lang = False)
 	{
-		foreach(array_keys($vals) as $key)
+		foreach (array_keys($vals) as $key)
 		{
 			$lname = ($lname = lang($key)) == $key.'*' ? $key : $lname;
 			if ($un_lang)
@@ -267,7 +267,7 @@ 
 				$langs[$key] = '$$'.$lname.'$$';
 			}
 		}
-		return $this->parse_notify($msg,$langs,False);
+		return $this->parse_notify($msg, $langs, False);
 	}
 
 	/**
@@ -278,7 +278,7 @@ 
 		if ($this->debug) error_log(__METHOD__." is called ");
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
-			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()
+			$GLOBALS['egw_info']['user']['preferences'] = $this->data; // else no lang()
 		}
 		// we cant use egw_info/user/fullname, as it's not set when we run
 		$this->values = array(	// standard notify replacements
@@ -287,37 +287,37 @@ 
 			'lastname'  => Accounts::id2name($this->account_id, 'account_lastname'),
 			'domain'    => $GLOBALS['egw_info']['server']['mail_suffix'],
 			'email'     => $this->email_address($this->account_id),
-			'date'      => DateTime::to('now',$GLOBALS['egw_info']['user']['preferences']['common']['dateformat']),
+			'date'      => DateTime::to('now', $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']),
 		);
 		// do this first, as it might be already contain some substitues
 		//
 		$this->values['email'] = $this->parse_notify($this->values['email']);
 
 		$this->vars = array(	// langs have to be in common !!!
-			'fullname'  => lang('name of the user, eg. "%1"',$this->values['fullname']),
-			'firstname' => lang('first name of the user, eg. "%1"',$this->values['firstname']),
-			'lastname'  => lang('last name of the user, eg. "%1"',$this->values['lastname']),
-			'domain'    => lang('domain name for mail-address, eg. "%1"',$this->values['domain']),
-			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
-			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
+			'fullname'  => lang('name of the user, eg. "%1"', $this->values['fullname']),
+			'firstname' => lang('first name of the user, eg. "%1"', $this->values['firstname']),
+			'lastname'  => lang('last name of the user, eg. "%1"', $this->values['lastname']),
+			'domain'    => lang('domain name for mail-address, eg. "%1"', $this->values['domain']),
+			'email'     => lang('email-address of the user, eg. "%1"', $this->values['email']),
+			'date'      => lang('todays date, eg. "%1"', $this->values['date']),
 		);
-		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
+		if ($this->debug) error_log(__METHOD__.print_r($this->vars, true));
 		// do the substituetion in the effective prefs (data)
 		//
-		foreach($this->data as $app => $data)
+		foreach ($this->data as $app => $data)
 		{
-			if(!is_array($data)) continue;
-			foreach($data as $key => $val)
+			if (!is_array($data)) continue;
+			foreach ($data as $key => $val)
 			{
-				if (!is_array($val) && strpos($val,'$$') !== False)
+				if (!is_array($val) && strpos($val, '$$') !== False)
 				{
 					$this->data[$app][$key] = $this->parse_notify($val);
 				}
 				elseif (is_array($val))
 				{
-					foreach($val as $k => $v)
+					foreach ($val as $k => $v)
 					{
-						if (!is_array($v) && strpos($v,'$$') !== False)
+						if (!is_array($v) && strpos($v, '$$') !== False)
 						{
 							$this->data[$app][$key][$k] = $this->parse_notify($v);
 						}
@@ -342,12 +342,12 @@ 
 		}
 		// handling of old PHP serialized and addslashed prefs
 		$data = php_safe_unserialize($str);
-		if($data === false)
+		if ($data === false)
 		{
 			// manually retrieve the string lengths of the serialized array if unserialize failed
 			$data = php_safe_unserialize(preg_replace_callback('!s:(\d+):"(.*?)";!s', function($matches)
 			{
-				return 's:'.mb_strlen($matches[2],'8bit').':"'.$matches[2].'";';
+				return 's:'.mb_strlen($matches[2], '8bit').':"'.$matches[2].'";';
 			}, $str));
 		}
 		self::unquote($data);
@@ -366,7 +366,7 @@ 
 			$arr = stripslashes($arr);
 			return;
 		}
-		foreach($arr as $key => $value)
+		foreach ($arr as $key => $value)
 		{
 			if (is_array($value))
 			{
@@ -387,27 +387,27 @@ 
 	 * @param boolean $use_session =true should the session prefs get used (default true) or not (false)
 	 * @return array with effective prefs ($this->data)
 	 */
-	function read_repository($use_session=true)
+	function read_repository($use_session = true)
 	{
-		$this->session = $use_session ? Cache::getSession('preferences','preferences') : array();
+		$this->session = $use_session ? Cache::getSession('preferences', 'preferences') : array();
 		if (!is_array($this->session))
 		{
 			$this->session = array();
 		}
 		$this->forced = $this->default = $this->user = $this->group = array();
-		$to_read = array(self::DEFAULT_ID,self::FORCED_ID,$this->account_id);
+		$to_read = array(self::DEFAULT_ID, self::FORCED_ID, $this->account_id);
 		if ($this->account_id > 0)
 		{
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
-			foreach((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
+			foreach ((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
 			{
-				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID;	// need to offset it with DEFAULT_ID = -2!
+				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID; // need to offset it with DEFAULT_ID = -2!
 			}
 			$to_read[] = $primary_group + self::DEFAULT_ID;
 		}
-		foreach($this->cache_read($to_read) as $id => $values)
+		foreach ($this->cache_read($to_read) as $id => $values)
 		{
-			switch($id)
+			switch ($id)
 			{
 				case self::FORCED_ID:
 					$this->forced = $values;
@@ -419,7 +419,7 @@ 
 					$this->user = $values;
 					break;
 				default:
-					foreach($values as $app => $vals)
+					foreach ($values as $app => $vals)
 					{
 						$this->group[$app] = (array)$vals + (array)$this->group[$app];
 					}
@@ -430,9 +430,9 @@ 
 
 		// let the (temp.) session prefs. override the user prefs.
 		//
-		foreach($this->session as $app => $values)
+		foreach ($this->session as $app => $values)
 		{
-			foreach($values as $var => $value)
+			foreach ($values as $var => $value)
 			{
 				$this->data[$app][$var] = $value;
 			}
@@ -440,9 +440,9 @@ 
 
 		// now use (primary) group defaults if needed (user-value unset or empty)
 		//
-		foreach((array)$this->group as $app => $values)
+		foreach ((array)$this->group as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				if (!isset($this->data[$app][$var]) || $this->data[$app][$var] === '')
 				{
@@ -452,9 +452,9 @@ 
 		}
 		// now use defaults if needed (user-value unset or empty)
 		//
-		foreach((array)$this->default as $app => $values)
+		foreach ((array)$this->default as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				if (!isset($this->data[$app][$var]) || $this->data[$app][$var] === '')
 				{
@@ -465,9 +465,9 @@ 
 		}
 		// now set/force forced values
 		//
-		foreach((array)$this->forced as $app => $values)
+		foreach ((array)$this->forced as $app => $values)
 		{
-			foreach((array)$values as $var => $value)
+			foreach ((array)$values as $var => $value)
 			{
 				$this->data[$app][$var] = $value;
 			}
@@ -483,12 +483,12 @@ 
 		{
 			reset($this->data);
 		}
-		if (isset($this->debug) && substr($GLOBALS['egw_info']['flags']['currentapp'],0,3) != 'log')
+		if (isset($this->debug) && substr($GLOBALS['egw_info']['flags']['currentapp'], 0, 3) != 'log')
 		{
-			echo 'user<pre>';     print_r($this->user); echo "</pre>\n";
-			echo 'forced<pre>';   print_r($this->forced); echo "</pre>\n";
-			echo 'default<pre>';  print_r($this->default); echo "</pre>\n";
-			echo 'group<pre>';    print_r($this->group); echo "</pre>\n";
+			echo 'user<pre>'; print_r($this->user); echo "</pre>\n";
+			echo 'forced<pre>'; print_r($this->forced); echo "</pre>\n";
+			echo 'default<pre>'; print_r($this->default); echo "</pre>\n";
+			echo 'group<pre>'; print_r($this->group); echo "</pre>\n";
 			echo 'effectiv<pre>'; print_r($this->data); echo "</pre>\n";
 		}
 		$this->check_set_tz_offset();
@@ -503,7 +503,7 @@ 
 	 * @param string $name =null
 	 * @return mixed
 	 */
-	function default_prefs($app=null,$name=null)
+	function default_prefs($app = null, $name = null)
 	{
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
@@ -521,13 +521,13 @@ 
 	 */
 	function check_set_tz_offset()
 	{
-		$prefs =& $this->data['common'];
+		$prefs = & $this->data['common'];
 
 		if (!empty($prefs['tz']))
 		{
-			DateTime::setUserPrefs($prefs['tz'],$prefs['dateformat'],$prefs['timeformat']);
+			DateTime::setUserPrefs($prefs['tz'], $prefs['dateformat'], $prefs['timeformat']);
 			// set the old preference for compatibilty with old code
-			$prefs['tz_offset'] = DateTime::tz_offset_s()/3600;
+			$prefs['tz_offset'] = DateTime::tz_offset_s() / 3600;
 		}
 	}
 
@@ -551,7 +551,7 @@ 
 		{
 			$this->read_repository();
 		}
-		reset ($this->data);
+		reset($this->data);
 		return $this->data;
 	}
 
@@ -566,7 +566,7 @@ 
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 * @return array with new effective prefs (even when forced or default prefs are set !)
 	 */
-	function add($app_name,$var,$value = '##undef##',$type='user')
+	function add($app_name, $var, $value = '##undef##', $type = 'user')
 	{
 		//echo "<p>add('$app_name','$var','$value')</p>\n";
 		if ($value === '##undef##')
@@ -580,10 +580,10 @@ 
 				if (!isset($this->forced[$app_name][$var]) || $this->forced[$app_name][$var] === '')
 				{
 					$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
-					Cache::setSession('preferences','preferences',$this->session);
-					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+					Cache::setSession('preferences', 'preferences', $this->session);
+					if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 					{
-						$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+						$GLOBALS['egw']->invalidate_session_cache(); // in case with cache the egw_info array in the session
 					}
 				}
 				break;
@@ -624,13 +624,13 @@ 
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 * @return array with new effective prefs (even when forced or default prefs are deleted!)
 	 */
-	function delete($app_name, $var = False,$type = 'user')
+	function delete($app_name, $var = False, $type = 'user')
 	{
 		//echo "<p>delete('$app_name','$var','$type')</p>\n";
 		$set_via = array(
-			'forced'  => array('user','default'),
-			'default' => array('forced','user'),
-			'user'    => array('forced','group','default'),
+			'forced'  => array('user', 'default'),
+			'default' => array('forced', 'user'),
+			'user'    => array('forced', 'group', 'default'),
 			'group'   => array('forced'),
 		);
 		if (!isset($set_via[$type]))
@@ -664,7 +664,7 @@ 
 			}
 			else
 			{
-				if($var && @isset($arr[$app_name][$var]) && $arr[$app_name][$var] !== '')
+				if ($var && @isset($arr[$app_name][$var]) && $arr[$app_name][$var] !== '')
 				{
 					$this->data[$app_name][$var] = $arr[$app_name][$var];
 					break;
@@ -672,7 +672,7 @@ 
 			}
 			unset($arr);
 		}
-		reset ($this->data);
+		reset($this->data);
 		return $this->data;
 	}
 
@@ -685,7 +685,7 @@ 
 	{
 		if ($accountid > 0)
 		{
-			$this->db->delete($this->table,array('preference_owner' => $accountid),__LINE__,__FILE__);
+			$this->db->delete($this->table, array('preference_owner' => $accountid), __LINE__, __FILE__);
 
 			Cache::unsetInstance(__CLASS__, $accountid);
 		}
@@ -700,9 +700,9 @@ 
 	{
 		if ($accountid < 0)
 		{
-			$this->db->delete($this->table,array('preference_owner' => $accountid+self::DEFAULT_ID),__LINE__,__FILE__);
+			$this->db->delete($this->table, array('preference_owner' => $accountid + self::DEFAULT_ID), __LINE__, __FILE__);
 
-			Cache::unsetInstance(__CLASS__, $accountid+self::DEFAULT_ID);
+			Cache::unsetInstance(__CLASS__, $accountid + self::DEFAULT_ID);
 		}
 	}
 
@@ -715,14 +715,14 @@ 
 	 * @param string $old_value if given, only change if that's current value
 	 * @param string $type if given limit to "user", "forced", "default", "group"
 	 */
-	public static function change_preference($app, $name, $value, $old_value=null, $type=null)
+	public static function change_preference($app, $name, $value, $old_value = null, $type = null)
 	{
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
 		if ($app) $where['preference_app'] = $app;
 
-		switch($type)
+		switch ($type)
 		{
 			case 'forced':
 				$where['preference_owner'] = self::FORCED_ID;
@@ -737,10 +737,10 @@ 
 				$where[] = 'preference_owner < '.self::DEFAULT_ID;
 				break;
 		}
-		foreach($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
+		foreach ($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
-			if (!is_array($prefs)) $prefs = array();	// would stall update otherwise
+			if (!is_array($prefs)) $prefs = array(); // would stall update otherwise
 
 			if ($name[0] == '/' && substr($name, -1) == '/')
 			{
@@ -755,7 +755,7 @@ 
 			}
 
 			$updated = false;
-			foreach($attrs as $attr)
+			foreach ($attrs as $attr)
 			{
 				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
 
@@ -784,7 +784,7 @@ 
 
 				// update instance-wide cache
 				$cached = Cache::getInstance(__CLASS__, $row['preference_owner']);
-				if($cached && $cached[$row['preference_app']])
+				if ($cached && $cached[$row['preference_app']])
 				{
 					$cached[$row['preference_app']] = $prefs;
 					Cache::setInstance(__CLASS__, $row['preference_owner'], $cached);
@@ -800,7 +800,7 @@ 
 	 * @param string $name Preference name
 	 * @param string $type ='user' of preference to set: forced, default, user
 	 */
-	public static function delete_preference($app, $name, $type='user')
+	public static function delete_preference($app, $name, $type = 'user')
 	{
 		self::change_preference($app, $name, null, null, $type);
 	}
@@ -812,12 +812,12 @@ 
 	 * @param string $to_app
 	 * @param array $names =null array of names to copy or null for all
 	 */
-	public static function copy_preferences($from_app, $to_app, array $names=null)
+	public static function copy_preferences($from_app, $to_app, array $names = null)
 	{
 		//error_log(__METHOD__."('$from_app', '$to_app', ".array2string($names).')');
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
-		foreach($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
+		foreach ($db->select(self::TABLE, '*', array('preference_app' => $from_app), __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
 
@@ -825,7 +825,7 @@ 
 			{
 				$prefs = array_intersect_key($prefs, array_flip($names));
 			}
-			if (!$prefs) continue;	// nothing to change, as nothing set
+			if (!$prefs) continue; // nothing to change, as nothing set
 
 			$row['preference_app'] = $to_app;
 			unset($row['preference_value']);
@@ -859,11 +859,11 @@ 
 	 * @param boolean $invalid_cache =true should we invalidate the cache, default true (not used anymore)
 	 * @return array with new effective prefs (even when forced or default prefs are deleted!)
 	 */
-	function save_repository($update_session_info = False,$type='user',$invalid_cache=true)
+	function save_repository($update_session_info = False, $type = 'user', $invalid_cache = true)
 	{
-		unset($update_session_info, $invalid_cache);	// no longer used
+		unset($update_session_info, $invalid_cache); // no longer used
 
-		switch($type)
+		switch ($type)
 		{
 			case 'forced':
 				$account_id = self::FORCED_ID;
@@ -878,17 +878,17 @@ 
 
 			default:
 				$account_id = (int)$this->account_id;
-				$prefs = &$this->user;	// we use the user-array as data contains default values too
+				$prefs = &$this->user; // we use the user-array as data contains default values too
 				break;
 		}
 		//echo "<p>preferences::save_repository(,$type): account_id=$account_id, prefs="; print_r($prefs); echo "</p>\n";
 
-		if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences',1,'preferences') &&
+		if (isset($GLOBALS['egw_setup']) || !$GLOBALS['egw']->acl->check('session_only_preferences', 1, 'preferences') &&
 			(!($old_prefs = $this->cache_read($account_id)) || $old_prefs != $prefs))
 		{
 			//error_log(__METHOD__."(type=$type) saved, because old_prefs[$account_id] != prefs=".array2string($prefs));
 			$changed = 0;
-			foreach($prefs as $app => $value)
+			foreach ($prefs as $app => $value)
 			{
 				// check if app preferences have changed, if not no need to save them
 				if ($old_prefs && $old_prefs[$app] == $value) continue;
@@ -905,12 +905,12 @@ 
 				}
 				else
 				{
-					$this->db->insert($this->table,array(
+					$this->db->insert($this->table, array(
 						'preference_value' => json_encode($value),
-					),array(
+					), array(
 						'preference_owner' => $account_id,
 						'preference_app'   => $app,
-					),__LINE__,__FILE__);
+					), __LINE__, __FILE__);
 				}
 			}
 			if ($changed)
@@ -937,21 +937,21 @@ 
 	 * @param int $account_id as determined in and/or passed to "create_email_preferences"
 	 * @return string with email-address
 	 */
-	function email_address($account_id='')
+	function email_address($account_id = '')
 	{
 		if (isset($this->data['email']['address']))
 		{
 			return $this->data['email']['address'];
 		}
 		// if email-address is set in the account, return it
-		if (($email = Accounts::id2name($account_id,'account_email')))
+		if (($email = Accounts::id2name($account_id, 'account_email')))
 		{
 			return $email;
 		}
 		$prefs_email_address = Accounts::id2name($account_id);
-		if ($prefs_email_address && strpos($prefs_email_address,'@') === False)
+		if ($prefs_email_address && strpos($prefs_email_address, '@') === False)
 		{
-			$prefs_email_address .= '@' . $GLOBALS['egw_info']['server']['mail_suffix'];
+			$prefs_email_address .= '@'.$GLOBALS['egw_info']['server']['mail_suffix'];
 		}
 		return $prefs_email_address;
 	}
@@ -965,7 +965,7 @@ 
 	 * @param $charset =null default system charset
 	 * @return string the local (or best estimate) set
 	 */
-	static function setlocale($category=LC_MESSAGES,$charset=null)
+	static function setlocale($category = LC_MESSAGES, $charset = null)
 	{
 		$lang = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		$country = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
@@ -976,12 +976,12 @@ 
 		}
 		else
 		{
-			list($lang,$lang2) = explode('-',$lang);
+			list($lang, $lang2) = explode('-', $lang);
 			$country_from_lang = strtoupper($lang2);
 		}
 		if (is_null($charset)) $charset = Translation::charset();
 
-		foreach(array(
+		foreach (array(
 			$lang.'_'.$country,
 			$lang.'_'.$country_from_lang,
 			$lang.'_'.$country.'.utf8',
@@ -991,15 +991,15 @@ 
 			'C',
 		) as $local)
 		{
-			if (($ret = setlocale($category,$local.'.'.$charset)) ||
-				($ret = setlocale($category,$local.'@'.$charset)) ||
-				($ret = setlocale($category,$local)))
+			if (($ret = setlocale($category, $local.'.'.$charset)) ||
+				($ret = setlocale($category, $local.'@'.$charset)) ||
+				($ret = setlocale($category, $local)))
 			{
 				//error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: returning '$ret'");
 				return $ret;
 			}
 		}
 		error_log(__METHOD__."($category,$charset) lang=$lang, country=$country, country_from_lang=$country_from_lang: Could not set local!");
-		return false;	// should not happen, as the 'C' local should at least be available everywhere
+		return false; // should not happen, as the 'C' local should at least be available everywhere
 	}
 }

Braces +81 added lines, -20 removed lines

@@ -196,7 +196,10 @@ 
 		foreach((array)$ids as $id)
 		{
 			// if prefs are not returned, null or not an array, read them from db
-			if (!isset($prefs[$id]) && !is_array($prefs[$id])) $db_read[] = $id;
+			if (!isset($prefs[$id]) && !is_array($prefs[$id]))
+			{
+				$db_read[] = $id;
+			}
 		}
 		if ($db_read)
 		{
@@ -209,7 +212,10 @@ 
 			}
 			foreach($db_read as $id)
 			{
-				if (!isset($prefs[$id])) $prefs[$id] = array();
+				if (!isset($prefs[$id]))
+				{
+					$prefs[$id] = array();
+				}
 				Cache::setInstance(__CLASS__, $id, $prefs[$id]);
 			}
 		}
@@ -237,7 +243,10 @@ 
 		$replace = $with = array();
 		foreach($vals as $key => $val)
 		{
-			if ($this->debug) error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			if ($this->debug)
+			{
+				error_log(__METHOD__." replacing \$\$$key\$\$ with $val  ");
+			}
 			$replace[] = '$$'.$key.'$$';
 			$with[]    = $val;
 		}
@@ -275,7 +284,10 @@ 
 	 */
 	function standard_substitutes()
 	{
-		if ($this->debug) error_log(__METHOD__." is called ");
+		if ($this->debug)
+		{
+			error_log(__METHOD__." is called ");
+		}
 		if (!is_array(@$GLOBALS['egw_info']['user']['preferences']))
 		{
 			$GLOBALS['egw_info']['user']['preferences'] = $this->data;	// else no lang()
@@ -301,12 +313,18 @@ 
 			'email'     => lang('email-address of the user, eg. "%1"',$this->values['email']),
 			'date'      => lang('todays date, eg. "%1"',$this->values['date']),
 		);
-		if ($this->debug) error_log(__METHOD__.print_r($this->vars,true));
+		if ($this->debug)
+		{
+			error_log(__METHOD__.print_r($this->vars,true));
+		}
 		// do the substituetion in the effective prefs (data)
 		//
 		foreach($this->data as $app => $data)
 		{
-			if(!is_array($data)) continue;
+			if(!is_array($data))
+			{
+				continue;
+			}
 			foreach($data as $key => $val)
 			{
 				if (!is_array($val) && strpos($val,'$$') !== False)
@@ -401,7 +419,11 @@ 
 			$primary_group = Accounts::id2name($this->account_id, 'account_primary_group');
 			foreach((array)$GLOBALS['egw']->accounts->memberships($this->account_id, true) as $gid)
 			{
-				if ($gid != $primary_group) $to_read[] = $gid + self::DEFAULT_ID;	// need to offset it with DEFAULT_ID = -2!
+				if ($gid != $primary_group)
+				{
+					$to_read[] = $gid + self::DEFAULT_ID;
+				}
+				// need to offset it with DEFAULT_ID = -2!
 			}
 			$to_read[] = $primary_group + self::DEFAULT_ID;
 		}
@@ -508,9 +530,15 @@ 
 		// Etemplate::complete_array_merge() is identical to PHP >= 5.3 array_replace_recursive()
 		$default = Etemplate::complete_array_merge($this->default, $this->forced);
 
-		if ($app) $default = $default[$app];
+		if ($app)
+		{
+			$default = $default[$app];
+		}
 
-		if ($name && is_array($default)) $default = $default[$name];
+		if ($name && is_array($default))
+		{
+			$default = $default[$name];
+		}
 
 		return $default;
 	}
@@ -581,9 +609,13 @@ 
 				{
 					$this->session[$app_name][$var] = $this->data[$app_name][$var] = $value;
 					Cache::setSession('preferences','preferences',$this->session);
-					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+					if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+					{
+						// egw object in setup is limited
 					{
-						$GLOBALS['egw']->invalidate_session_cache();	// in case with cache the egw_info array in the session
+						$GLOBALS['egw']->invalidate_session_cache();
+					}
+					// in case with cache the egw_info array in the session
 					}
 				}
 				break;
@@ -639,9 +671,12 @@ 
 		}
 		$pref = &$this->$type;
 
-		if (($all = empty($var))) // to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
+		if (($all = empty($var)))
+		{
+			// to check if $var is regarded as empty (false, 0, '', null, array() should do the trick
 		{
 			unset($pref[$app_name]);
+		}
 			unset($this->data[$app_name]);
 		}
 		else
@@ -720,7 +755,10 @@ 
 		$db = isset($GLOBALS['egw_setup']->db) ? $GLOBALS['egw_setup']->db : $GLOBALS['egw']->db;
 
 		$where = array();
-		if ($app) $where['preference_app'] = $app;
+		if ($app)
+		{
+			$where['preference_app'] = $app;
+		}
 
 		switch($type)
 		{
@@ -740,7 +778,11 @@ 
 		foreach($db->select(self::TABLE, '*', $where, __LINE__, __FILE__) as $row)
 		{
 			$prefs = self::unserialize($row['preference_value']);
-			if (!is_array($prefs)) $prefs = array();	// would stall update otherwise
+			if (!is_array($prefs))
+			{
+				$prefs = array();
+			}
+			// would stall update otherwise
 
 			if ($name[0] == '/' && substr($name, -1) == '/')
 			{
@@ -757,10 +799,16 @@ 
 			$updated = false;
 			foreach($attrs as $attr)
 			{
-				if (isset($old_value) && $prefs[$attr] != $old_value) continue;
+				if (isset($old_value) && $prefs[$attr] != $old_value)
+				{
+					continue;
+				}
 
 				$val = is_callable($value) ? call_user_func($value, $attr, $prefs[$attr], $row['preference_owner'], $prefs) : $value;
-				if ($val === $prefs[$attr]) continue;
+				if ($val === $prefs[$attr])
+				{
+					continue;
+				}
 
 				$updated = true;
 				if ((string)$val !== '')
@@ -825,7 +873,11 @@ 
 			{
 				$prefs = array_intersect_key($prefs, array_flip($names));
 			}
-			if (!$prefs) continue;	// nothing to change, as nothing set
+			if (!$prefs)
+			{
+				continue;
+			}
+			// nothing to change, as nothing set
 
 			$row['preference_app'] = $to_app;
 			unset($row['preference_value']);
@@ -891,9 +943,15 @@ 
 			foreach($prefs as $app => $value)
 			{
 				// check if app preferences have changed, if not no need to save them
-				if ($old_prefs && $old_prefs[$app] == $value) continue;
+				if ($old_prefs && $old_prefs[$app] == $value)
+				{
+					continue;
+				}
 
-				if (!$changed++) $this->db->transaction_begin();
+				if (!$changed++)
+				{
+					$this->db->transaction_begin();
+				}
 
 				if (!is_array($value) || !$value)
 				{
@@ -979,7 +1037,10 @@ 
 			list($lang,$lang2) = explode('-',$lang);
 			$country_from_lang = strtoupper($lang2);
 		}
-		if (is_null($charset)) $charset = Translation::charset();
+		if (is_null($charset))
+		{
+			$charset = Translation::charset();
+		}
 
 		foreach(array(
 			$lang.'_'.$country,

infolog/inc/class.infolog_datasource.inc.php

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

@@ -102,7 +102,7 @@
 	 *	and the amount to offset them from the original while copying
 	 * @return array/boolean array(info_id,link_id) on success, false otherwise
 	 */
-	function copy($element,$target,$extra=null,$date_offsets = Array())
+	function copy($element,$target,$extra=null,$date_offsets = array())
 	{
 		unset($extra);	// not used, but required by function signature
 

Braces +16 added lines, -4 removed lines

@@ -65,7 +65,10 @@ 
 		{
 			$data =& $this->infolog_bo->read((int) $data_id);
 
-			if (!is_array($data)) return false;
+			if (!is_array($data))
+			{
+				return false;
+			}
 		}
 		else
 		{
@@ -111,7 +114,10 @@ 
 
 		$info =& $this->infolog_bo->read((int) $element['pe_app_id']);
 
-		if (!is_array($info)) return false;
+		if (!is_array($info))
+		{
+			return false;
+		}
 
 		$info_contact = $info['info_contact'];
 		$info_from = $info['info_from'];
@@ -175,17 +181,23 @@ 
 		}
 
 		$info['pm_id'] = $target;
-		if(!($info['info_id'] = $this->infolog_bo->write($info))) return false;
+		if(!($info['info_id'] = $this->infolog_bo->write($info)))
+		{
+			return false;
+		}
 		$this->infolog_bo->link_id2from($info);
 
 		// creating again all links, beside the one to the source-project
 		foreach(Link::get_links('infolog',$element['pe_app_id']) as $link)
 		{
 			if ($link['app'] == 'projectmanager' && $link['id'] == $element['pm_id'] ||		// ignoring the source project
-				$link['app'] == Link::VFS_APPNAME)					// ignoring files attachments for now
+				$link['app'] == Link::VFS_APPNAME)
+			{
+				// ignoring files attachments for now
 			{
 				continue;
 			}
+			}
 			Link::link('infolog',$info['info_id'],$link['app'],$link['id'],$link['remark']);
 		}
 		$this->infolog_bo->write($info);

Spacing +32 added lines, -32 removed lines

@@ -50,7 +50,7 @@ 
 		{
 			$GLOBALS['infolog_bo'] = new infolog_bo();
 		}
-		$this->infolog_bo =& $GLOBALS['infolog_bo'];
+		$this->infolog_bo = & $GLOBALS['infolog_bo'];
 	}
 
 	/**
@@ -63,13 +63,13 @@ 
 	{
 		if (!is_array($data_id))
 		{
-			$data =& $this->infolog_bo->read((int) $data_id);
+			$data = & $this->infolog_bo->read((int)$data_id);
 
 			if (!is_array($data)) return false;
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 
 		return array(
@@ -103,11 +103,11 @@ 
 	 *	and the amount to offset them from the original while copying
 	 * @return array/boolean array(info_id,link_id) on success, false otherwise
 	 */
-	function copy($element,$target,$extra=null,$date_offsets = Array())
+	function copy($element, $target, $extra = null, $date_offsets = Array())
 	{
-		unset($extra);	// not used, but required by function signature
+		unset($extra); // not used, but required by function signature
 
-		$info =& $this->infolog_bo->read((int) $element['pe_app_id']);
+		$info = & $this->infolog_bo->read((int)$element['pe_app_id']);
 
 		if (!is_array($info)) return false;
 
@@ -117,13 +117,13 @@ 
 		// unsetting info_link_id and evtl. info_from
 		if ($info['info_link_id'])
 		{
-			$this->infolog_bo->link_id2from($info);		// unsets info_from and sets info_link_target
+			$this->infolog_bo->link_id2from($info); // unsets info_from and sets info_link_target
 			unset($info['info_link_id']);
 			unset($info['info_contact']);
 		}
 
 		// we need to unset a few fields to get a new entry
-		foreach(array('info_id','info_owner','info_modified','info_modifierer') as $key)
+		foreach (array('info_id', 'info_owner', 'info_modified', 'info_modifierer') as $key)
 		{
 			unset($info[$key]);
 		}
@@ -137,12 +137,12 @@ 
 		);
 
 		$startdate_original = $info['info_startdate'];
-		foreach($map as $offset_field => $info_field)
+		foreach ($map as $offset_field => $info_field)
 		{
-			if($date_offsets[$offset_field] && $info[$info_field])
+			if ($date_offsets[$offset_field] && $info[$info_field])
 			{
 				// Don't move startdate twice, but prefer later value
-				if($startdate_original && $info_field == 'info_startdate')
+				if ($startdate_original && $info_field == 'info_startdate')
 				{
 					$info[$info_field] = $startdate_original;
 				}
@@ -152,11 +152,11 @@ 
 			}
 		}
 		// Sanity check - not due or ended before it starts
-		if($info['info_startdate'] && $info['info_enddate'] && $info['info_startdate'] > $info['info_enddate'])
+		if ($info['info_startdate'] && $info['info_enddate'] && $info['info_startdate'] > $info['info_enddate'])
 		{
 			unset($info['info_enddate']);
 		}
-		if($info['info_startdate'] && $info['info_datecompleted'] && $info['info_startdate'] > $info['info_datecompleted'])
+		if ($info['info_startdate'] && $info['info_datecompleted'] && $info['info_startdate'] > $info['info_datecompleted'])
 		{
 			unset($info['info_datecompleted']);
 		}
@@ -164,7 +164,7 @@ 
 		// If info_from missing or matches project title, update it
 		if (!$info['info_from'] || $info['info_from'] == Link::title('projectmanager', $info['pm_id']))
 		{
-			$info['info_from'] = Link::title('projectmanager',$target);
+			$info['info_from'] = Link::title('projectmanager', $target);
 			unset($info['info_custom_from']);
 		}
 		if ($info['info_status'] == 'template')
@@ -173,29 +173,29 @@ 
 		}
 
 		$info['pm_id'] = $target;
-		if(!($info['info_id'] = $this->infolog_bo->write($info))) return false;
+		if (!($info['info_id'] = $this->infolog_bo->write($info))) return false;
 		$this->infolog_bo->link_id2from($info);
 
 		// creating again all links, beside the one to the source-project
-		foreach(Link::get_links('infolog',$element['pe_app_id']) as $link)
+		foreach (Link::get_links('infolog', $element['pe_app_id']) as $link)
 		{
-			if ($link['app'] == 'projectmanager' && $link['id'] == $element['pm_id'] ||		// ignoring the source project
+			if ($link['app'] == 'projectmanager' && $link['id'] == $element['pm_id'] || // ignoring the source project
 				$link['app'] == Link::VFS_APPNAME)					// ignoring files attachments for now
 			{
 				continue;
 			}
-			Link::link('infolog',$info['info_id'],$link['app'],$link['id'],$link['remark']);
+			Link::link('infolog', $info['info_id'], $link['app'], $link['id'], $link['remark']);
 		}
 		$this->infolog_bo->write($info);
-		$ret = array($info['info_id'],$info['info_link_id']);
+		$ret = array($info['info_id'], $info['info_link_id']);
 
 		// if we have a parent set, return our callback to modify the parent id,
 		// or we have a contact or custom info_from and need to re-set it after
 		// all entries are copied
 		if ($info['info_id_parent'] || $info_contact)
 		{
-			$ret[] = array($this,'copy_callback');	// callback
-			$ret[] = array($info['info_id'],$info['info_id_parent'], $info_contact, $info_from);	// $param
+			$ret[] = array($this, 'copy_callback'); // callback
+			$ret[] = array($info['info_id'], $info['info_id_parent'], $info_contact, $info_from); // $param
 		}
 		return $ret;
 	}
@@ -212,21 +212,21 @@ 
 	public function copy_callback(array $param, array $apps_copied)
 	{
 		//error_log(__METHOD__."(".array2string($param).', '.array2string($apps_copied).')');
-		list($info_id,$parent_id, $contact, $from) = $param;
+		list($info_id, $parent_id, $contact, $from) = $param;
 		if ($parent_id && isset($apps_copied['infolog'][$parent_id]) && ($info = $this->infolog_bo->read($info_id)))
 		{
 			$info['info_id_parent'] = $apps_copied['infolog'][$parent_id];
-			$this->infolog_bo->write($info,false,true,true,true);	// no default and no notification
+			$this->infolog_bo->write($info, false, true, true, true); // no default and no notification
 		}
-		if($contact && $contact['app'] != 'projectmanager' && ($info = $this->infolog_bo->read($info_id)))
+		if ($contact && $contact['app'] != 'projectmanager' && ($info = $this->infolog_bo->read($info_id)))
 		{
 			$info['info_contact'] = $contact;
-			$this->infolog_bo->write($info,false,true,true,true);	// no default and no notification
+			$this->infolog_bo->write($info, false, true, true, true); // no default and no notification
 		}
-		if($from && ($info = $this->infolog_bo->read($info_id)))
+		if ($from && ($info = $this->infolog_bo->read($info_id)))
 		{
 			$info['info_from'] = $from;
-			$this->infolog_bo->write($info,false,true,true,true);	// no default and no notification
+			$this->infolog_bo->write($info, false, true, true, true); // no default and no notification
 		}
 	}
 
@@ -244,7 +244,7 @@ 
 			$GLOBALS['infolog_bo'] = new infolog_bo();
 		}
 		// dont delete infolog, which are linked to other elements, but their project
-		if (count(Link::get_links('infolog',$id)) > 1)
+		if (count(Link::get_links('infolog', $id)) > 1)
 		{
 			return false;
 		}
@@ -258,19 +258,19 @@ 
 	 * @param string $status
 	 * @return boolean true if status changed, false otherwise
 	 */
-	function change_status($id,$status)
+	function change_status($id, $status)
 	{
 		//error_log("datasource_infolog::change_status($id,$status)");
 		if (($info = $this->infolog_bo->read($id)) && (
-				$this->infolog_bo->check_access($info,Acl::EDIT) ||
+				$this->infolog_bo->check_access($info, Acl::EDIT) ||
 				$info['info_status'] == 'deleted' && $this->infolog_bo->check_access($info, infolog_bo::ACL_UNDELETE)
 		))
 		{
-			if ($status == 'active' && in_array($info['info_status'],array('template','nonactive','archive','deleted')))
+			if ($status == 'active' && in_array($info['info_status'], array('template', 'nonactive', 'archive', 'deleted')))
 			{
 				$status = $this->infolog_bo->activate($info);
 			}
-			if($info['info_status'] != $status && isset($this->infolog_bo->status[$info['info_type']][$status]))
+			if ($info['info_status'] != $status && isset($this->infolog_bo->status[$info['info_type']][$status]))
 			{
 				//error_log("datasource_infolog::change_status($id,$status) setting status from ".$info['info_status']);
 				$info['info_status'] = $status;