EGroupware / egroupware

admin/inc/class.admin_export_users_csv.inc.php

Spacing +6 added lines, -6 removed lines

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

Doc Comments +2 added lines, -2 removed lines

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

Indentation +2 added lines, -2 removed lines

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

Braces +34 added lines, -14 removed lines

@@ -21,13 +21,15 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$query = array(
 			'type'	=>	'accounts',
 		);
-		if($options['selection']['group_id']) {
+		if($options['selection']['group_id'])
+		{
 			$query['type'] = (int)$options['selection']['group_id'];
 		}
 		$selection = $GLOBALS['egw']->accounts->search($query);
@@ -41,16 +43,28 @@ 
 		);
 
 		// $_record is an array, that's what search() returns
-		foreach ($selection as $_record) {
+		foreach ($selection as $_record)
+		{
 			$record = new admin_egw_user_record($_record);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				$never_expires = ($record->account_expires == -1);
 				importexport_export_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
-				if($never_expires) $record->account_expires = 'never';  // Has to be 'never' for admin_cmd_edit_user to parse it
-			} else {
+				if($never_expires)
+				{
+					$record->account_expires = 'never';
+				}
+				// Has to be 'never' for admin_cmd_edit_user to parse it
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -63,7 +77,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('User CSV export');
 	}
 
@@ -72,7 +87,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports users into a CSV File. ");
 	}
 
@@ -81,11 +97,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';
         }
 
@@ -95,7 +113,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -103,7 +122,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'admin.export_users_csv_selectors',
 			'preserv' => array('no_error_for_all'),

admin/inc/class.admin_import_groups_csv.inc.php

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

Doc Comments +1 added lines, -2 removed lines

@@ -104,8 +104,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(

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_passwordreset.inc.php

Spacing +31 added lines, -32 removed lines

@@ -10,7 +10,7 @@ 
  * @version $Id$
  */
 
-include_once(EGW_INCLUDE_ROOT.'/setup/inc/hook_config.inc.php');	// functions to return password hashes
+include_once(EGW_INCLUDE_ROOT.'/setup/inc/hook_config.inc.php'); // functions to return password hashes
 
 use EGroupware\Api;
 
@@ -47,7 +47,7 @@ 
 	 */
 	function __construct()
 	{
-		if($GLOBALS['egw']->acl->check('account_access',16,'admin'))
+		if ($GLOBALS['egw']->acl->check('account_access', 16, 'admin'))
 		{
 			$GLOBALS['egw']->redirect_link('/index.php');
 		}
@@ -59,7 +59,7 @@ 
 	 * @param array $content =null
 	 * @param string $msg =''
 	 */
-	function index(array $content=null, $msg='')
+	function index(array $content = null, $msg = '')
 	{
 		if (!($account_repository = $GLOBALS['egw_info']['server']['account_repository']) &&
 			!($account_repository = $GLOBALS['egw_info']['server']['auth_type']))
@@ -76,7 +76,7 @@ 
 			{
 				Api\Header\Content::type('changed.csv', 'text/csv');
 				//echo "account_lid;account_password;account_email;account_firstname;account_lastname\n";
-				foreach($content['changed'] as $account)
+				foreach ($content['changed'] as $account)
 				{
 					echo "$account[account_lid];$account[account_password];$account[account_email];$account[account_firstname];$account[account_lastname]\n";
 				}
@@ -93,7 +93,7 @@ 
 			{
 				$msg = lang('You need to select as least one action!');
 			}
-			elseif(!$content['random_pw'] && $content['hash'] && $content['hash'] != $current_hash && $current_hash != 'plain')
+			elseif (!$content['random_pw'] && $content['hash'] && $content['hash'] != $current_hash && $current_hash != 'plain')
 			{
 				$msg = lang('You can only change the hash, if you set a random password or currently use plaintext passwords!');
 			}
@@ -101,14 +101,14 @@ 
 			{
 				if ($content['hash'] && $content['hash'] != $current_hash)
 				{
-					Api\Config::save_value($account_repository.'_encryption_type',$content['hash'],'phpgwapi');
-					$msg = lang('Changed password hash for %1 to %2.',strtoupper($account_repository),$content['hash'])."\n";
+					Api\Config::save_value($account_repository.'_encryption_type', $content['hash'], 'phpgwapi');
+					$msg = lang('Changed password hash for %1 to %2.', strtoupper($account_repository), $content['hash'])."\n";
 					$GLOBALS['egw_info']['server'][$account_repository.'_encryption_type'] = $content['hash'];
 				}
 				$change_pw = $content['random_pw'] || $content['hash'] && $content['hash'] != $current_hash;
 				$changed = array();
 				$emailadmin = null;
-				foreach($content['users'] as $account_id)
+				foreach ($content['users'] as $account_id)
 				{
 					if (($account = $GLOBALS['egw']->accounts->read($account_id)))
 					{
@@ -118,20 +118,20 @@ 
 							$password = Api\Auth::randomstring(8);
 							$old_password = null;
 						}
-						elseif ($change_pw && !preg_match('/^{plain}/i',$account['account_pwd']) &&
+						elseif ($change_pw && !preg_match('/^{plain}/i', $account['account_pwd']) &&
 							($current_hash != 'plain' || $current_hash == 'plain' && $account['account_pwd'][0] == '{'))
 						{
-							$msg .= lang('Account "%1" has NO plaintext password!',$account['account_lid'])."\n";
+							$msg .= lang('Account "%1" has NO plaintext password!', $account['account_lid'])."\n";
 							continue;
 						}
 						else
 						{
-							$old_password = $password = preg_replace('/^{plain}/i','',$account['account_pwd']);
+							$old_password = $password = preg_replace('/^{plain}/i', '', $account['account_pwd']);
 						}
 						// change password, if requested
-						if ($change_pw && !$GLOBALS['egw']->auth->change_password($old_password,$password,$account_id))
+						if ($change_pw && !$GLOBALS['egw']->auth->change_password($old_password, $password, $account_id))
 						{
-							$msg .= lang('Failed to change password for account "%1"!',$account['account_lid'])."\n";
+							$msg .= lang('Failed to change password for account "%1"!', $account['account_lid'])."\n";
 							continue;
 						}
 						// force password change on next login
@@ -143,13 +143,13 @@ 
 						// allow or forbid to change password, if requested
 						if ((string)$content['changepassword'] !== '')
 						{
-							if(!$content['changepassword'])
+							if (!$content['changepassword'])
 							{
-								$GLOBALS['egw']->acl->add_repository('preferences','nopasswordchange',$account_id,1);
+								$GLOBALS['egw']->acl->add_repository('preferences', 'nopasswordchange', $account_id, 1);
 							}
 							else
 							{
-								$GLOBALS['egw']->acl->delete_repository('preferences','nopasswordchange',$account_id);
+								$GLOBALS['egw']->acl->delete_repository('preferences', 'nopasswordchange', $account_id);
 							}
 						}
 						$account['account_password'] = $password;
@@ -166,7 +166,7 @@ 
 									break;
 								}
 							}
-							if (($userData = $emailadmin->getUserData ($account_id)))
+							if (($userData = $emailadmin->getUserData($account_id)))
 							{
 								if ((string)$content['mail']['activate'] !== '')
 								{
@@ -180,7 +180,7 @@ 
 								{
 									$userData['mailLocalAddress'] = preg_replace('/@'.preg_quote($emailadmin->acc_domain).'$/', '@'.$content['mail']['domain'], $userData['mailLocalAddress']);
 
-									foreach($userData['mailAlternateAddress'] as &$alias)
+									foreach ($userData['mailAlternateAddress'] as &$alias)
 									{
 										$alias = preg_replace('/@'.preg_quote($emailadmin->acc_domain).'$/', '@'.$content['mail']['domain'], $alias);
 									}
@@ -197,20 +197,20 @@ 
 
 						if ($content['notify'])
 						{
-							if (strpos($account['account_email'],'@') === false)
+							if (strpos($account['account_email'], '@') === false)
 							{
-								$msg .= lang('Account "%1" has no email address --> not notified!',$account['account_lid']);
+								$msg .= lang('Account "%1" has no email address --> not notified!', $account['account_lid']);
 								continue;
 							}
 							$send = new send();
-							$send->AddAddress($account['account_email'],$account['account_fullname']);
+							$send->AddAddress($account['account_email'], $account['account_fullname']);
 							$replacements = array();
-							foreach($this->replacements as $name => $label)
+							foreach ($this->replacements as $name => $label)
 							{
 								$replacements['$$'.$name.'$$'] = $account['account_'.$name];
 							}
-							$send->Subject = strtr($content['subject'],$replacements);
-							$send->Body = strtr($content['body'],$replacements);
+							$send->Subject = strtr($content['subject'], $replacements);
+							$send->Body = strtr($content['body'], $replacements);
 							if (!empty($GLOBALS['egw_info']['user']['account_email']))
 							{
 								$send->From = $GLOBALS['egw_info']['user']['account_email'];
@@ -223,15 +223,15 @@ 
 							catch (Exception $e)
 							{
 								unset ($e);
-								$msg .= lang('Notifying account "%1" %2 failed!',$account['account_lid'],$account['account_email']).
-									': '.strip_tags(str_replace('<p>',"\n",$send->ErrorInfo))."\n";
+								$msg .= lang('Notifying account "%1" %2 failed!', $account['account_lid'], $account['account_email']).
+									': '.strip_tags(str_replace('<p>', "\n", $send->ErrorInfo))."\n";
 							}
 						}
 					}
 				}
 				if ($changed)
 				{
-					$msg .= lang('Passwords and/or attributes of %1 accounts changed',count($changed));
+					$msg .= lang('Passwords and/or attributes of %1 accounts changed', count($changed));
 				}
 			}
 		}
@@ -239,12 +239,11 @@ 
 		$content['account_repository'] = $account_repository;
 		$content['current_hash'] = $content['hash'] ? $content['hash'] : $current_hash;
 		$sel_options['hash'] = $account_repository == 'sql' ?
-			sql_passwdhashes($GLOBALS['egw_info']['server'],true) :
-			passwdhashes($GLOBALS['egw_info']['server'],true);
-		$sel_options['activate'] = array('Deactivate','Activate');
+			sql_passwdhashes($GLOBALS['egw_info']['server'], true) : passwdhashes($GLOBALS['egw_info']['server'], true);
+		$sel_options['activate'] = array('Deactivate', 'Activate');
 
 		$content['replacements'] = array();
-		foreach($this->replacements as $name => $label)
+		foreach ($this->replacements as $name => $label)
 		{
 			$content['replacements'][] = array(
 				'name'  => '$$'.$name.'$$',
@@ -256,7 +255,7 @@ 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Bulk password reset');
 
 		$tmpl = new Api\Etemplate('admin.passwordreset');
-		$tmpl->exec('admin.admin_passwordreset.index',$content,$sel_options,$readonlys,array(
+		$tmpl->exec('admin.admin_passwordreset.index', $content, $sel_options, $readonlys, array(
 			'changed' => $changed,
 		));
 	}

admin/inc/class.admin_wizard_import_users_csv.inc.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" ;
+		$content['msg'] .= "\n*";
 		
 		return $result;
 	}

admin/phpinfo.php

Spacing +1 added lines, -1 removed lines

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

logout.php

Spacing +8 added lines, -8 removed lines

@@ -28,34 +28,34 @@
 
 $verified = $GLOBALS['egw']->session->verify();
 
-if(!($redirectTarget = Api\Cache::getSession('login', 'referer')))
+if (!($redirectTarget = Api\Cache::getSession('login', 'referer')))
 {
 	$redirectTarget = $GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1&domain='.$GLOBALS['egw_info']['user']['domain'];
 }
-elseif(strpos($redirectTarget, '[?&]cd=') !== false)
+elseif (strpos($redirectTarget, '[?&]cd=') !== false)
 {
 	$redirectTarget = preg_replace('/([?&])cd=[^&]+/', '$1cd=1', $redirectTarget);
 }
 
-if($verified)
+if ($verified)
 {
 	Api\Hooks::process('logout');
-	$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'],$GLOBALS['kp3']);
+	$GLOBALS['egw']->session->destroy($GLOBALS['sessionid'], $GLOBALS['kp3']);
 }
 
-Api\Session::egw_setcookie('eGW_remember','',0,'/');
+Api\Session::egw_setcookie('eGW_remember', '', 0, '/');
 Api\Session::egw_setcookie('sessionid');
 Api\Session::egw_setcookie('kp3');
 Api\Session::egw_setcookie('domain');
 
-if($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
+if ($GLOBALS['egw_info']['server']['auth_type'] == 'cas')
 {
 	require_once('CAS/CAS.php');
 
 	phpCAS::client(CAS_VERSION_2_0,
 								$GLOBALS['egw_info']['server']['cas_server_host_name'],
-								(int) $GLOBALS['egw_info']['server']['cas_server_port'],
-								$GLOBALS['egw_info']['server']['cas_server_uri'] );
+								(int)$GLOBALS['egw_info']['server']['cas_server_port'],
+								$GLOBALS['egw_info']['server']['cas_server_uri']);
 	phpCAS::logout(array('url'=>$GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=1&domain='.$GLOBALS['egw_info']['user']['domain']));
 }
 

share.php

Spacing +3 added lines, -3 removed lines

@@ -18,10 +18,10 @@ 
 	'flags' => array(
 		'disable_Template_class' => true,
 		'noheader'  => true,
-		'nonavbar' => 'always',	// true would cause eTemplate to reset it to false for non-popups!
+		'nonavbar' => 'always', // true would cause eTemplate to reset it to false for non-popups!
 		'currentapp' => 'filemanager',
 		'autocreate_session_callback' => 'EGroupware\\Api\\Vfs\\Sharing::create_session',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
 	)
 );
 
@@ -29,6 +29,6 @@ 
 
 if (!$GLOBALS['egw']->sharing)
 {
-	Sharing::create_session(true);	// true = mount into existing session
+	Sharing::create_session(true); // true = mount into existing session
 }
 $GLOBALS['egw']->sharing->ServeRequest();

files/webdav.php

Spacing +6 added lines, -6 removed lines

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

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

timesheet/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
 $setup_info[TIMESHEET_APP]['version']   = '16.1';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
-$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
+$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet', 'egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
 $setup_info[TIMESHEET_APP]['index']     = 'timesheet.timesheet_ui.index&ajax=true';
 
@@ -28,7 +28,7 @@ 
 	'name'  => 'Ralf Becker',
 	'email' => 'RalfBecker@outdoor-training.de'
 );
-$setup_info[TIMESHEET_APP]['license']  = 'GPL';
+$setup_info[TIMESHEET_APP]['license'] = 'GPL';
 $setup_info[TIMESHEET_APP]['description'] =
 'Tracking times and other activities for the Projectmanager.';
 $setup_info[TIMESHEET_APP]['note'] =

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

@@ -38,7 +38,7 @@
 
 $setup_info['resources']['depends'][]	= array(
 	 'appname' => 'api',
-	 'versions' => Array('16.1')
+	 'versions' => array('16.1')
 );