EGroupware / egroupware

admin/inc/class.admin_cmd_account_app.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	/**
 	 * Constructor
 	 *
-	 * @param boolean|array $allow true=give rights, false=remove rights, or array with all 3 params
+	 * @param boolean $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
 	 */

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

Braces +8 added lines, -2 removed lines

@@ -54,11 +54,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

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,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;
@@ -88,7 +88,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

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

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

Braces +27 added lines, -12 removed lines

@@ -21,7 +21,8 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$query = array(
@@ -38,14 +39,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);
@@ -58,7 +67,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV export');
 	}
 
@@ -67,7 +77,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports groups into a CSV File. ");
 	}
 
@@ -76,11 +87,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';
         }
 
@@ -90,7 +103,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -98,7 +112,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/class.admin_import_groups_csv.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -77,8 +77,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Spacing +29 added lines, -29 removed lines

@@ -15,15 +15,15 @@ 
 /**
  * class import_csv for admin (groups)
  */
-class admin_import_groups_csv implements importexport_iface_import_plugin  {
+class admin_import_groups_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 		// string
+		'fieldsep', // char
+		'charset', // string
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -40,14 +40,14 @@ 
 	/**
 	 * actions which could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'create', 'delete');
+	protected static $actions = array('none', 'update', 'create', 'delete');
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -80,8 +80,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -89,7 +89,7 @@ 
 		$this->definition = $_definition;
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// set FieldMapping.
 		$import_csv->mapping = $_definition->plugin_options['field_mapping'];
@@ -98,9 +98,9 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -112,22 +112,22 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			importexport_import_csv::convert($record, admin_egw_group_record::$types, 'admin');
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
 							$accounts = array();
 
 							// Skip the search if the field is empty
-							if($record[$condition['string']] !== '') {
+							if ($record[$condition['string']] !== '') {
 
 								$accounts = $GLOBALS['egw']->accounts->search(array(
 									'type' => 'groups',
@@ -136,25 +136,25 @@ 
 								));
 							}
 							// Search looks in the given field, but doesn't do an exact match
-							foreach ( (array)$accounts as $key => $account )
+							foreach ((array)$accounts as $key => $account)
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if ($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if (is_array($accounts) && count($accounts) >= 1) {
 								$account = current($accounts);
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ((array)$accounts as $account) {
 									// Read full account, and copy needed info for accounts->save()
 									$account = $GLOBALS['egw']->accounts->read($account['account_id']);
 									$record['account_id'] = $account['account_id'];
 									$record['account_firstname'] = $account['account_firstname'];
 									$record['account_lastname'] = $account['account_lastname'];
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -167,9 +167,9 @@ 
 				}
 			} else {
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -181,18 +181,18 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		switch ($_action) {
 			case 'none' :
 				return true;
 			case 'update' :
 			case 'create' :
-				if(count($_data['account_members']) < 1) {
+				if (count($_data['account_members']) < 1) {
 					$this->errors[$record_num] = lang('You must select at least one group member.');
 					return false;
 				}
 				$command = new admin_cmd_edit_group($_action == 'create' ? false : $_data['account_lid'], $_data);
-				if($this->dry_run) {
+				if ($this->dry_run) {
 					$this->results[$_action]++;
 					return true;
 				}

Braces +71 added lines, -30 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for admin (groups)
  */
-class admin_import_groups_csv implements importexport_iface_import_plugin  {
+class admin_import_groups_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -80,7 +81,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -98,9 +100,12 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -112,22 +117,30 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			importexport_import_csv::convert($record, admin_egw_group_record::$types, 'admin');
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
 							$accounts = array();
 
 							// Skip the search if the field is empty
-							if($record[$condition['string']] !== '') {
+							if($record[$condition['string']] !== '')
+							{
 
 								$accounts = $GLOBALS['egw']->accounts->search(array(
 									'type' => 'groups',
@@ -138,13 +151,18 @@ 
 							// Search looks in the given field, but doesn't do an exact match
 							foreach ( (array)$accounts as $key => $account )
 							{
-								if($account[$condition['string']] != $record[$condition['string']]) unset($accounts[$key]);
+								if($account[$condition['string']] != $record[$condition['string']])
+								{
+									unset($accounts[$key]);
+								}
 							}
-							if ( is_array( $accounts ) && count( $accounts ) >= 1 ) {
+							if ( is_array( $accounts ) && count( $accounts ) >= 1 )
+							{
 								$account = current($accounts);
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ( (array)$accounts as $account )
+								{
 									// Read full account, and copy needed info for accounts->save()
 									$account = $GLOBALS['egw']->accounts->read($account['account_id']);
 									$record['account_id'] = $account['account_id'];
@@ -152,7 +170,9 @@ 
 									$record['account_lastname'] = $account['account_lastname'];
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -163,13 +183,21 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -181,24 +209,29 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
-		switch ($_action) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
 			case 'create' :
-				if(count($_data['account_members']) < 1) {
+				if(count($_data['account_members']) < 1)
+				{
 					$this->errors[$record_num] = lang('You must select at least one group member.');
 					return false;
 				}
 				$command = new admin_cmd_edit_group($_action == 'create' ? false : $_data['account_lid'], $_data);
-				if($this->dry_run) {
+				if($this->dry_run)
+				{
 					$this->results[$_action]++;
 					return true;
 				}
 				try {
 					$command->run();
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->errors[$record_num] = $e->getMessage();
 					return false;
 				}
@@ -215,7 +248,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Group CSV import');
 	}
 
@@ -224,7 +258,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Creates / updates user groups from CSV file");
 	}
 
@@ -233,7 +268,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -249,7 +285,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -258,7 +295,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -270,7 +308,8 @@ 
 	 *       record_# => warning message
 	 * )
 	 */
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -282,7 +321,8 @@ 
 	 *       record_# => error message
 	 * )
 	 */
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -294,7 +334,8 @@ 
 	 *       action => record count
 	 * )
 	 */
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 }

admin/inc/class.admin_statistics.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -291,7 +291,7 @@
 	 * Check if next submission is due, in which case we call submit and NOT return to the admin hook
 	 *
 	 * @param boolean $redirect should we redirect or return true
-	 * @return boolean true if statistic submission is due
+	 * @return boolean|null true if statistic submission is due
 	 */
 	public static function check($redirect=true)
 	{

Spacing +44 added lines, -44 removed lines

@@ -30,7 +30,7 @@ 
 	const SUBMIT_URL = 'https://www.egroupware.org/usage-statistic';
 	const STATISTIC_URL = 'http://www.egroupware.org/usage-statistic';
 
-	const SUBMISION_RATE = 2592000;	// 30 days
+	const SUBMISION_RATE = 2592000; // 30 days
 
 	/**
 	 * Which methods of this class can be called as menuation
@@ -46,27 +46,27 @@ 
 	 *
 	 * @param array $_content =null
 	 */
-	public function submit($_content=null)
+	public function submit($_content = null)
 	{
 		if (is_array($_content))
 		{
 			$config = new Api\Config(self::CONFIG_APP);
 			if ($_content['postpone'])
 			{
-				Api\Config::save_value(self::CONFIG_POSTPONE_SUBMIT,time()+$_content['postpone'],self::CONFIG_APP);
+				Api\Config::save_value(self::CONFIG_POSTPONE_SUBMIT, time() + $_content['postpone'], self::CONFIG_APP);
 				$what = 'postpone';
 			}
-			elseif(!$_content['cancel'])
+			elseif (!$_content['cancel'])
 			{
-				Api\Config::save_value(self::CONFIG_LAST_SUBMIT,time(),self::CONFIG_APP);
-				Api\Config::save_value(self::CONFIG_SUBMIT_ID,empty($_content['submit_id']) ? '***none***' : $_content['submit_id'],self::CONFIG_APP);
-				Api\Config::save_value(self::CONFIG_COUNTRY,empty($_content['country']) ? '***multinational***' : $_content['country'],self::CONFIG_APP);
-				Api\Config::save_value(self::CONFIG_USAGE_TYPE,$_content['usage_type'],self::CONFIG_APP);
-				Api\Config::save_value(self::CONFIG_INSTALL_TYPE,$_content['install_type'],self::CONFIG_APP);
-				Api\Config::save_value(self::CONFIG_POSTPONE_SUBMIT,null,self::CONFIG_APP);	// remove evtl. postpone time
+				Api\Config::save_value(self::CONFIG_LAST_SUBMIT, time(), self::CONFIG_APP);
+				Api\Config::save_value(self::CONFIG_SUBMIT_ID, empty($_content['submit_id']) ? '***none***' : $_content['submit_id'], self::CONFIG_APP);
+				Api\Config::save_value(self::CONFIG_COUNTRY, empty($_content['country']) ? '***multinational***' : $_content['country'], self::CONFIG_APP);
+				Api\Config::save_value(self::CONFIG_USAGE_TYPE, $_content['usage_type'], self::CONFIG_APP);
+				Api\Config::save_value(self::CONFIG_INSTALL_TYPE, $_content['install_type'], self::CONFIG_APP);
+				Api\Config::save_value(self::CONFIG_POSTPONE_SUBMIT, null, self::CONFIG_APP); // remove evtl. postpone time
 				$what = 'submitted';
 			}
-			Egw::redirect_link('/admin/index.php','ajax=true&statistics='.($what ? $what : 'canceled'),'admin');
+			Egw::redirect_link('/admin/index.php', 'ajax=true&statistics='.($what ? $what : 'canceled'), 'admin');
 		}
 		$sel_options['usage_type'] = array(
 			'commercial'   => lang('Commercial: all sorts of companies'),
@@ -86,19 +86,19 @@ 
 		$sel_options['postpone'] = array(
 			//10 => '10 secs',
 			3600 => lang('one hour'),
-			2*3600 => lang('two hours'),
-			24*3600 => lang('one day'),
-			2*24*3600 => lang('two days'),
-			7*24*3600 => lang('one week'),
-			14*24*3600 => lang('two weeks'),
-			30*24*3600 => lang('one month'),
-			60*24*3600 => lang('two months'),
+			2 * 3600 => lang('two hours'),
+			24 * 3600 => lang('one day'),
+			2 * 24 * 3600 => lang('two days'),
+			7 * 24 * 3600 => lang('one week'),
+			14 * 24 * 3600 => lang('two weeks'),
+			30 * 24 * 3600 => lang('one month'),
+			60 * 24 * 3600 => lang('two months'),
 		);
 		$config = Api\Config::read(self::CONFIG_APP);
 		//_debug_array($config);
-		$content = array_merge(self::gather_data(),array(
+		$content = array_merge(self::gather_data(), array(
 			'statistic_url' => self::STATISTIC_URL,
-			'submit_host' => parse_url(self::SUBMIT_URL,PHP_URL_HOST),
+			'submit_host' => parse_url(self::SUBMIT_URL, PHP_URL_HOST),
 			'submit_url'  => self::SUBMIT_URL,
 			'last_submitted' => $config[self::CONFIG_LAST_SUBMIT],
 		));
@@ -125,12 +125,12 @@ 
 			$sel_options['install_type'] = array($content['install_type'] => $sel_options['install_type'][$content['install_type']]);
 		}
 		// else default to previous type
-		elseif($config[self::CONFIG_INSTALL_TYPE])
+		elseif ($config[self::CONFIG_INSTALL_TYPE])
 		{
 			$content['install_type'] = $config[self::CONFIG_INSTALL_TYPE];
 		}
 		// check if we are due for a new submission
-		if (!isset($config[self::CONFIG_LAST_SUBMIT]) || $config[self::CONFIG_LAST_SUBMIT ] <= time()-self::SUBMISION_RATE)
+		if (!isset($config[self::CONFIG_LAST_SUBMIT]) || $config[self::CONFIG_LAST_SUBMIT] <= time() - self::SUBMISION_RATE)
 		{
 			// clear etemplate_exec_id and replace form.action, before submitting the form
 			$content['onclick'] = "return app.admin.submit_statistic(this.form,'$content[submit_url]');";
@@ -139,11 +139,11 @@ 
 		{
 			$readonlys['submit'] = $readonlys['postpone'] = true;
 			$content['msg'] = lang('Your last submission was less then %1 days ago!',
-				ceil((time()-$config[self::CONFIG_LAST_SUBMIT])/24/3600));
+				ceil((time() - $config[self::CONFIG_LAST_SUBMIT]) / 24 / 3600));
 		}
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Submit statistic information');
 		$tmpl = new Etemplate('admin.statistics');
-		$tmpl->exec('admin.admin_statistics.submit',$content,$sel_options,$readonlys);
+		$tmpl->exec('admin.admin_statistics.submit', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -166,7 +166,7 @@ 
 			$data['version'] .= ' '.$GLOBALS['egw_info']['apps']['stylite']['version'].'EPL';
 		}
 		// sessions in the last 30 days
-		$data['sessions'] = $GLOBALS['egw']->db->query('SELECT COUNT(*) FROM egw_access_log WHERE li > '.(time()-30*24*3600))->fetchColumn();
+		$data['sessions'] = $GLOBALS['egw']->db->query('SELECT COUNT(*) FROM egw_access_log WHERE li > '.(time() - 30 * 24 * 3600))->fetchColumn();
 
 		// total accounts from accounts table or ldap
 		$GLOBALS['egw']->accounts->search(array(
@@ -180,9 +180,9 @@ 
 		// @ required to get ride of warning, if files are outside of open_basedir
 		if (@file_exists($file = '/etc/SuSE-release') || @file_exists($file = '/etc/redhat-release') || @file_exists($file = '/etc/debian_version'))
 		{
-			$data['os'] .= ': '.str_replace(array("\n","\r"),'',implode(',',file($file)));
+			$data['os'] .= ': '.str_replace(array("\n", "\r"), '', implode(',', file($file)));
 		}
-		if(file_exists(EGW_INCLUDE_ROOT.'/.git'))
+		if (file_exists(EGW_INCLUDE_ROOT.'/.git'))
 		{
 			$data['install_type'] = 'git';
 		}
@@ -190,22 +190,22 @@ 
 		{
 			$data['install_type'] = 'svn';
 		}
-		elseif(EGW_INCLUDE_ROOT == '/usr/share/egroupware' && PHP_OS == 'Linux' && is_link('/usr/share/egroupware/header.inc.php'))
+		elseif (EGW_INCLUDE_ROOT == '/usr/share/egroupware' && PHP_OS == 'Linux' && is_link('/usr/share/egroupware/header.inc.php'))
 		{
 			$data['install_type'] = 'package';
 		}
-		foreach(array_keys($GLOBALS['egw_info']['apps']) as $app)
+		foreach (array_keys($GLOBALS['egw_info']['apps']) as $app)
 		{
-			if (in_array($app,array(
-				'admin','phpgwapi','api','sambaadmin','developer_tools',
-				'home','preferences','etemplate','registration','manual',
+			if (in_array($app, array(
+				'admin', 'phpgwapi', 'api', 'sambaadmin', 'developer_tools',
+				'home', 'preferences', 'etemplate', 'registration', 'manual',
 			)))
 			{
-				continue;	// --> ignore to not submit too much
+				continue; // --> ignore to not submit too much
 			}
 			if (($users = self::gather_app_users($app)))	// ignore apps noone is allowed to run
 			{
-				$data['apps'][$app] = $app.':'.round(100.0*$users/$data['users']).'%';
+				$data['apps'][$app] = $app.':'.round(100.0 * $users / $data['users']).'%';
 				if (($entries = self::gather_app_entries($app)))
 				{
 					$data['apps'][$app] .= ':'.$entries;
@@ -213,7 +213,7 @@ 
 			}
 		}
 		ksort($data['apps']);
-		$data['apps'] = implode("\n",$data['apps']);
+		$data['apps'] = implode("\n", $data['apps']);
 
 		return $data;
 	}
@@ -227,17 +227,17 @@ 
 	static function gather_app_users($app)
 	{
 		$users = array();
-		if (($access = $GLOBALS['egw']->acl->get_ids_for_location('run',1,$app)))
+		if (($access = $GLOBALS['egw']->acl->get_ids_for_location('run', 1, $app)))
 		{
-			foreach($access as $uid)
+			foreach ($access as $uid)
 			{
 				if ($uid > 0)
 				{
 					$users[] = $uid;
 				}
-				elseif (($members = $GLOBALS['egw']->accounts->members($uid,true)))
+				elseif (($members = $GLOBALS['egw']->accounts->members($uid, true)))
 				{
-					$users = array_merge($users,$members);
+					$users = array_merge($users, $members);
 				}
 			}
 			$users = array_unique($users);
@@ -261,7 +261,7 @@ 
 			'infolog'     => 'egw_infolog',
 			'filemanager' => 'egw_sqlfs',
 			'gallery'     => 'g2_Item',
-			'news_admin'  => 'egw_news WHERE news_submittedby > 0',	// exclude imported rss feeds
+			'news_admin'  => 'egw_news WHERE news_submittedby > 0', // exclude imported rss feeds
 			'polls'       => 'egw_polls',
 			'projectmanager' => 'egw_pm_projects',
 			'phpbrain'    => 'egw_kb_articles',
@@ -279,7 +279,7 @@ 
 				$entries = (int)$GLOBALS['egw']->db->query('SELECT COUNT(*) FROM '.$table)->fetchColumn();
 				//echo "$app ($table): $entries<br />\n";
 			}
-			catch(Api\Db\Exception $e) {
+			catch (Api\Db\Exception $e) {
 				unset($e);
 				$entries = null;
 			}
@@ -293,19 +293,19 @@ 
 	 * @param boolean $redirect should we redirect or return true
 	 * @return boolean true if statistic submission is due
 	 */
-	public static function check($redirect=true)
+	public static function check($redirect = true)
 	{
 		$config = Api\Config::read(self::CONFIG_APP);
 
 		if (isset($config[self::CONFIG_POSTPONE_SUBMIT]) && $config[self::CONFIG_POSTPONE_SUBMIT] > time() ||
-			isset($config[self::CONFIG_LAST_SUBMIT ]) && $config[self::CONFIG_LAST_SUBMIT ] > time()-self::SUBMISION_RATE)
+			isset($config[self::CONFIG_LAST_SUBMIT]) && $config[self::CONFIG_LAST_SUBMIT] > time() - self::SUBMISION_RATE)
 		{
 			return false;
 		}
 		if (!$redirect) return true;
 
 		//die('Due for new statistics submission: last_submit='.$config[self::CONFIG_LAST_SUBMIT ].', postpone='.$config[self::CONFIG_POSTPONE_SUBMIT].', '.function_backtrace());
-		Egw::redirect_link('/index.php',array(
+		Egw::redirect_link('/index.php', array(
 			'menuaction' => 'admin.admin_ui.index',
 			'ajax' => 'true',
 			'load' => 'admin.admin_statistics.submit',

Braces +8 added lines, -2 removed lines

@@ -203,9 +203,12 @@ 
 			{
 				continue;	// --> ignore to not submit too much
 			}
-			if (($users = self::gather_app_users($app)))	// ignore apps noone is allowed to run
+			if (($users = self::gather_app_users($app)))
+			{
+				// ignore apps noone is allowed to run
 			{
 				$data['apps'][$app] = $app.':'.round(100.0*$users/$data['users']).'%';
+			}
 				if (($entries = self::gather_app_entries($app)))
 				{
 					$data['apps'][$app] .= ':'.$entries;
@@ -302,7 +305,10 @@ 
 		{
 			return false;
 		}
-		if (!$redirect) return true;
+		if (!$redirect)
+		{
+			return true;
+		}
 
 		//die('Due for new statistics submission: last_submit='.$config[self::CONFIG_LAST_SUBMIT ].', postpone='.$config[self::CONFIG_POSTPONE_SUBMIT].', '.function_backtrace());
 		Egw::redirect_link('/index.php',array(

admin/inc/class.admin_ui.inc.php

Doc Comments +4 added lines

@@ -491,6 +491,10 @@
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
+
+		/**
+		 * @param string $appname
+		 */
 		function display_section($appname,$file,$file2=False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;

Spacing +31 added lines, -35 removed lines

@@ -40,7 +40,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	public function index(array $content=null)
+	public function index(array $content = null)
 	{
 		if (admin_statistics::check(false))
 		{
@@ -65,7 +65,7 @@ 
 		//$content['msg'] = 'Hi Ralf ;-)';
 		$sel_options['tree'] = $this->tree_data();
 		$sel_options['filter'] = array('' => lang('All groups'));
-		foreach(self::$accounts->search(array(
+		foreach (self::$accounts->search(array(
 			'type' => 'groups',
 			'start' => false,
 			'order' => 'account_lid',
@@ -96,7 +96,7 @@ 
 		}
 		else
 		{
-			$content['iframe'] = 'about:blank';	// we show accounts-list be default now
+			$content['iframe'] = 'about:blank'; // we show accounts-list be default now
 		}
 
 		$tpl->exec('admin.admin_ui.index', $content, $sel_options);
@@ -117,11 +117,11 @@ 
 				'caption' => 'Show members',
 				'enableId' => '^/groups/-\\d+',
 				'default' => true,
-				'group' => $group=1,
+				'group' => $group = 1,
 			),
 			'add' => array(
 				'group' => $group,
-			)+$user_actions['add'],
+			) + $user_actions['add'],
 			'acl' => array(
 				'onExecute' => 'javaScript:app.admin.group',
 				'caption' => 'Access control',
@@ -132,7 +132,7 @@ 
 				'group' => 2,
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access', 64, 'admin'))	// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -143,16 +143,16 @@ 
 				'group'     => 2,
 			);
 		}
-		$group = 5;	// allow to place actions in different groups by hook, this is the default
+		$group = 5; // allow to place actions in different groups by hook, this is the default
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_group')));
-		foreach($apps as $app)
+		foreach ($apps as $app)
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = Api\Hooks::single('edit_group', $app);
 			if (!is_array($data)) $data = $GLOBALS['menuData'];
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
-			foreach($data as $item)
+			foreach ($data as $item)
 			{
 				// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
 				if (empty($item['caption']))
@@ -203,7 +203,7 @@ 
 					'default' => true,
 					'allowOnMultiple' => false,
 					'onExecute' => 'javaScript:app.admin.account',
-					'group' => $group=0,
+					'group' => $group = 0,
 				),
 				'add' => array(
 					'caption' => 'Add user',
@@ -214,25 +214,25 @@ 
 			// generate urls for add/edit accounts via addressbook
 			$edit = Link::get_registry('addressbook', 'edit');
 			$edit['account_id'] = '$id';
-			foreach($edit as $name => $val)
+			foreach ($edit as $name => $val)
 			{
 				$actions['edit']['url'] .= ($actions['edit']['url'] ? '&' : '').$name.'='.$val;
 			}
 			unset($edit['account_id']);
 			$edit['owner'] = 0;
-			foreach($edit as $name => $val)
+			foreach ($edit as $name => $val)
 			{
 				$actions['add']['url'] .= ($actions['edit']['url'] ? '&' : '').$name.'='.$val;
 			}
 			++$group;
 			// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 			$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_user')));
-			foreach($apps as $app)
+			foreach ($apps as $app)
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = Api\Hooks::single('edit_user', $app);
 				if (!is_array($data)) $data = $GLOBALS['menuData'];
-				foreach($data as $item)
+				foreach ($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
 					if (empty($item['caption']))
@@ -281,7 +281,7 @@ 
 	 * @param array &$rows=null
 	 * @return int total number of rows available
 	 */
-	public static function get_users(array $query, array &$rows=null)
+	public static function get_users(array $query, array &$rows = null)
 	{
 		$params = array(
 			'type' => (int)$query['filter'] ? (int)$query['filter'] : 'accounts',
@@ -296,7 +296,7 @@ 
 			$params['query'] = $query['searchletter'];
 			$params['query_type'] = 'start';
 		}
-		elseif($query['search'])
+		elseif ($query['search'])
 		{
 			$params['query'] = $query['search'];
 			$params['query_type'] = 'all';
@@ -305,13 +305,10 @@ 
 		$rows = array_values(self::$accounts->search($params));
 		//error_log(__METHOD__."() accounts->search(".array2string($params).") total=".self::$accounts->total);
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			$row['status'] = self::$accounts->is_expired($row) ?
-				lang('Expired').' '.Api\DateTime::to($row['account_expires'], true) :
-					(!self::$accounts->is_active($row) ? lang('Disabled') :
-						($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) :
-							lang('Enabled')));
+				lang('Expired').' '.Api\DateTime::to($row['account_expires'], true) : (!self::$accounts->is_active($row) ? lang('Disabled') : ($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) : lang('Enabled')));
 
 			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
 		}
@@ -352,14 +349,14 @@ 
 		if ($root == '/')
 		{
 			$hook_data = self::call_hook();
-			foreach($hook_data as $app => $app_data)
+			foreach ($hook_data as $app => $app_data)
 			{
-				if(!is_array($app_data))
+				if (!is_array($app_data))
 				{
 					// Application has no data
 					continue;
 				}
-				foreach($app_data as $text => $data)
+				foreach ($app_data as $text => $data)
 				{
 					if (!is_array($data))
 					{
@@ -390,18 +387,17 @@ 
 						}
 					}
 					unset($data['icon']);
-					$parent =& $tree['item'];
+					$parent = & $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/') array_shift($parts); // remove root
 					array_pop($parts);
 					$path = '';
-					foreach($parts as $part)
+					foreach ($parts as $part)
 					{
 						$path .= ($path == '/' ? '' : '/').$part;
 						if (!isset($parent[$path]))
 						{
-							$icon = Etemplate\Widget\Tree::imagePath($part == 'apps' ? Api\Image::find('api', 'home') :
-								(($i=Api\Image::find($part, 'navbar')) ? $i : Api\Image::find('api', 'nonav')));
+							$icon = Etemplate\Widget\Tree::imagePath($part == 'apps' ? Api\Image::find('api', 'home') : (($i = Api\Image::find($part, 'navbar')) ? $i : Api\Image::find('api', 'nonav')));
 							$parent[$path] = array(
 								'id' => $path,
 								'text' => $part == 'apps' ? lang('Applications') : lang($part),
@@ -413,7 +409,7 @@ 
 							);
 							if ($path == '/admin') $parent[$path]['open'] = true;
 						}
-						$parent =& $parent[$path]['item'];
+						$parent = & $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
 					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
@@ -425,7 +421,7 @@ 
 		}
 		elseif ($root == '/groups')
 		{
-			foreach($GLOBALS['egw']->accounts->search(array(
+			foreach ($GLOBALS['egw']->accounts->search(array(
 				'type' => 'groups',
 				'order' => 'account_lid',
 				'sort' => 'ASC',
@@ -452,8 +448,8 @@ 
 	private static function fix_userdata(array $data)
 	{
 		// store link as userdata, maybe we should store everything not directly understood by tree this way ...
-		foreach(array_diff_key($data, array_flip(array(
-			'id','text','tooltip','im0','im1','im2','item','child','select','open','call',
+		foreach (array_diff_key($data, array_flip(array(
+			'id', 'text', 'tooltip', 'im0', 'im1', 'im2', 'item', 'child', 'select', 'open', 'call',
 		))) as $name => $content)
 		{
 			$data['userdata'][] = array(
@@ -473,7 +469,7 @@ 
 	private static function strip_item_keys(array &$items)
 	{
 		$items = array_values($items);
-		foreach($items as &$item)
+		foreach ($items as &$item)
 		{
 			if (is_array($item) && isset($item['item']))
 			{
@@ -491,7 +487,7 @@ 
 	protected static function call_hook()
 	{
 		self::$hook_data = array();
-		function display_section($appname,$file,$file2=False)
+		function display_section($appname, $file, $file2 = False)
 		{
 			admin_ui::$hook_data[$appname] = $file2 ? $file2 : $file;
 			//error_log(__METHOD__."(".array2string(func_get_args()).")");

Braces +85 added lines, -21 removed lines

@@ -48,7 +48,10 @@ 
 		}
 		$tpl = new Etemplate('admin.index');
 
-		if (!is_array($content)) $content = array();
+		if (!is_array($content))
+		{
+			$content = array();
+		}
 		$content['nm'] = array(
 			'get_rows' => 'admin_ui::get_users',
 			'no_cat' => true,
@@ -132,7 +135,9 @@ 
 				'group' => 2,
 			),
 		);
-		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))	// no rights to set ACL-rights
+		if (!$GLOBALS['egw']->acl->check('account_access',64,'admin'))
+		{
+			// no rights to set ACL-rights
 		{
 			$actions['deny'] = array(
 				'caption'   => 'Deny access',
@@ -143,6 +148,7 @@ 
 				'group'     => 2,
 			);
 		}
+		}
 		$group = 5;	// allow to place actions in different groups by hook, this is the default
 		// supporting both old way using $GLOBALS['menuData'] and new just returning data in hook
 		$apps = array_unique(array_merge(array('admin'), Api\Hooks::implemented('edit_group')));
@@ -150,7 +156,10 @@ 
 		{
 			$GLOBALS['menuData'] = $data = array();
 			$data = Api\Hooks::single('edit_group', $app);
-			if (!is_array($data)) $data = $GLOBALS['menuData'];
+			if (!is_array($data))
+			{
+				$data = $GLOBALS['menuData'];
+			}
 			//error_log(__METHOD__."() app $app returned ".array2string($data));
 			foreach($data as $item)
 			{
@@ -170,15 +179,33 @@ 
 					{
 						$item['popup'] = $matches[2].'x'.$matches[3];
 						$item['onExecute'] = 'javaScript:nm_action';
-						if (isset($matches[5])) $item['tooltip'] = $matches[5];
+						if (isset($matches[5]))
+						{
+							$item['tooltip'] = $matches[5];
+						}
 						unset($item['options']);
 					}
 				}
-				if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-				if (empty($item['group'])) $item['group'] = $group;
-				if (empty($item['onExecute'])) $item['onExecute'] = 'javaScript:app.admin.group';
-				if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
-				if (!isset($item['enableId'])) $item['enableId'] = '^/groups/-\\d+';
+				if (empty($item['icon']))
+				{
+					$item['icon'] = $app.'/navbar';
+				}
+				if (empty($item['group']))
+				{
+					$item['group'] = $group;
+				}
+				if (empty($item['onExecute']))
+				{
+					$item['onExecute'] = 'javaScript:app.admin.group';
+				}
+				if (!isset($item['allowOnMultiple']))
+				{
+					$item['allowOnMultiple'] = false;
+				}
+				if (!isset($item['enableId']))
+				{
+					$item['enableId'] = '^/groups/-\\d+';
+				}
 
 				$actions[$item['id']] = $item;
 			}
@@ -231,7 +258,10 @@ 
 			{
 				$GLOBALS['menuData'] = $data = array();
 				$data = Api\Hooks::single('edit_user', $app);
-				if (!is_array($data)) $data = $GLOBALS['menuData'];
+				if (!is_array($data))
+				{
+					$data = $GLOBALS['menuData'];
+				}
 				foreach($data as $item)
 				{
 					// allow hook to return "real" actions, but still support legacy: description, url, extradata, options
@@ -249,15 +279,30 @@ 
 						if ($item['options'] && preg_match('/(egw_openWindowCentered2?|window.open)\([^)]+,(\d+),(\d+).*(title="([^"]+)")?/', $item['options'], $matches))
 						{
 							$item['popup'] = $matches[2].'x'.$matches[3];
-							if (isset($matches[5])) $item['tooltip'] = $matches[5];
+							if (isset($matches[5]))
+							{
+								$item['tooltip'] = $matches[5];
+							}
 							unset($item['options']);
 						}
 					}
-					if (empty($item['icon'])) $item['icon'] = $app.'/navbar';
-					if (empty($item['group'])) $item['group'] = $group;
-					if (empty($item['onExecute'])) $item['onExecute'] = $item['popup'] ?
+					if (empty($item['icon']))
+					{
+						$item['icon'] = $app.'/navbar';
+					}
+					if (empty($item['group']))
+					{
+						$item['group'] = $group;
+					}
+					if (empty($item['onExecute']))
+					{
+						$item['onExecute'] = $item['popup'] ?
 						'javaScript:nm_action' : 'javaScript:app.admin.iframe_location';
-					if (!isset($item['allowOnMultiple'])) $item['allowOnMultiple'] = false;
+					}
+					if (!isset($item['allowOnMultiple']))
+					{
+						$item['allowOnMultiple'] = false;
+					}
 
 					$actions[$item['id']] = $item;
 				}
@@ -313,7 +358,10 @@ 
 						($row['account_expires'] != -1 ? lang('Expires').' '.Api\DateTime::to($row['account_expires'], true) :
 							lang('Enabled')));
 
-			if (!self::$accounts->is_active($row)) $row['status_class'] = 'adminAccountInactive';
+			if (!self::$accounts->is_active($row))
+			{
+				$row['status_class'] = 'adminAccountInactive';
+			}
 		}
 
 		return self::$accounts->total;
@@ -367,7 +415,10 @@ 
 							'link' => $data,
 						);
 					}
-					if (empty($data['text'])) $data['text'] = $text;
+					if (empty($data['text']))
+					{
+						$data['text'] = $text;
+					}
 					if (empty($data['id']))
 					{
 						$data['id'] = $root.($app == 'admin' ? 'admin' : 'apps/'.$app).'/';
@@ -392,7 +443,11 @@ 
 					unset($data['icon']);
 					$parent =& $tree['item'];
 					$parts = explode('/', $data['id']);
-					if ($data['id'][0] == '/') array_shift($parts);	// remove root
+					if ($data['id'][0] == '/')
+					{
+						array_shift($parts);
+					}
+					// remove root
 					array_pop($parts);
 					$path = '';
 					foreach($parts as $part)
@@ -411,14 +466,23 @@ 
 								'item' => array(),
 								'child' => 1,
 							);
-							if ($path == '/admin') $parent[$path]['open'] = true;
+							if ($path == '/admin')
+							{
+								$parent[$path]['open'] = true;
+							}
 						}
 						$parent =& $parent[$path]['item'];
 					}
 					$data['text'] = lang($data['text']);
-					if (!empty($data['tooltip'])) $data['tooltip'] = lang($data['tooltip']);
+					if (!empty($data['tooltip']))
+					{
+						$data['tooltip'] = lang($data['tooltip']);
+					}
 					// make sure keys are unique, as we overwrite tree entries otherwise
-					if (isset($parent[$data['id']])) $data['id'] .= md5($data['link']);
+					if (isset($parent[$data['id']]))
+					{
+						$data['id'] .= md5($data['link']);
+					}
 					$parent[$data['id']] = self::fix_userdata($data);
 				}
 			}

api/src/Accounts/Ldap.php

Doc Comments +2 added lines, -3 removed lines

@@ -190,7 +190,7 @@ 
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{
@@ -995,7 +995,7 @@ 
 	 *
 	 * @param int $_account_id
 	 * @param string $ip
-	 * @return int lastlogin time
+	 * @return boolean lastlogin time
 	 */
 	function update_lastlogin($_account_id, $ip)
 	{
@@ -1097,7 +1097,6 @@ 
 	 * @param int $gid gidnumber of group to set
 	 * @param array $objectclass =null should we set the member and uniqueMember attributes (groupOf(Unique)Names|univentionGroup) (default detect it)
 	 * @param string $use_cn =null if set $cn is used instead $gid and the attributes are returned, not written to ldap
-	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)

Indentation +1 added lines, -1 removed lines

@@ -962,7 +962,7 @@
 			'account_fullname' => 'cn',
 		);
 		if (!isset($to_ldap[$which]) || $account_type === 'g') {
-		    return False;
+			return False;
 		}
 
 		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));

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

@@ -775,7 +775,7 @@ 
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
-						$account = Array(
+						$account = array(
 							'account_id'        => $allVals['uidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
 							'account_type'      => 'u',
@@ -835,7 +835,7 @@ 
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
-						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
+						$accounts[(string)-$allVals['gidnumber'][0]] = array(
 							'account_id'        => -$allVals['gidnumber'][0],
 							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 							'account_type'      => 'g',

Braces +172 added lines, -44 removed lines

@@ -175,7 +175,10 @@ 
 	 */
 	function read($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -238,17 +241,23 @@ 
 					$this->delete($data['account_id']);
 					unset($old['dn']);
 					// removing the namedObject object-class, if it's included
-					if ($key !== false) unset($old['objectclass'][$key]);
+					if ($key !== false)
+					{
+						unset($old['objectclass'][$key]);
+					}
 					$to_write = $old;
 					unset($old);
 				}
 			}
 		}
-		if (!$data['account_id'])	// new account
+		if (!$data['account_id'])
+		{
+			// new account
 		{
 			if (!($data['account_id'] = $data_utf8['account_id'] = $this->_get_nextid($is_group ? 'g' : 'u')))
 			{
 				return false;
+		}
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
@@ -259,11 +268,14 @@ 
 			{
 				$to_write['objectclass'] = $old ? $old['objectclass'] : array();
 			}
-			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
+			if (!$old)
+			{
+				// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
 				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
 				{
 					$add = array();
+			}
 					if (is_array($additional))
 					{
 						$add = $additional;
@@ -272,7 +284,10 @@ 
 					if ($this->ldapServerInfo->supportsObjectClass($additional))
 					{
 						$to_write['objectclass'][] = $additional;
-						if ($add) $to_write += $add;
+						if ($add)
+						{
+							$to_write += $add;
+						}
 					}
 				}
 			}
@@ -281,7 +296,10 @@ 
 		}
 		if (!($dn = $old['dn']))
 		{
-			if (!$data['account_lid']) return false;
+			if (!$data['account_lid'])
+			{
+				return false;
+			}
 
 			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
 				'uid='.$data_utf8['account_lid'].','.$this->user_context;
@@ -302,24 +320,36 @@ 
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward))
+				{
+					list($forward,$extra_attr,$keep_objectclass) = $forward;
+				}
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
 					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
-					if ($data_utf8['account_email'])	// setting an email
+					if ($data_utf8['account_email'])
+					{
+						// setting an email
 					{
 						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
+					}
 							$to_write['objectclass'][] = $objectclass;
 						}
-						if ($extra_attr) $to_write[$extra_attr] = $data_utf8['account_lid'];
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = $data_utf8['account_lid'];
+						}
 						$to_write[static::MAIL_ATTR] = $data_utf8['account_email'];
 
 						if ($forward)
 						{
-							if (!$members) $members = $this->members($data['account_id']);
+							if (!$members)
+							{
+								$members = $this->members($data['account_id']);
+							}
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
@@ -330,11 +360,20 @@ 
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif($old)
+					{
+						// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
-						if ($forward) $to_write[$forward] = array();
-						if ($extra_attr) $to_write[$extra_attr] = array();
+					}
+						if ($forward)
+						{
+							$to_write[$forward] = array();
+						}
+						if ($extra_attr)
+						{
+							$to_write[$extra_attr] = array();
+						}
 						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
@@ -368,7 +407,8 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid']))
+		{
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
@@ -405,7 +445,10 @@ 
 	 */
 	function delete($account_id)
 	{
-		if (!(int)$account_id) return false;
+		if (!(int)$account_id)
+		{
+			return false;
+		}
 
 		if ($account_id < 0)
 		{
@@ -418,10 +461,16 @@ 
 
 			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
 		}
-		if (!$sri) return false;
+		if (!$sri)
+		{
+			return false;
+		}
 
 		$allValues = ldap_get_entries($this->ds, $sri);
-		if (!$allValues['count']) return false;
+		if (!$allValues['count'])
+		{
+			return false;
+		}
 
 		return ldap_delete($this->ds, $allValues[0]['dn']);
 	}
@@ -593,14 +642,20 @@ 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
 		{
-			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))	// md5 --> ldap md5
+			if (preg_match('/^[a-f0-9]{32}$/', $data['account_passwd']))
+			{
+				// md5 --> ldap md5
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			}
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))
+			{
+				// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
+			}
 			$to_write['userpassword'] = $data['account_passwd'];
 			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
 		}
@@ -620,16 +675,28 @@ 
 			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change'])
+		{
+			$to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
+		}
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0)
+		{
+			$to_write['shadowlastchange'] = 0;
+		}
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
-			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			if (isset($data['homedirectory']))
+			{
+				$to_write['homedirectory']  = $data['homedirectory'];
+			}
+			if (isset($data['loginshell']))
+			{
+				$to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
+			}
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
@@ -676,8 +743,14 @@ 
 		}
 		// if it's a limited query, check if the unlimited query is cached
 		$start = $param['start'];
-		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs'])) $maxmatchs = 15;
-		if (!($offset = $param['offset'])) $offset = $maxmatchs;
+		if (!($maxmatchs = $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']))
+		{
+			$maxmatchs = 15;
+		}
+		if (!($offset = $param['offset']))
+		{
+			$offset = $maxmatchs;
+		}
 		unset($param['start']);
 		unset($param['offset']);
 		$unl_serial = serialize($param);
@@ -748,12 +821,18 @@ 
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
-						if ($key !== 'count') $fullSet[$entry['uid'][0]] = $entry[$order][0];
+						if ($key !== 'count')
+						{
+							$fullSet[$entry['uid'][0]] = $entry[$order][0];
+						}
 					}
 
-					if (is_numeric($param['type'])) // return only group-members
+					if (is_numeric($param['type']))
+					{
+						// return only group-members
 					{
 						$relevantAccounts = array();
+					}
 						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
@@ -791,7 +870,10 @@ 
 						//error_log(__METHOD__."() ldap=".array2string($allVals)." --> account=".array2string($account));
 						if ($param['active'] && !$this->frontend->is_active($account))
 						{
-							if (isset($totalcount)) --$totalcount;
+							if (isset($totalcount))
+							{
+								--$totalcount;
+							}
 							continue;
 						}
 						$account['account_fullname'] = Api\Accounts::format_username($account['account_lid'],
@@ -844,7 +926,10 @@ 
 							'account_status'    => 'A',
 							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
 						);
-						if (isset($totalcount)) ++$totalcount;
+						if (isset($totalcount))
+						{
+							++$totalcount;
+						}
 					}
 				}
 			}
@@ -945,10 +1030,13 @@ 
 	{
 		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
 
-		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
+		if ($which == 'account_lid' && $account_type !== 'u')
+		{
+			// groups only support account_lid
 		{
 
 			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+		}
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -961,7 +1049,8 @@ 
 			'account_email' => static::MAIL_ATTR,
 			'account_fullname' => 'cn',
 		);
-		if (!isset($to_ldap[$which]) || $account_type === 'g') {
+		if (!isset($to_ldap[$which]) || $account_type === 'g')
+		{
 		    return False;
 		}
 
@@ -1011,13 +1100,19 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int) $account_id || !($account_lid = $this->id2name($account_id)))
+		{
+			return false;
+		}
 
 		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
 		$memberships = array();
 		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$memberships[(string) -$data['gidnumber'][0]] = $data['cn'][0];
 		}
@@ -1037,7 +1132,10 @@ 
 		{
 			// try to recover
 			$_gid = $this->name2id($_gid,'account_lid','g');
-			if (!is_numeric($_gid)) return false;
+			if (!is_numeric($_gid))
+			{
+				return false;
+			}
 		}
 
 		$gid = abs($_gid);	// our gid is negative!
@@ -1085,7 +1183,10 @@ 
 		// adding new memberships
 		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
 		{
-			if (!($members = $this->members($gid))) $members = array();
+			if (!($members = $this->members($gid)))
+			{
+				$members = array();
+			}
 			$members[$account_id] = $this->id2name($account_id);
 			$this->set_members($members,$gid);
 		}
@@ -1103,16 +1204,25 @@ 
 	 */
 	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
 	{
-		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
+		if (!($cn = $use_cn) && !($cn = $this->id2name($gid)))
+		{
+			return false;
+		}
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass))
+		{
+			$objectclass = $this->id2name($gid,'objectclass');
+		}
 
 		$to_write = array('memberuid' => array());
 		foreach((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
-			if (is_numeric($member)) $member = $this->id2name($member);
+			if (is_numeric($member))
+			{
+				$member = $this->id2name($member);
+			}
 
 			if ($member)
 			{
@@ -1136,21 +1246,33 @@ 
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if ($use_cn) return $to_write;
+		if ($use_cn)
+		{
+			return $to_write;
+		}
 
 		// set the member email addresses as forwards
 		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
-			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
+			if (is_array($forward))
+			{
+				list($forward,$extra_attr) = $forward;
+			}
+			if ($extra_attr && ($uid = $this->id2name($gid)))
+			{
+				$to_write[$extra_attr] = $uid;
+			}
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
 				foreach($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member,'account_email')))
+					{
+						$to_write[$forward][] = $email;
+					}
 				}
 			}
 		}
@@ -1176,7 +1298,10 @@ 
 
 		// prefer ids above 1000 (below reserved for system users under AD or Linux),
 		// if that's possible within what is configured, or nothing is configured
-		if ($min < 1000 && (!$max || $max > 1000)) $min = 1000;
+		if ($min < 1000 && (!$max || $max > 1000))
+		{
+			$min = 1000;
+		}
 
 		if ($account_type == 'g')
 		{
@@ -1229,7 +1354,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if($id < $min)
+		{
+			$id = $min;
+		}
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
 		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;

Spacing +138 added lines, -141 removed lines

@@ -89,14 +89,14 @@ 
 	 */
 	var $requiredObjectClasses = array(
 		'user' => array(
-			'top','person','organizationalperson','inetorgperson','posixaccount','shadowaccount'
+			'top', 'person', 'organizationalperson', 'inetorgperson', 'posixaccount', 'shadowaccount'
 		),
 		'user-if-supported' => array(	// these classes get added, if server supports them
 			'mozillaabpersonalpha', 'mozillaorgperson', 'evolutionperson',
 			'univentionperson', 'univentionmail', array('univentionobject', 'univentionObjectType' => 'users/user'),
 		),
 		'group' => array(
-			'top','posixgroup','groupofnames'
+			'top', 'posixgroup', 'groupofnames'
 		),
 		'group-if-supported' => array(	// these classes get added, if servers supports them
 			'univentiongroup', array('univentionobject', 'univentionObjectType' => 'groups/group'),
@@ -115,8 +115,8 @@ 
 	 */
 	var $group_mail_classes = array(
 		'dbmailforwardingaddress' => 'mailforwardingaddress',
-		'dbmailuser' => array('mailforwardingaddress','uid'),
-		'qmailuser' => array('mailforwardingaddress','uid'),
+		'dbmailuser' => array('mailforwardingaddress', 'uid'),
+		'qmailuser' => array('mailforwardingaddress', 'uid'),
 		'mailaccount' => 'mailalias',
 		'univentiongroup' => array(false, false, true),
 	);
@@ -158,7 +158,7 @@ 
 		$this->use_session_cache = true;
 
 		$this->ldap = Api\Ldap::factory(false, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 		$this->ds = $this->ldap->ds;
 
 		$this->user_context  = $this->frontend->config['ldap_context'];
@@ -196,7 +196,7 @@ 
 	{
 		$is_group = $data['account_id'] < 0 || $data['account_type'] === 'g';
 
-		$data_utf8 = Api\Translation::convert($data,Api\Translation::charset(),'utf-8');
+		$data_utf8 = Api\Translation::convert($data, Api\Translation::charset(), 'utf-8');
 		$members = $data['account_members'];
 
 		if (!is_object($this->ldapServerInfo))
@@ -208,8 +208,7 @@ 
 		if ($data_utf8['account_id'] && $data_utf8['account_lid'])
 		{
 			// read the entry first, to check if the dn (account_lid) has changed
-			$sri = $is_group ? ldap_search($this->ds,$this->group_context,'gidnumber='.abs($data['account_id'])) :
-				ldap_search($this->ds,$this->user_context,'uidnumber='.$data['account_id']);
+			$sri = $is_group ? ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($data['account_id'])) : ldap_search($this->ds, $this->user_context, 'uidnumber='.$data['account_id']);
 			$old = ldap_get_entries($this->ds, $sri);
 
 			if (!$old['count'])
@@ -221,9 +220,9 @@ 
 				$old = Api\Ldap::result2array($old[0]);
 				$old['objectclass'] = array_map('strtolower', $old['objectclass']);
 				$key = false;
-				if ($is_group && ($key = array_search('namedobject',$old['objectclass'])) !== false ||
-					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'],0,3) != 'cn=') ||
-					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'],0,4) != 'uid='))
+				if ($is_group && ($key = array_search('namedobject', $old['objectclass'])) !== false ||
+					$is_group && ($old['cn'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 3) != 'cn=') ||
+					!$is_group && ($old['uid'] != $data_utf8['account_lid'] || substr($old['dn'], 0, 4) != 'uid='))
 				{
 					// query the memberships to set them again later
 					if (!$is_group)
@@ -252,7 +251,7 @@ 
 			}
 		}
 		// check if we need to write the objectclass: new entry or required object classes are missing
-		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'],$old['objectclass']))
+		if (!$old || array_diff($this->requiredObjectClasses[$is_group ? 'group' : 'user'], $old['objectclass']))
 		{
 			// additional objectclasse might be already set in $to_write or $old
 			if (!is_array($to_write['objectclass']))
@@ -261,7 +260,7 @@ 
 			}
 			if (!$old)	// for new accounts add additional addressbook object classes, if supported by server
 			{			// as setting them later might loose eg. password, if we are not allowed to read them
-				foreach($this->requiredObjectClasses[$is_group?'group-if-supported':'user-if-supported'] as $additional)
+				foreach ($this->requiredObjectClasses[$is_group ? 'group-if-supported' : 'user-if-supported'] as $additional)
 				{
 					$add = array();
 					if (is_array($additional))
@@ -283,8 +282,7 @@ 
 		{
 			if (!$data['account_lid']) return false;
 
-			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context :
-				'uid='.$data_utf8['account_lid'].','.$this->user_context;
+			$dn = $is_group ? 'cn='.$data_utf8['account_lid'].','.$this->group_context : 'uid='.$data_utf8['account_lid'].','.$this->user_context;
 		}
 		// now we merge the user or group data
 		if ($is_group)
@@ -293,23 +291,23 @@ 
 			$data['account_type'] = 'g';
 
 			$objectclass = $old ? $old['objectclass'] : $to_write['objectclass'];
-			if ($members || !$old && array_intersect(array('groupofnames','groupofuniquenames','univentiongroup'), $objectclass))
+			if ($members || !$old && array_intersect(array('groupofnames', 'groupofuniquenames', 'univentiongroup'), $objectclass))
 			{
 				$to_write = array_merge($to_write, $this->set_members($members, $data['account_id'], $objectclass, $dn));
 			}
 			// check if we should set a mail address and forwards for each member
-			foreach($this->group_mail_classes as $objectclass => $forward)
+			foreach ($this->group_mail_classes as $objectclass => $forward)
 			{
 				$extra_attr = false;
 				$keep_objectclass = false;
-				if (is_array($forward)) list($forward,$extra_attr,$keep_objectclass) = $forward;
+				if (is_array($forward)) list($forward, $extra_attr, $keep_objectclass) = $forward;
 
 				if ($this->ldapServerInfo->supportsObjectClass($objectclass) &&
-					($old && in_array($objectclass,$old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
+					($old && in_array($objectclass, $old['objectclass']) || $data_utf8['account_email'] || $old[static::MAIL_ATTR]))
 				{
 					if ($data_utf8['account_email'])	// setting an email
 					{
-						if (!in_array($objectclass,$old ? $old['objectclass'] : $to_write['objectclass']))
+						if (!in_array($objectclass, $old ? $old['objectclass'] : $to_write['objectclass']))
 						{
 							if ($old) $to_write['objectclass'] = $old['objectclass'];
 							$to_write['objectclass'][] = $objectclass;
@@ -323,19 +321,19 @@ 
 							$to_write[$forward] = array();
 							foreach (array_keys($members) as $member)
 							{
-								if (($email = $this->id2name($member,'account_email')))
+								if (($email = $this->id2name($member, 'account_email')))
 								{
 									$to_write[$forward][] = $email;
 								}
 							}
 						}
 					}
-					elseif($old)	// remove the mail and forwards only for existing entries
+					elseif ($old)	// remove the mail and forwards only for existing entries
 					{
 						$to_write[static::MAIL_ATTR] = array();
 						if ($forward) $to_write[$forward] = array();
 						if ($extra_attr) $to_write[$extra_attr] = array();
-						if (!$keep_objectclass && ($key = array_search($objectclass,$old['objectclass'])))
+						if (!$keep_objectclass && ($key = array_search($objectclass, $old['objectclass'])))
 						{
 							$to_write['objectclass'] = $old['objectclass'];
 							unset($to_write['objectclass'][$key]);
@@ -349,7 +347,7 @@ 
 		}
 		else
 		{
-			$to_write = $this->_merge_user($to_write,$data_utf8,!$old);
+			$to_write = $this->_merge_user($to_write, $data_utf8, !$old);
 			// make sure multiple email-addresses in the mail attribute "survive"
 			if (isset($to_write[static::MAIL_ATTR]) && count($old[static::MAIL_ATTR]) > 1)
 			{
@@ -368,21 +366,21 @@ 
 		}
 
 		// remove memberuid when adding a group
-		if(!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
+		if (!$old && is_array($to_write['memberuid']) && empty($to_write['memberuid'])) {
 			unset($to_write['memberuid']);
 		}
 		// modifying or adding the entry
-		if ($old && !@ldap_modify($this->ds,$dn,$to_write) ||
-			!$old && !@ldap_add($this->ds,$dn,$to_write))
+		if ($old && !@ldap_modify($this->ds, $dn, $to_write) ||
+			!$old && !@ldap_add($this->ds, $dn, $to_write))
 		{
 			$err = true;
-			if ($is_group && ($key = array_search('groupofnames',$to_write['objectclass'])) !== false)
+			if ($is_group && ($key = array_search('groupofnames', $to_write['objectclass'])) !== false)
 			{
 				// try again with removed groupOfNames stuff, as I cant detect if posixGroup is a structural object
 				unset($to_write['objectclass'][$key]);
 				$to_write['objectclass'] = array_values($to_write['objectclass']);
 				unset($to_write['member']);
-				$err = $old ? !ldap_modify($this->ds,$dn,$to_write) : !ldap_add($this->ds,$dn,$to_write);
+				$err = $old ? !ldap_modify($this->ds, $dn, $to_write) : !ldap_add($this->ds, $dn, $to_write);
 			}
 			if ($err)
 			{
@@ -392,7 +390,7 @@ 
 		}
 		if ($memberships)
 		{
-			$this->set_memberships($memberships,$data['account_id']);
+			$this->set_memberships($memberships, $data['account_id']);
 		}
 		return $data['account_id'];
 	}
@@ -409,14 +407,14 @@ 
 
 		if ($account_id < 0)
 		{
-			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber=' . abs($account_id));
+			$sri = ldap_search($this->ds, $this->group_context, 'gidnumber='.abs($account_id));
 		}
 		else
 		{
 			// remove the user's memberships
-			$this->set_memberships(array(),$account_id);
+			$this->set_memberships(array(), $account_id);
 
-			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber=' . $account_id);
+			$sri = ldap_search($this->ds, $this->user_context, 'uidnumber='.$account_id);
 		}
 		if (!$sri) return false;
 
@@ -440,7 +438,7 @@ 
 		{
 			$this->ldapServerInfo = $this->ldap->getLDAPServerInfo($this->frontend->config['ldap_host']);
 		}
-		foreach(array_keys($this->group_mail_classes) as $objectclass)
+		foreach (array_keys($this->group_mail_classes) as $objectclass)
 		{
 			if ($this->ldapServerInfo->supportsObjectClass($objectclass))
 			{
@@ -448,15 +446,15 @@ 
 				break;
 			}
 		}
-		$sri = ldap_search($this->ds, $this->group_context,'(&(objectClass=posixGroup)(gidnumber=' . abs($account_id).'))',
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(gidnumber='.abs($account_id).'))',
 			array('dn', 'gidnumber', 'cn', 'objectclass', static::MAIL_ATTR, 'memberuid', 'description'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// group not found
+			return false; // group not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 		unset($data['objectclass']['count']);
 
 		$group += array(
@@ -477,7 +475,7 @@ 
 		{
 			unset($data['memberuid']['count']);
 
-			foreach($data['memberuid'] as $lid)
+			foreach ($data['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -498,16 +496,16 @@ 
 	 */
 	protected function _read_user($account_id)
 	{
-		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber=' . (int)$account_id.'))',
-			array('dn','uidnumber','uid','gidnumber','givenname','sn','cn',static::MAIL_ATTR,'userpassword','telephonenumber',
-				'shadowexpire','shadowlastchange','homedirectory','loginshell','createtimestamp','modifytimestamp'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&(objectclass=posixAccount)(uidnumber='.(int)$account_id.'))',
+			array('dn', 'uidnumber', 'uid', 'gidnumber', 'givenname', 'sn', 'cn', static::MAIL_ATTR, 'userpassword', 'telephonenumber',
+				'shadowexpire', 'shadowlastchange', 'homedirectory', 'loginshell', 'createtimestamp', 'modifytimestamp'));
 
 		$ldap_data = ldap_get_entries($this->ds, $sri);
 		if (!$ldap_data['count'])
 		{
-			return false;	// user not found
+			return false; // user not found
 		}
-		$data = Api\Translation::convert($ldap_data[0],'utf-8');
+		$data = Api\Translation::convert($ldap_data[0], 'utf-8');
 
 		$utc_diff = date('Z');
 		$user = array(
@@ -527,13 +525,13 @@ 
 			// - if it's set to 0, the account is disabled
 			// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 			// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0]*24*3600+$utc_diff < time() ? false : 'A',
-			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
-			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0]*24*3600+($data['shadowlastchange'][0]!=0?$utc_diff:0) : null,
+			'account_status'    => isset($data['shadowexpire']) && $data['shadowexpire'][0] * 24 * 3600 + $utc_diff < time() ? false : 'A',
+			'account_expires'   => isset($data['shadowexpire']) && $data['shadowexpire'][0] ? $data['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
+			'account_lastpwd_change' => isset($data['shadowlastchange']) ? $data['shadowlastchange'][0] * 24 * 3600 + ($data['shadowlastchange'][0] != 0 ? $utc_diff : 0) : null,
 			// lastlogin and lastlogin from are not availible via the shadowAccount object class
 			// 'account_lastlogin' => $data['phpgwaccountlastlogin'][0],
 			// 'account_lastloginfrom' => $data['phpgwaccountlastloginfrom'][0],
-			'person_id'         => $data['uid'][0],	// id of associated contact
+			'person_id'         => $data['uid'][0], // id of associated contact
 			'account_created' => isset($data['createtimestamp'][0]) ? self::accounts_ldap2ts($data['createtimestamp'][0]) : null,
 			'account_modified' => isset($data['modifytimestamp'][0]) ? self::accounts_ldap2ts($data['modifytimestamp'][0]) : null,
 		);
@@ -554,7 +552,7 @@ 
 	 * @param array $data array with account-data in utf-8
 	 * @return array merged data
 	 */
-	protected function _merge_group($to_write,$data,$old=null)
+	protected function _merge_group($to_write, $data, $old = null)
 	{
 		$to_write['gidnumber'] = abs($data['account_id']);
 		$to_write['cn'] = $data['account_lid'];
@@ -574,7 +572,7 @@ 
 	 * @param boolean $new_entry
 	 * @return array merged data
 	 */
-	protected function _merge_user($to_write,$data,$new_entry)
+	protected function _merge_user($to_write, $data, $new_entry)
 	{
 		$to_write['uidnumber'] = $data['account_id'];
 		$to_write['uid']       = $data['account_lid'];
@@ -583,12 +581,12 @@ 
 		{
 			$to_write['givenname'] = $data['account_firstname'] ? $data['account_firstname'] : array();
 		}
-		$to_write['sn']        = $data['account_lastname'];
+		$to_write['sn'] = $data['account_lastname'];
 		if (!$new_entry || $data['account_email'])
 		{
-			$to_write[static::MAIL_ATTR]  = $data['account_email'] ? $data['account_email'] : array();
+			$to_write[static::MAIL_ATTR] = $data['account_email'] ? $data['account_email'] : array();
 		}
-		$to_write['cn']        = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
+		$to_write['cn'] = $data['account_fullname'] ? $data['account_fullname'] : $data['account_firstname'].' '.$data['account_lastname'];
 
 		$utc_diff = date('Z');
 		if (isset($data['account_passwd']) && $data['account_passwd'])
@@ -597,47 +595,46 @@ 
 			{
 				$data['account_passwd'] = setup_cmd_ldap::hash_sql2ldap($data['account_passwd']);
 			}
-			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$data['account_passwd']))	// if it's not already entcrypted, do so now
+			elseif (!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $data['account_passwd']))	// if it's not already entcrypted, do so now
 			{
 				$data['account_passwd'] = Api\Auth::encrypt_ldap($data['account_passwd']);
 			}
 			$to_write['userpassword'] = $data['account_passwd'];
-			$to_write['shadowlastchange'] = round((time()-$utc_diff) / (24*3600));
+			$to_write['shadowlastchange'] = round((time() - $utc_diff) / (24 * 3600));
 		}
 		// both status and expires are encoded in the single shadowexpire value in LDAP
 		// - if it's unset an account is enabled AND does never expire
 		// - if it's set to 0, the account is disabled
 		// - if it's set to > 0, it will or already has expired --> acount is active if it not yet expired
 		// shadowexpire is in days since 1970/01/01 (equivalent to a timestamp (int UTC!) / (24*60*60)
-		$shadowexpire = ($data['account_expires']-$utc_diff) / (24*3600);
+		$shadowexpire = ($data['account_expires'] - $utc_diff) / (24 * 3600);
 
 		$to_write['shadowexpire'] = !$data['account_status'] ?
-			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) :
-			($data['account_expires'] != -1 ? round($shadowexpire) : array());	// array() = unset value
+			($data['account_expires'] != -1 && $data['account_expires'] < time() ? round($shadowexpire) : 0) : ($data['account_expires'] != -1 ? round($shadowexpire) : array()); // array() = unset value
 
 		if ($new_entry && is_array($to_write['shadowexpire']) && !count($to_write['shadowexpire']))
 		{
-			unset($to_write['shadowexpire']);	// gives protocoll error otherwise
+			unset($to_write['shadowexpire']); // gives protocoll error otherwise
 		}
 		//error_log(__METHOD__.__LINE__.$data['account_lid'].'#'.$data['account_lastpwd_change'].'#');
-		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change']-$utc_diff)/(24*3600));
-		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change']==0) $to_write['shadowlastchange'] = 0;
+		if ($data['account_lastpwd_change']) $to_write['shadowlastchange'] = round(($data['account_lastpwd_change'] - $utc_diff) / (24 * 3600));
+		if (isset($data['account_lastpwd_change']) && $data['account_lastpwd_change'] == 0) $to_write['shadowlastchange'] = 0;
 		// lastlogin and lastlogin from are not availible via the shadowAccount object class
 		// $to_write['phpgwaccountlastlogin'] = $data['lastlogin'];
 		// $to_write['phpgwaccountlastloginfrom'] = $data['lastloginfrom'];
 
 		if ($this->frontend->config['ldap_extra_attributes'])
 		{
-			if (isset($data['homedirectory'])) $to_write['homedirectory']  = $data['homedirectory'];
+			if (isset($data['homedirectory'])) $to_write['homedirectory'] = $data['homedirectory'];
 			if (isset($data['loginshell'])) $to_write['loginshell'] = $data['loginshell'] ? $data['loginshell'] : array();
 		}
 		if (($new_entry || isset($to_write['homedirectory'])) && empty($to_write['homedirectory']))
 		{
-			$to_write['homedirectory']  = '/dev/null';	// is a required attribute of posixAccount
+			$to_write['homedirectory'] = '/dev/null'; // is a required attribute of posixAccount
 		}
 		if ($new_entry && empty($to_write['loginshell']))
 		{
-			unset($to_write['loginshell']);	// setting array() for new entry gives "Protocol error", must not set it
+			unset($to_write['loginshell']); // setting array() for new entry gives "Protocol error", must not set it
 		}
 		return $to_write;
 	}
@@ -665,7 +662,7 @@ 
 	function search($param)
 	{
 		//error_log(__METHOD__."(".array2string($param).")");
-		$account_search =& Api\Accounts::$cache['account_search'];
+		$account_search = & Api\Accounts::$cache['account_search'];
 
 		// check if the query is cached
 		$serial = serialize($param);
@@ -691,12 +688,12 @@ 
 			$query = Api\Ldap::quote(strtolower($param['query']));
 
 			$accounts = array();
-			if($param['type'] != 'groups')
+			if ($param['type'] != 'groups')
 			{
 				$filter = "(&(objectclass=posixaccount)";
 				if (!empty($query) && $query != '*')
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -725,7 +722,7 @@ 
 					}
 				}
 				// add account_filter to filter (user has to be '*', as we otherwise only search uid's)
-				$filter .= str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$this->account_filter);
+				$filter .= str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $this->account_filter);
 				$filter .= ')';
 
 				if ($param['type'] != 'both')
@@ -744,9 +741,9 @@ 
 						'account_fullname'  => 'cn',
 						'account_primary_group' => 'gidnumber',
 					);
-					$orders = explode(',',$param['order']);
+					$orders = explode(',', $param['order']);
 					$order = isset($propertyMap[$orders[0]]) ? $propertyMap[$orders[0]] : 'uid';
-					$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid', $order));
+					$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', $order));
 					$fullSet = array();
 					foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $entry)
 					{
@@ -756,7 +753,7 @@ 
 					if (is_numeric($param['type'])) // return only group-members
 					{
 						$relevantAccounts = array();
-						$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=" . abs($param['type']) . "))",array('memberuid'));
+						$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=".abs($param['type'])."))", array('memberuid'));
 						$group = ldap_get_entries($this->ds, $sri);
 						$fullSet = $group[0]['memberuid'] ? array_intersect_key($fullSet, array_flip($group[0]['memberuid'])) : array();
 					}
@@ -765,26 +762,26 @@ 
 					$sortFn = $param['sort'] == 'DESC' ? 'arsort' : 'asort';
 					$sortFn($fullSet);
 					$relevantAccounts = is_numeric($start) ? array_slice(array_keys($fullSet), $start, $offset) : array_keys($fullSet);
-					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=',$relevantAccounts).'))' . $this->account_filter.')';
-					$filter = str_replace(array('%user','%domain'),array('*',$GLOBALS['egw_info']['user']['domain']),$filter);
+					$filter = '(&(objectclass=posixaccount)(|(uid='.implode(')(uid=', $relevantAccounts).'))'.$this->account_filter.')';
+					$filter = str_replace(array('%user', '%domain'), array('*', $GLOBALS['egw_info']['user']['domain']), $filter);
 				}
-				$sri = ldap_search($this->ds, $this->user_context, $filter,array('uid','uidNumber','givenname','sn',static::MAIL_ATTR,'shadowExpire','createtimestamp','modifytimestamp','objectclass','gidNumber'));
+				$sri = ldap_search($this->ds, $this->user_context, $filter, array('uid', 'uidNumber', 'givenname', 'sn', static::MAIL_ATTR, 'shadowExpire', 'createtimestamp', 'modifytimestamp', 'objectclass', 'gidNumber'));
 
 				$utc_diff = date('Z');
-				foreach(ldap_get_entries($this->ds, $sri) as $allVals)
+				foreach (ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = @$allVals['uid'][0];
 					if (!$this->frontend->config['global_denied_users'][$test] && $allVals['uid'][0])
 					{
 						$account = Array(
 							'account_id'        => $allVals['uidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['uid'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['uid'][0], 'utf-8'),
 							'account_type'      => 'u',
-							'account_firstname' => Api\Translation::convert($allVals['givenname'][0],'utf-8'),
-							'account_lastname'  => Api\Translation::convert($allVals['sn'][0],'utf-8'),
-							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0]*24*3600-$utc_diff < time() ? false : 'A',
-							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0]*24*3600+$utc_diff : -1, // LDAP date is in UTC
+							'account_firstname' => Api\Translation::convert($allVals['givenname'][0], 'utf-8'),
+							'account_lastname'  => Api\Translation::convert($allVals['sn'][0], 'utf-8'),
+							'account_status'    => isset($allVals['shadowexpire'][0]) && $allVals['shadowexpire'][0] * 24 * 3600 - $utc_diff < time() ? false : 'A',
+							'account_expires'   => isset($allVals['shadowexpire']) && $allVals['shadowexpire'][0] ? $allVals['shadowexpire'][0] * 24 * 3600 + $utc_diff : -1, // LDAP date is in UTC
 							'account_email'     => $allVals[static::MAIL_ATTR][0],
 							'account_created' => isset($allVals['createtimestamp'][0]) ? self::accounts_ldap2ts($allVals['createtimestamp'][0]) : null,
 							'account_modified' => isset($allVals['modifytimestamp'][0]) ? self::accounts_ldap2ts($allVals['modifytimestamp'][0]) : null,
@@ -810,13 +807,13 @@ 
 			}
 			if ($param['type'] == 'groups' || $param['type'] == 'both')
 			{
-				if(empty($query) || $query == '*')
+				if (empty($query) || $query == '*')
 				{
 					$filter = '(objectclass=posixgroup)';
 				}
 				else
 				{
-					switch($param['query_type'])
+					switch ($param['query_type'])
 					{
 						case 'all':
 						default:
@@ -830,21 +827,21 @@ 
 					}
 					$filter = "(&(objectclass=posixgroup)(cn=$query))";
 				}
-				$sri = ldap_search($this->ds, $this->group_context, $filter,array('cn','gidNumber'));
-				foreach((array)ldap_get_entries($this->ds, $sri) as $allVals)
+				$sri = ldap_search($this->ds, $this->group_context, $filter, array('cn', 'gidNumber'));
+				foreach ((array)ldap_get_entries($this->ds, $sri) as $allVals)
 				{
-					settype($allVals,'array');
+					settype($allVals, 'array');
 					$test = $allVals['cn'][0];
 					if (!$this->frontend->config['global_denied_groups'][$test] && $allVals['cn'][0])
 					{
 						$accounts[(string)-$allVals['gidnumber'][0]] = Array(
 							'account_id'        => -$allVals['gidnumber'][0],
-							'account_lid'       => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_lid'       => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_type'      => 'g',
-							'account_firstname' => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_firstname' => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 							'account_lastname'  => lang('Group'),
 							'account_status'    => 'A',
-							'account_fullname'  => Api\Translation::convert($allVals['cn'][0],'utf-8'),
+							'account_fullname'  => Api\Translation::convert($allVals['cn'][0], 'utf-8'),
 						);
 						if (isset($totalcount)) ++$totalcount;
 					}
@@ -852,9 +849,9 @@ 
 			}
 			// sort the array
 			$this->_callback_sort = strtoupper($param['sort']);
-			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',',$param['order']);
+			$this->_callback_order = empty($param['order']) ? array('account_lid') : explode(',', $param['order']);
 			$sortedAccounts = $accounts;
-			uasort($sortedAccounts,array($this,'_sort_callback'));
+			uasort($sortedAccounts, array($this, '_sort_callback'));
 			$this->total = isset($totalcount) ? $totalcount : count($accounts);
 
 			// if totalcount is set, $sortedAccounts is NOT the full set, but already a limited set!
@@ -866,7 +863,7 @@ 
 		}
 		// return only the wanted accounts
 		reset($sortedAccounts);
-		if(is_numeric($start) && is_numeric($offset))
+		if (is_numeric($start) && is_numeric($offset))
 		{
 			$account_search[$serial]['total'] = $this->total;
 			return $account_search[$serial]['data'] = isset($totalcount) ? $sortedAccounts : array_slice($sortedAccounts, $start, $offset);
@@ -894,19 +891,19 @@ 
 	 * @param array $b
 	 * @return int
 	 */
-	function _sort_callback($a,$b)
+	function _sort_callback($a, $b)
 	{
-		foreach($this->_callback_order as $col )
+		foreach ($this->_callback_order as $col)
 		{
-			if($this->_callback_sort != 'DESC')
+			if ($this->_callback_sort != 'DESC')
 			{
-				$cmp = strcasecmp( $a[$col], $b[$col] );
+				$cmp = strcasecmp($a[$col], $b[$col]);
 			}
 			else
 			{
-				$cmp = strcasecmp( $b[$col], $a[$col] );
+				$cmp = strcasecmp($b[$col], $a[$col]);
 			}
-			if ( $cmp != 0 )
+			if ($cmp != 0)
 			{
 				return $cmp;
 			}
@@ -925,8 +922,8 @@ 
 	{
 		if (!empty($date))
 		{
-			return gmmktime(substr($date,8,2),substr($date,10,2),substr($date,12,2),
-				substr($date,4,2),substr($date,6,2),substr($date,0,4));
+			return gmmktime(substr($date, 8, 2), substr($date, 10, 2), substr($date, 12, 2),
+				substr($date, 4, 2), substr($date, 6, 2), substr($date, 0, 4));
 		}
 		return NULL;
 	}
@@ -943,14 +940,14 @@ 
 	 * @param string $account_type u = user, g = group, default null = try both
 	 * @return int|false numeric account_id or false on error ($name not found)
 	 */
-	function name2id($_name,$which='account_lid',$account_type=null)
+	function name2id($_name, $which = 'account_lid', $account_type = null)
 	{
-		$name = Api\Ldap::quote(Api\Translation::convert($_name,Api\Translation::charset(),'utf-8'));
+		$name = Api\Ldap::quote(Api\Translation::convert($_name, Api\Translation::charset(), 'utf-8'));
 
 		if ($which == 'account_lid' && $account_type !== 'u') // groups only support account_lid
 		{
 
-			$sri = ldap_search($this->ds, $this->group_context, '(&(cn=' . $name . ')(objectclass=posixgroup))', array('gidNumber'));
+			$sri = ldap_search($this->ds, $this->group_context, '(&(cn='.$name.')(objectclass=posixgroup))', array('gidNumber'));
 			$allValues = ldap_get_entries($this->ds, $sri);
 
 			if (@$allValues[0]['gidnumber'][0])
@@ -967,7 +964,7 @@ 
 		    return False;
 		}
 
-		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'=' . $name . ')(objectclass=posixaccount))', array('uidNumber'));
+		$sri = ldap_search($this->ds, $this->user_context, '(&('.$to_ldap[$which].'='.$name.')(objectclass=posixaccount))', array('uidNumber'));
 
 		$allValues = ldap_get_entries($this->ds, $sri);
 
@@ -987,9 +984,9 @@ 
 	 * @param string $which ='account_lid' type to convert to: account_lid (default), account_email, ...
 	 * @return string/false converted value or false on error ($account_id not found)
 	 */
-	function id2name($account_id,$which='account_lid')
+	function id2name($account_id, $which = 'account_lid')
 	{
-		return $this->frontend->id2name($account_id,$which);
+		return $this->frontend->id2name($account_id, $which);
 	}
 
 	/**
@@ -1002,7 +999,7 @@ 
 	function update_lastlogin($_account_id, $ip)
 	{
 		unset($_account_id, $ip);
-		return false;	// not longer supported
+		return false; // not longer supported
 	}
 
 	/**
@@ -1013,11 +1010,11 @@ 
 	 */
 	function memberships($account_id)
 	{
-		if (!(int) $account_id || !($account_lid = $this->id2name($account_id))) return false;
+		if (!(int)$account_id || !($account_lid = $this->id2name($account_id))) return false;
 
-		$sri = ldap_search($this->ds,$this->group_context,'(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))',array('cn','gidnumber'));
+		$sri = ldap_search($this->ds, $this->group_context, '(&(objectClass=posixGroup)(memberuid='.Api\Ldap::quote($account_lid).'))', array('cn', 'gidnumber'));
 		$memberships = array();
-		foreach((array)ldap_get_entries($this->ds, $sri) as $key => $data)
+		foreach ((array)ldap_get_entries($this->ds, $sri) as $key => $data)
 		{
 			if ($key === 'count') continue;
 
@@ -1038,13 +1035,13 @@ 
 		if (!is_numeric($_gid))
 		{
 			// try to recover
-			$_gid = $this->name2id($_gid,'account_lid','g');
+			$_gid = $this->name2id($_gid, 'account_lid', 'g');
 			if (!is_numeric($_gid)) return false;
 		}
 
-		$gid = abs($_gid);	// our gid is negative!
+		$gid = abs($_gid); // our gid is negative!
 
-		$sri = ldap_search($this->ds,$this->group_context,"(&(objectClass=posixGroup)(gidnumber=$gid))",array('memberuid'));
+		$sri = ldap_search($this->ds, $this->group_context, "(&(objectClass=posixGroup)(gidnumber=$gid))", array('memberuid'));
 		$group = ldap_get_entries($this->ds, $sri);
 
 		$members = array();
@@ -1052,7 +1049,7 @@ 
 		{
 			unset($group[0]['memberuid']['count']);
 
-			foreach($group[0]['memberuid'] as $lid)
+			foreach ($group[0]['memberuid'] as $lid)
 			{
 				if (($id = $this->name2id($lid, 'account_lid', 'u')))
 				{
@@ -1069,27 +1066,27 @@ 
 	 * @param array $groups array with gidnumbers
 	 * @param int $account_id uidnumber
 	 */
-	function set_memberships($groups,$account_id)
+	function set_memberships($groups, $account_id)
 	{
 		// remove not longer existing memberships
 		if (($old_memberships = $this->memberships($account_id)))
 		{
 			$old_memberships = array_keys($old_memberships);
-			foreach(array_diff($old_memberships,$groups) as $gid)
+			foreach (array_diff($old_memberships, $groups) as $gid)
 			{
 				if (($members = $this->members($gid)))
 				{
 					unset($members[$account_id]);
-					$this->set_members($members,$gid);
+					$this->set_members($members, $gid);
 				}
 			}
 		}
 		// adding new memberships
-		foreach($old_memberships ? array_diff($groups,$old_memberships) : $groups as $gid)
+		foreach ($old_memberships ? array_diff($groups, $old_memberships) : $groups as $gid)
 		{
 			if (!($members = $this->members($gid))) $members = array();
 			$members[$account_id] = $this->id2name($account_id);
-			$this->set_members($members,$gid);
+			$this->set_members($members, $gid);
 		}
 	}
 
@@ -1103,15 +1100,15 @@ 
 	 * @param boolean $uniqueMember =null should we set the uniqueMember attribute (default detect it)
 	 * @return boolean/array false on failure, array or true otherwise
 	 */
-	function set_members($members, $gid, array $objectclass=null, $use_cn=null)
+	function set_members($members, $gid, array $objectclass = null, $use_cn = null)
 	{
 		if (!($cn = $use_cn) && !($cn = $this->id2name($gid))) return false;
 
 		// do that group is a groupOf(Unique)Names or univentionGroup?
-		if (is_null($objectclass)) $objectclass = $this->id2name($gid,'objectclass');
+		if (is_null($objectclass)) $objectclass = $this->id2name($gid, 'objectclass');
 
 		$to_write = array('memberuid' => array());
-		foreach((array)$members as $key => $member)
+		foreach ((array)$members as $key => $member)
 		{
 			$member_dn = $this->id2name($member, 'account_dn');
 			if (is_numeric($member)) $member = $this->id2name($member);
@@ -1123,7 +1120,7 @@ 
 				{
 					$to_write['member'][] = $member_dn;
 				}
-				if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass))
+				if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass))
 				{
 					$to_write['uniquemember'][] = $member_dn;
 				}
@@ -1134,31 +1131,31 @@ 
 		{
 			$to_write['member'][] = 'uid=dummy'.','.$this->user_context;
 		}
-		if (array_intersect(array('groupofuniquenames','univentiongroup'), $objectclass) && !$to_write['uniquemember'])
+		if (array_intersect(array('groupofuniquenames', 'univentiongroup'), $objectclass) && !$to_write['uniquemember'])
 		{
 			$to_write['uniquemember'][] = 'uid=dummy'.','.$this->user_context;
 		}
 		if ($use_cn) return $to_write;
 
 		// set the member email addresses as forwards
-		if ($this->id2name($gid,'account_email') &&	($objectclass = $this->id2name($gid,'mailAllowed')))
+		if ($this->id2name($gid, 'account_email') && ($objectclass = $this->id2name($gid, 'mailAllowed')))
 		{
 			$forward = $this->group_mail_classes[$objectclass];
-			if (is_array($forward)) list($forward,$extra_attr) = $forward;
+			if (is_array($forward)) list($forward, $extra_attr) = $forward;
 			if ($extra_attr && ($uid = $this->id2name($gid))) $to_write[$extra_attr] = $uid;
 
 			if ($forward)
 			{
 				$to_write[$forward] = array();
-				foreach($members as $key => $member)
+				foreach ($members as $key => $member)
 				{
-					if (($email = $this->id2name($member,'account_email')))	$to_write[$forward][] = $email;
+					if (($email = $this->id2name($member, 'account_email')))	$to_write[$forward][] = $email;
 				}
 			}
 		}
-		if (!ldap_modify($this->ds,'cn='.Api\Ldap::quote($cn).','.$this->group_context,$to_write))
+		if (!ldap_modify($this->ds, 'cn='.Api\Ldap::quote($cn).','.$this->group_context, $to_write))
 		{
-			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write,true)."))\n";
+			echo "ldap_modify(,'cn=$cn,$this->group_context',".print_r($to_write, true)."))\n";
 			return false;
 		}
 		return true;
@@ -1171,7 +1168,7 @@ 
 	 * @param string $account_type ='u' (optional, default to 'u')
 	 * @return int|boolean integer account_id (negative for groups) or false if none is free anymore
 	 */
-	protected function _get_nextid($account_type='u')
+	protected function _get_nextid($account_type = 'u')
 	{
 		$min = $this->frontend->config['account_min_id'] ? $this->frontend->config['account_min_id'] : 0;
 		$max = $this->frontend->config['account_max_id'] ? $this->frontend->config['account_max_id'] : 0;
@@ -1193,16 +1190,16 @@ 
 		/* Loop until we find a free id */
 		do
 		{
-			$account_id = (int) self::next_id($type,$min,$max);
+			$account_id = (int)self::next_id($type, $min, $max);
 		}
-		while ($account_id && ($this->frontend->exists($sign * $account_id) ||	// check need to include the sign!
+		while ($account_id && ($this->frontend->exists($sign * $account_id) || // check need to include the sign!
 			$this->frontend->exists(-1 * $sign * $account_id) ||
 			// if sambaadmin is installed, call it to check there's not yet a relative id (last part of SID) with that number
 			// to ease migration to AD or Samba4
 			file_exists(EGW_SERVER_ROOT.'/sambaadmin') && $GLOBALS['egw_info']['apps']['sambaadmin'] &&
 				ExecMethod2('sambaadmin.sosambaadmin.sidExists', $account_id)));
 
-		if	(!$account_id || $max && $account_id > $max)
+		if (!$account_id || $max && $account_id > $max)
 		{
 			return False;
 		}
@@ -1217,14 +1214,14 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean the next id or false if $max given and exceeded
 	 */
-	static function next_id($location,$min=0,$max=0)
+	static function next_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if ($max && $id >= $max)
 		{
@@ -1232,10 +1229,10 @@ 
 		}
 		++$id;
 
-		if($id < $min) $id = $min;
+		if ($id < $min) $id = $min;
 
 		Api\Config::save_value($key, $id, 'phpgwapi', true);
-		$GLOBALS['egw_info']['server'][$key='last_id_'.$location] = $id;
+		$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location] = $id;
 
 		return (int)$id;
 	}
@@ -1248,18 +1245,18 @@ 
 	 * @param int $max =0 if != 0 maximum id allowed, if it would be exceeded we return false
 	 * @return int|boolean current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
 	 */
-	static function last_id($location,$min=0,$max=0)
+	static function last_id($location, $min = 0, $max = 0)
 	{
 		if (!$location)
 		{
 			return -1;
 		}
 
-		$id = (int)$GLOBALS['egw_info']['server'][$key='last_id_'.$location];
+		$id = (int)$GLOBALS['egw_info']['server'][$key = 'last_id_'.$location];
 
 		if (!$id || $id < $min)
 		{
-			return self::next_id($location,$min,$max);
+			return self::next_id($location, $min, $max);
 		}
 		if ($max && $id > $max)
 		{
@@ -1274,6 +1271,6 @@ 
 	function __wakeup()
 	{
 		$this->ds = Api\Ldap::factory(true, $this->frontend->config['ldap_host'],
-			$this->frontend->config['ldap_root_dn'],$this->frontend->config['ldap_root_pw']);
+			$this->frontend->config['ldap_root_dn'], $this->frontend->config['ldap_root_pw']);
 	}
 }

api/src/Accounts/Univention.php

Doc Comments +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
 	 * If no account_id is set in data the account is added and the new id is set in $data.
 	 *
 	 * @param array $data array with account-data
-	 * @return int|boolean the account_id or false on error
+	 * @return false|string the account_id or false on error
 	 */
 	function save(&$data)
 	{

Spacing +6 added lines, -7 removed lines

@@ -62,7 +62,7 @@ 
 			if (!$data['account_id'] && $data['account_type'] !== 'g')
 			{
 				$params = array(
-					'users/user','create',
+					'users/user', 'create',
 					'--binddn', $config['ldap_root_dn'],
 					'--bindpwd', 5=>$config['ldap_root_pw'],
 					'--position', $config['ldap_context'],
@@ -87,7 +87,7 @@ 
 						}
 						$hostname = $account->acc_imap_host;
 					}
-					catch(\Exception $e) {
+					catch (\Exception $e) {
 						unset($e);
 					}
 					if (empty($hostname)) $hostname = trim(system('hostname -f'));
@@ -99,14 +99,14 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object created: (uid=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
 				$data['account_dn'] = $matches[1];
 				$data['account_id'] = $this->name2id($data['account_lid'], 'account_lid', 'u');
 			}
-			elseif($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
+			elseif ($data['account_id'] && ($data['old_loginid'] || ($data['old_loginid'] = $this->id2name($data['account_id']))) &&
 				$data['account_lid'] != $data['old_loginid'] &&
 				($data['account_dn'] = $this->id2name($data['account_id'], 'account_dn')))
 			{
@@ -123,12 +123,11 @@ 
 				$output = implode("\n", $output_arr);
 				if ($ret || !preg_match('/^Object modified: ((uid|cn)=.*)$/mui', $output, $matches))
 				{
-					$params[5] = '********';	// mask out password!
+					$params[5] = '********'; // mask out password!
 					$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));
 					throw new Api\Exception\WrongUserinput($cmd."\nreturned\n".$output);
 				}
-				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] :
-					// duno why but directory-manager returns old dn for groups ...
+				$data['account_dn'] = $data['account_type'] !== 'g' ? $matches[1] : // duno why but directory-manager returns old dn for groups ...
 					preg_replace('/^cn=[^,]+,/', 'cn='.$data['account_lid'].',', $data['account_dn']);
 			}
 		}

Braces +4 added lines, -1 removed lines

@@ -90,7 +90,10 @@
 					catch(\Exception $e) {
 						unset($e);
 					}
-					if (empty($hostname)) $hostname = trim(system('hostname -f'));
+					if (empty($hostname))
+					{
+						$hostname = trim(system('hostname -f'));
+					}
 					$params[] = '--set'; $params[] = 'mailHomeServer='.$hostname;
 				}
 				$cmd = self::DIRECTORY_MANAGER_BIN.' '.implode(' ', array_map('escapeshellarg', $params));

api/src/Acl.php

Doc Comments +3 added lines, -3 removed lines

@@ -166,7 +166,7 @@ 
 	 * Delete ACL record in the repository of the class
 	 *
 	 * @param string $appname appname or '' for $GLOBALS['egw_info']['flags']['currentapp']
-	 * @param string/boolean $location location or false for all locations
+	 * @param boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
 	function delete($appname,$location)
@@ -267,8 +267,8 @@ 
 	/**
 	 * check required rights agains the internal repository (included rights of $this->account_id and all it's memberships)
 	 *
-	 * @param $location app location
-	 * @param $required required right to check against
+	 * @param string $location app location
+	 * @param integer $required required right to check against
 	 * @param $appname optional defaults to currentapp
 	 * @return boolean
 	 */

Braces +81 added lines, -20 removed lines

@@ -111,7 +111,10 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			if (is_array($no_groups))
+			{
+				$acl_acc_list = array_diff($acl_acc_list,$no_groups);
+			}
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
@@ -149,7 +152,10 @@ 
 	 */
 	function add($appname,$location,$rights)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$row = array(
 			'appname'  => $appname,
@@ -171,7 +177,10 @@ 
 	 */
 	function delete($appname,$location)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		foreach($this->data as $idx => $value)
 		{
@@ -209,10 +218,13 @@ 
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return $this->data;
 	}
 
@@ -240,7 +252,10 @@ 
 		{
 			$this->read_repository();
 		}
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -289,7 +304,10 @@ 
 	 */
 	function get_specific_rights($location, $appname = '', $memberships=array())
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		if (!count($this->data) && $GLOBALS['egw_info']['server']['acl_default'] != 'deny')
 		{
@@ -353,10 +371,13 @@ 
 		),__LINE__,__FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
+		}
 		return True;
 	}
 
@@ -387,11 +408,17 @@ 
 				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))
+		{
+			// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
-		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
+		}
+		if ($app == '%' || $app == '%%')
+		{
+			unset($where['acl_appname']);
+		}
 
 		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
 
@@ -408,7 +435,10 @@ 
 	 */
 	function get_specific_rights_for_account($account_id,$location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		return $this->db->select(self::TABLE,'acl_rights',array(
 			'acl_location' => $location,
@@ -426,7 +456,10 @@ 
 	 */
 	function get_all_rights($location,$appname='')
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$rights = array();
 		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
@@ -449,7 +482,10 @@ 
 	 */
 	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
 	{
-		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$appname)
+		{
+			$appname = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = array($account_id);
 		if ($use_memberships && (int)$account_id > 0)
@@ -553,7 +589,10 @@ 
 	 */
 	function get_ids_for_location($location, $required, $app = '')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$accounts = false;
 		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
@@ -577,7 +616,10 @@ 
 	 */
 	function get_locations_for_app($app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = false;
 		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
@@ -613,7 +655,10 @@ 
 			$account_id = get_account_id($accountid,$this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
-		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		if ($use_memberships && (int)$account_id > 0)
+		{
+			$memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
+		}
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
@@ -647,15 +692,24 @@ 
 	 */
 	function get_grants($app='',$enum_group_acls=true,$user=null)
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
-		if (!$user) $user = $this->account_id;
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
+		if (!$user)
+		{
+			$user = $this->account_id;
+		}
 
 		static $cache = array();	// some caching withing the request
 
 		$grants =& $cache[$app][$user];
 		if (!isset($grants))
 		{
-			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			if ((int)$user > 0)
+			{
+				$memberships = $GLOBALS['egw']->accounts->memberships($user, true);
+			}
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
@@ -680,7 +734,11 @@ 
 					// return the grant for each member of the group (false = also for no longer active users)
 					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor)
+						{
+							continue;
+						}
+						// can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
@@ -734,7 +792,10 @@ 
 	 */
 	function get_location_grants($location,$app='')
 	{
-		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
+		if (!$app)
+		{
+			$app = $GLOBALS['egw_info']['flags']['currentapp'];
+		}
 
 		$locations = array();
 		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(

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

@@ -32,7 +32,7 @@ 
 	/**
 	 * @var array $data internal repository with acl rows for the given app and account-id (incl. memberships)
 	 */
-	var $data = Array();
+	var $data = array();
 	/**
 	 * internal reference to global db-object
 	 *
@@ -133,7 +133,7 @@ 
 			array_unshift($acl_acc_list,$this->account_id);
 		}
 
-		$this->data = Array();
+		$this->data = array();
 		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
 		{
 			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
@@ -676,7 +676,7 @@ 
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
-			$grants = $accounts = Array();
+			$grants = $accounts = array();
 			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,

Spacing +99 added lines, -99 removed lines

@@ -47,15 +47,15 @@ 
 	/**
 	 * Constants for acl rights, like old EGW_ACL_* defines
 	 */
-	const READ      = 1;	// EGW_ACL_READ
-	const ADD       = 2;	// EGW_ACL_ADD
-	const EDIT      = 4;	// EGW_ACL_EDIT
-	const DELETE    = 8;	// EGW_ACL_DELETE
-	const PRIVAT    = 16;	// EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
-	const GROUPMGRS = 32;	// EGW_ACL_GROUP_MANAGERS
-	const CUSTOM1  = 64;		// EGW_ACL_CUSTOM_1
-	const CUSTOM2  = 128;	// EGW_ACL_CUSTOM_2
-	const CUSTOM3  = 256;	// EGW_ACL_CUSTOM_3
+	const READ      = 1; // EGW_ACL_READ
+	const ADD       = 2; // EGW_ACL_ADD
+	const EDIT      = 4; // EGW_ACL_EDIT
+	const DELETE    = 8; // EGW_ACL_DELETE
+	const PRIVAT    = 16; // EGW_ACL_PRIVATE can NOT use PRIVATE as it is a PHP keyword, using German PRIVAT instead!
+	const GROUPMGRS = 32; // EGW_ACL_GROUP_MANAGERS
+	const CUSTOM1  = 64; // EGW_ACL_CUSTOM_1
+	const CUSTOM2  = 128; // EGW_ACL_CUSTOM_2
+	const CUSTOM3  = 256; // EGW_ACL_CUSTOM_3
 
 	/**
 	 * ACL constructor for setting account id
@@ -78,7 +78,7 @@ 
 		}
 		if ((int)$this->account_id != (int)$account_id)
 		{
-			$this->account_id = get_account_id((int)$account_id,@$GLOBALS['egw_info']['user']['account_id']);
+			$this->account_id = get_account_id((int)$account_id, @$GLOBALS['egw_info']['user']['account_id']);
 		}
 		$this->data = array();
 	}
@@ -91,7 +91,7 @@ 
 	 */
 	function __sleep()
 	{
-		return array('account_id','db');
+		return array('account_id', 'db');
 	}
 
 	/**************************************************************************\
@@ -104,7 +104,7 @@ 
 	 * @param boolean|array $no_groups = false if true, do not use memberships, if array do not use given groups
 	 * @return array along with storing it in $acl->data.  <br>
 	 */
-	function read_repository($no_groups=false)
+	function read_repository($no_groups = false)
 	{
 		// For some reason, calling this via XML-RPC doesn't call the constructor.
 		// Here is yet another work around(tm) (jengo)
@@ -119,14 +119,14 @@ 
 		else
 		{
 			$acl_acc_list = (array)$GLOBALS['egw']->accounts->memberships($this->account_id, true);
-			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list,$no_groups);
-			array_unshift($acl_acc_list,$this->account_id);
+			if (is_array($no_groups)) $acl_acc_list = array_diff($acl_acc_list, $no_groups);
+			array_unshift($acl_acc_list, $this->account_id);
 		}
 
 		$this->data = Array();
-		foreach($this->db->select(self::TABLE,'*',array('acl_account' => $acl_acc_list ),__LINE__,__FILE__) as $row)
+		foreach ($this->db->select(self::TABLE, '*', array('acl_account' => $acl_acc_list), __LINE__, __FILE__) as $row)
 		{
-			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row,'acl_');
+			$this->data[$row['acl_appname'].'-'.$row['acl_location'].'-'.$row['acl_account']] = Db::strip_array_keys($row, 'acl_');
 		}
 		return $this->data;
 	}
@@ -155,15 +155,15 @@ 
 	 * @param int $rights rights
 	 * @return array all ACL records from $this->data.
 	 */
-	function add($appname,$location,$rights)
+	function add($appname, $location, $rights)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$row = array(
 			'appname'  => $appname,
 			'location' => $location,
-			'account'  => (int) $this->account_id,
-			'rights'   => (int) $rights
+			'account'  => (int)$this->account_id,
+			'rights'   => (int)$rights
 		);
 		$this->data[$row['appname'].'-'.$row['location'].'-'.$row['account']] = $row;
 
@@ -177,11 +177,11 @@ 
 	 * @param string/boolean $location location or false for all locations
 	 * @return array all ACL records from $this->data.
 	 */
-	function delete($appname,$location)
+	function delete($appname, $location)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		foreach($this->data as $idx => $value)
+		foreach ($this->data as $idx => $value)
 		{
 			if ($value['appname'] == $appname &&
 				($location === false || $value['location'] == $location) &&
@@ -200,24 +200,24 @@ 
 	 */
 	function save_repository()
 	{
-		$this->db->delete(self::TABLE,array(
+		$this->db->delete(self::TABLE, array(
 			'acl_account' => $this->account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['account'] == $this->account_id)
 			{
-				$this->db->insert(self::TABLE,array(
+				$this->db->insert(self::TABLE, array(
 					'acl_appname'  => $value['appname'],
 					'acl_location' => $value['location'],
 					'acl_account'  => $this->account_id,
 					'acl_rights'   => $value['rights'],
-				),false,__LINE__,__FILE__);
+				), false, __LINE__, __FILE__);
 			}
 		}
 		if ($this->account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -235,7 +235,7 @@ 
 	 * @param string $appname optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return int all rights or'ed together
 	 */
-	function get_rights($location,$appname = '')
+	function get_rights($location, $appname = '')
 	{
 		// For XML-RPC, change this once its working correctly for passing parameters (jengo)
 		if (is_array($location))
@@ -255,7 +255,7 @@ 
 			return True;
 		}
 		$rights = 0;
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname)
 			{
@@ -282,9 +282,9 @@ 
 	 */
 	function check($location, $required, $appname = False)
 	{
-		$rights = $this->get_rights($location,$appname);
+		$rights = $this->get_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**
@@ -295,7 +295,7 @@ 
 	 * @param array $memberships = array() additional account_id, eg. memberships to match beside $this->account_id, default none
 	 * @return int $rights
 	 */
-	function get_specific_rights($location, $appname = '', $memberships=array())
+	function get_specific_rights($location, $appname = '', $memberships = array())
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -305,10 +305,10 @@ 
 		}
 		$rights = 0;
 
-		foreach($this->data as $value)
+		foreach ($this->data as $value)
 		{
 			if ($value['appname'] == $appname &&
-				($value['location'] == $location ||	$value['location'] == 'everywhere') &&
+				($value['location'] == $location || $value['location'] == 'everywhere') &&
 				($value['account'] == $this->account_id || $memberships && in_array($value['account'], $memberships)))
 			{
 				if ($value['rights'] == 0)
@@ -331,9 +331,9 @@ 
 	 */
 	function check_specific($location, $required, $appname = '')
 	{
-		$rights = $this->get_specific_rights($location,$appname);
+		$rights = $this->get_specific_rights($location, $appname);
 
-		return !!($rights & $required);
+		return !!($rights&$required);
 	}
 
 	/**************************************************************************\
@@ -352,16 +352,16 @@ 
 	function add_repository($app, $location, $account_id, $rights)
 	{
 		//echo "<p>self::add_repository('$app','$location',$account_id,$rights);</p>\n";
-		$this->db->insert(self::TABLE,array(
+		$this->db->insert(self::TABLE, array(
 			'acl_rights' => $rights,
-		),array(
+		), array(
 			'acl_appname' => $app,
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__);
+		), __LINE__, __FILE__);
 
 		if ($account_id == $GLOBALS['egw_info']['user']['account_id'] &&
-			method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+			method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
@@ -376,7 +376,7 @@ 
 	 * @param int/boolean $accountid = '' account id, default 0=$this->account_id, or false to delete all entries for $app/$location
 	 * @return int number of rows deleted
 	 */
-	function delete_repository($app, $location, $accountid='')
+	function delete_repository($app, $location, $accountid = '')
 	{
 		static $cache_accountid = array();
 
@@ -386,22 +386,22 @@ 
 		);
 		if ($accountid !== false)
 		{
-			if(isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
+			if (isset($cache_accountid[$accountid]) && $cache_accountid[$accountid])
 			{
 				$where['acl_account'] = $cache_accountid[$accountid];
 			}
 			else
 			{
-				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+				$where['acl_account'] = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 			}
 		}
-		if (method_exists($GLOBALS['egw'],'invalidate_session_cache'))	// egw object in setup is limited
+		if (method_exists($GLOBALS['egw'], 'invalidate_session_cache'))	// egw object in setup is limited
 		{
 			$GLOBALS['egw']->invalidate_session_cache();
 		}
 		if ($app == '%' || $app == '%%') unset($where['acl_appname']);
 
-		$this->db->delete(self::TABLE,$where,__LINE__,__FILE__);
+		$this->db->delete(self::TABLE, $where, __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -414,15 +414,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return int/boolean rights or false if none exist
 	 */
-	function get_specific_rights_for_account($account_id,$location,$appname='')
+	function get_specific_rights_for_account($account_id, $location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
-		return $this->db->select(self::TABLE,'acl_rights',array(
+		return $this->db->select(self::TABLE, 'acl_rights', array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__)->fetchColumn();
+		), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -432,15 +432,15 @@ 
 	 * @param string $appname = '' defaults to current app
 	 * @return array with account => rights pairs
 	 */
-	function get_all_rights($location,$appname='')
+	function get_all_rights($location, $appname = '')
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_account,acl_rights', array(
 			'acl_location' => $location,
 			'acl_appname'  => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_account']] = $row['acl_rights'];
 		}
@@ -455,7 +455,7 @@ 
 	 * @param boolean $use_memberships = true
 	 * @return array with location => rights pairs
 	 */
-	function get_all_location_rights($account_id,$appname='',$use_memberships=true)
+	function get_all_location_rights($account_id, $appname = '', $use_memberships = true)
 	{
 		if (!$appname) $appname = $GLOBALS['egw_info']['flags']['currentapp'];
 
@@ -466,10 +466,10 @@ 
 			$accounts[] = $account_id;
 		}
 		$rights = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_account' => $accounts,
 			'acl_appname' => $appname,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$rights[$row['acl_location']] |= $row['acl_rights'];
 		}
@@ -488,28 +488,28 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		$rights = 0;
 		$apps = false;
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => $location,
 			'acl_account'  => $account_id,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if ($row['acl_rights'] == 0)
 			{
 				return False;
 			}
 			$rights |= $row['acl_rights'];
-			if (!!($rights & $required))
+			if (!!($rights&$required))
 			{
 				$apps[] = $row['acl_appname'];
 			}
@@ -529,21 +529,21 @@ 
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$accountid = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$accountid = $cache_accountid[$accountid] = get_account_id($accountid,$this->account_id);
+			$accountid = $cache_accountid[$accountid] = get_account_id($accountid, $this->account_id);
 		}
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'acl_location,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_rights', array(
 			'acl_appname' => $app,
 			'acl_account' => $accountid,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if ($row['acl_rights'] & $required)
+			if ($row['acl_rights']&$required)
 			{
 				$locations[] = $row['acl_location'];
 			}
@@ -564,14 +564,14 @@ 
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$accounts = false;
-		foreach($this->db->select(self::TABLE,array('acl_account','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights'), array(
 			'acl_appname'  => $app,
 			'acl_location' => $location,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
-			if (!!($row['acl_rights'] & $required))
+			if (!!($row['acl_rights']&$required))
 			{
-				$accounts[] = (int) $row['acl_account'];
+				$accounts[] = (int)$row['acl_account'];
 			}
 		}
 		return $accounts;
@@ -583,14 +583,14 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return boolean/array false if there are no matching location in the db or array of locations
 	 */
-	function get_locations_for_app($app='')
+	function get_locations_for_app($app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = false;
-		foreach($this->db->select(self::TABLE,'DISTINCT '.'acl_location',array(
+		foreach ($this->db->select(self::TABLE, 'DISTINCT '.'acl_location', array(
 			'acl_appname'  => $app,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{
@@ -608,38 +608,38 @@ 
 	 * @param boolean $add_implicit_apps = true true: add apps every user has implicit rights
 	 * @return array containing list of apps
 	 */
-	function get_user_applications($accountid = '', $use_memberships=true, $add_implicit_apps=true)
+	function get_user_applications($accountid = '', $use_memberships = true, $add_implicit_apps = true)
 	{
 		static $cache_accountid = array();
 
-		if(isset($cache_accountid[$accountid]))
+		if (isset($cache_accountid[$accountid]))
 		{
 			$account_id = $cache_accountid[$accountid];
 		}
 		else
 		{
-			$account_id = get_account_id($accountid,$this->account_id);
+			$account_id = get_account_id($accountid, $this->account_id);
 			$cache_accountid[$accountid] = $account_id;
 		}
 		if ($use_memberships && (int)$account_id > 0) $memberships = $GLOBALS['egw']->accounts->memberships($account_id, true);
 		$memberships[] = (int)$account_id;
 
 		$apps = array();
-		foreach($this->db->select(self::TABLE,array('acl_appname','acl_rights'),array(
+		foreach ($this->db->select(self::TABLE, array('acl_appname', 'acl_rights'), array(
 			'acl_location' => 'run',
 			'acl_account'  => $memberships,
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			$app = $row['acl_appname'];
-			if(!isset($apps[$app]))
+			if (!isset($apps[$app]))
 			{
 				$apps[$app] = 0;
 			}
-			$apps[$app] |= (int) $row['acl_rights'];
+			$apps[$app] |= (int)$row['acl_rights'];
 		}
 		if ($add_implicit_apps)
 		{
-			$apps['api'] = 1;	// give everyone implicit rights for the home app
+			$apps['api'] = 1; // give everyone implicit rights for the home app
 		}
 		return $apps;
 	}
@@ -653,29 +653,29 @@ 
 	 * @param int $user = null user whos grants to return, default current user
 	 * @return array with account-ids (of owners) and granted rights as values
 	 */
-	function get_grants($app='',$enum_group_acls=true,$user=null)
+	function get_grants($app = '', $enum_group_acls = true, $user = null)
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 		if (!$user) $user = $this->account_id;
 
-		static $cache = array();	// some caching withing the request
+		static $cache = array(); // some caching withing the request
 
-		$grants =& $cache[$app][$user];
+		$grants = & $cache[$app][$user];
 		if (!isset($grants))
 		{
 			if ((int)$user > 0) $memberships = $GLOBALS['egw']->accounts->memberships($user, true);
 			$memberships[] = $user;
 
 			$grants = $accounts = Array();
-			foreach($this->db->select(self::TABLE,array('acl_account','acl_rights','acl_location'),array(
+			foreach ($this->db->select(self::TABLE, array('acl_account', 'acl_rights', 'acl_location'), array(
 				'acl_appname'  => $app,
 				'acl_location' => $memberships,
-			),__LINE__,__FILE__) as $row)
+			), __LINE__, __FILE__) as $row)
 			{
 				$grantor    = $row['acl_account'];
 				$rights     = $row['acl_rights'];
 
-				if(!isset($grants[$grantor]))
+				if (!isset($grants[$grantor]))
 				{
 					$grants[$grantor] = 0;
 				}
@@ -683,17 +683,17 @@ 
 
 				// if the right is granted from a group and we enummerated group ACL's
 				if ($GLOBALS['egw']->accounts->get_type($grantor) == 'g' && $enum_group_acls &&
-					(!is_array($enum_group_acls) || !in_array($grantor,$enum_group_acls)))
+					(!is_array($enum_group_acls) || !in_array($grantor, $enum_group_acls)))
 				{
 					// return the grant for each member of the group (false = also for no longer active users)
-					foreach((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
+					foreach ((array)$GLOBALS['egw']->accounts->members($grantor, true, false) as $grantor)
 					{
-						if (!$grantor) continue;	// can happen if group has no members
+						if (!$grantor) continue; // can happen if group has no members
 
 						// Don't allow to override private with group ACL's!
 						$rights &= ~self::PRIVAT;
 
-						if(!isset($grants[$grantor]))
+						if (!isset($grants[$grantor]))
 						{
 							$grants[$grantor] = 0;
 						}
@@ -715,21 +715,21 @@ 
 	 */
 	function delete_account($account_id)
 	{
-		if ((int) $account_id)
+		if ((int)$account_id)
 		{
 			// Delete all grants from this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_account' => $account_id
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 			// Delete all grants to this account
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_location' => $account_id
-			),__LINE__, __FILE__);
+			), __LINE__, __FILE__);
 			// delete all memberships in account_id (if it is a group)
-			$this->db->delete(self::TABLE,array(
+			$this->db->delete(self::TABLE, array(
 				'acl_appname' => 'phpgw_group',
 				'acl_location' => $account_id,
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 	}
 
@@ -740,15 +740,15 @@ 
 	 * @param string $app app optional defaults to $GLOBALS['egw_info']['flags']['currentapp'];
 	 * @return array with location => array(account => rights) pairs
 	 */
-	function get_location_grants($location,$app='')
+	function get_location_grants($location, $app = '')
 	{
 		if (!$app) $app = $GLOBALS['egw_info']['flags']['currentapp'];
 
 		$locations = array();
-		foreach($this->db->select(self::TABLE,'acl_location,acl_account,acl_rights',array(
+		foreach ($this->db->select(self::TABLE, 'acl_location,acl_account,acl_rights', array(
 			'acl_appname'  => $app,
 			'acl_location LIKE '.$this->db->quote($location),
-		),__LINE__,__FILE__) as $row)
+		), __LINE__, __FILE__) as $row)
 		{
 			if (($location = $row['acl_location']) != 'run')
 			{

api/src/Asyncservice.php

Doc Comments +3 added lines, -3 removed lines

@@ -324,7 +324,7 @@ 
 	 * cancels a timer
 	 *
 	 * @param string $id has to be the one used to set it.
-	 * @return boolean True if the timer exists and is not expired.
+	 * @return integer True if the timer exists and is not expired.
 	 */
 	function cancel_timer($id)
 	{
@@ -470,7 +470,7 @@ 
 	/**
 	 * reads all matching db-rows / jobs
 	 *
-	 * @param string $id =0 reads all expired rows / jobs ready to run\
+	 * @param integer $id =0 reads all expired rows / jobs ready to run\
 	 * 	!= 0 reads all rows/jobs matching $id (sql-wildcards '%' and '_' can be used)
 	 * @param array|string $cols ='*' string or array of column-names / select-expressions
 	 * @param int|bool $offset =False offset for a limited query or False (default)
@@ -558,7 +558,7 @@ 
 	/**
 	 * delete db-row / job with $id
 	 *
-	 * @return boolean False if $id not found else True
+	 * @return integer False if $id not found else True
 	 */
 	function delete($id)
 	{

Spacing +74 added lines, -76 removed lines

@@ -49,9 +49,9 @@ 
 		{
 			$this->db = $GLOBALS['egw_setup']->db;
 		}
-		$this->cronline = EGW_SERVER_ROOT . '/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
+		$this->cronline = EGW_SERVER_ROOT.'/api/asyncservices.php '.$GLOBALS['egw_info']['user']['domain'];
 
-		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows";	// atm cron-jobs dont work on win
+		$this->only_fallback = substr(php_uname(), 0, 7) == "Windows"; // atm cron-jobs dont work on win
 	}
 
 	/**
@@ -71,10 +71,10 @@ 
 	 * @param boolean $debug =false
 	 * @return boolean False if $id already exists, else True
 	 */
-	function set_timer($times,$id,$method,$data=null,$account_id=False,$debug=false)
+	function set_timer($times, $id, $method, $data = null, $account_id = False, $debug = false)
 	{
 		if (empty($id) || empty($method) || $this->read($id) ||
-				!($next = $this->next_run($times,$debug)))
+				!($next = $this->next_run($times, $debug)))
 		{
 			return False;
 		}
@@ -107,14 +107,14 @@ 
 	 * @param int $now Use this time to calculate then next run from.  Defaults to time().
 	 * @return int a unix timestamp of the next execution time or False if no more executions
 	 */
-	function next_run($times,$debug=False, $now = null)
+	function next_run($times, $debug = False, $now = null)
 	{
 		if ($this->debug)
 		{
-			echo "<p>next_run("; print_r($times); echo ",'$debug', " . date('Y-m-d H:i', $now) . ")</p>\n";
-			$debug = True;	// enable syntax-error messages too
+			echo "<p>next_run("; print_r($times); echo ",'$debug', ".date('Y-m-d H:i', $now).")</p>\n";
+			$debug = True; // enable syntax-error messages too
 		}
-		if(is_null($now)) {
+		if (is_null($now)) {
 			$now = time();
 		}
 
@@ -142,7 +142,7 @@ 
 			'dow'   => 6,
 			'day'   => 31,
 			'month' => 12,
-			'year'  => date('Y')+10	// else */[0-9] would never stop returning numbers
+			'year'  => date('Y') + 10	// else */[0-9] would never stop returning numbers
 		);
 		$min_unit = array(
 			'min'   => 0,
@@ -158,7 +158,7 @@ 
 		// get set to the minimum after
 		//
 		$i = $first_set = $last_set = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$i;
 			if (isset($times[$u]))
@@ -176,24 +176,24 @@ 
 		// (as descript above), enumerations are arrays with unit-values as keys
 		//
 		$n = 0;
-		foreach($units as $u => $date_pattern)
+		foreach ($units as $u => $date_pattern)
 		{
 			++$n;
-			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u])?'True':'False')."</p>\n"; }
+			if ($this->debug) { echo "<p>n=$n, $u: isset(times[$u]="; print_r($times[$u]); echo ")=".(isset($times[$u]) ? 'True' : 'False')."</p>\n"; }
 			if (isset($times[$u]))
 			{
-				if(is_array($times[$u])) {
+				if (is_array($times[$u])) {
 					$time = array_keys($times[$u]);
 				} else {
-					$time = explode(',',$times[$u]);
+					$time = explode(',', $times[$u]);
 				}
 				$times[$u] = array();
 
-				foreach($time as $t)
+				foreach ($time as $t)
 				{
-					if (strpos($t,'-') !== False && strpos($t,'/') === False)
+					if (strpos($t, '-') !== False && strpos($t, '/') === False)
 					{
-						list($min,$max) = $arr = explode('-',$t);
+						list($min, $max) = $arr = explode('-', $t);
 
 						if (count($arr) != 2 || !is_numeric($min) || !is_numeric($max) || $min > $max)
 						{
@@ -210,7 +210,7 @@ 
 					{
 						if ((string)$t == '*') 	$t = '*/1';
 
-						list($one,$inc) = $arr = explode('/',$t);
+						list($one, $inc) = $arr = explode('/', $t);
 
 						if (!(is_numeric($one) && count($arr) == 1 ||
 									count($arr) == 2 && is_numeric($inc)))
@@ -225,7 +225,7 @@ 
 						}
 						else
 						{
-							list($min,$max) = $arr = explode('-',$one);
+							list($min, $max) = $arr = explode('-', $one);
 							if (empty($one) || $one == '*')
 							{
 								$min = $min_unit[$u];
@@ -266,20 +266,19 @@ 
 		{
 			$future = False;
 
-			foreach($units as $u => $date_pattern)
+			foreach ($units as $u => $date_pattern)
 			{
-				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) :
-					(int)date($date_pattern,mktime(12,0,0,$found['month'],$found['day'],$found['year']));
+				$unit_now = $u != 'dow' ? (int)date($date_pattern, $now) : (int)date($date_pattern, mktime(12, 0, 0, $found['month'], $found['day'], $found['year']));
 
 				if (isset($found[$u]))
 				{
 					$future = $future || $found[$u] > $unit_now;
 					if ($this->debug) echo "--> already have a $u = ".$found[$u].", future='$future'<br>\n";
-					continue;	// already set
+					continue; // already set
 				}
-				foreach(array_keys($times[$u]) as $unit_value)
+				foreach (array_keys($times[$u]) as $unit_value)
 				{
-					switch($u)
+					switch ($u)
 					{
 						case 'dow':
 							$valid = $unit_value == $unit_now;
@@ -302,12 +301,12 @@ 
 				if (!isset($found[$u]))		// we have to try the next one, if it exists
 				{
 					$nexts = array_keys($units);
-					if (!isset($nexts[count($found)-1]))
+					if (!isset($nexts[count($found) - 1]))
 					{
 						if ($this->debug) echo "<p>Nothing found, exiting !!!</p>\n";
 						return False;
 					}
-					$next = $nexts[count($found)-1];
+					$next = $nexts[count($found) - 1];
 					$over = $found[$next];
 					unset($found[$next]);
 					if ($this->debug) echo "<p>Have to try the next $next, $u's are over for $next=$over !!!</p>\n";
@@ -317,7 +316,7 @@ 
 		}
 		if ($this->debug) { echo "<p>next="; print_r($found); echo "</p>\n"; }
 
-		return mktime($found['hour'],$found['min'],0,$found['month'],$found['day'],$found['year']);
+		return mktime($found['hour'], $found['min'], 0, $found['month'], $found['day'], $found['year']);
 	}
 
 	/**
@@ -339,7 +338,7 @@ 
 	 * @return mixed if !$set array('start' => $start,'end' => $end) with timestamps of last check_run start and end,  \
 	 * 	!$end means check_run is just running. If $set returns True if it was able to get the semaphore, else False
 	 */
-	function last_check_run($semaphore=False,$release=False,$run_by='')
+	function last_check_run($semaphore = False, $release = False, $run_by = '')
 	{
 		//echo "<p>last_check_run(semaphore=".($semaphore?'True':'False').",release=".($release?'True':'False').")</p>\n";
 		if (($exists = $this->read('##last-check-run##')))
@@ -361,7 +360,7 @@ 
 		}
 		else
 		{
-			@set_time_limit(0);		// dont stop for an execution-time-limit
+			@set_time_limit(0); // dont stop for an execution-time-limit
 			ignore_user_abort(True);
 
 			$last_run = array(
@@ -377,7 +376,7 @@ 
 			);
 			// as the async_next column is used as a semaphore we only update it,
 			// if it is 0 (semaphore released) or older then 10min to recover from failed or crashed attempts
-			if ($exists) $where = array('async_next=0 OR async_next<'.(time()-600));
+			if ($exists) $where = array('async_next=0 OR async_next<'.(time() - 600));
 		}
 		//echo "last_run=<pre>"; print_r($last_run); echo "</pre>\n";
 		return $this->write($last_run, !!$exists, $where) > 0;
@@ -386,20 +385,20 @@ 
 	/**
 	 * checks if there are any jobs ready to run (timer expired) and executes them
 	 */
-	function check_run($run_by='')
+	function check_run($run_by = '')
 	{
 		if ($run_by === 'fallback') flush();
 
-		if (!$this->last_check_run(True,False,$run_by))
+		if (!$this->last_check_run(True, False, $run_by))
 		{
-			return False;	// cant obtain semaphore
+			return False; // cant obtain semaphore
 		}
 		// mark enviroment as async-service, check with isset()!
 		$GLOBALS['egw_info']['flags']['async-service'] = $run_by;
 
 		if (($jobs = $this->read()))
 		{
-			foreach($jobs as $job)
+			foreach ($jobs as $job)
 			{
 				// checking / setting up egw_info/user
 				//
@@ -408,7 +407,7 @@ 
 					// run notifications, before changing account_id of enviroment
 					Link::run_notifies();
 					// unset all objects in $GLOBALS, which are created and used by ExecMethod, as they can contain user-data
-					foreach($GLOBALS as $name => $value)
+					foreach ($GLOBALS as $name => $value)
 					{
 						if ($name !== 'egw' && is_object($value)) unset($GLOBALS[$name]);
 					}
@@ -420,7 +419,7 @@ 
 					{
 						$GLOBALS['egw']->session->account_lid = $GLOBALS['egw']->accounts->id2name($job['account_id']);
 						$GLOBALS['egw']->session->account_domain = $domain;
-						$GLOBALS['egw_info']['user']  = $GLOBALS['egw']->session->read_repositories();
+						$GLOBALS['egw_info']['user'] = $GLOBALS['egw']->session->read_repositories();
 
 						if ($lang != $GLOBALS['egw_info']['user']['preferences']['common']['lang'])
 						{
@@ -435,12 +434,11 @@ 
 						$GLOBALS['egw_info']['user']['domain'] = $domain;
 					}
 				}
-				list($app) = strpos($job['method'],'::') !== false ? explode('_',$job['method']) :
-					explode('.',$job['method']);
+				list($app) = strpos($job['method'], '::') !== false ? explode('_', $job['method']) : explode('.', $job['method']);
 				Translation::add_app($app);
 				if (is_array($job['data']))
 				{
-					$job['data'] += array_diff_key($job,array('data' => false));
+					$job['data'] += array_diff_key($job, array('data' => false));
 				}
 				// update job before running it, to cope with jobs taking longer then async-frequency
 				if (($job['next'] = $this->next_run($job['times'])))
@@ -453,16 +451,16 @@ 
 				}
 				try
 				{
-					ExecMethod($job['method'],$job['data']);
+					ExecMethod($job['method'], $job['data']);
 				}
-				catch(Exception $e)
+				catch (Exception $e)
 				{
 					// log the exception to error_log, but continue running other async jobs
 					_egw_log_exception($e);
 				}
 			}
 		}
-		$this->last_check_run(True,True,$run_by);	// release semaphore
+		$this->last_check_run(True, True, $run_by); // release semaphore
 
 		return $jobs ? count($jobs) : 0;
 	}
@@ -478,7 +476,7 @@ 
 	 * @param int $num_rows =0 number of rows to return if offset set, default 0 = use default in user prefs
 	 * @return array/boolean db-rows / jobs as array or False if no matches
 	 */
-	function read($id=0,$cols='*',$offset=False,$append='ORDER BY async_next',$num_rows=0)
+	function read($id = 0, $cols = '*', $offset = False, $append = 'ORDER BY async_next', $num_rows = 0)
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return false;
 
@@ -486,7 +484,7 @@ 
 		{
 			$where = "async_id != '##last-check-run##'";
 		}
-		elseif (!is_array($id) && (strpos($id,'%') !== False || strpos($id,'_') !== False))
+		elseif (!is_array($id) && (strpos($id, '%') !== False || strpos($id, '_') !== False))
 		{
 			$id = $this->db->quote($id);
 			$where = "async_id LIKE $id AND async_id != '##last-check-run##'";
@@ -500,21 +498,21 @@ 
 			$where = array('async_id' => $id);
 		}
 		$jobs = array();
-		foreach($this->db->select($this->db_table,$cols,$where,__LINE__,__FILE__,$offset,$append,False,$num_rows) as $row)
+		foreach ($this->db->select($this->db_table, $cols, $where, __LINE__, __FILE__, $offset, $append, False, $num_rows) as $row)
 		{
 			$row['async_times'] = json_php_unserialize($row['async_times']);
 			// check for broken value during migration
 			if ($row['async_data'][0] == '"' && substr($row['async_data'], 0, 7) == '"\\"\\\\\\"')
 			{
 				$row['async_data'] = null;
-				$this->write(Db::strip_array_keys($row,'async_'), true);
+				$this->write(Db::strip_array_keys($row, 'async_'), true);
 			}
 			else
 			{
 				$row['async_data'] = !empty($row['async_data']) ?
-					json_php_unserialize($row['async_data'], true) : null;	// allow non-serialized data
+					json_php_unserialize($row['async_data'], true) : null; // allow non-serialized data
 			}
-			$jobs[$row['async_id']] = Db::strip_array_keys($row,'async_');
+			$jobs[$row['async_id']] = Db::strip_array_keys($row, 'async_');
 		}
 		if (!count($jobs))
 		{
@@ -531,7 +529,7 @@ 
 	 * @param array $where additional where statemetn to update only if a certain condition is met, used for the semaphore
 	 * @return int affected rows, can be 0 if an additional where statement is given
 	 */
-	function write($job, $exists = False, $where=array())
+	function write($job, $exists = False, $where = array())
 	{
 		if (!is_a($this->db, 'EGroupware\\Api\\Db')) return 0;
 
@@ -562,7 +560,7 @@ 
 	 */
 	function delete($id)
 	{
-		$this->db->delete($this->db_table,array('async_id' => $id),__LINE__,__FILE__);
+		$this->db->delete($this->db_table, array('async_id' => $id), __LINE__, __FILE__);
 
 		return $this->db->affected_rows();
 	}
@@ -587,38 +585,38 @@ 
 		{
 			$binarys = array(
 				'php'  => '/usr/bin/php',
-				'php5' => '/usr/bin/php5',		// SuSE 9.3 with php5
+				'php5' => '/usr/bin/php5', // SuSE 9.3 with php5
 				'crontab' => '/usr/bin/crontab'
 			);
 			foreach ($binarys as $name => $path)
 			{
-				$this->$name = $path;	// a reasonable default for *nix
+				$this->$name = $path; // a reasonable default for *nix
 
 				if (!($Ok = @is_executable($this->$name)))
 				{
 					if (file_exists($this->$name))
 					{
-						echo '<p>'.lang('%1 is not executable by the webserver !!!',$this->$name)."</p>\n";
+						echo '<p>'.lang('%1 is not executable by the webserver !!!', $this->$name)."</p>\n";
 						$perms = fileperms($this->$name);
-						if (!($perms & 0x0001) && ($perms & 0x0008) && function_exists('posix_getuid'))	// only executable by group
+						if (!($perms&0x0001) && ($perms&0x0008) && function_exists('posix_getuid'))	// only executable by group
 						{
 							$group = posix_getgrgid(filegroup($this->$name));
-							$webserver = posix_getpwuid(posix_getuid ());
-							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.",$webserver['name'],$group['name'])."</p>\n";							}
+							$webserver = posix_getpwuid(posix_getuid());
+							echo '<p>'.lang("You need to add the webserver user '%1' to the group '%2'.", $webserver['name'], $group['name'])."</p>\n"; }
 					}
-					if (($fd = popen('/bin/sh -c "type -p '.$name.'"','r')))
+					if (($fd = popen('/bin/sh -c "type -p '.$name.'"', 'r')))
 					{
-						$this->$name = fgets($fd,256);
+						$this->$name = fgets($fd, 256);
 						@pclose($fd);
 					}
-					if (($pos = strpos($this->$name,"\n")))
+					if (($pos = strpos($this->$name, "\n")))
 					{
-						$this->$name = substr($this->$name,0,$pos);
+						$this->$name = substr($this->$name, 0, $pos);
 					}
 				}
 				if (!$Ok && !@is_executable($this->$name))
 				{
-					$this->$name = $name;	// hopefully its in the path
+					$this->$name = $name; // hopefully its in the path
 				}
 				//echo "<p>$name = '".$this->$name."'</p>\n";
 			}
@@ -649,15 +647,15 @@ 
 		}
 		$times = False;
 		$this->other_cronlines = array();
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1','r')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -l" 2>&1', 'r')) !== False)
 		{
 			$n = 0;
-			while ($line = fgets($crontab,256))
+			while ($line = fgets($crontab, 256))
 			{
 				if ($this->debug) echo 'line '.++$n.": $line<br>\n";
-				$parts = explode(' ',$line,6);
+				$parts = explode(' ', $line, 6);
 
-				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5],0,3) != 'php'))
+				if ($line{0} == '#' || count($parts) < 6 || ($parts[5]{0} != '/' && substr($parts[5], 0, 3) != 'php'))
 				{
 					// ignore comments
 					if ($line{0} != '#')
@@ -665,12 +663,12 @@ 
 						$times['error'] .= $line;
 					}
 				}
-				elseif (strpos($line,$this->cronline) !== False ||
+				elseif (strpos($line, $this->cronline) !== False ||
 					// also check of old phpgwapi/cron path
 					strpos($line, str_replace('/api/', '/phpgwapi/cron/', $this->cronline)) !== False)
 				{
-					$cron_units = array('min','hour','day','month','dow');
-					foreach($cron_units as $n => $u)
+					$cron_units = array('min', 'hour', 'day', 'month', 'dow');
+					foreach ($cron_units as $n => $u)
 					{
 						$times[$u] = $parts[$n];
 					}
@@ -701,29 +699,29 @@ 
 		if ($this->only_fallback && $times !== False) {
 			return 0;
 		}
-		$this->installed();	// find other installed cronlines
+		$this->installed(); // find other installed cronlines
 
-		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1','w')) !== False)
+		if (($crontab = popen('/bin/sh -c "'.$this->crontab.' -" 2>&1', 'w')) !== False)
 		{
 			if (is_array($this->other_cronlines))
 			{
 				foreach ($this->other_cronlines as $cronline)
 				{
-					fwrite($crontab,$cronline);		// preserv the other lines on install
+					fwrite($crontab, $cronline); // preserv the other lines on install
 				}
 			}
 			if ($times !== False)
 			{
-				$cron_units = array('min','hour','day','month','dow');
+				$cron_units = array('min', 'hour', 'day', 'month', 'dow');
 				$cronline = '';
-				foreach($cron_units as $cu)
+				foreach ($cron_units as $cu)
 				{
-					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*') . ' ';
+					$cronline .= (isset($times[$cu]) ? $times[$cu] : '*').' ';
 				}
 				// -d memory_limit=-1 --> no memory limit
 				$cronline .= $this->php.' -q -d memory_limit=-1 '.$this->cronline."\n";
 				//echo "<p>Installing: '$cronline'</p>\n";
-				fwrite($crontab,$cronline);
+				fwrite($crontab, $cronline);
 			}
 			@pclose($crontab);
 		}

Braces +98 added lines, -28 removed lines

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