EGroupware / egroupware

setup/inc/class.setup_cmd_hooks.inc.php

Doc Comments +2 added lines, -3 removed lines

@@ -19,9 +19,8 @@
 	 * Constructor
 	 *
 	 * @param string $domain string with domain-name or array with all arguments
-	 * @param string $config_user=null user to config the domain (or header_admin_user)
-	 * @param string $config_passwd=null pw of above user
-	 * @param boolean $verbose=false if true, echos out some status information during the run
+	 * @param string $config_user user to config the domain (or header_admin_user)
+	 * @param string $config_passwd pw of above user
 	 */
 	function __construct($domain,$config_user=null,$config_passwd=null)
 	{

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);
 		}

Braces +9 added lines, -2 removed lines

@@ -47,7 +47,11 @@ 
 	 */
 	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);
@@ -57,7 +61,10 @@ 
 		global $setup_info;
 		foreach($setup_info as $appname => $info)
 		{
-			if ($info['currentver']) self::$egw_setup->register_hooks($appname);
+			if ($info['currentver'])
+			{
+				self::$egw_setup->register_hooks($appname);
+			}
 		}
 		$this->restore_db();
 

setup/inc/class.setup_cmd_ldap.inc.php

Doc Comments -3 removed lines

@@ -936,9 +936,6 @@
 	 *
 	 * Uses $this->ldap_host, $this->ldap_admin and $this->ldap_admin_pw to connect.
 	 *
-	 * @param string $this->object_class ='qmailUser'
-	 * @param string $this->mbox_attr ='mailmessagestore' lowercase!!!
-	 * @param string $this->mail_login_type ='email' 'email', 'vmailmgr', 'standard' or 'uidNumber'
 	 * @return string with success message N entries modified
 	 * @throws Api\Exception if dn not found, not listable or delete fails
 	 */

Braces +124 added lines, -30 removed lines

@@ -203,7 +203,10 @@ 
 		$change_account_id = '';
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry = Api\Ldap::result2array($entry);
 			$accounts[$entry['dn']] = $entry;
@@ -230,7 +233,10 @@ 
 		//print_r($change); die('Stop');
 
 		// change account-ids inside EGroupware
-		if ($check_only) $msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		if ($check_only)
+		{
+			$msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		}
 		//$cmd = new admin_cmd_change_account_id($change);
 		//$msg[] = $cmd->run($time=null, $set_modifier=false, $skip_checks=false, $check_only);
 
@@ -252,7 +258,10 @@ 
 				throw new Api\Exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
 					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
 			}
-			if ($modify) ++$changed;
+			if ($modify)
+			{
+				++$changed;
+			}
 		}
 		$msg[] = "You need to run now on your samba share(s):\nsetup/doc/chown.php -R $change_account_id <share>";
 
@@ -279,7 +288,10 @@ 
 			else
 			{
 				list($to, $from) = explode('=', $attr);
-				if ($from) $attrs[] = $from;
+				if ($from)
+				{
+					$attrs[] = $from;
+				}
 				$rename[strtolower($from)] = $to;
 			}
 		}
@@ -294,7 +306,10 @@ 
 		{
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
-		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
+		if (empty($this->ads_admin_user))
+		{
+			$this->ads_admin_user = 'Administrator';
+		}
 		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
 			'CN='.$this->ads_admin_user.','.$this->ads_context;
 		switch($this->ads_connection)
@@ -338,7 +353,10 @@ 
 		$utc_diff = null;
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry_arr = Api\Ldap::result2array($entry);
 			$uid = $entry_arr['uid'];
@@ -352,7 +370,10 @@ 
 				continue;
 			}
 			$dn = $dest[0]['dn'];
-			if (isset($rename[''])) $entry[''] = '';
+			if (isset($rename['']))
+			{
+				$entry[''] = '';
+			}
 			// special handling for copying shadowExpires to accountExpires
 			if (strtolower($rename['shadowexpire']) === 'accountexpires')
 			{
@@ -363,7 +384,10 @@ 
 				}
 				else
 				{
-					if (is_null($utc_diff)) $utc_diff = date('Z');
+					if (is_null($utc_diff))
+					{
+						$utc_diff = date('Z');
+					}
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
 						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
 				}
@@ -375,20 +399,29 @@ 
 				{
 					$to = isset($rename[$attr]) ? $rename[$attr] : $attr;
 					$prefix = null;
-					if ($to[0] == '{')	// eg. {smtp:}proxyAddresses=forwardTo
+					if ($to[0] == '{')
+					{
+						// eg. {smtp:}proxyAddresses=forwardTo
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
+					}
 					foreach((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
-							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
+							if (!is_array($update[$to]))
+							{
+								$update[$to] = array($update[$to]);
+							}
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
 							foreach($update[$to] as $v)
 							{
-								if (!strcasecmp($v, $prefix.$val)) continue 2;
+								if (!strcasecmp($v, $prefix.$val))
+								{
+									continue 2;
+								}
 							}
 							$update[$to][] = $prefix.$val;
 						}
@@ -415,7 +448,10 @@ 
 				$changed++;
 			}
 		}
-		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
+		if ($check_only)
+		{
+			return lang("%1 accounts to copy found.", count($entries));
+		}
 
 		return "Copied data of $changed accounts from LDAP to AD ".
 			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
@@ -431,7 +467,10 @@ 
 	private function migrate($mode)
 	{
 		// support old boolean mode
-		if (is_bool($mode)) $mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		if (is_bool($mode))
+		{
+			$mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		}
 
 		$passwords2sql = $mode === "passwords_to_sql";
 		list(,$to) = explode('_to_', $mode);
@@ -597,7 +636,10 @@ 
 					{
 						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
 						{
-							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 if (!empty($this->$name))
+							 {
+							 	$GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 }
 						}
 						//error_log(__METHOD__."() setup up egw_info[server]: ldap_host='{$GLOBALS['egw_info']['server']['ldap_host']}', ldap_root_dn='{$GLOBALS['egw_info']['server']['ldap_root_dn']}', ldap_root_pw='{$GLOBALS['egw_info']['server']['ldap_root_pw']}', ldap_context='{$GLOBALS['egw_info']['server']['ldap_context']}', mail_suffix='{$GLOBALS['egw_info']['server']['mail_suffix']}', mail_logig_type='{$GLOBALS['egw_info']['server']['mail_login-type']}'");
 					}
@@ -684,7 +726,10 @@ 
 	 */
 	public static function hash_sql2ldap($hash)
 	{
-		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
+		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type']))
+		{
+			$type = 'md5';
+		}
 
 		$matches = null;
 		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
@@ -718,10 +763,13 @@ 
 	 */
 	public static function hash_ldap2sql($hash)
 	{
-		if ($hash[0] != '{')	// plain has to be explicitly specified for sql, in ldap it's the default
+		if ($hash[0] != '{')
+		{
+			// plain has to be explicitly specified for sql, in ldap it's the default
 		{
 			$hash = '{PLAIN}'.$hash;
 		}
+		}
 		return $hash;
 	}
 
@@ -741,9 +789,12 @@ 
 
 		foreach($accounts as $account_id => &$account)
 		{
-			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
+			if ($account_id != $account['account_id'])
+			{
+				// not all backends have as key the account_id
 			{
 				unset($account);
+			}
 				$account_id = $account['account_id'];
 			}
 			$account += $accounts_obj->read($account_id);
@@ -776,7 +827,11 @@ 
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql')
+		{
+			$this->connect();
+		}
+		// throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -803,14 +858,26 @@ 
 	 */
 	private function connect($dn=null,$pw=null,$host=null)
 	{
-		if (is_null($dn)) $dn = $this->ldap_root_dn;
-		if (is_null($pw)) $pw = $this->ldap_root_pw;
-		if (is_null($host)) $host = $this->ldap_host;
+		if (is_null($dn))
+		{
+			$dn = $this->ldap_root_dn;
+		}
+		if (is_null($pw))
+		{
+			$pw = $this->ldap_root_pw;
+		}
+		if (is_null($host))
+		{
+			$host = $this->ldap_host;
+		}
 
-		if (!$pw)	// Api\Ldap::ldapConnect use the current eGW's pw otherwise
+		if (!$pw)
+		{
+			// Api\Ldap::ldapConnect use the current eGW's pw otherwise
 		{
 			throw new Api\Exception\WrongUserinput(lang('You need to specify a password!'));
 		}
+		}
 
 		try {
 			$this->test_ldap = Api\Ldap::factory(false, $host, $dn, $pw);
@@ -841,8 +908,14 @@ 
 		$num = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time())
+			{
+				continue;
+			}
 			++$num;
 		}
 		return $num;
@@ -921,7 +994,10 @@ 
 		$deleted = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 			$deleted += $this->rdelete($entry['dn']);
 		}
 		if (!ldap_delete($this->test_ldap->ds,$dn))
@@ -969,7 +1045,10 @@ 
 		$modified = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 
 			$mbox = Api\Mail\Smtp\Ldap::mailbox_addr(array(
 				'account_id' => $entry['uidnumber'][0],
@@ -977,7 +1056,11 @@ 
 				'account_email' => $entry['mail'][0],
 			),$this->domain,$mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0])
+			{
+				continue;
+			}
+			// nothing to change
 
 			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
 				$mbox_attr => $mbox,
@@ -986,7 +1069,10 @@ 
 				throw new Api\Exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
 			}
 			++$modified;
-			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			if ($check_only)
+			{
+				echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			}
 		}
 		return $check_only ? lang('%1 entries would have been modified.',$modified) :
 			lang('%1 entries modified.',$modified);
@@ -1034,8 +1120,16 @@ 
 			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!',$dn).' '.
 				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc')
+		{
+			$extra['o'] = $value;
+		}
+		// required by organisation
+		if ($name == 'uid')
+		{
+			$extra['cn'] = $value;
+		}
+		// required by organizationalRole
 
 		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
 			$name => $value,

Spacing +139 added lines, -142 removed lines

@@ -84,9 +84,9 @@ 
 	 * @param string $ldap_encryption_type ='des'
 	 * @param boolean $truncate_egw_accounts =false truncate accounts table before migration to SQL
 	 */
-	function __construct($domain,$ldap_host=null,$ldap_suffix=null,$ldap_admin=null,$ldap_admin_pw=null,
-		$ldap_base=null,$ldap_root_dn=null,$ldap_root_pw=null,$ldap_context=null,$ldap_search_filter=null,
-		$ldap_group_context=null,$sub_command='create_ldap',$ldap_encryption_type='des',$truncate_egw_accounts=false)
+	function __construct($domain, $ldap_host = null, $ldap_suffix = null, $ldap_admin = null, $ldap_admin_pw = null,
+		$ldap_base = null, $ldap_root_dn = null, $ldap_root_pw = null, $ldap_context = null, $ldap_search_filter = null,
+		$ldap_group_context = null, $sub_command = 'create_ldap', $ldap_encryption_type = 'des', $truncate_egw_accounts = false)
 	{
 		if (!is_array($domain))
 		{
@@ -119,23 +119,23 @@ 
 	 * @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 (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i',$this->domain))
+		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i', $this->domain))
 		{
-			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!",$this->domain));
+			throw new Api\Exception\WrongUserinput(lang("'%1' is no valid domain name!", $this->domain));
 		}
 		if ($this->remote_id && $check_only && !in_array($this->sub_command, array('set_mailbox', 'sid2uidnumber', 'copy2ad')))
 		{
-			return true;	// further checks can only done locally
+			return true; // further checks can only done locally
 		}
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
 
-		switch($this->sub_command)
+		switch ($this->sub_command)
 		{
 			case 'test_ldap_root':
-				$msg = $this->connect($this->ldap_admin,$this->ldap_admin_pw);
+				$msg = $this->connect($this->ldap_admin, $this->ldap_admin_pw);
 				break;
 			case 'test_ldap':
 				$msg = $this->connect();
@@ -180,28 +180,28 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function sid2uidnumber($check_only=false)
+	private function sid2uidnumber($check_only = false)
 	{
 		$msg = array();
 		$this->connect();
 
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search='(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
-			array('uidNumber','gidNumber','uid','cn', 'objectClass',self::sambaSID))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = '(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
+			array('uidNumber', 'gidNumber', 'uid', 'cn', 'objectClass', self::sambaSID))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$change = $accounts = array();
 		$cmd_change_account_id = 'admin/admin-cli.php --change-account-id <admin>@<domain>,<adminpw>';
 		$change_account_id = '';
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -236,7 +236,7 @@ 
 
 		// now change them in LDAP
 		$changed = 0;
-		foreach($accounts as $dn => $account)
+		foreach ($accounts as $dn => $account)
 		{
 			$modify = array();
 			if (!empty($account['uidnumber']) && isset($change[$account['uidnumber']]))
@@ -250,7 +250,7 @@ 
 			if (!$check_only && $modify && !ldap_modify($this->test_ldap->ds, $dn, $modify))
 			{
 				throw new Api\Exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
-					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
+					"\n- ".implode("\n- ", $msg)); // EGroupware change already run successful
 			}
 			if ($modify) ++$changed;
 		}
@@ -265,13 +265,13 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function copy2ad($check_only=false)
+	private function copy2ad($check_only = false)
 	{
 		$msg = array();
 		$attrs = $rename = array();
-		foreach(explode(',', $this->attributes) as $attr)
+		foreach (explode(',', $this->attributes) as $attr)
 		{
-			if ($attr[0] == '@' ||	// copy whole objectclass without renaming, eg. @inetOrgPerson
+			if ($attr[0] == '@' || // copy whole objectclass without renaming, eg. @inetOrgPerson
 				strpos($attr, '=') === false)
 			{
 				$attrs[] = $attr;
@@ -286,7 +286,7 @@ 
 		$ignore_attr = array_flip(array('dn', 'objectclass', 'cn', 'userpassword'));
 		if (!in_array('uid', $attrs))
 		{
-			$attrs[] = 'uid';	// need to match account
+			$attrs[] = 'uid'; // need to match account
 			$ignore_attr['uid'] = true;
 		}
 		// connect to destination ads
@@ -295,9 +295,8 @@ 
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
 		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
-		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
-			'CN='.$this->ads_admin_user.','.$this->ads_context;
-		switch($this->ads_connection)
+		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user : 'CN='.$this->ads_admin_user.','.$this->ads_context;
+		switch ($this->ads_connection)
 		{
 			case 'ssl':
 				$url = 'ldaps://'.$this->ads_host.'/';
@@ -315,28 +314,27 @@ 
 		// check if ads base does exist
 		if (!@ldap_read($ads->ds, $this->ads_context, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Ads dn "%1" NOT found!',$this->ads_context));
+			throw new Api\Exception\WrongUserinput(lang('Ads dn "%1" NOT found!', $this->ads_context));
 		}
 
 		// connect to source ldap
 		$this->connect();
 
 		// check if ldap base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search = $this->no_sid_check ? '(objectClass=posixAccount)' :
-				'(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = $this->no_sid_check ? '(objectClass=posixAccount)' : '(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new Api\Exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$changed = 0;
 		$utc_diff = null;
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -345,7 +343,7 @@ 
 			$entry = array_diff_key($entry_arr, $ignore_attr);
 
 			if (!($sr = ldap_search($ads->ds, $this->ads_context,
-				$search='(&(objectClass=user)(sAMAccountName='.Api\Ldap::quote($uid).'))', array('dn'))) ||
+				$search = '(&(objectClass=user)(sAMAccountName='.Api\Ldap::quote($uid).'))', array('dn'))) ||
 				!($dest = ldap_get_entries($ads->ds, $sr)))
 			{
 				$msg[] = lang('User "%1" not found!', $uid);
@@ -365,11 +363,11 @@ 
 				{
 					if (is_null($utc_diff)) $utc_diff = date('Z');
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
-						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
+						$entry['shadowexpire'] * 24 * 3600 + $utc_diff); // ldap time to unixTime
 				}
 			}
 			$update = array();
-			foreach($entry as $attr => $value)
+			foreach ($entry as $attr => $value)
 			{
 				if ($value || $attr === '')
 				{
@@ -379,14 +377,14 @@ 
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
-					foreach((array)$value as $val)
+					foreach ((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
 							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
-							foreach($update[$to] as $v)
+							foreach ($update[$to] as $v)
 							{
 								if (!strcasecmp($v, $prefix.$val)) continue 2;
 							}
@@ -418,7 +416,7 @@ 
 		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
 
 		return "Copied data of $changed accounts from LDAP to AD ".
-			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
+			(count($msg) > $changed ? ' ('.(count($msg) - $changed).' errors!)' : '');
 	}
 
 	/**
@@ -461,9 +459,9 @@ 
 		$accounts_created = $groups_created = $errors = $egw_info_set = 0;
 		$emailadmin_src = $ldap_class = null;
 		$target = strtoupper($to);
-		foreach($accounts as $account_id => $account)
+		foreach ($accounts as $account_id => $account)
 		{
-			if (isset($this->only) && !in_array($account_id,$this->only))
+			if (isset($this->only) && !in_array($account_id, $this->only))
 			{
 				continue;
 			}
@@ -483,12 +481,12 @@ 
 			{
 				if (!($sql_account = $accounts_obj->read($account_id)))
 				{
-					$msg[] = lang('%1 does NOT exist in %2.',$what,$target);
+					$msg[] = lang('%1 does NOT exist in %2.', $what, $target);
 					$errors++;
 				}
-				elseif(empty($account['account_pwd']))
+				elseif (empty($account['account_pwd']))
 				{
-					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!',$what);
+					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!', $what);
 					$errors++;
 				}
 				else
@@ -497,12 +495,12 @@ 
 
 					if (!$accounts_obj->save($sql_account))
 					{
-						$msg[] = lang('Update of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Update of %1 in %2 failed !!!', $what, $target);
 						$errors++;
 					}
 					else
 					{
-						$msg[] = lang('%1 password set in %2.',$what,$target);
+						$msg[] = lang('%1 password set in %2.', $what, $target);
 						$accounts_created++;
 					}
 				}
@@ -513,7 +511,7 @@ 
 			{
 				if ($accounts_obj->exists($account_id))
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 					continue;
 				}
@@ -521,7 +519,7 @@ 
 				{
 					if ($GLOBALS['egw_info']['server']['ldap_extra_attributes'])
 					{
-						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'] . '/' . $account['account_lid'];
+						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'].'/'.$account['account_lid'];
 						$account['loginshell'] = $GLOBALS['egw_info']['server']['ldap_account_shell'];
 					}
 					$account['account_passwd'] = self::hash_sql2ldap($account['account_pwd']);
@@ -534,12 +532,12 @@ 
 
 				if (!$accounts_obj->save($account))
 				{
-					$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+					$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 					$errors++;
 					continue;
 				}
-				$accounts_obj->set_memberships($account['memberships'],$account_id);
-				$msg[] = lang('%1 created in %2.',$what,$target);
+				$accounts_obj->set_memberships($account['memberships'], $account_id);
+				$msg[] = lang('%1 created in %2.', $what, $target);
 				$accounts_created++;
 
 				// check if we need to migrate mail-account
@@ -548,7 +546,7 @@ 
 					$ldap_class = false;
 					$ldap = new ldap();
 					$ldap->ldapConnect();
-					foreach(array(	// todo: have these enumerated by emailadmin ...
+					foreach (array(	// todo: have these enumerated by emailadmin ...
 						'qmailUser' => 'EGroupware\\Api\\Mail\\Smtp\\Oldqmailuser',
 						'dbMailUser' => 'EGroupware\\Api\\Mail\\Smtp\\Dbmailuser',
 						// nothing to migrate for inetOrgPerson ...
@@ -595,7 +593,7 @@ 
 					// setting up egw_info array with new ldap information, so hook can use Api\Ldap::ldapConnect()
 					if (!$egw_info_set++)
 					{
-						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
+						foreach (array('ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', 'ldap_encryptin_type', 'mail_suffix', 'mail_login_type') as $name)
 						{
 							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
 						}
@@ -609,12 +607,12 @@ 
 						{
 							Api\Hooks::process($account, array(), true);
 						}
-						elseif(is_callable($this->add_account_hook))
+						elseif (is_callable($this->add_account_hook))
 						{
-							call_user_func($this->add_account_hook,$account);
+							call_user_func($this->add_account_hook, $account);
 						}
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						$msg[] = $e->getMessage();
 						$errors++;
@@ -628,38 +626,38 @@ 
 				{
 					if (!$accounts_obj->save($account))
 					{
-						$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 						++$errors;
 						continue;
 					}
-					$msg[] = lang('%1 created in %2.',$what,$target);
+					$msg[] = lang('%1 created in %2.', $what, $target);
 					$groups_created++;
 				}
 				else
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 
 					if ($accounts_obj->id2name($account_id) != $account['account_lid'])
 					{
-						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!",$account['account_lid'],$account_id);
+						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!", $account['account_lid'], $account_id);
 						++$errors;
-						continue;	// different group under that gidnumber!
+						continue; // different group under that gidnumber!
 					}
 				}
 				// now saving / updating the memberships
-				$accounts_obj->set_members($account['members'],$account_id);
+				$accounts_obj->set_members($account['members'], $account_id);
 			}
 		}
 		if ($passwords2sql)
 		{
-			return lang('%1 passwords updated, %3 errors',$accounts_created,$groups_created,$errors).
-				($errors || $this->verbose ? "\n- ".implode("\n- ",$msg) : '');
+			return lang('%1 passwords updated, %3 errors', $accounts_created, $groups_created, $errors).
+				($errors || $this->verbose ? "\n- ".implode("\n- ", $msg) : '');
 		}
 		// migrate addressbook data
-		$GLOBALS['egw_info']['user']['apps']['admin'] = true;	// otherwise migration will not run in setup!
+		$GLOBALS['egw_info']['user']['apps']['admin'] = true; // otherwise migration will not run in setup!
 		$addressbook = new Api\Contacts\Storage();
-		foreach($this->as_array() as $name => $value)
+		foreach ($this->as_array() as $name => $value)
 		{
 			if (substr($name, 5) == 'ldap_')
 			{
@@ -672,8 +670,8 @@ 
 
 		$this->restore_db();
 
-		return lang('%1 users and %2 groups created, %3 errors',$accounts_created,$groups_created,$errors).
-			($errors || $this->verbose ? "\n- ".implode("\n- ",$msgs) : '');
+		return lang('%1 users and %2 groups created, %3 errors', $accounts_created, $groups_created, $errors).
+			($errors || $this->verbose ? "\n- ".implode("\n- ", $msgs) : '');
 	}
 
 	/**
@@ -687,22 +685,22 @@ 
 		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
 
 		$matches = null;
-		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
+		if (preg_match('/^\\{(.*)\\}(.*)$/', $hash, $matches))
 		{
-			list(,$type,$hash) = $matches;
+			list(,$type, $hash) = $matches;
 		}
-		elseif (preg_match('/^[0-9a-f]{32}$/',$hash))
+		elseif (preg_match('/^[0-9a-f]{32}$/', $hash))
 		{
 			$type = 'md5';
 		}
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			case 'plain':
 				// ldap stores plaintext passwords without {plain} prefix
 				break;
 
 			case 'md5':
-				$hash = base64_encode(pack("H*",$hash));
+				$hash = base64_encode(pack("H*", $hash));
 				// fall through
 			default:
 				$hash = '{'.strtoupper($type).'}'.$hash;
@@ -732,14 +730,14 @@ 
 	 * @param string $type ='both'
 	 * @return array
 	 */
-	public function accounts($from='ldap', $type='both')
+	public function accounts($from = 'ldap', $type = 'both')
 	{
 		$accounts_obj = $this->accounts_obj($from);
 		//error_log(__METHOD__."(from_ldap=".array2string($from_ldap).') get_class(accounts_obj->backend)='.get_class($accounts_obj->backend));
 
 		$accounts = $accounts_obj->search(array('type' => $type, 'objectclass' => true, 'active' => false));
 
-		foreach($accounts as $account_id => &$account)
+		foreach ($accounts as $account_id => &$account)
 		{
 			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
 			{
@@ -750,11 +748,11 @@ 
 
 			if ($account['account_type'] == 'g')
 			{
-				$account['members'] = $accounts_obj->members($account_id,true);
+				$account['members'] = $accounts_obj->members($account_id, true);
 			}
 			else
 			{
-				$account['memberships'] = $accounts_obj->memberships($account_id,true);
+				$account['memberships'] = $accounts_obj->memberships($account_id, true);
 			}
 		}
 		Api\Accounts::cache_invalidate();
@@ -770,13 +768,13 @@ 
 	 */
 	private function accounts_obj($type)
 	{
-		static $enviroment_setup=null;
+		static $enviroment_setup = null;
 		if (!$enviroment_setup)
 		{
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql') $this->connect(); // throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -801,7 +799,7 @@ 
 	 * @param string $host =null default $this->ldap_host, hostname, ip or ldap-url
 	 * @throws Api\Exception\WrongUserinput Can not connect to ldap ...
 	 */
-	private function connect($dn=null,$pw=null,$host=null)
+	private function connect($dn = null, $pw = null, $host = null)
 	{
 		if (is_null($dn)) $dn = $this->ldap_root_dn;
 		if (is_null($pw)) $pw = $this->ldap_root_pw;
@@ -818,9 +816,9 @@ 
 		catch (Api\Exception\NoPermission $e) {
 			_egw_log_exception($e);
 			throw new Api\Exception\WrongUserinput(lang('Can not connect to LDAP server on host %1 using DN %2!',
-				$host,$dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
+				$host, $dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
 		}
-		return lang('Successful connected to LDAP server on %1 using DN %2.',$this->ldap_host,$dn);
+		return lang('Successful connected to LDAP server on %1 using DN %2.', $this->ldap_host, $dn);
 	}
 
 	/**
@@ -833,16 +831,16 @@ 
 	{
 		$this->connect();
 
-		$sr = ldap_list($this->test_ldap->ds,$this->ldap_context,'ObjectClass=posixAccount',array('dn','shadowExpire'));
+		$sr = ldap_list($this->test_ldap->ds, $this->ldap_context, 'ObjectClass=posixAccount', array('dn', 'shadowExpire'));
 		if (!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception('Error listing "dn=%1"!',$this->ldap_context);
+			throw new Api\Exception('Error listing "dn=%1"!', $this->ldap_context);
 		}
 		$num = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0] * 24 * 3600 < time()) continue;
 			++$num;
 		}
 		return $num;
@@ -856,23 +854,23 @@ 
 	 */
 	private function create()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
-		foreach(array(
+		foreach (array(
 			$this->ldap_base => array(),
 			$this->ldap_context => array(),
 			$this->ldap_group_context => array(),
-			$this->ldap_root_dn => array('userPassword' => Api\Auth::encrypt_ldap($this->ldap_root_pw,'ssha')),
+			$this->ldap_root_dn => array('userPassword' => Api\Auth::encrypt_ldap($this->ldap_root_pw, 'ssha')),
 		) as $dn => $extra)
 		{
-			if (!$this->_create_node($dn,$extra,$this->check_only) && $dn == $this->ldap_root_dn)
+			if (!$this->_create_node($dn, $extra, $this->check_only) && $dn == $this->ldap_root_dn)
 			{
 				// ldap_root already existed, lets check the pw is correct
 				$this->connect();
 			}
 		}
 		return lang('Successful connected to LDAP server on %1 and created/checked required structur %2.',
-			$this->ldap_host,$this->ldap_base);
+			$this->ldap_host, $this->ldap_base);
 	}
 
 	/**
@@ -883,25 +881,25 @@ 
 	 */
 	private function delete_base()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// some precausion to not delete whole ldap tree!
-		if (count(explode(',',$this->ldap_base)) < 2)
+		if (count(explode(',', $this->ldap_base)) < 2)
 		{
-			throw new Api\Exception\AssertionFailed(lang('Refusing to delete dn "%1"!',$this->ldap_base));
+			throw new Api\Exception\AssertionFailed(lang('Refusing to delete dn "%1"!', $this->ldap_base));
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		return lang('LDAP dn="%1" with %2 entries deleted.',
-			$this->ldap_base,$this->rdelete($this->ldap_base));
+			$this->ldap_base, $this->rdelete($this->ldap_base));
 	}
 
 	/**
@@ -913,20 +911,20 @@ 
 	 */
 	private function rdelete($dn)
 	{
-		if (!($sr = ldap_list($this->test_ldap->ds,$dn,'ObjectClass=*',array(''))) ||
+		if (!($sr = ldap_list($this->test_ldap->ds, $dn, 'ObjectClass=*', array(''))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error listing "dn=%1"!',$dn));
+			throw new Api\Exception(lang('Error listing "dn=%1"!', $dn));
 		}
 		$deleted = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 			$deleted += $this->rdelete($entry['dn']);
 		}
-		if (!ldap_delete($this->test_ldap->ds,$dn))
+		if (!ldap_delete($this->test_ldap->ds, $dn))
 		{
-			throw new Api\Exception(lang('Error deleting "dn=%1"!',$dn));
+			throw new Api\Exception(lang('Error deleting "dn=%1"!', $dn));
 		}
 		return ++$deleted;
 	}
@@ -942,32 +940,32 @@ 
 	 * @return string with success message N entries modified
 	 * @throws Api\Exception if dn not found, not listable or delete fails
 	 */
-	private function set_mailbox($check_only=false)
+	private function set_mailbox($check_only = false)
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new Api\Exception\WrongUserinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		$object_class = $this->object_class ? $this->object_class : 'qmailUser';
 		$mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore';
 		$mail_login_type = $this->mail_login_type ? $this->mail_login_type : 'email';
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-				'objectClass='.$object_class,array('mail','uidNumber','uid',$mbox_attr))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+				'objectClass='.$object_class, array('mail', 'uidNumber', 'uid', $mbox_attr))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new Api\Exception(lang('Error listing "dn=%1"!',$this->ldap_base));
+			throw new Api\Exception(lang('Error listing "dn=%1"!', $this->ldap_base));
 		}
 		$modified = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 
@@ -975,21 +973,20 @@ 
 				'account_id' => $entry['uidnumber'][0],
 				'account_lid' => $entry['uid'][0],
 				'account_email' => $entry['mail'][0],
-			),$this->domain,$mail_login_type);
+			), $this->domain, $mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0]) continue; // nothing to change
 
-			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
+			if (!$check_only && !ldap_modify($this->test_ldap->ds, $entry['dn'], array(
 				$mbox_attr => $mbox,
 			)))
 			{
-				throw new Api\Exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
+				throw new Api\Exception(lang("Error modifying dn=%1: %2='%3'!", $entry['dn'], $mbox_attr, $mbox));
 			}
 			++$modified;
 			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
 		}
-		return $check_only ? lang('%1 entries would have been modified.',$modified) :
-			lang('%1 entries modified.',$modified);
+		return $check_only ? lang('%1 entries would have been modified.', $modified) : lang('%1 entries modified.', $modified);
 	}
 
 	/**
@@ -1000,9 +997,9 @@ 
 	static $requiredObjectclasses = array(
 		'o' => 'organization',
 		'ou' => 'organizationalUnit',
-		'cn' => array('organizationalRole','simpleSecurityObject'),
-		'uid' => array('uidObject','organizationalRole','simpleSecurityObject'),
-		'dc' => array('organization','dcObject'),
+		'cn' => array('organizationalRole', 'simpleSecurityObject'),
+		'uid' => array('uidObject', 'organizationalRole', 'simpleSecurityObject'),
+		'dc' => array('organization', 'dcObject'),
 	);
 
 	/**
@@ -1013,37 +1010,37 @@ 
 	 * @return boolean true if the node was create, false if it was already there
 	 * @throws Api\Exception\WrongUserinput
 	 */
-	private function _create_node($dn,$extra=array())
+	private function _create_node($dn, $extra = array())
 	{
 		// check if the node already exists and return if it does
-		if (@ldap_read($this->test_ldap->ds,$dn,'objectClass=*'))
+		if (@ldap_read($this->test_ldap->ds, $dn, 'objectClass=*'))
 		{
 			return false;
 		}
-		list($node,$base) = explode(',',$dn,2);
+		list($node, $base) = explode(',', $dn, 2);
 
-		if (!@ldap_read($this->test_ldap->ds,$base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $base, 'objectClass=*'))
 		{
-			$this->_create_node($base);		// create the base if it's not already there
+			$this->_create_node($base); // create the base if it's not already there
 		}
 		// now we need to create the node itself
-		list($name,$value) = explode('=',$node);
+		list($name, $value) = explode('=', $node);
 
 		if (!isset(self::$requiredObjectclasses[$name]))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!',$dn).' '.
-				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
+			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!', $dn).' '.
+				lang('Supported node types:').implode(', ', array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc') $extra['o'] = $value; // required by organisation
+		if ($name == 'uid') $extra['cn'] = $value; // required by organizationalRole
 
-		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
+		if (!@ldap_add($this->test_ldap->ds, $dn, $attr = array(
 			$name => $value,
 			'objectClass' => self::$requiredObjectclasses[$name],
-		)+$extra))
+		) + $extra))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!',$dn).
-				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr,true).')');
+			throw new Api\Exception\WrongUserinput(lang('Can not create DN %1!', $dn).
+				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr, true).')');
 		}
 		return true;
 	}
@@ -1074,30 +1071,30 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
-			if ($this->sub_command == 'delete_ldap' && in_array($name,array('ldap_base','ldap_context')))
+			if ($this->sub_command == 'delete_ldap' && in_array($name, array('ldap_base', 'ldap_context')))
 			{
-				continue;	// no default on what to delete!
+				continue; // no default on what to delete!
 			}
 			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',
 					'$suffix',
 					'$base',
 					'$admin_pw',
-				),array(
+				), array(
 					$this->domain,
 					$this->ldap_suffix,
 					$this->ldap_base,
 					$this->ldap_admin_pw,
-				),$this->$name);
+				), $this->$name);
 			}
 		}
 	}

setup/inc/class.setup_cmd_showheader.inc.php

Doc Comments -3 removed lines

@@ -28,9 +28,6 @@
 	/**
 	 * Constructor
 	 *
-	 * @param boolean $data=true true: send only the remote_hash, domain and webserver_url,
-	 *                           false: the complete header vars, plus install_id and webserver_url from the config table,
-	 *                           null:  only the header vars
 	 */
 	function __construct($data=true,$header_admin_user=null,$header_admin_password=null)
 	{

Spacing +15 added lines, -15 removed lines

@@ -32,7 +32,7 @@ 
 	 *                           false: the complete header vars, plus install_id and webserver_url from the config table,
 	 *                           null:  only the header vars
 	 */
-	function __construct($data=true,$header_admin_user=null,$header_admin_password=null)
+	function __construct($data = true, $header_admin_user = null, $header_admin_password = null)
 	{
 		if (!is_array($data))
 		{
@@ -54,16 +54,16 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	function exec($check_only=false)
+	function exec($check_only = false)
 	{
-		if ($this->remote_id && $check_only) return true;	// cant check for the remote site locally!
+		if ($this->remote_id && $check_only) return true; // cant check for the remote site locally!
 
 		$this->_check_header_access();
 
 		if ($check_only) return true;
 
 		$egw_info_backup = $GLOBALS['egw_info'];
-		$GLOBALS['egw_info'] = array (
+		$GLOBALS['egw_info'] = array(
 			'flags' => array(
 				'noapi' => true,
 			),
@@ -72,7 +72,7 @@ 
 		{
 			throw new Exception('header.inc.php not found!');
 		}
-		eval(str_replace(array('<?php','perfgetmicrotime'),array('','perfgetmicrotime2'),$header));
+		eval(str_replace(array('<?php', 'perfgetmicrotime'), array('', 'perfgetmicrotime2'), $header));
 
 		// unset the flags, they are not part of  the header
 		unset($GLOBALS['egw_info']['flags']);
@@ -81,7 +81,7 @@ 
 		$GLOBALS['egw_info']['server']['versions']['phpgwapi'] = $egw_info_backup['server']['versions']['phpgwapi'];
 
 		// fetching the install id's stored in the database
-		foreach($GLOBALS['egw_domain'] as &$data)
+		foreach ($GLOBALS['egw_domain'] as &$data)
 		{
 			if (!is_null($this->hash_only))
 			{
@@ -89,9 +89,9 @@ 
 			}
 			try {
 				// it's saver to only send the remote_hash and not install_id and config_pw
-				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'],$data['config_passwd']);
+				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'], $data['config_passwd']);
 			}
-			catch(Exception $e) {
+			catch (Exception $e) {
 				if ($data['install_id']) $data['error'] .= $e->getMessage();
 			}
 			if ($this->hash_only)
@@ -100,7 +100,7 @@ 
 					'remote_hash'   => $data['remote_hash'],
 					'webserver_url' => $data['webserver_url'],
 					'install_id'     => $data['install_id'],
-				)+($data['error'] ? array(
+				) + ($data['error'] ? array(
 					'error' => $data['error'],
 				) : array());
 			}
@@ -133,17 +133,17 @@ 
 	{
 		$db = new Api\Db();
 
-		ob_start();		// not available db connection echos a lot grab ;-)
+		ob_start(); // not available db connection echos a lot grab ;-)
 		$err_rep = error_reporting(0);
 
 		$config = array();
 		try {
-			$db->connect($data['db_name'],$data['db_host'],$data['db_port'],$data['db_user'],$data['db_pass'],$data['db_type']);
+			$db->connect($data['db_name'], $data['db_host'], $data['db_port'], $data['db_user'], $data['db_pass'], $data['db_type']);
 			$db->set_app('phpgwapi');
-			$db->select('egw_config','config_name,config_value',array(
-				'config_name'=>array('install_id','webserver_url','account_repository','allow_remote_admin','mail_suffix'),
+			$db->select('egw_config', 'config_name,config_value', array(
+				'config_name'=>array('install_id', 'webserver_url', 'account_repository', 'allow_remote_admin', 'mail_suffix'),
 				'config_app'=>'phpgwapi',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			while (($row = $db->row(true)))
 			{
 				$config[$row['config_name']] = $row['config_value'];
@@ -167,7 +167,7 @@ 
 	 * @param boolean $set_modifier =true set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
-	function save($set_modifier=true)
+	function save($set_modifier = true)
 	{
 		if ($this->remote_id)
 		{

Braces +13 added lines, -3 removed lines

@@ -56,11 +56,18 @@ 
 	 */
 	function exec($check_only=false)
 	{
-		if ($this->remote_id && $check_only) return true;	// cant check for the remote site locally!
+		if ($this->remote_id && $check_only)
+		{
+			return true;
+		}
+		// cant check for the remote site locally!
 
 		$this->_check_header_access();
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		$egw_info_backup = $GLOBALS['egw_info'];
 		$GLOBALS['egw_info'] = array (
@@ -92,7 +99,10 @@ 
 				$data['remote_hash'] = admin_cmd::remote_hash($data['install_id'],$data['config_passwd']);
 			}
 			catch(Exception $e) {
-				if ($data['install_id']) $data['error'] .= $e->getMessage();
+				if ($data['install_id'])
+				{
+					$data['error'] .= $e->getMessage();
+				}
 			}
 			if ($this->hash_only)
 			{

setup/inc/class.setup_detection.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	/**
 	 * Check if header exists and is up to date
 	 *
-	 * @return int 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
+	 * @return string 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
 	 */
 	function check_header()
 	{

Braces +20 added lines, -5 removed lines

@@ -65,7 +65,9 @@ 
 					foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__) as $row)
 					{
 						$app = $row['app_name'];
-						if (!isset($setup_info[$app]))	// app source no longer there
+						if (!isset($setup_info[$app]))
+						{
+							// app source no longer there
 						{
 							$setup_info[$app] = array(
 								'name' => $app,
@@ -73,6 +75,7 @@ 
 								'version' => 'deleted',
 							);
 						}
+						}
 						$setup_info[$app]['currentver'] = $row['app_version'];
 						$setup_info[$app]['enabled'] = $row['app_enabled'];
 					}
@@ -212,7 +215,9 @@ 
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if($setup_info[$key]['status'] != 'F')
+						{
+							//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
@@ -220,6 +225,7 @@ 
 							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
+						}
 							}
 							else
 							{
@@ -292,7 +298,10 @@ 
 	 */
 	function check_db($setup_info=null)
 	{
-		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
+		if (!$setup_info)
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		try {	// catch DB errors
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
@@ -482,11 +491,14 @@ 
 				{
 					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))
+				{
+					// names in tables might be lowercase
 				{
 					if($GLOBALS['DEBUG'])
 					{
 						echo '<br>check_app_tables(): ' . $val . ' missing!';
+				}
 					}
 					if(!$any)
 					{
@@ -543,9 +555,12 @@ 
 			$msg = lang('does not exist');
 			return false;
 		}
-		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])	// only do the check if we run by the webserver
+		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])
+		{
+			// only do the check if we run by the webserver
 		{
 			$msg = lang('is not writeable by the webserver');
+		}
 			return false;
 		}
 		if ($check_in_docroot)

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

@@ -464,7 +464,7 @@
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
-			$tables = Array();
+			$tables = array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
 				foreach($table_names as $key => $val)

Spacing +80 added lines, -80 removed lines

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

setup/inc/class.setup_process.inc.php

Doc Comments +1 added lines, -4 removed lines

@@ -53,10 +53,7 @@
 	 * the mother of all multipass upgrade parental loop functions
 	 *
 	 * @param array $setup_info array of application info from setup.inc.php files
-	 * @param string $type='new' defaults to new(install), could also be 'upgrade'
-	 * @param boolean $DEBUG=false print debugging info
-	 * @param boolean $force_en=false install english language files, not used anymore
-	 * @param string $system_charset=null charset to use
+	 * @param boolean $force_en install english language files, not used anymore
 	 * @param array $preset_config=array()
 	 */
 	function pass(array $setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())

Spacing +141 added lines, -141 removed lines

@@ -59,11 +59,11 @@ 
 	 * @param string $system_charset=null charset to use
 	 * @param array $preset_config=array()
 	 */
-	function pass(array $setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())
+	function pass(array $setup_info, $method = 'new', $DEBUG = False, $force_en = False, $preset_config = array())
 	{
-		unset($force_en);	// no longer used
+		unset($force_en); // no longer used
 
-		if(!$method)
+		if (!$method)
 		{
 			return False;
 		}
@@ -92,23 +92,23 @@ 
 				$pass['phpgwapi'] = $setup_info['phpgwapi'];
 			}
 		}
-		$pass['admin']    = $setup_info['admin'];
+		$pass['admin'] = $setup_info['admin'];
 		$pass['preferences'] = $setup_info['preferences'];
 		if (file_exists(EGW_SERVER_ROOT.'/etemplate'))
 		{
-			$pass['etemplate'] = $setup_info['etemplate'];	// helps to minimize passes, as many apps depend on it
+			$pass['etemplate'] = $setup_info['etemplate']; // helps to minimize passes, as many apps depend on it
 		}
 		$this->api_version_target = $setup_info['api']['version'];
 
 		$i = 1;
 		$passed = array();
 		$passing = array();
-		$pass_string = implode (':', $pass);
-		$passing_string = implode (':', $passing);
-		while($pass_string != $passing_string)
+		$pass_string = implode(':', $pass);
+		$passing_string = implode(':', $passing);
+		while ($pass_string != $passing_string)
 		{
 			$passing = array();
-			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			if ($DEBUG) { echo '<br>process->pass(): #'.$i.' for '.$method.' processing'."\n"; }
 
 			// Check current versions and dependencies
 			$setup_info = $GLOBALS['egw_setup']->detection->check_depends(
@@ -116,25 +116,25 @@ 
 					$GLOBALS['egw_setup']->detection->get_db_versions($setup_info), true));
 
 			// stuff the rest of the apps, but only those with available upgrades
-			foreach($setup_info as $key => $value)
+			foreach ($setup_info as $key => $value)
 			{
 				// check if app is either installed or supports the used database
 				if (!isset($value['currentver']) && isset($value['only_db']) && (
-					is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type,$value['only_db']) ||
+					is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type, $value['only_db']) ||
 					!is_array($value['only_db']) && $GLOBALS['egw_setup']->db->Type != $value['only_db']))
 				{
-					continue;	// app does not support this db-type, dont try installing it
+					continue; // app does not support this db-type, dont try installing it
 				}
-				if(/*$value['name'] != 'phpgwapi' &&*/ $value['status'] == 'U')
+				if (/*$value['name'] != 'phpgwapi' &&*/ $value['status'] == 'U')
 				{
-					if($passed[$value['name']]['status'] != 'F' && $passed[$value['name']]['status'] != 'C')
+					if ($passed[$value['name']]['status'] != 'F' && $passed[$value['name']]['status'] != 'C')
 					{
 						$pass[$value['name']] = $setup_info[$value['name']];
 					}
 				}
 			}
 
-			switch($method)
+			switch ($method)
 			{
 				case 'new':
 					if (empty($GLOBALS['egw_info']['server']['temp_dir']))
@@ -142,13 +142,13 @@ 
 						$GLOBALS['egw_info']['server']['temp_dir'] = sys_get_temp_dir();
 					}
 					/* Create tables and insert new records for each app in this list */
-					$passing_c = $this->current($pass,$DEBUG);
+					$passing_c = $this->current($pass, $DEBUG);
 					if (isset($pass['api'])) $this->save_minimal_config($preset_config);
-					$passing = $this->default_records($passing_c,$DEBUG);
+					$passing = $this->default_records($passing_c, $DEBUG);
 					break;
 				case 'upgrade':
 					/* Run upgrade scripts on each app in the list */
-					$passing = $this->upgrade($pass,$DEBUG);
+					$passing = $this->upgrade($pass, $DEBUG);
 					//_debug_array($pass);exit;
 					break;
 				default:
@@ -157,32 +157,32 @@ 
 			}
 
 			$pass = array();
-			foreach($passing as $key => $value)
+			foreach ($passing as $key => $value)
 			{
-				if($value['status'] == 'C')
+				if ($value['status'] == 'C')
 				{
 					$passed[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'].' install completed'."\n"; }
 				}
-				elseif($value['status'] == 'F')
+				elseif ($value['status'] == 'F')
 				{
 					$setup_info[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'].' install failed'."\n"; }
 				}
-				elseif($value['status'] == 'D')
+				elseif ($value['status'] == 'D')
 				{
 					$pass[$value['name']] = $setup_info[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'].' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
 					$tmp = $passing[$value['name']]['name'];
-					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$tmp.' skipped on this pass'."\n"; }
 				}
 			}
 
 			$i++;
-			if($i == 20) /* Then oops it broke */
+			if ($i == 20) /* Then oops it broke */
 			{
 				echo '<br>Setup failure: excess looping in process->pass():'."\n";
 				echo '<br>Pass:<br>'."\n";
@@ -191,19 +191,19 @@ 
 				_debug_array($passed);
 				exit;
 			}
-			$pass_string = implode (':', $pass);
-			$passing_string = implode (':', $passing);
+			$pass_string = implode(':', $pass);
+			$passing_string = implode(':', $passing);
 		}
 		try {
 			// flush instance cache: also registers hooks and flushes image cache
 			Api\Cache::flush(Api\Cache::INSTANCE);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, as during a new install, there's no cache configured and therefore no need to unset
 		}
 		/* now return the list */
-		return array_merge($setup_info,$passed);
+		return array_merge($setup_info, $passed);
 	}
 
 	/**
@@ -211,20 +211,20 @@ 
 	 *
 	 * @param array $preset_config =array()
 	 */
-	function save_minimal_config(array $preset_config=array())
+	function save_minimal_config(array $preset_config = array())
 	{
-		$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
+		$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 
 		$current_config['site_title'] = 'EGroupware';
-		$current_config['hostname']  = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
+		$current_config['hostname'] = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
 
 		// guessing the eGW url
 		if (isset($_SERVER['HTTP_HOST']))
 		{
-			$parts = explode('/',$_SERVER['PHP_SELF']);
-			array_pop($parts);	// remove config.php
-			array_pop($parts);	// remove setup
-			$current_config['webserver_url'] = implode('/',$parts);
+			$parts = explode('/', $_SERVER['PHP_SELF']);
+			array_pop($parts); // remove config.php
+			array_pop($parts); // remove setup
+			$current_config['webserver_url'] = implode('/', $parts);
 			$egroupwareDirName = end($parts);
 		}
 		else	// eg. cli install --> use defaults
@@ -232,9 +232,9 @@ 
 			$current_config['webserver_url'] = '/egroupware';
 			$egroupwareDirName = 'egroupware';
 		}
-		if(!$is_windows)
+		if (!$is_windows)
 		{
-			if(@is_dir('/tmp'))
+			if (@is_dir('/tmp'))
 			{
 				$current_config['temp_dir'] = '/tmp';
 			}
@@ -248,7 +248,7 @@ 
 		}
 		else
 		{
-			if(@is_dir('c:\\windows\\temp'))
+			if (@is_dir('c:\\windows\\temp'))
 			{
 				$current_config['temp_dir'] = 'c:\\windows\\temp';
 			}
@@ -269,15 +269,15 @@ 
 		$current_config['enabled_spellcheck'] = 'YesBrowserBased';
 
 		// always enable history logging for calendar, addressbook and infolog
-		$current_config['history'] = 'history';	// addressbook: only admin
-		$current_config['calendar_delete_history'] = 'history';	// only admins
+		$current_config['history'] = 'history'; // addressbook: only admin
+		$current_config['calendar_delete_history'] = 'history'; // only admins
 		// infolog does NOT use config_app='phpgwapi', but 'infolog'
-		$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
-			'config_value' => 'history_admin_delete',	// only admins
-		),array(
+		$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
+			'config_value' => 'history_admin_delete', // only admins
+		), array(
 			'config_app' => 'infolog',
 			'config_name' => 'history',
-		),__FILE__,__LINE__);
+		), __FILE__, __LINE__);
 
 
 		// RalfBecker: php.net recommend this for security reasons, it should be our default too
@@ -293,7 +293,7 @@ 
 			$tz = new DateTimeZone(date_default_timezone_get());
 			$current_config['server_timezone'] = $tz->getName();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			unset($e);
 			// do nothing if new DateTimeZone fails (eg. 'System/Localtime' returned), specially do NOT store it!
@@ -301,42 +301,42 @@ 
 		}
 		$current_config['install_id'] = md5($_SERVER['HTTP_HOST'].microtime(true).$GLOBALS['egw_setup']->ConfigDomain);
 
-		$current_config['postpone_statistics_submit'] = time() + 2 * 30 * 86400;	// ask user in 2 month from now, when he has something to report
+		$current_config['postpone_statistics_submit'] = time() + 2 * 30 * 86400; // ask user in 2 month from now, when he has something to report
 
 		// use securest password hash by default
-		require_once EGW_SERVER_ROOT.'/setup/inc/hook_config.inc.php';	// for sql_passwdhashes, to get securest available password hash
+		require_once EGW_SERVER_ROOT.'/setup/inc/hook_config.inc.php'; // for sql_passwdhashes, to get securest available password hash
 		$securest = null;
 		sql_passwdhashes(array(), true, $securest);
 		$current_config['sql_encryption_type'] = $current_config['ldap_encryption_type'] = $securest;
 
 		if ($preset_config)
 		{
-			$current_config = array_merge($current_config,$preset_config);
+			$current_config = array_merge($current_config, $preset_config);
 		}
 
-		foreach($current_config as $name => $value)
+		foreach ($current_config as $name => $value)
 		{
 			$app = 'phpgwapi';
 			if ($name == 'postpone_statistics_submit')
 			{
 				$app = 'admin';
 			}
-			elseif(strpos($name, '/') !== false)
+			elseif (strpos($name, '/') !== false)
 			{
 				list($app, $name) = explode('/', $name);
 			}
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => $value,
-			),array(
+			), array(
 				'config_app' => $app,
 				'config_name' => $name,
-			),__FILE__,__LINE__);
+			), __FILE__, __LINE__);
 		}
 
 		// so the default_records use the current data
 		$GLOBALS['egw_info']['server'] = array_merge((array)$GLOBALS['egw_info']['server'], $current_config);
-		Api\Cache::flush();	// flush whole instance cache
-		Api\Config::init_static();	// flush internal cache of Api\Config class
+		Api\Cache::flush(); // flush whole instance cache
+		Api\Config::init_static(); // flush internal cache of Api\Config class
 		$GLOBALS['egw_setup']->setup_account_object($current_config);
 	}
 
@@ -345,9 +345,9 @@ 
 	 *
 	 * @param $setup_info	array of application info from setup.inc.php files, etc.
 	 */
-	function droptables(array $setup_info,$DEBUG=False)
+	function droptables(array $setup_info, $DEBUG = False)
 	{
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
@@ -355,10 +355,10 @@ 
 		$tablenames = $GLOBALS['egw_setup']->db->table_names();
 		if (!is_array($setup_info) || !is_array($tablenames))
 		{
-			return $setup_info;	// nothing to do
+			return $setup_info; // nothing to do
 		}
 		$tables = array();
-		foreach($tablenames as $data)
+		foreach ($tablenames as $data)
 		{
 			$tables[] = $data['table_name'];
 		}
@@ -367,16 +367,16 @@ 
 		{
 			return $setup_info;
 		}
-		foreach($setup_info as $app_name => $data)
+		foreach ($setup_info as $app_name => $data)
 		{
-			if(is_array($data['tables']))
+			if (is_array($data['tables']))
 			{
-				foreach($data['tables'] as $table)
+				foreach ($data['tables'] as $table)
 				{
 					//echo $table;
-					if(in_array($table,$tables))
+					if (in_array($table, $tables))
 					{
-						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						if ($DEBUG) { echo '<br>process->droptables(): Dropping :'.$app_name.' table: '.$table; }
 						$GLOBALS['egw_setup']->oProc->DropTable($table);
 						// Update the array values for return below
 						$setup_info[$app_name]['status'] = 'U';
@@ -396,31 +396,31 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function current(array $setup_info,$DEBUG=False)
+	function current(array $setup_info, $DEBUG = False)
 	{
 		//echo __METHOD__; _debug_array($setup_info);
-		if(!isset($GLOBALS['egw_setup']->oProc))
+		if (!isset($GLOBALS['egw_setup']->oProc))
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
 			$enabled = False;
 			$apptitle = $appdata['title'];
 
-			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+			if ($DEBUG) { echo '<br>process->current(): Incoming status: '.$appname.',status: '.$appdata['status']; }
 
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
+			if ($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
 			{
-				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				if ($DEBUG) { echo '<br>process->current(): Including: '.$appdir.'tables_current.inc.php'; }
 				$phpgw_baseline = null;
 				include ($appdir.'tables_current.inc.php');
-				$ret = $this->post_process($phpgw_baseline,$DEBUG);
-				if($ret)
+				$ret = $this->post_process($phpgw_baseline, $DEBUG);
+				if ($ret)
 				{
-					if($GLOBALS['egw_setup']->app_registered($appname))
+					if ($GLOBALS['egw_setup']->app_registered($appname))
 					{
 						$GLOBALS['egw_setup']->update_app($appname);
 					}
@@ -435,34 +435,34 @@ 
 				else
 				{
 					/* script processing failed */
-					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					if ($DEBUG) { echo '<br>process->current(): Failed for '.$appname.',status: '.$appdata['status']; }
 					$appdata['status'] = 'F';
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				if ($DEBUG) { echo '<br>process->current(): No current tables for '.$apptitle."\n"; }
 				/*
 				 Add the app, but disable it if it has tables defined.
 				 A manual sql script install is needed, but we do add the hooks
 				*/
 				$enabled = 99;
-				if($appdata['tables'][0] != '')
+				if ($appdata['tables'][0] != '')
 				{
 					$enabled = False;
 				}
-				if($GLOBALS['egw_setup']->app_registered($appname))
+				if ($GLOBALS['egw_setup']->app_registered($appname))
 				{
 					$GLOBALS['egw_setup']->update_app($appname);
 				}
 				else
 				{
-					$GLOBALS['egw_setup']->register_app($appname,$enabled);
+					$GLOBALS['egw_setup']->register_app($appname, $enabled);
 					$GLOBALS['egw_setup']->set_default_preferences($appname);
 				}
 				$appdata['status'] = 'C';
 			}
-			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
+			if ($DEBUG) { echo '<br>process->current(): Outgoing status: '.$appname.',status: '.$appdata['status']; }
 		}
 
 		// update hooks
@@ -479,25 +479,25 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function default_records(array $setup_info,$DEBUG=False)
+	function default_records(array $setup_info, $DEBUG = False)
 	{
 		//echo __METHOD__; _debug_array($setup_info);
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if(file_exists($appdir.'default_records.inc.php'))
+			if (file_exists($appdir.'default_records.inc.php'))
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->default_records(): Including default records for ' . $appname . "\n";
+					echo '<br>process->default_records(): Including default records for '.$appname."\n";
 				}
 				$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
-				$oProc = &$GLOBALS['egw_setup']->oProc;	// to be compatible with old apps
+				$oProc = &$GLOBALS['egw_setup']->oProc; // to be compatible with old apps
 				include ($appdir.'default_records.inc.php');
 				$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
 			}
@@ -521,21 +521,21 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function test_data(array $setup_info,$DEBUG=False)
+	function test_data(array $setup_info, $DEBUG = False)
 	{
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if(file_exists($appdir.'test_data.inc.php'))
+			if (file_exists($appdir.'test_data.inc.php'))
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->test_data(): Including baseline test data for ' . $appname . "\n";
+					echo '<br>process->test_data(): Including baseline test data for '.$appname."\n";
 				}
 				$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
 				include ($appdir.'test_data.inc.php');
@@ -555,35 +555,35 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function baseline(array $setup_info,$DEBUG=False)
+	function baseline(array $setup_info, $DEBUG = False)
 	{
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if(file_exists($appdir.'tables_baseline.inc.php'))
+			if (file_exists($appdir.'tables_baseline.inc.php'))
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->baseline(): Including baseline tables for ' . $appname . "\n";
+					echo '<br>process->baseline(): Including baseline tables for '.$appname."\n";
 				}
 				$phpgw_baseline = null;
 				include ($appdir.'tables_baseline.inc.php');
 				$GLOBALS['egw_setup']->oProc->GenerateScripts($phpgw_baseline, $DEBUG);
-				$this->post_process($phpgw_baseline,$DEBUG);
+				$this->post_process($phpgw_baseline, $DEBUG);
 
 				/* Update the array values for return below */
 				/* $setup_info[$key]['status'] = 'R'; */
 			}
 			else
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->baseline(): No baseline tables for ' . $appname . "\n";
+					echo '<br>process->baseline(): No baseline tables for '.$appname."\n";
 				}
 				//$setup_info[$key]['status'] = 'C';
 			}
@@ -601,19 +601,19 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function upgrade($setup_info,$DEBUG=False)
+	function upgrade($setup_info, $DEBUG = False)
 	{
 		//echo __METHOD__; _debug_array($setup_info);
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
 		$GLOBALS['egw_setup']->oProc->m_odb->HaltOnError = 'yes';
 
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
 			// check if app is NOT installed
-			if(!$GLOBALS['egw_setup']->app_registered($appname))
+			if (!$GLOBALS['egw_setup']->app_registered($appname))
 			{
 				// check if app wants to be automatically installed on update to version x or allways
 				if (isset($appdata['autoinstall']) && ($appdata['autoinstall'] === true ||
@@ -625,7 +625,7 @@ 
 					continue;
 				}
 				/* Don't try to upgrade an app that is not installed */
-				if($DEBUG)
+				if ($DEBUG)
 				{
 					echo "<p>process->upgrade(): Application not installed: $appname</p>\n";
 				}
@@ -634,41 +634,41 @@ 
 			}
 
 			/* if upgrade required, or if we are running again after an upgrade or dependency failure */
-			if($DEBUG)
+			if ($DEBUG)
 			{
 				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
 			}
-			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			if ($appdata['status'] == 'U' || $appdata['status'] == 'D' || $appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
 			{
 				$currentver = $appdata['currentver'];
-				$targetver  = $appdata['version'];	// The version we need to match when done
-				$appdir     = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+				$targetver  = $appdata['version']; // The version we need to match when done
+				$appdir     = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-				if(file_exists($appdir . 'tables_update.inc.php'))
+				if (file_exists($appdir.'tables_update.inc.php'))
 				{
 					if (!@$this->updateincluded[$appname])
 					{
-						include ($appdir . 'tables_update.inc.php');
+						include ($appdir.'tables_update.inc.php');
 						$this->updateincluded[$appname] = True;
 					}
 					while ($currentver && $currentver != $targetver &&
-						function_exists($function = $appname . '_upgrade' . str_replace('.','_',$currentver)))
+						function_exists($function = $appname.'_upgrade'.str_replace('.', '_', $currentver)))
 					{
-						if($DEBUG)
+						if ($DEBUG)
 						{
 							echo "<br>process->upgrade(): $appname($currentver --> $targetver): running $function()\n";
 						}
 						if (!($currentver = $function()))
 						{
-							if($DEBUG)
+							if ($DEBUG)
 							{
 								echo "<b>failed!!!</b>\n";
 							}
-							$appstatus  = 'F';
+							$appstatus = 'F';
 						}
 						else
 						{
-							if($DEBUG)
+							if ($DEBUG)
 							{
 								echo "--> $currentver\n";
 							}
@@ -676,7 +676,7 @@ 
 					}
 					if ($currentver == $targetver)	// upgrades succesful
 					{
-						if($DEBUG)
+						if ($DEBUG)
 						{
 							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
 						}
@@ -684,27 +684,27 @@ 
 					}
 					elseif ($currentver)
 					{
-						if($DEBUG)
+						if ($DEBUG)
 						{
 							echo "<br><b>process->upgrade(): No table upgrade available for appname: $appname, version: $currentver</b>\n";
 						}
 						$appdate['currentver'] = $targetver;
-						$appstatus  = 'F';
+						$appstatus = 'F';
 					}
 				}
 				else
 				{
-					if($DEBUG)
+					if ($DEBUG)
 					{
 						echo "<br>process->upgrade(): No table upgrade required/availible for $appname\n";
 					}
-					$appstatus  = 'C';
+					$appstatus = 'C';
 				}
 				if ($appstatus == 'C')	// update successful completed
 				{
 					$appdata['currentver'] = $targetver;
 
-					if($GLOBALS['egw_setup']->app_registered($appname))
+					if ($GLOBALS['egw_setup']->app_registered($appname))
 					{
 						$GLOBALS['egw_setup']->update_app($appname);
 					}
@@ -717,14 +717,14 @@ 
 			}
 			else
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
 					echo "<br>process->upgrade(): No upgrade required for $appname\n";
 				}
-				$appstatus  = 'C';
+				$appstatus = 'C';
 			}
 			/* Done with this app, update status */
-			if($DEBUG)
+			if ($DEBUG)
 			{
 				echo "<br>process->upgrade(): Outgoing : appname: $appname, status: $appstatus</div>\n";
 			}
@@ -742,13 +742,13 @@ 
 	 * commit above processing to the db
 	 *
 	 */
-	function post_process($tables,$DEBUG=False)
+	function post_process($tables, $DEBUG = False)
 	{
-		if(!$tables)
+		if (!$tables)
 		{
 			return False;
 		}
-		return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
+		return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables, $DEBUG);
 	}
 
 	/**
@@ -756,14 +756,14 @@ 
 	 *
 	 * @param	$tablename	table whose array you want to see
 	 */
-	function sql_to_array($tablename='')
+	function sql_to_array($tablename = '')
 	{
-		if(!$tablename)
+		if (!$tablename)
 		{
 			return False;
 		}
 
-		if(!$GLOBALS['egw_setup']->oProc)
+		if (!$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
@@ -771,7 +771,7 @@ 
 		$sColumns = null;
 		$GLOBALS['egw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['egw_setup']->oProc, $tablename, $sColumns);
 
-		while(list($key,$tbldata) = each($GLOBALS['egw_setup']->oProc->m_oTranslator->sCol))
+		while (list($key, $tbldata) = each($GLOBALS['egw_setup']->oProc->m_oTranslator->sCol))
 		{
 			$arr .= $tbldata;
 		}
@@ -780,6 +780,6 @@ 
 		$ix = $GLOBALS['egw_setup']->oProc->m_oTranslator->ix;
 		$uc = $GLOBALS['egw_setup']->oProc->m_oTranslator->uc;
 
-		return array($arr,$pk,$fk,$ix,$uc);
+		return array($arr, $pk, $fk, $ix, $uc);
 	}
 }

Braces +53 added lines, -16 removed lines

@@ -108,7 +108,9 @@ 
 		while($pass_string != $passing_string)
 		{
 			$passing = array();
-			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			if($DEBUG)
+			{
+echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
 
 			// Check current versions and dependencies
 			$setup_info = $GLOBALS['egw_setup']->detection->check_depends(
@@ -143,7 +145,10 @@ 
 					}
 					/* Create tables and insert new records for each app in this list */
 					$passing_c = $this->current($pass,$DEBUG);
-					if (isset($pass['api'])) $this->save_minimal_config($preset_config);
+					if (isset($pass['api']))
+					{
+						$this->save_minimal_config($preset_config);
+					}
 					$passing = $this->default_records($passing_c,$DEBUG);
 					break;
 				case 'upgrade':
@@ -162,29 +167,40 @@ 
 				if($value['status'] == 'C')
 				{
 					$passed[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
 				}
 				elseif($value['status'] == 'F')
 				{
 					$setup_info[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
 				}
 				elseif($value['status'] == 'D')
 				{
 					$pass[$value['name']] = $setup_info[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
 					$tmp = $passing[$value['name']]['name'];
-					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
 				}
 			}
 
 			$i++;
-			if($i == 20) /* Then oops it broke */
+			if($i == 20)
+			{
+				/* Then oops it broke */
 			{
 				echo '<br>Setup failure: excess looping in process->pass():'."\n";
+			}
 				echo '<br>Pass:<br>'."\n";
 				_debug_array($pass);
 				echo '<br>Passed:<br>'."\n";
@@ -376,7 +392,9 @@ 
 					//echo $table;
 					if(in_array($table,$tables))
 					{
-						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						if($DEBUG)
+						{
+echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
 						$GLOBALS['egw_setup']->oProc->DropTable($table);
 						// Update the array values for return below
 						$setup_info[$app_name]['status'] = 'U';
@@ -408,13 +426,17 @@ 
 			$enabled = False;
 			$apptitle = $appdata['title'];
 
-			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
 
 			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
 			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
 			{
-				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
 				$phpgw_baseline = null;
 				include ($appdir.'tables_current.inc.php');
 				$ret = $this->post_process($phpgw_baseline,$DEBUG);
@@ -435,13 +457,17 @@ 
 				else
 				{
 					/* script processing failed */
-					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					if($DEBUG)
+					{
+echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
 					$appdata['status'] = 'F';
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
 				/*
 				 Add the app, but disable it if it has tables defined.
 				 A manual sql script install is needed, but we do add the hooks
@@ -462,7 +488,9 @@ 
 				}
 				$appdata['status'] = 'C';
 			}
-			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
 		}
 
 		// update hooks
@@ -638,9 +666,12 @@ 
 			{
 				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
 			}
-			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '')
+			{
+				// TODO this is not getting set for api upgrade, sometimes ???
 			{
 				$currentver = $appdata['currentver'];
+			}
 				$targetver  = $appdata['version'];	// The version we need to match when done
 				$appdir     = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
@@ -674,11 +705,14 @@ 
 							}
 						}
 					}
-					if ($currentver == $targetver)	// upgrades succesful
+					if ($currentver == $targetver)
+					{
+						// upgrades succesful
 					{
 						if($DEBUG)
 						{
 							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
+					}
 						}
 						$appstatus = 'C';
 					}
@@ -700,9 +734,12 @@ 
 					}
 					$appstatus  = 'C';
 				}
-				if ($appstatus == 'C')	// update successful completed
+				if ($appstatus == 'C')
+				{
+					// update successful completed
 				{
 					$appdata['currentver'] = $targetver;
+				}
 
 					if($GLOBALS['egw_setup']->app_registered($appname))
 					{

timesheet/inc/class.timesheet_bo.inc.php

Doc Comments +7 added lines, -9 removed lines

@@ -261,7 +261,7 @@ 
 	 *
 	 * @param statuses List of statuses to process, with sub-statuses in a 'substatus' array
 	 * @param labels Array of labels, pass array() and labels will be built in it
-	 * @param depth Current depth
+	 * @param depth integer depth
 	 *
 	 * @return None, labels are built in labels parameter
 	 */
@@ -305,7 +305,7 @@ 
 	 *
 	 * @param array|int $data =null use $this->data or $this->data['ts_id'] (to fetch the data)
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if the rights are ok, false if no rights
+	 * @return null|boolean true if the rights are ok, false if no rights
 	 */
 	function check_statusForEditRights($data=null,$user=null)
 	{
@@ -340,7 +340,7 @@ 
 	 * @param int $required Acl::READ, EGW_ACL_WRITE, Acl::ADD, Acl::DELETE, EGW_ACL_BUDGET, EGW_ACL_EDIT_BUDGET
 	 * @param array|int $data =null project or project-id to use, default the project in $this->data
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if the rights are ok, null if not found, false if no rights
+	 * @return null|boolean true if the rights are ok, null if not found, false if no rights
 	 */
 	function check_acl($required,$data=null,$user=null)
 	{
@@ -397,11 +397,11 @@ 
 	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
 	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. comma seperated list of keys to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard ='' appended befor and after each criteria
 	 * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
-	 * @param mixed $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
+	 * @param boolean $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
 	 * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
@@ -658,8 +658,6 @@ 
 	 * delete / move all timesheets of a given user
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] owner to change
-	 * @param int $data['new_owner']  new owner or 0 for delete
 	 */
 	function deleteaccount($data)
 	{
@@ -686,7 +684,7 @@ 
 	 *
 	 * @param array $keys =null if given array with col => value pairs to characterise single timesheet or null for $this->data
 	 * @param int $status =0
-	 * @return int affected rows, should be 1 if ok, 0 if an error
+	 * @return boolean affected rows, should be 1 if ok, 0 if an error
 	 */
 	function set_status($keys=null, $status=0)
 	{
@@ -816,7 +814,7 @@ 
 	 * @param int $check Acl::READ for read and Acl::EDIT for write or delete access
 	 * @param string $rel_path =null currently not used in InfoLog
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if access is granted or false otherwise
+	 * @return null|boolean true if access is granted or false otherwise
 	 */
 	function file_access($id,$check,$rel_path=null,$user=null)
 	{

Indentation +2 added lines, -2 removed lines

@@ -152,8 +152,8 @@
 	const EXTRA_TABLE = 'egw_timesheet_extra';
 
 	/**
-	* Columns to search when user does a text search
-	*/
+	 * Columns to search when user does a text search
+	 */
 	var $columns_to_search = array('egw_timesheet.ts_id', 'ts_project', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_unitprice');
 
 	/**

Spacing +134 added lines, -134 removed lines

@@ -16,7 +16,7 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 
@@ -43,7 +43,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $quantity_sum=false;
+	var $quantity_sum = false;
 	/**
 	 * current user
 	 *
@@ -56,7 +56,7 @@ 
 	 * @var array
 	 */
 	var $timestamps = array(
-		'ts_start','ts_modified'
+		'ts_start', 'ts_modified'
 	);
 	/**
 	 * Start of today in user-time
@@ -70,17 +70,17 @@ 
 	 * @var array
 	 */
 	var $date_filters = array(	// Start: year,month,day,week, End: year,month,day,week
-		'Today'       => array(0,0,0,0,  0,0,1,0),
-		'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-		'This week'   => array(0,0,0,0,  0,0,0,1),
-		'Last week'   => array(0,0,0,-1, 0,0,0,0),
-		'This month'  => array(0,0,0,0,  0,1,0,0),
-		'Last month'  => array(0,-1,0,0, 0,0,0,0),
-		'2 month ago' => array(0,-2,0,0, 0,-1,0,0),
-		'This year'   => array(0,0,0,0,  1,0,0,0),
-		'Last year'   => array(-1,0,0,0, 0,0,0,0),
-		'2 years ago' => array(-2,0,0,0, -1,0,0,0),
-		'3 years ago' => array(-3,0,0,0, -2,0,0,0),
+		'Today'       => array(0, 0, 0, 0, 0, 0, 1, 0),
+		'Yesterday'   => array(0, 0, -1, 0, 0, 0, 0, 0),
+		'This week'   => array(0, 0, 0, 0, 0, 0, 0, 1),
+		'Last week'   => array(0, 0, 0, -1, 0, 0, 0, 0),
+		'This month'  => array(0, 0, 0, 0, 0, 1, 0, 0),
+		'Last month'  => array(0, -1, 0, 0, 0, 0, 0, 0),
+		'2 month ago' => array(0, -2, 0, 0, 0, -1, 0, 0),
+		'This year'   => array(0, 0, 0, 0, 1, 0, 0, 0),
+		'Last year'   => array(-1, 0, 0, 0, 0, 0, 0, 0),
+		'2 years ago' => array(-2, 0, 0, 0, -1, 0, 0, 0),
+		'3 years ago' => array(-3, 0, 0, 0, -2, 0, 0, 0),
 	);
 	/**
 	 * Grants: $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP);
@@ -105,7 +105,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Array with status label
 	 *
@@ -165,21 +165,21 @@ 
 
 	function __construct()
 	{
-		parent::__construct(TIMESHEET_APP,'egw_timesheet',self::EXTRA_TABLE,'','ts_extra_name','ts_extra_value','ts_id');
+		parent::__construct(TIMESHEET_APP, 'egw_timesheet', self::EXTRA_TABLE, '', 'ts_extra_name', 'ts_extra_value', 'ts_id');
 
 		if ($this->customfields) $this->columns_to_search[] = self::EXTRA_TABLE.'.ts_extra_value';
 		$this->config_data = Api\Config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 
 		// Load & process statuses
-		if($this->config_data['status_labels']) $this->load_statuses();
+		if ($this->config_data['status_labels']) $this->load_statuses();
 
-		$this->today = mktime(0,0,0,date('m',$this->now),date('d',$this->now),date('Y',$this->now));
+		$this->today = mktime(0, 0, 0, date('m', $this->now), date('d', $this->now), date('Y', $this->now));
 
 		// save us in $GLOBALS['timesheet_bo'] for ExecMethod used in hooks
 		if (!is_object($GLOBALS['timesheet_bo']))
 		{
-			$GLOBALS['timesheet_bo'] =& $this;
+			$GLOBALS['timesheet_bo'] = & $this;
 		}
 		$this->grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP);
 	}
@@ -189,15 +189,15 @@ 
 	 */
 	protected function load_statuses()
 	{
-		$this->status_labels =&  $this->config_data['status_labels'];
-		if (!is_array($this->status_labels)) $this->status_labels= array($this->status_labels);
+		$this->status_labels = &  $this->config_data['status_labels'];
+		if (!is_array($this->status_labels)) $this->status_labels = array($this->status_labels);
 
 		foreach ($this->status_labels as $status_id => $label)
 		{
 			if (!is_array($label))
 			{	//old values, before parent status
 				$name = $label;
-				$label=array();
+				$label = array();
 				$label['name'] = $name;
 				$label['parent'] = '';
 			}
@@ -209,12 +209,12 @@ 
 		$map = array(
 			'' => array('substatus' => array())
 		);
-		foreach($this->status_labels_config as $id => &$status)
+		foreach ($this->status_labels_config as $id => &$status)
 		{
 			$status['substatus'] = array();
 			$map[$id] = &$status;
 		}
-		foreach($this->status_labels_config as &$status)
+		foreach ($this->status_labels_config as &$status)
 		{
 			$map[$status['parent']]['substatus'][] = &$status;
 		}
@@ -226,7 +226,7 @@ 
 
 		// Sort Api\Config based on tree
 		$sorted = array();
-		foreach($this->status_labels as $status_id => $label)
+		foreach ($this->status_labels as $status_id => $label)
 		{
 			$sorted[$status_id] = $this->status_labels_config[$status_id];
 			//$sorted[$status_id]['name'] = $label;
@@ -245,7 +245,7 @@ 
 	{
 		if (!isset($this->status_labels_config)) $this->load_statuses();
 		$stati = array($status);
-		foreach($this->status_labels_config as $stat)
+		foreach ($this->status_labels_config as $stat)
 		{
 			if ($stat['parent'] && in_array($stat['parent'], $stati))
 			{
@@ -265,14 +265,14 @@ 
 	 *
 	 * @return None, labels are built in labels parameter
 	 */
-	protected function make_status_labels($statuses, &$labels, $depth=0)
+	protected function make_status_labels($statuses, &$labels, $depth = 0)
 	{
-		foreach($statuses as $status)
+		foreach ($statuses as $status)
 		{
-			$labels[$status['id']] = str_pad('',$depth*12, " ",STR_PAD_LEFT).trim(str_replace(' ','',$status['name']));
-			if(count($status['substatus']) > 0)
+			$labels[$status['id']] = str_pad('', $depth * 12, " ", STR_PAD_LEFT).trim(str_replace(' ', '', $status['name']));
+			if (count($status['substatus']) > 0)
 			{
-				$this->make_status_labels($status['substatus'], $labels, $depth+1);
+				$this->make_status_labels($status['substatus'], $labels, $depth + 1);
 			}
 		}
 	}
@@ -283,12 +283,12 @@ 
 	 * @param int $required =EGW_ACL_READ
 	 * @return array with uid => Username pairs
 	 */
-	function grant_list($required=EGW_ACL_READ)
+	function grant_list($required = EGW_ACL_READ)
 	{
 		$result = array();
-		foreach($this->grants as $uid => $grant)
+		foreach ($this->grants as $uid => $grant)
 		{
-			if ($grant & $required)
+			if ($grant&$required)
 			{
 				$result[$uid] = Api\Accounts::username($uid);
 			}
@@ -307,19 +307,19 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if the rights are ok, false if no rights
 	 */
-	function check_statusForEditRights($data=null,$user=null)
+	function check_statusForEditRights($data = null, $user = null)
 	{
 		if (is_null($data) || (int)$data == $this->data['ts_id'])
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true);
+			$data = $this->read($data, true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data) return null; // entry not found
 		}
 		if (!$user) $user = $this->user;
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) && $data['ts_status'])
@@ -342,19 +342,19 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if the rights are ok, null if not found, false if no rights
 	 */
-	function check_acl($required,$data=null,$user=null)
+	function check_acl($required, $data = null, $user = null)
 	{
 		if (is_null($data) || (int)$data == $this->data['ts_id'])
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true);
+			$data = $this->read($data, true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data) return null; // entry not found
 		}
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -363,11 +363,11 @@ 
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP,true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP, true, $user);
 		}
-		$ret = $data && !!($grants[$data['ts_owner']] & $required);
+		$ret = $data && !!($grants[$data['ts_owner']]&$required);
 
-		if(($required & Acl::DELETE) && $this->config_data['history'] == 'history' &&
+		if (($required&Acl::DELETE) && $this->config_data['history'] == 'history' &&
 			$data['ts_status'] == self::DELETED_STATUS)
 		{
 			$ret = !!($GLOBALS['egw_info']['user']['apps']['admin']);
@@ -384,7 +384,7 @@ 
 	 * @param int &$end
 	 * @return string
 	 */
-	function date_filter($name,&$start,&$end)
+	function date_filter($name, &$start, &$end)
 	{
 		return Api\DateTime::sql_filter($name, $start, $end, 'ts_start', $this->date_filters);
 	}
@@ -409,7 +409,7 @@ 
 	 * @param boolean $only_summary =false If true only return the sums as array with keys duration and price, default false
 	 * @return array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false,$only_summary=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false, $only_summary = false)
 	{
 		//error_log(__METHOD__."(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')");
 		//echo "<p>".__METHOD__."(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
@@ -418,9 +418,9 @@ 
 
 		if (!is_array($extra_cols))
 		{
-			$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+			$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
 		}
-		if ($only_keys === false || $this->show_sums && strpos($order_by,'ts_start') !== false)
+		if ($only_keys === false || $this->show_sums && strpos($order_by, 'ts_start') !== false)
 		{
 			$extra_cols[] = $total_sql.' AS ts_total';
 		}
@@ -432,7 +432,7 @@ 
 		{
 			if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
 
-			foreach($filter['ts_owner'] as $key => $owner)
+			foreach ($filter['ts_owner'] as $key => $owner)
 			{
 				if (!isset($this->grants[$owner]))
 				{
@@ -446,8 +446,8 @@ 
 		}
 		else
 		{
-			$filter[] = '(ts_status ' . ($filter['ts_status'] == self::DELETED_STATUS ? '=':'!= ') . self::DELETED_STATUS .
-				($filter['ts_status'] == self::DELETED_STATUS ? '':' OR ts_status IS NULL') . ')';
+			$filter[] = '(ts_status '.($filter['ts_status'] == self::DELETED_STATUS ? '=' : '!= ').self::DELETED_STATUS.
+				($filter['ts_status'] == self::DELETED_STATUS ? '' : ' OR ts_status IS NULL').')';
 		}
 		if (!count($filter['ts_owner']))
 		{
@@ -455,15 +455,15 @@ 
 			$this->summary = array();
 			return array();
 		}
-		if ($only_summary==false && $criteria && $this->show_sums)
+		if ($only_summary == false && $criteria && $this->show_sums)
 		{
 			// if we have a criteria AND intend to show the sums we first query the affected ids,
 			// then we throw away criteria and filter, and replace the filter with the list of ids
-			$ids = parent::search($criteria,'egw_timesheet.ts_id as id','','',$wildcard,$empty,$op,false,$filter,$join);
+			$ids = parent::search($criteria, 'egw_timesheet.ts_id as id', '', '', $wildcard, $empty, $op, false, $filter, $join);
 			//_debug_array($ids);
 			if (empty($ids))
 			{
-				$this->summary = array('duration'=>0,'price'=>null,'quantity'=>0);
+				$this->summary = array('duration'=>0, 'price'=>null, 'quantity'=>0);
 				return array();
 			}
 			unset($criteria);
@@ -487,45 +487,45 @@ 
 
 		if ($only_summary) return $this->summary;
 
-		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
+		if ($this->show_sums && strpos($order_by, 'ts_start') !== false && // sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
 		{
 			$sum_sql = array(
-				'year'  => $this->db->date_format($from_unixtime_ts_start,'%Y'),
-				'month' => $this->db->date_format($from_unixtime_ts_start,'%Y%m'),
-				'week'  => $this->db->date_format($from_unixtime_ts_start,$GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
-				'day'   => $this->db->date_format($from_unixtime_ts_start,'%Y-%m-%d'),
+				'year'  => $this->db->date_format($from_unixtime_ts_start, '%Y'),
+				'month' => $this->db->date_format($from_unixtime_ts_start, '%Y%m'),
+				'week'  => $this->db->date_format($from_unixtime_ts_start, $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
+				'day'   => $this->db->date_format($from_unixtime_ts_start, '%Y-%m-%d'),
 			);
-			foreach($this->show_sums as $type)
+			foreach ($this->show_sums as $type)
 			{
 				$extra_cols[] = $sum_sql[$type].' AS ts_'.$type;
 				$extra_cols[] = '0 AS is_sum_'.$type;
-				$sum_extra_cols[] = str_replace('ts_start','MIN(ts_start)',$sum_sql[$type]);	// as we dont group by ts_start
+				$sum_extra_cols[] = str_replace('ts_start', 'MIN(ts_start)', $sum_sql[$type]); // as we dont group by ts_start
 				$sum_extra_cols[$type] = '0 AS is_sum_'.$type;
 			}
 			// regular entries
-			parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
+			parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, 'UNION', $filter, $join, $need_full_no_count);
 
-			$sort = substr($order_by,8);
+			$sort = substr($order_by, 8);
 			$union_order = array();
-			$sum_ts_id = array('year' => -3,'month' => -2,'week' => -1,'day' => 0);
-			foreach($this->show_sums as $type)
+			$sum_ts_id = array('year' => -3, 'month' => -2, 'week' => -1, 'day' => 0);
+			foreach ($this->show_sums as $type)
 			{
-				$union_order[] = 'ts_'.$type . ' ' . $sort;
+				$union_order[] = 'ts_'.$type.' '.$sort;
 				$union_order[] = 'is_sum_'.$type;
 				$sum_extra_cols[$type]{0} = '1';
 				// the $type sum
-				parent::search($criteria,array(
-					(string)$sum_ts_id[$type],"''","''","''",'MIN(ts_start)','SUM(ts_duration) AS ts_duration',
+				parent::search($criteria, array(
+					(string)$sum_ts_id[$type], "''", "''", "''", 'MIN(ts_start)', 'SUM(ts_duration) AS ts_duration',
 					($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0'),
-					'0','NULL','0','0','0','0','0',"SUM($total_sql) AS ts_total"
-				),'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
+					'0', 'NULL', '0', '0', '0', '0', '0', "SUM($total_sql) AS ts_total"
+				), 'GROUP BY '.$sum_sql[$type], $sum_extra_cols, $wildcard, $empty, $op, 'UNION', $filter, $join, $need_full_no_count);
 				$sum_extra_cols[$type]{0} = '0';
 			}
 			$union_order[] = 'ts_start '.$sort;
-			return parent::search('','',implode(',',$union_order),'','',false,'',$start);
+			return parent::search('', '', implode(',', $union_order), '', '', false, '', $start);
 		}
-		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 	}
 
 	/**
@@ -535,16 +535,16 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked
 	 * @return array|boolean array with timesheet entry, null if timesheet not found or false if no rights
 	 */
-	function read($ts_id,$ignore_acl=false)
+	function read($ts_id, $ignore_acl = false)
 	{
 		//error_log(__METHOD__."($ts_id,$ignore_acl) ".function_backtrace());
 		if (!(int)$ts_id || (int)$ts_id != $this->data['ts_id'] && !parent::read($ts_id))
 		{
-			return null;	// entry not found
+			return null; // entry not found
 		}
 		if (!$ignore_acl && !($ret = $this->check_acl(Acl::READ)))
 		{
-			return false;	// no read rights
+			return false; // no read rights
 		}
 		return $this->data;
 	}
@@ -559,7 +559,7 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked, returns true if no edit-rigts
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null,$touch_modified=true,$ignore_acl=false)
+	function save($keys = null, $touch_modified = true, $ignore_acl = false)
 	{
 		if ($keys) $this->data_merge($keys);
 
@@ -577,13 +577,13 @@ 
 		// check if we have a real modification of an existing record
 		if ($this->data['ts_id'])
 		{
-			$new =& $this->data;
+			$new = & $this->data;
 			unset($this->data);
 			$this->read($new['ts_id']);
-			$old =& $this->data;
-			$this->data =& $new;
+			$old = & $this->data;
+			$this->data = & $new;
 			$changed = array();
-			if (isset($old)) foreach($old as $name => $value)
+			if (isset($old)) foreach ($old as $name => $value)
 			{
 				if (isset($new[$name]) && $new[$name] != $value) $changed[] = $name;
 			}
@@ -594,7 +594,7 @@ 
 		}
 
 		// Check for restore of deleted contact, restore held links
-		if($old && $old['ts_status'] == self::DELETED_STATUS && $new['ts_status'] != self::DELETED_STATUS)
+		if ($old && $old['ts_status'] == self::DELETED_STATUS && $new['ts_status'] != self::DELETED_STATUS)
 		{
 			Link::restore(TIMESHEET_APP, $new['ts_id']);
 		}
@@ -605,14 +605,14 @@ 
 
 			$this->tracking->html_content_allow = true;
 		}
-		if ($this->tracking->track($this->data,$old,$this->user) === false)
+		if ($this->tracking->track($this->data, $old, $this->user) === false)
 		{
-			return implode(', ',$this->tracking->errors);
+			return implode(', ', $this->tracking->errors);
 		}
 		if (!($err = parent::save()))
 		{
 			// notify the link-class about the update, as other apps may be subscribt to it
-			Link::notify_update(TIMESHEET_APP,$this->data['ts_id'],$this->data);
+			Link::notify_update(TIMESHEET_APP, $this->data['ts_id'], $this->data);
 		}
 
 		return $err;
@@ -625,15 +625,15 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked, returns false if no delete-rigts
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null,$ignore_acl=false)
+	function delete($keys = null, $ignore_acl = false)
 	{
-		if (!is_array($keys) && (int) $keys)
+		if (!is_array($keys) && (int)$keys)
 		{
-			$keys = array('ts_id' => (int) $keys);
+			$keys = array('ts_id' => (int)$keys);
 		}
 		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
 
-		if (!$ignore_acl && !$this->check_acl(Acl::DELETE,$ts_id) || !($old = $this->read($ts_id)))
+		if (!$ignore_acl && !$this->check_acl(Acl::DELETE, $ts_id) || !($old = $this->read($ts_id)))
 		{
 			return false;
 		}
@@ -644,12 +644,12 @@ 
 			$delete = $old;
 			$delete['ts_status'] = self::DELETED_STATUS;
 			$ret = !($this->save($delete));
-			Link::unlink(0,TIMESHEET_APP,$ts_id,'','','',true);
+			Link::unlink(0, TIMESHEET_APP, $ts_id, '', '', '', true);
 		}
 		elseif (($ret = parent::delete($keys)) && $ts_id)
 		{
 			// delete all links to timesheet entry $ts_id
-			Link::unlink(0,TIMESHEET_APP,$ts_id);
+			Link::unlink(0, TIMESHEET_APP, $ts_id);
 		}
 		return $ret;
 	}
@@ -664,7 +664,7 @@ 
 	function deleteaccount($data)
 	{
 		$account_id = $data['account_id'];
-		$new_owner =  $data['new_owner'];
+		$new_owner = $data['new_owner'];
 
 		if (!$new_owner)
 		{
@@ -688,22 +688,22 @@ 
 	 * @param int $status =0
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function set_status($keys=null, $status=0)
+	function set_status($keys = null, $status = 0)
 	{
 		$ret = true;
-		if (!is_array($keys) && (int) $keys)
+		if (!is_array($keys) && (int)$keys)
 		{
-			$keys = array('ts_id' => (int) $keys);
+			$keys = array('ts_id' => (int)$keys);
 		}
 		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
 
-		if (!$this->check_acl(Acl::EDIT,$ts_id) || !$this->read($ts_id,true))
+		if (!$this->check_acl(Acl::EDIT, $ts_id) || !$this->read($ts_id, true))
 		{
 			return false;
 		}
 
 		$this->data['ts_status'] = $status;
-		if ($this->save($ts_id)!=0) $ret = false;
+		if ($this->save($ts_id) != 0) $ret = false;
 
 		return $ret;
 	}
@@ -720,7 +720,7 @@ 
 		{
 			return array('duration' => 0, 'quantity' => 0, 'price' => 0, 'max_modified' => null);
 		}
-		return $this->search(array('ts_id'=>$ids),true,'','','',false,'AND',false,null,'',false,true);
+		return $this->search(array('ts_id'=>$ids), true, '', '', '', false, 'AND', false, null, '', false, true);
 	}
 
 	/**
@@ -731,27 +731,27 @@ 
 	 * @param int|array $entry int ts_id or array with timesheet entry
 	 * @return string/boolean string with title, null if timesheet not found, false if no perms to view it
 	 */
-	function link_title( $entry )
+	function link_title($entry)
 	{
 		if (!is_array($entry))
 		{
 			// need to preserve the $this->data
-			$backup =& $this->data;
+			$backup = & $this->data;
 			unset($this->data);
-			$entry = $this->read( $entry,false,false);
+			$entry = $this->read($entry, false, false);
 			// restore the data again
-			$this->data =& $backup;
+			$this->data = & $backup;
 		}
 		if (!$entry)
 		{
 			return $entry;
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if (date('H:i',$entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
+		if (date('H:i', $entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
 		{
 			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 		}
-		return date($format,$entry['ts_start']).': '.$entry['ts_title'];
+		return date($format, $entry['ts_start']).': '.$entry['ts_title'];
 	}
 
 	/**
@@ -762,18 +762,18 @@ 
 	 * @param array $ids array with ts_id's
 	 * @return array with titles, see link_title
 	 */
-	function link_titles( array $ids )
+	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($entries = $this->search(array('ts_id' => $ids),'ts_id,ts_title,ts_start')))
+		if (($entries = $this->search(array('ts_id' => $ids), 'ts_id,ts_title,ts_start')))
 		{
-			foreach($entries as $entry)
+			foreach ($entries as $entry)
 			{
 				$titles[$entry['ts_id']] = $this->link_title($entry);
 			}
 		}
 		// we assume all not returned entries are not readable by the user, as we notify Link about all deletes
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -792,16 +792,16 @@ 
 	 * @param array $options Array of options for the search
 	 * @return array with ts_id - title pairs of the matching entries
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query($pattern, Array &$options = array())
 	{
 		$limit = false;
 		$need_count = false;
-		if($options['start'] || $options['num_rows']) {
+		if ($options['start'] || $options['num_rows']) {
 			$limit = array($options['start'], $options['num_rows']);
 			$need_count = true;
 		}
 		$result = array();
-		foreach((array) $this->search($pattern,false,'','','%',false,'OR', $limit, null, '', $need_count) as $ts )
+		foreach ((array)$this->search($pattern, false, '', '', '%', false, 'OR', $limit, null, '', $need_count) as $ts)
 		{
 			if ($ts) $result[$ts['ts_id']] = $this->link_title($ts);
 		}
@@ -818,11 +818,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_acl($check,$id,$user);
+		return $this->check_acl($check, $id, $user);
 	}
 
 	/**
@@ -834,16 +834,16 @@ 
 	 * @param string $newtitle => the new title of the project
 	 * @return boolean true for success, false for invalid parameters
 	 */
-	 function update_ts_project($oldtitle='', $newtitle='')
+	 function update_ts_project($oldtitle = '', $newtitle = '')
 	 {
-		if(strlen($oldtitle) > 0 && strlen($newtitle) > 0)
+		if (strlen($oldtitle) > 0 && strlen($newtitle) > 0)
 		{
-			$this->db->update('egw_timesheet',array(
+			$this->db->update('egw_timesheet', array(
 				'ts_project' => $newtitle,
 				'ts_title' => $newtitle,
-			),array(
+			), array(
 				'ts_project' => $oldtitle,
-			),__LINE__,__FILE__,TIMESHEET_APP);
+			), __LINE__, __FILE__, TIMESHEET_APP);
 
 			return true;
 		}
@@ -856,16 +856,16 @@ 
 	 * @param int $pm_id ID of selected project
 	 * @return array containing link_id and ts_id
 	 */
-	function get_ts_links($pm_id=0)
+	function get_ts_links($pm_id = 0)
 	{
-		if($pm_id && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
+		if ($pm_id && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
 		{
-			$pm_ids = ExecMethod('projectmanager.projectmanager_bo.children',$pm_id);
+			$pm_ids = ExecMethod('projectmanager.projectmanager_bo.children', $pm_id);
 			$pm_ids[] = $pm_id;
-			$links = Link\Storage::get_links('projectmanager',$pm_ids,'timesheet');	// Link\Storage::get_links not egw_links::get_links!
+			$links = Link\Storage::get_links('projectmanager', $pm_ids, 'timesheet'); // Link\Storage::get_links not egw_links::get_links!
 			if ($links)
 			{
-				$links = array_unique(call_user_func_array('array_merge',$links));
+				$links = array_unique(call_user_func_array('array_merge', $links));
 			}
 			return $links;
 		}
@@ -883,17 +883,17 @@ 
 	function notify($data)
 	{
 		//error_log(__METHOD__.'('.array2string($data).')');
-		$backup =& $this->data;	// backup internal data in case class got re-used by ExecMethod
+		$backup = & $this->data; // backup internal data in case class got re-used by ExecMethod
 		unset($this->data);
 
 		if ($data['target_app'] == 'projectmanager' && $this->read($data['id']))
 		{
 			$old_title = isset($data['data']) ? $data['data'][Link::OLD_LINK_TITLE] : null;
-			switch($data['type'])
+			switch ($data['type'])
 			{
 				case 'link':
 				case 'update':
-					if (empty($this->data['ts_project']) ||	// timesheet has not yet project set --> set just linked one
+					if (empty($this->data['ts_project']) || // timesheet has not yet project set --> set just linked one
 						isset($old_title) && $this->data['ts_project'] === $old_title)
 					{
 						$pm_id = $data['target_id'];
@@ -935,17 +935,17 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (($intern = !is_array($data)))
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		// get pm_id from links and ts_project: either project matching ts_project or first found project
 		if (!isset($data['pm_id']) && $data['ts_id'])
 		{
 			$first_pm_id = null;
-			foreach(Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
+			foreach (Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
 			{
 				if (!isset($first_pm_id)) $first_pm_id = $pm_id;
 				if ($data['ts_project'] == Link::title('projectmanager', $pm_id))
@@ -963,7 +963,7 @@ 
 			$data['ts_project_blur'] = $data['ts_project'];
 			$data['ts_project'] = '';
 		}
-		return parent::db2data($intern ? null : $data);	// important to use null, if $intern!
+		return parent::db2data($intern ? null : $data); // important to use null, if $intern!
 	}
 
 	/**
@@ -975,17 +975,17 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (($intern = !is_array($data)))
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		// allways store ts_project to be able to search for it, even if no custom project is set
 		if (empty($data['ts_project']) && !is_null($data['ts_project']))
 		{
 			$data['ts_project'] = $data['pm_id'] ? Link::title('projectmanager', $data['pm_id']) : '';
 		}
-		return parent::data2db($intern ? null : $data);	// important to use null, if $intern!
+		return parent::data2db($intern ? null : $data); // important to use null, if $intern!
 	}
 }

Braces +78 added lines, -20 removed lines

@@ -167,12 +167,18 @@ 
 	{
 		parent::__construct(TIMESHEET_APP,'egw_timesheet',self::EXTRA_TABLE,'','ts_extra_name','ts_extra_value','ts_id');
 
-		if ($this->customfields) $this->columns_to_search[] = self::EXTRA_TABLE.'.ts_extra_value';
+		if ($this->customfields)
+		{
+			$this->columns_to_search[] = self::EXTRA_TABLE.'.ts_extra_value';
+		}
 		$this->config_data = Api\Config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 
 		// Load & process statuses
-		if($this->config_data['status_labels']) $this->load_statuses();
+		if($this->config_data['status_labels'])
+		{
+			$this->load_statuses();
+		}
 
 		$this->today = mktime(0,0,0,date('m',$this->now),date('d',$this->now),date('Y',$this->now));
 
@@ -190,12 +196,16 @@ 
 	protected function load_statuses()
 	{
 		$this->status_labels =&  $this->config_data['status_labels'];
-		if (!is_array($this->status_labels)) $this->status_labels= array($this->status_labels);
+		if (!is_array($this->status_labels))
+		{
+			$this->status_labels= array($this->status_labels);
+		}
 
 		foreach ($this->status_labels as $status_id => $label)
 		{
 			if (!is_array($label))
-			{	//old values, before parent status
+			{
+//old values, before parent status
 				$name = $label;
 				$label=array();
 				$label['name'] = $name;
@@ -243,7 +253,10 @@ 
 	 */
 	function get_sub_status($status)
 	{
-		if (!isset($this->status_labels_config)) $this->load_statuses();
+		if (!isset($this->status_labels_config))
+		{
+			$this->load_statuses();
+		}
 		$stati = array($status);
 		foreach($this->status_labels_config as $stat)
 		{
@@ -319,9 +332,16 @@ 
 			$data = $this->read($data,true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data)
+			{
+				return null;
+			}
+			// entry not found
+		}
+		if (!$user)
+		{
+			$user = $this->user;
 		}
-		if (!$user) $user = $this->user;
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) && $data['ts_status'])
 		{
 			if ($this->status_labels_config[$data['ts_status']]['admin'])
@@ -354,9 +374,16 @@ 
 			$data = $this->read($data,true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data)
+			{
+				return null;
+			}
+			// entry not found
+		}
+		if (!$user)
+		{
+			$user = $this->user;
 		}
-		if (!$user) $user = $this->user;
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -430,7 +457,10 @@ 
 		}
 		else
 		{
-			if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
+			if (!is_array($filter['ts_owner']))
+			{
+				$filter['ts_owner'] = array($filter['ts_owner']);
+			}
 
 			foreach($filter['ts_owner'] as $key => $owner)
 			{
@@ -485,7 +515,10 @@ 
 		$this->summary = $this->summary[0];
 		$this->summary['max_modified'] = Api\DateTime::server2user($this->summary['max_modified']);
 
-		if ($only_summary) return $this->summary;
+		if ($only_summary)
+		{
+			return $this->summary;
+		}
 
 		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
@@ -561,7 +594,10 @@ 
 	 */
 	function save($keys=null,$touch_modified=true,$ignore_acl=false)
 	{
-		if ($keys) $this->data_merge($keys);
+		if ($keys)
+		{
+			$this->data_merge($keys);
+		}
 
 		if (!$ignore_acl && $this->data['ts_id'] && !$this->check_acl(Acl::EDIT))
 		{
@@ -583,10 +619,13 @@ 
 			$old =& $this->data;
 			$this->data =& $new;
 			$changed = array();
-			if (isset($old)) foreach($old as $name => $value)
+			if (isset($old))
+			{
+				foreach($old as $name => $value)
 			{
 				if (isset($new[$name]) && $new[$name] != $value) $changed[] = $name;
 			}
+			}
 		}
 		if (isset($old) && !$changed)
 		{
@@ -703,7 +742,10 @@ 
 		}
 
 		$this->data['ts_status'] = $status;
-		if ($this->save($ts_id)!=0) $ret = false;
+		if ($this->save($ts_id)!=0)
+		{
+			$ret = false;
+		}
 
 		return $ret;
 	}
@@ -747,10 +789,13 @@ 
 			return $entry;
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if (date('H:i',$entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
+		if (date('H:i',$entry['ts_start']) != '00:00')
+		{
+			// dont show 00:00 time, as it means date only
 		{
 			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 		}
+		}
 		return date($format,$entry['ts_start']).': '.$entry['ts_title'];
 	}
 
@@ -796,14 +841,18 @@ 
 	{
 		$limit = false;
 		$need_count = false;
-		if($options['start'] || $options['num_rows']) {
+		if($options['start'] || $options['num_rows'])
+		{
 			$limit = array($options['start'], $options['num_rows']);
 			$need_count = true;
 		}
 		$result = array();
 		foreach((array) $this->search($pattern,false,'','','%',false,'OR', $limit, null, '', $need_count) as $ts )
 		{
-			if ($ts) $result[$ts['ts_id']] = $this->link_title($ts);
+			if ($ts)
+			{
+				$result[$ts['ts_id']] = $this->link_title($ts);
+			}
 		}
 		$options['total'] = $need_count ? $this->total : count($result);
 		return $result;
@@ -922,7 +971,10 @@ 
 				//error_log(__METHOD__."() setting pm_id=$pm_id --> ".array2string($update));
 			}
 		}
-		if ($backup) $this->data = $backup;
+		if ($backup)
+		{
+			$this->data = $backup;
+		}
 	}
 
 
@@ -947,7 +999,10 @@ 
 			$first_pm_id = null;
 			foreach(Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
 			{
-				if (!isset($first_pm_id)) $first_pm_id = $pm_id;
+				if (!isset($first_pm_id))
+				{
+					$first_pm_id = $pm_id;
+				}
 				if ($data['ts_project'] == Link::title('projectmanager', $pm_id))
 				{
 					$data['pm_id'] = $pm_id;
@@ -956,7 +1011,10 @@ 
 					break;
 				}
 			}
-			if (!isset($data['pm_id']) && isset($first_pm_id)) $data['pm_id'] = $first_pm_id;
+			if (!isset($data['pm_id']) && isset($first_pm_id))
+			{
+				$data['pm_id'] = $first_pm_id;
+			}
 		}
 		elseif ($data['ts_id'] && $data['pm_id'] && Link::title('projectmanager', $data['pm_id']) == $data['ts_project'])
 		{

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

@@ -572,7 +572,7 @@
 	 * @param array $options Array of options for the search
 	 *
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query( $pattern, array &$options = array() )
 	{
 		if (is_array($pattern))
 		{

timesheet/inc/class.timesheet_datasource.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 	 * @param array $element source project element representing an InfoLog entry, $element['pe_app_id'] = info_id
 	 * @param int $target target project id
 	 * @param array $extra =null data of target-project, atm not used by the infolog datasource
-	 * @return array|boolean array(info_id,link_id) on success, false otherwise
+	 * @return boolean array(info_id,link_id) on success, false otherwise
 	 */
 	function copy($element,$target,$extra=null)
 	{

Spacing +5 added lines, -5 removed lines

@@ -43,14 +43,14 @@ 
 		}
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $GLOBALS['timesheet_bo']->read((int) $data_id)))
+			if (!(int)$data_id || !($data = $GLOBALS['timesheet_bo']->read((int)$data_id)))
 			{
 				return false;
 			}
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		$ds = array(
 			'pe_title'       => $GLOBALS['timesheet_bo']->link_title($data),
@@ -66,7 +66,7 @@ 
 		);
 		if ($data['ts_duration'])
 		{
-			$ds['pe_real_end'] = $data['ts_start'] + 60*$data['ts_duration'];
+			$ds['pe_real_end'] = $data['ts_start'] + 60 * $data['ts_duration'];
 			$ds['pe_used_time'] = $data['ts_duration'];
 		}
 		if ($this->debug)
@@ -85,9 +85,9 @@ 
 	 * @param array $extra =null data of target-project, atm not used by the infolog datasource
 	 * @return array|boolean array(info_id,link_id) on success, false otherwise
 	 */
-	function copy($element,$target,$extra=null)
+	function copy($element, $target, $extra = null)
 	{
-		unset($element,$target,$extra);	// not used, but required by function signature
+		unset($element, $target, $extra); // not used, but required by function signature
 
 		return false;
 	}

timesheet/inc/class.timesheet_export_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -132,7 +132,7 @@ 
 	 * return html for options.
 	 * this way the plugin has all opportunities for options tab
 	 *
-	 * @return string html
+	 * @return boolean html
 	 */
 	public function get_options_etpl() {
 		return false;

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * return html for options.

Spacing +25 added lines, -25 removed lines

@@ -27,51 +27,51 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$this->ui = new timesheet_ui();
 		$selection = array();
 
-		if($options['selection'] == 'search') {
-			$query = $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP);
-			$query['num_rows'] = -1;	// all records
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
-		} elseif($options['selection'] == 'all') {
+		if ($options['selection'] == 'search') {
+			$query = $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP);
+			$query['num_rows'] = -1; // all records
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
+		} elseif ($options['selection'] == 'all') {
 			$query = array(
 				'num_rows' => -1,
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
 			);
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
 		}
-		else if($options['selection'] == 'filter')
+		else if ($options['selection'] == 'filter')
 		{
 			$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
 			$filter = $_definition->filter;
 			$query = array(
 				'num_rows' => -1,
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
 				'col_filter' => array()
 			);
 
 			// Handle ranges
-			foreach($filter as $field => $value)
+			foreach ($filter as $field => $value)
 			{
-				if($field == 'cat_id')
+				if ($field == 'cat_id')
 				{
 					$query['cat_id'] = $value;
 					continue;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+				if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 				unset($query['col_filter'][$field]);
 			}
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
 		}
 
 
@@ -83,12 +83,12 @@ 
 		// support other selectors atm.
 		foreach ($selection as $identifier) {
 			$record = new timesheet_egw_record($identifier);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);
@@ -151,10 +151,10 @@ 
 	public function get_selects()
 	{
 		$this->selects = array(
-			'ts_status'	=>	$this->ui->status_labels+array(lang('No status'))
+			'ts_status'	=>	$this->ui->status_labels + array(lang('No status'))
 		);
-		foreach($this->selects['ts_status'] as &$status) {
-			$status = str_replace('&nbsp;','',$status); // Remove &nbsp;
+		foreach ($this->selects['ts_status'] as &$status) {
+			$status = str_replace('&nbsp;', '', $status); // Remove &nbsp;
 		}
 
 	}
@@ -163,9 +163,9 @@ 
 	 */
 	public function get_filter_fields(Array &$filters)
 	{
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 	}
 

Braces +52 added lines, -20 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * export plugin of addressbook
  */
-class timesheet_export_csv implements importexport_iface_export_plugin {
+class timesheet_export_csv implements importexport_iface_export_plugin
+{
 
 	public function __construct()
 	{
@@ -27,18 +28,22 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$this->ui = new timesheet_ui();
 		$selection = array();
 
-		if($options['selection'] == 'search') {
+		if($options['selection'] == 'search')
+		{
 			$query = $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP);
 			$query['num_rows'] = -1;	// all records
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
-		} elseif($options['selection'] == 'all') {
+		}
+		elseif($options['selection'] == 'all')
+		{
 			$query = array(
 				'num_rows' => -1,
 				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
@@ -64,11 +69,20 @@ 
 					continue;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if(!is_array($value) || (!$value['from'] && !$value['to']))
+				{
+					continue;
+				}
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if($value['from'])
+				{
+					$query['col_filter'][] = "$field >= " . (int)$value['from'];
+				}
+				if($value['to'])
+				{
+					$query['col_filter'][] = "$field <= " . (int)$value['to'];
+				}
 				unset($query['col_filter'][$field]);
 			}
 			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
@@ -81,14 +95,22 @@ 
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
-		foreach ($selection as $identifier) {
+		foreach ($selection as $identifier)
+		{
 			$record = new timesheet_egw_record($identifier);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -102,7 +124,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Timesheet CSV export');
 	}
 
@@ -111,7 +134,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports entries from your Timesheet into a CSV File. ");
 	}
 
@@ -120,11 +144,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -134,7 +160,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -142,7 +169,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'importexport.export_csv_selectors',
 		);
@@ -153,7 +181,8 @@ 
 		$this->selects = array(
 			'ts_status'	=>	$this->ui->status_labels+array(lang('No status'))
 		);
-		foreach($this->selects['ts_status'] as &$status) {
+		foreach($this->selects['ts_status'] as &$status)
+		{
 			$status = str_replace('&nbsp;','',$status); // Remove &nbsp;
 		}
 
@@ -165,7 +194,10 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

timesheet/inc/class.timesheet_favorite_portlet.inc.php

Doc Comments -2 removed lines

@@ -86,8 +86,6 @@
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
 	 *
-	 * @param type $id
-	 * @param Etemplate $etemplate
 	 */
 	public static function process($content = array())
 	{

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 		$context['appname'] = 'timesheet';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->context['template'] = 'timesheet.index.rows';
 		$this->nm_settings += array(
@@ -42,24 +42,24 @@ 
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 		$ui = new timesheet_ui();
 
 		$date_filters = array('All');
-		foreach(array_keys($ui->date_filters) as $name)
+		foreach (array_keys($ui->date_filters) as $name)
 		{
 			$date_filters[$name] = $name;
 		}
 		$date_filters['custom'] = 'custom';
 		$this->context['sel_options']['filter'] = $date_filters;
-		$this->context['sel_options']['filter2'] = array('No details','Details');
+		$this->context['sel_options']['filter2'] = array('No details', 'Details');
 		$read_grants = $ui->grant_list(Acl::READ);
 		$this->context['sel_options'] += array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
 			'cat_id'     => array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None'))),
-			'ts_status'  => $ui->status_labels+array(lang('No status')),
+			'ts_status'  => $ui->status_labels + array(lang('No status')),
 		);
 		$this->nm_settings['actions'] = $ui->get_actions($this->nm_settings);
 
@@ -112,29 +112,29 @@ 
 			if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
 			{
 				$msg = lang('You need to select some entries first!');
-				Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+				Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 			}
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($ui->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($ui->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, 'index', $msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2',$success,$action_msg);
+					$msg .= lang('%1 timesheets(s) %2', $success, $action_msg);
 
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($content['nm']['selected'] as &$id)
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($content['nm']['selected'] as &$id)
 					{
 						$id = 'timesheet::'.$id;
 					}
 					// Directly request an update - this will get timesheet tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 				}
-				Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+				Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 			}
 		}
 	}

Braces +4 added lines, -1 removed lines

@@ -76,9 +76,12 @@
 
 		// This is just copy+pasted from resources_ui line 816, but we don't want
 		// the etemplate exec to fire again.
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}

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

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();