EGroupware / egroupware

admin/inc/class.admin_cmd_account_app.inc.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 	 * @param string|int $account =null account name or id
 	 * @param array|string $apps =null app-names
 	 */
-	function __construct($allow,$account=null,$apps=null)
+	function __construct($allow, $account = null, $apps = null)
 	{
 		if (!is_array($allow))
 		{
@@ -36,7 +36,7 @@ 
 		}
 		if (isset($allow['apps']) && !is_array($allow['apps']))
 		{
-			$allow['apps'] = explode(',',$allow['apps']);
+			$allow['apps'] = explode(',', $allow['apps']);
 		}
 		admin_cmd::__construct($allow);
 	}
@@ -50,11 +50,11 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Api\Exception\WrongUserinput(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		$account_id = admin_cmd::parse_account($this->account);
 		// check creator is still admin and not explicitly forbidden to edit accounts/groups
-		if ($this->creator) $this->_check_admin($account_id > 0 ? 'account_access' : 'group_access',16);
+		if ($this->creator) $this->_check_admin($account_id > 0 ? 'account_access' : 'group_access', 16);
 
 		$apps = admin_cmd::parse_apps($this->apps);
 
@@ -62,15 +62,15 @@ 
 
 		//echo "account=$this->account, account_id=$account_id, apps: ".implode(', ',$apps)."\n";
 		admin_cmd::_instanciate_acl($account_id);
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			if ($this->allow)
 			{
-				admin_cmd::$acl->add_repository($app,'run',$account_id,1);
+				admin_cmd::$acl->add_repository($app, 'run', $account_id, 1);
 			}
 			else
 			{
-				admin_cmd::$acl->delete_repository($app,'run',$account_id);
+				admin_cmd::$acl->delete_repository($app, 'run', $account_id);
 			}
 		}
 		return lang('Applications run rights updated.');
@@ -83,7 +83,7 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('%1 rights for %2 and applications %3',$this->allow ? lang('Grant') : lang('Remove'),
-			admin_cmd::display_account($this->account),implode(', ',$this->apps));
+		return lang('%1 rights for %2 and applications %3', $this->allow ? lang('Grant') : lang('Remove'),
+			admin_cmd::display_account($this->account), implode(', ', $this->apps));
 	}
 }

Doc Comments +3 added lines, -4 removed lines

@@ -18,9 +18,8 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param boolean/array $allow true=give rights, false=remove rights, or array with all 3 params
-	 * @param string/int $account=null account name or id
-	 * @param array/string $apps=null app-names
+	 * @param boolean $allow true=give rights, false=remove rights, or array with all 3 params
+	 * @param string/int $account account name or id
 	 */
 	function __construct($allow,$account=null,$apps=null)
 	{
@@ -42,7 +41,7 @@ 
 	/**
 	 * give or remove run rights from a given account and application
 	 * 
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws egw_exception_no_admin
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);

Braces +9 added lines, -3 removed lines

@@ -13,7 +13,7 @@ 
 /**
  * admin command: give or remove run rights from a given account and application
  */
-class admin_cmd_account_app extends admin_cmd 
+class admin_cmd_account_app extends admin_cmd
 {
 	/**
 	 * Constructor
@@ -52,11 +52,17 @@ 
 	{
 		$account_id = admin_cmd::parse_account($this->account);
 		// check creator is still admin and not explicitly forbidden to edit accounts/groups
-		if ($this->creator) $this->_check_admin($account_id > 0 ? 'account_access' : 'group_access',16);
+		if ($this->creator)
+		{
+			$this->_check_admin($account_id > 0 ? 'account_access' : 'group_access',16);
+		}
 		
 		$apps = admin_cmd::parse_apps($this->apps);
 		
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		//echo "account=$this->account, account_id=$account_id, apps: ".implode(', ',$apps)."\n";
 		admin_cmd::_instanciate_acl($account_id);

admin/inc/class.admin_export_groups_csv.inc.php

Spacing +4 added lines, -4 removed lines

@@ -21,7 +21,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$query = array(
@@ -40,12 +40,12 @@ 
 		// $_record is an array, that's what search() returns
 		foreach ($selection as $_record) {
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -132,7 +132,7 @@ 
 	 * return html for options.
 	 * this way the plugin has all opportunities for options tab
 	 *
-	 * @return string html
+	 * @return boolean html
 	 */
 	public function get_options_etpl() {
 		return false;

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * return html for options.

Braces +29 added lines, -13 removed lines

@@ -14,14 +14,16 @@ 
 /**
  * Export users plugin
  */
-class admin_export_groups_csv implements importexport_iface_export_plugin {
+class admin_export_groups_csv implements importexport_iface_export_plugin
+{
 
 	/**
 	 * Exports records as defined in $_definition
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -40,14 +42,22 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_group_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, admin_egw_group_record::$types, 'admin', $lookups);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -60,7 +70,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV export');
 	}
 
@@ -69,7 +80,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports groups into a CSV File. ");
 	}
 
@@ -78,11 +90,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -92,7 +106,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -100,7 +115,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'preserv' => array('no_error_for_no_selection'),
 		);

admin/inc/hook_acl_manager.inc.php

Spacing +12 added lines, -12 removed lines

@@ -14,7 +14,7 @@ 
 		'List config settings'   => 1,
 		'Change config settings' => 2
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['account_access'] = array(
 	'name' => 'Deny access to user accounts',
@@ -27,7 +27,7 @@ 
 		'Delete account'  => 32,
 		'change ACL Rights' => 64
 	)
-);	// was already there and seems to work ralfbecker
+); // was already there and seems to work ralfbecker
 
 $GLOBALS['acl_manager']['admin']['group_access'] = array(
 	'name' => 'Deny access to groups',
@@ -39,7 +39,7 @@ 
 		'Edit group'    => 16,
 		'Delete group'  => 32
 	)
-);	// was already there and seems to work ralfbecker
+); // was already there and seems to work ralfbecker
 
 $GLOBALS['acl_manager']['admin']['applications_acc'] = array(
 	'name' => 'Deny access to applications',
@@ -52,7 +52,7 @@ 
 */
 		'Register application hooks' => 16
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['global_categorie'] = array(
 	'name' => 'Deny access to global categories',
@@ -65,7 +65,7 @@ 
 		'Delete category'   => 32,
 		'Add sub-category'  => 64
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['mainscreen_messa'] = array(
 	'name' => 'Deny access to mainscreen message',
@@ -73,7 +73,7 @@ 
 		'Main screen message' => 1,
 		'Login message'       => 2
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['current_sessions'] = array(
 	'name' => 'Deny access to current sessions',
@@ -83,40 +83,40 @@ 
 		'Show session IP address' => 4,
 		'Kill session'            => 8
 	)
-);	// checked and working ralfbecker
+); // checked and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['access_log_acces'] = array(
 	'name' => 'Deny access to access log',
 	'rights' => array(
 		'Show access log' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['error_log_access'] = array(
 	'name' => 'Deny access to error log',
 	'rights' => array(
 		'Show error log' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['asyncservice_acc'] = array(
 	'name' => 'Deny access to asynchronous timed services',
 	'rights' => array(
 		'Asynchronous timed services' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['db_backup_access'] = array(
 	'name' => 'Deny access to DB backup and restore',
 	'rights' => array(
 		'DB backup and restore' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 
 $GLOBALS['acl_manager']['admin']['info_access'] = array(
 	'name' => 'Deny access to phpinfo',
 	'rights' => array(
 		'Show phpinfo()' => 1
 	)
-);	// added and working ralfbecker
+); // added and working ralfbecker
 

admin/inc/class.admin_wizard_export_groups_csv.inc.php

Indentation +2 added lines, -2 removed lines

@@ -18,11 +18,11 @@
 		parent::__construct();
 
 		// Field mapping
-                $this->export_fields = array(
+				$this->export_fields = array(
 			'account_id'		=> lang('Account ID'),
 			'account_lid'		=> lang('Group Name'),
 			'account_members'	=> lang('Members'),
-                );
+				);
 
 		// Custom fields - not really used in admin...
 		unset($this->export_fields['customfields']);

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

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

Doc Comments +1 added lines, -2 removed lines

@@ -20,7 +20,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param array $data=array() default parm from parent class, no real parameters
 	 */
 	function __construct($data=array())
 	{
@@ -30,7 +29,7 @@ 
 	/**
 	 * give or remove run rights from a given account and application
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 */
 	protected function exec($check_only=false)

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_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']);

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

admin/inc/class.admin_export_users_csv.inc.php

Spacing +6 added lines, -6 removed lines

@@ -21,13 +21,13 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$query = array(
 			'type'	=>	'accounts',
 		);
-		if($options['selection']['group_id']) {
+		if ($options['selection']['group_id']) {
 			$query['type'] = (int)$options['selection']['group_id'];
 		}
 		$selection = $GLOBALS['egw']->accounts->search($query);
@@ -43,14 +43,14 @@ 
 		// $_record is an array, that's what search() returns
 		foreach ($selection as $_record) {
 			$record = new admin_egw_user_record($_record);
-			if($options['convert']) {
+			if ($options['convert']) {
 				$never_expires = ($record->account_expires == -1);
 				importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
-				if($never_expires) $record->account_expires = 'never';  // Has to be 'never' for admin_cmd_edit_user to parse it
+				if ($never_expires) $record->account_expires = 'never'; // Has to be 'never' for admin_cmd_edit_user to parse it
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -132,7 +132,7 @@ 
 	 * return html for options.
 	 * this way the plugin has all opportunities for options tab
 	 *
-	 * @return string html
+	 * @return boolean html
 	 */
 	public function get_options_etpl() {
 		return false;

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * return html for options.

Braces +36 added lines, -15 removed lines

@@ -14,14 +14,16 @@ 
 /**
  * Export users plugin
  */
-class admin_export_users_csv implements importexport_iface_export_plugin {
+class admin_export_users_csv implements importexport_iface_export_plugin
+{
 
 	/**
 	 * Exports records as defined in $_definition
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$selection = array();
@@ -29,7 +31,8 @@ 
 		$query = array(
 			'type'	=>	'accounts',
 		);
-		if($options['selection']['group_id']) {
+		if($options['selection']['group_id'])
+		{
 			$query['type'] = (int)$options['selection']['group_id'];
 		}
 		$selection = $GLOBALS['egw']->accounts->search($query);
@@ -43,16 +46,28 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_user_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				$never_expires = ($record->account_expires == -1);
 				importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
-				if($never_expires) $record->account_expires = 'never';  // Has to be 'never' for admin_cmd_edit_user to parse it
-			} else {
+				if($never_expires)
+				{
+					$record->account_expires = 'never';
+				}
+				// Has to be 'never' for admin_cmd_edit_user to parse it
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -65,7 +80,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('User CSV export');
 	}
 
@@ -74,7 +90,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports users into a CSV File. ");
 	}
 
@@ -83,11 +100,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -97,7 +116,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -105,7 +125,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'admin.export_users_csv_selectors',
 			'preserv' => array('no_error_for_all'),

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

Braces +53 added lines, -13 removed lines

@@ -183,7 +183,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) {
 				$this->error = $e->getMessage();
@@ -277,7 +280,10 @@ 
 	 */
 	function delete()
 	{
-		if ($this->status != admin_cmd::scheduled) return false;
+		if ($this->status != admin_cmd::scheduled)
+		{
+			return false;
+		}
 
 		$this->status = admin_cmd::deleted;
 
@@ -303,7 +309,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();
+			}
 		}
 		if (version_compare(PHP_VERSION,'5.1.2','>'))
 		{
@@ -411,10 +420,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),0);
 	}
 
@@ -564,7 +576,10 @@ 
 			}
 		}
 		unset($vars['data']);
-		if ($this->data) $vars = array_merge($this->data,$vars);
+		if ($this->data)
+		{
+			$vars = array_merge($this->data,$vars);
+		}
 
 		return $vars;
 	}
@@ -583,10 +598,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();
 			}
+			}
 		}
 	}
 
@@ -603,11 +621,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;
 					}
 				}
@@ -642,7 +663,11 @@ 
 		{
 			throw new Api\Exception\WrongUserinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')),15);
 		}
-		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;
 	}
@@ -658,7 +683,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)
@@ -677,9 +705,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);
 
@@ -837,10 +868,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!
@@ -944,10 +978,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!'));
@@ -981,7 +1018,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);
 	}

Doc Comments +16 added lines, -20 removed lines

@@ -100,7 +100,7 @@ 
 	/**
 	 * Executes the command
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws Exception()
 	 */
@@ -141,10 +141,10 @@ 
 	 *
 	 * The command will be written to the database queue, incl. its scheduled start time or execution status
 	 *
-	 * @param int $time=null timestamp to run the command or null to run it immediatly
-	 * @param boolean $set_modifier=null should the current user be set as modifier, default true
-	 * @param booelan $skip_checks=false do not yet run the checks for a scheduled command
-	 * @param boolean $dry_run=false only run checks, NOT command itself
+	 * @param boolean $set_modifier should the current user be set as modifier, default true
+	 * @param booelan $skip_checks do not yet run the checks for a scheduled command
+	 * @param boolean $dry_run only run checks, NOT command itself
+	 * @param integer $time
 	 * @return mixed return value of the command
 	 * @throws Exceptions on error
 	 */
@@ -282,7 +282,7 @@ 
 	/**
 	 * Saving the object to the database
 	 *
-	 * @param boolean $set_modifier=true set the current user as modifier or 0 (= run by the system)
+	 * @param boolean $set_modifier set the current user as modifier or 0 (= run by the system)
 	 * @return boolean true on success, false otherwise
 	 */
 	function save($set_modifier=true)
@@ -438,15 +438,12 @@ 
 	 *
 	 * @static
 	 * @param array/string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
-	 * @param boolean/string/array $only_keys=true True returns only keys, False returns all cols. or
+	 * @param boolean/string/array $only_keys True returns only keys, False returns all cols. or
 	 *	comma seperated list or array of columns to return
 	 * @param string $order_by='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
 	 * @param string/array $extra_cols='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard='' appended befor and after each criteria
-	 * @param boolean $empty=false False=empty criteria are ignored in query, True=empty have to be empty in row
-	 * @param string $op='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
-	 * @param mixed $start=false if != false, return only maxmatch rows begining with start, or array($start,$num), or 'UNION' for a part of a union query
-	 * @param array $filter=null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
+	 * @param array $filter 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)
@@ -567,8 +564,8 @@ 
 	/**
 	 * Check if the creator is still admin and has the neccessary admin rights
 	 *
-	 * @param string $extra_acl=null further admin rights to check, eg. 'account_access'
-	 * @param int $extra_deny=null further admin rights to check, eg. 16 = deny edit accounts
+	 * @param string $extra_acl further admin rights to check, eg. 'account_access'
+	 * @param integer $extra_deny further admin rights to check, eg. 16 = deny edit accounts
 	 * @throws egw_exception_no_admin
 	 */
 	protected function _check_admin($extra_acl=null,$extra_deny=null)
@@ -619,7 +616,7 @@ 
 	 * parse account name or id
 	 *
 	 * @param string/int $account account_id or account_lid
-	 * @param boolean $allow_only_user=null true=only user, false=only groups, default both
+	 * @param boolean $allow_only_user true=only user, false=only groups, default both
 	 * @return int/array account_id
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account),15);
 	 * @throws egw_exception_wrong_userinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')),15);
@@ -646,7 +643,7 @@ 
 	 * parse account names or ids
 	 *
 	 * @param string/int/array $accounts array or comma-separated account_id's or account_lid's
-	 * @param boolean $allow_only_user=null true=only user, false=only groups, default both
+	 * @param boolean $allow_only_user true=only user, false=only groups, default both
 	 * @return array of account_id's or null if none specified
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account),15);
 	 * @throws egw_exception_wrong_userinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only?lang('user'):lang('group')),15);
@@ -690,7 +687,7 @@ 
 	 * Parse a boolean value
 	 *
 	 * @param string|boolean|int $value
-	 * @param boolean $default=null
+	 * @param boolean $default
 	 * @return boolean
 	 * @throws egw_exception_wrong_userinput(lang('Invalid value "%1" use yes or no!',$value),998);
 	 */
@@ -759,7 +756,7 @@ 
 	 * Instanciated acl class
 	 *
 	 * @todo acl class instanciation for setup
-	 * @param int $account=null account_id the class needs to be instanciated for, default need only account-independent methods
+	 * @param int $account account_id the class needs to be instanciated for, default need only account-independent methods
 	 * @throws egw_exception_assertion_failed(lang('%1 class not instanciated','acl'),999);
 	 */
 	protected function _instanciate_acl($account=null)
@@ -920,7 +917,7 @@ 
 	 * Read data of a remote instance
 	 *
 	 * @param array/int $keys
-	 * @return array
+	 * @return string
 	 */
 	static function read_remote($keys)
 	{
@@ -1000,7 +997,7 @@ 
 	 * Check if string is a md5 hash (32 chars of 0-9 or a-f)
 	 *
 	 * @param string $str
-	 * @return boolean
+	 * @return integer
 	 */
 	static function is_md5($str)
 	{
@@ -1046,7 +1043,6 @@ 
 	/**
 	 * Return a rand string, eg. to generate passwords
 	 *
-	 * @param int $len=16
 	 * @return string
 	 */
 	static function randomstring($len=16)

Spacing +106 added lines, -106 removed lines

@@ -20,14 +20,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
@@ -104,7 +104,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
@@ -129,7 +129,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;
 		}
@@ -148,13 +148,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)
 			{
@@ -217,21 +217,21 @@ 
 	{
 		if (!($remote = $this->read_remote($this->remote_id)))
 		{
-			throw new egw_exception_wrong_userinput(lang('Invalid remote id or name "%1"!',$id_or_name),997);
+			throw new egw_exception_wrong_userinput(lang('Invalid remote id or name "%1"!', $id_or_name), 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 = $GLOBALS['egw']->translation->convert($postdata,$GLOBALS['egw']->translation->charset(),'utf-8');
+			$postdata = $GLOBALS['egw']->translation->convert($postdata, $GLOBALS['egw']->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]);
 		}
@@ -256,11 +256,11 @@ 
 		}
 		if (is_object($GLOBALS['egw']->translation))
 		{
-			$message = $GLOBALS['egw']->translation->convert($message,'utf-8');
+			$message = $GLOBALS['egw']->translation->convert($message, 'utf-8');
 		}
-		if (is_string($message) && preg_match('/^([0-9]+) (.*)$/',$message,$matches))
+		if (is_string($message) && preg_match('/^([0-9]+) (.*)$/', $message, $matches))
 		{
-			throw new egw_exception($matches[2],(int)$matches[1]);
+			throw new egw_exception($matches[2], (int)$matches[1]);
 		}
 		return $message;
 	}
@@ -285,7 +285,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();
 
@@ -300,13 +300,13 @@ 
 			$this->modifier = $set_modifier ? $GLOBALS['egw_info']['user']['account_id'] : 0;
 			if ($set_modifier) $this->modifier_email = admin_cmd::user_email();
 		}
-		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;
 			}
@@ -346,13 +346,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))
 			{
@@ -402,7 +402,7 @@ 
 		}
 		if (!class_exists($class = $data['type']) || $class == 'admin_cmd')
 		{
-			throw new egw_exception_wrong_parameter(lang('Unknown command %1!',$class),0);
+			throw new egw_exception_wrong_parameter(lang('Unknown command %1!', $class), 0);
 		}
 		$cmd = new $class($data);
 
@@ -410,7 +410,7 @@ 
 		{
 			return $cmd;
 		}
-		throw new egw_exception_wrong_parameter(lang('%1 is no command!',$class),0);
+		throw new egw_exception_wrong_parameter(lang('%1 is no command!', $class), 0);
 	}
 
 	/**
@@ -422,7 +422,7 @@ 
 	 * @param array $readonlys
 	 * @return int
 	 */
-	static function get_rows($query,&$rows,$readonlys)
+	static function get_rows($query, &$rows, $readonlys)
 	{
 		admin_cmd::_instanciate_sql();
 
@@ -430,7 +430,7 @@ 
 		{
 			$query['col_filter']['remote_id'] = null;
 		}
-		return admin_cmd::$sql->get_rows($query,$rows,$readonlys);
+		return admin_cmd::$sql->get_rows($query, $rows, $readonlys);
 	}
 
 	/**
@@ -449,11 +449,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);
 	}
 
 	/**
@@ -465,7 +465,7 @@ 
 	{
 		if (is_null(admin_cmd::$sql))
 		{
-			admin_cmd::$sql = new so_sql('admin','egw_admin_queue',null,'cmd_');
+			admin_cmd::$sql = new so_sql('admin', 'egw_admin_queue', null, 'cmd_');
 		}
 	}
 
@@ -478,7 +478,7 @@ 
 	{
 		if (is_null(admin_cmd::$remote))
 		{
-			admin_cmd::$remote = new so_sql('admin','egw_admin_remote');
+			admin_cmd::$remote = new so_sql('admin', 'egw_admin_remote');
 		}
 	}
 
@@ -490,11 +490,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();
@@ -511,9 +511,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]);
 	}
@@ -525,7 +525,7 @@ 
 	 * @param mixed $value
 	 * @return mixed
 	 */
-	function __set($property,$value)
+	function __set($property, $value)
 	{
 		$this->data[$property] = $value;
 	}
@@ -547,19 +547,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;
 	}
@@ -571,14 +571,14 @@ 
 	 * @param int $extra_deny=null further admin rights to check, eg. 16 = deny edit accounts
 	 * @throws egw_exception_no_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 egw_exception_no_permission_admin();
 			}
@@ -594,13 +594,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;
@@ -609,7 +609,7 @@ 
 			}
 			if (!isset($GLOBALS['egw_info']['apps'][$name]))
 			{
-				throw new egw_exception_wrong_userinput(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
+				throw new egw_exception_wrong_userinput(lang("Application '%1' not found (maybe not installed or misspelled)!", $name), 8);
 			}
 		}
 		return $apps;
@@ -624,20 +624,20 @@ 
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account),15);
 	 * @throws egw_exception_wrong_userinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')),15);
 	 */
-	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 egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account),15);
+			throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!", $account), 15);
 		}
 		if (!is_null($allow_only_user) && $allow_only_user !== ($type == 1))
 		{
-			throw new egw_exception_wrong_userinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only_user?lang('user'):lang('group')),15);
+			throw new egw_exception_wrong_userinput(lang("Wrong account type: %1 is NO %2 !!!", $account, $allow_only_user ? lang('user') : lang('group')), 15);
 		}
-		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;
 	}
@@ -651,14 +651,14 @@ 
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$account),15);
 	 * @throws egw_exception_wrong_userinput(lang("Wrong account type: %1 is NO %2 !!!",$account,$allow_only?lang('user'):lang('group')),15);
 	 */
-	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;
 	}
@@ -676,11 +676,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 egw_exception_wrong_userinput(lang('Invalid formated date "%1"!',$datein),6);
+				throw new egw_exception_wrong_userinput(lang('Invalid formated date "%1"!', $datein), 6);
 			}
 		}
 		return (int)$date;
@@ -694,7 +694,7 @@ 
 	 * @return boolean
 	 * @throws egw_exception_wrong_userinput(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))
 		{
@@ -704,15 +704,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 egw_exception_wrong_userinput(lang('Invalid value "%1" use yes or no!',$value),998);
+		throw new egw_exception_wrong_userinput(lang('Invalid value "%1" use yes or no!', $value), 998);
 	}
 
 	/**
@@ -730,9 +730,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 egw_exception_wrong_userinput(lang('Invalid remote id or name "%1"!',$id_or_name),997);
+			throw new egw_exception_wrong_userinput(lang('Invalid remote id or name "%1"!', $id_or_name), 997);
 		}
 		return $remotes[0]['remote_id'];
 	}
@@ -749,7 +749,7 @@ 
 		{
 			if (!is_object($GLOBALS['egw']->accounts))
 			{
-				throw new egw_exception_assertion_failed(lang('%1 class not instanciated','accounts'),999);
+				throw new egw_exception_assertion_failed(lang('%1 class not instanciated', 'accounts'), 999);
 			}
 			admin_cmd::$accounts = $GLOBALS['egw']->accounts;
 		}
@@ -762,13 +762,13 @@ 
 	 * @param int $account=null account_id the class needs to be instanciated for, default need only account-independent methods
 	 * @throws egw_exception_assertion_failed(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 egw_exception_assertion_failed(lang('%1 class not instanciated','acl'),999);
+				throw new egw_exception_assertion_failed(lang('%1 class not instanciated', 'acl'), 999);
 			}
 			if ($account && $GLOBALS['egw']->acl->account_id != $account)
 			{
@@ -788,20 +788,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.'>' : '');
 	}
 
 	/**
@@ -825,11 +825,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
@@ -840,11 +840,11 @@ 
 		$async = new 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']);
 	}
 
 	/**
@@ -854,26 +854,26 @@ 
 	 */
 	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
 				admin_cmd::$sql->init($job);
 				admin_cmd::$sql->save(array(
 					'status' => admin_cmd::failed,
-					'error'  => lang('Unknown command %1!',$job['type']),
+					'error'  => lang('Unknown command %1!', $job['type']),
 					'errno'  => 0,
 					'data'   => self::mask_passwords($job['data']),
 				));
@@ -894,9 +894,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;
 	}
@@ -909,11 +909,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);
 	}
 
 	/**
@@ -941,7 +941,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']))
 		{
@@ -953,12 +953,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 egw_exception_db(lang('Error saving to db:').' '.$this->sql->db->Error.' ('.$this->sql->db->Errno.')',$this->sql->db->Errno);
+			throw new egw_exception_db(lang('Error saving to db:').' '.$this->sql->db->Error.' ('.$this->sql->db->Errno.')', $this->sql->db->Errno);
 		}
 		return admin_cmd::$remote->data['remote_id'];
 	}
@@ -970,11 +970,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 egw_exception_wrong_parameter(empty($config_passwd)?'Empty config password':'install_id no md5 hash');
+			throw new egw_exception_wrong_parameter(empty($config_passwd) ? 'Empty config password' : 'install_id no md5 hash');
 		}
 		if (!self::is_md5($config_passwd)) $config_passwd = md5($config_passwd);
 
@@ -1004,7 +1004,7 @@ 
 	 */
 	static function is_md5($str)
 	{
-		return preg_match('/^[0-9a-f]{32}$/',$str);
+		return preg_match('/^[0-9a-f]{32}$/', $str);
 	}
 
 	/**
@@ -1021,25 +1021,25 @@ 
 	 * @param string $config_passwd of the current domain
 	 * @throws egw_exception_no_permission
 	 */
-	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 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));
 			$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 egw_exception_no_permission($msg,0);
+			throw new egw_exception_no_permission($msg, 0);
 		}
 	}
 
@@ -1049,21 +1049,21 @@ 
 	 * @param int $len=16
 	 * @return string
 	 */
-	static function randomstring($len=16)
+	static function randomstring($len = 16)
 	{
 		static $usedchars = array(
-			'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f',
-			'g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v',
-			'w','x','y','z','A','B','C','D','E','F','G','H','I','J','K','L',
-			'M','N','O','P','Q','R','S','T','U','V','W','X','Y','Z',
-			'@','!','$','%','&','/','(',')','=','?',';',':','#','_','-','<',
-			'>','|','{','[',']','}',	// dont add \,'" as we have problems dealing with them
+			'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f',
+			'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
+			'w', 'x', 'y', 'z', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L',
+			'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
+			'@', '!', '$', '%', '&', '/', '(', ')', '=', '?', ';', ':', '#', '_', '-', '<',
+			'>', '|', '{', '[', ']', '}', // dont add \,'" as we have problems dealing with them
 		);
 
 		$str = '';
-		for($i=0; $i < $len; $i++)
+		for ($i = 0; $i < $len; $i++)
 		{
-			$str .= $usedchars[mt_rand(0,count($usedchars)-1)];
+			$str .= $usedchars[mt_rand(0, count($usedchars) - 1)];
 		}
 		return $str;
 	}