EGroupware / egroupware

api/src/Cache/Apcu.php

Spacing +12 added lines, -12 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		if (!function_exists('apcu_fetch'))	// apc >= 3.0
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") No function apcu_fetch()!");
+			throw new Exception(__METHOD__.'('.array2string($params).") No function apcu_fetch()!");
 		}
 	}
 
@@ -65,7 +65,7 @@ 
 		{
 			$size = ini_get('apc.shm_size');
 
-			switch(strtoupper(substr($size, -1)))
+			switch (strtoupper(substr($size, -1)))
 			{
 				case 'G':
 					$size *= 1024;
@@ -91,9 +91,9 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0)
+	function add(array $keys, $data, $expiration = 0)
 	{
-		return apcu_add(self::key($keys),$data,$expiration);
+		return apcu_add(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -104,9 +104,9 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
-		return apcu_store(self::key($keys),$data,$expiration);
+		return apcu_store(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -118,7 +118,7 @@ 
 	function get(array $keys)
 	{
 		$success = null;
-		$data = apcu_fetch($key=self::key($keys),$success);
+		$data = apcu_fetch($key = self::key($keys), $success);
 
 		if (!$success)
 		{
@@ -160,12 +160,12 @@ 
 		// APCu > 5 has APCUIterator
 		if (class_exists('APCUIterator'))
 		{
-			$iterator = new \APCUIterator($preg='/^'.preg_quote(self::key($keys).'/'));
+			$iterator = new \APCUIterator($preg = '/^'.preg_quote(self::key($keys).'/'));
 		}
 		// APC >= 3.1.1, but also seems to be missing if apc is disabled eg. for cli
-		elseif(class_exists('APCIterator'))
+		elseif (class_exists('APCIterator'))
 		{
-			$iterator = new \APCIterator('user', $preg='/^'.preg_quote(self::key($keys).'/'));
+			$iterator = new \APCIterator('user', $preg = '/^'.preg_quote(self::key($keys).'/'));
 		}
 		else
 		{
@@ -173,7 +173,7 @@ 
 
 			return false;
 		}
-		foreach($iterator as $item)
+		foreach ($iterator as $item)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") preg='$preg': calling apcu_delete('$item[key]')");
 			apcu_delete($item['key']);
@@ -189,6 +189,6 @@ 
 	 */
 	private static function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

Braces +8 added lines, -2 removed lines

@@ -44,10 +44,13 @@ 
 	 */
 	function __construct(array $params)
 	{
-		if (!function_exists('apcu_fetch'))	// apc >= 3.0
+		if (!function_exists('apcu_fetch'))
+		{
+			// apc >= 3.0
 		{
 			throw new Exception (__METHOD__.'('.array2string($params).") No function apcu_fetch()!");
 		}
+		}
 	}
 
 	/**
@@ -169,7 +172,10 @@ 
 		}
 		else
 		{
-			if (function_exists('apcu_clear_cache')) apcu_clear_cache();
+			if (function_exists('apcu_clear_cache'))
+			{
+				apcu_clear_cache();
+			}
 
 			return false;
 		}

api/src/Cache/Apc.php

Spacing +9 added lines, -9 removed lines

@@ -46,7 +46,7 @@ 
 	{
 		if (!function_exists('apc_fetch'))	// apc >= 3.0
 		{
-			throw new Exception (__METHOD__.'('.array2string($params).") No function apc_fetch()!");
+			throw new Exception(__METHOD__.'('.array2string($params).") No function apc_fetch()!");
 		}
 	}
 
@@ -66,7 +66,7 @@ 
 			// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
 			if (is_numeric($size) && $size <= 1048576) $size .= 'M';
 
-			switch(strtoupper(substr($size, -1)))
+			switch (strtoupper(substr($size, -1)))
 			{
 				case 'G':
 					$size *= 1024;
@@ -92,9 +92,9 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error, incl. key already exists in cache
 	 */
-	function add(array $keys,$data,$expiration=0)
+	function add(array $keys, $data, $expiration = 0)
 	{
-		return apc_add(self::key($keys),$data,$expiration);
+		return apc_add(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -105,9 +105,9 @@ 
 	 * @param int $expiration =0
 	 * @return boolean true on success, false on error
 	 */
-	function set(array $keys,$data,$expiration=0)
+	function set(array $keys, $data, $expiration = 0)
 	{
-		return apc_store(self::key($keys),$data,$expiration);
+		return apc_store(self::key($keys), $data, $expiration);
 	}
 
 	/**
@@ -119,7 +119,7 @@ 
 	function get(array $keys)
 	{
 		$success = null;
-		$data = apc_fetch($key=self::key($keys),$success);
+		$data = apc_fetch($key = self::key($keys), $success);
 
 		if (!$success)
 		{
@@ -160,7 +160,7 @@ 
 			return false;
 		}
 		//error_log(__METHOD__."(".array2string($keys).")");
-		foreach(new \APCIterator('user', $preg='/^'.preg_quote(self::key($keys).'/')) as $item)
+		foreach (new \APCIterator('user', $preg = '/^'.preg_quote(self::key($keys).'/')) as $item)
 		{
 			//error_log(__METHOD__."(".array2string($keys).") preg='$preg': calling apc_delete('$item[key]')");
 			apc_delete($item['key']);
@@ -176,6 +176,6 @@ 
 	 */
 	private static function key(array $keys)
 	{
-		return implode('::',$keys);
+		return implode('::', $keys);
 	}
 }

Braces +12 added lines, -3 removed lines

@@ -44,10 +44,13 @@ 
 	 */
 	function __construct(array $params)
 	{
-		if (!function_exists('apc_fetch'))	// apc >= 3.0
+		if (!function_exists('apc_fetch'))
+		{
+			// apc >= 3.0
 		{
 			throw new Exception (__METHOD__.'('.array2string($params).") No function apc_fetch()!");
 		}
+		}
 	}
 
 	/**
@@ -64,7 +67,10 @@ 
 		{
 			$size = ini_get('apc.shm_size');
 			// ancent APC (3.1.3) in Debian 6/Squezze has size in MB without a unit
-			if (is_numeric($size) && $size <= 1048576) $size .= 'M';
+			if (is_numeric($size) && $size <= 1048576)
+			{
+				$size .= 'M';
+			}
 
 			switch(strtoupper(substr($size, -1)))
 			{
@@ -155,7 +161,10 @@ 
 		// APC >= 3.1.1, but also seems to be missing if apc is disabled eg. for cli
 		if (!class_exists('APCIterator') || !$keys)
 		{
-			if (function_exists('apc_clear_cache')) apc_clear_cache('user');
+			if (function_exists('apc_clear_cache'))
+			{
+				apc_clear_cache('user');
+			}
 
 			return false;
 		}

api/templates/default/images/mime128.php

Spacing +3 added lines, -3 removed lines

@@ -43,9 +43,9 @@
 	'ppt' => 'application/vnd.ms-powerpoint',
 	'qt' => 'video/quicktime',
 );
-$src_dir=__DIR__.'/MimeTypes-Link-Icons/images';
-$dst_dir=__DIR__;
-foreach(scandir($src_dir) as $file)
+$src_dir = __DIR__.'/MimeTypes-Link-Icons/images';
+$dst_dir = __DIR__;
+foreach (scandir($src_dir) as $file)
 {
 	if (preg_match('/^([^-]+)-icon-128x128.png$/', $file, $matches))
 	{

api/src/Mail/Credentials.php

Doc Comments +2 added lines, -3 removed lines

@@ -363,7 +363,7 @@ 
 	 *
 	 * @param string $password cleartext password
 	 * @param int $account_id user-account password is for
-	 * @param int& $pw_enc on return encryption used
+	 * @param integer $pw_enc on return encryption used
 	 * @return string encrypted password
 	 */
 	protected static function encrypt($password, $account_id, &$pw_enc)
@@ -436,7 +436,7 @@ 
 	 * With a 12 byte binary (16 byte base64) salt we can store 39 byte password in our varchar(80) column.
 	 *
 	 * @param string $password
-	 * @param string& $salt binary salt to use or null to generate one, on return used salt
+	 * @param string|null $salt binary salt to use or null to generate one, on return used salt
 	 * @param int $iterations =2048 iterations of passsword
 	 * @param int $length =16 length of binary aes key
 	 * @param string $hash ='sha256'
@@ -614,7 +614,6 @@ 
 	 *
 	 * @param array $row database row
 	 * @param string $key =null password to use
-	 * @param string $salt_len =16 len of base64 encoded salt (binary is 3/4)
 	 * @return string cleartext password
 	 * @throws Api\Exception\WrongParameter
 	 * @throws Api\Exception\AssertionFailed if OpenSSL extension not available

Spacing +38 added lines, -41 removed lines

@@ -153,7 +153,7 @@ 
 	 *	to run on successful login to trigger password migration
 	 * @return array with values for (imap|smtp|admin)_(username|password|cred_id)
 	 */
-	public static function read($acc_id, $type=null, $account_id=null, &$on_login=null)
+	public static function read($acc_id, $type = null, $account_id = null, &$on_login = null)
 	{
 		if (is_null($type)) $type = self::ALL;
 		if (is_null($account_id))
@@ -169,7 +169,7 @@ 
 			$rows = self::$db->select(self::TABLE, '*', array(
 				'acc_id' => $acc_id,
 				'account_id' => $account_id,
-				'(cred_type & '.(int)$type.') > 0',	// postgreSQL require > 0, or gives error as it expects boolean
+				'(cred_type & '.(int)$type.') > 0', // postgreSQL require > 0, or gives error as it expects boolean
 			), __LINE__, __FILE__, false,
 				// account_id DESC ensures 0=all allways overwrite (old user-specific credentials)
 				'ORDER BY account_id ASC', self::APP);
@@ -177,7 +177,7 @@ 
 		}
 		else
 		{
-			ksort($rows);	// ORDER BY account_id ASC
+			ksort($rows); // ORDER BY account_id ASC
 
 			// flatten account_id => cred_type => row array again, to have format like from database
 			$rows = call_user_func_array('array_merge', $rows);
@@ -185,7 +185,7 @@ 
 		}
 		$on_login = null;
 		$results = array();
-		foreach($rows as $row)
+		foreach ($rows as $row)
 		{
 			// update cache (only if we have database-iterator and all credentials asked!)
 			if (!is_array($rows) && $type == self::ALL)
@@ -203,9 +203,9 @@ 
 			// Remove special x char added to the end for \0 trimming escape.
 			if ($type == self::SMIME && substr($password, -1) === 'x') $password = substr($password, 0, -1);
 
-			foreach(self::$type2prefix as $pattern => $prefix)
+			foreach (self::$type2prefix as $pattern => $prefix)
 			{
-				if ($row['cred_type'] & $pattern)
+				if ($row['cred_type']&$pattern)
 				{
 					$results[$prefix.'username'] = $row['cred_username'];
 					$results[$prefix.'password'] = $password;
@@ -225,9 +225,9 @@ 
 	 * @param boolean $set_identity =true true: also set identity values realname&email, if not yet set
 	 * @return array with values for keys 'acc_(imap|smtp)_(username|password|cred_id)'
 	 */
-	public static function from_session(array $data, $set_identity=true)
+	public static function from_session(array $data, $set_identity = true)
 	{
-		switch($data['acc_imap_logintype'])
+		switch ($data['acc_imap_logintype'])
 		{
 			case 'standard':
 				$username = $GLOBALS['egw_info']['user']['account_lid'];
@@ -253,23 +253,21 @@ 
 				throw new Api\Exception\WrongParameter("Unknown data[acc_imap_logintype]=".array2string($data['acc_imap_logintype']).'!');
 		}
 		$password = base64_decode(Api\Cache::getSession('phpgwapi', 'password'));
-		$realname = !$set_identity || $data['ident_realname'] ? $data['ident_realname'] :
-			$GLOBALS['egw_info']['user']['account_fullname'];
-		$email = !$set_identity || $data['ident_email'] ? $data['ident_email'] :
-			$GLOBALS['egw_info']['user']['account_email'];
+		$realname = !$set_identity || $data['ident_realname'] ? $data['ident_realname'] : $GLOBALS['egw_info']['user']['account_fullname'];
+		$email = !$set_identity || $data['ident_email'] ? $data['ident_email'] : $GLOBALS['egw_info']['user']['account_email'];
 
 		return array(
 			'ident_realname' => $realname,
 			'ident_email' => $email,
 			'acc_imap_username' => $username,
 			'acc_imap_password' => $password,
-			'acc_imap_cred_id'  => $data['acc_imap_logintype'],	// to NOT store it
+			'acc_imap_cred_id'  => $data['acc_imap_logintype'], // to NOT store it
 			'acc_imap_account_id' => 'c',
 		) + ($data['acc_smtp_auth_session'] ? array(
 			// only set smtp
 			'acc_smtp_username' => $username,
 			'acc_smtp_password' => $password,
-			'acc_smtp_cred_id'  => $data['acc_imap_logintype'],	// to NOT store it
+			'acc_smtp_cred_id'  => $data['acc_imap_logintype'], // to NOT store it
 			'acc_smtp_account_id' => 'c',
 		) : array());
 	}
@@ -285,13 +283,13 @@ 
 	 * @param int $cred_id =null id of existing credentials to update
 	 * @return int cred_id
 	 */
-	public static function write($acc_id, $username, $password, $type, $account_id=0, $cred_id=null)
+	public static function write($acc_id, $username, $password, $type, $account_id = 0, $cred_id = null)
 	{
 		//error_log(__METHOD__."(acc_id=$acc_id, '$username', \$password, type=$type, account_id=$account_id, cred_id=$cred_id)");
 		if (!empty($cred_id) && !is_numeric($cred_id) || !is_numeric($account_id))
 		{
 			//error_log(__METHOD__."($acc_id, '$username', \$password, $type, $account_id, ".array2string($cred_id).") not storing session credentials!");
-			return;	// do NOT store credentials from session of current user!
+			return; // do NOT store credentials from session of current user!
 		}
 		
 		// Add arbitary char to the ending to make sure the Smime binary content
@@ -302,15 +300,14 @@ 
 		if ((string)$username === '')
 		{
 			if ($cred_id) self::$db->delete(self::TABLE, array('cred_id' => $cred_id), __LINE__, __FILE__, self::APP);
-			return;	// nothing to save
+			return; // nothing to save
 		}
 		$pw_enc = self::CLEARTEXT;
 		$data = array(
 			'acc_id' => $acc_id,
 			'account_id' => $account_id,
 			'cred_username' => $username,
-			'cred_password' => (string)$password === '' ? '' :
-				self::encrypt($password, $account_id, $pw_enc),
+			'cred_password' => (string)$password === '' ? '' : self::encrypt($password, $account_id, $pw_enc),
 			'cred_type' => $type,
 			'cred_pw_enc' => $pw_enc,
 		);
@@ -350,7 +347,7 @@ 
 	 * @param boolean $exact_type =false true: delete only cred_type=$type, false: delete cred_type&$type
 	 * @return int number of rows deleted
 	 */
-	public static function delete($acc_id, $account_id=null, $type=self::ALL, $exact_type=false)
+	public static function delete($acc_id, $account_id = null, $type = self::ALL, $exact_type = false)
 	{
 		if (!($acc_id > 0) && !isset($account_id))
 		{
@@ -365,12 +362,12 @@ 
 		}
 		elseif ($type != self::ALL)
 		{
-			$where[] = '(cred_type & '.(int)$type.') > 0';	// postgreSQL require > 0, or gives error as it expects boolean
+			$where[] = '(cred_type & '.(int)$type.') > 0'; // postgreSQL require > 0, or gives error as it expects boolean
 		}
 		self::$db->delete(self::TABLE, $where, __LINE__, __FILE__, self::APP);
 
 		// invalidate cache: we allways unset everything about an account to simplify cache handling
-		foreach($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
+		foreach ($acc_id > 0 ? (array)$acc_id : array_keys(self::$cache) as $acc_id)
 		{
 			unset(self::$cache[$acc_id]);
 		}
@@ -428,7 +425,7 @@ 
 	 * @param string $salt =null (binary) salt to use, default generate new random salt
 	 * @return string encrypted password
 	 */
-	protected static function encrypt_openssl_aes($password, $account_id, &$pw_enc, $key=null, $salt=null)
+	protected static function encrypt_openssl_aes($password, $account_id, &$pw_enc, $key = null, $salt = null)
 	{
 		if (empty($key))
 		{
@@ -463,7 +460,7 @@ 
 	 * @param string $hash ='sha256'
 	 * @return string
 	 */
-	protected static function aes_key($password, &$salt, $iterations=2048, $length=16, $hash='sha256')
+	protected static function aes_key($password, &$salt, $iterations = 2048, $length = 16, $hash = 'sha256')
 	{
 		if (empty($salt))
 		{
@@ -518,7 +515,7 @@ 
 	 * @throws Api\Exception\WrongParameter
 	 * @throws Api\Exception\AssertionFailed if neither OpenSSL nor MCrypt extension available
 	 */
-	protected static function decrypt(array $row, $key=null)
+	protected static function decrypt(array $row, $key = null)
 	{
 		// empty/unset passwords only give warnings ...
 		if (empty($row['cred_password'])) return '';
@@ -528,7 +525,7 @@ 
 			return self::UNAVAILABLE;
 		}
 
-		switch($row['cred_pw_enc'])
+		switch ($row['cred_pw_enc'])
 		{
 			case self::CLEARTEXT:
 				return base64_decode($row['cred_password']);
@@ -544,7 +541,7 @@ 
 					// ToDo store as AES
 					return $password;
 				}
-				catch(Api\Exception\AssertionFailed $e) {
+				catch (Api\Exception\AssertionFailed $e) {
 					unset($e);
 					// try Mcrypt
 					return self::decrypt_mcrypt_3des($row);
@@ -562,7 +559,7 @@ 
 	 * @throws Api\Exception\WrongParameter
 	 * @throws Api\Exception\AssertionFailed if MCrypt extension not available
 	 */
-	protected static function decrypt_mcrypt_3des(array $row, $key=null)
+	protected static function decrypt_mcrypt_3des(array $row, $key = null)
 	{
 		check_load_extension('mcrypt', true);
 
@@ -616,7 +613,7 @@ 
 	 * @throws Api\Exception\WrongParameter
 	 * @throws Api\Exception\AssertionFailed if OpenSSL extension not available
 	 */
-	protected static function decrypt_openssl_3des(array $row, $key=null)
+	protected static function decrypt_openssl_3des(array $row, $key = null)
 	{
 		check_load_extension('openssl', true);
 
@@ -626,7 +623,7 @@ 
 		}
 		// seems iv is NOT used for mcrypt "tripledes/ecb" = openssl "des-ede3", only key-size 24
 		$keySize = 24;
-		if (bytes($key) > $keySize) $key = cut_bytes($key,0,$keySize-1);	// $keySize-1 is wrong, but that's what's used!
+		if (bytes($key) > $keySize) $key = cut_bytes($key, 0, $keySize - 1); // $keySize-1 is wrong, but that's what's used!
 		return trim(openssl_decrypt($row['cred_password'], self::TRIPLEDES_ECB_METHOD, $key, OPENSSL_ZERO_PADDING, ''), "\0");
 	}
 
@@ -640,7 +637,7 @@ 
 	 * @throws Api\Exception\WrongParameter
 	 * @throws Api\Exception\AssertionFailed if OpenSSL extension not available
 	 */
-	protected static function decrypt_openssl_aes(array $row, $key=null)
+	protected static function decrypt_openssl_aes(array $row, $key = null)
 	{
 		check_load_extension('openssl', true);
 
@@ -676,9 +673,9 @@ 
 		try {
 			if (isset(self::$cache[$acc_id]))
 			{
-				foreach(self::$cache[$acc_id] as $account_id => &$rows)
+				foreach (self::$cache[$acc_id] as $account_id => &$rows)
 				{
-					foreach($rows as $cred_type => &$row)
+					foreach ($rows as $cred_type => &$row)
 					{
 						if (self::needMigration($row['cred_pw_enc']) && ($row['cred_pw_enc'] != self::USER ||
 							$row['cred_pw_enc'] == self::USER && $account_id == $GLOBALS['egw_info']['user']['account_id']))
@@ -689,7 +686,7 @@ 
 				}
 			}
 		}
-		catch(\Exception $e) {
+		catch (\Exception $e) {
 			// do not stall regular use, if password migration fails
 			_egw_log_exception($e);
 		}
@@ -715,9 +712,9 @@ 
 			throw new Api\Exception\AssertionFailed('Password in session !== password given in $data[new_password]!');
 		}
 
-		foreach(self::$db->select(self::TABLE, self::TABLE.'.*', array(
+		foreach (self::$db->select(self::TABLE, self::TABLE.'.*', array(
 			'account_id' => $data['account_id']
-		),__LINE__, __FILE__, false, '', self::APP, 0, self::USER_EDITABLE_JOIN.self::$db->quote(true, 'bool')) as $row)
+		), __LINE__, __FILE__, false, '', self::APP, 0, self::USER_EDITABLE_JOIN.self::$db->quote(true, 'bool')) as $row)
 		{
 			$password = self::decrypt($row, self::isUser($row['cred_pw_enc']) ? $data['old_passwd'] : null);
 
@@ -735,7 +732,7 @@ 
 	 * @param string $mode ='ecb'
 	 * @return ressource|boolean mcrypt ressource to use or false if not available
 	 */
-	static public function init_crypt($user=false, $algo='tripledes',$mode='ecb')
+	static public function init_crypt($user = false, $algo = 'tripledes', $mode = 'ecb')
 	{
 		if (is_string($user))
 		{
@@ -743,11 +740,11 @@ 
 		}
 		elseif ($user)
 		{
-			$mcrypt =& self::$user_mcrypt;
+			$mcrypt = & self::$user_mcrypt;
 		}
 		else
 		{
-			$mcrypt =& self::$system_mcrypt;
+			$mcrypt = & self::$system_mcrypt;
 		}
 		if (!isset($mcrypt))
 		{
@@ -785,10 +782,10 @@ 
 			{
 				$iv_size = mcrypt_enc_get_iv_size($mcrypt);
 				$iv = !isset($GLOBALS['egw_info']['server']['mcrypt_iv']) || strlen($GLOBALS['egw_info']['server']['mcrypt_iv']) < $iv_size ?
-					mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
+					mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'], 0, $iv_size);
 
 				$key_size = mcrypt_enc_get_key_size($mcrypt);
-				if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+				if (bytes($key) > $key_size) $key = cut_bytes($key, 0, $key_size - 1);
 
 				if (mcrypt_generic_init($mcrypt, $key, $iv) < 0)
 				{

Braces +41 added lines, -10 removed lines

@@ -155,7 +155,10 @@ 
 	 */
 	public static function read($acc_id, $type=null, $account_id=null, &$on_login=null)
 	{
-		if (is_null($type)) $type = self::ALL;
+		if (is_null($type))
+		{
+			$type = self::ALL;
+		}
 		if (is_null($account_id))
 		{
 			$account_id = array(0, $GLOBALS['egw_info']['user']['account_id']);
@@ -201,7 +204,10 @@ 
 			$password = self::decrypt($row);
 
 			// Remove special x char added to the end for \0 trimming escape.
-			if ($type == self::SMIME && substr($password, -1) === 'x') $password = substr($password, 0, -1);
+			if ($type == self::SMIME && substr($password, -1) === 'x')
+			{
+				$password = substr($password, 0, -1);
+			}
 
 			foreach(self::$type2prefix as $pattern => $prefix)
 			{
@@ -296,12 +302,18 @@ 
 		
 		// Add arbitary char to the ending to make sure the Smime binary content
 		// with \0 at the end not getting trimmed of while trying to decrypt.
-		if ($type == self::SMIME) $password .= 'x';
+		if ($type == self::SMIME)
+		{
+			$password .= 'x';
+		}
 
 		// no need to write empty usernames, but delete existing row
 		if ((string)$username === '')
 		{
-			if ($cred_id) self::$db->delete(self::TABLE, array('cred_id' => $cred_id), __LINE__, __FILE__, self::APP);
+			if ($cred_id)
+			{
+				self::$db->delete(self::TABLE, array('cred_id' => $cred_id), __LINE__, __FILE__, self::APP);
+			}
 			return;	// nothing to save
 		}
 		$pw_enc = self::CLEARTEXT;
@@ -357,8 +369,14 @@ 
 			throw new Api\Exception\WrongParameter(__METHOD__."() no acc_id AND no account_id parameter!");
 		}
 		$where = array();
-		if ($acc_id > 0) $where['acc_id'] = $acc_id;
-		if (isset($account_id)) $where['account_id'] = $account_id;
+		if ($acc_id > 0)
+		{
+			$where['acc_id'] = $acc_id;
+		}
+		if (isset($account_id))
+		{
+			$where['account_id'] = $account_id;
+		}
 		if ($exact_type)
 		{
 			$where['cred_type'] = $type;
@@ -521,7 +539,10 @@ 
 	protected static function decrypt(array $row, $key=null)
 	{
 		// empty/unset passwords only give warnings ...
-		if (empty($row['cred_password'])) return '';
+		if (empty($row['cred_password']))
+		{
+			return '';
+		}
 
 		if (self::isUser($row['cred_pw_enc']) && $row['account_id'] != $GLOBALS['egw_info']['user']['account_id'])
 		{
@@ -626,7 +647,11 @@ 
 		}
 		// seems iv is NOT used for mcrypt "tripledes/ecb" = openssl "des-ede3", only key-size 24
 		$keySize = 24;
-		if (bytes($key) > $keySize) $key = cut_bytes($key,0,$keySize-1);	// $keySize-1 is wrong, but that's what's used!
+		if (bytes($key) > $keySize)
+		{
+			$key = cut_bytes($key,0,$keySize-1);
+		}
+		// $keySize-1 is wrong, but that's what's used!
 		return trim(openssl_decrypt($row['cred_password'], self::TRIPLEDES_ECB_METHOD, $key, OPENSSL_ZERO_PADDING, ''), "\0");
 	}
 
@@ -707,7 +732,10 @@ 
 	 */
 	static public function changepassword(array $data)
 	{
-		if (empty($data['old_passwd'])) return;
+		if (empty($data['old_passwd']))
+		{
+			return;
+		}
 
 		// as self::encrypt will use password in session, check it is identical to given new password
 		if ($data['new_passwd'] !== base64_decode(Api\Cache::getSession('phpgwapi', 'password')))
@@ -788,7 +816,10 @@ 
 					mcrypt_create_iv ($iv_size, MCRYPT_RAND) : substr($GLOBALS['egw_info']['server']['mcrypt_iv'],0,$iv_size);
 
 				$key_size = mcrypt_enc_get_key_size($mcrypt);
-				if (bytes($key) > $key_size) $key = cut_bytes($key,0,$key_size-1);
+				if (bytes($key) > $key_size)
+				{
+					$key = cut_bytes($key,0,$key_size-1);
+				}
 
 				if (mcrypt_generic_init($mcrypt, $key, $iv) < 0)
 				{

admin/inc/class.admin_customfields.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -548,7 +548,7 @@
 	 * Validate and create a new content type
 	 *
 	 * @param array $content
-	 * @return string|boolean New type ID, or false for error
+	 * @return false|string New type ID, or false for error
 	 */
 	function create_content_type(&$content)
 	{

Indentation +27 added lines, -27 removed lines

@@ -32,10 +32,10 @@ 
 {
 
 	/**
-	* appname of app which want to add / edit its customfields
-	*
-	* @var string
-	*/
+	 * appname of app which want to add / edit its customfields
+	 *
+	 * @var string
+	 */
 	var $appname;
 
 	/**
@@ -44,10 +44,10 @@ 
 	protected $use_private = false;
 
 	/**
-	* userdefiened types e.g. type of infolog
-	*
-	* @var array
-	*/
+	 * userdefiened types e.g. type of infolog
+	 *
+	 * @var array
+	 */
 	var $types2 = array();
 	var $content_types,$fields;
 
@@ -507,8 +507,8 @@ 
 	}
 
 	/**
-	* deletes custom field from customfield definitions
-	*/
+	 * deletes custom field from customfield definitions
+	 */
 	function delete_field(&$content)
 	{
 		unset($this->fields[key($content['fields']['delete'])]);
@@ -525,8 +525,8 @@ 
 	}
 
 	/**
-	* create a new custom field
-	*/
+	 * create a new custom field
+	 */
 	function create_field(&$content)
 	{
 		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
@@ -587,8 +587,8 @@ 
 	}
 
 	/**
-	* save changes to repository
-	*/
+	 * save changes to repository
+	 */
 	function save_repository()
 	{
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
@@ -601,25 +601,25 @@ 
 	}
 
 	/**
-	* get customfields of using application
-	*
-	* @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @param boolean $all_private_too =false should all the private fields be returned too
-	* @return array with customfields
-	*/
+	 * get customfields of using application
+	 *
+	 * @deprecated use Api\Storage\Customfields::get() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @param boolean $all_private_too =false should all the private fields be returned too
+	 * @return array with customfields
+	 */
 	function get_customfields($all_private_too=false)
 	{
 		return Api\Storage\Customfields::get($this->appname,$all_private_too);
 	}
 
 	/**
-	* get_content_types of using application
-	*
-	* @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
-	* @author Cornelius Weiss
-	* @return array with content-types
-	*/
+	 * get_content_types of using application
+	 *
+	 * @deprecated use Api\Config::get_content_types() direct, no need to instanciate this UI class
+	 * @author Cornelius Weiss
+	 * @return array with content-types
+	 */
 	function get_content_types()
 	{
 		return Api\Config::get_content_types($this->appname);

Braces +21 added lines, -5 removed lines

@@ -127,7 +127,10 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if(!$this->appname)
+		{
+			die(lang('Error! No appname found'));
+		}
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
@@ -139,7 +142,10 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		// Handle incoming - types, options, etc.
 		if($this->manage_content_types)
@@ -359,7 +365,11 @@ 
 										lang('Invalide value "%1", use only:', $var)."\n".
 											preg_replace('/^.*\[([^]]+)\].*$/', '$1', self::CHECK_MULTISELCT_VALUE));
 									$action = 'apply';	// do not close the window to show validation error
-									if (!$cf_id) break 2;	// only stop storing of new CFs
+									if (!$cf_id)
+									{
+										break 2;
+									}
+									// only stop storing of new CFs
 								}
 								$values[$var] = trim($value)==='' ? $var : $value;
 							}
@@ -399,7 +409,10 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if($test->read($this->appname.'.admin.types'))
+		{
+			$this->manage_content_types = true;
+		}
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfield_edit');
@@ -567,7 +580,10 @@ 
 		else
 		{
 			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			if(!$this->fields[$new_name]['label'])
+			{
+				$this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			}
 			$this->save_repository();
 		}
 	}

Spacing +80 added lines, -81 removed lines

@@ -49,7 +49,7 @@ 
 	* @var array
 	*/
 	var $types2 = array();
-	var $content_types,$fields;
+	var $content_types, $fields;
 
 	/**
 	 * Does App uses content-types
@@ -110,14 +110,14 @@ 
 	 *
 	 * @param string $appname
 	 */
-	function __construct($appname='')
+	function __construct($appname = '')
 	{
 		if (($this->appname = $appname))
 		{
-			$this->fields = Api\Storage\Customfields::get($this->appname,true);
+			$this->fields = Api\Storage\Customfields::get($this->appname, true);
 			$this->content_types = Api\Config::get_content_types($this->appname);
 		}
-		$this->so = new Api\Storage\Base('phpgwapi','egw_customfields',null,'',true);
+		$this->so = new Api\Storage\Base('phpgwapi', 'egw_customfields', null, '', true);
 	}
 
 	/**
@@ -127,43 +127,43 @@ 
 	{
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['appname'] ? $content['appname'] : false));
-		if(!$this->appname) die(lang('Error! No appname found'));
+		if (!$this->appname) die(lang('Error! No appname found'));
 
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = Api\Storage\Customfields::get($this->appname,true);
+		$this->fields = Api\Storage\Customfields::get($this->appname, true);
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfields');
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		// Handle incoming - types, options, etc.
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = Api\Config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
-				$this->content_types = (array)Api\Link::get_registry($this->appname,'default_types');
+				$this->content_types = (array)Api\Link::get_registry($this->appname, 'default_types');
 			}
 			// Set this now, we need to know it for updates
-			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0,$this->content_types) ? $this->content_types[0] : key($this->content_types));
+			$this->content_type = $content['content_types']['types'] ? $content['content_types']['types'] : (array_key_exists(0, $this->content_types) ? $this->content_types[0] : key($this->content_types));
 
 			// Common type changes - add, delete
-			if($content['content_types']['delete'])
+			if ($content['content_types']['delete'])
 			{
 				$this->delete_content_type($content);
 			}
-			elseif($content['content_types']['create'])
+			elseif ($content['content_types']['create'])
 			{
-				if(($new_type = $this->create_content_type($content)))
+				if (($new_type = $this->create_content_type($content)))
 				{
 					$content['content_types']['types'] = $this->content_type = $new_type;
 				}
@@ -171,18 +171,18 @@ 
 				unset($content['content_types']['name']);
 			}
 			// No common type change and type didn't change, try an update
-			elseif($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
+			elseif ($this->content_type && is_array($content) && $this->content_type == $content['old_content_type'])
 			{
 				$this->update($content);
 			}
 		}
 
 		// Custom field deleted from nextmatch
-		if($content['nm']['action'] == 'delete')
+		if ($content['nm']['action'] == 'delete')
 		{
-			foreach($this->fields as $name => $data)
+			foreach ($this->fields as $name => $data)
 			{
-				if(in_array($data['id'],$content['nm']['selected']))
+				if (in_array($data['id'], $content['nm']['selected']))
 				{
 					unset($this->fields[$name]);
 				}
@@ -191,7 +191,7 @@ 
 			$this->save_repository();
 		}
 
-		$content['nm']= Api\Cache::getSession('admin', 'customfield-index');
+		$content['nm'] = Api\Cache::getSession('admin', 'customfield-index');
 		if (!is_array($content['nm']))
 		{
 			// Initialize nextmatch
@@ -201,8 +201,8 @@ 
 				'no_filter'      => 'true',
 				'no_filter2'     => 'true',
 				'row_id'         => 'cf_id',
-				'order'          =>	'cf_order',// IO name of the column to sort
-				'sort'           =>	'ASC',// IO direction of the sort: 'ASC' or 'DESC'
+				'order'          =>	'cf_order', // IO name of the column to sort
+				'sort'           =>	'ASC', // IO direction of the sort: 'ASC' or 'DESC'
 				'actions'        => $this->get_actions()
 			);
 		}
@@ -210,11 +210,11 @@ 
 		$content['nm']['use_private'] = $this->use_private;
 
 		// Set up sub-types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
-				if(!is_array($entry))
+				if (!is_array($entry))
 				{
 					$this->content_types[$type] = array('name' => $entry);
 					$entry = $this->content_types[$type];
@@ -223,7 +223,7 @@ 
 			}
 			$sel_options['types'] = $sel_options['cf_type2'] = $this->types2;
 
-			$content['type_template'] = $this->appname . '.admin.types';
+			$content['type_template'] = $this->appname.'.admin.types';
 			$content['content_types']['appname'] = $this->appname;
 
 			$content['content_type_options'] = $this->content_types[$this->content_type]['options'];
@@ -265,16 +265,16 @@ 
 		static::app_index($content, $sel_options, $readonlys, $preserve);
 
 		// Make sure app css gets loaded, extending app might cause et2 to miss it
-		Framework::includeCSS('admin','app');
+		Framework::includeCSS('admin', 'app');
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 
 		// Some logic to make sure extending class (if there is one) gets called
 		// when etemplate2 comes back instead of parent class
 		$exec = get_class() == get_called_class() || get_called_class() == 'customfields' ?
-			'admin.admin_customfields.index' : $this->appname . '.' . get_called_class() . '.index';
+			'admin.admin_customfields.index' : $this->appname.'.'.get_called_class().'.index';
 
-		$this->tmpl->exec($exec,$content,$sel_options,$readonlys,$preserve);
+		$this->tmpl->exec($exec, $content, $sel_options, $readonlys, $preserve);
 	}
 
 	/**
@@ -296,28 +296,28 @@ 
 
 		// determine appname
 		$this->appname = $this->appname ? $this->appname : ($_GET['appname'] ? $_GET['appname'] : ($content['cf_app'] ? $content['cf_app'] : false));
-		if(!$this->appname)
+		if (!$this->appname)
 		{
-			if($cf_id && $this->so)
+			if ($cf_id && $this->so)
 			{
 				$content = $this->so->read($cf_id);
 				$this->appname = $content['cf_app'];
 			}
 		}
-		if(!$this->appname)
+		if (!$this->appname)
 		{
 			die(lang('Error! No appname found'));
 		}
 		$this->use_private = !isset($_GET['use_private']) || (boolean)$_GET['use_private'] || $content['use_private'];
 
 		// Read fields, constructor doesn't always know appname
-		$this->fields = Api\Storage\Customfields::get($this->appname,true);
+		$this->fields = Api\Storage\Customfields::get($this->appname, true);
 
 		// Update based on info returned from template
 		if (is_array($content))
 		{
 			list($action) = @each($content['button']);
-			switch($action)
+			switch ($action)
 			{
 				case 'delete':
 					$this->so->delete($cf_id);
@@ -326,54 +326,54 @@ 
 					break;
 				case 'save':
 				case 'apply':
-					if(!$cf_id && $this->fields[$content['cf_name']])
+					if (!$cf_id && $this->fields[$content['cf_name']])
 					{
-						Framework::message(lang("Field '%1' already exists !!!",$content['cf_name']),'error');
+						Framework::message(lang("Field '%1' already exists !!!", $content['cf_name']), 'error');
 						$content['cf_name'] = '';
 						break;
 					}
-					if(empty($content['cf_label']))
+					if (empty($content['cf_label']))
 					{
 						$content['cf_label'] = $content['cf_name'];
 					}
 					if (!empty($content['cf_values']))
 					{
 						$values = array();
-						if($content['cf_values'][0] === '@')
+						if ($content['cf_values'][0] === '@')
 						{
-							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2:1);
+							$values['@'] = substr($content['cf_values'], $content['cf_values'][1] === '=' ? 2 : 1);
 						}
 						else
 						{
-							foreach(explode("\n",trim($content['cf_values'])) as $line)
+							foreach (explode("\n", trim($content['cf_values'])) as $line)
 							{
-								list($var_raw,$value) = explode('=',trim($line),2);
+								list($var_raw, $value) = explode('=', trim($line), 2);
 								$var = trim($var_raw);
 								if (!preg_match(self::CHECK_MULTISELCT_VALUE, $var))
 								{
 									Api\Etemplate::set_validation_error('cf_values',
 										lang('Invalide value "%1", use only:', $var)."\n".
 											preg_replace('/^.*\[([^]]+)\].*$/', '$1', self::CHECK_MULTISELCT_VALUE));
-									$action = 'apply';	// do not close the window to show validation error
-									if (!$cf_id) break 2;	// only stop storing of new CFs
+									$action = 'apply'; // do not close the window to show validation error
+									if (!$cf_id) break 2; // only stop storing of new CFs
 								}
-								$values[$var] = trim($value)==='' ? $var : $value;
+								$values[$var] = trim($value) === '' ? $var : $value;
 							}
 						}
 						$content['cf_values'] = $values;
 					}
 					$update_content = array();
-					foreach($content as $key => $value)
+					foreach ($content as $key => $value)
 					{
-						if(substr($key,0,3) == 'cf_')
+						if (substr($key, 0, 3) == 'cf_')
 						{
-							$update_content[substr($key,3)] = $value;
+							$update_content[substr($key, 3)] = $value;
 						}
 					}
 					Api\Storage\Customfields::update($update_content);
-					if(!$cf_id)
+					if (!$cf_id)
 					{
-						$this->fields = Api\Storage\Customfields::get($this->appname,true);
+						$this->fields = Api\Storage\Customfields::get($this->appname, true);
 						$cf_id = (int)$this->fields[$content['cf_name']]['id'];
 					}
 					Framework::refresh_opener('Saved', 'admin', $cf_id, 'edit');
@@ -394,30 +394,30 @@ 
 
 		// do we manage content-types?
 		$test = new Etemplate();
-		if($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
+		if ($test->read($this->appname.'.admin.types')) $this->manage_content_types = true;
 
 		$this->tmpl = new Etemplate();
 		$this->tmpl->read('admin.customfield_edit');
 
-		Api\Translation::add_app('infolog');	// til we move the translations
+		Api\Translation::add_app('infolog'); // til we move the translations
 
 		$GLOBALS['egw_info']['flags']['app_header'] = $GLOBALS['egw_info']['apps'][$this->appname]['title'].' - '.lang('Custom fields');
 		$sel_options = array();
 		$readonlys = array();
 
 		//echo 'customfields=<pre style="text-align: left;">'; print_r($this->fields); echo "</pre>\n";
-		$content['cf_order'] = (count($this->fields)+1) * 10;
+		$content['cf_order'] = (count($this->fields) + 1) * 10;
 		$content['use_private'] = $this->use_private;
 
-		if($cf_id)
+		if ($cf_id)
 		{
 			$content = array_merge($content, $this->so->read($cf_id));
 			$this->appname = $content['cf_app'];
-			if($content['cf_private'])
+			if ($content['cf_private'])
 			{
-				$content['cf_private'] = explode(',',$content['cf_private']);
+				$content['cf_private'] = explode(',', $content['cf_private']);
 			}
-			if($content['cf_name'])
+			if ($content['cf_name'])
 			{
 				$readonlys['cf_name'] = true;
 			}
@@ -430,7 +430,7 @@ 
 		if (is_array($content['cf_values']))
 		{
 			$values = '';
-			foreach($content['cf_values'] as $var => $value)
+			foreach ($content['cf_values'] as $var => $value)
 			{
 				$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 			}
@@ -438,18 +438,18 @@ 
 		}
 
 		// Show sub-type row, and get types
-		if($this->manage_content_types)
+		if ($this->manage_content_types)
 		{
-			if(count($this->content_types) == 0)
+			if (count($this->content_types) == 0)
 			{
 				$this->content_types = Api\Config::get_content_types($this->appname);
 			}
-			if (count($this->content_types)==0)
+			if (count($this->content_types) == 0)
 			{
 				// if you define your default types of your app with the search_link hook, they are available here, if no types were found
 				$this->content_types = (array)Api\Link::get_registry($this->appname, 'default_types');
 			}
-			foreach($this->content_types as $type => $entry)
+			foreach ($this->content_types as $type => $entry)
 			{
 				$this->types2[$type] = is_array($entry) ? $entry['name'] : $entry;
 			}
@@ -461,19 +461,19 @@ 
 		}
 
 		// Include type-specific value help
-		foreach(self::$type_option_help as $key => $value)
+		foreach (self::$type_option_help as $key => $value)
 		{
 			$content['options'][$key] = lang($value);
 		}
 		$content['statustext'] = $content['options'][$content['cf_type']];
 		$content['attributes'] = self::$type_attribute_flags;
 
-		$this->tmpl->exec('admin.admin_customfields.edit',$content,$sel_options,$readonlys,array(
+		$this->tmpl->exec('admin.admin_customfields.edit', $content, $sel_options, $readonlys, array(
 			'cf_id' => $cf_id,
 			'cf_app' => $this->appname,
 			'cf_name' => $content['cf_name'],
 			'use_private' => $this->use_private,
-		),2);
+		), 2);
 	}
 
 	/**
@@ -482,7 +482,7 @@ 
 	 */
 	protected function app_index(&$content, &$sel_options, &$readonlys, &$preserve)
 	{
-		unset($content, $sel_options, $readonlys, $preserve);	// not used, as this is a stub
+		unset($content, $sel_options, $readonlys, $preserve); // not used, as this is a stub
 		// This is just a stub.
 	}
 
@@ -502,7 +502,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=admin.admin_customfields.edit&cf_id=$id&use_private='.$this->use_private,
 				'popup' => '500x380',
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
 			),
 			'add' => array(
@@ -552,17 +552,16 @@ 
 	*/
 	function create_field(&$content)
 	{
-		$new_name = trim($content['fields'][count($content['fields'])-1]['name']);
+		$new_name = trim($content['fields'][count($content['fields']) - 1]['name']);
 		if (empty($new_name) || isset($this->fields[$new_name]))
 		{
 			$content['error_msg'] .= empty($new_name) ?
-				lang('You have to enter a name, to create a new field!!!') :
-				lang("Field '%1' already exists !!!",$new_name);
+				lang('You have to enter a name, to create a new field!!!') : lang("Field '%1' already exists !!!", $new_name);
 		}
 		else
 		{
-			$this->fields[$new_name] = $content['fields'][count($content['fields'])-1];
-			if(!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
+			$this->fields[$new_name] = $content['fields'][count($content['fields']) - 1];
+			if (!$this->fields[$new_name]['label']) $this->fields[$new_name]['label'] = $this->fields[$new_name]['name'];
 			$this->save_repository();
 		}
 	}
@@ -579,20 +578,20 @@ 
 		$new_type = false;
 		if (empty($new_name))
 		{
-			$this->tmpl->set_validation_error('content_types[name]','You have to enter a name, to create a new type!!!');
+			$this->tmpl->set_validation_error('content_types[name]', 'You have to enter a name, to create a new type!!!');
 		}
 		else
 		{
-			foreach($this->content_types as $type)
+			foreach ($this->content_types as $type)
 			{
-				if($type['name'] == $new_name)
+				if ($type['name'] == $new_name)
 				{
-					$this->tmpl->set_validation_error('content_types[name]',lang("type '%1' already exists !!!",$new_name));
+					$this->tmpl->set_validation_error('content_types[name]', lang("type '%1' already exists !!!", $new_name));
 					return false;
 				}
 			}
 			// search free type character
-			for($i=97;$i<=122;$i++)
+			for ($i = 97; $i <= 122; $i++)
 			{
 				if (!$this->content_types[chr($i)] &&
 					// skip letter of deleted type for addressbook content-types, as it gives SQL error
@@ -617,7 +616,7 @@ 
 		//echo '<p>uicustomfields::save_repository() \$this->fields=<pre style="text-aling: left;">'; print_r($this->fields); echo "</pre>\n";
 		$config = new Api\Config($this->appname);
 		$config->read_repository();
-		$config->value('types',$this->content_types);
+		$config->value('types', $this->content_types);
 		$config->save_repository();
 
 		Api\Storage\Customfields::save($this->appname, $this->fields);
@@ -631,9 +630,9 @@ 
 	* @param boolean $all_private_too =false should all the private fields be returned too
 	* @return array with customfields
 	*/
-	function get_customfields($all_private_too=false)
+	function get_customfields($all_private_too = false)
 	{
-		return Api\Storage\Customfields::get($this->appname,$all_private_too);
+		return Api\Storage\Customfields::get($this->appname, $all_private_too);
 	}
 
 	/**
@@ -659,13 +658,13 @@ 
 		$total = $this->so->get_rows($query, $rows, $readonlys);
 		unset($query['col_filter']['cf_app']);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['cf_values'] = json_decode($row['cf_values'], true);
 			if (is_array($row['cf_values']))
 			{
 				$values = '';
-				foreach($row['cf_values'] as $var => $value)
+				foreach ($row['cf_values'] as $var => $value)
 				{
 					$values .= (!empty($values) ? "\n" : '').$var.'='.$value;
 				}

admin/inc/class.customfields.inc.php

Braces +3 added lines, -1 removed lines

@@ -15,4 +15,6 @@
  *
  * Wrapper allowing apps to use old name
  */
-class customfields extends admin_customfields {}
+class customfields extends admin_customfields
+{
+}

api/src/Etemplate/Widget/Tree.php

Spacing +33 added lines, -33 removed lines

@@ -120,7 +120,7 @@ 
 	 * @param boolean $cloned =true true: object does NOT need to be cloned, false: to set attribute, set them in cloned object
 	 * @return Etempalte\Widget current object or clone, if any attribute was set
 	 */
-	public function set_attrs($xml, $cloned=true)
+	public function set_attrs($xml, $cloned = true)
 	{
 		$this->attrs['type'] = $xml->localName;
 		parent::set_attrs($xml, $cloned);
@@ -164,7 +164,7 @@ 
 
 		if (isset($item['item']) && is_array($item['item']))
 		{
-			foreach($item['item'] as &$child)
+			foreach ($item['item'] as &$child)
 			{
 				$child = self::htmlencode_node($child);
 			}
@@ -185,7 +185,7 @@ 
 		{
 			return true;
 		}
-		foreach((array)$item['item'] as $child)
+		foreach ((array)$item['item'] as $child)
 		{
 			if (self::in_tree($id, $child)) return true;
 		}
@@ -217,7 +217,7 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
@@ -231,13 +231,13 @@ 
 			{
 				$allowed = $this->attrs['multiple'] ? array() : array('' => $this->attrs['options']);
 				$allowed += self::selOptions($form_name);
-				foreach((array) $value as $val)
+				foreach ((array)$value as $val)
 				{
 					if ($this->type == 'tree-cat' && !($this->attrs['multiple'] && !$val) && !self::in_cats($val, $allowed) ||
 						$this->type == 'tree' && !self::in_tree($val, $allowed))
 					{
-						self::set_validation_error($form_name,lang("'%1' is NOT allowed%2)!", $val,
-							$this->type == 'tree-cat' ? " ('".implode("','",array_keys($allowed)).')' : ''), '');
+						self::set_validation_error($form_name, lang("'%1' is NOT allowed%2)!", $val,
+							$this->type == 'tree-cat' ? " ('".implode("','", array_keys($allowed)).')' : ''), '');
 						$value = '';
 						break;
 					}
@@ -254,18 +254,18 @@ 
 					{
 						$value = array_merge($value, (array)self::$request->preserv[$unavailable_name]);
 					}
-					elseif(!$value)	// for single cat, we only restore unavailable one, if no other was selected
+					elseif (!$value)	// for single cat, we only restore unavailable one, if no other was selected
 					{
 						$value = self::$request->preserv[$unavailable_name];
 					}
 				}
-				$value = implode(',',$value);
+				$value = implode(',', $value);
 			}
 			if ($ok && $value === '' && $this->attrs['needed'])
 			{
-				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
+				self::set_validation_error($form_name, lang('Field must not be empty !!!', $value), '');
 			}
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
@@ -291,7 +291,7 @@ 
 		{
 			// += to keep further options set by app code
 			self::$request->sel_options[$form_name] += self::typeOptions($this->attrs['type'], $this->attrs['options'],
-				$no_lang=null, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name);
+				$no_lang = null, $this->attrs['readonly'], self::get_array(self::$request->content, $form_name), $form_name);
 
 			// if no_lang was modified, forward modification to the client
 			if ($no_lang != $this->attr['no_lang'])
@@ -301,15 +301,15 @@ 
 		}
 
 		// Make sure  s, etc.  are properly encoded when sent, and not double-encoded
-		foreach(self::$request->sel_options[$form_name] as &$label)
+		foreach (self::$request->sel_options[$form_name] as &$label)
 		{
-			if(!is_array($label))
+			if (!is_array($label))
 			{
-				$label = html_entity_decode($label, ENT_NOQUOTES,'utf-8');
+				$label = html_entity_decode($label, ENT_NOQUOTES, 'utf-8');
 			}
-			elseif($label['label'])
+			elseif ($label['label'])
 			{
-				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES,'utf-8');
+				$label['label'] = html_entity_decode($label['label'], ENT_NOQUOTES, 'utf-8');
 			}
 		}
 
@@ -321,7 +321,7 @@ 
 	 * @param string $image_path =null default path to use, or empty to use default of /api/templates/default/images/dhtmlxtree
 	 * @return string templated url if available, otherwise default path
 	 */
-	public static function templateImagePath($image_path=null)
+	public static function templateImagePath($image_path = null)
 	{
 		$webserver_url = $GLOBALS['egw_info']['server']['webserver_url'];
 		if (empty($image_path))
@@ -353,20 +353,20 @@ 
 	 */
 	public static function imagePath($image)
 	{
-		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		static $image_path = null;
+		if (!isset($image_path)) $image_path = self::templateImagePath();
 
 		$parts = explode('/', $image_path);
-		$image_parts   = explode('/', $image);
+		$image_parts = explode('/', $image);
 
 		// remove common parts
-		while(isset($parts[0]) && $parts[0] === $image_parts[0])
+		while (isset($parts[0]) && $parts[0] === $image_parts[0])
 		{
 			array_shift($parts);
 			array_shift($image_parts);
 		}
 		// add .. for different parts, except last image part
-		$url = implode('/', array_merge(array_fill(0, count($parts)-1, '..'), $image_parts));
+		$url = implode('/', array_merge(array_fill(0, count($parts) - 1, '..'), $image_parts));
 
 		//error_log(__METHOD__."('$image') image_path=$image_path returning $url");
 		return $url;
@@ -388,10 +388,10 @@ 
 		}
 		else
 		{
-			$name_parts = explode('[',str_replace(']','',$name));
+			$name_parts = explode('[', str_replace(']', '', $name));
 			if (count($name_parts))
 			{
-				$org_name = $name_parts[count($name_parts)-1];
+				$org_name = $name_parts[count($name_parts) - 1];
 				if (isset(self::$request->sel_options[$org_name]) && is_array(self::$request->sel_options[$org_name]))
 				{
 					$options += self::$request->sel_options[$org_name];
@@ -421,9 +421,9 @@ 
 	 * @param string $form_name form-name of widget, used to store unavailable cats
 	 * @return array with value => label pairs
 	 */
-	public static function typeOptions($widget_type, $legacy_options, &$no_lang=false, $readonly=false, $value=null, $form_name=null)
+	public static function typeOptions($widget_type, $legacy_options, &$no_lang = false, $readonly = false, $value = null, $form_name = null)
 	{
-		list($rows,$type,$type2,$type3) = explode(',',$legacy_options);
+		list($rows, $type, $type2, $type3) = explode(',', $legacy_options);
 
 		$no_lang = false;
 		$options = array();
@@ -433,7 +433,7 @@ 
 				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
-					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
+					foreach (is_array($value) ? $value : (strpos($value, ',') !== false ? explode(',', $value) : array($value)) as $id)
 					{
 						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
 					}
@@ -441,14 +441,14 @@ 
 				}
 				if (!$type3 || $type3 === $GLOBALS['egw']->categories->app_name)
 				{
-					$categories =& $GLOBALS['egw']->categories;
+					$categories = & $GLOBALS['egw']->categories;
 				}
 				else    // we need to instanciate a new cat object for the correct application
 				{
-					$categories = new Api\Categories('',$type3);
+					$categories = new Api\Categories('', $type3);
 				}
-				$cat2path=array();
-				foreach((array)$categories->return_sorted_array(0,False,'','','',!$type,0,true) as $cat)
+				$cat2path = array();
+				foreach ((array)$categories->return_sorted_array(0, False, '', '', '', !$type, 0, true) as $cat)
 				{
 					$s = stripslashes($cat['name']);
 
@@ -479,7 +479,7 @@ 
 				if ($value)
 				{
 					$pathes = $unavailable = array();
-					foreach(is_array($value) ? $value : explode(',',$value) as $cat)
+					foreach (is_array($value) ? $value : explode(',', $value) as $cat)
 					{
 						if (isset($cat2path[$cat]))
 						{

Braces +28 added lines, -7 removed lines

@@ -187,7 +187,10 @@ 
 		}
 		foreach((array)$item['item'] as $child)
 		{
-			if (self::in_tree($id, $child)) return true;
+			if (self::in_tree($id, $child))
+			{
+				return true;
+			}
 		}
 		return false;
 	}
@@ -254,10 +257,13 @@ 
 					{
 						$value = array_merge($value, (array)self::$request->preserv[$unavailable_name]);
 					}
-					elseif(!$value)	// for single cat, we only restore unavailable one, if no other was selected
+					elseif(!$value)
+					{
+						// for single cat, we only restore unavailable one, if no other was selected
 					{
 						$value = self::$request->preserv[$unavailable_name];
 					}
+					}
 				}
 				$value = implode(',',$value);
 			}
@@ -266,7 +272,10 @@ 
 				self::set_validation_error($form_name,lang('Field must not be empty !!!',$value),'');
 			}
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 			//error_log(__METHOD__."() $form_name: ".array2string($value_in).' --> '.array2string($value).', allowed='.array2string($allowed));
 		}
 	}
@@ -286,7 +295,10 @@ 
 			//error_log(__METHOD__."() setting templated image-path for $form_name: $templated_path");
 		}
 
-		if (!is_array(self::$request->sel_options[$form_name])) self::$request->sel_options[$form_name] = array();
+		if (!is_array(self::$request->sel_options[$form_name]))
+		{
+			self::$request->sel_options[$form_name] = array();
+		}
 		if ($this->attrs['type'])
 		{
 			// += to keep further options set by app code
@@ -354,7 +366,10 @@ 
 	public static function imagePath($image)
 	{
 		static $image_path=null;
-		if (!isset($image_path)) $image_path = self::templateImagePath ();
+		if (!isset($image_path))
+		{
+			$image_path = self::templateImagePath ();
+		}
 
 		$parts = explode('/', $image_path);
 		$image_parts   = explode('/', $image);
@@ -430,12 +445,18 @@ 
 		switch ($widget_type)
 		{
 			case 'tree-cat':	// !$type == globals cats too, $type2: extraStyleMultiselect, $type3: application, if not current-app, $type4: parent-id, $type5=owner (-1=global),$type6=show missing
-				if ($readonly)  // for readonly we dont need to fetch all cat's, nor do we need to indent them by level
+				if ($readonly)
+				{
+					// for readonly we dont need to fetch all cat's, nor do we need to indent them by level
 				{
 					$cell['no_lang'] = True;
+				}
 					foreach(is_array($value) ? $value : (strpos($value,',') !== false ? explode(',',$value) : array($value)) as $id)
 					{
-						if ($id) $cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						if ($id)
+						{
+							$cell['sel_options'][$id] = stripslashes($GLOBALS['egw']->categories->id2name($id));
+						}
 					}
 					break;
 				}

Doc Comments +1 added lines, -2 removed lines

@@ -376,7 +376,6 @@ 
 	 * Get options from $sel_options array for a given selectbox name
 	 *
 	 * @param string $name
-	 * @param boolean $no_lang=false value of no_lang attribute
 	 * @return array
 	 */
 	public static function selOptions($name)
@@ -415,7 +414,7 @@ 
 	 *
 	 * @param string $widget_type
 	 * @param string $legacy_options options string of widget
-	 * @param boolean $no_lang=false initial value of no_lang attribute (some types set it to true)
+	 * @param boolean $no_lang initial value of no_lang attribute (some types set it to true)
 	 * @param boolean $readonly =false
 	 * @param mixed $value =null value for readonly
 	 * @param string $form_name form-name of widget, used to store unavailable cats

api/src/Storage/Merge.php

Doc Comments +15 added lines, -8 removed lines

@@ -373,9 +373,9 @@ 
 	 *
 	 * Calls get_links() repeatedly to get all the combinations for the content.
 	 *
-	 * @param $app String appname
-	 * @param $id String ID of record
-	 * @param $prefix
+	 * @param string $app String appname
+	 * @param integer $id String ID of record
+	 * @param string $prefix
 	 * @param $content String document content
 	 */
 	protected function get_all_links($app, $id, $prefix, &$content)
@@ -535,7 +535,7 @@ 
 	 * @param mixed $app_limit app_limit, if not set checks the global limit
 	 * @param string $checkas [AND|ISALLOWED], AND default; if set to ISALLOWED it is checked if Export is allowed
 	 *
-	 * @return bool - true if no export is allowed or a limit is set, false if there is no restriction
+	 * @return boolean|null - true if no export is allowed or a limit is set, false if there is no restriction
 	 */
 	public static function hasExportLimit($app_limit,$checkas='AND')
 	{
@@ -585,6 +585,9 @@ 
 		return $content;
 	}
 
+	/**
+	 * @param string $mimetype
+	 */
 	protected function apply_styles (&$content, $mimetype, $mso_application_progid=null)
 	{
 		if (!isset($mso_application_progid))
@@ -1178,6 +1181,8 @@ 
 
 	/**
 	 * Convert numeric values in spreadsheets into actual numeric values
+	 * @param string $content
+	 * @param string $mimetype
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
@@ -1247,6 +1252,7 @@ 
 
 	/**
 	 * Convert date / timestamp values in spreadsheets into actual date / timestamp values
+	 * @param string $mimetype
 	 */
 	protected function format_spreadsheet_dates(&$content, $names, &$values, $mimetype)
 	{
@@ -1351,6 +1357,7 @@ 
 	/**
 	 * Expand link_to custom fields with the merge replacements from the app
 	 * but only if the template uses them.
+	 * @param string $app
 	 */
 	public function cf_link_to_expand($values, $content, &$replacements, $app = null)
 	{
@@ -1416,7 +1423,7 @@ 
 	/**
 	 * Process special flags, such as IF or NELF
 	 *
-	 * @param content Text to be examined and changed
+	 * @param content string to be examined and changed
 	 * @param replacements array of markers => replacement
 	 *
 	 * @return changed content
@@ -1729,8 +1736,7 @@ 
 	 * Get a list of document actions / files from the given directory
 	 *
 	 * @param string $dirs Directory(s comma or space separated) to search
-	 * @param string $prefix='document_' prefix for array keys
-	 * @param array|string $mime_filter=null allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
+	 * @param array|string $mime_filter allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
 	 * @return array List of documents, suitable for a selectbox.  The key is document_<filename>.
 	 */
 	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
@@ -1997,7 +2003,8 @@ 
 	 *
 	 * @param string &$document maybe relative path of document, on return true absolute path to existing document
 	 * @param string $dirs comma or whitespace separated directories
-	 * @return string|boolean false if document exists, otherwise string with error-message
+	 * @param string $document
+	 * @return false|string false if document exists, otherwise string with error-message
 	 */
 	public static function check_document(&$document, $dirs)
 	{

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

@@ -1456,19 +1456,19 @@ 
 		if (strpos($content,'$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
@@ -1479,7 +1479,7 @@ 
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		return $content;
@@ -2055,7 +2055,7 @@ 
 	 * @param Array $file Array of information about the document from Api\Vfs::find
 	 * @return void
 	 */
-	private static function document_mail_action(Array &$action, $file)
+	private static function document_mail_action(array &$action, $file)
 	{
 		unset($action['postSubmit']);
 
@@ -2088,7 +2088,7 @@ 
 	 * @param Array $file Array of information about the document from Api\Vfs::find
 	 * @return void
 	 */
-	private static function document_editable_action(Array &$action, $file)
+	private static function document_editable_action(array &$action, $file)
 	{
 		unset($action['postSubmit']);
 		$action['nm_action'] = 'location';

Braces +277 added lines, -78 removed lines

@@ -168,7 +168,10 @@ 
 		switch ($mimetype)
 		{
 			case 'application/msword':
-				if (strtolower($extension) != '.rtf') break;
+				if (strtolower($extension) != '.rtf')
+				{
+					break;
+				}
 			case 'application/rtf':
 			case 'text/rtf':
 				return true;	// rtf files
@@ -178,7 +181,10 @@ 
 			case 'application/vnd.oasis.opendocument.text-template':
 			case 'application/vnd.oasis.opendocument.spreadsheet-template':
 			case 'application/vnd.oasis.opendocument.presentation-template':
-				if (!$zip_available) break;
+				if (!$zip_available)
+				{
+					break;
+				}
 				return true;	// open office write xml files
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms word 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
@@ -186,7 +192,10 @@ 
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':	// ms excel 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
 			case 'application/vnd.ms-excel.sheet.macroenabled.12':
-				if (!$zip_available) break;
+				if (!$zip_available)
+				{
+					break;
+				}
 				return true;	// ms word xml format
 			case 'application/xml':
 				return true;	// alias for text/xml, eg. ms office 2003 word format
@@ -221,7 +230,10 @@ 
 		{
 			$contact = $this->contacts->read($contact, $ignore_acl);
 		}
-		if (!is_array($contact)) return array();
+		if (!is_array($contact))
+		{
+			return array();
+		}
 
 		$replacements = array();
 		foreach(array_keys($this->contacts->contact_fields) as $name)
@@ -230,7 +242,10 @@ 
 			switch($name)
 			{
 				case 'created': case 'modified':
-					if($value) $value = Api\DateTime::to($value);
+					if($value)
+					{
+						$value = Api\DateTime::to($value);
+					}
 					break;
 				case 'bday':
 					if ($value)
@@ -278,7 +293,10 @@ 
 					}
 					break;
 			}
-			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			if ($name != 'photo')
+			{
+				$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			}
 		}
 		// set custom fields, should probably go to a general method all apps can use
 		// need to load all cfs for $ignore_acl=true
@@ -300,17 +318,23 @@ 
 		$cats = array();
 		foreach(is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',',$contact['cat_id']) as $cat_id)
 		{
-			if(!$cat_id) continue;
+			if(!$cat_id)
+			{
+				continue;
+			}
 			if($GLOBALS['egw']->categories->id2name($cat_id,'main') != $cat_id)
 			{
 				$path = explode(' / ', $GLOBALS['egw']->categories->id2name($cat_id, 'path'));
 				unset($path[0]); // Drop main
 				$cats[$GLOBALS['egw']->categories->id2name($cat_id,'main')][] = implode(' / ', $path);
-			} elseif($cat_id) {
+			}
+			elseif($cat_id)
+			{
 				$cats[$cat_id] = array();
 			}
 		}
-		foreach($cats as $main => $cat) {
+		foreach($cats as $main => $cat)
+		{
 			$replacements['$$'.($prefix ? $prefix.'/':'').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main,'name')
 				. (count($cat) > 0 ? ': ' : '') . implode(', ', $cats[$main]) . "\n";
 		}
@@ -345,7 +369,10 @@ 
 					'id'	=> $link_info
 				);
 			}
-			if($exclude && in_array($link_info['id'], $exclude)) continue;
+			if($exclude && in_array($link_info['id'], $exclude))
+			{
+				continue;
+			}
 
 			$title = Api\Link::title($link_info['app'], $link_info['id']);
 			if(class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $link_info['app'] != Api\Link::VFS_APPNAME)
@@ -365,7 +392,10 @@ 
 					$link = Api\Framework::link($link, array());
 				}
 				// Prepend site
-				if ($link[0] == '/') $link = Api\Framework::getUrl($link);
+				if ($link[0] == '/')
+				{
+					$link = Api\Framework::getUrl($link);
+				}
 
 				$title = $style == 'href' ? Api\Html::a_href(Api\Html::htmlspecialchars($title), $link) : $link;
 			}
@@ -421,7 +451,10 @@ 
 							$link = Api\Framework::link($link, array());
 						}
 						// Prepend site
-						if ($link[0] == '/') $link = Api\Framework::getUrl($link);
+						if ($link[0] == '/')
+						{
+							$link = Api\Framework::getUrl($link);
+						}
 
 						$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
 						break;
@@ -453,7 +486,10 @@ 
 	protected function format_datetime($time,$format=null)
 	{
 		trigger_error(__METHOD__ . ' is deprecated, use Api\DateTime::to($time, $format)', E_USER_DEPRECATED);
-		if (is_null($format)) $format = $this->datetime_format;
+		if (is_null($format))
+		{
+			$format = $this->datetime_format;
+		}
 
 		return Api\DateTime::to($time,$format);
 	}
@@ -495,7 +531,10 @@ 
 	public static function getExportLimit($app='common')
 	{
 		static $exportLimitStore=array();
-		if (empty($app)) $app='common';
+		if (empty($app))
+		{
+			$app='common';
+		}
 		//error_log(__METHOD__.__LINE__.' called with app:'.$app);
 		if (!array_key_exists($app,$exportLimitStore))
 		{
@@ -504,7 +543,10 @@ 
 			if ($app !='common')
 			{
 				$app_limit = Api\Hooks::single('export_limit',$app);
-				if ($app_limit) $exportLimitStore[$app] = $app_limit;
+				if ($app_limit)
+				{
+					$exportLimitStore[$app] = $app_limit;
+				}
 			}
 			//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);
 			if (empty($exportLimitStore[$app]))
@@ -537,10 +579,22 @@ 
 	 */
 	public static function hasExportLimit($app_limit,$checkas='AND')
 	{
-		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
-		if (empty($app_limit)) return false;
-		if ($app_limit == 'no') return true;
-		if ($app_limit > 0) return true;
+		if (strtoupper($checkas) == 'ISALLOWED')
+		{
+			return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
+		}
+		if (empty($app_limit))
+		{
+			return false;
+		}
+		if ($app_limit == 'no')
+		{
+			return true;
+		}
+		if ($app_limit > 0)
+		{
+			return true;
+		}
 	}
 
 	/**
@@ -575,7 +629,8 @@ 
 
 		try {
 			$content = $this->merge_string($content,$ids,$err,$mimetype,$fix);
-		} catch (\Exception $e) {
+		}
+		catch (\Exception $e) {
 			_egw_log_exception($e);
 			$err = $e->getMessage();
 			return false;
@@ -663,7 +718,8 @@ 
 			$content = $xslt->transformToXml($element);
 //echo $content;die();
 			// Word 2003 needs two declarations, add extra declaration back in
-			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
+			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0)
+			{
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.$content;
 			}
 			// Validate
@@ -725,7 +781,10 @@ 
 			// textdocuments are simple, they do not hold start and end, but they may have content before and after the $$pagerepeat$$ tag
 			// header and footer should not hold any $$ tags; if we find $$ tags with the header, we assume it is the pagerepeatcontent
 			$nohead = false;
-			if (stripos($contentstart,'$$') !== false) $nohead = true;
+			if (stripos($contentstart,'$$') !== false)
+			{
+				$nohead = true;
+			}
 			if ($nohead)
 			{
 				$contentend = $contentrepeat;
@@ -767,13 +826,19 @@ 
 		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
 		$countlables = count($countlables[0]);
 		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
-		if ($countlables > 1) $lableprint = true;
+		if ($countlables > 1)
+		{
+			$lableprint = true;
+		}
 		if (count($ids) > 1 && !$contentrepeat)
 		{
 			$err = lang('for more than one contact in a document use the tag pagerepeat!');
 			return false;
 		}
-		if ($this->report_memory_usage) error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
+		if ($this->report_memory_usage)
+		{
+			error_log(__METHOD__."(count(ids)=".count($ids).") strlen(contentrepeat)=".strlen($contentrepeat).', strlen(labelrepeat)='.strlen($Labelrepeat));
+		}
 
 		if ($contentrepeat)
 		{
@@ -813,8 +878,15 @@ 
 		}
 		foreach ((array)$ids as $n => $id)
 		{
-			if ($contentrepeat) $content = $contentrepeat;   //content to repeat
-			if ($lableprint) $content = $Labelrepeat;
+			if ($contentrepeat)
+			{
+				$content = $contentrepeat;
+			}
+			//content to repeat
+			if ($lableprint)
+			{
+				$content = $Labelrepeat;
+			}
 
 			// generate replacements; if exeption is thrown, catch it set error message and return false
 			try
@@ -831,7 +903,10 @@ 
 				$err = $e->getMessage();
 				return false;
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".Api\Vfs::hsize(memory_get_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() $n: $id ".Api\Vfs::hsize(memory_get_usage(true)));
+			}
 			// some general replacements: current user, date and time
 			if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
 			{
@@ -889,9 +964,12 @@ 
 			{
 				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
 				$count=$count+1;
-				if (($count % $countlables) == 0 && count($contentrep)>$count)  //new page
+				if (($count % $countlables) == 0 && count($contentrep)>$count)
+				{
+					//new page
 				{
 					$countpage = $countpage+1;
+				}
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 			}
@@ -928,7 +1006,10 @@ 
 			rewind($content_stream);
 			return stream_get_contents($content_stream);
 		}
-		if ($this->report_memory_usage) error_log(__METHOD__."() returning ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+		if ($this->report_memory_usage)
+		{
+			error_log(__METHOD__."() returning ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+		}
 
 		return $content;
 	}
@@ -977,7 +1058,10 @@ 
 				break;
 
 			default:	// div. text files --> use our export-charset, defined in addressbook prefs
-				if (empty($charset)) $charset = $this->contacts->prefs['csv_charset'];
+				if (empty($charset))
+				{
+					$charset = $this->contacts->prefs['csv_charset'];
+				}
 				break;
 		}
 		//error_log(__METHOD__."('$document', ... ,$mimetype) --> $charset (egw=".Api\Translation::charset().', export='.$this->contacts->prefs['csv_charset'].')');
@@ -1000,10 +1084,13 @@ 
 				}
 			}
 		}
-		if ($is_xml)	// zip'ed xml document (eg. OO)
+		if ($is_xml)
+		{
+			// zip'ed xml document (eg. OO)
 		{
 			// Numeric fields
 			$names = array();
+		}
 
 			// Tags we can replace with the target document's version
 			$replace_tags = array();
@@ -1073,7 +1160,8 @@ 
 				else if (is_string($value) && (strpos($value,'<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
+					if($replace_tags && extension_loaded('tidy'))
+					{
 						$tidy = new tidy();
 						$cleaned = $tidy->repairString($value, self::$tidy_config);
 						// Found errors. Strip it all so there's some output
@@ -1107,16 +1195,20 @@ 
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
 				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
-				if(is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
+				if(is_numeric($value) && $name != '$$user/account_id$$')
+				{
+					// account_id causes problems with the preg_replace below
 				{
 					$names[] = preg_quote($name,'/');
 				}
+				}
 			}
 
 			// Look for numbers, set their value if needed
 			if($this->numeric_fields || count($names))
 			{
-				foreach((array)$this->numeric_fields as $fieldname) {
+				foreach((array)$this->numeric_fields as $fieldname)
+				{
 					$names[] = preg_quote($fieldname,'/');
 				}
 				$this->format_spreadsheet_numbers($content, $names, $mimetype.$mso_application_progid);
@@ -1126,7 +1218,8 @@ 
 			if($this->date_fields || count($names))
 			{
 				$names = array();
-				foreach((array)$this->date_fields as $fieldname) {
+				foreach((array)$this->date_fields as $fieldname)
+				{
 					$names[] = $fieldname;
 				}
 				$this->format_spreadsheet_dates($content, $names, $replacements, $mimetype.$mso_application_progid);
@@ -1209,7 +1302,8 @@ 
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
-		foreach((array)$this->numeric_fields as $fieldname) {
+		foreach((array)$this->numeric_fields as $fieldname)
+		{
 			$names[] = preg_quote($fieldname,'/');
 		}
 		switch($mimetype)
@@ -1242,7 +1336,11 @@ 
 			// try to increase/double pcre.backtrack_limit failure
 			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result)
+			{
+				$content = $result;
+			}
+			// On failure $result would be NULL
 		}
 	}
 
@@ -1286,7 +1384,10 @@ 
 			'application/vnd.oasis.opendocument.spreadsheet',		// open office calc
 			'application/xmlExcel.Sheet',					// Excel 2003
 			//'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'//Excel WTF
-		))) return;
+		)))
+		{
+			return;
+		}
 
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
@@ -1307,9 +1408,12 @@ 
 			{
 				$date = Api\DateTime::createFromUserFormat($values[$key]);
 				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
-					$mimetype == 'application/vnd.ms-excel.sheet.macroenabled.12')//Excel WTF
+					$mimetype == 'application/vnd.ms-excel.sheet.macroenabled.12')
+				{
+					//Excel WTF
 				{
 					$interval = $date->diff(new Api\DateTime('1900-01-00 0:00'));
+				}
 					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
 					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
@@ -1352,7 +1456,11 @@ 
 			// try to increase/double pcre.backtrack_limit failure
 			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result)
+			{
+				$content = $result;
+			}
+			// On failure $result would be NULL
 		}
 	}
 
@@ -1425,7 +1533,10 @@ 
 			}
 			else
 			{
-				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time') $this->date_fields[] = '#'.$field;
+				if ($cfs[$field]['type'] == 'date' || $cfs[$field]['type'] == 'date-time')
+				{
+					$this->date_fields[] = '#'.$field;
+				}
 			}
 		}
 	}
@@ -1479,30 +1590,35 @@ 
 	private function process_commands($content, $replacements)
 	{
 		if (strpos($content,'$$IF') !== false)
-		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
+		{
+//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NELF') !== false)
-		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
+		{
+//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$NENVLF') !== false)
-		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
+		{
+//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
 		}
 		if (strpos($content,'$$LETTERPREFIX$$') !== false)
-		{	//Example use to use: $$LETTERPREFIX$$
+		{
+//Example use to use: $$LETTERPREFIX$$
 			$LETTERPREFIXCUSTOM = '$$LETTERPREFIXCUSTOM n_prefix title n_family$$';
 			$content = str_replace('$$LETTERPREFIX$$',$LETTERPREFIXCUSTOM,$content);
 		}
 		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
-		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
+		{
+//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
 			$this->replacements =& $replacements;
 			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
 			unset($this->replacements);
@@ -1518,8 +1634,14 @@ 
 	 */
 	private function replace_callback($param)
 	{
-		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
-		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
+		if (array_key_exists('$$'.$param[4].'$$',$this->replacements))
+		{
+			$param[4] = $this->replacements['$$'.$param[4].'$$'];
+		}
+		if (array_key_exists('$$'.$param[3].'$$',$this->replacements))
+		{
+			$param[3] = $this->replacements['$$'.$param[3].'$$'];
+		}
 
 		$pattern = '/'.preg_quote($param[2], '/').'/';
 		if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
@@ -1547,7 +1669,7 @@ 
 		}
 
 		switch($this->mimetype)
-			{
+		{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
@@ -1580,25 +1702,38 @@ 
 				default:
 					$LF = "\n";
 			}
-		if($is_xml) {
+		if($is_xml)
+		{
 			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
 		}
 		if (strpos($param[0],'$$NELF') === 0)
-		{	//sets a Pagebreak and value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+		{
+//sets a Pagebreak and value, only if the field has a value
+			if ($this->replacements['$$'.$param[1].'$$'] !='')
+			{
+				$replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+			}
 		}
 		if (strpos($param[0],'$$NENVLF') === 0)
-		{	//sets a Pagebreak without any value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF;
+		{
+//sets a Pagebreak without any value, only if the field has a value
+			if ($this->replacements['$$'.$param[1].'$$'] !='')
+			{
+				$replace = $LF;
+			}
 		}
 		if (strpos($param[0],'$$LETTERPREFIXCUSTOM') === 0)
-		{	//sets a Letterprefix
+		{
+//sets a Letterprefix
 			$replaceprefixsort = array();
 			// ToDo Stefan: $contentstart is NOT defined here!!!
 			$replaceprefix = explode(' ',substr($param[0],21,-2));
 			foreach ($replaceprefix as $nameprefix)
 			{
-				if ($this->replacements['$$'.$nameprefix.'$$'] !='') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				if ($this->replacements['$$'.$nameprefix.'$$'] !='')
+				{
+					$replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				}
 			}
 			$replace = implode($replaceprefixsort,' ');
 		}
@@ -1665,13 +1800,20 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.' Message after importMessageToMergeAndSend:'.array2string($msgs));
 				$retString = '';
-				if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('<br />',$msgs['success']);
+				if (count($msgs['success'])>0)
+				{
+					$retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));
+				}
+				//implode('<br />',$msgs['success']);
 				//if (strlen($retString)>0) $retString .= '<br />';
 				foreach($msgs['failed'] as $c =>$e)
 				{
 					$errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.';
 				}
-				if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				if (count($msgs['failed'])>0)
+				{
+					$retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				}
 				return $retString;
 			case 'application/vnd.oasis.opendocument.text':
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -1757,7 +1899,10 @@ 
 					return $err;
 				}
 			}
-			if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() after HTML processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			}
 		}
 		if(!empty($name))
 		{
@@ -1778,13 +1923,25 @@ 
 			if ($zip->open($archive, ZipArchive::CHECKCONS) !== true)
 			{
 				error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE"."::CHECKCONS) failed. Trying open without validating");
-				if ($zip->open($archive) !== true) throw new Api\Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
+				if ($zip->open($archive) !== true)
+				{
+					throw new Api\Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
+				}
+			}
+			if ($zip->addFromString($content_file,$merged) !== true)
+			{
+				throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			}
+			if ($zip->close() !== true)
+			{
+				throw new Api\Exception("!ZipArchive::close()");
 			}
-			if ($zip->addFromString($content_file,$merged) !== true) throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
-			if ($zip->close() !== true) throw new Api\Exception("!ZipArchive::close()");
 			unset($zip);
 			unset($merged);
-			if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			if ($this->report_memory_usage)
+			{
+				error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
+			}
 			$header['filesize'] = filesize($archive);
 		}
 		else
@@ -1820,9 +1977,18 @@ 
 	 */
 	public function download_by_request()
 	{
-		if(empty($_POST['data_document_name'])) return false;
-		if(empty($_POST['data_document_dir'])) return false;
-		if(empty($_POST['data_checked'])) return false;
+		if(empty($_POST['data_document_name']))
+		{
+			return false;
+		}
+		if(empty($_POST['data_document_dir']))
+		{
+			return false;
+		}
+		if(empty($_POST['data_checked']))
+		{
+			return false;
+		}
 
 		return $this->download(
 			$_POST['data_document_name'],
@@ -1843,7 +2009,10 @@ 
 	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
 	{
 		$export_limit=self::getExportLimit($app);
-		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted())) return array();
+		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted()))
+		{
+			return array();
+		}
 
 		// split multiple comma or whitespace separated directories
 		// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
@@ -1851,7 +2020,11 @@ 
 		{
 			foreach($dirs as $n => &$d)
 			{
-				if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+				if ($n)
+				{
+					$d = '/'.$d;
+				}
+				// re-adding trailing slash removed by split
 			}
 		}
 		if ($mime_filter && ($negativ_filter = $mime_filter[0] === '!'))
@@ -1874,8 +2047,14 @@ 
 				{
 					// return only the mime-types we support
 					$parts = explode('.',$file['name']);
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
-					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
+					if (!self::is_implemented($file['mime'],'.'.array_pop($parts)))
+					{
+						continue;
+					}
+					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter))
+					{
+						continue;
+					}
 					$list[$prefix.$file['name']] = Api\Vfs::decodePath($file['name']);
 				}
 			}
@@ -1906,15 +2085,18 @@ 
 	{
 		$documents = array();
 		$editable_mimes = array();
-		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
+		if ($export_limit == null)
+		{
+			$export_limit = self::getExportLimit();
+		}
+		// check if there is a globalsetting
 
 		try {
 			if (class_exists('EGroupware\\collabora\\Bo') &&
 					$GLOBALS['egw_info']['user']['apps']['collabora'] &&
 					($discovery = \EGroupware\collabora\Bo::discover()) &&
 					$GLOBALS['egw_info']['user']['preferences']['filemanager']['merge_open_handler'] != 'download'
-			)
-			{
+			) {
 				$editable_mimes = $discovery;
 			}
 		}
@@ -1923,11 +2105,14 @@ 
 			// ignore failed discovery
 			unset($e);
 		}
-		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))	// put default document on top
+		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))
+		{
+			// put default document on top
 		{
 			if(!$file['mime'])
 			{
 				$file['mime'] = Api\Vfs::mime_content_type($default_doc);
+		}
 				$file['path'] = $default_doc;
 			}
 			$documents['document'] = array(
@@ -1955,7 +2140,11 @@ 
 			{
 				foreach($dirs as $n => &$d)
 				{
-					if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+					if ($n)
+					{
+						$d = '/'.$d;
+					}
+					// re-adding trailing slash removed by split
 				}
 			}
 			foreach($dirs as $dir)
@@ -1975,10 +2164,13 @@ 
 			$parts = explode('.',$file['name']);
 			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
 				!Api\Vfs::check_access($file['path'], Api\Vfs::READABLE, $file) ||	// remove files not readable by user
-				$file['path'] === $default_doc)	// default doc already added
+				$file['path'] === $default_doc)
+			{
+				// default doc already added
 			{
 				unset($files[$key]);
 			}
+			}
 			else
 			{
 				$dirname = Api\Vfs::dirname($file['path']);
@@ -2171,7 +2363,11 @@ 
 			{
 				foreach($dirs as $n => $dir)
 				{
-					if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+					if ($n)
+					{
+						$dir = '/'.$dir;
+					}
+					// re-adding trailing slash removed by split
 					if (Api\Vfs::stat($dir.'/'.$document) && Api\Vfs::is_readable($dir.'/'.$document))
 					{
 						$document = $dir.'/'.$document;
@@ -2208,7 +2404,10 @@ 
 	 */
 	static public function number_format($number,$num_decimal_places=2,$_mimetype='')
 	{
-		if ((string)$number === '') return '';
+		if ((string)$number === '')
+		{
+			return '';
+		}
 		//error_log(__METHOD__.$_mimetype);
 		switch($_mimetype)
 		{

Spacing +371 added lines, -372 removed lines

@@ -82,14 +82,14 @@ 
 	 * Configuration for HTML Tidy to clean up any HTML content that is kept
 	 */
 	public static $tidy_config = array(
-		'output-xml'		=> true,	// Entity encoding
+		'output-xml'		=> true, // Entity encoding
 		'show-body-only'	=> true,
 		'output-encoding'	=> 'utf-8',
 		'input-encoding'	=> 'utf-8',
-		'quote-ampersand'	=> false,	// Prevent double encoding
-		'quote-nbsp'		=> true,	// XSLT can handle spaces easier
+		'quote-ampersand'	=> false, // Prevent double encoding
+		'quote-nbsp'		=> true, // XSLT can handle spaces easier
 		'preserve-entities'	=> true,
-		'wrap'			=> 0,		// Wrapping can break output
+		'wrap'			=> 0, // Wrapping can break output
 	);
 
 	/**
@@ -120,7 +120,7 @@ 
 		$this->contacts = new Api\Contacts();
 
 		$this->datetime_format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' '.
-			($GLOBALS['egw_info']['user']['preferences']['common']['timeformat']==12 ? 'h:i a' : 'H:i');
+			($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 
 		$this->export_limit = self::getExportLimit();
 	}
@@ -135,7 +135,7 @@ 
 		$accountsel = new uiaccountsel();
 
 		return '<input type="hidden" value="" name="newsettings[export_limit_excepted]" />'.
-			$accountsel->selection('newsettings[export_limit_excepted]','export_limit_excepted',$config['export_limit_excepted'],'both',4);
+			$accountsel->selection('newsettings[export_limit_excepted]', 'export_limit_excepted', $config['export_limit_excepted'], 'both', 4);
 	}
 
 	/**
@@ -149,7 +149,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean array with replacements or false if entry not found
 	 */
-	abstract protected function get_replacements($id,&$content=null);
+	abstract protected function get_replacements($id, &$content = null);
 
 	/**
 	 * Return if merge-print is implemented for given mime-type (and/or extension)
@@ -157,13 +157,13 @@ 
 	 * @param string $mimetype eg. text/plain
 	 * @param string $extension only checked for applications/msword and .rtf
 	 */
-	static public function is_implemented($mimetype,$extension=null)
+	static public function is_implemented($mimetype, $extension = null)
 	{
-		static $zip_available=null;
+		static $zip_available = null;
 		if (is_null($zip_available))
 		{
 			$zip_available = check_load_extension('zip') &&
-				class_exists('ZipArchive');	// some PHP has zip extension, but no ZipArchive (eg. RHEL5!)
+				class_exists('ZipArchive'); // some PHP has zip extension, but no ZipArchive (eg. RHEL5!)
 		}
 		switch ($mimetype)
 		{
@@ -171,7 +171,7 @@ 
 				if (strtolower($extension) != '.rtf') break;
 			case 'application/rtf':
 			case 'text/rtf':
-				return true;	// rtf files
+				return true; // rtf files
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
 			case 'application/vnd.oasis.opendocument.presentation':
@@ -179,7 +179,7 @@ 
 			case 'application/vnd.oasis.opendocument.spreadsheet-template':
 			case 'application/vnd.oasis.opendocument.presentation-template':
 				if (!$zip_available) break;
-				return true;	// open office write xml files
+				return true; // open office write xml files
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':	// ms word 2007 xml format
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.d':	// mimetypes in vfs are limited to 64 chars
 			case 'application/vnd.ms-word.document.macroenabled.12':
@@ -187,17 +187,17 @@ 
 			case 'application/vnd.openxmlformats-officedocument.spreadsheetml.shee':
 			case 'application/vnd.ms-excel.sheet.macroenabled.12':
 				if (!$zip_available) break;
-				return true;	// ms word xml format
+				return true; // ms word xml format
 			case 'application/xml':
-				return true;	// alias for text/xml, eg. ms office 2003 word format
+				return true; // alias for text/xml, eg. ms office 2003 word format
 			case 'message/rfc822':
 				return true; // ToDo: check if you are theoretical able to send mail
 			case 'application/x-yaml':
-				return true;	// yaml file, plain text with marginal syntax support for multiline replacements
+				return true; // yaml file, plain text with marginal syntax support for multiline replacements
 			default:
-				if (substr($mimetype,0,5) == 'text/')
+				if (substr($mimetype, 0, 5) == 'text/')
 				{
-					return true;	// text files
+					return true; // text files
 				}
 				break;
 		}
@@ -215,7 +215,7 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array
 	 */
-	public function contact_replacements($contact,$prefix='',$ignore_acl=false, &$content = '')
+	public function contact_replacements($contact, $prefix = '', $ignore_acl = false, &$content = '')
 	{
 		if (!is_array($contact))
 		{
@@ -224,13 +224,13 @@ 
 		if (!is_array($contact)) return array();
 
 		$replacements = array();
-		foreach(array_keys($this->contacts->contact_fields) as $name)
+		foreach (array_keys($this->contacts->contact_fields) as $name)
 		{
 			$value = $contact[$name];
-			switch($name)
+			switch ($name)
 			{
 				case 'created': case 'modified':
-					if($value) $value = Api\DateTime::to($value);
+					if ($value) $value = Api\DateTime::to($value);
 					break;
 				case 'bday':
 					if ($value)
@@ -239,7 +239,7 @@ 
 							$value = Api\DateTime::to($value, true);
 						}
 						catch (\Exception $e) {
-							unset($e);	// ignore exception caused by wrongly formatted date
+							unset($e); // ignore exception caused by wrongly formatted date
 						}
 					}
 					break;
@@ -252,17 +252,17 @@ 
 						// if cat-tree is displayed, we return a full category path not just the name of the cat
 						$use = $GLOBALS['egw_info']['server']['cat_tab'] == 'Tree' ? 'path' : 'name';
 						$cats = array();
-						foreach(is_array($value) ? $value : explode(',',$value) as $cat_id)
+						foreach (is_array($value) ? $value : explode(',', $value) as $cat_id)
 						{
-							$cats[] = $GLOBALS['egw']->categories->id2name($cat_id,$use);
+							$cats[] = $GLOBALS['egw']->categories->id2name($cat_id, $use);
 						}
-						$value = implode(', ',$cats);
+						$value = implode(', ', $cats);
 					}
 					break;
 				case 'jpegphoto':	// returning a link might make more sense then the binary photo
 					if ($contact['photo'])
 					{
-						$value = Api\Framework::getUrl(Api\Framework::link('/index.php',$contact['photo']));
+						$value = Api\Framework::getUrl(Api\Framework::link('/index.php', $contact['photo']));
 					}
 					break;
 				case 'tel_prefer':
@@ -274,57 +274,56 @@ 
 				case 'account_id':
 					if ($value)
 					{
-						$replacements['$$'.($prefix ? $prefix.'/':'').'account_lid$$'] = $GLOBALS['egw']->accounts->id2name($value);
+						$replacements['$$'.($prefix ? $prefix.'/' : '').'account_lid$$'] = $GLOBALS['egw']->accounts->id2name($value);
 					}
 					break;
 			}
-			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = $value;
+			if ($name != 'photo') $replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] = $value;
 		}
 		// set custom fields, should probably go to a general method all apps can use
 		// need to load all cfs for $ignore_acl=true
-		foreach($ignore_acl ? Customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
+		foreach ($ignore_acl ? Customfields::get('addressbook', true) : $this->contacts->customfields as $name => $field)
 		{
 			$name = '#'.$name;
-			if(!$contact[$name])
+			if (!$contact[$name])
 			{
-				$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = '';
+				$replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] = '';
 				continue;
 			}
 			// Format date cfs per user Api\Preferences
-			if($this->mimetype !== 'application/x-yaml' && $contact[$name] &&
+			if ($this->mimetype !== 'application/x-yaml' && $contact[$name] &&
 					($field['type'] == 'date' || $field['type'] == 'date-time'))
 			{
 				$this->date_fields[] = '#'.$name;
-				$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] = Api\DateTime::to($contact[$name], $field['type'] == 'date' ? true : '');
+				$replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] = Api\DateTime::to($contact[$name], $field['type'] == 'date' ? true : '');
 			}
-			$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] =
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] =
 				// use raw data for yaml, no user-preference specific formatting
-				$this->mimetype == 'application/x-yaml' || $field['type'] == 'htmlarea' ? (string)$contact[$name] :
-				Customfields::format($field, (string)$contact[$name]);
+				$this->mimetype == 'application/x-yaml' || $field['type'] == 'htmlarea' ? (string)$contact[$name] : Customfields::format($field, (string)$contact[$name]);
 		}
 
-		if($content && strpos($content, '$$#') !== FALSE)
+		if ($content && strpos($content, '$$#') !== FALSE)
 		{
 			$this->cf_link_to_expand($contact, $content, $replacements, 'addressbook');
 		}
 
 		// Add in extra cat field
 		$cats = array();
-		foreach(is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',',$contact['cat_id']) as $cat_id)
+		foreach (is_array($contact['cat_id']) ? $contact['cat_id'] : explode(',', $contact['cat_id']) as $cat_id)
 		{
-			if(!$cat_id) continue;
-			if($GLOBALS['egw']->categories->id2name($cat_id,'main') != $cat_id)
+			if (!$cat_id) continue;
+			if ($GLOBALS['egw']->categories->id2name($cat_id, 'main') != $cat_id)
 			{
 				$path = explode(' / ', $GLOBALS['egw']->categories->id2name($cat_id, 'path'));
 				unset($path[0]); // Drop main
-				$cats[$GLOBALS['egw']->categories->id2name($cat_id,'main')][] = implode(' / ', $path);
-			} elseif($cat_id) {
+				$cats[$GLOBALS['egw']->categories->id2name($cat_id, 'main')][] = implode(' / ', $path);
+			} elseif ($cat_id) {
 				$cats[$cat_id] = array();
 			}
 		}
-		foreach($cats as $main => $cat) {
-			$replacements['$$'.($prefix ? $prefix.'/':'').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main,'name')
-				. (count($cat) > 0 ? ': ' : '') . implode(', ', $cats[$main]) . "\n";
+		foreach ($cats as $main => $cat) {
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'categories$$'] .= $GLOBALS['egw']->categories->id2name($main, 'name')
+				. (count($cat) > 0 ? ': ' : '').implode(', ', $cats[$main])."\n";
 		}
 		return $replacements;
 	}
@@ -343,34 +342,34 @@ 
 	 * 	'link' - URL to the entry
 	 * 	'href' - HREF tag wrapped around the title
 	 */
-	protected function get_links($app, $id, $only_app='', $exclude = array(), $style = 'title')
+	protected function get_links($app, $id, $only_app = '', $exclude = array(), $style = 'title')
 	{
 		$links = Api\Link::get_links($app, $id, $only_app);
 		$link_titles = array();
-		foreach($links as $link_info)
+		foreach ($links as $link_info)
 		{
 			// Using only_app only returns the ID
-			if(!is_array($link_info) && $only_app && $only_app[0] !== '!')
+			if (!is_array($link_info) && $only_app && $only_app[0] !== '!')
 			{
 				$link_info = array(
 					'app'	=> $only_app,
 					'id'	=> $link_info
 				);
 			}
-			if($exclude && in_array($link_info['id'], $exclude)) continue;
+			if ($exclude && in_array($link_info['id'], $exclude)) continue;
 
 			$title = Api\Link::title($link_info['app'], $link_info['id']);
-			if(class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $link_info['app'] != Api\Link::VFS_APPNAME)
+			if (class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $link_info['app'] != Api\Link::VFS_APPNAME)
 			{
 				$title = Stylite\Vfs\Links\StreamWrapper::entry2name($link_info['app'], $link_info['id'], $title);
 			}
-			if($style == 'href' || $style == 'link')
+			if ($style == 'href' || $style == 'link')
 			{
 				$link = Api\Link::view($link_info['app'], $link_info['id'], $link_info);
-				if($link_info['app'] != Api\Link::VFS_APPNAME)
+				if ($link_info['app'] != Api\Link::VFS_APPNAME)
 				{
 					// Set app to false so we always get an external link
-					$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php',$link, false));
+					$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php', $link, false));
 				}
 				else
 				{
@@ -383,7 +382,7 @@ 
 			}
 			$link_titles[] = $title;
 		}
-		return implode("\n",$link_titles);
+		return implode("\n", $link_titles);
 	}
 
 	/**
@@ -400,33 +399,33 @@ 
 	{
 		$array = array();
 		$pattern = '@\$\$(links_attachments|links|attachments|link)\/?(title|href|link)?\/?([a-z]*)\$\$@';
-		static $link_cache=null;
+		static $link_cache = null;
 		$matches = null;
-		if(preg_match_all($pattern, $content, $matches))
+		if (preg_match_all($pattern, $content, $matches))
 		{
-			foreach($matches[0] as $i => $placeholder)
+			foreach ($matches[0] as $i => $placeholder)
 			{
 				$placeholder = substr($placeholder, 2, -2);
-				if($link_cache[$id][$placeholder])
+				if ($link_cache[$id][$placeholder])
 				{
 					$array[$placeholder] = $link_cache[$id][$placeholder];
 					continue;
 				}
-				switch($matches[1][$i])
+				switch ($matches[1][$i])
 				{
 					case 'link':
 						// Link to current record
 						$title = Api\Link::title($app, $id);
-						if(class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $app != Api\Link::VFS_APPNAME)
+						if (class_exists('EGroupware\Stylite\Vfs\Links\StreamWrapper') && $app != Api\Link::VFS_APPNAME)
 						{
 							$title = Stylite\Vfs\Links\StreamWrapper::entry2name($app, $id, $title);
 						}
 
 						$link = Api\Link::view($app, $id);
-						if($app != Api\Link::VFS_APPNAME)
+						if ($app != Api\Link::VFS_APPNAME)
 						{
 							// Set app to false so we always get an external link
-							$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php',$link, false));
+							$link = str_replace(',', '%2C', $GLOBALS['egw']->framework->link('/index.php', $link, false));
 						}
 						else
 						{
@@ -435,17 +434,17 @@ 
 						// Prepend site
 						if ($link[0] == '/') $link = Api\Framework::getUrl($link);
 
-						$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
+						$array['$$'.($prefix ? $prefix.'/' : '').$placeholder.'$$'] = Api\Html::a_href(Api\Html::htmlspecialchars($title), $link);
 						break;
 					case 'links':
-						$link_app = $matches[3][$i] ? $matches[3][$i] :  '!'.Api\Link::VFS_APPNAME;
-						$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = $this->get_links($app, $id, $link_app, array(),$matches[2][$i]);
+						$link_app = $matches[3][$i] ? $matches[3][$i] : '!'.Api\Link::VFS_APPNAME;
+						$array['$$'.($prefix ? $prefix.'/' : '').$placeholder.'$$'] = $this->get_links($app, $id, $link_app, array(), $matches[2][$i]);
 						break;
 					case 'attachments':
-						$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = $this->get_links($app, $id, Api\Link::VFS_APPNAME,array(),$matches[2][$i]);
+						$array['$$'.($prefix ? $prefix.'/' : '').$placeholder.'$$'] = $this->get_links($app, $id, Api\Link::VFS_APPNAME, array(), $matches[2][$i]);
 						break;
 					default:
-						$array['$$'.($prefix?$prefix.'/':'').$placeholder.'$$'] = $this->get_links($app, $id, $matches[3][$i], array(), $matches[2][$i]);
+						$array['$$'.($prefix ? $prefix.'/' : '').$placeholder.'$$'] = $this->get_links($app, $id, $matches[3][$i], array(), $matches[2][$i]);
 						break;
 				}
 				$link_cache[$id][$placeholder] = $array[$placeholder];
@@ -462,12 +461,12 @@ 
 	 * @deprecated use Api\DateTime::to($time='now',$format='')
 	 * @return string
 	 */
-	protected function format_datetime($time,$format=null)
+	protected function format_datetime($time, $format = null)
 	{
-		trigger_error(__METHOD__ . ' is deprecated, use Api\DateTime::to($time, $format)', E_USER_DEPRECATED);
+		trigger_error(__METHOD__.' is deprecated, use Api\DateTime::to($time, $format)', E_USER_DEPRECATED);
 		if (is_null($format)) $format = $this->datetime_format;
 
-		return Api\DateTime::to($time,$format);
+		return Api\DateTime::to($time, $format);
 	}
 
 	/**
@@ -479,7 +478,7 @@ 
 	 */
 	public static function is_export_limit_excepted()
 	{
-		static $is_excepted=null;
+		static $is_excepted = null;
 
 		if (is_null($is_excepted))
 		{
@@ -489,9 +488,9 @@ 
 			if (!$is_excepted && (is_array($export_limit_excepted = $GLOBALS['egw_info']['server']['export_limit_excepted']) ||
 				is_array($export_limit_excepted = unserialize($export_limit_excepted))))
 			{
-				$id_and_memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'],true);
+				$id_and_memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 				$id_and_memberships[] = $GLOBALS['egw_info']['user']['account_id'];
-				$is_excepted = (bool) array_intersect($id_and_memberships, $export_limit_excepted);
+				$is_excepted = (bool)array_intersect($id_and_memberships, $export_limit_excepted);
 			}
 		}
 		return $is_excepted;
@@ -504,18 +503,18 @@ 
 	 * @return mixed - no if no export is allowed, false if there is no restriction and int as there is a valid restriction
 	 *		you may have to cast the returned value to int, if you want to use it as number
 	 */
-	public static function getExportLimit($app='common')
+	public static function getExportLimit($app = 'common')
 	{
-		static $exportLimitStore=array();
-		if (empty($app)) $app='common';
+		static $exportLimitStore = array();
+		if (empty($app)) $app = 'common';
 		//error_log(__METHOD__.__LINE__.' called with app:'.$app);
-		if (!array_key_exists($app,$exportLimitStore))
+		if (!array_key_exists($app, $exportLimitStore))
 		{
 			//error_log(__METHOD__.__LINE__.' -> '.$app_limit.' '.function_backtrace());
 			$exportLimitStore[$app] = $GLOBALS['egw_info']['server']['export_limit'];
-			if ($app !='common')
+			if ($app != 'common')
 			{
-				$app_limit = Api\Hooks::single('export_limit',$app);
+				$app_limit = Api\Hooks::single('export_limit', $app);
 				if ($app_limit) $exportLimitStore[$app] = $app_limit;
 			}
 			//error_log(__METHOD__.__LINE__.' building cache for app:'.$app.' -> '.$exportLimitStore[$app]);
@@ -547,9 +546,9 @@ 
 	 *
 	 * @return bool - true if no export is allowed or a limit is set, false if there is no restriction
 	 */
-	public static function hasExportLimit($app_limit,$checkas='AND')
+	public static function hasExportLimit($app_limit, $checkas = 'AND')
 	{
-		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit !='no' && $app_limit > 0) );
+		if (strtoupper($checkas) == 'ISALLOWED') return (empty($app_limit) || ($app_limit != 'no' && $app_limit > 0));
 		if (empty($app_limit)) return false;
 		if ($app_limit == 'no') return true;
 		if ($app_limit > 0) return true;
@@ -565,28 +564,28 @@ 
 	 * @param array $fix =null regular expression => replacement pairs eg. to fix garbled placeholders
 	 * @return string|boolean merged document or false on error
 	 */
-	public function &merge($document,$ids,&$err,$mimetype,array $fix=null)
+	public function &merge($document, $ids, &$err, $mimetype, array $fix = null)
 	{
 		if (!($content = file_get_contents($document)))
 		{
-			$err = lang("Document '%1' does not exist or is not readable for you!",$document);
+			$err = lang("Document '%1' does not exist or is not readable for you!", $document);
 			return false;
 		}
 
 		if (self::hasExportLimit($this->export_limit) && !self::is_export_limit_excepted() && count($ids) > (int)$this->export_limit)
 		{
-			$err = lang('No rights to export more than %1 entries!',(int)$this->export_limit);
+			$err = lang('No rights to export more than %1 entries!', (int)$this->export_limit);
 			return false;
 		}
 
 		// fix application/msword mimetype for rtf files
-		if ($mimetype == 'application/msword' && strtolower(substr($document,-4)) == '.rtf')
+		if ($mimetype == 'application/msword' && strtolower(substr($document, -4)) == '.rtf')
 		{
 			$mimetype = 'application/rtf';
 		}
 
 		try {
-			$content = $this->merge_string($content,$ids,$err,$mimetype,$fix);
+			$content = $this->merge_string($content, $ids, $err, $mimetype, $fix);
 		} catch (\Exception $e) {
 			_egw_log_exception($e);
 			$err = $e->getMessage();
@@ -595,18 +594,18 @@ 
 		return $content;
 	}
 
-	protected function apply_styles (&$content, $mimetype, $mso_application_progid=null)
+	protected function apply_styles(&$content, $mimetype, $mso_application_progid = null)
 	{
 		if (!isset($mso_application_progid))
 		{
 			$matches = null;
 			$mso_application_progid = $mimetype == 'application/xml' &&
-				preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/',substr($content,0,200),$matches) ?
+				preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/', substr($content, 0, 200), $matches) ?
 					$matches[1] : '';
 		}
 		// Tags we can replace with the target document's version
 		$replace_tags = array();
-		switch($mimetype.$mso_application_progid)
+		switch ($mimetype.$mso_application_progid)
 		{
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
@@ -639,7 +638,7 @@ 
 					// Remove spans with no attributes, linebreaks inside them cause problems
 					'/<span>(.*?)<\/span>/' => '$1'
 				);
-				$content = preg_replace(array_keys($replace_tags),array_values($replace_tags),$content);
+				$content = preg_replace(array_keys($replace_tags), array_values($replace_tags), $content);
 
 				/*
 				In the case where you have something like <span><span></w:t><w:br/><w:t></span></span> (invalid - mismatched tags),
@@ -649,9 +648,9 @@ 
 				$count = $i = 0;
 				do
 				{
-					$content = preg_replace('/<span>(.*?)<\/span>/','$1',$content, -1, $count);
+					$content = preg_replace('/<span>(.*?)<\/span>/', '$1', $content, -1, $count);
 					$i++;
-				} while($count > 0 && $i < 10);
+				} while ($count > 0 && $i < 10);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -662,20 +661,20 @@ 
 		}
 
 		// XSLT transform known tags
-		if($xslt)
+		if ($xslt)
 		{
 			// does NOT work with php 5.2.6: Catchable fatal error: argument 1 to transformToXml() must be of type DOMDocument
 			//$element = new SimpleXMLelement($content);
 			$element = new DOMDocument('1.0', 'utf-8');
 			$result = $element->loadXML($content);
-			if(!$result)
+			if (!$result)
 			{
 				throw new Api\Exception('Unable to parse merged document for styles.  Check warnings in log for details.');
 			}
 			$content = $xslt->transformToXml($element);
 //echo $content;die();
 			// Word 2003 needs two declarations, add extra declaration back in
-			if($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
+			if ($mimetype == 'application/xml' && $mso_application_progid == 'Word.Document' && strpos($content, '<?xml') !== 0) {
 				$content = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>'.$content;
 			}
 			// Validate
@@ -698,11 +697,11 @@ 
 	 * @param string $charset =null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
-	public function &merge_string($_content,$ids,&$err,$mimetype,array $fix=null,$charset=null)
+	public function &merge_string($_content, $ids, &$err, $mimetype, array $fix = null, $charset = null)
 	{
 		$matches = null;
 		if ($mimetype == 'application/xml' &&
-			preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/',substr($_content,0,200),$matches))
+			preg_match('/'.preg_quote('<?mso-application progid="').'([^"]+)'.preg_quote('"?>').'/', substr($_content, 0, 200), $matches))
 		{
 			$mso_application_progid = $matches[1];
 		}
@@ -717,9 +716,9 @@ 
 			return '$$'.strip_tags(substr($matches[0], 2, -2)).'$$';
 		}, $_content);
 		// Handle escaped placeholder markers in RTF, they won't match when escaped
-		if($mimetype == 'application/rtf')
+		if ($mimetype == 'application/rtf')
 		{
-			$content = preg_replace('/\\\{\\\{([^\\}]+)\\\}\\\}/i','$$\1$$',$content);
+			$content = preg_replace('/\\\{\\\{([^\\}]+)\\\}\\\}/i', '$$\1$$', $content);
 		}
 
 		// make currently processed mimetype available to class methods;
@@ -728,16 +727,16 @@ 
 		// fix garbled placeholders
 		if ($fix && is_array($fix))
 		{
-			$content = preg_replace(array_keys($fix),array_values($fix),$content);
+			$content = preg_replace(array_keys($fix), array_values($fix), $content);
 			//die("<pre>".htmlspecialchars($content)."</pre>\n");
 		}
-		list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
+		list($contentstart, $contentrepeat, $contentend) = preg_split('/\$\$pagerepeat\$\$/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
 		if ($mimetype == 'text/plain' && count($ids) > 1)
 		{
 			// textdocuments are simple, they do not hold start and end, but they may have content before and after the $$pagerepeat$$ tag
 			// header and footer should not hold any $$ tags; if we find $$ tags with the header, we assume it is the pagerepeatcontent
 			$nohead = false;
-			if (stripos($contentstart,'$$') !== false) $nohead = true;
+			if (stripos($contentstart, '$$') !== false) $nohead = true;
 			if ($nohead)
 			{
 				$contentend = $contentrepeat;
@@ -746,16 +745,16 @@ 
 			}
 
 		}
-		if (in_array($mimetype, array('application/vnd.oasis.opendocument.text','application/vnd.oasis.opendocument.text-template')) && count($ids) > 1)
+		if (in_array($mimetype, array('application/vnd.oasis.opendocument.text', 'application/vnd.oasis.opendocument.text-template')) && count($ids) > 1)
 		{
-			if(strpos($content, '$$pagerepeat') === false)
+			if (strpos($content, '$$pagerepeat') === false)
 			{
 				//for odt files we have to split the content and add a style for page break to  the style area
-				list($contentstart,$contentrepeat,$contentend) = preg_split('/office:body>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
-				$contentstart = substr($contentstart,0,strlen($contentstart)-1);  //remove "<"
-				$contentrepeat = substr($contentrepeat,0,strlen($contentrepeat)-2);  //remove "</";
+				list($contentstart, $contentrepeat, $contentend) = preg_split('/office:body>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
+				$contentstart = substr($contentstart, 0, strlen($contentstart) - 1); //remove "<"
+				$contentrepeat = substr($contentrepeat, 0, strlen($contentrepeat) - 2); //remove "</";
 				// need to add page-break style to the style list
-				list($stylestart,$stylerepeat,$styleend) = preg_split('/<\/office:automatic-styles>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document style sheets
+				list($stylestart, $stylerepeat, $styleend) = preg_split('/<\/office:automatic-styles>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document style sheets
 				$contentstart = $stylestart.'<style:style style:name="P200" style:family="paragraph" style:parent-style-name="Standard"><style:paragraph-properties fo:break-before="page"/></style:style></office:automatic-styles>';
 				$contentstart .= '<office:body>';
 				$contentend = '</office:body></office:document-content>';
@@ -763,22 +762,22 @@ 
 			else
 			{
 				// Template specifies where to repeat
-				list($contentstart,$contentrepeat,$contentend) = preg_split('/\$\$pagerepeat\$\$/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get different parts of document, seperated by pagerepeat
+				list($contentstart, $contentrepeat, $contentend) = preg_split('/\$\$pagerepeat\$\$/', $content, -1, PREG_SPLIT_NO_EMPTY); //get different parts of document, seperated by pagerepeat
 			}
 		}
 		if (in_array($mimetype, array('application/vnd.ms-word.document.macroenabled.12', 'application/vnd.openxmlformats-officedocument.wordprocessingml.document')) && count($ids) > 1)
 		{
 			//for Word 2007 XML files we have to split the content and add a style for page break to  the style area
-			list($contentstart,$contentrepeat,$contentend) = preg_split('/w:body>/',$content,-1, PREG_SPLIT_NO_EMPTY);  //get differt parts of document, seperatet by Pagerepeat
-			$contentstart = substr($contentstart,0,strlen($contentstart)-1);  //remove "</"
-			$contentrepeat = substr($contentrepeat,0,strlen($contentrepeat)-2);  //remove "</";
+			list($contentstart, $contentrepeat, $contentend) = preg_split('/w:body>/', $content, -1, PREG_SPLIT_NO_EMPTY); //get differt parts of document, seperatet by Pagerepeat
+			$contentstart = substr($contentstart, 0, strlen($contentstart) - 1); //remove "</"
+			$contentrepeat = substr($contentrepeat, 0, strlen($contentrepeat) - 2); //remove "</";
 			$contentstart .= '<w:body>';
 			$contentend = '</w:body></w:document>';
 		}
-		list($Labelstart,$Labelrepeat,$Labeltend) = preg_split('/\$\$label\$\$/',$contentrepeat,-1, PREG_SPLIT_NO_EMPTY);  //get the Lable content
-		preg_match_all('/\$\$labelplacement\$\$/',$contentrepeat,$countlables, PREG_SPLIT_NO_EMPTY);
+		list($Labelstart, $Labelrepeat, $Labeltend) = preg_split('/\$\$label\$\$/', $contentrepeat, -1, PREG_SPLIT_NO_EMPTY); //get the Lable content
+		preg_match_all('/\$\$labelplacement\$\$/', $contentrepeat, $countlables, PREG_SPLIT_NO_EMPTY);
 		$countlables = count($countlables[0]);
-		preg_replace('/\$\$labelplacement\$\$/','',$Labelrepeat,1);
+		preg_replace('/\$\$labelplacement\$\$/', '', $Labelrepeat, 1);
 		if ($countlables > 1) $lableprint = true;
 		if (count($ids) > 1 && !$contentrepeat)
 		{
@@ -789,10 +788,10 @@ 
 
 		if ($contentrepeat)
 		{
-			$content_stream = fopen('php://temp','r+');
+			$content_stream = fopen('php://temp', 'r+');
 			fwrite($content_stream, $contentstart);
 			$joiner = '';
-			switch($mimetype)
+			switch ($mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
@@ -818,19 +817,19 @@ 
 					$joiner = "\r\n";
 					break;
 				default:
-					$err = lang('%1 not implemented for %2!','$$pagerepeat$$',$mimetype);
+					$err = lang('%1 not implemented for %2!', '$$pagerepeat$$', $mimetype);
 					return false;
 			}
 		}
 		foreach ((array)$ids as $n => $id)
 		{
-			if ($contentrepeat) $content = $contentrepeat;   //content to repeat
+			if ($contentrepeat) $content = $contentrepeat; //content to repeat
 			if ($lableprint) $content = $Labelrepeat;
 
 			// generate replacements; if exeption is thrown, catch it set error message and return false
 			try
 			{
-				if(!($replacements = $this->get_replacements($id,$content)))
+				if (!($replacements = $this->get_replacements($id, $content)))
 				{
 					$err = lang('Entry not found!');
 					return false;
@@ -844,92 +843,92 @@ 
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() $n: $id ".Api\Vfs::hsize(memory_get_usage(true)));
 			// some general replacements: current user, date and time
-			if (strpos($content,'$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'person_id')))
+			if (strpos($content, '$$user/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'person_id')))
 			{
-				$replacements += $this->contact_replacements($user,'user', false, $content);
-				$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'],'account_primary_group'));
+				$replacements += $this->contact_replacements($user, 'user', false, $content);
+				$replacements['$$user/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($GLOBALS['egw_info']['user']['account_id'], 'account_primary_group'));
 			}
-			$replacements['$$date$$'] = Api\DateTime::to('now',true);
+			$replacements['$$date$$'] = Api\DateTime::to('now', true);
 			$replacements['$$datetime$$'] = Api\DateTime::to('now');
-			$replacements['$$time$$'] = Api\DateTime::to('now',false);
+			$replacements['$$time$$'] = Api\DateTime::to('now', false);
 
 			// does our extending class registered table-plugins AND document contains table tags
-			if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s',$content,$matches,PREG_SET_ORDER))
+			if ($this->table_plugins && preg_match_all('/\\$\\$table\\/([A-Za-z0-9_]+)\\$\\$(.*?)\\$\\$endtable\\$\\$/s', $content, $matches, PREG_SET_ORDER))
 			{
 				// process each table
-				foreach($matches as $match)
+				foreach ($matches as $match)
 				{
-					$plugin   = $match[1];	// plugin name
+					$plugin   = $match[1]; // plugin name
 					$callback = $this->table_plugins[$plugin];
-					$repeat   = $match[2];	// line to repeat
+					$repeat   = $match[2]; // line to repeat
 					$repeats = '';
 					if (isset($callback))
 					{
-						for($n = 0; ($row_replacements = $this->$callback($plugin,$id,$n,$repeat)); ++$n)
+						for ($n = 0; ($row_replacements = $this->$callback($plugin, $id, $n, $repeat)); ++$n)
 						{
 							$_repeat = $this->process_commands($repeat, $row_replacements);
-							$repeats .= $this->replace($_repeat,$row_replacements,$mimetype,$mso_application_progid);
+							$repeats .= $this->replace($_repeat, $row_replacements, $mimetype, $mso_application_progid);
 						}
 					}
-					$content = str_replace($match[0],$repeats,$content);
+					$content = str_replace($match[0], $repeats, $content);
 				}
 			}
-			$content = $this->process_commands($this->replace($content,$replacements,$mimetype,$mso_application_progid,$charset), $replacements);
+			$content = $this->process_commands($this->replace($content, $replacements, $mimetype, $mso_application_progid, $charset), $replacements);
 
 			// remove not existing replacements (eg. from calendar array)
-			if (strpos($content,'$$') !== null)
+			if (strpos($content, '$$') !== null)
 			{
-				$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i','',$content);
+				$content = preg_replace('/\$\$[a-z0-9_\/]+\$\$/i', '', $content);
 			}
 			if ($contentrepeat)
 			{
-				fwrite($content_stream, ($n == 0 ? '' : $joiner) . $content);
+				fwrite($content_stream, ($n == 0 ? '' : $joiner).$content);
 			}
-			if($lableprint)
+			if ($lableprint)
 			{
-				$contentrep[is_array($id) ? implode(':',$id) : $id] = $content;
+				$contentrep[is_array($id) ? implode(':', $id) : $id] = $content;
 			}
 		}
 		if ($Labelrepeat)
 		{
-			$countpage=0;
-			$count=0;
+			$countpage = 0;
+			$count = 0;
 			$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 
 			foreach ($contentrep as $Label)
 			{
-				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/',$Label,$contentrepeatpages[$countpage],1);
-				$count=$count+1;
-				if (($count % $countlables) == 0 && count($contentrep)>$count)  //new page
+				$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/', $Label, $contentrepeatpages[$countpage], 1);
+				$count = $count + 1;
+				if (($count % $countlables) == 0 && count($contentrep) > $count)  //new page
 				{
-					$countpage = $countpage+1;
+					$countpage = $countpage + 1;
 					$contentrepeatpages[$countpage] = $Labelstart.$Labeltend;
 				}
 			}
-			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/','',$contentrepeatpages[$countpage],-1);  //clean empty fields
+			$contentrepeatpages[$countpage] = preg_replace('/\$\$labelplacement\$\$/', '', $contentrepeatpages[$countpage], -1); //clean empty fields
 
-			switch($mimetype)
+			switch ($mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
-					return $contentstart.implode('\\par \\page\\pard\\plain',$contentrepeatpages).$contentend;
+					return $contentstart.implode('\\par \\page\\pard\\plain', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.text':
 				case 'application/vnd.oasis.opendocument.presentation':
 				case 'application/vnd.oasis.opendocument.text-template':
 				case 'application/vnd.oasis.opendocument.presentation-template':
-					return $contentstart.implode('<text:line-break />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<text:line-break />', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.spreadsheet':
 				case 'application/vnd.oasis.opendocument.spreadsheet-template':
-					return $contentstart.implode('</text:p><text:p>',$contentrepeatpages).$contentend;
+					return $contentstart.implode('</text:p><text:p>', $contentrepeatpages).$contentend;
 				case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 				case 'application/vnd.ms-word.document.macroenabled.12':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 				case 'application/vnd.ms-excel.sheet.macroenabled.12':
-					return $contentstart.implode('<w:br w:type="page" />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<w:br w:type="page" />', $contentrepeatpages).$contentend;
 				case 'text/plain':
-					return $contentstart.implode("\r\n",$contentrep).$contentend;
+					return $contentstart.implode("\r\n", $contentrep).$contentend;
 			}
-			$err = lang('%1 not implemented for %2!','$$labelplacement$$',$mimetype);
+			$err = lang('%1 not implemented for %2!', '$$labelplacement$$', $mimetype);
 			return false;
 		}
 
@@ -954,9 +953,9 @@ 
 	 * @param string $charset =null charset to override default set by mimetype or export charset
 	 * @return string
 	 */
-	protected function replace($content,array $replacements,$mimetype,$mso_application_progid='',$charset=null)
+	protected function replace($content, array $replacements, $mimetype, $mso_application_progid = '', $charset = null)
 	{
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -971,13 +970,13 @@ 
 			case 'application/xml':
 			case 'text/xml':
 				$is_xml = true;
-				$charset = 'utf-8';	// xml files --> always use utf-8
+				$charset = 'utf-8'; // xml files --> always use utf-8
 				break;
 
 			case 'text/html':
 				$is_xml = true;
 				$matches = null;
-				if (preg_match('/<meta http-equiv="content-type".*charset=([^;"]+)/i',$content,$matches))
+				if (preg_match('/<meta http-equiv="content-type".*charset=([^;"]+)/i', $content, $matches))
 				{
 					$charset = $matches[1];
 				}
@@ -996,18 +995,18 @@ 
 		// do we need to convert charset
 		if ($charset && $charset != Api\Translation::charset())
 		{
-			$replacements = Api\Translation::convert($replacements,Api\Translation::charset(),$charset);
+			$replacements = Api\Translation::convert($replacements, Api\Translation::charset(), $charset);
 		}
 
 		// Date only placeholders for timestamps
-		if(is_array($this->date_fields))
+		if (is_array($this->date_fields))
 		{
-			foreach($this->date_fields as $field)
+			foreach ($this->date_fields as $field)
 			{
-				if(($value = $replacements['$$'.$field.'$$']))
+				if (($value = $replacements['$$'.$field.'$$']))
 				{
 					$time = Api\DateTime::createFromFormat('+'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$user_timeformat.'*', $value);
-					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(Api\DateTime::$user_dateformat)  : '';
+					$replacements['$$'.$field.'/date$$'] = $time ? $time->format(Api\DateTime::$user_dateformat) : '';
 				}
 			}
 		}
@@ -1021,12 +1020,12 @@ 
 			// only keep tags, if we have xsl extension available
 			if (class_exists('XSLTProcessor') && class_exists('DOMDocument') && $this->parse_html_styles)
 			{
-				switch($mimetype.$mso_application_progid)
+				switch ($mimetype.$mso_application_progid)
 				{
 					case 'text/html':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>','<a>','<style>','<img>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>', '<style>', '<img>',
 						);
 						break;
 					case 'application/vnd.oasis.opendocument.text':		// open office
@@ -1036,8 +1035,8 @@ 
 					case 'application/vnd.oasis.opendocument.spreadsheet-template':
 					case 'application/vnd.oasis.opendocument.presentation-template':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>','<a>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>',
 						);
 						break;
 					case 'application/xmlWord.Document':	// Word 2003*/
@@ -1046,49 +1045,49 @@ 
 					case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 					case 'application/vnd.ms-excel.sheet.macroenabled.12':
 						$replace_tags = array(
-							'<b>','<strong>','<i>','<em>','<u>','<span>','<ol>','<ul>','<li>',
-							'<table>','<tr>','<td>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>',
 						);
 						break;
 				}
 			}
 			// clean replacements from array values and html or html-entities, which mess up xml
-			foreach($replacements as $name => &$value)
+			foreach ($replacements as $name => &$value)
 			{
 				// set unresolved array values to empty string
-				if(is_array($value))
+				if (is_array($value))
 				{
 					$value = '';
 					continue;
 				}
 				// decode html entities back to utf-8
 
-				if (is_string($value) && (strpos($value,'&') !== false) && $this->parse_html_styles)
+				if (is_string($value) && (strpos($value, '&') !== false) && $this->parse_html_styles)
 				{
-					$value = html_entity_decode($value,ENT_QUOTES,$charset);
+					$value = html_entity_decode($value, ENT_QUOTES, $charset);
 
 					// remove all non-decodable entities
-					if (strpos($value,'&') !== false)
+					if (strpos($value, '&') !== false)
 					{
-						$value = preg_replace('/&[^; ]+;/','',$value);
+						$value = preg_replace('/&[^; ]+;/', '', $value);
 					}
 				}
-				if(!$this->parse_html_styles || (
+				if (!$this->parse_html_styles || (
 					strpos($value, "\n") !== FALSE &&
-						strpos($value,'<br') === FALSE && strpos($value, '<span') === FALSE && strpos($value, '<p') === FALSE && strpos($value, '<div') === FALSE
+						strpos($value, '<br') === FALSE && strpos($value, '<span') === FALSE && strpos($value, '<p') === FALSE && strpos($value, '<div') === FALSE
 				))
 				{
 					// Encode special chars so they don't break the file
-					$value = htmlspecialchars($value,ENT_NOQUOTES);
+					$value = htmlspecialchars($value, ENT_NOQUOTES);
 				}
-				else if (is_string($value) && (strpos($value,'<') !== false))
+				else if (is_string($value) && (strpos($value, '<') !== false))
 				{
 					// Clean HTML, if it's being kept
-					if($replace_tags && extension_loaded('tidy')) {
+					if ($replace_tags && extension_loaded('tidy')) {
 						$tidy = new tidy();
 						$cleaned = $tidy->repairString($value, self::$tidy_config);
 						// Found errors. Strip it all so there's some output
-						if($tidy->getStatus() == 2)
+						if ($tidy->getStatus() == 2)
 						{
 							error_log($tidy->errorBuffer);
 							$value = strip_tags($value);
@@ -1099,52 +1098,52 @@ 
 						}
 					}
 					// replace </p> and <br /> with CRLF (remove <p> and CRLF)
-					$value = strip_tags(str_replace(array("\r","\n",'<p>','</p>','<div>','</div>','<br />'),
-						array('','','',"\r\n",'',"\r\n","\r\n"), $value),
+					$value = strip_tags(str_replace(array("\r", "\n", '<p>', '</p>', '<div>', '</div>', '<br />'),
+						array('', '', '', "\r\n", '', "\r\n", "\r\n"), $value),
 						implode('', $replace_tags));
 
 					// Change <tag>...\r\n</tag> to <tag>...</tag>\r\n or simplistic line break below will mangle it
 					// Loop to catch things like <b><span>Break:\r\n</span></b>
-					if($mso_application_progid)
+					if ($mso_application_progid)
 					{
 						$count = $i = 0;
 						do
 						{
-							$value = preg_replace('/<(b|strong|i|em|u|span)\b([^>]*?)>(.*?)'."\r\n".'<\/\1>/u', '<$1$2>$3</$1>'."\r\n",$value,-1,$count);
+							$value = preg_replace('/<(b|strong|i|em|u|span)\b([^>]*?)>(.*?)'."\r\n".'<\/\1>/u', '<$1$2>$3</$1>'."\r\n", $value, -1, $count);
 							$i++;
-						} while($count > 0 && $i < 10); // Limit of 10 chosen arbitrarily just in case
+						} while ($count > 0 && $i < 10); // Limit of 10 chosen arbitrarily just in case
 					}
 				}
 				// replace all control chars (C0+C1) but CR (\015), LF (\012) and TAB (\011) (eg. vertical tabulators) with space
 				// as they are not allowed in xml
-				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u',' ',$value);
-				if(is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
+				$value = preg_replace('/[\000-\010\013\014\016-\037\177-\237]/u', ' ', $value);
+				if (is_numeric($value) && $name != '$$user/account_id$$') // account_id causes problems with the preg_replace below
 				{
-					$names[] = preg_quote($name,'/');
+					$names[] = preg_quote($name, '/');
 				}
 			}
 
 			// Look for numbers, set their value if needed
-			if($this->numeric_fields || count($names))
+			if ($this->numeric_fields || count($names))
 			{
-				foreach((array)$this->numeric_fields as $fieldname) {
-					$names[] = preg_quote($fieldname,'/');
+				foreach ((array)$this->numeric_fields as $fieldname) {
+					$names[] = preg_quote($fieldname, '/');
 				}
 				$this->format_spreadsheet_numbers($content, $names, $mimetype.$mso_application_progid);
 			}
 
 			// Look for dates, set their value if needed
-			if($this->date_fields || count($names))
+			if ($this->date_fields || count($names))
 			{
 				$names = array();
-				foreach((array)$this->date_fields as $fieldname) {
+				foreach ((array)$this->date_fields as $fieldname) {
 					$names[] = $fieldname;
 				}
 				$this->format_spreadsheet_dates($content, $names, $replacements, $mimetype.$mso_application_progid);
 			}
 
 			// replace CRLF with linebreak tag of given type
-			switch($mimetype.$mso_application_progid)
+			switch ($mimetype.$mso_application_progid)
 			{
 				case 'application/vnd.oasis.opendocument.text':		// open office writer
 				case 'application/vnd.oasis.opendocument.text-template':
@@ -1177,14 +1176,14 @@ 
 			}
 			// now decode &, < and >, which need to be encoded as entities in xml
 			// Check for encoded >< getting double-encoded
-			if($this->parse_html_styles)
+			if ($this->parse_html_styles)
 			{
-				$replacements = str_replace(array('&',"\r","\n",'&amp;lt;','&amp;gt;'),array('&amp;','',$break,'&lt;','&gt;'),$replacements);
+				$replacements = str_replace(array('&', "\r", "\n", '&amp;lt;', '&amp;gt;'), array('&amp;', '', $break, '&lt;', '&gt;'), $replacements);
 			}
 			else
 			{
 				// Need to at least handle new lines, or it'll be run together on one line
-				$replacements = str_replace(array("\r","\n"),array('',$break),$replacements);
+				$replacements = str_replace(array("\r", "\n"), array('', $break), $replacements);
 			}
 		}
 		if ($mimetype == 'application/x-yaml')
@@ -1195,24 +1194,24 @@ 
 				$parts = null;
 				if (preg_match('|^\$\$([^/]+)/([^/]+)/([^$]*)\$\$$|', $matches[3], $parts) && isset($replacements['$$'.$parts[1].'$$']))
 				{
-					$replacement =& $replacements['$$'.$parts[1].'$$'];
+					$replacement = & $replacements['$$'.$parts[1].'$$'];
 					$replacement = preg_replace('/'.$parts[2].'/', strtr($parts[3], array(
 						'\\n' => "\n", '\\r' => "\r", '\\t' => "\t", '\\v' => "\v", '\\\\' => '\\', '\\f' => "\f",
 					)), $replacement);
 				}
 				else
 				{
-					$replacement =& $replacements[$matches[3]];
+					$replacement = & $replacements[$matches[3]];
 				}
 				// replacement with multiple lines --> add same number of space as before placeholder
 				if (isset($replacement))
 				{
 					return $matches[1].$matches[2].implode("\n".$matches[1], preg_split("/\r?\n/", $replacement));
 				}
-				return $matches[0];	// regular replacement below
+				return $matches[0]; // regular replacement below
 			}, $content);
 		}
-		return str_replace(array_keys($replacements),array_values($replacements),$content);
+		return str_replace(array_keys($replacements), array_values($replacements), $content);
 	}
 
 	/**
@@ -1220,40 +1219,40 @@ 
 	 */
 	protected function format_spreadsheet_numbers(&$content, $names, $mimetype)
 	{
-		foreach((array)$this->numeric_fields as $fieldname) {
-			$names[] = preg_quote($fieldname,'/');
+		foreach ((array)$this->numeric_fields as $fieldname) {
+			$names[] = preg_quote($fieldname, '/');
 		}
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 			case 'application/vnd.oasis.opendocument.spreadsheet-template':
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)(?:calcext:value-type="[^"]+")?>.?<([a-z].*?)[^>]*>('.implode('|', $names).')<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2><$3>$4</$3></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// tables in open office writer
 			case 'application/vnd.oasis.opendocument.presentation':
 			case 'application/vnd.oasis.opendocument.text-template':
 			case 'application/vnd.oasis.opendocument.presentation-template':
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|',$names).')<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>('.implode('|', $names).')<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="float" office:value="$4"$2><text:p text:style-name="Standard">$4</text:p></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// open office writer
 			case 'application/xmlExcel.Sheet':	// Excel 2003
-				$format = '/'.preg_quote('<Data ss:Type="String">','/').'('.implode('|',$names).')'.preg_quote('</Data>','/').'/';
+				$format = '/'.preg_quote('<Data ss:Type="String">', '/').'('.implode('|', $names).')'.preg_quote('</Data>', '/').'/';
 				$replacement = '<Data ss:Type="Number">$1</Data>';
 
 				break;
 		}
-		if($format && $names)
+		if ($format && $names)
 		{
 			// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
 			do {
 				$result = preg_replace($format, $replacement, $content, -1);
 			}
 			// try to increase/double pcre.backtrack_limit failure
-			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
+			while (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result) $content = $result; // On failure $result would be NULL
 		}
 	}
 
@@ -1264,7 +1263,7 @@ 
 	 */
 	protected static function increase_backtrack_limit()
 	{
-		static $backtrack_limit=null,$memory_limit=null;
+		static $backtrack_limit = null, $memory_limit = null;
 		if (!isset($backtrack_limit))
 		{
 			$backtrack_limit = ini_get('pcre.backtrack_limit');
@@ -1272,16 +1271,16 @@ 
 		if (!isset($memory_limit))
 		{
 			$memory_limit = ini_get('memory_limit');
-			switch(strtoupper(substr($memory_limit, -1)))
+			switch (strtoupper(substr($memory_limit, -1)))
 			{
 				case 'G': $memory_limit *= 1024;
 				case 'M': $memory_limit *= 1024;
 				case 'K': $memory_limit *= 1024;
 			}
 		}
-		if ($backtrack_limit < $memory_limit/8)
+		if ($backtrack_limit < $memory_limit / 8)
 		{
-			ini_set( 'pcre.backtrack_limit', $backtrack_limit*=2);
+			ini_set('pcre.backtrack_limit', $backtrack_limit *= 2);
 			return true;
 		}
 		error_log("pcre.backtrack_limit exceeded @ $backtrack_limit, some cells left as text.");
@@ -1293,41 +1292,41 @@ 
 	 */
 	protected function format_spreadsheet_dates(&$content, $names, &$values, $mimetype)
 	{
-		if(!in_array($mimetype, array(
-			'application/vnd.oasis.opendocument.spreadsheet',		// open office calc
-			'application/xmlExcel.Sheet',					// Excel 2003
+		if (!in_array($mimetype, array(
+			'application/vnd.oasis.opendocument.spreadsheet', // open office calc
+			'application/xmlExcel.Sheet', // Excel 2003
 			//'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'//Excel WTF
 		))) return;
 
 		// Some different formats dates could be in, depending what they've been through
 		$formats = array(
-			'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat.':s',
-			'!'.Api\DateTime::$user_dateformat . '*' .Api\DateTime::$user_timeformat.':s',
-			'!'.Api\DateTime::$user_dateformat . '* ' .Api\DateTime::$user_timeformat,
-			'!'.Api\DateTime::$user_dateformat . '*',
+			'!'.Api\DateTime::$user_dateformat.' '.Api\DateTime::$user_timeformat.':s',
+			'!'.Api\DateTime::$user_dateformat.'*'.Api\DateTime::$user_timeformat.':s',
+			'!'.Api\DateTime::$user_dateformat.'* '.Api\DateTime::$user_timeformat,
+			'!'.Api\DateTime::$user_dateformat.'*',
 			'!'.Api\DateTime::$user_dateformat,
 			'!Y-m-d\TH:i:s'
 		);
 
 		// Properly format values for spreadsheet
-		foreach($names as $idx => &$field)
+		foreach ($names as $idx => &$field)
 		{
 			$key = '$$'.$field.'$$';
 			$field = preg_quote($field, '/');
-			if($values[$key])
+			if ($values[$key])
 			{
 				$date = Api\DateTime::createFromUserFormat($values[$key]);
-				if($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
+				if ($mimetype == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' ||
 					$mimetype == 'application/vnd.ms-excel.sheet.macroenabled.12')//Excel WTF
 				{
 					$interval = $date->diff(new Api\DateTime('1900-01-00 0:00'));
-					$values[$key] = $interval->format('%a')+1;// 1900-02-29 did not exist
+					$values[$key] = $interval->format('%a') + 1; // 1900-02-29 did not exist
 					// 1440 minutes in a day - fractional part
-					$values[$key] += ($date->format('H') * 60 + $date->format('i'))/1440;
+					$values[$key] += ($date->format('H') * 60 + $date->format('i')) / 1440;
 				}
 				else
 				{
-					$values[$key] = date('Y-m-d\TH:i:s',Api\DateTime::to($date,'ts'));
+					$values[$key] = date('Y-m-d\TH:i:s', Api\DateTime::to($date, 'ts'));
 				}
 			}
 			else
@@ -1336,17 +1335,17 @@ 
 			}
 		}
 
-		switch($mimetype)
+		switch ($mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 				// Removing these forces calc to respect our set value-type
-				$content = str_ireplace('calcext:value-type="string"','',$content);
+				$content = str_ireplace('calcext:value-type="string"', '', $content);
 
-				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>\$\$('.implode('|',$names).')\$\$<\/\3>.?<\/table:table-cell>/s';
+				$format = '/<table:table-cell([^>]+?)office:value-type="[^"]+"([^>]*?)>.?<([a-z].*?)[^>]*>\$\$('.implode('|', $names).')\$\$<\/\3>.?<\/table:table-cell>/s';
 				$replacement = '<table:table-cell$1office:value-type="date" office:date-value="\$\$$4\$\$"$2><$3>\$\$$4\$\$</$3></table:table-cell>';
 				break;
 			case 'application/xmlExcel.Sheet':	// Excel 2003
-				$format = '/'.preg_quote('<Data ss:Type="String">','/').'..('.implode('|',$names).')..'.preg_quote('</Data>','/').'/';
+				$format = '/'.preg_quote('<Data ss:Type="String">', '/').'..('.implode('|', $names).')..'.preg_quote('</Data>', '/').'/';
 				$replacement = '<Data ss:Type="DateTime">\$\$$1\$\$</Data>';
 
 				break;
@@ -1354,16 +1353,16 @@ 
 			case 'application/vnd.ms-excel.sheet.macroenabled.12':
 				break;
 		}
-		if($format && $names)
+		if ($format && $names)
 		{
 			// Dealing with backtrack limit per AmigoJack 10-Jul-2010 comment on php.net preg-replace docs
 			do {
 				$result = preg_replace($format, $replacement, $content, -1);
 			}
 			// try to increase/double pcre.backtrack_limit failure
-			while(preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
+			while (preg_last_error() == PREG_BACKTRACK_LIMIT_ERROR && self::increase_backtrack_limit());
 
-			if ($result) $content = $result;  // On failure $result would be NULL
+			if ($result) $content = $result; // On failure $result would be NULL
 		}
 	}
 
@@ -1373,9 +1372,9 @@ 
 	 */
 	public function cf_link_to_expand($values, $content, &$replacements, $app = null)
 	{
-		if($app == null)
+		if ($app == null)
 		{
-			$app = str_replace('_merge','',get_class($this));
+			$app = str_replace('_merge', '', get_class($this));
 		}
 		$cfs = Api\Storage\Customfields::get($app);
 
@@ -1386,24 +1385,24 @@ 
 		// Placeholders that need expanded will look like {{#name/placeholder}}
 		$matches = null;
 		preg_match_all('/\${2}(([^\/#]*?\/)?)#([^$\/]+)\/(.*?)[$}]{2}/', $content, $matches);
-		list($placeholders, , , $cf, $sub) = $matches;
+		list($placeholders,,, $cf, $sub) = $matches;
 
 		// Collect any used custom fields from entries so you can do
 		// {{#other_app/#other_app_cf/n_fn}}
 		$expand_sub_cfs = [];
-		foreach($sub as $index => $cf_sub)
+		foreach ($sub as $index => $cf_sub)
 		{
-			if(strpos($cf_sub, '#') === 0)
+			if (strpos($cf_sub, '#') === 0)
 			{
-				$expand_sub_cfs[$cf[$index]] .= '$$'.$cf_sub . '$$ ';
+				$expand_sub_cfs[$cf[$index]] .= '$$'.$cf_sub.'$$ ';
 			}
 		}
 
-		foreach($cf as $index => $field)
+		foreach ($cf as $index => $field)
 		{
-			if($cfs[$field])
+			if ($cfs[$field])
 			{
-				if(in_array($cfs[$field]['type'],array_keys($GLOBALS['egw_info']['apps'])))
+				if (in_array($cfs[$field]['type'], array_keys($GLOBALS['egw_info']['apps'])))
 				{
 					$field_app = $cfs[$field]['type'];
 				}
@@ -1414,7 +1413,7 @@ 
 					$account = $GLOBALS['egw']->accounts->read($values['#'.$field]);
 					$app_replacements[$field] = $this->contact_replacements($account['person_id']);
 				}
-				else if (($list = explode('-',$cfs[$field]['type']) && in_array($list[0], array_keys($GLOBALS['egw_info']['apps']))))
+				else if (($list = explode('-', $cfs[$field]['type']) && in_array($list[0], array_keys($GLOBALS['egw_info']['apps']))))
 				{
 					// Sub-type - use app
 					$field_app = $list[0];
@@ -1425,7 +1424,7 @@ 
 				}
 
 				// Get replacements for that application
-				if(!$app_replacements[$field])
+				if (!$app_replacements[$field])
 				{
 					// If we send the real content it can result in infinite loop of lookups
 					// so we send only the used fields
@@ -1449,10 +1448,10 @@ 
 	 * @param string $content
 	 * @return array
 	 */
-	public function get_app_replacements($app, $id, $content, $prefix='')
+	public function get_app_replacements($app, $id, $content, $prefix = '')
 	{
 		$replacements = array();
-		if($app == 'addressbook')
+		if ($app == 'addressbook')
 		{
 			return $this->contact_replacements($id, $prefix, false, $content);
 		}
@@ -1462,7 +1461,7 @@ 
 			$classname = "{$app}_merge";
 			$class = new $classname();
 			$method = $app.'_replacements';
-			if(method_exists($class,$method))
+			if (method_exists($class, $method))
 			{
 				$replacements = $class->$method($id, $prefix, $content);
 			}
@@ -1489,33 +1488,33 @@ 
 	 */
 	private function process_commands($content, $replacements)
 	{
-		if (strpos($content,'$$IF') !== false)
+		if (strpos($content, '$$IF') !== false)
 		{	//Example use to use: $$IF n_prefix~Herr~Sehr geehrter~Sehr geehrte$$
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$IF ([#0-9a-z_\/-]+)~(.*)~(.*)~(.*)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$NELF') !== false)
+		if (strpos($content, '$$NELF') !== false)
 		{	//Example: $$NEPBR org_unit$$ sets a LF and value of org_unit, only if there is a value
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$NELF ([#0-9a-z_\/-]+)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$NENVLF') !== false)
+		if (strpos($content, '$$NENVLF') !== false)
 		{	//Example: $$NEPBRNV org_unit$$ sets only a LF if there is a value for org_units, but did not add any value
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$NENVLF ([#0-9a-z_\/-]+)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
-		if (strpos($content,'$$LETTERPREFIX$$') !== false)
+		if (strpos($content, '$$LETTERPREFIX$$') !== false)
 		{	//Example use to use: $$LETTERPREFIX$$
 			$LETTERPREFIXCUSTOM = '$$LETTERPREFIXCUSTOM n_prefix title n_family$$';
-			$content = str_replace('$$LETTERPREFIX$$',$LETTERPREFIXCUSTOM,$content);
+			$content = str_replace('$$LETTERPREFIX$$', $LETTERPREFIXCUSTOM, $content);
 		}
-		if (strpos($content,'$$LETTERPREFIXCUSTOM') !== false)
+		if (strpos($content, '$$LETTERPREFIXCUSTOM') !== false)
 		{	//Example use to use for a custom Letter Prefix: $$LETTERPREFIX n_prefix title n_family$$
-			$this->replacements =& $replacements;
-			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU',Array($this,'replace_callback'),$content);
+			$this->replacements = & $replacements;
+			$content = preg_replace_callback('/\$\$LETTERPREFIXCUSTOM ([#0-9a-z_-]+)(.*)\$\$/imU', Array($this, 'replace_callback'), $content);
 			unset($this->replacements);
 		}
 		return $content;
@@ -1529,16 +1528,16 @@ 
 	 */
 	private function replace_callback($param)
 	{
-		if (array_key_exists('$$'.$param[4].'$$',$this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
-		if (array_key_exists('$$'.$param[3].'$$',$this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
+		if (array_key_exists('$$'.$param[4].'$$', $this->replacements)) $param[4] = $this->replacements['$$'.$param[4].'$$'];
+		if (array_key_exists('$$'.$param[3].'$$', $this->replacements)) $param[3] = $this->replacements['$$'.$param[3].'$$'];
 
 		$pattern = '/'.preg_quote($param[2], '/').'/';
-		if (strpos($param[0],'$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
+		if (strpos($param[0], '$$IF') === 0 && (trim($param[2]) == "EMPTY" || $param[2] === ''))
 		{
 			$pattern = '/^$/';
 		}
-		$replace = preg_match($pattern,$this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
-		switch($this->mimetype)
+		$replace = preg_match($pattern, $this->replacements['$$'.$param[1].'$$']) ? $param[3] : $param[4];
+		switch ($this->mimetype)
 		{
 			case 'application/vnd.oasis.opendocument.text':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -1557,7 +1556,7 @@ 
 				break;
 		}
 
-		switch($this->mimetype)
+		switch ($this->mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
@@ -1567,7 +1566,7 @@ 
 				case 'application/vnd.oasis.opendocument.presentation':
 				case 'application/vnd.oasis.opendocument.text-template':
 				case 'application/vnd.oasis.opendocument.presentation-template':
-					$LF ='<text:line-break/>';
+					$LF = '<text:line-break/>';
 					break;
 				case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 				case 'application/vnd.oasis.opendocument.spreadsheet-template':
@@ -1580,10 +1579,10 @@ 
 				case 'application/vnd.ms-word.document.macroenabled.12':
 				case 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet':
 				case 'application/vnd.ms-excel.sheet.macroenabled.12':
-					$LF ='</w:t></w:r></w:p><w:p><w:r><w:t>';
+					$LF = '</w:t></w:r></w:p><w:p><w:r><w:t>';
 					break;
 				case 'application/xml';
-					$LF ='</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
+					$LF = '</w:t></w:r><w:r><w:br w:type="text-wrapping" w:clear="all"/></w:r><w:r><w:t>';
 					break;
 				case 'text/html':
 					$LF = "<br/>";
@@ -1591,27 +1590,27 @@ 
 				default:
 					$LF = "\n";
 			}
-		if($is_xml) {
-			$this->replacements = str_replace(array('&','&amp;amp;','<','>',"\r","\n"),array('&amp;','&amp;','&lt;','&gt;','',$LF),$this->replacements);
+		if ($is_xml) {
+			$this->replacements = str_replace(array('&', '&amp;amp;', '<', '>', "\r", "\n"), array('&amp;', '&amp;', '&lt;', '&gt;', '', $LF), $this->replacements);
 		}
-		if (strpos($param[0],'$$NELF') === 0)
+		if (strpos($param[0], '$$NELF') === 0)
 		{	//sets a Pagebreak and value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
+			if ($this->replacements['$$'.$param[1].'$$'] != '') $replace = $LF.$this->replacements['$$'.$param[1].'$$'];
 		}
-		if (strpos($param[0],'$$NENVLF') === 0)
+		if (strpos($param[0], '$$NENVLF') === 0)
 		{	//sets a Pagebreak without any value, only if the field has a value
-			if ($this->replacements['$$'.$param[1].'$$'] !='') $replace = $LF;
+			if ($this->replacements['$$'.$param[1].'$$'] != '') $replace = $LF;
 		}
-		if (strpos($param[0],'$$LETTERPREFIXCUSTOM') === 0)
+		if (strpos($param[0], '$$LETTERPREFIXCUSTOM') === 0)
 		{	//sets a Letterprefix
 			$replaceprefixsort = array();
 			// ToDo Stefan: $contentstart is NOT defined here!!!
-			$replaceprefix = explode(' ',substr($param[0],21,-2));
+			$replaceprefix = explode(' ', substr($param[0], 21, -2));
 			foreach ($replaceprefix as $nameprefix)
 			{
-				if ($this->replacements['$$'.$nameprefix.'$$'] !='') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
+				if ($this->replacements['$$'.$nameprefix.'$$'] != '') $replaceprefixsort[] = $this->replacements['$$'.$nameprefix.'$$'];
 			}
-			$replace = implode($replaceprefixsort,' ');
+			$replace = implode($replaceprefixsort, ' ');
 		}
 		return $replace;
 	}
@@ -1625,14 +1624,14 @@ 
 	 * @param string $dirs comma or whitespace separated directories, used if $document is a relative path
 	 * @return string with error-message on error, otherwise it does NOT return
 	 */
-	public function download($document, $ids, $name='', $dirs='')
+	public function download($document, $ids, $name = '', $dirs = '')
 	{
 		$result = $this->merge_file($document, $ids, $name, $dirs, $header);
 
-		if(is_file($result) && is_readable($result))
+		if (is_file($result) && is_readable($result))
 		{
-			Api\Header\Content::type($header['name'],$header['mime'],$header['filesize']);
-			readfile($result,'r');
+			Api\Header\Content::type($header['name'], $header['mime'], $header['filesize']);
+			readfile($result, 'r');
 			exit;
 		}
 
@@ -1651,7 +1650,7 @@ 
 	 * @return string with error-message on error
 	 * @throws Api\Exception
 	 */
-	public function merge_file($document, $ids, &$name='', $dirs='', &$header)
+	public function merge_file($document, $ids, &$name = '', $dirs = '', &$header)
 	{
 		//error_log(__METHOD__."('$document', ".array2string($ids).", '$name', dirs='$dirs') ->".function_backtrace());
 		if (($error = $this->check_document($document, $dirs)))
@@ -1667,7 +1666,7 @@ 
 				$mail_bo->openConnection();
 				try
 				{
-					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder='');
+					$msgs = $mail_bo->importMessageToMergeAndSend($this, $content_url, $ids, $_folder = '');
 				}
 				catch (Api\Exception\WrongUserinput $e)
 				{
@@ -1676,13 +1675,13 @@ 
 				}
 				//error_log(__METHOD__.__LINE__.' Message after importMessageToMergeAndSend:'.array2string($msgs));
 				$retString = '';
-				if (count($msgs['success'])>0) $retString .= count($msgs['success']).' '.(count($msgs['success'])+count($msgs['failed'])==1?lang('Message prepared for sending.'):lang('Message(s) send ok.'));//implode('<br />',$msgs['success']);
+				if (count($msgs['success']) > 0) $retString .= count($msgs['success']).' '.(count($msgs['success']) + count($msgs['failed']) == 1 ?lang('Message prepared for sending.') : lang('Message(s) send ok.')); //implode('<br />',$msgs['success']);
 				//if (strlen($retString)>0) $retString .= '<br />';
-				foreach($msgs['failed'] as $c =>$e)
+				foreach ($msgs['failed'] as $c =>$e)
 				{
 					$errorString .= lang('contact').' '.lang('id').':'.$c.'->'.$e.'.';
 				}
-				if (count($msgs['failed'])>0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
+				if (count($msgs['failed']) > 0) $retString .= count($msgs['failed']).' '.lang('Message(s) send failed!').'=>'.$errorString;
 				return $retString;
 			case 'application/vnd.oasis.opendocument.text':
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -1690,7 +1689,7 @@ 
 			case 'application/vnd.oasis.opendocument.text-template':
 			case 'application/vnd.oasis.opendocument.spreadsheet-template':
 			case 'application/vnd.oasis.opendocument.presentation-template':
-				switch($mimetype)
+				switch ($mimetype)
 				{
 					case 'application/vnd.oasis.opendocument.text':	$ext = '.odt'; break;
 					case 'application/vnd.oasis.opendocument.spreadsheet': $ext = '.ods'; break;
@@ -1699,8 +1698,8 @@ 
 					case 'application/vnd.oasis.opendocument.spreadsheet-template': $ext = '.ots'; break;
 					case 'application/vnd.oasis.opendocument.presentation-template': $ext = '.otp'; break;
 				}
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,$ext).'-').$ext;
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, $ext).'-').$ext;
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'content.xml');
 				$this->parse_html_styles = true;
 				break;
@@ -1708,20 +1707,20 @@ 
 				$mimetype = 'application/vnd.openxmlformats-officedocument.wordprocessingml.document';
 			case 'application/vnd.openxmlformats-officedocument.wordprocessingml.document':
 			case 'application/vnd.ms-word.document.macroenabled.12':
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.docx').'-').'.docx';
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.docx').'-').'.docx';
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'word/document.xml');
 				$fix = array(		// regular expression to fix garbled placeholders
-					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$$\\1$$',
-					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="','/').
-						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="','/').
-						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$','/').'/i' => '$$\\2$$',
-					'/'.preg_quote('$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$\\1$',
-					'/'.preg_quote('$ $</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>','/').'([a-z0-9_]+)'.
-						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>','/').'/i' => '$ $\\1$ $',
+					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$$\\1$$',
+					'/'.preg_quote('$$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:lang w:val="', '/').
+						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:lang w:val="', '/').
+						'([a-z]{2}-[A-Z]{2})'.preg_quote('"/></w:rPr><w:t>$$', '/').'/i' => '$$\\2$$',
+					'/'.preg_quote('$</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$\\1$',
+					'/'.preg_quote('$ $</w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:t>', '/').'([a-z0-9_]+)'.
+						preg_quote('</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:t>', '/').'/i' => '$ $\\1$ $',
 				);
 				break;
 			case 'application/xml':
@@ -1736,13 +1735,13 @@ 
 				$fix = array(	// hack to get Excel 2007 to display additional rows in tables
 					'/ss:ExpandedRowCount="\d+"/' => 'ss:ExpandedRowCount="9999"',
 				);
-				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.xlsx').'-').'.xlsx';
-				copy($content_url,$archive);
+				$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.xlsx').'-').'.xlsx';
+				copy($content_url, $archive);
 				$content_url = 'zip://'.$archive.'#'.($content_file = 'xl/sharedStrings.xml');
 				break;
 		}
 		$err = null;
-		if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
+		if (!($merged = & $this->merge($content_url, $ids, $err, $mimetype, $fix)))
 		{
 			//error_log(__METHOD__."() !this->merge() err=$err");
 			return $err;
@@ -1759,22 +1758,22 @@ 
 			{
 				// Error converting HTML styles over
 				error_log($e->getMessage());
-				error_log("Target document: $content_url, IDs: ". array2string($ids));
+				error_log("Target document: $content_url, IDs: ".array2string($ids));
 
 				// Try again, but strip HTML so user gets something
 				$this->parse_html_styles = false;
-				if (!($merged =& $this->merge($content_url,$ids,$err,$mimetype,$fix)))
+				if (!($merged = & $this->merge($content_url, $ids, $err, $mimetype, $fix)))
 				{
 					return $err;
 				}
 			}
 			if ($this->report_memory_usage) error_log(__METHOD__."() after HTML processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
 		}
-		if(!empty($name))
+		if (!empty($name))
 		{
-			if(empty($ext))
+			if (empty($ext))
 			{
-				$ext = '.'.pathinfo($document,PATHINFO_EXTENSION);
+				$ext = '.'.pathinfo($document, PATHINFO_EXTENSION);
 			}
 			$name .= $ext;
 		}
@@ -1791,7 +1790,7 @@ 
 				error_log(__METHOD__.__LINE__." !ZipArchive::open('$archive',ZIPARCHIVE"."::CHECKCONS) failed. Trying open without validating");
 				if ($zip->open($archive) !== true) throw new Api\Exception("!ZipArchive::open('$archive',|ZIPARCHIVE::CHECKCONS)");
 			}
-			if ($zip->addFromString($content_file,$merged) !== true) throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
+			if ($zip->addFromString($content_file, $merged) !== true) throw new Api\Exception("!ZipArchive::addFromString('$content_file',\$merged)");
 			if ($zip->close() !== true) throw new Api\Exception("!ZipArchive::close()");
 			unset($zip);
 			unset($merged);
@@ -1800,16 +1799,16 @@ 
 		}
 		else
 		{
-			$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.'.$ext).'-').'.'.$ext;
+			$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.'.$ext).'-').'.'.$ext;
 			if ($mimetype == 'application/xml')
 			{
-				if (strpos($merged,'<?mso-application progid="Word.Document"?>') !== false)
+				if (strpos($merged, '<?mso-application progid="Word.Document"?>') !== false)
 				{
-					$header['mimetype'] = 'application/msword';	// to open it automatically in word or oowriter
+					$header['mimetype'] = 'application/msword'; // to open it automatically in word or oowriter
 				}
-				elseif (strpos($merged,'<?mso-application progid="Excel.Sheet"?>') !== false)
+				elseif (strpos($merged, '<?mso-application progid="Excel.Sheet"?>') !== false)
 				{
-					$header['mimetype'] = 'application/vnd.ms-excel';	// to open it automatically in excel or oocalc
+					$header['mimetype'] = 'application/vnd.ms-excel'; // to open it automatically in excel or oocalc
 				}
 			}
 			$handle = fopen($archive, 'w');
@@ -1831,13 +1830,13 @@ 
 	 */
 	public function download_by_request()
 	{
-		if(empty($_POST['data_document_name'])) return false;
-		if(empty($_POST['data_document_dir'])) return false;
-		if(empty($_POST['data_checked'])) return false;
+		if (empty($_POST['data_document_name'])) return false;
+		if (empty($_POST['data_document_dir'])) return false;
+		if (empty($_POST['data_checked'])) return false;
 
 		return $this->download(
 			$_POST['data_document_name'],
-			explode(',',$_POST['data_checked']),
+			explode(',', $_POST['data_checked']),
 			'',
 			$_POST['data_document_dir']
 		);
@@ -1851,18 +1850,18 @@ 
 	 * @param array|string $mime_filter=null allowed mime type(s), default all, negative filter if $mime_filter[0] === '!'
 	 * @return array List of documents, suitable for a selectbox.  The key is document_<filename>.
 	 */
-	public static function get_documents($dirs, $prefix='document_', $mime_filter=null, $app='')
+	public static function get_documents($dirs, $prefix = 'document_', $mime_filter = null, $app = '')
 	{
-		$export_limit=self::getExportLimit($app);
-		if (!$dirs || (!self::hasExportLimit($export_limit,'ISALLOWED') && !self::is_export_limit_excepted())) return array();
+		$export_limit = self::getExportLimit($app);
+		if (!$dirs || (!self::hasExportLimit($export_limit, 'ISALLOWED') && !self::is_export_limit_excepted())) return array();
 
 		// split multiple comma or whitespace separated directories
 		// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 		if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 		{
-			foreach($dirs as $n => &$d)
+			foreach ($dirs as $n => &$d)
 			{
-				if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+				if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
 			}
 		}
 		if ($mime_filter && ($negativ_filter = $mime_filter[0] === '!'))
@@ -1877,15 +1876,15 @@ 
 			}
 		}
 		$list = array();
-		foreach($dirs as $dir)
+		foreach ($dirs as $dir)
 		{
-			if (($files = Api\Vfs::find($dir,array('need_mime'=>true),true)))
+			if (($files = Api\Vfs::find($dir, array('need_mime'=>true), true)))
 			{
-				foreach($files as $file)
+				foreach ($files as $file)
 				{
 					// return only the mime-types we support
-					$parts = explode('.',$file['name']);
-					if (!self::is_implemented($file['mime'],'.'.array_pop($parts))) continue;
+					$parts = explode('.', $file['name']);
+					if (!self::is_implemented($file['mime'], '.'.array_pop($parts))) continue;
 					if ($mime_filter && $negativ_filter === in_array($file['mime'], (array)$mime_filter)) continue;
 					$list[$prefix.$file['name']] = Api\Vfs::decodePath($file['name']);
 				}
@@ -1912,8 +1911,8 @@ 
 	 * @param int|string $export_limit =null export-limit, default $GLOBALS['egw_info']['server']['export_limit']
 	 * @return array see nextmatch_widget::egw_actions
 	 */
-	public static function document_action($dirs, $group=0, $caption='Insert in document', $prefix='document_', $default_doc='',
-		$export_limit=null)
+	public static function document_action($dirs, $group = 0, $caption = 'Insert in document', $prefix = 'document_', $default_doc = '',
+		$export_limit = null)
 	{
 		$documents = array();
 		$editable_mimes = array();
@@ -1936,7 +1935,7 @@ 
 		}
 		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))	// put default document on top
 		{
-			if(!$file['mime'])
+			if (!$file['mime'])
 			{
 				$file['mime'] = Api\Vfs::mime_content_type($default_doc);
 				$file['path'] = $default_doc;
@@ -1945,7 +1944,7 @@ 
 				'icon' => Api\Vfs::mime_icon($file['mime']),
 				'caption' => Api\Vfs::decodePath(Api\Vfs::basename($default_doc)),
 				'group' => 1,
-				'postSubmit' => true,	// download needs post submit (not Ajax) to work
+				'postSubmit' => true, // download needs post submit (not Ajax) to work
 			);
 			if ($file['mime'] == 'message/rfc822')
 			{
@@ -1964,28 +1963,28 @@ 
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if (count($dirs = preg_split('/[,\s]+\//', $dirs)) > 1)
 			{
-				foreach($dirs as $n => &$d)
+				foreach ($dirs as $n => &$d)
 				{
-					if ($n) $d = '/'.$d;	// re-adding trailing slash removed by split
+					if ($n) $d = '/'.$d; // re-adding trailing slash removed by split
 				}
 			}
-			foreach($dirs as $dir)
+			foreach ($dirs as $dir)
 			{
-				$files += Api\Vfs::find($dir,array(
+				$files += Api\Vfs::find($dir, array(
 					'need_mime' => true,
 					'order' => 'fs_name',
 					'sort' => 'ASC',
-				),true);
+				), true);
 			}
 		}
 
 		$dircount = array();
-		foreach($files as $key => $file)
+		foreach ($files as $key => $file)
 		{
 			// use only the mime-types we support
-			$parts = explode('.',$file['name']);
-			if (!self::is_implemented($file['mime'],'.'.array_pop($parts)) ||
-				!Api\Vfs::check_access($file['path'], Api\Vfs::READABLE, $file) ||	// remove files not readable by user
+			$parts = explode('.', $file['name']);
+			if (!self::is_implemented($file['mime'], '.'.array_pop($parts)) ||
+				!Api\Vfs::check_access($file['path'], Api\Vfs::READABLE, $file) || // remove files not readable by user
 				$file['path'] === $default_doc)	// default doc already added
 			{
 				unset($files[$key]);
@@ -1993,40 +1992,40 @@ 
 			else
 			{
 				$dirname = Api\Vfs::dirname($file['path']);
-				if(!isset($dircount[$dirname]))
+				if (!isset($dircount[$dirname]))
 				{
 					$dircount[$dirname] = 1;
 				}
 				else
 				{
-					$dircount[$dirname] ++;
+					$dircount[$dirname]++;
 				}
 			}
 		}
-		foreach($files as $file)
+		foreach ($files as $file)
 		{
 			if (count($dircount) > 1)
 			{
 				$name_arr = explode('/', $file['name']);
 				$current_level = &$documents;
-				for($count = 0; $count < count($name_arr); $count++)
+				for ($count = 0; $count < count($name_arr); $count++)
 				{
-					if($count == 0)
+					if ($count == 0)
 					{
 						$current_level = &$documents;
 					}
 					else
 					{
-						$current_level = &$current_level[$prefix.$name_arr[($count-1)]]['children'];
+						$current_level = &$current_level[$prefix.$name_arr[($count - 1)]]['children'];
 					}
-					switch($count)
+					switch ($count)
 					{
-						case (count($name_arr)-1):
+						case (count($name_arr) - 1):
 							$current_level[$prefix.$file['name']] = array(
 								'icon'		=> Api\Vfs::mime_icon($file['mime']),
 								'caption'	=> Api\Vfs::decodePath($name_arr[$count]),
 								'group'		=> 2,
-								'postSubmit' => true,	// download needs post submit (not Ajax) to work
+								'postSubmit' => true, // download needs post submit (not Ajax) to work
 							);
 							if ($file['mime'] == 'message/rfc822')
 							{
@@ -2039,7 +2038,7 @@ 
 							break;
 
 						default:
-							if(!is_array($current_level[$prefix.$name_arr[$count]]))
+							if (!is_array($current_level[$prefix.$name_arr[$count]]))
 							{
 								// create parent folder
 								$current_level[$prefix.$name_arr[$count]] = array(
@@ -2066,7 +2065,7 @@ 
 				}
 				$documents[$file['mime']]['children'][$prefix.$file['name']] = array(
 					'caption' => Api\Vfs::decodePath($file['name']),
-					'postSubmit' => true,	// download needs post submit (not Ajax) to work
+					'postSubmit' => true, // download needs post submit (not Ajax) to work
 				);
 				if ($file['mime'] == 'message/rfc822')
 				{
@@ -2083,7 +2082,7 @@ 
 					'icon' => Api\Vfs::mime_icon($file['mime']),
 					'caption' => Api\Vfs::decodePath($file['name']),
 					'group' => 2,
-					'postSubmit' => true,	// download needs post submit (not Ajax) to work
+					'postSubmit' => true, // download needs post submit (not Ajax) to work
 				);
 				if ($file['mime'] == 'message/rfc822')
 				{
@@ -2101,8 +2100,8 @@ 
 			'caption' => $caption,
 			'children' => $documents,
 			// disable action if no document or export completly forbidden for non-admins
-			'enabled' => (boolean)$documents && (self::hasExportLimit($export_limit,'ISALLOWED') || self::is_export_limit_excepted()),
-			'hideOnDisabled' => true,	// do not show 'Insert in document', if no documents defined or no export allowed
+			'enabled' => (boolean)$documents && (self::hasExportLimit($export_limit, 'ISALLOWED') || self::is_export_limit_excepted()),
+			'hideOnDisabled' => true, // do not show 'Insert in document', if no documents defined or no export allowed
 			'group' => $group,
 		);
 	}
@@ -2133,14 +2132,14 @@ 
 		);
 
 		// egw.open() used if only 1 row selected
-		$action['egw_open'] = 'edit-mail--'.implode('&',$extra);
-		$action['target'] = 'compose_' .$file['path'];
+		$action['egw_open'] = 'edit-mail--'.implode('&', $extra);
+		$action['target'] = 'compose_'.$file['path'];
 
 		// long_task runs menuaction once for each selected row
 		$action['nm_action'] = 'long_task';
 		$action['popup'] = Api\Link::get_registry('mail', 'edit_popup');
-		$action['message'] = lang('insert in %1',Api\Vfs::decodePath($file['name']));
-		$action['menuaction'] = 'mail.mail_compose.ajax_merge&document='.$file['path'].'&merge='. get_called_class();
+		$action['message'] = lang('insert in %1', Api\Vfs::decodePath($file['name']));
+		$action['menuaction'] = 'mail.mail_compose.ajax_merge&document='.$file['path'].'&merge='.get_called_class();
 	}
 
 	/**
@@ -2174,15 +2173,15 @@ 
 	 */
 	public static function check_document(&$document, $dirs)
 	{
-		if($document[0] !== '/')
+		if ($document[0] !== '/')
 		{
 			// split multiple comma or whitespace separated directories
 			// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 			if ($dirs && ($dirs = preg_split('/[,\s]+\//', $dirs)))
 			{
-				foreach($dirs as $n => $dir)
+				foreach ($dirs as $n => $dir)
 				{
-					if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+					if ($n) $dir = '/'.$dir; // re-adding trailing slash removed by split
 					if (Api\Vfs::stat($dir.'/'.$document) && Api\Vfs::is_readable($dir.'/'.$document))
 					{
 						$document = $dir.'/'.$document;
@@ -2196,7 +2195,7 @@ 
 			return false;
 		}
 		//error_log(__METHOD__."('$document', dirs='$dirs') returning 'Document '$document' does not exist or is not readable for you!'");
-		return lang("Document '%1' does not exist or is not readable for you!",$document);
+		return lang("Document '%1' does not exist or is not readable for you!", $document);
 	}
 
 	/**
@@ -2217,16 +2216,16 @@ 
 	 * @param string $_mimetype =''
 	 * @return string
 	 */
-	static public function number_format($number,$num_decimal_places=2,$_mimetype='')
+	static public function number_format($number, $num_decimal_places = 2, $_mimetype = '')
 	{
 		if ((string)$number === '') return '';
 		//error_log(__METHOD__.$_mimetype);
-		switch($_mimetype)
+		switch ($_mimetype)
 		{
 			case 'application/xml':	// Excel 2003
 			case 'application/vnd.oasis.opendocument.spreadsheet': // OO.o spreadsheet
-				return number_format(str_replace(' ','',$number),$num_decimal_places,'.','');
+				return number_format(str_replace(' ', '', $number), $num_decimal_places, '.', '');
 		}
-		return Api\Etemplate::number_format($number,$num_decimal_places);
+		return Api\Etemplate::number_format($number, $num_decimal_places);
 	}
 }

api/src/Link.php

Doc Comments +3 added lines, -3 removed lines

@@ -433,7 +433,7 @@ 
 	 * generate temporary link_id used as array-key
 	 *
 	 * @param string $app app-name
-	 * @param mixed $id
+	 * @param string $id
 	 * @return string
 	 */
 	static function temp_link_id($app,$id)
@@ -579,7 +579,7 @@ 
 	 * @param string|array $id ='' id if $app_link_id is an appname or array with links, if 1. entry not yet created
 	 * @param string $app2 ='' second app
 	 * @param string $id2 ='' id in $app2
-	 * @return array with link-data or False
+	 * @return string with link-data or False
 	 */
 	static function get_link($app_link_id,$id='',$app2='',$id2='')
 	{
@@ -1197,7 +1197,7 @@ 
 	 * @param string $app appname to link the file to
 	 * @param string $id id in $app
 	 * @param string $file VFS path to link to
-	 * @return boolean true on success, false on failure
+	 * @return null|boolean true on success, false on failure
 	 */
 	static function link_file($app,$id,$file)
 	{

Braces +174 added lines, -48 removed lines

@@ -309,13 +309,16 @@ 
 	 */
 	static function save_session_cache()
 	{
-		if (isset($GLOBALS['egw']->session))	// eg. cron-jobs use it too, without any session
+		if (isset($GLOBALS['egw']->session))
+		{
+			// eg. cron-jobs use it too, without any session
 		{
 			//error_log(__METHOD__.'() items in title-cache: '.count(self::$title_cache).' file-access-cache: '.count(self::$file_access_cache));
 
 			if (count(self::$title_cache) > self::TITLE_CACHE_SIZE)
 			{
 				self::$title_cache = array_slice(self::$title_cache, -self::TITLE_CACHE_SIZE);
+		}
 			}
 			Cache::setSession(__CLASS__, 'link_title_cache', self::$title_cache);
 
@@ -366,14 +369,20 @@ 
 			$link_id = True;
 			while ($link_id && list(,$link) = each($app2))
 			{
-				if (!is_array($link))	// check for unlink-marker
+				if (!is_array($link))
+				{
+					// check for unlink-marker
 				{
 					//echo "<b>link='$link' is no array</b><br>\n";
 					continue;
 				}
-				if (is_array($id1) || !$id1)		// create link only in $id1 array
+				}
+				if (is_array($id1) || !$id1)
+				{
+					// create link only in $id1 array
 				{
 					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'],$link['owner'],$link['lastmod']);
+				}
 					continue;
 				}
 				switch ($link['app'])
@@ -397,18 +406,27 @@ 
 						$link_id = Link\Storage::link($app1,$id1,$link['app'],$link['id'],
 							$link['remark'],$link['owner'],$link['lastmod']);
 						// notify both sides
-						if (!($no_notify&2)) self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
-						if (!($no_notify&1)) self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						if (!($no_notify&2))
+						{
+							self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
+						}
+						if (!($no_notify&1))
+						{
+							self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						}
 						break;
 				}
 			}
 			return $link_id;
 		}
-		if (is_array($id1) || !$id1)		// create link only in $id1 array
+		if (is_array($id1) || !$id1)
+		{
+			// create link only in $id1 array
 		{
 			if (!is_array($id1))
 			{
 				$id1 = array( );
+		}
 			}
 			$link_id = self::temp_link_id($app2,$id2);
 
@@ -444,8 +462,14 @@ 
 		}
 		$link_id = Link\Storage::link($app1,$id1,$app2,$id2,$remark,$owner);
 
-		if (!($no_notify&2)) self::notify('link',$app2,$id2,$app1,$id1,$link_id);
-		if (!($no_notify&1)) self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		if (!($no_notify&2))
+		{
+			self::notify('link',$app2,$id2,$app1,$id1,$link_id);
+		}
+		if (!($no_notify&1))
+		{
+			self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		}
 
 		return $link_id;
 	}
@@ -477,7 +501,10 @@ 
 	 */
 	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC',$cache_titles=false, $deleted=false, $limit=null)
 	{
-		if (self::DEBUG) echo "<p>Link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
+		if (self::DEBUG)
+		{
+			echo "<p>Link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
+		}
 
 		if (is_array($id) || !$id)
 		{
@@ -548,7 +575,10 @@ 
 	 */
 	static function get_links_multiple($app,array $ids,$cache_titles=true,$only_app='',$order='link_lastmod DESC', $deleted=false )
 	{
-		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		if (self::DEBUG)
+		{
+			echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		}
 
 		if (!$ids)
 		{
@@ -580,7 +610,10 @@ 
 			{
 				foreach($targets as $link)
 				{
-					if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
+					if (is_array($link))
+					{
+						$app_ids[$link['app']][] = $link['id'];
+					}
 				}
 			}
 			foreach($app_ids as $app => $a_ids)
@@ -610,20 +643,30 @@ 
 		}
 		if (is_array($id))
 		{
-			if (strpos($app_link_id,':') === false) $app_link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+			if (strpos($app_link_id,':') === false)
+			{
+				$app_link_id = self::temp_link_id($app2,$id2);
+			}
+			// create link_id of temporary link, if not given
 
-			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))	// check for unlinked-marker
+			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))
+			{
+				// check for unlinked-marker
 			{
 				return $id[$app_link_id];
 			}
+			}
 			return False;
 		}
 		if ((int)$app_link_id < 0 || $app_link_id == self::VFS_APPNAME || $app2 == self::VFS_APPNAME)
 		{
-			if ((int)$app_link_id < 0)	// vfs link_id ?
+			if ((int)$app_link_id < 0)
+			{
+				// vfs link_id ?
 			{
 				return self::fileinfo2link(-$app_link_id);
 			}
+			}
 			if ($app_link_id == self::VFS_APPNAME)
 			{
 				return self::info_attached($app2,$id2,$id);
@@ -671,10 +714,13 @@ 
 		{
 			echo "<p>Link::unlink('$link_id','$app',".array2string($id).",'$owner','$app2','$id2', $hold_for_purge)</p>\n";
 		}
-		if ($link_id < 0)	// vfs-link?
+		if ($link_id < 0)
+		{
+			// vfs-link?
 		{
 			return self::delete_attached(-$link_id);
 		}
+		}
 		elseif ($app == self::VFS_APPNAME)
 		{
 			return self::delete_attached($app2,$id2,$id);
@@ -713,7 +759,11 @@ 
 
 			return count($deleted);
 		}
-		if (!$link_id) $link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+		if (!$link_id)
+		{
+			$link_id = self::temp_link_id($app2,$id2);
+		}
+		// create link_id of temporary link, if not given
 
 		if (isset($id[$link_id]))
 		{
@@ -739,7 +789,10 @@ 
 		$apps = array();
 		foreach(self::$app_register as $type => $reg)
 		{
-			if ($must_support && !isset($reg[$must_support])) continue;
+			if ($must_support && !isset($reg[$must_support]))
+			{
+				continue;
+			}
 
 			list($app) = explode('-', $type);
 			if ($GLOBALS['egw_info']['user']['apps'][$app])
@@ -796,12 +849,18 @@ 
 	 */
 	static function title($app,$id,$link=null)
 	{
-		if (!$id) return '';
+		if (!$id)
+		{
+			return '';
+		}
 
 		$title =& self::get_cache($app,$id);
 		if (isset($title) && !empty($title) && !is_array($id))
 		{
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
+			}
 			return $title;
 		}
 		if ($app == self::VFS_APPNAME)
@@ -821,21 +880,33 @@ 
 			{
 				$title .= ': '.$link['type'] . ' '.Vfs::hsize($link['size']);
 			}*/
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id')='$title' (file)</p>\n";
+			}
 			return $title;
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['title']))
 		{
-			if (self::DEBUG) echo "<p>".__METHOD__."('$app','$id') something is wrong!!!</p>\n";
+			if (self::DEBUG)
+			{
+				echo "<p>".__METHOD__."('$app','$id') something is wrong!!!</p>\n";
+			}
 			return false; //array(); // not sure why it should return an array on failure, as the description states boolean/string
 		}
 		$method = $reg['title'];
 
-		if (true) $title = self::exec($method, array($id));
+		if (true)
+		{
+			$title = self::exec($method, array($id));
+		}
 
-		if ($id && is_null($title))	// $app,$id has been deleted ==> unlink all links to it
+		if ($id && is_null($title))
+		{
+			// $app,$id has been deleted ==> unlink all links to it
 		{
 			static $unlinking = array();
+		}
 			// check if we are already trying to unlink the entry, to avoid an infinit recursion
 			if (!isset($unlinking[$app]) || !isset($unlinking[$app][$id]))
 			{
@@ -843,10 +914,16 @@ 
 				self::unlink(0,$app,$id);
 				unset($unlinking[$app][$id]);
 			}
-			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
+			if (self::DEBUG)
+			{
+				echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
+			}
 			return False;
 		}
-		if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from $method)</p>\n";
+		if (self::DEBUG)
+		{
+			echo '<p>'.__METHOD__."('$app','$id')='$title' (from $method)</p>\n";
+		}
 
 		return $title;
 	}
@@ -1012,7 +1089,10 @@ 
 			{
 				foreach($registry['mime'] as $mime => $data)
 				{
-					if ($mime == $type) return $data;
+					if ($mime == $type)
+					{
+						return $data;
+					}
 					if ($mime[0] == '/' && preg_match($mime.'i', $type))
 					{
 						$wildcard_mime = $data;
@@ -1033,7 +1113,10 @@ 
 	 */
 	static function mime_open($path, $type=null, &$popup=null)
 	{
-		if (is_null($type)) $type = Vfs::mime_content_type($path);
+		if (is_null($type))
+		{
+			$type = Vfs::mime_content_type($path);
+		}
 
 		if (($data = self::get_mime_info($type)))
 		{
@@ -1101,14 +1184,20 @@ 
 	{
 		$reg = self::$app_register[$app];
 
-		if (!isset($reg)) return false;
+		if (!isset($reg))
+		{
+			return false;
+		}
 
-		if (!isset($reg[$name]))	// some defaults
+		if (!isset($reg[$name]))
+		{
+			// some defaults
 		{
 			switch($name)
 			{
 				case 'name':
 					$reg[$name] = $app;
+		}
 					break;
 				case 'entry':
 					$reg[$name] = $app;
@@ -1147,10 +1236,12 @@ 
 
 		if ($app)
 		{
-			if( isset(self::$app_register[$app]) ) {
+			if( isset(self::$app_register[$app]) )
+			{
 				$reg = self::$app_register[$app];
 
-				if( isset($reg['file_dir']) ) {
+				if( isset($reg['file_dir']) )
+				{
 					$app = $reg['file_dir'];
 				}
 			}
@@ -1212,7 +1303,10 @@ 
 		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
 		{
 			$Ok = Vfs::copy_uploaded($file, $p=Vfs::parse_url($entry_dir, PHP_URL_PATH), $comment, false);	// no is_uploaded_file() check!
-			if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
+			if (!$Ok)
+			{
+				error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
+			}
 		}
 		else
 		{
@@ -1232,7 +1326,10 @@ 
 	static function link_file($app,$id,$file)
 	{
 		// Don't try to link into app dir if there is no id
-		if(!$id) return;
+		if(!$id)
+		{
+			return;
+		}
 
 		if (!Vfs::stat($file))
 		{
@@ -1259,10 +1356,13 @@ 
 	 */
 	static function delete_attached($app,$id='',$fname='')
 	{
-		if ((int)$app > 0)	// is file_id
+		if ((int)$app > 0)
+		{
+			// is file_id
 		{
 			$url = Vfs::resolve_url(Vfs\Sqlfs\StreamWrapper::id2path($app));
 		}
+		}
 		else
 		{
 			if (empty($app) || empty($id))
@@ -1271,9 +1371,12 @@ 
 			}
 			$url = self::vfs_path($app,$id,$fname);
 
-			if (!$fname || !$id)	// we delete the whole entry (or all entries), which probably not exist anymore
+			if (!$fname || !$id)
+			{
+				// we delete the whole entry (or all entries), which probably not exist anymore
 			{
 				$current_is_root = Vfs::$is_root;
+			}
 				Vfs::$is_root = true;
 			}
 		}
@@ -1293,7 +1396,10 @@ 
 		if (($Ok = !file_exists($url) || Vfs::remove($url,true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty
-			if (($dir = Vfs::dirname($url))) @Vfs::rmdir($dir);
+			if (($dir = Vfs::dirname($url)))
+			{
+				@Vfs::rmdir($dir);
+			}
 		}
 		if (!is_null($current_is_root))
 		{
@@ -1340,8 +1446,10 @@ 
 		$up = explode('/',$url[0] == '/' ? $url : parse_url($url,PHP_URL_PATH));	// /apps/$app/$id
 		$app = null;
 
-		foreach( self::$app_register as $tapp => $reg ) {
-			if( isset($reg['file_dir']) ) {
+		foreach( self::$app_register as $tapp => $reg )
+		{
+			if( isset($reg['file_dir']) )
+			{
 				$lup = $up;
 
 				unset($lup[0]);
@@ -1353,20 +1461,25 @@ 
 
 				$found = true;
 
-				foreach( $fdp as $part ) {
-					if( current($lup) == $part ) {
-						if( next($lup) === false ) {
+				foreach( $fdp as $part )
+				{
+					if( current($lup) == $part )
+					{
+						if( next($lup) === false )
+						{
 							$found = false;
 							break;
 						}
 					}
-					else {
+					else
+					{
 						$found = false;
 						break;
 					}
 				}
 
-				if( $found ) {
+				if( $found )
+				{
 					$id	= current($lup);
 					$app = $tapp;
 					break;
@@ -1374,7 +1487,8 @@ 
 			}
 		}
 
-		if( $app === null ) {
+		if( $app === null )
+		{
 			list(,,$app,$id) = $up;
 		}
 
@@ -1404,10 +1518,16 @@ 
 		$path = self::vfs_path($app,$id);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
-		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
+		if (!($extra = self::get_registry($app,'find_extra')))
+		{
+			$extra = array();
+		}
 
 		// always use regular links stream wrapper here: extended one is unnecessary (slow) for just listing attachments
-		if (substr($path,0,13) == 'stylite.links') $path = substr($path,8);
+		if (substr($path,0,13) == 'stylite.links')
+		{
+			$path = substr($path,8);
+		}
 
 		$attached = array();
 		if (($url2stats = Vfs::find($path,array('need_mime'=>true,'type'=>'F','url'=>true)+$extra,true)))
@@ -1650,7 +1770,10 @@ 
 		$method = array_shift($data);
 		$ret = self::exec($method, $data);
 
-		if (is_resource($ret)) fseek($ret, 0);
+		if (is_resource($ret))
+		{
+			fseek($ret, 0);
+		}
 
 		if ($return_resource != is_resource($ret))
 		{
@@ -1748,7 +1871,10 @@ 
 		}
 
 		list($app, $class, $m) = $parts = explode('.', $method);
-		if (count($parts) != 3) throw Api\Exception\WrongParameter("Wrong dot-delimited method string '$method'!");
+		if (count($parts) != 3)
+		{
+			throw Api\Exception\WrongParameter("Wrong dot-delimited method string '$method'!");
+		}
 
 		if (!isset($objs[$class]))
 		{

Spacing +174 added lines, -174 removed lines

@@ -113,7 +113,7 @@ 
 	/**
 	 * appname used for returned attached files (!= 'filemanager'!)
 	 */
-	const VFS_APPNAME = 'file';		// pseudo-appname for own file-attachments in vfs, this is NOT the vfs-app
+	const VFS_APPNAME = 'file'; // pseudo-appname for own file-attachments in vfs, this is NOT the vfs-app
 
 	/**
 	 * Appname used of files stored via Link::set_data()
@@ -146,7 +146,7 @@ 
 			'icon' => 'addressbook/accounts',
 			'query' => 'EGroupware\\Api\\Accounts::link_query',
 			'title' => 'EGroupware\\Api\\Accounts::username',
-			'view' => array('menuaction'=>'addressbook.addressbook_ui.view','ajax'=>'true'),
+			'view' => array('menuaction'=>'addressbook.addressbook_ui.view', 'ajax'=>'true'),
 			'view_id' => 'account_id'
 		),
 		'api' => array(
@@ -204,7 +204,7 @@ 
 	 *
 	 * @param boolean $clear_all do not use session AND not permission check for app-registry
 	 */
-	static function init_static($clear_all=false)
+	static function init_static($clear_all = false)
 	{
 		// FireFox 36 can not display pdf with it's internal viewer in an iframe used by mobile theme/template for popups
 		// same is true for all mobile devices
@@ -218,19 +218,19 @@ 
 		// for performance reasons, we do it only once / cache it in the session
 		if ($clear_all || !($search_link_hooks = Cache::getSession(__CLASS__, 'search_link_hooks')))
 		{
-			$search_link_hooks = Hooks::process('search_link',array(), $clear_all || (bool)$GLOBALS['egw_info']['flags']['async-service']);
+			$search_link_hooks = Hooks::process('search_link', array(), $clear_all || (bool)$GLOBALS['egw_info']['flags']['async-service']);
 			Cache::setSession(__CLASS__, 'search_link_hooks', $search_link_hooks);
 		}
 		if (is_array($search_link_hooks))
 		{
-			foreach($search_link_hooks as $app => $data)
+			foreach ($search_link_hooks as $app => $data)
 			{
 				// allow apps to register additional types
 				if (isset($data['additional']))
 				{
-					foreach($data['additional'] as $name => $values)
+					foreach ($data['additional'] as $name => $values)
 					{
-						$values['app'] = $app;	// store name of registring app, to be able to check access
+						$values['app'] = $app; // store name of registring app, to be able to check access
 						self::$app_register[$name] = $values;
 					}
 					unset($data['additional']);
@@ -240,7 +240,7 @@ 
 				{
 					$data['list'] = array('menuaction' => $data['view_list']);
 				}
-				elseif(isset($data['list']) && !isset($data['view_list']))
+				elseif (isset($data['list']) && !isset($data['view_list']))
 				{
 					$data['view_list'] = $data['list']['menuaction'];
 				}
@@ -284,18 +284,18 @@ 
 	public static function json_registry()
 	{
 		$to_json = array();
-		foreach(self::$app_register as $app => $data)
+		foreach (self::$app_register as $app => $data)
 		{
 			if (isset($GLOBALS['egw_info']['user']['apps'][$app]) ||
 				isset($data['app']) && isset($GLOBALS['egw_info']['user']['apps'][$data['app']]))
 			{
 				$to_json[$app] = array_intersect_key($data, array_flip(array(
-					'view','view_id','view_popup',
-					'add','add_app','add_id','add_popup',
-					'edit','edit_id','edit_popup',
-					'list','list_popup',
-					'name','icon','query',
-					'mime','entry','entries',
+					'view', 'view_id', 'view_popup',
+					'add', 'add_app', 'add_id', 'add_popup',
+					'edit', 'edit_id', 'edit_popup',
+					'list', 'list_popup',
+					'name', 'icon', 'query',
+					'mime', 'entry', 'entries',
 				)));
 			}
 		}
@@ -350,11 +350,11 @@ 
 	 * @param int $no_notify =0 &1 dont notify $app1, &2 dont notify $app2
 	 * @return int/boolean False (for db or param-error) or on success link_id (Please not the return-value of $id1)
 	 */
-	static function link( $app1,&$id1,$app2,$id2='',$remark='',$owner=0,$lastmod=0,$no_notify=0 )
+	static function link($app1, &$id1, $app2, $id2 = '', $remark = '', $owner = 0, $lastmod = 0, $no_notify = 0)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>Link::link('$app1',$id1,'".print_r($app2,true)."',".print_r($id2,true).",'$remark',$owner,$lastmod)</p>\n";
+			echo "<p>Link::link('$app1',$id1,'".print_r($app2, true)."',".print_r($id2, true).",'$remark',$owner,$lastmod)</p>\n";
 		}
 		if (!$app1 || !$app2 || $app1 == $app2 && $id1 == $id2)
 		{
@@ -373,7 +373,7 @@ 
 				}
 				if (is_array($id1) || !$id1)		// create link only in $id1 array
 				{
-					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'],$link['owner'],$link['lastmod']);
+					self::link($app1, $id1, $link['app'], $link['id'], $link['remark'], $link['owner'], $link['lastmod']);
 					continue;
 				}
 				switch ($link['app'])
@@ -386,19 +386,19 @@ 
 						}
 						// fall through
 					case self::VFS_APPNAME:
-						$link_id = self::attach_file($app1,$id1,$link['id'],$link['remark']);
+						$link_id = self::attach_file($app1, $id1, $link['id'], $link['remark']);
 						break;
 
 					case self::VFS_LINK:
-						$link_id = self::link_file($app1,$id1, $link['id'],$link['remark']);
+						$link_id = self::link_file($app1, $id1, $link['id'], $link['remark']);
 						break;
 
 					default:
-						$link_id = Link\Storage::link($app1,$id1,$link['app'],$link['id'],
-							$link['remark'],$link['owner'],$link['lastmod']);
+						$link_id = Link\Storage::link($app1, $id1, $link['app'], $link['id'],
+							$link['remark'], $link['owner'], $link['lastmod']);
 						// notify both sides
-						if (!($no_notify&2)) self::notify('link',$link['app'],$link['id'],$app1,$id1,$link_id);
-						if (!($no_notify&1)) self::notify('link',$app1,$id1,$link['app'],$link['id'],$link_id);
+						if (!($no_notify&2)) self::notify('link', $link['app'], $link['id'], $app1, $id1, $link_id);
+						if (!($no_notify&1)) self::notify('link', $app1, $id1, $link['app'], $link['id'], $link_id);
 						break;
 				}
 			}
@@ -410,7 +410,7 @@ 
 			{
 				$id1 = array( );
 			}
-			$link_id = self::temp_link_id($app2,$id2);
+			$link_id = self::temp_link_id($app2, $id2);
 
 			$id1[$link_id] = array(
 				'app' => $app2,
@@ -428,24 +428,24 @@ 
 		}
 		if ($app1 == self::VFS_LINK)
 		{
-			return self::link_file($app2,$id2,$id1,$remark);
+			return self::link_file($app2, $id2, $id1, $remark);
 		}
 		elseif ($app2 == self::VFS_LINK)
 		{
-			return self::link_file($app1,$id1,$id2,$remark);
+			return self::link_file($app1, $id1, $id2, $remark);
 		}
 		if ($app1 == self::VFS_APPNAME)
 		{
-			return self::attach_file($app2,$id2,$id1,$remark);
+			return self::attach_file($app2, $id2, $id1, $remark);
 		}
 		elseif ($app2 == self::VFS_APPNAME)
 		{
-			return self::attach_file($app1,$id1,$id2,$remark);
+			return self::attach_file($app1, $id1, $id2, $remark);
 		}
-		$link_id = Link\Storage::link($app1,$id1,$app2,$id2,$remark,$owner);
+		$link_id = Link\Storage::link($app1, $id1, $app2, $id2, $remark, $owner);
 
-		if (!($no_notify&2)) self::notify('link',$app2,$id2,$app1,$id1,$link_id);
-		if (!($no_notify&1)) self::notify('link',$app1,$id1,$app2,$id2,$link_id);
+		if (!($no_notify&2)) self::notify('link', $app2, $id2, $app1, $id1, $link_id);
+		if (!($no_notify&1)) self::notify('link', $app1, $id1, $app2, $id2, $link_id);
 
 		return $link_id;
 	}
@@ -457,9 +457,9 @@ 
 	 * @param mixed $id
 	 * @return string
 	 */
-	static function temp_link_id($app,$id)
+	static function temp_link_id($app, $id)
 	{
-		return $app.':'.(!in_array($app, array(self::VFS_APPNAME,self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
+		return $app.':'.(!in_array($app, array(self::VFS_APPNAME, self::VFS_LINK, self::DATA_APPNAME)) ? $id : $id['name']);
 	}
 
 	/**
@@ -475,7 +475,7 @@ 
 	 * @param int $limit =null number of entries to return, only affects links, attachments are allways reported!
 	 * @return array id => links pairs if $id is an array or just the links (only_app: ids) or empty array if no matching links found
 	 */
-	static function get_links($app, $id, $only_app='', $order='link_lastmod DESC',$cache_titles=false, $deleted=false, $limit=null)
+	static function get_links($app, $id, $only_app = '', $order = 'link_lastmod DESC', $cache_titles = false, $deleted = false, $limit = null)
 	{
 		if (self::DEBUG) echo "<p>Link::get_links(app='$app',id='$id',only_app='$only_app',order='$order',deleted='$deleted')</p>\n";
 
@@ -486,7 +486,7 @@ 
 			{
 				if (($not_only = $only_app[0] == '!'))
 				{
-					$only_app = substr(1,$only_app);
+					$only_app = substr(1, $only_app);
 				}
 				foreach (array_reverse($id) as $link)
 				{
@@ -503,7 +503,7 @@ 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
 		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
-			if (($vfs_ids = self::list_attached($app,$id)))
+			if (($vfs_ids = self::list_attached($app, $id)))
 			{
 				$ids += $vfs_ids;
 			}
@@ -513,18 +513,18 @@ 
 		{
 			// agregate links by app
 			$app_ids = array();
-			foreach($ids as $link)
+			foreach ($ids as $link)
 			{
 				$app_ids[$link['app']][] = $link['id'];
 			}
-			foreach($app_ids as $appname => $a_ids)
+			foreach ($app_ids as $appname => $a_ids)
 			{
-				self::titles($appname,array_unique($a_ids));
+				self::titles($appname, array_unique($a_ids));
 			}
 			// remove links, current user has no access, from result
-			foreach($ids as $key => $link)
+			foreach ($ids as $key => $link)
 			{
-				if (!self::title($link['app'],$link['id']))
+				if (!self::title($link['app'], $link['id']))
 				{
 					unset($ids[$key]);
 				}
@@ -546,27 +546,27 @@ 
 	 * @param boolean $deleted =false Include links that have been flagged as deleted, waiting for purge of linked record.
 	 * @return array of $id => array($links) pairs
 	 */
-	static function get_links_multiple($app,array $ids,$cache_titles=true,$only_app='',$order='link_lastmod DESC', $deleted=false )
+	static function get_links_multiple($app, array $ids, $cache_titles = true, $only_app = '', $order = 'link_lastmod DESC', $deleted = false)
 	{
-		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids,true).",$cache_titles,'$only_app','$order')</p>\n";
+		if (self::DEBUG) echo "<p>".__METHOD__."('$app',".print_r($ids, true).",$cache_titles,'$only_app','$order')</p>\n";
 
 		if (!$ids)
 		{
-			return array();		// no ids are linked to nothing
+			return array(); // no ids are linked to nothing
 		}
-		$links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted);
+		$links = Link\Storage::get_links($app, $ids, $only_app, $order, $deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
 		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
-			foreach($ids as $id)
+			foreach ($ids as $id)
 			{
 				if (!isset($links[$id]))
 				{
 					$links[$id] = array();
 				}
-				if (($vfs_ids = self::list_attached($app,$id)))
+				if (($vfs_ids = self::list_attached($app, $id)))
 				{
 					$links[$id] += $vfs_ids;
 				}
@@ -576,16 +576,16 @@ 
 		{
 			// agregate links by app
 			$app_ids = array();
-			foreach($links as &$targets)
+			foreach ($links as &$targets)
 			{
-				foreach($targets as $link)
+				foreach ($targets as $link)
 				{
 					if (is_array($link)) $app_ids[$link['app']][] = $link['id'];
 				}
 			}
-			foreach($app_ids as $app => $a_ids)
+			foreach ($app_ids as $app => $a_ids)
 			{
-				self::titles($app,array_unique($a_ids));
+				self::titles($app, array_unique($a_ids));
 			}
 		}
 		return $links;
@@ -602,7 +602,7 @@ 
 	 * @param string $id2 ='' id in $app2
 	 * @return array with link-data or False
 	 */
-	static function get_link($app_link_id,$id='',$app2='',$id2='')
+	static function get_link($app_link_id, $id = '', $app2 = '', $id2 = '')
 	{
 		if (self::DEBUG)
 		{
@@ -610,7 +610,7 @@ 
 		}
 		if (is_array($id))
 		{
-			if (strpos($app_link_id,':') === false) $app_link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+			if (strpos($app_link_id, ':') === false) $app_link_id = self::temp_link_id($app2, $id2); // create link_id of temporary link, if not given
 
 			if (isset($id[$app_link_id]) && is_array($id[$app_link_id]))	// check for unlinked-marker
 			{
@@ -626,11 +626,11 @@ 
 			}
 			if ($app_link_id == self::VFS_APPNAME)
 			{
-				return self::info_attached($app2,$id2,$id);
+				return self::info_attached($app2, $id2, $id);
 			}
-			return self::info_attached($app_link_id,$id,$id2);
+			return self::info_attached($app_link_id, $id, $id2);
 		}
-		return Link\Storage::get_link($app_link_id,$id,$app2,$id2);
+		return Link\Storage::get_link($app_link_id, $id, $app2, $id2);
 	}
 
 	/**
@@ -648,9 +648,9 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete
 	 * @return the number of links deleted
 	 */
-	static function unlink($link_id,$app='',$id='',$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink($link_id, $app = '', $id = '', $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
-		return self::unlink2($link_id,$app,$id,$owner,$app2,$id2,$hold_for_purge);
+		return self::unlink2($link_id, $app, $id, $owner, $app2, $id2, $hold_for_purge);
 	}
 
 	/**
@@ -665,7 +665,7 @@ 
 	 * @param boolean $hold_for_purge Don't really delete the link, just mark it as deleted and wait for final delete
 	 * @return the number of links deleted
 	 */
-	static function unlink2($link_id,$app,&$id,$owner=0,$app2='',$id2='',$hold_for_purge=false)
+	static function unlink2($link_id, $app, &$id, $owner = 0, $app2 = '', $id2 = '', $hold_for_purge = false)
 	{
 		if (self::DEBUG)
 		{
@@ -677,22 +677,22 @@ 
 		}
 		elseif ($app == self::VFS_APPNAME)
 		{
-			return self::delete_attached($app2,$id2,$id);
+			return self::delete_attached($app2, $id2, $id);
 		}
 		elseif ($app2 == self::VFS_APPNAME)
 		{
-			return self::delete_attached($app,$id,$id2);
+			return self::delete_attached($app, $id, $id2);
 		}
 		if (!is_array($id))
 		{
 			if (!$link_id && !$app2 && !$id2 && $app2 != '!'.self::VFS_APPNAME)
 			{
-				self::delete_attached($app,$id);	// deleting all attachments
-				self::delete_cache($app,$id);
+				self::delete_attached($app, $id); // deleting all attachments
+				self::delete_cache($app, $id);
 			}
 
 			// Log in history
-			if($link_id && (!$app || !$app2))
+			if ($link_id && (!$app || !$app2))
 			{
 				// Need to load it first
 				$link = self::get_link($link_id);
@@ -703,21 +703,21 @@ 
 			}
 			if ($app && $app2)
 			{
-				Storage\History::static_add($app,$id,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app2.':'.$id2);
-				Storage\History::static_add($app2,$id2,$GLOBALS['egw_info']['user']['account_id'],'~link~','',$app.':'.$id);
+				Storage\History::static_add($app, $id, $GLOBALS['egw_info']['user']['account_id'], '~link~', '', $app2.':'.$id2);
+				Storage\History::static_add($app2, $id2, $GLOBALS['egw_info']['user']['account_id'], '~link~', '', $app.':'.$id);
 			}
-			$deleted = Link\Storage::unlink($link_id,$app,$id,$owner,$app2 != '!'.self::VFS_APPNAME ? $app2 : '',$id2,$hold_for_purge);
+			$deleted = Link\Storage::unlink($link_id, $app, $id, $owner, $app2 != '!'.self::VFS_APPNAME ? $app2 : '', $id2, $hold_for_purge);
 
 			// only notify on real links, not the one cached for writing or fileattachments
 			self::notify_unlink($deleted);
 
 			return count($deleted);
 		}
-		if (!$link_id) $link_id = self::temp_link_id($app2,$id2);	// create link_id of temporary link, if not given
+		if (!$link_id) $link_id = self::temp_link_id($app2, $id2); // create link_id of temporary link, if not given
 
 		if (isset($id[$link_id]))
 		{
-			$id[$link_id] = False;	// set the unlink marker
+			$id[$link_id] = False; // set the unlink marker
 
 			if (self::DEBUG)
 			{
@@ -734,10 +734,10 @@ 
 	 * @param string $must_support capability the apps need to support, eg. 'add', default ''=list all apps
 	 * @return array with app => title pairs
 	 */
-	static function app_list($must_support='')
+	static function app_list($must_support = '')
 	{
 		$apps = array();
-		foreach(self::$app_register as $type => $reg)
+		foreach (self::$app_register as $type => $reg)
 		{
 			if ($must_support && !isset($reg[$must_support])) continue;
 
@@ -794,11 +794,11 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return string/boolean string with title, null if $id does not exist in $app or false if no perms to view it
 	 */
-	static function title($app,$id,$link=null)
+	static function title($app, $id, $link = null)
 	{
 		if (!$id) return '';
 
-		$title =& self::get_cache($app,$id);
+		$title = & self::get_cache($app, $id);
 		if (isset($title) && !empty($title) && !is_array($id))
 		{
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id')='$title' (from cache)</p>\n";
@@ -840,7 +840,7 @@ 
 			if (!isset($unlinking[$app]) || !isset($unlinking[$app][$id]))
 			{
 				$unlinking[$app][$id] = true;
-				self::unlink(0,$app,$id);
+				self::unlink(0, $app, $id);
 				unset($unlinking[$app][$id]);
 			}
 			if (self::DEBUG) echo '<p>'.__METHOD__."('$app','$id') unlinked, as $method returned null</p>\n";
@@ -865,36 +865,36 @@ 
 	 * @param string $app
 	 * @param array $ids
 	 */
-	static function titles($app,array $ids)
+	static function titles($app, array $ids)
 	{
 		if (self::DEBUG)
 		{
-			echo "<p>".__METHOD__."($app,".implode(',',$ids).")</p>\n";
+			echo "<p>".__METHOD__."($app,".implode(',', $ids).")</p>\n";
 		}
 		$titles = $ids_to_query = array();
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
-			$title =& self::get_cache($app,$id);
+			$title = & self::get_cache($app, $id);
 			if (!isset($title))
 			{
 				if (isset(self::$app_register[$app]['titles']))
 				{
-					$ids_to_query[] = $id;	// titles method --> collect links to query at once
+					$ids_to_query[] = $id; // titles method --> collect links to query at once
 				}
 				else
 				{
-					$title = self::title($app,$id);	// no titles method --> fallback to query each link separate
+					$title = self::title($app, $id); // no titles method --> fallback to query each link separate
 				}
 			}
 			$titles[$id] = $title;
 		}
 		if ($ids_to_query)
 		{
-			for ($n = 0; ($ids = array_slice($ids_to_query,$n*self::MAX_TITLES_QUERY,self::MAX_TITLES_QUERY)); ++$n)
+			for ($n = 0; ($ids = array_slice($ids_to_query, $n * self::MAX_TITLES_QUERY, self::MAX_TITLES_QUERY)); ++$n)
 			{
-				foreach(self::exec(self::$app_register[$app]['titles'], array($ids)) as $id => $t)
+				foreach (self::exec(self::$app_register[$app]['titles'], array($ids)) as $id => $t)
 				{
-					$title =& self::get_cache($app,$id);
+					$title = & self::get_cache($app, $id);
 					$titles[$id] = $title = $t;
 				}
 			}
@@ -910,7 +910,7 @@ 
 	 * @param string $to_id =''id in $to_app
 	 * @return array/boolean with name-value pairs for link to add-methode of $app or false if add not supported
 	 */
-	static function add($app,$to_app='',$to_id='')
+	static function add($app, $to_app = '', $to_id = '')
 	{
 		//echo "<p>Link::add('$app','$to_app','$to_id') app_register[$app] ="; _debug_array($app_register[$app]);
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['add']))
@@ -935,7 +935,7 @@ 
 	 * @param string &$popup=null on return popup size eg. '600x400' or null
 	 * @return array|boolean with name-value pairs for link to edit-methode of $app or false if edit not supported
 	 */
-	static function edit($app,$id,&$popup=null)
+	static function edit($app, $id, &$popup = null)
 	{
 		//echo "<p>Link::add('$app','$to_app','$to_id') app_register[$app] ="; _debug_array($app_register[$app]);
 		if (empty($app) || empty($id) || !is_array($reg = self::$app_register[$app]) || !isset($reg['edit']))
@@ -943,7 +943,7 @@ 
 			if ($reg && isset($reg['view']))
 			{
 				$popup = $reg['view_popup'];
-				return self::view($app,$id);	// fallback to view
+				return self::view($app, $id); // fallback to view
 			}
 			return false;
 		}
@@ -963,12 +963,12 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return array with name-value pairs for link to view-methode of $app to view $id
 	 */
-	static function view($app,$id,$link=null)
+	static function view($app, $id, $link = null)
 	{
 		if ($app == self::VFS_APPNAME && !empty($id) && is_array($link))
 		{
 			//return Vfs::download_url(self::vfs_path($link['app2'],$link['id2'],$link['id'],true));
-			return self::mime_open(self::vfs_path($link['app2'],$link['id2'],$link['id'],true), $link['type']);
+			return self::mime_open(self::vfs_path($link['app2'], $link['id2'], $link['id'], true), $link['type']);
 		}
 		if ($app == '' || !is_array($reg = self::$app_register[$app]) || !isset($reg['view']) || !isset($reg['view_id']))
 		{
@@ -976,11 +976,11 @@ 
 		}
 		$view = $reg['view'];
 
-		$names = explode(':',$reg['view_id']);
+		$names = explode(':', $reg['view_id']);
 		if (count($names) > 1)
 		{
-			$id = explode(':',$id);
-			while (list($n,$name) = each($names))
+			$id = explode(':', $id);
+			while (list($n, $name) = each($names))
 			{
 				$view[$name] = $id[$n];
 			}
@@ -1004,13 +1004,13 @@ 
 	 */
 	static function get_mime_info($type)
 	{
-		foreach(self::$app_register as $app => $registry)
+		foreach (self::$app_register as $app => $registry)
 		{
 			if (isset($registry['mime']) &&
 				(isset($GLOBALS['egw_info']['user']['apps'][$app]) ||
 				isset($registry['app']) && isset($GLOBALS['egw_info']['user']['apps'][$registry['app']])))
 			{
-				foreach($registry['mime'] as $mime => $data)
+				foreach ($registry['mime'] as $mime => $data)
 				{
 					if ($mime == $type) return $data;
 					if ($mime[0] == '/' && preg_match($mime.'i', $type))
@@ -1031,7 +1031,7 @@ 
 	 * @param string &$popup=null on return popup size or null
 	 * @return string|array string with EGw relative link, array with get-parameters for '/index.php' or null (directory and not filemanager access)
 	 */
-	static function mime_open($path, $type=null, &$popup=null)
+	static function mime_open($path, $type = null, &$popup = null)
 	{
 		if (is_null($type)) $type = Vfs::mime_content_type($path);
 
@@ -1047,7 +1047,7 @@ 
 				$data[$data['mime_id']] = $path;
 				unset($data['mime_id']);
 			}
-			elseif(isset($data['mime_popup']))
+			elseif (isset($data['mime_popup']))
 			{
 				$popup = $data['mime_popup'];
 			}
@@ -1072,9 +1072,9 @@ 
 	 * @param array $link =null link-data for file-attachments
 	 * @return boolean|string false if no popup is used or $app is not registered, otherwise string with the prefered popup size (eg. '640x400)
 	 */
-	static function is_popup($app, $action='view', $link=null)
+	static function is_popup($app, $action = 'view', $link = null)
 	{
-		$popup = self::get_registry($app,$action.'_popup');
+		$popup = self::get_registry($app, $action.'_popup');
 
 		// for files/attachments check mime-registry
 		if ($app == self::VFS_APPNAME && is_array($link) && !empty($link['type']))
@@ -1097,7 +1097,7 @@ 
 	 * @param string $name name / key in the registry, eg. 'view'
 	 * @return boolean|string false if $app is not registered, otherwise string with the value for $name
 	 */
-	static function get_registry($app,$name)
+	static function get_registry($app, $name)
 	{
 		$reg = self::$app_register[$app];
 
@@ -1105,7 +1105,7 @@ 
 
 		if (!isset($reg[$name]))	// some defaults
 		{
-			switch($name)
+			switch ($name)
 			{
 				case 'name':
 					$reg[$name] = $app;
@@ -1141,16 +1141,16 @@ 
 	 * @param boolean $just_the_path =false return url or just the vfs path
 	 * @return string/array path or array with path and relatives, depending on $relatives
 	 */
-	static function vfs_path($app,$id='',$file='',$just_the_path=false)
+	static function vfs_path($app, $id = '', $file = '', $just_the_path = false)
 	{
 		$path = self::VFS_BASEURL;
 
 		if ($app)
 		{
-			if( isset(self::$app_register[$app]) ) {
+			if (isset(self::$app_register[$app])) {
 				$reg = self::$app_register[$app];
 
-				if( isset($reg['file_dir']) ) {
+				if (isset($reg['file_dir'])) {
 					$app = $reg['file_dir'];
 				}
 			}
@@ -1169,7 +1169,7 @@ 
 		}
 		if ($just_the_path)
 		{
-			$path = parse_url($path,PHP_URL_PATH);
+			$path = parse_url($path, PHP_URL_PATH);
 		}
 		else
 		{
@@ -1193,7 +1193,7 @@ 
 	 * @param string $comment ='' comment to add to the link
 	 * @return int negative id of egw_sqlfs table as negative link-id's are for vfs attachments
 	 */
-	static function attach_file($app,$id,$file,$comment='')
+	static function attach_file($app, $id, $file, $comment = '')
 	{
 		// check if $file['name'] specifies a subdirectory, in which case use and, if necessary, create it
 		if (is_array($file) && strpos($file['name'], '/') && strpos($file['name'], '..') === false)
@@ -1203,15 +1203,15 @@ 
 		}
 		else
 		{
-			$entry_dir = self::vfs_path($app,$id);
+			$entry_dir = self::vfs_path($app, $id);
 		}
 		if (self::DEBUG)
 		{
 			echo "<p>attach_file: app='$app', id='$id', tmp_name='$file[tmp_name]', name='$file[name]', size='$file[size]', type='$file[type]', path='$file[path]', ip='$file[ip]', comment='$comment', entry_dir='$entry_dir'</p>\n";
 		}
-		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir,0,true)))
+		if (file_exists($entry_dir) || ($Ok = mkdir($entry_dir, 0, true)))
 		{
-			$Ok = Vfs::copy_uploaded($file, $p=Vfs::parse_url($entry_dir, PHP_URL_PATH), $comment, false);	// no is_uploaded_file() check!
+			$Ok = Vfs::copy_uploaded($file, $p = Vfs::parse_url($entry_dir, PHP_URL_PATH), $comment, false); // no is_uploaded_file() check!
 			if (!$Ok) error_log(__METHOD__."('$app', '$id', ".array2string($file).", '$comment') called Vfs::copy_uploaded('$file[tmp_name]', '$p', '$comment', false)=".array2string($Ok));
 		}
 		else
@@ -1229,14 +1229,14 @@ 
 	 * @param string $file VFS path to link to
 	 * @return boolean true on success, false on failure
 	 */
-	static function link_file($app,$id,$file)
+	static function link_file($app, $id, $file)
 	{
 		// Don't try to link into app dir if there is no id
-		if(!$id) return;
+		if (!$id) return;
 
 		if (!Vfs::stat($file))
 		{
-			error_log(__METHOD__. ' (Link target ' . Vfs::decodePath($file) . ' not found!');
+			error_log(__METHOD__.' (Link target '.Vfs::decodePath($file).' not found!');
 			return false;
 		}
 
@@ -1257,7 +1257,7 @@ 
 	 * @param string $fname ='' filename
 	 * @return boolean|array false on error ($app or $id not found), array with path as key and boolean result of delete
 	 */
-	static function delete_attached($app,$id='',$fname='')
+	static function delete_attached($app, $id = '', $fname = '')
 	{
 		if ((int)$app > 0)	// is file_id
 		{
@@ -1267,9 +1267,9 @@ 
 		{
 			if (empty($app) || empty($id))
 			{
-				return False;	// dont delete more than all attachments of an entry
+				return False; // dont delete more than all attachments of an entry
 			}
-			$url = self::vfs_path($app,$id,$fname);
+			$url = self::vfs_path($app, $id, $fname);
 
 			if (!$fname || !$id)	// we delete the whole entry (or all entries), which probably not exist anymore
 			{
@@ -1282,15 +1282,15 @@ 
 			echo '<p>'.__METHOD__."('$app','$id','$fname') url=$url</p>\n";
 		}
 		// Log in history - Need to load it first
-		if((int)$app > 0)
+		if ((int)$app > 0)
 		{
 			$link = self::get_link(-$app);
-			if($link['app2'] && $link['id2'])
+			if ($link['app2'] && $link['id2'])
 			{
-				Storage\History::static_add($link['app2'],$link['id2'],$GLOBALS['egw_info']['user']['account_id'],'~file~','', Vfs::basename($url));
+				Storage\History::static_add($link['app2'], $link['id2'], $GLOBALS['egw_info']['user']['account_id'], '~file~', '', Vfs::basename($url));
 			}
 		}
-		if (($Ok = !file_exists($url) || Vfs::remove($url,true)) && ((int)$app > 0 || $fname))
+		if (($Ok = !file_exists($url) || Vfs::remove($url, true)) && ((int)$app > 0 || $fname))
 		{
 			// try removing the dir, in case it's empty
 			if (($dir = Vfs::dirname($url))) @Vfs::rmdir($dir);
@@ -1310,14 +1310,14 @@ 
 	 * @param string $filename filename
 	 * @return array 'kind' of link-array
 	 */
-	static function info_attached($app,$id,$filename)
+	static function info_attached($app, $id, $filename)
 	{
-		$path = self::vfs_path($app,$id,$filename,true);
-		if (!($stat = Vfs::stat($path,STREAM_URL_STAT_QUIET)))
+		$path = self::vfs_path($app, $id, $filename, true);
+		if (!($stat = Vfs::stat($path, STREAM_URL_STAT_QUIET)))
 		{
 			return false;
 		}
-		return self::fileinfo2link($stat,$path);
+		return self::fileinfo2link($stat, $path);
 	}
 
 	/**
@@ -1326,36 +1326,36 @@ 
 	 * @param array|int $fileinfo a row from the vfs-db-table (eg. returned by the vfs ls static function) or a file_id of that table
 	 * @return array a 'kind' of link-array
 	 */
-	static function fileinfo2link($fileinfo,$url=null)
+	static function fileinfo2link($fileinfo, $url = null)
 	{
 		if (!is_array($fileinfo))
 		{
 			$url = Vfs\Sqlfs\StreamWrapper::id2path($fileinfo);
-			if (!($fileinfo = Vfs::stat($url,STREAM_URL_STAT_QUIET)))
+			if (!($fileinfo = Vfs::stat($url, STREAM_URL_STAT_QUIET)))
 			{
 				return false;
 			}
 		}
 
-		$up = explode('/',$url[0] == '/' ? $url : parse_url($url,PHP_URL_PATH));	// /apps/$app/$id
+		$up = explode('/', $url[0] == '/' ? $url : parse_url($url, PHP_URL_PATH)); // /apps/$app/$id
 		$app = null;
 
-		foreach( self::$app_register as $tapp => $reg ) {
-			if( isset($reg['file_dir']) ) {
+		foreach (self::$app_register as $tapp => $reg) {
+			if (isset($reg['file_dir'])) {
 				$lup = $up;
 
 				unset($lup[0]);
 				unset($lup[1]);
 				reset($lup);
 
-				$fdp = explode('/',$reg['file_dir'][0] == '/' ?
-					$reg['file_dir'] : parse_url($reg['file_dir'],PHP_URL_PATH));
+				$fdp = explode('/', $reg['file_dir'][0] == '/' ?
+					$reg['file_dir'] : parse_url($reg['file_dir'], PHP_URL_PATH));
 
 				$found = true;
 
-				foreach( $fdp as $part ) {
-					if( current($lup) == $part ) {
-						if( next($lup) === false ) {
+				foreach ($fdp as $part) {
+					if (current($lup) == $part) {
+						if (next($lup) === false) {
 							$found = false;
 							break;
 						}
@@ -1366,16 +1366,16 @@ 
 					}
 				}
 
-				if( $found ) {
-					$id	= current($lup);
+				if ($found) {
+					$id = current($lup);
 					$app = $tapp;
 					break;
 				}
 			}
 		}
 
-		if( $app === null ) {
-			list(,,$app,$id) = $up;
+		if ($app === null) {
+			list(,, $app, $id) = $up;
 		}
 
 		return array(
@@ -1383,7 +1383,7 @@ 
 			'id'        => $fileinfo['name'],
 			'app2'      => $app,
 			'id2'       => $id,
-			'remark'    => '',					// only list_attached currently sets the remark
+			'remark'    => '', // only list_attached currently sets the remark
 			'owner'     => $fileinfo['uid'],
 			'link_id'   => -$fileinfo['ino'],
 			'lastmod'   => $fileinfo['mtime'],
@@ -1399,26 +1399,26 @@ 
 	 * @param string $id id in app
 	 * @return array with link_id => 'kind' of link-array pairs
 	 */
-	static function list_attached($app,$id)
+	static function list_attached($app, $id)
 	{
-		$path = self::vfs_path($app,$id);
+		$path = self::vfs_path($app, $id);
 		//error_log(__METHOD__."($app,$id) url=$url");
 
-		if (!($extra = self::get_registry($app,'find_extra'))) $extra = array();
+		if (!($extra = self::get_registry($app, 'find_extra'))) $extra = array();
 
 		// always use regular links stream wrapper here: extended one is unnecessary (slow) for just listing attachments
-		if (substr($path,0,13) == 'stylite.links') $path = substr($path,8);
+		if (substr($path, 0, 13) == 'stylite.links') $path = substr($path, 8);
 
 		$attached = array();
-		if (($url2stats = Vfs::find($path,array('need_mime'=>true,'type'=>'F','url'=>true)+$extra,true)))
+		if (($url2stats = Vfs::find($path, array('need_mime'=>true, 'type'=>'F', 'url'=>true) + $extra, true)))
 		{
-			$props = Vfs::propfind(array_keys($url2stats));	// get the comments
-			foreach($url2stats as $url => &$fileinfo)
+			$props = Vfs::propfind(array_keys($url2stats)); // get the comments
+			foreach ($url2stats as $url => &$fileinfo)
 			{
-				$link = self::fileinfo2link($fileinfo,$url);
+				$link = self::fileinfo2link($fileinfo, $url);
 				if ($props && isset($props[$url]))
 				{
-					foreach($props[$url] as $prop)
+					foreach ($props[$url] as $prop)
 					{
 						if ($prop['ns'] == Vfs::DEFAULT_PROP_NAMESPACE && $prop['name'] == 'comment')
 						{
@@ -1440,7 +1440,7 @@ 
 	 */
 	static private function decode_htmlspecialchars($str)
 	{
-		return str_replace(array('&amp;','&quot;','&lt;','&gt;'),array('&','"','<','>'),$str);
+		return str_replace(array('&amp;', '&quot;', '&lt;', '&gt;'), array('&', '"', '<', '>'), $str);
 	}
 
 	/**
@@ -1458,18 +1458,18 @@ 
 	 * @param string $id id in $app of the updated entry
 	 * @param array $data =null updated data of changed entry, as the read-method of the BO-layer would supply it
 	 */
-	static function notify_update($app,$id,$data=null)
+	static function notify_update($app, $id, $data = null)
 	{
-		self::delete_cache($app,$id);
+		self::delete_cache($app, $id);
 		//error_log(__METHOD__."('$app', $id, $data)");
-		foreach(self::get_links($app,$id,'!'.self::VFS_APPNAME) as $link_id => $link)
+		foreach (self::get_links($app, $id, '!'.self::VFS_APPNAME) as $link_id => $link)
 		{
-			self::notify('update',$link['app'],$link['id'],$app,$id,$link_id,$data);
+			self::notify('update', $link['app'], $link['id'], $app, $id, $link_id, $data);
 		}
-		if($data[Link::OLD_LINK_TITLE] && Json\Response::isJSONResponse())
+		if ($data[Link::OLD_LINK_TITLE] && Json\Response::isJSONResponse())
 		{
 			// Update client side with new title
-			Json\Response::get()->apply('egw.link_title_callback',array(array($app => array($id => self::title($app, $id)))));
+			Json\Response::get()->apply('egw.link_title_callback', array(array($app => array($id => self::title($app, $id)))));
 		}
 	}
 
@@ -1493,7 +1493,7 @@ 
 	 * @param string $target_id id in $target_app
 	 * @param array $data =null data of entry in app2 (optional)
 	 */
-	static private function notify($type,$notify_app,$notify_id,$target_app,$target_id,$link_id,$data=null)
+	static private function notify($type, $notify_app, $notify_id, $target_app, $target_id, $link_id, $data = null)
 	{
 		//error_log(__METHOD__."('$type', '$notify_app', $notify_id, '$target_app', $target_id, $link_id, $data)");
 		if ($link_id && isset(self::$app_register[$notify_app]) && isset(self::$app_register[$notify_app]['notify']))
@@ -1520,7 +1520,7 @@ 
 	static public function run_notifies()
 	{
 		//error_log(__METHOD__."() count(self::\$notifies)=".count(self::$notifies));
-		while(self::$notifies)
+		while (self::$notifies)
 		{
 			$args = array_shift(self::$notifies);
 			$method = $args['method'];
@@ -1538,11 +1538,11 @@ 
 	 */
 	static private function notify_unlink(&$links)
 	{
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			// we notify both sides of the link, as the unlink command NOT clearly knows which side initiated the unlink
-			self::notify('unlink',$link['link_app1'],$link['link_id1'],$link['link_app2'],$link['link_id2'],$link['link_id']);
-			self::notify('unlink',$link['link_app2'],$link['link_id2'],$link['link_app1'],$link['link_id1'],$link['link_id']);
+			self::notify('unlink', $link['link_app1'], $link['link_id1'], $link['link_app2'], $link['link_id2'], $link['link_id']);
+			self::notify('unlink', $link['link_app2'], $link['link_id2'], $link['link_app1'], $link['link_id1'], $link['link_id']);
 		}
 	}
 
@@ -1554,14 +1554,14 @@ 
 	 * @param string $type ='title' 'title' or 'file_access'
 	 * @return int|string can be null, if cache not yet set
 	 */
-	private static function &get_cache($app,$id,$type = 'title')
+	private static function &get_cache($app, $id, $type = 'title')
 	{
-		switch($type)
+		switch ($type)
 		{
 			case 'title':
 				if ($app == self::VFS_APPNAME)
 				{
-					return null;	// do not cache file titles, they are just the names
+					return null; // do not cache file titles, they are just the names
 				}
 				return self::$title_cache[$app.':'.$id];
 			case 'file_access':
@@ -1583,7 +1583,7 @@ 
 	 * @param string $title title string or null
 	 * @param int $file_access =null Acl::READ, Acl::EDIT or both or'ed together
 	 */
-	public static function set_cache($app,$id,$title,$file_access=null)
+	public static function set_cache($app, $id, $title, $file_access = null)
 	{
 		//error_log(__METHOD__."($app,$id,$title,$file_access)");
 		// do not cache file titles, they are just the names
@@ -1603,7 +1603,7 @@ 
 	 * @param string $app app-name or null to delete the whole cache
 	 * @param int|string $id id or null to delete only file_access cache of given app (keeps title cache, if app implements file_access!)
 	 */
-	private static function delete_cache($app,$id)
+	private static function delete_cache($app, $id)
 	{
 		unset(self::$title_cache[$app.':'.$id]);
 		unset(self::$file_access_cache[$app.':'.$id]);
@@ -1618,7 +1618,7 @@ 
 	 * @param boolean $ignore_mime =false true: return id, even if nothing registered for given mime-type
 	 * @return string|null md5 hash of stored data of server-side supported mime-type or null otherwise
 	 */
-	public static function set_data($mime_type, $method, array $params, $ignore_mime=false)
+	public static function set_data($mime_type, $method, array $params, $ignore_mime = false)
 	{
 		if (!$ignore_mime && (!($info = self::get_mime_info($mime_type)) || empty($info['mime_data'])))
 		{
@@ -1639,7 +1639,7 @@ 
 	 * @return mixed null if id is not found or invalid
 	 * @throws Exception\WrongParameter
 	 */
-	public static function get_data($id, $return_resource=false)
+	public static function get_data($id, $return_resource = false)
 	{
 		$data = Cache::getSession(__CLASS__, $id);
 
@@ -1664,7 +1664,7 @@ 
 			{
 				$fp = $ret;
 				$ret = '';
-				while(!feof($fp))
+				while (!feof($fp))
 				{
 					$ret .= fread($fp, 8192);
 				}
@@ -1689,13 +1689,13 @@ 
 	 * @param int $user =null default null = current user
 	 * @return boolean true if access granted, false otherwise
 	 */
-	static function file_access($app,$id,$required=Acl::READ,$rel_path=null,$user=null)
+	static function file_access($app, $id, $required = Acl::READ, $rel_path = null, $user = null)
 	{
 		// are we called for an other user
 		if ($user && $user != $GLOBALS['egw_info']['user']['account_id'])
 		{
 			// check if app supports file_access WITH 4th $user parameter --> return false if not
-			if (!self::get_registry($app,'file_access_user') || !($method = self::get_registry($app,'file_access')))
+			if (!self::get_registry($app, 'file_access_user') || !($method = self::get_registry($app, 'file_access')))
 			{
 				$ret = false;
 				$err = "(no file_access_user)";
@@ -1709,22 +1709,22 @@ 
 			return $ret;
 		}
 
-		$cache =& self::get_cache($app,$id,'file_access');
+		$cache = & self::get_cache($app, $id, 'file_access');
 
-		if (!isset($cache) || $required == Acl::EDIT && !($cache & $required))
+		if (!isset($cache) || $required == Acl::EDIT && !($cache&$required))
 		{
-			if(($method = self::get_registry($app,'file_access')))
+			if (($method = self::get_registry($app, 'file_access')))
 			{
 				$cache |= self::exec($method, array($id, $required, $rel_path)) ? $required|Acl::READ : 0;
 			}
 			else
 			{
-				$cache |= self::title($app,$id) ? Acl::READ|Acl::EDIT : 0;
+				$cache |= self::title($app, $id) ? Acl::READ|Acl::EDIT : 0;
 			}
 			//error_log(__METHOD__."($app,$id,$required,$rel_path) got $cache --> ".($cache & $required ? 'true' : 'false'));
 		}
 		//else error_log(__METHOD__."($app,$id,$required,$rel_path) using cached value $cache --> ".($cache & $required ? 'true' : 'false'));
-		return !!($cache & $required);
+		return !!($cache&$required);
 	}
 
 	/**
@@ -1737,7 +1737,7 @@ 
 	 * @param array $params array with arguments incl. references
 	 * @return mixed
 	 */
-	protected static function exec($method, array $params=array())
+	protected static function exec($method, array $params = array())
 	{
 		static $objs = array();
 

Indentation +3 added lines, -3 removed lines

@@ -501,7 +501,7 @@ 
 		}
 		$ids = Link\Storage::get_links($app, $id, $only_app, $order, $deleted, $limit);
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			if (($vfs_ids = self::list_attached($app,$id)))
 			{
@@ -557,7 +557,7 @@ 
 		$links = Link\Storage::get_links($app,$ids,$only_app,$order,$deleted);
 
 		if (empty($only_app) || $only_app == self::VFS_APPNAME ||
-		    ($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
+			($only_app[0] == '!' && $only_app != '!'.self::VFS_APPNAME))
 		{
 			// todo do that in a single query, eg. directory listing, too
 			foreach($ids as $id)
@@ -776,7 +776,7 @@ 
 
 		if (!isset($options['total']))
 		{
-		       $options['total'] = count($result);
+			   $options['total'] = count($result);
 		}
 		if (isset($options['exclude']))
 		{