EGroupware / egroupware

importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Indentation +20 added lines, -20 removed lines

@@ -23,13 +23,13 @@ 
 	const TEMPLATE_MARKER = '-eTemplate-';
 
 	/**
-	* List of steps.  Key is the function, value is the translated title.
-	*/
+	 * List of steps.  Key is the function, value is the translated title.
+	 */
 	public $steps;
 
 	/**
-	* List of eTemplates to use for each step.  You can override this with your own etemplates steps.
-	*/
+	 * List of eTemplates to use for each step.  You can override this with your own etemplates steps.
+	 */
 	protected $step_templates = array(
 		'wizard_step30' => 'importexport.wizard_basic_import_csv.sample_file',
 		'wizard_step40' => 'importexport.wizard_basic_import_csv.choosesepncharset',
@@ -39,19 +39,19 @@ 
 		
 
 	/**
-	* Destination fields for the mapping
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the mapping
+	 * Key is the field name, value is the human version
+	 */
 	protected $mapping_fields = array();
 	
 	/**
-	* List of conditions your plugin supports
-	*/
+	 * List of conditions your plugin supports
+	 */
 	protected $conditions = array();
 
 	/**
-	* List of actions your plugin supports
-	*/
+	 * List of actions your plugin supports
+	 */
 	protected $actions = array();
 
 	/**
@@ -68,8 +68,8 @@ 
 	}
 
 	/**
-	* Take a sample CSV file.  It will be processed in later steps
-	*/
+	 * Take a sample CSV file.  It will be processed in later steps
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -263,11 +263,11 @@ 
 	}
 	
 	/**
-	* Process the sample file, get the fields out of it, then allow them to be mapped onto
-	* the fields the destination understands.  Also, set any translations to be done to the field.
-	*
-	* You can use the eTemplate
-	*/
+	 * Process the sample file, get the fields out of it, then allow them to be mapped onto
+	 * the fields the destination understands.  Also, set any translations to be done to the field.
+	 *
+	 * You can use the eTemplate
+	 */
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
@@ -348,8 +348,8 @@ 
 	}
 	
 	/**
-	* Edit conditions
-	*/
+	 * Edit conditions
+	 */
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));

Spacing +60 added lines, -60 removed lines

@@ -72,7 +72,7 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step30->$content '.print_r($content, true));
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -80,17 +80,17 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
+					if ($content['file']['tmp_name']) {
 						Api\Cache::setSession($content['application'], 'csvfile', $content['file']['tmp_name']);
 					}
 					unset($content['file']);
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -117,57 +117,57 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step40->$content '.print_r($content, true));
 		// return from step40
 		if ($content['step'] == 'wizard_step40') {
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
 					// Process sample file for fields
-					if (Api\Cache::getSession($content['application'],'csvfile') &&
-						($handle = fopen(Api\Cache::getSession($content['application'],'csvfile'), "rb")) !== FALSE
+					if (Api\Cache::getSession($content['application'], 'csvfile') &&
+						($handle = fopen(Api\Cache::getSession($content['application'], 'csvfile'), "rb")) !== FALSE
 					) {
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
 						//error_log(array2string($data));
 						fclose($handle);
 
 						// Remove & forget file
-						unlink(Api\Cache::getSession($content['application'],'csvfile'));
+						unlink(Api\Cache::getSession($content['application'], 'csvfile'));
 						Api\Cache::setSession($content['application'], 'csvfile', '');
-						$content['csv_fields'] = Api\Translation::convert($data,$content['charset']);
+						$content['csv_fields'] = Api\Translation::convert($data, $content['charset']);
 
 						// Reset field mapping for new file
 						$content['field_mapping'] = array();
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach ($content['csv_fields'] as $index => $field) {
+							if ($content['field_mapping'][$index]) continue;
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach ($this->mapping_fields as $key => $field_name) {
+								if (is_array($field_name)) continue;
+								if (strcasecmp($field, $field_name) == 0 || strcasecmp($field, $key) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
 									$msg_id = Api\Translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if ($msg_id) {
 									$english[$field_name] = Api\Translation::read('en', $content['application'], $msg_id);
 								} else {
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if ($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 
 								// Check for similar but slightly different
 								$match = 0;
-								if(similar_text(strtolower($field), strtolower($field_name), $match) &&
+								if (similar_text(strtolower($field), strtolower($field_name), $match) &&
 										$match > 85 &&
 										$match > $best_match_value
 								) {
@@ -176,20 +176,20 @@ 
 								}
 
 							}
-							if($best_match) {
+							if ($best_match) {
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					} elseif (!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -199,17 +199,17 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if (!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
 			} elseif (!$content['fieldsep']) {
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
-			if(!array_key_exists('num_header_lines', $content))
+			if (!array_key_exists('num_header_lines', $content))
 			{
-				if(is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
+				if (is_array($content['plugin_options']) && array_key_exists('num_header_lines', $content['plugin_options']))
 				{
 					$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
 				}
@@ -219,10 +219,10 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if (!$content['update_cats'] && $content['plugin_options']['update_cats']) {
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if (!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -231,24 +231,24 @@ 
 				$content['convert'] = 1;
 			}
 
-			$sel_options['charset'] = Api\Translation::get_installed_charsets()+
+			$sel_options['charset'] = Api\Translation::get_installed_charsets() +
 			array(
 				'user'	=> lang('User preference'),
 			);
 
 			// Add in extra allowed charsets
 			$config = Api\Config::read('importexport');
-			$extra_charsets = array_intersect(explode(',',$config['import_charsets']), mb_list_encodings());
-			if($extra_charsets)
+			$extra_charsets = array_intersect(explode(',', $config['import_charsets']), mb_list_encodings());
+			if ($extra_charsets)
 			{
-				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets,$extra_charsets));
+				$sel_options['charset'] += array(lang('Extra encodings') => array_combine($extra_charsets, $extra_charsets));
 			}
 			$sel_options['convert'] = array(
 				0       => lang('Database values'),
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if ($this->mapping_fields['cat_id']) {
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
@@ -270,18 +270,18 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
 			unset($content['field_mapping']);
 			unset($content['field_conversion']);
-			foreach($content['mapping'] as $field)
+			foreach ($content['mapping'] as $field)
 			{
 				$index = $field['index'];
-				foreach(array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
+				foreach (array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
 				{
-					if(trim($field[$id]) != '' && $field[$id] !== '--NONE--')
+					if (trim($field[$id]) != '' && $field[$id] !== '--NONE--')
 					{
 						$content[$dest][$index] = trim($field[$id]);
 					}
@@ -291,13 +291,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step50
@@ -307,7 +307,7 @@ 
 			$content['step'] = 'wizard_step50';
 
 			$content['mapping'] = array(false);
-			if(array_key_exists('field_mapping', $content))
+			if (array_key_exists('field_mapping', $content))
 			{
 				$field = $content['field_mapping'];
 				$conversion = $content['field_conversion'];
@@ -318,7 +318,7 @@ 
 				$conversion = $content['plugin_options']['field_conversion'];
 			}
 			$empties = 1;
-			foreach($content['csv_fields'] as $index => $title)
+			foreach ($content['csv_fields'] as $index => $title)
 			{
 				$content['mapping'][] = array(
 					'index'	=>	$index,
@@ -326,15 +326,15 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if (strstr($title, lang('Extra %1'))) $empties++;
 			}
-			while($empties <= 3)
+			while ($empties <= 3)
 			{
 				$content['mapping'][] = array(
 					'index' => $index + $empties,
 					'title' => lang('Extra %1', $empties),
-					'field' => $field[$index+$empties],
-					'conversion'	=>	$conversion[$index+$empties]
+					'field' => $field[$index + $empties],
+					'conversion'	=>	$conversion[$index + $empties]
 				);
 				$empties++;
 			}
@@ -352,7 +352,7 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step55->$content '.print_r($content, true));
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -360,8 +360,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
-				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
+			foreach ($content['conditions'] as $key => &$condition) {
+				if (($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
 				) {
@@ -370,7 +370,7 @@ 
 				}
 
 				// Check for true without false, or false without true - set to 'none'
-				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
+				elseif ($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
 				)
@@ -382,9 +382,9 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				case 'add':
@@ -393,7 +393,7 @@ 
 					$content['conditions'][] = array('string' => '');
 					return 'wizard_step55';
 				default :
-					return $this->wizard_step55($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step55($content, $sel_options, $readonlys, $preserv);
 					break;
 			}
 		}
@@ -401,18 +401,18 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if (!$content['conditions'] && $content['plugin_options']['conditions']) {
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach ($content['field_mapping'] as $field) {
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
-			if(!$sel_options['string'][$field])
+			if (!$sel_options['string'][$field])
 			{
-				foreach($this->mapping_fields as $fields)
+				foreach ($this->mapping_fields as $fields)
 				{
-					if(is_array($fields) && $fields[$field])
+					if (is_array($fields) && $fields[$field])
 					{
 						$sel_options['string'][$field] = $fields[$field];
 					}

Braces +75 added lines, -30 removed lines

@@ -72,7 +72,10 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		}
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -80,7 +83,8 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
+					if($content['file']['tmp_name'])
+					{
 						Api\Cache::setSession($content['application'], 'csvfile', $content['file']['tmp_name']);
 					}
 					unset($content['file']);
@@ -117,9 +121,13 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		}
 		// return from step40
-		if ($content['step'] == 'wizard_step40') {
+		if ($content['step'] == 'wizard_step40')
+		{
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
@@ -141,26 +149,40 @@ 
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach($content['csv_fields'] as $index => $field)
+						{
+							if($content['field_mapping'][$index])
+							{
+								continue;
+							}
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach($this->mapping_fields as $key => $field_name)
+							{
+								if(is_array($field_name))
+								{
+									continue;
+								}
+								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name]))
+								{
 									$msg_id = Api\Translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if($msg_id)
+								{
 									$english[$field_name] = Api\Translation::read('en', $content['application'], $msg_id);
-								} else {
+								}
+								else
+								{
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
@@ -176,11 +198,14 @@ 
 								}
 
 							}
-							if($best_match) {
+							if($best_match)
+							{
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					}
+					elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields'])
+					{
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
@@ -199,12 +224,16 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep'])
+			{
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
-			} elseif (!$content['fieldsep']) {
+			}
+			elseif (!$content['fieldsep'])
+			{
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
 			if(!array_key_exists('num_header_lines', $content))
@@ -219,10 +248,12 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if(!$content['update_cats'] && $content['plugin_options']['update_cats'])
+			{
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -248,12 +279,15 @@ 
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if($this->mapping_fields['cat_id'])
+			{
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
 				);
-			} else {
+			}
+			else
+			{
 				$content['no_cats'] = true;
 			}
 			unset ($preserv['button']);
@@ -270,7 +304,10 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		}
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
@@ -326,7 +363,10 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if(strstr($title,lang('Extra %1')))
+				{
+					$empties++;
+				}
 			}
 			while($empties <= 3)
 			{
@@ -352,7 +392,10 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		}
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -360,7 +403,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
+			foreach($content['conditions'] as $key => &$condition)
+			{
 				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
@@ -373,8 +417,7 @@ 
 				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
-				)
-				{
+				) {
 					$condition[$condition['true']['action'] == '' ? 'true' : 'false']['action'] = "none";
 				}
 			}
@@ -401,12 +444,14 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if(!$content['conditions'] && $content['plugin_options']['conditions'])
+		{
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach($content['field_mapping'] as $field)
+		{
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
 			if(!$sel_options['string'][$field])
 			{

importexport/importexport_cli.php

Spacing +19 added lines, -19 removed lines

@@ -29,23 +29,23 @@ 
 
 if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 {
-	ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+	ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 }
 
 // Include PEAR::Console_Getopt
 require_once 'Console/Getopt.php';
 
 // Define exit codes for errors
-define('HEADER_NOT_FOUND',9);
-define('NO_ARGS',10);
-define('INVALID_OPTION',11);
+define('HEADER_NOT_FOUND', 9);
+define('NO_ARGS', 10);
+define('INVALID_OPTION', 11);
 
 // Reading the incoming arguments - same as $argv
 $args = Console_Getopt::readPHPArgv();
 
 // Make sure we got them (for non CLI binaries)
 if (PEAR::isError($args)) {
-   fwrite(STDERR,"importexport_cli: ".$args->getMessage()."\n".$usage);
+   fwrite(STDERR, "importexport_cli: ".$args->getMessage()."\n".$usage);
    exit(NO_ARGS);
 }
 
@@ -63,15 +63,15 @@ 
    );
 
 // Convert the arguments to options - check for the first argument
-if ( realpath($_SERVER['argv'][0]) == __FILE__ ) {
-   $options = Console_Getopt::getOpt($args,$short_opts,$long_opts);
+if (realpath($_SERVER['argv'][0]) == __FILE__) {
+   $options = Console_Getopt::getOpt($args, $short_opts, $long_opts);
 } else {
-   $options = Console_Getopt::getOpt2($args,$short_opts,$long_opts);
+   $options = Console_Getopt::getOpt2($args, $short_opts, $long_opts);
 }
 
 // Check the options are valid
 if (PEAR::isError($options)) {
-   fwrite(STDERR,"importexport_cli: ".$options->getMessage()."\n".$usage."\n");
+   fwrite(STDERR, "importexport_cli: ".$options->getMessage()."\n".$usage."\n");
    exit(INVALID_OPTION);
 }
 
@@ -98,13 +98,13 @@ 
 			$dryrun = true;
 			break;
 		default :
-			fwrite (STDERR,$usage."\n");
+			fwrite(STDERR, $usage."\n");
 			exit(INVALID_OPTION);
 	}
 }
 // check file
-if ( !$user || !$password ) {
-	fwrite(STDERR,'importexport_cli: You have to supply a username / password'."\n".$usage);
+if (!$user || !$password) {
+	fwrite(STDERR, 'importexport_cli: You have to supply a username / password'."\n".$usage);
 	exit(INVALID_OPTION);
 }
 
@@ -117,12 +117,12 @@ 
 	'nonavbar' => True,
 	'currentapp' => 'importexport',
 	'autocreate_session_callback' => 'import_export_access',
-	'login' => $user . '@' . $domain,
+	'login' => $user.'@'.$domain,
 	'passwd' => $password,
 );
 if (!is_readable($path_to_egroupware.'/header.inc.php'))
 {
-	fwrite(STDERR,"importexport.php: Could not find '$path_to_egroupware/header.inc.php', exiting !!!\n");
+	fwrite(STDERR, "importexport.php: Could not find '$path_to_egroupware/header.inc.php', exiting !!!\n");
 	exit(HEADER_NOT_FOUND);
 }
 include($path_to_egroupware.'/header.inc.php');
@@ -130,13 +130,13 @@ 
 // check file
 if (!is_readable($file))
 {
-	fwrite(STDERR,"importexport_cli: ". $file. ' is not readable'."\n");
+	fwrite(STDERR, "importexport_cli: ".$file.' is not readable'."\n");
 	exit(INVALID_OPTION);
 }
 
 $definition = new importexport_definition($definition);
-if( $definition->get_identifier() < 1 ) {
-	fwrite(STDERR,"importexport_cli: Definition not found! \n");
+if ($definition->get_identifier() < 1) {
+	fwrite(STDERR, "importexport_cli: Definition not found! \n");
 	exit(INVALID_OPTION);
 }
 
@@ -147,8 +147,8 @@ 
 
 $po = new $definition->plugin;
 
-$resource = fopen( $file, 'r' );
-$po->$type( $resource, $definition );
+$resource = fopen($file, 'r');
+$po->$type($resource, $definition);
 
 exit();
 

Braces +19 added lines, -9 removed lines

@@ -23,7 +23,8 @@ 
 		--dry-run                            no real action, just console output
 		\n";
 
-if (php_sapi_name() != 'cli') {
+if (php_sapi_name() != 'cli')
+{
 	die('This script only runs form command line');
 }
 
@@ -44,7 +45,8 @@ 
 $args = Console_Getopt::readPHPArgv();
 
 // Make sure we got them (for non CLI binaries)
-if (PEAR::isError($args)) {
+if (PEAR::isError($args))
+{
    fwrite(STDERR,"importexport_cli: ".$args->getMessage()."\n".$usage);
    exit(NO_ARGS);
 }
@@ -63,22 +65,28 @@ 
    );
 
 // Convert the arguments to options - check for the first argument
-if ( realpath($_SERVER['argv'][0]) == __FILE__ ) {
+if ( realpath($_SERVER['argv'][0]) == __FILE__ )
+{
    $options = Console_Getopt::getOpt($args,$short_opts,$long_opts);
-} else {
+}
+else
+{
    $options = Console_Getopt::getOpt2($args,$short_opts,$long_opts);
 }
 
 // Check the options are valid
-if (PEAR::isError($options)) {
+if (PEAR::isError($options))
+{
    fwrite(STDERR,"importexport_cli: ".$options->getMessage()."\n".$usage."\n");
    exit(INVALID_OPTION);
 }
 
 $domain = 'default';
 $dryrun = false;
-foreach ($options[0] as $option) {
-	switch ($option[0]) {
+foreach ($options[0] as $option)
+{
+	switch ($option[0])
+	{
 		case '--file' :
 			$file = $option[1];
 			break;
@@ -103,7 +111,8 @@ 
 	}
 }
 // check file
-if ( !$user || !$password ) {
+if ( !$user || !$password )
+{
 	fwrite(STDERR,'importexport_cli: You have to supply a username / password'."\n".$usage);
 	exit(INVALID_OPTION);
 }
@@ -135,7 +144,8 @@ 
 }
 
 $definition = new importexport_definition($definition);
-if( $definition->get_identifier() < 1 ) {
+if( $definition->get_identifier() < 1 )
+{
 	fwrite(STDERR,"importexport_cli: Definition not found! \n");
 	exit(INVALID_OPTION);
 }

admin/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -12,9 +12,9 @@ 
 $setup_info['admin']['name']      = 'admin';
 $setup_info['admin']['version']   = '16.1';
 $setup_info['admin']['app_order'] = 1;
-$setup_info['admin']['tables']    = array('egw_admin_queue','egw_admin_remote');
+$setup_info['admin']['tables']    = array('egw_admin_queue', 'egw_admin_remote');
 $setup_info['admin']['enable']    = 1;
-$setup_info['admin']['index']   = 'admin.admin_ui.index&ajax=true';
+$setup_info['admin']['index'] = 'admin.admin_ui.index&ajax=true';
 
 $setup_info['admin']['author'][] = array(
 	'name'  => 'eGroupWare coreteam',
@@ -27,7 +27,7 @@ 
 	'url'   => 'www.egroupware.org'
 );
 
-$setup_info['admin']['license']  = 'GPL';
+$setup_info['admin']['license'] = 'GPL';
 $setup_info['admin']['description'] = 'EGroupware administration application';
 
 /* The hooks this app includes, needed for hooks registration */

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

@@ -46,5 +46,5 @@
 // Dependencies for this app to work
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'api',
-	'versions' => Array('16.1')
+	'versions' => array('16.1')
 );

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

Spacing +37 added lines, -37 removed lines

@@ -25,7 +25,7 @@ 
 	 * @param string $password =null password
 	 * @param boolean $run_addaccount_hook =null default run addaccount for new Api\Accounts and editaccount for existing ones
 	 */
-	function __construct($account,$set=null,$password=null,$run_addaccount_hook=null)
+	function __construct($account, $set = null, $password = null, $run_addaccount_hook = null)
 	{
 		if (!is_array($account))
 		{
@@ -49,10 +49,10 @@ 
 	 * @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)
 	{
 		// check creator is still admin and not explicitly forbidden to edit accounts/groups
-		if ($this->creator) $this->_check_admin('account_access',$this->account ? 16 : 4);
+		if ($this->creator) $this->_check_admin('account_access', $this->account ? 16 : 4);
 
 		admin_cmd::_instanciate_accounts();
 
@@ -68,29 +68,29 @@ 
 		}
 		if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
 		{
-			throw new Api\Exception\WrongUserinput(lang('You must enter a loginid'),9);
+			throw new Api\Exception\WrongUserinput(lang('You must enter a loginid'), 9);
 		}
 		// Check if an account already exists as system user, and if it does deny creation
 		if ($GLOBALS['egw_info']['server']['account_repository'] == 'ldap' &&
 			!$GLOBALS['egw_info']['server']['ldap_allow_systemusernames'] && !$data['account_id'] &&
 			function_exists('posix_getpwnam') && posix_getpwnam($data['account_lid']))
 		{
-			throw new Api\Exception\WrongUserinput(lang('There already is a system-user with this name. User\'s should not have the same name as a systemuser'),99);
+			throw new Api\Exception\WrongUserinput(lang('There already is a system-user with this name. User\'s should not have the same name as a systemuser'), 99);
 		}
 		if (!$data['account_lastname'] && (!$this->account || !is_null($data['account_lastname'])))
 		{
-			throw new Api\Exception\WrongUserinput(lang('You must enter a lastname'),9);
+			throw new Api\Exception\WrongUserinput(lang('You must enter a lastname'), 9);
 		}
-		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'],'account_lid','u')) &&
+		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'], 'account_lid', 'u')) &&
 			(string)$id !== (string)$data['account_id'])
 		{
-			throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'),999);
+			throw new Api\Exception\WrongUserinput(lang('That loginid has already been taken'), 999);
 		}
 		if (isset($data['account_passwd_2']) && $data['account_passwd'] != $data['account_passwd_2'])
 		{
-			throw new Api\Exception\WrongUserinput(lang('The two passwords are not the same'),0);
+			throw new Api\Exception\WrongUserinput(lang('The two passwords are not the same'), 0);
 		}
-		$expires = self::_parse_expired($data['account_expires'],(boolean)$this->account);
+		$expires = self::_parse_expired($data['account_expires'], (boolean)$this->account);
 		if ($expires === 0)	// deactivated
 		{
 			$data['account_expires'] = -1;
@@ -102,16 +102,16 @@ 
 			$data['account_status'] = is_null($expires) ? null : ($expires == -1 || $expires > time() ? 'A' : '');
 		}
 
-		$data['changepassword'] = admin_cmd::parse_boolean($data['changepassword'],$this->account ? null : true);
-		$data['anonymous'] = admin_cmd::parse_boolean($data['anonymous'],$this->account ? null : false);
+		$data['changepassword'] = admin_cmd::parse_boolean($data['changepassword'], $this->account ? null : true);
+		$data['anonymous'] = admin_cmd::parse_boolean($data['anonymous'], $this->account ? null : false);
 		if ($data['mustchangepassword'] && $data['changepassword'])
 		{
-			$data['account_lastpwd_change']=0;
+			$data['account_lastpwd_change'] = 0;
 		}
 
 		if (!$data['account_primary_group'] && $this->account)
 		{
-			$data['account_primary_group'] = null;	// dont change
+			$data['account_primary_group'] = null; // dont change
 		}
 		else
 		{
@@ -119,11 +119,11 @@ 
 			{
 				$data['account_primary_group'] = 'Default';
 			}
-			$data['account_primary_group'] = admin_cmd::parse_account($data['account_primary_group'],false);
+			$data['account_primary_group'] = admin_cmd::parse_account($data['account_primary_group'], false);
 		}
 		if (!$data['account_groups'] && $this->account)
 		{
-			$data['account_groups'] = null;	// dont change
+			$data['account_groups'] = null; // dont change
 		}
 		else
 		{
@@ -131,7 +131,7 @@ 
 			{
 				$data['account_groups'] = array('Default');
 			}
-			$data['account_groups'] = admin_cmd::parse_accounts($data['account_groups'],false);
+			$data['account_groups'] = admin_cmd::parse_accounts($data['account_groups'], false);
 		}
 		if ($check_only) return true;
 
@@ -141,27 +141,27 @@ 
 			Api\Accounts::cache_invalidate($data['account_id']);
 			if (!($old = admin_cmd::$accounts->read($data['account_id'])))
 			{
-				throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!",$this->account),15);
+				throw new Api\Exception\WrongUserinput(lang("Unknown account: %1 !!!", $this->account), 15);
 			}
 			// as the current account class always sets all values, we have to add the not specified ones
-			foreach($data as $name => &$value)
+			foreach ($data as $name => &$value)
 			{
 				if (is_null($value)) $value = $old[$name];
 			}
 		}
 		else
 		{
-			unset($data['account_id']);	// otherwise add will fail under postgres
+			unset($data['account_id']); // otherwise add will fail under postgres
 		}
 		// hook allowing apps to intercept adding/editing Api\Accounts before saving them
-		Api\Hooks::process($data+array(
+		Api\Hooks::process($data + array(
 			'location' => $this->account ? 'pre_editaccount' : 'pre_addaccount',
-		),False,True);	// called for every app now, not only enabled ones)
+		), False, True); // called for every app now, not only enabled ones)
 
 		if (!($data['account_id'] = admin_cmd::$accounts->save($data)))
 		{
 			//_debug_array($data);
-			throw new Api\Db\Exception(lang("Error saving account!"),11);
+			throw new Api\Db\Exception(lang("Error saving account!"), 11);
 		}
 		// make new account_id available to caller
 		$update = (boolean)$this->account;
@@ -169,44 +169,44 @@ 
 
 		if ($data['account_groups'])
 		{
-			admin_cmd::$accounts->set_memberships($data['account_groups'],$data['account_id']);
+			admin_cmd::$accounts->set_memberships($data['account_groups'], $data['account_id']);
 		}
 		if (!is_null($data['anonymous']))
 		{
 			admin_cmd::_instanciate_acl();
 			if ($data['anonymous'])
 			{
-				admin_cmd::$acl->add_repository('phpgwapi','anonymous',$data['account_id'],1);
+				admin_cmd::$acl->add_repository('phpgwapi', 'anonymous', $data['account_id'], 1);
 			}
 			else
 			{
-				admin_cmd::$acl->delete_repository('phpgwapi','anonymous',$data['account_id']);
+				admin_cmd::$acl->delete_repository('phpgwapi', 'anonymous', $data['account_id']);
 			}
 		}
 		if (!is_null($data['changepassword']))
 		{
 			if (!$data['changepassword'])
 			{
-				admin_cmd::$acl->add_repository('preferences','nopasswordchange',$data['account_id'],1);
+				admin_cmd::$acl->add_repository('preferences', 'nopasswordchange', $data['account_id'], 1);
 			}
 			else
 			{
-				admin_cmd::$acl->delete_repository('preferences','nopasswordchange',$data['account_id']);
+				admin_cmd::$acl->delete_repository('preferences', 'nopasswordchange', $data['account_id']);
 			}
 		}
 		// if we have a password and it's not a hash, and auth_type != account_repository
 		if (!is_null($this->password) &&
-			!preg_match('/^\\{[a-z5]{3,5}\\}.+/i',$this->password) &&
-			!preg_match('/^[0-9a-f]{32}$/',$this->password) &&	// md5 hash
+			!preg_match('/^\\{[a-z5]{3,5}\\}.+/i', $this->password) &&
+			!preg_match('/^[0-9a-f]{32}$/', $this->password) && // md5 hash
 			admin_cmd::$accounts->config['auth_type'] != admin_cmd::$accounts->config['account_repository'])
 		{
-			admin_cmd_change_pw::exec();		// calling the exec method of the admin_cmd_change_pw
+			admin_cmd_change_pw::exec(); // calling the exec method of the admin_cmd_change_pw
 		}
 		$data['account_passwd'] = $this->password;
-		$GLOBALS['hook_values'] =& $data;
-		Api\Hooks::process($GLOBALS['hook_values']+array(
+		$GLOBALS['hook_values'] = & $data;
+		Api\Hooks::process($GLOBALS['hook_values'] + array(
 			'location' => $update && $this->run_addaccount_hook !== true ? 'editaccount' : 'addaccount'
-		),False,True);	// called for every app now, not only enabled ones)
+		), False, True); // called for every app now, not only enabled ones)
 
 		return lang("Account %1 %2", $data['account_lid'] ? $data['account_lid'] : Api\Accounts::id2name($this->account),
 			$update ? lang('updated') : lang("created with id #%1", $this->account));
@@ -219,7 +219,7 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('%1 user %2',$this->account ? lang('Edit') : lang('Add'),
+		return lang('%1 user %2', $this->account ? lang('Edit') : lang('Add'),
 			admin_cmd::display_account($this->account ? $this->account : $this->set['account_lid']));
 	}
 
@@ -231,9 +231,9 @@ 
 	 * @return int timestamp, 0 for already, -1 for never or null for dont change
 	 * @throws Api\Exception\WrongUserinput(lang('Invalid formated date "%1"!',$datein),6);
 	 */
-	private function _parse_expired($str,$existing)
+	private function _parse_expired($str, $existing)
 	{
-		switch($str)
+		switch ($str)
 		{
 			case '':
 				if ($existing) return null;

Braces +28 added lines, -7 removed lines

@@ -52,16 +52,22 @@ 
 	protected function exec($check_only=false)
 	{
 		// check creator is still admin and not explicitly forbidden to edit accounts/groups
-		if ($this->creator) $this->_check_admin('account_access',$this->account ? 16 : 4);
+		if ($this->creator)
+		{
+			$this->_check_admin('account_access',$this->account ? 16 : 4);
+		}
 
 		admin_cmd::_instanciate_accounts();
 
 		$data = $this->set;
 		$data['account_type'] = 'u';
 
-		if ($this->account)	// existing account
+		if ($this->account)
+		{
+			// existing account
 		{
 			$data['account_id'] = admin_cmd::parse_account($this->account);
+		}
 			//error_log(__METHOD__."($check_only) this->account=".array2string($this->account).', data[account_id]='.array2string($data['account_id']).", ...)");
 
 			$data['old_loginid'] = admin_cmd::$accounts->id2name($data['account_id']);
@@ -91,9 +97,12 @@ 
 			throw new Api\Exception\WrongUserinput(lang('The two passwords are not the same'),0);
 		}
 		$expires = self::_parse_expired($data['account_expires'],(boolean)$this->account);
-		if ($expires === 0)	// deactivated
+		if ($expires === 0)
+		{
+			// deactivated
 		{
 			$data['account_expires'] = -1;
+		}
 			$data['account_status'] = '';
 		}
 		else
@@ -133,7 +142,10 @@ 
 			}
 			$data['account_groups'] = admin_cmd::parse_accounts($data['account_groups'],false);
 		}
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		if ($this->account)
 		{
@@ -146,7 +158,10 @@ 
 			// as the current account class always sets all values, we have to add the not specified ones
 			foreach($data as $name => &$value)
 			{
-				if (is_null($value)) $value = $old[$name];
+				if (is_null($value))
+				{
+					$value = $old[$name];
+				}
 			}
 		}
 		else
@@ -165,7 +180,10 @@ 
 		}
 		// make new account_id available to caller
 		$update = (boolean)$this->account;
-		if (!$this->account) $this->account = $data['account_id'];
+		if (!$this->account)
+		{
+			$this->account = $data['account_id'];
+		}
 
 		if ($data['account_groups'])
 		{
@@ -236,7 +254,10 @@ 
 		switch($str)
 		{
 			case '':
-				if ($existing) return null;
+				if ($existing)
+				{
+					return null;
+				}
 				// fall through --> default for new Api\Accounts is never
 			case 'never':
 				return -1;

admin/inc/class.uiconfig.inc.php

Spacing +52 added lines, -53 removed lines

@@ -20,7 +20,7 @@ 
 {
 	var $public_functions = array('index' => True);
 
-	function index($params=null)
+	function index($params = null)
 	{
 		// if we have a xet file, run new et2 config
 		if (file_exists(EGW_SERVER_ROOT.'/'.$_GET['appname'].'/templates/default/config.xet'))
@@ -46,7 +46,7 @@ 
 			//_debug_array($params);
 			$_appname = $_GET['appname'];
 		}
-		if ($GLOBALS['egw']->acl->check('site_config_acce',1,'admin'))
+		if ($GLOBALS['egw']->acl->check('site_config_acce', 1, 'admin'))
 		{
 			Egw::redirect_link('/index.php');
 		}
@@ -57,12 +57,12 @@ 
 			Api\Translation::add_app($_appname);
 		}
 
-		if(get_magic_quotes_gpc() && is_array($_POST['newsettings']))
+		if (get_magic_quotes_gpc() && is_array($_POST['newsettings']))
 		{
 			$_POST['newsettings'] = array_stripslashes($_POST['newsettings']);
 		}
 
-		switch($_appname)
+		switch ($_appname)
 		{
 			case 'admin':
 			case 'addressbook':
@@ -89,7 +89,7 @@ 
 		$t = new Framework\Template(Framework\Template::get_dir($appname));
 		$t->set_unknowns('keep');
 		$t->set_file(array('config' => 'config.tpl'));
-		$t->set_block('config','header','header');
+		$t->set_block('config', 'header', 'header');
 
 		// fix header templates missing essential parts like display of validation errors
 		$header = $t->get_var('header');
@@ -107,15 +107,15 @@ 
 		}
 		$t->set_var('header', $header);
 
-		$t->set_block('config','body','body');
-		$t->set_block('config','footer','footer');
+		$t->set_block('config', 'body', 'body');
+		$t->set_block('config', 'footer', 'footer');
 
 		// fix footer submit buttons to just {submit} {cancel}
 		$t->set_var('footer', preg_replace('/<input[^>]+value="{lang_(submit|cancel)}"[^>]*>/', '{$1}', $t->get_var('footer')));
 
 		$c = new Api\Config($config_appname);
 		$c->read_repository();
-		if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
+		if ($_POST['cancel'] || ($_POST['submit'] || $_POST['save'] || $_POST['apply']) && $GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin'))
 		{
 			Egw::redirect_link('/admin/index.php?ajax=true');
 		}
@@ -123,9 +123,9 @@ 
 		if ($_POST['submit'] || $_POST['save'] || $_POST['apply'])
 		{
 			/* Load hook file with functions to validate each Api\Config (one/none/all) */
-			Api\Hooks::single('config_validate',$appname);
+			Api\Hooks::single('config_validate', $appname);
 
-			foreach($_POST['newsettings'] as $key => $config)
+			foreach ($_POST['newsettings'] as $key => $config)
 			{
 				if ($config)
 				{
@@ -133,26 +133,26 @@ 
 					if (in_array($key, (array)$GLOBALS['egw_info']['server']['found_validation_hook'], true) && function_exists($key))
 					{
 						call_user_func($key, $config, $c);
-						if($GLOBALS['config_error'])
+						if ($GLOBALS['config_error'])
 						{
-							$errors .= lang($GLOBALS['config_error']) . "\n";
+							$errors .= lang($GLOBALS['config_error'])."\n";
 							$GLOBALS['config_error'] = False;
 						}
 					}
 				}
 				/* don't erase passwords, since we also don't print them */
-				elseif(strpos($key,'passwd') === false && strpos($key,'password') === false && strpos($key,'root_pw') === false)
+				elseif (strpos($key, 'passwd') === false && strpos($key, 'password') === false && strpos($key, 'root_pw') === false)
 				{
 					unset($c->config_data[$key]);
 				}
 			}
-			if(in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
+			if (in_array('final_validation', (array)$GLOBALS['egw_info']['server']['found_validation_hook']) &&
 				function_exists('final_validation'))
 			{
 				final_validation($_POST['newsettings']);
-				if($GLOBALS['config_error'])
+				if ($GLOBALS['config_error'])
 				{
-					$errors .= lang($GLOBALS['config_error']) . "\n";
+					$errors .= lang($GLOBALS['config_error'])."\n";
 					$GLOBALS['config_error'] = False;
 				}
 				unset($GLOBALS['egw_info']['server']['found_validation_hook']);
@@ -160,7 +160,7 @@ 
 
 			$c->save_repository();
 
-			if(!$errors && !$_POST['apply'])
+			if (!$errors && !$_POST['apply'])
 			{
 				Framework::message(lang('Configuration saved.'), 'success');
 				Egw::redirect_link('/index.php', array(
@@ -170,10 +170,10 @@ 
 			}
 		}
 
-		$t->set_var('error','');
-		if($errors)
+		$t->set_var('error', '');
+		if ($errors)
 		{
-			Framework::message(lang('Error') . ': ' . $errors, 'error');
+			Framework::message(lang('Error').': '.$errors, 'error');
 			unset($errors);
 			unset($GLOBALS['config_error']);
 		}
@@ -181,41 +181,41 @@ 
 		{
 			Framework::message(lang('Configuration saved.'), 'success');
 		}
-		$t->set_var('title',lang('Site Configuration'));
-		$t->set_var('action_url',$GLOBALS['egw']->link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname));
-		$t->set_var('th_bg',     $GLOBALS['egw_info']['theme']['th_bg']);
-		$t->set_var('th_text',   $GLOBALS['egw_info']['theme']['th_text']);
-		$t->set_var('row_on',    $GLOBALS['egw_info']['theme']['row_on']);
-		$t->set_var('row_off',   $GLOBALS['egw_info']['theme']['row_off']);
+		$t->set_var('title', lang('Site Configuration'));
+		$t->set_var('action_url', $GLOBALS['egw']->link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname));
+		$t->set_var('th_bg', $GLOBALS['egw_info']['theme']['th_bg']);
+		$t->set_var('th_text', $GLOBALS['egw_info']['theme']['th_text']);
+		$t->set_var('row_on', $GLOBALS['egw_info']['theme']['row_on']);
+		$t->set_var('row_off', $GLOBALS['egw_info']['theme']['row_off']);
 		$t->set_var('hidden_vars', Api\Html::input_hidden('csrf_token', Api\Csrf::token(__CLASS__)));
 
 		$vars = $t->get_undefined('body');
 
-		if (Api\Hooks::single('config',$appname))	// reload the config-values, they might have changed
+		if (Api\Hooks::single('config', $appname))	// reload the config-values, they might have changed
 		{
 			$c->read_repository();
 		}
-		foreach($vars as $value)
+		foreach ($vars as $value)
 		{
-			$valarray = explode('_',$value);
+			$valarray = explode('_', $value);
 			$type = array_shift($valarray);
-			$newval = implode(' ',$valarray);
+			$newval = implode(' ', $valarray);
 
 			switch ($type)
 			{
 				case 'lang':
-					$t->set_var($value,lang($newval));
+					$t->set_var($value, lang($newval));
 					break;
 				case 'value':
-					$newval = str_replace(' ','_',$newval);
+					$newval = str_replace(' ', '_', $newval);
 					/* Don't show passwords in the form */
-					if(strpos($value,'passwd') !== false || strpos($value,'password') !== false || strpos($value,'root_pw') !== false)
+					if (strpos($value, 'passwd') !== false || strpos($value, 'password') !== false || strpos($value, 'root_pw') !== false)
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					else
 					{
-						$t->set_var($value,$c->config_data[$newval]);
+						$t->set_var($value, $c->config_data[$newval]);
 					}
 					break;
 				/*
@@ -233,46 +233,45 @@ 
 				*/
 				case 'selected':
 					$configs = array();
-					$newvals = explode(' ',$newval);
+					$newvals = explode(' ', $newval);
 					$setting = end($newvals);
-					for ($i=0;$i<(count($newvals) - 1); $i++)
+					for ($i = 0; $i < (count($newvals) - 1); $i++)
 					{
 						$configs[] = $newvals[$i];
 					}
-					$config = implode('_',$configs);
+					$config = implode('_', $configs);
 					/* echo $config . '=' . $c->config_data[$config]; */
 					if ($c->config_data[$config] == $setting)
 					{
-						$t->set_var($value,' selected');
+						$t->set_var($value, ' selected');
 					}
 					else
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					break;
 				case 'hook':
-					$newval = str_replace(' ','_',$newval);
-					if(function_exists($newval))
+					$newval = str_replace(' ', '_', $newval);
+					if (function_exists($newval))
 					{
-						$t->set_var($value,$newval($c->config_data));
+						$t->set_var($value, $newval($c->config_data));
 					}
 					else
 					{
-						$t->set_var($value,'');
+						$t->set_var($value, '');
 					}
 					break;
 				case 'call':	// eg. call_class::method or call_app.class.method
-					$newval = str_replace(' ','_',$newval);
-					$t->set_var($value,ExecMethod($newval,$c->config_data));
+					$newval = str_replace(' ', '_', $newval);
+					$t->set_var($value, ExecMethod($newval, $c->config_data));
 					break;
 				default:
-					$t->set_var($value,'');
+					$t->set_var($value, '');
 					break;
 			}
 		}
 		$t->set_var('submit', '<div class="dialogFooterToolbar" style="text-align: left">'.
-			($GLOBALS['egw']->acl->check('site_config_acce',2,'admin') ? '' :
-				Api\Html::submit_button('save', 'Save')."\n".
+			($GLOBALS['egw']->acl->check('site_config_acce', 2, 'admin') ? '' : Api\Html::submit_button('save', 'Save')."\n".
 				Api\Html::submit_button('apply', 'Apply')));
 		$t->set_var('cancel', Api\Html::submit_button('cancel', 'Cancel').'</div>');
 
@@ -282,10 +281,10 @@ 
 		// render the page
 		$GLOBALS['egw']->framework->render(
 			'<div id="admin-config-'.$appname.'" class="admin-config">'.
-			$t->parse('out','header').
-			$t->fp('out','body').
-			$t->fp('out','footer').'</div>',
-			null,true
+			$t->parse('out', 'header').
+			$t->fp('out', 'body').
+			$t->fp('out', 'footer').'</div>',
+			null, true
 		);
 	}
 }

Braces +9 added lines, -2 removed lines

@@ -85,7 +85,11 @@ 
 				$config_appname = $appname;
 				break;
 		}
-		if (ob_get_contents()) ob_end_flush(); // if there is output in buffer, flush it now.
+		if (ob_get_contents())
+		{
+			ob_end_flush();
+		}
+		// if there is output in buffer, flush it now.
 		$t = new Framework\Template(Framework\Template::get_dir($appname));
 		$t->set_unknowns('keep');
 		$t->set_file(array('config' => 'config.tpl'));
@@ -191,10 +195,13 @@ 
 
 		$vars = $t->get_undefined('body');
 
-		if (Api\Hooks::single('config',$appname))	// reload the config-values, they might have changed
+		if (Api\Hooks::single('config',$appname))
+		{
+			// reload the config-values, they might have changed
 		{
 			$c->read_repository();
 		}
+		}
 		foreach($vars as $value)
 		{
 			$valarray = explode('_',$value);

admin/inc/class.admin_cmd_check_acl.inc.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,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);
 	}
@@ -34,7 +34,7 @@ 
 	 * @throws Exception(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws Exception(lang("Application '%1' not found (maybe not installed or misspelled)!",$name),8);
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
 		if ($check_only) return true;
 
@@ -43,14 +43,14 @@ 
 		if (($all_accounts = admin_cmd::$accounts->search(array('type'=>'both'))))
 		{
 			$ids = array();
-			foreach($all_accounts as $account)
+			foreach ($all_accounts as $account)
 			{
 				$ids[] = $account['account_id'];
 			}
-			$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',',$ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','",$ids)."')",__LINE__,__FILE__);
+			$GLOBALS['egw']->db->query("DELETE FROM egw_acl WHERE acl_account NOT IN (".implode(',', $ids).") OR acl_appname='phpgw_group' AND acl_location NOT IN ('".implode("','", $ids)."')", __LINE__, __FILE__);
 			$deleted = $GLOBALS['egw']->db->affected_rows();
 		}
-		return lang("%1 ACL records of not (longer) existing Api\Accounts deleted.",$deleted);
+		return lang("%1 ACL records of not (longer) existing Api\Accounts deleted.", $deleted);
 	}
 
 	/**

Braces +4 added lines, -1 removed lines

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

admin/inc/class.admin_cmds.inc.php

Spacing +24 added lines, -25 removed lines

@@ -31,25 +31,24 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_rows(array $query,&$rows,&$readonlys)
+	static function get_rows(array $query, &$rows, &$readonlys)
 	{
 		Api\Cache::setSession('admin', 'cmds', $query);
 
-		$total = admin_cmd::get_rows($query,$rows,$readonlys);
+		$total = admin_cmd::get_rows($query, $rows, $readonlys);
 
 		if (!$rows) return array();
 
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			try {
 				$cmd = admin_cmd::instanciate($row);
-				$row['title'] = $cmd->__tostring();	// we call __tostring explicit, as a cast to string requires php5.2+
+				$row['title'] = $cmd->__tostring(); // we call __tostring explicit, as a cast to string requires php5.2+
 			}
 			catch (Exception $e) {
 				$row['title'] = $e->getMessage();
 			}
-			$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' :
-				json_encode($data, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
+			$row['data'] = !($data = json_php_unserialize($row['data'])) ? '' : json_encode($data, JSON_PRETTY_PRINT|JSON_UNESCAPED_UNICODE|JSON_UNESCAPED_SLASHES);
 
 			if ($row['status'] == admin_cmd::scheduled)
 			{
@@ -65,7 +64,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	static function index(array $content=null)
+	static function index(array $content = null)
 	{
 		$tpl = new Etemplate('admin.cmds');
 
@@ -75,10 +74,10 @@ 
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows' => 'admin.admin_cmds.get_rows',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter' => true,	// I  disable the 1. filter
-					'no_filter2' => true,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat' => true,		// I  disable the cat-selectbox
+					'get_rows' => 'admin.admin_cmds.get_rows', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter' => true, // I  disable the 1. filter
+					'no_filter2' => true, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat' => true, // I  disable the cat-selectbox
 					'order' => 'cmd_created',
 					'sort' => 'DESC',
 					'row_id' => 'id',
@@ -98,10 +97,10 @@ 
 			}
 			unset($cmd);
 		}
-		$tpl->exec('admin.admin_cmds.index',$content,array(
+		$tpl->exec('admin.admin_cmds.index', $content, array(
 			'status' => admin_cmd::$stati,
 			'remote_id' => admin_cmd::remote_sites(),
-		),array(),$content);
+		), array(), $content);
 	}
 
 	/**
@@ -127,9 +126,9 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_remotes(array $query,&$rows,&$readonlys)
+	static function get_remotes(array $query, &$rows, &$readonlys)
 	{
-		return admin_cmd::get_remotes($query,$rows,$readonlys);
+		return admin_cmd::get_remotes($query, $rows, $readonlys);
 	}
 
 	/**
@@ -137,7 +136,7 @@ 
 	 *
 	 * @param array $content =null
 	 */
-	static function remotes(array $content=null)
+	static function remotes(array $content = null)
 	{
 		$tpl = new Etemplate('admin.remotes');
 
@@ -147,10 +146,10 @@ 
 			if (!is_array($content['nm']))
 			{
 				$content['nm'] = array(
-					'get_rows' => 'admin.admin_cmds.get_remotes',	// I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
-					'no_filter' => true,	// I  disable the 1. filter
-					'no_filter2' => true,	// I  disable the 2. filter (params are the same as for filter)
-					'no_cat' => true,		// I  disable the cat-selectbox
+					'get_rows' => 'admin.admin_cmds.get_remotes', // I  method/callback to request the data for the rows eg. 'notes.bo.get_rows'
+					'no_filter' => true, // I  disable the 1. filter
+					'no_filter2' => true, // I  disable the 2. filter (params are the same as for filter)
+					'no_cat' => true, // I  disable the cat-selectbox
 					'order' => 'remote_name',
 					'sort' => 'ASC',
 					'row_id' => 'remote_id',
@@ -165,7 +164,7 @@ 
 
 			if ($content['nm']['action'])
 			{
-				switch($content['nm']['action'])
+				switch ($content['nm']['action'])
 				{
 					case 'edit':
 						$content['remote'] = admin_cmd::read_remote($content['nm']['selected'][0]);
@@ -175,11 +174,11 @@ 
 				}
 				unset($content['nm']['action']);
 			}
-			elseif($content['remote']['button'])
+			elseif ($content['remote']['button'])
 			{
 				list($button) = each($content['remote']['button']);
 				unset($content['remote']['button']);
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -210,7 +209,7 @@ 
 				unset($content['nm']['add']);
 			}
 		}
-		$tpl->exec('admin.admin_cmds.remotes',$content,array(),array(),$content);
+		$tpl->exec('admin.admin_cmds.remotes', $content, array(), array(), $content);
 	}
 
 	/**
@@ -226,7 +225,7 @@ 
 				'default' => true,
 				'allowOnMultiple' => false,
 				'nm_action' => 'submit',
-				'group' => $group=0,
+				'group' => $group = 0,
 			),
 			'add' => array(
 				'caption' => 'Add',

Braces +10 added lines, -3 removed lines

@@ -37,7 +37,10 @@ 
 
 		$total = admin_cmd::get_rows($query,$rows,$readonlys);
 
-		if (!$rows) return array();
+		if (!$rows)
+		{
+			return array();
+		}
 
 		foreach($rows as &$row)
 		{
@@ -193,11 +196,15 @@ 
 						try {
 							$content['remote']['remote_id'] = admin_cmd::save_remote($content['remote']);
 							$content['msg'] = lang('Remote instance saved');
-						} catch (Exception $e) {
+						}
+						catch (Exception $e) {
 							$content['msg'] = lang('Error saving').': '.$e->getMessage().' ('.$e->getCode().')';
 							break;
 						}
-						if ($button == 'apply') break;
+						if ($button == 'apply')
+						{
+							break;
+						}
 						// fall through for save
 					case 'cancel':
 						unset($content['remote']);