EGroupware / egroupware

importexport/inc/class.importexport_iface_export_plugin.inc.php

Braces +2 added lines, -1 removed lines

@@ -34,7 +34,8 @@
  *
  * get_selector();  //returns array
  */
-interface importexport_iface_export_plugin {
+interface importexport_iface_export_plugin
+{
 	
 	/**
 	 * exports entries according to given definition object.

importexport/inc/class.importexport_widget_filter.inc.php

Braces +5 added lines, -2 removed lines

@@ -93,7 +93,8 @@ 
 						'get_rows'      => 'etemplate.ajax_select_widget.array_rows',
 						'id_field'      => ajax_select_widget::ARRAY_KEY,
 					);
-					if($field['rows']) {
+					if($field['rows'])
+					{
 						$options['num_rows'] = $field['rows'];
 					}
 
@@ -103,7 +104,9 @@ 
 					{
 						$options['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
 						unset($field['values']['@']);
-					} else {
+					}
+					else
+					{
 						$options['values'] = array_diff_key($field['values'], array_flip(ajax_select_widget::$known_options));
 					}
 					$options = array_merge($options, array_intersect_key($field['values'], array_flip(ajax_select_widget::$known_options)));

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

@@ -35,7 +35,7 @@ 
 	 *
 	 * @param string $cname
 	 */
-	public function beforeSendToClient($cname, Array $expand = Array())
+	public function beforeSendToClient($cname, array $expand = array())
 	{
 		$form_name = self::form_name($cname, $this->id);
 		if($this->getElementAttribute($form_name, 'customfields'))
@@ -185,7 +185,7 @@ 
 	 *
 	 * @return Array of widget info
 	 */
-	protected static function do_relative_date($lname, Array &$value, $options, $readonly)
+	protected static function do_relative_date($lname, array &$value, $options, $readonly)
 	{
 		// Maybe this could be moved to date widget
 		$input = boetemplate::empty_cell('select',$lname, array(
@@ -211,7 +211,7 @@ 
 	 *
 	 * @return Array of widget info
 	 */
-	protected static function do_absolute_date($lname, Array &$value, $options, $readonly)
+	protected static function do_absolute_date($lname, array &$value, $options, $readonly)
 	{
 		$input = boetemplate::empty_cell('hbox',$lname);
 

Spacing +25 added lines, -25 removed lines

@@ -38,18 +38,18 @@ 
 	public function beforeSendToClient($cname, Array $expand = Array())
 	{
 		$form_name = self::form_name($cname, $this->id);
-		if($this->getElementAttribute($form_name, 'customfields'))
+		if ($this->getElementAttribute($form_name, 'customfields'))
 		{
 			// Already done?  Still need to process, or sel_options may be missing
 			unset(self::$request->modifications[$form_name]);
 		}
-		$value =& self::get_array(self::$request->content, $form_name, true);
+		$value = & self::get_array(self::$request->content, $form_name, true);
 		$fields = $value['fields'];
 		unset($value['fields']);
 		$relative_dates = $this->attrs['relative_dates'];
 
 		// Fallback, so there's something there...
-		if(!is_array($fields))
+		if (!is_array($fields))
 		{
 			error_log("$this has no fields");
 			self::$transformation = array(
@@ -66,14 +66,14 @@ 
 		$this->setElementAttribute($form_name, 'prefix', self::$prefix);
 
 		$n = 1;
-		foreach($fields as $lname => &$field)
+		foreach ($fields as $lname => &$field)
 		{
-			$type =& $field['type'];
+			$type = & $field['type'];
 
 			// No filters are required
 			$field['needed'] = false;
 
-			switch($type)
+			switch ($type)
 			{
 				case 'date':
 				case 'date-time':
@@ -90,7 +90,7 @@ 
 						'get_rows'      => 'etemplate.ajax_select_widget.array_rows',
 						'id_field'      => ajax_select_widget::ARRAY_KEY,
 					);
-					if($field['rows']) {
+					if ($field['rows']) {
 						$options['num_rows'] = $field['rows'];
 					}
 
@@ -109,15 +109,15 @@ 
 					break;
 				case 'select':
 				default:
-					if(strpos($field['type'],'select') === 0)
+					if (strpos($field['type'], 'select') === 0)
 					{
 						if (count($field['values']) == 1 && isset($field['values']['@']))
 						{
 							$field['values'] = egw_customfields::get_options_from_file($field['values']['@']);
 						}
-						foreach((array)$field['values'] as $key => $val)
+						foreach ((array)$field['values'] as $key => $val)
 						{
-							if (substr($val = lang($val),-1) != '*')
+							if (substr($val = lang($val), -1) != '*')
 							{
 								$field['values'][$key] = $val;
 							}
@@ -129,27 +129,27 @@ 
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);
 					}
-					else if( $GLOBALS['egw_info']['apps'][$field['type']])
+					else if ($GLOBALS['egw_info']['apps'][$field['type']])
 					{
 						// Links
 					}
 					else
 					{
-						error_log('Trying to filter with unsupported field type ' . $lname . ': ' . $field['type']);
+						error_log('Trying to filter with unsupported field type '.$lname.': '.$field['type']);
 					}
 			}
 
 			// Send select options
-			if($field['values'])
+			if ($field['values'])
 			{
 				self::$request->sel_options[self::$prefix.$lname] = $field['values'];
 			}
 			$widget = self::factory($type, '<'.$type.' type="'.$type.'" id="'.self::$prefix.$lname.'"/>', self::$prefix.$lname);
-			if(method_exists($widget, 'beforeSendToClient'))
+			if (method_exists($widget, 'beforeSendToClient'))
 			{
 				$widget->id = self::$prefix.$lname;
 				$widget->attrs['type'] = $type;
-				if($type == 'link-to')
+				if ($type == 'link-to')
 				{
 					$widget->attrs['only_app'] = $field['type'];
 				}
@@ -161,7 +161,7 @@ 
 		parent::beforeSendToClient($cname, $expand);
 
 		$this->setElementAttribute($form_name, 'customfields', $fields);
-		$this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true));
+		$this->setElementAttribute($form_name, 'fields', array_fill_keys(array_keys($fields), true));
 		return false;
 	}
 
@@ -177,13 +177,13 @@ 
 	protected static function do_relative_date($lname, Array &$value, $options, $readonly)
 	{
 		// Maybe this could be moved to date widget
-		$input = boetemplate::empty_cell('select',$lname, array(
+		$input = boetemplate::empty_cell('select', $lname, array(
 			'readonly'	=> $readonly,
 			'no_lang'	=> true,
 			'options'	=> $options,
 			'sel_options'	=> array('' => lang('all'))
 		));
-		foreach(importexport_helper_functions::$relative_dates as $label => $values)
+		foreach (importexport_helper_functions::$relative_dates as $label => $values)
 		{
 			$input['sel_options'][$label] = lang($label);
 		}
@@ -202,10 +202,10 @@ 
 	 */
 	protected static function do_absolute_date($lname, Array &$value, $options, $readonly)
 	{
-		$input = boetemplate::empty_cell('hbox',$lname);
+		$input = boetemplate::empty_cell('hbox', $lname);
 
 		$type = 'date';
-		$from = boetemplate::empty_cell($type, $lname.'[from]',array(
+		$from = boetemplate::empty_cell($type, $lname.'[from]', array(
 			'readonly'      => $readonly,
 			'no_lang'       => True,
 			'size'          => $options
@@ -217,7 +217,7 @@ 
 			'size'          => $options
 		));
 		boetemplate::add_child($input, $from);
-		boetemplate::add_child($input,boetemplate::empty_cell('label','',array(
+		boetemplate::add_child($input, boetemplate::empty_cell('label', '', array(
 			'label' => lang('to'),
 			'no_lang' => true
 		)));
@@ -226,18 +226,18 @@ 
 	}
 
 
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value_in = (array)self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
+			$valid = & self::get_array($validated, $this->id ? $form_name : $field, true);
 
-			foreach($value_in as $key => $value)
+			foreach ($value_in as $key => $value)
 			{
 				// Client side cf widget automatically prefixes #
-				$valid[substr($key,strlen(self::$prefix))] = $value;
+				$valid[substr($key, strlen(self::$prefix))] = $value;
 			}
 		}
 	}

importexport/inc/class.importexport_wizard_basic_export_csv.inc.php

Braces +57 added lines, -21 removed lines

@@ -64,7 +64,11 @@ 
 			'wizard_step80' => lang('Filters'),
 		);
 		list($appname, $part2) = explode('_', get_class($this));
-		if(!$GLOBALS['egw_info']['apps'][$appname]) $appname .= '_'.$part2; // Handle apps with _ in the name
+		if(!$GLOBALS['egw_info']['apps'][$appname])
+		{
+			$appname .= '_'.$part2;
+		}
+		// Handle apps with _ in the name
 		Api\Translation::add_app($appname);
 	}
 
@@ -73,7 +77,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')
 		{
@@ -89,12 +96,17 @@ 
 					$content['mapping'][$field_name] = $field_name;
 				}
 			}
-			if($content['mapping']['all_custom_fields']) {
+			if($content['mapping']['all_custom_fields'])
+			{
 				// Need the appname during actual export, to fetch the fields
 				$parts = explode('_', get_class($this));
 				$appname = $parts[0];
-				foreach($parts as $name_part) {
-					if($GLOBALS['egw_info']['apps'][$appname]) break;
+				foreach($parts as $name_part)
+				{
+					if($GLOBALS['egw_info']['apps'][$appname])
+					{
+						break;
+					}
 					$appname .= '_'.$name_part; // Handle apps with _ in the name
 				}
 				$content['mapping']['all_custom_fields'] = $appname;
@@ -125,15 +137,20 @@ 
 			unset ($preserv['button']);
 			unset ($preserv['fields']);
 			$content['fields'] = array('');
-			if(!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
+			if(!$content['mapping'])
+			{
+				$content['mapping'] = $content['plugin_options']['mapping'];
+			}
 		
 			$row = 1;
-			foreach($this->export_fields as $field => $name) {
+			foreach($this->export_fields as $field => $name)
+			{
 				$content['fields'][] = array(
 					'field'	=>	$field,
 					'name'	=>	lang($name),
 				);
-				if($content['mapping'][$field]) {
+				if($content['mapping'][$field])
+				{
 					$content['fields']['export'][$row] = $field;
 				}
 				$row++;
@@ -155,11 +172,17 @@ 
 	 */
 	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['begin_with_fieldnames'] == 'label') {
-				foreach($content['mapping'] as $field => &$label) {
+		if ($content['step'] == 'wizard_step40')
+		{
+			if($content['begin_with_fieldnames'] == 'label')
+			{
+				foreach($content['mapping'] as $field => &$label)
+				{
 					// Check first, to avoid clearing any pseudo-columns (ex: All custom fields)
 					$label = $this->export_fields[$field] ? $this->export_fields[$field] : $label;
 				}
@@ -183,18 +206,24 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['delimiter'] && $content['plugin_options']['delimiter']) {
+			if(!$content['delimiter'] && $content['plugin_options']['delimiter'])
+			{
 				$content['delimiter'] = $content['plugin_options']['delimiter'];
-			} elseif (!$content['delimiter']) {
+			}
+			elseif (!$content['delimiter'])
+			{
 				$content['delimiter'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
 			}
-			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
+			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options']))
+			{
 				$content['begin_with_fieldnames'] = $content['plugin_options']['begin_with_fieldnames'];
 			}
-			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 
@@ -238,15 +267,20 @@ 
 	 */
 	function wizard_step80(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		}
 		// return from submit
-		if ($content['step'] == 'wizard_step80') {
+		if ($content['step'] == 'wizard_step80')
+		{
 			// Process submitted
 			unset($content['filter']);
 			unset($content['set_filter']['fields']);
 			foreach($content['set_filter'] as $key => $value)
 			{
-				if($value) {
+				if($value)
+				{
 					$content['filter'][$key] = $value;
 				}
 			}
@@ -264,7 +298,9 @@ 
 				default :
 					return $this->wizard_step80($content,$sel_options,$readonlys,$preserv);
 			}
-		} else {
+		}
+		else
+		{
 
 			// Step 50 - filters
 			$content['text'] = $this->steps['wizard_step80'];

Indentation +22 added lines, -22 removed lines

@@ -21,13 +21,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_export_csv.choose_fields',
 		'wizard_step40' => 'importexport.wizard_basic_export_csv.choosesepncharset',
@@ -36,19 +36,19 @@ 
 		
 
 	/**
-	* Destination fields for the export
-	* Key is the field name, value is the human version
-	*/
+	 * Destination fields for the export
+	 * Key is the field name, value is the human version
+	 */
 	protected $export_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();
 
 	/**
@@ -67,8 +67,8 @@ 
 	}
 
 	/**
-	* Choose fields to export
-	*/
+	 * Choose fields to export
+	 */
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
@@ -204,16 +204,16 @@ 
 			);
 			$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
 			array(
-                                'user'  => lang('User preference'),
-                        );
+								'user'  => lang('User preference'),
+						);
 
-                        // Add in extra allowed charsets
-                        $config = config::read('importexport');
-                        $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));
-                        }
+						// Add in extra allowed charsets
+						$config = config::read('importexport');
+						$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['convert'] = array(
 				0	=> lang('Database values'),
 				1	=> lang('Human friendly values')

Spacing +36 added lines, -36 removed lines

@@ -62,7 +62,7 @@ 
 			'wizard_step80' => lang('Filters'),
 		);
 		list($appname, $part2) = explode('_', get_class($this));
-		if(!$GLOBALS['egw_info']['apps'][$appname]) $appname .= '_'.$part2; // Handle apps with _ in the name
+		if (!$GLOBALS['egw_info']['apps'][$appname]) $appname .= '_'.$part2; // Handle apps with _ in the name
 		translation::add_app($appname);
 	}
 
@@ -71,14 +71,14 @@ 
 	*/
 	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')
 		{
-			foreach($content['fields']['export'] as $field_name)
+			foreach ($content['fields']['export'] as $field_name)
 			{
 				// Preserve original field names, where available
-				if($content['plugin_options']['no_header_translation'] && $content['plugin_options']['mapping'][$field_name])
+				if ($content['plugin_options']['no_header_translation'] && $content['plugin_options']['mapping'][$field_name])
 				{
 					$content['mapping'][$field_name] = $content['plugin_options']['mapping'][$field_name];
 				}
@@ -87,12 +87,12 @@ 
 					$content['mapping'][$field_name] = $field_name;
 				}
 			}
-			if($content['mapping']['all_custom_fields']) {
+			if ($content['mapping']['all_custom_fields']) {
 				// Need the appname during actual export, to fetch the fields
 				$parts = explode('_', get_class($this));
 				$appname = $parts[0];
-				foreach($parts as $name_part) {
-					if($GLOBALS['egw_info']['apps'][$appname]) break;
+				foreach ($parts as $name_part) {
+					if ($GLOBALS['egw_info']['apps'][$appname]) break;
 					$appname .= '_'.$name_part; // Handle apps with _ in the name
 				}
 				$content['mapping']['all_custom_fields'] = $appname;
@@ -103,13 +103,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_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -123,15 +123,15 @@ 
 			unset ($preserv['button']);
 			unset ($preserv['fields']);
 			$content['fields'] = array('');
-			if(!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
+			if (!$content['mapping']) $content['mapping'] = $content['plugin_options']['mapping'];
 		
 			$row = 1;
-			foreach($this->export_fields as $field => $name) {
+			foreach ($this->export_fields as $field => $name) {
 				$content['fields'][] = array(
 					'field'	=>	$field,
 					'name'	=>	lang($name),
 				);
-				if($content['mapping'][$field]) {
+				if ($content['mapping'][$field]) {
 					$content['fields']['export'][$row] = $field;
 				}
 				$row++;
@@ -153,11 +153,11 @@ 
 	 */
 	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['begin_with_fieldnames'] == 'label') {
-				foreach($content['mapping'] as $field => &$label) {
+			if ($content['begin_with_fieldnames'] == 'label') {
+				foreach ($content['mapping'] as $field => &$label) {
 					// Check first, to avoid clearing any pseudo-columns (ex: All custom fields)
 					$label = $this->export_fields[$field] ? $this->export_fields[$field] : $label;
 				}
@@ -165,13 +165,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_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -181,18 +181,18 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['delimiter'] && $content['plugin_options']['delimiter']) {
+			if (!$content['delimiter'] && $content['plugin_options']['delimiter']) {
 				$content['delimiter'] = $content['plugin_options']['delimiter'];
 			} elseif (!$content['delimiter']) {
 				$content['delimiter'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'] ? $content['plugin_options']['charset'] : 'user';
 			}
-			if(!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
+			if (!array_key_exists('begin_with_fieldnames', $content) && array_key_exists('begin_with_fieldnames', $content['plugin_options'])) {
 				$content['begin_with_fieldnames'] = $content['plugin_options']['begin_with_fieldnames'];
 			}
-			if(!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
+			if (!array_key_exists('convert', $content) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 
@@ -202,17 +202,17 @@ 
 				1	=> lang('Field names'),
 				'label'	=> lang('Field labels')
 			);
-			$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets()+
+			$sel_options['charset'] = $GLOBALS['egw']->translation->get_installed_charsets() +
 			array(
                                 'user'  => lang('User preference'),
                         );
 
                         // Add in extra allowed charsets
                         $config = 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'),
@@ -236,15 +236,15 @@ 
 	 */
 	function wizard_step80(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::' . __METHOD__ .'->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::'.__METHOD__.'->$content '.print_r($content, true));
 		// return from submit
 		if ($content['step'] == 'wizard_step80') {
 			// Process submitted
 			unset($content['filter']);
 			unset($content['set_filter']['fields']);
-			foreach($content['set_filter'] as $key => $value)
+			foreach ($content['set_filter'] as $key => $value)
 			{
-				if($value) {
+				if ($value) {
 					$content['filter'][$key] = $value;
 				}
 			}
@@ -254,13 +254,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_step80($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step80($content, $sel_options, $readonlys, $preserv);
 			}
 		} else {
 
@@ -271,15 +271,15 @@ 
 			unset ($preserv['button']);
 
 			$content['set_filter']['fields'] = importexport_helper_functions::get_filter_fields(
-				$content['application'],$content['plugin'],$this
+				$content['application'], $content['plugin'], $this
 			);
 			// Load existing filter from either content or definition
-			foreach($content['set_filter']['fields'] as $field => $settings)
+			foreach ($content['set_filter']['fields'] as $field => $settings)
 			{
 				$content['set_filter'][$field] = $content['filter'][$field];
 			}
 
-			if(!$content['set_filter']['fields'])
+			if (!$content['set_filter']['fields'])
 			{
 				// No fields
 				return importexport_definitions_ui::SKIP;

importexport/inc/class.importexport_definitions_ui.inc.php

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

@@ -940,7 +940,7 @@
 	 * Determine if the user is allowed to edit the definition
 	 *
 	 */
-	protected function can_edit(Array $definition)
+	protected function can_edit(array $definition)
 	{
 		if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{

Doc Comments +3 added lines, -2 removed lines

@@ -76,7 +76,7 @@ 
 	/**
 	 * List defined {im|ex}ports
 	 *
-	 * @param array $content=null
+	 * @param array $content
 	 */
 	function index($content = null,$msg='')
 	{
@@ -303,7 +303,8 @@ 
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 entries 'deleted'
-	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $msg
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$selected,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)

Spacing +157 added lines, -158 removed lines

@@ -56,12 +56,12 @@ 
 	function __construct()
 	{
 		// we cant deal with notice and warnings, as we are on ajax!
-		error_reporting(E_ALL & ~E_NOTICE & ~E_WARNING);
+		error_reporting(E_ALL&~E_NOTICE&~E_WARNING);
 		$GLOBALS['egw']->translation->add_app(self::_appname);
 		$GLOBALS['egw_info']['flags']['currentapp'] = self::_appname;
 		
 		$this->etpl = new etemplate_new();
-		$this->clock = html::image(self::_appname,'clock');
+		$this->clock = html::image(self::_appname, 'clock');
 		$this->steps = array(
 			'wizard_step10' => lang('Choose an application'),
 			'wizard_step20' => lang('Choose a plugin'),
@@ -78,18 +78,18 @@ 
 	 *
 	 * @param array $content=null
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$filter = array('name' => '*');
 
-		if($GLOBALS['egw_info']['user']['apps']['admin']) {
+		if ($GLOBALS['egw_info']['user']['apps']['admin']) {
 			// Any public definition
-			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = ' . $GLOBALS['egw_info']['user']['account_id'] . ')';
+			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = '.$GLOBALS['egw_info']['user']['account_id'].')';
 		} else {
 			// Filter private definitions
 			$filter['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			$config = config::read('phpgwapi');
-			if($config['export_limit'] == 'no' && !bo_merge::is_export_limit_excepted()) {
+			if ($config['export_limit'] == 'no' && !bo_merge::is_export_limit_excepted()) {
 				$filter['type'] = 'import';
 			}
 		}
@@ -100,12 +100,12 @@ 
 			if (isset($content['nm']['rows']['delete']))
 			{
 				$content['nm']['action'] = 'delete';
-				$content['nm']['selected'] = array_keys($content['nm']['rows']['delete'],'pressed');
+				$content['nm']['selected'] = array_keys($content['nm']['rows']['delete'], 'pressed');
 			}
-			elseif(($button = array_search('pressed',$content['nm']['rows'])) !== false)
+			elseif (($button = array_search('pressed', $content['nm']['rows'])) !== false)
 			{
 				$selected = $content['nm']['rows']['selected'];
-				if(count($selected) < 1 || !is_array($selected)) common::egw_exit();
+				if (count($selected) < 1 || !is_array($selected)) common::egw_exit();
 				switch ($button)
 				{
 					case 'delete_selected' :
@@ -127,54 +127,54 @@ 
 				else
 				{
 					// Action has an additional parameter
-					if(in_array($content['nm']['action'], array('owner', 'allowed')))
+					if (in_array($content['nm']['action'], array('owner', 'allowed')))
 					{
 						$action = $content['nm']['action'];
-						if($content['nm']['action'] == 'allowed')
+						if ($content['nm']['action'] == 'allowed')
 						{
 							$content['allowed'] = $content['allowed_popup']['allowed_private'] == 'true' ? null : (
-								$content['allowed_popup']['all_users']=='true' ? 'all' : implode(',',$content['allowed_popup']['allowed'])
+								$content['allowed_popup']['all_users'] == 'true' ? 'all' : implode(',', $content['allowed_popup']['allowed'])
 							);
 						}
 						else
 						{
 							$content['owner'] = $content['owner_popup']['owner'];
 						}
-						if(is_array($content[$content['nm']['action']]))
+						if (is_array($content[$content['nm']['action']]))
 						{
-							$content[$content['nm']['action']] = implode(',',$content[$content['nm']['action']]);
+							$content[$content['nm']['action']] = implode(',', $content[$content['nm']['action']]);
 						}
-						$content['nm']['action'] .= '_' . $content[$action];
+						$content['nm']['action'] .= '_'.$content[$action];
 						unset($content[$action]);
 						unset($content['allowed_popup']);
 					}
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'index',$msg))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'index', $msg))
 					{
-						$msg .= lang('%1 definition(s) %2',$success,$action_msg);
+						$msg .= lang('%1 definition(s) %2', $success, $action_msg);
 					}
-					elseif(empty($msg))
+					elseif (empty($msg))
 					{
-						$msg .= lang('%1 definition(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 definition(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 				}
 			}
 		}
 
-		if(!is_array($content['nm'])) {
+		if (!is_array($content['nm'])) {
 			$content['nm'] = array(
 				'get_rows'	=> 'importexport.importexport_definitions_ui.get_rows',
 				'no_cat'	=> true,
 				'no_filter'	=> true,
 				'no_filter2'	=> true,
-				'csv_fields'	=> false,	// Disable CSV export, uses own export
-				'default_cols'  => '!actions',  // switch legacy actions column and row off by default
+				'csv_fields'	=> false, // Disable CSV export, uses own export
+				'default_cols'  => '!actions', // switch legacy actions column and row off by default
 				'row_id'	=> 'definition_id',
 				'placeholder_actions' => array('add')
 			);
-			if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
+			if ($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
 		}
-		if(egw_session::appsession('index', 'importexport'))
+		if (egw_session::appsession('index', 'importexport'))
 		{
 			$content['nm'] = array_merge($content['nm'], egw_session::appsession('index', 'importexport'));
 		}
@@ -191,14 +191,14 @@ 
 		);
 		foreach ($this->plugins as $appname => $options)
 		{
-			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if ($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 				$sel_options['application'][$appname] = lang($appname);
 			}
 		}
-		if($msg) $content['msg'] = $msg;
+		if ($msg) $content['msg'] = $msg;
 
 		$etpl = new etemplate_new(self::_appname.'.definition_index');
-		return $etpl->exec( self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv );
+		return $etpl->exec(self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv);
 	}
 
 	private function get_actions() {
@@ -287,7 +287,7 @@ 
 		);
 
 		// Unset admin actions
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			unset($actions['schedule']);
 		}
@@ -306,27 +306,27 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$selected,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $selected, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		//error_log( __METHOD__."('$action', ".array2string($selected).', '.array2string($use_all).",,, '$session_name')");
 		if ($use_all)
 		{
 			// get the whole selection
-			$old_query = $query = is_array($session_name) ? $session_name : egw_session::appsession($session_name,'importexport');
+			$old_query = $query = is_array($session_name) ? $session_name : egw_session::appsession($session_name, 'importexport');
 
-			@set_time_limit(0);				// switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;		// all
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->get_rows($query,$rows,$readonlys);
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->get_rows($query, $rows, $readonlys);
 
 			$selected = array();
-			foreach($rows as $row) {
+			foreach ($rows as $row) {
 				$selected[] = $row['definition_id'];
 			}
-			if(!is_array($session_name))
+			if (!is_array($session_name))
 			{
 				// Restore old query
-				egw_session::appsession($session_name, 'importexport',$old_query);
+				egw_session::appsession($session_name, 'importexport', $old_query);
 			}
 		}
 
@@ -335,10 +335,10 @@ 
 
 		$bodefinitions = new importexport_definitions_bo(false, true);
 
-		switch($action) {
+		switch ($action) {
 			case 'execute':
 				// There's probably a way to do this in just JS, all the info should be there...
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
 					$link = egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_'.$definition['type'].'_ui.'.$definition['type'].'_dialog',
@@ -349,14 +349,14 @@ 
 				}
 				break;
 			case 'allowed':
-				$action = 'allowed_users';// Field is allowed_users, popup doesn't like _
+				$action = 'allowed_users'; // Field is allowed_users, popup doesn't like _
 			case 'owner':
-				$action_msg = lang('changed'. ' ' . $action);
-				foreach($selected as $id) {
+				$action_msg = lang('changed'.' '.$action);
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if ($definition['definition_id']) {
 						// Prevent private with no owner
-						if(!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						if (!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 						$definition[$action] = $settings;
 						$bodefinitions->save($definition);
@@ -374,7 +374,7 @@ 
 				$mime_type = ($GLOBALS['egw']->html->user_agent == 'msie' || $GLOBALS['egw']->html->user_agent == 'opera') ?
 					'application/octetstream' : 'application/octet-stream';
 				$name = 'importexport_definition.xml';
-				header('Content-Type: ' . $mime_type);
+				header('Content-Type: '.$mime_type);
 				header('Content-Disposition: attachment; filename="'.$name.'"');
 				echo $bodefinitions->export($selected);
 				common::egw_exit();
@@ -383,16 +383,16 @@ 
 			case 'copy':
 				$action_msg = lang('copied');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if ($definition['definition_id']) {
 						unset($definition['definition_id']);
-						$definition['name'] = $settings ? $settings : $definition['name'] . ' copy';
+						$definition['name'] = $settings ? $settings : $definition['name'].' copy';
 						try {
 							$bodefinitions->save($definition);
 						} catch (Exception $e) {
 							try {
-								$definition['name'] .= ' ' . $GLOBALS['egw_info']['user']['account_lid'];
+								$definition['name'] .= ' '.$GLOBALS['egw_info']['user']['account_lid'];
 								$bodefinitions->save($definition);
 							} catch (Exception $ex) {
 								$failed++;
@@ -407,16 +407,16 @@ 
 			case 'createexport':
 				$action_msg = lang('created');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach ($selected as $id) {
 					$definition = new importexport_definition($id);
 					try {
 						$export = $bodefinitions->export_from_import($definition);
 						$export->save();
 					} catch (Exception $e) {
-						if($export)
+						if ($export)
 						{
 							try {
-								$export->name = $export->name.' ' . $GLOBALS['egw_info']['user']['account_lid'];
+								$export->name = $export->name.' '.$GLOBALS['egw_info']['user']['account_lid'];
 								$export->save();
 							} catch (Exception $ex) {
 								$failed++;
@@ -438,13 +438,13 @@ 
 
 	public function get_rows(&$query, &$rows, &$readonlys) {
 		$rows = array();
-		egw_session::appsession('index','importexport',$query);
+		egw_session::appsession('index', 'importexport', $query);
 
 		// Special handling for allowed users 'private'
-		if($query['col_filter']['allowed_users'] == 'private')
+		if ($query['col_filter']['allowed_users'] == 'private')
 		{
 			unset($query['col_filter']['allowed_users']);
-			$query['col_filter'][] = 'allowed_users = ' . $GLOBALS['egw']->db->quote(',,');
+			$query['col_filter'][] = 'allowed_users = '.$GLOBALS['egw']->db->quote(',,');
 		}
 		$bodefinitions = new importexport_definitions_bo($query['col_filter'], true);
 		// We don't care about readonlys for the UI
@@ -459,7 +459,7 @@ 
 	 */
 	function edit()
 	{
-		if(!$_definition = $_GET['definition'])
+		if (!$_definition = $_GET['definition'])
 		{
 			$content = array(
 				'edit'		=> true,
@@ -468,11 +468,11 @@ 
 			);
 
 			// Jump to a step
-			if($_GET['step'])
+			if ($_GET['step'])
 			{
 				$content['edit'] = false;
 				// Wizard will process previous step, then advance
-				$content['step'] = $this->get_step($_GET['step'],-1);
+				$content['step'] = $this->get_step($_GET['step'], -1);
 				$content['button']['next'] = 'pressed';
 				$this->wizard($content);
 			}
@@ -483,7 +483,7 @@ 
 			}
 			return;
 		}
-		if(is_numeric($_GET['definition']))
+		if (is_numeric($_GET['definition']))
 		{
 			$definition = (int)$_GET['definition'];
 		}
@@ -495,31 +495,31 @@ 
 		$definition = $bodefinitions->read($definition);
 		$definition['edit'] = true;
 		// Jump to a step
-		if($_GET['step'])
+		if ($_GET['step'])
 		{
 			$definition['edit'] = false;
 			// Wizard will process previous step, then advance
-			$definition['step'] = $_GET['step'];;
+			$definition['step'] = $_GET['step']; ;
 			$definition['button'] = array('next' => 'pressed');
 		}
 		$this->wizard($definition);
 	}
 
-	function wizard($content = null, $msg='')
+	function wizard($content = null, $msg = '')
 	{
 		$this->etpl->read('importexport.wizardbox');
 
-		if(is_array($content) &&! $content['edit'])
+		if (is_array($content) && !$content['edit'])
 		{
-			if(self::_debug) error_log('importexport.wizard->$content '. print_r($content,true));
+			if (self::_debug) error_log('importexport.wizard->$content '.print_r($content, true));
 			//foreach($content as $key => $val) error_log(" $key : ".array2string($val));
 			// fetch plugin object
-			if($content['plugin'] && $content['application'])
+			if ($content['plugin'] && $content['application'])
 			{
-				$wizard_name = $content['application'] . '_wizard_' . str_replace($content['application'] . '_', '', $content['plugin']);
+				$wizard_name = $content['application'].'_wizard_'.str_replace($content['application'].'_', '', $content['plugin']);
 
 				// we need to deal with the wizard object if exists
-				if (file_exists(EGW_SERVER_ROOT . '/'. $content['application']."/inc/class.$wizard_name.inc.php"))
+				if (file_exists(EGW_SERVER_ROOT.'/'.$content['application']."/inc/class.$wizard_name.inc.php"))
 				{
 					$wizard_plugin = $wizard_name;
 				}
@@ -528,38 +528,38 @@ 
 					$wizard_plugin = $content['plugin'];
 				}
 				// App translations
-				if($content['application']) translation::add_app($content['application']);
+				if ($content['application']) translation::add_app($content['application']);
 
 				$this->plugin = is_object($GLOBALS['egw']->$wizard_plugin) ? $GLOBALS['egw']->$wizard_plugin : new $wizard_plugin;
 
 				// Global object needs to be the same, or references to plugin don't work
-				if(!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
-					$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				if (!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
+					$GLOBALS['egw']->importexport_definitions_ui = & $this;
 			}
 			// deal with buttons even if we are not on ajax
-			if(isset($content['button']) && array_search('pressed',$content['button']) === false && count($content['button']) == 1)
+			if (isset($content['button']) && array_search('pressed', $content['button']) === false && count($content['button']) == 1)
 			{
 				$button = array_keys($content['button']);
 				$content['button'] = array($button[0] => 'pressed');
 			}
 
 			// post process submitted step
-			if($content['step'])
+			if ($content['step'])
 			{
-				if(!$this->can_edit($content))
+				if (!$this->can_edit($content))
 				{
 					// Each step changes definition, reload it
 					$bodefinitions = new importexport_definitions_bo();
 					$definition = $bodefinitions->read($content);
 					$content = $definition + array('step' => $content['step'], 'button' => $content['button']);
 				}
-				if(!key_exists($content['step'],$this->steps))
+				if (!key_exists($content['step'], $this->steps))
 				{
-					$next_step = $this->plugin->$content['step']($content,$sel_options,$readonlys,$preserv);
+					$next_step = $this->plugin->$content['step']($content, $sel_options, $readonlys, $preserv);
 				}
 				else
 				{
-					$next_step = $this->$content['step']($content,$sel_options,$readonlys,$preserv);
+					$next_step = $this->$content['step']($content, $sel_options, $readonlys, $preserv);
 				}
 			}
 			else
@@ -571,23 +571,23 @@ 
 			$sel_options = $readonlys = $preserv = array();
 
 			// Disable finish button if required fields are missing
-			if(!$content['name'] || !$content['type'] || !$content['plugin'])
+			if (!$content['name'] || !$content['type'] || !$content['plugin'])
 			{
 				$readonlys['button[finish]'] = true;
 			}
 			do
 			{
-				if(!key_exists($next_step,$this->steps))
+				if (!key_exists($next_step, $this->steps))
 				{
-					$this->wizard_content_template = $this->plugin->$next_step($content,$sel_options,$readonlys,$preserv);
+					$this->wizard_content_template = $this->plugin->$next_step($content, $sel_options, $readonlys, $preserv);
 				}
 				else
 				{
-					$this->wizard_content_template = $this->$next_step($content,$sel_options,$readonlys,$preserv);
+					$this->wizard_content_template = $this->$next_step($content, $sel_options, $readonlys, $preserv);
 				}
-				if($this->wizard_content_template == self::SKIP)
+				if ($this->wizard_content_template == self::SKIP)
 				{
-					if(!key_exists($content['step'],$this->steps))
+					if (!key_exists($content['step'], $this->steps))
 					{
 						$next_step = $this->plugin->$content['step']($content);
 					}
@@ -596,9 +596,9 @@ 
 						$next_step = $this->$content['step']($content);
 					}
 				}
-			} while($this->wizard_content_template == self::SKIP);
+			} while ($this->wizard_content_template == self::SKIP);
 			
-			if(!$this->can_edit($content))
+			if (!$this->can_edit($content))
 			{
 				$readonlys[$this->wizard_content_template] = true;
 				$preserve = $content;
@@ -607,21 +607,21 @@ 
 
 			unset($content['button']);
 			$content['wizard_content'] = $this->wizard_content_template;
-			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard',$content,$sel_options,$readonlys,$preserv,2);
+			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard', $content, $sel_options, $readonlys, $preserv, 2);
 		}
 		else
 		{
 			// initial content
 			$sel_options = $readonlys = $preserv = array();
 			$readonlys['button[previous]'] = true;
-			if($content['edit'])
+			if ($content['edit'])
 			{
 				unset ($content['edit']);
 			}
 
 			$this->wizard_content_template = $this->wizard_step10($content, $sel_options, $readonlys, $preserv);
 
-			if(!$this->can_edit($content))
+			if (!$this->can_edit($content))
 			{
 				$readonlys[$this->wizard_content_template] = true;
 				$preserve = $content;
@@ -629,7 +629,7 @@ 
 			}
 
 			$content['wizard_content'] = $this->wizard_content_template;
-			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard',$content,$sel_options,$readonlys,$preserv,2);
+			$this->etpl->exec(self::_appname.'.importexport_definitions_ui.wizard', $content, $sel_options, $readonlys, $preserv, 2);
 		}
 	}
 
@@ -640,31 +640,31 @@ 
 	 * @param int $step_width
 	 * @return string containing function name of next step
 	 */
-	function get_step ($curr_step, $step_width)
+	function get_step($curr_step, $step_width)
 	{
 		/*if($content['plugin'] && $content['application']&& !is_object($this->plugin))
 		{
 			$plugin_definition =  $this->plugins[$content['application']][$content['plugin']]['definition'];
 			if($plugin_definition) $this->plugin = new $plugin_definition;
 		}*/
-		if(is_object($this->plugin) && is_array($this->plugin->steps))
+		if (is_object($this->plugin) && is_array($this->plugin->steps))
 		{
-			$steps = array_merge($this->steps,$this->plugin->steps);
-			$steps = array_flip($steps); asort($steps);	$steps = array_flip($steps);
+			$steps = array_merge($this->steps, $this->plugin->steps);
+			$steps = array_flip($steps); asort($steps); $steps = array_flip($steps);
 		}
 		else
 		{
 			$steps = $this->steps;
 		}
 		$step_keys = array_keys($steps);
-		$nn = array_search($curr_step,$step_keys)+(int)$step_width;
-		return (key_exists($nn,$step_keys)) ? $step_keys[$nn] : 'wizard_finish';
+		$nn = array_search($curr_step, $step_keys) + (int)$step_width;
+		return (key_exists($nn, $step_keys)) ? $step_keys[$nn] : 'wizard_finish';
 	}
 
 
 	function wizard_step10(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content, true));
 
 		// return from step10
 		if ($content['step'] == 'wizard_step10')
@@ -672,11 +672,11 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step10($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step10($content, $sel_options, $readonlys, $preserv);
 			}
 
 		}
@@ -686,7 +686,7 @@ 
 			$content['text'] = $this->steps['wizard_step10'];
 			foreach ($this->plugins as $appname => $options)
 			{
-				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+				if ($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
 					$sel_options['application'][$appname] = lang($appname);
 				}
 			}
@@ -702,7 +702,7 @@ 
 	// get plugin
 	function wizard_step20(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.'.get_class($this).'::wizard_step20->$content '.print_r($content, true));
 
 		// return from step20
 		if ($content['step'] == 'wizard_step20')
@@ -711,21 +711,21 @@ 
 			{
 				case 'next':
 					// There's no real reason the plugin has to come from any of these, as long as it has a $steps variable
-					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
+					if ($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
 						$content['type'] = 'import';
-					} elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false) {
+					} elseif ($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin), 'export') !== false) {
 						$content['type'] = 'export';
 					} else {
 						throw new egw_exception('Invalid plugin');
 					}
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'previous' :
 					$readonlys['button[previous]'] = true;
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step20($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step20($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step20
@@ -734,8 +734,8 @@ 
 			$content['text'] = $this->steps['wizard_step20'];
 			$config = config::read('phpgwapi');
 			foreach ($this->plugins[$content['application']] as $type => $plugins) {
-				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
-				foreach($plugins as $plugin => $name) {
+				if ($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
+				foreach ($plugins as $plugin => $name) {
 					$sel_options['plugin'][$plugin] = $name;
 				}
 			}
@@ -751,15 +751,15 @@ 
 	// name
 	function wizard_step21(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content, true));
 
 		// Check for duplicate name
 		$duplicate = isset($content['duplicate_error']);
-		if($content['name'] && !$duplicate)
+		if ($content['name'] && !$duplicate)
 		{
 			try {
 				$check_definition = new importexport_definition($content['name']);
-				if($check_definition && $check_definition->definition_id && $check_definition->definition_id != $content['definition_id'])
+				if ($check_definition && $check_definition->definition_id && $check_definition->definition_id != $content['definition_id'])
 				{
 					throw new Exception('Already exists');
 				}
@@ -769,21 +769,21 @@ 
 
 				// Try some suggestions
 				$suggestions = array(
-					$content['name'] .'-'. $GLOBALS['egw_info']['user']['account_lid'],
-					$content['name'] .'-'. $GLOBALS['egw_info']['user']['account_id'],
-					$content['name'] .'-'. egw_time::to('now', true),
+					$content['name'].'-'.$GLOBALS['egw_info']['user']['account_lid'],
+					$content['name'].'-'.$GLOBALS['egw_info']['user']['account_id'],
+					$content['name'].'-'.egw_time::to('now', true),
 					//$content['name'] .'-'. rand(0,100),
 				);
-				foreach($suggestions as $key => $suggestion) {
+				foreach ($suggestions as $key => $suggestion) {
 					$sug_definition = new importexport_definition($suggestion);
-					if($sug_definition->definition_id) {
+					if ($sug_definition->definition_id) {
 						unset($suggestions[$key]);
 					}
 				}
-				if($suggestions) {
-					$content['duplicate_error'] .= '  '. lang('Try')." \n" . implode("\n", $suggestions);
+				if ($suggestions) {
+					$content['duplicate_error'] .= '  '.lang('Try')." \n".implode("\n", $suggestions);
 				}
-				return $this->get_step($content['step'],0);
+				return $this->get_step($content['step'], 0);
 			}
 		}
 
@@ -793,19 +793,19 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $this->get_step($content['step'],1);
+					return $this->get_step($content['step'], 1);
 				case 'previous' :
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step21($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step21($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step21
 		else
 		{
-			$content['text'] = $this->steps['wizard_step21'] . ($duplicate ? "\n".$content['duplicate_error'] : '');
+			$content['text'] = $this->steps['wizard_step21'].($duplicate ? "\n".$content['duplicate_error'] : '');
 			$content['step'] = 'wizard_step21';
 			unset($content['duplicate_error']);
 			$preserv = $content;
@@ -817,17 +817,16 @@ 
 	// allowed users
 	function wizard_step90(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content, true));
 
 		// return from step90
 		if ($content['step'] == 'wizard_step90')
 		{
-			if($this->can_edit($content))
+			if ($this->can_edit($content))
 			{
-				$content['owner'] = $content['just_me'] || !$GLOBALS['egw']->acl->check('share_definitions', EGW_ACL_READ,'importexport') ?
-					($content['owner'] ? $content['owner'] : $GLOBALS['egw_info']['user']['account_id']) :
-					null;
-				$content['allowed_users'] = $content['just_me'] ? '' : ($content['all_users'] ? 'all' : implode(',',$content['allowed_users']));
+				$content['owner'] = $content['just_me'] || !$GLOBALS['egw']->acl->check('share_definitions', EGW_ACL_READ, 'importexport') ?
+					($content['owner'] ? $content['owner'] : $GLOBALS['egw_info']['user']['account_id']) : null;
+				$content['allowed_users'] = $content['just_me'] ? '' : ($content['all_users'] ? 'all' : implode(',', $content['allowed_users']));
 				unset($content['just_me']);
 			}
 
@@ -835,12 +834,12 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'previous' :
-					return $this->get_step($content['step'],-1);
+					return $this->get_step($content['step'], -1);
 				case 'next':
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step90($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step90($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step90
@@ -851,10 +850,10 @@ 
 			$preserv = $content;
 
 			// Set owner for non-admins
-			$content['just_me'] = ((!$content['allowed_users'] || !$content['allowed_users'][0] && count($content['allowed_users']) ==1) && $content['owner']);
-			$content['all_users'] = is_array($content['allowed_users']) && array_key_exists('0',$content['allowed_users']) && $content['allowed_users'][0] == 'all' ||
+			$content['just_me'] = ((!$content['allowed_users'] || !$content['allowed_users'][0] && count($content['allowed_users']) == 1) && $content['owner']);
+			$content['all_users'] = is_array($content['allowed_users']) && array_key_exists('0', $content['allowed_users']) && $content['allowed_users'][0] == 'all' ||
 			$content['allowed_users'] == 'all';
-			if(!$GLOBALS['egw']->acl->check('share_definition', EGW_ACL_READ, 'importexport') && !$GLOBALS['egw_info']['user']['apps']['admin'])
+			if (!$GLOBALS['egw']->acl->check('share_definition', EGW_ACL_READ, 'importexport') && !$GLOBALS['egw_info']['user']['apps']['admin'])
 			{
 				$content['allowed_users'] = array();
 				$readonlys['allowed_users'] = true;
@@ -870,11 +869,11 @@ 
 				)
 			);
 			// Hide 'just me' checkbox, users get confused by read-only
-			if($readonlys['just_me'] || !$this->can_edit($content))
+			if ($readonlys['just_me'] || !$this->can_edit($content))
 			{
 				$content['no_just_me'] = true;
 			}
-			if($readonlys['all_users'] || !$this->can_edit($content))
+			if ($readonlys['all_users'] || !$this->can_edit($content))
 			{
 				$content['no_all_users'] = true;
 			}
@@ -887,7 +886,7 @@ 
 
 	function wizard_finish(&$content)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		if (self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content, true));
 		// Take out some UI leavings
 		unset($content['text']);
 		unset($content['step']);
@@ -897,26 +896,26 @@ 
 		$bodefinitions->save($content);
 		// This message is displayed if browser cant close window
 		$content['msg'] = lang('ImportExport wizard finished successfully!');
-		egw_framework::refresh_opener('','importexport');
+		egw_framework::refresh_opener('', 'importexport');
 		egw_framework::window_close();
 		return 'importexport.wizard_close';
 	}
 
-	function import_definition($content='')
+	function import_definition($content = '')
 	{
 		$bodefinitions = new importexport_definitions_bo();
 		if (is_array($content))
 		{
-			if($content['import_file']['tmp_name'])
+			if ($content['import_file']['tmp_name'])
 			{
 				$result = $bodefinitions->import($content['import_file']['tmp_name']);
-				$msg = lang('%1 definitions %2', count($result), lang('imported')) ."\n". implode("\n", array_keys($result));
+				$msg = lang('%1 definitions %2', count($result), lang('imported'))."\n".implode("\n", array_keys($result));
 				return $this->index(null, $msg);
 			}
-			if($content['update'])
+			if ($content['update'])
 			{
 				$applist = importexport_helper_functions::get_apps('all', true);
-				foreach($applist as $appname) {
+				foreach ($applist as $appname) {
 					importexport_helper_functions::load_defaults($appname);
 				}
 				return $this->index();
@@ -926,7 +925,7 @@ 
 		{
 			$content = array();
 			$etpl = new etemplate(self::_appname.'.import_definition');
-			return $etpl->exec(self::_appname.'.importexport_definitions_ui.import_definition',$content,array(),$readonlys,$preserv);
+			return $etpl->exec(self::_appname.'.importexport_definitions_ui.import_definition', $content, array(), $readonlys, $preserv);
 		}
 	}
 
@@ -936,17 +935,17 @@ 
 	 */
 	protected function can_edit(Array $definition)
 	{
-		if($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
+		if ($definition['owner'] && $definition['owner'] == $GLOBALS['egw_info']['user']['account_id'])
 		{
 			// Definition belongs to user
 			return true;
 		}
-		elseif($definition['definition_id'] && !$definition['owner'] && $GLOBALS['egw_info']['user']['apps']['admin'])
+		elseif ($definition['definition_id'] && !$definition['owner'] && $GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			// Definition is unowned, and user is an admin
 			return true;
 		}
-		elseif(!$definition['definition_id'])
+		elseif (!$definition['definition_id'])
 		{
 			// Definition is in-progress, not saved yet
 			return true;
@@ -959,26 +958,26 @@ 
 	 */
 	public function site_config($content = array())
 	{
-		if(!$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			egw::redirect_link('/home');
 		}
-		if($content['save'])
+		if ($content['save'])
 		{
 			unset($content['save']);
 
 			// ACL
-			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'definition',false);
-			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'share_definition',false);
+			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'definition', false);
+			$GLOBALS['egw']->acl->delete_repository(self::_appname, 'share_definition', false);
 
-			foreach($content['share_definition'] as $group)
+			foreach ($content['share_definition'] as $group)
 			{
-				$GLOBALS['egw']->acl->add_repository(self::_appname, 'share_definition', $group,EGW_ACL_READ);
+				$GLOBALS['egw']->acl->add_repository(self::_appname, 'share_definition', $group, EGW_ACL_READ);
 			}
 			unset($content['share_definition']);
 
 			// Other config
-			foreach($content as $key=>$value)
+			foreach ($content as $key=>$value)
 			{
 				config::save_value($key, $value, 'importexport');
 			}
@@ -988,18 +987,18 @@ 
 
 		$data = config::read(self::_appname);
 		$data['share_definition'] = $GLOBALS['egw']->acl->get_ids_for_location('share_definition', EGW_ACL_READ, self::_appname);
-		$sel_options['import_charsets'] = array_combine(mb_list_encodings(),mb_list_encodings());
+		$sel_options['import_charsets'] = array_combine(mb_list_encodings(), mb_list_encodings());
 
 		// Remove 'standard' encodings to prevent doubles
-		foreach($GLOBALS['egw']->translation->get_installed_charsets() as $charset => $label)
+		foreach ($GLOBALS['egw']->translation->get_installed_charsets() as $charset => $label)
 		{
 			unset($sel_options['import_charsets'][strtoupper($charset)]);
 		}
 
-		if(!$data['update']) $data['update'] = 'request';
+		if (!$data['update']) $data['update'] = 'request';
 
-		$GLOBALS['egw_info']['flags']['app_header'] = lang('Site configuration') . ' - ' . lang(self::_appname);
+		$GLOBALS['egw_info']['flags']['app_header'] = lang('Site configuration').' - '.lang(self::_appname);
 		$etpl = new etemplate(self::_appname.'.config');
-		$etpl->exec(self::_appname.'.importexport_definitions_ui.site_config',$data,$sel_options,$readonlys,$preserv);
+		$etpl->exec(self::_appname.'.importexport_definitions_ui.site_config', $data, $sel_options, $readonlys, $preserv);
 	}
 }

Braces +121 added lines, -45 removed lines

@@ -82,14 +82,18 @@ 
 	{
 		$filter = array('name' => '*');
 
-		if($GLOBALS['egw_info']['user']['apps']['admin']) {
+		if($GLOBALS['egw_info']['user']['apps']['admin'])
+		{
 			// Any public definition
 			$filter[] = '(owner=0 OR owner IS NULL OR allowed_users IS NOT NULL OR owner = ' . $GLOBALS['egw_info']['user']['account_id'] . ')';
-		} else {
+		}
+		else
+		{
 			// Filter private definitions
 			$filter['owner'] = $GLOBALS['egw_info']['user']['account_id'];
 			$config = config::read('phpgwapi');
-			if($config['export_limit'] == 'no' && !bo_merge::is_export_limit_excepted()) {
+			if($config['export_limit'] == 'no' && !bo_merge::is_export_limit_excepted())
+			{
 				$filter['type'] = 'import';
 			}
 		}
@@ -105,7 +109,10 @@ 
 			elseif(($button = array_search('pressed',$content['nm']['rows'])) !== false)
 			{
 				$selected = $content['nm']['rows']['selected'];
-				if(count($selected) < 1 || !is_array($selected)) common::egw_exit();
+				if(count($selected) < 1 || !is_array($selected))
+				{
+					common::egw_exit();
+				}
 				switch ($button)
 				{
 					case 'delete_selected' :
@@ -161,7 +168,8 @@ 
 			}
 		}
 
-		if(!is_array($content['nm'])) {
+		if(!is_array($content['nm']))
+		{
 			$content['nm'] = array(
 				'get_rows'	=> 'importexport.importexport_definitions_ui.get_rows',
 				'no_cat'	=> true,
@@ -172,7 +180,10 @@ 
 				'row_id'	=> 'definition_id',
 				'placeholder_actions' => array('add')
 			);
-			if($_GET['application']) $content['nm']['col_filter']['application'] = $_GET['application'];
+			if($_GET['application'])
+			{
+				$content['nm']['col_filter']['application'] = $_GET['application'];
+			}
 		}
 		if(egw_session::appsession('index', 'importexport'))
 		{
@@ -191,17 +202,22 @@ 
 		);
 		foreach ($this->plugins as $appname => $options)
 		{
-			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+			if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin'])
+			{
 				$sel_options['application'][$appname] = lang($appname);
 			}
 		}
-		if($msg) $content['msg'] = $msg;
+		if($msg)
+		{
+			$content['msg'] = $msg;
+		}
 
 		$etpl = new etemplate_new(self::_appname.'.definition_index');
 		return $etpl->exec( self::_appname.'.importexport_definitions_ui.index', $content, $sel_options, $readonlys, $preserv );
 	}
 
-	private function get_actions() {
+	private function get_actions()
+	{
 		$group = 0;
 		$actions = array(
 			'edit' => array(
@@ -320,7 +336,8 @@ 
 			$this->get_rows($query,$rows,$readonlys);
 
 			$selected = array();
-			foreach($rows as $row) {
+			foreach($rows as $row)
+			{
 				$selected[] = $row['definition_id'];
 			}
 			if(!is_array($session_name))
@@ -335,10 +352,12 @@ 
 
 		$bodefinitions = new importexport_definitions_bo(false, true);
 
-		switch($action) {
+		switch($action)
+		{
 			case 'execute':
 				// There's probably a way to do this in just JS, all the info should be there...
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = $bodefinitions->read((int)$id);
 					$link = egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_'.$definition['type'].'_ui.'.$definition['type'].'_dialog',
@@ -352,11 +371,16 @@ 
 				$action = 'allowed_users';// Field is allowed_users, popup doesn't like _
 			case 'owner':
 				$action_msg = lang('changed'. ' ' . $action);
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if($definition['definition_id'])
+					{
 						// Prevent private with no owner
-						if(!$definition['owner'] && !$settings) $definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						if(!$definition['owner'] && !$settings)
+						{
+							$definition['owner'] = $GLOBALS['egw_info']['user']['account_id'];
+						}
 
 						$definition[$action] = $settings;
 						$bodefinitions->save($definition);
@@ -383,18 +407,22 @@ 
 			case 'copy':
 				$action_msg = lang('copied');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = $bodefinitions->read((int)$id);
-					if($definition['definition_id']) {
+					if($definition['definition_id'])
+					{
 						unset($definition['definition_id']);
 						$definition['name'] = $settings ? $settings : $definition['name'] . ' copy';
 						try {
 							$bodefinitions->save($definition);
-						} catch (Exception $e) {
+						}
+						catch (Exception $e) {
 							try {
 								$definition['name'] .= ' ' . $GLOBALS['egw_info']['user']['account_lid'];
 								$bodefinitions->save($definition);
-							} catch (Exception $ex) {
+							}
+							catch (Exception $ex) {
 								$failed++;
 								$msg .= lang('Duplicate name, please choose another.');
 								continue;
@@ -407,18 +435,21 @@ 
 			case 'createexport':
 				$action_msg = lang('created');
 				// Should only be one selected
-				foreach($selected as $id) {
+				foreach($selected as $id)
+				{
 					$definition = new importexport_definition($id);
 					try {
 						$export = $bodefinitions->export_from_import($definition);
 						$export->save();
-					} catch (Exception $e) {
+					}
+					catch (Exception $e) {
 						if($export)
 						{
 							try {
 								$export->name = $export->name.' ' . $GLOBALS['egw_info']['user']['account_lid'];
 								$export->save();
-							} catch (Exception $ex) {
+							}
+							catch (Exception $ex) {
 								$failed++;
 								$msg .= lang('Duplicate name, please choose another.');
 								continue;
@@ -436,7 +467,8 @@ 
 		return !$failed;
 	}
 
-	public function get_rows(&$query, &$rows, &$readonlys) {
+	public function get_rows(&$query, &$rows, &$readonlys)
+	{
 		$rows = array();
 		egw_session::appsession('index','importexport',$query);
 
@@ -511,7 +543,10 @@ 
 
 		if(is_array($content) &&! $content['edit'])
 		{
-			if(self::_debug) error_log('importexport.wizard->$content '. print_r($content,true));
+			if(self::_debug)
+			{
+				error_log('importexport.wizard->$content '. print_r($content,true));
+			}
 			//foreach($content as $key => $val) error_log(" $key : ".array2string($val));
 			// fetch plugin object
 			if($content['plugin'] && $content['application'])
@@ -528,13 +563,18 @@ 
 					$wizard_plugin = $content['plugin'];
 				}
 				// App translations
-				if($content['application']) translation::add_app($content['application']);
+				if($content['application'])
+				{
+					translation::add_app($content['application']);
+				}
 
 				$this->plugin = is_object($GLOBALS['egw']->$wizard_plugin) ? $GLOBALS['egw']->$wizard_plugin : new $wizard_plugin;
 
 				// Global object needs to be the same, or references to plugin don't work
 				if(!is_object($GLOBALS['egw']->importexport_definitions_ui) || $GLOBALS['egw']->importexport_definitions_ui !== $this)
-					$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				{
+									$GLOBALS['egw']->importexport_definitions_ui =& $this;
+				}
 			}
 			// deal with buttons even if we are not on ajax
 			if(isset($content['button']) && array_search('pressed',$content['button']) === false && count($content['button']) == 1)
@@ -664,7 +704,10 @@ 
 
 	function wizard_step10(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_step10->$content '.print_r($content,true));
+		}
 
 		// return from step10
 		if ($content['step'] == 'wizard_step10')
@@ -686,7 +729,8 @@ 
 			$content['text'] = $this->steps['wizard_step10'];
 			foreach ($this->plugins as $appname => $options)
 			{
-				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin']) {
+				if($GLOBALS['egw_info']['user']['apps'][$appname] || $GLOBALS['egw_info']['user']['apps']['admin'])
+				{
 					$sel_options['application'][$appname] = lang($appname);
 				}
 			}
@@ -702,7 +746,10 @@ 
 	// get plugin
 	function wizard_step20(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.' . get_class($this) . '::wizard_step20->$content '.print_r($content,true));
+		}
 
 		// return from step20
 		if ($content['step'] == 'wizard_step20')
@@ -711,11 +758,16 @@ 
 			{
 				case 'next':
 					// There's no real reason the plugin has to come from any of these, as long as it has a $steps variable
-					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false) {
+					if($this->plugin instanceof importexport_iface_import_plugin || $this->plugin instanceof importexport_wizard_basic_import_csv || strpos(get_class($this->plugin), 'import') !== false)
+					{
 						$content['type'] = 'import';
-					} elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false) {
+					}
+					elseif($this->plugin instanceof importexport_iface_export_plugin || $this->plugin instanceof importexport_wizard_basic_export_csv || strpos(get_class($this->plugin),'export') !== false)
+					{
 						$content['type'] = 'export';
-					} else {
+					}
+					else
+					{
 						throw new egw_exception('Invalid plugin');
 					}
 					return $this->get_step($content['step'],1);
@@ -733,9 +785,14 @@ 
 		{
 			$content['text'] = $this->steps['wizard_step20'];
 			$config = config::read('phpgwapi');
-			foreach ($this->plugins[$content['application']] as $type => $plugins) {
-				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export') continue;
-				foreach($plugins as $plugin => $name) {
+			foreach ($this->plugins[$content['application']] as $type => $plugins)
+			{
+				if($config['export_limit'] == 'no' && !$GLOBALS['egw_info']['user']['apps']['admin'] && $type == 'export')
+				{
+					continue;
+				}
+				foreach($plugins as $plugin => $name)
+				{
 					$sel_options['plugin'][$plugin] = $name;
 				}
 			}
@@ -751,7 +808,10 @@ 
 	// name
 	function wizard_step21(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_step21->$content '.print_r($content,true));
+		}
 
 		// Check for duplicate name
 		$duplicate = isset($content['duplicate_error']);
@@ -763,7 +823,8 @@ 
 				{
 					throw new Exception('Already exists');
 				}
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 			//		throw new Exception('Already exists');
 				$content['duplicate_error'] = lang('Duplicate name, please choose another.');
 
@@ -774,13 +835,16 @@ 
 					$content['name'] .'-'. egw_time::to('now', true),
 					//$content['name'] .'-'. rand(0,100),
 				);
-				foreach($suggestions as $key => $suggestion) {
+				foreach($suggestions as $key => $suggestion)
+				{
 					$sug_definition = new importexport_definition($suggestion);
-					if($sug_definition->definition_id) {
+					if($sug_definition->definition_id)
+					{
 						unset($suggestions[$key]);
 					}
 				}
-				if($suggestions) {
+				if($suggestions)
+				{
 					$content['duplicate_error'] .= '  '. lang('Try')." \n" . implode("\n", $suggestions);
 				}
 				return $this->get_step($content['step'],0);
@@ -817,7 +881,10 @@ 
 	// allowed users
 	function wizard_step90(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_step90->$content '.print_r($content,true));
+		}
 
 		// return from step90
 		if ($content['step'] == 'wizard_step90')
@@ -887,7 +954,10 @@ 
 
 	function wizard_finish(&$content)
 	{
-		if(self::_debug) error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		if(self::_debug)
+		{
+			error_log('importexport.importexport_definitions_ui::wizard_finish->$content '.print_r($content,true));
+		}
 		// Take out some UI leavings
 		unset($content['text']);
 		unset($content['step']);
@@ -916,7 +986,8 @@ 
 			if($content['update'])
 			{
 				$applist = importexport_helper_functions::get_apps('all', true);
-				foreach($applist as $appname) {
+				foreach($applist as $appname)
+				{
 					importexport_helper_functions::load_defaults($appname);
 				}
 				return $this->index();
@@ -982,7 +1053,9 @@ 
 			{
 				config::save_value($key, $value, 'importexport');
 			}
-		} elseif (isset($content['cancel'])) {
+		}
+		elseif (isset($content['cancel']))
+		{
 			$GLOBALS['egw']->redirect_link('/admin/index.php');
 		}
 
@@ -996,7 +1069,10 @@ 
 			unset($sel_options['import_charsets'][strtoupper($charset)]);
 		}
 
-		if(!$data['update']) $data['update'] = 'request';
+		if(!$data['update'])
+		{
+			$data['update'] = 'request';
+		}
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Site configuration') . ' - ' . lang(self::_appname);
 		$etpl = new etemplate(self::_appname.'.config');

admin/inc/class.admin_cmd_edit_user.inc.php

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;

Spacing +37 added lines, -37 removed lines

@@ -23,7 +23,7 @@ 
 	 * @param string $password =null password
 	 * @param boolean $run_addaccount_hook =null default run addaccount for new 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))
 		{
@@ -47,10 +47,10 @@ 
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws egw_exception_wrong_userinput(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();
 
@@ -66,29 +66,29 @@ 
 		}
 		if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
 		{
-			throw new egw_exception_wrong_userinput(lang('You must enter a loginid'),9);
+			throw new egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(lang('There already is a system-user with this name. User\'s should not have the same name as a systemuser'),99);
+			throw new egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(lang('You must enter a lastname'),9);
+			throw new egw_exception_wrong_userinput(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 egw_exception_wrong_userinput(lang('That loginid has already been taken'),999);
+			throw new egw_exception_wrong_userinput(lang('That loginid has already been taken'), 999);
 		}
 		if (isset($data['account_passwd_2']) && $data['account_passwd'] != $data['account_passwd_2'])
 		{
-			throw new egw_exception_wrong_userinput(lang('The two passwords are not the same'),0);
+			throw new egw_exception_wrong_userinput(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;
@@ -100,16 +100,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
 		{
@@ -117,11 +117,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
 		{
@@ -129,7 +129,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;
 
@@ -139,27 +139,27 @@ 
 			accounts::cache_invalidate($data['account_id']);
 			if (!($old = admin_cmd::$accounts->read($data['account_id'])))
 			{
-				throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);
+				throw new egw_exception_wrong_userinput(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 accounts before saving them
-		$GLOBALS['egw']->hooks->process($data+array(
+		$GLOBALS['egw']->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 egw_exception_db(lang("Error saving account!"),11);
+			throw new egw_exception_db(lang("Error saving account!"), 11);
 		}
 		// make new account_id available to caller
 		$update = (boolean)$this->account;
@@ -167,44 +167,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;
-		$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
+		$GLOBALS['hook_values'] = & $data;
+		$GLOBALS['egw']->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'] : accounts::id2name($this->account),
 			$update ? lang('updated') : lang("created with id #%1", $this->account));
@@ -217,7 +217,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']));
 	}
 
@@ -229,9 +229,9 @@ 
 	 * @return int timestamp, 0 for already, -1 for never or null for dont change
 	 * @throws egw_exception_wrong_userinput(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;

admin/inc/class.admin_cmds.inc.php

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

Doc Comments +2 added lines, -2 removed lines

@@ -54,7 +54,7 @@ 
 	/**
 	 * Showing the command history and the scheduled commands
 	 *
-	 * @param array $content=null
+	 * @param array $content
 	 */
 	static function index(array $content=null)
 	{
@@ -108,7 +108,7 @@ 
 	/**
 	 * Showing remote administration instances
 	 *
-	 * @param array $content=null
+	 * @param array $content
 	 */
 	static function remotes(array $content=null)
 	{

Spacing +24 added lines, -24 removed lines

@@ -28,19 +28,19 @@ 
 	 * @param array &$readonlys
 	 * @return int
 	 */
-	static function get_rows(array $query,&$rows,&$readonlys)
+	static function get_rows(array $query, &$rows, &$readonlys)
 	{
-		$GLOBALS['egw']->session->appsession('cmds','admin',$query);
+		$GLOBALS['egw']->session->appsession('cmds', 'admin', $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();
@@ -56,20 +56,20 @@ 
 	 *
 	 * @param array $content=null
 	 */
-	static function index(array $content=null)
+	static function index(array $content = null)
 	{
 		$tpl = new etemplate('admin.cmds');
 
 		if (!is_array($content))
 		{
-			$content['nm'] = $GLOBALS['egw']->session->appsession('cmds','admin');
+			$content['nm'] = $GLOBALS['egw']->session->appsession('cmds', 'admin');
 			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',
 				);		
@@ -86,10 +86,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);
 	}
 	
 	/**
@@ -100,9 +100,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);
 	}
 
 	/**
@@ -110,20 +110,20 @@ 
 	 *
 	 * @param array $content=null
 	 */
-	static function remotes(array $content=null)
+	static function remotes(array $content = null)
 	{
 		$tpl = new etemplate('admin.remotes');
 
 		if (!is_array($content))
 		{
-			$content['nm'] = $GLOBALS['egw']->session->appsession('remotes','admin');
+			$content['nm'] = $GLOBALS['egw']->session->appsession('remotes', 'admin');
 			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',
 					'header_right' => 'admin.remotes.header_right',
@@ -142,11 +142,11 @@ 
 				
 				$content['remote'] = admin_cmd::read_remote($id);
 			}
-			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':
@@ -177,7 +177,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);
 		
 	}
 }

admin/inc/class.admin_customtranslation.inc.php

Braces +8 added lines, -2 removed lines

@@ -62,8 +62,14 @@
 							++$saved;
 						}
 					}
-					if ($saved) $msg = lang('%1 phrases saved.', $saved);
-					if ($action == 'apply') break;
+					if ($saved)
+					{
+						$msg = lang('%1 phrases saved.', $saved);
+					}
+					if ($action == 'apply')
+					{
+						break;
+					}
 					// fall through
 				case 'cancel':
 					Egw::redirect_link('/admin/index.php');

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Spacing +6 added lines, -6 removed lines

@@ -30,7 +30,7 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	function index(array $content=null, $msg='')
+	function index(array $content = null, $msg = '')
 	{
 		if (is_array($content))
 		{
@@ -40,17 +40,17 @@ 
 				list($action) = each($content['button']);
 				unset($content['button']);
 			}
-			elseif($content['rows']['delete'])
+			elseif ($content['rows']['delete'])
 			{
 				list($action) = each($content['rows']['delete']);
 				unset($content['rows']['delete']);
 			}
-			switch($action)
+			switch ($action)
 			{
 				case 'save':
 				case 'apply':
 					$saved = 0;
-					foreach($content['rows'] as $n => $data)
+					foreach ($content['rows'] as $n => $data)
 					{
 						if (!empty($data['phrase']))
 						{
@@ -75,7 +75,7 @@ 
 			}
 		}
 		$content = array('rows' => array());
-		foreach(translation::load_app('custom', 'en') as $phrase => $translation)
+		foreach (translation::load_app('custom', 'en') as $phrase => $translation)
 		{
 			$content['rows'][++$row] = array(
 				'phrase' => $phrase,
@@ -87,7 +87,7 @@ 
 			'phrase' => '',
 			'translation' => '',
 		);
-		$readonlys["delete[$row]"] = true;	// no delete for empty row
+		$readonlys["delete[$row]"] = true; // no delete for empty row
 		$content['msg'] = $msg;
 
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('Custom translation');

admin/inc/class.admin_cmd_edit_group.inc.php

Braces +21 added lines, -5 removed lines

@@ -46,16 +46,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('group_access',$this->account ? 16 : 4);
+		if ($this->creator)
+		{
+			$this->_check_admin('group_access',$this->account ? 16 : 4);
+		}
 
 		admin_cmd::_instanciate_accounts();
 
 		$data = $this->set;
 
-		if ($this->account)	// existing account
+		if ($this->account)
+		{
+			// existing account
 		{
 			$data['account_id'] = admin_cmd::parse_account($this->account,false);
 		}
+		}
 		else
 		{
 			$data += array(
@@ -81,7 +87,10 @@ 
 		{
 			$data['account_members'] = admin_cmd::parse_accounts($data['account_members'],true);
 		}
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		if (($update = $this->account))
 		{
@@ -94,7 +103,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];
+				}
 			}
 		}
 		if (!($data['account_id'] = admin_cmd::$accounts->save($data)))
@@ -103,7 +115,11 @@ 
 			throw new Api\Db\Exception(lang("Error saving account!"),11);
 		}
 		$data['account_name'] = $data['account_lid'];	// also set deprecated name
-		if ($update) $data['old_name'] = $old['account_lid'];	// make old name available for hooks
+		if ($update)
+		{
+			$data['old_name'] = $old['account_lid'];
+		}
+		// make old name available for hooks
 		$GLOBALS['hook_values'] =& $data;
 		Api\Hooks::process($GLOBALS['hook_values']+array(
 			'location' => $update ? 'editgroup' : 'addgroup'

Doc Comments +1 added lines, -2 removed lines

@@ -19,7 +19,6 @@ 
 	 * Constructor
 	 *
 	 * @param string/int/array $account account name or id (!$account to add a new account), or array with all parameters
-	 * @param array $set=null array with all data to change
 	 */
 	function __construct($account,$set=null)
 	{
@@ -36,7 +35,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);

Spacing +20 added lines, -20 removed lines

@@ -21,7 +21,7 @@ 
 	 * @param string/int/array $account account name or id (!$account to add a new account), or array with all parameters
 	 * @param array $set=null array with all data to change
 	 */
-	function __construct($account,$set=null)
+	function __construct($account, $set = null)
 	{
 		if (!is_array($account))
 		{
@@ -41,10 +41,10 @@ 
 	 * @throws egw_exception_no_admin
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 */
-	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('group_access',$this->account ? 16 : 4);
+		if ($this->creator) $this->_check_admin('group_access', $this->account ? 16 : 4);
 
 		admin_cmd::_instanciate_accounts();
 
@@ -52,32 +52,32 @@ 
 
 		if ($this->account)	// existing account
 		{
-			$data['account_id'] = admin_cmd::parse_account($this->account,false);
+			$data['account_id'] = admin_cmd::parse_account($this->account, false);
 		}
 		else
 		{
 			$data += array(
 				'account_type' => 'g',
-				'account_status' => 'A',	// not used, but so we do the same thing as the web-interface
+				'account_status' => 'A', // not used, but so we do the same thing as the web-interface
 				'account_expires' => -1,
 			);
 		}
 		if (!$data['account_lid'] && (!$this->account || !is_null($data['account_lid'])))
 		{
-			throw new egw_exception_wrong_userinput(lang('You must enter a group name.'),9);
+			throw new egw_exception_wrong_userinput(lang('You must enter a group name.'), 9);
 		}
-		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'],'account_lid','g')) &&
+		if (!is_null($data['account_lid']) && ($id = admin_cmd::$accounts->name2id($data['account_lid'], 'account_lid', 'g')) &&
 			$id !== $data['account_id'])
 		{
-			throw new egw_exception_wrong_userinput(lang('That loginid has already been taken'),999);
+			throw new egw_exception_wrong_userinput(lang('That loginid has already been taken'), 999);
 		}
 		if (!$data['account_members'] && !$this->account)
 		{
-			throw new egw_exception_wrong_userinput(lang('You must select at least one group member.'),9);
+			throw new egw_exception_wrong_userinput(lang('You must select at least one group member.'), 9);
 		}
 		if ($data['account_members'])
 		{
-			$data['account_members'] = admin_cmd::parse_accounts($data['account_members'],true);
+			$data['account_members'] = admin_cmd::parse_accounts($data['account_members'], true);
 		}
 		if ($check_only) return true;
 
@@ -87,10 +87,10 @@ 
 			accounts::cache_invalidate($data['account_id']);
 			if (!($old = admin_cmd::$accounts->read($data['account_id'])))
 			{
-				throw new egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);
+				throw new egw_exception_wrong_userinput(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];
 			}
@@ -98,18 +98,18 @@ 
 		if (!($data['account_id'] = admin_cmd::$accounts->save($data)))
 		{
 			//_debug_array($data);
-			throw new egw_exception_db(lang("Error saving account!"),11);
+			throw new egw_exception_db(lang("Error saving account!"), 11);
 		}
-		$data['account_name'] = $data['account_lid'];	// also set deprecated name
-		if ($update) $data['old_name'] = $old['account_lid'];	// make old name available for hooks
-		$GLOBALS['hook_values'] =& $data;
-		$GLOBALS['egw']->hooks->process($GLOBALS['hook_values']+array(
+		$data['account_name'] = $data['account_lid']; // also set deprecated name
+		if ($update) $data['old_name'] = $old['account_lid']; // make old name available for hooks
+		$GLOBALS['hook_values'] = & $data;
+		$GLOBALS['egw']->hooks->process($GLOBALS['hook_values'] + array(
 			'location' => $update ? 'editgroup' : 'addgroup'
-		),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_members'])
 		{
-			admin_cmd::$accounts->set_members($data['account_members'],$data['account_id']);
+			admin_cmd::$accounts->set_members($data['account_members'], $data['account_id']);
 		}
 		// make new account_id available to caller
 		$this->account = $data['account_id'];
@@ -125,7 +125,7 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('%1 group %2',$this->account ? lang('Edit') : lang('Add'),
+		return lang('%1 group %2', $this->account ? lang('Edit') : lang('Add'),
 			admin_cmd::display_account($this->account ? $this->account : $this->set['account_lid']));
 	}
 }

admin/inc/class.admin_cmd_delete_account.inc.php

Braces +8 added lines, -2 removed lines

@@ -57,9 +57,15 @@
 			$new_user = admin_cmd::parse_account($this->new_user,true);	// true = user, no group
 		}
 		// check creator is still admin and not explicitly forbidden to edit accounts
-		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
+		if ($this->creator)
+		{
+			$this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
+		}
 
-		if ($check_only) return true;
+		if ($check_only)
+		{
+			return true;
+		}
 
 		// delete the account
 		$GLOBALS['hook_values'] = array(

Doc Comments +3 added lines, -3 removed lines

@@ -19,8 +19,8 @@ 
 	 * Constructor
 	 *
 	 * @param string/int/array $account account name or id, or array with all parameters
-	 * @param string $new_user=null if specified, account to transfer the data to (users only)
-	 * @param string $is_user=true type of the account: true=user, false=group
+	 * @param string $new_user if specified, account to transfer the data to (users only)
+	 * @param string $is_user type of the account: true=user, false=group
 	 */
 	function __construct($account,$new_user=null,$is_user=true)
 	{
@@ -38,7 +38,7 @@ 
 	/**
 	 * delete an account (user or group)
 	 *
-	 * @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);

Spacing +12 added lines, -12 removed lines

@@ -22,7 +22,7 @@ 
 	 * @param string $new_user=null if specified, account to transfer the data to (users only)
 	 * @param string $is_user=true type of the account: true=user, false=group
 	 */
-	function __construct($account,$new_user=null,$is_user=true)
+	function __construct($account, $new_user = null, $is_user = true)
 	{
 		if (!is_array($account))
 		{
@@ -44,18 +44,18 @@ 
 	 * @throws egw_exception_wrong_userinput(lang("Unknown account: %1 !!!",$this->account),15);
 	 * @throws egw_exception_wrong_userinput(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,$this->is_user);
+		$account_id = admin_cmd::parse_account($this->account, $this->is_user);
 		admin_cmd::_instanciate_accounts();
 		$account_lid = admin_cmd::$accounts->id2name($account_id);
 
 		if ($this->is_user && $this->new_user)
 		{
-			$new_user = admin_cmd::parse_account($this->new_user,true);	// true = user, no group
+			$new_user = admin_cmd::parse_account($this->new_user, true); // true = user, no group
 		}
 		// check creator is still admin and not explicitly forbidden to edit accounts
-		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access',32);
+		if ($this->creator) $this->_check_admin($this->is_user ? 'account_access' : 'group_access', 32);
 
 		if ($check_only) return true;
 
@@ -63,22 +63,22 @@ 
 		$GLOBALS['hook_values'] = array(
 			'account_id'  => $account_id,
 			'account_lid' => $account_lid,
-			'account_name'=> $account_lid,		// depericated name for deletegroup hook
-			'new_owner'   => (int)$new_user,	// deleteaccount only
+			'account_name'=> $account_lid, // depericated name for deletegroup hook
+			'new_owner'   => (int)$new_user, // deleteaccount only
 			'location'    => $this->is_user ? 'deleteaccount' : 'deletegroup',
 		);
 		// first all other apps, then preferences and admin
-		foreach(array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']),array('preferences','admin')),array('preferences','admin')) as $app)
+		foreach (array_merge(array_diff(array_keys($GLOBALS['egw_info']['apps']), array('preferences', 'admin')), array('preferences', 'admin')) as $app)
 		{
-			$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'],$app);
+			$GLOBALS['egw']->hooks->single($GLOBALS['hook_values'], $app);
 		}
 		$GLOBALS['egw']->accounts->delete($account_id);
 
 		if ($account_id < 0)
 		{
-			return lang("Group '%1' deleted.",$account_lid)."\n\n";
+			return lang("Group '%1' deleted.", $account_lid)."\n\n";
 		}
-		return lang("Account '%1' deleted.",$account_lid)."\n\n";
+		return lang("Account '%1' deleted.", $account_lid)."\n\n";
 	}
 
 	/**
@@ -88,6 +88,6 @@ 
 	 */
 	function __tostring()
 	{
-		return lang('Delete account %1',admin_cmd::display_account($this->account));
+		return lang('Delete account %1', admin_cmd::display_account($this->account));
 	}
 }