EGroupware / egroupware

importexport/setup/default_records.inc.php

Spacing +11 added lines, -11 removed lines

@@ -12,9 +12,9 @@ 
 if (!extension_loaded('dom'))
 {
 	echo "<p>Required PHP DOM extension missing, installation of ImportExport definitions aborted.</p>\n";
-	return;	// otherwise we mess up the whole eGroupware install process
+	return; // otherwise we mess up the whole eGroupware install process
 }
-require_once(EGW_INCLUDE_ROOT. '/importexport/inc/class.importexport_definitions_bo.inc.php');
+require_once(EGW_INCLUDE_ROOT.'/importexport/inc/class.importexport_definitions_bo.inc.php');
 
 // This sets up $GLOBALS['egw']->accounts and $GLOBALS['egw']->db
 $GLOBALS['egw_setup']->setup_account_object();
@@ -22,22 +22,22 @@ 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
 while (false !== ($appdir = $egwdir->read())) {
-	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	$defdir = EGW_INCLUDE_ROOT."/$appdir/setup/";
+	if (!is_dir($defdir)) continue;
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
 	while (false !== ($entry = $d->read())) {
-		$file = $defdir. '/'. $entry;
-		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
-		importexport_definitions_bo::import( $file );
+		$file = $defdir.'/'.$entry;
+		list($filename, $extension) = explode('.', $entry);
+		if ($extension != 'xml') continue;
+		importexport_definitions_bo::import($file);
 	}
 }
 
 // give Default and Admins group rights for ImportExport
-foreach(array('Default' => 'Default','Admins' => 'Admin') as $account_lid => $name)
+foreach (array('Default' => 'Default', 'Admins' => 'Admin') as $account_lid => $name)
 {
-	$account_id = $GLOBALS['egw_setup']->add_account($account_lid,$name,'Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('importexport','run',$account_id);
+	$account_id = $GLOBALS['egw_setup']->add_account($account_lid, $name, 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('importexport', 'run', $account_id);
 }

Braces +12 added lines, -4 removed lines

@@ -21,16 +21,24 @@
 
 // step through every source code intstalled app
 $egwdir = dir(EGW_INCLUDE_ROOT);
-while (false !== ($appdir = $egwdir->read())) {
+while (false !== ($appdir = $egwdir->read()))
+{
 	$defdir = EGW_INCLUDE_ROOT. "/$appdir/setup/";
-	if ( !is_dir( $defdir ) ) continue;
+	if ( !is_dir( $defdir ) )
+	{
+		continue;
+	}
 
 	// step through each file in defdir of app
 	$d = dir($defdir);
-	while (false !== ($entry = $d->read())) {
+	while (false !== ($entry = $d->read()))
+	{
 		$file = $defdir. '/'. $entry;
 		list( $filename, $extension) = explode('.',$entry);
-		if ( $extension != 'xml' ) continue;
+		if ( $extension != 'xml' )
+		{
+			continue;
+		}
 		importexport_definitions_bo::import( $file );
 	}
 }

importexport/inc/class.importexport_iface_export_record.inc.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 	
 	/**
 	 * exports a record into resource of handle
@@ -41,7 +41,7 @@ 
 	 * @param object of interface egw_record _record
 	 * @return bool
 	 */
-	public function export_record( importexport_iface_egw_record $_record );
+	public function export_record(importexport_iface_egw_record $_record);
 
 	/**
 	 * Retruns total number of exported records.

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * cleanup
 	 *
 	 * @return 
-	 */
+	 void
 	public function __destruct( );
 
 	/**

importexport/inc/class.importexport_arrayxml.inc.php

Spacing +23 added lines, -23 removed lines

@@ -30,39 +30,39 @@ 
 	 * @param DOMElement $_node

 	 * @return string XML string

 	 */

-	public static function array2xml ( $_data, $_name = 'root', $_node=null ) {

+	public static function array2xml($_data, $_name = 'root', $_node = null) {

 		$returnXML = false;

-		if ( $_node === null ) {

-			$_node = new DOMDocument( '1.0', 'utf-8' );

+		if ($_node === null) {

+			$_node = new DOMDocument('1.0', 'utf-8');

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

-		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		$datatype = gettype($_data);

+		switch ($datatype) {

 			case 'array' :

-				$subnode = new DOMElement( 'entry' );

-				$_node->appendChild( $subnode );

-				$subnode->setAttribute( 'type', $datatype );

-				$subnode->setAttribute( 'name' , $_name );

+				$subnode = new DOMElement('entry');

+				$_node->appendChild($subnode);

+				$subnode->setAttribute('type', $datatype);

+				$subnode->setAttribute('name', $_name);

 					

-				foreach ( $_data as $ikey => $ivalue ) {

-					self::array2xml( $ivalue, $ikey, $subnode );

+				foreach ($_data as $ikey => $ivalue) {

+					self::array2xml($ivalue, $ikey, $subnode);

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ($datatype) {

 					case 'boolean' :

 						$data = $_data !== false ? 'TRUE' : 'FALSE';

 						break;

 					default:

 						$data = &$_data;

 				}

-				$subnode = new DOMElement( 'entry' , $data );

-				$_node->appendChild( $subnode );

-				$subnode->setAttribute( 'type', $datatype );

-				$subnode->setAttribute( 'name' , $_name );

+				$subnode = new DOMElement('entry', $data);

+				$_node->appendChild($subnode);

+				$subnode->setAttribute('type', $datatype);

+				$subnode->setAttribute('name', $_name);

 				break;

 		}

 		return $returnXML ? $_node->saveXML() : '';

@@ -74,28 +74,28 @@ 
 	 * @param string $_xml

 	 * @return array

 	 */

-	public static function xml2array( $_xml ) {

-		if ( $_xml instanceof DOMElement ) {

+	public static function xml2array($_xml) {

+		if ($_xml instanceof DOMElement) {

 			$n = &$_xml;

 		} else {

 			$n = new DOMDocument;

 			$loaded = $n->loadXML($_xml);

-			if(!$loaded) return array();

+			if (!$loaded) return array();

 		}

 		$xml_array = array();

 		

-		foreach($n->childNodes as $nc) {

+		foreach ($n->childNodes as $nc) {

 			

-			if ( $nc->nodeType != XML_ELEMENT_NODE ) continue;

+			if ($nc->nodeType != XML_ELEMENT_NODE) continue;

 				

 			$name = $nc->attributes->getNamedItem('name')->nodeValue;

 			$type = $nc->attributes->getNamedItem('type')->nodeValue;

 

 			//echo $nc->nodeType. "(length ): ". $nc->nodeName. " => ". $nc->nodeValue. "; Attriubtes: name=$name, type=$type  \n ";

-			if( $nc->childNodes->length >= 2) {

+			if ($nc->childNodes->length >= 2) {

 				$xml_array[$name] = self::xml2array($nc);

 			} else {

-				switch ( $type ) {

+				switch ($type) {

 					case 'boolean' :

 						$value = $nc->nodeValue == 'FALSE' ? false : true;

 						break;

Braces +36 added lines, -15 removed lines

@@ -20,7 +20,8 @@ 
  * @todo deal with other types like objects

  * @static only namespace here

  */ 

-class importexport_arrayxml {

+class importexport_arrayxml
+{
 	

 	/**

 	 * converts a php array to an xml string

@@ -30,29 +31,34 @@ 
 	 * @param DOMElement $_node

 	 * @return string XML string

 	 */

-	public static function array2xml ( $_data, $_name = 'root', $_node=null ) {

+	public static function array2xml ( $_data, $_name = 'root', $_node=null )
+	{
 		$returnXML = false;

-		if ( $_node === null ) {

+		if ( $_node === null )
+		{
 			$_node = new DOMDocument( '1.0', 'utf-8' );

 			$_node->formatOutput = true;

 			$returnXML = true;

 		}

 		

 		$datatype = gettype( $_data );

-		switch ( $datatype ) {

+		switch ( $datatype )
+		{
 			case 'array' :

 				$subnode = new DOMElement( 'entry' );

 				$_node->appendChild( $subnode );

 				$subnode->setAttribute( 'type', $datatype );

 				$subnode->setAttribute( 'name' , $_name );

 					

-				foreach ( $_data as $ikey => $ivalue ) {

+				foreach ( $_data as $ikey => $ivalue )
+				{
 					self::array2xml( $ivalue, $ikey, $subnode );

 				}

 				break;

 

 			default : 

-				switch ( $datatype ) {

+				switch ( $datatype )
+				{
 					case 'boolean' :

 						$data = $_data !== false ? 'TRUE' : 'FALSE';

 						break;

@@ -74,28 +80,43 @@ 
 	 * @param string $_xml

 	 * @return array

 	 */

-	public static function xml2array( $_xml ) {

-		if ( $_xml instanceof DOMElement ) {

+	public static function xml2array( $_xml )
+	{
+		if ( $_xml instanceof DOMElement )
+		{
 			$n = &$_xml;

-		} else {

+		}
+		else
+		{
 			$n = new DOMDocument;

 			$loaded = $n->loadXML($_xml);

-			if(!$loaded) return array();

+			if(!$loaded)
+			{
+				return array();
+			}
 		}

 		$xml_array = array();

 		

-		foreach($n->childNodes as $nc) {

+		foreach($n->childNodes as $nc)
+		{
 			

-			if ( $nc->nodeType != XML_ELEMENT_NODE ) continue;

+			if ( $nc->nodeType != XML_ELEMENT_NODE )
+			{
+				continue;
+			}
 				

 			$name = $nc->attributes->getNamedItem('name')->nodeValue;

 			$type = $nc->attributes->getNamedItem('type')->nodeValue;

 

 			//echo $nc->nodeType. "(length ): ". $nc->nodeName. " => ". $nc->nodeValue. "; Attriubtes: name=$name, type=$type  \n ";

-			if( $nc->childNodes->length >= 2) {

+			if( $nc->childNodes->length >= 2)
+			{
 				$xml_array[$name] = self::xml2array($nc);

-			} else {

-				switch ( $type ) {

+			}
+			else
+			{
+				switch ( $type )
+				{
 					case 'boolean' :

 						$value = $nc->nodeValue == 'FALSE' ? false : true;

 						break;

importexport/inc/class.importexport_wizard_basic_import_csv.inc.php

Indentation +20 added lines, -20 removed lines

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

Spacing +60 added lines, -60 removed lines

@@ -70,7 +70,7 @@ 
 	*/
 	function wizard_step30(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step30->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step30->$content '.print_r($content, true));
 		// return from step30
 		if ($content['step'] == 'wizard_step30')
 		{
@@ -78,17 +78,17 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
-						$GLOBALS['egw']->session->appsession('csvfile',$content['application'],$content['file']['tmp_name']);
+					if ($content['file']['tmp_name']) {
+						$GLOBALS['egw']->session->appsession('csvfile', $content['application'], $content['file']['tmp_name']);
 					}
 					unset($content['file']);
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step30($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step30($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step30
@@ -115,55 +115,55 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step40->$content '.print_r($content, true));
 		// return from step40
 		if ($content['step'] == 'wizard_step40') {
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
 					// Process sample file for fields
-					if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE) {
+					if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile', $content['application']), "rb")) !== FALSE) {
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
 						//error_log(array2string($data));
 						fclose($handle);
 
 						// Remove & forget file
-						unlink($GLOBALS['egw']->session->appsession('csvfile',$content['application']));
+						unlink($GLOBALS['egw']->session->appsession('csvfile', $content['application']));
 						egw_cache::setSession($content['application'], 'csvfile', '');
-						$content['csv_fields'] = translation::convert($data,$content['charset']);
+						$content['csv_fields'] = translation::convert($data, $content['charset']);
 
 						// Reset field mapping for new file
 						$content['field_mapping'] = array();
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach ($content['csv_fields'] as $index => $field) {
+							if ($content['field_mapping'][$index]) continue;
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach ($this->mapping_fields as $key => $field_name) {
+								if (is_array($field_name)) continue;
+								if (strcasecmp($field, $field_name) == 0 || strcasecmp($field, $key) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if ($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
 									$msg_id = translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if ($msg_id) {
 									$english[$field_name] = translation::read('en', $content['application'], $msg_id);
 								} else {
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if ($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 
 								// Check for similar but slightly different
 								$match = 0;
-								if(similar_text(strtolower($field), strtolower($field_name), $match) &&
+								if (similar_text(strtolower($field), strtolower($field_name), $match) &&
 										$match > 85 &&
 										$match > $best_match_value
 								) {
@@ -172,20 +172,20 @@ 
 								}
 
 							}
-							if($best_match) {
+							if ($best_match) {
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					} elseif (!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step40($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step40($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step40
@@ -195,17 +195,17 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if (!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
 			} elseif (!$content['fieldsep']) {
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if (!$content['charset'] && $content['plugin_options']['charset']) {
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
-			if(!array_key_exists('num_header_lines', $content))
+			if (!array_key_exists('num_header_lines', $content))
 			{
-				if(array_key_exists('num_header_lines', $content['plugin_options']))
+				if (array_key_exists('num_header_lines', $content['plugin_options']))
 				{
 					$content['num_header_lines'] = $content['plugin_options']['num_header_lines'];
 				}
@@ -215,10 +215,10 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if (!$content['update_cats'] && $content['plugin_options']['update_cats']) {
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if (!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -227,24 +227,24 @@ 
 				$content['convert'] = 1;
 			}
 
-			$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'),
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if ($this->mapping_fields['cat_id']) {
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
@@ -266,18 +266,18 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step50->$content '.print_r($content, true));
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
 			unset($content['field_mapping']);
 			unset($content['field_conversion']);
-			foreach($content['mapping'] as $field)
+			foreach ($content['mapping'] as $field)
 			{
 				$index = $field['index'];
-				foreach(array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
+				foreach (array('conversion'=>'field_conversion', 'field' => 'field_mapping') as $id => $dest)
 				{
-					if(trim($field[$id]) != '' && $field[$id] !== '--NONE--')
+					if (trim($field[$id]) != '' && $field[$id] !== '--NONE--')
 					{
 						$content[$dest][$index] = trim($field[$id]);
 					}
@@ -287,13 +287,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step50($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step50($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step50
@@ -303,7 +303,7 @@ 
 			$content['step'] = 'wizard_step50';
 
 			$content['mapping'] = array(false);
-			if(array_key_exists('field_mapping', $content))
+			if (array_key_exists('field_mapping', $content))
 			{
 				$field = $content['field_mapping'];
 				$conversion = $content['field_conversion'];
@@ -314,7 +314,7 @@ 
 				$conversion = $content['plugin_options']['field_conversion'];
 			}
 			$empties = 1;
-			foreach($content['csv_fields'] as $index => $title)
+			foreach ($content['csv_fields'] as $index => $title)
 			{
 				$content['mapping'][] = array(
 					'index'	=>	$index,
@@ -322,15 +322,15 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if (strstr($title, lang('Extra %1'))) $empties++;
 			}
-			while($empties <= 3)
+			while ($empties <= 3)
 			{
 				$content['mapping'][] = array(
 					'index' => $index + $empties,
 					'title' => lang('Extra %1', $empties),
-					'field' => $field[$index+$empties],
-					'conversion'	=>	$conversion[$index+$empties]
+					'field' => $field[$index + $empties],
+					'conversion'	=>	$conversion[$index + $empties]
 				);
 				$empties++;
 			}
@@ -348,7 +348,7 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if ($this->debug) error_log(get_class($this).'::wizard_step55->$content '.print_r($content, true));
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -356,8 +356,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
-				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
+			foreach ($content['conditions'] as $key => &$condition) {
+				if (($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
 				) {
@@ -366,7 +366,7 @@ 
 				}
 
 				// Check for true without false, or false without true - set to 'none'
-				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
+				elseif ($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
 				)
@@ -378,9 +378,9 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				case 'add':
@@ -389,7 +389,7 @@ 
 					$content['conditions'][] = array('string' => '');
 					return 'wizard_step55';
 				default :
-					return $this->wizard_step55($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step55($content, $sel_options, $readonlys, $preserv);
 					break;
 			}
 		}
@@ -397,18 +397,18 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if (!$content['conditions'] && $content['plugin_options']['conditions']) {
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach ($content['field_mapping'] as $field) {
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
-			if(!$sel_options['string'][$field])
+			if (!$sel_options['string'][$field])
 			{
-				foreach($this->mapping_fields as $fields)
+				foreach ($this->mapping_fields as $fields)
 				{
-					if(is_array($fields) && $fields[$field])
+					if (is_array($fields) && $fields[$field])
 					{
 						$sel_options['string'][$field] = $fields[$field];
 					}

Braces +77 added lines, -31 removed lines

@@ -70,7 +70,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')
 		{
@@ -78,7 +81,8 @@ 
 			{
 				case 'next':
 					// Move sample file to temp
-					if($content['file']['tmp_name']) {
+					if($content['file']['tmp_name'])
+					{
 						$GLOBALS['egw']->session->appsession('csvfile',$content['application'],$content['file']['tmp_name']);
 					}
 					unset($content['file']);
@@ -115,14 +119,19 @@ 
 	 */
 	function wizard_step40(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step40->$content '.print_r($content,true));
+		}
 		// return from step40
-		if ($content['step'] == 'wizard_step40') {
+		if ($content['step'] == 'wizard_step40')
+		{
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
 					// Process sample file for fields
-					if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE) {
+					if (($handle = fopen($GLOBALS['egw']->session->appsession('csvfile',$content['application']), "rb")) !== FALSE)
+					{
 						$data = fgetcsv($handle, 8000, $content['fieldsep']);
 						//error_log(array2string($data));
 						fclose($handle);
@@ -137,26 +146,40 @@ 
 
 						// Try to match automatically
 						$english = array();
-						foreach($content['csv_fields'] as $index => $field) {
-							if($content['field_mapping'][$index]) continue;
+						foreach($content['csv_fields'] as $index => $field)
+						{
+							if($content['field_mapping'][$index])
+							{
+								continue;
+							}
 							$best_match = '';
 							$best_match_value = 0;
-							foreach($this->mapping_fields as $key => $field_name) {
-								if(is_array($field_name)) continue;
-								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0) {
+							foreach($this->mapping_fields as $key => $field_name)
+							{
+								if(is_array($field_name))
+								{
+									continue;
+								}
+								if(strcasecmp($field, $field_name) == 0 || strcasecmp($field,$key) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
 								// Check english also
-								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name])) {
+								if($GLOBALS['egw_info']['user']['preferences']['common']['lang'] != 'en' && !isset($english[$field_name]))
+								{
 									$msg_id = translation::get_message_id($field_name, $content['application']);
 								}
-								if($msg_id) {
+								if($msg_id)
+								{
 									$english[$field_name] = translation::read('en', $content['application'], $msg_id);
-								} else {
+								}
+								else
+								{
 									$english[$field_name] = false;
 								}
-								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0) {
+								if($english[$field_name] && strcasecmp($field, $english[$field_name]) == 0)
+								{
 									$content['field_mapping'][$index] = $key;
 									continue 2;
 								}
@@ -172,11 +195,14 @@ 
 								}
 
 							}
-							if($best_match) {
+							if($best_match)
+							{
 								$content['field_mapping'][$index] = $best_match;
 							}
 						}
-					} elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields']) {
+					}
+					elseif(!$content['csv_fields'] && $content['plugin_options']['csv_fields'])
+					{
 						$content['csv_fields'] = $content['plugin_options']['csv_fields'];
 					}
 					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
@@ -195,12 +221,16 @@ 
 			$content['step'] = 'wizard_step40';
 
 			// If editing an existing definition, these will be in plugin_options
-			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep']) {
+			if(!$content['fieldsep'] && $content['plugin_options']['fieldsep'])
+			{
 				$content['fieldsep'] = $content['plugin_options']['fieldsep'];
-			} elseif (!$content['fieldsep']) {
+			}
+			elseif (!$content['fieldsep'])
+			{
 				$content['fieldsep'] = ';';
 			}
-			if(!$content['charset'] && $content['plugin_options']['charset']) {
+			if(!$content['charset'] && $content['plugin_options']['charset'])
+			{
 				$content['charset'] = $content['plugin_options']['charset'];
 			}
 			if(!array_key_exists('num_header_lines', $content))
@@ -215,10 +245,12 @@ 
 					$content['num_header_lines'] = 1;
 				}
 			}
-			if(!$content['update_cats'] && $content['plugin_options']['update_cats']) {
+			if(!$content['update_cats'] && $content['plugin_options']['update_cats'])
+			{
 				$content['update_cats'] = $content['plugin_options']['update_cats'];
 			}
-			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options'])) {
+			if(!array_key_exists('convert', $content) && is_array($content['plugin_options']) && array_key_exists('convert', $content['plugin_options']))
+			{
 				$content['convert'] = $content['plugin_options']['convert'];
 			}
 			else
@@ -244,12 +276,15 @@ 
 				1       => lang('Human friendly values')
 			);
 			$preserv = $content;
-			if($this->mapping_fields['cat_id']) {
+			if($this->mapping_fields['cat_id'])
+			{
 				$sel_options['update_cats'] = array(
 					'add'	=> lang('Add'),
 					'replace'=> lang('Replace')
 				);
-			} else {
+			}
+			else
+			{
 				$content['no_cats'] = true;
 			}
 			unset ($preserv['button']);
@@ -266,7 +301,10 @@ 
 	*/
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step50->$content '.print_r($content,true));
+		}
 		// return from step50
 		if ($content['step'] == 'wizard_step50')
 		{
@@ -322,7 +360,10 @@ 
 					'field'	=>	$field[$index],
 					'conversion'	=>	$conversion[$index]
 				);
-				if(strstr($title,lang('Extra %1'))) $empties++;
+				if(strstr($title,lang('Extra %1')))
+				{
+					$empties++;
+				}
 			}
 			while($empties <= 3)
 			{
@@ -348,7 +389,10 @@ 
 	*/
 	function wizard_step55(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(get_class($this) . '::wizard_step55->$content '.print_r($content,true));
+		}
 
 		// return from step55
 		if ($content['step'] == 'wizard_step55')
@@ -356,7 +400,8 @@ 
 
 			// Clear conditions that don't do anything
 			array_shift($content['conditions']);
-			foreach($content['conditions'] as $key => &$condition) {
+			foreach($content['conditions'] as $key => &$condition)
+			{
 				if(($condition['true']['action'] == 'none' || !$condition['true']['action'])
 					&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) &&
 					!$condition['string']
@@ -369,8 +414,7 @@ 
 				elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
 					$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
 					!$condition['true'] || !$condition['false']
-				)
-				{
+				) {
 					$condition[$condition['true']['action'] == '' ? 'true' : 'false']['action'] = "none";
 				}
 			}
@@ -397,12 +441,14 @@ 
 		$content['text'] = $this->steps['wizard_step55'];
 		$content['step'] = 'wizard_step55';
 
-		if(!$content['conditions'] && $content['plugin_options']['conditions']) {
+		if(!$content['conditions'] && $content['plugin_options']['conditions'])
+		{
 			$content['conditions'] = $content['plugin_options']['conditions'];
 		}
 		$preserv = $content;
 
-		foreach($content['field_mapping'] as $field) {
+		foreach($content['field_mapping'] as $field)
+		{
 			$sel_options['string'][$field] = $this->mapping_fields[$field];
 			if(!$sel_options['string'][$field])
 			{

importexport/importexport_cli.php

Spacing +19 added lines, -19 removed lines

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

Braces +19 added lines, -9 removed lines

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

admin/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

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

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

@@ -47,11 +47,11 @@
 /* Dependencies for this app to work */
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'phpgwapi',
-	'versions' => Array('14.1')
+	'versions' => array('14.1')
 );
 $setup_info['admin']['depends'][] = array(
 	'appname' => 'etemplate',
-	'versions' => Array('14.1')
+	'versions' => array('14.1')
 );
 
 

admin/setup/tables_current.inc.php

Spacing +24 added lines, -24 removed lines

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

admin/setup/tables_update.inc.php

Spacing +30 added lines, -30 removed lines

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

admin/inc/class.admin_cmd_change_pw.inc.php

Spacing +6 added lines, -6 removed lines

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

Braces +8 added lines, -2 removed lines

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

Doc Comments +2 added lines, -2 removed lines

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