EGroupware / egroupware

admin/inc/class.admin_cmd.inc.php

Braces +85 added lines, -21 removed lines

@@ -172,7 +172,10 @@ 
 	 */
 	public static function name()
 	{
-		if (self::NAME) return self::NAME;
+		if (self::NAME)
+		{
+			return self::NAME;
+		}
 
 		return ucfirst(str_replace(['_cmd_', '_', '\\'], ' ', get_called_class()));
 	}
@@ -242,7 +245,10 @@ 
 				{
 					$ret = $this->remote_exec($dry_run);
 				}
-				if (is_null($this->status)) $this->status = admin_cmd::successful;
+				if (is_null($this->status))
+				{
+					$this->status = admin_cmd::successful;
+				}
 			}
 			catch (Exception $e) {
 				_egw_log_exception($e);
@@ -339,7 +345,10 @@ 
 	function delete()
 	{
 		$this->cancel_periodic_job();
-		if ($this->status != admin_cmd::scheduled) return false;
+		if ($this->status != admin_cmd::scheduled)
+		{
+			return false;
+		}
 
 		$this->status = admin_cmd::deleted;
 
@@ -365,7 +374,10 @@ 
 		{
 			$this->modified = time();
 			$this->modifier = $set_modifier ? $GLOBALS['egw_info']['user']['account_id'] : 0;
-			if ($set_modifier) $this->modifier_email = admin_cmd::user_email();
+			if ($set_modifier)
+			{
+				$this->modifier_email = admin_cmd::user_email();
+			}
 		}
 		$vars = get_object_vars($this);	// does not work in php5.1.2 due a bug
 
@@ -481,10 +493,13 @@ 
 		}
 		$cmd = new $class($data);
 
-		if ($cmd instanceof admin_cmd)	// dont allow others classes to be executed that way!
+		if ($cmd instanceof admin_cmd)
+		{
+			// dont allow others classes to be executed that way!
 		{
 			return $cmd;
 		}
+		}
 		throw new Api\Exception\WrongParameter(lang('%1 is no command!',$class), 10);
 	}
 
@@ -521,7 +536,10 @@ 
 
 		$total = admin_cmd::$sql->get_rows($query,$rows,$readonlys);
 
-		if (!$rows) return 0;
+		if (!$rows)
+		{
+			return 0;
+		}
 
 		$async = new Api\Asyncservice();
 		foreach($rows as &$row)
@@ -746,7 +764,10 @@ 
 			}
 		}
 		unset($vars['data']);
-		if ($this->data) $vars = array_merge($this->data,$vars);
+		if ($this->data)
+		{
+			$vars = array_merge($this->data,$vars);
+		}
 
 		return $vars;
 	}
@@ -765,10 +786,13 @@ 
 			admin_cmd::_instanciate_acl($this->creator);
 			// todo: check only if and with $this->creator
 			if (!admin_cmd::$acl->check('run',1,'admin') &&		// creator is no longer admin
-				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))	// creator is explicitly forbidden to do something
+				$extra_acl && $extra_deny && admin_cmd::$acl->check($extra_acl,$extra_deny,'admin'))
+			{
+				// creator is explicitly forbidden to do something
 			{
 				throw new Api\Exception\NoPermission\Admin();
 			}
+			}
 		}
 	}
 
@@ -785,11 +809,14 @@ 
 		{
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				foreach($GLOBALS['egw_info']['apps'] as $app => $data)	// check against title and localised name
+				foreach($GLOBALS['egw_info']['apps'] as $app => $data)
+				{
+					// check against title and localised name
 				{
 					if (!strcasecmp($name,$data['title']) || !strcasecmp($name,lang($app)))
 					{
 						$apps[$key] = $name = $app;
+				}
 						break;
 					}
 				}
@@ -824,7 +851,11 @@ 
 		{
 			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')), 16);
 		}
-		if ($type == 2 && $id > 0) $id = -$id;	// groups use negative id's internally, fix it, if user given the wrong sign
+		if ($type == 2 && $id > 0)
+		{
+			$id = -$id;
+		}
+		// groups use negative id's internally, fix it, if user given the wrong sign
 
 		return $id;
 	}
@@ -840,7 +871,10 @@ 
 	 */
 	static function parse_accounts($accounts,$allow_only_user=null)
 	{
-		if (!$accounts) return null;
+		if (!$accounts)
+		{
+			return null;
+		}
 
 		$ids = array();
 		foreach(is_array($accounts) ? $accounts : explode(',',$accounts) as $account)
@@ -859,9 +893,12 @@ 
 	 */
 	static function parse_date($date)
 	{
-		if (!is_numeric($date))	// we allow to input a timestamp
+		if (!is_numeric($date))
+		{
+			// we allow to input a timestamp
 		{
 			$datein = $date;
+		}
 			// convert german DD.MM.YYYY format into ISO YYYY-MM-DD format
 			$date = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$/','\3-\2-\1',$date);
 
@@ -1019,10 +1056,13 @@ 
 			return false;		// no schduled command, no need to setup the job
 		}
 		$next = $jobs[0];
-		if (($time = $next['scheduled']) < time())	// should run immediatly
+		if (($time = $next['scheduled']) < time())
+		{
+			// should run immediatly
 		{
 			return admin_cmd::run_queued_jobs();
 		}
+		}
 		$async = new Api\Asyncservice();
 
 		// we cant use this class as callback, as it's abstract and ExecMethod used by the async service instanciated the class!
@@ -1080,7 +1120,10 @@ 
 	 */
 	public function set_periodic_job()
 	{
-		if (empty($this->rrule)) return false;
+		if (empty($this->rrule))
+		{
+			return false;
+		}
 
 		// parse rrule and calculate next execution time
 		$event = calendar_rrule::parseRrule($this->rrule, true);	// true: allow HOURLY or MINUTELY
@@ -1201,10 +1244,13 @@ 
 	{
 		admin_cmd::_instanciate_remote();
 
-		if ($data['install_id'] && $data['config_passwd'])	// calculate hash
+		if ($data['install_id'] && $data['config_passwd'])
+		{
+			// calculate hash
 		{
 			$data['remote_hash'] = self::remote_hash($data['install_id'],$data['config_passwd']);
 		}
+		}
 		elseif (!$data['remote_hash'] && !($data['install_id'] && $data['config_passwd']))
 		{
 			throw new Api\Exception\WrongUserinput(lang('Either Install ID AND Api\Config password needed OR the remote hash!'));
@@ -1238,7 +1284,10 @@ 
 		{
 			throw new Api\Exception\WrongParameter(empty($config_passwd)?'Empty Api\Config password':'install_id no md5 hash');
 		}
-		if (!self::is_md5($config_passwd)) $config_passwd = md5($config_passwd);
+		if (!self::is_md5($config_passwd))
+		{
+			$config_passwd = md5($config_passwd);
+		}
 
 		return md5($config_passwd.$install_id);
 	}
@@ -1368,7 +1417,10 @@ 
 				{
 					// remember label from last description widget
 					case 'description':
-						if (!empty($widget->attrs['value'])) $label = $widget->attrs['value'];
+						if (!empty($widget->attrs['value']))
+						{
+							$label = $widget->attrs['value'];
+						}
 						break;
 					// ignore non input-widgets
 					case 'hbox': case 'vbox': case 'box': case 'groupbox':
@@ -1380,8 +1432,14 @@ 
 					default:
 						if (!empty($widget->id))
 						{
-							if (!empty($widget->attrs['label'])) $label = $widget->attrs['label'];
-							if (!empty($label)) $labels[$widget->id] = $label;
+							if (!empty($widget->attrs['label']))
+							{
+								$label = $widget->attrs['label'];
+							}
+							if (!empty($label))
+							{
+								$labels[$widget->id] = $label;
+							}
 							$label = null;
 						}
 						break;
@@ -1419,7 +1477,10 @@ 
 					case 'button': case 'buttononly': case 'taglist-thumbnail':
 						break;
 					case 'radio':
-						if (!is_array($widgets[$widget->id])) $widgets[$widget->id] = [];
+						if (!is_array($widgets[$widget->id]))
+						{
+							$widgets[$widget->id] = [];
+						}
 						$label = (string)$widget->attrs['label'];
 						// translate "{something} {else}" type options
 						if (strpos($label, '{') !== false)
@@ -1433,7 +1494,10 @@ 
 						break;
 					// config templates have options in the template
 					case 'option':
-						if (!is_array($widgets[$last_select])) $widgets[$last_select] = [];
+						if (!is_array($widgets[$last_select]))
+						{
+							$widgets[$last_select] = [];
+						}
 						$label = (string)$widget->attrs['#text'];
 						// translate "{something} {else}" type options
 						if (strpos($label, '{') !== false)