EGroupware / egroupware

api/src/Asyncservice.php

Braces +98 added lines, -28 removed lines

@@ -114,7 +114,8 @@ 
 			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
 			$debug = True;	// enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if(is_null($now))
+		{
 			$now = time();
 		}
 
@@ -179,12 +180,17 @@ 
 		foreach($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug)
+			{
+echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if(is_array($times[$u]))
+				{
 					$time = array_keys($times[$u]);
-				} else {
+				}
+				else
+				{
 					$time = explode(',',$times[$u]);
 				}
 				$times[$u] = array();
@@ -197,7 +203,10 @@ 
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is 'min-max', min <= max, min='$min', max='$max'</p>\n";
+							}
 
 							return False;
 						}
@@ -208,14 +217,20 @@ 
 					}
 					else
 					{
-						if ((string)$t == '*') 	$t = '*/1';
+						if ((string)$t == '*')
+						{
+							$t = '*/1';
+						}
 
 						list($one,$inc) = $arr = explode('/',$t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
 						{
-							if ($debug) echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							if ($debug)
+							{
+								echo "<p>Syntax error in $u='$t', allowed is a number or '{*|range}/inc', inc='$inc'</p>\n";
+							}
 
 							return False;
 						}
@@ -233,7 +248,10 @@ 
 							}
 							elseif (count($arr) != 2 || $min > $max)
 							{
-								if ($debug) echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								if ($debug)
+								{
+									echo "<p>Syntax error in $u='$t', allowed is '{*|min-max}/inc', min='$min',max='$max', inc='$inc'</p>\n";
+								}
 								return False;
 							}
 							for ($i = $min; $i <= $max; $i += $inc)
@@ -244,9 +262,13 @@ 
 					}
 				}
 			}
-			elseif ($n < $last_set || $u == 'dow')	// before last value set (or dow) => empty gets enumerated
+			elseif ($n < $last_set || $u == 'dow')
+			{
+				// before last value set (or dow) => empty gets enumerated
 			{
-				for ($i = $min_unit[$u]; $i <= $max_unit[$u]; ++$i)
+				for ($i = $min_unit[$u];
+			}
+			$i <= $max_unit[$u]; ++$i)
 				{
 					$times[$u][$i] = True;
 				}
@@ -256,7 +278,9 @@ 
 				$times[$u][$min_unit[$u]] = True;
 			}
 		}
-		if ($this->debug) { echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
+		if ($this->debug)
+		{
+echo "enumerated times=<pre>"; print_r($times); echo "</pre>\n"; }
 
 		// now we have the times enumerated, lets find the first not expired one
 		//
@@ -274,7 +298,10 @@ 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
-					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					if ($this->debug)
+					{
+						echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
+					}
 					continue;	// already set
 				}
 				foreach(array_keys($times[$u]) as $unit_value)
@@ -292,30 +319,44 @@ 
 							break;
 
 					}
-					if ($valid && ($u != $next || $unit_value > $over))	 // valid and not over
+					if ($valid && ($u != $next || $unit_value > $over))
+					{
+						// valid and not over
 					{
 						$found[$u] = $unit_value;
+					}
 						$future = $future || $unit_value > $unit_now;
 						break;
 					}
 				}
-				if (!isset($found[$u]))		// we have to try the next one, if it exists
+				if (!isset($found[$u]))
+				{
+					// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
+				}
 					if (!isset($nexts[count($found)-1]))
 					{
-						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
+						if ($this->debug)
+						{
+							echo "<p>Nothing found, exiting !!!</p>\n";
+						}
 						return False;
 					}
 					$next = $nexts[count($found)-1];
 					$over = $found[$next];
 					unset($found[$next]);
-					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					if ($this->debug)
+					{
+						echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
+					}
 					break;
 				}
 			}
 		}
-		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
+		if ($this->debug)
+		{
+echo "<p>next="; print_r($found); echo "</p>\n"; }
 
 		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
 	}
@@ -377,7 +418,10 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists)
+			{
+				$where = array('async_next=0 OR async_next<'.(time()-600));
+			}
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -388,7 +432,10 @@ 
 	 */
 	function check_run($run_by='')
 	{
-		if ($run_by === 'fallback') flush();
+		if ($run_by === 'fallback')
+		{
+			flush();
+		}
 
 		if (!$this->last_check_run(True,False,$run_by))
 		{
@@ -410,7 +457,10 @@ 
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
 					foreach($GLOBALS as $name => $value)
 					{
-						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
+						if ($name !== 'egw' && is_object($value))
+						{
+							unset($GLOBALS[$name]);
+						}
 					}
 					$domain = $GLOBALS['egw_info']['user']['domain'];
 					$lang   = $GLOBALS['egw_info']['user']['preferences']['common']['lang'];
@@ -480,7 +530,10 @@ 
 	 */
 	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return false;
+		}
 
 		if ($id === '%')
 		{
@@ -533,9 +586,15 @@ 
 	 */
 	function write($job, $exists = False, $where=array())
 	{
-		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
+		if (!is_a($this->db, 'EGroupware\\Api\\Db'))
+		{
+			return 0;
+		}
 
-		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next'])) $job['data']['next'] = $job['next'];
+		if (is_array($job['data']) && isset($job['data']['next']) && isset($job['next']))
+		{
+			$job['data']['next'] = $job['next'];
+		}
 		$data = array(
 			'async_next'      => $job['next'],
 			'async_times'     => json_encode($job['times']),
@@ -600,9 +659,12 @@ 
 					{
 						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))
+						{
+							// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
+						}
 							$webserver = posix_getpwuid(posix_getuid ());
 							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
 					}
@@ -622,10 +684,13 @@ 
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
-			if ($this->php5[0] == '/')	// we found a php5 binary
+			if ($this->php5[0] == '/')
+			{
+				// we found a php5 binary
 			{
 				$this->php = $this->php5;
 			}
+			}
 		}
 	}
 
@@ -637,7 +702,8 @@ 
 	 */
 	function installed()
 	{
-		if ($this->only_fallback) {
+		if ($this->only_fallback)
+		{
 			return 0;
 		}
 		$this->find_binarys();
@@ -654,7 +720,10 @@ 
 			$n = 0;
 			while ($line = fgets($crontab,256))
 			{
-				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
+				if ($this->debug)
+				{
+					echo 'line '.++$n.": $line<br>\n";
+				}
 				$parts = explode(' ',$line,6);
 
 				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
@@ -698,7 +767,8 @@ 
 	 */
 	function install($times)
 	{
-		if ($this->only_fallback && $times !== False) {
+		if ($this->only_fallback && $times !== False)
+		{
 			return 0;
 		}
 		$this->installed();	// find other installed cronlines

api/src/Link/Storage.php

Braces +4 added lines, -1 removed lines

@@ -302,7 +302,10 @@
 			}
 			if ($owner)
 			{
-				if ($app) $where = array($where);
+				if ($app)
+				{
+					$where = array($where);
+				}
 				$where['link_owner'] = $owner;
 			}
 		}

api/src/loader/common.php

Braces +24 added lines, -6 removed lines

@@ -47,7 +47,10 @@ 
 {
 	static $func_overload = null;
 
-	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	if (is_null($func_overload))
+	{
+		$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	}
 
 	return $func_overload & 2 ? mb_strlen($str,'ascii') : strlen($str);
 }
@@ -64,7 +67,10 @@ 
 {
 	static $func_overload = null;
 
-	if (is_null($func_overload)) $func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	if (is_null($func_overload))
+	{
+		$func_overload = extension_loaded('mbstring') ? ini_get('mbstring.func_overload') : 0;
+	}
 
 	if (is_null($len))
 	{
@@ -130,7 +136,10 @@ 
 			{
 				$personal = str_replace('\\', '', substr($personal, 1, -1));
 			}
-			if (empty($host)) $host = $default_host;
+			if (empty($host))
+			{
+				$host = $default_host;
+			}
 
 			$addresses[] = (object)array_diff(array(
 				'mailbox'  => $mailbox,
@@ -153,13 +162,19 @@ 
 	 */
 	function imap_rfc822_write_address($mailbox, $host, $personal)
 	{
-		if (is_array($personal))  $personal = implode(' ', $personal);
+		if (is_array($personal))
+		{
+			$personal = implode(' ', $personal);
+		}
 
 		//if (!preg_match('/^[!#$%&\'*+/0-9=?A-Z^_`a-z{|}~-]+$/u', $personal))	// that's how I read the rfc(2)822
-		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))	// but quoting is never wrong, so quote more then necessary
+		if ($personal && !preg_match('/^[0-9A-Z -]*$/iu', $personal))
+		{
+			// but quoting is never wrong, so quote more then necessary
 		{
 			$personal = '"'.str_replace(array('\\', '"'),array('\\\\', '\\"'), $personal).'"';
 		}
+		}
 		return ($personal ? $personal.' <' : '').$mailbox.($host ? '@'.$host : '').($personal ? '>' : '');
 	}
 }
@@ -366,7 +381,9 @@ 
 	return $_GET['menuaction'] ? $_GET['menuaction'] : str_replace(EGW_SERVER_ROOT,'',$_SERVER['SCRIPT_FILENAME']);
 }
 
-if (!function_exists('lang') || defined('NO_LANG'))	// setup declares an own version
+if (!function_exists('lang') || defined('NO_LANG'))
+{
+	// setup declares an own version
 {
 	/**
 	 * function to handle multilanguage support
@@ -380,6 +397,7 @@ 
 		if(!is_array($vars))
 		{
 			$vars = func_get_args();
+}
 			array_shift($vars);	// remove $key
 		}
 		return Api\Translation::translate($key,$vars);

api/src/loader/exception.php

Braces +3 added lines, -1 removed lines

@@ -188,7 +188,9 @@
 /**
  * Used internally to trace warnings
  */
-class egw_exception_warning extends Exception {}
+class egw_exception_warning extends Exception
+{
+}
 
 // install our error-handler only for catchable fatal errors and warnings
 // following error types cannot be handled with a user defined function: E_ERROR, E_PARSE, E_CORE_ERROR, E_CORE_WARNING, E_COMPILE_ERROR, E_COMPILE_WARNING

api/src/loader/security.php

Braces +8 added lines, -2 removed lines

@@ -24,7 +24,9 @@ 
 {
 	static $preg=null;
 	//old: '/<\/?[^>]*\b(iframe|script|javascript|on(before)?(abort|blur|change|click|dblclick|error|focus|keydown|keypress|keyup|load|mousedown|mousemove|mouseout|mouseover|mouseup|reset|select|submit|unload))\b[^>]*>/i';
-	if (!isset($preg)) $preg =
+	if (!isset($preg))
+	{
+		$preg =
 		// forbidden tags like iframe or script
 		'/(<(\s*\/)?\s*(iframe|script|object|embed|math|meta)[^a-z0-9]|'.
 		// on* attributes
@@ -33,6 +35,7 @@ 
 		'<[^>]+(href|src|dynsrc|lowsrc|background|style|poster|action)\s*=\s*("|\')?[^"\']*javascript|'.
 		// benavior:url and expression in style attribute
 		'<[^>]+style\s*=\s*("|\')[^>]*(behavior\s*:\s*url|expression)\s*\()/i';
+	}
 	if (is_array($var))
 	{
 		foreach($var as $key => $val)
@@ -41,7 +44,9 @@ 
 			{
 				_check_script_tag($var[$key],$name.'['.$key.']');
 			}
-			elseif(strpos($val, '<') !== false)	// speedup: ignore everything without <
+			elseif(strpos($val, '<') !== false)
+			{
+				// speedup: ignore everything without <
 			{
 				if (preg_match($preg,$val))
 				{
@@ -49,6 +54,7 @@ 
 					if ($name == '_POST' && $key == 'json_data' && ($json_data = json_decode($val, true)))
 					{
 						_check_script_tag($json_data, $name.'[json_data]');
+			}
 						$_REQUEST[$key] = $var[$key] = json_encode($json_data);
 						continue;
 					}

api/src/Storage/Tracking.php

Braces +157 added lines, -39 removed lines

@@ -239,7 +239,10 @@ 
 			$header_done = false;
 			foreach($cfs as $name => $field)
 			{
-				if (in_array($field['type'], Customfields::$non_printable_fields)) continue;
+				if (in_array($field['type'], Customfields::$non_printable_fields))
+				{
+					continue;
+				}
 
 				if (!$header_done)
 				{
@@ -337,8 +340,14 @@ 
 		{
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.' Field:'.$name. ' Value (old):'.array2string($old[$name]));
-			if (is_array($data[$name]) && array_key_exists('id',$data[$name])) $data[$name] = $data[$name]['id'];
-			if (is_array($old[$name]) && array_key_exists('id',$old[$name])) $old[$name] = $old[$name]['id'];
+			if (is_array($data[$name]) && array_key_exists('id',$data[$name]))
+			{
+				$data[$name] = $data[$name]['id'];
+			}
+			if (is_array($old[$name]) && array_key_exists('id',$old[$name]))
+			{
+				$old[$name] = $old[$name]['id'];
+			}
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (new):'.array2string($data[$name]));
 			//error_log(__METHOD__.__LINE__.'(After processing) Field:'.$name. ' Value (old):'.array2string($old[$name]));
 		}
@@ -352,11 +361,18 @@ 
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;	// can be eg. 'addressbook:', if no contact selected
+				if (!$id)
+				{
+					continue;
+				}
+				// can be eg. 'addressbook:', if no contact selected
 			}
 			$source_id = $data[$this->id_field];
 			//error_log(__METHOD__.__LINE__.array2string($source_id));
-			if ($source_id) Api\Link::link($this->app,$source_id,$app,$id);
+			if ($source_id)
+			{
+				Api\Link::link($this->app,$source_id,$app,$id);
+			}
 			//error_log(__METHOD__.__LINE__."Api\Link::link('$this->app',".array2string($source_id).",'$app',$id);");
 			//echo "<p>Api\Link::link('$this->app',{$data[$this->id_field]},'$app',$id);</p>\n";
 		}
@@ -364,14 +380,24 @@ 
 		// unlink removed application entries
 		foreach(array_diff($old_ids,$current_ids) as $name => $id)
 		{
-			if (!isset($data[$name])) continue;	// ignore not set link cf's, eg. from sync clients
+			if (!isset($data[$name]))
+			{
+				continue;
+			}
+			// ignore not set link cf's, eg. from sync clients
 			if (!($app = $this->cf_link_fields[$name]))
 			{
 				list($app,$id) = explode(':',$id);
-				if (!$id) continue;
+				if (!$id)
+				{
+					continue;
+				}
 			}
 			$source_id = $data[$this->id_field];
-			if ($source_id) Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			if ($source_id)
+			{
+				Api\Link::unlink(null,$this->app,$source_id,0,$app,$id);
+			}
 			//echo "<p>Api\Link::unlink(NULL,'$this->app',{$data[$this->id_field]},0,'$app',$id);</p>\n";
 		}
 	}
@@ -396,7 +422,10 @@ 
 			$changed_fields = self::changed_fields($data,$old);
 			//error_log(__METHOD__.__LINE__.' Changedfields:'.array2string($changed_fields));
 		}
-		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action'])) return 0;
+		if (!$changed_fields && ($old || !$GLOBALS['egw_info']['server']['log_user_agent_action']))
+		{
+			return 0;
+		}
 
 		if (!is_object($this->historylog) || $this->historylog->user != $this->user)
 		{
@@ -412,10 +441,13 @@ 
 		{
 			$status = isset($this->field2history[$name]) ? $this->field2history[$name] : $name;
 			//error_log(__METHOD__.__LINE__." Name $name,".' Status:'.array2string($status));
-			if (is_array($status))	// 1:N relation --> remove common rows
+			if (is_array($status))
+			{
+				// 1:N relation --> remove common rows
 			{
 				//error_log(__METHOD__.__LINE__.' is Array');
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 				$added = array_values(array_diff($data[$name],$old[$name]));
 				$removed = array_values(array_diff($old[$name],$data[$name]));
@@ -449,17 +481,31 @@ 
 	 */
 	public function changed_fields(array $data,array $old=null)
 	{
-		if (is_null($old)) return array_keys($data);
+		if (is_null($old))
+		{
+			return array_keys($data);
+		}
 		$changed_fields = array();
 		foreach($this->field2history as $name => $status)
 		{
-			if (!$old[$name] && !$data[$name]) continue;	// treat all sorts of empty equally
+			if (!$old[$name] && !$data[$name])
+			{
+				continue;
+			}
+			// treat all sorts of empty equally
 
-			if ($name[0] == '#' && !isset($data[$name])) continue;	// no set customfields are not stored, therefore not changed
+			if ($name[0] == '#' && !isset($data[$name]))
+			{
+				continue;
+			}
+			// no set customfields are not stored, therefore not changed
 
-			if (is_array($status))	// 1:N relation
+			if (is_array($status))
+			{
+				// 1:N relation
 			{
 				self::compact_1_N_relation($data[$name],$status);
+			}
 				self::compact_1_N_relation($old[$name],$status);
 			}
 			if ($old[$name] != $data[$name])
@@ -467,13 +513,22 @@ 
 				// normalize arrays, we do NOT care for the order of multiselections
 				if (is_array($data[$name]) || is_array($old[$name]))
 				{
-					if (!is_array($data[$name])) $data[$name] = explode(',',$data[$name]);
-					if (!is_array($old[$name])) $old[$name] = explode(',',$old[$name]);
+					if (!is_array($data[$name]))
+					{
+						$data[$name] = explode(',',$data[$name]);
+					}
+					if (!is_array($old[$name]))
+					{
+						$old[$name] = explode(',',$old[$name]);
+					}
 					if (count($data[$name]) == count($old[$name]))
 					{
 						sort($data[$name]);
 						sort($old[$name]);
-						if ($data[$name] == $old[$name]) continue;
+						if ($data[$name] == $old[$name])
+						{
+							continue;
+						}
 					}
 				}
 				elseif (str_replace("\r", '', $old[$name]) == str_replace("\r", '', $data[$name]))
@@ -534,13 +589,19 @@ 
 	public function do_notifications($data,$old,$deleted=null,&$email_notified=null)
 	{
 		$this->errors = $email_sent = array();
-		if (!empty($email_notified) && is_array($email_notified)) $email_sent = $email_notified;
+		if (!empty($email_notified) && is_array($email_notified))
+		{
+			$email_sent = $email_notified;
+		}
 
-		if (!$this->notify_current_user && $this->user)		// do we have a current user and should we notify the current user about his own changes
+		if (!$this->notify_current_user && $this->user)
+		{
+			// do we have a current user and should we notify the current user about his own changes
 		{
 			//error_log("do_notificaton() adding user=$this->user to email_sent, to not notify him");
 			$email_sent[] = $GLOBALS['egw']->accounts->id2name($this->user,'account_email');
 		}
+		}
 		$skip_notify = $this->get_config('skip_notify',$data,$old);
 		if($skip_notify && is_array($skip_notify))
 		{
@@ -579,11 +640,14 @@ 
 			//error_log(__METHOD__."() data[$this->assigned_field]=".print_r($data[$this->assigned_field],true).", old[$this->assigned_field]=".print_r($old[$this->assigned_field],true));
 			$old_assignees = array();
 			$assignees = $assigned ? $assigned : array();
-			if ($data[$this->assigned_field])	// current assignments
+			if ($data[$this->assigned_field])
+			{
+				// current assignments
 			{
 				$assignees = is_array($data[$this->assigned_field]) ?
 					$data[$this->assigned_field] : explode(',',$data[$this->assigned_field]);
 			}
+			}
 			if ($old && $old[$this->assigned_field])
 			{
 				$old_assignees = is_array($old[$this->assigned_field]) ?
@@ -592,7 +656,10 @@ 
 			foreach(array_unique(array_merge($assignees,$old_assignees)) as $assignee)
 			{
 				//error_log(__METHOD__."() assignee=$assignee, type=".$GLOBALS['egw']->accounts->get_type($assignee).", email=".$GLOBALS['egw']->accounts->id2name($assignee,'account_email'));
-				if (!$assignee) continue;
+				if (!$assignee)
+				{
+					continue;
+				}
 
 				// item assignee is a user
 				if ($GLOBALS['egw']->accounts->get_type($assignee) == 'u')
@@ -600,10 +667,13 @@ 
 					if (($email = $GLOBALS['egw']->accounts->id2name($assignee,'account_email')) && !in_array($email, $email_sent))
 					{
 						if ($this->send_notification($data,$old,$email,$assignee,'notify_assigned',
-							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))	// assignment changed
+							in_array($assignee,$assignees) !== in_array($assignee,$old_assignees) || $deleted))
+						{
+							// assignment changed
 						{
 							$email_sent[] = $email;
 						}
+						}
 					}
 				}
 				else	// item assignee is a group
@@ -613,10 +683,13 @@ 
 						if (($email = $GLOBALS['egw']->accounts->id2name($u,'account_email')) && !in_array($email, $email_sent))
 						{
 							if ($this->send_notification($data,$old,$email,$u,'notify_assigned',
-								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))	// assignment changed
+								in_array($u,$assignees) !== in_array($u,$old_assignees) || $deleted))
+							{
+								// assignment changed
 							{
 								$email_sent[] = $email;
 							}
+							}
 						}
 					}
 				}
@@ -679,25 +752,38 @@ 
 	public function send_notification($data,$old,$email,$user_or_lang,$check=null,$assignment_changed=true,$deleted=null)
 	{
 		//error_log(__METHOD__."(,,'$email',$user_or_lang,$check,$assignment_changed,$deleted)");
-		if (!$email) return false;
+		if (!$email)
+		{
+			return false;
+		}
 
 		$save_user = $GLOBALS['egw_info']['user'];
 		$do_notify = true;
 
-		if (is_numeric($user_or_lang))	// user --> read everything from his prefs
+		if (is_numeric($user_or_lang))
+		{
+			// user --> read everything from his prefs
 		{
 			$GLOBALS['egw_info']['user']['account_id'] = $user_or_lang;
+		}
 			$GLOBALS['egw']->preferences->__construct($user_or_lang);
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->read_repository(false);	// no session prefs!
 
-			if ($check && $this->check2pref) $check = $this->check2pref[$check];
+			if ($check && $this->check2pref)
+			{
+				$check = $this->check2pref[$check];
+			}
 
 			if ($check && !$GLOBALS['egw_info']['user']['preferences'][$this->app][$check] ||	// no notification requested
 				// only notification about changed assignment requested
 				$check && $GLOBALS['egw_info']['user']['preferences'][$this->app][$check] === 'assignment' && !$assignment_changed ||
-				$this->user == $user_or_lang && !$this->notify_current_user)  // no popup for own actions
+				$this->user == $user_or_lang && !$this->notify_current_user)
 			{
-				$do_notify = false;	// no notification requested / necessary
+				// no popup for own actions
+			{
+				$do_notify = false;
+			}
+			// no notification requested / necessary
 			}
 		}
 		else
@@ -706,10 +792,13 @@ 
 			$GLOBALS['egw_info']['user']['preferences'] = $GLOBALS['egw']->preferences->default_prefs();
 			$GLOBALS['egw_info']['user']['preferences']['common']['lang'] = $user_or_lang;
 		}
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != Api\Translation::$userlang)	// load the right language if needed
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != Api\Translation::$userlang)
+		{
+			// load the right language if needed
 		{
 			Api\Translation::init();
 		}
+		}
 
 		$receiver = is_numeric($user_or_lang) ? $user_or_lang : $email;
 
@@ -813,7 +902,10 @@ 
 			$do_time = ($timestamp->format('Hi') != '0000');
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if ($do_time) $format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		if ($do_time)
+		{
+			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] != 12 ? 'H:i' : 'h:i a');
+		}
 
 		return $timestamp->format($format);
 	}
@@ -843,9 +935,12 @@ 
 		{
 			$name = $GLOBALS['egw']->accounts->id2name($this->user,'account_fullname');
 
-			if($prefer_id) {
+			if($prefer_id)
+			{
 				$sender = $this->user;
-			} else {
+			}
+			else
+			{
 				$sender = $name ? $name.' <'.$email.'>' : $email;
 			}
 		}
@@ -947,7 +1042,10 @@ 
 			// remove the session-id in the notification mail!
 			$link = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$link);
 
-			if ($popup) $link .= '&nopopup=1';
+			if ($popup)
+			{
+				$link .= '&nopopup=1';
+			}
 		}
 		//error_log(__METHOD__."(..., $allow_popup, $receiver) returning ".array2string($allow_popup ? array($link,$popup) : $link));
 		return $allow_popup ? array($link,$popup) : $link;
@@ -1022,7 +1120,11 @@ 
 			// if both values are '', 0 or null, we count them as equal too
 			$modified = $old && $data[$name] != $old[$name] && !(!$data[$name] && !$old[$name]);
 			//if ($modified) error_log("data[$name]=".print_r($data[$name],true).", old[$name]=".print_r($old[$name],true)." --> modified=".(int)$modified);
-			if (empty($detail['value']) && !$modified) continue;	// skip unchanged, empty values
+			if (empty($detail['value']) && !$modified)
+			{
+				continue;
+			}
+			// skip unchanged, empty values
 
 			$body .= $this->format_line($html_email,$detail['type'],$modified,
 				$detail['label'] ? $detail['label'] : '', $detail['value']);
@@ -1056,7 +1158,11 @@ 
 
 		if ($html_mail)
 		{
-			if (!$this->html_content_allow) $line = Api\Html::htmlspecialchars($line);	// XSS
+			if (!$this->html_content_allow)
+			{
+				$line = Api\Html::htmlspecialchars($line);
+			}
+			// XSS
 
 			$color = $modified ? 'red' : false;
 			$size  = '110%';
@@ -1095,15 +1201,24 @@ 
 		}
 		else	// text-mail
 		{
-			if ($type == 'reply') $content = str_repeat('-',64)."\n";
+			if ($type == 'reply')
+			{
+				$content = str_repeat('-',64)."\n";
+			}
 
-			if ($modified) $content .= '> ';
+			if ($modified)
+			{
+				$content .= '> ';
+			}
 		}
 		$content .= $line;
 
 		if ($html_mail)
 		{
-			if ($line && $data) $content .= '</td><td style="'.$style.'">';
+			if ($line && $data)
+			{
+				$content .= '</td><td style="'.$style.'">';
+			}
 			if ($type == 'link')
 			{
 				// the link is often too long for html boxes chunk-split allows to break lines if needed
@@ -1122,7 +1237,10 @@ 
 		{
 			$content .= ($content&&$data?': ':'').$data;
 		}
-		if ($html_mail) $content .= '</td></tr>';
+		if ($html_mail)
+		{
+			$content .= '</td></tr>';
+		}
 
 		$content .= "\n";
 

api/src/Storage/Base.php

Braces +193 added lines, -51 removed lines

@@ -182,7 +182,10 @@ 
 	function __construct($app='',$table='',Api\Db $db=null,$column_prefix='',$no_clone=false,$timestamp_type=null)
 	{
 		// ease the transition to api
-		if ($app == 'phpgwapi') $app = 'api';
+		if ($app == 'phpgwapi')
+		{
+			$app = 'api';
+		}
 
 		if ($no_clone)
 		{
@@ -198,9 +201,15 @@ 
 		{
 			$this->app = $app;
 
-			if (!$no_clone) $this->db->set_app($app);
+			if (!$no_clone)
+			{
+				$this->db->set_app($app);
+			}
 
-			if ($table) $this->setup_table($app,$table,$column_prefix);
+			if ($table)
+			{
+				$this->setup_table($app,$table,$column_prefix);
+			}
 		}
 		$this->init();
 
@@ -221,7 +230,10 @@ 
 	 */
 	public function set_times($timestamp_type=false)
 	{
-		if ($timestamp_type !== false) $this->timestamp_type = $timestamp_type;
+		if ($timestamp_type !== false)
+		{
+			$this->timestamp_type = $timestamp_type;
+		}
 
 		// set current time
 		switch($this->timestamp_type)
@@ -279,7 +291,10 @@ 
 			{
 				$this->autoinc_id = $col;
 			}
-			if ($def['type'] == 'bool') $this->has_bools = true;
+			if ($def['type'] == 'bool')
+			{
+				$this->has_bools = true;
+			}
 
 			foreach($this->table_def['uc'] as $k => $uni_index)
 			{
@@ -318,7 +333,10 @@ 
 	 */
 	function data_merge($new)
 	{
-		if ((int) $this->debug >= 4) echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::data_merge(".print_r($new,true).")</p>\n";
+		}
 
 		if (!is_array($new) || !count($new))
 		{
@@ -342,7 +360,10 @@ 
 		{
 			$this->data[self::USER_TIMEZONE_READ] = $new[self::USER_TIMEZONE_READ];
 		}
-		if ((int) $this->debug >= 4) _debug_array($this->data);
+		if ((int) $this->debug >= 4)
+		{
+			_debug_array($this->data);
+		}
 	}
 
 	/**
@@ -486,7 +507,10 @@ 
 		if (!is_array($keys))
 		{
 			$pk = array_values($this->db_key_cols);
-			if ($pk) $keys = array($pk[0] => $keys);
+			if ($pk)
+			{
+				$keys = array($pk[0] => $keys);
+			}
 		}
 
 		$this->init($keys);
@@ -500,13 +524,16 @@ 
 				$query[$db_col] = $this->data[$col];
 			}
 		}
-		if (!$query)	// no primary key in keys, lets try the data_cols for a unique key
+		if (!$query)
+		{
+			// no primary key in keys, lets try the data_cols for a unique key
 		{
 			foreach($this->db_uni_cols as $db_col => $col)
 			{
 				if (!is_array($col) && $this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 				elseif(is_array($col))
 				{
@@ -520,31 +547,43 @@ 
 						}
 						$q[$db_c] = $this->data[$c];
 					}
-					if ($q) $query += $q;
+					if ($q)
+					{
+						$query += $q;
+					}
 				}
 			}
 		}
-		if (!$query)	// no unique key in keys, lets try everything else
+		if (!$query)
+		{
+			// no unique key in keys, lets try everything else
 		{
 			foreach($this->db_data_cols as $db_col => $col)
 			{
 				if ($this->data[$col] != '')
 				{
 					$query[$db_col] = $this->data[$col];
+		}
 				}
 			}
 		}
-		if (!$query)	// keys has no cols
+		if (!$query)
+		{
+			// keys has no cols
 		{
 			$this->db2data();
+		}
 
 			return False;
 		}
-		if ($join)	// Prefix the columns with the table-name, as they might exist in the join
+		if ($join)
+		{
+			// Prefix the columns with the table-name, as they might exist in the join
 		{
 			foreach($query as $col => $val)
 			{
 				if (is_int($col) || strpos($join,$col) === false) continue;
+		}
 				$query[] = $this->db->expression($this->table_name,$this->table_name.'.',array($col=>$val));
 				unset($query[$col]);
 			}
@@ -553,11 +592,14 @@ 
 			$query,__LINE__,__FILE__,False,'',$this->app,0,$join) as $row)
 		{
 			$cols = $this->db_cols;
-			if ($extra_cols)	// extra columns to report
+			if ($extra_cols)
+			{
+				// extra columns to report
 			{
 				foreach(is_array($extra_cols) ? $extra_cols : array($extra_cols) as $col)
 				{
 					if (FALSE!==stripos($col,' as ')) $col = preg_replace('/^.* as *([a-z0-9_]+) *$/i','\\1',$col);
+			}
 					$cols[$col] = $col;
 				}
 			}
@@ -580,7 +622,10 @@ 
 		{
 			unset($this->data[$this->db_key_cols[$this->autoinc_id]]);
 		}
-		if ((int) $this->debug >= 4) echo "nothing found !!!</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "nothing found !!!</p>\n";
+		}
 
 		$this->db2data();
 
@@ -596,7 +641,10 @@ 
 	 */
 	function save($keys=null,$extra_where=null)
 	{
-		if (is_array($keys) && count($keys)) $this->data_merge($keys);
+		if (is_array($keys) && count($keys))
+		{
+			$this->data_merge($keys);
+		}
 
 		// check if data contains user timezone during read AND user changed timezone since then
 		// --> load old timezone for the rest of this request
@@ -613,9 +661,13 @@ 
 		}
 		$this->data2db();
 
-		if ((int) $this->debug >= 4) { echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
+		if ((int) $this->debug >= 4)
+		{
+echo "so_sql::save(".print_r($keys,true).") autoinc_id='$this->autoinc_id', data="; _debug_array($this->data); }
 
-		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])	// insert with auto id
+		if ($this->autoinc_id && !$this->data[$this->db_key_cols[$this->autoinc_id]])
+		{
+			// insert with auto id
 		{
 			foreach($this->db_cols as $db_col => $col)
 			{
@@ -625,7 +677,9 @@ 
 						(isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value
 						 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
 					{
-						continue;	// no need to write that (unset) column
+						continue;
+		}
+		// no need to write that (unset) column
 					}
 					if ($this->table_def['fd'][$db_col]['type'] == 'varchar' &&
 						strlen($this->data[$col]) > $this->table_def['fd'][$db_col]['precision'])
@@ -656,9 +710,13 @@ 
 				if (!array_key_exists($col,$this->data) &&	// handling of unset columns in $this->data
 					($this->autoinc_id ||			// update of table with auto id or
 					 isset($this->table_def['fd'][$db_col]['default']) ||	// we have a default value or
-					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))	// column is nullable
+					 !isset($this->table_def['fd'][$db_col]['nullable']) || $this->table_def['fd'][$db_col]['nullable']))
 				{
-					continue;	// no need to write that (unset) column
+					// column is nullable
+				{
+					continue;
+				}
+				// no need to write that (unset) column
 				}
 				$data[$db_col] = !is_object($this->data[$col]) && (string) $this->data[$col] === '' && $this->empty_on_write == 'NULL' ? null : $this->data[$col];
 			}
@@ -675,9 +733,12 @@ 
 			{
 				$keys[$db_col] = $this->data[$col];
 			}
-			if (!$data && !$this->autoinc_id)	// happens if all columns are in the primary key
+			if (!$data && !$this->autoinc_id)
+			{
+				// happens if all columns are in the primary key
 			{
 				$data = $keys;
+			}
 				$keys = False;
 			}
 			if ($this->autoinc_id)
@@ -708,7 +769,10 @@ 
 	 */
 	function update($_fields,$merge=true)
 	{
-		if ($merge) $this->data_merge($_fields);
+		if ($merge)
+		{
+			$this->data_merge($_fields);
+		}
 
 		$fields = $this->data2db($_fields);
 
@@ -761,9 +825,12 @@ 
 		{
 			$keys = array($this->autoinc_id => $keys);
 		}
-		if (!is_array($keys) || !count($keys))	// use internal data
+		if (!is_array($keys) || !count($keys))
+		{
+			// use internal data
 		{
 			$data = $this->data;
+		}
 			$keys = $this->db_key_cols;
 		}
 		else	// data and keys are supplied in $keys
@@ -783,7 +850,10 @@ 
 		{
 			$query[$db_col] = $data[$col];
 		}
-		if ($only_return_query) return $query;
+		if ($only_return_query)
+		{
+			return $query;
+		}
 
 		$this->db->delete($this->table_name,$query,__LINE__,__FILE__,$this->app);
 
@@ -816,7 +886,10 @@ 
 	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false)
 	{
 		//error_log(__METHOD__.'('.array2string(array_combine(array_slice(array('criteria','only_keys','order_by','extra_cols','wildcard','empty','op','start','filter','join','need_full_no_count'), 0, count(func_get_args())), func_get_args())).')');
-		if ((int) $this->debug >= 4) echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>so_sql::search(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
+		}
 
 		// if extending class or instanciator set columns to search, convert string criteria to array
 		if ($criteria && !is_array($criteria))
@@ -880,9 +953,12 @@ 
 								($negate ? ') ' : '');
 						}
 					}
-					elseif (strpos($db_col,'.') !== false)	// we have a table-name specified
+					elseif (strpos($db_col,'.') !== false)
+					{
+						// we have a table-name specified
 					{
 						list($table,$only_col) = explode('.',$db_col);
+					}
 						$type = $this->db->get_column_attribute($only_col, $table, true, 'type');
 						if (empty($type))
 						{
@@ -907,13 +983,17 @@ 
 					}
 				}
 			}
-			if (is_array($query) && $op != 'AND') $query = $this->db->column_data_implode(' '.$op.' ',$query);
+			if (is_array($query) && $op != 'AND')
+			{
+				$query = $this->db->column_data_implode(' '.$op.' ',$query);
+			}
 		}
 		if (is_array($filter))
 		{
 			$db_filter = array();
 			$data2db_filter = $this->data2db($filter);
-			if (!is_array($data2db_filter)) {
+			if (!is_array($data2db_filter))
+			{
 				echo function_backtrace()."<br/>\n";
 				echo "filter=";_debug_array($filter);
 				echo "data2db(filter)=";_debug_array($data2db_filter);
@@ -1009,7 +1089,10 @@ 
 			}
 		}
 		$num_rows = 0;	// as spec. in max_matches in the user-prefs
-		if (is_array($start)) list($start,$num_rows) = $start;
+		if (is_array($start))
+		{
+			list($start,$num_rows) = $start;
+		}
 
 		// fix GROUP BY clause to contain all non-aggregate selected columns
 		if ($order_by && stripos($order_by,'GROUP BY') !== false)
@@ -1037,18 +1120,24 @@ 
 					'append' => $order_by,
 					'join'   => $join,
 				);
-				if (!$union_cols)	// union used the colum-names of the first query
+				if (!$union_cols)
+				{
+					// union used the colum-names of the first query
 				{
 					$union_cols = $this->_get_columns($only_keys,$extra_cols);
 				}
+				}
 				return true;	// waiting for further calls, before running the union-query
 			}
 			// running the union query now
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$union[0]['cols'] = ($mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ').$union[0]['cols'];
+			}
 				}
 				else	// cant do a count, have to run the query without limit
 				{
@@ -1056,18 +1145,24 @@ 
 				}
 			}
 			$rs = $this->db->union($union,__LINE__,__FILE__,$order_by,$start,$num_rows);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 
 			$cols = $union_cols;
 			$union = $union_cols = array();
 		}
 		else	// no UNION
 		{
-			if ($start !== false)	// need to get the total too, saved in $this->total
+			if ($start !== false)
+			{
+				// need to get the total too, saved in $this->total
 			{
 				if ($this->db->Type == 'mysql' && $this->db->ServerInfo['version'] >= 4.0)
 				{
 					$mysql_calc_rows = 'SQL_CALC_FOUND_ROWS ';
+			}
 				}
 				elseif (!$need_full_no_count && (!$join || stripos($join,'LEFT JOIN')!==false))
 				{
@@ -1080,10 +1175,16 @@ 
 			}
 			$rs = $this->db->select($this->table_name,$mysql_calc_rows.$colums,$query,__LINE__,__FILE__,
 				$start,$order_by,$this->app,$num_rows,$join);
-			if ($this->debug) error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			if ($this->debug)
+			{
+				error_log(__METHOD__."() ".$this->db->Query_ID->sql);
+			}
 			$cols = $this->_get_columns($only_keys,$extra_cols);
 		}
-		if ((int) $this->debug >= 4) echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		if ((int) $this->debug >= 4)
+		{
+			echo "<p>sql='{$this->db->Query_ID->sql}'</p>\n";
+		}
 
 		if ($mysql_calc_rows)
 		{
@@ -1096,9 +1197,12 @@ 
 		}
 		$arr = array();
 		$n = 0;
-		if ($rs) foreach($rs as $row)
+		if ($rs)
+		{
+			foreach($rs as $row)
 		{
 			$data = array();
+		}
 			foreach($cols as $db_col => $col)
 			{
 				$data[$col] = (isset($row[$db_col]) ? $row[$db_col] : $row[$col]);
@@ -1166,9 +1270,15 @@ 
 					$col = substr($col, $pos+9);
 				}
 				$alias = $col;
-				if (stripos($col, ' AS ')) list($col, $alias) = preg_split('/ +AS +/i', $col);
+				if (stripos($col, ' AS '))
+				{
+					list($col, $alias) = preg_split('/ +AS +/i', $col);
+				}
 				// do NOT group by constant expressions
-				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col)) continue;
+				if (preg_match('/^ *(-?[0-9]+|".*"|\'.*\'|NULL) *$/i', $col))
+				{
+					continue;
+				}
 				if (!in_array($col, $group_by_cols) && !in_array($alias, $group_by_cols))
 				{
 					// instead of aliased primary key, we have to use original column incl. table-name as alias is ambigues
@@ -1201,7 +1311,10 @@ 
 	{
 		$pattern = trim($_pattern);
 		// This function can get called multiple times.  Make sure it doesn't re-process.
-		if (empty($pattern) || is_array($pattern)) return $pattern;
+		if (empty($pattern) || is_array($pattern))
+		{
+			return $pattern;
+		}
 		if(strpos($pattern, 'CAST(COALESCE(') !== false)
 		{
 			return $pattern;
@@ -1271,7 +1384,7 @@ 
 			{
 				$token = substr($token, 1,strlen($token));
  				if(substr($token, -1) != '"')
-				{
+ 				{
 					$token .= ' '.strtok('"');
 				}
 				else
@@ -1387,7 +1500,8 @@ 
 			foreach($search_cols as $key => &$col)
 			{
 				// If the name as given isn't a real column name, and adding the prefix doesn't help, skip it
-				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols))) {
+				if(!$this->table_def['fd'][$col] && !($col = $this->prefix.array_search($col, $search_cols)))
+				{
 					// Can't search this column
 					unset($search_cols[$key]);
 					continue;
@@ -1421,10 +1535,13 @@ 
 	function _get_columns($only_keys,$extra_cols)
 	{
 		//echo "_get_columns() only_keys="; _debug_array($only_keys); echo "extra_cols="; _debug_array($extra_cols);
-		if ($only_keys === true)	// only primary key
+		if ($only_keys === true)
+		{
+			// only primary key
 		{
 			$cols = $this->db_key_cols;
 		}
+		}
 		else
 		{
 			$cols = array();
@@ -1433,18 +1550,27 @@ 
 			{
 				if (!$distinct_checked)
 				{
-					if (stripos($col, 'DISTINCT ') === 0) $col = substr($col, 9);
+					if (stripos($col, 'DISTINCT ') === 0)
+					{
+						$col = substr($col, 9);
+					}
 					$distinct_checked = true;
 				}
-				if (!$col || $col == '*' || $col == $this->table_name.'.*')	// all columns
+				if (!$col || $col == '*' || $col == $this->table_name.'.*')
+				{
+					// all columns
 				{
 					$cols = array_merge($cols,$this->db_cols);
 				}
+				}
 				else	// only the specified columns
 				{
-					if (stripos($col,'as'))	// if there's already an explicit naming of the column, just use it
+					if (stripos($col,'as'))
+					{
+						// if there's already an explicit naming of the column, just use it
 					{
 						$col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+					}
 						$cols[$col] = $col;
 						continue;
 					}
@@ -1459,11 +1585,14 @@ 
 				}
 			}
 		}
-		if ($extra_cols)	// extra columns to report
+		if ($extra_cols)
+		{
+			// extra columns to report
 		{
 			foreach(is_array($extra_cols) ? $extra_cols : explode(',',$extra_cols) as $col)
 			{
 				if (stripos($col,'as ')!==false) $col = preg_replace('/^.*as +([a-z0-9_]+) *$/i','\\1',$col);
+		}
 				if (($db_col = array_search($col,$this->db_cols)) !== false)
 				{
 					$cols[$db_col] = $col;
@@ -1508,7 +1637,11 @@ 
 			'',false,$op,$query['num_rows']?array((int)$query['start'],$query['num_rows']):(int)$query['start'],
 			$query['col_filter'],$join,$need_full_no_count);
 
-		if (!$rows) $rows = array();	// otherwise false returned from search would be returned as array(false)
+		if (!$rows)
+		{
+			$rows = array();
+		}
+		// otherwise false returned from search would be returned as array(false)
 
 		return $this->total;
 	}
@@ -1587,7 +1720,10 @@ 
 		{
 			return $cache[$cache_key];
 		}
-		if (!is_array($value_col)) $value_col = array($value_col);
+		if (!is_array($value_col))
+		{
+			$value_col = array($value_col);
+		}
 
 		$cols = $ret = array();
 		foreach($value_col as $key => $col)
@@ -1595,7 +1731,10 @@ 
 			$matches = null;
 			$cols[$key] = preg_match('/AS ([a-z_0-9]+)$/i',$col,$matches) ? $matches[1] : $col;
 		}
-		if (!$order) $order = current($cols);
+		if (!$order)
+		{
+			$order = current($cols);
+		}
 
 		if (($search =& $this->search(array(),($key_col ? $key_col.',' : 'DISTINCT ').implode(',',$value_col),$order,'','',false,'AND',false,$filter)))
 		{
@@ -1621,7 +1760,10 @@ 
 				{
 					$data = $row[current($cols)];
 				}
-				if ($data) $ret[$row[$key_col]] = $data;
+				if ($data)
+				{
+					$ret[$row[$key_col]] = $data;
+				}
 			}
 		}
 		return $cache[$cache_key] =& $ret;

api/src/Storage/History.php

Braces +16 added lines, -5 removed lines

@@ -142,7 +142,10 @@ 
 	 */
 	function search($filter,$order='history_id',$sort='DESC',$limit=null)
 	{
-		if (!is_array($filter)) $filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		if (!is_array($filter))
+		{
+			$filter = is_numeric($filter) ? array('history_record_id' => $filter) : array();
+		}
 
 		if (!$order || !preg_match('/^[a-z0-9_]+$/i',$order) || !preg_match('/^(asc|desc)?$/i',$sort))
 		{
@@ -160,10 +163,16 @@ 
 				unset($filter[$col]);
 			}
 		}
-		if (!isset($filter['history_appname'])) $filter['history_appname'] = $this->appname;
+		if (!isset($filter['history_appname']))
+		{
+			$filter['history_appname'] = $this->appname;
+		}
 
 		// do not try to read all history entries of an app
-		if (!$filter['history_record_id']) return array();
+		if (!$filter['history_record_id'])
+		{
+			return array();
+		}
 
 		$rows = array();
 		foreach($this->db->select(self::TABLE, '*', $filter, __LINE__, __FILE__,
@@ -188,8 +197,10 @@ 
 		$rows = array();
 		$filter['history_appname'] = $query['appname'];
 		$filter['history_record_id'] = $query['record_id'];
-		if(is_array($query['colfilter'])) {
-			foreach($query['colfilter'] as $column => $value) {
+		if(is_array($query['colfilter']))
+		{
+			foreach($query['colfilter'] as $column => $value)
+			{
 				$filter[$column] = $value;
 			}
 		}

api/src/Exception/NoPermission/Admin.php

Braces +4 added lines, -1 removed lines

@@ -21,7 +21,10 @@
 {
 	function __construct($msg=null,$code=102)
 	{
-		if (is_null($msg)) $msg = 'admin';
+		if (is_null($msg))
+		{
+			$msg = 'admin';
+		}
 
 		parent::__construct($msg,$code);
 	}