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

api/src/Storage/Merge.php

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)
 		{