EGroupware / egroupware

api/setup/tables_update.inc.php

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

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

Doc Comments +1 added lines, -1 removed lines

@@ -459,7 +459,7 @@
  *
  * Forced preferences with value '' behave unexpected, false values of type "check" need to be written as "0".
  *
- * @return type
+ * @return string
  */
 function api_upgrade17_1_003()
 {

Braces +20 added lines, -5 removed lines

@@ -46,7 +46,10 @@ 
 	{
 		$GLOBALS['egw_setup']->oProc->DropTable($table);
 
-		if (!$done++) $GLOBALS['egw_setup']->deregister_app('felamimail');
+		if (!$done++)
+		{
+			$GLOBALS['egw_setup']->deregister_app('felamimail');
+		}
 	}
 
 	return $GLOBALS['setup_info']['api']['currentver'] = '16.1';
@@ -104,11 +107,17 @@ 
 	Vfs::$is_root = true;
 	foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app)
 	{
-		if ($app && !file_exists(EGW_SERVER_ROOT.'/'.$app)) continue;
+		if ($app && !file_exists(EGW_SERVER_ROOT.'/'.$app))
+		{
+			continue;
+		}
 
 		// create directory and set permissions: Admins writable and other readable
 		$dir = '/templates'.($app ? '/'.$app : '');
-		if (Vfs::file_exists($dir)) continue;
+		if (Vfs::file_exists($dir))
+		{
+			continue;
+		}
 
 		Vfs::mkdir($dir, 075, STREAM_MKDIR_RECURSIVE);
 		Vfs::chgrp($dir, abs($admins));
@@ -297,7 +306,10 @@ 
 					fclose($fp);
 				}
 			}
-			if (!trim($row['contact_pubkey'])) $row['contact_pubkey'] = null;
+			if (!trim($row['contact_pubkey']))
+			{
+				$row['contact_pubkey'] = null;
+			}
 
 			if ($files)
 			{
@@ -432,7 +444,10 @@ 
 				$template_set = null;
 				break;
 		}
-		if ($value !== $prefs[$attr]) error_log(__FUNCTION__."('$attr', '{$prefs[$attr]}', $owner, ...) setting $attr to ".array2string($value));
+		if ($value !== $prefs[$attr])
+		{
+			error_log(__FUNCTION__."('$attr', '{$prefs[$attr]}', $owner, ...) setting $attr to ".array2string($value));
+		}
 		return $value;
 	});
 

Spacing +90 added lines, -90 removed lines

@@ -25,7 +25,7 @@ 
 	$tables = $GLOBALS['egw_setup']->db->table_names(true);
 	$phpgw_baseline = array();
 	include (__DIR__.'/tables_current.inc.php');
-	foreach($phpgw_baseline as $table => $definition)
+	foreach ($phpgw_baseline as $table => $definition)
 	{
 		if (!in_array($table, $tables))
 		{
@@ -42,7 +42,7 @@ 
 
 	// uninstall obsolete FelamiMail tables, if still around
 	$done = 0;
-	foreach(array_intersect($tables, array('egw_felamimail_accounts', 'egw_felamimail_displayfilter', 'egw_felamimail_signatures')) as $table)
+	foreach (array_intersect($tables, array('egw_felamimail_accounts', 'egw_felamimail_displayfilter', 'egw_felamimail_signatures')) as $table)
 	{
 		$GLOBALS['egw_setup']->oProc->DropTable($table);
 
@@ -59,7 +59,7 @@ 
  */
 function api_upgrade16_1()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_folder_archive', array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_folder_archive', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'archive folder'
@@ -75,7 +75,7 @@ 
  */
 function api_upgrade16_1_001()
 {
-	foreach(array(
+	foreach (array(
 		'cf_type' => 'egw_customfields',
 		'link_app1' => 'egw_links',
 		'link_app2' => 'egw_links',
@@ -99,10 +99,10 @@ 
  */
 function api_upgrade16_1_002()
 {
-	$admins = $GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False);
+	$admins = $GLOBALS['egw_setup']->add_account('Admins', 'Admin', 'Group', False, False);
 
 	Vfs::$is_root = true;
-	foreach(array('','addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app)
+	foreach (array('', 'addressbook', 'calendar', 'infolog', 'tracker', 'timesheet', 'projectmanager', 'filemanager') as $app)
 	{
 		if ($app && !file_exists(EGW_SERVER_ROOT.'/'.$app)) continue;
 
@@ -127,7 +127,7 @@ 
 function api_upgrade16_1_003()
 {
 	$GLOBALS['egw_setup']->oProc->RenameColumn('egw_ea_accounts', 'acc_further_identities', 'further_bool');
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_further_identities',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_further_identities', array(
 		'type' => 'int',
 		'precision' => '1',
 		'nullable' => False,
@@ -161,19 +161,19 @@ 
 		$total = 0;
 		do {
 			$n = 0;
-			foreach($GLOBALS['egw_setup']->db->query('SELECT fs_id,prop_namespace,prop_name,MAX(prop_id) AS prop_id
+			foreach ($GLOBALS['egw_setup']->db->query('SELECT fs_id,prop_namespace,prop_name,MAX(prop_id) AS prop_id
 FROM egw_sqlfs_props
 GROUP BY fs_id,prop_namespace,prop_name
 HAVING COUNT(*) > 1', __LINE__, __FILE__, 0, $junk_size, false, Api\Db::FETCH_ASSOC) as $row)
 			{
 				$prop_id = $row['prop_id'];
 				unset($row['prop_id']);
-				$GLOBALS['egw_setup']->db->delete('egw_sqlfs_props', $row+array('prop_id != '.(int)$prop_id), __LINE__, __FILE__);
+				$GLOBALS['egw_setup']->db->delete('egw_sqlfs_props', $row + array('prop_id != '.(int)$prop_id), __LINE__, __FILE__);
 				$total += $GLOBALS['egw_setup']->db->affected_rows();
 				$n++;
 			}
 		}
-		while($n == $junk_size);
+		while ($n == $junk_size);
 
 		if ($total)
 		{
@@ -209,7 +209,7 @@ 
  */
 function api_upgrade16_9()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_credentials','cred_password',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_credentials', 'cred_password', array(
 		'type' => 'varchar',
 		'precision' => '9600',
 		'comment' => 'password encrypted'
@@ -220,12 +220,12 @@ 
 
 function api_upgrade16_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_folder_ham',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_folder_ham', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'ham folder'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts','acc_spam_api',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_ea_accounts', 'acc_spam_api', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'comment' => 'SpamTitan API URL'
@@ -242,7 +242,7 @@ 
  */
 function api_upgrade16_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook','contact_files',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_addressbook', 'contact_files', array(
 		'type' => 'int',
 		'precision' => '1',
 		'default' => '0',
@@ -254,7 +254,7 @@ 
 	Api\Vfs::$is_root = true;
 	do {
 		$n = 0;
-		foreach($GLOBALS['egw_setup']->db->query("SELECT contact_id,contact_jpegphoto,contact_pubkey
+		foreach ($GLOBALS['egw_setup']->db->query("SELECT contact_id,contact_jpegphoto,contact_pubkey
 FROM egw_addressbook
 WHERE contact_jpegphoto != '' OR contact_pubkey IS NOT NULL AND contact_pubkey LIKE '%-----%'",
 			__LINE__, __FILE__, 0, $junk_size, false, Api\Db::FETCH_ASSOC) as $row)
@@ -275,7 +275,7 @@ 
 				}
 				fclose($fp);
 			}
-			foreach(array(
+			foreach (array(
 				array(addressbook_bo::$pgp_key_regexp, Api\Contacts::FILES_PGP_PUBKEY, Api\Contacts::FILES_BIT_PGP_PUBKEY, 'application/pgp-keys'),
 				array(Api\Mail\Smime::$certificate_regexp, Api\Contacts::FILES_SMIME_PUBKEY, Api\Contacts::FILES_BIT_SMIME_PUBKEY, 'application/x-pem-file'),
 			) as $data)
@@ -309,7 +309,7 @@ 
 			$n++;
 		}
 	}
-	while($n == $junk_size);
+	while ($n == $junk_size);
 	Api\Vfs::$is_root = false;
 
 	return $GLOBALS['setup_info']['api']['currentver'] = '16.9.003';
@@ -322,78 +322,78 @@ 
  */
 function api_upgrade16_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_addressbook',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_addressbook', array(
 		'fd' => array(
-			'contact_id' => array('type' => 'auto','nullable' => False),
-			'contact_tid' => array('type' => 'char','precision' => '1','default' => 'n'),
-			'contact_owner' => array('type' => 'int','meta' => 'account','precision' => '8','nullable' => False,'comment' => 'account or group id of the adressbook'),
-			'contact_private' => array('type' => 'int','precision' => '1','default' => '0','comment' => 'privat or personal'),
-			'cat_id' => array('type' => 'ascii','meta' => 'category','precision' => '255','comment' => 'Category(s)'),
-			'n_family' => array('type' => 'varchar','precision' => '64','comment' => 'Family name'),
-			'n_given' => array('type' => 'varchar','precision' => '64','comment' => 'Given Name'),
-			'n_middle' => array('type' => 'varchar','precision' => '64'),
-			'n_prefix' => array('type' => 'varchar','precision' => '64','comment' => 'Prefix'),
-			'n_suffix' => array('type' => 'varchar','precision' => '64','comment' => 'Suffix'),
-			'n_fn' => array('type' => 'varchar','precision' => '128','comment' => 'Full name'),
-			'n_fileas' => array('type' => 'varchar','precision' => '255','comment' => 'sort as'),
-			'contact_bday' => array('type' => 'varchar','precision' => '12','comment' => 'Birtday'),
-			'org_name' => array('type' => 'varchar','precision' => '128','comment' => 'Organisation'),
-			'org_unit' => array('type' => 'varchar','precision' => '64','comment' => 'Department'),
-			'contact_title' => array('type' => 'varchar','precision' => '64','comment' => 'jobtittle'),
-			'contact_role' => array('type' => 'varchar','precision' => '64','comment' => 'role'),
-			'contact_assistent' => array('type' => 'varchar','precision' => '64','comment' => 'Name of the Assistent (for phone number)'),
-			'contact_room' => array('type' => 'varchar','precision' => '64','comment' => 'room'),
-			'adr_one_street' => array('type' => 'varchar','precision' => '64','comment' => 'street (business)'),
-			'adr_one_street2' => array('type' => 'varchar','precision' => '64','comment' => 'street (business) - 2. line'),
-			'adr_one_locality' => array('type' => 'varchar','precision' => '64','comment' => 'city (business)'),
-			'adr_one_region' => array('type' => 'varchar','precision' => '64','comment' => 'region (business)'),
-			'adr_one_postalcode' => array('type' => 'varchar','precision' => '64','comment' => 'postalcode (business)'),
-			'adr_one_countryname' => array('type' => 'varchar','precision' => '64','comment' => 'countryname (business)'),
-			'contact_label' => array('type' => 'text','comment' => 'currently not used'),
-			'adr_two_street' => array('type' => 'varchar','precision' => '64','comment' => 'street (private)'),
-			'adr_two_street2' => array('type' => 'varchar','precision' => '64','comment' => 'street (private) - 2. line'),
-			'adr_two_locality' => array('type' => 'varchar','precision' => '64','comment' => 'city (private)'),
-			'adr_two_region' => array('type' => 'varchar','precision' => '64','comment' => 'region (private)'),
-			'adr_two_postalcode' => array('type' => 'varchar','precision' => '64','comment' => 'postalcode (private)'),
-			'adr_two_countryname' => array('type' => 'varchar','precision' => '64','comment' => 'countryname (private)'),
-			'tel_work' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number (business)'),
-			'tel_cell' => array('type' => 'varchar','precision' => '40','comment' => 'mobil phone (business)'),
-			'tel_fax' => array('type' => 'varchar','precision' => '40','comment' => 'fax-number (business)'),
-			'tel_assistent' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number assistent'),
-			'tel_car' => array('type' => 'varchar','precision' => '40'),
-			'tel_pager' => array('type' => 'varchar','precision' => '40','comment' => 'pager'),
-			'tel_home' => array('type' => 'varchar','precision' => '40','comment' => 'phone-number (private)'),
-			'tel_fax_home' => array('type' => 'varchar','precision' => '40','comment' => 'fax-number (private)'),
-			'tel_cell_private' => array('type' => 'varchar','precision' => '40','comment' => 'mobil phone (private)'),
-			'tel_other' => array('type' => 'varchar','precision' => '40','comment' => 'other phone'),
-			'tel_prefer' => array('type' => 'varchar','precision' => '32','comment' => 'prefered phone-number'),
-			'contact_email' => array('type' => 'varchar','precision' => '128','comment' => 'email address (business)'),
-			'contact_email_home' => array('type' => 'varchar','precision' => '128','comment' => 'email address (private)'),
-			'contact_url' => array('type' => 'varchar','precision' => '128','comment' => 'website (business)'),
-			'contact_url_home' => array('type' => 'varchar','precision' => '128','comment' => 'website (private)'),
-			'contact_freebusy_uri' => array('type' => 'ascii','precision' => '128','comment' => 'freebusy-url for calendar of the contact'),
-			'contact_calendar_uri' => array('type' => 'ascii','precision' => '128','comment' => 'url for users calendar - currently not used'),
-			'contact_note' => array('type' => 'varchar','precision' => '8192','comment' => 'notes field'),
-			'contact_tz' => array('type' => 'varchar','precision' => '8','comment' => 'timezone difference'),
-			'contact_geo' => array('type' => 'ascii','precision' => '32','comment' => 'currently not used'),
-			'contact_pubkey' => array('type' => 'ascii','precision' => '16384','comment' => 'public key'),
-			'contact_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','comment' => 'timestamp of the creation'),
-			'contact_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account id of the creator'),
-			'contact_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the last modified'),
-			'contact_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id of the last modified'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '4','comment' => 'account id'),
-			'contact_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag of the changes'),
-			'contact_uid' => array('type' => 'ascii','precision' => '128','comment' => 'unique id of the contact'),
-			'adr_one_countrycode' => array('type' => 'ascii','precision' => '2','comment' => 'countrycode (business)'),
-			'adr_two_countrycode' => array('type' => 'ascii','precision' => '2','comment' => 'countrycode (private)'),
-			'carddav_name' => array('type' => 'ascii','precision' => '128','comment' => 'name part of CardDAV URL, if specified by client'),
-			'contact_files' => array('type' => 'int','precision' => '1','default' => '0','comment' => '&1: photo, &2: pgp, &4: smime')
+			'contact_id' => array('type' => 'auto', 'nullable' => False),
+			'contact_tid' => array('type' => 'char', 'precision' => '1', 'default' => 'n'),
+			'contact_owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '8', 'nullable' => False, 'comment' => 'account or group id of the adressbook'),
+			'contact_private' => array('type' => 'int', 'precision' => '1', 'default' => '0', 'comment' => 'privat or personal'),
+			'cat_id' => array('type' => 'ascii', 'meta' => 'category', 'precision' => '255', 'comment' => 'Category(s)'),
+			'n_family' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Family name'),
+			'n_given' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Given Name'),
+			'n_middle' => array('type' => 'varchar', 'precision' => '64'),
+			'n_prefix' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Prefix'),
+			'n_suffix' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Suffix'),
+			'n_fn' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'Full name'),
+			'n_fileas' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'sort as'),
+			'contact_bday' => array('type' => 'varchar', 'precision' => '12', 'comment' => 'Birtday'),
+			'org_name' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'Organisation'),
+			'org_unit' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Department'),
+			'contact_title' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'jobtittle'),
+			'contact_role' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'role'),
+			'contact_assistent' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'Name of the Assistent (for phone number)'),
+			'contact_room' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'room'),
+			'adr_one_street' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (business)'),
+			'adr_one_street2' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (business) - 2. line'),
+			'adr_one_locality' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'city (business)'),
+			'adr_one_region' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'region (business)'),
+			'adr_one_postalcode' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'postalcode (business)'),
+			'adr_one_countryname' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'countryname (business)'),
+			'contact_label' => array('type' => 'text', 'comment' => 'currently not used'),
+			'adr_two_street' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (private)'),
+			'adr_two_street2' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'street (private) - 2. line'),
+			'adr_two_locality' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'city (private)'),
+			'adr_two_region' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'region (private)'),
+			'adr_two_postalcode' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'postalcode (private)'),
+			'adr_two_countryname' => array('type' => 'varchar', 'precision' => '64', 'comment' => 'countryname (private)'),
+			'tel_work' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'phone-number (business)'),
+			'tel_cell' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'mobil phone (business)'),
+			'tel_fax' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'fax-number (business)'),
+			'tel_assistent' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'phone-number assistent'),
+			'tel_car' => array('type' => 'varchar', 'precision' => '40'),
+			'tel_pager' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'pager'),
+			'tel_home' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'phone-number (private)'),
+			'tel_fax_home' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'fax-number (private)'),
+			'tel_cell_private' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'mobil phone (private)'),
+			'tel_other' => array('type' => 'varchar', 'precision' => '40', 'comment' => 'other phone'),
+			'tel_prefer' => array('type' => 'varchar', 'precision' => '32', 'comment' => 'prefered phone-number'),
+			'contact_email' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'email address (business)'),
+			'contact_email_home' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'email address (private)'),
+			'contact_url' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'website (business)'),
+			'contact_url_home' => array('type' => 'varchar', 'precision' => '128', 'comment' => 'website (private)'),
+			'contact_freebusy_uri' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'freebusy-url for calendar of the contact'),
+			'contact_calendar_uri' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'url for users calendar - currently not used'),
+			'contact_note' => array('type' => 'varchar', 'precision' => '8192', 'comment' => 'notes field'),
+			'contact_tz' => array('type' => 'varchar', 'precision' => '8', 'comment' => 'timezone difference'),
+			'contact_geo' => array('type' => 'ascii', 'precision' => '32', 'comment' => 'currently not used'),
+			'contact_pubkey' => array('type' => 'ascii', 'precision' => '16384', 'comment' => 'public key'),
+			'contact_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'comment' => 'timestamp of the creation'),
+			'contact_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'account id of the creator'),
+			'contact_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'timestamp of the last modified'),
+			'contact_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'account id of the last modified'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'comment' => 'account id'),
+			'contact_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag of the changes'),
+			'contact_uid' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'unique id of the contact'),
+			'adr_one_countrycode' => array('type' => 'ascii', 'precision' => '2', 'comment' => 'countrycode (business)'),
+			'adr_two_countrycode' => array('type' => 'ascii', 'precision' => '2', 'comment' => 'countrycode (private)'),
+			'carddav_name' => array('type' => 'ascii', 'precision' => '128', 'comment' => 'name part of CardDAV URL, if specified by client'),
+			'contact_files' => array('type' => 'int', 'precision' => '1', 'default' => '0', 'comment' => '&1: photo, &2: pgp, &4: smime')
 		),
 		'pk' => array('contact_id'),
 		'fk' => array(),
-		'ix' => array('contact_owner','cat_id','n_fileas','contact_modified','contact_uid','carddav_name',array('n_family','n_given'),array('n_given','n_family'),array('org_name','n_family','n_given')),
+		'ix' => array('contact_owner', 'cat_id', 'n_fileas', 'contact_modified', 'contact_uid', 'carddav_name', array('n_family', 'n_given'), array('n_given', 'n_family'), array('org_name', 'n_family', 'n_given')),
 		'uc' => array('account_id')
-	),'contact_jpegphoto');
+	), 'contact_jpegphoto');
 
 	return $GLOBALS['setup_info']['api']['currentver'] = '16.9.004';
 }
@@ -446,7 +446,7 @@ 
  */
 function api_upgrade17_1()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_credentials','cred_password',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_ea_credentials', 'cred_password', array(
 		'type' => 'varchar',
 		'precision' => '16384',
 		'comment' => 'password encrypted'
@@ -460,7 +460,7 @@ 
  */
 function api_upgrade17_1_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_history_log','share_email',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_history_log', 'share_email', array(
 		'type' => 'varchar',
 		'precision' => '4096',
 		'default' => NULL,
@@ -473,11 +473,11 @@ 
 
 function api_upgrade17_1_002()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_history_log','history_new_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_history_log', 'history_new_value', array(
 		'type' => 'longtext',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_history_log','history_old_value',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_history_log', 'history_old_value', array(
 		'type' => 'longtext',
 		'nullable' => False
 	));
@@ -502,12 +502,12 @@ 
 
 function api_upgrade17_1_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','contact_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook', 'contact_uid', array(
 		'type' => 'ascii',
 		'precision' => '255',
 		'comment' => 'unique id of the contact'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook','carddav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_addressbook', 'carddav_name', array(
 		'type' => 'ascii',
 		'precision' => '260',
 		'comment' => 'name part of CardDAV URL, if specified by client'

api/setup/default_records.inc.php

Braces +8 added lines, -2 removed lines

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

Spacing +15 added lines, -15 removed lines

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

api/inc/class.egw_exception_db_invalid_sql.inc.php

Braces +3 added lines, -1 removed lines

@@ -21,4 +21,6 @@
  *
  * @deprecated use Api\Db\Exception\InvalidSql
  */
-class egw_exception_db_invalid_sql extends Api\Db\Exception {}
+class egw_exception_db_invalid_sql extends Api\Db\Exception
+{
+}

api/inc/class.egw_exception_no_permission.inc.php

Braces +3 added lines, -1 removed lines

@@ -21,4 +21,6 @@
  *
  * @deprecated use Api\Exception\NoPermission
  */
-class egw_exception_no_permission extends Api\Exception {}
+class egw_exception_no_permission extends Api\Exception
+{
+}

api/inc/class.egw_exception_db.inc.php

Braces +3 added lines, -1 removed lines

@@ -21,4 +21,6 @@
  *
  * @deprecated use Api\Db\Exception
  */
-class egw_exception_db extends Api\Exception {}
+class egw_exception_db extends Api\Exception
+{
+}

api/lang.php

Braces +8 added lines, -2 removed lines

@@ -14,8 +14,14 @@
 use EGroupware\Api;
 
 // just to be sure, noone tries something nasty ...
-if (!preg_match('/^[a-z0-9_]+$/i', $_GET['app'])) die('No valid application-name given!');
-if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/i', $_GET['lang'])) die('No valid lang-name given!');
+if (!preg_match('/^[a-z0-9_]+$/i', $_GET['app']))
+{
+	die('No valid application-name given!');
+}
+if (!preg_match('/^[a-z]{2}(-[a-z]{2})?$/i', $_GET['lang']))
+{
+	die('No valid lang-name given!');
+}
 
 // switch evtl. set output-compression off, as we cant calculate a Content-Length header with transparent compression
 ini_set('zlib.output_compression', 0);

Spacing +4 added lines, -4 removed lines

@@ -24,7 +24,7 @@ 
 	'flags' => array(
 		'currentapp' => 'api',
 		'noheader' => true,
-		'load_translations' => false,	// do not automatically load translations
+		'load_translations' => false, // do not automatically load translations
 		'nocachecontrol' => true,
 	)
 );
@@ -39,10 +39,10 @@ 
 }
 
 // use an etag with app, lang and a hash over the creation-times of all lang-files
-$etag = '"'.$_GET['app'].'-'.$_GET['lang'].'-'.  Api\Translation::etag($_GET['app'], $_GET['lang']).'"';
+$etag = '"'.$_GET['app'].'-'.$_GET['lang'].'-'.Api\Translation::etag($_GET['app'], $_GET['lang']).'"';
 
 // headers to allow caching, we specify etag on url to force reload, even with Expires header
-Api\Session::cache_control(864000);	// cache for 10 days
+Api\Session::cache_control(864000); // cache for 10 days
 Header('Content-Type: text/javascript; charset=utf-8');
 Header('ETag: '.$etag);
 
@@ -66,7 +66,7 @@ 
 	', egw && egw.window !== window);';
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
-if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
+if (in_array('gzip', explode(',', $_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))
 {
 	$content = gzencode($content);
 	header('Content-Encoding: gzip');

setup/manageheader.php

Braces +38 added lines, -10 removed lines

@@ -84,14 +84,21 @@ 
 {
 	$GLOBALS['egw_info']['server']['server_root'] = EGW_SERVER_ROOT;
 }
-if (isset($_POST['setting']))	// Post of the header-form
+if (isset($_POST['setting']))
 {
-	$validation_errors = check_header_form();	// validate the submitted form
+	// Post of the header-form
+{
+	$validation_errors = check_header_form();
+}
+// validate the submitted form
 }
-if (!isset($_POST['action']) || $validation_errors)	// generate form to edit the header
+if (!isset($_POST['action']) || $validation_errors)
+{
+	// generate form to edit the header
 {
 	show_header_form($validation_errors);
 }
+}
 else
 {
 	$newheader = $GLOBALS['egw_setup']->header->generate($GLOBALS['egw_info'],$GLOBALS['egw_domain']);
@@ -156,7 +163,10 @@ 
 	// setting the non-domain settings from the posted content
 	foreach($_POST['setting'] as $name => $value)
 	{
-		if (get_magic_quotes_gpc()) $value = stripslashes($value);
+		if (get_magic_quotes_gpc())
+		{
+			$value = stripslashes($value);
+		}
 
 		switch($name)
 		{
@@ -166,7 +176,10 @@ 
 				$GLOBALS['egw_info']['server'][$name] = $value == 'True';
 				break;
 			case 'new_admin_password':
-				if ($value) $GLOBALS['egw_info']['server']['header_admin_password'] = $value;
+				if ($value)
+				{
+					$GLOBALS['egw_info']['server']['header_admin_password'] = $value;
+				}
 				break;
 			default:
 				$GLOBALS['egw_info']['server'][$name] = $value;
@@ -186,11 +199,17 @@ 
 
 		foreach($_POST['setting_'.$key] as $name => $value)
 		{
-			if (get_magic_quotes_gpc()) $value = stripslashes($value);
+			if (get_magic_quotes_gpc())
+			{
+				$value = stripslashes($value);
+			}
 
 			if ($name == 'new_config_passwd')
 			{
-				if ($value) $GLOBALS['egw_domain'][$domain]['config_passwd'] = $value;
+				if ($value)
+				{
+					$GLOBALS['egw_domain'][$domain]['config_passwd'] = $value;
+				}
 				continue;
 			}
 			$GLOBALS['egw_domain'][$domain][$name] = $value;
@@ -255,7 +274,10 @@ 
 	}
 	$setup_tpl->set_var('js_default_db_ports',$js_default_db_ports);
 
-	if ($validation_errors) $setup_tpl->set_var('detected','<ul><li>'.implode("</li>\n<li>",$validation_errors)."</li>\n</ul>\n");
+	if ($validation_errors)
+	{
+		$setup_tpl->set_var('detected','<ul><li>'.implode("</li>\n<li>",$validation_errors)."</li>\n</ul>\n");
+	}
 
 	if ($_POST['adddomain'])
 	{
@@ -275,7 +297,10 @@ 
 				$setup_tpl->set_var($name.($GLOBALS['egw_info']['server'][$name] ? '_yes' : '_no'),' selected="selected"');
 				break;
 			default:
-				if (!is_array($value)) $setup_tpl->set_var($name,htmlspecialchars($value));
+				if (!is_array($value))
+				{
+					$setup_tpl->set_var($name,htmlspecialchars($value));
+				}
 				break;
 		}
 	}
@@ -300,10 +325,13 @@ 
 		$setup_tpl->set_var('db_domain',htmlspecialchars($domain));
 		foreach($data as $name => $value)
 		{
-			if ($name == 'db_port' && !$value)	// Set default here if the admin didn't set a port yet
+			if ($name == 'db_port' && !$value)
+			{
+				// Set default here if the admin didn't set a port yet
 			{
 				$value = $GLOBALS['egw_setup']->header->default_db_ports[$data['db_type']];
 			}
+			}
 			$setup_tpl->set_var($name,htmlspecialchars($value));
 		}
 		$dbtype_options = '';

Spacing +54 added lines, -54 removed lines

@@ -18,7 +18,7 @@ 
 require_once('./inc/class.setup_header.inc.php');
 $GLOBALS['egw_setup']->header = new setup_header();
 
-$setup_tpl = new Framework\Template('./templates/default', 'keep');	// 'keep' to keep our {hash} prefix of passwords
+$setup_tpl = new Framework\Template('./templates/default', 'keep'); // 'keep' to keep our {hash} prefix of passwords
 $setup_tpl->set_file(array(
 	'T_head' => 'head.tpl',
 	'T_footer' => 'footer.tpl',
@@ -27,10 +27,10 @@ 
 	'T_login_stage_header' => 'login_stage_header.tpl',
 	'T_setup_manage' => 'manageheader.tpl'
 ));
-$setup_tpl->set_block('T_login_stage_header','B_multi_domain','V_multi_domain');
-$setup_tpl->set_block('T_login_stage_header','B_single_domain','V_single_domain');
-$setup_tpl->set_block('T_setup_manage','manageheader','manageheader');
-$setup_tpl->set_block('T_setup_manage','domain','domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_multi_domain', 'V_multi_domain');
+$setup_tpl->set_block('T_login_stage_header', 'B_single_domain', 'V_single_domain');
+$setup_tpl->set_block('T_setup_manage', 'manageheader', 'manageheader');
+$setup_tpl->set_block('T_setup_manage', 'domain', 'domain');
 
 $setup_tpl->set_var(array(
 	'lang_select' => '',
@@ -44,13 +44,13 @@ 
 
 if ($GLOBALS['egw_info']['setup']['stage']['header'] > 2 && !$GLOBALS['egw_setup']->auth('Header'))
 {
-	$GLOBALS['egw_setup']->html->show_header('Please login',True);
+	$GLOBALS['egw_setup']->html->show_header('Please login', True);
 	$GLOBALS['egw_setup']->html->login_form();
 	$GLOBALS['egw_setup']->html->show_footer();
 	exit;
 }
 // Detect current mode
-switch($GLOBALS['egw_info']['setup']['stage']['header'])
+switch ($GLOBALS['egw_info']['setup']['stage']['header'])
 {
 	case '1':
 		$GLOBALS['egw_info']['setup']['HeaderFormMSG'] = lang('Create your header.inc.php');
@@ -86,7 +86,7 @@ 
 }
 if (isset($_POST['setting']))	// Post of the header-form
 {
-	$validation_errors = check_header_form();	// validate the submitted form
+	$validation_errors = check_header_form(); // validate the submitted form
 }
 if (!isset($_POST['action']) || $validation_errors)	// generate form to edit the header
 {
@@ -94,25 +94,25 @@ 
 }
 else
 {
-	$newheader = $GLOBALS['egw_setup']->header->generate($GLOBALS['egw_info'],$GLOBALS['egw_domain']);
+	$newheader = $GLOBALS['egw_setup']->header->generate($GLOBALS['egw_info'], $GLOBALS['egw_domain']);
 
 	list($action) = @each($_POST['action']);
-	switch($action)
+	switch ($action)
 	{
 		case 'download':
-			Api\Header\Content::type('header.inc.php','application/octet-stream');
+			Api\Header\Content::type('header.inc.php', 'application/octet-stream');
 			echo $newheader;
 			break;
 
 		case 'view':
 			$GLOBALS['egw_setup']->html->show_header('Generated header.inc.php', False, 'header');
 			echo '<table width="90%"><tr><td>';
-			echo '<br />' . lang('Save this text as contents of your header.inc.php') . '<br /><hr />';
+			echo '<br />'.lang('Save this text as contents of your header.inc.php').'<br /><hr />';
 			echo "<pre>\n";
 			echo htmlentities($newheader);
 			echo "\n</pre><hr />\n";
 			echo '<form action="index.php" method="post">';
-			echo '<br />' . lang('After retrieving the file, put it into place as the header.inc.php.  Then, click "continue".') . '<br />';
+			echo '<br />'.lang('After retrieving the file, put it into place as the header.inc.php.  Then, click "continue".').'<br />';
 			echo '<input type="hidden" name="FormLogout" value="header" />';
 			echo '<input type="submit" name="junk" value="'.lang('Continue').'" />';
 			echo '</form>';
@@ -122,13 +122,13 @@ 
 
 		case 'write':
 			if ((is_writeable('../header.inc.php') || !file_exists('../header.inc.php') && is_writeable('../')) &&
-				($f = fopen('../header.inc.php','wb')))
+				($f = fopen('../header.inc.php', 'wb')))
 			{
-				fwrite($f,$newheader);
+				fwrite($f, $newheader);
 				fclose($f);
 				$GLOBALS['egw_setup']->html->show_header('Saved header.inc.php', False, 'header');
 				echo '<form action="index.php" method="post">';
-					echo '<br />' . lang('Created header.inc.php!');
+					echo '<br />'.lang('Created header.inc.php!');
 				echo '<input type="hidden" name="FormLogout" value="header" />';
 				echo '<input type="submit" name="junk" value="'.lang('Continue').'" />';
 				echo '</form>';
@@ -138,8 +138,8 @@ 
 			else
 			{
 				$GLOBALS['egw_setup']->html->show_header('Error generating header.inc.php', False, 'header');
-				echo lang('Could not open header.inc.php for writing!') . '<br />' . "\n";
-				echo lang('Please check read/write permissions on directories, or back up and use another option.') . '<br />';
+				echo lang('Could not open header.inc.php for writing!').'<br />'."\n";
+				echo lang('Please check read/write permissions on directories, or back up and use another option.').'<br />';
 				$GLOBALS['egw_setup']->html->show_footer();
 			}
 			break;
@@ -154,11 +154,11 @@ 
 function check_header_form()
 {
 	// setting the non-domain settings from the posted content
-	foreach($_POST['setting'] as $name => $value)
+	foreach ($_POST['setting'] as $name => $value)
 	{
 		if (get_magic_quotes_gpc()) $value = stripslashes($value);
 
-		switch($name)
+		switch ($name)
 		{
 			case 'show_domain_selectbox':
 			case 'mcrypt_enabled':
@@ -175,7 +175,7 @@ 
 	}
 
 	// setting the domain settings from the posted content
-	foreach($_POST['domains'] as $key => $domain)
+	foreach ($_POST['domains'] as $key => $domain)
 	{
 		if ($_POST['deletedomain'][$key])
 		{
@@ -184,7 +184,7 @@ 
 			continue;
 		}
 
-		foreach($_POST['setting_'.$key] as $name => $value)
+		foreach ($_POST['setting_'.$key] as $name => $value)
 		{
 			if (get_magic_quotes_gpc()) $value = stripslashes($value);
 
@@ -218,20 +218,20 @@ 
 
 	$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['HeaderFormMSG'], False, 'header');
 
-	if(empty($_REQUEST['ConfigLang']))
+	if (empty($_REQUEST['ConfigLang']))
 	{
-		$setup_tpl->set_var('lang_select','<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.setup_html::lang_select(True,'en')."</form></td></tr>");
+		$setup_tpl->set_var('lang_select', '<tr><td colspan="2"><form action="manageheader.php" method="post">Please Select your language '.setup_html::lang_select(True, 'en')."</form></td></tr>");
 	}
 
-	$setup_tpl->set_var('pagemsg',$GLOBALS['egw_info']['setup']['PageMSG']);
+	$setup_tpl->set_var('pagemsg', $GLOBALS['egw_info']['setup']['PageMSG']);
 
 	// checking required PHP version
-	if ((float) PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
+	if ((float)PHP_VERSION < $GLOBALS['egw_setup']->required_php_version)
 	{
-		$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'],True);
+		$GLOBALS['egw_setup']->html->show_header($GLOBALS['egw_info']['setup']['header_msg'], True);
 		$GLOBALS['egw_setup']->html->show_alert_msg('Error',
 			lang('You are using PHP version %1. EGroupware now requires %2 or later, recommended is PHP %3.',
-			PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,$GLOBALS['egw_setup']->recommended_php_version));
+			PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, $GLOBALS['egw_setup']->recommended_php_version));
 		$GLOBALS['egw_setup']->html->show_footer();
 		exit;
 	}
@@ -249,33 +249,33 @@ 
 		exit;
 	}
 	$js_default_db_ports = 'var default_db_ports = new Array();'."\n";
-	foreach($GLOBALS['egw_setup']->header->default_db_ports as $db => $port)
+	foreach ($GLOBALS['egw_setup']->header->default_db_ports as $db => $port)
 	{
 		$js_default_db_ports .= '  default_db_ports["'.$db.'"]="'.$port.'";'."\n";
 	}
-	$setup_tpl->set_var('js_default_db_ports',$js_default_db_ports);
+	$setup_tpl->set_var('js_default_db_ports', $js_default_db_ports);
 
-	if ($validation_errors) $setup_tpl->set_var('detected','<ul><li>'.implode("</li>\n<li>",$validation_errors)."</li>\n</ul>\n");
+	if ($validation_errors) $setup_tpl->set_var('detected', '<ul><li>'.implode("</li>\n<li>", $validation_errors)."</li>\n</ul>\n");
 
 	if ($_POST['adddomain'])
 	{
 		$GLOBALS['egw_domain'][lang('new')] = $GLOBALS['egw_setup']->header->domain_defaults(
 			$GLOBALS['egw_info']['server']['header_admin_user'],
-			$GLOBALS['egw_info']['server']['header_admin_password'],$supported_db);
+			$GLOBALS['egw_info']['server']['header_admin_password'], $supported_db);
 	}
 	// show the non-domain settings
 	//echo "<pre>".print_r($GLOBALS['egw_info']['server'],true)."</pre>\n";
-	foreach($GLOBALS['egw_info']['server'] as $name => $value)
+	foreach ($GLOBALS['egw_info']['server'] as $name => $value)
 	{
-		switch($name)
+		switch ($name)
 		{
 			case 'db_persistent':
 			case 'show_domain_selectbox':
 			case 'mcrypt_enabled':
-				$setup_tpl->set_var($name.($GLOBALS['egw_info']['server'][$name] ? '_yes' : '_no'),' selected="selected"');
+				$setup_tpl->set_var($name.($GLOBALS['egw_info']['server'][$name] ? '_yes' : '_no'), ' selected="selected"');
 				break;
 			default:
-				if (!is_array($value)) $setup_tpl->set_var($name,htmlspecialchars($value));
+				if (!is_array($value)) $setup_tpl->set_var($name, htmlspecialchars($value));
 				break;
 		}
 	}
@@ -284,48 +284,48 @@ 
 	);
 	if ($GLOBALS['egw_info']['server']['session_handler'] && !isset($supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']]))
 	{
-		$supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']] = lang("Custom handler: %1",$GLOBALS['egw_info']['server']['session_handler']);
+		$supported_session_handler[$GLOBALS['egw_info']['server']['session_handler']] = lang("Custom handler: %1", $GLOBALS['egw_info']['server']['session_handler']);
 	}
 	$options = array();
-	foreach($supported_session_handler as $type => $label)
+	foreach ($supported_session_handler as $type => $label)
 	{
-		$options[] = '<option ' . ($type == $GLOBALS['egw_info']['server']['session_handler'] ?
-			'selected="selected" ' : '') . 'value="' . $type . '">' . $label . '</option>';
+		$options[] = '<option '.($type == $GLOBALS['egw_info']['server']['session_handler'] ?
+			'selected="selected" ' : '').'value="'.$type.'">'.$label.'</option>';
 	}
-	$setup_tpl->set_var('session_options',implode("\n",$options));
+	$setup_tpl->set_var('session_options', implode("\n", $options));
 
 	// showing the settings of all domains
-	foreach($GLOBALS['egw_domain'] as $domain => $data)
+	foreach ($GLOBALS['egw_domain'] as $domain => $data)
 	{
-		$setup_tpl->set_var('db_domain',htmlspecialchars($domain));
-		foreach($data as $name => $value)
+		$setup_tpl->set_var('db_domain', htmlspecialchars($domain));
+		foreach ($data as $name => $value)
 		{
 			if ($name == 'db_port' && !$value)	// Set default here if the admin didn't set a port yet
 			{
 				$value = $GLOBALS['egw_setup']->header->default_db_ports[$data['db_type']];
 			}
-			$setup_tpl->set_var($name,htmlspecialchars($value));
+			$setup_tpl->set_var($name, htmlspecialchars($value));
 		}
 		$dbtype_options = '';
-		foreach($supported_db as $db)
+		foreach ($supported_db as $db)
 		{
-			$dbtype_options .= '<option ' . ($db == $data['db_type'] ? 'selected="selected" ' : '').
-				'value="' . $db . '">' . $GLOBALS['egw_setup']->header->db_fullnames[$db] . "</option>\n";
+			$dbtype_options .= '<option '.($db == $data['db_type'] ? 'selected="selected" ' : '').
+				'value="'.$db.'">'.$GLOBALS['egw_setup']->header->db_fullnames[$db]."</option>\n";
 		}
-		$setup_tpl->set_var('dbtype_options',$dbtype_options);
+		$setup_tpl->set_var('dbtype_options', $dbtype_options);
 
-		$setup_tpl->parse('domains','domain',True);
+		$setup_tpl->parse('domains', 'domain', True);
 	}
-	if(is_writeable('../header.inc.php') || !file_exists('../header.inc.php') && is_writeable('../'))
+	if (is_writeable('../header.inc.php') || !file_exists('../header.inc.php') && is_writeable('../'))
 	{
-		$setup_tpl->set_var('actions',lang('%1, %2 or %3 the configuration file.',
+		$setup_tpl->set_var('actions', lang('%1, %2 or %3 the configuration file.',
 			'<input type="submit" name="action[write]" value="'.htmlspecialchars(lang('Write')).'" />',
 			'<input type="submit" name="action[download]" value="'.htmlspecialchars(lang('Download')).'" />',
 			'<input type="submit" name="action[view]" value="'.htmlspecialchars(lang('View')).'" />'));
 	}
 	else
 	{
-		$setup_tpl->set_var('actions',lang('Cannot create the header.inc.php due to file permission restrictions.<br /> Instead you can %1 or %2 the file.',
+		$setup_tpl->set_var('actions', lang('Cannot create the header.inc.php due to file permission restrictions.<br /> Instead you can %1 or %2 the file.',
 			'<input type="submit" name="action[download]" value="'.htmlspecialchars(lang('Download')).'" />',
 			'<input type="submit" name="action[view]" value="'.htmlspecialchars(lang('View')).'" />'));
 	}
@@ -387,7 +387,7 @@ 
 		'lang_Yes'             => lang('Yes'),
 		'lang_No'              => lang('No')
 	));
-	$setup_tpl->pfp('out','manageheader');
+	$setup_tpl->pfp('out', 'manageheader');
 
 	$GLOBALS['egw_setup']->html->show_footer();
 }

setup/inc/hook_config.inc.php

Braces +12 added lines, -3 removed lines

@@ -23,17 +23,23 @@ 
 	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
-	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
+	}
 	elseif($config['vfs_fstab'] == json_encode($default_db=array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
-	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
+	)) || $config['vfs_fstab'] == serialize($default_db))
+	{
+		// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'db';
 	}
+	}
 	else
 	{
 		$config['vfs_storage_mode'] = 'custom';
@@ -45,11 +51,14 @@ 
 		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
 	) as $name => $label)
 	{
-		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
+		if ($name != 'custom' || $name === $config['vfs_storage_mode'])
+		{
+			// dont show custom, if not custom
 		{
 			$options .= '<option value="'.$name.($name === $config['vfs_storage_mode'] ? '" selected="selected' : '').
 				'">'.htmlspecialchars($label)."</options>\n";
 		}
+		}
 	}
 	//echo "<pre>".htmlspecialchars($options)."</pre>\n";
 	return $options;

Spacing +34 added lines, -34 removed lines

@@ -20,14 +20,14 @@ 
  */
 function vfs_storage_mode_options($config)
 {
-	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default=array(
+	if (!isset($config['vfs_fstab']) || $config['vfs_fstab'] == json_encode($default = array(
 		'/' => 'sqlfs://$host/',
 		'/apps' => 'links://$host/apps',
 	)) || $config['vfs_fstab'] == serialize($default))	// detect old serialized value too
 	{
 		$config['vfs_storage_mode'] = 'fs';
 	}
-	elseif($config['vfs_fstab'] == json_encode($default_db=array(
+	elseif ($config['vfs_fstab'] == json_encode($default_db = array(
 		'/' => 'sqlfs://$host/?storage=db',
 		'/apps' => 'links://$host/apps?storage=db',
 	)) || $config['vfs_fstab'] == serialize($default_db))	// detect old serialized value too
@@ -39,10 +39,10 @@ 
 		$config['vfs_storage_mode'] = 'custom';
 	}
 	//_debug_array(array_intersect_key($config,array('vfs_fstab'=>1,'vfs_storage_mode'=>1)));
-	foreach(array(
+	foreach (array(
 		'fs' => lang('Filesystem (default)'),
 		'db' => lang('Database').' (problems with files > 1MB)',
-		'custom' => lang('Custom set via %1','filemanager/cli.php mount'),
+		'custom' => lang('Custom set via %1', 'filemanager/cli.php mount'),
 	) as $name => $label)
 	{
 		if ($name != 'custom' || $name === $config['vfs_storage_mode'])	// dont show custom, if not custom
@@ -57,24 +57,24 @@ 
 
 function encryptalgo($config)
 {
-	if(@function_exists('mcrypt_list_algorithms'))
+	if (@function_exists('mcrypt_list_algorithms'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_algo']))
+		if (!isset($config['mcrypt_algo']))
 		{
-			$config['mcrypt_algo'] = 'tripledes';  /* MCRYPT_TRIPLEDES */
+			$config['mcrypt_algo'] = 'tripledes'; /* MCRYPT_TRIPLEDES */
 		}
 		$algos = @mcrypt_list_algorithms();
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($algos))
+		while (list($key, $value) = each($algos))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_algo'] == $value)
+				if ($config['mcrypt_algo'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -84,29 +84,29 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="">' . lang('no algorithms available') . '</option>' . "\n";
+			$out = '<option value="">'.lang('no algorithms available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="tripledes">TRIPLEDES</option>' . "\n";
+		$out = '<option value="tripledes">TRIPLEDES</option>'."\n";
 	}
 	return $out;
 }
 
 function encryptmode($config)
 {
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		$listed = array();
-		if(!isset($config['mcrypt_mode']))
+		if (!isset($config['mcrypt_mode']))
 		{
 			$config['mcrypt_mode'] = 'cbc'; /* MCRYPT_MODE_CBC */
 		}
@@ -114,13 +114,13 @@ 
 		$found = False;
 
 		$out = '';
-		while(list($key,$value) = each($modes))
+		while (list($key, $value) = each($modes))
 		{
 			$found = True;
 			/* Only show each once - seems this is a problem in some installs */
-			if(!in_array($value,$listed))
+			if (!in_array($value, $listed))
 			{
-				if($config['mcrypt_mode'] == $value)
+				if ($config['mcrypt_mode'] == $value)
 				{
 					$selected = ' selected="selected"';
 				}
@@ -130,34 +130,34 @@ 
 				}
 				$descr = strtoupper($value);
 
-				$out .= '<option value="' . $value . '"' . $selected . '>' . $descr . '</option>' . "\n";
+				$out .= '<option value="'.$value.'"'.$selected.'>'.$descr.'</option>'."\n";
 				$listed[] = $value;
 			}
 		}
-		if(!$found)
+		if (!$found)
 		{
 			/* Something is wrong with their mcrypt install or php.ini */
-			$out = '<option value="" selected="selected">' . lang('no modes available') . '</option>' . "\n";
+			$out = '<option value="" selected="selected">'.lang('no modes available').'</option>'."\n";
 		}
 	}
 	else
 	{
-		$out = '<option value="cbc" selected="selected">CBC</option>' . "\n";
+		$out = '<option value="cbc" selected="selected">CBC</option>'."\n";
 	}
 	return $out;
 }
 
-function passwdhashes($config,$return_hashes=false)
+function passwdhashes($config, $return_hashes = false)
 {
-	$hashes = sql_passwdhashes($config,true);
+	$hashes = sql_passwdhashes($config, true);
 	if (isset($hashes['crypt']))
 	{
-		$hashes['des'] = 'des (=crypt)';	// old LDAP name for crypt
+		$hashes['des'] = 'des (=crypt)'; // old LDAP name for crypt
 	}
 	return $return_hashes ? $hashes : _options_from($hashes, $config['ldap_encryption_type'] ? $config['ldap_encryption_type'] : 'des');
 }
 
-function sql_passwdhashes($config, $return_hashes=false, &$securest=null)
+function sql_passwdhashes($config, $return_hashes = false, &$securest = null)
 {
 	$hashes = Api\Auth::passwdhashes($securest);
 
@@ -172,15 +172,15 @@ 
  */
 function auth_types($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type']);
 }
 function auth_type_groupdav($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_groupdav']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_groupdav']);
 }
 function auth_type_activesync($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_activesync']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_activesync']);
 }
 
 /**
@@ -201,12 +201,12 @@ 
  * @param string $selected value of selected optino
  * @return string
  */
-function _options_from(array $options,$selected)
+function _options_from(array $options, $selected)
 {
-	foreach($options as $value => $label)
+	foreach ($options as $value => $label)
 	{
-		$out .= '<option value="' . htmlspecialchars($value) . '"' .
-			($selected == $value ? ' selected="selected"' : '') . '>' . $label . '</option>' . "\n";
+		$out .= '<option value="'.htmlspecialchars($value).'"'.
+			($selected == $value ? ' selected="selected"' : '').'>'.$label.'</option>'."\n";
 	}
 	return $out;
 }

setup/inc/class.setup_header.inc.php

Braces +16 added lines, -4 removed lines

@@ -74,7 +74,10 @@ 
 		$GLOBALS['egw_info']['server']['header_admin_password'] = '';
 		$GLOBALS['egw_info']['server']['setup_acl'] = '';
 
-		if ($domain) $GLOBALS['egw_domain'][$domain] = $this->domain_defaults();
+		if ($domain)
+		{
+			$GLOBALS['egw_domain'][$domain] = $this->domain_defaults();
+		}
 
 		$GLOBALS['egw_info']['server']['show_domain_selectbox'] = false;
 		$GLOBALS['egw_info']['server']['db_persistent'] = True;
@@ -87,7 +90,10 @@ 
 	function domain_defaults($user='admin',$passwd='',$supported_db=null)
 	{
 		$null = null;
-		if (is_null($supported_db)) $supported_db = $this->check_db_support($null);
+		if (is_null($supported_db))
+		{
+			$supported_db = $this->check_db_support($null);
+		}
 		$default_db = count($supported_db) ? $supported_db[0] : 'mysqli';
 
 		return array(
@@ -170,7 +176,10 @@ 
 			$var = array('DB_DOMAIN' => $domain);
 			foreach($data as $name => $value)
 			{
-				if ($name == 'db_port' && !$value) $value = $this->default_db_ports[$data['db_type']];
+				if ($name == 'db_port' && !$value)
+				{
+					$value = $this->default_db_ports[$data['db_type']];
+				}
 				if ($name == 'config_passwd')
 				{
 					$var['CONFIG_PASS'] = self::is_hashed($value) ? $value : Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
@@ -188,7 +197,10 @@ 
 		$var = Array();
 		foreach($egw_info['server'] as $name => $value)
 		{
-			if ($name == 'header_admin_password' && $value && !self::is_hashed($value)) $value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
+			if ($name == 'header_admin_password' && $value && !self::is_hashed($value))
+			{
+				$value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
+			}
 			if ($name == 'versions')
 			{
 				$name = 'mcrypt_version';

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

@@ -185,7 +185,7 @@
 		}
 		$tpl->set_var('domain','');
 
-		$var = Array();
+		$var = array();
 		foreach($egw_info['server'] as $name => $value)
 		{
 			if ($name == 'header_admin_password' && $value && !self::is_hashed($value)) $value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);

Spacing +41 added lines, -41 removed lines

@@ -63,12 +63,12 @@ 
 	 *
 	 * @param string $domain ='default' domain to set
 	 */
-	function defaults($domain='default')
+	function defaults($domain = 'default')
 	{
 		$egw_root = realpath(__DIR__.'/../..');
 		$GLOBALS['egw_info']['server']['server_root'] = $GLOBALS['egw_info']['server']['include_root'] = $egw_root;
-		define('EGW_SERVER_ROOT',$egw_root);	// this is usally already defined by setup and cant be changed
-		define('EGW_INCLUDE_ROOT',$egw_root);
+		define('EGW_SERVER_ROOT', $egw_root); // this is usally already defined by setup and cant be changed
+		define('EGW_INCLUDE_ROOT', $egw_root);
 
 		$GLOBALS['egw_info']['server']['header_admin_user'] = 'admin';
 		$GLOBALS['egw_info']['server']['header_admin_password'] = '';
@@ -84,7 +84,7 @@ 
 		$GLOBALS['egw_info']['server']['mcrypt_iv'] = $this->generate_mcyrpt_iv();
 	}
 
-	function domain_defaults($user='admin',$passwd='',$supported_db=null)
+	function domain_defaults($user = 'admin', $passwd = '', $supported_db = null)
 	{
 		$null = null;
 		if (is_null($supported_db)) $supported_db = $this->check_db_support($null);
@@ -109,19 +109,19 @@ 
 	 *
 	 * @return array with errors or null if no errors
 	 */
-	function validation_errors($path=EGW_SERVER_ROOT)
+	function validation_errors($path = EGW_SERVER_ROOT)
 	{
 		$errors = null;
 
 		if (!is_dir($path) || !is_readable($path) || !is_dir($path.'/api'))
 		{
-			$errors[] = lang("%1 '%2' does NOT exist, is not readable by the webserver or contains no EGroupware installation!",lang('Server root'),$path);
+			$errors[] = lang("%1 '%2' does NOT exist, is not readable by the webserver or contains no EGroupware installation!", lang('Server root'), $path);
 		}
-		if(!$GLOBALS['egw_info']['server']['header_admin_password'])
+		if (!$GLOBALS['egw_info']['server']['header_admin_password'])
 		{
 			$errors[] = lang("You didn't enter a header admin password");
 		}
-		if(!$GLOBALS['egw_info']['server']['header_admin_user'])
+		if (!$GLOBALS['egw_info']['server']['header_admin_user'])
 		{
 			$errors[] = lang("You didn't enter a header admin username");
 		}
@@ -131,15 +131,15 @@ 
 		}
 		else
 		{
-			foreach($GLOBALS['egw_domain'] as $domain => $data)
+			foreach ($GLOBALS['egw_domain'] as $domain => $data)
 			{
 				if (!$data['config_passwd'])
 				{
-					$errors[] = lang("You didn't enter a config password for domain %1",$domain);
+					$errors[] = lang("You didn't enter a config password for domain %1", $domain);
 				}
-				if(!$data['config_user'])
+				if (!$data['config_user'])
 				{
-					$errors[] = lang("You didn't enter a config username for domain %1",$domain);
+					$errors[] = lang("You didn't enter a config username for domain %1", $domain);
 				}
 			}
 		}
@@ -156,19 +156,19 @@ 
 	 * @param array $egw_domain info about the existing EGw domains / DB instances
 	 * @return string content of header.inc.php
 	 */
-	function generate($egw_info,$egw_domain)
+	function generate($egw_info, $egw_domain)
 	{
-		$tpl = new Framework\Template('../', 'keep');	// 'keep' to not loose '{hash}' prefix of password-hashes!
+		$tpl = new Framework\Template('../', 'keep'); // 'keep' to not loose '{hash}' prefix of password-hashes!
 		$tpl->set_file(array('header' => 'header.inc.php.template'));
-		$tpl->set_block('header','domain','domain');
+		$tpl->set_block('header', 'domain', 'domain');
 
 		$most_secure_pw_hash = null;
 		Api\Auth::passwdhashes($most_secure_pw_hash);
 
-		foreach($egw_domain as $domain => $data)
+		foreach ($egw_domain as $domain => $data)
 		{
 			$var = array('DB_DOMAIN' => $domain);
-			foreach($data as $name => $value)
+			foreach ($data as $name => $value)
 			{
 				if ($name == 'db_port' && !$value) $value = $this->default_db_ports[$data['db_type']];
 				if ($name == 'config_passwd')
@@ -181,12 +181,12 @@ 
 				}
 			}
 			$tpl->set_var($var);
-			$tpl->parse('domains','domain',True);
+			$tpl->parse('domains', 'domain', True);
 		}
-		$tpl->set_var('domain','');
+		$tpl->set_var('domain', '');
 
 		$var = Array();
-		foreach($egw_info['server'] as $name => $value)
+		foreach ($egw_info['server'] as $name => $value)
 		{
 			if ($name == 'header_admin_password' && $value && !self::is_hashed($value)) $value = Api\Auth::encrypt_sql($value, $most_secure_pw_hash);
 			if ($name == 'versions')
@@ -208,7 +208,7 @@ 
 		}
 		$tpl->set_var($var);
 
-		return $tpl->parse('out','header');
+		return $tpl->parse('out', 'header');
 	}
 
 	/**
@@ -227,18 +227,18 @@ 
 			return $iv;
 		}*/
 		$size = 30;
-		srand((double)microtime()*1000000);
+		srand((double)microtime() * 1000000);
 		$random_char = array(
-			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z'
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+			'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'
 		);
 
 		$iv = '';
-		for($i=0; $i < $size; $i++)
+		for ($i = 0; $i < $size; $i++)
 		{
-			$iv .= $random_char[rand(1,count($random_char))];
+			$iv .= $random_char[rand(1, count($random_char))];
 		}
 		//error_log(__METHOD__."() size=$size returning ".array2string($iv));
 		return $iv;
@@ -247,15 +247,15 @@ 
 	function check_db_support(&$detected)
 	{
 		$supported_db = $detected = array();
-		foreach(array(
+		foreach (array(
 			// short => array(extension,func_to_check,supported_db(s))
-			'mysqli' => array('mysql','mysqli_connect','mysqli'),
-			'mysql'  => array('mysql','mysql_connect','mysql'),
-			'mysqlt' => array('mysql','mysql_connect','mysqlt'),
-			'pgsql'  => array('pgsql','pg_connect','pgsql'),
-			'mssql'  => array('mssql','mssql_connect','mssql'),
-			'odbc'   => array('odbc',false,'sapdb','odbc_mssql','odbc_oracle'),
-			'oracle' => array('oci8',false,'oracle'),
+			'mysqli' => array('mysql', 'mysqli_connect', 'mysqli'),
+			'mysql'  => array('mysql', 'mysql_connect', 'mysql'),
+			'mysqlt' => array('mysql', 'mysql_connect', 'mysqlt'),
+			'pgsql'  => array('pgsql', 'pg_connect', 'pgsql'),
+			'mssql'  => array('mssql', 'mssql_connect', 'mssql'),
+			'odbc'   => array('odbc', false, 'sapdb', 'odbc_mssql', 'odbc_oracle'),
+			'oracle' => array('oci8', false, 'oracle'),
 		) as $db => $data)
 		{
 			$ext = array_shift($data);
@@ -263,12 +263,12 @@ 
 			$name = isset($this->db_fullnames[$db]) ? $this->db_fullnames[$db] : strtoupper($db);
 			if (check_load_extension($ext) || $func_to_check && function_exists($func_to_check))
 			{
-				$detected[] = lang('You appear to have %1 support.',$name);
-				$supported_db = array_merge($supported_db,$data);
+				$detected[] = lang('You appear to have %1 support.', $name);
+				$supported_db = array_merge($supported_db, $data);
 			}
 			else
 			{
-				$detected[] .= lang('No %1 support found. Disabling',$name);
+				$detected[] .= lang('No %1 support found. Disabling', $name);
 			}
 		}
 		return $supported_db;
@@ -291,9 +291,9 @@ 
 // some constanst for pre php4.3
 if (!defined('PHP_SHLIB_SUFFIX'))
 {
-	define('PHP_SHLIB_SUFFIX',strtoupper(substr(PHP_OS, 0,3)) == 'WIN' ? 'dll' : 'so');
+	define('PHP_SHLIB_SUFFIX', strtoupper(substr(PHP_OS, 0, 3)) == 'WIN' ? 'dll' : 'so');
 }
 if (!defined('PHP_SHLIB_PREFIX'))
 {
-	define('PHP_SHLIB_PREFIX',PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
+	define('PHP_SHLIB_PREFIX', PHP_SHLIB_SUFFIX == 'dll' ? 'php_' : '');
 }