EGroupware / egroupware

admin/inc/class.admin_cmd_check_cats.inc.php

Spacing +2 added lines, -2 removed lines

@@ -24,7 +24,7 @@ 
 	 *
 	 * @param array $data =array() default parm from parent class, no real parameters
 	 */
-	function __construct($data=array())
+	function __construct($data = array())
 	{
 		admin_cmd::__construct($data);
 	}
@@ -35,7 +35,7 @@ 
 	 * @param boolean $check_only =false only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only) return true;
 

Braces +4 added lines, -1 removed lines

@@ -37,7 +37,10 @@
 	 */
 	protected function exec($check_only=false)
 	{
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		admin_cmd::_instanciate_accounts();
 

admin/inc/hook_config_validate.inc.php

Spacing +2 added lines, -2 removed lines

@@ -15,7 +15,7 @@ 
 /*
   Set global flag to indicate for which config settings we have equally named validation methods
 */
-$GLOBALS['egw_info']['server']['found_validation_hook'] = array('vfs_image_dir','fw_mobile_app_list');
+$GLOBALS['egw_info']['server']['found_validation_hook'] = array('vfs_image_dir', 'fw_mobile_app_list');
 
 /**
  * Check VFS dir exists and delete image map to recreate it, if vfs-image-dir changes
@@ -29,7 +29,7 @@ 
 	{
 		if (!Vfs::file_exists($vfs_image_dir) || !Vfs::is_dir($vfs_image_dir))
 		{
-			$GLOBALS['config_error'] = lang('VFS directory "%1" NOT found!',$vfs_image_dir);
+			$GLOBALS['config_error'] = lang('VFS directory "%1" NOT found!', $vfs_image_dir);
 			return;
 		}
 	}

admin/inc/class.admin_db_backup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
  		if (($f = $this->db_backup->fopen_backup()))
  		{
 			$this->db_backup->backup($f);
-			if(is_resource($f))
+			if (is_resource($f))
 				fclose($f);
 			/* Remove old backups. */
 			$this->db_backup->housekeeping();
@@ -41,7 +41,7 @@ 
 	function index()
 	{
 		$tpl_root = EGW_SERVER_ROOT.'/setup/templates/default';
-		$self = $GLOBALS['egw']->link('/index.php',array('menuaction'=>'admin.admin_db_backup.index'));
+		$self = $GLOBALS['egw']->link('/index.php', array('menuaction'=>'admin.admin_db_backup.index'));
 		Api\Translation::add_app('setup');
 		Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
 

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
  		{
 			$this->db_backup->backup($f);
 			if(is_resource($f))
-				fclose($f);
+			{
+							fclose($f);
+			}
 			/* Remove old backups. */
 			$this->db_backup->housekeeping();
 		}

admin/inc/class.admin_egw_user_record.inc.php

Spacing +10 added lines, -10 removed lines

@@ -35,8 +35,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct($_identifier = '') {
+		if (is_array($_identifier)) {
 			$this->identifier = $_identifier['account_id'];
 		} else {
 			$this->identifier = $_identifier;
@@ -90,7 +90,7 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->user = $_record;
 		$this->account_groups = $GLOBALS['egw']->accounts->memberships($this->identifier, true);
 	}
@@ -119,8 +119,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function save($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -129,8 +129,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -140,15 +140,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +31 added lines, -15 removed lines

@@ -35,10 +35,14 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct( $_identifier='' )
+	{
+		if(is_array($_identifier))
+		{
 			$this->identifier = $_identifier['account_id'];
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 		}
 		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
@@ -49,7 +53,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->user[$_attribute_name];
 	}
 
@@ -59,7 +64,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->user[$_attribute_name] = $data;
 	}
 
@@ -71,7 +77,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->user;
 	}
 
@@ -80,7 +87,8 @@ 
 	 *
 	 *@return string title
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return Api\Accounts::username($this->identifier);
 	}
 
@@ -90,7 +98,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->user = $_record;
 		$this->account_groups = $GLOBALS['egw']->accounts->memberships($this->identifier, true);
 	}
@@ -100,7 +109,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -110,7 +120,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'user';
 	}
 
@@ -119,7 +130,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -129,7 +141,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -140,7 +153,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -148,7 +162,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -156,7 +171,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->user);
 	}
 }

admin/inc/class.admin_wizard_export_users_csv.inc.php

Indentation +13 added lines, -13 removed lines

@@ -18,20 +18,20 @@
 		parent::__construct();
 
 		// Field mapping
-                $this->export_fields = array(
+				$this->export_fields = array(
 			'account_id'		=> lang('Account ID'),
-                        'account_lid'		=> lang('LoginID'),
-                        'account_firstname'	=> lang('First Name'),
-                        'account_lastname'	=> lang('Last Name'),
-                        'account_email'		=> lang('email'),
-                        'account_pwd'		=> lang('Password'),
-                        'account_status'	=> lang('Status'),
-                        'account_primary_group'	=> lang('Primary Group'),
-                        'account_groups'	=> lang('Groups'),
-                        'account_expires'	=> lang('Expires'),
-                        'account_lastlogin'	=> lang('Last login'),
-                        'account_lastpwd_change'=> lang('Last password change'),
-                );
+						'account_lid'		=> lang('LoginID'),
+						'account_firstname'	=> lang('First Name'),
+						'account_lastname'	=> lang('Last Name'),
+						'account_email'		=> lang('email'),
+						'account_pwd'		=> lang('Password'),
+						'account_status'	=> lang('Status'),
+						'account_primary_group'	=> lang('Primary Group'),
+						'account_groups'	=> lang('Groups'),
+						'account_expires'	=> lang('Expires'),
+						'account_lastlogin'	=> lang('Last login'),
+						'account_lastpwd_change'=> lang('Last password change'),
+				);
 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class admin_wizard_export_users_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -36,7 +37,8 @@ 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('admin', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Spacing +1 added lines, -1 removed lines

@@ -27,7 +27,7 @@
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('admin', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

admin/inc/class.admin_egw_group_record.inc.php

Spacing +11 added lines, -11 removed lines

@@ -34,8 +34,8 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct($_identifier = '') {
+		if (is_array($_identifier)) {
 			$this->identifier = $_identifier['account_id'];
 		} else {
 			$this->identifier = $_identifier;
@@ -89,9 +89,9 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->group = $_record;
-		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'],true);
+		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'], true);
 	}
 
 	/**
@@ -118,8 +118,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function save($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -128,8 +128,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function copy($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
@@ -139,15 +139,15 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
-		unset($_dst_identifier);	// not used, but require by function signature
+	public function move($_dst_identifier) {
+		unset($_dst_identifier); // not used, but require by function signature
 	}
 
 	/**
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +31 added lines, -15 removed lines

@@ -34,10 +34,14 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ) {
-		if(is_array($_identifier)) {
+	public function __construct( $_identifier='' )
+	{
+		if(is_array($_identifier))
+		{
 			$this->identifier = $_identifier['account_id'];
-		} else {
+		}
+		else
+		{
 			$this->identifier = $_identifier;
 		}
 		$this->set_record($GLOBALS['egw']->accounts->read($this->identifier));
@@ -48,7 +52,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->group[$_attribute_name];
 	}
 
@@ -58,7 +63,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->group[$_attribute_name] = $data;
 	}
 
@@ -70,7 +76,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->group;
 	}
 
@@ -79,7 +86,8 @@ 
 	 *
 	 *@return string title
 	 */
-	public function get_title() {
+	public function get_title()
+	{
 		return Api\Accounts::username($this->identifier);
 	}
 
@@ -89,7 +97,8 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->group = $_record;
 		$this->group['account_members'] = $GLOBALS['egw']->accounts->members($this->group['account_id'],true);
 	}
@@ -99,7 +108,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -109,7 +119,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'group';
 	}
 
@@ -118,7 +129,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -128,7 +140,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -139,7 +152,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);	// not used, but require by function signature
 	}
 
@@ -147,7 +161,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -155,7 +170,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->group);
 	}
 }

admin/inc/class.admin_cmd.inc.php

Indentation +5 added lines, -5 removed lines

@@ -239,11 +239,11 @@
 			unset($postdata[$name]);
 		}
 		$opts = array('http' =>
-		    array(
-		        'method'  => 'POST',
-		        'header'  => 'Content-type: application/x-www-form-urlencoded',
-		        'content' => http_build_query($postdata),
-		    )
+			array(
+				'method'  => 'POST',
+				'header'  => 'Content-type: application/x-www-form-urlencoded',
+				'content' => http_build_query($postdata),
+			)
 		);
 		$url = $remote['remote_url'].'/admin/remote.php?domain='.urlencode($remote['remote_domain']).'&secret='.urlencode($secret);
 		//echo "sending command to $url\n"; _debug_array($opts);

Spacing +125 added lines, -126 removed lines

@@ -60,14 +60,14 @@ 
 	const successful = 2;
 	const failed     = 3;
 	const pending    = 4;
-	const queued     = 5;	// command waits to be fetched from remote
+	const queued     = 5; // command waits to be fetched from remote
 
 	/**
 	 * Status which stil need passwords available
 	 *
 	 * @var array
 	 */
-	static $require_pw_stati = array(self::scheduled,self::pending,self::queued);
+	static $require_pw_stati = array(self::scheduled, self::pending, self::queued);
 
 	/**
 	 * The status of the command, one of either scheduled, successful, failed or deleted
@@ -153,7 +153,7 @@ 
 	 * @return string success message
 	 * @throws Exception()
 	 */
-	protected abstract function exec($check_only=false);
+	protected abstract function exec($check_only = false);
 
 	/**
 	 * Return a title / string representation for a given command, eg. to display it
@@ -190,7 +190,7 @@ 
 
 		$this->type = get_class($this);
 
-		foreach($data as $name => $value)
+		foreach ($data as $name => $value)
 		{
 			$this->$name = $name == 'data' && !is_array($value) ? json_php_unserialize($value) : $value;
 		}
@@ -209,13 +209,13 @@ 
 	 * @return mixed return value of the command
 	 * @throws Exceptions on error
 	 */
-	function run($time=null,$set_modifier=true,$skip_checks=false,$dry_run=false)
+	function run($time = null, $set_modifier = true, $skip_checks = false, $dry_run = false)
 	{
 		if (!is_null($time))
 		{
 			$this->scheduled = $time;
 			$this->status = admin_cmd::scheduled;
-			$ret = lang('Command scheduled to run at %1',date('Y-m-d H:i',$time));
+			$ret = lang('Command scheduled to run at %1', date('Y-m-d H:i', $time));
 			// running the checks of the arguments for local commands, if not explicitly requested to not run them
 			if (!$this->remote_id && !$skip_checks)
 			{
@@ -281,21 +281,21 @@ 
 	{
 		if (!($remote = $this->read_remote($this->remote_id)))
 		{
-			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!',$this->remote_id),997);
+			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!', $this->remote_id), 997);
 		}
 		if (!$this->uid)
 		{
-			$this->save();	// to get the uid
+			$this->save(); // to get the uid
 		}
 		$secret = md5($this->uid.$remote['remote_hash']);
 
 		$postdata = $this->as_array();
 		if (is_object($GLOBALS['egw']->translation))
 		{
-			$postdata = Api\Translation::convert($postdata,Api\Translation::charset(),'utf-8');
+			$postdata = Api\Translation::convert($postdata, Api\Translation::charset(), 'utf-8');
 		}
 		// dont send the id's which have no meaning on the remote install
-		foreach(array('id','creator','modifier','requested','remote_id') as $name)
+		foreach (array('id', 'creator', 'modifier', 'requested', 'remote_id') as $name)
 		{
 			unset($postdata[$name]);
 		}
@@ -321,12 +321,12 @@ 
 		}
 		if (is_object($GLOBALS['egw']->translation))
 		{
-			$message = Api\Translation::convert($message,'utf-8');
+			$message = Api\Translation::convert($message, 'utf-8');
 		}
 		$matches = null;
-		if (is_string($message) && preg_match('/^([0-9]+) (.*)$/',$message,$matches))
+		if (is_string($message) && preg_match('/^([0-9]+) (.*)$/', $message, $matches))
 		{
-			throw new Api\Exception($matches[2],(int)$matches[1]);
+			throw new Api\Exception($matches[2], (int)$matches[1]);
 		}
 		return $message;
 	}
@@ -352,7 +352,7 @@ 
 	 * @param boolean $set_modifier =true set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
-	function save($set_modifier=true)
+	function save($set_modifier = true)
 	{
 		admin_cmd::_instanciate_sql();
 
@@ -367,7 +367,7 @@ 
 			$this->modifier = $set_modifier ? $GLOBALS['egw_info']['user']['account_id'] : 0;
 			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
+		$vars = get_object_vars($this); // does not work in php5.1.2 due a bug
 
 		// data is stored serialized
 		// paswords are masked / removed, if we dont need them anymore
@@ -406,7 +406,7 @@ 
 			$this->set_periodic_job();
 		}
 		// existing object with no rrule, cancle evtl. running periodic job
-		elseif($vars['id'])
+		elseif ($vars['id'])
 		{
 			$this->cancel_periodic_job();
 		}
@@ -420,13 +420,13 @@ 
 	 * @param boolean $return_serialized =true true: return json serialized string, false: return array
 	 * @return string|array see $return_serialized
 	 */
-	static function mask_passwords($data, $return_serialized=true)
+	static function mask_passwords($data, $return_serialized = true)
 	{
 		if (!is_array($data))
 		{
 			$data = json_php_unserialize($data);
 		}
-		foreach($data as $key => &$value)
+		foreach ($data as $key => &$value)
 		{
 			if (is_array($value))
 			{
@@ -474,10 +474,10 @@ 
 		{
 			$data['data'] = json_php_unserialize($data['data']);
 		}
-		if (!(class_exists($class = 'EGroupware\\'.$data['type']) ||	// namespaced class
+		if (!(class_exists($class = 'EGroupware\\'.$data['type']) || // namespaced class
 			class_exists($class = $data['type'])) || $data['type'] == 'admin_cmd')
 		{
-			throw new Api\Exception\WrongParameter(lang('Unknown command %1!',$class), 10);
+			throw new Api\Exception\WrongParameter(lang('Unknown command %1!', $class), 10);
 		}
 		$cmd = new $class($data);
 
@@ -485,7 +485,7 @@ 
 		{
 			return $cmd;
 		}
-		throw new Api\Exception\WrongParameter(lang('%1 is no command!',$class), 10);
+		throw new Api\Exception\WrongParameter(lang('%1 is no command!', $class), 10);
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 	 * @param array $readonlys
 	 * @return int
 	 */
-	static function get_rows($query,&$rows,$readonlys)
+	static function get_rows($query, &$rows, $readonlys)
 	{
 		admin_cmd::_instanciate_sql();
 
@@ -514,21 +514,21 @@ 
 			$query['col_filter'][] = 'cmd_rrule IS NOT NULL';
 		}
 		unset($query['col_filter']['periodic']);
-		if($query['col_filter']['parent'])
+		if ($query['col_filter']['parent'])
 		{
 			$query['col_filter']['parent'] = (int)$query['col_filter']['parent'];
 		}
 
-		$total = admin_cmd::$sql->get_rows($query,$rows,$readonlys);
+		$total = admin_cmd::$sql->get_rows($query, $rows, $readonlys);
 
 		if (!$rows) return 0;
 
 		$async = new Api\Asyncservice();
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			try {
 				$cmd = admin_cmd::instanciate($row);
-				$row['title'] = $cmd->__tostring();	// we call __tostring explicit, as a cast to string requires php5.2+
+				$row['title'] = $cmd->__tostring(); // we call __tostring explicit, as a cast to string requires php5.2+
 			}
 			catch (Exception $e) {
 				$row['title'] = $e->getMessage();
@@ -536,25 +536,24 @@ 
 
 			$row['value'] = $cmd->value;
 
-			if(method_exists($cmd, 'summary'))
+			if (method_exists($cmd, 'summary'))
 			{
 				$row['data'] = $cmd->summary();
 			}
 			else
 			{
-				$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' :
-					json_encode($data+(empty($row['rrule'])?array():array('rrule' => $row['rrule'])),
+				$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' : json_encode($data + (empty($row['rrule']) ? array() : array('rrule' => $row['rrule'])),
 						JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
 			}
-			if($row['rrule'])
+			if ($row['rrule'])
 			{
-				$rrule = calendar_rrule::event2rrule(calendar_rrule::parseRrule($row['rrule'],true)+array(
+				$rrule = calendar_rrule::event2rrule(calendar_rrule::parseRrule($row['rrule'], true) + array(
 					'start' => time(),
 					'tzid'=> Api\DateTime::$server_timezone->getName()
 				));
 				$row['rrule'] = ''.$rrule;
 			}
-			if(!$row['scheduled'] && $cmd && $cmd->async_job_id)
+			if (!$row['scheduled'] && $cmd && $cmd->async_job_id)
 			{
 				$job = $async->read($cmd->async_job_id);
 
@@ -580,11 +579,11 @@ 
 			admin_cmd::_instanciate_sql();
 
 			// Need a new one to avoid column name modification
-			$sql = new Api\Storage\Base('admin','egw_admin_queue',null);
+			$sql = new Api\Storage\Base('admin', 'egw_admin_queue', null);
 			$labels = $sql->query_list('cmd_type');
 
 			// for admin app we also add all available cmd objects
-			foreach(scandir(__DIR__) as $file)
+			foreach (scandir(__DIR__) as $file)
 			{
 				$matches = null;
 				if (preg_match('/^class\.(admin_cmd_.*)\.inc\.php$/', $file, $matches))
@@ -595,15 +594,15 @@ 
 					}
 				}
 			}
-			foreach($labels as $class => &$label)
+			foreach ($labels as $class => &$label)
 			{
-				if(class_exists($class))
+				if (class_exists($class))
 				{
 					$label = $class::name();
 				}
-				elseif (class_exists('EGroupware\\' . $class))
+				elseif (class_exists('EGroupware\\'.$class))
 				{
-					$class = 'EGroupware\\' . $class;
+					$class = 'EGroupware\\'.$class;
 					$label = $class::name();
 				}
 			}
@@ -634,11 +633,11 @@ 
 	 * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @return array
 	 */
-	static function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null)
+	static function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null)
 	{
 		admin_cmd::_instanciate_sql();
 
-		return admin_cmd::$sql->search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter);
+		return admin_cmd::$sql->search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter);
 	}
 
 	/**
@@ -650,7 +649,7 @@ 
 	{
 		if (is_null(admin_cmd::$sql))
 		{
-			admin_cmd::$sql = new Api\Storage\Base('admin','egw_admin_queue',null,'cmd_');
+			admin_cmd::$sql = new Api\Storage\Base('admin', 'egw_admin_queue', null, 'cmd_');
 		}
 	}
 
@@ -663,7 +662,7 @@ 
 	{
 		if (is_null(admin_cmd::$remote))
 		{
-			admin_cmd::$remote = new Api\Storage\Base('admin','egw_admin_remote');
+			admin_cmd::$remote = new Api\Storage\Base('admin', 'egw_admin_remote');
 		}
 	}
 
@@ -675,11 +674,11 @@ 
 	 */
 	function __get($property)
 	{
-		if (property_exists('admin_cmd',$property))
+		if (property_exists('admin_cmd', $property))
 		{
-			return $this->$property;	// making all (non static) class vars readonly available
+			return $this->$property; // making all (non static) class vars readonly available
 		}
-		switch($property)
+		switch ($property)
 		{
 			case 'accounts':
 				self::_instanciate_accounts();
@@ -698,9 +697,9 @@ 
 	 */
 	function __isset($property)
 	{
-		if (property_exists('admin_cmd',$property))
+		if (property_exists('admin_cmd', $property))
 		{
-			return isset($this->$property);	// making all (non static) class vars readonly available
+			return isset($this->$property); // making all (non static) class vars readonly available
 		}
 		return isset($this->data[$property]);
 	}
@@ -712,7 +711,7 @@ 
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
 		$this->data[$property] = $value;
 	}
@@ -734,19 +733,19 @@ 
 	 */
 	function as_array()
 	{
-		if (version_compare(PHP_VERSION,'5.1.2','>'))
+		if (version_compare(PHP_VERSION, '5.1.2', '>'))
 		{
-			$vars = get_object_vars($this);	// does not work in php5.1.2 due a bug
+			$vars = get_object_vars($this); // does not work in php5.1.2 due a bug
 		}
 		else
 		{
-			foreach(array_keys(get_class_vars(__CLASS__)) as $name)
+			foreach (array_keys(get_class_vars(__CLASS__)) as $name)
 			{
 				$vars[$name] = $this->$name;
 			}
 		}
 		unset($vars['data']);
-		if ($this->data) $vars = array_merge($this->data,$vars);
+		if ($this->data) $vars = array_merge($this->data, $vars);
 
 		return $vars;
 	}
@@ -758,14 +757,14 @@ 
 	 * @param int $extra_deny =null further admin rights to check, eg. 16 = deny edit Api\Accounts
 	 * @throws Api\Exception\NoPermission\Admin
 	 */
-	protected function _check_admin($extra_acl=null,$extra_deny=null)
+	protected function _check_admin($extra_acl = null, $extra_deny = null)
 	{
 		if ($this->creator)
 		{
 			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
+			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
 			{
 				throw new Api\Exception\NoPermission\Admin();
 			}
@@ -781,13 +780,13 @@ 
 	 */
 	static function parse_apps(array $apps)
 	{
-		foreach($apps as $key => $name)
+		foreach ($apps as $key => $name)
 		{
 			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)))
+					if (!strcasecmp($name, $data['title']) || !strcasecmp($name, lang($app)))
 					{
 						$apps[$key] = $name = $app;
 						break;
@@ -796,7 +795,7 @@ 
 			}
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
+				throw new Api\Exception\WrongUserinput(lang("Application '%1' not found (maybe not installed or misspelled)!", $name), 8);
 			}
 		}
 		return $apps;
@@ -811,20 +810,20 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account), 15);
 	 * @throws Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')), 16);
 	 */
-	static function parse_account($account,$allow_only_user=null)
+	static function parse_account($account, $allow_only_user = null)
 	{
 		admin_cmd::_instanciate_accounts();
 
 		if (!($type = admin_cmd::$accounts->exists($account)) ||
-			!is_numeric($id=$account) && !($id = admin_cmd::$accounts->name2id($account)))
+			!is_numeric($id = $account) && !($id = admin_cmd::$accounts->name2id($account)))
 		{
-			throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account), 15);
+			throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!", $account), 15);
 		}
 		if (!is_null($allow_only_user) && $allow_only_user !== ($type == 1))
 		{
-			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')), 16);
+			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;
 	}
@@ -838,14 +837,14 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$account), 15);
 	 * @throws Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only?lang('user'):lang('group')), 16);
 	 */
-	static function parse_accounts($accounts,$allow_only_user=null)
+	static function parse_accounts($accounts, $allow_only_user = null)
 	{
 		if (!$accounts) return null;
 
 		$ids = array();
-		foreach(is_array($accounts) ? $accounts : explode(',',$accounts) as $account)
+		foreach (is_array($accounts) ? $accounts : explode(',', $accounts) as $account)
 		{
-			$ids[] = admin_cmd::parse_account($account,$allow_only_user);
+			$ids[] = admin_cmd::parse_account($account, $allow_only_user);
 		}
 		return $ids;
 	}
@@ -863,11 +862,11 @@ 
 		{
 			$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);
+			$date = preg_replace('/^([0-9]{1,2})\.([0-9]{1,2})\.([0-9]{4})$/', '\3-\2-\1', $date);
 
-			if (($date = strtotime($date))  === false)
+			if (($date = strtotime($date)) === false)
 			{
-				throw new Api\Exception\WrongUserinput(lang('Invalid formated date "%1"!',$datein),6);
+				throw new Api\Exception\WrongUserinput(lang('Invalid formated date "%1"!', $datein), 6);
 			}
 		}
 		return (int)$date;
@@ -881,7 +880,7 @@ 
 	 * @return boolean
 	 * @throws Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!',$value),998);
 	 */
-	static function parse_boolean($value,$default=null)
+	static function parse_boolean($value, $default = null)
 	{
 		if (is_bool($value) || is_int($value))
 		{
@@ -891,15 +890,15 @@ 
 		{
 			return $default;
 		}
-		if (in_array($value,array('1','yes','true',lang('yes'),lang('true'))))
+		if (in_array($value, array('1', 'yes', 'true', lang('yes'), lang('true'))))
 		{
 			return true;
 		}
-		if (in_array($value,array('0','no','false',lang('no'),lang('false'))))
+		if (in_array($value, array('0', 'no', 'false', lang('no'), lang('false'))))
 		{
 			return false;
 		}
-		throw new Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!',$value),998);
+		throw new Api\Exception\WrongUserinput(lang('Invalid value "%1" use yes or no!', $value), 998);
 	}
 
 	/**
@@ -917,9 +916,9 @@ 
 			'remote_id' => $id_or_name,
 			'remote_name' => $id_or_name,
 			'remote_domain' => $id_or_name,
-		),true,'','','',false,'OR')) || count($remotes) != 1)
+		), true, '', '', '', false, 'OR')) || count($remotes) != 1)
 		{
-			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!',$id_or_name),997);
+			throw new Api\Exception\WrongUserinput(lang('Invalid remote id or name "%1"!', $id_or_name), 997);
 		}
 		return $remotes[0]['remote_id'];
 	}
@@ -936,7 +935,7 @@ 
 		{
 			if (!is_object($GLOBALS['egw']->accounts))
 			{
-				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated','accounts'),999);
+				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated', 'accounts'), 999);
 			}
 			admin_cmd::$accounts = $GLOBALS['egw']->accounts;
 		}
@@ -949,13 +948,13 @@ 
 	 * @param int $account =null account_id the class needs to be instanciated for, default need only account-independent methods
 	 * @throws Api\Exception\AssertionFailed(lang('%1 class not instanciated','acl'),999);
 	 */
-	protected function _instanciate_acl($account=null)
+	protected function _instanciate_acl($account = null)
 	{
 		if (!is_object(admin_cmd::$acl) || $account && admin_cmd::$acl->account_id != $account)
 		{
 			if (!is_object($GLOBALS['egw']->acl))
 			{
-				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated','acl'),999);
+				throw new Api\Exception\AssertionFailed(lang('%1 class not instanciated', 'acl'), 999);
 			}
 			if ($account && $GLOBALS['egw']->acl->account_id != $account)
 			{
@@ -975,20 +974,20 @@ 
 	 * @param $account_id =null account_id, default current user
 	 * @return string
 	 */
-	static function user_email($account_id=null)
+	static function user_email($account_id = null)
 	{
 		if ($account_id)
 		{
 			admin_cmd::_instanciate_accounts();
-			$fullname = admin_cmd::$accounts->id2name($account_id,'account_fullname');
-			$email = admin_cmd::$accounts->id2name($account_id,'account_email');
+			$fullname = admin_cmd::$accounts->id2name($account_id, 'account_fullname');
+			$email = admin_cmd::$accounts->id2name($account_id, 'account_email');
 		}
 		else
 		{
 			$fullname = $GLOBALS['egw_info']['user']['account_fullname'];
 			$email = $GLOBALS['egw_info']['user']['account_email'];
 		}
-		return $fullname . ($email ? ' <'.$email.'>' : '');
+		return $fullname.($email ? ' <'.$email.'>' : '');
 	}
 
 	/**
@@ -1012,11 +1011,11 @@ 
 		{
 			return false;
 		}
-		if (!($jobs = admin_cmd::search(array(),false,'cmd_scheduled','','',false,'AND',array(0,1),array(
+		if (!($jobs = admin_cmd::search(array(), false, 'cmd_scheduled', '', '', false, 'AND', array(0, 1), array(
 			'cmd_status' => admin_cmd::scheduled,
 		))))
 		{
-			return false;		// no schduled command, no need to setup the job
+			return false; // no schduled command, no need to setup the job
 		}
 		$next = $jobs[0];
 		if (($time = $next['scheduled']) < time())	// should run immediatly
@@ -1026,11 +1025,11 @@ 
 		$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!
-		list($app) = explode('_',$class=$next['type']);
+		list($app) = explode('_', $class = $next['type']);
 		$callback = $app.'.'.$class.'.run_queued_jobs';
 
-		$async->cancel_timer(admin_cmd::async_job_id);	// we delete it in case a job already exists
-		return $async->set_timer($time,admin_cmd::async_job_id,$callback,null,$next['creator']);
+		$async->cancel_timer(admin_cmd::async_job_id); // we delete it in case a job already exists
+		return $async->set_timer($time, admin_cmd::async_job_id, $callback, null, $next['creator']);
 	}
 
 	/**
@@ -1040,20 +1039,20 @@ 
 	 */
 	static function run_queued_jobs()
 	{
-		if (!($jobs = admin_cmd::search(array(),false,'cmd_scheduled','','',false,'AND',false,array(
+		if (!($jobs = admin_cmd::search(array(), false, 'cmd_scheduled', '', '', false, 'AND', false, array(
 			'cmd_status' => admin_cmd::scheduled,
 			'cmd_scheduled <= '.time(),
 		))))
 		{
-			return false;		// no schduled commands, no need to setup the job
+			return false; // no schduled commands, no need to setup the job
 		}
-		admin_cmd::$running_queued_jobs = true;	// stop admin_cmd::run() which calls admin_cmd::save() to install a new job
+		admin_cmd::$running_queued_jobs = true; // stop admin_cmd::run() which calls admin_cmd::save() to install a new job
 
-		foreach($jobs as $job)
+		foreach ($jobs as $job)
 		{
 			try {
 				$cmd = admin_cmd::instanciate($job);
-				$cmd->run(null,false);	// false = dont set current user as modifier, as job is run by the queue/system itself
+				$cmd->run(null, false); // false = dont set current user as modifier, as job is run by the queue/system itself
 			}
 			catch (Exception $e) {	// we need to mark that command as failed, to prevent further execution
 				_egw_log_exception($e);
@@ -1083,13 +1082,13 @@ 
 		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
+		$event = calendar_rrule::parseRrule($this->rrule, true); // true: allow HOURLY or MINUTELY
 		// rrule can depend on start-time, use policy creation time by default, if rrule_start is not set
 		$event['start'] = empty($this->rrule_start) ? $this->created : $this->rrule_start;
 		$event['tzid'] = Api\DateTime::$server_timezone->getName();
-		$rrule = calendar_rrule::event2rrule($event, false);	// false = server timezone
+		$rrule = calendar_rrule::event2rrule($event, false); // false = server timezone
 		$rrule->rewind();
-		while((($time = $rrule->current()->format('ts'))) <= time())
+		while ((($time = $rrule->current()->format('ts'))) <= time())
 		{
 			$rrule->next();
 		}
@@ -1097,7 +1096,7 @@ 
 		// schedule run_periodic_job to run at that time
 		$async = new Api\Asyncservice();
 		$job_id = empty($this->async_job_id) ? self::PERIOD_ASYNC_ID_PREFIX.$this->id : $this->async_job_id;
-		$async->cancel_timer($job_id);	// we delete it in case a job already exists
+		$async->cancel_timer($job_id); // we delete it in case a job already exists
 		return $async->set_timer($time, $job_id, __CLASS__.'::run_periodic_job', $this->as_array(), $this->creator);
 	}
 
@@ -1110,7 +1109,7 @@ 
 	{
 		$async = new Api\Asyncservice();
 		$job_id = empty($this->async_job_id) ? self::PERIOD_ASYNC_ID_PREFIX.$this->id : $this->async_job_id;
-		$async->cancel_timer($job_id);	// we delete it in case a job already exists
+		$async->cancel_timer($job_id); // we delete it in case a job already exists
 	}
 
 	/**
@@ -1127,10 +1126,10 @@ 
 		$single = $cmd->as_array();
 		$single['parent'] = $single['id'];
 		$args = array_diff_key($single, array_flip(array(
-			'id','uid',
-			'created','modified','modifier',
-			'async_job_id','rrule','scheduled',
-			'status', 'set', 'old','value','result'
+			'id', 'uid',
+			'created', 'modified', 'modifier',
+			'async_job_id', 'rrule', 'scheduled',
+			'status', 'set', 'old', 'value', 'result'
 		)));
 
 		$periodic = admin_cmd::instanciate($args);
@@ -1156,9 +1155,9 @@ 
 		admin_cmd::_instanciate_remote();
 
 		$sites = array(lang('local'));
-		if (($remote = admin_cmd::$remote->query_list('remote_name','remote_id')))
+		if (($remote = admin_cmd::$remote->query_list('remote_name', 'remote_id')))
 		{
-			$sites = array_merge($sites,$remote);
+			$sites = array_merge($sites, $remote);
 		}
 		return $sites;
 	}
@@ -1171,11 +1170,11 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_remotes($query,&$rows,&$readonlys)
+	static function get_remotes($query, &$rows, &$readonlys)
 	{
 		admin_cmd::_instanciate_remote();
 
-		return admin_cmd::$remote->get_rows($query,$rows,$readonlys);
+		return admin_cmd::$remote->get_rows($query, $rows, $readonlys);
 	}
 
 	/**
@@ -1203,7 +1202,7 @@ 
 
 		if ($data['install_id'] && $data['config_passwd'])	// calculate hash
 		{
-			$data['remote_hash'] = self::remote_hash($data['install_id'],$data['config_passwd']);
+			$data['remote_hash'] = self::remote_hash($data['install_id'], $data['config_passwd']);
 		}
 		elseif (!$data['remote_hash'] && !($data['install_id'] && $data['config_passwd']))
 		{
@@ -1215,12 +1214,12 @@ 
 		// check if a unique key constrain would be violated by saving the entry
 		if (($num = admin_cmd::$remote->not_unique()))
 		{
-			$col = admin_cmd::$remote->table_def['uc'][$num-1];	// $num is 1 based!
-			throw new egw_exception_db_not_unique(lang('Value for column %1 is not unique!',$this->table_name.'.'.$col),$num);
+			$col = admin_cmd::$remote->table_def['uc'][$num - 1]; // $num is 1 based!
+			throw new egw_exception_db_not_unique(lang('Value for column %1 is not unique!', $this->table_name.'.'.$col), $num);
 		}
 		if (admin_cmd::$remote->save() != 0)
 		{
-			throw new Api\Db\Exception(lang('Error saving to db:').' '.$this->sql->db->Error.' ('.$this->sql->db->Errno.')',$this->sql->db->Errno);
+			throw new Api\Db\Exception(lang('Error saving to db:').' '.$this->sql->db->Error.' ('.$this->sql->db->Errno.')', $this->sql->db->Errno);
 		}
 		return admin_cmd::$remote->data['remote_id'];
 	}
@@ -1232,11 +1231,11 @@ 
 	 * @param string $config_passwd
 	 * @return string 32char md5 hash
 	 */
-	static function remote_hash($install_id,$config_passwd)
+	static function remote_hash($install_id, $config_passwd)
 	{
 		if (empty($config_passwd) || !self::is_md5($install_id))
 		{
-			throw new Api\Exception\WrongParameter(empty($config_passwd)?'Empty Api\Config password':'install_id no md5 hash');
+			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);
 
@@ -1266,7 +1265,7 @@ 
 	 */
 	static function is_md5($str)
 	{
-		return preg_match('/^[0-9a-f]{32}$/',$str);
+		return preg_match('/^[0-9a-f]{32}$/', $str);
 	}
 
 	/**
@@ -1283,26 +1282,26 @@ 
 	 * @param string $config_passwd of the current domain
 	 * @throws Api\Exception\NoPermission
 	 */
-	function check_remote_access($secret,$config_passwd)
+	function check_remote_access($secret, $config_passwd)
 	{
 		// as a security measure remote administration need to be enabled under Admin > Site configuration
-		list(,$remote_admin_install_id) = explode('-',$this->uid);
-		$allowed_remote_admin_ids = $GLOBALS['egw_info']['server']['allow_remote_admin'] ? explode(',',$GLOBALS['egw_info']['server']['allow_remote_admin']) : array();
+		list(,$remote_admin_install_id) = explode('-', $this->uid);
+		$allowed_remote_admin_ids = $GLOBALS['egw_info']['server']['allow_remote_admin'] ? explode(',', $GLOBALS['egw_info']['server']['allow_remote_admin']) : array();
 
 		// to authenticate with the installation we use a secret, which is a md5 hash build from the uid
 		// of the command (to not allow to send new commands with an earsdroped secret) and the md5 hash
 		// of the md5 hash of the Api\Config password and the install_id (egw_admin_remote.remote_hash)
-		if (is_null($config_passwd) || is_numeric($this->uid) || !in_array($remote_admin_install_id,$allowed_remote_admin_ids) ||
-			$secret != ($md5=md5($this->uid.$this->remote_hash($GLOBALS['egw_info']['server']['install_id'],$config_passwd))))
+		if (is_null($config_passwd) || is_numeric($this->uid) || !in_array($remote_admin_install_id, $allowed_remote_admin_ids) ||
+			$secret != ($md5 = md5($this->uid.$this->remote_hash($GLOBALS['egw_info']['server']['install_id'], $config_passwd))))
 		{
 			//die("secret='$secret' != '$md5', is_null($config_passwd)=".is_null($config_passwd).", uid=$this->uid, remote_install_id=$remote_admin_install_id, allowed: ".implode(', ',$allowed_remote_admin_ids));
 			unset($md5);
 			$msg = lang('Permission denied!');
-			if (!in_array($remote_admin_install_id,$allowed_remote_admin_ids))
+			if (!in_array($remote_admin_install_id, $allowed_remote_admin_ids))
 			{
 				$msg .= "\n".lang('Remote administration need to be enabled in the remote instance under Admin > Site configuration!');
 			}
-			throw new Api\Exception\NoPermission($msg,0);
+			throw new Api\Exception\NoPermission($msg, 0);
 		}
 	}
 
@@ -1312,7 +1311,7 @@ 
 	 * @param int $len =16
 	 * @return string
 	 */
-	static function randomstring($len=16)
+	static function randomstring($len = 16)
 	{
 		return Api\Auth::randomstring($len);
 	}
@@ -1334,7 +1333,7 @@ 
 	 */
 	protected function get_etemplate()
 	{
-		static $tpl = null;	// some caching to not instanciate it twice
+		static $tpl = null; // some caching to not instanciate it twice
 
 		if (!isset($tpl))
 		{
@@ -1365,7 +1364,7 @@ 
 		{
 			$tpl->run(function($cname, $expand, $widget) use (&$labels, &$label)
 			{
-				switch($widget->type)
+				switch ($widget->type)
 				{
 					// remember label from last description widget
 					case 'description':
@@ -1408,7 +1407,7 @@ 
 		{
 			$tpl->run(function($cname, $expand, $widget) use (&$widgets, &$last_select, $selectboxes)
 			{
-				switch($widget->type)
+				switch ($widget->type)
 				{
 					// ignore non input-widgets
 					case 'hbox': case 'vbox': case 'box': case 'groupbox':
@@ -1473,12 +1472,12 @@ 
 	 */
 	public function get_result()
 	{
-		if($this->result)
+		if ($this->result)
 		{
 			return is_array($this->result) ? implode("\n", $this->result) : $this->result;
 		}
 		return lang("Command was run %1 on %2",
-				static::$stati[ $this->status ],
+				static::$stati[$this->status],
 				Api\DateTime::to($this->created));
 	}
 }

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 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);
 	}
@@ -1369,7 +1418,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':
@@ -1381,8 +1433,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;
@@ -1420,7 +1478,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)
@@ -1434,7 +1495,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)

admin/phpinfo.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 );
 include('../header.inc.php');
 
-if ($GLOBALS['egw']->acl->check('info_access',1,'admin'))
+if ($GLOBALS['egw']->acl->check('info_access', 1, 'admin'))
 {
 	$GLOBALS['egw']->redirect_link('/index.php');
 }

files/webdav.php

Spacing +6 added lines, -6 removed lines

@@ -34,7 +34,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return Api\Header\Authenticate::autocreate_session_callback($account);
 }
@@ -45,8 +45,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
 	)
 );
 
@@ -74,12 +74,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/webdav.php/clientsync') !== false &&
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/webdav.php/clientsync') !== false &&
+	($fstab = Vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = Vfs::$is_root;
 	Vfs::$is_root = true;
-	$ok = Vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = Vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	Vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }