EGroupware / egroupware

setup/inc/functions.inc.php

Braces +12 added lines, -3 removed lines

@@ -30,14 +30,20 @@ 
 	include('../header.inc.php');
 }
 // for an old header we need to setup a reference for the domains
-if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+if (!is_array($GLOBALS['egw_domain']))
+{
+	$GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+}
 
 /*  If we included the header.inc.php, but it is somehow broken, cover ourselves... */
 if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
 {
-	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))	// pre 1.2 install
+	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))
+	{
+		// pre 1.2 install
 	{
 		define('EGW_SERVER_ROOT',PHPGW_SERVER_ROOT);
+	}
 		define('EGW_INCLUDE_ROOT',PHPGW_INCLUDE_ROOT);
 	}
 	else	// no install
@@ -84,7 +90,10 @@ 
 
 if (!function_exists('version_compare') || version_compare(PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,'<'))
 {
-	if (isset($_SERVER['HTTP_HOST'])) echo "<pre>\n";
+	if (isset($_SERVER['HTTP_HOST']))
+	{
+		echo "<pre>\n";
+	}
 	echo "EGroupware now requires PHP {$GLOBALS['egw_setup']->required_php_version} or greater.\nYour PHP version is: ".PHP_VERSION."\n";
 	echo 'Please contact your System Administrator.';
 	exit;

Spacing +20 added lines, -20 removed lines

@@ -13,10 +13,10 @@ 
  * @version $Id$
  */
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_STRICT);
+error_reporting(error_reporting()&~E_NOTICE & ~E_STRICT);
 
 // for an old header, we need to setup the reference before including it
-$GLOBALS['phpgw_info'] =& $GLOBALS['egw_info'];
+$GLOBALS['phpgw_info'] = & $GLOBALS['egw_info'];
 
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
@@ -25,48 +25,48 @@ 
 		'currentapp' => 'setup',
 		'noapi' => True
 ));
-if(file_exists('../header.inc.php'))
+if (file_exists('../header.inc.php'))
 {
 	include('../header.inc.php');
 }
 // for an old header we need to setup a reference for the domains
-if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] =& $GLOBALS['phpgw_domain'];
+if (!is_array($GLOBALS['egw_domain'])) $GLOBALS['egw_domain'] = & $GLOBALS['phpgw_domain'];
 
 /*  If we included the header.inc.php, but it is somehow broken, cover ourselves... */
-if(!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
+if (!defined('EGW_SERVER_ROOT') && !defined('EGW_INCLUDE_ROOT'))
 {
 	if (defined('PHPGW_SERVER_ROOT') && defined('PHPGW_INCLUDE_ROOT'))	// pre 1.2 install
 	{
-		define('EGW_SERVER_ROOT',PHPGW_SERVER_ROOT);
-		define('EGW_INCLUDE_ROOT',PHPGW_INCLUDE_ROOT);
+		define('EGW_SERVER_ROOT', PHPGW_SERVER_ROOT);
+		define('EGW_INCLUDE_ROOT', PHPGW_INCLUDE_ROOT);
 	}
 	else	// no install
 	{
-		define('EGW_SERVER_ROOT',realpath('..'));
-		define('EGW_INCLUDE_ROOT',realpath('..'));
-		define('PHPGW_SERVER_ROOT',realpath('..'));
-		define('PHPGW_INCLUDE_ROOT',realpath('..'));
+		define('EGW_SERVER_ROOT', realpath('..'));
+		define('EGW_INCLUDE_ROOT', realpath('..'));
+		define('PHPGW_SERVER_ROOT', realpath('..'));
+		define('PHPGW_INCLUDE_ROOT', realpath('..'));
 	}
-	define('EGW_API_INC',EGW_SERVER_ROOT.'/phpgwapi/inc');
+	define('EGW_API_INC', EGW_SERVER_ROOT.'/phpgwapi/inc');
 }
 
-require_once(EGW_INCLUDE_ROOT . '/api/src/loader/common.php');
+require_once(EGW_INCLUDE_ROOT.'/api/src/loader/common.php');
 
 /**
  * function to handle multilanguage support
  *
  */
-function lang($key,$vars=null)
+function lang($key, $vars = null)
 {
-	if(!is_array($vars))
+	if (!is_array($vars))
 	{
 		$vars = func_get_args();
-		array_shift($vars);	// remove $key
+		array_shift($vars); // remove $key
 	}
 	return $GLOBALS['egw_setup']->translation->translate("$key", $vars);
 }
 
-if(file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'))
+if (file_exists(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'))
 {
 	include(EGW_SERVER_ROOT.'/api/setup/setup.inc.php'); /* To set the current core version */
 	/* This will change to just use setup_info */
@@ -79,10 +79,10 @@ 
 
 $GLOBALS['egw_info']['server']['app_images'] = 'templates/default/images';
 
-CreateObject('setup.setup',True,True);	// setup constuctor assigns itself to $GLOBALS['egw_setup'], doing it twice fails on some php4
-$GLOBALS['phpgw_setup'] =& $GLOBALS['egw_setup'];
+CreateObject('setup.setup', True, True); // setup constuctor assigns itself to $GLOBALS['egw_setup'], doing it twice fails on some php4
+$GLOBALS['phpgw_setup'] = & $GLOBALS['egw_setup'];
 
-if (!function_exists('version_compare') || version_compare(PHP_VERSION,$GLOBALS['egw_setup']->required_php_version,'<'))
+if (!function_exists('version_compare') || version_compare(PHP_VERSION, $GLOBALS['egw_setup']->required_php_version, '<'))
 {
 	if (isset($_SERVER['HTTP_HOST'])) echo "<pre>\n";
 	echo "EGroupware now requires PHP {$GLOBALS['egw_setup']->required_php_version} or greater.\nYour PHP version is: ".PHP_VERSION."\n";

setup/inc/hook_config_validate.inc.php

Braces +5 added lines, -2 removed lines

@@ -199,5 +199,8 @@
 {
 	$filter =& $settings['ldap_search_filter'];
 
-	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
-}
+	if ($filter && $filter{0} != '(')
+	{
+		$filter = '('.$filter.')';
+	}
+	}

Spacing +21 added lines, -21 removed lines

@@ -32,12 +32,12 @@ 
  */
 function auth_type($settings)
 {
-	switch($settings['auth_type'])
+	switch ($settings['auth_type'])
 	{
 		case 'mail':
 			if (class_exists('Horde_Imap_Client_Socket') && !in_array($settings['mail_server_type'], array('pop', 'pops')))
 			{
-				return;	// we use Horde code instead of imap extension
+				return; // we use Horde code instead of imap extension
 			}
 			try {
 				check_load_extension('imap', true);
@@ -57,16 +57,16 @@ 
  */
 function vfs_storage_mode($settings)
 {
-	switch($settings['vfs_storage_mode'])
+	switch ($settings['vfs_storage_mode'])
 	{
 		case 'fs':
-			Api\Config::save_value('vfs_fstab','','phpgwapi');
+			Api\Config::save_value('vfs_fstab', '', 'phpgwapi');
 			break;
 		case 'db':
 			Api\Config::save_value('vfs_fstab', array(
 				'/' => 'sqlfs://$host/?storage=db',
 				'/apps' => 'links://$host/apps?storage=db',
-			),'phpgwapi');
+			), 'phpgwapi');
 			break;
 	}
 }
@@ -74,18 +74,18 @@ 
 function temp_dir($settings)
 {
 	$error_msg = null;
-	if (!setup_detection::check_dir($settings['temp_dir'],$error_msg))
+	if (!setup_detection::check_dir($settings['temp_dir'], $error_msg))
 	{
-		$GLOBALS['config_error'] = lang("Your temporary directory '%1' %2",$settings['temp_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your temporary directory '%1' %2", $settings['temp_dir'], $error_msg);
 	}
 }
 
 function files_dir($settings)
 {
 	$error_msg = null;
-	if (!setup_detection::check_dir($settings['files_dir'],$error_msg,true))
+	if (!setup_detection::check_dir($settings['files_dir'], $error_msg, true))
 	{
-		$GLOBALS['config_error'] = lang("Your files directory '%1' %2",$settings['files_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your files directory '%1' %2", $settings['files_dir'], $error_msg);
 	}
 }
 
@@ -96,20 +96,20 @@ 
 		$settings['backup_dir'] = $settings['files_dir'].'/db_backup';
 	}
 	$error_msg = null;
-	if (!setup_detection::check_dir($settings['backup_dir'],$error_msg,true))
+	if (!setup_detection::check_dir($settings['backup_dir'], $error_msg, true))
 	{
-		$GLOBALS['config_error'] = lang("Your backup directory '%1' %2",$settings['backup_dir'],$error_msg);
+		$GLOBALS['config_error'] = lang("Your backup directory '%1' %2", $settings['backup_dir'], $error_msg);
 	}
 }
 
-function _mcrypt_test_module_mode($module,$mode)
+function _mcrypt_test_module_mode($module, $mode)
 {
 	/* Data */
 	$key_in = 'this is a very long key, even too long for the cipher';
 	$plain_text = 'very important data';
 
 	/* Open module, and create IV */
-	if(!$GLOBALS['td'] = @mcrypt_module_open($module, '',$mode, ''))
+	if (!$GLOBALS['td'] = @mcrypt_module_open($module, '', $mode, ''))
 	{
 		@mcrypt_module_close($GLOBALS['td']);
 		return False;
@@ -119,7 +119,7 @@ 
 	$iv = @mcrypt_create_iv($iv_size, MCRYPT_RAND);
 
 	/* Initialize encryption handle */
-	if(mcrypt_generic_init($GLOBALS['td'], $key, $iv) != -1)
+	if (mcrypt_generic_init($GLOBALS['td'], $key, $iv) != -1)
 	{
 		/* Encrypt data */
 		$c_t = mcrypt_generic($GLOBALS['td'], $plain_text);
@@ -153,14 +153,14 @@ 
 	$modes = mcrypt_list_modes();
 	$algorithms = mcrypt_list_algorithms();
 
-	foreach($algorithms as $cipher)
+	foreach ($algorithms as $cipher)
 	{
-		if(mcrypt_module_self_test($cipher))
+		if (mcrypt_module_self_test($cipher))
 		{
 			$GLOBALS['ciphers'][$cipher] = array();
-			foreach($modes as $mode)
+			foreach ($modes as $mode)
 			{
-				if(_mcrypt_test_module_mode($cipher,$mode))
+				if (_mcrypt_test_module_mode($cipher, $mode))
 				{
 					$result = True;
 				}
@@ -179,10 +179,10 @@ 
 function mcrypt_algo($settings)
 {
 	/* _debug_array($settings);exit; */
-	if(@function_exists('mcrypt_list_modes'))
+	if (@function_exists('mcrypt_list_modes'))
 	{
 		mcrypt_check_sanity();
-		if(!@$GLOBALS['ciphers'][$settings['mcrypt_algo']][$settings['mcrypt_mode']])
+		if (!@$GLOBALS['ciphers'][$settings['mcrypt_algo']][$settings['mcrypt_mode']])
 		{
 			$GLOBALS['config_error'] = lang('Invalid Mcrypt Algorithm/Mode combination');
 		}
@@ -196,7 +196,7 @@ 
  */
 function ldap_search_filter(&$settings)
 {
-	$filter =& $settings['ldap_search_filter'];
+	$filter = & $settings['ldap_search_filter'];
 
 	if ($filter && $filter{0} != '(') $filter = '('.$filter.')';
 }

setup/inc/class.setup_cmd_install.inc.php

Braces +8 added lines, -2 removed lines

@@ -113,8 +113,14 @@
 		self::$egw_setup->db->Link_ID->SetCharSet($this->charset);
 		$_POST['ConfigLang'] = $this->lang;
 
-		if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
-		if (true) $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		if ($this->verbose)
+		{
+			echo lang('Installation started, this might take a few minutes ...')."\n";
+		}
+		if (true)
+		{
+			$setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		}
 
 		$this->restore_db();
 

Spacing +12 added lines, -12 removed lines

@@ -34,7 +34,7 @@ 
 	 * @param array $config =array() configuration to preset the defaults during the install, eg. set the account_repository
 	 * @param string $lang ='en'
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$backup=null,$charset='utf-8',$verbose=false,array $config=array(),$lang='en')
+	function __construct($domain, $config_user = null, $config_passwd = null, $backup = null, $charset = 'utf-8', $verbose = false, array $config = array(), $lang = 'en')
 	{
 		if (!is_array($domain))
 		{
@@ -49,7 +49,7 @@ 
 				'lang'          => $lang,
 			);
 		}
-		elseif(!$domain['charset'])
+		elseif (!$domain['charset'])
 		{
 			$domain['charset'] = 'utf-8';
 		}
@@ -65,24 +65,24 @@ 
 	 * @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)
 	{
-		unset($check_only);	// not used;
+		unset($check_only); // not used;
 		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(13,14,20),$this->verbose);
+		$this->check_installed($this->domain, array(13, 14, 20), $this->verbose);
 
 		// use uploaded backup, instead installing from scratch
 		if ($this->backup)
 		{
 			$db_backup = new db_backup();
 
-			if (!is_resource($f = $db_backup->fopen_backup($this->backup,true)))
+			if (!is_resource($f = $db_backup->fopen_backup($this->backup, true)))
 			{
-				throw new Api\Exception\WrongUserinput(lang('Restore failed').' ('.$f.')',31);
+				throw new Api\Exception\WrongUserinput(lang('Restore failed').' ('.$f.')', 31);
 			}
 			if ($this->verbose)
 			{
@@ -90,9 +90,9 @@ 
 			}
 			else
 			{
-				ob_start();	// restore echos the table structure
+				ob_start(); // restore echos the table structure
 			}
-			$db_backup->restore($f,$this->charset,$this->backup);
+			$db_backup->restore($f, $this->charset, $this->backup);
 			fclose($f);
 
 			if (!$this->verbose)
@@ -104,7 +104,7 @@ 
 		// regular (new) install
 		if ($GLOBALS['egw_info']['setup']['stage']['db'] != 3)
 		{
-			throw new Api\Exception\WrongUserinput(lang('EGroupware is already installed!'),30);
+			throw new Api\Exception\WrongUserinput(lang('EGroupware is already installed!'), 30);
 		}
 		$setup_info = self::$egw_setup->detection->upgrade_exclude($setup_info);
 
@@ -114,7 +114,7 @@ 
 		$_POST['ConfigLang'] = $this->lang;
 
 		if ($this->verbose) echo lang('Installation started, this might take a few minutes ...')."\n";
-		if (true) $setup_info = self::$egw_setup->process->pass($setup_info,'new',false,True,$this->config);
+		if (true) $setup_info = self::$egw_setup->process->pass($setup_info, 'new', false, True, $this->config);
 
 		$this->restore_db();
 

setup/inc/class.setup_cmd_config.inc.php

Braces +20 added lines, -5 removed lines

@@ -70,10 +70,13 @@ 
 		self::auth_types(true);
 
 		$values = array();
-		if ($this->arguments)	// we have command line arguments
+		if ($this->arguments)
+		{
+			// we have command line arguments
 		{
 			$save_mail_account = $this->_parse_cli_arguments($values);
 		}
+		}
 		else
 		{
 			$save_mail_account = $this->_parse_properties($values);
@@ -82,7 +85,10 @@ 
 		// store the config
 		foreach($values as $name => $value)
 		{
-			if (substr($name, 0, 4) == 'acc_') continue;
+			if (substr($name, 0, 4) == 'acc_')
+			{
+				continue;
+			}
 
 			$app = 'phpgwapi';
 			if (strpos($name, '/') !== false)
@@ -98,7 +104,10 @@ 
 		}
 		if (count($values))
 		{
-			if ($save_mail_account) $this->_save_mail_account($values);
+			if ($save_mail_account)
+			{
+				$this->_save_mail_account($values);
+			}
 
 			// flush instance cache, so above config get read from database not cache
 			Api\Cache::flush();
@@ -322,13 +331,19 @@ 
 	 */
 	private function _parse_value($arg,$n,$data,$value,array &$values)
 	{
-		if ($value === '' && is_array($data) && !isset($data[$n]['default'])) return false;
+		if ($value === '' && is_array($data) && !isset($data[$n]['default']))
+		{
+			return false;
+		}
 
 		$name = is_array($data) || $n ? $data[$n] : $data;
 
 		if (is_array($name))
 		{
-			if (!$value && isset($name['default'])) $value = $name['default'];
+			if (!$value && isset($name['default']))
+			{
+				$value = $name['default'];
+			}
 
 			if (isset($name['allowed']) && !in_array($value,$name['allowed']))
 			{

Spacing +65 added lines, -65 removed lines

@@ -31,7 +31,7 @@ 
 	 * @param string $arguments =null array with command line argruments
 	 * @param boolean $verbose =false if true, echos out some status information during the run
 	 */
-	function __construct($domain,$config_user=null,$config_passwd=null,$arguments=null,$verbose=false)
+	function __construct($domain, $config_user = null, $config_passwd = null, $arguments = null, $verbose = false)
 	{
 		if (!is_array($domain))
 		{
@@ -55,16 +55,16 @@ 
 	 * @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 && $this->remote_id)
 		{
-			return true;	// can only check locally
+			return true; // can only check locally
 		}
 		// 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);
 
 		// fixing authtypes in self::$options
 		self::auth_types(true);
@@ -80,7 +80,7 @@ 
 		}
 
 		// store the config
-		foreach($values as $name => $value)
+		foreach ($values as $name => $value)
 		{
 			if (substr($name, 0, 4) == 'acc_') continue;
 
@@ -89,12 +89,12 @@ 
 			{
 				list($app, $name) = explode('/', $name);
 			}
-			self::$egw_setup->db->insert(self::$egw_setup->config_table,array(
+			self::$egw_setup->db->insert(self::$egw_setup->config_table, array(
 				'config_value' => $value,
-			),array(
+			), array(
 				'config_app'  => $app,
 				'config_name' => $name,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		if (count($values))
 		{
@@ -118,12 +118,12 @@ 
 	 * @param boolean $echoit =false if true the config is additionally echo'ed out
 	 * @return array with name => value pairs
 	 */
-	static function get_config($echoit=false)
+	static function get_config($echoit = false)
 	{
-		self::$egw_setup->db->select(self::$egw_setup->config_table,'config_name,config_value',array(
+		self::$egw_setup->db->select(self::$egw_setup->config_table, 'config_name,config_value', array(
 			'config_app'  => 'phpgwapi',
 			"(config_name LIKE '%\\_dir' OR (config_name LIKE 'mail%' AND config_name != 'mail_footer') OR config_name LIKE 'smtp\\_%' OR config_name LIKE 'ldap%' OR config_name IN ('webserver_url','system_charset','auth_type','account_repository'))",
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		$config = array();
 		while (($row = self::$egw_setup->db->row(true)))
@@ -133,9 +133,9 @@ 
 		if ($echoit)
 		{
 			echo lang('Current configuration:')."\n";
-			foreach($config as $name => $value)
+			foreach ($config as $name => $value)
 			{
-				echo str_pad($name.':',22).$value."\n";
+				echo str_pad($name.':', 22).$value."\n";
 			}
 		}
 		return $config;
@@ -147,7 +147,7 @@ 
 	 * @var array
 	 */
 	static $options = array(
-		'--config'     => array(),	// name=value,...
+		'--config'     => array(), // name=value,...
 		'--files-dir'  => 'files_dir',
 		'--vfs-root-user' => 'vfs_root_user',
 		'--backup-dir' => 'backup_dir',
@@ -158,14 +158,14 @@ 
 			'acc_imap_host',
 			'acc_imap_port',
 			'acc_domain',
-			array('name' => 'acc_imap_logintype','allowed'  => array(
+			array('name' => 'acc_imap_logintype', 'allowed'  => array(
 				'username (standard)' => 'standard',
 				'username@domain (virtual mail manager)' => 'vmailmgr',
 				'Username/Password defined by admin' => 'admin',
 				'userId@domain eg. u123@domain' => 'uidNumber',
 				'email (Standard Maildomain should be set)' => 'email',
 			)),
-			array('name' => 'acc_imap_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
+			array('name' => 'acc_imap_ssl', 'allowed' => array(0, 'no', 1, 'starttls', 3, 'ssl', 2, 'tls')),
 		),
 		'--imap' => array(
 			'acc_imap_admin_username',
@@ -173,28 +173,28 @@ 
 			'acc_imap_type',
 		),
 		'--folder' => array(
-			'acc_folder_sent','acc_folder_trash','acc_folder_draft','acc_folder_template','acc_folder_junk','acc_folder_archive','acc_folder_ham'
+			'acc_folder_sent', 'acc_folder_trash', 'acc_folder_draft', 'acc_folder_template', 'acc_folder_junk', 'acc_folder_archive', 'acc_folder_ham'
 		),
 		'--sieve' => array(
 			array('name' => 'acc_sieve_host'),
 			'acc_sieve_port',
 			'acc_sieve_enabled',
-			array('name' => 'acc_sieve_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
+			array('name' => 'acc_sieve_ssl', 'allowed' => array(0, 'no', 1, 'starttls', 3, 'ssl', 2, 'tls')),
 		),
 		'--smtp' => array(
-			array('name' => 'editforwardingaddress','allowed' => array('yes',null)),
+			array('name' => 'editforwardingaddress', 'allowed' => array('yes', null)),
 			'acc_smtp_type',
 		),
 		'--smtpserver' => array(	//smtp server,[smtp port],[smtp user],[smtp password],[auth session user/pw],[no|starttls|ssl|tls],[user editable],[further identities]
-			'acc_smtp_host','acc_smtp_port','acc_smtp_username','acc_smtp_passwd','acc_smtp_auth_session',
-			array('name' => 'acc_smtp_ssl','allowed' => array(0,'no',1,'starttls',3,'ssl',2,'tls')),
-			'acc_user_editable','acc_further_identities',
+			'acc_smtp_host', 'acc_smtp_port', 'acc_smtp_username', 'acc_smtp_passwd', 'acc_smtp_auth_session',
+			array('name' => 'acc_smtp_ssl', 'allowed' => array(0, 'no', 1, 'starttls', 3, 'ssl', 2, 'tls')),
+			'acc_user_editable', 'acc_further_identities',
 		),
 		'--account-auth' => array(
-			array('name' => 'account_repository','allowed' => array('sql','ldap','ads'),'default'=>'sql'),
-			array('name' => 'auth_type','allowed' => array('sql','ldap','mail','ads','http','sqlssl','nis','pam'),'default'=>'sql'),
-			array('name' => 'sql_encryption','allowed' => array('blowfish_crypt','sha512_crypt','sha256_crypt','md5_crypt','crypt','ssha','smd5','md5'),'default'=>'blowfish_crypt'),
-			'check_save_password','allow_cookie_auth'),
+			array('name' => 'account_repository', 'allowed' => array('sql', 'ldap', 'ads'), 'default'=>'sql'),
+			array('name' => 'auth_type', 'allowed' => array('sql', 'ldap', 'mail', 'ads', 'http', 'sqlssl', 'nis', 'pam'), 'default'=>'sql'),
+			array('name' => 'sql_encryption', 'allowed' => array('blowfish_crypt', 'sha512_crypt', 'sha256_crypt', 'md5_crypt', 'crypt', 'ssha', 'smd5', 'md5'), 'default'=>'blowfish_crypt'),
+			'check_save_password', 'allow_cookie_auth'),
 		'--ldap-host' => 'ldap_host',
 		'--ldap-root-dn' => 'ldap_root_dn',
 		'--ldap-root-pw' => 'ldap_root_pw',
@@ -206,7 +206,7 @@ 
 		'--install-id' => 'install_id',
 		'--ads-host' => 'ads_host',
 		'--ads-domain' => 'ads_domain',
-		'--ads-admin-user' => 'ads_domain_admin',	// eg. Administrator
+		'--ads-admin-user' => 'ads_domain_admin', // eg. Administrator
 		'--ads-admin-pw' => 'ads_admin_pw',
 		'--ads-connection' => array(
 			array('name' => 'ads_connection', 'allowed' => array('ssl', 'tls'))
@@ -252,9 +252,9 @@ 
 
 		$save_mail_account = false;
 		$values = array();
-		foreach(self::$options as $arg => $option)
+		foreach (self::$options as $arg => $option)
 		{
-			foreach(is_array($option) ? $option : array($option) as $n => $data)
+			foreach (is_array($option) ? $option : array($option) as $n => $data)
 			{
 				$name = is_array($data) ? $data['name'] : $data;
 				$oldname = array_key_exists($name, $this->old2new);
@@ -266,7 +266,7 @@ 
 				}
 				if (isset($this->$name))
 				{
-					$save_mail_account = $this->_parse_value($arg,$n,$option,$this->$name,$values) || $save_mail_account;
+					$save_mail_account = $this->_parse_value($arg, $n, $option, $this->$name, $values) || $save_mail_account;
 				}
 			}
 		}
@@ -284,27 +284,27 @@ 
 		$values = array();
 		$save_mail_account = false;
 		$args = $this->arguments;
-		while(($arg = array_shift($args)))
+		while (($arg = array_shift($args)))
 		{
 			if (!isset(self::$options[$arg]))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!",$arg),90);
+				throw new Api\Exception\WrongUserinput(lang("Unknown option '%1' !!!", $arg), 90);
 			}
-			$options = is_array(self::$options[$arg]) ? explode(',',array_shift($args)) : array(array_shift($args));
+			$options = is_array(self::$options[$arg]) ? explode(',', array_shift($args)) : array(array_shift($args));
 
 			if ($arg == '--config' || $arg == '--setup_cmd_config')
 			{
-				foreach($options as $option)
+				foreach ($options as $option)
 				{
-					list($name,$value) = explode('=',$option,2);
+					list($name, $value) = explode('=', $option, 2);
 					$values[$name] = $value;
 				}
 				continue;
 			}
 			$options[] = ''; $options[] = '';
-			foreach($options as $n => $value)
+			foreach ($options as $n => $value)
 			{
-				$save_mail_account = $this->_parse_value($arg,$n,self::$options[$arg],$value,$values) || $save_mail_account;
+				$save_mail_account = $this->_parse_value($arg, $n, self::$options[$arg], $value, $values) || $save_mail_account;
 			}
 		}
 		return $save_mail_account;
@@ -320,7 +320,7 @@ 
 	 * @param array &$values where the values get set
 	 * @return boolean true if mail-accounts needs to be saved, false if not
 	 */
-	private function _parse_value($arg,$n,$data,$value,array &$values)
+	private function _parse_value($arg, $n, $data, $value, array &$values)
 	{
 		if ($value === '' && is_array($data) && !isset($data[$n]['default'])) return false;
 
@@ -330,15 +330,15 @@ 
 		{
 			if (!$value && isset($name['default'])) $value = $name['default'];
 
-			if (isset($name['allowed']) && !in_array($value,$name['allowed']))
+			if (isset($name['allowed']) && !in_array($value, $name['allowed']))
 			{
-				throw new Api\Exception\WrongUserinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!",$value,1+$n,$arg)." ($name[name])",91);
+				throw new Api\Exception\WrongUserinput(lang("'%1' is not allowed as %2. arguments of option %3 !!!", $value, 1 + $n, $arg)." ($name[name])", 91);
 			}
 			$name = $name['name'];
 		}
 		$values[$name] = $value;
 
-		return in_array($arg,array('--mailserver','--smtpserver','--imap','--smtp','--sieve','--folder'));
+		return in_array($arg, array('--mailserver', '--smtpserver', '--imap', '--smtp', '--sieve', '--folder'));
 	}
 
 	/**
@@ -349,9 +349,9 @@ 
 	function _save_mail_account(array $data)
 	{
 		// convert ssl textual values to nummerical ones used in Api\Mail\Account
-		foreach(array('acc_imap_ssl', 'acc_sieve_ssl', 'acc_smtp_ssl') as $name)
+		foreach (array('acc_imap_ssl', 'acc_sieve_ssl', 'acc_smtp_ssl') as $name)
 		{
-			switch(strtolower($data[$name]))
+			switch (strtolower($data[$name]))
 			{
 				case 'no':       $data[$name] = Api\Mail\Account::SSL_NONE; break;
 				case 'starttls': $data[$name] = Api\Mail\Account::SSL_STARTTLS; break;
@@ -360,12 +360,12 @@ 
 			}
 		}
 		// convert 'yes', 'no' to boolean
-		foreach(array('acc_sieve_enabled','acc_user_editable','acc_further_identities','acc_smtp_auth_session') as $name)
+		foreach (array('acc_sieve_enabled', 'acc_user_editable', 'acc_further_identities', 'acc_smtp_auth_session') as $name)
 		{
 			$data[$name] = $data[$name] && strtolower($data[$name]) != 'no';
 		}
 		// do NOT write empty usernames
-		foreach(array('acc_imap_username', 'acc_smtp_username') as $name)
+		foreach (array('acc_imap_username', 'acc_smtp_username') as $name)
 		{
 			if (empty($data[$name]))
 			{
@@ -375,16 +375,16 @@ 
 		}
 
 		$data['acc_name'] = 'Created by setup';
-		$data['account_id'] = 0;	// 0 = valid for all users
+		$data['account_id'] = 0; // 0 = valid for all users
 
 		Api\Mail\Account::write($data);
 
 		if ($this->verbose)
 		{
 			echo "\n".lang('EMailAdmin mail account saved:')."\n";
-			foreach($data as $name => $value)
+			foreach ($data as $name => $value)
 			{
-				echo str_pad($name.':',22).$value."\n";
+				echo str_pad($name.':', 22).$value."\n";
 			}
 		}
 	}
@@ -397,11 +397,11 @@ 
 	static function options()
 	{
 		$options = array();
-		foreach(self::$options as $option)
+		foreach (self::$options as $option)
 		{
 			if (is_array($option))
 			{
-				foreach($option as $data)
+				foreach ($option as $data)
 				{
 					if (is_array($data) && isset($data['allowed']))
 					{
@@ -414,11 +414,11 @@ 
 								$options[$data['name']] = self::account_repositories();
 								continue 2;
 						}
-						foreach($data['allowed'] as $label => $value)
+						foreach ($data['allowed'] as $label => $value)
 						{
 							if (is_int($label))
 							{
-								$label = (string) $value === '' ? 'No' : strtoupper($value);
+								$label = (string)$value === '' ? 'No' : strtoupper($value);
 							}
 							$options[$data['name']][$value] = lang($label);
 						}
@@ -451,7 +451,7 @@ 
 		if (!$scan_done++)
 		{
 			// now add auth backends found in filesystem
-			foreach(scandir(EGW_INCLUDE_ROOT.'/api/src/Auth') as $file)
+			foreach (scandir(EGW_INCLUDE_ROOT.'/api/src/Auth') as $file)
 			{
 				$matches = null;
 				if (preg_match('/^([a-z0-9]+)\.php$/i', $file, $matches) &&
@@ -460,7 +460,7 @@ 
 					$auth_types[strtolower($matches[1])] = $matches[1];
 				}
 			}
-			foreach(self::$options['--account-auth'] as &$param)
+			foreach (self::$options['--account-auth'] as &$param)
 			{
 				if ($param['name'] == 'auth_type')
 				{
@@ -478,7 +478,7 @@ 
 	 * @param string $current =null current value, to allways return it
 	 * @return array
 	 */
-	static function account_repositories($current=null)
+	static function account_repositories($current = null)
 	{
 		static $account_repositories = array(
 			'sql' => 'SQL',
@@ -489,13 +489,13 @@ 
 		if (!$scan_done++)
 		{
 			// now add auth backends found in filesystem
-			foreach(scandir(EGW_INCLUDE_ROOT.'/api/src/Accounts') as $file)
+			foreach (scandir(EGW_INCLUDE_ROOT.'/api/src/Accounts') as $file)
 			{
 				$matches = null;
 				if (preg_match('/^([a-z0-9]+)\.php$/i', $file, $matches) &&
 					!isset($account_repositories[strtolower($matches[1])]) &&
-					class_exists($class='EGroupware\\Api\\Accounts\\'.$matches[1]) &&
-					(strtolower($matches[1]) == $current || !is_callable($callable=$class.'::available') || call_user_func($callable)))
+					class_exists($class = 'EGroupware\\Api\\Accounts\\'.$matches[1]) &&
+					(strtolower($matches[1]) == $current || !is_callable($callable = $class.'::available') || call_user_func($callable)))
 				{
 					$account_repositories[strtolower($matches[1])] = $matches[1];
 				}
@@ -513,11 +513,11 @@ 
 	{
 		$defaults = array();
 		// fetch the default from the cli options
-		foreach(self::$options as $option)
+		foreach (self::$options as $option)
 		{
 			if (is_array($option))
 			{
-				foreach($option as $data)
+				foreach ($option as $data)
 				{
 					if (is_array($data) && isset($data['default']))
 					{
@@ -545,20 +545,20 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$') !== false)
+			if (strpos($this->$name, '$') !== false)
 			{
 				$this->set_defaults[$name] = $this->$name = str_replace(array(
 					'$domain',
-				),array(
+				), array(
 					$this->domain,
-				),$this->$name);
+				), $this->$name);
 			}
 		}
 	}

setup/inc/class.setup_html.inc.php

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

@@ -29,7 +29,7 @@
 
 		$GLOBALS['header_template']->set_file(array('header' => 'header.inc.php.template'));
 		$GLOBALS['header_template']->set_block('header','domain','domain');
-		$var = Array();
+		$var = array();
 
 		$deletedomain = $_POST['deletedomain'];
 		$domains = $_POST['domains'];

Spacing +82 added lines, -82 removed lines

@@ -28,54 +28,54 @@ 
 		// variable names with underscores.
 
 		$GLOBALS['header_template']->set_file(array('header' => 'header.inc.php.template'));
-		$GLOBALS['header_template']->set_block('header','domain','domain');
+		$GLOBALS['header_template']->set_block('header', 'domain', 'domain');
 		$var = Array();
 
 		$deletedomain = $_POST['deletedomain'];
 		$domains = $_POST['domains'];
 
-		foreach($domains as $k => $v)
+		foreach ($domains as $k => $v)
 		{
-			if(is_array($deletedomain) && isset($deletedomain[$k]))
+			if (is_array($deletedomain) && isset($deletedomain[$k]))
 			{
 				continue;
 			}
-			$variableName = str_replace('.','_',$k);
+			$variableName = str_replace('.', '_', $k);
 			$dom = $_POST['setting_'.$variableName];
-			$GLOBALS['header_template']->set_var('DB_DOMAIN',$v);
-			foreach($dom as $x => $y)
+			$GLOBALS['header_template']->set_var('DB_DOMAIN', $v);
+			foreach ($dom as $x => $y)
 			{
-				if(strtoupper($x) == 'CONFIG_PASS')
+				if (strtoupper($x) == 'CONFIG_PASS')
 				{
-					$GLOBALS['header_template']->set_var(strtoupper($x),md5($y));
+					$GLOBALS['header_template']->set_var(strtoupper($x), md5($y));
 				}
 				else
 				{
-					$GLOBALS['header_template']->set_var(strtoupper($x),$y);
+					$GLOBALS['header_template']->set_var(strtoupper($x), $y);
 				}
 			}
 			/* Admin did not type a new password, so use the old one from the hidden field,
 			 * which is already md5 encoded.
 			 */
-			if($dom['config_password'] && !$dom['config_pass'])
+			if ($dom['config_password'] && !$dom['config_pass'])
 			{
 				/* Real == hidden */
-				$GLOBALS['header_template']->set_var('CONFIG_PASS',$dom['config_password']);
+				$GLOBALS['header_template']->set_var('CONFIG_PASS', $dom['config_password']);
 			}
 			/* If the admin didn't select a db_port, set to the default */
-			if(!$dom['db_port'])
+			if (!$dom['db_port'])
 			{
-				$GLOBALS['header_template']->set_var('DB_PORT',$GLOBALS['default_db_ports'][$dom['db_type']]);
+				$GLOBALS['header_template']->set_var('DB_PORT', $GLOBALS['default_db_ports'][$dom['db_type']]);
 			}
-			$GLOBALS['header_template']->parse('domains','domain',True);
+			$GLOBALS['header_template']->parse('domains', 'domain', True);
 		}
 
-		$GLOBALS['header_template']->set_var('domain','');
+		$GLOBALS['header_template']->set_var('domain', '');
 
 		$setting = $_POST['setting'];
-		while($setting && list($k,$v) = @each($setting))
+		while ($setting && list($k, $v) = @each($setting))
 		{
-			if(strtoupper($k) == 'HEADER_ADMIN_PASSWORD')
+			if (strtoupper($k) == 'HEADER_ADMIN_PASSWORD')
 			{
 				$var[strtoupper($k)] = md5($v);
 			}
@@ -87,21 +87,21 @@ 
 		/* Admin did not type a new header password, so use the old one from the hidden field,
 		 * which is already md5 encoded.
 		 */
-		if($var['HEADER_ADMIN_PASS'] && empty($setting['HEADER_ADMIN_PASSWORD']))
+		if ($var['HEADER_ADMIN_PASS'] && empty($setting['HEADER_ADMIN_PASSWORD']))
 		{
 			/* Real == hidden */
 			$var['HEADER_ADMIN_PASSWORD'] = $var['HEADER_ADMIN_PASS'];
 		}
 		$GLOBALS['header_template']->set_var($var);
-		return $GLOBALS['header_template']->parse('out','header');
+		return $GLOBALS['header_template']->parse('out', 'header');
 	}
 
-	static function setup_tpl_dir($app_name='setup')
+	static function setup_tpl_dir($app_name = 'setup')
 	{
 		/* hack to get tpl dir */
 		if (is_dir(EGW_SERVER_ROOT))
 		{
-			$srv_root = EGW_SERVER_ROOT . '/' . $app_name . '/';
+			$srv_root = EGW_SERVER_ROOT.'/'.$app_name.'/';
 		}
 		else
 		{
@@ -109,16 +109,16 @@ 
 		}
 
 		$tpl_typical = 'templates/default';
-		$tpl_root = "$srv_root" ."$tpl_typical";
+		$tpl_root = "$srv_root"."$tpl_typical";
 		return $tpl_root;
 	}
 
-	static function show_header($title='',$nologoutbutton=False, $logoutfrom='config', $configdomain='')
+	static function show_header($title = '', $nologoutbutton = False, $logoutfrom = 'config', $configdomain = '')
 	{
 		// add a content-type header to overwrite an existing default charset in apache (AddDefaultCharset directiv)
 		header('Content-type: text/html; charset='.$GLOBALS['egw_setup']->system_charset);
 
-		$GLOBALS['setup_tpl']->set_var('charset',$GLOBALS['egw_setup']->system_charset);
+		$GLOBALS['setup_tpl']->set_var('charset', $GLOBALS['egw_setup']->system_charset);
 		$style = array(
 			'th_bg'		=> '#486591',
 			'th_text'	=> '#FFFFFF',
@@ -130,34 +130,34 @@ 
 		$GLOBALS['setup_tpl']->set_var($style);
 		if ($nologoutbutton)
 		{
-			$GLOBALS['setup_tpl']->set_block('T_head','loged_in');
-			$GLOBALS['setup_tpl']->set_var('loged_in','');
+			$GLOBALS['setup_tpl']->set_block('T_head', 'loged_in');
+			$GLOBALS['setup_tpl']->set_var('loged_in', '');
 		}
 		else
 		{
-			$btn_logout = '<a href="index.php?FormLogout=' . $logoutfrom . '" class="link">' . lang('Logout').'</a>';
+			$btn_logout = '<a href="index.php?FormLogout='.$logoutfrom.'" class="link">'.lang('Logout').'</a>';
 			$check_install = '<a class="textsidebox" href="check_install.php">'.lang('Check installation').'</a>';
 			$register_hooks = '<a class="textsidebox" href="applications.php?hooks=1">'.lang('Clear cache and register hooks').'</a>';
 		}
 
 		$GLOBALS['setup_tpl']->set_var('lang_setup', lang('setup'));
-		$GLOBALS['setup_tpl']->set_var('page_title',$title);
+		$GLOBALS['setup_tpl']->set_var('page_title', $title);
 		if ($configdomain == '')
 		{
-			$GLOBALS['setup_tpl']->set_var('configdomain','');
+			$GLOBALS['setup_tpl']->set_var('configdomain', '');
 		}
 		else
 		{
-			$GLOBALS['setup_tpl']->set_var('configdomain',' - ' . lang('Domain') . ': ' . $configdomain);
+			$GLOBALS['setup_tpl']->set_var('configdomain', ' - '.lang('Domain').': '.$configdomain);
 		}
 
-		if(basename($_SERVER['SCRIPT_FILENAME']) != 'index.php')
+		if (basename($_SERVER['SCRIPT_FILENAME']) != 'index.php')
 		{
-			$index_btn = '<a href="index.php" class="link">' . lang('Setup Main Menu') . '</a>';
+			$index_btn = '<a href="index.php" class="link">'.lang('Setup Main Menu').'</a>';
 			$index_img = '<img src="../api/templates/default/images/bullet.png" />';
 		}
 
-		$GLOBALS['setup_tpl']->set_var('lang_version',lang('version'));
+		$GLOBALS['setup_tpl']->set_var('lang_version', lang('version'));
 		if (!isset($GLOBALS['setup_info']) || !isset($GLOBALS['setup_info']['api']) ||
 			!isset($GLOBALS['setup_info']['api']['versions']) || !isset($GLOBALS['setup_info']['api']['versions']['maintenance_release']))
 		{
@@ -168,7 +168,7 @@ 
 			$setup_info = $GLOBALS['setup_info'];
 		}
 		$GLOBALS['setup_tpl']->set_var('pgw_ver', $nologoutbutton ?
-			(double)$setup_info['api']['version'] :	// without login only show main version, not maintenance release
+			(double)$setup_info['api']['version'] : // without login only show main version, not maintenance release
 			$setup_info['api']['versions']['maintenance_release']);
 
 		$GLOBALS['setup_tpl']->set_var(array(
@@ -185,56 +185,56 @@ 
 			'community_forum' => lang('Community forum'),
 		));
 
-		$GLOBALS['setup_tpl']->pparse('out','T_head');
+		$GLOBALS['setup_tpl']->pparse('out', 'T_head');
 	}
 
 	static function show_footer()
 	{
-		$GLOBALS['setup_tpl']->pparse('out','T_footer');
+		$GLOBALS['setup_tpl']->pparse('out', 'T_footer');
 		unset($GLOBALS['setup_tpl']);
 	}
 
-	static function show_alert_msg($alert_word='Setup alert',$alert_msg='setup alert (generic)')
+	static function show_alert_msg($alert_word = 'Setup alert', $alert_msg = 'setup alert (generic)')
 	{
-		$GLOBALS['setup_tpl']->set_var('V_alert_word',$alert_word);
-		$GLOBALS['setup_tpl']->set_var('V_alert_msg',$alert_msg);
-		$GLOBALS['setup_tpl']->pparse('out','T_alert_msg');
+		$GLOBALS['setup_tpl']->set_var('V_alert_word', $alert_word);
+		$GLOBALS['setup_tpl']->set_var('V_alert_msg', $alert_msg);
+		$GLOBALS['setup_tpl']->pparse('out', 'T_alert_msg');
 	}
 
-	static function make_frm_btn_simple($pre_frm_blurb='',$frm_method='post',$frm_action='',$input_type='submit',$input_value='',$post_frm_blurb='')
+	static function make_frm_btn_simple($pre_frm_blurb = '', $frm_method = 'post', $frm_action = '', $input_type = 'submit', $input_value = '', $post_frm_blurb = '')
 	{
 		/* a simple form has simple components */
-		$simple_form = $pre_frm_blurb  ."\n"
-			. '<form method="' . $frm_method . '" action="' . $frm_action  . '">' . "\n"
-			. '<input type="'  . $input_type . '" value="'  . $input_value . '" />' . "\n"
-			. '</form>' . "\n"
-			. $post_frm_blurb . "\n";
+		$simple_form = $pre_frm_blurb."\n"
+			. '<form method="'.$frm_method.'" action="'.$frm_action.'">'."\n"
+			. '<input type="'.$input_type.'" value="'.$input_value.'" />'."\n"
+			. '</form>'."\n"
+			. $post_frm_blurb."\n";
 		return $simple_form;
 	}
 
-	static function make_href_link_simple($pre_link_blurb='',$href_link='',$href_text='default text',$post_link_blurb='')
+	static function make_href_link_simple($pre_link_blurb = '', $href_link = '', $href_text = 'default text', $post_link_blurb = '')
 	{
 		/* a simple href link has simple components */
 		$simple_link = $pre_link_blurb
-			. '<a href="' . $href_link . '">' . $href_text . '</a> '
-			. $post_link_blurb . "\n";
+			. '<a href="'.$href_link.'">'.$href_text.'</a> '
+			. $post_link_blurb."\n";
 		return $simple_link;
 	}
 
 	static function login_form()
 	{
 		/* begin use TEMPLATE login_main.tpl */
-		$GLOBALS['setup_tpl']->set_var('ConfigLoginMSG',@$GLOBALS['egw_info']['setup']['ConfigLoginMSG']);
-		$GLOBALS['setup_tpl']->set_var('HeaderLoginMSG',@$GLOBALS['egw_info']['setup']['HeaderLoginMSG']);
-		$GLOBALS['setup_tpl']->set_var('lang_header_username',lang('Header Username'));
-		$GLOBALS['setup_tpl']->set_var('lang_header_password',lang('Header Password'));
-		$GLOBALS['setup_tpl']->set_var('lang_header_login',lang('Header Admin Login'));
-		$GLOBALS['setup_tpl']->set_var('lang_config_login',lang('Setup/Config Admin Login'));
-		$GLOBALS['setup_tpl']->set_var('lang_config_username',lang('Config Username'));
-		$GLOBALS['setup_tpl']->set_var('lang_config_password',lang('Config Password'));
-		$GLOBALS['setup_tpl']->set_var('lang_domain',lang('Domain'));
+		$GLOBALS['setup_tpl']->set_var('ConfigLoginMSG', @$GLOBALS['egw_info']['setup']['ConfigLoginMSG']);
+		$GLOBALS['setup_tpl']->set_var('HeaderLoginMSG', @$GLOBALS['egw_info']['setup']['HeaderLoginMSG']);
+		$GLOBALS['setup_tpl']->set_var('lang_header_username', lang('Header Username'));
+		$GLOBALS['setup_tpl']->set_var('lang_header_password', lang('Header Password'));
+		$GLOBALS['setup_tpl']->set_var('lang_header_login', lang('Header Admin Login'));
+		$GLOBALS['setup_tpl']->set_var('lang_config_login', lang('Setup/Config Admin Login'));
+		$GLOBALS['setup_tpl']->set_var('lang_config_username', lang('Config Username'));
+		$GLOBALS['setup_tpl']->set_var('lang_config_password', lang('Config Password'));
+		$GLOBALS['setup_tpl']->set_var('lang_domain', lang('Domain'));
 
-		$GLOBALS['setup_tpl']->set_var('lang_select',self::lang_select());
+		$GLOBALS['setup_tpl']->set_var('lang_select', self::lang_select());
 
 		if ($GLOBALS['egw_info']['setup']['stage']['header'] == '10')
 		{
@@ -244,53 +244,53 @@ 
 			*/
 			if (count($GLOBALS['egw_domain']) > 1)
 			{
-				foreach(array_keys($GLOBALS['egw_domain']) as $domain)
+				foreach (array_keys($GLOBALS['egw_domain']) as $domain)
 				{
 					$domains .= "<option value=\"$domain\" ".($domain == @$GLOBALS['egw_info']['setup']['LastDomain'] ? ' selected="selected"' : '').">$domain</option>\n";
 				}
-				$GLOBALS['setup_tpl']->set_var('domains',$domains);
+				$GLOBALS['setup_tpl']->set_var('domains', $domains);
 
 				// use BLOCK B_multi_domain inside of login_stage_header
-				$GLOBALS['setup_tpl']->parse('V_multi_domain','B_multi_domain');
+				$GLOBALS['setup_tpl']->parse('V_multi_domain', 'B_multi_domain');
 				// in this case, the single domain block needs to be nothing
-				$GLOBALS['setup_tpl']->set_var('V_single_domain','');
+				$GLOBALS['setup_tpl']->set_var('V_single_domain', '');
 			}
 			else
 			{
 				reset($GLOBALS['egw_domain']);
 				$default_domain = each($GLOBALS['egw_domain']);
-				$GLOBALS['setup_tpl']->set_var('default_domain_zero',$default_domain[0]);
+				$GLOBALS['setup_tpl']->set_var('default_domain_zero', $default_domain[0]);
 
 				/* Use BLOCK B_single_domain inside of login_stage_header */
-				$GLOBALS['setup_tpl']->parse('V_single_domain','B_single_domain');
+				$GLOBALS['setup_tpl']->parse('V_single_domain', 'B_single_domain');
 				/* in this case, the multi domain block needs to be nothing */
-				$GLOBALS['setup_tpl']->set_var('V_multi_domain','');
+				$GLOBALS['setup_tpl']->set_var('V_multi_domain', '');
 			}
 			/*
 			 End use SUB-TEMPLATE login_stage_header
 			 put all this into V_login_stage_header for use inside login_main
 			*/
-			$GLOBALS['setup_tpl']->parse('V_login_stage_header','T_login_stage_header');
+			$GLOBALS['setup_tpl']->parse('V_login_stage_header', 'T_login_stage_header');
 		}
 		else
 		{
 			/* begin SKIP SUB-TEMPLATE login_stage_header */
-			$GLOBALS['setup_tpl']->set_var('V_multi_domain','');
-			$GLOBALS['setup_tpl']->set_var('V_single_domain','');
-			$GLOBALS['setup_tpl']->set_var('V_login_stage_header','');
+			$GLOBALS['setup_tpl']->set_var('V_multi_domain', '');
+			$GLOBALS['setup_tpl']->set_var('V_single_domain', '');
+			$GLOBALS['setup_tpl']->set_var('V_login_stage_header', '');
 		}
 		/*
 		 end use TEMPLATE login_main.tpl
 		 now out the login_main template
 		*/
-		$GLOBALS['setup_tpl']->pparse('out','T_login_main');
+		$GLOBALS['setup_tpl']->pparse('out', 'T_login_main');
 	}
 
-	static function lang_select($onChange=False,$ConfigLang='')
+	static function lang_select($onChange = False, $ConfigLang = '')
 	{
 		if (empty($ConfigLang))
 		{
-			$ConfigLang = setup::get_lang(true);	// true use Accept-Language header
+			$ConfigLang = setup::get_lang(true); // true use Accept-Language header
 		}
 		return Api\Html::select('ConfigLang', $ConfigLang, Api\Translation::get_available_langs(false), true,
 			$onChange ? ' onchange="this.form.submit();"' : '');
@@ -298,19 +298,19 @@ 
 
 	static function get_template_list()
 	{
-		$d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates');
+		$d = dir(EGW_SERVER_ROOT.'/phpgwapi/templates');
 
 		$list = array();
-		while($entry = $d->read())
+		while ($entry = $d->read())
 		{
 			if ($entry != 'CVS' && $entry != '.' && $entry != '..')
 			{
 				$list[$entry]['name'] = $entry;
-				$f = EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/details.inc.php';
-				if (file_exists ($f))
+				$f = EGW_SERVER_ROOT.'/phpgwapi/templates/'.$entry.'/details.inc.php';
+				if (file_exists($f))
 				{
 					include($f);
-					$list[$entry]['title'] = 'Use ' . $GLOBALS['egw_info']['template'][$entry]['title'] . 'interface';
+					$list[$entry]['title'] = 'Use '.$GLOBALS['egw_info']['template'][$entry]['title'].'interface';
 				}
 				else
 				{
@@ -319,22 +319,22 @@ 
 			}
 		}
 		$d->close();
-		reset ($list);
+		reset($list);
 		return $list;
 	}
 
 	static function list_themes()
 	{
-		$dh = dir(EGW_SERVER_ROOT . '/phpgwapi/themes');
+		$dh = dir(EGW_SERVER_ROOT.'/phpgwapi/themes');
 		while ($file = $dh->read())
 		{
 			if (preg_match('/'."\.theme$".'/i', $file))
 			{
-				$list[] = substr($file,0,strpos($file,'.'));
+				$list[] = substr($file, 0, strpos($file, '.'));
 			}
 		}
 		$dh->close();
-		reset ($list);
+		reset($list);
 		return $list;
 	}
 }

importexport/inc/class.importexport_definition.inc.php

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

@@ -196,7 +196,7 @@
 	 *
 	 * @param filter array of field => settings
 	 */
-	private function set_filter(Array $filter) {
+	private function set_filter(array $filter) {
 		$this->definition['filter'] = $filter;
 	}
 

Doc Comments -1 removed lines

@@ -176,7 +176,6 @@
 	/**
 	 * sets options
 	 *
-	 * @param array $options
 	 */
 	private function set_options(array $_plugin_options) {
 		// Check conditions

Spacing +43 added lines, -43 removed lines

@@ -65,8 +65,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		$this->so_sql = new Api\Storage\Base(self::_appname ,self::_defintion_talbe);
+	public function __construct($_identifier = '') {
+		$this->so_sql = new Api\Storage\Base(self::_appname, self::_defintion_talbe);
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
 		$this->is_admin = $GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_setup'] ? true : false;
 		// compability to string identifiers
@@ -74,17 +74,17 @@ 
 
 		if ((int)$_identifier != 0) {
 			$this->definition = $this->so_sql->read(array('definition_id' => $_identifier));
-			if ( empty( $this->definition ) ) {
+			if (empty($this->definition)) {
 				throw new Exception('Error: No such definition with identifier :"'.$_identifier.'"!');
 			}
-			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
+			if (!(importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
 				throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!');
 			}
 			try
 			{
-				$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
+				$options_data = importexport_arrayxml::xml2array($this->definition['plugin_options']);
 				$this->definition['plugin_options'] = (array)$options_data['root'];
-				if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				if ($this->definition['filter']) $filter = importexport_arrayxml::xml2array($this->definition['filter']);
 				$this->definition['filter'] = $filter['root'];
 			}
 			catch (Exception $e)
@@ -100,22 +100,22 @@ 
 	 * @param string $_name
 	 * @return int
 	 */
-	private function name2identifier( $_name ) {
-		$identifiers = $this->so_sql->search(array('name' => $_name),true);
+	private function name2identifier($_name) {
+		$identifiers = $this->so_sql->search(array('name' => $_name), true);
 		if (isset($identifiers[1])) {
-			throw new Exception('Error: Definition: "'.$_name. '" is not unique! Can\'t convert to identifier');
+			throw new Exception('Error: Definition: "'.$_name.'" is not unique! Can\'t convert to identifier');
 		}
-		if ( empty( $identifiers[0] ) ) {
+		if (empty($identifiers[0])) {
 			// not a good idea, till we don't have different exceptions so far
 			// throw new Exception('Error: No such definition :"'.$_name.'"!');
-			$identifiers = array( array( 'definition_id' => 0 ) );
+			$identifiers = array(array('definition_id' => 0));
 		}
 		return $identifiers[0]['definition_id'];
 	}
 
 	public function __get($_attribute_name) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
-			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
+		if (!array_key_exists($_attribute_name, $this->attributes)) {
+			throw new Exception('Error: "'.$_attribute_name.'" is not an attribute defintion');
 		}
 		switch ($_attribute_name) {
 			case 'allowed_users' :
@@ -129,9 +129,9 @@ 
 		}
 	}
 
-	public function __set($_attribute_name,$_data) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
-			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
+	public function __set($_attribute_name, $_data) {
+		if (!array_key_exists($_attribute_name, $this->attributes)) {
+			throw new Exception('Error: "'.$_attribute_name.'" is not an attribute defintion');
 		}
 		switch ($_attribute_name) {
 			case 'allowed_users' :
@@ -152,7 +152,7 @@ 
 	 * @return array
 	 */
 	private function get_allowed_users() {
-		return explode(',',substr($this->definition['allowed_users'],1,-1));
+		return explode(',', substr($this->definition['allowed_users'], 1, -1));
 	}
 
 	/**
@@ -160,8 +160,8 @@ 
 	 *
 	 * @param array $_allowed_users
 	 */
-	private function set_allowed_users( $_allowed_users ) {
-		$this->definition['allowed_users'] = ','.implode(',',(array)$_allowed_users) .',';
+	private function set_allowed_users($_allowed_users) {
+		$this->definition['allowed_users'] = ','.implode(',', (array)$_allowed_users).',';
 	}
 
 	/**
@@ -180,8 +180,8 @@ 
 	 */
 	private function set_options(array $_plugin_options) {
 		// Check conditions
-		foreach ( $_plugin_options['conditions'] as $key => $condition ) {
-			if(!$condition['string'])
+		foreach ($_plugin_options['conditions'] as $key => $condition) {
+			if (!$condition['string'])
 			{
 				unset($_plugin_options['conditions'][$key]);
 			}
@@ -237,13 +237,13 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_record( array $_record ) {
-		$this->definition = array_intersect_key( $_record, $this->attributes );
+	public function set_record(array $_record) {
+		$this->definition = array_intersect_key($_record, $this->attributes);
 
 		// anything which is not an attribute is perhaps a plugin_option.
 		// If not, it gets whiped out on save time.
-		foreach ( $_record as $attribute => $value) {
-			if ( !array_key_exists( $attribute, $this->attributes ) ) {
+		foreach ($_record as $attribute => $value) {
+			if (!array_key_exists($attribute, $this->attributes)) {
 				$this->definition['plugin_options'][$attribute] = $value;
 			}
 		}
@@ -251,9 +251,9 @@ 
 		$this->plugin = $_record['plugin'];
 
 		// convert plugin_options into internal representation
-		$this->set_allowed_users( $this->definition['allowed_users'] );
-		$this->set_options( $this->definition['plugin_options'] ? $this->definition['plugin_options'] : array());
-		$this->set_filter( $this->definition['filter'] ? $this->definition['filter'] : array());
+		$this->set_allowed_users($this->definition['allowed_users']);
+		$this->set_options($this->definition['plugin_options'] ? $this->definition['plugin_options'] : array());
+		$this->set_filter($this->definition['filter'] ? $this->definition['filter'] : array());
 	}
 
 	/**
@@ -273,7 +273,7 @@ 
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
 	public function get_icon() {
-		return self::_appname . '/navbar';
+		return self::_appname.'/navbar';
 	}
 
 	/**
@@ -281,16 +281,16 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		if ( strlen($this->definition['name']) < 3 ) {
+	public function save($_dst_identifier) {
+		if (strlen($this->definition['name']) < 3) {
 			throw new Exception('Error: Can\'t save definition, no valid name given!');
 		}
 
 		$this->so_sql->data = $this->definition;
-		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml( $this->definition['plugin_options'] );
-		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml( $this->definition['filter'] );
+		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml($this->definition['plugin_options']);
+		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml($this->definition['filter']);
 		$this->so_sql->data['modified'] = time();
-		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier ))) {
+		if ($this->so_sql->save(array('definition_id' => $_dst_identifier))) {
 			throw new Exception('Error: Api\Storage\Base was not able to save definition: '.$this->get_identifier());
 		}
 
@@ -303,13 +303,13 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 		$dst_object = clone $this;
 		try {
 			$dst_object->set_owner($this->user);
 			$dst_identifier = $dst_object->save($_dst_identifier);
 		}
-		catch(exception $Exception) {
+		catch (exception $Exception) {
 			unset($dst_object);
 			throw $Exception;
 		}
@@ -324,16 +324,16 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 		if ($this->user != $this->get_owner() && !$this->is_admin) {
-			throw('Error: User '. $this->user. 'does not have permissions to move definition '.$this->get_identifier());
+			throw('Error: User '.$this->user.'does not have permissions to move definition '.$this->get_identifier());
 		}
 		$old_object = clone $this;
 		try {
 			$dst_identifier = $this->save($_dst_identifier);
 			$old_object->delete();
 		}
-		catch(exception $Exception) {
+		catch (exception $Exception) {
 			unset($old_object);
 			throw $Exception;
 		}
@@ -346,11 +346,11 @@ 
 	 * @return void
 	 *
 	 */
-	public function delete () {
-		if($this->user != $this->get_owner() && !$this->is_admin) {
-			throw('Error: User '. $this->user. 'does not have permissions to delete definition '.$this->get_identifier());
+	public function delete() {
+		if ($this->user != $this->get_owner() && !$this->is_admin) {
+			throw('Error: User '.$this->user.'does not have permissions to delete definition '.$this->get_identifier());
 		}
-		if(!$this->so_sql->delete()) {
+		if (!$this->so_sql->delete()) {
 			throw('Error: Api\Storage\Base was not able to delete definition: '.$this->get_identifier());
 		}
 	}

Braces +84 added lines, -40 removed lines

@@ -20,7 +20,8 @@ 
  * are in one assiozative array which is complely managed by {Im|Ex}port plugins
  * @todo testing
  */
-class importexport_definition implements importexport_iface_egw_record {
+class importexport_definition implements importexport_iface_egw_record
+{
 
 	const _appname = 'importexport';
 	const _defintion_talbe = 'egw_importexport_definitions';
@@ -65,26 +66,36 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
+	public function __construct( $_identifier='' )
+	{
 		$this->so_sql = new Api\Storage\Base(self::_appname ,self::_defintion_talbe);
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
 		$this->is_admin = $GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_setup'] ? true : false;
 		// compability to string identifiers
-		if (!is_numeric($_identifier) && strlen($_identifier) > 3) $_identifier = $this->name2identifier($_identifier);
+		if (!is_numeric($_identifier) && strlen($_identifier) > 3)
+		{
+			$_identifier = $this->name2identifier($_identifier);
+		}
 
-		if ((int)$_identifier != 0) {
+		if ((int)$_identifier != 0)
+		{
 			$this->definition = $this->so_sql->read(array('definition_id' => $_identifier));
-			if ( empty( $this->definition ) ) {
+			if ( empty( $this->definition ) )
+			{
 				throw new Exception('Error: No such definition with identifier :"'.$_identifier.'"!');
 			}
-			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin)) {
+			if ( !( importexport_definitions_bo::is_permitted($this->get_record_array()) || $this->is_admin))
+			{
 				throw new Exception('Error: User "'.$this->user.'" is not permitted to get definition with identifier "'.$_identifier.'"!');
 			}
 			try
 			{
 				$options_data = importexport_arrayxml::xml2array( $this->definition['plugin_options'] );
 				$this->definition['plugin_options'] = (array)$options_data['root'];
-				if($this->definition['filter']) $filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				if($this->definition['filter'])
+				{
+					$filter = importexport_arrayxml::xml2array( $this->definition['filter']  );
+				}
 				$this->definition['filter'] = $filter['root'];
 			}
 			catch (Exception $e)
@@ -100,12 +111,15 @@ 
 	 * @param string $_name
 	 * @return int
 	 */
-	private function name2identifier( $_name ) {
+	private function name2identifier( $_name )
+	{
 		$identifiers = $this->so_sql->search(array('name' => $_name),true);
-		if (isset($identifiers[1])) {
+		if (isset($identifiers[1]))
+		{
 			throw new Exception('Error: Definition: "'.$_name. '" is not unique! Can\'t convert to identifier');
 		}
-		if ( empty( $identifiers[0] ) ) {
+		if ( empty( $identifiers[0] ) )
+		{
 			// not a good idea, till we don't have different exceptions so far
 			// throw new Exception('Error: No such definition :"'.$_name.'"!');
 			$identifiers = array( array( 'definition_id' => 0 ) );
@@ -113,11 +127,14 @@ 
 		return $identifiers[0]['definition_id'];
 	}
 
-	public function __get($_attribute_name) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
+	public function __get($_attribute_name)
+	{
+		if (!array_key_exists($_attribute_name,$this->attributes))
+		{
 			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
 		}
-		switch ($_attribute_name) {
+		switch ($_attribute_name)
+		{
 			case 'allowed_users' :
 				return $this->get_allowed_users();
 			case 'plugin_options' :
@@ -129,11 +146,14 @@ 
 		}
 	}
 
-	public function __set($_attribute_name,$_data) {
-		if (!array_key_exists($_attribute_name,$this->attributes)) {
+	public function __set($_attribute_name,$_data)
+	{
+		if (!array_key_exists($_attribute_name,$this->attributes))
+		{
 			throw new Exception('Error: "'. $_attribute_name. '" is not an attribute defintion');
 		}
-		switch ($_attribute_name) {
+		switch ($_attribute_name)
+		{
 			case 'allowed_users' :
 				return $this->set_allowed_users($_data);
 			case 'plugin_options' :
@@ -151,7 +171,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_allowed_users() {
+	private function get_allowed_users()
+	{
 		return explode(',',substr($this->definition['allowed_users'],1,-1));
 	}
 
@@ -160,7 +181,8 @@ 
 	 *
 	 * @param array $_allowed_users
 	 */
-	private function set_allowed_users( $_allowed_users ) {
+	private function set_allowed_users( $_allowed_users )
+	{
 		$this->definition['allowed_users'] = ','.implode(',',(array)$_allowed_users) .',';
 	}
 
@@ -169,7 +191,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_options() {
+	private function get_options()
+	{
 		return $this->definition['plugin_options'];
 	}
 
@@ -178,9 +201,11 @@ 
 	 *
 	 * @param array $options
 	 */
-	private function set_options(array $_plugin_options) {
+	private function set_options(array $_plugin_options)
+	{
 		// Check conditions
-		foreach ( $_plugin_options['conditions'] as $key => $condition ) {
+		foreach ( $_plugin_options['conditions'] as $key => $condition )
+		{
 			if(!$condition['string'])
 			{
 				unset($_plugin_options['conditions'][$key]);
@@ -194,7 +219,8 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_filter() {
+	private function get_filter()
+	{
 		return $this->definition['filter'];
 	}
 
@@ -203,7 +229,8 @@ 
 	 *
 	 * @param filter array of field => settings
 	 */
-	private function set_filter(Array $filter) {
+	private function set_filter(Array $filter)
+	{
 		$this->definition['filter'] = $filter;
 	}
 
@@ -215,7 +242,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		$definition = $this->definition;
 		$definition['allowed_users'] = $this->get_allowed_users();
 		$definition['plugin_options'] = $this->get_options();
@@ -228,7 +256,8 @@ 
 	 *
 	 *@return string tiltle
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return $this->definition['name'];
 	}
 
@@ -237,13 +266,16 @@ 
 	 *
 	 * @return void
 	 */
-	public function set_record( array $_record ) {
+	public function set_record( array $_record )
+	{
 		$this->definition = array_intersect_key( $_record, $this->attributes );
 
 		// anything which is not an attribute is perhaps a plugin_option.
 		// If not, it gets whiped out on save time.
-		foreach ( $_record as $attribute => $value) {
-			if ( !array_key_exists( $attribute, $this->attributes ) ) {
+		foreach ( $_record as $attribute => $value)
+		{
+			if ( !array_key_exists( $attribute, $this->attributes ) )
+			{
 				$this->definition['plugin_options'][$attribute] = $value;
 			}
 		}
@@ -261,7 +293,8 @@ 
 	 *
 	 * @return int identifier of this record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->definition['definition_id'];
 	}
 
@@ -272,7 +305,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return self::_appname . '/navbar';
 	}
 
@@ -281,8 +315,10 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		if ( strlen($this->definition['name']) < 3 ) {
+	public function save ( $_dst_identifier )
+	{
+		if ( strlen($this->definition['name']) < 3 )
+		{
 			throw new Exception('Error: Can\'t save definition, no valid name given!');
 		}
 
@@ -290,7 +326,8 @@ 
 		$this->so_sql->data['plugin_options'] = importexport_arrayxml::array2xml( $this->definition['plugin_options'] );
 		$this->so_sql->data['filter'] = importexport_arrayxml::array2xml( $this->definition['filter'] );
 		$this->so_sql->data['modified'] = time();
-		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier ))) {
+		if ($this->so_sql->save( array( 'definition_id' => $_dst_identifier )))
+		{
 			throw new Exception('Error: Api\Storage\Base was not able to save definition: '.$this->get_identifier());
 		}
 
@@ -303,7 +340,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		$dst_object = clone $this;
 		try {
 			$dst_object->set_owner($this->user);
@@ -324,8 +362,10 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		if ($this->user != $this->get_owner() && !$this->is_admin) {
+	public function move ( $_dst_identifier )
+	{
+		if ($this->user != $this->get_owner() && !$this->is_admin)
+		{
 			throw('Error: User '. $this->user. 'does not have permissions to move definition '.$this->get_identifier());
 		}
 		$old_object = clone $this;
@@ -346,11 +386,14 @@ 
 	 * @return void
 	 *
 	 */
-	public function delete () {
-		if($this->user != $this->get_owner() && !$this->is_admin) {
+	public function delete ()
+	{
+		if($this->user != $this->get_owner() && !$this->is_admin)
+		{
 			throw('Error: User '. $this->user. 'does not have permissions to delete definition '.$this->get_identifier());
 		}
-		if(!$this->so_sql->delete()) {
+		if(!$this->so_sql->delete())
+		{
 			throw('Error: Api\Storage\Base was not able to delete definition: '.$this->get_identifier());
 		}
 	}
@@ -359,7 +402,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset($this->so_sql);
 	}
 

importexport/inc/class.importexport_iface_export_plugin.inc.php

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
  *
  * get_selector();  //returns array
  */
-interface importexport_iface_export_plugin {
+interface importexport_iface_export_plugin
+{
 	
 	/**
 	 * exports entries according to given definition object.

Spacing +1 added lines, -1 removed lines

@@ -87,7 +87,7 @@
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl(importexport_definition &$definition=null);
+	public function get_options_etpl(importexport_definition &$definition = null);
 
 	/**
 	 * returns etemplate name for slectors of this plugin

Doc Comments +2 added lines, -2 removed lines

@@ -79,7 +79,7 @@ 
 	 *
 	 * @param $definition Specific definition
 	 * 
-	 * @return array (
+	 * @return boolean (
 	 * 		name 		=> string,
 	 * 		content		=> array,
 	 * 		sel_options	=> array,
@@ -109,7 +109,7 @@ 
 	 * and automatic conversions.  In most cases they are named <appname>_egw_record,
 	 * but projectmanager is an exception to this.
 	 *
-	 * @return string;
+	 * @return string
 	 */
 	public static function get_egw_record_class();
 } // end of iface_export_plugin

importexport/inc/class.importexport_widget_filter.inc.php

Braces +5 added lines, -2 removed lines

@@ -93,7 +93,8 @@ 
 						'get_rows'      => 'etemplate.ajax_select_widget.array_rows',
 						'id_field'      => ajax_select_widget::ARRAY_KEY,
 					);
-					if($field['rows']) {
+					if($field['rows'])
+					{
 						$options['num_rows'] = $field['rows'];
 					}
 
@@ -103,7 +104,9 @@ 
 					{
 						$options['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
 						unset($field['values']['@']);
-					} else {
+					}
+					else
+					{
 						$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
 					}
 					$options = array_merge($options, array_intersect_key($field['values'], array_flip(ajax_select_widget::$known_options)));

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

@@ -38,7 +38,7 @@
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, Array $expand = Array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$form_name = self::form_name($cname, $this->id);
 		if($this->getElementAttribute($form_name, 'customfields'))

Spacing +21 added lines, -21 removed lines

@@ -41,18 +41,18 @@ 
 	public function beforeSendToClient($cname, Array $expand = Array())
 	{
 		$form_name = self::form_name($cname, $this->id);
-		if($this->getElementAttribute($form_name, 'customfields'))
+		if ($this->getElementAttribute($form_name, 'customfields'))
 		{
 			// Already done?  Still need to process, or sel_options may be missing
 			unset(self::$request->modifications[$form_name]);
 		}
-		$value =& self::get_array(self::$request->content, $form_name, true);
+		$value = & self::get_array(self::$request->content, $form_name, true);
 		$fields = $value['fields'];
 		unset($value['fields']);
 		$relative_dates = $this->attrs['relative_dates'];
 
 		// Fallback, so there's something there...
-		if(!is_array($fields))
+		if (!is_array($fields))
 		{
 			error_log("$this has no fields");
 			self::$transformation = array(
@@ -69,14 +69,14 @@ 
 		$this->setElementAttribute($form_name, 'prefix', self::$prefix);
 
 		$n = 1;
-		foreach($fields as $lname => &$field)
+		foreach ($fields as $lname => &$field)
 		{
-			$type =& $field['type'];
+			$type = & $field['type'];
 
 			// No filters are required
 			$field['needed'] = false;
 
-			switch($type)
+			switch ($type)
 			{
 				case 'date':
 				case 'date-time':
@@ -93,7 +93,7 @@ 
 						'get_rows'      => 'etemplate.ajax_select_widget.array_rows',
 						'id_field'      => ajax_select_widget::ARRAY_KEY,
 					);
-					if($field['rows']) {
+					if ($field['rows']) {
 						$options['num_rows'] = $field['rows'];
 					}
 
@@ -115,22 +115,22 @@ 
 					// fall through
 				case 'select':
 				default:
-					if(strpos($field['type'],'select') === 0)
+					if (strpos($field['type'], 'select') === 0)
 					{
 						if (count($field['values']) == 1 && isset($field['values']['@']))
 						{
 							$field['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
 						}
-						foreach((array)$field['values'] as $key => $val)
+						foreach ((array)$field['values'] as $key => $val)
 						{
-							if (substr($val = lang($val),-1) != '*')
+							if (substr($val = lang($val), -1) != '*')
 							{
 								$field['values'][$key] = $val;
 							}
 						}
 
 						// We don't want the 'All' or 'Select...' if it's there
-						if(is_array($field['values']) && $field['values'][''])
+						if (is_array($field['values']) && $field['values'][''])
 						{
 							unset($field['values']['']);
 						}
@@ -138,27 +138,27 @@ 
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);
 					}
-					else if( $GLOBALS['egw_info']['apps'][$field['type']])
+					else if ($GLOBALS['egw_info']['apps'][$field['type']])
 					{
 						// Links
 					}
 					else
 					{
-						error_log('Trying to filter with unsupported field type ' . $lname . ': ' . $field['type']);
+						error_log('Trying to filter with unsupported field type '.$lname.': '.$field['type']);
 					}
 			}
 
 			// Send select options
-			if($field['values'])
+			if ($field['values'])
 			{
 				self::$request->sel_options[self::$prefix.$lname] = $field['values'];
 			}
 			$widget = self::factory($type, '<'.$type.' type="'.$type.'" id="'.self::$prefix.$lname.'"/>', self::$prefix.$lname);
-			if(method_exists($widget, 'beforeSendToClient'))
+			if (method_exists($widget, 'beforeSendToClient'))
 			{
 				$widget->id = self::$prefix.$lname;
 				$widget->attrs['type'] = $type;
-				if($type == 'link-to')
+				if ($type == 'link-to')
 				{
 					$widget->attrs['only_app'] = $field['type'];
 				}
@@ -170,22 +170,22 @@ 
 		parent::beforeSendToClient($cname, $expand);
 
 		$this->setElementAttribute($form_name, 'customfields', $fields);
-		$this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true));
+		$this->setElementAttribute($form_name, 'fields', array_fill_keys(array_keys($fields), true));
 		return false;
 	}
 
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value_in = (array)self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
+			$valid = & self::get_array($validated, $this->id ? $form_name : $field, true);
 
-			foreach($value_in as $key => $value)
+			foreach ($value_in as $key => $value)
 			{
 				// Client side cf widget automatically prefixes #
-				$valid[substr($key,strlen(self::$prefix))] = $value;
+				$valid[substr($key, strlen(self::$prefix))] = $value;
 			}
 		}
 	}

admin/inc/class.admin_cmd_check_acl.inc.php

Braces +4 added lines, -1 removed lines

@@ -36,7 +36,10 @@
 	 */
 	protected function exec($check_only=false)
 	{
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		admin_cmd::_instanciate_accounts();
 		$deleted = 0;

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 	 *
 	 * @param array $data =array() default parm from parent class, no real parameters
 	 */
-	function __construct($data=array())
+	function __construct($data = array())
 	{
 		admin_cmd::__construct($data);
 	}
@@ -34,7 +34,7 @@ 
 	 * @throws Exception(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Exception(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only) return true;
 
@@ -43,14 +43,14 @@ 
 		if (($all_accounts = admin_cmd::$accounts->search(array('type'=>'both'))))
 		{
 			$ids = array();
-			foreach($all_accounts as $account)
+			foreach ($all_accounts as $account)
 			{
 				$ids[] = $account['account_id'];
 			}
-			$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',',$ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','",$ids)."')",__LINE__,__FILE__);
+			$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',', $ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','", $ids)."')", __LINE__, __FILE__);
 			$deleted = $GLOBALS['egw']->db->affected_rows();
 		}
-		return lang("%1 ACL records of not (longer) existing accounts deleted.",$deleted);
+		return lang("%1 ACL records of not (longer) existing accounts deleted.", $deleted);
 	}
 
 	/**