EGroupware / egroupware

api/src/DateTime.php

Braces +82 added lines, -20 removed lines

@@ -95,7 +95,11 @@ 
 	 */
 	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz))
+		{
+			$tz = self::$user_timezone;
+		}
+		// default user timezone
 
 		switch(($type = gettype($time)))
 		{
@@ -108,7 +112,11 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8)
+					{
+						$t_str .= 'T000000';
+					}
+					// 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
 						parent::__construct($t_str,$tz);
@@ -116,7 +124,10 @@ 
 					}
 					catch(Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
-						if (!is_numeric($time)) throw $e;
+						if (!is_numeric($time))
+						{
+							throw $e;
+						}
 					}
 				}
 				$type = 'integer';
@@ -137,7 +148,9 @@ 
 
 			case 'array':
 				parent::__construct('now',$tz);
-				if (isset($time['Y']))	// array format used in eTemplate
+				if (isset($time['Y']))
+				{
+					// array format used in eTemplate
 				{
 					$time = array(
 						'year'   => $time['Y'],
@@ -148,13 +161,17 @@ 
 						'second' => $time['s'],
 					);
 				}
+				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
 					$time['year']  = (int)substr($time['full'],0,4);
 					$time['month'] = (int)substr($time['full'],4,2);
 					$time['day']   = (int)substr($time['full'],6,2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				if (isset($time['year']))
+				{
+					$this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				}
 				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
 				break;
 
@@ -178,7 +195,10 @@ 
 	 */
 	public function add($interval)
 	{
-		if (is_string($interval)) $interval = DateInterval::createFromDateString($interval);
+		if (is_string($interval))
+		{
+			$interval = DateInterval::createFromDateString($interval);
+		}
 
 		parent::add($interval);
 	}
@@ -202,7 +222,10 @@ 
 				$wstart = -($wday ? $wday-1 : 6);
 				break;
 		}
-		if ($wstart) $this->add($wstart.'days');
+		if ($wstart)
+		{
+			$this->add($wstart.'days');
+		}
 	}
 
 	/**
@@ -263,15 +286,27 @@ 
 			}
 			elseif ($sday || $eday)
 			{
-				if ($sday) $start->add($sday.'days');
-				if ($eday) $end->add($eday.'days');
+				if ($sday)
+				{
+					$start->add($sday.'days');
+				}
+				if ($eday)
+				{
+					$end->add($eday.'days');
+				}
 			}
 			elseif ($sweek || $eweek)
 			{
 				$start->setWeekstart();
-				if ($sweek) $start->add($sweek.'weeks');
+				if ($sweek)
+				{
+					$start->add($sweek.'weeks');
+				}
 				$end->setWeekstart();
-				if ($eweek) $end->add($eweek.'weeks');
+				if ($eweek)
+				{
+					$end->add($eweek.'weeks');
+				}
 			}
 		}
 		// convert start + end from user to servertime for the filter
@@ -416,7 +451,10 @@ 
 		}
 		$time->setUser();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -446,7 +484,10 @@ 
 		}
 		$time->setServer();
 
-		if (is_null($type)) $type = $typeof;
+		if (is_null($type))
+		{
+			$type = $typeof;
+		}
 
 		//echo "<p>".__METHOD__."($time,$type) = ".print_r($format->format($type),true)."</p>\n";
 		return $time->format($type);
@@ -520,8 +561,12 @@ 
 					$time,
 					static::$user_timezone
 				);
-				if($date) break;
-			} catch (\Exception $e) {
+				if($date)
+				{
+					break;
+				}
+			}
+			catch (\Exception $e) {
 
 			}
 		}
@@ -540,7 +585,10 @@ 
 	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
-		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
+		if (!empty($dateformat))
+		{
+			self::$user_dateformat = $dateformat;
+		}
 
 		switch($timeformat)
 		{
@@ -578,7 +626,10 @@ 
 	 */
 	public static function tz_offset_s($time='now')
 	{
-		if (!($time instanceof DateTime)) $time = new DateTime($time);
+		if (!($time instanceof DateTime))
+		{
+			$time = new DateTime($time);
+		}
 
 		return self::$user_timezone->getOffset($time) - self::$server_timezone->getOffset($time);
 	}
@@ -686,9 +737,17 @@ 
 		);
 		foreach(DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			if (in_array($name,$no_vtimezone))
+			{
+				continue;
+			}
+			// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
 			list($continent) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
+			if (!isset($tzs[$continent]))
+			{
+				continue;
+			}
+			// old depricated timezones
 			$datetime = new DateTime('now',new DateTimeZone($name));
 			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
 			unset($datetime);
@@ -727,10 +786,13 @@ 
 		{
 			$user_tzs = array_merge(array($tz),$user_tzs);
 		}
-		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
+		if (!$user_tzs)
+		{
+			// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
+		}
 		if ($extra && !in_array($extra,$user_tzs))
 		{
 			$user_tzs = array_merge(array($extra),$user_tzs);

Spacing +84 added lines, -84 removed lines

@@ -93,11 +93,11 @@ 
 	 * @param string &$type=null on return type of $time (optional)
 	 * @throws Exception if $time can NOT be parsed
 	 */
-	public function __construct($time='now',DateTimeZone $tz=null,&$type=null)
+	public function __construct($time = 'now', DateTimeZone $tz = null, &$type = null)
 	{
-		if (is_null($tz)) $tz = self::$user_timezone;	// default user timezone
+		if (is_null($tz)) $tz = self::$user_timezone; // default user timezone
 
-		switch(($type = gettype($time)))
+		switch (($type = gettype($time)))
 		{
 			case 'NULL':
 			case 'boolean':	// depricated use in calendar for 'now'
@@ -108,13 +108,13 @@ 
 				if (!(is_numeric($time) && ($time > 21000000 || $time < 19000000)))
 				{
 					$t_str = $time;
-					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000';	// 'Ymd' string used in calendar to represent a date
+					if (is_numeric($time) && strlen($time) == 8) $t_str .= 'T000000'; // 'Ymd' string used in calendar to represent a date
 					// $time ending in a Z (Zulu or UTC time), is unterstood by DateTime class itself
 					try {
-						parent::__construct($t_str,$tz);
+						parent::__construct($t_str, $tz);
 						break;
 					}
-					catch(Exception $e) {
+					catch (Exception $e) {
 						// if string is nummeric, ignore the exception and treat string as timestamp
 						if (!is_numeric($time)) throw $e;
 					}
@@ -131,12 +131,12 @@ 
 				}
 				else*/
 				{
-					parent::__construct(date('Y-m-d H:i:s',$time),$tz);
+					parent::__construct(date('Y-m-d H:i:s', $time), $tz);
 				}
 				break;
 
 			case 'array':
-				parent::__construct('now',$tz);
+				parent::__construct('now', $tz);
 				if (isset($time['Y']))	// array format used in eTemplate
 				{
 					$time = array(
@@ -150,18 +150,18 @@ 
 				}
 				if (!empty($time['full']) && empty($time['year']))
 				{
-					$time['year']  = (int)substr($time['full'],0,4);
-					$time['month'] = (int)substr($time['full'],4,2);
-					$time['day']   = (int)substr($time['full'],6,2);
+					$time['year']  = (int)substr($time['full'], 0, 4);
+					$time['month'] = (int)substr($time['full'], 4, 2);
+					$time['day']   = (int)substr($time['full'], 6, 2);
 				}
-				if (isset($time['year'])) $this->setDate((int)$time['year'],(int)$time['month'],isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
-				$this->setTime((int)$time['hour'],(int)$time['minute'],(int)$time['second']);
+				if (isset($time['year'])) $this->setDate((int)$time['year'], (int)$time['month'], isset($time['day']) ? (int)$time['day'] : (int)$time['mday']);
+				$this->setTime((int)$time['hour'], (int)$time['minute'], (int)$time['second']);
 				break;
 
 			case 'object':
 				if ($time instanceof \DateTime)
 				{
-					parent::__construct($time->format('Y-m-d H:i:s'),$time->getTimezone());
+					parent::__construct($time->format('Y-m-d H:i:s'), $time->getTimezone());
 					$this->setTimezone($tz);
 					break;
 				}
@@ -188,18 +188,18 @@ 
 	 */
 	public function setWeekstart()
 	{
-		$wday = (int) $this->format('w'); // 0=sun, ..., 6=sat
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		$wday = (int)$this->format('w'); // 0=sun, ..., 6=sat
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$wstart = -$wday;
 				break;
 			case 'Saturday':
-				$wstart =  -(6-$wday);
+				$wstart = -(6 - $wday);
 				break;
 			case 'Moday':
 			default:
-				$wstart = -($wday ? $wday-1 : 6);
+				$wstart = -($wday ? $wday - 1 : 6);
 				break;
 		}
 		if ($wstart) $this->add($wstart.'days');
@@ -215,7 +215,7 @@ 
 	 * @param array $filters $name => list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) pairs with offsets
 	 * @return string
 	 */
-	public static function sql_filter($name, &$start, &$end, $column, array $filters=array())
+	public static function sql_filter($name, &$start, &$end, $column, array $filters = array())
 	{
 		if ($name == 'custom' && $start)
 		{
@@ -240,26 +240,26 @@ 
 			$end   = new DateTime('now');
 			$end->setTime(0, 0, 0);
 
-			$year  = (int) $start->format('Y');
-			$month = (int) $start->format('m');
+			$year  = (int)$start->format('Y');
+			$month = (int)$start->format('m');
 
-			list($syear,$smonth,$sday,$sweek,$eyear,$emonth,$eday,$eweek) = $filters[$name];
+			list($syear, $smonth, $sday, $sweek, $eyear, $emonth, $eday, $eweek) = $filters[$name];
 
 			// Handle quarters
-			if(stripos($name, 'quarter') !== false)
+			if (stripos($name, 'quarter') !== false)
 			{
-				$start->setDate($year, ((int)floor(($smonth+$month) / 3.1)) * 3 + 1, 1);
-				$end->setDate($year, ((int)floor(($emonth+$month) / 3.1)+1) * 3 + 1, 1);
+				$start->setDate($year, ((int)floor(($smonth + $month) / 3.1)) * 3 + 1, 1);
+				$end->setDate($year, ((int)floor(($emonth + $month) / 3.1) + 1) * 3 + 1, 1);
 			}
 			elseif ($syear || $eyear)
 			{
-				$start->setDate($year+$syear, 1, 1);
-				$end->setDate($year+$eyear, 1, 1);
+				$start->setDate($year + $syear, 1, 1);
+				$end->setDate($year + $eyear, 1, 1);
 			}
 			elseif ($smonth || $emonth)
 			{
-				$start->setDate($year, $month+$smonth, 1);
-				$end->setDate($year, $month+$emonth, 1);
+				$start->setDate($year, $month + $smonth, 1);
+				$end->setDate($year, $month + $emonth, 1);
 			}
 			elseif ($sday || $eday)
 			{
@@ -276,9 +276,9 @@ 
 		}
 		// convert start + end from user to servertime for the filter
 		$sql = '('.DateTime::user2server($start, 'ts').' <= '.$column;
-		if($end)
+		if ($end)
 		{
-			$sql .=' AND '.$column.' < '.DateTime::user2server($end, 'ts');
+			$sql .= ' AND '.$column.' < '.DateTime::user2server($end, 'ts');
 
 			// returned timestamps: $end is an inclusive date, eg. for today it's equal to start!
 			$end->add('-1day');
@@ -320,9 +320,9 @@ 
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
 	 * @return int|string|array|datetime see $type
 	 */
-	public function format($type='')
+	public function format($type = '')
 	{
-		switch((string)$type)
+		switch ((string)$type)
 		{
 			case '':	// empty string:  date and time as in user prefs
 			//case '':	// boolean false: time as in user prefs
@@ -347,7 +347,7 @@ 
 			case 'integer':
 			case 'ts':
 				// ToDo: Check if PHP5.3 getTimestamp does the same, or always returns UTC timestamp
-				return mktime(parent::format('H'),parent::format('i'),parent::format('s'),parent::format('m'),parent::format('d'),parent::format('Y'));
+				return mktime(parent::format('H'), parent::format('i'), parent::format('s'), parent::format('m'), parent::format('d'), parent::format('Y'));
 
 			case 'object':
 			case 'datetime':
@@ -365,7 +365,7 @@ 
 					'second' => (int)parent::format('s'),
 					'full'   => parent::format('Ymd'),
 				);
-				$arr['raw'] = mktime($arr['hour'],$arr['minute'],$arr['second'],$arr['month'],$arr['day'],$arr['year']);
+				$arr['raw'] = mktime($arr['hour'], $arr['minute'], $arr['second'], $arr['month'], $arr['day'], $arr['year']);
 				return $arr;
 
 			case 'date_array':	// array with short keys used by date: Y, m, d, H, i, s (used in eTemplate)
@@ -399,19 +399,19 @@ 
 	 * @param string $type =null type or return-value, default (null) same as $time
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
-	public static function server2user($time,$type=null)
+	public static function server2user($time, $type = null)
 	{
-		$typeof='DateTime';
+		$typeof = 'DateTime';
 		if (!($time instanceof DateTime))
 		{
 			try
 			{
 				$time = new DateTime($time, self::$server_timezone, $typeof);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				unset($e);
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		$time->setUser();
@@ -429,19 +429,19 @@ 
 	 * @param string $type =null type or return-value, default (null) same as $time
 	 * @return int|string|array|datetime null if time could not be parsed
 	 */
-	public static function user2server($time,$type=null)
+	public static function user2server($time, $type = null)
 	{
-		$typeof='DateTime';
+		$typeof = 'DateTime';
 		if (!($time instanceof DateTime))
 		{
 			try
 			{
-				$time = new DateTime($time,self::$user_timezone,$typeof);
+				$time = new DateTime($time, self::$user_timezone, $typeof);
 			}
-			catch(Exception $e)
+			catch (Exception $e)
 			{
 				unset($e);
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		$time->setServer();
@@ -461,7 +461,7 @@ 
 	 * 		true = date only, false = time only as in user prefs, '' = date+time as in user prefs
 	 * @return int|string|array|datetime see $type, null if time could not be parsed
 	 */
-	public static function to($time='now',$type='')
+	public static function to($time = 'now', $type = '')
 	{
 		if (!($time instanceof DateTime))
 		{
@@ -470,10 +470,10 @@ 
 				// Try user format first
 				$time = static::createFromUserFormat($time);
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				unset($e);
-				return null;	// time could not be parsed
+				return null; // time could not be parsed
 			}
 		}
 		return $time->format($type);
@@ -497,22 +497,22 @@ 
 		$date = null;
 
 		// If numeric, just let normal constructor do it
-		if(is_numeric($time))
+		if (is_numeric($time))
 		{
 			return new DateTime($time);
 		}
 
 		// Various date formats in decreasing preference
 		$formats = array(
-			'!'.static::$user_dateformat . ' ' .static::$user_timeformat.':s',
-			'!'.static::$user_dateformat . '*' .static::$user_timeformat.':s',
-			'!'.static::$user_dateformat . '* ' .static::$user_timeformat,
-			'!'.static::$user_dateformat . '*',
+			'!'.static::$user_dateformat.' '.static::$user_timeformat.':s',
+			'!'.static::$user_dateformat.'*'.static::$user_timeformat.':s',
+			'!'.static::$user_dateformat.'* '.static::$user_timeformat,
+			'!'.static::$user_dateformat.'*',
 			'!'.static::$user_dateformat,
 			'!Y-m-d\TH:i:s'
 		);
 		// Try the different formats, stop when one works
-		foreach($formats as $f)
+		foreach ($formats as $f)
 		{
 			try {
 				$date = static::createFromFormat(
@@ -520,7 +520,7 @@ 
 					$time,
 					static::$user_timezone
 				);
-				if($date) break;
+				if ($date) break;
 			} catch (\Exception $e) {
 
 			}
@@ -537,12 +537,12 @@ 
 	 * @param string|int $timeformat ='' integer 12, 24, or format string eg. 'H:i'
 	 * @return DateTimeZone
 	 */
-	public static function setUserPrefs($tz,$dateformat='',$timeformat='')
+	public static function setUserPrefs($tz, $dateformat = '', $timeformat = '')
 	{
 		//echo "<p>".__METHOD__."('$tz','$dateformat','$timeformat') ".function_backtrace()."</p>\n";
 		if (!empty($dateformat)) self::$user_dateformat = $dateformat;
 
-		switch($timeformat)
+		switch ($timeformat)
 		{
 			case '':
 				break;
@@ -559,7 +559,7 @@ 
 		try {
 			self::$user_timezone = new DateTimeZone($tz);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			unset($e);
 			// silently use server timezone, as we have no means to report the wrong timezone to the user from this class
@@ -576,7 +576,7 @@ 
 	 * @param int|string|DateTime $time ='now'
 	 * @return int difference in seconds between user and server time (for the given time!)
 	 */
-	public static function tz_offset_s($time='now')
+	public static function tz_offset_s($time = 'now')
 	{
 		if (!($time instanceof DateTime)) $time = new DateTime($time);
 
@@ -597,17 +597,17 @@ 
 		try {
 			self::$server_timezone = new DateTimeZone($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		catch(\Exception $e)
+		catch (\Exception $e)
 		{
 			try {
 				self::$server_timezone = new DateTimeZone(date_default_timezone_get());
 			}
-			catch(\Exception $e)
+			catch (\Exception $e)
 			{
 				self::$server_timezone = new DateTimeZone('Europe/Berlin');
 			}
 			error_log(__METHOD__."() invalid server_timezone='{$GLOBALS['egw_info']['server']['server_timezone']}' setting now '".self::$server_timezone->getName()."'!");
-			Config::save_value('server_timezone',$GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(),'phpgwapi');
+			Config::save_value('server_timezone', $GLOBALS['egw_info']['server']['server_timezone'] = self::$server_timezone->getName(), 'phpgwapi');
 		}
 		if (!isset($GLOBALS['egw_info']['user']['preferences']['common']['tz']))
 		{
@@ -630,15 +630,15 @@ 
 	{
 		// prepare list of timezones from php, ignoring depricated ones and sort as follows
 		$tzs = array(
-			'Africa'     => array(),	// Contients
+			'Africa'     => array(), // Contients
 			'America'    => array(),
 			'Asia'       => array(),
 			'Australia'  => array(),
 			'Europe'     => array(),
-			'Atlantic'   => array(),	// Oceans
+			'Atlantic'   => array(), // Oceans
 			'Pacific'    => array(),
 			'Indian'     => array(),
-			'Antarctica' => array(),	// Poles
+			'Antarctica' => array(), // Poles
 			'Arctic'     => array(),
 			'UTC'        => array('UTC' => 'UTC'),
 		);
@@ -684,27 +684,27 @@ 
 			'Australia/Yancowinna',
 			'Pacific/Samoa',
 		);
-		foreach(DateTimeZone::listIdentifiers() as $name)
+		foreach (DateTimeZone::listIdentifiers() as $name)
 		{
-			if (in_array($name,$no_vtimezone)) continue;	// do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
-			list($continent) = explode('/',$name,2);
-			if (!isset($tzs[$continent])) continue;	// old depricated timezones
-			$datetime = new DateTime('now',new DateTimeZone($name));
-			$tzs[$continent][$name] = str_replace(array('_','/'),array(' ',' / '),$name)."  ".$datetime->format();
+			if (in_array($name, $no_vtimezone)) continue; // do NOT allow to set in EGroupware, as we have not VTIMEZONE component for it
+			list($continent) = explode('/', $name, 2);
+			if (!isset($tzs[$continent])) continue; // old depricated timezones
+			$datetime = new DateTime('now', new DateTimeZone($name));
+			$tzs[$continent][$name] = str_replace(array('_', '/'), array(' ', ' / '), $name)."  ".$datetime->format();
 			unset($datetime);
 		}
-		foreach($tzs as $continent => &$data)
+		foreach ($tzs as $continent => &$data)
 		{
-			natcasesort($data);	// sort cities
+			natcasesort($data); // sort cities
 		}
 		unset($data);
 
 		// if user lang or installed langs contain a european language --> move Europe to top of tz list
 		$langs = class_exists('EGroupware\\Api\\Translation') ? Translation::get_installed_langs() : array();
-		if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang'])+array_keys($langs),
-			array('de','fr','it','nl','bg','ca','cs','da','el','es-es','et','eu','fi','hr','hu','lt','no','pl','pt','sk','sl','sv','tr','uk')))
+		if (array_intersect(array($GLOBALS['egw_info']['user']['preferences']['common']['lang']) + array_keys($langs),
+			array('de', 'fr', 'it', 'nl', 'bg', 'ca', 'cs', 'da', 'el', 'es-es', 'et', 'eu', 'fi', 'hr', 'hu', 'lt', 'no', 'pl', 'pt', 'sk', 'sl', 'sv', 'tr', 'uk')))
 		{
-			$tzs = array_merge(array('Europe' => $tzs['Europe']),$tzs);
+			$tzs = array_merge(array('Europe' => $tzs['Europe']), $tzs);
 		}
 		return $tzs;
 	}
@@ -715,30 +715,30 @@ 
 	 * @param string $extra extra timezone to add, if not already included in user timezones
 	 * @return array tzid => label
 	 */
-	public static function getUserTimezones($extra=null)
+	public static function getUserTimezones($extra = null)
 	{
 		$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-		$user_tzs = explode(',',$GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
+		$user_tzs = explode(',', $GLOBALS['egw_info']['user']['preferences']['common']['tz_selection']);
 		if (count($user_tzs) <= 1)
 		{
 			$user_tzs = $tz ? array($tz) : array();
 		}
-		if ($tz && !in_array($tz,$user_tzs))
+		if ($tz && !in_array($tz, $user_tzs))
 		{
-			$user_tzs = array_merge(array($tz),$user_tzs);
+			$user_tzs = array_merge(array($tz), $user_tzs);
 		}
 		if (!$user_tzs)	// if we have no user timezones, eg. user set no pref --> use server default
 		{
 			$user_tzs = array($GLOBALS['egw_info']['server']['server_timezone']);
 		}
-		if ($extra && !in_array($extra,$user_tzs))
+		if ($extra && !in_array($extra, $user_tzs))
 		{
-			$user_tzs = array_merge(array($extra),$user_tzs);
+			$user_tzs = array_merge(array($extra), $user_tzs);
 		}
-		$ret_user_tzs = array_combine($user_tzs,$user_tzs);
-		foreach($ret_user_tzs as &$label)
+		$ret_user_tzs = array_combine($user_tzs, $user_tzs);
+		foreach ($ret_user_tzs as &$label)
 		{
-			$label = str_replace(array('_','/'),array(' ',' / '),$label);
+			$label = str_replace(array('_', '/'), array(' ', ' / '), $label);
 		}
 		return $ret_user_tzs;
 	}

infolog/inc/class.infolog_merge.inc.php

Spacing +34 added lines, -34 removed lines

@@ -63,7 +63,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->infolog_replacements($id, '', $content)))
 		{
@@ -79,7 +79,7 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function infolog_replacements($id,$prefix='', &$content = '')
+	public function infolog_replacements($id, $prefix = '', &$content = '')
 	{
 		$record = new infolog_egw_record($id);
 		$info = array();
@@ -87,13 +87,13 @@ 
 		// Convert to human friendly values
 		$types = infolog_egw_record::$types;
 		$_selects = $this->bo->enums + array('status' => $this->bo->status[$record->info_type]);
-		foreach($_selects as $name => $value)
+		foreach ($_selects as $name => $value)
 		{
 			$selects['info_'.$name] = $value;
-			if(!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
+			if (!in_array('info_'.$name, $types['select'])) $types['select'][] = 'info_'.$name;
 		}
 
-		if($content && strpos($content, '$$#') !== FALSE)
+		if ($content && strpos($content, '$$#') !== FALSE)
 		{
 			$this->cf_link_to_expand($record->get_record_array(), $content, $info);
 		}
@@ -101,21 +101,21 @@ 
 		importexport_export_csv::convert($record, $types, 'infolog', $selects);
 
 		$array = $record->get_record_array();
-		if($record->info_contact)
+		if ($record->info_contact)
 		{
 			$array['info_contact'] = $array['info_link']['title'];
 		}
 
 		// Set any missing custom fields, or the marker will stay
 		$array = $record->get_record_array();
-		foreach($this->bo->customfields as $name => $field)
+		foreach ($this->bo->customfields as $name => $field)
 		{
-			if(!$array['#'.$name])
+			if (!$array['#'.$name])
 			{
 				$array['#'.$name] = '';
 			}
 			// Format date cfs per user Api\Preferences
-			if($array['#'.$name] && ($field['type'] == 'date' || $field['type'] == 'date-time'))
+			if ($array['#'.$name] && ($field['type'] == 'date' || $field['type'] == 'date-time'))
 			{
 				$this->date_fields[] = '#'.$name;
 				$array['#'.$name] = Api\DateTime::to($array['#'.$name], $field['type'] == 'date' ? true : '');
@@ -126,16 +126,16 @@ 
 		$array += $this->get_all_links('infolog', $id, $prefix, $content);
 
 		// Timesheet time
-		if(strpos($content, 'info_sum_timesheets'))
+		if (strpos($content, 'info_sum_timesheets'))
 		{
-			$links = Link::get_links('infolog',$id,'timesheet');
-			$sum = ExecMethod('timesheet.timesheet_bo.sum',$links);
+			$links = Link::get_links('infolog', $id, 'timesheet');
+			$sum = ExecMethod('timesheet.timesheet_bo.sum', $links);
 			$info['$$info_sum_timesheets$$'] = $sum['duration'];
 		}
 
 		// Check for linked project ID
 		$links = Link::get_links('infolog', $id, 'projectmanager');
-		foreach($links as $app_id)
+		foreach ($links as $app_id)
 		{
 			$array['pm_id'] = $app_id;
 			$array['project'] = Link::title('projectmanager', $app_id);
@@ -144,24 +144,24 @@ 
 		if (strpos($content, '$$project/') !== false && $array['pm_id'] && class_exists('projectmanager_merge'))
 		{
 			$pm_merge = new projectmanager_merge($array['pm_id']);
-			$info += $pm_merge->projectmanager_replacements($array['pm_id'],'project',$content);
+			$info += $pm_merge->projectmanager_replacements($array['pm_id'], 'project', $content);
 		}
 
 		// Add markers
-		foreach($array as $key => &$value)
+		foreach ($array as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
 
 		// Add contact fields
-		if($array['info_link']['app'] && $array['info_link']['id'])
+		if ($array['info_link']['app'] && $array['info_link']['id'])
 		{
-			$info+=$this->get_app_replacements($array['info_link']['app'], $array['info_link']['id'], $content, 'info_contact');
+			$info += $this->get_app_replacements($array['info_link']['app'], $array['info_link']['id'], $content, 'info_contact');
 		}
 
 		// Add parent
-		if($record->info_id_parent)
+		if ($record->info_id_parent)
 		{
 			$info += $this->infolog_replacements($record->info_id_parent, 'info_id_parent', $content);
 		}
@@ -185,11 +185,11 @@ 
 		$tracking = new infolog_tracking($this->bo);
 		$fields = array('info_id' => lang('Infolog ID'), 'pm_id' => lang('Project ID'), 'project' => lang('Project name')) + $tracking->field2label + array('info_sum_timesheets' => lang('Used time'));
 		Api\Translation::add_app('projectmanager');
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
-			if (in_array($name,array('custom'))) continue;	// dont show them
+			if (in_array($name, array('custom'))) continue; // dont show them
 
-			if (in_array($name,array('info_subject', 'info_des')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('info_subject', 'info_des')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -202,26 +202,26 @@ 
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
 		$contact_custom = false;
-		foreach($this->bo->customfields as $name => $field)
+		foreach ($this->bo->customfields as $name => $field)
 		{
-			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label'].($field['type'] == 'select-account' ? '*':'')."</td></tr>\n";
-			if($field['type'] == 'select-account') $contact_custom = true;
+			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label'].($field['type'] == 'select-account' ? '*' : '')."</td></tr>\n";
+			if ($field['type'] == 'select-account') $contact_custom = true;
 		}
-		if($contact_custom)
+		if ($contact_custom)
 		{
-			echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available'). '</td></tr>';
+			echo '<tr><td /><td colspan="3">* '.lang('Addressbook placeholders available').'</td></tr>';
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Parent').":</h3></td></tr>";
-		echo '<tr><td>{{info_id_parent/info_subject}}</td><td colspan="3">'.lang('All other %1 fields are valid',lang('infolog'))."</td></tr>\n";
+		echo '<tr><td>{{info_id_parent/info_subject}}</td><td colspan="3">'.lang('All other %1 fields are valid', lang('infolog'))."</td></tr>\n";
 
 		echo '<tr><td colspan="4"><h3>'.lang('Contact fields').':</h3></td></tr>';
 		$i = 0;
-		foreach($this->contacts->contact_fields as $name => $label)
+		foreach ($this->contacts->contact_fields as $name => $label)
 		{
-			if (in_array($name,array('tid','label','geo'))) continue;       // dont show them, as they are not used in the UI atm.
+			if (in_array($name, array('tid', 'label', 'geo'))) continue; // dont show them, as they are not used in the UI atm.
 
-			if (in_array($name,array('email','org_name','tel_work','url')) && $n&1)         // main values, which should be in the first column
+			if (in_array($name, array('email', 'org_name', 'tel_work', 'url')) && $n&1)         // main values, which should be in the first column
 			{
 					echo "</tr>\n";
 					$i++;
@@ -233,13 +233,13 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach($this->contacts->customfields as $name => $field)
+		foreach ($this->contacts->customfields as $name => $field)
 		{
 			echo '<tr><td>{{info_contact/#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
 			'attachments' => lang('List of files linked to the current record'),

api/src/Storage/Merge.php

Spacing +364 added lines, -365 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,11 +171,11 @@ 
 				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
 				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':
@@ -183,17 +183,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;
 		}
@@ -211,7 +211,7 @@ 
 	 * @param boolean $ignore_acl =false true: no acl check
 	 * @return array
 	 */
-	public function contact_replacements($contact,$prefix='',$ignore_acl=false)
+	public function contact_replacements($contact, $prefix = '', $ignore_acl = false)
 	{
 		if (!is_array($contact))
 		{
@@ -220,13 +220,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)
@@ -235,7 +235,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;
@@ -248,11 +248,11 @@ 
 						// 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
@@ -260,7 +260,7 @@ 
 					{
 						$value = ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/' ?
 							($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'] : '').
-							$GLOBALS['egw']->link('/index.php',$contact['photo']);
+							$GLOBALS['egw']->link('/index.php', $contact['photo']);
 					}
 					break;
 				case 'tel_prefer':
@@ -272,40 +272,39 @@ 
 				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;
-			$replacements['$$'.($prefix ? $prefix.'/':'').$name.'$$'] =
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$name.'$$'] =
 				// use raw data for yaml, no user-preference specific formatting
-				$this->mimetype == 'application/x-yaml' ? (string)$contact[$name] :
-				Customfields::format($field, (string)$contact[$name]);
+				$this->mimetype == 'application/x-yaml' ? (string)$contact[$name] : Customfields::format($field, (string)$contact[$name]);
 		}
 
 		// 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;
 	}
@@ -324,34 +323,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
 				{
@@ -367,7 +366,7 @@ 
 			}
 			$link_titles[] = $title;
 		}
-		return implode("\n",$link_titles);
+		return implode("\n", $link_titles);
 	}
 
 	/**
@@ -384,33 +383,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, 1, -1);
-				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
 						{
@@ -422,26 +421,26 @@ 
 							$link = ($_SERVER['HTTPS'] || $GLOBALS['egw_info']['server']['enforce_ssl'] ? 'https://' : 'http://').
 								($GLOBALS['egw_info']['server']['hostname'] ? $GLOBALS['egw_info']['server']['hostname'] : $_SERVER['HTTP_HOST']).$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];
 			}
 		}
 		// Need to set each app, to make sure placeholders are removed
-		foreach(array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
+		foreach (array_keys($GLOBALS['egw_info']['user']['apps']) as $_app)
 		{
-			$array[($prefix?$prefix.'/':'')."links/$app"] = $this->get_links($app,$id,$_app);
+			$array[($prefix ? $prefix.'/' : '')."links/$app"] = $this->get_links($app, $id, $_app);
 		}
 		return $array;
 	}
@@ -454,12 +453,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);
 	}
 
 	/**
@@ -471,7 +470,7 @@ 
 	 */
 	public static function is_export_limit_excepted()
 	{
-		static $is_excepted=null;
+		static $is_excepted = null;
 
 		if (is_null($is_excepted))
 		{
@@ -481,9 +480,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;
@@ -496,18 +495,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]);
@@ -539,9 +538,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;
@@ -557,28 +556,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();
@@ -587,18 +586,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':		// open office
 			case 'application/vnd.oasis.opendocument.spreadsheet':
@@ -608,7 +607,7 @@ 
 					'/<\/(ol|ul|table)>/' => '</$1><text:p>',
 					//'/<(li)(.*?)>(.*?)<\/\1>/' => '<$1 $2>$3</$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);
 
 				$doc = new DOMDocument();
 				$xslt = new XSLTProcessor();
@@ -635,7 +634,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),
@@ -645,9 +644,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();
@@ -658,20 +657,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);
 
 			// 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
@@ -694,11 +693,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];
 		}
@@ -708,12 +707,12 @@ 
 		}
 		// alternative syntax using double curly brackets (eg. {{cat_id}} instead $$cat_id$$),
 		// agressivly removing all xml-tags eg. Word adds within placeholders
-		$content = preg_replace_callback('/{{[^}]+}}/i',create_function('$p','return \'$$\'.strip_tags(substr($p[0],2,-2)).\'$$\';'),$_content);
+		$content = preg_replace_callback('/{{[^}]+}}/i', create_function('$p', 'return \'$$\'.strip_tags(substr($p[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;
@@ -722,16 +721,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;
@@ -742,14 +741,14 @@ 
 		}
 		if ($mimetype == 'application/vnd.oasis.opendocument.text' && 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>';
@@ -757,22 +756,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)
 		{
@@ -783,10 +782,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':
@@ -808,19 +807,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;
@@ -834,88 +833,88 @@ 
 			}
 			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');
-				$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');
+				$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':
-					return $contentstart.implode('<text:line-break />',$contentrepeatpages).$contentend;
+					return $contentstart.implode('<text:line-break />', $contentrepeatpages).$contentend;
 				case 'application/vnd.oasis.opendocument.spreadsheet':
-					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;
 		}
 
@@ -940,9 +939,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':
@@ -953,13 +952,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];
 				}
@@ -978,18 +977,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) : '';
 				}
 			}
 		}
@@ -1003,19 +1002,19 @@ 
 			// 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>',
+							'<b>', '<strong>', '<i>', '<em>', '<u>', '<span>', '<ol>', '<ul>', '<li>',
+							'<table>', '<tr>', '<td>', '<a>', '<style>',
 						);
 						break;
 					case 'application/vnd.oasis.opendocument.text':		// open office
 					case 'application/vnd.oasis.opendocument.spreadsheet':
 						$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*/
@@ -1024,48 +1023,48 @@ 
 					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 || (
-					strpos($value, "\n") !== FALSE && strpos($value,'<br') === FALSE && strpos($value, '<span') === FALSE && strpos($value, '<p') === FALSE
+				if (!$this->parse_html_styles || (
+					strpos($value, "\n") !== FALSE && strpos($value, '<br') === FALSE && strpos($value, '<span') === FALSE && strpos($value, '<p') === 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);
@@ -1076,52 +1075,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
 					$break = '<text:line-break/>';
@@ -1150,14 +1149,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')
@@ -1168,24 +1167,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);
 	}
 
 	/**
@@ -1193,36 +1192,36 @@ 
 	 */
 	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
-				$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 calcext:value-type="float"><$3>$4</$3></table:table-cell>';
 				break;
 			case 'application/vnd.oasis.opendocument.text':		// tables in open office writer
-				$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
 		}
 	}
 
@@ -1233,7 +1232,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');
@@ -1241,16 +1240,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.");
@@ -1262,41 +1261,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
@@ -1305,17 +1304,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;
@@ -1323,16 +1322,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
 		}
 	}
 
@@ -1342,9 +1341,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);
 
@@ -1355,25 +1354,25 @@ 
 		// 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.'$$ ';
 			}
 		}
 		$expand_sub_cfs = array_unique($expand_sub_cfs);
 
-		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'];
 				}
@@ -1384,7 +1383,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];
@@ -1395,7 +1394,7 @@ 
 				}
 
 				// Get replacements for that application
-				if(!$app_replacements[$field])
+				if (!$app_replacements[$field])
 				{
 					$app_replacements[$field] = $this->get_app_replacements($field_app, $values['#'.$field], $content);
 				}
@@ -1419,7 +1418,7 @@ 
 	protected function get_app_replacements($app, $id, $content, $prefix)
 	{
 		$replacements = array();
-		if($app == 'addressbook')
+		if ($app == 'addressbook')
 		{
 			return $this->contact_replacements($id, $prefix);
 		}
@@ -1429,7 +1428,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);
 			}
@@ -1456,33 +1455,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;
@@ -1496,16 +1495,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':
@@ -1520,14 +1519,14 @@ 
 				break;
 		}
 
-		switch($this->mimetype)
+		switch ($this->mimetype)
 			{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
 					break;
 				case 'application/vnd.oasis.opendocument.text':
-					$LF ='<text:line-break/>';
+					$LF = '<text:line-break/>';
 					break;
 				case 'application/vnd.oasis.opendocument.spreadsheet':		// open office calc
 					$LF = '</text:p><text:p>';
@@ -1539,10 +1538,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/>";
@@ -1550,27 +1549,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;
 	}
@@ -1584,7 +1583,7 @@ 
 	 * @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 = '')
 	{
 		//error_log(__METHOD__."('$document', ".array2string($ids).", '$name', dirs='$dirs') ->".function_backtrace());
 		if (($error = $this->check_document($document, $dirs)))
@@ -1600,7 +1599,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)
 				{
@@ -1609,19 +1608,19 @@ 
 				}
 				//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':
 				$ext = $mimetype == 'application/vnd.oasis.opendocument.text' ? '.odt' : '.ods';
-				$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;
@@ -1629,20 +1628,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':
@@ -1657,13 +1656,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;
@@ -1680,22 +1679,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;
 		}
@@ -1711,25 +1710,25 @@ 
 				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);
 			if ($this->report_memory_usage) error_log(__METHOD__."() after ZIP processing ".Api\Vfs::hsize(memory_get_peak_usage(true)));
-			Api\Header\Content::type($name,$mimetype,filesize($archive));
-			readfile($archive,'r');
+			Api\Header\Content::type($name, $mimetype, filesize($archive));
+			readfile($archive, 'r');
 		}
 		else
 		{
 			if ($mimetype == 'application/xml')
 			{
-				if (strpos($merged,'<?mso-application progid="Word.Document"?>') !== false)
+				if (strpos($merged, '<?mso-application progid="Word.Document"?>') !== false)
 				{
-					$mimetype = 'application/msword';	// to open it automatically in word or oowriter
+					$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)
 				{
-					$mimetype = 'application/vnd.ms-excel';	// to open it automatically in excel or oocalc
+					$mimetype = 'application/vnd.ms-excel'; // to open it automatically in excel or oocalc
 				}
 			}
 			Api\Header\Content::type($name, $mimetype);
@@ -1750,13 +1749,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']
 		);
@@ -1770,18 +1769,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] === '!'))
@@ -1796,15 +1795,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']);
 				}
@@ -1831,14 +1830,14 @@ 
 	 * @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();
 		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
 		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;
@@ -1847,7 +1846,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')
 			{
@@ -1862,28 +1861,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]);
@@ -1891,40 +1890,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')
 							{
@@ -1933,7 +1932,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(
@@ -1960,7 +1959,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')
 				{
@@ -1973,7 +1972,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')
 				{
@@ -1987,8 +1986,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,
 		);
 	}
@@ -2019,14 +2018,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();
 	}
 
 	/**
@@ -2038,15 +2037,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;
@@ -2060,7 +2059,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);
 	}
 
 	/**
@@ -2081,16 +2080,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);
 	}
 }

Braces +268 added lines, -74 removed lines

@@ -168,13 +168,19 @@ 
 		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
 			case 'application/vnd.oasis.opendocument.text':	// oo text
 			case 'application/vnd.oasis.opendocument.spreadsheet':	// oo spreadsheet
-				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
@@ -182,7 +188,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
@@ -217,7 +226,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)
@@ -226,7 +238,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)
@@ -276,7 +291,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
@@ -293,17 +311,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";
 		}
@@ -338,7 +362,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)
@@ -457,7 +484,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);
 	}
@@ -499,7 +529,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))
 		{
@@ -508,7 +541,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]))
@@ -541,10 +577,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;
+		}
 	}
 
 	/**
@@ -579,7 +627,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;
@@ -671,7 +720,8 @@ 
 			$content = $xslt->transformToXml($element);
 
 			// 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
@@ -731,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;
@@ -773,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)
 		{
@@ -814,8 +873,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
@@ -832,7 +898,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')))
 			{
@@ -890,9 +959,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;
 				}
 			}
@@ -925,7 +997,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;
 	}
@@ -970,7 +1045,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'].')');
@@ -993,10 +1071,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();
@@ -1061,7 +1142,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
@@ -1095,16 +1177,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);
@@ -1114,7 +1200,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);
@@ -1193,7 +1280,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)
@@ -1222,7 +1310,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
 		}
 	}
 
@@ -1266,7 +1358,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(
@@ -1287,9 +1382,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;
@@ -1332,7 +1430,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
 		}
 	}
 
@@ -1403,7 +1505,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;
+				}
 			}
 		}
 	}
@@ -1457,30 +1562,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);
@@ -1496,8 +1606,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] === ''))
@@ -1521,7 +1637,7 @@ 
 		}
 
 		switch($this->mimetype)
-			{
+		{
 				case 'application/rtf':
 				case 'text/rtf':
 					$LF = '}\par \pard\plain{';
@@ -1550,25 +1666,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,' ');
 		}
@@ -1609,13 +1738,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':
@@ -1689,7 +1825,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))
 		{
@@ -1709,13 +1848,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)));
+			}
 			Api\Header\Content::type($name,$mimetype,filesize($archive));
 			readfile($archive,'r');
 		}
@@ -1750,9 +1901,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'],
@@ -1773,7 +1933,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
@@ -1781,7 +1944,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] === '!'))
@@ -1804,8 +1971,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']);
 				}
 			}
@@ -1835,12 +2008,19 @@ 
 		$export_limit=null)
 	{
 		$documents = array();
-		if ($export_limit == null) $export_limit = self::getExportLimit(); // check if there is a globalsetting
-		if ($default_doc && ($file = Api\Vfs::stat($default_doc)))	// put default document on top
+		if ($export_limit == null)
+		{
+			$export_limit = self::getExportLimit();
+		}
+		// check if there is a globalsetting
+		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(
@@ -1864,7 +2044,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)
@@ -1884,10 +2068,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']);
@@ -2046,7 +2233,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;
@@ -2083,7 +2274,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)
 		{