EGroupware / egroupware

phpgwapi/inc/class.egw_datetime.inc.php

Doc Comments +6 added lines

@@ -691,6 +691,9 @@ 
 			return (int)(($server_time - $this->gmtnow) / 3600);
 		}
 
+		/**
+		 * @param string $date_str
+		 */
 		function convert_rfc_to_epoch($date_str)
 		{
 			$comma_pos = strpos($date_str,',');
@@ -993,6 +996,9 @@ 
 			return $date;
 		}
 
+		/**
+		 * @param integer $localtime
+		 */
 		function gmtdate($localtime)
 		{
 			return $this->localdates($localtime - $this->tz_offset);

Indentation +4 added lines, -4 removed lines

@@ -38,10 +38,10 @@
 	unset($d3);
 
 	/**
-	* eGroupWare datetime class that contains common date/time functions
-	* 
-	* renamed to egw_datetime to support php5.2
-	*/
+	 * eGroupWare datetime class that contains common date/time functions
+	 * 
+	 * renamed to egw_datetime to support php5.2
+	 */
 	class egw_datetime
 	{
 		var $zone_offset_list = array(

Spacing +91 added lines, -91 removed lines

@@ -25,10 +25,10 @@ 
 
 	/* $Id$ */
 
-	$d1 = strtolower(@substr(EGW_API_INC,0,3));
-	$d2 = strtolower(@substr(EGW_SERVER_ROOT,0,3));
-	$d3 = strtolower(@substr(EGW_APP_INC,0,3));
-	if($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 == 'htt' || $d3 == 'ftp')
+	$d1 = strtolower(@substr(EGW_API_INC, 0, 3));
+	$d2 = strtolower(@substr(EGW_SERVER_ROOT, 0, 3));
+	$d3 = strtolower(@substr(EGW_APP_INC, 0, 3));
+	if ($d1 == 'htt' || $d1 == 'ftp' || $d2 == 'htt' || $d2 == 'ftp' || $d3 == 'htt' || $d3 == 'ftp')
 	{
 		echo 'Failed attempt to break in via an old Security Hole!<br>'."\n";
 		exit;
@@ -584,21 +584,21 @@ 
 		function egw_datetime()
 		{
 			$this->tz_offset = 3600 * @$GLOBALS['egw_info']['user']['preferences']['common']['tz_offset'];
-			print_debug('datetime::datetime::gmtnow',$this->gmtnow,'api');
+			print_debug('datetime::datetime::gmtnow', $this->gmtnow, 'api');
 
 			$error_occured = True;
 			// If we already have a GMT time, no need to do this again.
-			if(!$this->gmtnow)
+			if (!$this->gmtnow)
 			{
-				if(isset($GLOBALS['egw_info']['server']['tz_offset']))
+				if (isset($GLOBALS['egw_info']['server']['tz_offset']))
 				{
 					$this->gmtnow = time() - ((int)$GLOBALS['egw_info']['server']['tz_offset'] * 3600);
-					print_debug('datetime::datetime::tz_offset',"set via tz_offset=".$GLOBALS['egw_info']['server']['tz_offset'].": gmtnow=".date('Y/m/d H:i',$this->gmtnow),'api');
+					print_debug('datetime::datetime::tz_offset', "set via tz_offset=".$GLOBALS['egw_info']['server']['tz_offset'].": gmtnow=".date('Y/m/d H:i', $this->gmtnow), 'api');
 				}
 				else
 				{
 					$this->gmtnow = time() - ($this->getbestguess() * 3600);
-					print_debug('datetime::datetime::bestguess',"set via bestguess=".$this->getbestguess().": gmtnow=".date('Y/m/d H:i',$this->gmtnow),'api');
+					print_debug('datetime::datetime::bestguess', "set via bestguess=".$this->getbestguess().": gmtnow=".date('Y/m/d H:i', $this->gmtnow), 'api');
 				}
 			}
 			$this->users_localtime = time() + $this->tz_offset;
@@ -607,33 +607,33 @@ 
 		function getntpoffset()
 		{
 			$error_occured = False;
-			if(!@is_object($GLOBALS['egw']->network))
+			if (!@is_object($GLOBALS['egw']->network))
 			{
 				$GLOBALS['egw']->network = createobject('phpgwapi.network');
 			}
 			$server_time = time();
 
-			if($GLOBALS['egw']->network->open_port('129.6.15.28',13,5))
+			if ($GLOBALS['egw']->network->open_port('129.6.15.28', 13, 5))
 			{
 				$line = $GLOBALS['egw']->network->bs_read_port(64);
 				$GLOBALS['egw']->network->close_port();
 
-				$array = explode(' ',$line);
+				$array = explode(' ', $line);
 				// host: 129.6.15.28
 				// Value returned is 52384 02-04-20 13:55:29 50 0 0   9.2 UTC(NIST) *
-				print_debug('Server datetime',time(),'api');
-				print_debug('Temporary NTP datetime',$line,'api');
+				print_debug('Server datetime', time(), 'api');
+				print_debug('Temporary NTP datetime', $line, 'api');
 				if ($array[5] == 4)
 				{
 					$error_occured = True;
 				}
 				else
 				{
-					$date = explode('-',$array[1]);
-					$time = explode(':',$array[2]);
-					$this->gmtnow = mktime((int)$time[0],(int)$time[1],(int)$time[2],(int)$date[1],(int)$date[2],(int)$date[0] + 2000);
-					print_debug('Temporary RFC epoch',$this->gmtnow,'api');
-					print_debug('GMT',date('Ymd H:i:s',$this->gmtnow),'api');
+					$date = explode('-', $array[1]);
+					$time = explode(':', $array[2]);
+					$this->gmtnow = mktime((int)$time[0], (int)$time[1], (int)$time[2], (int)$date[1], (int)$date[2], (int)$date[0] + 2000);
+					print_debug('Temporary RFC epoch', $this->gmtnow, 'api');
+					print_debug('GMT', date('Ymd H:i:s', $this->gmtnow), 'api');
 				}
 			}
 			else
@@ -641,7 +641,7 @@ 
 				$error_occured = True;
 			}
 
-			if($error_occured == True)
+			if ($error_occured == True)
 			{
 				return $this->getbestguess();
 			}
@@ -654,7 +654,7 @@ 
 		function gethttpoffset()
 		{
 			$error_occured = False;
-			if(!@is_object($GLOBALS['egw']->network))
+			if (!@is_object($GLOBALS['egw']->network))
 			{
 				$GLOBALS['egw']->network = createobject('phpgwapi.network');
 			}
@@ -662,41 +662,41 @@ 
 
 			$filename = 'http://132.163.4.213/timezone.cgi?GMT';
 			$file = $GLOBALS['egw']->network->gethttpsocketfile($filename);
-			if(!$file)
+			if (!$file)
 			{
 				return $this->getbestguess();
 			}
 			$time = strip_tags($file[55]);
 			$date = strip_tags($file[56]);
 
-			print_debug('GMT DateTime',$date.' '.$time,'api');
-			$dt_array = explode(' ',$date);
-			$temp_datetime = $dt_array[0].' '.substr($dt_array[2],0,-1).' '.substr($dt_array[1],0,3).' '.$dt_array[3].' '.$time.' GMT';
-			print_debug('Reformulated GMT DateTime',$temp_datetime,'api');
+			print_debug('GMT DateTime', $date.' '.$time, 'api');
+			$dt_array = explode(' ', $date);
+			$temp_datetime = $dt_array[0].' '.substr($dt_array[2], 0, -1).' '.substr($dt_array[1], 0, 3).' '.$dt_array[3].' '.$time.' GMT';
+			print_debug('Reformulated GMT DateTime', $temp_datetime, 'api');
 			$this->gmtnow = $this->convert_rfc_to_epoch($temp_datetime);
-			print_debug('this->gmtnow',$this->gmtnow,'api');
-			print_debug('server time',$server_time,'api');
-			print_debug('server DateTime',date('D, d M Y H:i:s',$server_time),'api');
+			print_debug('this->gmtnow', $this->gmtnow, 'api');
+			print_debug('server time', $server_time, 'api');
+			print_debug('server DateTime', date('D, d M Y H:i:s', $server_time), 'api');
 			return (int)(($server_time - $this->gmtnow) / 3600);
 		}
 
 		function getbestguess()
 		{
-			print_debug('datetime::datetime::debug: Inside getting from local server','api');
+			print_debug('datetime::datetime::debug: Inside getting from local server', 'api');
 			$server_time = time();
 			// Calculate GMT time...
 			// If DST, add 1 hour...
 			//  - (date('I') == 1?3600:0)
-			$this->gmtnow = $this->convert_rfc_to_epoch(gmdate('D, d M Y H:i:s',$server_time).' GMT');
+			$this->gmtnow = $this->convert_rfc_to_epoch(gmdate('D, d M Y H:i:s', $server_time).' GMT');
 			return (int)(($server_time - $this->gmtnow) / 3600);
 		}
 
 		function convert_rfc_to_epoch($date_str)
 		{
-			$comma_pos = strpos($date_str,',');
-			if($comma_pos)
+			$comma_pos = strpos($date_str, ',');
+			if ($comma_pos)
 			{
-				$date_str = substr($date_str,$comma_pos+1);
+				$date_str = substr($date_str, $comma_pos + 1);
 			}
 
 			// This may need to be a reference to the different months in native tongue....
@@ -718,14 +718,14 @@ 
 			$ta = array();
 
 			// Convert "15 Jul 2000 20:50:22 +0200" to unixtime
-			$dta = explode(' ',$date_str);
-			$ta = explode(':',$dta[4]);
+			$dta = explode(' ', $date_str);
+			$ta = explode(':', $dta[4]);
 
-			if(substr($dta[5],0,3) <> 'GMT')
+			if (substr($dta[5], 0, 3) <> 'GMT')
 			{
-				$tzoffset = substr($dta[5],0,1);
-				$tzhours = (int)substr($dta[5],1,2);
-				$tzmins = (int)substr($dta[5],3,2);
+				$tzoffset = substr($dta[5], 0, 1);
+				$tzhours = (int)substr($dta[5], 1, 2);
+				$tzmins = (int)substr($dta[5], 3, 2);
 				switch ($tzoffset)
 				{
 					case '-':
@@ -738,13 +738,13 @@ 
 						break;
 				}
 			}
-			return mktime($ta[0],$ta[1],$ta[2],$month[$dta[2]],$dta[1],$dta[3]);
+			return mktime($ta[0], $ta[1], $ta[2], $month[$dta[2]], $dta[1], $dta[3]);
 		}
 
-		function get_weekday_start($year,$month,$day)
+		function get_weekday_start($year, $month, $day)
 		{
-			$weekday = $this->day_of_week($year,$month,$day);
-			switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+			$weekday = $this->day_of_week($year, $month, $day);
+			switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 			{
 				// Saturday is for arabic support
 				case 'Saturday':
@@ -766,16 +766,16 @@ 
 						5 => 'Th',
 						6 => 'Fr'
 					);
-					switch($weekday)
+					switch ($weekday)
 					{
 						case 0:
-							$sday = mktime(2,0,0,$month,$day - 1,$year);
+							$sday = mktime(2, 0, 0, $month, $day - 1, $year);
 							break;
 						case 6:
-							$sday = mktime(2,0,0,$month,$day,$year);
+							$sday = mktime(2, 0, 0, $month, $day, $year);
 							break;
 						default:
-							$sday = mktime(2,0,0,$month,$day - ($weekday + 1),$year);
+							$sday = mktime(2, 0, 0, $month, $day - ($weekday + 1), $year);
 							break;
 					}
 					break;
@@ -798,16 +798,16 @@ 
 						5 => 'Sa',
 						6 => 'Su'
 					);
-					switch($weekday)
+					switch ($weekday)
 					{
 						case 0:
-							$sday = mktime(2,0,0,$month,$day - 6,$year);
+							$sday = mktime(2, 0, 0, $month, $day - 6, $year);
 							break;
 						case 1:
-							$sday = mktime(2,0,0,$month,$day,$year);
+							$sday = mktime(2, 0, 0, $month, $day, $year);
 							break;
 						default:
-							$sday = mktime(2,0,0,$month,$day - ($weekday - 1),$year);
+							$sday = mktime(2, 0, 0, $month, $day - ($weekday - 1), $year);
 							break;
 					}
 					break;
@@ -831,7 +831,7 @@ 
 						5 => 'Fr',
 						6 => 'Sa'
 					);
-					$sday = mktime(2,0,0,$month,$day - $weekday,$year);
+					$sday = mktime(2, 0, 0, $month, $day - $weekday, $year);
 					break;
 			}
 			return $sday - 7200;
@@ -849,7 +849,7 @@ 
 			}
 		}
 
-		function days_in_month($month,$year)
+		function days_in_month($month, $year)
 		{
 			$days = Array(
 				1  => 31,
@@ -868,22 +868,22 @@ 
 			return $days[(int)$month];
 		}
 
-		function date_valid($year,$month,$day)
+		function date_valid($year, $month, $day)
 		{
-			return checkdate((int)$month,(int)$day,(int)$year);
+			return checkdate((int)$month, (int)$day, (int)$year);
 		}
 
-		function time_valid($hour,$minutes,$seconds)
+		function time_valid($hour, $minutes, $seconds)
 		{
-			if((int)$hour < 0 || (int)$hour > 24)
+			if ((int)$hour < 0 || (int)$hour > 24)
 			{
 				return False;
 			}
-			if((int)$minutes < 0 || (int)$minutes > 59)
+			if ((int)$minutes < 0 || (int)$minutes > 59)
 			{
 				return False;
 			}
-			if((int)$seconds < 0 || (int)$seconds > 59)
+			if ((int)$seconds < 0 || (int)$seconds > 59)
 			{
 				return False;
 			}
@@ -891,9 +891,9 @@ 
 			return True;
 		}
 
-		function day_of_week($year,$month,$day)
+		function day_of_week($year, $month, $day)
 		{
-			if($month > 2)
+			if ($month > 2)
 			{
 				$month -= 2;
 			}
@@ -906,13 +906,13 @@ 
 			return (($day - 7 * floor($day / 7)));
 		}
 
-		function day_of_year($year,$month,$day)
+		function day_of_year($year, $month, $day)
 		{
-			$days = array(0,31,59,90,120,151,181,212,243,273,304,334);
+			$days = array(0, 31, 59, 90, 120, 151, 181, 212, 243, 273, 304, 334);
 
 			$julian = ($days[$month - 1] + $day);
 
-			if($month > 2 && $this->is_leap_year($year))
+			if ($month > 2 && $this->is_leap_year($year))
 			{
 				$julian++;
 			}
@@ -926,50 +926,50 @@ 
 		@param $m1 - Month_1, $d1 - Day_1, $y1 - Year_1, $m2 - Month_2, $d2 - Day_2, $y2 - Year_2
 		@note the last param == 0, ensures that the calculation is always done without daylight-saveing
 		*/
-		function days_between($m1,$d1,$y1,$m2,$d2,$y2)
+		function days_between($m1, $d1, $y1, $m2, $d2, $y2)
 		{
-			return (int)((mktime(0,0,0,$m2,$d2,$y2,0) - mktime(0,0,0,$m1,$d1,$y1,0)) / 86400);
+			return (int)((mktime(0, 0, 0, $m2, $d2, $y2, 0) - mktime(0, 0, 0, $m1, $d1, $y1, 0)) / 86400);
 		}
 
-		function date_compare($a_year,$a_month,$a_day,$b_year,$b_month,$b_day)
+		function date_compare($a_year, $a_month, $a_day, $b_year, $b_month, $b_day)
 		{
-			$a_date = mktime(0,0,0,(int)$a_month,(int)$a_day,(int)$a_year);
-			$b_date = mktime(0,0,0,(int)$b_month,(int)$b_day,(int)$b_year);
-			if($a_date == $b_date)
+			$a_date = mktime(0, 0, 0, (int)$a_month, (int)$a_day, (int)$a_year);
+			$b_date = mktime(0, 0, 0, (int)$b_month, (int)$b_day, (int)$b_year);
+			if ($a_date == $b_date)
 			{
 				return 0;
 			}
-			elseif($a_date > $b_date)
+			elseif ($a_date > $b_date)
 			{
 				return 1;
 			}
-			elseif($a_date < $b_date)
+			elseif ($a_date < $b_date)
 			{
 				return -1;
 			}
 		}
 
-		function time_compare($a_hour,$a_minute,$a_second,$b_hour,$b_minute,$b_second)
+		function time_compare($a_hour, $a_minute, $a_second, $b_hour, $b_minute, $b_second)
 		{
 			// I use the 1970/1/2 to compare the times, as the 1. can get via TZ-offest still
 			// before 1970/1/1, which is the earliest date allowed on windows
-			$a_time = mktime((int)$a_hour,(int)$a_minute,(int)$a_second,1,2,1970);
-			$b_time = mktime((int)$b_hour,(int)$b_minute,(int)$b_second,1,2,1970);
-			if($a_time == $b_time)
+			$a_time = mktime((int)$a_hour, (int)$a_minute, (int)$a_second, 1, 2, 1970);
+			$b_time = mktime((int)$b_hour, (int)$b_minute, (int)$b_second, 1, 2, 1970);
+			if ($a_time == $b_time)
 			{
 				return 0;
 			}
-			elseif($a_time > $b_time)
+			elseif ($a_time > $b_time)
 			{
 				return 1;
 			}
-			elseif($a_time < $b_time)
+			elseif ($a_time < $b_time)
 			{
 				return -1;
 			}
 		}
 
-		function makegmttime($hour,$minute,$second,$month,$day,$year)
+		function makegmttime($hour, $minute, $second, $month, $day, $year)
 		{
 			return $this->gmtdate(mktime($hour, $minute, $second, $month, $day, $year));
 		}
@@ -977,18 +977,18 @@ 
 		// Note common:show_date converts server- to user-time, before it returns the requested format !!!
 		function localdates($localtime)
 		{
-			$date = Array('raw','day','month','year','full','dow','dm','bd');
+			$date = Array('raw', 'day', 'month', 'year', 'full', 'dow', 'dm', 'bd');
 			$date['raw'] = $localtime;
-			$date['year'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'Y');
-			$date['month'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'m');
-			$date['day'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'d');
-			$date['full'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'Ymd');
-			$date['bd'] = mktime(0,0,0,$date['month'],$date['day'],$date['year']);
-			$date['dm'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'dm');
-			$date['dow'] = $this->day_of_week($date['year'],$date['month'],$date['day']);
-			$date['hour'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'H');
-			$date['minute'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'i');
-			$date['second'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'s');
+			$date['year'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'Y');
+			$date['month'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'm');
+			$date['day'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'd');
+			$date['full'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'Ymd');
+			$date['bd'] = mktime(0, 0, 0, $date['month'], $date['day'], $date['year']);
+			$date['dm'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'dm');
+			$date['dow'] = $this->day_of_week($date['year'], $date['month'], $date['day']);
+			$date['hour'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'H');
+			$date['minute'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 'i');
+			$date['second'] = (int)$GLOBALS['egw']->common->show_date($date['raw'], 's');
 
 			return $date;
 		}

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

@@ -560,8 +560,8 @@ 
 			'GMT-8:00' => '-8:00'
 		);
 		var $tz_offset;
-		var $days = Array();
-		var $days_short = Array();
+		var $days = array();
+		var $days_short = array();
 		var $gmtnow = 0;
 		var $users_localtime;
 		var $cv_gmtdate;
@@ -748,7 +748,7 @@ 
 			{
 				// Saturday is for arabic support
 				case 'Saturday':
-					$this->days = Array(
+					$this->days = array(
 						0 => 'Sat',
 						1 => 'Sun',
 						2 => 'Mon',
@@ -757,7 +757,7 @@ 
 						5 => 'Thu',
 						6 => 'Fri'
 					);
-					$this->days_short = Array(
+					$this->days_short = array(
 						0 => 'Sa',
 						1 => 'Su',
 						2 => 'Mo',
@@ -780,7 +780,7 @@ 
 					}
 					break;
 				case 'Monday':
-					$this->days = Array(
+					$this->days = array(
 						0 => 'Mon',
 						1 => 'Tue',
 						2 => 'Wed',
@@ -789,7 +789,7 @@ 
 						5 => 'Sat',
 						6 => 'Sun'
 					);
-					$this->days_short = Array(
+					$this->days_short = array(
 						0 => 'Mo',
 						1 => 'Tu',
 						2 => 'We',
@@ -813,7 +813,7 @@ 
 					break;
 				case 'Sunday':
 				default:
-					$this->days = Array(
+					$this->days = array(
 						0 => 'Sun',
 						1 => 'Mon',
 						2 => 'Tue',
@@ -822,7 +822,7 @@ 
 						5 => 'Fri',
 						6 => 'Sat'
 					);
-					$this->days_short = Array(
+					$this->days_short = array(
 						0 => 'Su',
 						1 => 'Mo',
 						2 => 'Tu',
@@ -851,7 +851,7 @@ 
 
 		function days_in_month($month,$year)
 		{
-			$days = Array(
+			$days = array(
 				1  => 31,
 				2  => 28 + $this->is_leap_year((int)$year),
 				3  => 31,
@@ -977,7 +977,7 @@ 
 		// Note common:show_date converts server- to user-time, before it returns the requested format !!!
 		function localdates($localtime)
 		{
-			$date = Array('raw','day','month','year','full','dow','dm','bd');
+			$date = array('raw','day','month','year','full','dow','dm','bd');
 			$date['raw'] = $localtime;
 			$date['year'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'Y');
 			$date['month'] = (int)$GLOBALS['egw']->common->show_date($date['raw'],'m');

phpgwapi/inc/class.egw_db.inc.php

Doc Comments +9 added lines, -16 removed lines

@@ -286,7 +286,7 @@ 
 	}
 
 	/**
-	* @return int current connection id
+	* @return ADOConnection current connection id
 	*/
 	function link_id()
 	{
@@ -692,6 +692,7 @@ 
 	* Convert a unix timestamp to a rdms specific timestamp
 	*
 	* @param int unix timestamp
+	* @param string $epoch
 	* @return string rdms specific timestamp
 	*/
 	function to_timestamp($epoch)
@@ -945,7 +946,7 @@ 
 	/**
 	* Rollback the current transaction
 	*
-	* @return bool True if sucessful, False if fails
+	* @return false|null True if sucessful, False if fails
 	*/
 	function transaction_abort()
 	{
@@ -991,7 +992,7 @@ 
 	* @deprecated not used anymore as it costs to much performance, use transactions if needed
 	* @param string $table name of table to lock
 	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
+	* @return boolean|null True if sucessful, False if fails
 	*/
 	function lock($table, $mode='write')
 	{
@@ -1002,7 +1003,7 @@ 
 	* Unlock a table
 	*
 	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
+	* @return boolean|null True if sucessful, False if fails
 	*/
 	function unlock()
 	{}
@@ -1306,7 +1307,6 @@ 
 	 *
 	 * Example: $db->concat($db->quote('Hallo '),'username') would return
 	 *	for mysql "concat('Hallo ',username)" or "'Hallo ' || username" for postgres
-	 * @param string $str1 already quoted stringliteral or column-name, variable number of arguments
 	 * @return string to be used in a query
 	 */
 	function concat(/*$str1, ...*/)
@@ -1326,7 +1326,7 @@ 
 	 * @param string $expr column-name or expression optional prefixed with "DISTINCT"
 	 * @param string $order_by ='' optional order
 	 * @param string $separator =',' optional separator, default is comma
-	 * @return string|boolean false if not supported by dbms
+	 * @return false|string false if not supported by dbms
 	 */
 	function group_concat($expr, $order_by='', $separator=',')
 	{
@@ -1658,7 +1658,7 @@ 
 	*	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
 	* @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
 	*	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
-	* @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
+	* @param boolean $only if set to an array only colums which are set (as data !!!) are written
 	*	typicaly used to form a WHERE-clause from the primary keys.
 	*	If set to True, only columns from the colum_definitons are written.
 	* @param array|boolean $column_definitions this can be set to the column-definitions-array
@@ -2133,13 +2133,6 @@ 
 	 * gives "(name='test\'ed' AND lang='en') OR 'owner' IN (0,4,5,6,10)" if name,lang are strings and owner is an integer
 	 *
 	 * @param string|array $table_def table-name or definition array
-	 * @param mixed $args variable number of arguments of the following types:
-	 *	string: get's as is into the result
-	 *	array:	column-name / value pairs: the value gets quoted according to the type of the column and prefixed
-	 *		with column-name=, multiple pairs are AND'ed together, see db::column_data_implode
-	 *	bool: If False or is_null($arg): the next 2 (!) arguments gets ignored
-	 *
-	 * Please note: As the function has a variable number of arguments, you CAN NOT add further parameters !!!
 	 *
 	 * @return string the expression generated from the arguments
 	 */
@@ -2277,7 +2270,7 @@ 
 	 * Strip eg. a prefix from the keys of an array
 	 *
 	 * @param array $arr
-	 * @param string|array $strip
+	 * @param string $strip
 	 * @return array
 	 */
 	static function strip_array_keys($arr,$strip)
@@ -2373,7 +2366,7 @@ 
 	 * @param Traversable $rs
 	 * @param callback $callback
 	 * @param array $params =array() additional parameters, row is always first parameter
-	 * @param $key_callback =null optional callback, if you want different keys
+	 * @param Closure $key_callback =null optional callback, if you want different keys
 	 */
 	public function __construct(Traversable $rs, $callback, $params=array(), $key_callback=null)
 	{

Indentation +308 added lines, -308 removed lines

@@ -68,43 +68,43 @@ 
 	 */
 	const FETCH_BOTH = ADODB_FETCH_BOTH;
 	/**
-	* @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
-	*/
+	 * @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
+	 */
 	var $Type     = '';
 
 	/**
-	* @var string $type database type as defined in the header.inc.php, eg. mysqlt
-	*/
+	 * @var string $type database type as defined in the header.inc.php, eg. mysqlt
+	 */
 	var $setupType     = '';
 
 	/**
-	* @var string $Host database host to connect to
-	*/
+	 * @var string $Host database host to connect to
+	 */
 	var $Host     = '';
 
 	/**
-	* @var string $Port port number of database to connect to
-	*/
+	 * @var string $Port port number of database to connect to
+	 */
 	var $Port     = '';
 
 	/**
-	* @var string $Database name of database to use
-	*/
+	 * @var string $Database name of database to use
+	 */
 	var $Database = '';
 
 	/**
-	* @var string $User name of database user
-	*/
+	 * @var string $User name of database user
+	 */
 	var $User     = '';
 
 	/**
-	* @var string $Password password for database user
-	*/
+	 * @var string $Password password for database user
+	 */
 	var $Password = '';
 
 	/**
-	* @var int $Debug enable debuging - 0 no, 1 yes
-	*/
+	 * @var int $Debug enable debuging - 0 no, 1 yes
+	 */
 	var $Debug         = 0;
 
 	/**
@@ -115,23 +115,23 @@ 
 	var $log_updates = false;
 
 	/**
-	* @var array $Record current record
-	*/
+	 * @var array $Record current record
+	 */
 	var $Record   = array();
 
 	/**
-	* @var int row number for current record
-	*/
+	 * @var int row number for current record
+	 */
 	var $Row;
 
 	/**
-	* @var int $Errno internal rdms error number for last error
-	*/
+	 * @var int $Errno internal rdms error number for last error
+	 */
 	var $Errno    = 0;
 
 	/**
-	* @var string descriptive text from last error
-	*/
+	 * @var string descriptive text from last error
+	 */
 	var $Error    = '';
 
 	/**
@@ -277,8 +277,8 @@ 
 	}
 
 	/**
-	* @param string $query query to be executed (optional)
-	*/
+	 * @param string $query query to be executed (optional)
+	 */
 
 	function db($query = '')
 	{
@@ -286,8 +286,8 @@ 
 	}
 
 	/**
-	* @return int current connection id
-	*/
+	 * @return int current connection id
+	 */
 	function link_id()
 	{
 		return $this->Link_ID;
@@ -654,8 +654,8 @@ 
 	}
 
 	/**
-	* Close a connection to a database
-	*/
+	 * Close a connection to a database
+	 */
 	function disconnect()
 	{
 		if (!$this->privat_Link_ID)
@@ -669,12 +669,12 @@ 
 	}
 
 	/**
-	* Escape strings before sending them to the database
-	*
-	* @deprecated use quote($value,$type='') instead
-	* @param string $str the string to be escaped
-	* @return string escaped sting
-	*/
+	 * Escape strings before sending them to the database
+	 *
+	 * @deprecated use quote($value,$type='') instead
+	 * @param string $str the string to be escaped
+	 * @return string escaped sting
+	 */
 	function db_addslashes($str)
 	{
 		if (!isset($str) || $str == '')
@@ -689,11 +689,11 @@ 
 	}
 
 	/**
-	* Convert a unix timestamp to a rdms specific timestamp
-	*
-	* @param int unix timestamp
-	* @return string rdms specific timestamp
-	*/
+	 * Convert a unix timestamp to a rdms specific timestamp
+	 *
+	 * @param int unix timestamp
+	 * @return string rdms specific timestamp
+	 */
 	function to_timestamp($epoch)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -705,11 +705,11 @@ 
 	}
 
 	/**
-	* Convert a rdms specific timestamp to a unix timestamp
-	*
-	* @param string rdms specific timestamp
-	* @return int unix timestamp
-	*/
+	 * Convert a rdms specific timestamp to a unix timestamp
+	 *
+	 * @param string rdms specific timestamp
+	 * @return int unix timestamp
+	 */
 	function from_timestamp($timestamp)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -742,19 +742,19 @@ 
 	}
 
 	/**
-	* Execute a query
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $offset row to start from, default 0
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @param int $fetchmode =egw_db::FETCH_BOTH egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
-	* @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
-	* @return ADORecordSet or false, if the query fails
-	* @throws egw_exception_db_invalid_sql with $this->Link_ID->ErrorNo() as code
-	*/
+	 * Execute a query
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $offset row to start from, default 0
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @param int $fetchmode =egw_db::FETCH_BOTH egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
+	 * @param boolean $reconnect =true true: try reconnecting if server closes connection, false: dont (mysql only!)
+	 * @return ADORecordSet or false, if the query fails
+	 * @throws egw_exception_db_invalid_sql with $this->Link_ID->ErrorNo() as code
+	 */
 	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=egw_db::FETCH_BOTH, $reconnect=true)
 	{
 		unset($line, $file);	// not used anymore
@@ -824,30 +824,30 @@ 
 	}
 
 	/**
-	* Execute a query with limited result set
-	*
-	* @param string $Query_String the query to be executed
-	* @param int $offset row to start from, default 0
-	* @param int $line the line method was called from - use __LINE__
-	* @param string $file the file method was called from - use __FILE__
-	* @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
-	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Execute a query with limited result set
+	 *
+	 * @param string $Query_String the query to be executed
+	 * @param int $offset row to start from, default 0
+	 * @param int $line the line method was called from - use __LINE__
+	 * @param string $file the file method was called from - use __FILE__
+	 * @param int $num_rows number of rows to return (optional), default -1 = all, 0 will use $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']
+	 * @param array|boolean $inputarr array for binding variables to parameters or false (default)
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '',$inputarr=false)
 	{
 		return $this->query($Query_String,$line,$file,$offset,$num_rows,$inputarr);
 	}
 
 	/**
-	* Move to the next row in the results set
-	*
-	* Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param int $fetch_mode egw_db::FETCH_BOTH = numerical+assoc keys (eGW default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
-	* @return bool was another row found?
-	*/
+	 * Move to the next row in the results set
+	 *
+	 * Specifying a fetch_mode only works for newly fetched rows, the first row always gets fetched by query!!!
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param int $fetch_mode egw_db::FETCH_BOTH = numerical+assoc keys (eGW default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
+	 * @return bool was another row found?
+	 */
 	function next_record($fetch_mode=egw_db::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
@@ -897,12 +897,12 @@ 
 	}
 
 	/**
-	* Move to position in result set
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param int $pos required row (optional), default first row
-	* @return boolean true if sucessful or false if not found
-	*/
+	 * Move to position in result set
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param int $pos required row (optional), default first row
+	 * @return boolean true if sucessful or false if not found
+	 */
 	function seek($pos = 0)
 	{
 		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
@@ -913,10 +913,10 @@ 
 	}
 
 	/**
-	* Begin Transaction
-	*
-	* @return int/boolean current transaction-id, of false if no connection
-	*/
+	 * Begin Transaction
+	 *
+	 * @return int/boolean current transaction-id, of false if no connection
+	 */
 	function transaction_begin()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -928,10 +928,10 @@ 
 	}
 
 	/**
-	* Complete the transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Complete the transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_commit()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -943,10 +943,10 @@ 
 	}
 
 	/**
-	* Rollback the current transaction
-	*
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Rollback the current transaction
+	 *
+	 * @return bool True if sucessful, False if fails
+	 */
 	function transaction_abort()
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -958,12 +958,12 @@ 
 	}
 
 	/**
-	* Find the primary key of the last insertion on the current db connection
-	*
-	* @param string $table name of table the insert was performed on
-	* @param string $field the autoincrement primary key of the table
-	* @return int the id, -1 if fails
-	*/
+	 * Find the primary key of the last insertion on the current db connection
+	 *
+	 * @param string $table name of table the insert was performed on
+	 * @param string $field the autoincrement primary key of the table
+	 * @return int the id, -1 if fails
+	 */
 	function get_last_insert_id($table, $field)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -986,32 +986,32 @@ 
 	}
 
 	/**
-	* Lock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @param string $table name of table to lock
-	* @param string $mode type of lock required (optional), default write
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Lock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @param string $table name of table to lock
+	 * @param string $mode type of lock required (optional), default write
+	 * @return bool True if sucessful, False if fails
+	 */
 	function lock($table, $mode='write')
 	{
 		unset($table, $mode);	// not used anymore
 	}
 
 	/**
-	* Unlock a table
-	*
-	* @deprecated not used anymore as it costs to much performance, use transactions if needed
-	* @return bool True if sucessful, False if fails
-	*/
+	 * Unlock a table
+	 *
+	 * @deprecated not used anymore as it costs to much performance, use transactions if needed
+	 * @return bool True if sucessful, False if fails
+	 */
 	function unlock()
 	{}
 
 	/**
-	* Get the number of rows affected by last update or delete
-	*
-	* @return int number of rows
-	*/
+	 * Get the number of rows affected by last update or delete
+	 *
+	 * @return int number of rows
+	 */
 	function affected_rows()
 	{
 		if ($this->log_updates) return 0;
@@ -1024,52 +1024,52 @@ 
 	}
 
 	/**
-	* Number of rows in current result set
-	*
-	* @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
-	* @return int number of rows
-	*/
+	 * Number of rows in current result set
+	 *
+	 * @deprecated use the result-object returned by query/select()->NumRows(), so you can use the global db-object and not a clone
+	 * @return int number of rows
+	 */
 	function num_rows()
 	{
 		return $this->Query_ID ? $this->Query_ID->RecordCount() : False;
 	}
 
 	/**
-	* Number of fields in current row
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @return int number of fields
-	*/
+	 * Number of fields in current row
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @return int number of fields
+	 */
 	function num_fields()
 	{
 		return $this->Query_ID ? $this->Query_ID->FieldCount() : False;
 	}
 
 	/**
-	* @deprecated use num_rows()
-	*/
+	 * @deprecated use num_rows()
+	 */
 	function nf()
 	{
 		return $this->num_rows();
 	}
 
 	/**
-	* @deprecated use print num_rows()
-	*/
+	 * @deprecated use print num_rows()
+	 */
 	function np()
 	{
 		print $this->num_rows();
 	}
 
 	/**
-	* Return the value of a column
-	*
-	* @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
-	* @param string|integer $Name name of field or positional index starting from 0
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	* @return string the field value
-	*/
+	 * Return the value of a column
+	 *
+	 * @deprecated use the result-object returned by query() or select() direct, so you can use the global db-object and not a clone
+	 * @param string|integer $Name name of field or positional index starting from 0
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 * @return string the field value
+	 */
 	function f($Name, $strip_slashes = False)
 	{
 		if ($strip_slashes)
@@ -1080,25 +1080,25 @@ 
 	}
 
 	/**
-	* Print the value of a field
-	*
-	* @param string $Name name of field to print
-	* @param bool $strip_slashes string escape chars from field(optional), default false
-	*	depricated param, as correctly quoted values dont need any stripslashes!
-	*/
+	 * Print the value of a field
+	 *
+	 * @param string $Name name of field to print
+	 * @param bool $strip_slashes string escape chars from field(optional), default false
+	 *	depricated param, as correctly quoted values dont need any stripslashes!
+	 */
 	function p($Name, $strip_slashes = True)
 	{
 		print $this->f($Name, $strip_slashes);
 	}
 
 	/**
-	* Returns a query-result-row as an associative array (no numerical keys !!!)
-	*
-	* @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
-	* @param bool $do_next_record should next_record() be called or not (default not)
-	* @param string $strip ='' string to strip of the column-name, default ''
-	* @return array/bool the associative array or False if no (more) result-row is availible
-	*/
+	 * Returns a query-result-row as an associative array (no numerical keys !!!)
+	 *
+	 * @deprecated use foreach(query() or foreach(select() to loop over the query using the global db object
+	 * @param bool $do_next_record should next_record() be called or not (default not)
+	 * @param string $strip ='' string to strip of the column-name, default ''
+	 * @return array/bool the associative array or False if no (more) result-row is availible
+	 */
 	function row($do_next_record=False,$strip='')
 	{
 		if ($do_next_record && !$this->next_record(egw_db::FETCH_ASSOC) || !is_array($this->Record))
@@ -1119,14 +1119,14 @@ 
 	}
 
 	/**
-	* Get description of a table
-	*
-	* Beside the column-name all other data depends on the db-type !!!
-	*
-	* @param string $table name of table to describe
-	* @param bool $full optional, default False summary information, True full information
-	* @return array table meta data
-	*/
+	 * Get description of a table
+	 *
+	 * Beside the column-name all other data depends on the db-type !!!
+	 *
+	 * @param string $table name of table to describe
+	 * @param bool $full optional, default False summary information, True full information
+	 * @return array table meta data
+	 */
 	function metadata($table='',$full=false)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -1208,10 +1208,10 @@ 
 	}
 
 	/**
-	* Return a list of indexes in current database
-	*
-	* @return array list of indexes
-	*/
+	 * Return a list of indexes in current database
+	 *
+	 * @return array list of indexes
+	 */
 	function index_names()
 	{
 		$indices = array();
@@ -1233,10 +1233,10 @@ 
 	}
 
 	/**
-	* Returns an array containing column names that are the primary keys of $tablename.
-	*
-	* @return array of columns
-	*/
+	 * Returns an array containing column names that are the primary keys of $tablename.
+	 *
+	 * @return array of columns
+	 */
 	function pkey_columns($tablename)
 	{
 		if (!$this->Link_ID && !$this->connect())
@@ -1247,13 +1247,13 @@ 
 	}
 
 	/**
-	* Create a new database
-	*
-	* @param string $adminname name of database administrator user (optional)
-	* @param string $adminpasswd password for the database administrator user (optional)
-	* @param string $charset default charset for the database
-	* @param string $grant_host ='localhost' host/ip of the webserver
-	*/
+	 * Create a new database
+	 *
+	 * @param string $adminname name of database administrator user (optional)
+	 * @param string $adminpasswd password for the database administrator user (optional)
+	 * @param string $charset default charset for the database
+	 * @param string $grant_host ='localhost' host/ip of the webserver
+	 */
 	function create_database($adminname = '', $adminpasswd = '', $charset='', $grant_host='localhost')
 	{
 		$currentUser = $this->User;
@@ -1509,12 +1509,12 @@ 
 	}
 
 	/**
-	* Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
-	*
-	* This is mostly copy & paste from adodb's datadict class
-	* @param string $_name
-	* @return string quoted string
-	*/
+	 * Correctly Quote Identifiers like table- or colmnnames for use in SQL-statements
+	 *
+	 * This is mostly copy & paste from adodb's datadict class
+	 * @param string $_name
+	 * @return string quoted string
+	 */
 	function name_quote($_name = NULL)
 	{
 		if (!is_string($_name))
@@ -1553,19 +1553,19 @@ 
 	}
 
 	/**
-	* Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
-	*
-	* Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
-	* Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
-	* Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
-	*
-	* @param mixed $value the value to be escaped
-	* @param string|boolean $type =false string the type of the db-column, default False === varchar
-	* @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
-	* @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
-	* @param string $glue =',' used to glue array values together for the string type
-	* @return string escaped sting
-	*/
+	 * Escape values before sending them to the database - prevents SQL injection and SQL errors ;-)
+	 *
+	 * Please note that the quote function already returns necessary quotes: quote('Hello') === "'Hello'".
+	 * Int and Auto types are casted to int: quote('1','int') === 1, quote('','int') === 0, quote('Hello','int') === 0
+	 * Arrays of id's stored in strings: quote(array(1,2,3),'string') === "'1,2,3'"
+	 *
+	 * @param mixed $value the value to be escaped
+	 * @param string|boolean $type =false string the type of the db-column, default False === varchar
+	 * @param boolean $not_null =true is column NOT NULL, default true, else php null values are written as SQL NULL
+	 * @param int $length =null length of the varchar column, to truncate it if the database requires it (eg. Postgres)
+	 * @param string $glue =',' used to glue array values together for the string type
+	 * @return string escaped sting
+	 */
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
 		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
@@ -1645,27 +1645,27 @@ 
 	}
 
 	/**
-	* Implodes an array of column-value pairs for the use in sql-querys.
-	* All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
-	* @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
-	*	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
-	*	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
-	*	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
-	*	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
-	* @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
-	*	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
-	* @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
-	*	typicaly used to form a WHERE-clause from the primary keys.
-	*	If set to True, only columns from the colum_definitons are written.
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	* @return string SQL
-	*/
+	 * Implodes an array of column-value pairs for the use in sql-querys.
+	 * All data is run through quote (does either addslashes() or (int)) - prevents SQL injunction and SQL errors ;-).
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $glue in most cases this will be either ',' or ' AND ', depending you your query
+	 * @param array $array column-name / value pairs, if the value is an array all its array-values will be quoted
+	 *	according to the type of the column, and the whole array with be formatted like (val1,val2,...)
+	 *	If $use_key == True, an ' IN ' instead a '=' is used. Good for category- or user-lists.
+	 *	If the key is numerical (no key given in the array-definition) the value is used as is, eg.
+	 *	array('visits=visits+1') gives just "visits=visits+1" (no quoting at all !!!)
+	 * @param boolean|string $use_key If $use_key===True a "$key=" prefix each value (default), typically set to False
+	 *	or 'VALUES' for insert querys, on 'VALUES' "(key1,key2,...) VALUES (val1,val2,...)" is returned
+	 * @param array|boolean $only if set to an array only colums which are set (as data !!!) are written
+	 *	typicaly used to form a WHERE-clause from the primary keys.
+	 *	If set to True, only columns from the colum_definitons are written.
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 * @return string SQL
+	 */
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
 		if (!is_array($array))	// this allows to give an SQL-string for delete or update
@@ -1751,14 +1751,14 @@ 
 	}
 
 	/**
-	* Sets the default column-definitions for use with column_data_implode()
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array|boolean $column_definitions this can be set to the column-definitions-array
-	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
-	*	If its set, the column-type-data determinates if (int) or addslashes is used.
-	*/
+	 * Sets the default column-definitions for use with column_data_implode()
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array|boolean $column_definitions this can be set to the column-definitions-array
+	 *	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
+	 *	If its set, the column-type-data determinates if (int) or addslashes is used.
+	 */
 	function set_column_definitions($column_definitions=False)
 	{
 		$this->column_definitions=$column_definitions;
@@ -1795,17 +1795,17 @@ 
 	}
 
 	/**
-	* reads the table-definitions from the app's setup/tables_current.inc.php file
-	*
-	* The already read table-definitions are shared between all db-instances via a static var.
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
-	*	true to search the already loaded table-definitions for $table and then search all existing apps for it
-	* @param bool|string $table if set return only defintions of that table, else return all defintions
-	* @return mixed array with table-defintions or False if file not found
-	*/
+	 * reads the table-definitions from the app's setup/tables_current.inc.php file
+	 *
+	 * The already read table-definitions are shared between all db-instances via a static var.
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param bool|string $app name of the app or default False to use the app set by db::set_app or the current app,
+	 *	true to search the already loaded table-definitions for $table and then search all existing apps for it
+	 * @param bool|string $table if set return only defintions of that table, else return all defintions
+	 * @return mixed array with table-defintions or False if file not found
+	 */
 	function get_table_definitions($app=False,$table=False)
 	{
 		static $all_app_data = array();
@@ -1898,21 +1898,21 @@ 
 	}
 
 	/**
-	* Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
-	*	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Insert a row of data into a table or updates it if $where is given, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param mixed $where string with where clause or array with column-name / values pairs to check if a row with that keys already exists, or false for an unconditional insert
+	 *	if the row exists db::update is called else a new row with $date merged with $where gets inserted (data has precedence)
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
@@ -2009,20 +2009,20 @@ 
 	}
 
 	/**
-	* Updates the data of one or more rows in a table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $data with column-name / value pairs
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param bool $use_prepared_statement use a prepared statement
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Updates the data of one or more rows in a table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $data with column-name / value pairs
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param bool $use_prepared_statement use a prepared statement
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
 		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
@@ -2099,18 +2099,18 @@ 
 	}
 
 	/**
-	* Deletes one or more rows in table, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array $where column-name / values pairs and'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Deletes one or more rows in table, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array $where column-name / values pairs and'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
 		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
@@ -2176,25 +2176,25 @@ 
 	}
 
 	/**
-	* Selects one or more rows in table depending on where, all data is quoted according to it's type
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param string $table name of the table
-	* @param array|string $cols string or array of column-names / select-expressions
-	* @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param string $append string to append to the end of the query, eg. ORDER BY ...
-	* @param string|boolean $app string with name of app or False to use the current-app
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param string $join =null sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
-	*	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
-	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
-	* @param int $fetchmode =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Selects one or more rows in table depending on where, all data is quoted according to it's type
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param string $table name of the table
+	 * @param array|string $cols string or array of column-names / select-expressions
+	 * @param array|string $where string or array with column-name / values pairs AND'ed together for the where clause
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param string $append string to append to the end of the query, eg. ORDER BY ...
+	 * @param string|boolean $app string with name of app or False to use the current-app
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param string $join =null sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
+	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
+	 * @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
+	 * @param int $fetchmode =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=egw_db::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
@@ -2229,20 +2229,20 @@ 
 	}
 
 	/**
-	* Does a union over multiple selects
-	*
-	* @author RalfBecker<at>outdoor-training.de
-	*
-	* @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
-	*	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
-	* @param int $line line-number to pass to query
-	* @param string $file file-name to pass to query
-	* @param string $order_by ORDER BY statement for the union
-	* @param int|bool $offset offset for a limited query or False (default)
-	* @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
-	* @param int $fetchmode =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
-	* @return ADORecordSet or false, if the query fails
-	*/
+	 * Does a union over multiple selects
+	 *
+	 * @author RalfBecker<at>outdoor-training.de
+	 *
+	 * @param array $selects array of selects, each select is an array with the possible keys/parameters: table, cols, where, append, app, join, table_def
+	 *	For further info about parameters see the definition of the select function, beside table, cols and where all other params are optional
+	 * @param int $line line-number to pass to query
+	 * @param string $file file-name to pass to query
+	 * @param string $order_by ORDER BY statement for the union
+	 * @param int|bool $offset offset for a limited query or False (default)
+	 * @param int $num_rows number of rows to return if offset set, default 0 = use default in user prefs
+	 * @param int $fetchmode =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
+	 * @return ADORecordSet or false, if the query fails
+	 */
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=egw_db::FETCH_ASSOC)
 	{
 		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";

Spacing +220 added lines, -222 removed lines

@@ -11,7 +11,7 @@ 
  * @version $Id$
  */
 
-if(empty($GLOBALS['egw_info']['server']['db_type']))
+if (empty($GLOBALS['egw_info']['server']['db_type']))
 {
 	$GLOBALS['egw_info']['server']['db_type'] = 'mysql';
 }
@@ -70,22 +70,22 @@ 
 	/**
 	* @var string $type translated database type: mysqlt+mysqli ==> mysql, same for odbc-types
 	*/
-	var $Type     = '';
+	var $Type = '';
 
 	/**
 	* @var string $type database type as defined in the header.inc.php, eg. mysqlt
 	*/
-	var $setupType     = '';
+	var $setupType = '';
 
 	/**
 	* @var string $Host database host to connect to
 	*/
-	var $Host     = '';
+	var $Host = '';
 
 	/**
 	* @var string $Port port number of database to connect to
 	*/
-	var $Port     = '';
+	var $Port = '';
 
 	/**
 	* @var string $Database name of database to use
@@ -95,7 +95,7 @@ 
 	/**
 	* @var string $User name of database user
 	*/
-	var $User     = '';
+	var $User = '';
 
 	/**
 	* @var string $Password password for database user
@@ -105,7 +105,7 @@ 
 	/**
 	* @var int $Debug enable debuging - 0 no, 1 yes
 	*/
-	var $Debug         = 0;
+	var $Debug = 0;
 
 	/**
 	 * Log update querys to error_log, do not run them
@@ -117,7 +117,7 @@ 
 	/**
 	* @var array $Record current record
 	*/
-	var $Record   = array();
+	var $Record = array();
 
 	/**
 	* @var int row number for current record
@@ -127,12 +127,12 @@ 
 	/**
 	* @var int $Errno internal rdms error number for last error
 	*/
-	var $Errno    = 0;
+	var $Errno = 0;
 
 	/**
 	* @var string descriptive text from last error
 	*/
-	var $Error    = '';
+	var $Error = '';
 
 	/**
 	 * eGW's own query log, independent of the db-type, eg. /tmp/query.log
@@ -152,7 +152,7 @@ 
 	 *
 	 * @var ADOConnection
 	 */
-	var $privat_Link_ID = False;	// do we use a privat Link_ID or a reference to the global ADOdb object
+	var $privat_Link_ID = False; // do we use a privat Link_ID or a reference to the global ADOdb object
 	/**
 	 * ADOdb record set of the current query
 	 *
@@ -194,11 +194,11 @@ 
 	/**
 	 * db is able to use DISTINCT on text or blob columns
 	 */
-	const CAPABILITY_DISTINCT_ON_TEXT =	'distinct_on_text';
+	const CAPABILITY_DISTINCT_ON_TEXT = 'distinct_on_text';
 	/**
 	 * DB is able to use LIKE on text columns
 	 */
-	const CAPABILITY_LIKE_ON_TEXT =	'like_on_text';
+	const CAPABILITY_LIKE_ON_TEXT = 'like_on_text';
 	/**
 	 * DB allows ORDER on text columns
 	 *
@@ -250,18 +250,18 @@ 
 		self::CAPABILITY_CAST_AS_VARCHAR   => 'CAST(%s AS varchar)',
 	);
 
-	var $prepared_sql = array();	// sql is the index
+	var $prepared_sql = array(); // sql is the index
 
 	/**
 	 * Constructor
 	 *
 	 * @param array $db_data =null values for keys 'db_name', 'db_host', 'db_port', 'db_user', 'db_pass', 'db_type'
 	 */
-	function __construct(array $db_data=null)
+	function __construct(array $db_data = null)
 	{
 		if (!is_null($db_data))
 		{
-			foreach(array(
+			foreach (array(
 				'Database' => 'db_name',
 				'Host'     => 'db_host',
 				'Port'     => 'db_port',
@@ -316,7 +316,7 @@ 
 	 * @throws egw_exception_db_connection
 	 * @return ADOConnection
 	 */
-	function connect($Database = NULL, $Host = NULL, $Port = NULL, $User = NULL, $Password = NULL,$Type = NULL)
+	function connect($Database = NULL, $Host = NULL, $Port = NULL, $User = NULL, $Password = NULL, $Type = NULL)
 	{
 		/* Handle defaults */
 		if (!is_null($Database) && $Database)
@@ -325,15 +325,15 @@ 
 		}
 		if (!is_null($Host) && $Host)
 		{
-			$this->Host     = $Host;
+			$this->Host = $Host;
 		}
 		if (!is_null($Port) && $Port)
 		{
-			$this->Port     = $Port;
+			$this->Port = $Port;
 		}
 		if (!is_null($User) && $User)
 		{
-			$this->User     = $User;
+			$this->User = $User;
 		}
 		if (!is_null($Password) && $Password)
 		{
@@ -350,7 +350,7 @@ 
 		// on connection failure re-try with an other host
 		// remembering in session which host we used last time
 		$use_host_from_session = true;
-		while(($host = $this->get_host(!$use_host_from_session)))
+		while (($host = $this->get_host(!$use_host_from_session)))
 		{
 			try {
 				//error_log(__METHOD__."() this->Host(s)=$this->Host, n=$n --> host=$host");
@@ -364,11 +364,11 @@ 
 				//error_log(__METHOD__."() host=$host, new_connection=$new_connection, this->Type=$this->Type, this->Host=$this->Host, wsrep_local_state=".array2string($state));
 				return $this->Link_ID;
 			}
-			catch(egw_exception_db_connection $e) {
+			catch (egw_exception_db_connection $e) {
 				_egw_log_exception($e);
-				$this->disconnect();	// force a new connect
-				$this->Type = $this->setupType;	// get set to "mysql" for "mysqli"
-				$use_host_from_session = false;	// re-try with next host from list
+				$this->disconnect(); // force a new connect
+				$this->Type = $this->setupType; // get set to "mysql" for "mysqli"
+				$use_host_from_session = false; // re-try with next host from list
 			}
 		}
 		if (!isset($e))
@@ -417,12 +417,12 @@ 
 	{
 		$hosts = explode(';', $this->Host[0] == '@' ? getenv(substr($this->Host, 1)) : $this->Host);
 		$num_hosts = count($hosts);
-		$n =& egw_cache::getSession(__CLASS__, $this->Host);
+		$n = & egw_cache::getSession(__CLASS__, $this->Host);
 		if (!isset($n)) $n = 0;
 
-		if ($next && ++$n >= $num_hosts+2)
+		if ($next && ++$n >= $num_hosts + 2)
 		{
-			$n = 0;	// start search again with default on next request
+			$n = 0; // start search again with default on next request
 			$ret = false;
 		}
 		else
@@ -445,21 +445,21 @@ 
 		if (!$this->Link_ID)
 		{
 			$Database = $User = $Password = $Port = $Type = '';
-			foreach(array('Database','User','Password','Port','Type') as $name)
+			foreach (array('Database', 'User', 'Password', 'Port', 'Type') as $name)
 			{
 				$$name = $this->$name;
 				if (${$name}[0] == '@' && $name != 'Password') $$name = getenv(substr($$name, 1));
 			}
 			$this->setupType = $php_extension = $Type;
 
-			switch($Type)	// convert to ADO db-type-names
+			switch ($Type)	// convert to ADO db-type-names
 			{
 				case 'pgsql':
 					$Type = 'postgres'; // name in ADOdb
 					// create our own pgsql connection-string, to allow unix domain soccets if !$Host
 					$Host = "dbname=$Database".($Host ? " host=$Host".($Port ? " port=$Port" : '') : '').
 						" user=$User".($Password ? " password='".addslashes($Password)."'" : '');
-					$User = $Password = $Database = '';	// to indicate $Host is a connection-string
+					$User = $Password = $Database = ''; // to indicate $Host is a connection-string
 					break;
 
 				case 'odbc_mssql':
@@ -482,22 +482,22 @@ 
 					$Type = 'maxdb';
 					// fall through
 				case 'maxdb':
-					$Type ='sapdb';	// name in ADOdb
+					$Type = 'sapdb'; // name in ADOdb
 					$php_extension = 'odbc';
 					break;
 
 				case 'mysqlt':
-					$php_extension = 'mysql';	// you can use $this->setupType to determine if it's mysqlt or mysql
+					$php_extension = 'mysql'; // you can use $this->setupType to determine if it's mysqlt or mysql
 					// fall through
 				case 'mysqli':
-					$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!
+					$this->Type = 'mysql'; // need to be "mysql", so apps can check just for "mysql"!
 					// fall through
 				default:
 					if ($Port) $Host .= ':'.$Port;
 					break;
 			}
-			if (!isset($GLOBALS['egw']->ADOdb) ||	// we have no connection so far
-				(is_object($GLOBALS['egw']->db) &&	// we connect to a different db, then the global one
+			if (!isset($GLOBALS['egw']->ADOdb) || // we have no connection so far
+				(is_object($GLOBALS['egw']->db) && // we connect to a different db, then the global one
 					($this->Type != $GLOBALS['egw']->db->Type ||
 					$this->Database != $GLOBALS['egw']->db->Database ||
 					$this->User != $GLOBALS['egw']->db->User ||
@@ -510,11 +510,11 @@ 
 				}
 				if (!isset($GLOBALS['egw']->ADOdb))	// use the global object to store the connection
 				{
-					$this->Link_ID =& $GLOBALS['egw']->ADOdb;
+					$this->Link_ID = & $GLOBALS['egw']->ADOdb;
 				}
 				else
 				{
-					$this->privat_Link_ID = True;	// remember that we use a privat Link_ID for disconnect
+					$this->privat_Link_ID = True; // remember that we use a privat Link_ID for disconnect
 				}
 				$this->Link_ID = ADONewConnection($Type);
 				if (!$this->Link_ID)
@@ -525,11 +525,11 @@ 
 				if (($Ok = $this->Link_ID->$connect($Host, $User, $Password, $Database)))
 				{
 					$this->ServerInfo = $this->Link_ID->ServerInfo();
-					$this->set_capabilities($Type,$this->ServerInfo['version']);
+					$this->set_capabilities($Type, $this->ServerInfo['version']);
 				}
 				if (!$Ok)
 				{
-					$Host = preg_replace('/password=[^ ]+/','password=$Password',$Host);	// eg. postgres dsn contains password
+					$Host = preg_replace('/password=[^ ]+/', 'password=$Password', $Host); // eg. postgres dsn contains password
 					throw new egw_exception_db_connection("ADOdb::$connect($Host, $User, \$Password, $Database) failed.");
 				}
 				if ($this->Debug)
@@ -545,8 +545,8 @@ 
 					// this is the format ADOdb expects
 					$this->Link_ID->Execute('SET DATEFORMAT ymd');
 					// sets the limit to the maximum
-					ini_set('mssql.textlimit',2147483647);
-					ini_set('mssql.sizelimit',2147483647);
+					ini_set('mssql.textlimit', 2147483647);
+					ini_set('mssql.sizelimit', 2147483647);
 				}
 				// set our default charset
 				$this->Link_ID->SetCharSet('utf-8');
@@ -555,12 +555,12 @@ 
 			}
 			else
 			{
-				$this->Link_ID =& $GLOBALS['egw']->ADOdb;
+				$this->Link_ID = & $GLOBALS['egw']->ADOdb;
 			}
 		}
 		if (!$this->Link_ID->isConnected() && !$this->Link_ID->Connect())
 		{
-			$Host = preg_replace('/password=[^ ]+/','password=$Password',$Host);	// eg. postgres dsn contains password
+			$Host = preg_replace('/password=[^ ]+/', 'password=$Password', $Host); // eg. postgres dsn contains password
 			throw new egw_exception_db_connection("ADOdb::$connect($Host, $User, \$Password, $Database) reconnect failed.");
 		}
 		// fix due to caching and reusing of connection not correctly set $this->Type == 'mysql'
@@ -571,9 +571,9 @@ 
 		}
 		if ($new_connection)
 		{
-			foreach(get_included_files() as $file)
+			foreach (get_included_files() as $file)
 			{
-				if (strpos($file,'adodb') !== false && !in_array($file,(array)$_SESSION['egw_required_files']))
+				if (strpos($file, 'adodb') !== false && !in_array($file, (array)$_SESSION['egw_required_files']))
 				{
 					$_SESSION['egw_required_files'][] = $file;
 					//error_log(__METHOD__."() egw_required_files[] = $file");
@@ -589,7 +589,7 @@ 
 	 */
 	function __wakeup()
 	{
-		$this->connect();	// we need to re-connect
+		$this->connect(); // we need to re-connect
 	}
 
 	/**
@@ -602,7 +602,7 @@ 
 	 */
 	function __sleep()
 	{
-		if (!empty($this->setupType)) $this->Type = $this->setupType;	// restore Type eg. to mysqli
+		if (!empty($this->setupType)) $this->Type = $this->setupType; // restore Type eg. to mysqli
 
 		$vars = get_object_vars($this);
 		unset($vars['Link_ID']);
@@ -616,23 +616,23 @@ 
 	 * @param string $adodb_driver mysql, postgres, mssql, sapdb, oci8
 	 * @param string $db_version version-number of connected db-server, as reported by ServerInfo
 	 */
-	function set_capabilities($adodb_driver,$db_version)
+	function set_capabilities($adodb_driver, $db_version)
 	{
-		switch($adodb_driver)
+		switch ($adodb_driver)
 		{
 			case 'mysql':
 			case 'mysqlt':
 			case 'mysqli':
-				$this->capabilities[self::CAPABILITY_SUB_QUERIES] = (float) $db_version >= 4.1;
-				$this->capabilities[self::CAPABILITY_UNION] = (float) $db_version >= 4.0;
+				$this->capabilities[self::CAPABILITY_SUB_QUERIES] = (float)$db_version >= 4.1;
+				$this->capabilities[self::CAPABILITY_UNION] = (float)$db_version >= 4.0;
 				$this->capabilities[self::CAPABILITY_NAME_CASE] = 'preserv';
-				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float) $db_version >= 4.1;
+				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float)$db_version >= 4.1;
 				$this->capabilities[self::CAPABILITY_CAST_AS_VARCHAR] = 'CAST(%s AS char)';
 				break;
 
 			case 'postgres':
 				$this->capabilities[self::CAPABILITY_NAME_CASE] = 'lower';
-				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float) $db_version >= 7.4;
+				$this->capabilities[self::CAPABILITY_CLIENT_ENCODING] = (float)$db_version >= 7.4;
 				$this->capabilities[self::CAPABILITY_OUTER_JOIN] = true;
 				$this->capabilities[self::CAPABILITY_CASE_INSENSITIV_LIKE] = '::text ILIKE';
 				$this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR] = true;
@@ -701,7 +701,7 @@ 
 			return False;
 		}
 		// the substring is needed as the string is already in quotes
-		return substr($this->Link_ID->DBTimeStamp($epoch),1,-1);
+		return substr($this->Link_ID->DBTimeStamp($epoch), 1, -1);
 	}
 
 	/**
@@ -727,7 +727,7 @@ 
 	 */
 	public static function from_bool($val)
 	{
-		return $val && $val[0] !== 'f';	// everthing other then 0 or f[alse] is returned as true
+		return $val && $val[0] !== 'f'; // everthing other then 0 or f[alse] is returned as true
 	}
 
 	/**
@@ -737,7 +737,7 @@ 
 	 */
 	function free()
 	{
-		unset($this->Query_ID);	// else copying of the db-object does not work
+		unset($this->Query_ID); // else copying of the db-object does not work
 		$this->Query_ID = 0;
 	}
 
@@ -755,9 +755,9 @@ 
 	* @return ADORecordSet or false, if the query fails
 	* @throws egw_exception_db_invalid_sql with $this->Link_ID->ErrorNo() as code
 	*/
-	function query($Query_String, $line = '', $file = '', $offset=0, $num_rows=-1, $inputarr=false, $fetchmode=egw_db::FETCH_BOTH, $reconnect=true)
+	function query($Query_String, $line = '', $file = '', $offset = 0, $num_rows = -1, $inputarr = false, $fetchmode = egw_db::FETCH_BOTH, $reconnect = true)
 	{
-		unset($line, $file);	// not used anymore
+		unset($line, $file); // not used anymore
 
 		if ($Query_String == '')
 		{
@@ -788,23 +788,23 @@ 
 		}
 		if ($num_rows > 0)
 		{
-			$this->Query_ID = $this->Link_ID->SelectLimit($Query_String,$num_rows,(int)$offset,$inputarr);
+			$this->Query_ID = $this->Link_ID->SelectLimit($Query_String, $num_rows, (int)$offset, $inputarr);
 		}
 		else
 		{
-			$this->Query_ID = $this->Link_ID->Execute($Query_String,$inputarr);
+			$this->Query_ID = $this->Link_ID->Execute($Query_String, $inputarr);
 		}
 		$this->Row = 0;
 		$this->Errno  = $this->Link_ID->ErrorNo();
 		$this->Error  = $this->Link_ID->ErrorMsg();
 
-		if ($this->query_log && ($f = @fopen($this->query_log,'a+')))
+		if ($this->query_log && ($f = @fopen($this->query_log, 'a+')))
 		{
-			fwrite($f,'['.(isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->ConfigDomain : $GLOBALS['egw_info']['user']['domain']).'] ');
-			fwrite($f,date('Y-m-d H:i:s ').$Query_String.($inputarr ? "\n".print_r($inputarr,true) : '')."\n");
+			fwrite($f, '['.(isset($GLOBALS['egw_setup']) ? $GLOBALS['egw_setup']->ConfigDomain : $GLOBALS['egw_info']['user']['domain']).'] ');
+			fwrite($f, date('Y-m-d H:i:s ').$Query_String.($inputarr ? "\n".print_r($inputarr, true) : '')."\n");
 			if (!$this->Query_ID)
 			{
-				fwrite($f,"*** Error $this->Errno: $this->Error\n".function_backtrace()."\n");
+				fwrite($f, "*** Error $this->Errno: $this->Error\n".function_backtrace()."\n");
 			}
 			fclose($f);
 		}
@@ -815,11 +815,11 @@ 
 				$this->disconnect();
 				return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr, $fetchmode, false);
 			}
-			throw new egw_exception_db_invalid_sql("Invalid SQL: ".(is_array($Query_String)?$Query_String[0]:$Query_String).
+			throw new egw_exception_db_invalid_sql("Invalid SQL: ".(is_array($Query_String) ? $Query_String[0] : $Query_String).
 				"\n$this->Error ($this->Errno)".
-				($inputarr ? "\nParameters: '".implode("','",$inputarr)."'":''), $this->Errno);
+				($inputarr ? "\nParameters: '".implode("','", $inputarr)."'" : ''), $this->Errno);
 		}
-		elseif(empty($this->Query_ID->sql)) $this->Query_ID->sql = $Query_String;
+		elseif (empty($this->Query_ID->sql)) $this->Query_ID->sql = $Query_String;
 		return $this->Query_ID;
 	}
 
@@ -834,9 +834,9 @@ 
 	* @param array|boolean $inputarr array for binding variables to parameters or false (default)
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '',$inputarr=false)
+	function limit_query($Query_String, $offset, $line = '', $file = '', $num_rows = '', $inputarr = false)
 	{
-		return $this->query($Query_String,$line,$file,$offset,$num_rows,$inputarr);
+		return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr);
 	}
 
 	/**
@@ -848,7 +848,7 @@ 
 	* @param int $fetch_mode egw_db::FETCH_BOTH = numerical+assoc keys (eGW default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
 	* @return bool was another row found?
 	*/
-	function next_record($fetch_mode=egw_db::FETCH_BOTH)
+	function next_record($fetch_mode = egw_db::FETCH_BOTH)
 	{
 		if (!$this->Query_ID)
 		{
@@ -868,7 +868,7 @@ 
 		}
 		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')	// maxdb, oracle, ...
 		{
-			switch($fetch_mode)
+			switch ($fetch_mode)
 			{
 				case egw_db::FETCH_ASSOC:
 					$this->Record = array_change_key_case($this->Record);
@@ -905,9 +905,9 @@ 
 	*/
 	function seek($pos = 0)
 	{
-		if (!$this->Query_ID  || !$this->Query_ID->Move($this->Row = $pos))
+		if (!$this->Query_ID || !$this->Query_ID->Move($this->Row = $pos))
 		{
-			throw new egw_exception_db("seek($pos) failed: resultset has " . $this->num_rows() . " rows");
+			throw new egw_exception_db("seek($pos) failed: resultset has ".$this->num_rows()." rows");
 		}
 		return True;
 	}
@@ -974,7 +974,7 @@ 
 		{
 			$table = self::$tablealiases[$table];
 		}
-		$id = $this->Link_ID->PO_Insert_ID($table,$field);	// simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
+		$id = $this->Link_ID->PO_Insert_ID($table, $field); // simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
 
 		if ($id === False)	// function not supported
 		{
@@ -993,9 +993,9 @@ 
 	* @param string $mode type of lock required (optional), default write
 	* @return bool True if sucessful, False if fails
 	*/
-	function lock($table, $mode='write')
+	function lock($table, $mode = 'write')
 	{
-		unset($table, $mode);	// not used anymore
+		unset($table, $mode); // not used anymore
 	}
 
 	/**
@@ -1099,18 +1099,18 @@ 
 	* @param string $strip ='' string to strip of the column-name, default ''
 	* @return array/bool the associative array or False if no (more) result-row is availible
 	*/
-	function row($do_next_record=False,$strip='')
+	function row($do_next_record = False, $strip = '')
 	{
 		if ($do_next_record && !$this->next_record(egw_db::FETCH_ASSOC) || !is_array($this->Record))
 		{
 			return False;
 		}
 		$result = array();
-		foreach($this->Record as $column => $value)
+		foreach ($this->Record as $column => $value)
 		{
 			if (!is_numeric($column))
 			{
-				if ($strip) $column = str_replace($strip,'',$column);
+				if ($strip) $column = str_replace($strip, '', $column);
 
 				$result[$column] = $value;
 			}
@@ -1127,7 +1127,7 @@ 
 	* @param bool $full optional, default False summary information, True full information
 	* @return array table meta data
 	*/
-	function metadata($table='',$full=false)
+	function metadata($table = '', $full = false)
 	{
 		if (!$this->Link_ID && !$this->connect())
 		{
@@ -1139,13 +1139,13 @@ 
 
 		$metadata = array();
 		$i = 0;
-		foreach($columns as $column)
+		foreach ($columns as $column)
 		{
 			// for backwards compatibilty (depreciated)
 			$flags = null;
-			if($column->auto_increment) $flags .= "auto_increment ";
-			if($column->primary_key) $flags .= "primary_key ";
-			if($column->binary) $flags .= "binary ";
+			if ($column->auto_increment) $flags .= "auto_increment ";
+			if ($column->primary_key) $flags .= "primary_key ";
+			if ($column->binary) $flags .= "binary ";
 
 			$metadata[$i] = array(
 				'table' => $table,
@@ -1180,7 +1180,7 @@ 
 	 * @param boolean $just_name =false true return array of table-names, false return old format
 	 * @return array list of the tables
 	 */
-	function table_names($just_name=false)
+	function table_names($just_name = false)
 	{
 		if (!$this->Link_ID) $this->connect();
 		if (!$this->Link_ID)
@@ -1191,7 +1191,7 @@ 
 		$tables = $this->Link_ID->MetaTables('TABLES');
 		if (is_array($tables))
 		{
-			foreach($tables as $table)
+			foreach ($tables as $table)
 			{
 				if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')
 				{
@@ -1254,7 +1254,7 @@ 
 	* @param string $charset default charset for the database
 	* @param string $grant_host ='localhost' host/ip of the webserver
 	*/
-	function create_database($adminname = '', $adminpasswd = '', $charset='', $grant_host='localhost')
+	function create_database($adminname = '', $adminpasswd = '', $charset = '', $grant_host = 'localhost')
 	{
 		$currentUser = $this->User;
 		$currentPassword = $this->Password;
@@ -1278,7 +1278,7 @@ 
 			case 'mysqli':
 			case 'mysqlt':
 				$create = "CREATE DATABASE `$currentDatabase`";
-				if ($charset && isset($this->Link_ID->charset2mysql[$charset]) && (float) $this->ServerInfo['version'] >= 4.1)
+				if ($charset && isset($this->Link_ID->charset2mysql[$charset]) && (float)$this->ServerInfo['version'] >= 4.1)
 				{
 					$create .= ' DEFAULT CHARACTER SET '.$this->Link_ID->charset2mysql[$charset].';';
 				}
@@ -1289,9 +1289,9 @@ 
 				echo "<p>db::create_database(user='$adminname',\$pw) not yet implemented for DB-type '$this->Type'</p>\n";
 				break;
 		}
-		foreach($sqls as $sql)
+		foreach ($sqls as $sql)
 		{
-			$this->query($sql,__LINE__,__FILE__);
+			$this->query($sql, __LINE__, __FILE__);
 		}
 		$this->disconnect();
 
@@ -1317,7 +1317,7 @@ 
 		{
 			return False;
 		}
-		return call_user_func_array(array(&$this->Link_ID,'concat'),$args);
+		return call_user_func_array(array(&$this->Link_ID, 'concat'), $args);
 	}
 
 	/**
@@ -1328,9 +1328,9 @@ 
 	 * @param string $separator =',' optional separator, default is comma
 	 * @return string|boolean false if not supported by dbms
 	 */
-	function group_concat($expr, $order_by='', $separator=',')
+	function group_concat($expr, $order_by = '', $separator = ',')
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				$sql = 'GROUP_CONCAT('.$expr;
@@ -1364,7 +1364,7 @@ 
 	 */
 	function strpos($str, $substr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "LOCATE($substr,$str)";
@@ -1384,7 +1384,7 @@ 
 	 */
 	function unix_timestamp($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "UNIX_TIMESTAMP($expr)";
@@ -1405,7 +1405,7 @@ 
 	 */
 	function from_unixtime($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "FROM_UNIXTIME($expr)";
@@ -1414,7 +1414,7 @@ 
 				return "(TIMESTAMP WITH TIME ZONE 'epoch' + ($expr) * INTERVAL '1 sec')";
 
 			case 'mssql':	// we use date(,0) as we store server-time
-				return "DATEADD(second,($expr),'".date('Y-m-d H:i:s',0)."')";
+				return "DATEADD(second,($expr),'".date('Y-m-d H:i:s', 0)."')";
 		}
 		return false;
 	}
@@ -1428,30 +1428,30 @@ 
 	 * @param string $format format specifier like '%Y-%m-%d %H:%i:%s' or '%V%X' ('%v%x') weeknumber & year with Sunday (Monday) as first day
 	 * @return string SQL expression of type timestamp
 	 */
-	function date_format($expr,$format)
+	function date_format($expr, $format)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'mysql':
 				return "DATE_FORMAT($expr,'$format')";
 
 			case 'pgsql':
 				$format = str_replace(
-					array('%Y',  '%y','%m','%d','%H',  '%h','%i','%s','%V','%v','%X',  '%x'),
-					array('YYYY','YY','MM','DD','HH24','HH','MI','SS','IW','IW','YYYY','YYYY'),
+					array('%Y', '%y', '%m', '%d', '%H', '%h', '%i', '%s', '%V', '%v', '%X', '%x'),
+					array('YYYY', 'YY', 'MM', 'DD', 'HH24', 'HH', 'MI', 'SS', 'IW', 'IW', 'YYYY', 'YYYY'),
 					$format);
 				return "TO_CHAR($expr,'$format')";
 
 			case 'mssql':
 				$from = $to = array();
-				foreach(array('%Y'=>'yyyy','%y'=>'yy','%m'=>'mm','%d'=>'dd','%H'=>'hh','%i'=>'mi','%s'=>'ss','%V'=>'wk','%v'=>'wk','%X'=>'yyyy','%x'=>'yyyy') as $f => $t)
+				foreach (array('%Y'=>'yyyy', '%y'=>'yy', '%m'=>'mm', '%d'=>'dd', '%H'=>'hh', '%i'=>'mi', '%s'=>'ss', '%V'=>'wk', '%v'=>'wk', '%X'=>'yyyy', '%x'=>'yyyy') as $f => $t)
 				{
 					$from[] = $f;
 					$to[] = "'+DATEPART($t,($expr))+'";
 				}
 				$from[] = "''+"; $to[] = '';
 				$from[] = "+''"; $to[] = '';
-				return str_replace($from,$to,$format);
+				return str_replace($from, $to, $format);
 		}
 		return false;
 	}
@@ -1464,7 +1464,7 @@ 
 	 */
 	function to_double($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'pgsql':
 				return $expr.'::double';
@@ -1482,7 +1482,7 @@ 
 	 */
 	function to_int($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'pgsql':
 				return $expr.'::integer';
@@ -1500,7 +1500,7 @@ 
 	 */
 	function to_varchar($expr)
 	{
-		switch($this->Type)
+		switch ($this->Type)
 		{
 			case 'pgsql':
 				return 'CAST('.$expr.' AS varchar)';
@@ -1544,7 +1544,7 @@ 
 			// always quote for postgreSQL, as this is the only way to support mixed case names
 			if (preg_match('/\W/', $name) || $type == 'pgsql' && preg_match('/[A-Z]+/', $name) || $name == 'index')
 			{
-				return $quote . $name . $quote;
+				return $quote.$name.$quote;
 			}
 			return $name;
 		}, explode('.', $name));
@@ -1566,27 +1566,27 @@ 
 	* @param string $glue =',' used to glue array values together for the string type
 	* @return string escaped sting
 	*/
-	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
+	function quote($value, $type = False, $not_null = true, $length = null, $glue = ',')
 	{
-		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		if ($this->Debug) echo "<p>db::quote(".(is_null($value) ? 'NULL' : "'$value'").",'$type','$not_null')</p>\n";
 
 		if (!$not_null && is_null($value))	// writing unset php-variables and those set to NULL now as SQL NULL
 		{
 			return 'NULL';
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'int':
 				// if DateTime object given, convert it to a unix timestamp (NOT converting the timezone!)
 				if (is_object($value) && ($value instanceof DateTime))
 				{
-					return ($value instanceof egw_time) ? $value->format('ts') : egw_time::to($value,'ts');
+					return ($value instanceof egw_time) ? $value->format('ts') : egw_time::to($value, 'ts');
 				}
 			case 'auto':
 				// atm. (php5.2) php has only 32bit integers, it converts everything else to float.
 				// Casting it to int gives a negative number instead of the big 64bit integer!
 				// There for we have to keep it as float by using round instead the int cast.
-				return is_float($value) ? round($value) : (int) $value;
+				return is_float($value) ? round($value) : (int)$value;
 			case 'bool':
 				if ($this->Type == 'mysql')		// maybe it's not longer necessary with mysql5
 				{
@@ -1595,23 +1595,23 @@ 
 				return $value ? 'true' : 'false';
 			case 'float':
 			case 'decimal':
-				return (double) $value;
+				return (double)$value;
 		}
 		if (!$this->Link_ID && !$this->connect())
 		{
 			return False;
 		}
-		switch($type)
+		switch ($type)
 		{
 			case 'blob':
 				switch ($this->Link_ID->blobEncodeType)
 				{
 					case 'C':	// eg. postgres
-						return "'" . $this->Link_ID->BlobEncode($value) . "'";
+						return "'".$this->Link_ID->BlobEncode($value)."'";
 					case 'I':
 						return $this->Link_ID->BlobEncode($value);
 				}
-				break;	// handled like strings
+				break; // handled like strings
 			case 'date':
 				// if DateTime object given, convert it (NOT converting the timezone!)
 				if (is_object($value) && ($value instanceof DateTime))
@@ -1629,7 +1629,7 @@ 
 		}
 		if (is_array($value))
 		{
-			$value = implode($glue,$value);
+			$value = implode($glue, $value);
 		}
 		// only truncate string if length given and <= 255
 		// to not unnecessary truncate varchar(>255) as PostgreSQL uses text anyway and MySQL truncates itself silently (unless strict mode!)
@@ -1666,7 +1666,7 @@ 
 	*	If its set, the column-type-data determinates if (int) or addslashes is used.
 	* @return string SQL
 	*/
-	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
+	function column_data_implode($glue, $array, $use_key = True, $only = False, $column_definitions = False)
 	{
 		if (!is_array($array))	// this allows to give an SQL-string for delete or update
 		{
@@ -1676,16 +1676,16 @@ 
 		{
 			$column_definitions = $this->column_definitions;
 		}
-		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array, True).",'$use_key',".print_r($only, True).",<pre>".print_r($column_definitions, True)."</pre>\n";
 
 		// do we need to truncate varchars to their max length (INSERT and UPDATE on Postgres)
 		$truncate_varchar = $glue == ',' && $this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR];
 
 		$keys = $values = array();
-		foreach($array as $key => $data)
+		foreach ($array as $key => $data)
 		{
 			if (is_int($key) && $use_key !== 'VALUES' || !$only || $only === True && isset($column_definitions[$key]) ||
-				is_array($only) && in_array($key,$only))
+				is_array($only) && in_array($key, $only))
 			{
 				$keys[] = $this->name_quote($key);
 
@@ -1696,7 +1696,7 @@ 
 					if (strpos($key, '.') !== false) list(, $col) = explode('.', $key);
 					if (!isset($column_definitions[$col]))
 					{
-						throw new egw_exception_db_invalid_sql("db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre><b>nothing known about column '$key'!</b>");
+						throw new egw_exception_db_invalid_sql("db::column_data_implode('$glue',".print_r($array, True).",'$use_key',".print_r($only, True).",<pre>".print_r($column_definitions, True)."</pre><b>nothing known about column '$key'!</b>");
 					}
 				}
 				$column_type = is_array($column_definitions) ? @$column_definitions[$col]['type'] : False;
@@ -1705,7 +1705,7 @@ 
 				$maxlength = null;
 				if ($truncate_varchar)
 				{
-					$maxlength = in_array($column_definitions[$col]['type'], array('varchar','ascii')) ? $column_definitions[$col]['precision'] : null;
+					$maxlength = in_array($column_definitions[$col]['type'], array('varchar', 'ascii')) ? $column_definitions[$col]['precision'] : null;
 				}
 				// dont use IN ( ), if there's only one value, it's slower for MySQL
 				if (is_array($data) && count($data) == 1)
@@ -1715,39 +1715,38 @@ 
 				if (is_array($data))
 				{
 					$or_null = '';
-					foreach($data as $k => $v)
+					foreach ($data as $k => $v)
 					{
-						if (!$not_null && $use_key===True && is_null($v))
+						if (!$not_null && $use_key === True && is_null($v))
 						{
 							$or_null = $this->name_quote($key).' IS NULL)';
 							unset($data[$k]);
 							continue;
 						}
-						$data[$k] = $this->quote($v,$column_type,$not_null,$maxlength);
+						$data[$k] = $this->quote($v, $column_type, $not_null, $maxlength);
 					}
-					$values[] = ($or_null?'(':'').(!count($data) ?
+					$values[] = ($or_null ? '(' : '').(!count($data) ?
 						// empty array on insert/update, store as NULL, or if not allowed whatever value NULL is casted to
-						$this->quote(null, $column_type, $not_null) :
-						($use_key===True ? $this->name_quote($key).' IN ' : '') .
-						'('.implode(',',$data).')'.($or_null ? ' OR ' : '')).$or_null;
+						$this->quote(null, $column_type, $not_null) : ($use_key === True ? $this->name_quote($key).' IN ' : '').
+						'('.implode(',', $data).')'.($or_null ? ' OR ' : '')).$or_null;
 				}
-				elseif (is_int($key) && $use_key===True)
+				elseif (is_int($key) && $use_key === True)
 				{
-					if (empty($data)) continue;	// would give SQL error
+					if (empty($data)) continue; // would give SQL error
 					$values[] = $data;
 				}
 				elseif ($glue != ',' && $use_key === True && !$not_null && is_null($data))
 				{
-					$values[] = $this->name_quote($key) .' IS NULL';
+					$values[] = $this->name_quote($key).' IS NULL';
 				}
 				else
 				{
-					$values[] = ($use_key===True ? $this->name_quote($key) . '=' : '') . $this->quote($data,$column_type,$not_null,$maxlength);
+					$values[] = ($use_key === True ? $this->name_quote($key).'=' : '').$this->quote($data, $column_type, $not_null, $maxlength);
 				}
 			}
 		}
-		return ($use_key==='VALUES' ? '('.implode(',',$keys).') VALUES (' : '').
-			implode($glue,$values) . ($use_key==='VALUES' ? ')' : '');
+		return ($use_key === 'VALUES' ? '('.implode(',', $keys).') VALUES (' : '').
+			implode($glue, $values).($use_key === 'VALUES' ? ')' : '');
 	}
 
 	/**
@@ -1759,9 +1758,9 @@ 
 	*	of your table ($tables_baseline[$table]['fd'] of the setup/tables_current.inc.php file).
 	*	If its set, the column-type-data determinates if (int) or addslashes is used.
 	*/
-	function set_column_definitions($column_definitions=False)
+	function set_column_definitions($column_definitions = False)
 	{
-		$this->column_definitions=$column_definitions;
+		$this->column_definitions = $column_definitions;
 	}
 
 	/**
@@ -1774,7 +1773,7 @@ 
 	 *
 	 * @var string
 	 */
-	private $app=self::API_APPNAME;
+	private $app = self::API_APPNAME;
 
 	/**
 	 * Sets the application in which the db-class looks for table-defintions
@@ -1806,12 +1805,12 @@ 
 	* @param bool|string $table if set return only defintions of that table, else return all defintions
 	* @return mixed array with table-defintions or False if file not found
 	*/
-	function get_table_definitions($app=False,$table=False)
+	function get_table_definitions($app = False, $table = False)
 	{
 		static $all_app_data = array();
 		if ($app === true && $table)
 		{
-			foreach($all_app_data as $app => &$app_data)
+			foreach ($all_app_data as $app => &$app_data)
 			{
 				if (isset($app_data[$table]))
 				{
@@ -1819,13 +1818,13 @@ 
 				}
 			}
 			// $table not found in loaded apps, check not yet loaded ones
-			foreach(scandir(EGW_INCLUDE_ROOT) as $app)
+			foreach (scandir(EGW_INCLUDE_ROOT) as $app)
 			{
 				if ($app[0] == '.' || !is_dir(EGW_INCLUDE_ROOT.'/'.$app) || isset($all_app_data[$app]))
 				{
 					continue;
 				}
-				$tables_current = EGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php";
+				$tables_current = EGW_INCLUDE_ROOT."/$app/setup/tables_current.inc.php";
 				if (!@file_exists($tables_current))
 				{
 					$all_app_data[$app] = False;
@@ -1834,7 +1833,7 @@ 
 				{
 					$phpgw_baseline = null;
 					include($tables_current);
-					$all_app_data[$app] =& $phpgw_baseline;
+					$all_app_data[$app] = & $phpgw_baseline;
 					unset($phpgw_baseline);
 
 					if (isset($all_app_data[$app][$table]))
@@ -1849,17 +1848,17 @@ 
 		{
 			$app = $this->app ? $this->app : $GLOBALS['egw_info']['flags']['currentapp'];
 		}
-		$app_data =& $all_app_data[$app];
+		$app_data = & $all_app_data[$app];
 
 		if (!isset($app_data))
 		{
-			$tables_current = EGW_INCLUDE_ROOT . "/$app/setup/tables_current.inc.php";
+			$tables_current = EGW_INCLUDE_ROOT."/$app/setup/tables_current.inc.php";
 			if (!@file_exists($tables_current))
 			{
 				return $app_data = False;
 			}
 			include($tables_current);
-			$app_data =& $phpgw_baseline;
+			$app_data = & $phpgw_baseline;
 			unset($phpgw_baseline);
 		}
 		if ($table && (!$app_data || !isset($app_data[$table])))
@@ -1882,14 +1881,14 @@ 
 	 * @param string $attribute='comment' what field to return, NULL for array with all fields, default 'comment' to return the comment
 	 * @return string|array NULL if table or column or attribute not found
 	 */
-	/* static */ function get_column_attribute($column,$table,$app=null,$attribute='comment')
+	/* static */ function get_column_attribute($column, $table, $app = null, $attribute = 'comment')
 	{
-		static $cached_columns=null,$cached_table=null;	// some caching
+		static $cached_columns = null, $cached_table = null; // some caching
 
 		if ($cached_table !== $table || is_null($cached_columns))
 		{
 			$db = isset($this) ? $this : $GLOBALS['egw']->db;
-			$table_def = $db->get_table_definitions($app,$table);
+			$table_def = $db->get_table_definitions($app, $table);
 			$cached_columns = is_array($table_def) ? $table_def['fd'] : false;
 		}
 		if ($cached_columns === false) return null;
@@ -1913,39 +1912,39 @@ 
 	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
+	function insert($table, $data, $where, $line, $file, $app = False, $use_prepared_statement = false, $table_def = False)
 	{
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data, True).",".print_r($where, True).",$line,$file,'$app')</p>\n";
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 
 		$sql_append = '';
 		$cmd = 'INSERT';
 		if (is_array($where) && count($where))
 		{
-			switch($this->Type)
+			switch ($this->Type)
 			{
 				case 'sapdb': case 'maxdb':
 					$sql_append = ' UPDATE DUPLICATES';
 					break;
 				case 'mysql':
 					// use replace if primary keys are included
-					if (count(array_intersect(array_keys($where),(array)$table_def['pk'])) == count($table_def['pk']))
+					if (count(array_intersect(array_keys($where), (array)$table_def['pk'])) == count($table_def['pk']))
 					{
 						$cmd = 'REPLACE';
 						break;
 					}
 					// fall through !!!
 				default:
-					$this->select($table,'count(*)',$where,$line,$file);
+					$this->select($table, 'count(*)', $where, $line, $file);
 					if ($this->next_record() && $this->f(0))
 					{
-						return !!$this->update($table,$data,$where,$line,$file,$app,$use_prepared_statement,$table_def);
+						return !!$this->update($table, $data, $where, $line, $file, $app, $use_prepared_statement, $table_def);
 					}
 					break;
 			}
 			// the checked values need to be inserted too, value in data has precedence, also cant insert sql strings (numerical id)
-			foreach($where as $column => $value)
+			foreach ($where as $column => $value)
 			{
 				if (!is_numeric($column) && !isset($data[$column]) &&
 					// skip auto-id of 0 or NULL, as PostgreSQL does NOT create an auto-id, if they are given
@@ -1965,24 +1964,24 @@ 
 			if ($where) throw new egw_exception_wrong_parameter('Can NOT use $where together with multiple data rows in $data!');
 
 			$sql = "$cmd INTO $table ";
-			foreach($data as $k => $d)
+			foreach ($data as $k => $d)
 			{
 				if (!$k)
 				{
-					$sql .= $this->column_data_implode(',',$d,'VALUES',true,$table_def['fd']);
+					$sql .= $this->column_data_implode(',', $d, 'VALUES', true, $table_def['fd']);
 				}
 				else
 				{
-					$sql .= ",\n(".$this->column_data_implode(',',$d,false,true,$table_def['fd']).')';
+					$sql .= ",\n(".$this->column_data_implode(',', $d, false, true, $table_def['fd']).')';
 				}
 			}
 			$sql .= $sql_append;
 		}
 		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
 		{
-			$this->Link_ID->Param(false);	// reset param-counter
+			$this->Link_ID->Param(false); // reset param-counter
 			$cols = array_keys($data);
-			foreach($cols as $k => $col)
+			foreach ($cols as $k => $col)
 			{
 				if (!isset($table_def['fd'][$col]))	// ignore columns not in this table
 				{
@@ -1991,7 +1990,7 @@ 
 				}
 				$params[] = $this->Link_ID->Param($col);
 			}
-			$sql = "$cmd INTO $table (".implode(',',$cols).') VALUES ('.implode(',',$params).')'.$sql_append;
+			$sql = "$cmd INTO $table (".implode(',', $cols).') VALUES ('.implode(',', $params).')'.$sql_append;
 			// check if we already prepared that statement
 			if (!isset($this->prepared_sql[$sql]))
 			{
@@ -2002,10 +2001,10 @@ 
 		}
 		else
 		{
-			$sql = "$cmd INTO $table ".$this->column_data_implode(',',$data,'VALUES',true,$table_def['fd']).$sql_append;
+			$sql = "$cmd INTO $table ".$this->column_data_implode(',', $data, 'VALUES', true, $table_def['fd']).$sql_append;
 		}
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
-		return $this->query($sql,$line,$file,0,-1,$inputarr);
+		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data, True).",".print_r($where, True).",$line,$file,'$app') sql='$sql'</p>\n";
+		return $this->query($sql, $line, $file, 0, -1, $inputarr);
 	}
 
 	/**
@@ -2023,10 +2022,10 @@ 
 	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
+	function update($table, $data, $where, $line, $file, $app = False, $use_prepared_statement = false, $table_def = False)
 	{
-		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if ($this->Debug) echo "<p>db::update('$table',".print_r($data, true).','.print_r($where, true).",$line,$file,'$app')</p>\n";
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 
 		$blobs2update = array();
 		// SapDB/MaxDB cant update LONG columns / blob's: if a blob-column is included in the update we remember it in $blobs2update
@@ -2037,7 +2036,7 @@ 
 			case 'maxdb':
 				if ($use_prepared_statement) break;
 				// check if data contains any LONG columns
-				foreach($data as $col => $val)
+				foreach ($data as $col => $val)
 				{
 					switch ($table_def['fd'][$col]['type'])
 					{
@@ -2051,7 +2050,7 @@ 
 				}
 				break;
 		}
-		$where_str = $this->column_data_implode(' AND ',$where,True,true,$table_def['fd']);
+		$where_str = $this->column_data_implode(' AND ', $where, True, true, $table_def['fd']);
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -2062,13 +2061,13 @@ 
 			$inputarr = false;
 			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
 			{
-				$this->Link_ID->Param(false);	// reset param-counter
-				foreach($data as $col => $val)
+				$this->Link_ID->Param(false); // reset param-counter
+				foreach ($data as $col => $val)
 				{
-					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
+					if (!isset($table_def['fd'][$col])) continue; // ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
-				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
+				$sql = "UPDATE $table SET ".implode(',', $params).' WHERE '.$where_str;
 				// check if we already prepared that statement
 				if (!isset($this->prepared_sql[$sql]))
 				{
@@ -2080,19 +2079,19 @@ 
 			else
 			{
 				$sql = "UPDATE $table SET ".
-					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
+					$this->column_data_implode(',', $data, True, true, $table_def['fd']).' WHERE '.$where_str;
 			}
-			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
+			$ret = $this->query($sql, $line, $file, 0, -1, $inputarr);
 			if ($this->Debug) echo "<p>db::query('$sql',$line,$file)</p>\n";
 		}
 		// if we have any blobs to update, we do so now
 		if (($ret || !count($data)) && count($blobs2update))
 		{
-			foreach($blobs2update as $col => $val)
+			foreach ($blobs2update as $col => $val)
 			{
-				$ret = $this->Link_ID->UpdateBlob($table,$col,$val,$where_str,$table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
+				$ret = $this->Link_ID->UpdateBlob($table, $col, $val, $where_str, $table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
 				if ($this->Debug) echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
-				if (!$ret) throw new egw_exception_db_invalid_sql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				if (!$ret) throw new egw_exception_db_invalid_sql("Error in UpdateBlob($table,$col,\$val,$where_str)", $line, $file);
 			}
 		}
 		return $ret;
@@ -2111,18 +2110,18 @@ 
 	* @param array|bool $table_def use this table definition. If False, the table definition will be read from tables_baseline
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function delete($table,$where,$line,$file,$app=False,$table_def=False)
+	function delete($table, $where, $line, $file, $app = False, $table_def = False)
 	{
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
 			$table = self::$tablealiases[$table];
 		}
 		$sql = "DELETE FROM $table WHERE ".
-			$this->column_data_implode(' AND ',$where,True,False,$table_def['fd']);
+			$this->column_data_implode(' AND ', $where, True, False, $table_def['fd']);
 
-		return $this->query($sql,$line,$file);
+		return $this->query($sql, $line, $file);
 	}
 
 	/**
@@ -2145,12 +2144,12 @@ 
 	 */
 	function expression($table_def/*,$args, ...*/)
 	{
-		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true,$table_def);
+		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true, $table_def);
 		$sql = '';
 		$ignore_next = 0;
-		foreach(func_get_args() as $n => $arg)
+		foreach (func_get_args() as $n => $arg)
 		{
-			if ($n < 1) continue;	// table-name
+			if ($n < 1) continue; // table-name
 
 			if ($ignore_next)
 			{
@@ -2159,7 +2158,7 @@ 
 			}
 			if (is_null($arg)) $arg = False;
 
-			switch(gettype($arg))
+			switch (gettype($arg))
 			{
 				case 'string':
 					$sql .= $arg;
@@ -2168,7 +2167,7 @@ 
 					$ignore_next += !$arg ? 2 : 0;
 					break;
 				case 'array':
-					$sql .= $this->column_data_implode(' AND ',$arg,True,False,$table_def['fd']);
+					$sql .= $this->column_data_implode(' AND ', $arg, True, False, $table_def['fd']);
 					break;
 			}
 		}
@@ -2195,18 +2194,18 @@ 
 	* @param int $fetchmode =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=egw_db::FETCH_ASSOC)
+	function select($table, $cols, $where, $line, $file, $offset = False, $append = '', $app = False, $num_rows = 0, $join = '', $table_def = False, $fetchmode = egw_db::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols, True).",".print_r($where, True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def) $table_def = $this->get_table_definitions($app, $table);
 		if (is_array($cols))
 		{
-			$cols = implode(',',$cols);
+			$cols = implode(',', $cols);
 		}
 		if (is_array($where))
 		{
-			$where = $this->column_data_implode(' AND ',$where,True,False,$table_def['fd']);
+			$where = $this->column_data_implode(' AND ', $where, True, False, $table_def['fd']);
 		}
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -2215,7 +2214,7 @@ 
 		$sql = "SELECT $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
-		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		if ($where) $sql .= (strpos($join, "WHERE") !== false) ? ' AND ('.$where.')' : ' WHERE '.$where;
 
 		if ($append) $sql .= ' '.$append;
 
@@ -2225,7 +2224,7 @@ 
 		{
 			return $sql;
 		}
-		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
+		return $this->query($sql, $line, $file, $offset, $offset === False ? -1 : (int)$num_rows, false, $fetchmode);
 	}
 
 	/**
@@ -2243,34 +2242,34 @@ 
 	* @param int $fetchmode =egw_db::FETCH_ASSOC egw_db::FETCH_BOTH (default), egw_db::FETCH_ASSOC or egw_db::FETCH_NUM
 	* @return ADORecordSet or false, if the query fails
 	*/
-	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=egw_db::FETCH_ASSOC)
+	function union($selects, $line, $file, $order_by = '', $offset = false, $num_rows = 0, $fetchmode = egw_db::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		if ($this->Debug) echo "<p>db::union(".print_r($selects, True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
 
 		$union = array();
-		foreach($selects as $select)
+		foreach ($selects as $select)
 		{
-			$union[] = call_user_func_array(array($this,'select'),array(
+			$union[] = call_user_func_array(array($this, 'select'), array(
 				$select['table'],
 				$select['cols'],
 				$select['where'],
-				false,	// line
-				false,	// file
-				false,	// offset
+				false, // line
+				false, // file
+				false, // offset
 				$select['append'],
 				$select['app'],
-				0,		// num_rows,
+				0, // num_rows,
 				$select['join'],
 				$select['table_def'],
 			));
 		}
-		$sql = count($union) > 1 ? '(' . implode(")\nUNION\n(",$union).')' : 'SELECT DISTINCT'.substr($union[0],6);
+		$sql = count($union) > 1 ? '('.implode(")\nUNION\n(", $union).')' : 'SELECT DISTINCT'.substr($union[0], 6);
 
-		if ($order_by) $sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		if ($order_by) $sql .= (!stristr($order_by, 'ORDER BY') ? "\nORDER BY " : '').$order_by;
 
 		if ($this->Debug) echo "<p>sql='$sql'</p>";
 
-		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
+		return $this->query($sql, $line, $file, $offset, $offset === False ? -1 : (int)$num_rows, false, $fetchmode);
 	}
 
 	/**
@@ -2280,12 +2279,12 @@ 
 	 * @param string|array $strip
 	 * @return array
 	 */
-	static function strip_array_keys($arr,$strip)
+	static function strip_array_keys($arr, $strip)
 	{
 		$keys = array_keys($arr);
 
-		return array_walk($keys,create_function('&$v,$k,$strip','$v = str_replace($strip,\'\',$v);'),$strip) ?
-			array_combine($keys,$arr) : $arr;
+		return array_walk($keys, create_function('&$v,$k,$strip', '$v = str_replace($strip,\'\',$v);'), $strip) ?
+			array_combine($keys, $arr) : $arr;
 	}
 }
 
@@ -2375,13 +2374,13 @@ 
 	 * @param array $params =array() additional parameters, row is always first parameter
 	 * @param $key_callback =null optional callback, if you want different keys
 	 */
-	public function __construct(Traversable $rs, $callback, $params=array(), $key_callback=null)
+	public function __construct(Traversable $rs, $callback, $params = array(), $key_callback = null)
 	{
 		$this->callback = $callback;
 		$this->params = $params;
 		$this->key_callback = $key_callback;
 
-		if (is_a($rs,'IteratorAggregate'))
+		if (is_a($rs, 'IteratorAggregate'))
 		{
 			$this->rs = $rs->getIterator();
 		}
@@ -2398,7 +2397,7 @@ 
 	 */
 	public function current()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			$params = $this->params;
 			array_unshift($params, $this->rs->current());
@@ -2414,11 +2413,10 @@ 
 	 */
 	public function key()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->key_callback ?
-				call_user_func($this->key_callback, $this->rs->current()) :
-				$this->rs->key();
+				call_user_func($this->key_callback, $this->rs->current()) : $this->rs->key();
 		}
 		return 0;
 	}
@@ -2428,7 +2426,7 @@ 
 	 */
 	public function next()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->next();
 		}
@@ -2439,7 +2437,7 @@ 
 	 */
 	public function rewind()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->rewind();
 		}
@@ -2450,9 +2448,9 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
-		if (is_a($this->rs,'iterator'))
+		if (is_a($this->rs, 'iterator'))
 		{
 			return $this->rs->valid();
 		}

Braces +250 added lines, -63 removed lines

@@ -399,7 +399,10 @@ 
 			if ($state['wsrep_local_state_comment'] == 'Synced' ||
 				// if we have only 2 nodes (2. one starting), we can only use the donor
 				$state['wsrep_local_state_comment'] == 'Donor/Desynced' &&
-					$state['wsrep_cluster_size'] == 2) return;
+					$state['wsrep_cluster_size'] == 2)
+			{
+				return;
+			}
 
 			throw new egw_exception_db_connection('Node is NOT Synced! '.array2string($state));
 		}
@@ -418,7 +421,10 @@ 
 		$hosts = explode(';', $this->Host[0] == '@' ? getenv(substr($this->Host, 1)) : $this->Host);
 		$num_hosts = count($hosts);
 		$n =& egw_cache::getSession(__CLASS__, $this->Host);
-		if (!isset($n)) $n = 0;
+		if (!isset($n))
+		{
+			$n = 0;
+		}
 
 		if ($next && ++$n >= $num_hosts+2)
 		{
@@ -448,7 +454,10 @@ 
 			foreach(array('Database','User','Password','Port','Type') as $name)
 			{
 				$$name = $this->$name;
-				if (${$name}[0] == '@' && $name != 'Password') $$name = getenv(substr($$name, 1));
+				if (${$name}[0] == '@' && $name != 'Password')
+				{
+					$$name = getenv(substr($$name, 1));
+				}
 			}
 			$this->setupType = $php_extension = $Type;
 
@@ -467,7 +476,10 @@ 
 					$Type = 'mssql';
 					// fall through
 				case 'mssql':
-					if ($Port) $Host .= ','.$Port;
+					if ($Port)
+					{
+						$Host .= ','.$Port;
+					}
 					break;
 
 				case 'odbc_oracle':
@@ -493,7 +505,10 @@ 
 					$this->Type = 'mysql';		// need to be "mysql", so apps can check just for "mysql"!
 					// fall through
 				default:
-					if ($Port) $Host .= ':'.$Port;
+					if ($Port)
+					{
+						$Host .= ':'.$Port;
+					}
 					break;
 			}
 			if (!isset($GLOBALS['egw']->ADOdb) ||	// we have no connection so far
@@ -508,10 +523,13 @@ 
 				{
 					throw new egw_exception_db_connection("Necessary php database support for $this->Type (".PHP_SHLIB_PREFIX.$php_extension.'.'.PHP_SHLIB_SUFFIX.") not loaded and can't be loaded, exiting !!!");
 				}
-				if (!isset($GLOBALS['egw']->ADOdb))	// use the global object to store the connection
+				if (!isset($GLOBALS['egw']->ADOdb))
+				{
+					// use the global object to store the connection
 				{
 					$this->Link_ID =& $GLOBALS['egw']->ADOdb;
 				}
+				}
 				else
 				{
 					$this->privat_Link_ID = True;	// remember that we use a privat Link_ID for disconnect
@@ -602,7 +620,11 @@ 
 	 */
 	function __sleep()
 	{
-		if (!empty($this->setupType)) $this->Type = $this->setupType;	// restore Type eg. to mysqli
+		if (!empty($this->setupType))
+		{
+			$this->Type = $this->setupType;
+		}
+		// restore Type eg. to mysqli
 
 		$vars = get_object_vars($this);
 		unset($vars['Link_ID']);
@@ -665,7 +687,10 @@ 
 		unset($this->Link_ID);
 		$this->Link_ID = 0;
 
-		if (!empty($this->setupType)) $this->Type = $this->setupType;
+		if (!empty($this->setupType))
+		{
+			$this->Type = $this->setupType;
+		}
 	}
 
 	/**
@@ -810,16 +835,22 @@ 
 		}
 		if (!$this->Query_ID)
 		{
-			if ($reconnect && $this->Type == 'mysql' && $this->Errno == 2006)	// Server has gone away
+			if ($reconnect && $this->Type == 'mysql' && $this->Errno == 2006)
+			{
+				// Server has gone away
 			{
 				$this->disconnect();
+			}
 				return $this->query($Query_String, $line, $file, $offset, $num_rows, $inputarr, $fetchmode, false);
 			}
 			throw new egw_exception_db_invalid_sql("Invalid SQL: ".(is_array($Query_String)?$Query_String[0]:$Query_String).
 				"\n$this->Error ($this->Errno)".
 				($inputarr ? "\nParameters: '".implode("','",$inputarr)."'":''), $this->Errno);
 		}
-		elseif(empty($this->Query_ID->sql)) $this->Query_ID->sql = $Query_String;
+		elseif(empty($this->Query_ID->sql))
+		{
+			$this->Query_ID->sql = $Query_String;
+		}
 		return $this->Query_ID;
 	}
 
@@ -854,10 +885,13 @@ 
 		{
 			throw new egw_exception_db('next_record called with no query pending.');
 		}
-		if ($this->Row)	// first row is already fetched
+		if ($this->Row)
+		{
+			// first row is already fetched
 		{
 			$this->Query_ID->MoveNext();
 		}
+		}
 		++$this->Row;
 
 		$this->Record = $this->Query_ID->fields;
@@ -866,12 +900,15 @@ 
 		{
 			return False;
 		}
-		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')	// maxdb, oracle, ...
+		if ($this->capabilities[self::CAPABILITY_NAME_CASE] == 'upper')
+		{
+			// maxdb, oracle, ...
 		{
 			switch($fetch_mode)
 			{
 				case egw_db::FETCH_ASSOC:
 					$this->Record = array_change_key_case($this->Record);
+		}
 					break;
 				case egw_db::FETCH_NUM:
 					$this->Record = array_values($this->Record);
@@ -976,9 +1013,12 @@ 
 		}
 		$id = $this->Link_ID->PO_Insert_ID($table,$field);	// simulates Insert_ID with "SELECT MAX($field) FROM $table" if not native availible
 
-		if ($id === False)	// function not supported
+		if ($id === False)
+		{
+			// function not supported
 		{
 			echo "<p>db::get_last_insert_id(table='$table',field='$field') not yet implemented for db-type '$this->Type' OR no insert operation before</p>\n";
+		}
 			echo '<p>'.function_backtrace()."</p>\n";
 			return -1;
 		}
@@ -1005,7 +1045,8 @@ 
 	* @return bool True if sucessful, False if fails
 	*/
 	function unlock()
-	{}
+	{
+}
 
 	/**
 	* Get the number of rows affected by last update or delete
@@ -1014,7 +1055,10 @@ 
 	*/
 	function affected_rows()
 	{
-		if ($this->log_updates) return 0;
+		if ($this->log_updates)
+		{
+			return 0;
+		}
 
 		if (!$this->Link_ID && !$this->connect())
 		{
@@ -1110,7 +1154,10 @@ 
 		{
 			if (!is_numeric($column))
 			{
-				if ($strip) $column = str_replace($strip,'',$column);
+				if ($strip)
+				{
+					$column = str_replace($strip,'',$column);
+				}
 
 				$result[$column] = $value;
 			}
@@ -1143,9 +1190,18 @@ 
 		{
 			// for backwards compatibilty (depreciated)
 			$flags = null;
-			if($column->auto_increment) $flags .= "auto_increment ";
-			if($column->primary_key) $flags .= "primary_key ";
-			if($column->binary) $flags .= "binary ";
+			if($column->auto_increment)
+			{
+				$flags .= "auto_increment ";
+			}
+			if($column->primary_key)
+			{
+				$flags .= "primary_key ";
+			}
+			if($column->binary)
+			{
+				$flags .= "binary ";
+			}
 
 			$metadata[$i] = array(
 				'table' => $table,
@@ -1182,7 +1238,10 @@ 
 	 */
 	function table_names($just_name=false)
 	{
-		if (!$this->Link_ID) $this->connect();
+		if (!$this->Link_ID)
+		{
+			$this->connect();
+		}
 		if (!$this->Link_ID)
 		{
 			return False;
@@ -1334,8 +1393,14 @@ 
 		{
 			case 'mysql':
 				$sql = 'GROUP_CONCAT('.$expr;
-				if ($order_by) $sql .= ' ORDER BY '.$order_by;
-				if ($separator != ',') $sql .= ' SEPARATOR '.$this->quote($separator);
+				if ($order_by)
+				{
+					$sql .= ' ORDER BY '.$order_by;
+				}
+				if ($separator != ',')
+				{
+					$sql .= ' SEPARATOR '.$this->quote($separator);
+				}
 				$sql .= ')';
 				break;
 
@@ -1345,7 +1410,10 @@ 
 					return false;
 				}
 				$sql = 'ARRAY_TO_STRING(ARRAY_AGG('.$expr;
-				if ($order_by) $sql .= ' ORDER BY '.$order_by;
+				if ($order_by)
+				{
+					$sql .= ' ORDER BY '.$order_by;
+				}
 				$sql .= '), '.$this->quote($separator).')';
 				break;
 
@@ -1568,12 +1636,18 @@ 
 	*/
 	function quote($value,$type=False,$not_null=true,$length=null,$glue=',')
 	{
-		if ($this->Debug) echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::quote(".(is_null($value)?'NULL':"'$value'").",'$type','$not_null')</p>\n";
+		}
 
-		if (!$not_null && is_null($value))	// writing unset php-variables and those set to NULL now as SQL NULL
+		if (!$not_null && is_null($value))
+		{
+			// writing unset php-variables and those set to NULL now as SQL NULL
 		{
 			return 'NULL';
 		}
+		}
 		switch($type)
 		{
 			case 'int':
@@ -1588,10 +1662,13 @@ 
 				// There for we have to keep it as float by using round instead the int cast.
 				return is_float($value) ? round($value) : (int) $value;
 			case 'bool':
-				if ($this->Type == 'mysql')		// maybe it's not longer necessary with mysql5
+				if ($this->Type == 'mysql')
+				{
+					// maybe it's not longer necessary with mysql5
 				{
 					return $value ? 1 : 0;
 				}
+				}
 				return $value ? 'true' : 'false';
 			case 'float':
 			case 'decimal':
@@ -1639,7 +1716,10 @@ 
 		}
 		// casting boolean explicitly to string, as ADODB_postgres64::qstr() has an unwanted special handling
 		// for boolean types, causing it to return "true" or "false" and not a quoted string like "'1'"!
-		if (is_bool($value)) $value = (string)$value;
+		if (is_bool($value))
+		{
+			$value = (string)$value;
+		}
 
 		return $this->Link_ID->qstr($value);
 	}
@@ -1668,15 +1748,21 @@ 
 	*/
 	function column_data_implode($glue,$array,$use_key=True,$only=False,$column_definitions=False)
 	{
-		if (!is_array($array))	// this allows to give an SQL-string for delete or update
+		if (!is_array($array))
+		{
+			// this allows to give an SQL-string for delete or update
 		{
 			return $array;
 		}
+		}
 		if (!$column_definitions)
 		{
 			$column_definitions = $this->column_definitions;
 		}
-		if ($this->Debug) echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre>\n";
+		}
 
 		// do we need to truncate varchars to their max length (INSERT and UPDATE on Postgres)
 		$truncate_varchar = $glue == ',' && $this->capabilities[self::CAPABILITY_REQUIRE_TRUNCATE_VARCHAR];
@@ -1693,7 +1779,10 @@ 
 				// fix "table.column" expressions, to not trigger exception, if column alone would work
 				if (!is_int($key) && is_array($column_definitions) && !isset($column_definitions[$key]))
 				{
-					if (strpos($key, '.') !== false) list(, $col) = explode('.', $key);
+					if (strpos($key, '.') !== false)
+					{
+						list(, $col) = explode('.', $key);
+					}
 					if (!isset($column_definitions[$col]))
 					{
 						throw new egw_exception_db_invalid_sql("db::column_data_implode('$glue',".print_r($array,True).",'$use_key',".print_r($only,True).",<pre>".print_r($column_definitions,True)."</pre><b>nothing known about column '$key'!</b>");
@@ -1733,7 +1822,11 @@ 
 				}
 				elseif (is_int($key) && $use_key===True)
 				{
-					if (empty($data)) continue;	// would give SQL error
+					if (empty($data))
+					{
+						continue;
+					}
+					// would give SQL error
 					$values[] = $data;
 				}
 				elseif ($glue != ',' && $use_key === True && !$not_null && is_null($data))
@@ -1864,10 +1957,16 @@ 
 		}
 		if ($table && (!$app_data || !isset($app_data[$table])))
 		{
-			if ($this->Debug) echo "<p>!!!get_table_definitions($app,$table) failed!!!</p>\n";
+			if ($this->Debug)
+			{
+				echo "<p>!!!get_table_definitions($app,$table) failed!!!</p>\n";
+			}
 			return False;
 		}
-		if ($this->Debug) echo "<p>get_table_definitions($app,$table) succeeded</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>get_table_definitions($app,$table) succeeded</p>\n";
+		}
 		return $table ? $app_data[$table] : $app_data;
 	}
 
@@ -1892,7 +1991,10 @@ 
 			$table_def = $db->get_table_definitions($app,$table);
 			$cached_columns = is_array($table_def) ? $table_def['fd'] : false;
 		}
-		if ($cached_columns === false) return null;
+		if ($cached_columns === false)
+		{
+			return null;
+		}
 
 		return is_null($attribute) ? $cached_columns[$column] : $cached_columns[$column][$attribute];
 	}
@@ -1915,9 +2017,15 @@ 
 	*/
 	function insert($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app')</p>\n";
+		}
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		$sql_append = '';
 		$cmd = 'INSERT';
@@ -1960,9 +2068,12 @@ 
 			$table = self::$tablealiases[$table];
 		}
 		$inputarr = false;
-		if (isset($data[0]) && is_array($data[0]))	// multiple data rows
+		if (isset($data[0]) && is_array($data[0]))
+		{
+			// multiple data rows
 		{
 			if ($where) throw new egw_exception_wrong_parameter('Can NOT use $where together with multiple data rows in $data!');
+		}
 
 			$sql = "$cmd INTO $table ";
 			foreach($data as $k => $d)
@@ -1978,15 +2089,22 @@ 
 			}
 			$sql .= $sql_append;
 		}
-		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
+		elseif ($use_prepared_statement && $this->Link_ID->_bindInputArray)
 		{
-			$this->Link_ID->Param(false);	// reset param-counter
+			// eg. MaxDB
+		{
+			$this->Link_ID->Param(false);
+		}
+		// reset param-counter
 			$cols = array_keys($data);
 			foreach($cols as $k => $col)
 			{
-				if (!isset($table_def['fd'][$col]))	// ignore columns not in this table
+				if (!isset($table_def['fd'][$col]))
+				{
+					// ignore columns not in this table
 				{
 					unset($cols[$k]);
+				}
 					continue;
 				}
 				$params[] = $this->Link_ID->Param($col);
@@ -2004,7 +2122,10 @@ 
 		{
 			$sql = "$cmd INTO $table ".$this->column_data_implode(',',$data,'VALUES',true,$table_def['fd']).$sql_append;
 		}
-		if ($this->Debug) echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::insert('$table',".print_r($data,True).",".print_r($where,True).",$line,$file,'$app') sql='$sql'</p>\n";
+		}
 		return $this->query($sql,$line,$file,0,-1,$inputarr);
 	}
 
@@ -2025,8 +2146,14 @@ 
 	*/
 	function update($table,$data,$where,$line,$file,$app=False,$use_prepared_statement=false,$table_def=False)
 	{
-		if ($this->Debug) echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if ($this->Debug)
+		{
+			echo "<p>db::update('$table',".print_r($data,true).','.print_r($where,true).",$line,$file,'$app')</p>\n";
+		}
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		$blobs2update = array();
 		// SapDB/MaxDB cant update LONG columns / blob's: if a blob-column is included in the update we remember it in $blobs2update
@@ -2035,7 +2162,10 @@ 
 		{
 			case 'sapdb':
 			case 'maxdb':
-				if ($use_prepared_statement) break;
+				if ($use_prepared_statement)
+				{
+					break;
+				}
 				// check if data contains any LONG columns
 				foreach($data as $col => $val)
 				{
@@ -2060,12 +2190,20 @@ 
 		if (count($data))
 		{
 			$inputarr = false;
-			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)	// eg. MaxDB
+			if ($use_prepared_statement && $this->Link_ID->_bindInputArray)
+			{
+				// eg. MaxDB
 			{
-				$this->Link_ID->Param(false);	// reset param-counter
+				$this->Link_ID->Param(false);
+			}
+			// reset param-counter
 				foreach($data as $col => $val)
 				{
-					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
+					if (!isset($table_def['fd'][$col]))
+					{
+						continue;
+					}
+					// ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
 				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
@@ -2083,7 +2221,10 @@ 
 					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
 			}
 			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
-			if ($this->Debug) echo "<p>db::query('$sql',$line,$file)</p>\n";
+			if ($this->Debug)
+			{
+				echo "<p>db::query('$sql',$line,$file)</p>\n";
+			}
 		}
 		// if we have any blobs to update, we do so now
 		if (($ret || !count($data)) && count($blobs2update))
@@ -2091,8 +2232,14 @@ 
 			foreach($blobs2update as $col => $val)
 			{
 				$ret = $this->Link_ID->UpdateBlob($table,$col,$val,$where_str,$table_def['fd'][$col]['type'] == 'blob' ? 'BLOB' : 'CLOB');
-				if ($this->Debug) echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
-				if (!$ret) throw new egw_exception_db_invalid_sql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				if ($this->Debug)
+				{
+					echo "<p>adodb::UpdateBlob('$table','$col','$val','$where_str') = '$ret'</p>\n";
+				}
+				if (!$ret)
+				{
+					throw new egw_exception_db_invalid_sql("Error in UpdateBlob($table,$col,\$val,$where_str)",$line,$file);
+				}
 			}
 		}
 		return $ret;
@@ -2113,7 +2260,10 @@ 
 	*/
 	function delete($table,$where,$line,$file,$app=False,$table_def=False)
 	{
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 
 		if (self::$tablealiases && isset(self::$tablealiases[$table]))
 		{
@@ -2145,19 +2295,29 @@ 
 	 */
 	function expression($table_def/*,$args, ...*/)
 	{
-		if (!is_array($table_def)) $table_def = $this->get_table_definitions(true,$table_def);
+		if (!is_array($table_def))
+		{
+			$table_def = $this->get_table_definitions(true,$table_def);
+		}
 		$sql = '';
 		$ignore_next = 0;
 		foreach(func_get_args() as $n => $arg)
 		{
-			if ($n < 1) continue;	// table-name
+			if ($n < 1)
+			{
+				continue;
+			}
+			// table-name
 
 			if ($ignore_next)
 			{
 				--$ignore_next;
 				continue;
 			}
-			if (is_null($arg)) $arg = False;
+			if (is_null($arg))
+			{
+				$arg = False;
+			}
 
 			switch(gettype($arg))
 			{
@@ -2197,9 +2357,15 @@ 
 	*/
 	function select($table,$cols,$where,$line,$file,$offset=False,$append='',$app=False,$num_rows=0,$join='',$table_def=False,$fetchmode=egw_db::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::select('$table',".print_r($cols,True).",".print_r($where,True).",$line,$file,$offset,'$app',$num_rows,'$join')</p>\n";
+		}
 
-		if (!$table_def) $table_def = $this->get_table_definitions($app,$table);
+		if (!$table_def)
+		{
+			$table_def = $this->get_table_definitions($app,$table);
+		}
 		if (is_array($cols))
 		{
 			$cols = implode(',',$cols);
@@ -2215,16 +2381,28 @@ 
 		$sql = "SELECT $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
-		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		if ($where)
+		{
+			$sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;
+		}
 
-		if ($append) $sql .= ' '.$append;
+		if ($append)
+		{
+			$sql .= ' '.$append;
+		}
 
-		if ($this->Debug) echo "<p>sql='$sql'</p>";
+		if ($this->Debug)
+		{
+			echo "<p>sql='$sql'</p>";
+		}
 
-		if ($line === false && $file === false)	// call by union, to return the sql rather then run the query
+		if ($line === false && $file === false)
+		{
+			// call by union, to return the sql rather then run the query
 		{
 			return $sql;
 		}
+		}
 		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
 	}
 
@@ -2245,7 +2423,10 @@ 
 	*/
 	function union($selects,$line,$file,$order_by='',$offset=false,$num_rows=0,$fetchmode=egw_db::FETCH_ASSOC)
 	{
-		if ($this->Debug) echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		if ($this->Debug)
+		{
+			echo "<p>db::union(".print_r($selects,True).",$line,$file,$order_by,$offset,$num_rows)</p>\n";
+		}
 
 		$union = array();
 		foreach($selects as $select)
@@ -2266,9 +2447,15 @@ 
 		}
 		$sql = count($union) > 1 ? '(' . implode(")\nUNION\n(",$union).')' : 'SELECT DISTINCT'.substr($union[0],6);
 
-		if ($order_by) $sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		if ($order_by)
+		{
+			$sql .=  (!stristr($order_by,'ORDER BY') ? "\nORDER BY " : '').$order_by;
+		}
 
-		if ($this->Debug) echo "<p>sql='$sql'</p>";
+		if ($this->Debug)
+		{
+			echo "<p>sql='$sql'</p>";
+		}
 
 		return $this->query($sql,$line,$file,$offset,$offset===False ? -1 : (int)$num_rows,false,$fetchmode);
 	}

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

@@ -1845,7 +1845,7 @@ 
 					if (!isset($table_def['fd'][$col])) continue;	// ignore columns not in this table
 					$params[] = $this->name_quote($col).'='.$this->Link_ID->Param($col);
 				}
-				$sql = "UPDATE $table SET ".implode(',',$params).' WHERE '.$where_str;
+				$sql = "update $table SET ".implode(',',$params).' WHERE '.$where_str;
 				// check if we already prepared that statement
 				if (!isset($this->prepared_sql[$sql]))
 				{
@@ -1856,7 +1856,7 @@ 
 			}
 			else
 			{
-				$sql = "UPDATE $table SET ".
+				$sql = "update $table SET ".
 					$this->column_data_implode(',',$data,True,true,$table_def['fd']).' WHERE '.$where_str;
 			}
 			$ret = $this->query($sql,$line,$file,0,-1,$inputarr);
@@ -1989,7 +1989,7 @@ 
 		{
 			$table = self::$tablealiases[$table];
 		}
-		$sql = "SELECT $cols FROM $table $join";
+		$sql = "select $cols FROM $table $join";
 
 		// if we have a where clause, we need to add it together with the WHERE statement, if thats not in the join
 		if ($where) $sql .= (strpos($join,"WHERE")!==false) ? ' AND ('.$where.')' : ' WHERE '.$where;

phpgwapi/inc/class.egw_digest_auth.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -234,7 +234,7 @@
 	 * @param string $realm
 	 * @param string $username
 	 * @param string &$password=null password to use or if null, on return stored password
-	 * @return string|boolean false if $password not given and can NOT be read
+	 * @return false|string false if $password not given and can NOT be read
 	 */
 	static private function get_digest_A1($realm,$username,&$password=null)
 	{

Indentation +12 added lines, -12 removed lines

@@ -255,20 +255,20 @@
 	 */
 	static public function parse_digest($txt)
 	{
-	    // protect against missing data
-	    $needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
-	    $data = array();
-	    $keys = implode('|', array_keys($needed_parts));
+		// protect against missing data
+		$needed_parts = array('nonce'=>1, 'nc'=>1, 'cnonce'=>1, 'qop'=>1, 'username'=>1, 'uri'=>1, 'response'=>1);
+		$data = array();
+		$keys = implode('|', array_keys($needed_parts));
 
 		$matches = null;
-	    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+		preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
 
-	    foreach ($matches as $m)
-	    {
-	        $data[$m[1]] = $m[3] ? $m[3] : $m[4];
-	        unset($needed_parts[$m[1]]);
-	    }
-	    //error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
-	    return $needed_parts ? false : $data;
+		foreach ($matches as $m)
+		{
+			$data[$m[1]] = $m[3] ? $m[3] : $m[4];
+			unset($needed_parts[$m[1]]);
+		}
+		//error_log(__METHOD__."('$txt') returning ".array2string($needed_parts ? false : $data));
+		return $needed_parts ? false : $data;
 	}
 }

Spacing +19 added lines, -19 removed lines

@@ -75,7 +75,7 @@ 
 	 */
 	static public function autocreate_session_callback(&$account)
 	{
-		unset($account);	// not used, but required by function signature
+		unset($account); // not used, but required by function signature
 		if (self::ERROR_LOG)
 		{
 			$pw = self::ERROR_LOG > 1 ? $_SERVER['PHP_AUTH_PW'] : '**********';
@@ -86,15 +86,15 @@ 
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
-		if (!isset($username) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'],'Basic ') === 0)
+		if (!isset($username) && !empty($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && strpos($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 'Basic ') === 0)
 		{
-			$hash = base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'],6));
+			$hash = base64_decode(substr($_SERVER['REDIRECT_HTTP_AUTHORIZATION'], 6));
 			if (strpos($hash, ':') !== false)
 			{
 				list($username, $password) = explode(':', $hash, 2);
 			}
 		}
-		elseif (isset($_SERVER['PHP_AUTH_DIGEST']) && !self::is_valid($realm,$_SERVER['PHP_AUTH_DIGEST'],$username,$password))
+		elseif (isset($_SERVER['PHP_AUTH_DIGEST']) && !self::is_valid($realm, $_SERVER['PHP_AUTH_DIGEST'], $username, $password))
 		{
 			unset($password);
 		}
@@ -111,7 +111,7 @@ 
 			// if the session class gives a reason why the login failed --> append it to the REALM
 			if ($GLOBALS['egw']->session->reason) $realm .= ': '.$GLOBALS['egw']->session->reason;
 
-			header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
+			header('WWW-Authenticate: Basic realm="'.$realm.'"'); // draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
 			self::digest_header($realm);
 			header('HTTP/1.1 401 Unauthorized');
 			header('X-WebDAV-Status: 401 Unauthorized', true);
@@ -135,7 +135,7 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches) {
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -157,24 +157,24 @@ 
 	 * @param string &$user_pw =null stored cleartext password, if $username given AND function returns true
 	 * @return boolean true if digest auth is available, false otherwise
 	 */
-	static public function digest_auth_available($realm,$username=null,&$user_pw=null)
+	static public function digest_auth_available($realm, $username = null, &$user_pw = null)
 	{
 		// we currently require plaintext passwords!
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
 			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
-			return false;	// no plain-text passwords used
+			return false; // no plain-text passwords used
 		}
 		// check for specific user, if given
-		if (!is_null($username) && !(($user_pw = $GLOBALS['egw']->accounts->id2name($username,'account_pwd','u')) ||
-			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
+		if (!is_null($username) && !(($user_pw = $GLOBALS['egw']->accounts->id2name($username, 'account_pwd', 'u')) ||
+			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw, 0, 7) != '{PLAIN}'))
 		{
 			unset($user_pw);
 			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
-			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
+			return false; // user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw, 0, 7) == '{PLAIN}') $user_pw = substr($user_pw, 7);
 
 		if (self::ERROR_LOG)
 		{
@@ -190,7 +190,7 @@ 
 	 * @param string $realm
 	 * @param string &$nonce=null on return
 	 */
-	static public function digest_header($realm,&$nonce=null)
+	static public function digest_header($realm, &$nonce = null)
 	{
 		if (self::digest_auth_available($realm))
 		{
@@ -209,13 +209,13 @@ 
 	 * @param string &$password on return cleartext password
 	 * @return boolean true if digest is correct, false otherwise
 	 */
-	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
+	static public function is_valid($realm, $auth_digest = null, &$username = null, &$password = null)
 	{
 		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
 
 		$data = self::parse_digest($auth_digest);
 
-		if (!$data || !($A1 = self::get_digest_A1($realm,$username=$data['username'],$password=null)))
+		if (!$data || !($A1 = self::get_digest_A1($realm, $username = $data['username'], $password = null)))
 		{
 			error_log(__METHOD__."('$realm','$auth_digest','$username') returning FALSE");
 			return false;
@@ -236,16 +236,16 @@ 
 	 * @param string &$password=null password to use or if null, on return stored password
 	 * @return string|boolean false if $password not given and can NOT be read
 	 */
-	static private function get_digest_A1($realm,$username,&$password=null)
+	static private function get_digest_A1($realm, $username, &$password = null)
 	{
 		$user_pw = null;
-		if (empty($username) || empty($realm) || !self::digest_auth_available($realm,$username,$user_pw))
+		if (empty($username) || empty($realm) || !self::digest_auth_available($realm, $username, $user_pw))
 		{
 			return false;
 		}
 		if (is_null($password)) $password = $user_pw;
 
-		$A1 = md5($username . ':' . $realm . ':' . $password);
+		$A1 = md5($username.':'.$realm.':'.$password);
 		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
 		return $A1;
 	}
@@ -261,7 +261,7 @@ 
 	    $keys = implode('|', array_keys($needed_parts));
 
 		$matches = null;
-	    preg_match_all('@(' . $keys . ')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
+	    preg_match_all('@('.$keys.')=(?:([\'"])([^\2]+?)\2|([^\s,]+))@', $txt, $matches, PREG_SET_ORDER);
 
 	    foreach ($matches as $m)
 	    {

Braces +42 added lines, -11 removed lines

@@ -82,7 +82,10 @@ 
 			error_log(__METHOD__.'() PHP_AUTH_USER='.array2string($_SERVER['PHP_AUTH_USER']).', PHP_AUTH_PW='.array2string($pw).', PHP_AUTH_DIGEST='.array2string($_SERVER['PHP_AUTH_DIGEST']));
 		}
 		$realm = $GLOBALS['egw_info']['flags']['auth_realm'];
-		if (empty($realm)) $realm = 'EGroupware';
+		if (empty($realm))
+		{
+			$realm = 'EGroupware';
+		}
 
 		$username = $_SERVER['PHP_AUTH_USER']; $password = $_SERVER['PHP_AUTH_PW'];
 		// Support for basic auth when using PHP CGI (what about digest auth?)
@@ -109,7 +112,10 @@ 
 		if (!isset($username) || !($sessionid = $GLOBALS['egw']->session->create($username, $password, 'text', true)))
 		{
 			// if the session class gives a reason why the login failed --> append it to the REALM
-			if ($GLOBALS['egw']->session->reason) $realm .= ': '.$GLOBALS['egw']->session->reason;
+			if ($GLOBALS['egw']->session->reason)
+			{
+				$realm .= ': '.$GLOBALS['egw']->session->reason;
+			}
 
 			header('WWW-Authenticate: Basic realm="'.$realm.'"');// draft-reschke-basicauth-enc-06 adds, accept-charset="'.translation::charset().'"');
 			self::digest_header($realm);
@@ -135,7 +141,8 @@ 
 			// replace \x encoded non-ascii chars in password, as they are used eg. by Thunderbird for German umlauts
 			if (strpos($password, '\\x') !== false)
 			{
-				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches){
+				$password = preg_replace_callback('/\\\\x([0-9A-F]{2})/i', function($matches)
+				{
 					return chr(hexdec($matches[1]));
 				}, $password);
 			}
@@ -163,7 +170,10 @@ 
 		if (!($GLOBALS['egw_info']['server']['auth_type'] == 'sql' && $GLOBALS['egw_info']['server']['sql_encryption_type'] == 'plain') ||
 			  $GLOBALS['egw_info']['server']['auth_type'] == 'ldap' && $GLOBALS['egw_info']['server']['ldap_encryption_type'] == 'plain')
 		{
-			if (self::ERROR_LOG) error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$username') return false (no plaintext passwords used)");
+			}
 			return false;	// no plain-text passwords used
 		}
 		// check for specific user, if given
@@ -171,10 +181,16 @@ 
 			$GLOBALS['egw_info']['server']['auth_type'] == 'sql' && substr($user_pw,0,7) != '{PLAIN}'))
 		{
 			unset($user_pw);
-			if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."('$realm','$username') return false (unknown user or NO plaintext password for user)");
+			}
 			return false;	// user does NOT exist, or has no plaintext passwords (ldap server requires real root_dn or special ACL!)
 		}
-		if (substr($user_pw,0,7) == '{PLAIN}') $user_pw = substr($user_pw,7);
+		if (substr($user_pw,0,7) == '{PLAIN}')
+		{
+			$user_pw = substr($user_pw,7);
+		}
 
 		if (self::ERROR_LOG)
 		{
@@ -196,7 +212,10 @@ 
 		{
 			$nonce = uniqid();
    			header('WWW-Authenticate: Digest realm="'.$realm.'",qop="auth",nonce="'.$nonce.'",opaque="'.md5($realm).'"');
-			if (self::ERROR_LOG) error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			if (self::ERROR_LOG)
+			{
+				error_log(__METHOD__."() offering digest auth for realm '$realm' using nonce='$nonce'");
+			}
 		}
 	}
 
@@ -211,7 +230,10 @@ 
 	 */
 	static public function is_valid($realm,$auth_digest=null,&$username=null,&$password=null)
 	{
-		if (is_null($auth_digest)) $auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		if (is_null($auth_digest))
+		{
+			$auth_digest = $_SERVER['PHP_AUTH_DIGEST'];
+		}
 
 		$data = self::parse_digest($auth_digest);
 
@@ -224,7 +246,10 @@ 
 
 		$valid_response = md5($A1.':'.$data['nonce'].':'.$data['nc'].':'.$data['cnonce'].':'.$data['qop'].':'.$A2);
 
-		if (self::ERROR_LOG) error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		if (self::ERROR_LOG)
+		{
+			error_log(__METHOD__."('$realm','$auth_digest','$username') response='$data[response]', valid_response='$valid_response' returning ".array2string($data['response'] === $valid_response));
+		}
 		return $data['response'] === $valid_response;
 	}
 
@@ -243,10 +268,16 @@ 
 		{
 			return false;
 		}
-		if (is_null($password)) $password = $user_pw;
+		if (is_null($password))
+		{
+			$password = $user_pw;
+		}
 
 		$A1 = md5($username . ':' . $realm . ':' . $password);
-		if (self::ERROR_LOG > 1) error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		if (self::ERROR_LOG > 1)
+		{
+			error_log(__METHOD__."('$realm','$username','$password') returning ".array2string($A1));
+		}
 		return $A1;
 	}
 

phpgwapi/inc/class.egw_exception.inc.php

Doc Comments +3 added lines

@@ -19,6 +19,9 @@
  */
 class Admin extends App
 {
+	/**
+	 * @param string $msg
+	 */
 	function __construct($msg=null,$code=102)
 	{
 		if (is_null($msg)) $msg = 'admin';

Spacing +12 added lines, -12 removed lines

@@ -27,7 +27,7 @@ 
 class egw_exception extends Exception
 {
 	// nothing fancy yet
-	function __construct($msg=null,$code=100,Exception $previous=null)
+	function __construct($msg = null, $code = 100, Exception $previous = null)
 	{
 		return parent::__construct($msg, $code, $previous);
 	}
@@ -45,11 +45,11 @@ 
 	 * @param string $msg =null message, default "Permission denied!"
 	 * @param int $code =100 numerical code, default 100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Permisson denied!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }
 
@@ -59,7 +59,7 @@ 
  */
 class egw_exception_no_permission_app extends egw_exception_no_permission
 {
-	function __construct($msg=null,$code=101)
+	function __construct($msg = null, $code = 101)
 	{
 		if (isset($GLOBALS['egw_info']['apps'][$msg]))
 		{
@@ -77,7 +77,7 @@ 
 						'"'.$app.'"');
 			}
 		}
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }
 
@@ -87,11 +87,11 @@ 
  */
 class egw_exception_no_permission_admin extends egw_exception_no_permission_app
 {
-	function __construct($msg=null,$code=102)
+	function __construct($msg = null, $code = 102)
 	{
 		if (is_null($msg)) $msg = 'admin';
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }
 
@@ -113,11 +113,11 @@ 
 	 * @param string $msg =null message, default "Entry not found!"
 	 * @param int $code =99 numerical code, default 2
 	 */
-	function __construct($msg=null,$code=2)
+	function __construct($msg = null, $code = 2)
 	{
 		if (is_null($msg)) $msg = lang('Entry not found!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }
 
@@ -152,11 +152,11 @@ 
 	 * @param string $msg =null message, default "Database error!"
 	 * @param int $code =100
 	 */
-	function __construct($msg=null,$code=100)
+	function __construct($msg = null, $code = 100)
 	{
 		if (is_null($msg)) $msg = lang('Database error!');
 
-		parent::__construct($msg,$code);
+		parent::__construct($msg, $code);
 	}
 }
 
@@ -203,7 +203,7 @@ 
 	 * @param string $msg
 	 * @param int $code
 	 */
-	function __construct($url,$app=null,$msg=null,$code=301)
+	function __construct($url, $app = null, $msg = null, $code = 301)
 	{
 		$this->url = $url;
 		$this->app = $app;

Braces +43 added lines, -13 removed lines

@@ -47,7 +47,10 @@ 
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Permisson denied!');
+		if (is_null($msg))
+		{
+			$msg = lang('Permisson denied!');
+		}
 
 		parent::__construct($msg,$code);
 	}
@@ -89,7 +92,10 @@ 
 {
 	function __construct($msg=null,$code=102)
 	{
-		if (is_null($msg)) $msg = 'admin';
+		if (is_null($msg))
+		{
+			$msg = 'admin';
+		}
 
 		parent::__construct($msg,$code);
 	}
@@ -99,7 +105,9 @@ 
  * User lacks a record level permission, eg. he's not the owner and has no grant from the owner
  *
  */
-class egw_exception_no_permission_record extends egw_exception_no_permission { }
+class egw_exception_no_permission_record extends egw_exception_no_permission
+{
+}
 
 /**
  * A record or application entry was not found for the given id
@@ -115,7 +123,10 @@ 
 	 */
 	function __construct($msg=null,$code=2)
 	{
-		if (is_null($msg)) $msg = lang('Entry not found!');
+		if (is_null($msg))
+		{
+			$msg = lang('Entry not found!');
+		}
 
 		parent::__construct($msg,$code);
 	}
@@ -126,20 +137,26 @@ 
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class egw_exception_assertion_failed extends egw_exception { }
+class egw_exception_assertion_failed extends egw_exception
+{
+}
 
 /**
  * A method or function was called with a wrong or missing parameter
  *
  * As you get this only by an error in the code or during development, the message does not need to be translated
  */
-class egw_exception_wrong_parameter extends egw_exception_assertion_failed { }
+class egw_exception_wrong_parameter extends egw_exception_assertion_failed
+{
+}
 
 /**
  * Wrong or missing required user input: message should be translated so it can be shown directly to the user
  *
  */
-class egw_exception_wrong_userinput extends egw_exception_assertion_failed { }
+class egw_exception_wrong_userinput extends egw_exception_assertion_failed
+{
+}
 
 /**
  * Exception thrown by the egw_db class for everything not covered by extended classed below
@@ -154,7 +171,10 @@ 
 	 */
 	function __construct($msg=null,$code=100)
 	{
-		if (is_null($msg)) $msg = lang('Database error!');
+		if (is_null($msg))
+		{
+			$msg = lang('Database error!');
+		}
 
 		parent::__construct($msg,$code);
 	}
@@ -163,27 +183,37 @@ 
 /**
  * Storing the row violates a unique key constrain
  */
-class egw_exception_db_not_unique extends egw_exception_db { }
+class egw_exception_db_not_unique extends egw_exception_db
+{
+}
 
 /**
  *  Can not connect to database: eg. database down, wrong host, name or credentials
  */
-class egw_exception_db_connection extends egw_exception_db { }
+class egw_exception_db_connection extends egw_exception_db
+{
+}
 
 /**
  * PHP lackst support for configured database type
  */
-class egw_exception_db_support extends egw_exception_db { }
+class egw_exception_db_support extends egw_exception_db
+{
+}
 
 /**
  * Classic invalid SQL error
  */
-class egw_exception_db_invalid_sql extends egw_exception_db { }
+class egw_exception_db_invalid_sql extends egw_exception_db
+{
+}
 
 /**
  * EGroupware not (fully) installed, visit setup
  */
-class egw_exception_db_setup extends egw_exception_db { }
+class egw_exception_db_setup extends egw_exception_db
+{
+}
 
 /**
  * Allow callbacks to request a redirect

phpgwapi/inc/class.egw_favorites.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -187,7 +187,7 @@
 	 * @param string $action "add" or "delete"
 	 * @param boolean|int|String $group ID of the group to create the favorite for, or 'all' for all users
 	 * @param array $filters key => value pairs for the filter
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function set_favorite($app, $_name, $action, $group, $filters = array())
 	{

Spacing +22 added lines, -23 removed lines

@@ -38,7 +38,7 @@ 
 	 *
 	 * @return array with a single sidebox menu item (array) containing html for favorites
 	 */
-	public static function list_favorites($app, $default=null)
+	public static function list_favorites($app, $default = null)
 	{
 		if (!$app)
 		{
@@ -54,7 +54,7 @@ 
 		$target = 'favorite_sidebox_'.$app;
 
 		/* @var $filters array an array of favorites*/
-		$filters =  self::get_favorites($app);
+		$filters = self::get_favorites($app);
 		$is_admin = $GLOBALS['egw_info']['user']['apps']['admin'];
 		$html = "<span id='$target' class='ui-helper-clearfix sidebox-favorites'><ul class='ui-menu ui-widget-content ui-corner-all favorites' role='listbox'>\n";
 
@@ -65,25 +65,24 @@ 
 		}
 
 		// Get link for if there is no nextmatch - this is the fallback
-		$registry = egw_link::get_registry($app,'list');
+		$registry = egw_link::get_registry($app, 'list');
 		if (!$registry)
 		{
 			$registry = egw_link::get_registry($app, 'index');
 		}
-		foreach($filters as $name => $filter)
+		foreach ($filters as $name => $filter)
 		{
 			//filter must not be empty if there's one, ignore it at the moment but it need to be checked how it got there in database
 			if (!$filter)
 			{
-				error_log(__METHOD__.'Favorite filter is not suppose to be empty, it should be an array. filter = '. array2string($filters[$name]));
+				error_log(__METHOD__.'Favorite filter is not suppose to be empty, it should be an array. filter = '.array2string($filters[$name]));
 				continue;
 			}
 			$li = "<li data-id='$name' data-group='{$filter['group']}' class='ui-menu-item' role='menuitem'>\n";
 			$li .= '<a href="#" class="ui-corner-all" tabindex="-1">';
-			$li .= "<div class='" . ((string)$name === (string)$default_filter ? 'ui-icon ui-icon-heart' : 'sideboxstar') . "'></div>".
+			$li .= "<div class='".((string)$name === (string)$default_filter ? 'ui-icon ui-icon-heart' : 'sideboxstar')."'></div>".
 				$filter['name'];
-			$li .= ($filter['group'] != false && !$is_admin || $name === 'blank' ? "" :
-				"<div class='ui-icon ui-icon-trash' title='" . lang('Delete') . "'></div>");
+			$li .= ($filter['group'] != false && !$is_admin || $name === 'blank' ? "" : "<div class='ui-icon ui-icon-trash' title='".lang('Delete')."'></div>");
 			$li .= "</a></li>\n";
 			//error_log(__METHOD__."() $name, filter=".array2string($filter)." --> ".$li);
 			$html .= $li;
@@ -91,7 +90,7 @@ 
 
 		// If were're here, the app supports favorites, so add a 'Add' link too
 		$html .= "<li data-id='add' class='ui-menu-item' role='menuitem'><a href='javascript:app.$app.add_favorite()' class='ui-corner-all'>";
-		$html .= html::image($app, 'new') . lang('Add current'). '</a></li>';
+		$html .= html::image($app, 'new').lang('Add current').'</a></li>';
 
 		$html .= '</ul></span>';
 
@@ -113,7 +112,7 @@ 
 	 * @return (array|boolean) An array of sorted favorites or False if there's no preferenced sorted list
 	 *
 	 */
-	public static function get_fav_sort_pref ($app)
+	public static function get_fav_sort_pref($app)
 	{
 		$fav_sorted_list = array();
 
@@ -153,13 +152,13 @@ 
 		$fav_sort_pref = self::get_fav_sort_pref($app);
 
 		// Look through all preferences & pull out favorites
-		foreach((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $pref_name => $pref)
+		foreach ((array)$GLOBALS['egw_info']['user']['preferences'][$app] as $pref_name => $pref)
 		{
-			if(strpos($pref_name, $pref_prefix) === 0)
+			if (strpos($pref_name, $pref_prefix) === 0)
 			{
-				if(!is_array($pref)) continue;	// old favorite
+				if (!is_array($pref)) continue; // old favorite
 
-				$favorites[(string)substr($pref_name,strlen($pref_prefix))] = $pref;
+				$favorites[(string)substr($pref_name, strlen($pref_prefix))] = $pref;
 			}
 		}
 		if (is_array($fav_sort_pref))
@@ -168,7 +167,7 @@ 
 			{
 				$sorted_list[$key] = $favorites[$key];
 			}
-			$favorites = array_merge($sorted_list,$favorites);
+			$favorites = array_merge($sorted_list, $favorites);
 		}
 		return $favorites;
 	}
@@ -200,7 +199,7 @@ 
 			}
 			else
 			{
-				foreach($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $gid)
+				foreach ($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true) as $gid)
 				{
 					$prefs = new preferences($gid);
 					$prefs->read_repository();
@@ -212,7 +211,7 @@ 
 				}
 			}
 		}
-		if($group && $GLOBALS['egw_info']['apps']['admin'] && $group !== 'all')
+		if ($group && $GLOBALS['egw_info']['apps']['admin'] && $group !== 'all')
 		{
 			$prefs = new preferences(is_numeric($group) ? $group : $GLOBALS['egw_info']['user']['account_id']);
 		}
@@ -223,7 +222,7 @@ 
 		$prefs->read_repository();
 		$type = $group === "all" ? "default" : "user";
 		//error_log(__METHOD__."('$app', '$name', '$action', ".array2string($group).", ...) pref_name=$pref_name, type=$type");
-		if($action == "add")
+		if ($action == "add")
 		{
 			$filters = array(
 				// This is the name as user entered it, minus tags
@@ -231,9 +230,9 @@ 
 				'group' => $group ? $group : false,
 				'state' => $filters
 			);
-			$pref_name = "favorite_".preg_replace('/[^A-Za-z0-9-_]/','_',$name);
-			$result = $prefs->add($app,$pref_name,$filters,$type);
-			$pref = $prefs->save_repository(false,$type);
+			$pref_name = "favorite_".preg_replace('/[^A-Za-z0-9-_]/', '_', $name);
+			$result = $prefs->add($app, $pref_name, $filters, $type);
+			$pref = $prefs->save_repository(false, $type);
 
 			// Update preferences client side, or it could disappear
 			egw_json_response::get()->call('egw.set_preferences', (array)$pref[$app], $app);
@@ -243,8 +242,8 @@ 
 		}
 		else if ($action == "delete")
 		{
-			$result = $prefs->delete($app,$pref_name, $type);
-			$pref = $prefs->save_repository(false,$type);
+			$result = $prefs->delete($app, $pref_name, $type);
+			$pref = $prefs->save_repository(false, $type);
 
 			// Update preferences client side, or it could come back
 			egw_json_response::get()->call('egw.set_preferences', (array)$pref[$app], $app);

Braces +5 added lines, -1 removed lines

@@ -161,7 +161,11 @@
 		{
 			if(strpos($pref_name, $pref_prefix) === 0)
 			{
-				if(!is_array($pref)) continue;	// old favorite
+				if(!is_array($pref))
+				{
+					continue;
+				}
+				// old favorite
 
 				$favorites[(string)substr($pref_name,strlen($pref_prefix))] = $pref;
 			}

phpgwapi/inc/class.egw_find_iterator.inc.php

Doc Comments +15 added lines

@@ -18,6 +18,9 @@ 
 define("FILTER_DISPLAY", -1); //The element filtered should not be returned to the caller of find, it should not be displayed
 define("FILTER_ALL", -2); //The element didn't pass the filter
 
+/**
+ * @param boolean $isurl
+ */
 function translate_path($path, $isurl) {
 	return $isurl ? $path : egw_vfs::PREFIX.parse_url($path, PHP_URL_PATH);
 }
@@ -39,6 +42,11 @@ 
 	public $isdot = false;
 	public $filterstate = FILTER_ALL;
 
+	/**
+	 * @param string $path
+	 * @param boolean $isurl
+	 * @param boolean $need_mime
+	 */
 	public function __construct($path, $isurl, $need_mime)
 	{
 		//Copy the given parameters
@@ -372,6 +380,13 @@ 
 		}
 	}
 
+	/**
+	 * @param RecursiveDirectoryIterator $iterator
+	 * @param boolean $follow
+	 * @param boolean $url
+	 * @param boolean $needmime
+	 * @param boolean $sort
+	 */
 	public function __construct($iterator, &$filter, $follow, $url, $needmime, 
 		$sort, $sortfunc)
 	{

Spacing +20 added lines, -22 removed lines

@@ -50,9 +50,9 @@ 
 		//Set filename, path and path + name as this information will most likely
 		//be needed
 		$paths = $this->isurl ? explode('/', $path) : explode('/', parse_url($path, PHP_URL_PATH));
-		$this->name = implode('/',$paths);
+		$this->name = implode('/', $paths);
 		$this->filename = array_pop($paths);
-		$this->path = implode('/',$paths).'/';
+		$this->path = implode('/', $paths).'/';
 		$this->is_dot = ($this->filename == '.') || ($this->filename == '..');
 	}
 	
@@ -61,8 +61,7 @@ 
 		//Check whether the stat data has already been created, if not, create it
 		if ($this->stat === null)
 		{
-			$this->stat = $this->isurl ? lstat($this->base_path) :
-				egw_vfs::url_stat($this->base_path, STREAM_URL_STAT_LINK);
+			$this->stat = $this->isurl ? lstat($this->base_path) : egw_vfs::url_stat($this->base_path, STREAM_URL_STAT_LINK);
 			
 			//Remove numerical indices 0-12
 			$this->stat = array_slice($this->stat, 13);
@@ -172,7 +171,7 @@ 
 		if ($argument < 0)
 			return $value < abs($argument);
 		
-		return $value > (int) substr($argument,1);
+		return $value > (int)substr($argument, 1);
 	}
 	
 	public function __construct($options)
@@ -196,19 +195,19 @@ 
 		
 		//Convert the (probably) given path/name filters to regular expressions
 		if (isset($options['name']) && !isset($options['name_preg'])) // change from simple *,? wildcards to preg regular expression once
-			$this->name_preg = '/^'.str_replace(array('\\?','\\*'),
-				array('.{1}','.*'), preg_quote($options['name'])).'$/i';
+			$this->name_preg = '/^'.str_replace(array('\\?', '\\*'),
+				array('.{1}', '.*'), preg_quote($options['name'])).'$/i';
 		
 		if (isset($options['path']) && !isset($options['preg_path'])) // change from simple *,? wildcards to preg regular expression once
-			$this->path_preg = '/^'.str_replace(array('\\?','\\*'),
-				array('.{1}','.*'), preg_quote($options['path'])).'$/i';
+			$this->path_preg = '/^'.str_replace(array('\\?', '\\*'),
+				array('.{1}', '.*'), preg_quote($options['path'])).'$/i';
 		
 		//Translate username to uid
 		if (!isset($options['uid']))
 		{
 			if (isset($options['user']))
 			{
-				$this->uid = $GLOBALS['egw']->accounts->name2id($options['user'],'account_lid','u');
+				$this->uid = $GLOBALS['egw']->accounts->name2id($options['user'], 'account_lid', 'u');
 			}
 			elseif (isset($options['nouser']))
 			{
@@ -225,7 +224,7 @@ 
 		{
 			if (isset($options['group']))
 			{
-				$this->gid = abs($GLOBALS['egw']->accounts->name2id($options['group'],'account_lid','g'));
+				$this->gid = abs($GLOBALS['egw']->accounts->name2id($options['group'], 'account_lid', 'g'));
 			}
 			elseif (isset($options['nogroup']))
 			{
@@ -287,10 +286,10 @@ 
 				
 				//Excludes files where the creation/last modification timestamps is greater than
 				//the given time
-				if ($this->cmin && !self::check_num(round((time()-$stat['ctime'])/60), $this->cmin) ||
-					$this->mmin && !self::check_num(round((time()-$stat['mtime'])/60), $this->mmin) ||
-					$this->ctime && !self::check_num(round((time()-$stat['ctime'])/86400), $this->ctime) ||
-					$this->mtime && !self::check_num(round((time()-$stat['mtime'])/86400), $this->mtime))
+				if ($this->cmin && !self::check_num(round((time() - $stat['ctime']) / 60), $this->cmin) ||
+					$this->mmin && !self::check_num(round((time() - $stat['mtime']) / 60), $this->mmin) ||
+					$this->ctime && !self::check_num(round((time() - $stat['ctime']) / 86400), $this->ctime) ||
+					$this->mtime && !self::check_num(round((time() - $stat['mtime']) / 86400), $this->mtime))
 				{
 					return $dir_filter;
 				}
@@ -312,7 +311,7 @@ 
 					list($type, $subtype) = explode('/', $this->mime);
 					
 					// no subtype (eg. 'image') --> check only the main type
-					if ($sub_type || substr($this->mime, 0, strlen($type)+1) != $type.'/')
+					if ($sub_type || substr($this->mime, 0, strlen($type) + 1) != $type.'/')
 						return $dir_filter; // wrong mime-type
 				}
 			}
@@ -349,7 +348,7 @@ 
 		$this->elements = array();
 		
 		//Loop through each element of the recursive directory iterator
-		foreach($this->iterator as $key => $value)
+		foreach ($this->iterator as $key => $value)
 		{
 			//Create a new egw_find_file class for each entry and filter it
 			$findfile = new egw_find_file( 
@@ -532,7 +531,7 @@ 
 		if ($findfile->filterstate >= FILTER_OK)
 		{
 			$this->index++;
-			if (($this->index-1 >= $this->lower_limit) && 
+			if (($this->index - 1 >= $this->lower_limit) && 
 				(($this->mindepth === null) || count($this->iterator_stack) >= $this->mindepth))
 			{
 				$this->current_cache = $findfile->get_result($this->pairs);
@@ -629,8 +628,7 @@ 
 		$this->mindepth = isset($options['mindepth']) ? $options['mindepth'] : null;
 		$this->maxdepth = isset($options['maxdepth']) ? $options['maxdepth'] : null;
 		$this->depth = isset($options['depth']) ? $options['depth'] : false;
-		$this->dirsontop = isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : 
-			(isset($options['maxdepth']) && $options['maxdepth']>0);
+		$this->dirsontop = isset($options['dirsontop']) ? (boolean)$options['dirsontop'] : (isset($options['maxdepth']) && $options['maxdepth'] > 0);
 		$this->sort = isset($options['sort']) ? (($options['sort'] == 'ASC') ? 1 : -1) : 1;
 		$this->order = isset($options['order']) ? $options['order'] : null;
 		
@@ -656,7 +654,7 @@ 
 		}
 	}
 	
-	public function __construct($base, $options=null, $pairs = false)
+	public function __construct($base, $options = null, $pairs = false)
 	{
 		//_debug_array($options);
 		$this->pairs = $pairs;
@@ -674,7 +672,7 @@ 
 		}
 		
 		//Add the default url prefix to every path if url is not set.
-		foreach($this->base as $key => $path)
+		foreach ($this->base as $key => $path)
 			$this->base[$key] = translate_path($path, $this->url);
 
 		$this->rewind();

Braces +70 added lines, -25 removed lines

@@ -18,7 +18,8 @@ 
 define("FILTER_DISPLAY", -1); //The element filtered should not be returned to the caller of find, it should not be displayed
 define("FILTER_ALL", -2); //The element didn't pass the filter
 
-function translate_path($path, $isurl) {
+function translate_path($path, $isurl)
+{
 	return $isurl ? $path : egw_vfs::PREFIX.parse_url($path, PHP_URL_PATH);
 }
 
@@ -75,7 +76,9 @@ 
 	{
 		//Check if the mime data has already been read, if not, read it
 		if ($this->mime === null)
-			$res['mime'] = egw_vfs::mime_content_type($this->base_path);
+		{
+					$res['mime'] = egw_vfs::mime_content_type($this->base_path);
+		}
 			
 		return $this->mime;
 	}
@@ -92,7 +95,9 @@ 
 			);
 			
 			if ($this->props['islink'])
-				$this->props['linktarget'] = readlink($this->base_path);
+			{
+							$this->props['linktarget'] = readlink($this->base_path);
+			}
 		}
 		
 		return $this->props;
@@ -112,7 +117,9 @@ 
 				$this->result['path'] = $this->name;
 				$this->result['name'] = $this->filename;
 				if ($this->need_mime)
-					$this->result['mime'] = $this->get_mime();
+				{
+									$this->result['mime'] = $this->get_mime();
+				}
 			}
 			else
 			{
@@ -167,10 +174,14 @@ 
 	private static function check_num($value, $argument)
 	{
 		if (is_int($argument) && $argument >= 0 || $argument[0] != '-' && $argument[0] != '+')
-			return $value == $argument;
+		{
+					return $value == $argument;
+		}
 		
 		if ($argument < 0)
-			return $value < abs($argument);
+		{
+					return $value < abs($argument);
+		}
 		
 		return $value > (int) substr($argument,1);
 	}
@@ -195,13 +206,19 @@ 
 		$this->mime = isset($options['mime']) ? $options['mime'] : null;
 		
 		//Convert the (probably) given path/name filters to regular expressions
-		if (isset($options['name']) && !isset($options['name_preg'])) // change from simple *,? wildcards to preg regular expression once
+		if (isset($options['name']) && !isset($options['name_preg']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 			$this->name_preg = '/^'.str_replace(array('\\?','\\*'),
 				array('.{1}','.*'), preg_quote($options['name'])).'$/i';
+		}
 		
-		if (isset($options['path']) && !isset($options['preg_path'])) // change from simple *,? wildcards to preg regular expression once
+		if (isset($options['path']) && !isset($options['preg_path']))
+		{
+			// change from simple *,? wildcards to preg regular expression once
 			$this->path_preg = '/^'.str_replace(array('\\?','\\*'),
 				array('.{1}','.*'), preg_quote($options['path'])).'$/i';
+		}
 		
 		//Translate username to uid
 		if (!isset($options['uid']))
@@ -244,11 +261,15 @@ 
 		{
 			//Exclude directory and parent directory
 			if ($findfile->isdot)
-				return FILTER_ALL;
+			{
+							return FILTER_ALL;
+			}
 			
 			//Exclude hidden files			 
 			if (!$this->hidden && (($findfile->filename[0] == '.') || ($findfile->filename == 'Thumbs.db')))
-				return FILTER_ALL;
+			{
+							return FILTER_ALL;
+			}
 			
 			//Read the file properties (like (is link etc.))
 			$props = $findfile->get_props();
@@ -256,19 +277,26 @@ 
 			//If this is a directory, we probably need to keep this entry to crawl
 			//for files inside this directory. That's what FILTER_DISPLAY is for
 			if ($props['isdir'] && (!($props['islink']) || $this->follow))
-				$dir_filter = FILTER_DISPLAY; 
-			else
-				$dir_filter = FILTER_ALL;
+			{
+							$dir_filter = FILTER_DISPLAY;
+			}
+			else {
+							$dir_filter = FILTER_ALL;
+			}
 			
 			//Exclude files/directories based on the given regular expression
 			if ($this->name_preg && !preg_match($this->name_preg, $findfile->filename) || 
 				$this->path_preg && !preg_match($this->path_preg, $findfile->path))
-				return $dir_filter;
+			{
+							return $dir_filter;
+			}
 			
 			//Exclude directories/symlinks/files			
 			if ($this->type && ($this->type == 'd') == !($props['isdir'] && !$props['islink']) ||
 				(($this->type == 'F') && ($props['isdir'] || $props['islink'])))
-				return $dir_filter;
+			{
+							return $dir_filter;
+			}
 			
 			if (($this->cmin !== null) || ($this->mmin !== null) || 
 				($this->ctime !== null) || ($this->mtime !== null) ||
@@ -297,15 +325,19 @@ 
 				
 				//Check filesize
 				if (($this->size !== null) && !self::check_num($stat['size'], $this->size) ||
-					(!$this->empty && $stat['size'] <= 0)) //TODO Check this
+					(!$this->empty && $stat['size'] <= 0))
+				{
+					//TODO Check this
 				{
 					return $dir_filter;
 				}
+				}
 			}
 			
 			//Check the mime type and subtype. As loading the mime type takes the
 			//longest time, it is postponed as long as possible
-			if ($this->mime !== null) {
+			if ($this->mime !== null)
+			{
 				$mime = $findfile->get_mime();
 				if ($options['mime'] != $mime)
 				{
@@ -313,7 +345,10 @@ 
 					
 					// no subtype (eg. 'image') --> check only the main type
 					if ($sub_type || substr($this->mime, 0, strlen($type)+1) != $type.'/')
-						return $dir_filter; // wrong mime-type
+					{
+											return $dir_filter;
+					}
+					// wrong mime-type
 				}
 			}
 			
@@ -557,7 +592,7 @@ 
 			while (($cur != null) && (!$this->upper_limit || ($this->index <= $this->upper_limit)))
 			{
 				$skip = false;
-				if ($cur->valid()) 
+				if ($cur->valid())
 				{
 					//Get a copy of the current file state
 					$findfile = $cur->current();
@@ -573,12 +608,16 @@ 
 					}
 					
 					//Step the current element one further and get the (probably) new iterator
-					if (!$skip)	
-						$cur->next();
+					if (!$skip)
+					{
+											$cur->next();
+					}
 					$cur = $this->cur_iterator();
 					
 					if (!$skip && $this->output_directory($findfile))
-						break;
+					{
+											break;
+					}
 				}
 				
 				//If the current iterator doesn't contain any valid element, we're at the
@@ -608,7 +647,9 @@ 
 							$findfile = $cur->current();
 							$cur->next();
 							if ($this->output_directory($findfile))
-								break;
+							{
+															break;
+							}
 						}
 					}
 				}
@@ -620,7 +661,9 @@ 
 	{
 		//If options is not set, make it an empty array
 		if (!$options)
-			$options = array();
+		{
+					$options = array();
+		}
 		
 		//Create the filter object (passed to other objects by reference) and
 		//parse some other options relevant for this base class		
@@ -675,7 +718,9 @@ 
 		
 		//Add the default url prefix to every path if url is not set.
 		foreach($this->base as $key => $path)
-			$this->base[$key] = translate_path($path, $this->url);
+		{
+					$this->base[$key] = translate_path($path, $this->url);
+		}
 
 		$this->rewind();
 	}

phpgwapi/inc/class.egw_framework.inc.php

Doc Comments +5 added lines, -17 removed lines

@@ -987,7 +987,7 @@ 
 	/**
 	 * Returns html with user and time
 	 *
-	 * @return void
+	 * @return string
 	 */
 	protected static function _user_time_info()
 	{
@@ -1115,7 +1115,7 @@ 
 	 *
 	 * @param string $username =null username for regular basic auth
 	 * @param string $password =null password --------- " ----------
-	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
+	 * @return resource context to use with file_get_context/fopen or null if no proxy configured
 	 */
 	public static function proxy_context($username=null, $password=null)
 	{
@@ -1460,7 +1460,7 @@ 
 	 * Parse beginning of given CSS file for /*@import url("...") statements
 	 *
 	 * @param string $path EGroupware relative path eg. /phpgwapi/templates/default/some.css
-	 * @return array parsed pathes (EGroupware relative) including $path itself
+	 * @return string[] parsed pathes (EGroupware relative) including $path itself
 	 */
 	protected static function resolve_css_includes($path, &$pathes=array())
 	{
@@ -1577,7 +1577,6 @@ 
 	 *
 	 * Themes are css file in the template directory
 	 *
-	 * @param string $themes_dir ='css'
 	 */
 	function list_themes()
 	{
@@ -1761,11 +1760,6 @@ 
 	/**
 	* Add menu items to the topmenu template class to be displayed
 	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
 	*/
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
@@ -1974,12 +1968,6 @@ 
 	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
 	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
 	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
-	*
-	* @discuss The browser specific option loads the file which is in the correct
-	*          browser folder. Supported folder are those supported by class.browser.inc.php
-	*
-	* @returns bool was the file found?
 	*/
 	static function validate_file($package, $file=null, $app='phpgwapi')
 	{
@@ -2090,7 +2078,7 @@ 
 	 * Generate bundle url(s) for given js files
 	 *
 	 * @param array $js_includes
-	 * @param int& $max_modified =null on return maximum modification time of bundle
+	 * @param integer $max_modified =null on return maximum modification time of bundle
 	 * @return array js-files (can be more then one, if one of given files can not be bundeled)
 	 */
 	protected static function bundle_urls(array $js_includes, &$max_modified=null)
@@ -2382,7 +2370,7 @@ 
 	 * @param string $action "add" or "delete"
 	 * @param boolean|int|string $group ID of the group to create the favorite for, or 'all' for all users
 	 * @param array $filters =array() key => value pairs for the filter
-	 * @return boolean Success
+	 * @return boolean|null Success
 	 */
 	public static function ajax_set_favorite($app, $name, $action, $group, $filters = array())
 	{

Indentation +72 added lines, -72 removed lines

@@ -53,16 +53,16 @@ 
 	var $template_dir;
 
 	/**
-	* true if $this->header() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->header() was called
+	 *
+	 * @var boolean
+	 */
 	static $header_done = false;
 	/**
-	* true if $this->navbar() was called
-	*
-	* @var boolean
-	*/
+	 * true if $this->navbar() was called
+	 *
+	 * @var boolean
+	 */
 	static $navbar_done = false;
 
 	/**
@@ -582,7 +582,7 @@ 
 	 *
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
-	*/
+	 */
 	function login_screen($extra_vars, $change_passwd=null)
 	{
 		self::csp_frame_src_attrs(array());	// array() no external frame-sources
@@ -759,8 +759,8 @@ 
 	}
 
 	/**
-	* displays a login denied message
-	*/
+	 * displays a login denied message
+	 */
 	function denylogin_screen()
 	{
 		$tmpl = new Template(EGW_SERVER_ROOT.$this->template_dir);
@@ -822,7 +822,7 @@ 
 		ob_start();
 		// Include the apps footer files if it exists
 		if (EGW_APP_INC != EGW_API_INC &&	// this prevents an endless inclusion on the homepage
-			                                // (some apps set currentapp in hook_home => it's not releyable)
+											// (some apps set currentapp in hook_home => it's not releyable)
 			(file_exists (EGW_APP_INC . '/footer.inc.php') || isset($_GET['menuaction'])) &&
 			$GLOBALS['egw_info']['flags']['currentapp'] != 'home' &&
 			$GLOBALS['egw_info']['flags']['currentapp'] != 'login' &&
@@ -1649,13 +1649,13 @@ 
 	}
 
 	/**
-	* Compile entries for topmenu:
-	* - regular items: links
-	* - info items
-	*
-	* @param array $vars
-	* @param array $apps
-	*/
+	 * Compile entries for topmenu:
+	 * - regular items: links
+	 * - info items
+	 *
+	 * @param array $vars
+	 * @param array $apps
+	 */
 	function topmenu(array $vars,array $apps)
 	{
 		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
@@ -1759,39 +1759,39 @@ 
 	}
 
 	/**
-	* Add menu items to the topmenu template class to be displayed
-	*
-	* @param array $app application data
-	* @param mixed $alt_label string with alternative menu item label default value = null
-	* @param string $urlextra string with alternate additional code inside <a>-tag
-	* @access protected
-	* @return void
-	*/
+	 * Add menu items to the topmenu template class to be displayed
+	 *
+	 * @param array $app application data
+	 * @param mixed $alt_label string with alternative menu item label default value = null
+	 * @param string $urlextra string with alternate additional code inside <a>-tag
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
 
 	/**
-	* Add info items to the topmenu template class to be displayed
-	*
-	* @param string $content html of item
-	* @param string $id =null
-	* @access protected
-	* @return void
-	*/
+	 * Add info items to the topmenu template class to be displayed
+	 *
+	 * @param string $content html of item
+	 * @param string $id =null
+	 * @access protected
+	 * @return void
+	 */
 	abstract function _add_topmenu_info_item($content, $id=null);
 
 	static $top_menu_extra = array();
 
 	/**
-	* Called by hooks to add an entry in the topmenu location.
-	* Extra entries will be added just before Logout.
-	*
-	* @param string $id unique element id
-	* @param string $url Address for the entry to link to
-	* @param string $title Text displayed for the entry
-	* @param string $target Optional, so the entry can open in a new page or popup
-	* @access public
-	* @return void
-	*/
+	 * Called by hooks to add an entry in the topmenu location.
+	 * Extra entries will be added just before Logout.
+	 *
+	 * @param string $id unique element id
+	 * @param string $url Address for the entry to link to
+	 * @param string $title Text displayed for the entry
+	 * @param string $target Optional, so the entry can open in a new page or popup
+	 * @access public
+	 * @return void
+	 */
 	public static function add_topmenu_item($id,$url,$title,$target = '')
 	{
 		$entry['name'] = $id;
@@ -1803,16 +1803,16 @@ 
 	}
 
 	/**
-	* called by hooks to add an icon in the topmenu info location
-	*
-	* @param string $id unique element id
-	* @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
-	* @param string $iconlink where the icon links to
-	* @param booleon $blink set true to make the icon blink
-	* @param mixed $tooltip string containing the tooltip html, or null of no tooltip
-	* @access public
-	* @return void
-	*/
+	 * called by hooks to add an icon in the topmenu info location
+	 *
+	 * @param string $id unique element id
+	 * @param string $icon_src src of the icon image. Make sure this nog height then 18pixels
+	 * @param string $iconlink where the icon links to
+	 * @param booleon $blink set true to make the icon blink
+	 * @param mixed $tooltip string containing the tooltip html, or null of no tooltip
+	 * @access public
+	 * @return void
+	 */
 	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
 
 	/**
@@ -1963,24 +1963,24 @@ 
 	protected static $js_include_mgr;
 
 	/**
-	* Checks to make sure a valid package and file name is provided
-	*
-	* Example call syntax:
-	* a) egw_framework::validate_file('jscalendar','calendar')
-	*    --> /phpgwapi/js/jscalendar/calendar.js
-	* b) egw_framework::validate_file('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
-	*    --> /phpgwapi/inc/calendar-setup.js?lang=de
-	*
-	* @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
-	* @param string|array $file =null file to be included - no ".js" on the end or array with get params
-	* @param string $app ='phpgwapi' application directory to search - default = phpgwapi
-	* @param boolean $append =true should the file be added
-	*
-	* @discuss The browser specific option loads the file which is in the correct
-	*          browser folder. Supported folder are those supported by class.browser.inc.php
-	*
-	* @returns bool was the file found?
-	*/
+	 * Checks to make sure a valid package and file name is provided
+	 *
+	 * Example call syntax:
+	 * a) egw_framework::validate_file('jscalendar','calendar')
+	 *    --> /phpgwapi/js/jscalendar/calendar.js
+	 * b) egw_framework::validate_file('/phpgwapi/inc/calendar-setup.js',array('lang'=>'de'))
+	 *    --> /phpgwapi/inc/calendar-setup.js?lang=de
+	 *
+	 * @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
+	 * @param string|array $file =null file to be included - no ".js" on the end or array with get params
+	 * @param string $app ='phpgwapi' application directory to search - default = phpgwapi
+	 * @param boolean $append =true should the file be added
+	 *
+	 * @discuss The browser specific option loads the file which is in the correct
+	 *          browser folder. Supported folder are those supported by class.browser.inc.php
+	 *
+	 * @returns bool was the file found?
+	 */
 	static function validate_file($package, $file=null, $app='phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);

Spacing +236 added lines, -238 removed lines

@@ -101,15 +101,15 @@ 
 		$class = $GLOBALS['egw_info']['server']['template_set'].'_framework';
 		if (!class_exists($class))	// first try to autoload the class
 		{
-			require_once($file=EGW_INCLUDE_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.$class.'.inc.php');
-			if (!in_array($file,(array)$_SESSION['egw_required_files']))
+			require_once($file = EGW_INCLUDE_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.$class.'.inc.php');
+			if (!in_array($file, (array)$_SESSION['egw_required_files']))
 			{
-				$_SESSION['egw_required_files'][] = $file;	// automatic load the used framework class, when the object get's restored
+				$_SESSION['egw_required_files'][] = $file; // automatic load the used framework class, when the object get's restored
 			}
 		}
 		// fall back to idots if a template does NOT support current user-agent
-		if ($class != 'idots_framework' && method_exists($class,'is_supported_user_agent') &&
-			!call_user_func(array($class,'is_supported_user_agent')))
+		if ($class != 'idots_framework' && method_exists($class, 'is_supported_user_agent') &&
+			!call_user_func(array($class, 'is_supported_user_agent')))
 		{
 			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
 			return self::factory();
@@ -138,13 +138,13 @@ 
 	 * @param string|array $set =array() 'unsafe-eval' and/or 'unsafe-inline' (without quotes!) or URL (incl. protocol!)
 	 * @return string with attributes eg. "'unsafe-eval' 'unsafe-inline'"
 	 */
-	public static function csp_script_src_attrs($set=null)
+	public static function csp_script_src_attrs($set = null)
 	{
-		foreach((array)$set as $attr)
+		foreach ((array)$set as $attr)
 		{
 			if (in_array($attr, array('none', 'self', 'unsafe-eval', 'unsafe-inline')))
 			{
-				$attr = "'$attr'";	// automatic add quotes
+				$attr = "'$attr'"; // automatic add quotes
 			}
 			if (!in_array($attr, self::$csp_script_src_attrs))
 			{
@@ -173,13 +173,13 @@ 
 	 * @param string|array $set =array() 'unsafe-inline' (without quotes!) and/or URL (incl. protocol!)
 	 * @return string with attributes eg. "'unsafe-inline'"
 	 */
-	public static function csp_style_src_attrs($set=null)
+	public static function csp_style_src_attrs($set = null)
 	{
-		foreach((array)$set as $attr)
+		foreach ((array)$set as $attr)
 		{
 			if (in_array($attr, array('none', 'self', 'unsafe-inline')))
 			{
-				$attr = "'$attr'";	// automatic add quotes
+				$attr = "'$attr'"; // automatic add quotes
 			}
 			if (!in_array($attr, self::$csp_style_src_attrs))
 			{
@@ -204,9 +204,9 @@ 
 	 * @param string|array $set =array() URL (incl. protocol!)
 	 * @return string with attributes eg. "'unsafe-inline'"
 	 */
-	public static function csp_connect_src_attrs($set=null)
+	public static function csp_connect_src_attrs($set = null)
 	{
-		foreach((array)$set as $attr)
+		foreach ((array)$set as $attr)
 		{
 			if (!in_array($attr, self::$csp_connect_src_attrs))
 			{
@@ -233,7 +233,7 @@ 
 	 * @param string|array $set =array() URL (incl. protocol!)
 	 * @return string with attributes eg. "'unsafe-inline'"
 	 */
-	public static function csp_frame_src_attrs($set=null)
+	public static function csp_frame_src_attrs($set = null)
 	{
 		// set frame-src attrs of API and apps via hook
 		if (!isset(self::$csp_frame_src_attrs) && !isset($set))
@@ -241,7 +241,7 @@ 
 			$frame_src = array('manual.egroupware.org', 'www.egroupware.org');
 			if (($app_additional = $GLOBALS['egw']->hooks->process('csp-frame-src')))
 			{
-				foreach($app_additional as $addtional)
+				foreach ($app_additional as $addtional)
 				{
 					if ($addtional) $frame_src = array_unique(array_merge($frame_src, $addtional));
 				}
@@ -251,7 +251,7 @@ 
 
 		if (!isset(self::$csp_frame_src_attrs)) self::$csp_frame_src_attrs = array();
 
-		foreach((array)$set as $attr)
+		foreach ((array)$set as $attr)
 		{
 			if (!in_array($attr, self::$csp_frame_src_attrs))
 			{
@@ -283,11 +283,11 @@ 
 
 		//$csp = "default-src * 'unsafe-eval' 'unsafe-inline'";	// allow everything
 		header("Content-Security-Policy: $csp");
-		header("X-Webkit-CSP: $csp");	// Chrome: <= 24, Safari incl. iOS
-		header("X-Content-Security-Policy: $csp");	// FF <= 22
+		header("X-Webkit-CSP: $csp"); // Chrome: <= 24, Safari incl. iOS
+		header("X-Content-Security-Policy: $csp"); // FF <= 22
 
 		// allow client-side to detect first load aka just logged in
-		$reload_count =& egw_cache::getSession(__CLASS__, 'framework-reload');
+		$reload_count = & egw_cache::getSession(__CLASS__, 'framework-reload');
 		self::$extra['framework-reload'] = (int)(bool)$reload_count++;
 	}
 
@@ -328,9 +328,9 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function link($url, $extravars = '', $link_app=null)
+	static function link($url, $extravars = '', $link_app = null)
 	{
-		unset($link_app);	// not used by required by function signature
+		unset($link_app); // not used by required by function signature
 		return $GLOBALS['egw']->session->link($url, $extravars);
 	}
 
@@ -342,7 +342,7 @@ 
 	 * @param string $link_app =null if appname or true, some templates generate a special link-handler url
 	 * @return string	The full url after processing
 	 */
-	static function redirect_link($url, $extravars='', $link_app=null)
+	static function redirect_link($url, $extravars = '', $link_app = null)
 	{
 		egw::redirect(self::link($url, $extravars), $link_app);
 	}
@@ -357,7 +357,7 @@ 
 	 * @param string $navbar =null show the navigation, default !$GLOBALS['egw_info']['flags']['nonavbar'], false gives a typical popu
 	 *
 	 */
-	function render($content,$app_header=null,$navbar=null)
+	function render($content, $app_header = null, $navbar = null)
 	{
 		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
 		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
@@ -406,12 +406,12 @@ 
 	 * @param string $with =null
 	 * @param string $msg_type =null 'error', 'warning' or 'success' (default)
 	 */
-	public static function refresh_opener($msg, $app, $id=null, $type=null, $targetapp=null, $replace=null, $with=null, $msg_type=null)
+	public static function refresh_opener($msg, $app, $id = null, $type = null, $targetapp = null, $replace = null, $with = null, $msg_type = null)
 	{
 		//error_log(__METHOD__.'('.array2string(func_get_args()).')');
 		self::$extra['refresh-opener'] = func_get_args();
 
-		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type);	// used only via func_get_args();
+		unset($msg, $app, $id, $type, $targetapp, $replace, $with, $msg_type); // used only via func_get_args();
 	}
 
 	/**
@@ -422,11 +422,11 @@ 
 	 * @param string $msg message to show
 	 * @param string $type ='success' 'error', 'warning' or 'success' (default)
 	 */
-	public static function message($msg, $type='success')
+	public static function message($msg, $type = 'success')
 	{
 		self::$extra['message'] = func_get_args();
 
-		unset($msg, $type);	// used only via func_get_args();
+		unset($msg, $type); // used only via func_get_args();
 	}
 
 	/**
@@ -436,12 +436,12 @@ 
 	 * @param string $target
 	 * @param string $popup
 	 */
-	public static function popup($link, $target='_blank', $popup='640x480')
+	public static function popup($link, $target = '_blank', $popup = '640x480')
 	{
 		// default params are not returned by func_get_args!
-		$args = func_get_args()+array(null, '_blank', '640x480');
+		$args = func_get_args() + array(null, '_blank', '640x480');
 
-		unset($link, $target, $popup);	// used only via func_get_args()
+		unset($link, $target, $popup); // used only via func_get_args()
 
 		if (egw_json_request::isJSONRequest())
 		{
@@ -458,7 +458,7 @@ 
 	 *
 	 * @param string $alert_msg ='' optional message to display as alert, before closing the window
 	 */
-	public static function window_close($alert_msg='')
+	public static function window_close($alert_msg = '')
 	{
 		//error_log(__METHOD__."()");
 		self::$extra['window-close'] = $alert_msg ? $alert_msg : true;
@@ -515,12 +515,12 @@ 
 	public static function get_extra()
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
-		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
+		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 && // do not run twice
 			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
 		{
 			$links = egw_link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
 			$apps = array();
-			foreach($links as $link)
+			foreach ($links as $link)
 			{
 				$apps[$link['app']][] = $link['id'];
 			}
@@ -538,7 +538,7 @@ 
 	 *
 	 * @return string with html
 	 */
-	abstract function header(array $extra=array());
+	abstract function header(array $extra = array());
 
 	/**
 	 * Returns the html from the body-tag til the main application area (incl. opening div tag)
@@ -558,7 +558,7 @@ 
 	 * @return boolean $consider_navbar_not_yet_called_as_true=true
 	 * @return boolean
 	 */
-	abstract function isTop($consider_navbar_not_yet_called_as_true=true);
+	abstract function isTop($consider_navbar_not_yet_called_as_true = true);
 
 	/**
 	 * Returns the content of one sidebox
@@ -568,7 +568,7 @@ 
 	 * @param array $file
 	 * @param string $type =null 'admin', 'preferences', 'favorites', ...
 	 */
-	abstract function sidebox($appname,$menu_title,$file,$type=null);
+	abstract function sidebox($appname, $menu_title, $file, $type = null);
 
 	/**
 	 * Returns the html from the closing div of the main application area to the closing html-tag
@@ -583,24 +583,24 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	*/
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
-		self::csp_frame_src_attrs(array());	// array() no external frame-sources
+		self::csp_frame_src_attrs(array()); // array() no external frame-sources
 
 		//error_log(__METHOD__."() this->template=$this->template, this->template_dir=$this->template_dir, get_class(this)=".get_class($this));
 		$tmpl = new Template(EGW_SERVER_ROOT.$this->template_dir);
 
 		$tmpl->set_file(array('login_form' => 'login.tpl'));
 
-		$tmpl->set_var('lang_message',$GLOBALS['loginscreenmessage']);
+		$tmpl->set_var('lang_message', $GLOBALS['loginscreenmessage']);
 
 		// hide change-password fields, if not requested
 		if (!$change_passwd)
 		{
-			$tmpl->set_block('login_form','change_password');
+			$tmpl->set_block('login_form', 'change_password');
 			$tmpl->set_var('change_password', '');
-			$tmpl->set_var('lang_password',lang('password'));
-			$tmpl->set_var('cd',check_logoutcode($_GET['cd']));
+			$tmpl->set_var('lang_password', lang('password'));
+			$tmpl->set_var('cd', check_logoutcode($_GET['cd']));
 			$tmpl->set_var('cd_class', isset($_GET['cd']) && $_GET['cd'] != 1 ? 'error' : '');
 			$last_loginid = $_COOKIE['last_loginid'];
 			$last_domain  = $_COOKIE['last_domain'];
@@ -609,9 +609,9 @@ 
 		}
 		else
 		{
-			$tmpl->set_var('lang_password',lang('Old password'));
-			$tmpl->set_var('lang_new_password',lang('New password'));
-			$tmpl->set_var('lang_repeat_password',lang('Repeat password'));
+			$tmpl->set_var('lang_password', lang('Old password'));
+			$tmpl->set_var('lang_new_password', lang('New password'));
+			$tmpl->set_var('lang_repeat_password', lang('Repeat password'));
 			$tmpl->set_var('cd', $change_passwd);
 			$tmpl->set_var('cd_class', 'error');
 			$last_loginid = $_POST['login'];
@@ -620,55 +620,55 @@ 
 			$tmpl->set_var('autofocus_login', '');
 			$tmpl->set_var('autofocus_new_passwd', 'autofocus');
 		}
-		if($GLOBALS['egw_info']['server']['show_domain_selectbox'])
+		if ($GLOBALS['egw_info']['server']['show_domain_selectbox'])
 		{
-			foreach(array_keys($GLOBALS['egw_domain']) as $domain)
+			foreach (array_keys($GLOBALS['egw_domain']) as $domain)
 			{
 				$domains[$domain] = $domain;
 			}
 			$tmpl->set_var(array(
 				'lang_domain'   => lang('domain'),
-				'select_domain' => html::select('logindomain',$last_domain,$domains,true,'tabindex="2"',0,false),
+				'select_domain' => html::select('logindomain', $last_domain, $domains, true, 'tabindex="2"', 0, false),
 			));
 		}
 		else
 		{
 			/* trick to make domain section disapear */
-			$tmpl->set_block('login_form','domain_selection');
-			$tmpl->set_var('domain_selection',$GLOBALS['egw_info']['user']['domain'] ?
-			html::input_hidden('logindomain',$GLOBALS['egw_info']['user']['domain']) : '');
+			$tmpl->set_block('login_form', 'domain_selection');
+			$tmpl->set_var('domain_selection', $GLOBALS['egw_info']['user']['domain'] ?
+			html::input_hidden('logindomain', $GLOBALS['egw_info']['user']['domain']) : '');
 
-			if($last_loginid !== '')
+			if ($last_loginid !== '')
 			{
 				reset($GLOBALS['egw_domain']);
 				list($default_domain) = each($GLOBALS['egw_domain']);
 
-				if(!empty ($last_domain) && $last_domain != $default_domain)
+				if (!empty ($last_domain) && $last_domain != $default_domain)
 				{
-					$last_loginid .= '@' . $last_domain;
+					$last_loginid .= '@'.$last_domain;
 				}
 			}
 		}
 
 		$config_reg = config::read('registration');
 
-		if($config_reg['enable_registration'])
+		if ($config_reg['enable_registration'])
 		{
 			if ($config_reg['register_link'])
 			{
-				$reg_link='&nbsp;<a href="'. egw::link('/registration/index.php','lang_code='.$_GET['lang']). '">'.lang('Not a user yet? Register now').'</a><br/>';
+				$reg_link = '&nbsp;<a href="'.egw::link('/registration/index.php', 'lang_code='.$_GET['lang']).'">'.lang('Not a user yet? Register now').'</a><br/>';
 			}
 			if ($config_reg['lostpassword_link'])
 			{
-				$lostpw_link='&nbsp;<a href="'. egw::link('/registration/index.php','menuaction=registration.registration_ui.lost_password&lang_code='.$_GET['lang']). '">'.lang('Lost password').'</a><br/>';
+				$lostpw_link = '&nbsp;<a href="'.egw::link('/registration/index.php', 'menuaction=registration.registration_ui.lost_password&lang_code='.$_GET['lang']).'">'.lang('Lost password').'</a><br/>';
 			}
 			if ($config_reg['lostid_link'])
 			{
-				$lostid_link='&nbsp;<a href="'. egw::link('/registration/index.php','menuaction=registration.registration_ui.lost_username&lang_code='.$_GET['lang']). '">'.lang('Lost Login Id').'</a><br/>';
+				$lostid_link = '&nbsp;<a href="'.egw::link('/registration/index.php', 'menuaction=registration.registration_ui.lost_username&lang_code='.$_GET['lang']).'">'.lang('Lost Login Id').'</a><br/>';
 			}
 
 			/* if at least one option of "registration" is activated display the registration section */
-			if($config_reg['register_link'] || $config_reg['lostpassword_link'] || $config_reg['lostid_link'] )
+			if ($config_reg['register_link'] || $config_reg['lostpassword_link'] || $config_reg['lostid_link'])
 			{
 				$tmpl->set_var(array(
 				'register_link'     => $reg_link,
@@ -679,20 +679,20 @@ 
 			else
 			{
 				/* trick to make registration section disapear */
-				$tmpl->set_block('login_form','registration');
-				$tmpl->set_var('registration','');
+				$tmpl->set_block('login_form', 'registration');
+				$tmpl->set_var('registration', '');
 			}
 		}
 
-		$tmpl->set_var('login_url', $GLOBALS['egw_info']['server']['webserver_url'] . '/login.php' . $extra_vars);
+		$tmpl->set_var('login_url', $GLOBALS['egw_info']['server']['webserver_url'].'/login.php'.$extra_vars);
 		$tmpl->set_var('version', $GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 		$tmpl->set_var('login', $last_loginid);
 
-		$tmpl->set_var('lang_username',lang('username'));
-		$tmpl->set_var('lang_login',lang('login'));
+		$tmpl->set_var('lang_username', lang('username'));
+		$tmpl->set_var('lang_login', lang('login'));
 
 		$tmpl->set_var('website_title', $GLOBALS['egw_info']['server']['site_title']);
-		$tmpl->set_var('template_set',$this->template);
+		$tmpl->set_var('template_set', $this->template);
 
 		if (substr($GLOBALS['egw_info']['server']['login_logo_file'], 0, 4) == 'http' ||
 			$GLOBALS['egw_info']['server']['login_logo_file'][0] == '/')
@@ -701,14 +701,14 @@ 
 		}
 		else
 		{
-			$var['logo_file'] = common::image('phpgwapi',$GLOBALS['egw_info']['server']['login_logo_file']?$GLOBALS['egw_info']['server']['login_logo_file']:'logo', '', null);	// null=explicit allow svg
+			$var['logo_file'] = common::image('phpgwapi', $GLOBALS['egw_info']['server']['login_logo_file'] ? $GLOBALS['egw_info']['server']['login_logo_file'] : 'logo', '', null); // null=explicit allow svg
 		}
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
-		if (substr($var['logo_url'],0,4) != 'http')
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.eGroupWare.org';
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 		$tmpl->set_var($var);
 
 		/* language section if activated in site config */
@@ -716,14 +716,14 @@ 
 		{
 			$tmpl->set_var(array(
 				'lang_language' => lang('Language'),
-				'select_language' => html::select('lang',$GLOBALS['egw_info']['user']['preferences']['common']['lang'],
-				translation::get_installed_langs(),true,'tabindex="1"',0,false),
+				'select_language' => html::select('lang', $GLOBALS['egw_info']['user']['preferences']['common']['lang'],
+				translation::get_installed_langs(), true, 'tabindex="1"', 0, false),
 			));
 		}
 		else
 		{
-			$tmpl->set_block('login_form','language_select');
-			$tmpl->set_var('language_select','');
+			$tmpl->set_block('login_form', 'language_select');
+			$tmpl->set_var('language_select', '');
 		}
 
 		/********************************************************\
@@ -731,31 +731,31 @@ 
 		* and place a time selectbox, how long cookie is valid   *
 		\********************************************************/
 
-		if($GLOBALS['egw_info']['server']['allow_cookie_auth'])
+		if ($GLOBALS['egw_info']['server']['allow_cookie_auth'])
 		{
-			$tmpl->set_block('login_form','remember_me_selection');
-			$tmpl->set_var('lang_remember_me',lang('Remember me'));
-			$tmpl->set_var('select_remember_me',html::select('remember_me', '', array(
+			$tmpl->set_block('login_form', 'remember_me_selection');
+			$tmpl->set_var('lang_remember_me', lang('Remember me'));
+			$tmpl->set_var('select_remember_me', html::select('remember_me', '', array(
 				'' => lang('not'),
 				'1hour' => lang('1 Hour'),
 				'1day' => lang('1 Day'),
 				'1week'=> lang('1 Week'),
 				'1month' => lang('1 Month'),
 				'forever' => lang('Forever'),
-			),true,'tabindex="3"',0,false));
+			), true, 'tabindex="3"', 0, false));
 		}
 		else
 		{
 			/* trick to make remember_me section disapear */
-			$tmpl->set_block('login_form','remember_me_selection');
-			$tmpl->set_var('remember_me_selection','');
+			$tmpl->set_block('login_form', 'remember_me_selection');
+			$tmpl->set_var('remember_me_selection', '');
 		}
 		$tmpl->set_var('autocomplete', ($GLOBALS['egw_info']['server']['autocomplete_login'] ? 'autocomplete="off"' : ''));
 
 		// load jquery for login screen too
 		self::validate_file('jquery', 'jquery');
 
-		$this->render($tmpl->fp('loginout','login_form'),false,false);
+		$this->render($tmpl->fp('loginout', 'login_form'), false, false);
 	}
 
 	/**
@@ -778,7 +778,7 @@ 
 		// load jquery for deny-login screen too
 		self::validate_file('jquery', 'jquery');
 
-		$this->render($tmpl->fp('loginout','login_form'),false,false);
+		$this->render($tmpl->fp('loginout', 'login_form'), false, false);
 	}
 
 	/**
@@ -789,19 +789,19 @@ 
 	public function _get_footer()
 	{
 		$var = Array(
-			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
+			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'].$this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
 		);
 		$var['page_generation_time'] = '';
-		if($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['show_generation_time'])
 		{
-			$totaltime = sprintf('%4.2lf',microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time']);
+			$totaltime = sprintf('%4.2lf', microtime(true) - $GLOBALS['egw_info']['flags']['page_start_time']);
 
-			$var['page_generation_time'] = '<div class="pageGenTime" id="divGenTime_'.$GLOBALS['egw_info']['flags']['currentapp'].'"><span>'.lang('Page was generated in %1 seconds',$totaltime);
+			$var['page_generation_time'] = '<div class="pageGenTime" id="divGenTime_'.$GLOBALS['egw_info']['flags']['currentapp'].'"><span>'.lang('Page was generated in %1 seconds', $totaltime);
 			if ($GLOBALS['egw_info']['flags']['session_restore_time'])
 			{
 				$var['page_generation_time'] .= ' '.lang('(session restored in %1 seconds)',
-					sprintf('%4.2lf',$GLOBALS['egw_info']['flags']['session_restore_time']));
+					sprintf('%4.2lf', $GLOBALS['egw_info']['flags']['session_restore_time']));
 			}
 			$var['page_generation_time'] .= '</span></div>';
 		}
@@ -821,23 +821,23 @@ 
 	{
 		ob_start();
 		// Include the apps footer files if it exists
-		if (EGW_APP_INC != EGW_API_INC &&	// this prevents an endless inclusion on the homepage
+		if (EGW_APP_INC != EGW_API_INC && // this prevents an endless inclusion on the homepage
 			                                // (some apps set currentapp in hook_home => it's not releyable)
-			(file_exists (EGW_APP_INC . '/footer.inc.php') || isset($_GET['menuaction'])) &&
+			(file_exists(EGW_APP_INC.'/footer.inc.php') || isset($_GET['menuaction'])) &&
 			$GLOBALS['egw_info']['flags']['currentapp'] != 'home' &&
 			$GLOBALS['egw_info']['flags']['currentapp'] != 'login' &&
 			$GLOBALS['egw_info']['flags']['currentapp'] != 'logout' &&
 			!@$GLOBALS['egw_info']['flags']['noappfooter'])
 		{
-			list(, $class) = explode('.',(string)$_GET['menuaction']);
+			list(, $class) = explode('.', (string)$_GET['menuaction']);
 			if ($class && is_object($GLOBALS[$class]) && is_array($GLOBALS[$class]->public_functions) &&
 				isset($GLOBALS[$class]->public_functions['footer']))
 			{
 				$GLOBALS[$class]->footer();
 			}
-			elseif(file_exists(EGW_APP_INC.'/footer.inc.php'))
+			elseif (file_exists(EGW_APP_INC.'/footer.inc.php'))
 			{
-				include(EGW_APP_INC . '/footer.inc.php');
+				include(EGW_APP_INC.'/footer.inc.php');
 			}
 		}
 		$content = ob_get_contents();
@@ -852,7 +852,7 @@ 
 	 * @param array $extra =array() extra attributes passed as data-attribute to egw.js
 	 * @return array
 	 */
-	protected function _get_header(array $extra=array())
+	protected function _get_header(array $extra = array())
 	{
 		// display password expires in N days message once per session
 		$message = null;
@@ -863,7 +863,7 @@ 
 		}
 
 		// get used language code (with a little xss check, if someone tries to sneak something in)
-		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/',$GLOBALS['egw_info']['user']['preferences']['common']['lang']))
+		if (preg_match('/^[a-z]{2}(-[a-z]{2})?$/', $GLOBALS['egw_info']['user']['preferences']['common']['lang']))
 		{
 			$lang_code = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
 		}
@@ -875,9 +875,9 @@ 
 			$pngfix = '<meta http-equiv="X-UA-Compatible" content="IE=edge" />'."\n";
 
 			// pngfix for IE6 defaults to yes
-			if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] && html::$ua_version < 7)
+			if (!$GLOBALS['egw_info']['user']['preferences']['common']['disable_pngfix'] && html::$ua_version < 7)
 			{
-				$pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/pngfix.js';
+				$pngfix_src = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/templates/idots/js/pngfix.js';
 				$pngfix .= '<!-- This solves the Internet Explorer PNG-transparency bug, but only for IE 5.5 - 6.0 and higher -->
 				<!--[if lt IE 7.0]>
 				<script src="'.$pngfix_src.'" type="text/javascript">
@@ -894,14 +894,14 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
-		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
+		if ($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots = '<meta name="robots" content="none" />';
+		if (substr($GLOBALS['egw_info']['server']['favicon_file'], 0, 4) == 'http')
 		{
 			$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
 		}
 		else
 		{
-			$var['favicon_file'] = common::image('phpgwapi',$GLOBALS['egw_info']['server']['favicon_file']?$GLOBALS['egw_info']['server']['favicon_file']:'favicon.ico');
+			$var['favicon_file'] = common::image('phpgwapi', $GLOBALS['egw_info']['server']['favicon_file'] ? $GLOBALS['egw_info']['server']['favicon_file'] : 'favicon.ico');
 		}
 
 		if ($GLOBALS['egw_info']['flags']['include_wz_tooltip'] &&
@@ -910,7 +910,7 @@ 
 			$include_wz_tooltip = '<script src="'.$GLOBALS['egw_info']['server']['webserver_url'].
 				$wz_tooltip.'?'.filemtime(EGW_SERVER_ROOT.$wz_tooltip).'" type="text/javascript"></script>';
 		}
-		return $this->_get_css()+array(
+		return $this->_get_css() + array(
 			'img_icon'			=> $var['favicon_file'],
 			'img_shortcut'		=> $var['favicon_file'],
 			'pngfix'        	=> $pngfix,
@@ -934,15 +934,15 @@ 
 	 */
 	protected function _get_navbar($apps)
 	{
-		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/'.$this->template.'/images';
+		$var['img_root'] = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/templates/'.$this->template.'/images';
 
-		if(isset($GLOBALS['egw_info']['flags']['app_header']))
+		if (isset($GLOBALS['egw_info']['flags']['app_header']))
 		{
 			$var['current_app_title'] = $GLOBALS['egw_info']['flags']['app_header'];
 		}
 		else
 		{
-			$var['current_app_title']=$apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
+			$var['current_app_title'] = $apps[$GLOBALS['egw_info']['flags']['currentapp']]['title'];
 		}
 		$var['currentapp'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -954,32 +954,32 @@ 
 
 		$var['user_info'] = $this->_user_time_info();
 
-		if($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
+		if ($GLOBALS['egw_info']['user']['account_lastpwd_change'] == 0)
 		{
 			$api_messages = lang('You are required to change your password during your first login').'<br />'.
-				lang('Click this image on the navbar: %1','<img src="'.common::image('preferences','navbar.gif').'">');
+				lang('Click this image on the navbar: %1', '<img src="'.common::image('preferences', 'navbar.gif').'">');
 		}
-		elseif($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400*$GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
+		elseif ($GLOBALS['egw_info']['server']['change_pwd_every_x_days'] && $GLOBALS['egw_info']['user']['account_lastpwd_change'] < time() - (86400 * $GLOBALS['egw_info']['server']['change_pwd_every_x_days']))
 		{
-			$api_messages = lang('it has been more then %1 days since you changed your password',$GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
+			$api_messages = lang('it has been more then %1 days since you changed your password', $GLOBALS['egw_info']['server']['change_pwd_every_x_days']);
 		}
 
-		if (substr($GLOBALS['egw_info']['server']['login_logo_file'],0,4) == 'http' ||
+		if (substr($GLOBALS['egw_info']['server']['login_logo_file'], 0, 4) == 'http' ||
 			$GLOBALS['egw_info']['server']['login_logo_file'][0] == '/')
 		{
 			$var['logo_file'] = $GLOBALS['egw_info']['server']['login_logo_file'];
 		}
 		else
 		{
-			$var['logo_file'] = common::image('phpgwapi',$GLOBALS['egw_info']['server']['login_logo_file']?$GLOBALS['egw_info']['server']['login_logo_file']:'logo', '', null);	// null=explicit allow svg
+			$var['logo_file'] = common::image('phpgwapi', $GLOBALS['egw_info']['server']['login_logo_file'] ? $GLOBALS['egw_info']['server']['login_logo_file'] : 'logo', '', null); // null=explicit allow svg
 		}
-		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url']?$GLOBALS['egw_info']['server']['login_logo_url']:'http://www.eGroupWare.org';
+		$var['logo_url'] = $GLOBALS['egw_info']['server']['login_logo_url'] ? $GLOBALS['egw_info']['server']['login_logo_url'] : 'http://www.eGroupWare.org';
 
-		if (substr($var['logo_url'],0,4) != 'http')
+		if (substr($var['logo_url'], 0, 4) != 'http')
 		{
 			$var['logo_url'] = 'http://'.$var['logo_url'];
 		}
-		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title']?$GLOBALS['egw_info']['server']['login_logo_title']:'www.eGroupWare.org';
+		$var['logo_title'] = $GLOBALS['egw_info']['server']['login_logo_title'] ? $GLOBALS['egw_info']['server']['login_logo_title'] : 'www.eGroupWare.org';
 
 		return $var;
 	}
@@ -992,14 +992,14 @@ 
 	protected static function _user_time_info()
 	{
 		$now = new egw_time();
-		$user_info = '<b>'.common::display_fullname() .'</b>'. ' - ' . lang($now->format('l')) . ' ' . $now->format(true);
+		$user_info = '<b>'.common::display_fullname().'</b>'.' - '.lang($now->format('l')).' '.$now->format(true);
 
 		$user_tzs = egw_time::getUserTimezones();
 		if (count($user_tzs) > 1)
 		{
 			$tz = $GLOBALS['egw_info']['user']['preferences']['common']['tz'];
-			$user_info .= html::form(html::select('tz',$tz,$user_tzs,true),array(),
-				'/index.php','','tz_selection',' style="display: inline;"','GET');
+			$user_info .= html::form(html::select('tz', $tz, $user_tzs, true), array(),
+				'/index.php', '', 'tz_selection', ' style="display: inline;"', 'GET');
 		}
 		return $user_info;
 	}
@@ -1011,10 +1011,10 @@ 
 	 */
 	protected static function _current_users()
 	{
-	   if( $GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
+	   if ($GLOBALS['egw_info']['user']['apps']['admin'] && $GLOBALS['egw_info']['user']['preferences']['common']['show_currentusers'])
 	   {
-		  $current_users = '<a href="' . egw::link('/index.php','menuaction=admin.admin_accesslog.sessions') . '">' .
-		  	lang('Current users') . ': <span id="currentusers">' . $GLOBALS['egw']->session->session_count() . '</span></a>';
+		  $current_users = '<a href="'.egw::link('/index.php', 'menuaction=admin.admin_accesslog.sessions').'">'.
+		  	lang('Current users').': <span id="currentusers">'.$GLOBALS['egw']->session->session_count().'</span></a>';
 		  return $current_users;
 	   }
 	}
@@ -1070,8 +1070,8 @@ 
 				list($current, $security) = explode("\n", $remote);
 				if (empty($security)) $security = $current;
 				$versions = array(
-					'current'  => $current,		// last maintenance update
-					'security' => $security,	// last security update
+					'current'  => $current, // last maintenance update
+					'security' => $security, // last security update
 				);
 			}
 			return $versions;
@@ -1117,14 +1117,14 @@ 
 	 * @param string $password =null password --------- " ----------
 	 * @return resource|null context to use with file_get_context/fopen or null if no proxy configured
 	 */
-	public static function proxy_context($username=null, $password=null)
+	public static function proxy_context($username = null, $password = null)
 	{
 		$opts = array(
 			'method' => 'GET',
 		);
 		if (!empty($GLOBALS['egw_info']['server']['httpproxy_server']))
 		{
-			$opts += array (
+			$opts += array(
 				'proxy'  => 'tcp://'.$GLOBALS['egw_info']['server']['httpproxy_server'].':'.
 					($GLOBALS['egw_info']['server']['httpproxy_port'] ? $GLOBALS['egw_info']['server']['httpproxy_port'] : 8080),
 				'request_fulluri' => true,
@@ -1156,7 +1156,7 @@ 
 	 */
 	protected static function update_older($version, $days)
 	{
-		list(,,$date) = explode('.', $version);
+		list(,, $date) = explode('.', $version);
 		if ($date < 20140000) return false;
 		$version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4));
 
@@ -1169,7 +1169,7 @@ 
 	 * @param string &$changelog on return path to changelog
 	 * @return string
 	 */
-	public static function api_version(&$changelog=null)
+	public static function api_version(&$changelog = null)
 	{
 		$version = preg_replace('/[^0-9.]/', '', $GLOBALS['egw_info']['server']['versions']['phpgwapi']);
 		// parse version from changelog
@@ -1192,7 +1192,7 @@ 
 	 */
 	public static function index($app)
 	{
-		$data =& $GLOBALS['egw_info']['user']['apps'][$app];
+		$data = & $GLOBALS['egw_info']['user']['apps'][$app];
 		if (!isset($data))
 		{
 			throw new egw_exception_wrong_parameter("'$app' not a valid app for this user!");
@@ -1209,7 +1209,7 @@ 
 				$index = '/index.php?menuaction='.$data['index'];
 			}
 		}
-		return egw::link($index,$GLOBALS['egw_info']['flags']['params'][$app]);
+		return egw::link($index, $GLOBALS['egw_info']['flags']['params'][$app]);
 	}
 
 	/**
@@ -1250,15 +1250,15 @@ 
 	 *	true: always return svg, false: never return svg (current default), null: browser dependent, see svg_usable()
 	 * @return array
 	 */
-	protected static function _get_navbar_apps($svg=false)
+	protected static function _get_navbar_apps($svg = false)
 	{
 		list($first) = each($GLOBALS['egw_info']['user']['apps']);
-		if(is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
+		if (is_array($GLOBALS['egw_info']['user']['apps']['admin']) && $first != 'admin')
 		{
 			$newarray['admin'] = $GLOBALS['egw_info']['user']['apps']['admin'];
-			foreach($GLOBALS['egw_info']['user']['apps'] as $index => $value)
+			foreach ($GLOBALS['egw_info']['user']['apps'] as $index => $value)
 			{
-				if($index != 'admin')
+				if ($index != 'admin')
 				{
 					$newarray[$index] = $value;
 				}
@@ -1271,7 +1271,7 @@ 
 		unset($newarray);
 
 		$apps = array();
-		foreach($GLOBALS['egw_info']['user']['apps'] as $app => $data)
+		foreach ($GLOBALS['egw_info']['user']['apps'] as $app => $data)
 		{
 			if (is_long($app))
 			{
@@ -1288,29 +1288,29 @@ 
 				if ($data['status'] == 4)
 				{
 					$apps[$app]['target'] = ' target="'.$app.'" onClick="'."if (this != '') { window.open(this+'".
-						(strpos($apps[$app]['url'],'?') !== false ? '&' : '?').
+						(strpos($apps[$app]['url'], '?') !== false ? '&' : '?').
 						"referer='+encodeURIComponent(location),this.target,'width=800,height=600,scrollbars=yes,resizable=yes'); return false; } else { return true; }".'"';
 				}
-				elseif(isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
+				elseif (isset($GLOBALS['egw_info']['flags']['navbar_target']) && $GLOBALS['egw_info']['flags']['navbar_target'])
 				{
-					$apps[$app]['target'] = 'target="' . $GLOBALS['egw_info']['flags']['navbar_target'] . '"';
+					$apps[$app]['target'] = 'target="'.$GLOBALS['egw_info']['flags']['navbar_target'].'"';
 				}
 				else
 				{
 					$apps[$app]['target'] = '';
 				}
 
-				$icon = isset($data['icon']) ?  $data['icon'] : 'navbar';
+				$icon = isset($data['icon']) ? $data['icon'] : 'navbar';
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
 				if ($app != $GLOBALS['egw_info']['flags']['currentapp'])
 				{
-					$apps[$app]['icon']  = common::image($icon_app,Array($icon,'nonav'),'',$svg);
-					$apps[$app]['icon_hover']  = common::image_on($icon_app,Array($icon,'nonav'),'-over',$svg);
+					$apps[$app]['icon'] = common::image($icon_app, Array($icon, 'nonav'), '', $svg);
+					$apps[$app]['icon_hover'] = common::image_on($icon_app, Array($icon, 'nonav'), '-over', $svg);
 				}
 				else
 				{
-					$apps[$app]['icon']  = common::image_on($icon_app,Array($icon,'nonav'),'-over',$svg);
-					$apps[$app]['icon_hover']  = common::image($icon_app,Array($icon,'nonav'),'',$svg);
+					$apps[$app]['icon'] = common::image_on($icon_app, Array($icon, 'nonav'), '-over', $svg);
+					$apps[$app]['icon_hover'] = common::image($icon_app, Array($icon, 'nonav'), '', $svg);
 				}
 			}
 		}
@@ -1345,15 +1345,15 @@ 
 		$apps['about']['title'] = 'EGroupware';
 
 		$apps['about']['url']   = egw::link('/about.php');
-		$apps['about']['icon']  = common::image('phpgwapi',Array('about','nonav'));
-		$apps['about']['icon_hover']  = common::image_on('phpgwapi',Array('about','nonav'),'-over');
+		$apps['about']['icon']  = common::image('phpgwapi', Array('about', 'nonav'));
+		$apps['about']['icon_hover'] = common::image_on('phpgwapi', Array('about', 'nonav'), '-over');
 		$apps['about']['name'] = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name'] = 'logout';
 		$apps['logout']['url']   = egw::link('/logout.php');
-		$apps['logout']['icon']  = common::image('phpgwapi',Array('logout','nonav'));
-		$apps['logout']['icon_hover']  = common::image_on('phpgwapi',Array('logout','nonav'),'-over');
+		$apps['logout']['icon']  = common::image('phpgwapi', Array('logout', 'nonav'));
+		$apps['logout']['icon_hover'] = common::image_on('phpgwapi', Array('logout', 'nonav'), '-over');
 
 		return $apps;
 	}
@@ -1399,7 +1399,7 @@ 
 			if (html::$ua_mobile) $themes_to_check[] = $this->template_dir.'/css/mobile.css';
 			$themes_to_check[] = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
-			foreach($themes_to_check as $theme_css)
+			foreach ($themes_to_check as $theme_css)
 			{
 				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
 			}
@@ -1411,7 +1411,7 @@ 
 
 			// sending print css last, so it can overwrite anything
 			$print_css = $this->template_dir.'/print.css';
-			if(!file_exists(EGW_SERVER_ROOT.$print_css))
+			if (!file_exists(EGW_SERVER_ROOT.$print_css))
 			{
 				$print_css = '/phpgwapi/templates/idots/print.css';
 			}
@@ -1423,15 +1423,15 @@ 
 		$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
 		if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
 		$css_files = '';
-		foreach(self::$css_include_files as $path)
+		foreach (self::$css_include_files as $path)
 		{
-			foreach(self::resolve_css_includes($path) as $path)
+			foreach (self::resolve_css_includes($path) as $path)
 			{
-				list($file,$query) = explode('?',$path,2);
+				list($file, $query) = explode('?', $path, 2);
 				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified) $max_modified = $mod;
 
 				// do NOT include app.css or categories.php, as it changes from app to app
-				if ($debug_minify || substr($path, -8) == '/app.css' || substr($file,-14) == 'categories.php')
+				if ($debug_minify || substr($path, -8) == '/app.css' || substr($file, -14) == 'categories.php')
 				{
 					$css_files .= '<link href="'.$GLOBALS['egw_info']['server']['webserver_url'].$path.($query ? '&' : '?').$mod.'" type="text/css" rel="StyleSheet" />'."\n";
 				}
@@ -1445,7 +1445,7 @@ 
 		{
 			$css = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/inc/min/?';
 			if ($base_path && $base_path != '/') $css .= 'b='.substr($base_path, 1).'&';
-			$css .= 'f='.$css_file .
+			$css .= 'f='.$css_file.
 				($GLOBALS['egw_info']['server']['debug_minify'] === 'debug' ? '&debug' : '').
 				'&'.$max_modified;
 			$css_files = '<link href="'.$css.'" type="text/css" rel="StyleSheet" />'."\n".$css_files;
@@ -1462,20 +1462,20 @@ 
 	 * @param string $path EGroupware relative path eg. /phpgwapi/templates/default/some.css
 	 * @return array parsed pathes (EGroupware relative) including $path itself
 	 */
-	protected static function resolve_css_includes($path, &$pathes=array())
+	protected static function resolve_css_includes($path, &$pathes = array())
 	{
 		$matches = null;
 
-		list($file,$query) = explode('?',$path,2);
-		if (($to_check = file_get_contents (EGW_SERVER_ROOT.$file, false, null, -1, 1024)) &&
+		list($file, $query) = explode('?', $path, 2);
+		if (($to_check = file_get_contents(EGW_SERVER_ROOT.$file, false, null, -1, 1024)) &&
 			stripos($to_check, '/*@import') !== false && preg_match_all('|/\*@import url\("([^"]+)"|i', $to_check, $matches))
 		{
-			foreach($matches[1] as $import_path)
+			foreach ($matches[1] as $import_path)
 			{
 				if ($import_path[0] != '/')
 				{
 					$dir = dirname($path);
-					while(substr($import_path,0,3) == '../')
+					while (substr($import_path, 0, 3) == '../')
 					{
 						$dir = dirname($dir);
 						$import_path = substr($import_path, 3);
@@ -1500,7 +1500,7 @@ 
 	 * @param array $extra =array() extra data to pass to egw.js as data-parameter
 	 * @return string the javascript to be included
 	 */
-	public static function _get_js(array $extra=array())
+	public static function _get_js(array $extra = array())
 	{
 		$java_script = '';
 
@@ -1508,7 +1508,7 @@ 
 		Think of conf vars etc...  (pim@lingewoud.nl) */
 		if (isset($GLOBALS['egw_info']['flags']['java_script_thirst']))
 		{
-			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst'] . "\n";
+			$java_script .= $GLOBALS['egw_info']['flags']['java_script_thirst']."\n";
 		}
 		// add configuration, link-registry, images, user-data and -perferences for non-popup windows
 		// specifying etag in url to force reload, as we send expires header
@@ -1520,7 +1520,7 @@ 
 			self::validate_file('/phpgwapi/images.php', array(
 				'template' => $GLOBALS['egw_info']['server']['template_set'],
 				'etag' => md5(json_encode(common::image_map($GLOBALS['egw_info']['server']['template_set']))),
-				'svg' => 0,	// always load non-svg image map
+				'svg' => 0, // always load non-svg image map
 			));
 			self::validate_file('/phpgwapi/user.php', array(
 				'user' => $GLOBALS['egw_info']['user']['account_lid'],
@@ -1532,7 +1532,7 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str) {return substr($str, 1); }, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -1542,18 +1542,18 @@ 
 				'/phpgwapi/js/jsapi/egw.js?'.filemtime(EGW_SERVER_ROOT.'/phpgwapi/js/jsapi/egw.js').'" id="egw_script_id"';
 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
-		foreach($extra+self::$extra as $name => $value)
+		foreach ($extra + self::$extra as $name => $value)
 		{
 			if (is_array($value)) $value = json_encode($value);
 			// we need to double encode (html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
-			$java_script .= ' data-'.$name."=\"". html::htmlspecialchars($value, true)."\"";
+			$java_script .= ' data-'.$name."=\"".html::htmlspecialchars($value, true)."\"";
 		}
 		$java_script .= "></script>\n";
 
-		if(@isset($_GET['menuaction']))
+		if (@isset($_GET['menuaction']))
 		{
-			list(, $class) = explode('.',$_GET['menuaction']);
-			if(is_array($GLOBALS[$class]->public_functions) &&
+			list(, $class) = explode('.', $_GET['menuaction']);
+			if (is_array($GLOBALS[$class]->public_functions) &&
 				$GLOBALS[$class]->public_functions['java_script'])
 			{
 				$java_script .= $GLOBALS[$class]->java_script();
@@ -1562,10 +1562,10 @@ 
 		if (isset($GLOBALS['egw_info']['flags']['java_script']))
 		{
 			// Strip out any script tags, this needs to be executed as anonymous function
-			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is','/<\/script>/'),array('$2',''),$GLOBALS['egw_info']['flags']['java_script']);
-			if(trim($GLOBALS['egw_info']['flags']['java_script']) != '')
+			$GLOBALS['egw_info']['flags']['java_script'] = preg_replace(array('/(<script[^>]*>)([^<]*)/is', '/<\/script>/'), array('$2', ''), $GLOBALS['egw_info']['flags']['java_script']);
+			if (trim($GLOBALS['egw_info']['flags']['java_script']) != '')
 			{
-				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script'] . "});</script>\n";
+				$java_script .= '<script type="text/javascript">window.egw_LAB.wait(function() {'.$GLOBALS['egw_info']['flags']['java_script']."});</script>\n";
 			}
 		}
 
@@ -1582,13 +1582,13 @@ 
 	function list_themes()
 	{
 		$list = array();
-		if (($dh = @opendir(EGW_SERVER_ROOT.$this->template_dir . SEP . 'css')))
+		if (($dh = @opendir(EGW_SERVER_ROOT.$this->template_dir.SEP.'css')))
 		{
 			while (($file = readdir($dh)))
 			{
 				if (preg_match('/'."\.css$".'/i', $file))
 				{
-					list($name) = explode('.',$file);
+					list($name) = explode('.', $file);
 					$list[$name] = $name;
 				}
 			}
@@ -1603,20 +1603,19 @@ 
 	 * @param boolean $full_data =false true: value is array with values for keys 'name', 'title', ...
 	 * @returns array alphabetically sorted list of templates
 	 */
-	static function list_templates($full_data=false)
+	static function list_templates($full_data = false)
 	{
-		$list = array('pixelegg'=>null,'jdots'=>null,'idots'=>null);
+		$list = array('pixelegg'=>null, 'jdots'=>null, 'idots'=>null);
 		// templates packaged in the api
-		$d = dir(EGW_SERVER_ROOT . '/phpgwapi/templates');
-		while (($entry=$d->read()))
+		$d = dir(EGW_SERVER_ROOT.'/phpgwapi/templates');
+		while (($entry = $d->read()))
 		{
-			if ($entry != '..' && file_exists(EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry .'/class.'.$entry.'_framework.inc.php'))
+			if ($entry != '..' && file_exists(EGW_SERVER_ROOT.'/phpgwapi/templates/'.$entry.'/class.'.$entry.'_framework.inc.php'))
 			{
-				if (file_exists ($f = EGW_SERVER_ROOT . '/phpgwapi/templates/' . $entry . '/setup/setup.inc.php'))
+				if (file_exists($f = EGW_SERVER_ROOT.'/phpgwapi/templates/'.$entry.'/setup/setup.inc.php'))
 				{
 					include($f);
-					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] :
-						$GLOBALS['egw_info']['template'][$entry]['title'];
+					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] : $GLOBALS['egw_info']['template'][$entry]['title'];
 				}
 				else
 				{
@@ -1630,16 +1629,15 @@ 
 		$d->close();
 		// templates packaged like apps in own directories (containing as setup/setup.inc.php file!)
 		$dr = dir(EGW_SERVER_ROOT);
-		while (($entry=$dr->read()))
+		while (($entry = $dr->read()))
 		{
 			if ($entry != '..' && !isset($GLOBALS['egw_info']['apps'][$entry]) && is_dir(EGW_SERVER_ROOT.'/'.$entry) &&
-				file_exists($f = EGW_SERVER_ROOT . '/' . $entry .'/setup/setup.inc.php'))
+				file_exists($f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php'))
 			{
 				include($f);
 				if (isset($GLOBALS['egw_info']['template'][$entry]))
 				{
-					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] :
-						$GLOBALS['egw_info']['template'][$entry]['title'];
+					$list[$entry] = $full_data ? $GLOBALS['egw_info']['template'][$entry] : $GLOBALS['egw_info']['template'][$entry]['title'];
 				}
 			}
 		}
@@ -1656,14 +1654,14 @@ 
 	* @param array $vars
 	* @param array $apps
 	*/
-	function topmenu(array $vars,array $apps)
+	function topmenu(array $vars, array $apps)
 	{
-		if($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
+		if ($GLOBALS['egw_info']['user']['apps']['home'] && isset($apps['home']))
 		{
 			$this->_add_topmenu_item($apps['home']);
 		}
 
-		if($GLOBALS['egw_info']['user']['apps']['preferences'])
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
 		{
 			$this->add_preferences_topmenu('prefs');
 			$this->add_preferences_topmenu('acl');
@@ -1688,9 +1686,9 @@ 
 			$this->_add_topmenu_item(array_merge($apps['manual'],array('title' => lang('Help'))));
 		}*/
 
-		$GLOBALS['egw']->hooks->process('topmenu_info',array(),true);
+		$GLOBALS['egw']->hooks->process('topmenu_info', array(), true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach (self::$top_menu_extra as $extra_item) {
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1700,7 +1698,7 @@ 
 		{
 			$this->_add_topmenu_info_item($update, 'update');
 		}
-		if($GLOBALS['egw_info']['user']['apps']['notifications'])
+		if ($GLOBALS['egw_info']['user']['apps']['notifications'])
 		{
 			$this->_add_topmenu_info_item(self::_get_notification_bell(), 'notifications');
 		}
@@ -1712,9 +1710,9 @@ 
 	/**
 	 * Add preferences link to topmenu using settings-hook to know if an app supports preferences
 	 */
-	protected function add_preferences_topmenu($type='prefs')
+	protected function add_preferences_topmenu($type = 'prefs')
 	{
-		static $memberships=null;
+		static $memberships = null;
 		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
 		static $types = array(
 			'prefs' => array(
@@ -1728,20 +1726,20 @@ 
 			'cats' => array(
 				'title' => 'Categories',
 				'hook' => 'categories',
-				'run_hook' => true,	// acturally run hook, not just look it's implemented
+				'run_hook' => true, // acturally run hook, not just look it's implemented
 			),
 		);
 		if (!$GLOBALS['egw_info']['user']['apps']['preferences'] || $GLOBALS['egw_info']['server']['deny_'.$type] &&
 			array_intersect($memberships, (array)$GLOBALS['egw_info']['server']['deny_'.$type]) &&
 			!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			return;	// user has no access to preferences app
+			return; // user has no access to preferences app
 		}
 		if (isset($types[$type]['run_hook']))
 		{
 			$apps = $GLOBALS['egw']->hooks->process($types[$type]['hook']);
 			// as all apps answer, we need to remove none-true responses
-			foreach($apps as $app => $val)
+			foreach ($apps as $app => $val)
 			{
 				if (!$val) unset($apps[$app]);
 			}
@@ -1767,7 +1765,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_item(array $app_data,$alt_label=null);
+	abstract function _add_topmenu_item(array $app_data, $alt_label = null);
 
 	/**
 	* Add info items to the topmenu template class to be displayed
@@ -1777,7 +1775,7 @@ 
 	* @access protected
 	* @return void
 	*/
-	abstract function _add_topmenu_info_item($content, $id=null);
+	abstract function _add_topmenu_info_item($content, $id = null);
 
 	static $top_menu_extra = array();
 
@@ -1792,7 +1790,7 @@ 
 	* @access public
 	* @return void
 	*/
-	public static function add_topmenu_item($id,$url,$title,$target = '')
+	public static function add_topmenu_item($id, $url, $title, $target = '')
 	{
 		$entry['name'] = $id;
 		$entry['url'] = $url;
@@ -1813,7 +1811,7 @@ 
 	* @access public
 	* @return void
 	*/
-	abstract function topmenu_info_icon($id,$icon_src,$iconlink,$blink=false,$tooltip=null);
+	abstract function topmenu_info_icon($id, $icon_src, $iconlink, $blink = false, $tooltip = null);
 
 	/**
 	 * Call and return content of 'after_navbar' hook
@@ -1823,7 +1821,7 @@ 
 	protected function _get_after_navbar()
 	{
 		ob_start();
-		$GLOBALS['egw']->hooks->process('after_navbar',null,true);
+		$GLOBALS['egw']->hooks->process('after_navbar', null, true);
 		$content = ob_get_contents();
 		ob_end_clean();
 
@@ -1857,7 +1855,7 @@ 
 	 * @deprecated since 14.1 use app.js et2_ready method instead to execute code or bind a handler (CSP will stop onXXX attributes!)
 	 * @return string content of onXXX tag after adding code
 	 */
-	static function set_onload($code='',$replace=false)
+	static function set_onload($code = '', $replace = false)
 	{
 		if ($replace || empty(self::$body_tags['onLoad']))
 		{
@@ -1878,7 +1876,7 @@ 
 	 * @deprecated since 14.1 use app.js et2_ready method instead to execute code or bind a handler (CSP will stop onXXX attributes!)
 	 * @return string content of onXXX tag after adding code
 	 */
-	static function set_onunload($code='',$replace=false)
+	static function set_onunload($code = '', $replace = false)
 	{
 		if ($replace || empty(self::$body_tags['onUnload']))
 		{
@@ -1899,7 +1897,7 @@ 
 	 * @deprecated since 14.1 use app.js et2_ready method instead to execute code or bind a handler (CSP will stop onXXX attributes!)
 	 * @return string content of onXXX tag after adding code
 	 */
-	static function set_onbeforeunload($code='',$replace=false)
+	static function set_onbeforeunload($code = '', $replace = false)
 	{
 		if ($replace || empty(self::$body_tags['onBeforeUnload']))
 		{
@@ -1920,7 +1918,7 @@ 
 	 * @deprecated since 14.1 use app.js et2_ready method instead to execute code or bind a handler (CSP will stop onXXX attributes!)
 	 * @return string content of onXXX tag after adding code
 	 */
-	static function set_onresize($code='',$replace=false)
+	static function set_onresize($code = '', $replace = false)
 	{
 		if ($replace || empty(self::$body_tags['onResize']))
 		{
@@ -1942,16 +1940,16 @@ 
 	static public function _get_body_attribs()
 	{
 		$js = '';
-		foreach(self::$body_tags as $what => $data)
+		foreach (self::$body_tags as $what => $data)
 		{
 			if (!empty($data))
 			{
-				if($what == 'onLoad')
+				if ($what == 'onLoad')
 				{
-					$js .= 'onLoad="egw_LAB.wait(function() {'. htmlspecialchars($data).'})"';
+					$js .= 'onLoad="egw_LAB.wait(function() {'.htmlspecialchars($data).'})"';
 					continue;
 				}
-				$js .= ' '.$what.'="' . htmlspecialchars($data) . '"';
+				$js .= ' '.$what.'="'.htmlspecialchars($data).'"';
 			}
 		}
 		return $js;
@@ -1981,7 +1979,7 @@ 
 	*
 	* @returns bool was the file found?
 	*/
-	static function validate_file($package, $file=null, $app='phpgwapi')
+	static function validate_file($package, $file = null, $app = 'phpgwapi')
 	{
 		self::$js_include_mgr->include_js_file($package, $file, $app);
 	}
@@ -1993,7 +1991,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return array with pathes relative to EGW_SERVER_ROOT
 	 */
-	static function js_files(array $files=null, $clear_files=false)
+	static function js_files(array $files = null, $clear_files = false)
 	{
 		if (isset($files) && is_array($files))
 		{
@@ -2012,7 +2010,7 @@ 
 	 * @param boolean $clear_files =false true clear files after returning them
 	 * @return string|array see $return_pathes parameter
 	 */
-	static public function get_script_links($return_pathes=false, $clear_files=false)
+	static public function get_script_links($return_pathes = false, $clear_files = false)
 	{
 		$to_include = self::bundle_js_includes(self::$js_include_mgr->get_included_files($clear_files));
 
@@ -2020,7 +2018,7 @@ 
 		{
 			return $to_include;
 		}
-		$start = '<script type="text/javascript" src="'. $GLOBALS['egw_info']['server']['webserver_url'];
+		$start = '<script type="text/javascript" src="'.$GLOBALS['egw_info']['server']['webserver_url'];
 		$end = '">'."</script>\n";
 		return "\n".$start.implode($end.$start, $to_include).$end;
 	}
@@ -2041,14 +2039,14 @@ 
 			$bundles = egw_cache::getTree(__CLASS__, 'bundles', array(__CLASS__, 'get_bundles'), array(), 7200);
 			$bundles_ts = $bundles['.ts'];
 			unset($bundles['.ts']);
-			foreach($bundles as $name => $files)
+			foreach ($bundles as $name => $files)
 			{
 				$file2bundle += array_combine($files, array_fill(0, count($files), $name));
 			}
 		}
 		$to_include = $included_bundles = array();
 		$query = null;
-		foreach($js_includes as $file)
+		foreach ($js_includes as $file)
 		{
 			if (!isset($to_include[$file]))
 			{
@@ -2093,31 +2091,31 @@ 
 	 * @param int& $max_modified =null on return maximum modification time of bundle
 	 * @return array js-files (can be more then one, if one of given files can not be bundeled)
 	 */
-	protected static function bundle_urls(array $js_includes, &$max_modified=null)
+	protected static function bundle_urls(array $js_includes, &$max_modified = null)
 	{
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		$to_include = $to_minify = array();
 		$max_modified = 0;
 		$query = null;
-		foreach($js_includes as $path)
+		foreach ($js_includes as $path)
 		{
-			if ($path == '/phpgwapi/js/jsapi/egw.js') continue;	// loaded via own tag, and we must not load it twice!
+			if ($path == '/phpgwapi/js/jsapi/egw.js') continue; // loaded via own tag, and we must not load it twice!
 
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
+			list($path, $query) = explode('?', $path, 2);
 			$mod = filemtime(EGW_SERVER_ROOT.$path);
 
 			// for now minify does NOT support query parameters, nor php files generating javascript
-			if ($debug_minify || $query || substr($path, -3) != '.js' || strpos($path,'ckeditor') !== false ||
+			if ($debug_minify || $query || substr($path, -3) != '.js' || strpos($path, 'ckeditor') !== false ||
 				substr($path, -7) == '/app.js')	// do NOT include app.js, as it changes from app to app
 			{
-				$path .= '?'. $mod.($query ? '&'.$query : '');
+				$path .= '?'.$mod.($query ? '&'.$query : '');
 				$to_include[] = $path;
 			}
 			else
 			{
 				if ($mod > $max_modified) $max_modified = $mod;
-				$to_minify[] = substr($path,1);
+				$to_minify[] = substr($path, 1);
 			}
 		}
 		if (!$debug_minify && $to_minify)
@@ -2125,7 +2123,7 @@ 
 			$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
 			if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
 			$path = '/phpgwapi/inc/min/?'.($base_path && $base_path != '/' ? 'b='.substr($base_path, 1).'&' : '').
-				'f='.implode(',', $to_minify) .
+				'f='.implode(',', $to_minify).
 				($GLOBALS['egw_info']['server']['debug_minify'] === 'debug' ? '&debug' : '').
 				'&'.$max_modified;
 			// need to include minified javascript before not minified stuff like jscalendar-setup, as it might depend on it
@@ -2202,12 +2200,12 @@ 
 		}*/
 
 		// automatic split bundles with more then MAX_BUNDLE_FILES (=50) files
-		foreach($bundles as $name => $files)
+		foreach ($bundles as $name => $files)
 		{
 			$n = '';
-			while (count($files) > self::MAX_BUNDLE_FILES*(int)$n)
+			while (count($files) > self::MAX_BUNDLE_FILES * (int)$n)
 			{
-				$files80 = array_slice($files, self::MAX_BUNDLE_FILES*(int)$n, self::MAX_BUNDLE_FILES, true);
+				$files80 = array_slice($files, self::MAX_BUNDLE_FILES * (int)$n, self::MAX_BUNDLE_FILES, true);
 				$bundles[$name.$n++] = $files80;
 			}
 		}
@@ -2241,7 +2239,7 @@ 
 	 * @param boolean $no_default_css =false true do NOT load any default css, only what app explicitly includes
 	 * @return boolean false: css file not found, true: file found
 	 */
-	public static function includeCSS($app, $name=null, $append=true, $no_default_css=false)
+	public static function includeCSS($app, $name = null, $append = true, $no_default_css = false)
 	{
 		if ($no_default_css)
 		{
@@ -2261,12 +2259,12 @@ 
 		{
 			$path = $app;
 		}
-		if (!file_exists(EGW_SERVER_ROOT.$path) && !file_exists(EGW_SERVER_ROOT . parse_url($path,PHP_URL_PATH)))
+		if (!file_exists(EGW_SERVER_ROOT.$path) && !file_exists(EGW_SERVER_ROOT.parse_url($path, PHP_URL_PATH)))
 		{
 			//error_log(__METHOD__."($app,$name) $path NOT found!");
 			return false;
 		}
-		if (!in_array($path,self::$css_include_files))
+		if (!in_array($path, self::$css_include_files))
 		{
 			if ($append)
 			{
@@ -2290,15 +2288,15 @@ 
 
 		// try to add app specific css file
 		self::includeCSS($app, 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-			self::includeCSS($app,'app');
+			self::includeCSS($app, 'app');
 
 		// add all css files from egw_framework::includeCSS()
 		$query = null;
-		foreach(self::$css_include_files as $path)
+		foreach (self::$css_include_files as $path)
 		{
 			unset($query);
-			list($path,$query) = explode('?',$path,2);
-			$path .= '?'. ($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
+			list($path, $query) = explode('?', $path, 2);
+			$path .= '?'.($query ? $query : filemtime(EGW_SERVER_ROOT.$path));
 			$response->includeCSS($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
 
@@ -2307,7 +2305,7 @@ 
 
 		// add all js files from egw_framework::validate_file()
 		$files = self::bundle_js_includes(self::$js_include_mgr->get_included_files());
-		foreach($files as $path)
+		foreach ($files as $path)
 		{
 			$response->includeScript($GLOBALS['egw_info']['server']['webserver_url'].$path);
 		}
@@ -2367,7 +2365,7 @@ 
 	 * @deprecated use egw_favorites::favorite_list
 	 * @return array with a single sidebox menu item (array) containing html for favorites
 	 */
-	public static function favorite_list($app, $default=null)
+	public static function favorite_list($app, $default = null)
 	{
 		return egw_favorites::list_favorites($app, $default);
 	}
@@ -2396,17 +2394,17 @@ 
 	 */
 	public static function ajax_user_list()
 	{
-		$list = array('accounts' => array(),'groups' => array(), 'owngroups' => array());
-		if($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
+		$list = array('accounts' => array(), 'groups' => array(), 'owngroups' => array());
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['account_selection'] == 'primary_group')
 		{
 			$list['accounts']['filter']['group'] = $GLOBALS['egw_info']['user']['account_primary_group'];
 		}
-		foreach($list as $type => &$accounts)
+		foreach ($list as $type => &$accounts)
 		{
 			$options = array('account_type' => $type) + $accounts;
-			$key_pair = accounts::link_query('',$options);
+			$key_pair = accounts::link_query('', $options);
 			$accounts = array();
-			foreach($key_pair as $account_id => $name)
+			foreach ($key_pair as $account_id => $name)
 			{
 				$accounts[] = array('value' => $account_id, 'label' => $name);
 			}
@@ -2443,9 +2441,9 @@ 
 	 *
 	 * @deprecated use $GLOBALS['egw']->framework->sidebox()
 	 */
-	function display_sidebox($appname,$menu_title,$_file)
+	function display_sidebox($appname, $menu_title, $_file)
 	{
 		$file = str_replace('preferences.uisettings.index', 'preferences.preferences_settings.index', $_file);
-		$GLOBALS['egw']->framework->sidebox($appname,$menu_title,$file);
+		$GLOBALS['egw']->framework->sidebox($appname, $menu_title, $file);
 	}
  }

Braces +107 added lines, -28 removed lines

@@ -96,12 +96,18 @@ 
 			$GLOBALS['egw_info']['server']['template_set'] = 'pixelegg';
 		}
 		// default to idots, if no template_set set, to eg. not stall installations if settings use egw::link
-		if (empty($GLOBALS['egw_info']['server']['template_set'])) $GLOBALS['egw_info']['server']['template_set'] = 'idots';
+		if (empty($GLOBALS['egw_info']['server']['template_set']))
+		{
+			$GLOBALS['egw_info']['server']['template_set'] = 'idots';
+		}
 		// setup the new eGW framework (template sets)
 		$class = $GLOBALS['egw_info']['server']['template_set'].'_framework';
-		if (!class_exists($class))	// first try to autoload the class
+		if (!class_exists($class))
+		{
+			// first try to autoload the class
 		{
 			require_once($file=EGW_INCLUDE_ROOT.'/phpgwapi/templates/'.$GLOBALS['egw_info']['server']['template_set'].'/class.'.$class.'.inc.php');
+		}
 			if (!in_array($file,(array)$_SESSION['egw_required_files']))
 			{
 				$_SESSION['egw_required_files'][] = $file;	// automatic load the used framework class, when the object get's restored
@@ -243,13 +249,19 @@ 
 			{
 				foreach($app_additional as $addtional)
 				{
-					if ($addtional) $frame_src = array_unique(array_merge($frame_src, $addtional));
+					if ($addtional)
+					{
+						$frame_src = array_unique(array_merge($frame_src, $addtional));
+					}
 				}
 			}
 			return self::csp_frame_src_attrs($frame_src);
 		}
 
-		if (!isset(self::$csp_frame_src_attrs)) self::$csp_frame_src_attrs = array();
+		if (!isset(self::$csp_frame_src_attrs))
+		{
+			self::$csp_frame_src_attrs = array();
+		}
 
 		foreach((array)$set as $attr)
 		{
@@ -359,8 +371,14 @@ 
 	 */
 	function render($content,$app_header=null,$navbar=null)
 	{
-		if (!is_null($app_header)) $GLOBALS['egw_info']['flags']['app_header'] = $app_header;
-		if (!is_null($navbar)) $GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		if (!is_null($app_header))
+		{
+			$GLOBALS['egw_info']['flags']['app_header'] = $app_header;
+		}
+		if (!is_null($navbar))
+		{
+			$GLOBALS['egw_info']['flags']['nonavbar'] = !$navbar;
+		}
 
 		echo $this->header();
 
@@ -516,9 +534,12 @@ 
 	{
 		// adding links of refreshed entry, to give others apps more information about necessity to refresh
 		if (isset(self::$extra['refresh-opener']) && count(self::$extra['refresh-opener']) <= 8 &&	// do not run twice
-			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))	// app/id given
+			!empty(self::$extra['refresh-opener'][1]) && !empty(self::$extra['refresh-opener'][2]))
+		{
+			// app/id given
 		{
 			$links = egw_link::get_links(self::$extra['refresh-opener'][1], self::$extra['refresh-opener'][2]);
+		}
 			$apps = array();
 			foreach($links as $link)
 			{
@@ -894,7 +915,10 @@ 
 		// send appheader to clientside
 		$extra['app-header'] = $app_header;
 
-		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki') $robots ='<meta name="robots" content="none" />';
+		if($GLOBALS['egw_info']['flags']['currentapp'] != 'wiki')
+		{
+			$robots ='<meta name="robots" content="none" />';
+		}
 		if (substr($GLOBALS['egw_info']['server']['favicon_file'],0,4) == 'http')
 		{
 			$var['favicon_file'] = $GLOBALS['egw_info']['server']['favicon_file'];
@@ -1068,7 +1092,10 @@ 
 			if (($remote = file_get_contents(egw_framework::CURRENT_VERSION_URL, false, egw_framework::proxy_context())))
 			{
 				list($current, $security) = explode("\n", $remote);
-				if (empty($security)) $security = $current;
+				if (empty($security))
+				{
+					$security = $current;
+				}
 				$versions = array(
 					'current'  => $current,		// last maintenance update
 					'security' => $security,	// last security update
@@ -1157,7 +1184,10 @@ 
 	protected static function update_older($version, $days)
 	{
 		list(,,$date) = explode('.', $version);
-		if ($date < 20140000) return false;
+		if ($date < 20140000)
+		{
+			return false;
+		}
 		$version_timestamp = mktime(0, 0, 0, (int)substr($date, 4, 2), (int)substr($date, -2), (int)substr($date, 0, 4));
 
 		return (time() - $version_timestamp) / 86400 > $days;
@@ -1230,13 +1260,19 @@ 
 		$ind_b = isset($arr[$b['name']]) ? $arr[$b['name']] : null;
 
 		if ($ind_a == $ind_b)
-			return 0;
+		{
+					return 0;
+		}
 
 		if ($ind_a == null)
-			return -1;
+		{
+					return -1;
+		}
 
 		if ($ind_b == null)
-			return 1;
+		{
+					return 1;
+		}
 
 		return $ind_a > $ind_b ? 1 : -1;
 	}
@@ -1334,9 +1370,12 @@ 
 			$app_title = $GLOBALS['egw_info']['apps'][$app]['title'];
 		}
 
-		if ($GLOBALS['egw_info']['user']['apps']['preferences'])	// preferences last
+		if ($GLOBALS['egw_info']['user']['apps']['preferences'])
+		{
+			// preferences last
 		{
 			$prefs = $apps['preferences'];
+		}
 			unset($apps['preferences']);
 			$apps['preferences'] = $prefs;
 		}
@@ -1396,12 +1435,18 @@ 
 
 			// For mobile user-agent we prefer mobile theme over selected one with a final fallback to theme named as template
 			$themes_to_check = array();
-			if (html::$ua_mobile) $themes_to_check[] = $this->template_dir.'/css/mobile.css';
+			if (html::$ua_mobile)
+			{
+				$themes_to_check[] = $this->template_dir.'/css/mobile.css';
+			}
 			$themes_to_check[] = $this->template_dir.'/css/'.$GLOBALS['egw_info']['user']['preferences']['common']['theme'].'.css';
 			$themes_to_check[] = $this->template_dir.'/css/'.$this->template.'.css';
 			foreach($themes_to_check as $theme_css)
 			{
-				if (file_exists(EGW_SERVER_ROOT.$theme_css)) break;
+				if (file_exists(EGW_SERVER_ROOT.$theme_css))
+				{
+					break;
+				}
 			}
 			self::includeCSS($theme_css);
 
@@ -1421,14 +1466,20 @@ 
 		$max_modified = 0;
 		$debug_minify = $GLOBALS['egw_info']['server']['debug_minify'] === 'True';
 		$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
-		if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
+		if ($base_path[0] != '/')
+		{
+			$base_path = parse_url($base_path, PHP_URL_PATH);
+		}
 		$css_files = '';
 		foreach(self::$css_include_files as $path)
 		{
 			foreach(self::resolve_css_includes($path) as $path)
 			{
 				list($file,$query) = explode('?',$path,2);
-				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified) $max_modified = $mod;
+				if (($mod = filemtime(EGW_SERVER_ROOT.$file)) > $max_modified)
+				{
+					$max_modified = $mod;
+				}
 
 				// do NOT include app.css or categories.php, as it changes from app to app
 				if ($debug_minify || substr($path, -8) == '/app.css' || substr($file,-14) == 'categories.php')
@@ -1444,7 +1495,10 @@ 
 		if (!$debug_minify)
 		{
 			$css = $GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/inc/min/?';
-			if ($base_path && $base_path != '/') $css .= 'b='.substr($base_path, 1).'&';
+			if ($base_path && $base_path != '/')
+			{
+				$css .= 'b='.substr($base_path, 1).'&';
+			}
 			$css .= 'f='.$css_file .
 				($GLOBALS['egw_info']['server']['debug_minify'] === 'debug' ? '&debug' : '').
 				'&'.$max_modified;
@@ -1532,7 +1586,9 @@ 
 		}
 
 		$extra['url'] = $GLOBALS['egw_info']['server']['webserver_url'];
-		$extra['include'] = array_map(function($str){return substr($str,1);}, self::get_script_links(true), array(1));
+		$extra['include'] = array_map(function($str)
+		{
+return substr($str,1);}, self::get_script_links(true), array(1));
 		$extra['app'] = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		// Load LABjs ONCE here
@@ -1544,7 +1600,10 @@ 
 		// add values of extra parameter and class var as data attributes to script tag of egw.js
 		foreach($extra+self::$extra as $name => $value)
 		{
-			if (is_array($value)) $value = json_encode($value);
+			if (is_array($value))
+			{
+				$value = json_encode($value);
+			}
 			// we need to double encode (html::htmlspecialchars( , TRUE)), as otherwise we get invalid json, eg. for quotes
 			$java_script .= ' data-'.$name."=\"". html::htmlspecialchars($value, true)."\"";
 		}
@@ -1690,7 +1749,8 @@ 
 
 		$GLOBALS['egw']->hooks->process('topmenu_info',array(),true);
 		// Add extra items added by hooks
-		foreach(self::$top_menu_extra as $extra_item) {
+		foreach(self::$top_menu_extra as $extra_item)
+		{
 			$this->_add_topmenu_item($extra_item);
 		}
 
@@ -1715,7 +1775,10 @@ 
 	protected function add_preferences_topmenu($type='prefs')
 	{
 		static $memberships=null;
-		if (!isset($memberships)) $memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		if (!isset($memberships))
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true);
+		}
 		static $types = array(
 			'prefs' => array(
 				'title' => 'Preferences',
@@ -1743,7 +1806,10 @@ 
 			// as all apps answer, we need to remove none-true responses
 			foreach($apps as $app => $val)
 			{
-				if (!$val) unset($apps[$app]);
+				if (!$val)
+				{
+					unset($apps[$app]);
+				}
 			}
 		}
 		else
@@ -2101,7 +2167,11 @@ 
 		$query = null;
 		foreach($js_includes as $path)
 		{
-			if ($path == '/phpgwapi/js/jsapi/egw.js') continue;	// loaded via own tag, and we must not load it twice!
+			if ($path == '/phpgwapi/js/jsapi/egw.js')
+			{
+				continue;
+			}
+			// loaded via own tag, and we must not load it twice!
 
 			unset($query);
 			list($path,$query) = explode('?',$path,2);
@@ -2109,21 +2179,30 @@ 
 
 			// for now minify does NOT support query parameters, nor php files generating javascript
 			if ($debug_minify || $query || substr($path, -3) != '.js' || strpos($path,'ckeditor') !== false ||
-				substr($path, -7) == '/app.js')	// do NOT include app.js, as it changes from app to app
+				substr($path, -7) == '/app.js')
+			{
+				// do NOT include app.js, as it changes from app to app
 			{
 				$path .= '?'. $mod.($query ? '&'.$query : '');
+			}
 				$to_include[] = $path;
 			}
 			else
 			{
-				if ($mod > $max_modified) $max_modified = $mod;
+				if ($mod > $max_modified)
+				{
+					$max_modified = $mod;
+				}
 				$to_minify[] = substr($path,1);
 			}
 		}
 		if (!$debug_minify && $to_minify)
 		{
 			$base_path = $GLOBALS['egw_info']['server']['webserver_url'];
-			if ($base_path[0] != '/') $base_path = parse_url($base_path, PHP_URL_PATH);
+			if ($base_path[0] != '/')
+			{
+				$base_path = parse_url($base_path, PHP_URL_PATH);
+			}
 			$path = '/phpgwapi/inc/min/?'.($base_path && $base_path != '/' ? 'b='.substr($base_path, 1).'&' : '').
 				'f='.implode(',', $to_minify) .
 				($GLOBALS['egw_info']['server']['debug_minify'] === 'debug' ? '&debug' : '').

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

@@ -788,7 +788,7 @@ 
 	 */
 	public function _get_footer()
 	{
-		$var = Array(
+		$var = array(
 			'img_root'       => $GLOBALS['egw_info']['server']['webserver_url'] . $this->template_dir.'/images',
 			'version'        => $GLOBALS['egw_info']['server']['versions']['phpgwapi']
 		);
@@ -1304,13 +1304,13 @@ 
 				$icon_app = isset($data['icon_app']) ? $data['icon_app'] : $app;
 				if ($app != $GLOBALS['egw_info']['flags']['currentapp'])
 				{
-					$apps[$app]['icon']  = common::image($icon_app,Array($icon,'nonav'),'',$svg);
-					$apps[$app]['icon_hover']  = common::image_on($icon_app,Array($icon,'nonav'),'-over',$svg);
+					$apps[$app]['icon']  = common::image($icon_app,array($icon,'nonav'),'',$svg);
+					$apps[$app]['icon_hover']  = common::image_on($icon_app,array($icon,'nonav'),'-over',$svg);
 				}
 				else
 				{
-					$apps[$app]['icon']  = common::image_on($icon_app,Array($icon,'nonav'),'-over',$svg);
-					$apps[$app]['icon_hover']  = common::image($icon_app,Array($icon,'nonav'),'',$svg);
+					$apps[$app]['icon']  = common::image_on($icon_app,array($icon,'nonav'),'-over',$svg);
+					$apps[$app]['icon_hover']  = common::image($icon_app,array($icon,'nonav'),'',$svg);
 				}
 			}
 		}
@@ -1345,15 +1345,15 @@ 
 		$apps['about']['title'] = 'EGroupware';
 
 		$apps['about']['url']   = egw::link('/about.php');
-		$apps['about']['icon']  = common::image('phpgwapi',Array('about','nonav'));
-		$apps['about']['icon_hover']  = common::image_on('phpgwapi',Array('about','nonav'),'-over');
+		$apps['about']['icon']  = common::image('phpgwapi',array('about','nonav'));
+		$apps['about']['icon_hover']  = common::image_on('phpgwapi',array('about','nonav'),'-over');
 		$apps['about']['name'] = 'about';
 
 		$apps['logout']['title'] = lang('Logout');
 		$apps['logout']['name'] = 'logout';
 		$apps['logout']['url']   = egw::link('/logout.php');
-		$apps['logout']['icon']  = common::image('phpgwapi',Array('logout','nonav'));
-		$apps['logout']['icon_hover']  = common::image_on('phpgwapi',Array('logout','nonav'),'-over');
+		$apps['logout']['icon']  = common::image('phpgwapi',array('logout','nonav'));
+		$apps['logout']['icon_hover']  = common::image_on('phpgwapi',array('logout','nonav'),'-over');
 
 		return $apps;
 	}

phpgwapi/inc/class.egw_htmLawed.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -104,7 +104,7 @@
 	 * @param varchar $html2check =text input Text to check
 	 * @param mixed $Config = text or array
 	 * @param mixed $Spec =text or array; The '$spec' argument can be used to disallow an otherwise legal attribute for an element
-	 * @return varchar cleaned/fixed html
+	 * @return string cleaned/fixed html
 	 */
 	function run($html2check, $Config=null, $Spec=array())
 	{

Spacing +58 added lines, -58 removed lines

@@ -81,8 +81,8 @@ 
 		*/
 
 		$this->Configuration = array('comment'=>1, //remove comments
-			'make_tag_strict'=>3,//3 is a new own config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
-			'balance'=>0,//turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
+			'make_tag_strict'=>3, //3 is a new own config value, to indicate that transformation is to be performed, but don't transform font, as size transformation of numeric sizes to keywords alters the intended result too much
+			'balance'=>0, //turn off tag-balancing (config['balance']=>0). That will not introduce any security risk; only standards-compliant tag nesting check/filtering will be turned off (basic tag-balance will remain; i.e., there won't be any unclosed tag, etc., after filtering)
 			// tidy eats away even some wanted whitespace, so we switch it off;
 			// we used it for its compacting and beautifying capabilities, which resulted in better html for further processing
 			'tidy'=>0,
@@ -102,7 +102,7 @@ 
 	 * @param mixed $Spec =text or array; The '$spec' argument can be used to disallow an otherwise legal attribute for an element
 	 * @return varchar cleaned/fixed html
 	 */
-	function egw_htmLawed($html2check, $Config=null, $Spec=array())
+	function egw_htmLawed($html2check, $Config = null, $Spec = array())
 	{
 		//error_log(__METHOD__.__LINE__.' Input:'.$html2check);
 		if (is_array($Config) && is_array($this->Configuration)) $Config = array_merge($this->Configuration, $Config);
@@ -111,12 +111,12 @@ 
 		// If we are processing mails, we take out stuff in <style> stuff </style> tags and
 		// put it back in after purifying; styles are processed for known security risks
 		// in html::getStyles
-		$styles='';
+		$styles = '';
 		// we allow filtered style sections now throughout egroupware
 		/*if ($Config['hook_tag'] =="hl_email_tag_transform")*/ $styles = html::getStyles($html2check);
 		//error_log(__METHOD__.__LINE__.array2string($styles));
 
-		return ($styles?$styles:'').htmLawed($html2check, $Config, $Spec);
+		return ($styles ? $styles : '').htmLawed($html2check, $Config, $Spec);
 	}
 }
 
@@ -128,17 +128,17 @@ 
  * 						a checking for title, replacing @
  * 						blockquote checking for cite, replacing @
  */
-function hl_my_tag_transform($element, $attribute_array=0)
+function hl_my_tag_transform($element, $attribute_array = 0)
 {
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
+	if (is_numeric($attribute_array)) {
 		return "</$element>";
 	}
 
 	//if ($element=='img') error_log(__METHOD__.__LINE__." ".$element.'->'.array2string($attribute_array));
-	if ($element=='td' && isset($attribute_array['background']))
+	if ($element == 'td' && isset($attribute_array['background']))
 	{
-		if (is_object($GLOBALS['egw']) && stripos($attribute_array['background'],$GLOBALS['egw']->link('/index.php'))!==false)
+		if (is_object($GLOBALS['egw']) && stripos($attribute_array['background'], $GLOBALS['egw']->link('/index.php')) !== false)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($attribute_array));
 			//$attribute_array['background'] = 'url('.$attribute_array['background'].');';
@@ -146,25 +146,25 @@ 
 		else
 		{
 			// $attribute_array['background']='denied:'.$attribute_array['background'];
-			unset($attribute_array['background']);// only internal background images are allowed
+			unset($attribute_array['background']); // only internal background images are allowed
 		}
 	}
 	// Elements other than 'img' or 'img' without a 'img' attribute are returned unchanged
-	if($element == 'img')
+	if ($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt'] == 'image' ? '' : $attribute_array['alt']);
+		if (isset($attribute_array['alt']) && strpos($attribute_array['alt'], '@') !== false) $attribute_array['alt'] = str_replace('@', '(at)', $attribute_array['alt']);
 	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'], '@') !== false) $attribute_array['title'] = str_replace('@', '(at)', $attribute_array['title']);
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'], '@') !== false) $attribute_array['cite'] = str_replace('@', '(at)', $attribute_array['cite']);
 		}
 	}
 	/*
@@ -196,31 +196,31 @@ 
 		$attribute_array['style'] = implode('; ', $style);
 	}
 	*/
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
-	if($element == 'a')
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'], 'script') !== false) $attribute_array['style'] = str_ireplace('script', '', $attribute_array['style']);
+	if ($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
 		// rebuild Anchors, if processed by hl_email_tag_transform
-		if (strpos($attribute_array['href'],"denied:javascript:GoToAnchor('")===0)
+		if (strpos($attribute_array['href'], "denied:javascript:GoToAnchor('") === 0)
 		{
-			$attribute_array['href']=str_ireplace("');",'',str_ireplace("denied:javascript:GoToAnchor('","#",$attribute_array['href']));
+			$attribute_array['href'] = str_ireplace("');", '', str_ireplace("denied:javascript:GoToAnchor('", "#", $attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],"javascript:GoToAnchor('")===0)
+		if (strpos($attribute_array['href'], "javascript:GoToAnchor('") === 0)
 		{
-			$attribute_array['href']=str_ireplace("');",'',str_ireplace("javascript:GoToAnchor('","#",$attribute_array['href']));
+			$attribute_array['href'] = str_ireplace("');", '', str_ireplace("javascript:GoToAnchor('", "#", $attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'], 'denied:javascript') === 0) $attribute_array['href'] = '';
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach ($attribute_array as $k=>$v) {
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
 	// Return the opening tag with attributes
 	static $empty_elements = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1);
-	return "<{$element}{$attributes}". (isset($empty_elements[$element]) ? ' /' : ''). '>';
+	return "<{$element}{$attributes}".(isset($empty_elements[$element]) ? ' /' : '').'>';
 }
 
 /**
@@ -234,22 +234,22 @@ 
  * 						blockquote -checking for cite, replacing @
  * 						throwing away excess div elements, that carry no style or class or id info
  */
-function hl_email_tag_transform($element, $attribute_array=0)
+function hl_email_tag_transform($element, $attribute_array = 0)
 {
 	//error_log(__METHOD__.__LINE__.$element.array2string($attribute_array));
 	static $lastelement;
 	static $throwawaycounter;
-	if (is_null($lastelement)) $lastelement='';
+	if (is_null($lastelement)) $lastelement = '';
 	if (is_null($throwawaycounter)) $throwawaycounter = 0;
 	//if ($throwawaycounter>1) error_log(__METHOD__.__LINE__.' '.$throwawaycounter.$element.array2string($attribute_array));
-	if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array)))
+	if ($element == 'div' && $element == $lastelement && ($attribute_array == 0 || empty($attribute_array)))
 	{
 		if (is_array($attribute_array)) $throwawaycounter++;
-		if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--;
-		if ($throwawaycounter>1) return '';
+		if ($attribute_array == 0 && $throwawaycounter > 0) $throwawaycounter--;
+		if ($throwawaycounter > 1) return '';
 	}
-	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array)) $throwawaycounter = 0;
-	if (is_array($attribute_array) && !empty($attribute_array) && $element=='div')
+	if ($lastelement == 'div' && $element != $lastelement && is_array($attribute_array)) $throwawaycounter = 0;
+	if (is_array($attribute_array) && !empty($attribute_array) && $element == 'div')
 	{
 		$lastelement = 'div_with_attr';
 	}
@@ -258,15 +258,15 @@ 
 		if (is_array($attribute_array)) $lastelement = $element;
 	}
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
-		if($element==$lastelement) $lastelement='';
+	if (is_numeric($attribute_array)) {
+		if ($element == $lastelement) $lastelement = '';
 		return "</$element>";
 	}
 
 	//if ($element=='a') error_log(__METHOD__.__LINE__." ".$element.'->'.array2string($attribute_array));
-	if ($element=='td' && isset($attribute_array['background']))
+	if ($element == 'td' && isset($attribute_array['background']))
 	{
-		if (stripos($attribute_array['background'],'cid:')!==false)
+		if (stripos($attribute_array['background'], 'cid:') !== false)
 		{
 			//error_log(__METHOD__.__LINE__.array2string($attribute_array));
 			//$attribute_array['background'] = 'url('.$attribute_array['background'].');';
@@ -274,73 +274,73 @@ 
 		else
 		{
 			// $attribute_array['background']='denied:'.$attribute_array['background'];
-			unset($attribute_array['background']);// only cid style background images are allowed
+			unset($attribute_array['background']); // only cid style background images are allowed
 		}
 	}
 	// Elements other than 'img' or 'img' without a 'img' attribute are returned unchanged
-	if($element == 'img')
+	if ($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt'] == 'image' ? '' : $attribute_array['alt']);
+		if (isset($attribute_array['alt']) && strpos($attribute_array['alt'], '@') !== false) $attribute_array['alt'] = str_replace('@', '(at)', $attribute_array['alt']);
 		// $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] ? '' : 'match' => '/^cid:.*/'),
 		if (isset($attribute_array['src']))
 		{
-			if (!(strlen($attribute_array['src'])>4 && strlen($attribute_array['src']<400)))
+			if (!(strlen($attribute_array['src']) > 4 && strlen($attribute_array['src'] < 400)))
 			{
-					$attribute_array['alt']= $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
-					$attribute_array['src']=common::image('phpgwapi','dialog_error');
+					$attribute_array['alt'] = $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
+					if (!isset($attribute_array['title'])) $attribute_array['title'] = $attribute_array['alt'];
+					$attribute_array['src'] = common::image('phpgwapi', 'dialog_error');
 			}
 			if (!$GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'])
 			{
-				if (!preg_match('/^cid:.*/',$attribute_array['src']))
+				if (!preg_match('/^cid:.*/', $attribute_array['src']))
 				{
-					$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
-					$attribute_array['src']=common::image('mail','no-image-shown');
+					$attribute_array['alt'] = $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
+					if (!isset($attribute_array['title'])) $attribute_array['title'] = $attribute_array['alt'];
+					$attribute_array['src'] = common::image('mail', 'no-image-shown');
 					$attribute_array['border'] = 1;
 					if ($attribute_array['style'])
 					{
-						if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+						if (stripos($attribute_array['style'], 'border') !== false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si', '', $attribute_array['style']);
 					}
 				}
 			}
 		}
 	}
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'], 'script') !== false) $attribute_array['style'] = str_ireplace('script', '', $attribute_array['style']);
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'], '@') !== false) $attribute_array['title'] = str_replace('@', '(at)', $attribute_array['title']);
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'], '@') !== false) $attribute_array['cite'] = str_replace('@', '(at)', $attribute_array['cite']);
 		}
 	}
-	if($element == 'a')
+	if ($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'], 'denied:javascript') === 0) $attribute_array['href'] = '';
 		if (isset($attribute_array['name']) && isset($attribute_array['id'])) $attribute_array['id'] = $attribute_array['name'];
-		if (strpos($attribute_array['href'],'@')!==false) $attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
-		if (strpos($attribute_array['href'],'#')===0 && (isset(emailadmin_imapbase::$htmLawed_config['transform_anchor']) && emailadmin_imapbase::$htmLawed_config['transform_anchor']===true))
+		if (strpos($attribute_array['href'], '@') !== false) $attribute_array['href'] = str_replace('@', '%40', $attribute_array['href']);
+		if (strpos($attribute_array['href'], '#') === 0 && (isset(emailadmin_imapbase::$htmLawed_config['transform_anchor']) && emailadmin_imapbase::$htmLawed_config['transform_anchor'] === true))
 		{
-			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'],1))."');";
+			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'], 1))."');";
 		}
 
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach ($attribute_array as $k=>$v) {
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
 	// Return the opening tag with attributes
 	static $empty_elements = array('area'=>1, 'br'=>1, 'col'=>1, 'embed'=>1, 'hr'=>1, 'img'=>1, 'input'=>1, 'isindex'=>1, 'param'=>1);
-	return "<{$element}{$attributes}". (isset($empty_elements[$element]) ? ' /' : ''). '>';
+	return "<{$element}{$attributes}".(isset($empty_elements[$element]) ? ' /' : '').'>';
 }
 

Braces +120 added lines, -32 removed lines

@@ -105,9 +105,18 @@ 
 	function egw_htmLawed($html2check, $Config=null, $Spec=array())
 	{
 		//error_log(__METHOD__.__LINE__.' Input:'.$html2check);
-		if (is_array($Config) && is_array($this->Configuration)) $Config = array_merge($this->Configuration, $Config);
-		if (empty($Config)) $Config = $this->Configuration;
-		if (empty($Spec)) $Spec = $this->Spec;
+		if (is_array($Config) && is_array($this->Configuration))
+		{
+			$Config = array_merge($this->Configuration, $Config);
+		}
+		if (empty($Config))
+		{
+			$Config = $this->Configuration;
+		}
+		if (empty($Spec))
+		{
+			$Spec = $this->Spec;
+		}
 		// If we are processing mails, we take out stuff in <style> stuff </style> tags and
 		// put it back in after purifying; styles are processed for known security risks
 		// in html::getStyles
@@ -131,7 +140,8 @@ 
 function hl_my_tag_transform($element, $attribute_array=0)
 {
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
+	if(is_numeric($attribute_array))
+	{
 		return "</$element>";
 	}
 
@@ -153,18 +163,30 @@ 
 	if($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt']))
+		{
+			$attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
+		}
+		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false)
+		{
+			$attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		}
 	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'],'@')!==false)
+		{
+			$attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		}
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'],'@')!==false)
+			{
+				$attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			}
 		}
 	}
 	/*
@@ -196,7 +218,10 @@ 
 		$attribute_array['style'] = implode('; ', $style);
 	}
 	*/
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false)
+	{
+		$attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	}
 	if($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
@@ -209,12 +234,16 @@ 
 		{
 			$attribute_array['href']=str_ireplace("');",'',str_ireplace("javascript:GoToAnchor('","#",$attribute_array['href']));
 		}
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
+		if (strpos($attribute_array['href'],'denied:javascript')===0)
+		{
+			$attribute_array['href']='';
+		}
 	}
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach($attribute_array as $k=>$v)
+	{
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 
@@ -239,27 +268,52 @@ 
 	//error_log(__METHOD__.__LINE__.$element.array2string($attribute_array));
 	static $lastelement;
 	static $throwawaycounter;
-	if (is_null($lastelement)) $lastelement='';
-	if (is_null($throwawaycounter)) $throwawaycounter = 0;
+	if (is_null($lastelement))
+	{
+		$lastelement='';
+	}
+	if (is_null($throwawaycounter))
+	{
+		$throwawaycounter = 0;
+	}
 	//if ($throwawaycounter>1) error_log(__METHOD__.__LINE__.' '.$throwawaycounter.$element.array2string($attribute_array));
 	if ($element=='div' && $element==$lastelement && ($attribute_array==0 || empty($attribute_array)))
 	{
-		if (is_array($attribute_array)) $throwawaycounter++;
-		if ($attribute_array==0 && $throwawaycounter>0) $throwawaycounter--;
-		if ($throwawaycounter>1) return '';
+		if (is_array($attribute_array))
+		{
+			$throwawaycounter++;
+		}
+		if ($attribute_array==0 && $throwawaycounter>0)
+		{
+			$throwawaycounter--;
+		}
+		if ($throwawaycounter>1)
+		{
+			return '';
+		}
+	}
+	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array))
+	{
+		$throwawaycounter = 0;
 	}
-	if ($lastelement=='div' && $element!=$lastelement && is_array($attribute_array)) $throwawaycounter = 0;
 	if (is_array($attribute_array) && !empty($attribute_array) && $element=='div')
 	{
 		$lastelement = 'div_with_attr';
 	}
 	else
 	{
-		if (is_array($attribute_array)) $lastelement = $element;
+		if (is_array($attribute_array))
+		{
+			$lastelement = $element;
+		}
 	}
 	// If second argument is not received, it means a closing tag is being handled
-	if(is_numeric($attribute_array)){
-		if($element==$lastelement) $lastelement='';
+	if(is_numeric($attribute_array))
+	{
+		if($element==$lastelement)
+		{
+			$lastelement='';
+		}
 		return "</$element>";
 	}
 
@@ -281,15 +335,24 @@ 
 	if($element == 'img')
 	{
 		// Re-build 'alt'
-		if (isset($attribute_array['alt'])) $attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
-		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false) $attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		if (isset($attribute_array['alt']))
+		{
+			$attribute_array['alt'] = ($attribute_array['alt']=='image'?'':$attribute_array['alt']);
+		}
+		if (isset($attribute_array['alt'])&&strpos($attribute_array['alt'],'@')!==false)
+		{
+			$attribute_array['alt']=str_replace('@','(at)',$attribute_array['alt']);
+		}
 		// $GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'] ? '' : 'match' => '/^cid:.*/'),
 		if (isset($attribute_array['src']))
 		{
 			if (!(strlen($attribute_array['src'])>4 && strlen($attribute_array['src']<400)))
 			{
 					$attribute_array['alt']= $attribute_array['alt'].' [blocked (reason: url length):'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
+					if (!isset($attribute_array['title']))
+					{
+						$attribute_array['title']=$attribute_array['alt'];
+					}
 					$attribute_array['src']=common::image('phpgwapi','dialog_error');
 			}
 			if (!$GLOBALS['egw_info']['user']['preferences']['mail']['allowExternalIMGs'])
@@ -297,35 +360,59 @@ 
 				if (!preg_match('/^cid:.*/',$attribute_array['src']))
 				{
 					$attribute_array['alt']= $attribute_array['alt'].' [blocked external image:'.$attribute_array['src'].']';
-					if (!isset($attribute_array['title'])) $attribute_array['title']=$attribute_array['alt'];
+					if (!isset($attribute_array['title']))
+					{
+						$attribute_array['title']=$attribute_array['alt'];
+					}
 					$attribute_array['src']=common::image('mail','no-image-shown');
 					$attribute_array['border'] = 1;
 					if ($attribute_array['style'])
 					{
-						if (stripos($attribute_array['style'],'border')!==false) $attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+						if (stripos($attribute_array['style'],'border')!==false)
+						{
+							$attribute_array['style'] = preg_replace('~border(:|-left:|-right:|-bottom:|-top:)+ (0px)+ (none)+;~si','',$attribute_array['style']);
+						}
 					}
 				}
 			}
 		}
 	}
-	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false) $attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	if (isset($attribute_array['style']) && stripos($attribute_array['style'],'script')!==false)
+	{
+		$attribute_array['style'] = str_ireplace('script','',$attribute_array['style']);
+	}
 	if (isset($attribute_array['title']))
 	{
-		if (strpos($attribute_array['title'],'@')!==false) $attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		if (strpos($attribute_array['title'],'@')!==false)
+		{
+			$attribute_array['title']=str_replace('@','(at)',$attribute_array['title']);
+		}
 	}
 	if ($element == 'blockquote')
 	{
 		if (isset($attribute_array['cite']))
 		{
-			if (strpos($attribute_array['cite'],'@')!==false) $attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			if (strpos($attribute_array['cite'],'@')!==false)
+			{
+				$attribute_array['cite']=str_replace('@','(at)',$attribute_array['cite']);
+			}
 		}
 	}
 	if($element == 'a')
 	{
 		//error_log(__METHOD__.__LINE__.array2string($attribute_array));
-		if (strpos($attribute_array['href'],'denied:javascript')===0) $attribute_array['href']='';
-		if (isset($attribute_array['name']) && isset($attribute_array['id'])) $attribute_array['id'] = $attribute_array['name'];
-		if (strpos($attribute_array['href'],'@')!==false) $attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
+		if (strpos($attribute_array['href'],'denied:javascript')===0)
+		{
+			$attribute_array['href']='';
+		}
+		if (isset($attribute_array['name']) && isset($attribute_array['id']))
+		{
+			$attribute_array['id'] = $attribute_array['name'];
+		}
+		if (strpos($attribute_array['href'],'@')!==false)
+		{
+			$attribute_array['href'] = str_replace('@','%40',$attribute_array['href']);
+		}
 		if (strpos($attribute_array['href'],'#')===0 && (isset(emailadmin_imapbase::$htmLawed_config['transform_anchor']) && emailadmin_imapbase::$htmLawed_config['transform_anchor']===true))
 		{
 			$attribute_array['href'] = "javascript:GoToAnchor('".trim(substr($attribute_array['href'],1))."');";
@@ -335,7 +422,8 @@ 
 
 	// Build the attributes string
 	$attributes = '';
-	foreach($attribute_array as $k=>$v){
+	foreach($attribute_array as $k=>$v)
+	{
 		$attributes .= " {$k}=\"{$v}\"";
 	}
 

phpgwapi/inc/class.egw_include_mgr.inc.php

Doc Comments +2 added lines, -7 removed lines

@@ -270,8 +270,6 @@ 
 	 *    --> /phpgwapi/inc/calendar-setup.js?lang=de
 	 *
 	 * @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
-	 * @param string|array $file=null file to be included - no ".js" on the end or array with get params
-	 * @param string $app='phpgwapi' application directory to search - default = phpgwapi
 	 *
 	 * @returns the correct path on the server if the file is found or false, if the
 	 *  file is not found or no further processing is needed.
@@ -332,8 +330,6 @@ 
 	 *    --> /phpgwapi/inc/calendar-setup.js?lang=de
 	 *
 	 * @param string $package package or complete path (relative to EGW_SERVER_ROOT) to be included
-	 * @param string|array $file=null file to be included - no ".js" on the end or array with get params
-	 * @param string $app='phpgwapi' application directory to search - default = phpgwapi
 	 */
 	public function include_js_file($package, $file = null, $app = 'phpgwapi')
 	{
@@ -361,7 +357,7 @@ 
 	 * Include given files, optionally clear list of files to include
 	 *
 	 * @param array $files
-	 * @param boolean $clear_files=false if true clear list of files, before including given ones
+	 * @param boolean $clear_files if true clear list of files, before including given ones
 	 */
 	public function include_files(array $files, $clear_files=false)
 	{
@@ -376,7 +372,7 @@ 
 	/**
 	 * Return all files
 	 *
-	 * @param boolean $clear_files=false if true clear list of files after returning them
+	 * @param boolean $clear_files if true clear list of files after returning them
 	 * @return array
 	 */
 	public function get_included_files($clear_files=false)
@@ -389,7 +385,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param array $files=null optional files to include as for include_files method
 	 */
 	public function __construct(array $files = null)
 	{

Indentation +1 added lines, -1 removed lines

@@ -172,7 +172,7 @@
 	private function file_processed($file)
 	{
 		return (array_key_exists($file, $this->included_files) ||
-			    array_key_exists($file, $this->parsed_files));
+				array_key_exists($file, $this->parsed_files));
 	}
 
 	/**

Spacing +8 added lines, -8 removed lines

@@ -72,7 +72,7 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file, '?') !== false) list($file) = explode('?', $file);
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -280,9 +280,9 @@ 
 	{
 		if ($package[0] == '/' && (is_readable(EGW_SERVER_ROOT.(parse_url($path = $package, PHP_URL_PATH))) ||
 			is_readable(EGW_SERVER_ROOT.($path = $package))) ||
-			$package == '.' && is_readable(EGW_SERVER_ROOT.($path="/$app/js/$file.js")) ||
-			is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) ||
-			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js")))
+			$package == '.' && is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$file.js")) ||
+			is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$package/$file.js")) ||
+			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path = "/phpgwapi/js/$package/$file.js")))
 		{
 			// normalise /./ to /
 			$path = str_replace('/./', '/', $path);
@@ -293,7 +293,7 @@ 
 			// 	adding the ctime to all js files...
 			if (is_array($file))
 			{
-				foreach($file as $name => $val)
+				foreach ($file as $name => $val)
 				{
 					$args .= (empty($args) ? '?' : '&').$name.'='.urlencode($val);
 				}
@@ -363,7 +363,7 @@ 
 	 * @param array $files
 	 * @param boolean $clear_files=false if true clear list of files, before including given ones
 	 */
-	public function include_files(array $files, $clear_files=false)
+	public function include_files(array $files, $clear_files = false)
 	{
 		if ($clear_files) self::$included_files = array();
 
@@ -379,7 +379,7 @@ 
 	 * @param boolean $clear_files=false if true clear list of files after returning them
 	 * @return array
 	 */
-	public function get_included_files($clear_files=false)
+	public function get_included_files($clear_files = false)
 	{
 		$ret = array_keys($this->included_files);
 		if ($clear_files) $this->included_files = array();
@@ -411,7 +411,7 @@ 
 
 	$paths = !empty($_GET['path']) ? (array)$_GET['path'] : (array)'/stylite/js/filemanager/filemanager.js';
 
-	foreach($paths as $path)
+	foreach ($paths as $path)
 	{
 		echo "\t<h1>".htmlspecialchars($path)."</h1>\n";
 		$mgr->include_js_file($path);

Braces +16 added lines, -4 removed lines

@@ -72,7 +72,10 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file,'?') !== false)
+		{
+			list($file) = explode('?',$file);
+		}
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -314,12 +317,15 @@ 
 			}
 		}
 
-		if (self::$DEBUG_MODE) // DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
+		if (self::$DEBUG_MODE)
+		{
+			// DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
 		{
 			//error_log(__METHOD__."($package,$file,$app) $path NOT found".($this->debug_processing_file ? " while processing file '{$this->debug_processing_file}'." : "!").' '.function_backtrace());
 		}
 
 		return false;
+		}
 	}
 
 	/**
@@ -365,7 +371,10 @@ 
 	 */
 	public function include_files(array $files, $clear_files=false)
 	{
-		if ($clear_files) self::$included_files = array();
+		if ($clear_files)
+		{
+			self::$included_files = array();
+		}
 
 		foreach ($files as $file)
 		{
@@ -382,7 +391,10 @@ 
 	public function get_included_files($clear_files=false)
 	{
 		$ret = array_keys($this->included_files);
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 		return $ret;
 	}