EGroupware / egroupware

importexport/inc/class.importexport_iface_egw_record.inc.php

Doc Comments +3 added lines

@@ -35,6 +35,7 @@ 
 	 * reads record from backend if identifier is given.
 	 *
 	 * @param string $_identifier
+	 * @return void
 	 */
 	public function __construct( $_identifier='' );
 	
@@ -50,6 +51,7 @@ 
 	 *
 	 * @param string $_attribute_name
 	 * @param data $data
+	 * @return void
 	 */
 	public function __set($_attribute_name, $data);
 	
@@ -126,6 +128,7 @@ 
 	/**
 	 * destructor
 	 *
+	 * @return void
 	 */
 	public function __destruct();
 

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' );
+	public function __construct($_identifier = '');
 	
 	/**
 	 * magic method to set attributes of record
@@ -97,7 +97,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier );
+	public function save($_dst_identifier);
 	
 	/**
 	 * copys current record to record identified by $_dst_identifier
@@ -105,7 +105,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier );
+	public function copy($_dst_identifier);
 	
 	/**
 	 * moves current record to record identified by $_dst_identifier
@@ -114,14 +114,14 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier );
+	public function move($_dst_identifier);
 	
 	/**
 	 * delets current record from backend
 	 * @return void
 	 *
 	 */
-	public function delete ();
+	public function delete();
 	
 	/**
 	 * destructor

importexport/inc/class.importexport_iface_import_plugin.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -29,8 +29,8 @@
 	/**
 	 * imports entries according to given definition object.
 	 *
-	 * @param stram $_stram
-	 * @param definition $_definition
+	 * @param stram $_stream
+	 * @param importexport_definition $_definition
 	 * @return int number of successful imports
 	 */
 	public function import( $_stream, importexport_definition $_definition );

Indentation +21 added lines, -21 removed lines

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

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 * @param definition $_definition
 	 * @return int number of successful imports
 	 */
-	public function import( $_stream, importexport_definition $_definition );
+	public function import($_stream, importexport_definition $_definition);
 
 	/**
 	 * Reads entries, and presents them back as they will be understood

Braces +2 added lines, -1 removed lines

@@ -24,7 +24,8 @@
  * So this interface just garanties the interaction with userinterfaces. It
  * has nothing to do with datatypes.
  */
-interface importexport_iface_import_plugin {
+interface importexport_iface_import_plugin
+{
 	
 	/**
 	 * imports entries according to given definition object.

importexport/inc/class.importexport_iface_import_record.inc.php

Doc Comments +1 added lines, -1 removed lines

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

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	 * @param array $_options options for specific backends
 	 * @return bool
 	 */
-	public function __construct( $_stream, array $_options );
+	public function __construct($_stream, array $_options);
 
 	/**
 	 * cleanup
@@ -42,7 +42,7 @@ 
 	 * @param string _position may be: {first|last|next|previous|somenumber}
 	 * @return bool
 	 */
-	public function get_record( $_position = 'next' );
+	public function get_record($_position = 'next');
 
 	/**
 	 * Retruns total number of records for the open resource.

importexport/inc/class.importexport_import_csv.inc.php

Doc Comments +3 added lines, -3 removed lines

@@ -137,8 +137,8 @@ 
 	/**
 	 * updates $this->record
 	 *
-	 * @param mixed $_position
-	 * @return bool
+	 * @param string $_position
+	 * @return null|false
 	 */
 	private function get_raw_record( $_position = 'next' ) {
 		switch ($_position) {
@@ -244,7 +244,7 @@ 
 	/**
 	 * does conversions according to $this->conversion
 	 *
-	 * @return bool
+	 * @return boolean|null
 	 */
 	protected function do_conversions() {
 		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class )) {

Braces +143 added lines, -61 removed lines

@@ -22,7 +22,9 @@ 
  * @todo Throw away spechial chars and trim() entries ?
  * @todo Check for XSS like userinput! (see common_functions)
  */
-class importexport_import_csv implements importexport_iface_import_record { //, Iterator {
+class importexport_import_csv implements importexport_iface_import_record
+{
+//, Iterator {
 
 	const csv_max_linelength = 8000;
 	
@@ -83,10 +85,14 @@ 
 	 * @param string $_resource resource containing data. May be each valid php-stream
 	 * @param array $_options options for the resource array with keys: charset and fieldsep
 	 */
-	public function __construct( $_resource,  array $_options ) {
+	public function __construct( $_resource,  array $_options )
+	{
 		$this->resource = $_resource;
 		$this->csv_fieldsep = $_options['fieldsep'];
-		if($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		if($_options['charset'] == 'user')
+		{
+			$_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		}
 		$this->csv_charset = $_options['charset'];
 		return;
 	} // end of member function __construct
@@ -94,7 +100,8 @@ 
 	/**
 	 * cleanup
 	 */
-	public function __destruct( ) {
+	public function __destruct( )
+	{
 	} // end of member function __destruct
 
 	/**
@@ -103,20 +110,27 @@ 
 	 * @param mixed _position may be: {current|first|last|next|previous|somenumber}
 	 * @return mixed array with data / false if no furtor records
 	 */
-	public function get_record( $_position = 'next' ) {
+	public function get_record( $_position = 'next' )
+	{
 		
-		if ($this->get_raw_record( $_position ) === false) {
+		if ($this->get_raw_record( $_position ) === false)
+		{
 			return false;
 		}
 		
 		// skip empty records
-		if( count( array_unique( $this->record ) ) < 2 ) return $this->get_record( $_position );
+		if( count( array_unique( $this->record ) ) < 2 )
+		{
+			return $this->get_record( $_position );
+		}
 		
-		if ( !empty( $this->conversion ) ) {
+		if ( !empty( $this->conversion ) )
+		{
 			$this->do_conversions();
 		}
 		
-		if ( !empty( $this->mapping ) ) {
+		if ( !empty( $this->mapping ) )
+		{
 			$this->do_fieldmapping();
 		}
 		
@@ -128,8 +142,10 @@ 
 	 *
 	 * @param int $_numToSkip
 	 */
-	public function skip_records( $_numToSkip ) {
-		while ( (int)$_numToSkip-- !== 0 ) {
+	public function skip_records( $_numToSkip )
+	{
+		while ( (int)$_numToSkip-- !== 0 )
+		{
 			fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
 		}
 	}
@@ -140,22 +156,27 @@ 
 	 * @param mixed $_position
 	 * @return bool
 	 */
-	private function get_raw_record( $_position = 'next' ) {
-		switch ($_position) {
+	private function get_raw_record( $_position = 'next' )
+	{
+		switch ($_position)
+		{
 			case 'current' :
-				if ($this->current_position == 0) {
+				if ($this->current_position == 0)
+				{
 					return;
 				}
 				break;
 			case 'first' :
-				if (!$this->current_position == 0) {
+				if (!$this->current_position == 0)
+				{
 					$this->current_position = 0;
 					rewind($this->resource);
 				}
 				
 			case 'next' :
 				$csv_data = fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
-				if (!is_array($csv_data)) {
+				if (!is_array($csv_data))
+				{
 					return false;
 				}
 				$this->current_position++;
@@ -163,33 +184,41 @@ 
 				break;
 				
 			case 'previous' :
-				if ($this->current_position < 2) {
+				if ($this->current_position < 2)
+				{
 					throw new Exception('Error: There is no previous record!');
 				}
 				$final_position = --$this->current_position;
 				$this->current_position = 0;
 				rewind($this->resource);
-				while ($this->current_position !== $final_position) {
+				while ($this->current_position !== $final_position)
+				{
 					$this->get_raw_record();
 				}
 				break;
 				
 			case 'last' :
-				while ($this->get_raw_record()) {}
+				while ($this->get_raw_record())
+				{
+}
 				break;
 				
 			default: //somenumber
-				if (!is_int($_position)) {
+				if (!is_int($_position))
+				{
 					throw new Exception('Error: $position must be one of {current|first|last|next|previous} or an integer value');
 				}
-				if ($_position == $this->current_position) {
+				if ($_position == $this->current_position)
+				{
 					break;
 				}
-				elseif ($_position < $this->current_position) {
+				elseif ($_position < $this->current_position)
+				{
 					$this->current_position = 0;
 					rewind($this->resource);
 				}
-				while ($this->current_position !== $_position) {
+				while ($this->current_position !== $_position)
+				{
 					$this->get_raw_record();
 				}
 				break;				
@@ -202,12 +231,16 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_num_of_records( ) {
-		if ($this->num_of_records > 0) {
+	public function get_num_of_records( )
+	{
+		if ($this->num_of_records > 0)
+		{
 			return $this->num_of_records;
 		}
 		$current_position = $this->current_position;
-		while ($this->get_raw_record()) {}
+		while ($this->get_raw_record())
+		{
+}
 		$this->num_of_records = $this->current_position;
 		$this->get_record($current_position);
 		return $this->num_of_records;
@@ -218,7 +251,8 @@ 
 	 *
 	 * @return int
 	 */
-	public function get_current_position( ) {
+	public function get_current_position( )
+	{
 		
 		return $this->current_position;
 		
@@ -230,12 +264,16 @@ 
 	 *
 	 * @return
 	 */
-	protected function do_fieldmapping( ) {
+	protected function do_fieldmapping( )
+	{
 		$record = $this->record;
 		$this->record = array();
 		foreach ($this->mapping as $cvs_idx => $new_idx)
 		{
-			if( $new_idx == '' ) continue;
+			if( $new_idx == '' )
+			{
+				continue;
+			}
 			$this->record[$new_idx] = $record[$cvs_idx];
 		}
 		return true;
@@ -246,8 +284,10 @@ 
 	 *
 	 * @return bool
 	 */
-	protected function do_conversions() {
-		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class )) {
+	protected function do_conversions()
+	{
+		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class ))
+		{
 			$this->record = $record;
 			return;
 		}
@@ -264,16 +304,19 @@ 
 	 *
 	 * @return string warnings, if any
 	 */
-	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0) {
+	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0)
+	{
 		$warnings = array();
 
 		// Automatic conversions
-		if($appname) {
+		if($appname)
+		{
 
 			// Load translations
 			Api\Translation::add_app($appname);
 
-			if(!self::$cf_parse_cache[$appname]) {
+			if(!self::$cf_parse_cache[$appname])
+			{
 				$c_fields = importexport_export_csv::convert_parse_custom_fields($appname, $selects, $links, $methods);
 				self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
 			}
@@ -282,7 +325,10 @@ 
 			// Add in any fields that are keys to another app
 			foreach((array)$fields['links'] as $link_field => $app)
 			{
-				if(is_numeric($link_field)) continue;
+				if(is_numeric($link_field))
+				{
+					continue;
+				}
 				$links[$link_field] = $app;
 				// Set it as a normal link field
 				$fields['links'][] = $link_field;
@@ -292,7 +338,8 @@ 
 			// Not quite a recursive merge, since only one level
 			foreach($fields as $type => &$list)
 			{
-				if($c_fields[$type]) {
+				if($c_fields[$type])
+				{
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -300,9 +347,12 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		if($fields) {
-			foreach((array)$fields['select'] as $name) {
-				if($record[$name] != null && is_array($selects) && $selects[$name]) {
+		if($fields)
+		{
+			foreach((array)$fields['select'] as $name)
+			{
+				if($record[$name] != null && is_array($selects) && $selects[$name])
+				{
 					$key = array_search(strtolower($record[$name]), array_map('strtolower',$selects[$name]));
 					if($key !== false)
 					{
@@ -311,11 +361,15 @@ 
 					else
 					{
 						$key = array_search(strtolower($record[$name]), array_map('strtolower',array_map('lang',$selects[$name])));
-						if($key !== false) $record[$name] = $key;
+						if($key !== false)
+						{
+							$record[$name] = $key;
+						}
 					}
 				}
 			}
-			foreach((array)$fields['links'] as $name) {
+			foreach((array)$fields['links'] as $name)
+			{
 				if($record[$name] && $links[$name])
 				{
 					// Primary key to another app, not a link
@@ -357,15 +411,19 @@ 
 								lang($links[$name]), $record[$name]).
  								' - ' . lang('no matches');
 							continue;
-						} else {
+						}
+						else
+						{
 							$record[$name] = key($results);
 						}
 					}
 				}
 			}
-			foreach((array)$fields['select-account'] as $name) {
+			foreach((array)$fields['select-account'] as $name)
+			{
 				// Compare against null to deal with empty arrays
-				if ($record[$name]) {
+				if ($record[$name])
+				{
 					// Automatically handle text owner without explicit translation
 					$new_owner = importexport_helper_functions::account_name2id($record[$name]);
 					if(count($new_owner) != count(explode(',',$record[$name])))
@@ -373,20 +431,26 @@ 
 						// Unable to parse value into account
 						$warnings[] = $name . ': ' .lang('%1 is not a known user or group', $record[$name]);
 					}
-					if($new_owner != '') {
+					if($new_owner != '')
+					{
 						$record[$name] = $new_owner;
-					} else {
+					}
+					else
+					{
 						// Clear it to prevent trouble later on
 						$record[$name] = '';
 					}
 				}
 			}
-			foreach((array)$fields['select-bool'] as $name) {
-				if($record[$name] != null && $record[$name] != '') {
+			foreach((array)$fields['select-bool'] as $name)
+			{
+				if($record[$name] != null && $record[$name] != '')
+				{
 					$record[$name] = ($record[$name] == lang('Yes') || $record[$name] == '1' ? 1 : 0);
 				}
 			}
-			foreach((array)$fields['date-time'] as $name) {
+			foreach((array)$fields['date-time'] as $name)
+			{
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
@@ -412,7 +476,8 @@ 
 								// Try again, anything goes
 								try {
 									$formatted = new Api\DateTime($record[$name]);
-								} catch (Exception $e) {
+								}
+								catch (Exception $e) {
 									$warnings[] = $name.': ' . $e->getMessage() . "\n" .
 										'Format: '.'!'.Api\DateTime::$user_dateformat . ' ' .Api\DateTime::$user_timeformat;
 									continue;
@@ -434,7 +499,8 @@ 
 					}
 					
 					if(is_array(self::$cf_parse_cache[$appname][0]['date-time']) &&
-							in_array($name, self::$cf_parse_cache[$appname][0]['date-time'])) {
+							in_array($name, self::$cf_parse_cache[$appname][0]['date-time']))
+					{
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d H:i:s', $record[$name]);
 					}
@@ -444,7 +510,8 @@ 
 					$record[$name] = null;
 				}
 			}
-			foreach((array)$fields['date'] as $name) {
+			foreach((array)$fields['date'] as $name)
+			{
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
@@ -458,7 +525,8 @@ 
 					}
 					$record[$name] = Api\DateTime::server2user($record[$name],'ts');
 					if(is_array(self::$cf_parse_cache[$appname][0]['date']) &&
-							in_array($name, self::$cf_parse_cache[$appname][0]['date'])) {
+							in_array($name, self::$cf_parse_cache[$appname][0]['date']))
+					{
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d', $record[$name]);
 					}
@@ -470,26 +538,37 @@ 
 			}
 			foreach((array)$fields['float'] as $name)
 			{
-				if($record[$name] != null && $record[$name] != '') {
+				if($record[$name] != null && $record[$name] != '')
+				{
 					$dec_point = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
-					if (empty($dec_point)) $dec_point = '.';
+					if (empty($dec_point))
+					{
+						$dec_point = '.';
+					}
 					$record[$name] = floatval(str_replace($dec_point, '.', preg_replace('/[^\d'.preg_quote($dec_point).']/', '', $record[$name])));
 				}
 			}
 
 			// Some custom methods for conversion
-			foreach((array)$methods as $name => $method) {
-				if($record[$name]) $record[$name] = ExecMethod($method, $record[$name]);
+			foreach((array)$methods as $name => $method)
+			{
+				if($record[$name])
+				{
+					$record[$name] = ExecMethod($method, $record[$name]);
+				}
 			}
 
 			// cat_name2id will use currentapp to create new categories
 			$current_app = $GLOBALS['egw_info']['flags']['currentapp'];
-			if($appname) {
+			if($appname)
+			{
 				$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 			}
 			$categories = new Api\Categories('',$appname);
-			foreach((array)$fields['select-cat'] as $name) {
-				if($record[$name]) {
+			foreach((array)$fields['select-cat'] as $name)
+			{
+				if($record[$name])
+				{
 					// Only parse name if it needs it
 					if($format == 1)
 					{
@@ -503,7 +582,10 @@ 
 							$cat_id = importexport_helper_functions::cat_name2id($record[$name]);
 						}
 						// Don't clear it if it wasn't found
-						if($cat_id) $record[$name] = $cat_id;
+						if($cat_id)
+						{
+							$record[$name] = $cat_id;
+						}
 					}
 				}
 			}

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

@@ -264,7 +264,7 @@
 	 *
 	 * @return string warnings, if any
 	 */
-	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0) {
+	public static function convert(array &$record, array $fields = array(), $appname = null, array $selects = array(), $format=0) {
 		$warnings = array();
 
 		// Automatic conversions

Spacing +75 added lines, -75 removed lines

@@ -80,10 +80,10 @@ 
 	 * @param string $_resource resource containing data. May be each valid php-stream
 	 * @param array $_options options for the resource array with keys: charset and fieldsep
 	 */
-	public function __construct( $_resource,  array $_options ) {
+	public function __construct($_resource, array $_options) {
 		$this->resource = $_resource;
 		$this->csv_fieldsep = $_options['fieldsep'];
-		if($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
+		if ($_options['charset'] == 'user') $_options['charset'] = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 		$this->csv_charset = $_options['charset'];
 		return;
 	} // end of member function __construct
@@ -100,20 +100,20 @@ 
 	 * @param mixed _position may be: {current|first|last|next|previous|somenumber}
 	 * @return mixed array with data / false if no furtor records
 	 */
-	public function get_record( $_position = 'next' ) {
+	public function get_record($_position = 'next') {
 		
-		if ($this->get_raw_record( $_position ) === false) {
+		if ($this->get_raw_record($_position) === false) {
 			return false;
 		}
 		
 		// skip empty records
-		if( count( array_unique( $this->record ) ) < 2 ) return $this->get_record( $_position );
+		if (count(array_unique($this->record)) < 2) return $this->get_record($_position);
 		
-		if ( !empty( $this->conversion ) ) {
+		if (!empty($this->conversion)) {
 			$this->do_conversions();
 		}
 		
-		if ( !empty( $this->mapping ) ) {
+		if (!empty($this->mapping)) {
 			$this->do_fieldmapping();
 		}
 		
@@ -125,9 +125,9 @@ 
 	 *
 	 * @param int $_numToSkip
 	 */
-	public function skip_records( $_numToSkip ) {
-		while ( (int)$_numToSkip-- !== 0 ) {
-			fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
+	public function skip_records($_numToSkip) {
+		while ((int)$_numToSkip-- !== 0) {
+			fgetcsv($this->resource, self::csv_max_linelength, $this->csv_fieldsep);
 		}
 	}
 	
@@ -137,7 +137,7 @@ 
 	 * @param mixed $_position
 	 * @return bool
 	 */
-	private function get_raw_record( $_position = 'next' ) {
+	private function get_raw_record($_position = 'next') {
 		switch ($_position) {
 			case 'current' :
 				if ($this->current_position == 0) {
@@ -151,7 +151,7 @@ 
 				}
 				
 			case 'next' :
-				$csv_data = fgetcsv( $this->resource, self::csv_max_linelength, $this->csv_fieldsep);
+				$csv_data = fgetcsv($this->resource, self::csv_max_linelength, $this->csv_fieldsep);
 				if (!is_array($csv_data)) {
 					return false;
 				}
@@ -232,7 +232,7 @@ 
 		$this->record = array();
 		foreach ($this->mapping as $cvs_idx => $new_idx)
 		{
-			if( $new_idx == '' ) continue;
+			if ($new_idx == '') continue;
 			$this->record[$new_idx] = $record[$cvs_idx];
 		}
 		return true;
@@ -244,7 +244,7 @@ 
 	 * @return bool
 	 */
 	protected function do_conversions() {
-		if ( $record = importexport_helper_functions::conversion( $this->record, $this->conversion, $this->conversion_class )) {
+		if ($record = importexport_helper_functions::conversion($this->record, $this->conversion, $this->conversion_class)) {
 			$this->record = $record;
 			return;
 		}
@@ -261,25 +261,25 @@ 
 	 *
 	 * @return string warnings, if any
 	 */
-	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format=0) {
+	public static function convert(Array &$record, Array $fields = array(), $appname = null, Array $selects = array(), $format = 0) {
 		$warnings = array();
 
 		// Automatic conversions
-		if($appname) {
+		if ($appname) {
 
 			// Load translations
 			translation::add_app($appname);
 
-			if(!self::$cf_parse_cache[$appname]) {
+			if (!self::$cf_parse_cache[$appname]) {
 				$c_fields = importexport_export_csv::convert_parse_custom_fields($appname, $selects, $links, $methods);
 				self::$cf_parse_cache[$appname] = array($c_fields, $selects, $links, $methods);
 			}
 			list($c_fields, $c_selects, $links, $methods) = self::$cf_parse_cache[$appname];
 
 			// Add in any fields that are keys to another app
-			foreach((array)$fields['links'] as $link_field => $app)
+			foreach ((array)$fields['links'] as $link_field => $app)
 			{
-				if(is_numeric($link_field)) continue;
+				if (is_numeric($link_field)) continue;
 				$links[$link_field] = $app;
 				// Set it as a normal link field
 				$fields['links'][] = $link_field;
@@ -287,9 +287,9 @@ 
 			}
 
 			// Not quite a recursive merge, since only one level
-			foreach($fields as $type => &$list)
+			foreach ($fields as $type => &$list)
 			{
-				if($c_fields[$type]) {
+				if ($c_fields[$type]) {
 					$list = array_merge($c_fields[$type], $list);
 					unset($c_fields[$type]);
 				}
@@ -297,36 +297,36 @@ 
 			$fields += $c_fields;
 			$selects += $c_selects;
 		}
-		if($fields) {
-			foreach((array)$fields['select'] as $name) {
-				if($record[$name] != null && is_array($selects) && $selects[$name]) {
-					$key = array_search(strtolower($record[$name]), array_map('strtolower',$selects[$name]));
-					if($key !== false)
+		if ($fields) {
+			foreach ((array)$fields['select'] as $name) {
+				if ($record[$name] != null && is_array($selects) && $selects[$name]) {
+					$key = array_search(strtolower($record[$name]), array_map('strtolower', $selects[$name]));
+					if ($key !== false)
 					{
 						$record[$name] = $key;
 					}
 					else
 					{
-						$key = array_search(strtolower($record[$name]), array_map('strtolower',array_map('lang',$selects[$name])));
-						if($key !== false) $record[$name] = $key;
+						$key = array_search(strtolower($record[$name]), array_map('strtolower', array_map('lang', $selects[$name])));
+						if ($key !== false) $record[$name] = $key;
 					}
 				}
 			}
-			foreach((array)$fields['links'] as $name) {
-				if($record[$name] && $links[$name])
+			foreach ((array)$fields['links'] as $name) {
+				if ($record[$name] && $links[$name])
 				{
 					// Primary key to another app, not a link
 					// Text - search for a matching record
-					if(!is_numeric($record[$name]))
+					if (!is_numeric($record[$name]))
 					{
 						$results = egw_link::query($links[$name], $record[$name]);
-						if(count($results) >= 1)
+						if (count($results) >= 1)
 						{
 							// More than 1 result.  Check for exact match
 							$exact_count = 0;
-							foreach($results as $id => $title)
+							foreach ($results as $id => $title)
 							{
-								if($title == $record[$name])
+								if ($title == $record[$name])
 								{
 									$exact_count++;
 									$app_id = $id;
@@ -335,11 +335,11 @@ 
 								unset($results[$id]);
 							}
 							// Too many exact matches, or none good enough
-							if($exact_count > 1 || count($results) == 0)
+							if ($exact_count > 1 || count($results) == 0)
 							{
 								$warnings[] = lang('Unable to link to %1 "%2"',
 									lang($links[$name]), $record[$name]).
- 									' - ' .lang('too many matches');
+ 									' - '.lang('too many matches');
 								continue;
 							}
 							elseif ($exact_count == 1)
@@ -352,7 +352,7 @@ 
 						{
 							$warnings[] = lang('Unable to link to %1 "%2"',
 								lang($links[$name]), $record[$name]).
- 								' - ' . lang('no matches');
+ 								' - '.lang('no matches');
 							continue;
 						} else {
 							$record[$name] = key($results);
@@ -360,17 +360,17 @@ 
 					}
 				}
 			}
-			foreach((array)$fields['select-account'] as $name) {
+			foreach ((array)$fields['select-account'] as $name) {
 				// Compare against null to deal with empty arrays
 				if ($record[$name]) {
 					// Automatically handle text owner without explicit translation
 					$new_owner = importexport_helper_functions::account_name2id($record[$name]);
-					if(count($new_owner) != count(explode(',',$record[$name])))
+					if (count($new_owner) != count(explode(',', $record[$name])))
 					{
 						// Unable to parse value into account
-						$warnings[] = $name . ': ' .lang('%1 is not a known user or group', $record[$name]);
+						$warnings[] = $name.': '.lang('%1 is not a known user or group', $record[$name]);
 					}
-					if($new_owner != '') {
+					if ($new_owner != '') {
 						$record[$name] = $new_owner;
 					} else {
 						// Clear it to prevent trouble later on
@@ -378,24 +378,24 @@ 
 					}
 				}
 			}
-			foreach((array)$fields['select-bool'] as $name) {
-				if($record[$name] != null && $record[$name] != '') {
+			foreach ((array)$fields['select-bool'] as $name) {
+				if ($record[$name] != null && $record[$name] != '') {
 					$record[$name] = ($record[$name] == lang('Yes') || $record[$name] == '1' ? 1 : 0);
 				}
 			}
-			foreach((array)$fields['date-time'] as $name) {
+			foreach ((array)$fields['date-time'] as $name) {
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
-					if($format == 1)
+					if ($format == 1)
 					{
 						$formatted = egw_time::createFromFormat(
-							'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat,
+							'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat,
 							$record[$name],
 							egw_time::$user_timezone
 						);
 
-						if(!$formatted && $errors = egw_time::getLastErrors())
+						if (!$formatted && $errors = egw_time::getLastErrors())
 						{
 							// Try again, without time
 							$formatted = egw_time::createFromFormat(
@@ -404,70 +404,70 @@ 
 								egw_time::$user_timezone
 							);
 							
-							if(!$formatted && $errors = egw_time::getLastErrors())
+							if (!$formatted && $errors = egw_time::getLastErrors())
 							{
 								// Try again, anything goes
 								try {
 									$formatted = new egw_time($record[$name]);
 								} catch (Exception $e) {
-									$warnings[] = $name.': ' . $e->getMessage() . "\n" .
-										'Format: '.'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat;
+									$warnings[] = $name.': '.$e->getMessage()."\n".
+										'Format: '.'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat;
 									continue;
 								}
 								$errors = egw_time::getLastErrors();
-								foreach($errors['errors'] as $char => $msg)
+								foreach ($errors['errors'] as $char => $msg)
 								{
 									$warnings[] = "$name: [$char] $msg\n".
-										'Format: '.'!'.egw_time::$user_dateformat . ' ' .egw_time::$user_timeformat;
+										'Format: '.'!'.egw_time::$user_dateformat.' '.egw_time::$user_timeformat;
 								}
 							}
 						}
-						if($formatted)
+						if ($formatted)
 						{
 							$record[$name] = $formatted->getTimestamp();
 							// Timestamp is apparently in server time, but apps will do the same conversion
-							$record[$name] = egw_time::server2user($record[$name],'ts');
+							$record[$name] = egw_time::server2user($record[$name], 'ts');
 						}
 					}
 					
-					if(is_array(self::$cf_parse_cache[$appname][0]['date-time']) &&
+					if (is_array(self::$cf_parse_cache[$appname][0]['date-time']) &&
 							in_array($name, self::$cf_parse_cache[$appname][0]['date-time'])) {
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d H:i:s', $record[$name]);
 					}
 				}
-				if(array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
+				if (array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
 				{
 					$record[$name] = null;
 				}
 			}
-			foreach((array)$fields['date'] as $name) {
+			foreach ((array)$fields['date'] as $name) {
 				if (isset($record[$name]) && !is_numeric($record[$name]) && strlen(trim($record[$name])) > 0)
 				{
 					// Need to handle format first
-					if($format == 1)
+					if ($format == 1)
 					{
 						$formatted = egw_time::createFromFormat('!'.egw_time::$user_dateformat, $record[$name]);
-						if($formatted && $errors = egw_time::getLastErrors() && $errors['error_count'] == 0)
+						if ($formatted && $errors = egw_time::getLastErrors() && $errors['error_count'] == 0)
 						{
 							$record[$name] = $formatted->getTimestamp();
 						}
 					}
-					$record[$name] = egw_time::server2user($record[$name],'ts');
-					if(is_array(self::$cf_parse_cache[$appname][0]['date']) &&
+					$record[$name] = egw_time::server2user($record[$name], 'ts');
+					if (is_array(self::$cf_parse_cache[$appname][0]['date']) &&
 							in_array($name, self::$cf_parse_cache[$appname][0]['date'])) {
 						// Custom fields stored in a particular format (from customfields_widget)
 						$record[$name] = date('Y-m-d', $record[$name]);
 					}
 				}
-				if(array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
+				if (array_key_exists($name, $record) && strlen(trim($record[$name])) == 0)
 				{
 					$record[$name] = null;
 				}
 			}
-			foreach((array)$fields['float'] as $name)
+			foreach ((array)$fields['float'] as $name)
 			{
-				if($record[$name] != null && $record[$name] != '') {
+				if ($record[$name] != null && $record[$name] != '') {
 					$dec_point = $GLOBALS['egw_info']['user']['preferences']['common']['number_format'][0];
 					if (empty($dec_point)) $dec_point = '.';
 					$record[$name] = floatval(str_replace($dec_point, '.', preg_replace('/[^\d'.preg_quote($dec_point).']/', '', $record[$name])));
@@ -475,23 +475,23 @@ 
 			}
 
 			// Some custom methods for conversion
-			foreach((array)$methods as $name => $method) {
-				if($record[$name]) $record[$name] = ExecMethod($method, $record[$name]);
+			foreach ((array)$methods as $name => $method) {
+				if ($record[$name]) $record[$name] = ExecMethod($method, $record[$name]);
 			}
 
 			// cat_name2id will use currentapp to create new categories
 			$current_app = $GLOBALS['egw_info']['flags']['currentapp'];
-			if($appname) {
+			if ($appname) {
 				$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 			}
-			$categories = new categories('',$appname);
-			foreach((array)$fields['select-cat'] as $name) {
-				if($record[$name]) {
+			$categories = new categories('', $appname);
+			foreach ((array)$fields['select-cat'] as $name) {
+				if ($record[$name]) {
 					// Only parse name if it needs it
-					if($format == 1)
+					if ($format == 1)
 					{
-						$existing_cat = $categories->exists('all',$record[$name]);
-						if($existing_cat)
+						$existing_cat = $categories->exists('all', $record[$name]);
+						if ($existing_cat)
 						{
 							$cat_id = $existing_cat;
 						}
@@ -500,14 +500,14 @@ 
 							$cat_id = importexport_helper_functions::cat_name2id($record[$name]);
 						}
 						// Don't clear it if it wasn't found
-						if($cat_id) $record[$name] = $cat_id;
+						if ($cat_id) $record[$name] = $cat_id;
 					}
 				}
 			}
 			$GLOBALS['egw_info']['flags']['currentapp'] = $current_app;
 		}
 
-		return implode("\n",$warnings);
+		return implode("\n", $warnings);
 	}
 } // end of import_csv
 ?>

importexport/inc/class.importexport_import_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -295,7 +295,7 @@
 		 *
 		 * @param importexport_iface_import_plugin $plugin Instance of plugin to be used
 		 * @param resource $stream
-		 * @param importexport_definition $definition
+		 * @param importexport_definition $definition_obj
 		 * @return String HTML fragment illustrating how the data will be understood by Egw
 		 */
 		protected function preview(importexport_iface_import_plugin &$plugin, &$stream, importexport_definition &$definition_obj)

Indentation +6 added lines, -6 removed lines

@@ -41,8 +41,8 @@ 
 		}
 
 		/**
-		*  Step user through importing their file
-		*/
+		 *  Step user through importing their file
+		 */
 		public function import_dialog($content = array()) {
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
@@ -224,8 +224,8 @@ 
 		}
 
 		/**
-		* Get options for select boxes
-		*/
+		 * Get options for select boxes
+		 */
 		public static function get_select_options(Array $data) {
 			$options = array(
 				'delimiter' => array(
@@ -274,8 +274,8 @@ 
 		}
 
 		/**
-		* Get definitions via ajax
-		*/
+		 * Get definitions via ajax
+		 */
 		public function ajax_get_definitions($appname, $file=null) {
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
 			$response = new xajaxResponse();

Braces +81 added lines, -35 removed lines

@@ -20,7 +20,8 @@ 
  *
 */
 
-	class importexport_import_ui {
+	class importexport_import_ui
+	{
 
 		const _appname = 'importexport';
 
@@ -35,7 +36,8 @@ 
 		 */
 		private $plugins;
 
-		public function __construct() {
+		public function __construct()
+		{
 			$this->plugins = importexport_helper_functions::get_plugins('all','import');
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 		}
@@ -43,7 +45,8 @@ 
 		/**
 		*  Step user through importing their file
 		*/
-		public function import_dialog($content = array()) {
+		public function import_dialog($content = array())
+		{
 			$appname = $_GET['appname'] ? $_GET['appname'] : $content['appname'];
 			$definition = $_GET['definition'] ? $_GET['definition'] : $content['definition'];
 
@@ -57,16 +60,19 @@ 
 			{
 				Api\Translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if($content['import'] && $definition)
+			{
 				try {
 					$definition_obj = new importexport_definition($content['definition']);
-					if($content['dry-run']) {
+					if($content['dry-run'])
+					{
 						// Set this so plugin doesn't do any data changes
 						$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 					}
 					$options =& $definition_obj->plugin_options;
 					$options['no_notification'] = $content['no_notifications'];
-					if($content['delimiter']) {
+					if($content['delimiter'])
+					{
 						$options['fieldsep'] =
 							$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
 					}
@@ -109,7 +115,8 @@ 
 						// Keep file
 						if($dst_file)
 						{
-							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file)) {
+							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file))
+							{
 								$preserve['file']['tmp_name'] = $dst_file;
 							}
 						}
@@ -162,31 +169,41 @@ 
 						Framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
 					}
 					$total_processed = 0;
-					foreach($plugin->get_results() as $action => $a_count) {
+					foreach($plugin->get_results() as $action => $a_count)
+					{
 						$this->message .= "<br />\n" . lang($action) . ": $a_count";
 						$total_processed += $a_count;
 					}
-					if(count($plugin->get_warnings())) {
+					if(count($plugin->get_warnings()))
+					{
 						$this->message .= "<br />\n".lang('Warnings').':';
-						foreach($plugin->get_warnings() as $record => $message) {
+						foreach($plugin->get_warnings() as $record => $message)
+						{
 							$this->message .= "\n$record: $message";
 						}
 					}
-					if(count($plugin->get_errors())) {
+					if(count($plugin->get_errors()))
+					{
 						$this->message .= "<br />\n".lang('Problems during import:');
-						foreach($plugin->get_errors() as $record => $message) {
+						foreach($plugin->get_errors() as $record => $message)
+						{
 							$this->message .= "<br />\n$record: $message";
 						}
-						if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+						if($count != $total_processed)
+						{
+							$this->message .= "<br />\n".lang('Some records may not have been imported');
+						}
 					}
-					if ($dst_file && $content['file']['tmp_name'] == $dst_file) {
+					if ($dst_file && $content['file']['tmp_name'] == $dst_file)
+					{
 						// Remove file
 						$cachefile->delete(Api\Cache::keys(Api\Cache::INSTANCE, 'importexport',
 							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id'])));
 						unset($dst_file);
 					}
 
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					$this->message .= $e->getMessage();
 				}
 			}
@@ -218,7 +235,10 @@ 
 			$data['message'] = $this->message;
 			Framework::includeJS('.','importexport','importexport');
 
-			if($_GET['appname']) $readonlys['appname'] = true;
+			if($_GET['appname'])
+			{
+				$readonlys['appname'] = true;
+			}
 
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
 		}
@@ -226,7 +246,8 @@ 
 		/**
 		* Get options for select boxes
 		*/
-		public static function get_select_options(Array $data) {
+		public static function get_select_options(Array $data)
+		{
 			$options = array(
 				'delimiter' => array(
 					''	=>	lang('From definition'),
@@ -242,17 +263,20 @@ 
 			(array)$apps = importexport_helper_functions::get_apps('import');
 			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
 
-			if($data['appname']) {
+			if($data['appname'])
+			{
 				$options['definition'] = array();
 
-				if($data['file'] && !is_array($data['file'])) {
+				if($data['file'] && !is_array($data['file']))
+				{
 					$extension = substr($data['file'], -3);
 				}
 				$definitions = new importexport_definitions_bo(array(
 					'type' => 'import',
 					'application' => $data['appname']
 				));
-				foreach ((array)$definitions->get_definitions() as $identifier) {
+				foreach ((array)$definitions->get_definitions() as $identifier)
+				{
 					try
 					{
 						$definition = new importexport_definition($identifier);
@@ -262,7 +286,8 @@ 
 						// Permission error
 						continue;
 					}
-					if ($title = $definition->get_title()) {
+					if ($title = $definition->get_title())
+					{
 						$options['definition'][$title] = $title;
 					}
 					unset($definition);
@@ -276,12 +301,15 @@ 
 		/**
 		* Get definitions via ajax
 		*/
-		public function ajax_get_definitions($appname, $file=null) {
+		public function ajax_get_definitions($appname, $file=null)
+		{
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
 			$response = new xajaxResponse();
 			$response->addScript("clear_options('exec[definition]');");
-			if(is_array($options['definition'])) {
-				foreach ($options['definition'] as $value => $title) {
+			if(is_array($options['definition']))
+			{
+				foreach ($options['definition'] as $value => $title)
+				{
 					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);");
 				}
 			}
@@ -317,9 +345,15 @@ 
 				for($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
 				{
 					$row_data = $import_csv->get_record();
-					if($row_data === false) break;
+					if($row_data === false)
+					{
+						break;
+					}
 					$rows[$import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'] ? 'h1' : $row] = $row_data;
-					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
+					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'])
+					{
+						$row--;
+					}
 				}
 				$preview = Api\Html::table($rows);
 				rewind($stream);
@@ -328,19 +362,26 @@ 
 			{
 				$preview = lang('Preview not supported by %1', $plugin->get_name());
 			}
-			if(count($plugin->get_warnings())) {
+			if(count($plugin->get_warnings()))
+			{
 				$this->message .= "<br />\n".lang('Warnings').':';
-				foreach($plugin->get_warnings() as $record => $message) {
+				foreach($plugin->get_warnings() as $record => $message)
+				{
 					$this->message .= "\n$record: $message";
 				}
 				$this->message .= "<br />\n";
 			};
-			if(count($plugin->get_errors())) {
+			if(count($plugin->get_errors()))
+			{
 				$this->message .= "<br />\n".lang('Problems during import:');
-				foreach($plugin->get_errors() as $record => $message) {
+				foreach($plugin->get_errors() as $record => $message)
+				{
 					$this->message .= "<br />\n$record: $message";
 				}
-				if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+				if($count != $total_processed)
+				{
+					$this->message .= "<br />\n".lang('Some records may not have been imported');
+				}
 				$this->message .= "<br />\n";
 			}
 			return '<div class="header">' . lang('Preview') . ' - ' . $plugin->get_name() . '</div>' . $preview;
@@ -365,10 +406,16 @@ 
 			$message_count = count($message);
 
 			// Only CSV files
-			if(!$options['csv_fields']) return true;
+			if(!$options['csv_fields'])
+			{
+				return true;
+			}
 
 			// Can't check if definition has no header
-			if($options['num_header_lines'] == 0) return true;
+			if($options['num_header_lines'] == 0)
+			{
+				return true;
+			}
 
 			$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 			$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
@@ -412,8 +459,7 @@ 
 				if($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
-				)
-				{
+				) {
 					continue;
 				}
 

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

@@ -226,7 +226,7 @@
 		/**
 		* Get options for select boxes
 		*/
-		public static function get_select_options(Array $data) {
+		public static function get_select_options(array $data) {
 			$options = array(
 				'delimiter' => array(
 					''	=>	lang('From definition'),

Spacing +79 added lines, -79 removed lines

@@ -32,7 +32,7 @@ 
 		private $plugins;
 
 		public function __construct() {
-			$this->plugins = importexport_helper_functions::get_plugins('all','import');
+			$this->plugins = importexport_helper_functions::get_plugins('all', 'import');
 			$GLOBALS['egw_info']['flags']['include_xajax'] = true;
 		}
 
@@ -49,20 +49,20 @@ 
 			$template = new etemplate_new('importexport.import_dialog');
 
 			// Load application's translations
-			if($appname)
+			if ($appname)
 			{
 				translation::add_app($appname);
 			}
-			if($content['import'] && $definition) {
+			if ($content['import'] && $definition) {
 				try {
 					$definition_obj = new importexport_definition($content['definition']);
-					if($content['dry-run']) {
+					if ($content['dry-run']) {
 						// Set this so plugin doesn't do any data changes
 						$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 					}
-					$options =& $definition_obj->plugin_options;
+					$options = & $definition_obj->plugin_options;
 					$options['no_notification'] = $content['no_notifications'];
-					if($content['delimiter']) {
+					if ($content['delimiter']) {
 						$options['fieldsep'] =
 							$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
 					}
@@ -71,8 +71,8 @@ 
 					$plugin = new $definition_obj->plugin;
 
 					// Check file encoding matches import
-					$sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024);
-					if($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
+					$sample = file_get_contents($content['file']['tmp_name'], false, null, 0, 1024);
+					if ($appname == 'addressbook' && $definition_obj->plugin == 'addressbook_import_vcard')
 					{
 						$preference = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
 					}
@@ -82,7 +82,7 @@ 
 					}
 					$required = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 					$encoding = translation::detect_encoding($sample, $required);
-					if($encoding && strtoupper($required) != strtoupper($encoding))
+					if ($encoding && strtoupper($required) != strtoupper($encoding))
 					{
 						$this->message = lang("Encoding mismatch.  Expected %1 file, you uploaded %2.<br />\n",
 							$required,
@@ -97,37 +97,37 @@ 
 					$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
 
 					// Destination if we need to hold the file
-					if($file)
+					if ($file)
 					{
 						$cachefile = new egw_cache_files(array());
 						$dst_file = $cachefile->filename(egw_cache::keys(egw_cache::INSTANCE, 'importexport',
-							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true),true);
+							'import_'.md5($content['file']['name'].$GLOBALS['egw_info']['user']['account_id']), true), true);
 						// Keep file
-						if($dst_file)
+						if ($dst_file)
 						{
-							if($content['file']['name'] && copy($content['file']['tmp_name'],$dst_file)) {
+							if ($content['file']['name'] && copy($content['file']['tmp_name'], $dst_file)) {
 								$preserve['file']['tmp_name'] = $dst_file;
 							}
 						}
 
 						// Check on matching columns
 						$check_message = array();
-						if(!self::check_file($file, $definition_obj, $check_message, $dst_file))
+						if (!self::check_file($file, $definition_obj, $check_message, $dst_file))
 						{
 							// Set this so plugin doesn't do any data changes
 							$content['dry-run'] = true;
 							importexport_helper_functions::$dry_run = true;
-							$this->message .= '<b>' . lang('Import aborted').":</b><br />\n";
+							$this->message .= '<b>'.lang('Import aborted').":</b><br />\n";
 							$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
 						}
-						if(count($check_message))
+						if (count($check_message))
 						{
-							$this->message .= implode($check_message, "<br />\n") . "<br />\n";
+							$this->message .= implode($check_message, "<br />\n")."<br />\n";
 						}
-						if($content['dry-run'])
+						if ($content['dry-run'])
 						{
 							$preview = $this->preview($plugin, $file, $definition_obj);
-							if(trim($this->message) == '')
+							if (trim($this->message) == '')
 							{
 								// Clear first, to prevent request from being collected if the result is the same
 								$template->setElementAttribute('preview', 'value', '');
@@ -146,34 +146,34 @@ 
 						$this->message .= lang('please select file to import'."<br />\n");
 					}
 
-					if($content['dry-run'])
+					if ($content['dry-run'])
 					{
-						$this->message .= '<b>' . lang('test only').":</b><br />\n";
+						$this->message .= '<b>'.lang('test only').":</b><br />\n";
 					}
 					$this->message .= lang('%1 records processed', $count);
 
 					// Refresh opening window
-					if(!$content['dry-run'])
+					if (!$content['dry-run'])
 					{
-						egw_framework::refresh_opener(lang('%1 records processed',$count), $appname, null,null,$appname);
+						egw_framework::refresh_opener(lang('%1 records processed', $count), $appname, null, null, $appname);
 					}
 					$total_processed = 0;
-					foreach($plugin->get_results() as $action => $a_count) {
-						$this->message .= "<br />\n" . lang($action) . ": $a_count";
+					foreach ($plugin->get_results() as $action => $a_count) {
+						$this->message .= "<br />\n".lang($action).": $a_count";
 						$total_processed += $a_count;
 					}
-					if(count($plugin->get_warnings())) {
+					if (count($plugin->get_warnings())) {
 						$this->message .= "<br />\n".lang('Warnings').':';
-						foreach($plugin->get_warnings() as $record => $message) {
+						foreach ($plugin->get_warnings() as $record => $message) {
 							$this->message .= "\n$record: $message";
 						}
 					}
-					if(count($plugin->get_errors())) {
+					if (count($plugin->get_errors())) {
 						$this->message .= "<br />\n".lang('Problems during import:');
-						foreach($plugin->get_errors() as $record => $message) {
+						foreach ($plugin->get_errors() as $record => $message) {
 							$this->message .= "<br />\n$record: $message";
 						}
-						if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+						if ($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
 					}
 					if ($dst_file && $content['file']['tmp_name'] == $dst_file) {
 						// Remove file
@@ -186,7 +186,7 @@ 
 					$this->message .= $e->getMessage();
 				}
 			}
-			elseif($content['cancel'])
+			elseif ($content['cancel'])
 			{
 				$GLOBALS['egw']->js->set_onload('window.close();');
 			}
@@ -199,7 +199,7 @@ 
 				);
 			}
 
-			if(!array_key_exists('dry-run',$content))
+			if (!array_key_exists('dry-run', $content))
 			{
 				$data['dry-run'] = true;
 			}
@@ -207,14 +207,14 @@ 
 			$data['appname'] = $preserve['appname'] = $appname ? $appname : ($definition_obj ? $definition_obj->application : '');
 			$data['definition'] = $definition;
 			$data['delimiter'] = $definition_obj->plugin_options['delimiter'];
-			$data['no_notifications'] = true;	// switch notifications off by default
+			$data['no_notifications'] = true; // switch notifications off by default
 
 			$sel_options = self::get_select_options($data);
 
 			$data['message'] = $this->message;
-			$GLOBALS['egw']->js->validate_file('.','importexport','importexport');
+			$GLOBALS['egw']->js->validate_file('.', 'importexport', 'importexport');
 
-			if($_GET['appname']) $readonlys['appname'] = true;
+			if ($_GET['appname']) $readonlys['appname'] = true;
 
 			$template->exec('importexport.importexport_import_ui.import_dialog', $data, $sel_options, $readonlys, $preserve, 2);
 		}
@@ -236,12 +236,12 @@ 
 			);
 
 			(array)$apps = importexport_helper_functions::get_apps('import');
-			$options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
+			$options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
 
-			if($data['appname']) {
+			if ($data['appname']) {
 				$options['definition'] = array();
 
-				if($data['file'] && !is_array($data['file'])) {
+				if ($data['file'] && !is_array($data['file'])) {
 					$extension = substr($data['file'], -3);
 				}
 				$definitions = new importexport_definitions_bo(array(
@@ -272,11 +272,11 @@ 
 		/**
 		* Get definitions via ajax
 		*/
-		public function ajax_get_definitions($appname, $file=null) {
+		public function ajax_get_definitions($appname, $file = null) {
 			$options = self::get_select_options(array('appname'=>$appname, 'file'=>$file));
 			$response = new xajaxResponse();
 			$response->addScript("clear_options('exec[definition]');");
-			if(is_array($options['definition'])) {
+			if (is_array($options['definition'])) {
 				foreach ($options['definition'] as $value => $title) {
 					$response->addScript("selectbox_add_option('exec[definition]','$title', '$value',false);");
 				}
@@ -294,28 +294,28 @@ 
 		 * @param importexport_definition $definition
 		 * @return String HTML fragment illustrating how the data will be understood by egw
 		 */
-		protected function preview(importexport_iface_import_plugin &$plugin, &$stream, importexport_definition &$definition_obj)
+		protected function preview(importexport_iface_import_plugin&$plugin, &$stream, importexport_definition&$definition_obj)
 		{
-			if(method_exists($plugin, 'preview'))
+			if (method_exists($plugin, 'preview'))
 			{
 				$preview = $plugin->preview($stream, $definition_obj);
 			}
-			elseif($definition_obj->plugin_options['csv_fields'])
+			elseif ($definition_obj->plugin_options['csv_fields'])
 			{
-				$import_csv = new importexport_import_csv( $stream, array(
+				$import_csv = new importexport_import_csv($stream, array(
 					'fieldsep' => $definition_obj->plugin_options['fieldsep'],
 					'charset' => $definition_obj->plugin_options['charset'],
 				));
 				// set FieldMapping.
 				$import_csv->mapping = $definition_obj->plugin_options['field_mapping'];
 
-				$rows = array('h1'=>array(),'f1'=>array(),'.h1'=>'class=th');
-				for($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
+				$rows = array('h1'=>array(), 'f1'=>array(), '.h1'=>'class=th');
+				for ($row = 0; $row < $GLOBALS['egw_info']['user']['preferences']['common']['maxmatchs']; $row++)
 				{
 					$row_data = $import_csv->get_record();
-					if($row_data === false) break;
+					if ($row_data === false) break;
 					$rows[$import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines'] ? 'h1' : $row] = $row_data;
-					if($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
+					if ($import_csv->get_current_position() <= $definition_obj->plugin_options['num_header_lines']) $row--;
 				}
 				$preview = html::table($rows);
 				rewind($stream);
@@ -324,22 +324,22 @@ 
 			{
 				$preview = lang('Preview not supported by %1', $plugin->get_name());
 			}
-			if(count($plugin->get_warnings())) {
+			if (count($plugin->get_warnings())) {
 				$this->message .= "<br />\n".lang('Warnings').':';
-				foreach($plugin->get_warnings() as $record => $message) {
+				foreach ($plugin->get_warnings() as $record => $message) {
 					$this->message .= "\n$record: $message";
 				}
 				$this->message .= "<br />\n";
 			};
-			if(count($plugin->get_errors())) {
+			if (count($plugin->get_errors())) {
 				$this->message .= "<br />\n".lang('Problems during import:');
-				foreach($plugin->get_errors() as $record => $message) {
+				foreach ($plugin->get_errors() as $record => $message) {
 					$this->message .= "<br />\n$record: $message";
 				}
-				if($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
+				if ($count != $total_processed) $this->message .= "<br />\n".lang('Some records may not have been imported');
 				$this->message .= "<br />\n";
 			}
-			return '<div class="header">' . lang('Preview') . ' - ' . $plugin->get_name() . '</div>' . $preview;
+			return '<div class="header">'.lang('Preview').' - '.$plugin->get_name().'</div>'.$preview;
 		}
 
 		/**
@@ -357,24 +357,24 @@ 
 		 */
 		public static function check_file(&$file, &$definition, &$message = array(), $dst_file = false)
 		{
-			$options =& $definition->plugin_options;
+			$options = & $definition->plugin_options;
 			$message_count = count($message);
 
 			// Only CSV files
-			if(!$options['csv_fields']) return true;
+			if (!$options['csv_fields']) return true;
 
 			// Can't check if definition has no header
-			if($options['num_header_lines'] == 0) return true;
+			if ($options['num_header_lines'] == 0) return true;
 
 			$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
 			$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
 
 			$data = fgetcsv($file, 8000, $options['fieldsep']);
 			rewind($file);
-			$data = translation::convert($data,$charset);
+			$data = translation::convert($data, $charset);
 
 			$ok = true;
-			if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
+			if (count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
 			{
 				$message[] = lang("Column mismatch.  Expected %1 columns, your file has %2.",
 					count($options['field_mapping']),
@@ -382,9 +382,9 @@ 
 				);
 				$ok = false;
 			}
-			foreach($data as $index => $header)
+			foreach ($data as $index => $header)
 			{
-				if($index < count($options['csv_fields']) && !$options['field_mapping'][$index])
+				if ($index < count($options['csv_fields']) && !$options['field_mapping'][$index])
 				{
 					// Skipped column in definition
 					continue;
@@ -396,16 +396,16 @@ 
 				}
 
 				// Check for matching headers
-				if($options['csv_fields'][$index] == $header)
+				if ($options['csv_fields'][$index] == $header)
 				{
 					// Simple match
 					continue;
 				}
 				// Check column headers, taking into account different translations - make sure no *
-				$lang_defn = mb_strtoupper(translation::translate($options['csv_fields'][$index],false,''));
-				$lang_file = mb_strtoupper(translation::translate($header,false,''));
+				$lang_defn = mb_strtoupper(translation::translate($options['csv_fields'][$index], false, ''));
+				$lang_file = mb_strtoupper(translation::translate($header, false, ''));
 
-				if($lang_defn == $lang_file ||
+				if ($lang_defn == $lang_file ||
 					$lang_defn == mb_strtoupper($header) ||
 					$lang_file == mb_strtoupper($options['csv_fields'][$index])
 				)
@@ -417,7 +417,7 @@ 
 				$file_message_id = translation::get_message_id($header, $definition->application);
 				$defn_message_id = translation::get_message_id($options['csv_fields'][$index], $definition->application);
 
-				if($file_message_id && $defn_message_id && $file_message_id == $defn_message_id)
+				if ($file_message_id && $defn_message_id && $file_message_id == $defn_message_id)
 				{
 					continue;
 				}
@@ -425,19 +425,19 @@ 
 
 				// Problem
 				$message[] = lang("Column mismatch: %1 should be %2, not %3",
-					$index,$options['csv_fields'][$index], $header);
+					$index, $options['csv_fields'][$index], $header);
 				// But can still continue
 				// $ok = false;
 			}
-			if(!$ok || count($message) != $message_count)
+			if (!$ok || count($message) != $message_count)
 			{
 				// Add links for new / edit definition
 				$config = config::read('importexport');
-				if($GLOBALS['egw_info']['user']['apps']['admin'] || $config['users_create_definitions'])
+				if ($GLOBALS['egw_info']['user']['apps']['admin'] || $config['users_create_definitions'])
 				{
 					$actions = '';
 					// New definition
-					$add_link = egw::link('/index.php',array(
+					$add_link = egw::link('/index.php', array(
 						'menuaction' => 'importexport.importexport_definitions_ui.edit',
 						'application' => $definition->application,
 						'plugin' => $definition->plugin,
@@ -449,13 +449,13 @@ 
 							'menuaction' => 'importexport.importexport_import_ui.import_dialog',
 							// Don't set appname, or user won't be able to select & see their new definition
 							//'appname' => $definition->application,
-						)) . "';
+						))."';
 						egw_openWindowCentered2('$add_link','_blank',500,500,'yes');
 					";
 					$actions[] = lang('Create a <a href="%1">new definition</a> for this file', $add_link);
 
 					// Edit selected definition, if allowed
-					if($definition->owner == $GLOBALS['egw_info']['user']['account_id'] ||
+					if ($definition->owner == $GLOBALS['egw_info']['user']['account_id'] ||
 						!$definition->owner && $GLOBALS['egw_info']['user']['apps']['admin'])
 					{
 						$edit_link = array(
@@ -464,20 +464,20 @@ 
 							// Jump to file step
 							'step' => 'wizard_step21'
 						);
-						if($dst_file)
+						if ($dst_file)
 						{
 							// Still have uploaded file, jump there
-							$GLOBALS['egw']->session->appsession('csvfile','',$dst_file);
+							$GLOBALS['egw']->session->appsession('csvfile', '', $dst_file);
 							$edit_link['step'] = 'wizard_step30';
 						}
-						$edit_link = egw::link('/index.php',$edit_link);
+						$edit_link = egw::link('/index.php', $edit_link);
 						$edit_link = "javascript:egw_openWindowCentered2('$edit_link','_blank',500,500,'yes')";
 						$actions[] = lang('Edit definition <a href="%1">%2</a> to match your file',
-							$edit_link, $definition->name );
+							$edit_link, $definition->name);
 					}
-					$actions[] = lang('Edit your file to match the definition:') . ' '
-					. implode(array_map('lang',array_intersect_key($options['csv_fields'],$options['field_mapping'])),', ');
-					$message[] = "\n<li>".implode($actions,"\n<li>");
+					$actions[] = lang('Edit your file to match the definition:').' '
+					. implode(array_map('lang', array_intersect_key($options['csv_fields'], $options['field_mapping'])), ', ');
+					$message[] = "\n<li>".implode($actions, "\n<li>");
 				}
 			}
 			return $ok;

infolog/inc/class.infolog_import_infologs_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -108,8 +108,7 @@ 
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(
@@ -527,6 +526,7 @@ 
 	 *
 	 * This is a copy of what's in importexport_basic_import_csv, and can go
 	 * away if this is changed to extend it
+	 * @param integer $record_num
 	 */
 	protected function link_by_cf($record_num, $app, $fieldname, $_value)
 	{

Indentation +26 added lines, -26 removed lines

@@ -74,10 +74,10 @@ 
 	private $boinfolog;
 
 	/**
-	* For figuring out if a record has changed
-	*
-	* @var infolog_tracking::
-	*/
+	 * For figuring out if a record has changed
+	 *
+	 * @var infolog_tracking::
+	 */
 	protected $tracking;
 
 	/**
@@ -101,7 +101,7 @@ 
 	protected $errors = array();
 
 	/**
- 	* List of actions, and how many times that action was taken
+	 * List of actions, and how many times that action was taken
 	 */
 	protected $results = array();
 
@@ -466,37 +466,37 @@ 
 	}
 
 	/**
-	* Returns warnings that were encountered during importing
-	* Maximum of one warning message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => warning message
-	*       )
-	*/
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
 	public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-	* Returns errors that were encountered during importing
-	* Maximum of one error message per record, but you can append if you need to
-	*
-	* @return Array (
-	*       record_# => error message
-	*       )
-	*/
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
 	public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-	* Returns a list of actions taken, and the number of records for that action.
-	* Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-	*
-	* @return Array (
-	*       action => record count
-	* )
-	*/
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
 	public function get_results() {
 		return $this->results;
 	}

Spacing +77 added lines, -77 removed lines

@@ -14,19 +14,19 @@ 
 /**
  * class import_csv for infolog
  */
-class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
+class infolog_import_infologs_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'contact_owner', 	// int
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'contact_owner', // int
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -52,14 +52,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -109,8 +109,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -120,7 +120,7 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// fetch the infolog bo
 		$this->boinfolog = new infolog_bo();
@@ -141,9 +141,9 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -168,18 +168,18 @@ 
 		$this->errors = array();
 		$this->warnings = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			$lookups = $_lookups;
 
 			// Early detection of type, to load appropriate statuses
-			foreach(array($lookups['info_type'], array_map('strtolower',array_map('lang',$lookups['info_type']))) as $types)
+			foreach (array($lookups['info_type'], array_map('strtolower', array_map('lang', $lookups['info_type']))) as $types)
 			{
-				if($record['info_type'] && $key = array_search(strtolower($record['info_type']),$types))
+				if ($record['info_type'] && $key = array_search(strtolower($record['info_type']), $types))
 				{
 					$lookups['info_status'] = $this->boinfolog->status[$key];
 					break;
@@ -187,34 +187,34 @@ 
 			}
 
 			$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if ($result) $this->warnings[$import_csv->get_current_position()] = $result;
 
 			// Make sure type is valid
-			if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
+			if (!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
 			{
 				// Check for translated type
-				$un_trans = translation::get_message_id($record['info_type'],'infolog');
-				if($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
+				$un_trans = translation::get_message_id($record['info_type'], 'infolog');
+				if ($record['info_type'] && $this->boinfolog->enums['type'][$un_trans])
 				{
 					$record['info_type'] = $un_trans;
 				}
 				else
 				{
-					$this->errors[$import_csv->get_current_position()] .= ($this->errors[$import_csv->get_current_position()] ? "\n":'').
+					$this->errors[$import_csv->get_current_position()] .= ($this->errors[$import_csv->get_current_position()] ? "\n" : '').
 						lang('Unknown type: %1', $record['info_type']);
 				}
 			}
 
 			// Set default status for type, if not specified
-			if(!$record['info_status'] && $record['info_type'])
+			if (!$record['info_status'] && $record['info_type'])
 			{
 				$record['info_status'] = $this->boinfolog->status['defaults'][$record['info_type']];
 			}
 
 			// Set owner, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'])
+			if ($_definition->plugin_options['owner_from_csv'])
 			{
-				if(!is_numeric($record['info_owner']))
+				if (!is_numeric($record['info_owner']))
 				{
 					$this->errors[$import_csv->get_current_position()] = lang(
 						'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
@@ -231,51 +231,51 @@ 
 			if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
 
 			// Responsible has to be an array
-			$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
+			$record['info_responsible'] = $record['info_responsible'] ? explode(',', $record['info_responsible']) : 0;
 
 			// Special values
 			if ($record['addressbook'] && !is_numeric($record['addressbook']))
 			{
-				list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
-				$record['addressbook'] = importexport_basic_import_csv::addr_id($lastname,$firstname,$org_name);
+				list($lastname, $firstname, $org_name) = explode(',', $record['addressbook']);
+				$record['addressbook'] = importexport_basic_import_csv::addr_id($lastname, $firstname, $org_name);
 			}
 			if ($record['projectmanager'] && !is_numeric($record['projectmanager']))
 			{
 				$record['projectmanager'] = self::project_id($record['projectmanager']);
 			}
 
-			if ( $_definition->plugin_options['conditions'] )
+			if ($_definition->plugin_options['conditions'])
 			{
-				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				foreach ($_definition->plugin_options['conditions'] as $condition)
 				{
 					$results = array();
-					switch ( $condition['type'] )
+					switch ($condition['type'])
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
-								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
+							if ($record[$condition['string']]) {
+								$query['col_filter'] = array($condition['string'] => $record[$condition['string']],);
 								// Needed to query custom fields
-								if($condition['string'][0] == '#') $query['custom_fields'] = true;
+								if ($condition['string'][0] == '#') $query['custom_fields'] = true;
 								$results = $this->boinfolog->search($query);
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+							if (is_array($results) && count(array_keys($results)) >= 1) {
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $contact ) {
+								foreach ((array)$results as $contact) {
 									$record['info_id'] = $contact['info_id'];
 									$record['info_owner'] = $contact['info_owner'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $contact['cat_id'] ) ) );
+									if ($_definition->plugin_options['update_cats'] == 'add') {
+										if (!is_array($contact['cat_id'])) $contact['cat_id'] = explode(',', $contact['cat_id']);
+										if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+										$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $contact['cat_id'])));
 									}
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -290,14 +290,14 @@ 
 			else
 			{
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
-			if($this->warnings[$import_csv->get_current_position()]) {
-				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
+			if ($success) $count++;
+			if ($this->warnings[$import_csv->get_current_position()]) {
+				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n".array2string($record);
 			}
-			if($this->errors[$import_csv->get_current_position()]) {
-				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
+			if ($this->errors[$import_csv->get_current_position()]) {
+				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n".array2string($record);
 			}
 		}
 		return $count;
@@ -310,7 +310,7 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		$result = true;
 		switch ($_action) {
 			case 'none' :
@@ -319,7 +319,7 @@ 
 				// Only update if there are changes
 				$old = $this->boinfolog->read($_data['info_id']);
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -327,19 +327,19 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if (count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
 					break;
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 
 					// Check for link during dry run
-					if($_data['link_custom'])
+					if ($_data['link_custom'])
 					{
-						list($app, $app_id) = explode(':', $_data['link_custom'],2);
+						list($app, $app_id) = explode(':', $_data['link_custom'], 2);
 						$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 					}
 
@@ -347,12 +347,12 @@ 
 					break;
 				} else {
 					$result = $this->boinfolog->write(
-						$_data, true, 2,true, 	// 2 = dont touch modification date
+						$_data, true, 2, true, // 2 = dont touch modification date
 						$this->definition->plugin_options['no_notification']
 					);
-					if(!$result)
+					if (!$result)
 					{
-						if($result === false)
+						if ($result === false)
 						{
 							$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 								$GLOBALS['egw']->accounts->id2name($_data['info_owner']),
@@ -375,17 +375,17 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if (!is_numeric($result)) {
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
-				list($app, $app_id) = explode(':', $_data[$field],2);
+		foreach (self::$special_fields as $field => $desc) {
+			if (!$_data[$field]) continue;
+			if (strpos($field, 'link') === 0) {
+				list($app, $app_id) = explode(':', $_data[$field], 2);
 
 				// Linking to another entry based on matching custom fields
-				if($field == 'link_custom')
+				if ($field == 'link_custom')
 				{
 					$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 				}
@@ -396,14 +396,14 @@ 
 			if ($app && $app_id) {
 				$id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
 				//echo "<p>linking infolog:$id with $app:$app_id</p>\n";
-				$link_id = egw_link::link('infolog',$id,$app,$app_id);
+				$link_id = egw_link::link('infolog', $id, $app, $app_id);
 				if ($link_id && !$info_link_id)
 				{
 					$to_write = array(
 						'info_id'      => $id,
 						'info_link_id' => $link_id,
 					);
-					$this->boinfolog->write($to_write,False,false,true,true);	// last true = no notifications, as no real change
+					$this->boinfolog->write($to_write, False, false, true, true); // last true = no notifications, as no real change
 					$info_link_id = $link_id;
 				}
 			}
@@ -530,18 +530,18 @@ 
 	{
 		$app_id = false;
 
-		list($custom_field, $value) = explode(':',$value);
+		list($custom_field, $value) = explode(':', $value);
 		// Find matching entry
-		if($app && $custom_field && $value)
+		if ($app && $custom_field && $value)
 		{
 			$cfs = config::get_customfields($app);
 			// Error if no custom fields, probably something wrong in definition
-			if(!$cfs[$custom_field])
+			if (!$cfs[$custom_field])
 			{
 				// Check for users specifing label instead of name
-				foreach($cfs as $name => $settings)
+				foreach ($cfs as $name => $settings)
 				{
-					if(strtolower($settings['label']) == strtolower($custom_field))
+					if (strtolower($settings['label']) == strtolower($custom_field))
 					{
 						$custom_field = $name;
 						break;
@@ -550,23 +550,23 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if (!$cfs[$custom_field] && !$cfs[substr($custom_field, 1)]) {
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if ($custom_field[0] != '#') $custom_field = '#'.$custom_field;
 
 			// Search
-			if(egw_link::get_registry($app, 'query'))
+			if (egw_link::get_registry($app, 'query'))
 			{
-				$options = array('filter' => array("$custom_field = " . $GLOBALS['egw']->db->quote($value)));
+				$options = array('filter' => array("$custom_field = ".$GLOBALS['egw']->db->quote($value)));
 				$result = egw_link::query($app, '', $options);
 
 				// Only one allowed
-				if(count($result) != 1)
+				if (count($result) != 1)
 				{
-					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '') .
+					$this->warnings[$record_num] .= ($this->warnings[$record_num] ? "\n" : '').
 						lang('Unable to link to %3 by custom field "%1": "%4".  %2 matches.',
 						$custom_field, count($result), lang($app), $options['filter'][0]
 					);

Braces +112 added lines, -43 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * class import_csv for infolog
  */
-class infolog_import_infologs_csv implements importexport_iface_import_plugin  {
+class infolog_import_infologs_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -109,7 +110,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -141,9 +143,12 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -168,11 +173,15 @@ 
 		$this->errors = array();
 		$this->warnings = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			$lookups = $_lookups;
 
@@ -187,7 +196,10 @@ 
 			}
 
 			$result = importexport_import_csv::convert($record, infolog_egw_record::$types, 'infolog', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if($result)
+			{
+				$this->warnings[$import_csv->get_current_position()] = $result;
+			}
 
 			// Make sure type is valid
 			if(!$record['info_type'] || $record['info_type'] && !$this->boinfolog->enums['type'][$record['info_type']])
@@ -228,7 +240,10 @@ 
 			{
 				$record['info_owner'] = $_definition->plugin_options['record_owner'];
 			}
-			if (!isset($record['info_owner'])) $record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!isset($record['info_owner']))
+			{
+				$record['info_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
 			// Responsible has to be an array
 			$record['info_responsible'] = $record['info_responsible'] ? explode(',',$record['info_responsible']) : 0;
@@ -253,27 +268,42 @@ 
 					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if($record[$condition['string']])
+							{
 								$query['col_filter'] = array( $condition['string'] => $record[$condition['string']],);
 								// Needed to query custom fields
-								if($condition['string'][0] == '#') $query['custom_fields'] = true;
+								if($condition['string'][0] == '#')
+								{
+									$query['custom_fields'] = true;
+								}
 								$results = $this->boinfolog->search($query);
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+							if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+							{
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $contact ) {
+								foreach ( (array)$results as $contact )
+								{
 									$record['info_id'] = $contact['info_id'];
 									$record['info_owner'] = $contact['info_owner'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $contact['cat_id'] ) ) $contact['cat_id'] = explode( ',', $contact['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+									if ( $_definition->plugin_options['update_cats'] == 'add' )
+									{
+										if ( !is_array( $contact['cat_id'] ) )
+										{
+											$contact['cat_id'] = explode( ',', $contact['cat_id'] );
+										}
+										if ( !is_array( $record['cat_id'] ) )
+										{
+											$record['cat_id'] = explode( ',', $record['cat_id'] );
+										}
 										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $contact['cat_id'] ) ) );
 									}
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -284,7 +314,10 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
 			}
 			else
@@ -292,11 +325,16 @@ 
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
-			if($this->warnings[$import_csv->get_current_position()]) {
+			if($success)
+			{
+				$count++;
+			}
+			if($this->warnings[$import_csv->get_current_position()])
+			{
 				$this->warnings[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
 			}
-			if($this->errors[$import_csv->get_current_position()]) {
+			if($this->errors[$import_csv->get_current_position()])
+			{
 				$this->errors[$import_csv->get_current_position()] .= "\nRecord:\n" .array2string($record);
 			}
 		}
@@ -310,16 +348,19 @@ 
 	 * @param array $_data contact data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
 		$result = true;
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
 				// Only update if there are changes
 				$old = $this->boinfolog->read($_data['info_id']);
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change addressbook of an existing contact
 					unset($_data['owner']);
 				}
@@ -327,13 +368,15 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
+				{
 					break;
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 
 					// Check for link during dry run
@@ -345,7 +388,9 @@ 
 
 					$this->results[$_action]++;
 					break;
-				} else {
+				}
+				else
+				{
 					$result = $this->boinfolog->write(
 						$_data, true, 2,true, 	// 2 = dont touch modification date
 						$this->definition->plugin_options['no_notification']
@@ -375,13 +420,19 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if(!is_numeric($result))
+		{
 			return $result;
 		}
 		$info_link_id = $_data['info_link_id'];
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
-			if(strpos($field, 'link') === 0) {
+		foreach(self::$special_fields as $field => $desc)
+		{
+			if(!$_data[$field])
+			{
+				continue;
+			}
+			if(strpos($field, 'link') === 0)
+			{
 				list($app, $app_id) = explode(':', $_data[$field],2);
 
 				// Linking to another entry based on matching custom fields
@@ -389,11 +440,14 @@ 
 				{
 					$app_id = $this->link_by_cf($record_num, $app, $field, $app_id);
 				}
-			} else {
+			}
+			else
+			{
 				$app = $field;
 				$app_id = $_data[$field];
 			}
-			if ($app && $app_id) {
+			if ($app && $app_id)
+			{
 				$id = $_data['info_id'] ? $_data['info_id'] : (int)$result;
 				//echo "<p>linking infolog:$id with $app:$app_id</p>\n";
 				$link_id = egw_link::link('infolog',$id,$app,$app_id);
@@ -416,7 +470,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Infolog CSV import');
 	}
 
@@ -425,7 +480,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports entries into the infolog from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -434,7 +490,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -450,7 +507,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -459,7 +517,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -471,7 +530,8 @@ 
 	*       record_# => warning message
 	*       )
 	*/
-	public function get_warnings() {
+	public function get_warnings()
+	{
 		return $this->warnings;
 	}
 
@@ -483,7 +543,8 @@ 
 	*       record_# => error message
 	*       )
 	*/
-	public function get_errors() {
+	public function get_errors()
+	{
 		return $this->errors;
 	}
 
@@ -495,7 +556,8 @@ 
 	*       action => record count
 	* )
 	*/
-	public function get_results() {
+	public function get_results()
+	{
 		return $this->results;
 	}
 	// end of iface_export_plugin
@@ -505,7 +567,10 @@ 
 	{
 		static $boprojects;
 
-		if (!$num_or_title) return false;
+		if (!$num_or_title)
+		{
+			return false;
+		}
 
 		if (!is_object($boprojects))
 		{
@@ -550,12 +615,16 @@ 
 			}
 
 			// Couldn't find field, give an error - something's wrong
-			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)]) {
+			if(!$cfs[$custom_field] && !$cfs[substr($custom_field,1)])
+			{
 				$this->errors[$record_num] .= lang('No custom field "%1" for %2.',
 					$custom_field, lang($app));
 				return false;
 			}
-			if($custom_field[0] != '#') $custom_field = '#' . $custom_field;
+			if($custom_field[0] != '#')
+			{
+				$custom_field = '#' . $custom_field;
+			}
 
 			// Search
 			if(egw_link::get_registry($app, 'query'))

infolog/inc/class.infolog_tracking.inc.php

Doc Comments -1 removed lines

@@ -125,7 +125,6 @@
 	/**
 	 * Constructor
 	 *
-	 * @param botracker $botracker
 	 * @return tracker_tracking
 	 */
 	function __construct(&$infolog_bo)

Spacing +39 added lines, -39 removed lines

@@ -127,9 +127,9 @@ 
 	 */
 	function __construct(&$infolog_bo)
 	{
-		parent::__construct('infolog');	// add custom fields from infolog
+		parent::__construct('infolog'); // add custom fields from infolog
 
-		$this->infolog =& $infolog_bo;
+		$this->infolog = & $infolog_bo;
 	}
 
 	/**
@@ -141,23 +141,23 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_subject($data,$old)
+	function get_subject($data, $old)
 	{
 		if ($data['prefix'])
 		{
-			$prefix = $data['prefix'];	// async notification
+			$prefix = $data['prefix']; // async notification
 		}
 		elseif (!$old || $old['info_status'] == 'deleted')
 		{
-			$prefix = lang('New %1',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('New %1', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
-		elseif($data['info_status'] == 'deleted')
+		elseif ($data['info_status'] == 'deleted')
 		{
-			$prefix = lang('%1 deleted',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('%1 deleted', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
 		else
 		{
-			$prefix = lang('%1 modified',lang($this->infolog->enums['type'][$data['info_type']]));
+			$prefix = lang('%1 modified', lang($this->infolog->enums['type'][$data['info_type']]));
 		}
 		return $prefix.': '.$data['info_subject'];
 	}
@@ -169,22 +169,22 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_message($data,$old)
+	function get_message($data, $old)
 	{
-		if ($data['message']) return $data['message'];	// async notification
+		if ($data['message']) return $data['message']; // async notification
 
 		if (!$old || $old['info_status'] == 'deleted')
 		{
-			return lang('New %1 created by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
-				common::grab_owner_name($this->infolog->user),$this->datetime('now'));
+			return lang('New %1 created by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
+				common::grab_owner_name($this->infolog->user), $this->datetime('now'));
 		}
-		elseif($data['info_status'] == 'deleted')
+		elseif ($data['info_status'] == 'deleted')
 		{
-			return lang('%1 deleted by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
+			return lang('%1 deleted by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
 				common::grab_owner_name($data['info_modifier']),
 				$this->datetime($data['info_datemodified']));
 		}
-		return lang('%1 modified by %2 at %3',lang($this->infolog->enums['type'][$data['info_type']]),
+		return lang('%1 modified by %2 at %3', lang($this->infolog->enums['type'][$data['info_type']]),
 			common::grab_owner_name($data['info_modifier']),
 			$this->datetime($data['info_datemodified']));
 	}
@@ -196,14 +196,14 @@ 
 	 * @param int|string $receiver nummeric account_id or email address
 	 * @return array of details as array with values for keys 'label','value','type'
 	 */
-	function get_details($data,$receiver=null)
+	function get_details($data, $receiver = null)
 	{
-		unset($receiver);	// not used, but required function signature
+		unset($receiver); // not used, but required function signature
 		//error_log(__METHOD__.__LINE__.' Data:'.array2string($data));
 		$responsible = array();
 		if ($data['info_responsible'])
 		{
-			foreach($data['info_responsible'] as $uid)
+			foreach ($data['info_responsible'] as $uid)
 			{
 				$responsible[] = common::grab_owner_name($uid);
 			}
@@ -212,31 +212,31 @@ 
 		{
 			$id = ' #'.$data['info_id'];
 		}
-		foreach(array(
+		foreach (array(
 			'info_type'      => lang($this->infolog->enums['type'][$data['info_type']]).$id,
 			'info_from'      => $data['info_from'],
 			'info_addr'      => $data['info_addr'],
 			'info_cat'       => $data['info_cat'] ? $GLOBALS['egw']->categories->id2name($data['info_cat']) : '',
 			'info_priority'  => lang($this->infolog->enums['priority'][$data['info_priority']]),
 			'info_owner'     => common::grab_owner_name($data['info_owner']),
-			'info_status'    => lang($data['info_status']=='deleted'?'deleted':$this->infolog->status[$data['info_type']][$data['info_status']]),
+			'info_status'    => lang($data['info_status'] == 'deleted' ? 'deleted' : $this->infolog->status[$data['info_type']][$data['info_status']]),
 			'info_percent'   => (int)$data['info_percent'].'%',
 			'info_datecompleted' => $data['info_datecompleted'] ? $this->datetime($data['info_datecompleted']) : '',
 			'info_location'  => $data['info_location'],
-			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'],null) : '',
-			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'],null) : '',
-			'info_responsible' => implode(', ',$responsible),
+			'info_startdate' => $data['info_startdate'] ? $this->datetime($data['info_startdate'], null) : '',
+			'info_enddate'   => $data['info_enddate'] ? $this->datetime($data['info_enddate'], null) : '',
+			'info_responsible' => implode(', ', $responsible),
 			'info_subject'   => $data['info_subject'],
 		) as $name => $value)
 		{
 			//error_log(__METHOD__.__LINE__.' Key:'.$name.' val:'.array2string($value));
-			if ($name=='info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
+			if ($name == 'info_from' && empty($value) && !empty($data['info_contact']) && is_array($data['link_to']['to_id']))
 			{
 				$lkeys = array_keys($data['link_to']['to_id']);
-				if (in_array($data['info_contact'],$lkeys))
+				if (in_array($data['info_contact'], $lkeys))
 				{
-					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = egw_link::title($app,$id);
+					list($app, $id) = explode(':', $data['info_contact']);
+					if (!empty($app) && !empty($id)) $value = egw_link::title($app, $id);
 				}
 			}
 			$details[$name] = array(
@@ -268,7 +268,7 @@ 
 	 * @param boolean $skip_notification = false do NOT send any notification
 	 * @return int|boolean false on error, integer number of changes logged or true for new entries ($old == null)
 	 */
-	public function track(array $data,array $old=null,$user=null,$deleted=null,array $changed_fields=null,$skip_notification=false)
+	public function track(array $data, array $old = null, $user = null, $deleted = null, array $changed_fields = null, $skip_notification = false)
 	{
 		//error_log(__METHOD__.__LINE__.' notify?'.($skip_notification?'no':'yes').function_backtrace());
 		$this->user = !is_null($user) ? $user : $GLOBALS['egw_info']['user']['account_id'];
@@ -277,23 +277,23 @@ 
 
 		if ($old && $this->field2history)
 		{
-			$changes = $this->save_history($data,$old,$deleted,$changed_fields);
+			$changes = $this->save_history($data, $old, $deleted, $changed_fields);
 		}
 
 		// Don't notify if the only change was to the modified date
-		if(is_null($changed_fields))
+		if (is_null($changed_fields))
 		{
 			$changed_fields = $this->changed_fields($data, $old);
 			$changes = count($changed_fields); // we need that since TRUE evaluates to 1
 		}
 		//error_log(__METHOD__.__LINE__.array2string($changed_fields));
-		if(is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
+		if (is_array($changed_fields) && $changes == 1 && in_array('info_datemodified', $changed_fields))
 		{
 			return count($changes);
 		}
 
 		// do not run do_notifications if we have no changes
-		if ($changes && !$skip_notification && !$this->do_notifications($data,$old,$deleted))
+		if ($changes && !$skip_notification && !$this->do_notifications($data, $old, $deleted))
 		{
 			$changes = false;
 		}
@@ -311,16 +311,16 @@ 
 	 * @param array $old = null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
-		unset($old);	// not used, but required function signature
-		switch($name)
+		unset($old); // not used, but required function signature
+		switch ($name)
 		{
 			case 'copy':	// include the info_cc addresses
-				if ($data['info_access'] == 'private') return array();	// no copies for private entries
+				if ($data['info_access'] == 'private') return array(); // no copies for private entries
 				if ($data['info_cc'])
 				{
-					$config = preg_split('/, ?/',$data['info_cc']);
+					$config = preg_split('/, ?/', $data['info_cc']);
 				}
 				else
 				{
@@ -329,7 +329,7 @@ 
 				break;
 			case self::CUSTOM_NOTIFICATION:
 				$info_config = config::read('infolog');
-				if(!$info_config[self::CUSTOM_NOTIFICATION])
+				if (!$info_config[self::CUSTOM_NOTIFICATION])
 				{
 					return '';
 				}
@@ -338,7 +338,7 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if (!$type_config['use_custom'] && !$global['use_custom']) return '';
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

Braces +22 added lines, -5 removed lines

@@ -171,7 +171,11 @@ 
 	 */
 	function get_message($data,$old)
 	{
-		if ($data['message']) return $data['message'];	// async notification
+		if ($data['message'])
+		{
+			return $data['message'];
+		}
+		// async notification
 
 		if (!$old || $old['info_status'] == 'deleted')
 		{
@@ -236,14 +240,20 @@ 
 				if (in_array($data['info_contact'],$lkeys))
 				{
 					list($app,$id) = explode(':',$data['info_contact']);
-					if (!empty($app)&&!empty($id)) $value = egw_link::title($app,$id);
+					if (!empty($app)&&!empty($id))
+					{
+						$value = egw_link::title($app,$id);
+					}
 				}
 			}
 			$details[$name] = array(
 				'label' => lang($this->field2label[$name]),
 				'value' => $value,
 			);
-			if ($name == 'info_subject') $details[$name]['type'] = 'summary';
+			if ($name == 'info_subject')
+			{
+				$details[$name]['type'] = 'summary';
+			}
 		}
 		$details['info_des'] = array(
 			'value' => $data['info_des'],
@@ -317,7 +327,11 @@ 
 		switch($name)
 		{
 			case 'copy':	// include the info_cc addresses
-				if ($data['info_access'] == 'private') return array();	// no copies for private entries
+				if ($data['info_access'] == 'private')
+				{
+					return array();
+				}
+				// no copies for private entries
 				if ($data['info_cc'])
 				{
 					$config = preg_split('/, ?/',$data['info_cc']);
@@ -338,7 +352,10 @@ 
 				$global = $info_config[self::CUSTOM_NOTIFICATION]['~global~'];
 
 				// Disabled
-				if(!$type_config['use_custom'] && !$global['use_custom']) return '';
+				if(!$type_config['use_custom'] && !$global['use_custom'])
+				{
+					return '';
+				}
 
 				// Type or globabl
 				$config = trim(strip_tags($type_config['message'])) != '' && $type_config['use_custom'] ? $type_config['message'] : $global['message'];

json.php

Doc Comments +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * callback if the session-check fails, redirects to login.php, if no valid basic auth credentials given
  *
  * @param array &$anon_account anon account_info with keys 'login', 'passwd' and optional 'passwd_type'
- * @return boolean|string true if we allow anon access and anon_account is set, a sessionid or false otherwise
+ * @return string|null true if we allow anon access and anon_account is set, a sessionid or false otherwise
  */
 function login_redirect(&$anon_account)
 {

Braces +4 added lines, -1 removed lines

@@ -73,9 +73,12 @@
 
 if (isset($_GET['menuaction']))
 {
-	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)	// static method name app_something::method
+	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)
+	{
+		// static method name app_something::method
 	{
 		@list($className,$functionName,$handler) = explode('::',$_GET['menuaction']);
+	}
 
 		if (substr($className, 0, 11) == 'EGroupware\\')
 		{

Spacing +9 added lines, -9 removed lines

@@ -25,7 +25,7 @@ 
 		return $session_id;
 	}
 	unset($anon_account);
-	egw_json_request::isJSONRequest(true);	// because egw_json_request::parseRequest() is not (yet) called
+	egw_json_request::isJSONRequest(true); // because egw_json_request::parseRequest() is not (yet) called
 	$response = egw_json_response::get();
 	$response->redirect($GLOBALS['egw_info']['server']['webserver_url'].'/login.php?cd=10', true);
 
@@ -50,7 +50,7 @@ 
 	$message = null;
 	if (function_exists('_egw_log_exception'))
 	{
-		_egw_log_exception($e,$message);
+		_egw_log_exception($e, $message);
 	}
 	$response = egw_json_response::get();
 	$message .= ($message ? "\n\n" : '').$e->getMessage();
@@ -74,14 +74,14 @@ 
 
 if (isset($_GET['menuaction']))
 {
-	if (strpos($_GET['menuaction'],'::') !== false && strpos($_GET['menuaction'],'.') === false)	// static method name app_something::method
+	if (strpos($_GET['menuaction'], '::') !== false && strpos($_GET['menuaction'], '.') === false)	// static method name app_something::method
 	{
-		@list($className,$functionName,$handler) = explode('::',$_GET['menuaction']);
-		list($appName) = explode('_',$className);
+		@list($className, $functionName, $handler) = explode('::', $_GET['menuaction']);
+		list($appName) = explode('_', $className);
 	}
 	else
 	{
-		@list($appName, $className, $functionName, $handler) = explode('.',$_GET['menuaction']);
+		@list($appName, $className, $functionName, $handler) = explode('.', $_GET['menuaction']);
 	}
 	//error_log("json.php: appName=$appName, className=$className, functionName=$functionName, handler=$handler");
 
@@ -91,7 +91,7 @@ 
 			'noheader'		=> True,
 			'disable_Template_class'	=> True,
 			'autocreate_session_callback' => 'login_redirect',
-			'no_exception_handler' => true,	// we already installed our own
+			'no_exception_handler' => true, // we already installed our own
 			// only log ajax requests which represent former GET requests or submits
 			// cuts down updates to egw_access_log table
 			'no_dla_update' => !preg_match('/(\.etemplate_new\.ajax_process_content\.etemplate|\.jdots_framework\.ajax_exec\.template)$/', $_GET['menuaction']),
@@ -106,7 +106,7 @@ 
 	//Check whether the request data is set
 	if (isset($GLOBALS['egw_unset_vars']['_POST[json_data]']))
 	{
-		$json->isJSONRequest(true);	// otherwise exception is not send back to client, as we have not yet called parseRequest()
+		$json->isJSONRequest(true); // otherwise exception is not send back to client, as we have not yet called parseRequest()
 		throw new egw_exception_assertion_failed("JSON Data contains script tags. Aborting...");
 	}
 	$json->parseRequest($_GET['menuaction'], $_REQUEST['json_data']);
@@ -114,4 +114,4 @@ 
 	common::egw_exit();
 }
 
-throw new Exception($_SERVER['PHP_SELF'] . ' Invalid AJAX JSON Request');
+throw new Exception($_SERVER['PHP_SELF'].' Invalid AJAX JSON Request');

mail/inc/class.mail_acl.inc.php

Doc Comments -2 removed lines

@@ -277,8 +277,6 @@
 	 * Update ACL rights of a folder or including subfolders for an account(s)
 	 *
 	 * @param array $content content including the acl rights
-	 * @param Boolean $recursive boolean flag FALSE|TRUE. If it is FALSE, only the folder take in to account, but in case of TRUE
-	 *		the mailbox including all its subfolders will be considered.
 	 * @param string $msg Message
 	 *
 	 */

Spacing +40 added lines, -40 removed lines

@@ -33,12 +33,12 @@ 
 	 *
 	 */
 	var $aclRightsAbbrvs = array(
-		'lrs'		=> array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'),
-		'lprs'		=> array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
-		'ilprs'		=> array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
-		'ilprsw'	=> array('label'=>'write','title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
-		'aeiklprstwx'=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
-		'custom'	=> array('label'=>'custom','title'=>'User defined combination of rights for the ACL'),
+		'lrs'		=> array('label'=>'readable', 'title'=>'Allows a user to read the contents of the mailbox.'),
+		'lprs'		=> array('label'=>'post', 'title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
+		'ilprs'		=> array('label'=>'append', 'title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
+		'ilprsw'	=> array('label'=>'write', 'title'=>'Allows a user to read the maibox, post to it, append messages to it, and delete messages or the mailbox itself. The only right not given is the right to change the ACL of the mailbox.'),
+		'aeiklprstwx'=> array('label'=>'all', 'title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
+		'custom'	=> array('label'=>'custom', 'title'=>'User defined combination of rights for the ACL'),
 	);
 
 	/**
@@ -61,12 +61,12 @@ 
 	 * @param array $msg = ''
 	 *
 	 */
-	function edit(array $content=null ,$msg='')
+	function edit(array $content = null, $msg = '')
 	{
 		$tmpl = new Etemplate('mail.acl');
 		if (!is_array($content))
 		{
-			$acc_id = $_GET['acc_id']?$_GET['acc_id']:$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			$acc_id = $_GET['acc_id'] ? $_GET['acc_id'] : $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 			if (isset($_GET['account_id']) && !isset($GLOBALS['egw_info']['user']['apps']['admin']))
 			{
 				Framework::window_close(lang('Permission denied'));
@@ -81,7 +81,7 @@ 
 		$account = Mail\Account::read($acc_id, $account_id);
 		$this->imap = $account->imapServer(isset($account_id) ? (int)$account_id : false);
 
-		$mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']): $content['mailbox'][0];
+		$mailbox = $_GET['mailbox'] ? base64_decode($_GET['mailbox']) : $content['mailbox'][0];
 		if (empty($mailbox))
 		{
 			$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($this->imap->isAdminConnection) : 'INBOX';
@@ -111,14 +111,14 @@ 
 
 					foreach ($rights as $right)
 					{
-						$content['grid'][$n]['acl_'. $right] = true;
+						$content['grid'][$n]['acl_'.$right] = true;
 					}
-					$virtualD = array('e','t');
-					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'],array_intersect($rights,$virtuals['c']))? false: true; //c=kx more information rfc4314, Obsolote Rights
-					$content['grid'][$n]['acl_d'] = array_diff($virtualD,array_intersect($rights,$virtuals['d']))? false: true; //d=et more information rfc4314, Obsolote Rights
+					$virtualD = array('e', 't');
+					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'], array_intersect($rights, $virtuals['c'])) ? false : true; //c=kx more information rfc4314, Obsolote Rights
+					$content['grid'][$n]['acl_d'] = array_diff($virtualD, array_intersect($rights, $virtuals['d'])) ? false : true; //d=et more information rfc4314, Obsolote Rights
 
 					sort($rights);
-					$acl_abbrvs = implode('',$rights);
+					$acl_abbrvs = implode('', $rights);
 
 					if (array_key_exists($acl_abbrvs, $this->aclRightsAbbrvs))
 					{
@@ -159,7 +159,7 @@ 
 				case 'apply':
 					if ($content)
 					{
-						$validation_err = $this->update_acl($content,$msg);
+						$validation_err = $this->update_acl($content, $msg);
 						if ($validation_err)
 						{
 							foreach ($validation_err as &$row)
@@ -193,7 +193,7 @@ 
 					}
 					else
 					{
-						error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there");
+						error_log(__METHOD__.__LINE__."()"."The remove_acl suppose to return an array back, something is wrong there");
 					}
 					Framework::message($msg);
 			}
@@ -202,7 +202,7 @@ 
 		$sel_options['acl'] = $this->aclRightsAbbrvs;
 
 		//Make the account owner's fields all readonly as owner has all rights and should not be able to change them
-		foreach($content['grid'] as $key => $fields)
+		foreach ($content['grid'] as $key => $fields)
 		{
 			if ($fields['acc_id'] == $this->imap->acc_imap_username ||
 					$fields['acc_id'][0] == $this->imap->acc_imap_username)
@@ -235,7 +235,7 @@ 
 			));
 		}
 
-		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv,2);
+		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -254,7 +254,7 @@ 
 		$mailbox = $imap->isAdminConnection ? $imap->getUserMailboxString($imap->isAdminConnection) : 'INBOX';
 
 		$folders = array();
-		foreach(self::getSubfolders($mailbox, $imap) as $folder)
+		foreach (self::getSubfolders($mailbox, $imap) as $folder)
 		{
 			if (stripos($folder, $_GET['query']) !== false)
 			{
@@ -282,7 +282,7 @@ 
 	 * @param string $msg Message
 	 *
 	 */
-	function update_acl ($content, &$msg)
+	function update_acl($content, &$msg)
 	{
 		$validator = array();
 
@@ -298,14 +298,14 @@ 
 			{
 				if ($value[$key] == true)
 				{
-					$right = explode("acl_" ,$key);
+					$right = explode("acl_", $key);
 					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
 					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
-					$options['rights'] .=  $right[1];
+					$options['rights'] .= $right[1];
 				}
 			}
 			$username = $content['grid'][$keys]['acc_id'] == $this->imap->acc_imap_username
-				?$content['grid'][$keys]['acc_id']:$content['grid'][$keys]['acc_id'][0];
+				? $content['grid'][$keys]['acc_id'] : $content['grid'][$keys]['acc_id'][0];
 			//error_log(__METHOD__."(".__LINE__.") setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
 			if (is_numeric($username) && ($u = $this->imap->getMailBoxUserName($username)))
 			{
@@ -314,7 +314,7 @@ 
 			if (!empty($username))
 			{
 				//error_log(__METHOD__."() setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
-				if (($ret=$this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
+				if (($ret = $this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
 				{
 					$msg = lang("The Folder %1 's ACLs saved", $content['mailbox']);
 
@@ -326,7 +326,7 @@ 
 			}
 			else
 			{
-				if($keys !== count($content['grid']))
+				if ($keys !== count($content['grid']))
 				{
 					array_push($validator, $keys);
 					$msg = lang("Error:Could not save the ACL! Because some names are empty!");
@@ -343,7 +343,7 @@ 
 	 * Retrive Folder ACL rights
 	 * @todo rights 'c' and 'd' should be fixed
 	 */
-	function retrive_acl ($mailbox, &$msg)
+	function retrive_acl($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
 		 {
@@ -368,7 +368,7 @@ 
 	 */
 	function remove_acl($content, &$msg)
 	{
-		$row_num = array_keys($content['grid']['delete'],"pressed");
+		$row_num = array_keys($content['grid']['delete'], "pressed");
 		if ($row_num) $row_num = $row_num[0];
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = $content['grid'][$row_num]['acc_id'][0];
@@ -378,24 +378,24 @@ 
 			$identifier = $u;
 		}
 		//error_log(__METHOD__.__LINE__."(".$content['mailbox'].", ".$identifier.", ".$recursive.")");
-		if(($res = $this->deleteACL($content['mailbox'], $identifier,$recursive)))
+		if (($res = $this->deleteACL($content['mailbox'], $identifier, $recursive)))
 		{
 			unset($content['grid'][$row_num]);
 			unset($content['grid']['delete']);
 			if ($recursive)
 			{
-				$msg = lang("The %1 's acl, including its subfolders, removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl, including its subfolders, removed from the %2", $content['mailbox'], $identifier);
 			}
 			else
 			{
-				$msg = lang("The %1 's acl removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl removed from the %2", $content['mailbox'], $identifier);
 			}
 
 			return array_combine(range(1, count($content['grid'])), array_values($content['grid']));
 		}
 		else
 		{
-			$msg = lang("An error happend while trying to remove ACL rights from the account %1!",$identifier);
+			$msg = lang("An error happend while trying to remove ACL rights from the account %1!", $identifier);
 			return false;
 		}
 	}
@@ -410,7 +410,7 @@ 
 	 *
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success
 	 */
-	function deleteACL ($mailbox, $identifier, $recursive)
+	function deleteACL($mailbox, $identifier, $recursive)
 	{
 		if ($recursive)
 		{
@@ -420,7 +420,7 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
@@ -428,7 +428,7 @@ 
 			}
 			catch (Exception $e)
 			{
-				error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ." because of " .$e->getMessage());
+				error_log(__METHOD__."Could not delete ACL rights of folder ".$mailbox." for account ".$identifier." because of ".$e->getMessage());
 				return false;
 			}
 		}
@@ -471,7 +471,7 @@ 
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success,
 	 *
 	 */
-	function setACL($mailbox, $identifier,$options, $recursive, &$msg)
+	function setACL($mailbox, $identifier, $options, $recursive, &$msg)
 	{
 		if ($recursive)
 		{
@@ -481,16 +481,16 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
-				$this->imap->setACL($sbFolders,$identifier,$options);
+				$this->imap->setACL($sbFolders, $identifier, $options);
 			}
 			catch (Exception $e)
 			{
 				$msg = $e->getMessage();
-				error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . " because of " .$e->getMessage());
+				error_log(__METHOD__."Could not set ACL rights on folder ".$mailbox." for account ".$identifier." because of ".$e->getMessage());
 				return false;
 			}
 		}
@@ -503,14 +503,14 @@ 
 	 * @param String $mailbox folder name that needs to be read
 	 * @return Boolean FALSE in case of any exceptions and if TRUE in case of success,
 	 */
-	function getACL ($mailbox)
+	function getACL($mailbox)
 	{
 		try
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
 		} catch (Exception $e) {
-			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
+			error_log(__METHOD__."Could not get ACL rights from folder ".$mailbox." because of ".$e->getMessage());
 			return false;
 		}
 	}

Braces +32 added lines, -9 removed lines

@@ -95,7 +95,10 @@ 
 			//Todo: Implement autocomplete_url function with admin stuffs consideration
 		}
 		// Unset the content if folder is changed, in order to read acl rights for new selected folder
-		if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete'])) unset($content);
+		if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete']))
+		{
+			unset($content);
+		}
 
 		if (!is_array($content))
 		{
@@ -170,7 +173,9 @@ 
 
 						//Add new row at the end
 						if ($content['grid'][count($content['grid'])]['acc_id'])
-							array_push($content['grid'], array('acc_id'=>''));
+						{
+													array_push($content['grid'], array('acc_id'=>''));
+						}
 					}
 					else
 					{
@@ -178,7 +183,10 @@ 
 					}
 					//Send message
 					Framework::message($msg);
-					if ($button == "apply") break;
+					if ($button == "apply")
+					{
+						break;
+					}
 
 				//Fall through
 				case 'cancel':
@@ -299,8 +307,16 @@ 
 				if ($value[$key] == true)
 				{
 					$right = explode("acl_" ,$key);
-					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
-					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
+					if ($right[1] === 'c')
+					{
+						$right[1] = 'kx';
+					}
+					// c = kx , rfc 4314
+					if ($right[1] === 'd')
+					{
+						$right[1] = 'et';
+					}
+					// d = et , rfc 4314
 					$options['rights'] .=  $right[1];
 				}
 			}
@@ -346,7 +362,7 @@ 
 	function retrive_acl ($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
-		 {
+		{
 			$msg = lang('ACL rights retrived successfully');
 			return $acl;
 		 }
@@ -369,10 +385,16 @@ 
 	function remove_acl($content, &$msg)
 	{
 		$row_num = array_keys($content['grid']['delete'],"pressed");
-		if ($row_num) $row_num = $row_num[0];
+		if ($row_num)
+		{
+			$row_num = $row_num[0];
+		}
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = $content['grid'][$row_num]['acc_id'][0];
-		if (is_array($content['mailbox'])) $content['mailbox'] = $content['mailbox'][0];
+		if (is_array($content['mailbox']))
+		{
+			$content['mailbox'] = $content['mailbox'][0];
+		}
 		if (is_numeric($identifier) && ($u = $this->imap->getMailBoxUserName($identifier)))
 		{
 			$identifier = $u;
@@ -509,7 +531,8 @@ 
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . " because of " .$e->getMessage());
 			return false;
 		}