EGroupware / egroupware

setup/fix_mysql_charset.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 // if we are NOT called as part of an update script, behave like a regular setup script
 if (!isset($GLOBALS['egw_setup']) || !is_object($GLOBALS['egw_setup']))
 {
-	$diagnostics = 1;	// can be set to 0=non, 1=some (default for now), 2=all
+	$diagnostics = 1; // can be set to 0=non, 1=some (default for now), 2=all
 
 	include('./inc/functions.inc.php');
 	// Authorize the user to use setup app and load the database
@@ -25,50 +25,50 @@ 
 	$GLOBALS['egw_setup']->loaddb();
 
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-	$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+	$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 	$setup_tpl->set_file(array(
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
 	));
-	$GLOBALS['egw_setup']->html->show_header('',False,'config',$GLOBALS['egw_setup']->ConfigDomain . '(' . $GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'] . ')');
+	$GLOBALS['egw_setup']->html->show_header('', False, 'config', $GLOBALS['egw_setup']->ConfigDomain.'('.$GLOBALS['egw_domain'][$GLOBALS['egw_setup']->ConfigDomain]['db_type'].')');
 	echo '<h3>'.'Fix mysql DB to match the eGroupWare system_charset'."</h3>\n";
 	$running_standalone = true;
 }
-$db =& $GLOBALS['egw_setup']->db;
-$charset2mysql =& $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
+$db = & $GLOBALS['egw_setup']->db;
+$charset2mysql = & $GLOBALS['egw_setup']->db->Link_ID->charset2mysql;
 $mysql2charset = array_flip($charset2mysql);
 
 $ServerInfo = $db->Link_ID->ServerInfo();
-$db_version = (float) $ServerInfo['version'];
+$db_version = (float)$ServerInfo['version'];
 
 if ($running_standalone || $_REQUEST['debug']) echo "<p>DB-Type='<b>{$GLOBALS['egw_setup']->db->Type}</b>', DB-Version=<b>$db_version</b> ($ServerInfo[description]), eGroupWare system_charset='<b>{$GLOBALS['egw_setup']->system_charset}</b>', DB-connection charset was '<b>{$GLOBALS['egw_setup']->db_charset_was}</b>'</p>\n";
 
 $mysql_system_charset = isset($charset2mysql[$GLOBALS['egw_setup']->system_charset]) ?
 	$charset2mysql[$GLOBALS['egw_setup']->system_charset] : $GLOBALS['egw_setup']->system_charset;
 
-if (substr($db->Type,0,5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
+if (substr($db->Type, 0, 5) == 'mysql' && $db_version >= 4.1 && $GLOBALS['egw_setup']->system_charset && $GLOBALS['egw_setup']->db_charset_was &&
 	$GLOBALS['egw_setup']->system_charset != $GLOBALS['egw_setup']->db_charset_was)
 {
 	$tables_modified = 'no';
 
 	$tables = array();
-	$db->query("SHOW TABLE STATUS",__LINE__,__FILE__);
+	$db->query("SHOW TABLE STATUS", __LINE__, __FILE__);
 	while (($row = $db->row(true)))
 	{
 		$tables[$row['Name']] = $row['Collation'];
 	}
-	foreach($tables as $table => $collation)
+	foreach ($tables as $table => $collation)
 	{
 		$columns = array();
-		$db->query("SHOW FULL FIELDS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW FULL FIELDS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			$columns[] = $row;
 		}
 		//echo $table; _debug_array($columns);
 		$fulltext = $fulltext_back = array();
-		$db->query("SHOW KEYS FROM `$table`",__LINE__,__FILE__);
-		while(($row = $db->row(true)))
+		$db->query("SHOW KEYS FROM `$table`", __LINE__, __FILE__);
+		while (($row = $db->row(true)))
 		{
 			if ($row['Index_type'] == 'FULLTEXT')
 			{
@@ -77,12 +77,12 @@ 
 		}
 
 		$alter_table = $alter_table_back = array();
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
-			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i',$column['Type'],$matches))
+			if ($column['Collation'] && preg_match('/^(char|varchar|.*text)\(?([0-9]*)\)?$/i', $column['Type'], $matches))
 			{
-				list(,$type,$size) = $matches;
-				list($charset) = explode('_',$column['Collation']);
+				list(,$type, $size) = $matches;
+				list($charset) = explode('_', $column['Collation']);
 
 				if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 
@@ -97,7 +97,7 @@ 
 					}
 					else
 					{
-						$bintype = str_replace('text','blob',$type);
+						$bintype = str_replace('text', 'blob', $type);
 					}
 					//echo "<p>$table.$col $type CHARACTER SET $charset $default $null</p>\n";
 
@@ -108,7 +108,7 @@ 
 					{
 						$idx_name = $fulltext[$col];
 						$idx_cols = array();
-						foreach($fulltext as $c => $i)
+						foreach ($fulltext as $c => $i)
 						{
 							if ($i == $idx_name)
 							{
@@ -124,7 +124,7 @@ 
 				}
 			}
 		}
-		list($charset) = explode('_',$collation);
+		list($charset) = explode('_', $collation);
 		if (isset($mysql2charset[$charset])) $charset = $mysql2charset[$charset];
 		if ($charset != $GLOBALS['egw_setup']->system_charset)
 		{
@@ -132,26 +132,26 @@ 
 		}
 		if (count($alter_table))
 		{
-			$alter_table = "ALTER TABLE $table\n".implode(",\n",$alter_table);
+			$alter_table = "ALTER TABLE $table\n".implode(",\n", $alter_table);
 
 			if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table)."</p>\n";
-			if (!$db->query($alter_table,__LINE__,__FILE__))
+			if (!$db->query($alter_table, __LINE__, __FILE__))
 			{
 				echo "<p>SQL Error: ".nl2br($alter_table)."</p>\n";
 				echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
 				echo "<p>continuing ...</p>\n";
 				continue;
 			}
-			foreach($fulltext_back as $idx_name => $idx_cols)
+			foreach ($fulltext_back as $idx_name => $idx_cols)
 			{
-				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`',$idx_cols)."`)";
+				$alter_table_back[] = " ADD FULLTEXT `$idx_name` (`".implode('`,`', $idx_cols)."`)";
 			}
 			if (count($alter_table_back))
 			{
-				$alter_table_back = "ALTER TABLE $table\n".implode(",\n",$alter_table_back);
+				$alter_table_back = "ALTER TABLE $table\n".implode(",\n", $alter_table_back);
 
 				if ($running_standalone || $_REQUEST['debug']) echo '<p>'.nl2br($alter_table_back)."</p>\n";
-				if (!$db->query($alter_table_back,__LINE__,__FILE__))
+				if (!$db->query($alter_table_back, __LINE__, __FILE__))
 				{
 					echo "<p><b>SQL Error</b>: ".nl2br($alter_table_back)."</p>\n";
 					echo "<b>{$db->Type} Error</b>: {$db->Errno} ({$db->Error})</p>\n";
@@ -163,13 +163,13 @@ 
 		}
 	}
 	// change the default charset of the DB
-	$db->query("SHOW CREATE DATABASE `$db->Database`",__LINE__,__FILE__);
+	$db->query("SHOW CREATE DATABASE `$db->Database`", __LINE__, __FILE__);
 	$create_db = $db->next_record() ? $db->f(1) : '';
-	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i',$create_db,$matches) && $matches[1] != $mysql_system_charset)
+	if (preg_match('/CHARACTER SET ([a-z1-9_-]+) /i', $create_db, $matches) && $matches[1] != $mysql_system_charset)
 	{
 		$alter_db = "ALTER DATABASE `$db->Database` DEFAULT CHARACTER SET $mysql_system_charset";
 		if ($running_standalone || $_REQUEST['debug']) echo '<p>'.$alter_db."</p>\n";
-		$db->query($alter_db,__LINE__,__FILE__);
+		$db->query($alter_db, __LINE__, __FILE__);
 	}
 }
 if ($running_standalone || $_REQUEST['debug'])

setup/inc/class.setup_cmd_hooks.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $config_passwd=null pw of above user
 	 * @param boolean $verbose=false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null)
+	function __construct($domain, $config_user = null, $config_passwd = null)
 	{
 		if (!is_array($domain))
 		{
@@ -45,17 +45,17 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if ($check_only) return true;	// nothing to check, no arguments ...
+		if ($check_only) return true; // nothing to check, no arguments ...
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,15,$this->verbose);
+		$this->check_installed($this->domain, 15, $this->verbose);
 
 		global $setup_info;
-		foreach($setup_info as $appname => $info)
+		foreach ($setup_info as $appname => $info)
 		{
 			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
 		}

setup/inc/hook_config.inc.php

Spacing +35 added lines, -35 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,19 +172,19 @@ 
  */
 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_syncml($config)
 {
-	return _options_from(setup_cmd_config::auth_types(),$config['auth_type_syncml']);
+	return _options_from(setup_cmd_config::auth_types(), $config['auth_type_syncml']);
 }
 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']);
 }
 
 /**
@@ -205,12 +205,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_cmd_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 * @param string $app =null single application to update or install
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$verbose=false,$app=null)
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $verbose = false, $app = null)
 	{
 		if (!is_array($domain))
 		{
@@ -55,32 +55,32 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		global $setup_info;
 
 		// instanciate setup object and check authorisation
-		$this->check_setup_auth($this->config_user,$this->config_passwd,$this->domain);
+		$this->check_setup_auth($this->config_user, $this->config_passwd, $this->domain);
 
-		$this->check_installed($this->domain,array(14),$this->verbose);
+		$this->check_installed($this->domain, array(14), $this->verbose);
 
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 4 &&
 			(!$this->app || !in_array($this->app, self::$apps_to_install) && !in_array($this->app, self::$apps_to_upgrade)) &&
 			!self::check_autoinstall())
 		{
-			return lang('No update necessary, domain %1(%2) is up to date.',$this->domain,$GLOBALS['egw_domain'][$this->domain]['db_type']);
+			return lang('No update necessary, domain %1(%2) is up to date.', $this->domain, $GLOBALS['egw_domain'][$this->domain]['db_type']);
 		}
 		if ($check_only) return lang('Update necessary.');
 
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
-		self::$egw_setup->process->init_process();	// we need a new schema-proc instance for each new domain
+		self::$egw_setup->process->init_process(); // we need a new schema-proc instance for each new domain
 
 		// request to install a single app
 		if ($this->app && in_array($this->app, self::$apps_to_install))
 		{
 			$app_title = $setup_info[$this->app]['title'] ? $setup_info[$this->app]['title'] : $setup_info[$this->app]['name'];
-			self::_echo_message($this->verbose,lang('Start installing application %1 ...',$app_title));
+			self::_echo_message($this->verbose, lang('Start installing application %1 ...', $app_title));
 			ob_start();
 			$terror = array($this->app => $setup_info[$this->app]);
 
@@ -88,7 +88,7 @@ 
 			{
 				$errors = self::$egw_setup->process->current($terror, $this->verbose);
 				$terror = self::$egw_setup->process->default_records($errors, $this->verbose);
-				echo $app_title . ' ' . lang('tables installed, unless there are errors printed above') . '.';
+				echo $app_title.' '.lang('tables installed, unless there are errors printed above').'.';
 			}
 			else
 			{
@@ -102,20 +102,20 @@ 
 				{
 					self::$egw_setup->register_app($setup_info[$this->app]['name']);
 				}
-				echo $app_title . ' ' . lang('registered') . '.';
+				echo $app_title.' '.lang('registered').'.';
 
 				if ($setup_info[$this->app]['hooks'])
 				{
 					self::$egw_setup->register_hooks($setup_info[$this->app]['name']);
-					echo "\n".$app_title . ' ' . lang('hooks registered') . '.';
+					echo "\n".$app_title.' '.lang('hooks registered').'.';
 				}
 			}
 		}
 		else
 		{
-			self::_echo_message($this->verbose,lang('Start updating the database ...'));
+			self::_echo_message($this->verbose, lang('Start updating the database ...'));
 			ob_start();
-			self::$egw_setup->process->pass($setup_info,'upgrade',false);
+			self::$egw_setup->process->pass($setup_info, 'upgrade', false);
 		}
 		$messages = ob_get_contents();
 		ob_end_clean();

setup/doc/chown.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling as web-page
 {
@@ -39,7 +39,7 @@ 
 }
 $ids = explode(',', $_SERVER['argv'][0]);
 $change = array();
-while($ids)
+while ($ids)
 {
 	$from = (int)array_shift($ids);
 	$to = (int)array_shift($ids);
@@ -66,24 +66,24 @@ 
 
 chown_grp($path, null, $recursive);
 
-function chown_grp($path, array $stat=null, $recursive=false)
+function chown_grp($path, array $stat = null, $recursive = false)
 {
 	global $change;
 
 	if (is_null($stat) && !($stat = stat($path))) return false;
 
-	if (isset($change[$stat['uid']]) && !chown($path, $uid=$change[$stat['uid']]))
+	if (isset($change[$stat['uid']]) && !chown($path, $uid = $change[$stat['uid']]))
 	{
 		echo "Faild to set new owner #$uid for $path\n";
 	}
-	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid=-$change[-$stat['gid']]))
+	if (isset($change[-$stat['gid']]) && !chgrp($path, $gid = -$change[-$stat['gid']]))
 	{
 		echo "Faild to set new group #$gid for $path\n";
 	}
 
 	if ($recursive && is_dir($path))
 	{
-		foreach(new DirectoryIterator($path) as $child)
+		foreach (new DirectoryIterator($path) as $child)
 		{
 			if (!$child->isDot())
 				chown_grp($child->getPathname(), array(

importexport/setup/setup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -20,9 +20,9 @@
 	'name'  => 'eGroupware core team',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
-$setup_info['importexport']['autoinstall'] = true;	// install automatically on update
+$setup_info['importexport']['autoinstall'] = true; // install automatically on update
 
-$setup_info['importexport']['license']  = 'GPL';
+$setup_info['importexport']['license'] = 'GPL';
 $setup_info['importexport']['description'] =
 '';
 $setup_info['importexport']['note'] =

importexport/setup/tables_current.inc.php

Spacing +8 added lines, -8 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_importexport_definitions' => array(
 		'fd' => array(
-			'definition_id' => array('type' => 'auto','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '255'),
-			'application' => array('type' => 'varchar','precision' => '50'),
-			'plugin' => array('type' => 'varchar','precision' => '100'),
-			'type' => array('type' => 'varchar','precision' => '20'),
-			'allowed_users' => array('type' => 'varchar','meta' => 'account-commasep','precision' => '255'),
+			'definition_id' => array('type' => 'auto', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '255'),
+			'application' => array('type' => 'varchar', 'precision' => '50'),
+			'plugin' => array('type' => 'varchar', 'precision' => '100'),
+			'type' => array('type' => 'varchar', 'precision' => '20'),
+			'allowed_users' => array('type' => 'varchar', 'meta' => 'account-commasep', 'precision' => '255'),
 			'plugin_options' => array('type' => 'longtext'),
-			'owner' => array('type' => 'int','meta' => 'account','precision' => '4'),
-			'description' => array('type' => 'varchar','precision' => '255'),
+			'owner' => array('type' => 'int', 'meta' => 'account', 'precision' => '4'),
+			'description' => array('type' => 'varchar', 'precision' => '255'),
 			'modified' => array('type' => 'timestamp'),
 			'filter' => array('type' => 'longtext')
 		),

importexport/setup/tables_update.inc.php

Spacing +15 added lines, -15 removed lines

@@ -13,7 +13,7 @@ 
 
 function importexport_upgrade0_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','description',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'description', array(
 		'type' => 'varchar',
 		'precision' => '255'
 	));
@@ -44,11 +44,11 @@ 
 
 function importexport_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_importexport_definitions','definition_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_importexport_definitions', 'definition_id', array(
 		'type' => 'auto',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'modified', array(
 		'type' => 'timestamp'
 	));
 
@@ -63,7 +63,7 @@ 
 
 function importexport_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','filter',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'filter', array(
 		'type' => 'longtext'
 	));
 
@@ -74,7 +74,7 @@ 
 	// import i/e defintions
 	if (extension_loaded('dom'))
 	{
-		require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+		require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 		// This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 		$GLOBALS['egw_setup']->setup_account_object();
@@ -82,18 +82,18 @@ 
 		// step through every source code intstalled app
 		$egwdir = dir(EGW_INCLUDE_ROOT);
 		while (false !== ($appdir = $egwdir->read())) {
-			$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-			if ( !is_dir( $defdir ) ) continue;
+			$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+			if (!is_dir($defdir)) continue;
 
 			// step through each file in defdir of app
 			$d = dir($defdir);
 			while (false !== ($entry = $d->read())) {
 				try
 				{
-					$file = $defdir. '/'. $entry;
-					list( $filename, $extension) = explode('.',$entry);
-					if ( $extension != 'xml' ) continue;
-					importexport_definitions_bo::import( $file );
+					$file = $defdir.'/'.$entry;
+					list($filename, $extension) = explode('.', $entry);
+					if ($extension != 'xml') continue;
+					importexport_definitions_bo::import($file);
 				}
 				catch (Exception $e)
 				{
@@ -104,10 +104,10 @@ 
 		}
 	}
 	// give Default and Admins group rights for ImportExport
-	foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+	foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 	{
-		$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-		$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+		$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+		$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 	}
 
 	return $GLOBALS['setup_info']['importexport']['currentver'] = '1.9.004';
@@ -115,7 +115,7 @@ 
 
 function importexport_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions','filter',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_importexport_definitions', 'filter', array(
 		'type' => 'longtext'
 	));
 

importexport/setup/default_records.inc.php

Spacing +11 added lines, -11 removed lines

@@ -12,9 +12,9 @@ 
 if (!extension_loaded('dom'))
 {
 	echo "<p>Required PHP DOM extension missing, installation of ImportExport definitions aborted.</p>\n";
-	return;	// otherwise we mess up the whole eGroupware install process
+	return; // otherwise we mess up the whole eGroupware install process
 }
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 // This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 $GLOBALS['egw_setup']->setup_account_object();
@@ -22,22 +22,22 @@ 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
 while (false !== ($appdir = $egwdir->read())) {
-	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+	if (!is_dir($defdir)) continue;
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
 	while (false !== ($entry = $d->read())) {
-		$file = $defdir. '/'. $entry;
-		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
-		importexport_definitions_bo::import( $file );
+		$file = $defdir.'/'.$entry;
+		list($filename, $extension) = explode('.', $entry);
+		if ($extension != 'xml') continue;
+		importexport_definitions_bo::import($file);
 	}
 }
 
 // give Default and Admins group rights for ImportExport
-foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 {
-	$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+	$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 }