EGroupware / egroupware

admin/setup/tables_current.inc.php

Spacing +24 added lines, -24 removed lines

@@ -15,37 +15,37 @@
 $phpgw_baseline = array(
 	'egw_admin_queue' => array(
 		'fd' => array(
-			'cmd_id' => array('type' => 'auto','nullable' => False),
-			'cmd_uid' => array('type' => 'ascii','precision' => '64','nullable' => False),
-			'cmd_creator' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False),
-			'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'cmd_created' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False),
-			'cmd_type' => array('type' => 'ascii','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
-			'cmd_status' => array('type' => 'int','precision' => '1'),
-			'cmd_scheduled' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'cmd_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8'),
-			'cmd_modifier' => array('type' => 'int','meta' => 'user','precision' => '4'),
-			'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_error' => array('type' => 'varchar','precision' => '255'),
-			'cmd_errno' => array('type' => 'int','precision' => '4'),
-			'cmd_requested' => array('type' => 'int','precision' => '4'),
-			'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_comment' => array('type' => 'varchar','precision' => '255'),
-			'cmd_data' => array('type' => 'ascii','precision' => '16384'),
-			'remote_id' => array('type' => 'int','precision' => '4')
+			'cmd_id' => array('type' => 'auto', 'nullable' => False),
+			'cmd_uid' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False),
+			'cmd_creator' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False),
+			'cmd_creator_email' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'cmd_created' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False),
+			'cmd_type' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False, 'default' => 'admin_cmd'),
+			'cmd_status' => array('type' => 'int', 'precision' => '1'),
+			'cmd_scheduled' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'cmd_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8'),
+			'cmd_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4'),
+			'cmd_modifier_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_error' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_errno' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_comment' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_data' => array('type' => 'ascii', 'precision' => '16384'),
+			'remote_id' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cmd_id'),
 		'fk' => array(),
-		'ix' => array('cmd_status','cmd_scheduled'),
+		'ix' => array('cmd_status', 'cmd_scheduled'),
 		'uc' => array('cmd_uid')
 	),
 	'egw_admin_remote' => array(
 		'fd' => array(
-			'remote_id' => array('type' => 'auto','nullable' => False),
-			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'remote_hash' => array('type' => 'ascii','precision' => '32','nullable' => False),
-			'remote_url' => array('type' => 'ascii','precision' => '128','nullable' => False),
-			'remote_domain' => array('type' => 'ascii','precision' => '64','nullable' => False)
+			'remote_id' => array('type' => 'auto', 'nullable' => False),
+			'remote_name' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False),
+			'remote_hash' => array('type' => 'ascii', 'precision' => '32', 'nullable' => False),
+			'remote_url' => array('type' => 'ascii', 'precision' => '128', 'nullable' => False),
+			'remote_domain' => array('type' => 'ascii', 'precision' => '64', 'nullable' => False)
 		),
 		'pk' => array('remote_id'),
 		'fk' => array(),

admin/setup/tables_update.inc.php

Spacing +30 added lines, -30 removed lines

@@ -20,29 +20,29 @@ 
 
 function admin_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_queue',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_queue', array(
 		'fd' => array(
 			'cmd_id' => array('type' => 'auto'),
-			'cmd_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cmd_creator' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cmd_creator_email' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'cmd_created' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cmd_type' => array('type' => 'varchar','precision' => '32','nullable' => False,'default' => 'admin_cmd'),
-			'cmd_status' => array('type' => 'int','precision' => '1'),
-			'cmd_scheduled' => array('type' => 'int','precision' => '8'),
-			'cmd_modified' => array('type' => 'int','precision' => '8'),
-			'cmd_modifier' => array('type' => 'int','precision' => '4'),
-			'cmd_modifier_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_error' => array('type' => 'varchar','precision' => '255'),
-			'cmd_errno' => array('type' => 'int','precision' => '4'),
-			'cmd_requested' => array('type' => 'int','precision' => '4'),
-			'cmd_requested_email' => array('type' => 'varchar','precision' => '128'),
-			'cmd_comment' => array('type' => 'varchar','precision' => '255'),
+			'cmd_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cmd_creator' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cmd_creator_email' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'cmd_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cmd_type' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False, 'default' => 'admin_cmd'),
+			'cmd_status' => array('type' => 'int', 'precision' => '1'),
+			'cmd_scheduled' => array('type' => 'int', 'precision' => '8'),
+			'cmd_modified' => array('type' => 'int', 'precision' => '8'),
+			'cmd_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cmd_modifier_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_error' => array('type' => 'varchar', 'precision' => '255'),
+			'cmd_errno' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested' => array('type' => 'int', 'precision' => '4'),
+			'cmd_requested_email' => array('type' => 'varchar', 'precision' => '128'),
+			'cmd_comment' => array('type' => 'varchar', 'precision' => '255'),
 			'cmd_data' => array('type' => 'blob')
 		),
 		'pk' => array('cmd_id'),
 		'fk' => array(),
-		'ix' => array('cmd_status','cmd_scheduled'),
+		'ix' => array('cmd_status', 'cmd_scheduled'),
 		'uc' => array('cmd_uid')
 	));
 	return $GLOBALS['setup_info']['admin']['currentver'] = '1.5.001';
@@ -51,13 +51,13 @@ 
 
 function admin_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_remote',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_admin_remote', array(
 		'fd' => array(
 			'remote_id' => array('type' => 'auto'),
-			'remote_name' => array('type' => 'varchar','precision' => '64','nullable' => False),
-			'remote_hash' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'remote_url' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'remote_domain' => array('type' => 'varchar','precision' => '64','nullable' => False)
+			'remote_name' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False),
+			'remote_hash' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'remote_url' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'remote_domain' => array('type' => 'varchar', 'precision' => '64', 'nullable' => False)
 		),
 		'pk' => array('remote_id'),
 		'fk' => array(),
@@ -71,7 +71,7 @@ 
 
 function admin_upgrade1_5_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_admin_queue','remote_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_admin_queue', 'remote_id', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -110,18 +110,18 @@ 
 
 function admin_upgrade14_1()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue','cmd_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue', 'cmd_uid', array(
 		'type' => 'ascii',
 		'precision' => '64',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue','cmd_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue', 'cmd_type', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'nullable' => False,
 		'default' => 'admin_cmd'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue','cmd_data',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_queue', 'cmd_data', array(
 		'type' => 'ascii',
 		'precision' => '16384'
 	));
@@ -132,17 +132,17 @@ 
 
 function admin_upgrade14_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote','remote_hash',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote', 'remote_hash', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote','remote_url',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote', 'remote_url', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote','remote_domain',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_admin_remote', 'remote_domain', array(
 		'type' => 'ascii',
 		'precision' => '64',
 		'nullable' => False
@@ -161,7 +161,7 @@ 
 	// asuming everythings not MySQL uses PostgreSQL regular expression syntax
 	$regexp = substr($GLOBALS['egw_setup']->db->Type, 0, 5) == 'mysql' ? 'REGEXP' : '~*';
 
-	foreach($GLOBALS['egw_setup']->db->select('egw_admin_queue', 'cmd_id,cmd_data',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_admin_queue', 'cmd_id,cmd_data',
 		'cmd_status NOT IN ('.implode(',', admin_cmd::$require_pw_stati).") AND cmd_data $regexp '(pw|passwd\\_?\\d*|password|db\\_pass)\\?\"'",
 		__LINE__, __FILE__, false, '', 'admin') as $row)
 	{

admin/inc/class.admin_cmd_change_pw.inc.php

Spacing +6 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string|int|array $account account name or id, or array with all parameters
 	 * @param string $password =null password
 	 */
-	function __construct($account,$password=null)
+	function __construct($account, $password = null)
 	{
 		if (!is_array($account))
 		{
@@ -44,11 +44,11 @@ 
 	 * @throws Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Api\Exception\WrongUserinput(lang('Error changing the password for %1 !!!',$this->account),99);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		$account_id = admin_cmd::parse_account($this->account,true);	// true = user, no group
+		$account_id = admin_cmd::parse_account($this->account, true); // true = user, no group
 		// check creator is still admin and not explicitly forbidden to edit Api\Accounts
-		if ($this->creator) $this->_check_admin('account_access',16);
+		if ($this->creator) $this->_check_admin('account_access', 16);
 
 		if ($check_only) return true;
 
@@ -57,7 +57,7 @@ 
 		if (!$auth->change_password(null, $this->password, $account_id))
 		{
 			// as long as the Api\Auth class is not throwing itself ...
-			throw new Exception(lang('Error changing the password for %1 !!!',$this->account),99);
+			throw new Exception(lang('Error changing the password for %1 !!!', $this->account), 99);
 		}
 		return lang('Password updated');
 	}
@@ -69,6 +69,6 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('change password for %1',admin_cmd::display_account($this->account));
+		return lang('change password for %1', admin_cmd::display_account($this->account));
 	}
 }

Braces +8 added lines, -2 removed lines

@@ -48,9 +48,15 @@
 	{
 		$account_id = admin_cmd::parse_account($this->account,true);	// true = user, no group
 		// check creator is still admin and not explicitly forbidden to edit Api\Accounts
-		if ($this->creator) $this->_check_admin('account_access',16);
+		if ($this->creator)
+		{
+			$this->_check_admin('account_access',16);
+		}
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		$auth = new Api\Auth;
 

Doc Comments +2 added lines, -2 removed lines

@@ -19,7 +19,7 @@ 
 	 * Constructor
 	 *
 	 * @param string/int/array $account account name or id, or array with all parameters
-	 * @param string $password=null password
+	 * @param string $password password
 	 */
 	function __construct($account,$password=null)
 	{
@@ -36,7 +36,7 @@ 
 	/**
 	 * change the password of a given user
 	 *
-	 * @param boolean $check_only=false only run the checks (and throw the exceptions), but not the command itself
+	 * @param boolean $check_only only run the checks (and throw the exceptions), but not the command itself
 	 * @return string success message
 	 * @throws egw_exception_no_admin
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);

admin/inc/class.admin_import_users_csv.inc.php

Indentation +21 added lines, -21 removed lines

@@ -275,37 +275,37 @@
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can concatenate them if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can concatenate them if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 		return $this->results;
 	}

Spacing +31 added lines, -31 removed lines

@@ -15,15 +15,15 @@ 
 /**
  * class import_csv for admin (users)
  */
-class admin_import_users_csv implements importexport_iface_import_plugin  {
+class admin_import_users_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', 'disable', 'enable' );
+	protected static $actions = array('none', 'update', 'create', 'delete', 'disable', 'enable');
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -90,8 +90,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'],
 		));
@@ -99,11 +99,11 @@ 
 		$this->definition = $_definition;
 
 		// user, is admin ?
-		$this->is_admin = isset( $GLOBALS['egw_info']['user']['apps']['admin'] ) && $GLOBALS['egw_info']['user']['apps']['admin'];
+		$this->is_admin = isset($GLOBALS['egw_info']['user']['apps']['admin']) && $GLOBALS['egw_info']['user']['apps']['admin'];
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// 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'];
@@ -112,9 +112,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);
 		}
@@ -130,22 +130,22 @@ 
 			'account_status'	=> array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
 		);
 
-		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;
 
-			if(strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
+			if (strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
 			importexport_import_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
 
-			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' => 'accounts',
@@ -154,20 +154,20 @@ 
 								));
 							}
 							// 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) {
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ((array)$accounts as $account) {
 									$record['account_id'] = $account['account_id'];
-									$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;
 
@@ -180,9 +180,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;
 	}
@@ -194,7 +194,7 @@ 
 	 * @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;
@@ -203,8 +203,8 @@ 
 				$_data['account_expires'] = $_action == 'disable' ? 'already' : '';
 			case 'create' :
 			case 'update' :
-				$command = new admin_cmd_edit_user(($_action=='create'?null:$_data['account_lid']), $_data);
-				if($this->dry_run) {
+				$command = new admin_cmd_edit_user(($_action == 'create' ? null : $_data['account_lid']), $_data);
+				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, -29 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for admin (users)
  */
-class admin_import_users_csv implements importexport_iface_import_plugin  {
+class admin_import_users_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -90,7 +91,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'],
@@ -112,9 +114,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);
 		}
@@ -130,17 +135,27 @@ 
 			'account_status'	=> array('A' => lang('Active'), '' => lang('Disabled'), 'D' => lang('Disabled')),
 		);
 
-		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;
+			}
 
-			if(strtolower($record['account_expires']) == 'never') $record['account_expires'] = -1;
+			if(strtolower($record['account_expires']) == 'never')
+			{
+				$record['account_expires'] = -1;
+			}
 			importexport_import_csv::convert($record, admin_egw_user_record::$types, 'admin', $lookups);
 
-			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();
@@ -156,16 +171,23 @@ 
 							// 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 )
+							{
 								// apply action to all contacts matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$accounts as $account ) {
+								foreach ( (array)$accounts as $account )
+								{
 									$record['account_id'] = $account['account_id'];
 									$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() ));
 							}
@@ -176,13 +198,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;
 	}
@@ -194,8 +224,10 @@ 
 	 * @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 'disable':
@@ -204,13 +236,15 @@ 
 			case 'create' :
 			case 'update' :
 				$command = new admin_cmd_edit_user(($_action=='create'?null:$_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;
 				}
@@ -227,7 +261,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('User CSV import');
 	}
 
@@ -236,7 +271,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Creates / updates user accounts from CSV file");
 	}
 
@@ -245,7 +281,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -261,7 +298,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -270,7 +308,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -282,7 +321,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -294,7 +334,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -306,7 +347,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 }

admin/inc/class.admin_cmd_account_app.inc.php

Spacing +9 added lines, -9 removed lines

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

Doc Comments +3 added lines, -4 removed lines

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

Braces +9 added lines, -3 removed lines

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

admin/inc/class.admin_export_groups_csv.inc.php

Spacing +4 added lines, -4 removed lines

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

Doc Comments +2 added lines, -2 removed lines

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

Indentation +2 added lines, -2 removed lines

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

Braces +29 added lines, -13 removed lines

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

admin/inc/hook_acl_manager.inc.php

Spacing +12 added lines, -12 removed lines

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

admin/inc/class.admin_wizard_export_groups_csv.inc.php

Indentation +2 added lines, -2 removed lines

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

Spacing +1 added lines, -1 removed lines

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

Braces +4 added lines, -2 removed lines

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

admin/inc/class.admin_cmd_check_cats.inc.php

Spacing +2 added lines, -2 removed lines

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

Braces +4 added lines, -1 removed lines

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

Doc Comments +1 added lines, -2 removed lines

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