EGroupware / egroupware

timesheet/inc/class.timesheet_export_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

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

Indentation +2 added lines, -2 removed lines

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

Spacing +25 added lines, -25 removed lines

@@ -27,51 +27,51 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$this->ui = new timesheet_ui();
 		$selection = array();
 
-		if($options['selection'] == 'search') {
-			$query = $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP);
-			$query['num_rows'] = -1;	// all records
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
-		} elseif($options['selection'] == 'all') {
+		if ($options['selection'] == 'search') {
+			$query = $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP);
+			$query['num_rows'] = -1; // all records
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
+		} elseif ($options['selection'] == 'all') {
 			$query = array(
 				'num_rows' => -1,
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
 			);
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
 		}
-		else if($options['selection'] == 'filter')
+		else if ($options['selection'] == 'filter')
 		{
 			$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
 			$filter = $_definition->filter;
 			$query = array(
 				'num_rows' => -1,
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
 				'col_filter' => array()
 			);
 
 			// Handle ranges
-			foreach($filter as $field => $value)
+			foreach ($filter as $field => $value)
 			{
-				if($field == 'cat_id')
+				if ($field == 'cat_id')
 				{
 					$query['cat_id'] = $value;
 					continue;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+				if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 				unset($query['col_filter'][$field]);
 			}
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
 		}
 
 
@@ -83,12 +83,12 @@ 
 		// support other selectors atm.
 		foreach ($selection as $identifier) {
 			$record = new timesheet_egw_record($identifier);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);
@@ -151,10 +151,10 @@ 
 	public function get_selects()
 	{
 		$this->selects = array(
-			'ts_status'	=>	$this->ui->status_labels+array(lang('No status'))
+			'ts_status'	=>	$this->ui->status_labels + array(lang('No status'))
 		);
-		foreach($this->selects['ts_status'] as &$status) {
-			$status = str_replace('&nbsp;','',$status); // Remove &nbsp;
+		foreach ($this->selects['ts_status'] as &$status) {
+			$status = str_replace('&nbsp;', '', $status); // Remove &nbsp;
 		}
 
 	}
@@ -163,9 +163,9 @@ 
 	 */
 	public function get_filter_fields(Array &$filters)
 	{
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 	}
 

Braces +52 added lines, -20 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * export plugin of addressbook
  */
-class timesheet_export_csv implements importexport_iface_export_plugin {
+class timesheet_export_csv implements importexport_iface_export_plugin
+{
 
 	public function __construct()
 	{
@@ -27,18 +28,22 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$this->ui = new timesheet_ui();
 		$selection = array();
 
-		if($options['selection'] == 'search') {
+		if($options['selection'] == 'search')
+		{
 			$query = $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP);
 			$query['num_rows'] = -1;	// all records
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
-		} elseif($options['selection'] == 'all') {
+		}
+		elseif($options['selection'] == 'all')
+		{
 			$query = array(
 				'num_rows' => -1,
 				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
@@ -64,11 +69,20 @@ 
 					continue;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if(!is_array($value) || (!$value['from'] && !$value['to']))
+				{
+					continue;
+				}
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if($value['from'])
+				{
+					$query['col_filter'][] = "$field >= " . (int)$value['from'];
+				}
+				if($value['to'])
+				{
+					$query['col_filter'][] = "$field <= " . (int)$value['to'];
+				}
 				unset($query['col_filter'][$field]);
 			}
 			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
@@ -81,14 +95,22 @@ 
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
-		foreach ($selection as $identifier) {
+		foreach ($selection as $identifier)
+		{
 			$record = new timesheet_egw_record($identifier);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -102,7 +124,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Timesheet CSV export');
 	}
 
@@ -111,7 +134,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports entries from your Timesheet into a CSV File. ");
 	}
 
@@ -120,11 +144,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -134,7 +160,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -142,7 +169,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'importexport.export_csv_selectors',
 		);
@@ -153,7 +181,8 @@ 
 		$this->selects = array(
 			'ts_status'	=>	$this->ui->status_labels+array(lang('No status'))
 		);
-		foreach($this->selects['ts_status'] as &$status) {
+		foreach($this->selects['ts_status'] as &$status)
+		{
 			$status = str_replace('&nbsp;','',$status); // Remove &nbsp;
 		}
 
@@ -165,7 +194,10 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

timesheet/inc/class.timesheet_import_csv.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Indentation +31 added lines, -31 removed lines

@@ -72,8 +72,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if a record has changed
-	*/
+	 * For figuring out if a record has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -97,9 +97,9 @@ 
 	protected $errors = array();
 
 	/**
-         * List of actions, and how many times that action was taken
-         */
-        protected $results = array();
+	 * List of actions, and how many times that action was taken
+	 */
+		protected $results = array();
 
 	/**
 	 * imports entries according to given definition object.
@@ -458,40 +458,40 @@ 
 	}
 
 	/**
-        * 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() {
+	 * 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
-        *       )
-        */
-        public function get_errors() {
+	 * 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
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * 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;
+		}
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static

Spacing +74 added lines, -74 removed lines

@@ -15,18 +15,18 @@ 
 /**
  * class import_csv for timesheet
  */
-class timesheet_import_csv implements importexport_iface_import_plugin  {
+class timesheet_import_csv implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'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(
@@ -50,14 +50,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
@@ -105,8 +105,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'],
 		));
@@ -116,7 +116,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 bo
 		$this->bo = new timesheet_bo();
@@ -134,15 +134,15 @@ 
 		$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);
 		}
 
 		// set Owner
-		$_definition->plugin_options['record_owner'] = isset( $_definition->plugin_options['record_owner'] ) ?
+		$_definition->plugin_options['record_owner'] = isset($_definition->plugin_options['record_owner']) ?
 			$_definition->plugin_options['record_owner'] : $this->user;
 
 		// Used to try to automatically match names to account IDs
@@ -156,9 +156,9 @@ 
 		);
 
 		// Status need leading spaces removed
-		foreach($lookups['ts_status'] as $id => &$label) {
-			$label = str_replace(' ', '',trim($label));
-			if($label == '') unset($lookups['ts_status'][$id]);
+		foreach ($lookups['ts_status'] as $id => &$label) {
+			$label = str_replace(' ', '', trim($label));
+			if ($label == '') unset($lookups['ts_status'][$id]);
 		}
 
 		// Start counting successes
@@ -168,22 +168,22 @@ 
 		// Failures
 		$this->errors = 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;
 
 			$result = importexport_import_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $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;
 
 			// Automatically handle text categories without explicit translation
-			foreach(array('ts_status','cat_id') as $field) {
-				if(!is_numeric($record[$field])) {
-					$translate_key = 'translate'.(substr($field,0,2) == 'ts' ? substr($field,2) : '_cat_id');
-					if($key = array_search($record[$field], $lookups[$field])) {
+			foreach (array('ts_status', 'cat_id') as $field) {
+				if (!is_numeric($record[$field])) {
+					$translate_key = 'translate'.(substr($field, 0, 2) == 'ts' ? substr($field, 2) : '_cat_id');
+					if ($key = array_search($record[$field], $lookups[$field])) {
 						$record[$field] = $key;
-					} elseif(array_key_exists($translate_key, $_definition->plugin_options)) {
+					} elseif (array_key_exists($translate_key, $_definition->plugin_options)) {
 						$t_field = $_definition->plugin_options[$translate_key];
 						switch ($t_field) {
 							case '':
@@ -194,29 +194,29 @@ 
 							case '~skip~':
 								continue 2;
 							default:
-								if(strpos($t_field, 'add') === 0) {
+								if (strpos($t_field, 'add') === 0) {
 									// Check for a parent
-									list($name, $parent_name) = explode('~',$t_field);
-									if($parent_name) {
+									list($name, $parent_name) = explode('~', $t_field);
+									if ($parent_name) {
 										$parent = importexport_helper_functions::cat_name2id($parent_name);
 									}
 
-									if($field == 'cat_id') {
+									if ($field == 'cat_id') {
 										$record[$field] = importexport_helper_functions::cat_name2id($record[$field], $parent);
 									} elseif ($field == 'ts_status') {
 										end($this->bo->status_labels);
-										$id = key($this->bo->status_labels)+1;
+										$id = key($this->bo->status_labels) + 1;
 										$this->bo->status_labels[$id] = $record[$field];
 										$this->bo->status_labels_config[$id] = array(
 											'name'   => $record[$field],
 											'parent' => $parent,
 											'admin'  => false
 										);
-										config::save_value('status_labels',$this->bo->status_labels_config,TIMESHEET_APP);
+										config::save_value('status_labels', $this->bo->status_labels_config, TIMESHEET_APP);
 										$lookups[$field][$id] = $name;
 										$record[$field] = $id;
 									}
-								} elseif($key = array_search($t_field, $lookups[$field])) {
+								} elseif ($key = array_search($t_field, $lookups[$field])) {
 									$record[$field] = $key;
 								} else {
 									$record[$field] = $t_field;
@@ -228,11 +228,11 @@ 
 			}
 
 			// Set creator, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
-				if(!is_numeric($record['ts_owner'])) {
+			if ($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
+				if (!is_numeric($record['ts_owner'])) {
 					// Automatically handle text owner without explicit translation
 					$new_owner = importexport_helper_functions::account_name2id($record['ts_owner']);
-					if($new_owner == '') {
+					if ($new_owner == '') {
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
 							$record['ts_owner'],
@@ -249,11 +249,11 @@ 
 			}
 
 			// Check account IDs
-			foreach(array('ts_modifier') as $field) {
-				if($record[$field] && !is_numeric($record[$field])) {
+			foreach (array('ts_modifier') as $field) {
+				if ($record[$field] && !is_numeric($record[$field])) {
 					// Try an automatic conversion
 					$account_id = importexport_helper_functions::account_name2id($record[$field]);
-					if($account_id && strtoupper(common::grab_owner_name($account_id)) == strtoupper($record[$field])) {
+					if ($account_id && strtoupper(common::grab_owner_name($account_id)) == strtoupper($record[$field])) {
 						$record[$field] = $account_id;
 					} else {
 						$this->errors[$import_csv->get_current_position()] = lang(
@@ -269,35 +269,35 @@ 
 			// Special values
 			if ($record['addressbook'] && !is_numeric($record['addressbook']))
 			{
-				list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
-				$record['addressbook'] = self::addr_id($lastname,$firstname,$org_name);
+				list($lastname, $firstname, $org_name) = explode(',', $record['addressbook']);
+				$record['addressbook'] = self::addr_id($lastname, $firstname, $org_name);
 			}
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
 					$results = array();
-					switch ( $condition['type'] ) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if ($record[$condition['string']]) {
 								$results = $this->bo->search(array($condition['string'] => $record[$condition['string']]));
 							}
 
-							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 $result ) {
+								foreach ((array)$results as $result) {
 									$record['ts_id'] = $result['ts_id'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $result['cat_id'] ) ) $result['cat_id'] = explode( ',', $result['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'], $result['cat_id'] ) ) );
+									if ($_definition->plugin_options['update_cats'] == 'add') {
+										if (!is_array($result['cat_id'])) $result['cat_id'] = explode(',', $result['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'], $result['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;
 
@@ -310,9 +310,9 @@ 
 				}
 			} else {
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -324,7 +324,7 @@ 
 	 * @param array $_data tracker 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' :
@@ -334,7 +334,7 @@ 
 				$old_record = new timesheet_egw_record($_data['ts_id']);
 				$old = $old_record->get_record_array();
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change creator of an existing ticket
 					unset($_data['ts_owner']);
 				}
@@ -342,35 +342,35 @@ 
 				// 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;
 				}
 
 				// Clear old link, if different
 				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id']) {
-					egw_link::unlink2(0,TIMESHEET_APP,$_data['ts_id'],0,'projectmanager',$old['pm_id']);
+					egw_link::unlink2(0, TIMESHEET_APP, $_data['ts_id'], 0, 'projectmanager', $old['pm_id']);
 				}
 				
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					break;
 				} else {
-					$result = $this->bo->save( $_data);
+					$result = $this->bo->save($_data);
 					$_data['ts_id'] = $this->bo->data['ts_id'];
 
 					// Set projectmanager link
 					if ($_data['pm_id']) {
-						egw_link::link(TIMESHEET_APP,$_data['ts_id'],'projectmanager',$_data['pm_id']);
+						egw_link::link(TIMESHEET_APP, $_data['ts_id'], 'projectmanager', $_data['pm_id']);
 					}
 
-					if($result) {
+					if ($result) {
 						$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 							$GLOBALS['egw']->accounts->id2name($_data['owner']),
 							lang($_action)
-						) . ' ' . $result;
+						).' '.$result;
 					} else {
 						$this->results[$_action]++;
 						$result = $this->bo->data['ts_id'];
@@ -382,22 +382,22 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if (!is_numeric($result)) {
 			return $result;
 		}
 		$_link_id = false;
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
+		foreach (self::$special_fields as $field => $desc) {
+			if (!$_data[$field]) continue;
 
 			// Links
-			if(strpos('link', $field) === 0) {
+			if (strpos('link', $field) === 0) {
 				list($app, $id) = explode(':', $_data[$field]);
 			} else {
 				$app = $field;
 				$id = $_data[$field];
 			}
 			if ($app && $app_id) {
-				$link_id = egw_link::link('timesheet',$id,$app,$app_id);
+				$link_id = egw_link::link('timesheet', $id, $app, $app_id);
 			}
 		}
 		return $result;
@@ -493,7 +493,7 @@ 
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static
-	public static function addr_id( $n_family,$n_given=null,$org_name=null ) {
+	public static function addr_id($n_family, $n_given = null, $org_name = null) {
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -503,18 +503,18 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if (!is_null($n_given)) $n_given = trim($n_given);
 		if (!is_object($contacts))
 		{
-			$contacts =& CreateObject('phpgwapi.contacts');
+			$contacts = & CreateObject('phpgwapi.contacts');
 		}
 		if (!is_null($org_name))        // org_name given?
 		{
 			$org_name = trim($org_name);
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,n_given=$n_given,org_name=$org_name");
 			if (!count($addrs))
 			{
-				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
+				$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,org_name=$org_name", '', 'n_family,org_name');
 			}
 		}
 		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
@@ -523,7 +523,7 @@ 
 		}
 		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
 		{
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_fn=$n_family", '', 'n_fn');
 		}
 		if (count($addrs))
 		{

Braces +179 added lines, -71 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for timesheet
  */
-class timesheet_import_csv implements importexport_iface_import_plugin  {
+class timesheet_import_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -105,7 +106,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'],
@@ -134,9 +136,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);
 		}
@@ -156,9 +161,13 @@ 
 		);
 
 		// Status need leading spaces removed
-		foreach($lookups['ts_status'] as $id => &$label) {
+		foreach($lookups['ts_status'] as $id => &$label)
+		{
 			$label = str_replace(' ', '',trim($label));
-			if($label == '') unset($lookups['ts_status'][$id]);
+			if($label == '')
+			{
+				unset($lookups['ts_status'][$id]);
+			}
 		}
 
 		// Start counting successes
@@ -168,24 +177,37 @@ 
 		// Failures
 		$this->errors = 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;
+			}
 
 			$result = importexport_import_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $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;
+			}
 
 			// Automatically handle text categories without explicit translation
-			foreach(array('ts_status','cat_id') as $field) {
-				if(!is_numeric($record[$field])) {
+			foreach(array('ts_status','cat_id') as $field)
+			{
+				if(!is_numeric($record[$field]))
+				{
 					$translate_key = 'translate'.(substr($field,0,2) == 'ts' ? substr($field,2) : '_cat_id');
-					if($key = array_search($record[$field], $lookups[$field])) {
+					if($key = array_search($record[$field], $lookups[$field]))
+					{
 						$record[$field] = $key;
-					} elseif(array_key_exists($translate_key, $_definition->plugin_options)) {
+					}
+					elseif(array_key_exists($translate_key, $_definition->plugin_options))
+					{
 						$t_field = $_definition->plugin_options[$translate_key];
-						switch ($t_field) {
+						switch ($t_field)
+						{
 							case '':
 							case '0':
 								// Skip that field
@@ -194,16 +216,21 @@ 
 							case '~skip~':
 								continue 2;
 							default:
-								if(strpos($t_field, 'add') === 0) {
+								if(strpos($t_field, 'add') === 0)
+								{
 									// Check for a parent
 									list($name, $parent_name) = explode('~',$t_field);
-									if($parent_name) {
+									if($parent_name)
+									{
 										$parent = importexport_helper_functions::cat_name2id($parent_name);
 									}
 
-									if($field == 'cat_id') {
+									if($field == 'cat_id')
+									{
 										$record[$field] = importexport_helper_functions::cat_name2id($record[$field], $parent);
-									} elseif ($field == 'ts_status') {
+									}
+									elseif ($field == 'ts_status')
+									{
 										end($this->bo->status_labels);
 										$id = key($this->bo->status_labels)+1;
 										$this->bo->status_labels[$id] = $record[$field];
@@ -216,9 +243,13 @@ 
 										$lookups[$field][$id] = $name;
 										$record[$field] = $id;
 									}
-								} elseif($key = array_search($t_field, $lookups[$field])) {
+								}
+								elseif($key = array_search($t_field, $lookups[$field]))
+								{
 									$record[$field] = $key;
-								} else {
+								}
+								else
+								{
 									$record[$field] = $t_field;
 								}
 								break;
@@ -228,11 +259,14 @@ 
 			}
 
 			// Set creator, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
-				if(!is_numeric($record['ts_owner'])) {
+			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner'])
+			{
+				if(!is_numeric($record['ts_owner']))
+				{
 					// Automatically handle text owner without explicit translation
 					$new_owner = importexport_helper_functions::account_name2id($record['ts_owner']);
-					if($new_owner == '') {
+					if($new_owner == '')
+					{
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
 							$record['ts_owner'],
@@ -240,22 +274,31 @@ 
 							lang($this->bo->field2label['ts_owner'])
 						);
 						$record['ts_owner'] = $_definition->plugin_options['record_owner'];
-					} else {
+					}
+					else
+					{
 						$record['ts_owner'] = $new_owner;
 					}
 				}
-			} elseif ($_definition->plugin_options['record_owner']) {
+			}
+			elseif ($_definition->plugin_options['record_owner'])
+			{
 				$record['ts_owner'] = $_definition->plugin_options['record_owner'];
 			}
 
 			// Check account IDs
-			foreach(array('ts_modifier') as $field) {
-				if($record[$field] && !is_numeric($record[$field])) {
+			foreach(array('ts_modifier') as $field)
+			{
+				if($record[$field] && !is_numeric($record[$field]))
+				{
 					// Try an automatic conversion
 					$account_id = importexport_helper_functions::account_name2id($record[$field]);
-					if($account_id && strtoupper(common::grab_owner_name($account_id)) == strtoupper($record[$field])) {
+					if($account_id && strtoupper(common::grab_owner_name($account_id)) == strtoupper($record[$field]))
+					{
 						$record[$field] = $account_id;
-					} else {
+					}
+					else
+					{
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
 							$record[$field],
@@ -273,29 +316,44 @@ 
 				$record['addressbook'] = self::addr_id($lastname,$firstname,$org_name);
 			}
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
 					$results = array();
-					switch ( $condition['type'] ) {
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if($record[$condition['string']])
+							{
 								$results = $this->bo->search(array($condition['string'] => $record[$condition['string']]));
 							}
 
-							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 $result ) {
+								foreach ( (array)$results as $result )
+								{
 									$record['ts_id'] = $result['ts_id'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $result['cat_id'] ) ) $result['cat_id'] = explode( ',', $result['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( $result['cat_id'] ) )
+										{
+											$result['cat_id'] = explode( ',', $result['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'], $result['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() ));
 							}
@@ -306,13 +364,21 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -324,9 +390,11 @@ 
 	 * @param array $_data tracker 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' :
@@ -334,7 +402,8 @@ 
 				$old_record = new timesheet_egw_record($_data['ts_id']);
 				$old = $old_record->get_record_array();
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change creator of an existing ticket
 					unset($_data['ts_owner']);
 				}
@@ -342,36 +411,45 @@ 
 				// 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;
 				}
 
 				// Clear old link, if different
-				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id']) {
+				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id'])
+				{
 					egw_link::unlink2(0,TIMESHEET_APP,$_data['ts_id'],0,'projectmanager',$old['pm_id']);
 				}
 				
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					break;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data);
 					$_data['ts_id'] = $this->bo->data['ts_id'];
 
 					// Set projectmanager link
-					if ($_data['pm_id']) {
+					if ($_data['pm_id'])
+					{
 						egw_link::link(TIMESHEET_APP,$_data['ts_id'],'projectmanager',$_data['pm_id']);
 					}
 
-					if($result) {
+					if($result)
+					{
 						$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 							$GLOBALS['egw']->accounts->id2name($_data['owner']),
 							lang($_action)
 						) . ' ' . $result;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						$result = $this->bo->data['ts_id'];
 					}
@@ -382,21 +460,30 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if(!is_numeric($result))
+		{
 			return $result;
 		}
 		$_link_id = false;
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
+		foreach(self::$special_fields as $field => $desc)
+		{
+			if(!$_data[$field])
+			{
+				continue;
+			}
 
 			// Links
-			if(strpos('link', $field) === 0) {
+			if(strpos('link', $field) === 0)
+			{
 				list($app, $id) = explode(':', $_data[$field]);
-			} else {
+			}
+			else
+			{
 				$app = $field;
 				$id = $_data[$field];
 			}
-			if ($app && $app_id) {
+			if ($app && $app_id)
+			{
 				$link_id = egw_link::link('timesheet',$id,$app,$app_id);
 			}
 		}
@@ -408,7 +495,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Timesheet CSV import');
 	}
 
@@ -417,7 +505,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports entries into the timesheet from a CSV File. ");
 	}
 
@@ -426,7 +515,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -442,7 +532,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -451,7 +542,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -463,7 +555,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -475,7 +568,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -487,13 +581,15 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static
-	public static function addr_id( $n_family,$n_given=null,$org_name=null ) {
+	public static function addr_id( $n_family,$n_given=null,$org_name=null )
+	{
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -503,28 +599,40 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if(!is_null($n_given))
+		{
+			$n_given = trim($n_given);
+		}
 		if (!is_object($contacts))
 		{
 			$contacts =& CreateObject('phpgwapi.contacts');
 		}
-		if (!is_null($org_name))        // org_name given?
+		if (!is_null($org_name))
+		{
+			// org_name given?
 		{
 			$org_name = trim($org_name);
+		}
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
 			if (!count($addrs))
 			{
 				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
 			}
 		}
-		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
+		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))
+		{
+			// first name given and no result so far
 		{
 			$addrs = $contacts->search(array('n_family' => $n_family, 'n_given' => $n_given));
 		}
-		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
+		}
+		if (is_null($n_given) && is_null($org_name))
+		{
+			// just one name given, check against fn (= full name)
 		{
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
 		}
+		}
 		if (count($addrs))
 		{
 			return $addrs[0]['id'];

timesheet/inc/class.timesheet_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1053,7 +1053,7 @@
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 timesheets 'deleted'
-	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)

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

@@ -942,7 +942,7 @@
 	 *
 	 * @return array see nextmatch_widget::egw_actions()
 	 */
-	public function get_actions(Array $query)
+	public function get_actions(array $query)
 	{
 		$actions = array(
 			'open' => array(	// does edit if allowed, otherwise view

Spacing +162 added lines, -163 removed lines

@@ -49,10 +49,10 @@ 
 
 	function view()
 	{
-		$this->edit(null,true);
+		$this->edit(null, true);
 	}
 
-	function edit($content = null,$view = false)
+	function edit($content = null, $view = false)
 	{
 		$etpl = new etemplate_new('timesheet.edit');
 		if (!is_array($content))
@@ -74,20 +74,19 @@ 
 			{
 				$this->data = array(
 					'ts_start' => $this->today,
-					'start_time' => '',	// force empty start-time
-					'end_time' => egw_time::to($this->now,'H:i'),
+					'start_time' => '', // force empty start-time
+					'end_time' => egw_time::to($this->now, 'H:i'),
 					'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
-					'cat_id'   => (int) $_REQUEST['cat_id'],
+					'cat_id'   => (int)$_REQUEST['cat_id'],
 					'ts_status'=> $GLOBALS['egw_info']['user']['preferences']['timesheet']['predefined_status'],
 				);
 			}
 			$matches = null;
-			$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] :
-				(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
+			$referer = preg_match('/menuaction=([^&]+)/', $_SERVER['HTTP_REFERER'], $matches) ? $matches[1] : (strpos($_SERVER['HTTP_REFERER'], '/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
 
 			if (!$this->check_statusForEditRights($this->data))
 			{
-				$view = true;  //only admin can edit with this status
+				$view = true; //only admin can edit with this status
 				$only_admin_edit = true;
 				$msg = lang('only Admin can edit this status');
 			}
@@ -100,7 +99,7 @@ 
 			{
 				if ($this->status_labels_config[$content['ts_status']]['admin'])
 				{
-					$view = true;  //only admin can edit with this status
+					$view = true; //only admin can edit with this status
 					$only_admin_edit = true;
 					$msg = lang('only Admin can edit this status');
 				}
@@ -114,29 +113,29 @@ 
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new egw_time($content['ts_start']);
-				$start_time = explode(':',$content['start_time']);
-				$start->setTime($start_time[0],$start_time[1]);
+				$start_time = explode(':', $content['start_time']);
+				$start->setTime($start_time[0], $start_time[1]);
 				$content['ts_start'] = $start->format('ts');
 			}
 			if (isset($content['end_time']))		// end-time specified
 			{
 				$end = new egw_time($content['ts_start']);
-				$end_time = explode(':',$content['end_time']);
-				$end->setTime($end_time[0],$end_time[1]);
+				$end_time = explode(':', $content['end_time']);
+				$end->setTime($end_time[0], $end_time[1]);
 			}
 			if ($end && $start)	// start- & end-time --> calculate the duration
 			{
 				$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
 				// check if negative duration is caused by wrap over midnight
-				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
+				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24 * 60)
 				{
-					$content['ts_duration'] += 24*60;
+					$content['ts_duration'] += 24 * 60;
 				}
 				//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
 			}
 			elseif ($content['ts_duration'] && $end)	// no start, calculate from end and duration
 			{
-				$content['ts_start'] = $end->format('ts') - 60*$content['ts_duration'];
+				$content['ts_start'] = $end->format('ts') - 60 * $content['ts_duration'];
 				//echo "<p>end_time=$content[end_time], duration=$content[ts_duration] --> ts_start=$content[ts_start]=".egw_time::to($content['ts_start'])."</p>\n";
 			}
 			if ($content['ts_duration'] > 0) unset($content['end_time']);
@@ -146,18 +145,18 @@ 
 			$referer = $content['referer'];
 			$content['ts_project_blur'] = $content['pm_id'] ? egw_link::title('projectmanager', $content['pm_id']) : '';
 			$this->data = $content;
-			foreach(array('button','view','referer','tabs','start_time') as $key)
+			foreach (array('button', 'view', 'referer', 'tabs', 'start_time') as $key)
 			{
 				unset($this->data[$key]);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'edit':
 					if ($this->check_acl(EGW_ACL_EDIT) && !$only_admin_edit) $view = false;
 					break;
 
 				case 'undelete':
-					if($content['ts_status'] == self::DELETED_STATUS)
+					if ($content['ts_status'] == self::DELETED_STATUS)
 					{
 						unset($content['ts_status']);
 						$this->data['ts_status'] = '';
@@ -175,14 +174,14 @@ 
 					}
 					if (!$this->data['ts_quantity'])
 					{
-						$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
+						$etpl->set_validation_error('ts_quantity', lang('Field must not be empty !!!'));
 					}
 					if ($this->data['ts_duration'] < 0)
 					{
-						$etpl->set_validation_error('start_time',lang('Starttime has to be before endtime !!!'));
+						$etpl->set_validation_error('start_time', lang('Starttime has to be before endtime !!!'));
 					}
 					// set ts_title to ts_project if short viewtype (title is not editable)
-					if($this->ts_viewtype == 'short')
+					if ($this->ts_viewtype == 'short')
 					{
 						$this->data['ts_title'] = $this->data['ts_project'];
 					}
@@ -193,9 +192,9 @@ 
 
 						if (!$this->data['ts_title'])
 						{
-							$etpl->set_validation_error('ts_title',lang('Field must not be empty !!!'));
+							$etpl->set_validation_error('ts_title', lang('Field must not be empty !!!'));
 						}
-						elseif($button != 'save_new')
+						elseif ($button != 'save_new')
 						{
 							// remove title-blur for same behavior after apply, as for opening the saved entry again
 							unset($this->data['ts_title_blur']);
@@ -204,26 +203,26 @@ 
 							unset($content['ts_project_blur']);
 						}
 					}
-					if ($etpl->validation_errors()) break;	// the user need to fix the error, before we can save the entry
+					if ($etpl->validation_errors()) break; // the user need to fix the error, before we can save the entry
 
 					// account for changed project --> remove old one from links and add new one
-					if ((int) $this->data['pm_id'] != (int) $this->data['old_pm_id'])
+					if ((int)$this->data['pm_id'] != (int)$this->data['old_pm_id'])
 					{
 						// update links accordingly
 						if ($this->data['pm_id'])
 						{
-							egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],'projectmanager',$this->data['pm_id']);
+							egw_link::link(TIMESHEET_APP, $content['link_to']['to_id'], 'projectmanager', $this->data['pm_id']);
 						}
 						if ($this->data['old_pm_id'])
 						{
-							egw_link::unlink2(0,TIMESHEET_APP,$content['link_to']['to_id'],0,'projectmanager',$this->data['old_pm_id']);
+							egw_link::unlink2(0, TIMESHEET_APP, $content['link_to']['to_id'], 0, 'projectmanager', $this->data['old_pm_id']);
 							unset($this->data['old_pm_id']);
 						}
 					}
 					// check if we are linked to a project, but that is NOT set as project
 					if (!$this->data['pm_id'] && is_array($content['link_to']['to_id']))
 					{
-						foreach($content['link_to']['to_id'] as $data)
+						foreach ($content['link_to']['to_id'] as $data)
 						{
 							if ($data['app'] == 'projectmanager')
 							{
@@ -244,26 +243,26 @@ 
 						$msg = lang('Entry saved');
 						if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 						{
-							egw_link::link(TIMESHEET_APP,$this->data['ts_id'],$content['link_to']['to_id']);
+							egw_link::link(TIMESHEET_APP, $this->data['ts_id'], $content['link_to']['to_id']);
 						}
 					}
 					egw_framework::refresh_opener($msg, 'timesheet', $this->data['ts_id'], $content['ts_id'] ? 'edit' : 'add');
 					if ($button == 'apply') break;
 					if ($button == 'save_new')
 					{
-						$msg .= ', '.lang('creating new entry');		// giving some feedback to the user
+						$msg .= ', '.lang('creating new entry'); // giving some feedback to the user
 
 						if (!is_array($content['link_to']['to_id']))	// set links again, so new entry gets the same links as the existing one
 						{
 							$content['link_to']['to_id'] = 0;
-							foreach(egw_link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.egw_link::VFS_APPNAME) as $link)
+							foreach (egw_link::get_links(TIMESHEET_APP, $this->data['ts_id'], '!'.egw_link::VFS_APPNAME) as $link)
 							{
-								egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
+								egw_link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
 							}
 						}
 						// create a new entry
 						$this->data['ts_start'] += 60 * $this->data['ts_duration'];
-						foreach(array('ts_id','ts_title','ts_description','ts_duration','ts_quantity','ts_modified','ts_modifier') as $name)
+						foreach (array('ts_id', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_modified', 'ts_modifier') as $name)
 						{
 							unset($this->data[$name]);
 						}
@@ -283,7 +282,7 @@ 
 						else
 						{
 							$msg = lang('Error deleting the entry!!!');
-							break;	// dont close window
+							break; // dont close window
 						}
 					}
 					// fall-through for save
@@ -296,7 +295,7 @@ 
 			'referer' => $referer,
 			'ts_title_blur' => $content['ts_title_blur'],
 		);
-		$content = array_merge($this->data,array(
+		$content = array_merge($this->data, array(
 			'msg'  => $msg,
 			'view' => $view,
 			'tabs'  => $content['tabs'],
@@ -304,8 +303,8 @@ 
 				'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
 				'to_app' => TIMESHEET_APP,
 			),
-			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
-			'ts_quantity' => $this->data['ts_duration']/60.0 == $this->data['ts_quantity'] ? null : $this->data['ts_quantity'],
+			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0, 3) : '',
+			'ts_quantity' => $this->data['ts_duration'] / 60.0 == $this->data['ts_quantity'] ? null : $this->data['ts_quantity'],
 			'start_time' => isset($this->data['start_time']) ? $this->data['start_time'] : $this->data['ts_start'],
 			'pm_integration' => $this->pm_integration,
 			'no_ts_status' => !$this->status_labels && ($this->data['ts_status'] != self::DELETED_STATUS),
@@ -315,10 +314,10 @@ 
 		if (!$this->data['ts_id'] && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
 		{
 			$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-			foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+			foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 			{
 				$link_id = $link_ids[$n];
-				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// gard against XSS
 				{
 					switch ($link_app)
 					{
@@ -326,33 +325,33 @@ 
 							$links[] = $link_id;
 							// fall-through;
 						default:
-							if(!$n)
+							if (!$n)
 							{
 								// get title from first linked app
-								$preserv['ts_title_blur'] = egw_link::title($link_app,$link_id);
+								$preserv['ts_title_blur'] = egw_link::title($link_app, $link_id);
 								// ask first linked app via "timesheet_set" hook, for further data to set, incl. links
-								if (($set = $GLOBALS['egw']->hooks->single(array('location'=>'timesheet_set','id'=>$link_id),$link_app)))
+								if (($set = $GLOBALS['egw']->hooks->single(array('location'=>'timesheet_set', 'id'=>$link_id), $link_app)))
 								{
-									foreach((array)$set['link_app'] as $i => $l_app)
+									foreach ((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										if (($l_id = $set['link_id'][$i])) egw_link::link(TIMESHEET_APP, $content['link_to']['to_id'], $l_app, $l_id);
 										if ($l_app == 'projectmanager') $links[] = $l_id;
 									}
 									unset($set['link_app']);
 									unset($set['link_id']);
 
-									$content = array_merge($content,$set);
+									$content = array_merge($content, $set);
 								}
 							}
 							break;
 					}
-					egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link_app,$link_id);
+					egw_link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link_app, $link_id);
 				}
 			}
 		}
 		elseif ($this->data['ts_id'])
 		{
-			$links = egw_link::get_links(TIMESHEET_APP,$this->data['ts_id'],'projectmanager');
+			$links = egw_link::get_links(TIMESHEET_APP, $this->data['ts_id'], 'projectmanager');
 		}
 		// make all linked projects availible for the pm-pricelist widget, to be able to choose prices from all
 		$content['all_pm_ids'] = array_values($links);
@@ -395,7 +394,7 @@ 
 
 		if ($view)
 		{
-			foreach(array_merge(array_keys($this->data),array('pm_id','pl_id','link_to')) as $key)
+			foreach (array_merge(array_keys($this->data), array('pm_id', 'pl_id', 'link_to')) as $key)
 			{
 				$readonlys[$key] = true;
 			}
@@ -411,9 +410,9 @@ 
 		{
 			$edit_grants[$content['ts_owner']] = common::grab_owner_name($content['ts_owner']);
 		}
-		$sel_options['ts_owner']  = $edit_grants;
-		$sel_options['ts_status']  = $this->status_labels;
-		if($this->config_data['history'] && $content['ts_status'] == self::DELETED_STATUS)
+		$sel_options['ts_owner'] = $edit_grants;
+		$sel_options['ts_status'] = $this->status_labels;
+		if ($this->config_data['history'] && $content['ts_status'] == self::DELETED_STATUS)
 		{
 			$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
 		}
@@ -423,19 +422,19 @@ 
 		// supress unknow widget 'projectmanager-*', if projectmanager is not installed or old
 		if (!@file_exists(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.projectmanager_widget.inc.php'))
 		{
-			$etpl->set_cell_attribute('pm_id','disabled',true);
-			$etpl->set_cell_attribute('pl_id','disabled',true);
+			$etpl->set_cell_attribute('pm_id', 'disabled', true);
+			$etpl->set_cell_attribute('pl_id', 'disabled', true);
 		}
 
-		if($this->ts_viewtype == 'short')
+		if ($this->ts_viewtype == 'short')
 		{
 			$content['ts_viewtype'] = $readonlys['tabs']['notes'] = true;
 			$content['ts_description_short'] = $content['ts_description'];
 		}
-		if (!$this->customfields) $readonlys['tabs']['customfields'] = true;	// suppress tab if there are not customfields
-		if (!$this->data['ts_id']) $readonlys['tabs']['history']    = true;   //suppress history for the first loading without ID
+		if (!$this->customfields) $readonlys['tabs']['customfields'] = true; // suppress tab if there are not customfields
+		if (!$this->data['ts_id']) $readonlys['tabs']['history'] = true; //suppress history for the first loading without ID
 
-		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
+		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -448,7 +447,7 @@ 
 	{
 		if (!$datetime) return 0;
 
-		return $datetime - mktime(0,0,0,date('m',$datetime),date('d',$datetime),date('Y',$datetime));
+		return $datetime - mktime(0, 0, 0, date('m', $datetime), date('d', $datetime), date('Y', $datetime));
 	}
 
 	/**
@@ -462,17 +461,17 @@ 
 	 * @param boolean $id_only if true only return (via $rows) an array of contact-ids, dont save state to session
 	 * @return int total number of contacts matching the selection
 	 */
-	function get_rows(&$query_in,&$rows,&$readonlys,$id_only=false)
+	function get_rows(&$query_in, &$rows, &$readonlys, $id_only = false)
 	{
 		$this->show_sums = false;
 		if ($query_in['filter'])
 		{
-			$date_filter = $this->date_filter($query_in['filter'],$query_in['startdate'],$query_in['enddate']);
+			$date_filter = $this->date_filter($query_in['filter'], $query_in['startdate'], $query_in['enddate']);
 
 			if ($query_in['startdate'])
 			{
-				$start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60));
-				$end   = explode('-',date('Y-m-d',$query_in['enddate'] ? $query_in['enddate'] : $query_in['startdate']+7.5*24*60*60));
+				$start = explode('-', date('Y-m-d', $query_in['startdate'] + 12 * 60 * 60));
+				$end   = explode('-', date('Y-m-d', $query_in['enddate'] ? $query_in['enddate'] : $query_in['startdate'] + 7.5 * 24 * 60 * 60));
 
 				// show year-sums, if we are year-aligned (show full years)?
 				if ((int)$start[2] == 1 && (int)$start[1] == 1 && (int)$end[2] == 31 && (int)$end[1] == 12)
@@ -480,42 +479,42 @@ 
 					$this->show_sums[] = 'year';
 				}
 				// show month-sums, if we are month-aligned (show full monthes)?
-				if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d',mktime(12,0,0,$end[1]+1,0,$end[0])))
+				if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d', mktime(12, 0, 0, $end[1] + 1, 0, $end[0])))
 				{
 					$this->show_sums[] = 'month';
 				}
 				// show week-sums, if we are week-aligned (show full weeks)?
 				$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
 				if (!$week_start_day) $week_start_day = 'Sunday';
-				switch($week_start_day)
+				switch ($week_start_day)
 				{
 					case 'Sunday': $week_end_day = 'Saturday'; break;
 					case 'Monday': $week_end_day = 'Sunday'; break;
 					case 'Saturday': $week_end_day = 'Friday'; break;
 				}
-				$filter_start_day = date('l',$query_in['startdate']+12*60*60);
-				$filter_end_day   = $query_in['enddate'] ? date('l',$query_in['enddate']+12*60*60) : false;
+				$filter_start_day = date('l', $query_in['startdate'] + 12 * 60 * 60);
+				$filter_end_day   = $query_in['enddate'] ? date('l', $query_in['enddate'] + 12 * 60 * 60) : false;
 				//echo "<p align=right>prefs: $week_start_day - $week_end_day, filter: $filter_start_day - $filter_end_day</p>\n";
 				if ($filter_start_day == $week_start_day && (!$filter_end_day || $filter_end_day == $week_end_day))
 				{
 					$this->show_sums[] = 'week';
 				}
 				// show day-sums, if range <= 5 weeks
-				if (!$query_in['enddate'] || $query_in['enddate'] - $query_in['startdate'] < 36*24*60*60)
+				if (!$query_in['enddate'] || $query_in['enddate'] - $query_in['startdate'] < 36 * 24 * 60 * 60)
 				{
 					$this->show_sums[] = 'day';
 				}
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP, $query_in);
 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
 
-		$query = $query_in;	// keep the original query
+		$query = $query_in; // keep the original query
 
-		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		if ($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false, 'ts_unitprice'=>false, 'ts_total'=>false);
 		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
 
 		//_debug_array($query['col_filter']);
@@ -542,10 +541,10 @@ 
 		// handle linked filter (show only entries linked to a certain other entry)
 		if ($query['col_filter']['linked'])
 		{
-			list($app,$id) = explode(':',$query['col_filter']['linked']);
-			if (!($links = egw_link::get_links($app,$id,'timesheet')))
+			list($app, $id) = explode(':', $query['col_filter']['linked']);
+			if (!($links = egw_link::get_links($app, $id, 'timesheet')))
 			{
-				$rows = array();	// no infologs linked to project --> no rows to return
+				$rows = array(); // no infologs linked to project --> no rows to return
 				return 0;
 			}
 			if (!$query['col_filter']['ts_id'])
@@ -553,9 +552,9 @@ 
 				$query['col_filter']['ts_id'] = array_values(array_unique($links));
 			}
 			// allow to combine with other filters using ts_id --> intersect ids
-			elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'],array_values(array_unique($links)))))
+			elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'], array_values(array_unique($links)))))
 			{
-				$rows = array();	// no infologs linked to project --> no rows to return
+				$rows = array(); // no infologs linked to project --> no rows to return
 				return 0;
 			}
 		}
@@ -579,13 +578,13 @@ 
 			{
 				if (isset($this->status_labels_substatus['2level'][$status_id]))
 				{
-					$query['col_filter']['ts_status'] = array_merge($query['col_filter']['ts_status'],$this->status_labels_substatus[$status_id]);
+					$query['col_filter']['ts_status'] = array_merge($query['col_filter']['ts_status'], $this->status_labels_substatus[$status_id]);
 				}
 			}
 		}
 		if ((int)$query['filter2'] != (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'])
 		{
-			$GLOBALS['egw']->preferences->add(TIMESHEET_APP,'show_details',(int)$query['filter2']);
+			$GLOBALS['egw']->preferences->add(TIMESHEET_APP, 'show_details', (int)$query['filter2']);
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
 		// category filter: cat_id or ''=All cats or 0=No cat
@@ -608,7 +607,7 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.common::grab_owner_name($query['col_filter']['ts_owner']);
 			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
 			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
-			if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			if ($query['col_filter']['ts_owner'] < 0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']), $GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'], true));
 		}
 		else
 		{
@@ -621,51 +620,51 @@ 
 			// generate a meaningful app-header / report title
 			if ($this->show_sums['month'])
 			{
-				if ((int)$start[1] == 1 && (int) $end[1] == 12)		// whole year(s)
+				if ((int)$start[1] == 1 && (int)$end[1] == 12)		// whole year(s)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . $start[0] . ($start[0] != $end[0] ? ' - '.$end[0] : '');
+					$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$start[0].($start[0] != $end[0] ? ' - '.$end[0] : '');
 				}
 				else
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang(date('F',$query['startdate']+12*60*60)) . ' ' . $start[0];
+					$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(date('F', $query['startdate'] + 12 * 60 * 60)).' '.$start[0];
 					if ($start[0] != $end[0] || $start[1] != $end[1])
 					{
-						$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . lang(date('F',$query['enddate']+12*60*60)) . ' ' . $end[0];
+						$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang(date('F', $query['enddate'] + 12 * 60 * 60)).' '.$end[0];
 					}
 				}
 			}
 			elseif ($this->show_sums['week'])
 			{
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang('week') . ' ' . date('W',$query['startdate']+36*60*60) . '/' . $start[0];
-				if ($query['enddate'] && $query['enddate'] - $query['startdate'] > 10*24*60*60)
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('week').' '.date('W', $query['startdate'] + 36 * 60 * 60).'/'.$start[0];
+				if ($query['enddate'] && $query['enddate'] - $query['startdate'] > 10 * 24 * 60 * 60)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . date('W',$query['enddate']-36*60*60) . '/' . $end[0];
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.date('W', $query['enddate'] - 36 * 60 * 60).'/'.$end[0];
 				}
 			}
 			elseif ($query['startdate'])
 			{
 				$df = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . common::show_date($query['startdate']+12*60*60,$df,false);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.common::show_date($query['startdate'] + 12 * 60 * 60, $df, false);
 				if ($start != $end)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.common::show_date($query['enddate']+12*60*60,$df,false);
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.common::show_date($query['enddate'] + 12 * 60 * 60, $df, false);
 				}
 			}
 		}
-		$total = parent::get_rows($query,$rows,$readonlys);
+		$total = parent::get_rows($query, $rows, $readonlys);
 
 		$ids = array();
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if ($row['ts_id'] > 0) $ids[] = $row['ts_id'];
 		}
 		if ($id_only)
 		{
 			$rows = $ids;
-			return $this->total;	// no need to set other fields or $readonlys
+			return $this->total; // no need to set other fields or $readonlys
 		}
 		$links = array();
-		$links3 = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		$links3 = egw_link::get_links_multiple(TIMESHEET_APP, $ids, true, 'projectmanager'); // only check for pm links!
 		//as the full array is expected, we must supply the missing but needed (since expected further down) information
 		if (is_array($links3))
 		{
@@ -685,14 +684,14 @@ 
 
 		$readonlys = array();
 		$have_cats = false;
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if ($row['cat_id']) $have_cats = true;
 
 			$row['class'] = 'row';
 			if ($row['ts_id'] <= 0)	// sums
 			{
-				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;	// fix for DSL change
+				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200; // fix for DSL change
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
@@ -700,23 +699,23 @@ 
 				// Set flag to avoid actions on these rows
 				$row['no_actions'] = true;
 
-				switch($row['ts_id'])
+				switch ($row['ts_id'])
 				{
 					case 0:	// day-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.common::show_date($row['ts_start'],
-						$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
+						$row['ts_title'] = lang('Sum %1:', lang(date('l', $row['ts_start'])).' '.common::show_date($row['ts_start'],
+						$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], false));
 						$row['ts_id'] = 'sum-day-'.$row['ts_start'];
 						break;
 					case -1:	// week-sum
-						$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
+						$row['ts_title'] = lang('Sum %1:', lang('week').' '.substr($row['ts_week'], 4).'/'.substr($row['ts_week'], 0, 4));
 						$row['ts_id'] = 'sum-week-'.$row['ts_week'];
 						break;
 					case -2:	// month-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
+						$row['ts_title'] = lang('Sum %1:', lang(date('F', $row['ts_start'])).' '.substr($row['ts_month'], 0, 4));
 						$row['ts_id'] = 'sum-month-'.$row['ts_month'];
 						break;
 					case -3:	// year-sum
-						$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
+						$row['ts_title'] = lang('Sum %1:', $row['ts_year']);
 						$row['ts_id'] = 'sum-year-'.$row['ts_year'];
 						break;
 				}
@@ -726,11 +725,11 @@ 
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
 			}
-			if($row['ts_quantity'])
+			if ($row['ts_quantity'])
 			{
 				$row['ts_quantity'] = round($row['ts_quantity'], 2);
 			}
-			if (!$this->check_acl(EGW_ACL_EDIT,$row))
+			if (!$this->check_acl(EGW_ACL_EDIT, $row))
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
@@ -738,21 +737,21 @@ 
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
-			if (!$this->check_acl(EGW_ACL_DELETE,$row))
+			if (!$this->check_acl(EGW_ACL_DELETE, $row))
 			{
 				$row['class'] .= ' rowNoDelete ';
 			}
-			if($row['ts_status'] != self::DELETED_STATUS)
+			if ($row['ts_status'] != self::DELETED_STATUS)
 			{
 				$row['class'] .= ' rowNoUndelete ';
 			}
 			if ($query['col_filter']['ts_project'])
 			{
-				unset($row['ts_project']);	// dont need or want to show it
+				unset($row['ts_project']); // dont need or want to show it
 			}
 			elseif ($links[$row['ts_id']])
 			{
-				foreach($links[$row['ts_id']] as $link)
+				foreach ($links[$row['ts_id']] as $link)
 				{
 					if ($link['app'] == 'projectmanager')
 					{
@@ -763,26 +762,26 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if (!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
 
 		}
 		if (!$have_cats || $query['cat_id']) $rows['no_cat_id'] = true;
 		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
 		$rows['no_owner_col'] = $query['no_owner_col'];
-		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
+		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'], 'ts_owner')) $rows['no_owner_col'] = 1;
 		if ($query['filter'])
 		{
 			$rows += $this->summary;
 		}
 		$rows['pm_integration'] = $this->pm_integration;
-		$rows['ts_viewtype'] =  $rows['no_ts_quantity'] =  $rows['no_ts_unitprice'] =  $rows['no_ts_total'] = $this->ts_viewtype == 'short';
+		$rows['ts_viewtype'] = $rows['no_ts_quantity'] = $rows['no_ts_unitprice'] = $rows['no_ts_total'] = $this->ts_viewtype == 'short';
 		if (!$rows['ts_viewtype'])
 		{
 			#_debug_array($query['selectcols']);
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'], 'ts_quantity') === false) $rows['no_ts_quantity'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'], 'ts_unitprice') === false) $rows['no_ts_unitprice'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'], 'ts_total') === false) $rows['no_ts_total'] = 1;
 		}
 		$rows['no_ts_status'] = strpos($query['selectcols'], 'ts_status') === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -796,7 +795,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$etpl = new etemplate_new('timesheet.index');
 
@@ -833,26 +832,26 @@ 
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, 'index', $msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2',$success,$action_msg);
+					$msg .= lang('%1 timesheets(s) %2', $success, $action_msg);
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 				}
 			}
 		}
 
 		$content = array(
-			'nm' => $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP),
+			'nm' => $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP),
 			'msg' => $msg,
 		);
 		if (!is_array($content['nm']))
 		{
 			$date_filters = array('All');
-			foreach(array_keys($this->date_filters) as $name)
+			foreach (array_keys($this->date_filters) as $name)
 			{
 				$date_filters[$name] = $name;
 			}
@@ -861,9 +860,9 @@ 
 			$content['nm'] = array(
 				'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
 				'options-filter' => $date_filters,
-				'options-filter2' => array('No details','Details'),
-				'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
+				'options-filter2' => array('No details', 'Details'),
+				'order'          =>	'ts_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 				'header_left'    => 'timesheet.index.dates',
 				'header_row'     => 'timesheet.index.add',
 				'filter_onchange' => "app.timesheet.filter_change();",
@@ -872,13 +871,13 @@ 
 				'row_id'         => 'ts_id',
 				'row_modified'   => 'ts_modified',
 				//'actions'        => $this->get_actions(),
-				'default_cols'   => '!legacy_actions',	// switch legacy actions column and row off by default
+				'default_cols'   => '!legacy_actions', // switch legacy actions column and row off by default
 				'pm_integration' => $this->pm_integration,
 			);
 		}
 		$content['nm']['actions'] = $this->get_actions($content['nm']);
 
-		if($_GET['search'])
+		if ($_GET['search'])
 		{
 			$content['nm']['search'] = $_GET['search'];
 		}
@@ -889,25 +888,25 @@ 
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
 			'cat_id'     => array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None'))),
-			'ts_status'  => $this->status_labels+array(lang('No status')),
+			'ts_status'  => $this->status_labels + array(lang('No status')),
 		);
-		if($this->config_data['history'])
+		if ($this->config_data['history'])
 		{
 			$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
 		}
-		$content['nm']['no_status'] = count($sel_options['ts_status']) <= 1;	// 1 because of 'No status'
-		$content['nm']['favorites'] = true;		//Enable favorite
+		$content['nm']['no_status'] = count($sel_options['ts_status']) <= 1; // 1 because of 'No status'
+		$content['nm']['favorites'] = true; //Enable favorite
 
 		if ($this->pm_integration != 'full')
 		{
-			$projects =& $this->query_list('ts_project');
+			$projects = & $this->query_list('ts_project');
 			if (!is_array($projects)) $projects = array();
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
 
 		// dont show [Export] button if app is not availible to the user or we are on php4
-		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int) phpversion() < 5;
-		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index',$content,$sel_options,$readonlys);
+		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int)phpversion() < 5;
+		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -926,7 +925,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&ts_id=$id',
 				'popup' => egw_link::get_registry('timesheet', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
 			),
 /*
@@ -954,7 +953,7 @@ 
 				'group' => $group,
 			),
 			'cat' => etemplate_widget_nextmatch::category_action(
-				'timesheet',++$group,'Change category','cat_'
+				'timesheet', ++$group, 'Change category', 'cat_'
 			),
 			'status' => array(
 				'icon' => 'apply',
@@ -1006,7 +1005,7 @@ 
 			);
 		}
 		// enable additonal edit check for following actions, if they are generally available
-		foreach(array('cat','status') as $action)
+		foreach (array('cat', 'status') as $action)
 		{
 			if ($actions[$action]['enabled'])
 			{
@@ -1029,27 +1028,27 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		$success = $failed = 0;
 		if ($use_all)
 		{
 			// get the whole selection
-			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession($session_name,'timesheet');
+			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession($session_name, 'timesheet');
 
 			if ($use_all)
 			{
-				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
-				$query['num_rows'] = -1;	// all
+				@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1; // all
 				$readonlys = null;
-				$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+				$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 			}
 		}
 		//error_log(__METHOD__."('$action', ".array2string($checked).', '.array2string($use_all).",,, '$session_name')");
 
-		if (substr($action,0,9) == 'to_status')
+		if (substr($action, 0, 9) == 'to_status')
 		{
-			$to_status = (int)substr($action,10);
+			$to_status = (int)substr($action, 10);
 			$action = 'to_status';
 		}
 		else
@@ -1058,11 +1057,11 @@ 
 			list($action, $settings) = explode('_', $action, 2);
 		}
 
-		switch($action)
+		switch ($action)
 		{
 			case 'delete':
 				$action_msg = lang('deleted');
-				foreach((array)$checked as $n => $id)
+				foreach ((array)$checked as $n => $id)
 				{
 					if ($this->delete($id))
 					{
@@ -1075,10 +1074,10 @@ 
 				}
 				break;
 			case 'undelete':
-				$action_msg =lang('recovered');
-				foreach((array)$checked as $n => $id)
+				$action_msg = lang('recovered');
+				foreach ((array)$checked as $n => $id)
 				{
-					if ($this->set_status($id,''))
+					if ($this->set_status($id, ''))
 					{
 						$success++;
 					}
@@ -1089,10 +1088,10 @@ 
 				}
 				break;
 			case 'to_status':
-				$action_msg =lang('changed status');
-				foreach((array)$checked as $n => $id)
+				$action_msg = lang('changed status');
+				foreach ((array)$checked as $n => $id)
 				{
-					if ($this->set_status($id,$to_status))
+					if ($this->set_status($id, $to_status))
 					{
 						$success++;
 					}
@@ -1105,10 +1104,10 @@ 
 			case 'cat':
 				$cat_name = categories::id2name($settings);
 				$action_msg = lang('changed category to %1', $cat_name);
-				foreach((array)$checked as $n => $id) {
+				foreach ((array)$checked as $n => $id) {
 					$entry = $this->read($id);
 					$entry['cat_id'] = $settings;
-					if($this->save($entry) == 0)
+					if ($this->save($entry) == 0)
 					{
 						$success++;
 					}
@@ -1136,7 +1135,7 @@ 
 	 * @param conetnt
 	 * @param view
 	 */
-	function editstatus($content = null,$msg='')
+	function editstatus($content = null, $msg = '')
 	{
 		// this function requires admin rights
 		$GLOBALS['egw_info']['flags']['admin_only'] = true;
@@ -1147,13 +1146,13 @@ 
 			list($button) = @each($content['button']);
 			unset ($content['button']);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'delete':
 					break;
 				case 'apply':
 				case 'save':
-					foreach($content['statis'] as &$cat)
+					foreach ($content['statis'] as &$cat)
 					{
 						$id = $cat['id'];
 						if (($cat ['name'] !== $this->status_labels_config[$id]) && ($cat ['name'] !== '') || ($cat ['parent'] !== $this->status_labels_config[$id]['parent']) && ($cat ['parent'] !== ''))
@@ -1167,7 +1166,7 @@ 
 					}
 					if ($need_update)
 					{
-						config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+						config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 						$this->config_data = config::read(TIMESHEET_APP);
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
@@ -1184,7 +1183,7 @@ 
 			if (isset($this->status_labels_config[$id]))
 			{
 				unset($this->status_labels_config[$id]);
-				config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+				config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 				unset($this->status_labels[$id]);
 				$msg .= lang('Status deleted.');
 			}
@@ -1193,12 +1192,12 @@ 
 		$i = 1;
 		$max_id = 0;
 		unset($content['statis']);
-		foreach($this->status_labels_config as $id => $label)
+		foreach ($this->status_labels_config as $id => $label)
 		{
-			$content['statis'][$i]['name']= $label['name'];
-			$content['statis'][$i]['id']= $id;
-			$content['statis'][$i]['parent']= $label['parent'];
-			$content['statis'][$i]['admin']= $label['admin'];
+			$content['statis'][$i]['name'] = $label['name'];
+			$content['statis'][$i]['id'] = $id;
+			$content['statis'][$i]['parent'] = $label['parent'];
+			$content['statis'][$i]['admin'] = $label['admin'];
 			$i++;
 			$max_id = max($id, $max_id);
 		}
@@ -1210,6 +1209,6 @@ 
 		$preserv = $content;
 		$sel_options['parent'] = $this->status_labels;
 		$etpl = new etemplate_new('timesheet.editstatus');
-		$etpl->exec('timesheet.timesheet_ui.editstatus',$content,$sel_options,array(),$preserv);
+		$etpl->exec('timesheet.timesheet_ui.editstatus', $content, $sel_options, array(), $preserv);
 	}
 }

Braces +179 added lines, -45 removed lines

@@ -57,7 +57,10 @@ 
 		$etpl = new etemplate_new('timesheet.edit');
 		if (!is_array($content))
 		{
-			if ($_GET['msg']) $msg = strip_tags($_GET['msg']);
+			if ($_GET['msg'])
+			{
+				$msg = strip_tags($_GET['msg']);
+			}
 
 			if ($view || (int)$_GET['ts_id'])
 			{
@@ -110,23 +113,32 @@ 
 				$content['ts_description'] = $content['ts_description_short'];
 			}
 			// we only need 2 out of 3 values from start-, end-time or duration (the date in ts_start is always required!)
-			if (isset($content['start_time']))		// start-time specified
+			if (isset($content['start_time']))
+			{
+				// start-time specified
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new egw_time($content['ts_start']);
+			}
 				$start_time = explode(':',$content['start_time']);
 				$start->setTime($start_time[0],$start_time[1]);
 				$content['ts_start'] = $start->format('ts');
 			}
-			if (isset($content['end_time']))		// end-time specified
+			if (isset($content['end_time']))
+			{
+				// end-time specified
 			{
 				$end = new egw_time($content['ts_start']);
+			}
 				$end_time = explode(':',$content['end_time']);
 				$end->setTime($end_time[0],$end_time[1]);
 			}
-			if ($end && $start)	// start- & end-time --> calculate the duration
+			if ($end && $start)
+			{
+				// start- & end-time --> calculate the duration
 			{
 				$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
+			}
 				// check if negative duration is caused by wrap over midnight
 				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
 				{
@@ -134,12 +146,18 @@ 
 				}
 				//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
 			}
-			elseif ($content['ts_duration'] && $end)	// no start, calculate from end and duration
+			elseif ($content['ts_duration'] && $end)
+			{
+				// no start, calculate from end and duration
 			{
 				$content['ts_start'] = $end->format('ts') - 60*$content['ts_duration'];
+			}
 				//echo "<p>end_time=$content[end_time], duration=$content[ts_duration] --> ts_start=$content[ts_start]=".egw_time::to($content['ts_start'])."</p>\n";
 			}
-			if ($content['ts_duration'] > 0) unset($content['end_time']);
+			if ($content['ts_duration'] > 0)
+			{
+				unset($content['end_time']);
+			}
 			// now we only deal with start (date+time) and duration
 			list($button) = @each($content['button']);
 			$view = $content['view'];
@@ -153,7 +171,10 @@ 
 			switch($button)
 			{
 				case 'edit':
-					if ($this->check_acl(EGW_ACL_EDIT) && !$only_admin_edit) $view = false;
+					if ($this->check_acl(EGW_ACL_EDIT) && !$only_admin_edit)
+					{
+						$view = false;
+					}
 					break;
 
 				case 'undelete':
@@ -167,12 +188,15 @@ 
 				case 'save':
 				case 'save_new':
 				case 'apply':
-					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])	// set the quantity (in h) from the duration (in min)
+					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])
+					{
+						// set the quantity (in h) from the duration (in min)
 					{
 						// We need to keep the actual value of ts_quantity when we are storing it, as it is used in price calculation
 						// and rounding it causes miscalculation on prices
 						$this->data['ts_quantity'] = $this->data['ts_duration'] / 60.0;
 					}
+					}
 					if (!$this->data['ts_quantity'])
 					{
 						$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
@@ -204,7 +228,11 @@ 
 							unset($content['ts_project_blur']);
 						}
 					}
-					if ($etpl->validation_errors()) break;	// the user need to fix the error, before we can save the entry
+					if ($etpl->validation_errors())
+					{
+						break;
+					}
+					// the user need to fix the error, before we can save the entry
 
 					// account for changed project --> remove old one from links and add new one
 					if ((int) $this->data['pm_id'] != (int) $this->data['old_pm_id'])
@@ -248,14 +276,20 @@ 
 						}
 					}
 					egw_framework::refresh_opener($msg, 'timesheet', $this->data['ts_id'], $content['ts_id'] ? 'edit' : 'add');
-					if ($button == 'apply') break;
+					if ($button == 'apply')
+					{
+						break;
+					}
 					if ($button == 'save_new')
 					{
 						$msg .= ', '.lang('creating new entry');		// giving some feedback to the user
 
-						if (!is_array($content['link_to']['to_id']))	// set links again, so new entry gets the same links as the existing one
+						if (!is_array($content['link_to']['to_id']))
+						{
+							// set links again, so new entry gets the same links as the existing one
 						{
 							$content['link_to']['to_id'] = 0;
+						}
 							foreach(egw_link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.egw_link::VFS_APPNAME) as $link)
 							{
 								egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
@@ -318,12 +352,15 @@ 
 			foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 			{
 				$link_id = $link_ids[$n];
-				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+				{
+					// gard against XSS
 				{
 					switch ($link_app)
 					{
 						case 'projectmanager':
 							$links[] = $link_id;
+				}
 							// fall-through;
 						default:
 							if(!$n)
@@ -335,8 +372,14 @@ 
 								{
 									foreach((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
-										if ($l_app == 'projectmanager') $links[] = $l_id;
+										if (($l_id=$set['link_id'][$i]))
+										{
+											egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										}
+										if ($l_app == 'projectmanager')
+										{
+											$links[] = $l_id;
+										}
 									}
 									unset($set['link_app']);
 									unset($set['link_id']);
@@ -432,8 +475,16 @@ 
 			$content['ts_viewtype'] = $readonlys['tabs']['notes'] = true;
 			$content['ts_description_short'] = $content['ts_description'];
 		}
-		if (!$this->customfields) $readonlys['tabs']['customfields'] = true;	// suppress tab if there are not customfields
-		if (!$this->data['ts_id']) $readonlys['tabs']['history']    = true;   //suppress history for the first loading without ID
+		if (!$this->customfields)
+		{
+			$readonlys['tabs']['customfields'] = true;
+		}
+		// suppress tab if there are not customfields
+		if (!$this->data['ts_id'])
+		{
+			$readonlys['tabs']['history']    = true;
+		}
+		//suppress history for the first loading without ID
 
 		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
 	}
@@ -446,7 +497,10 @@ 
 	 */
 	function datetime2time($datetime)
 	{
-		if (!$datetime) return 0;
+		if (!$datetime)
+		{
+			return 0;
+		}
 
 		return $datetime - mktime(0,0,0,date('m',$datetime),date('d',$datetime),date('Y',$datetime));
 	}
@@ -486,7 +540,10 @@ 
 				}
 				// show week-sums, if we are week-aligned (show full weeks)?
 				$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
-				if (!$week_start_day) $week_start_day = 'Sunday';
+				if (!$week_start_day)
+				{
+					$week_start_day = 'Sunday';
+				}
 				switch($week_start_day)
 				{
 					case 'Sunday': $week_end_day = 'Saturday'; break;
@@ -508,15 +565,24 @@ 
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		if (!$id_only && !$query_in['csv_export'])
+		{
+			$GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		}
 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
 
 		$query = $query_in;	// keep the original query
 
-		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
-		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
+		if($this->ts_viewtype == 'short')
+		{
+			$query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		}
+		if ($query['no_status'])
+		{
+			$query_in['options-selectcols']['ts_status'] = false;
+		}
 
 		//_debug_array($query['col_filter']);
 		//echo "PM Integration:".$this->pm_integration.'<br>';
@@ -529,8 +595,14 @@ 
 		{
 			//$query['col_filter']['ts_id'] = egw_link::get_links('projectmanager',$query['col_filter']['pm_id'],'timesheet');
 			$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
-			if (empty($query['col_filter']['ts_id'])) $query['col_filter']['ts_id'] = -1;
-			if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
+			if (empty($query['col_filter']['ts_id']))
+			{
+				$query['col_filter']['ts_id'] = -1;
+			}
+			if (!$query['col_filter']['ts_id'])
+			{
+				$query['col_filter']['ts_id'] = 0;
+			}
 		}
 		if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0')
 		{
@@ -594,10 +666,13 @@ 
 			$cats = $GLOBALS['egw']->categories->return_all_children((int)$query['cat_id']);
 			$query['col_filter']['cat_id'] = count($cats) > 1 ? $cats : $query['cat_id'];
 		}
-		elseif ((string)$query['cat_id'] == '0')	// no category
+		elseif ((string)$query['cat_id'] == '0')
+		{
+			// no category
 		{
 			$query['col_filter']['cat_id'] = null;
 		}
+		}
 		else	// all cats --> no filter
 		{
 			unset($query['col_filter']['cat_id']);
@@ -608,7 +683,10 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.common::grab_owner_name($query['col_filter']['ts_owner']);
 			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
 			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
-			if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			if ($query['col_filter']['ts_owner']<0)
+			{
+				$query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			}
 		}
 		else
 		{
@@ -621,10 +699,13 @@ 
 			// generate a meaningful app-header / report title
 			if ($this->show_sums['month'])
 			{
-				if ((int)$start[1] == 1 && (int) $end[1] == 12)		// whole year(s)
+				if ((int)$start[1] == 1 && (int) $end[1] == 12)
+				{
+					// whole year(s)
 				{
 					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . $start[0] . ($start[0] != $end[0] ? ' - '.$end[0] : '');
 				}
+				}
 				else
 				{
 					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang(date('F',$query['startdate']+12*60*60)) . ' ' . $start[0];
@@ -657,7 +738,10 @@ 
 		$ids = array();
 		foreach($rows as &$row)
 		{
-			if ($row['ts_id'] > 0) $ids[] = $row['ts_id'];
+			if ($row['ts_id'] > 0)
+			{
+				$ids[] = $row['ts_id'];
+			}
 		}
 		if ($id_only)
 		{
@@ -687,12 +771,19 @@ 
 		$have_cats = false;
 		foreach($rows as &$row)
 		{
-			if ($row['cat_id']) $have_cats = true;
+			if ($row['cat_id'])
+			{
+				$have_cats = true;
+			}
 
 			$row['class'] = 'row';
-			if ($row['ts_id'] <= 0)	// sums
+			if ($row['ts_id'] <= 0)
+			{
+				// sums
 			{
-				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;	// fix for DSL change
+				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;
+			}
+			// fix for DSL change
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
@@ -721,7 +812,10 @@ 
 						break;
 				}
 				$row['ts_start'] = $row['ts_unitprice'] = '';
-				if (!$this->quantity_sum) $row['ts_quantity'] = '';
+				if (!$this->quantity_sum)
+				{
+					$row['ts_quantity'] = '';
+				}
 				$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete';
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
@@ -763,13 +857,25 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if(!$row['titleClass'])
+			{
+				$row['titleClass'] = 'timesheet_titleDetails';
+			}
 
 		}
-		if (!$have_cats || $query['cat_id']) $rows['no_cat_id'] = true;
-		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
+		if (!$have_cats || $query['cat_id'])
+		{
+			$rows['no_cat_id'] = true;
+		}
+		if ($query['col_filter']['ts_owner'])
+		{
+			$rows['ownerClass'] = 'noPrint';
+		}
 		$rows['no_owner_col'] = $query['no_owner_col'];
-		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
+		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner'))
+		{
+			$rows['no_owner_col'] = 1;
+		}
 		if ($query['filter'])
 		{
 			$rows += $this->summary;
@@ -780,9 +886,18 @@ 
 		{
 			#_debug_array($query['selectcols']);
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false)
+			{
+				$rows['no_ts_quantity'] = 1;
+			}
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false)
+			{
+				$rows['no_ts_unitprice'] = 1;
+			}
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false)
+			{
+				$rows['no_ts_total'] = 1;
+			}
 		}
 		$rows['no_ts_status'] = strpos($query['selectcols'], 'ts_status') === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -800,7 +915,10 @@ 
 	{
 		$etpl = new etemplate_new('timesheet.index');
 
-		if ($_GET['msg']) $msg = $_GET['msg'];
+		if ($_GET['msg'])
+		{
+			$msg = $_GET['msg'];
+		}
 		if ($content['nm']['rows']['delete'])
 		{
 			list($ts_id) = each($content['nm']['rows']['delete']);
@@ -813,9 +931,12 @@ 
 				$msg = lang('Error deleting the entry!!!');
 			}
 		}
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}
@@ -884,7 +1005,10 @@ 
 		}
 		$read_grants = $this->grant_list(EGW_ACL_READ);
 		$content['nm']['no_owner_col'] = count($read_grants) == 1;
-		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows']) $content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
+		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'])
+		{
+			$content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
+		}
 		$sel_options = array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
@@ -901,7 +1025,10 @@ 
 		if ($this->pm_integration != 'full')
 		{
 			$projects =& $this->query_list('ts_project');
-			if (!is_array($projects)) $projects = array();
+			if (!is_array($projects))
+			{
+				$projects = array();
+			}
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
 
@@ -1105,7 +1232,8 @@ 
 			case 'cat':
 				$cat_name = categories::id2name($settings);
 				$action_msg = lang('changed category to %1', $cat_name);
-				foreach((array)$checked as $n => $id) {
+				foreach((array)$checked as $n => $id)
+				{
 					$entry = $this->read($id);
 					$entry['cat_id'] = $settings;
 					if($this->save($entry) == 0)
@@ -1120,7 +1248,10 @@ 
 				break;
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'];
+				}
 				$document_merge = new timesheet_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['timesheet']['document_dir']);
 				$failed = count($checked);
@@ -1172,7 +1303,10 @@ 
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
 					}
-					if ($button == 'apply') break;
+					if ($button == 'apply')
+					{
+						break;
+					}
 					// fall-through
 				case 'cancel':
 					$GLOBALS['egw']->redirect_link('/admin/index.php', null, 'admin');

webdav.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

Spacing +3 added lines, -3 removed lines

@@ -34,7 +34,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return egw_digest_auth::autocreate_session_callback($account);
 }
@@ -45,8 +45,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use vfs_webdav_server::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use vfs_webdav_server::REALM as autoloading and include path not yet setup!
 	)
 );
 require_once('phpgwapi/inc/class.egw_digest_auth.inc.php');

filemanager/setup/setup.inc.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	'name'  => 'Ralf Becker',
 	'email' => 'ralfbecker@outdoor-training.de'
 );
-$setup_info['filemanager']['license']  = 'GPL';
+$setup_info['filemanager']['license'] = 'GPL';
 
 /* The hooks this app includes, needed for hooks registration */
 $setup_info['filemanager']['hooks']['settings'] = 'filemanager_hooks::settings';

filemanager/inc/class.filemanager_merge.inc.php

Indentation +1 added lines, -1 removed lines

@@ -123,7 +123,7 @@
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+				{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 

Braces +21 added lines, -7 removed lines

@@ -123,7 +123,7 @@ 
 		}
 		// Custom fields
 		if($content && strpos($content, '#') !== 0)
-                {
+		{
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
@@ -151,12 +151,14 @@ 
 			// Try this first - a normal path /apps/appname/id/file
 			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+			{
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
 				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
 				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps']))
+				{
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
 					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
@@ -190,7 +192,10 @@ 
 		if(is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if($link['path'] && strpos($link['path'], '://') !== false)
+			{
+				$link['path'] = $file['path'];
+			}
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -211,7 +216,10 @@ 
 		// Add markers
 		foreach($file as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		if($app_placeholders)
@@ -252,9 +260,15 @@ 
 		);
 		foreach($fields as $name => $label)
 		{
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 

Spacing +35 added lines, -35 removed lines

@@ -56,7 +56,7 @@ 
 	{
 		parent::__construct();
 
-		if($_dir)
+		if ($_dir)
 		{
 			$this->dir = $_dir;
 		}
@@ -72,7 +72,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->filemanager_replacements($id, '', $content)))
 		{
@@ -88,27 +88,27 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function filemanager_replacements($id,$prefix='', &$content = null)
+	public function filemanager_replacements($id, $prefix = '', &$content = null)
 	{
 		$info = array();
-		$file = egw_vfs::lstat($id,true);
+		$file = egw_vfs::lstat($id, true);
 
 		$file['mtime'] = egw_time::to($file['mtime']);
 		$file['ctime'] = egw_time::to($file['ctime']);
 
 		$file['name'] = egw_vfs::basename($id);
 		$file['dir'] = egw_vfs::decodePath(egw_vfs::dirname($id));
-		$dirlist = explode('/',$file['dir']);
+		$dirlist = explode('/', $file['dir']);
 		$file['folder'] = array_pop($dirlist);
-		$file['folder_file'] = $file['folder'] . '/'.$file['name'];
+		$file['folder_file'] = $file['folder'].'/'.$file['name'];
 		$file['path'] = $id;
 		$file['rel_path'] = str_replace($this->dir.'/', '', $id);
 		$file['hsize'] = egw_vfs::hsize($file['size']);
 		$file['mime'] = egw_vfs::mime_content_type($id);
-		$file['gid'] *= -1;  // our widgets use negative gid's
+		$file['gid'] *= -1; // our widgets use negative gid's
 		if (($props = egw_vfs::propfind($id)))
 		{
-			foreach($props as $prop)
+			foreach ($props as $prop)
 			{
 				$file[$prop['name']] = $prop['val'];
 			}
@@ -118,22 +118,22 @@ 
 			$file['symlink'] = egw_vfs::readlink($id);
 		}
 		// Custom fields
-		if($content && strpos($content, '#') !== 0)
+		if ($content && strpos($content, '#') !== 0)
                 {
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
-			foreach(config::get_customfields('filemanager') as $name => $field)
+			foreach (config::get_customfields('filemanager') as $name => $field)
 			{
 				// Set any missing custom fields, or the marker will stay
-				if(!$file['#'.$name])
+				if (!$file['#'.$name])
 				{
 					$file['#'.$name] = '';
 					continue;
 				}
 
 				// Format date cfs per user preferences
-				if($field['type'] == 'date' || $field['type'] == 'date-time')
+				if ($field['type'] == 'date' || $field['type'] == 'date-time')
 				{
 					$this->date_fields[] = '#'.$name;
 					$file['#'.$name] = egw_time::to($file['#'.$name], $field['type'] == 'date' ? true : '');
@@ -142,51 +142,51 @@ 
 		}
 
 		// If in apps folder, try for app-specific placeholders
-		if($dirlist[1] == 'apps' && count($dirlist) > 1)
+		if ($dirlist[1] == 'apps' && count($dirlist) > 1)
 		{
 			// Try this first - a normal path /apps/appname/id/file
-			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
+			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/') + 5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
-				$resolved = egw_vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
-				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+				$resolved = egw_vfs::resolve_url_symlinks(implode('/', array_slice(explode('/', $file['dir']), 0, 4)));
+				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = egw_vfs::resolve_url_symlinks($file['path']);
-					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 				}
 			}
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				if($app && $GLOBALS['egw_info']['user']['apps'][$app])
+				if ($app && $GLOBALS['egw_info']['user']['apps'][$app])
 				{
 					$app_merge = null;
 					try
 					{
-						$classname = $app .'_merge';
-						if(class_exists($classname))
+						$classname = $app.'_merge';
+						if (class_exists($classname))
 						{
 							$app_merge = new $classname();
-							if($app_merge && method_exists($app_merge, 'get_replacements'))
+							if ($app_merge && method_exists($app_merge, 'get_replacements'))
 							{
 								$app_placeholders = $app_merge->get_replacements($app_id, $content);
 							}
 						}
 					}
 					// Silently discard & continue
-					catch(Exception $e) {
-						unset($e);	// not used
+					catch (Exception $e) {
+						unset($e); // not used
 					}
 				}
 			}
 		}
 		$link = egw_link::mime_open($file['url'], $file['mime']);
-		if(is_array($link))
+		if (is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if ($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
 			$link = egw_session::link('/index.php', $link);
 		}
 		else
@@ -205,12 +205,12 @@ 
 		$file['url'] = $link;
 
 		// Add markers
-		foreach($file as $key => &$value)
+		foreach ($file as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
-		if($app_placeholders)
+		if ($app_placeholders)
 		{
 			$info = array_merge($app_placeholders, $info);
 		}
@@ -246,7 +246,7 @@ 
 			'hsize' => 'Size',
 			'size' => 'Size (in bytes)',
 		);
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
 			if (!($n&1)) echo '<tr>';
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
@@ -255,7 +255,7 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach(config::get_customfields('filemanager') as $name => $field)
+		foreach (config::get_customfields('filemanager') as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -264,7 +264,7 @@ 
 		echo '<tr><td colspan="4">'.lang('For files linked to an application entry (inside /apps/appname/id/) the placeholders for that application are also available.  See the specific application for a list of available placeholders.').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),

calendar/sitemgr/class.module_calendar.inc.php

Spacing +3 added lines, -3 removed lines

@@ -27,12 +27,12 @@
 		$this->description = lang('This module displays the current month');
  	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
-		$date = (int) (strtotime(get_var('date',array('POST','GET'))));
+		$date = (int)(strtotime(get_var('date', array('POST', 'GET'))));
 		$redirect = $arguments['redirect'] ? $arguments['redirect'] : '#';
 
 		return $GLOBALS['egw']->jscalendar->get_javascript().
-			$GLOBALS['egw']->jscalendar->flat($redirect,$date);
+			$GLOBALS['egw']->jscalendar->flat($redirect, $date);
 	}
 }

Braces +2 added lines, -2 removed lines

@@ -12,9 +12,9 @@
 /**
  * Calendar day selection for sitemgr
  */
-class module_calendar extends Module 
+class module_calendar extends Module
 {
-	function module_calendar()  
+	function module_calendar()
 	{
 		$this->arguments = array(
 			'redirect' => array(

calendar/setup/setup.inc.php

Spacing +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 $setup_info['calendar']['enable']  = 1;
 $setup_info['calendar']['index']   = 'calendar.calendar_uiviews.index&ajax=true';
 
-$setup_info['calendar']['license']  = 'GPL';
+$setup_info['calendar']['license'] = 'GPL';
 $setup_info['calendar']['description'] =
 	'Powerful group calendar with meeting request system and ACL security.';
 $setup_info['calendar']['note'] =

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

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

calendar/setup/tables_update.inc.php

Indentation +1 added lines, -1 removed lines

@@ -1909,7 +1909,7 @@
 			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
 	}
 
-    $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
 			WHERE recur_interval=0',__LINE__,__FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';

Braces +12 added lines, -3 removed lines

@@ -1429,13 +1429,18 @@ 
 function calendar_upgrade1_0_1_008()
 {
 	$config_data = Api\Config::read('calendar');
-	if (isset($config_data['fields']))	// old custom fields
+	if (isset($config_data['fields']))
+	{
+		// old custom fields
 	{
 		$customfields = array();
+	}
 		$order = 0;
 		foreach($config_data['fields'] as $name => $data)
 		{
-			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
+			if ($name{0} == '#' && !$data['disabled'])
+			{
+				// real not-disabled custom field
 			{
 				$customfields[substr($name,1)] = array(
 					'type'  => 'text',
@@ -1444,6 +1449,7 @@ 
 					'order' => ($order += 10),
 				);
 			}
+			}
 		}
 		if (count($customfields))
 		{
@@ -2589,9 +2595,12 @@ 
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
 			$email.'='.$GLOBALS['egw_setup']->db->quote($row['email']),
-		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
+		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)
+		{
+			// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
+		}
 			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))));
 		}
 	}

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

@@ -32,7 +32,7 @@ 
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
-			$GLOBALS['egw_setup']->oProc->query("UPDATE $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
+			$GLOBALS['egw_setup']->oProc->query("update $table SET $field=".$GLOBALS['egw_setup']->oProc->f('account_id')." WHERE $field='".$owner[$i]."'");
 		}
 	}
 	$GLOBALS['egw_setup']->oProc->AlterColumn($table, $field, array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => 0));
@@ -188,7 +188,7 @@ 
 	$db2 = clone($GLOBALS['egw_setup']->db);
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto', 'nullable' => false),
 				'cal_owner' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -238,7 +238,7 @@ 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry');
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_user',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
 				'cal_login' => array('type' => 'int', 'precision' => 4, 'nullable' => false, 'default' => '0'),
@@ -268,7 +268,7 @@ 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_user');
 
 	$GLOBALS['egw_setup']->oProc->CreateTable('calendar_entry_repeats',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 4, 'default' => '0', 'nullable' => false),
 				'cal_type' => array('type' => 'varchar', 'precision' => 20, 'default' => 'daily', 'nullable' => false),
@@ -310,7 +310,7 @@ 
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("update {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -602,7 +602,7 @@ 
 
 // calendar_entry => phpgw_cal
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'auto', 'nullable' => False),
 				'owner' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -658,7 +658,7 @@ 
 
 // calendar_entry_repeats => phpgw_cal_repeats
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
-		Array(
+		array(
 			'fd' => array(
 				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
 				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
@@ -731,7 +731,7 @@ 
 function calendar_upgrade0_9_11_003()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-		Array(
+		array(
 			'fd' => array(
 				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
 				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
@@ -767,7 +767,7 @@ 
 {
 	$GLOBALS['egw_setup']->oProc->DropTable('phpgw_cal_holidays');
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
-		Array(
+		array(
 			'fd' => array(
 				'hol_id' => array('type' => 'auto','nullable' => False),
 				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
@@ -854,7 +854,7 @@ 
 function calendar_upgrade0_9_13_003()
 {
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
-		Array(
+		array(
 			'fd' => array(
 				'alarm_id' => array('type' => 'auto','nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -888,7 +888,7 @@ 
 
 function calendar_upgrade0_9_13_005()
 {
-	$calendar_data = Array();
+	$calendar_data = array();
 	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
 	while($GLOBALS['egw_setup']->oProc->next_record())
 	{

Doc Comments +3 added lines, -1 removed lines

@@ -7,6 +7,8 @@ 
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
+ * @param string $table
+ * @param string $field
  */
 
 function calendar_v0_9_2to0_9_3update_owner($table, $field)
@@ -2304,7 +2306,7 @@ 
  *
  * Also fix recurring events containing a reference to an other master, created when an exception is made a recurring event.
  *
- * @return type
+ * @return string
  */
 function calendar_upgrade14_1()
 {

Spacing +430 added lines, -430 removed lines

@@ -18,7 +18,7 @@ 
 		{
 			$owner[count($owner)] = $GLOBALS['egw_setup']->oProc->f($field);
 		}
-		if($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.10pre4'))
+		if ($GLOBALS['egw_setup']->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'], '0.9.10pre4'))
 		{
 			$acctstbl = 'accounts';
 		}
@@ -26,7 +26,7 @@ 
 		{
 			$acctstbl = 'phpgw_accounts';
 		}
-		for($i=0;$i<count($owner);$i++)
+		for ($i = 0; $i < count($owner); $i++)
 		{
 			$GLOBALS['egw_setup']->oProc->query("SELECT account_id FROM $acctstbl WHERE account_lid='".$owner[$i]."'");
 			$GLOBALS['egw_setup']->oProc->next_record();
@@ -39,8 +39,8 @@ 
 
 function calendar_upgrade0_9_3pre1()
 {
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry','cal_create_by');
-	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user','cal_login');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry', 'cal_create_by');
+	calendar_v0_9_2to0_9_3update_owner('webcal_entry_user', 'cal_login');
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.3pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
 }
@@ -207,12 +207,12 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_owner,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description,cal_id,cal_date,cal_time,cal_mod_date,cal_mod_time FROM webcal_entry ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
@@ -222,13 +222,13 @@ 
 			$cal_access = $GLOBALS['egw_setup']->oProc->f('cal_access');
 			$cal_name = $GLOBALS['egw_setup']->oProc->f('cal_name');
 			$cal_description = $GLOBALS['egw_setup']->oProc->f('cal_description');
-			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'),0,4)));
-			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),4))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),2,2))),intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')),0,2))),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'),0,4)));
-			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$datetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_date'), 0, 4)));
+			$moddatetime = mktime(intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 4))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 2, 2))), intval(strrev(substr(strrev($GLOBALS['egw_setup']->oProc->f('cal_mod_time')), 0, 2))), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_mod_date'), 0, 4)));
+			$db2->query('SELECT groups FROM webcal_entry_groups WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 			$db2->next_record();
 			$cal_group = $db2->f('groups');
 			$db2->query('INSERT INTO calendar_entry(cal_id,cal_owner,cal_group,cal_datetime,cal_mdatetime,cal_duration,cal_priority,cal_type,cal_access,cal_name,cal_description) '
-				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')",__LINE__,__FILE__);
+				.'VALUES('.$cal_id.",'".$cal_owner."','".$cal_group."',".$datetime.",".$moddatetime.",".$cal_duration.",".$cal_priority.",'".$cal_type."','".$cal_access."','".$cal_name."','".$cal_description."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -249,17 +249,17 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_user', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_login,cal_status FROM webcal_entry_user ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_login = $GLOBALS['egw_setup']->oProc->f('cal_login');
 			$cal_status = $GLOBALS['egw_setup']->oProc->f('cal_status');
-			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_user(cal_id,cal_login,cal_status) VALUES('.$cal_id.','.$cal_login.",'".$cal_status."')", __LINE__, __FILE__);
 		}
 	}
 
@@ -282,18 +282,18 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query('SELECT count(*) FROM webcal_entry_repeats', __LINE__, __FILE__);
 	$GLOBALS['egw_setup']->oProc->next_record();
-	if($GLOBALS['egw_setup']->oProc->f(0))
+	if ($GLOBALS['egw_setup']->oProc->f(0))
 	{
-		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id',__LINE__,__FILE__);
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_type,cal_end,cal_frequency,cal_days FROM webcal_entry_repeats ORDER BY cal_id', __LINE__, __FILE__);
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$cal_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-			if(isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
+			if (isset($GLOBALS['egw_setup']->oProc->Record['cal_end']))
 			{
-				$enddate = mktime(0,0,0,intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),4,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),6,2)),intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'),0,4)));
+				$enddate = mktime(0, 0, 0, intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 4, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 6, 2)), intval(substr($GLOBALS['egw_setup']->oProc->f('cal_end'), 0, 4)));
 				$useend = 1;
 			}
 			else
@@ -303,12 +303,12 @@ 
 			}
 			$cal_frequency = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 			$cal_days = $GLOBALS['egw_setup']->oProc->f('cal_days');
-			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')",__LINE__,__FILE__);
+			$db2->query('INSERT INTO calendar_entry_repeats(cal_id,cal_type,cal_use_end,cal_end,cal_frequency,cal_days) VALUES('.$cal_id.",'".$cal_type."',".$useend.",".$enddate.",".$cal_frequency.",'".$cal_days."')", __LINE__, __FILE__);
 		}
 	}
 
 	$GLOBALS['egw_setup']->oProc->DropTable('webcal_entry_repeats');
-	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("UPDATE {$GLOBALS['egw_setup']->applications_table} SET app_tables='calendar_entry,calendar_entry_user,calendar_entry_repeats' WHERE app_name='calendar'", __LINE__, __FILE__);
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.7pre2';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -320,19 +320,19 @@ 
 	$db2 = $GLOBALS['egw_setup']->db;
 
 	$GLOBALS['egw_setup']->oProc->RenameColumn('calendar_entry', 'cal_duration', 'cal_edatetime');
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id',__LINE__,__FILE__);
-	if($GLOBALS['egw_setup']->oProc->num_rows())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id,cal_datetime,cal_owner,cal_edatetime,cal_mdatetime FROM calendar_entry ORDER BY cal_id', __LINE__, __FILE__);
+	if ($GLOBALS['egw_setup']->oProc->num_rows())
 	{
-		while($GLOBALS['egw_setup']->oProc->next_record())
+		while ($GLOBALS['egw_setup']->oProc->next_record())
 		{
-			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'),__LINE__,__FILE__);
+			$db2->query("SELECT preference_value FROM preferences WHERE preference_name='tz_offset' AND preference_appname='common' AND preference_owner=".$GLOBALS['egw_setup']->db->f('cal_owner'), __LINE__, __FILE__);
 			$db2->next_record();
 			$tz = $db2->f('preference_value');
 			$cal_id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 			$datetime = $GLOBALS['egw_setup']->oProc->f('cal_datetime') - ((60 * 60) * $tz);
 			$mdatetime = $GLOBALS['egw_setup']->oProc->f('cal_mdatetime') - ((60 * 60) * $tz);
 			$edatetime = $datetime + (60 * $GLOBALS['egw_setup']->oProc->f('cal_edatetime'));
-			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id,__LINE__,__FILE__);
+			$db2->query('UPDATE calendar_entry SET cal_datetime='.$datetime.', cal_edatetime='.$edatetime.', cal_mdatetime='.$mdatetime.' WHERE cal_id='.$cal_id, __LINE__, __FILE__);
 		}
 	}
 
@@ -580,22 +580,22 @@ 
 {
 	$db2 = $GLOBALS['egw_setup']->db;
 
-	if(extension_loaded('mcal') == False)
+	if (extension_loaded('mcal') == False)
 	{
-		define(RECUR_NONE,0);
-		define(RECUR_DAILY,1);
-		define(RECUR_WEEKLY,2);
-		define(RECUR_MONTHLY_MDAY,3);
-		define(RECUR_MONTHLY_WDAY,4);
-		define(RECUR_YEARLY,5);
-
-		define(M_SUNDAY,1);
-		define(M_MONDAY,2);
-		define(M_TUESDAY,4);
-		define(M_WEDNESDAY,8);
-		define(M_THURSDAY,16);
-		define(M_FRIDAY,32);
-		define(M_SATURDAY,64);
+		define(RECUR_NONE, 0);
+		define(RECUR_DAILY, 1);
+		define(RECUR_WEEKLY, 2);
+		define(RECUR_MONTHLY_MDAY, 3);
+		define(RECUR_MONTHLY_WDAY, 4);
+		define(RECUR_YEARLY, 5);
+
+		define(M_SUNDAY, 1);
+		define(M_MONDAY, 2);
+		define(M_TUESDAY, 4);
+		define(M_WEDNESDAY, 8);
+		define(M_THURSDAY, 16);
+		define(M_FRIDAY, 32);
+		define(M_SATURDAY, 64);
 	}
 
 // calendar_entry => phpgw_cal
@@ -622,13 +622,13 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$owner = $GLOBALS['egw_setup']->oProc->f('cal_owner');
 		$access = $GLOBALS['egw_setup']->oProc->f('cal_access');
-		switch($access)
+		switch ($access)
 		{
 			case 'private':
 				$is_public = 0;
@@ -650,7 +650,7 @@ 
 		$description = $GLOBALS['egw_setup']->oProc->f('cal_description');
 
 		$db2->query("INSERT INTO phpgw_cal(cal_id,owner,groups,datetime,mdatetime,edatetime,priority,cal_type,is_public,title,description) "
-			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')",__LINE__,__FILE__);
+			. "VALUES($id,$owner,'$groups',$datetime,$mdatetime,$edatetime,$priority,'$type',$is_public,'$title','$description')", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry');
 
@@ -658,12 +658,12 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_repeats',
 		Array(
 			'fd' => array(
-				'cal_id' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_type' => array('type' => 'int', 'precision' => 8,'nullable' => False),
-				'recur_use_end' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_enddate' => array('type' => 'int', 'precision' => 8,'nullable' => True),
-				'recur_interval' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1'),
-				'recur_data' => array('type' => 'int', 'precision' => 8,'nullable' => True,'default' => '1')
+				'cal_id' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_type' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
+				'recur_use_end' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_enddate' => array('type' => 'int', 'precision' => 8, 'nullable' => True),
+				'recur_interval' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1'),
+				'recur_data' => array('type' => 'int', 'precision' => 8, 'nullable' => True, 'default' => '1')
 			),
 			'pk' => array(),
 			'fk' => array(),
@@ -671,12 +671,12 @@ 
 			'uc' => array()
 		)
 	);
-	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT * FROM calendar_entry_repeats', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$id = $GLOBALS['egw_setup']->oProc->f('cal_id');
 		$recur_type = $GLOBALS['egw_setup']->oProc->f('cal_type');
-		switch($recur_type)
+		switch ($recur_type)
 		{
 			case 'daily':
 				$recur_type_num = RECUR_DAILY;
@@ -699,20 +699,20 @@ 
 		$recur_interval = $GLOBALS['egw_setup']->oProc->f('cal_frequency');
 		$days = strtoupper($GLOBALS['egw_setup']->oProc->f('cal_days'));
 		$recur_data = 0;
-		$recur_data += (substr($days,0,1)=='Y'?M_SUNDAY:0);
-		$recur_data += (substr($days,1,1)=='Y'?M_MONDAY:0);
-		$recur_data += (substr($days,2,1)=='Y'?M_TUESDAY:0);
-		$recur_data += (substr($days,3,1)=='Y'?M_WEDNESDAY:0);
-		$recur_data += (substr($days,4,1)=='Y'?M_THURSDAY:0);
-		$recur_data += (substr($days,5,1)=='Y'?M_FRIDAY:0);
-		$recur_data += (substr($days,6,1)=='Y'?M_SATURDAY:0);
+		$recur_data += (substr($days, 0, 1) == 'Y' ? M_SUNDAY : 0);
+		$recur_data += (substr($days, 1, 1) == 'Y' ? M_MONDAY : 0);
+		$recur_data += (substr($days, 2, 1) == 'Y' ? M_TUESDAY : 0);
+		$recur_data += (substr($days, 3, 1) == 'Y' ? M_WEDNESDAY : 0);
+		$recur_data += (substr($days, 4, 1) == 'Y' ? M_THURSDAY : 0);
+		$recur_data += (substr($days, 5, 1) == 'Y' ? M_FRIDAY : 0);
+		$recur_data += (substr($days, 6, 1) == 'Y' ? M_SATURDAY : 0);
 		$db2->query("INSERT INTO phpgw_cal_repeats(cal_id,recur_type,recur_use_end,recur_enddate,recur_interval,recur_data) "
-			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)",__LINE__,__FILE__);
+			. "VALUES($id,$recur_type_num,$recur_use_end,$recur_end,$recur_interval,$recur_data)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->oProc->DropTable('calendar_entry_repeats');
 
 // calendar_entry_user => phpgw_cal_user
-	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user','phpgw_cal_user');
+	$GLOBALS['egw_setup']->oProc->RenameTable('calendar_entry_user', 'phpgw_cal_user');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -731,11 +731,11 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
-			'pk' => array('locale','name'),
+			'pk' => array('locale', 'name'),
 			'fk' => array(),
 			'ix' => array(),
 			'uc' => array()
@@ -767,10 +767,10 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_holidays',
 		Array(
 			'fd' => array(
-				'hol_id' => array('type' => 'auto','nullable' => False),
-				'locale' => array('type' => 'char', 'precision' => 2,'nullable' => False),
-				'name' => array('type' => 'varchar', 'precision' => 50,'nullable' => False),
-				'date_time' => array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0')
+				'hol_id' => array('type' => 'auto', 'nullable' => False),
+				'locale' => array('type' => 'char', 'precision' => 2, 'nullable' => False),
+				'name' => array('type' => 'varchar', 'precision' => 50, 'nullable' => False),
+				'date_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0')
 			),
 			'pk' => array('hol_id'),
 			'fk' => array(),
@@ -787,10 +787,10 @@ 
 function calendar_upgrade0_9_11_007()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','mday',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','month_num',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','occurence',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','dow',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'mday', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'month_num', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'occurence', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'dow', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.008';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -807,7 +807,7 @@ 
 function calendar_upgrade0_9_11_009()
 {
 	$GLOBALS['egw_setup']->oProc->query('DELETE FROM phpgw_cal_holidays');
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays','observance_rule',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_holidays', 'observance_rule', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.11.010';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -842,7 +842,7 @@ 
 
 function calendar_upgrade0_9_13_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','reference',array('type' => 'int', 'precision' => 8,'nullable' => False, 'default' => '0'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'reference', array('type' => 'int', 'precision' => 8, 'nullable' => False, 'default' => '0'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -854,7 +854,7 @@ 
 	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_alarm',
 		Array(
 			'fd' => array(
-				'alarm_id' => array('type' => 'auto','nullable' => False),
+				'alarm_id' => array('type' => 'auto', 'nullable' => False),
 				'cal_id'   => array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_owner'	=> array('type' => 'int', 'precision' => 8, 'nullable' => False),
 				'cal_time' => array('type' => 'int', 'precision' => 8, 'nullable' => False),
@@ -867,8 +867,8 @@ 
 		)
 	);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','uid',array('type' => 'varchar', 'precision' => 255,'nullable' => False));
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal','location',array('type' => 'varchar', 'precision' => 255,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'uid', array('type' => 'varchar', 'precision' => 255, 'nullable' => False));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal', 'location', array('type' => 'varchar', 'precision' => 255, 'nullable' => True));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.004';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -877,7 +877,7 @@ 
 
 function calendar_upgrade0_9_13_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm','alarm_enabled',array('type' => 'int', 'precision' => 4,'nullable' => False, 'default' => '1'));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_alarm', 'alarm_enabled', array('type' => 'int', 'precision' => 4, 'nullable' => False, 'default' => '1'));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.005';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -887,18 +887,18 @@ 
 function calendar_upgrade0_9_13_005()
 {
 	$calendar_data = Array();
-	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal',__LINE__,__FILE__);
-	while($GLOBALS['egw_setup']->oProc->next_record())
+	$GLOBALS['egw_setup']->oProc->query('SELECT cal_id, category FROM phpgw_cal', __LINE__, __FILE__);
+	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$calendar_data[$GLOBALS['egw_setup']->oProc->f('cal_id')] = $GLOBALS['egw_setup']->oProc->f('category');
 	}
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','category',array('type' => 'varchar', 'precision' => 30,'nullable' => True));
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'category', array('type' => 'varchar', 'precision' => 30, 'nullable' => True));
 
 	@reset($calendar_data);
-	while($calendar_data && list($cal_id,$category) = each($calendar_data))
+	while ($calendar_data && list($cal_id, $category) = each($calendar_data))
 	{
-		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->oProc->query("UPDATE phpgw_cal SET category='".$category."' WHERE cal_id=".$cal_id, __LINE__, __FILE__);
 	}
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.006';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -907,7 +907,7 @@ 
 
 function calendar_upgrade0_9_13_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats','recur_exception',array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_repeats', 'recur_exception', array('type' => 'varchar', 'precision' => 255, 'nullable' => True, 'default' => ''));
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '0.9.13.007';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -917,20 +917,20 @@ 
 
 function calendar_upgrade0_9_13_007()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('phpgw_cal_extra', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'cal_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_extra_name' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False),
+			'cal_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('cal_id','cal_extra_name'),
+		'pk' => array('cal_id', 'cal_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -947,7 +947,7 @@ 
 function calendar_upgrade0_9_16_001()
 {
 	// this is to set the default as schema_proc was not setting an empty default
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user','cal_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal_user', 'cal_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
@@ -964,15 +964,15 @@ 
 
 function calendar_upgrade0_9_16_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array(),
 		'fk' => array(),
@@ -988,14 +988,14 @@ 
 
 function calendar_upgrade0_9_16_003()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_login' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A'),
-			'cal_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_login' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u')
 		),
-		'pk' => array('cal_id','cal_login','cal_type'),
+		'pk' => array('cal_id', 'cal_login', 'cal_type'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1009,16 +1009,16 @@ 
 
 function calendar_upgrade0_9_16_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_holidays', array(
 		'fd' => array(
-			'hol_id' => array('type' => 'auto','nullable' => False),
-			'locale' => array('type' => 'char','precision' => '2','nullable' => False),
-			'name' => array('type' => 'varchar','precision' => '50','nullable' => False),
-			'mday' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'month_num' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'occurence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'dow' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'observance_rule' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'hol_id' => array('type' => 'auto', 'nullable' => False),
+			'locale' => array('type' => 'char', 'precision' => '2', 'nullable' => False),
+			'name' => array('type' => 'varchar', 'precision' => '50', 'nullable' => False),
+			'mday' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'month_num' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'occurence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'dow' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'observance_rule' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('hol_id'),
 		'fk' => array(),
@@ -1036,13 +1036,13 @@ 
 {
 	// creates uid's for all entries which do not have unique ones, they are '-@domain.com'
 	// very old entries even have an empty uid, see 0.9.16.006 update
-	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->oProc->query("SELECT config_name,config_value FROM {$GLOBALS['egw_setup']->config_table} WHERE config_name IN ('install_id','mail_suffix') AND config_app='phpgwapi'", __LINE__, __FILE__);
 	while ($GLOBALS['egw_setup']->oProc->next_record())
 	{
 		$config[$GLOBALS['egw_setup']->oProc->f(0)] = $GLOBALS['egw_setup']->oProc->f(1);
 	}
 	$GLOBALS['egw_setup']->oProc->query('UPDATE phpgw_cal SET uid='.
-		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'),'cal_id',
+		$GLOBALS['egw_setup']->db->concat($GLOBALS['egw_setup']->db->quote('cal-'), 'cal_id',
 			$GLOBALS['egw_setup']->db->quote('-'.$config['install_id'].'@'.
 			($config['mail_suffix'] ? $config['mail_suffix'] : 'local'))).
 		" WHERE uid LIKE '-@%' OR uid=''");
@@ -1065,7 +1065,7 @@ 
 function calendar_upgrade0_9_16_007()
 {
 	// update the sequenzes for refreshed tables (postgres only)
-	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays','hol_id');
+	$GLOBALS['egw_setup']->oProc->UpdateSequence('phpgw_cal_holidays', 'hol_id');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1075,19 +1075,19 @@ 
 
 function calendar_upgrade1_0_0()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','uid','cal_uid');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','owner','cal_owner');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','category','cal_category');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','groups','cal_groups');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','datetime','cal_starttime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','mdatetime','cal_modified');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','edatetime','cal_endtime');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','priority','cal_priority');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','is_public','cal_public');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','title','cal_title');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','description','cal_description');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','location','cal_location');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal','reference','cal_reference');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'uid', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'owner', 'cal_owner');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'category', 'cal_category');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'groups', 'cal_groups');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'datetime', 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'mdatetime', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'edatetime', 'cal_endtime');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'priority', 'cal_priority');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'is_public', 'cal_public');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'title', 'cal_title');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'description', 'cal_description');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'location', 'cal_location');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal', 'reference', 'cal_reference');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1097,13 +1097,13 @@ 
 
 function calendar_upgrade1_0_0_001()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','locale','hol_locale');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','name','hol_name');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','mday','hol_mday');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','month_num','hol_month_num');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','occurence','hol_occurence');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','dow','hol_dow');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays','observance_rule','hol_observance_rule');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'locale', 'hol_locale');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'name', 'hol_name');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'mday', 'hol_mday');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'month_num', 'hol_month_num');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'occurence', 'hol_occurence');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'dow', 'hol_dow');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_holidays', 'observance_rule', 'hol_observance_rule');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.002';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1113,8 +1113,8 @@ 
 
 function calendar_upgrade1_0_0_002()
 {
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_login','cal_user_id');
-	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user','cal_type','cal_user_type');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_login', 'cal_user_id');
+	$GLOBALS['egw_setup']->oProc->RenameColumn('phpgw_cal_user', 'cal_type', 'cal_user_type');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.0.003';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1124,7 +1124,7 @@ 
 
 function calendar_upgrade1_0_0_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('phpgw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -1139,15 +1139,15 @@ 
 
 function calendar_upgrade1_0_0_004()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('phpgw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_use_end' => array('type' => 'int','precision' => '8','default' => '0'),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_use_end' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -1164,19 +1164,19 @@ 
 function calendar_upgrade1_0_0_005()
 {
 	// change prefix of all calendar tables to egw_
-	foreach(array('cal_user','cal_repeats','cal_extra','cal_holidays','cal') as $name)
+	foreach (array('cal_user', 'cal_repeats', 'cal_extra', 'cal_holidays', 'cal') as $name)
 	{
-		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name,'egw_'.$name);
+		$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_'.$name, 'egw_'.$name);
 	}
 
 	// create new dates table, with content from the egw_cal table
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_dates', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_start' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_end' => array('type' => 'int','precision' => '8','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_start' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_end' => array('type' => 'int', 'precision' => '8', 'nullable' => False)
 		),
-		'pk' => array('cal_id','cal_start'),
+		'pk' => array('cal_id', 'cal_start'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1184,49 +1184,49 @@ 
 	$GLOBALS['egw_setup']->oProc->query("INSERT INTO egw_cal_dates SELECT cal_id,cal_starttime,cal_endtime FROM egw_cal");
 
 	// drop the fields transfered to the dates table
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_endtime' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_endtime' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_starttime');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_starttime');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_type' => array('type' => 'varchar','precision' => '10'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_type' => array('type' => 'varchar', 'precision' => '10'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_endtime');
+	), 'cal_endtime');
 
 	$GLOBALS['setup_info']['calendar']['currentver'] = '1.0.1.001';
 	return $GLOBALS['setup_info']['calendar']['currentver'];
@@ -1242,15 +1242,15 @@ 
 		'precision' => '8',
 		'default' => '0'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_recur_date' => array('type' => 'int','precision' => '8','default' => '0'),
-			'cal_user_type' => array('type' => 'varchar','precision' => '1','nullable' => False,'default' => 'u'),
-			'cal_user_id' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_status' => array('type' => 'char','precision' => '1','default' => 'A')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_recur_date' => array('type' => 'int', 'precision' => '8', 'default' => '0'),
+			'cal_user_type' => array('type' => 'varchar', 'precision' => '1', 'nullable' => False, 'default' => 'u'),
+			'cal_user_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_status' => array('type' => 'char', 'precision' => '1', 'default' => 'A')
 		),
-		'pk' => array('cal_id','cal_recur_date','cal_user_type','cal_user_id'),
+		'pk' => array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -1264,50 +1264,50 @@ 
 
 function calendar_upgrade1_0_1_002()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '8','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_groups' => array('type' => 'varchar','precision' => '255'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_groups' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_type');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_owner',array(
+	), 'cal_type');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_owner', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_priority',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_priority', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '2'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_public',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_public', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False,
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_reference',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_reference', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_modifier', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
@@ -1320,36 +1320,36 @@ 
 
 function calendar_upgrade1_0_1_003()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '8','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '8','default' => '1'),
-			'recur_exception' => array('type' => 'varchar','precision' => '255','default' => '')
+			'cal_id' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '8', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '8', 'default' => '1'),
+			'recur_exception' => array('type' => 'varchar', 'precision' => '255', 'default' => '')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_use_end');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','cal_id',array(
+	), 'recur_use_end');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_type', array(
 		'type' => 'int',
 		'precision' => '2',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_interval',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_interval', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_data',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_data', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '1'
@@ -1363,13 +1363,13 @@ 
 
 function calendar_upgrade1_0_1_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
@@ -1384,7 +1384,7 @@ 
 
 function calendar_upgrade1_0_1_005()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1'
@@ -1398,7 +1398,7 @@ 
 
 function calendar_upgrade1_0_1_006()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_non_blocking',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_non_blocking', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1412,9 +1412,9 @@ 
 
 function calendar_upgrade1_0_1_007()
 {
-	$GLOBALS['egw_setup']->db->update('egw_cal_repeats',array('recur_exception' => null),array('recur_exception' => ''),__LINE__,__FILE__,'calendar');
+	$GLOBALS['egw_setup']->db->update('egw_cal_repeats', array('recur_exception' => null), array('recur_exception' => ''), __LINE__, __FILE__, 'calendar');
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_repeats', 'recur_exception', array(
 		'type' => 'text'
 	));
 
@@ -1431,11 +1431,11 @@ 
 	{
 		$customfields = array();
 		$order = 0;
-		foreach($config_data['fields'] as $name => $data)
+		foreach ($config_data['fields'] as $name => $data)
 		{
 			if ($name{0} == '#' && !$data['disabled'])	// real not-disabled custom field
 			{
-				$customfields[substr($name,1)] = array(
+				$customfields[substr($name, 1)] = array(
 					'type'  => 'text',
 					'len'   => $data['length'].($data['shown'] ? ','.$data['shown'] : ''),
 					'label' => $data['name'],
@@ -1458,38 +1458,38 @@ 
 function calendar_upgrade1_0_1_009()
 {
 	$db2 = clone($GLOBALS['egw_setup']->db);
-	$GLOBALS['egw_setup']->db->select('egw_cal','DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date',"cal_groups != ''",__LINE__,__FILE__,
-		False,'','calendar',0,',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
-	while(($row = $GLOBALS['egw_setup']->db->row(true)))
+	$GLOBALS['egw_setup']->db->select('egw_cal', 'DISTINCT egw_cal.cal_id,cal_groups,cal_recur_date', "cal_groups != ''", __LINE__, __FILE__,
+		False, '', 'calendar', 0, ',egw_cal_user WHERE egw_cal.cal_id=egw_cal_user.cal_id');
+	while (($row = $GLOBALS['egw_setup']->db->row(true)))
 	{
 		$row['cal_user_type'] = 'u';
-		foreach(explode(',',$row['cal_groups']) as $group)
+		foreach (explode(',', $row['cal_groups']) as $group)
 		{
 			$row['cal_user_id'] = $group;
-			$db2->insert('egw_cal_user',array('cal_status' => 'U'),$row,__LINE__,__FILE__,'calendar');
+			$db2->insert('egw_cal_user', array('cal_status' => 'U'), $row, __LINE__, __FILE__, 'calendar');
 		}
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_groups');
+	), 'cal_groups');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2';
 }
@@ -1499,7 +1499,7 @@ 
 function calendar_upgrade1_2()
 {
 	// get old alarms (saved before 1.2) working again
-	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'",__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query("UPDATE egw_async SET async_method ='calendar.bocalupdate.send_alarm' WHERE async_method ='calendar.bocalendar.send_alarm'", __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.2.001';
 }
@@ -1507,7 +1507,7 @@ 
 
 function calendar_upgrade1_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_special',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_special', array(
 		'type' => 'int',
 		'precision' => '2',
 		'default' => '0'
@@ -1525,7 +1525,7 @@ 
 
 function calendar_upgrade1_4()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_etag',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -1537,59 +1537,59 @@ 
 
 function calendar_upgrade1_5()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4'),
-			'cal_edit_time' => array('type' => 'int','precision' => '8')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4'),
+			'cal_edit_time' => array('type' => 'int', 'precision' => '8')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_user');
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal',array(
+	), 'cal_edit_user');
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_category' => array('type' => 'varchar','precision' => '30'),
-			'cal_modified' => array('type' => 'int','precision' => '8'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0'),
-			'cal_modifier' => array('type' => 'int','precision' => '4'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'cal_edit_time');
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_etag',array(
+	), 'cal_edit_time');
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_etag', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL',__LINE__,__FILE__);
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_etag=0 WHERE cal_etag IS NULL', __LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.5.001';
 }
@@ -1597,12 +1597,12 @@ 
 
 function calendar_upgrade1_5_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False
@@ -1616,12 +1616,12 @@ 
 {
 	// update the alarm methods
 	$async = new asyncservice();
-	foreach((array)$async->read('cal:%') as $job)
+	foreach ((array)$async->read('cal:%') as $job)
 	{
 		if ($job['method'] == 'calendar.bocalupdate.send_alarm')
 		{
 			$job['method'] = 'calendar.calendar_boupdate.send_alarm';
-			$async->write($job,true);
+			$async->write($job, true);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.6';
@@ -1638,48 +1638,48 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag, cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
 	// Search series exception for nearest exception in series master and add that RECURRENCE-ID
 	// as cal_reference (for 1.6.003 and move it to new field cal_recurrence in 1.7.001)
 	$diff = null;
-	foreach($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT egw_cal.cal_id,cal_start,recur_exception FROM egw_cal
 		JOIN egw_cal_dates ON egw_cal.cal_id=egw_cal_dates.cal_id
 		JOIN egw_cal_repeats ON cal_reference=egw_cal_repeats.cal_id
-		WHERE cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		$recurrence = null;
-		foreach(explode(',',$row['recur_exception']) as $ts)
+		foreach (explode(',', $row['recur_exception']) as $ts)
 		{
-			if (is_null($recurrence) || abs($ts-$row['cal_start']) < $diff)
+			if (is_null($recurrence) || abs($ts - $row['cal_start']) < $diff)
 			{
 				$recurrence = $ts;
-				$diff = abs($ts-$row['cal_start']);
+				$diff = abs($ts - $row['cal_start']);
 			}
 		}
 		if ($recurrence)
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$recurrence.
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 		else
 		{
 			// if we cannot determine the RECURRENCE-ID use cal_start
 			// because RECURRENCE-ID must be present
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_reference='.(int)$row['cal_start'].
-				' WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				' WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 
@@ -1694,33 +1694,33 @@ 
  */
 function calendar_upgrade1_6_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'creating user'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_creator',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_creator=cal_owner', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_creator', array(
 		'type' => 'int',
 		'precision' => '4',
 		'nullable' => False,
 		'comment' => 'creating user'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'creation time of event'
 	));
-	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified',__LINE__,__FILE__);
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_created',array(
+	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_created=cal_modified', __LINE__, __FILE__);
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_created', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'creation time of event'
 	));
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_recurrence',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_recurrence', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -1731,14 +1731,14 @@ 
 	// move RECURRENCE-ID from temporarily (1.6.003)
 	// used field cal_reference to new field cal_recurrence
 	// and restore cal_reference field of series exceptions with id of the series master
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id AS cal_id_ex,cal_master.cal_id AS cal_id_master,
 		cal_ex.cal_reference AS cal_reference_ex,cal_ex.cal_uid AS cal_uid_ex,
 		cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master
 		ON cal_ex.cal_uid=cal_master.cal_uid AND cal_master.cal_reference = 0 AND cal_ex.cal_owner = cal_master.cal_owner
-		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference !=0 AND cal_master.cal_id IS NOT NULL',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_recurrence='.(int)$row['cal_reference_ex'].
 			', cal_reference='.(int)$row['cal_id_master'].
@@ -1755,7 +1755,7 @@ 
  */
 function calendar_upgrade1_7_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT'
@@ -1771,14 +1771,14 @@ 
  */
 function calendar_upgrade1_7_002()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_cal_timezones', array(
 		'fd' => array(
-			'tz_id' => array('type' => 'auto','nullable' => False),
-			'tz_tzid' => array('type' => 'varchar','precision' => '128','nullable' => False),
-			'tz_alias' => array('type' => 'int','precision' => '4','comment' => 'tz_id for data'),
-			'tz_latitude' => array('type' => 'int','precision' => '4'),
-			'tz_longitude' => array('type' => 'int','precision' => '4'),
-			'tz_component' => array('type' => 'text','comment' => 'iCal VTIMEZONE component')
+			'tz_id' => array('type' => 'auto', 'nullable' => False),
+			'tz_tzid' => array('type' => 'varchar', 'precision' => '128', 'nullable' => False),
+			'tz_alias' => array('type' => 'int', 'precision' => '4', 'comment' => 'tz_id for data'),
+			'tz_latitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_longitude' => array('type' => 'int', 'precision' => '4'),
+			'tz_component' => array('type' => 'text', 'comment' => 'iCal VTIMEZONE component')
 		),
 		'pk' => array('tz_id'),
 		'fk' => array(),
@@ -1798,38 +1798,38 @@ 
  */
 function calendar_upgrade1_7_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_type', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'nullable' => False,
 		'default' => 'u',
 		'comment' => 'u=user, g=group, c=contact, r=resource, e=email'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'varchar',
 		'precision' => '128',
 		'nullable' => False,
 		'comment' => 'id or email-address for type=e'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_status',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_status', array(
 		'type' => 'char',
 		'precision' => '1',
 		'default' => 'A',
 		'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_quantity',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_quantity', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '1',
 		'comment' => 'only for certain types (eg. resources)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_role',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_role', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'default' => 'REQ-PARTICIPANT',
 		'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_modified', array(
 		'type' => 'timestamp',
 		'default' => 'current_timestamp',
 		'comment' => 'automatic timestamp of last update'
@@ -1845,19 +1845,19 @@ 
  */
 function calendar_upgrade1_7_004()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'starttime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates','cal_end',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_dates', 'cal_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
 		'comment' => 'endtime in server time'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','tz_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'tz_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'comment' => 'key into egw_cal_timezones'
@@ -1866,7 +1866,7 @@ 
 	// set id of server timezone for existing events, as that's the timezone their recurrences are using
 	if (($tzid = date_default_timezone_get()) && ($tz_id = calendar_timezones::tz2id($tzid)))
 	{
-		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id,__LINE__,__FILE__);
+		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET tz_id='.(int)$tz_id, __LINE__, __FILE__);
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.005';
 }
@@ -1893,22 +1893,22 @@ 
  */
 function calendar_upgrade1_7_006()
 {
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE (cal_end-cal_start)%86400=86340',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE (cal_end-cal_start)%86400=86340',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end+59
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
-	foreach($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
-		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__,__FILE__) as $row)
+	foreach ($GLOBALS['egw_setup']->db->query('SELECT * FROM egw_cal_dates
+		WHERE cal_end-cal_start>0 AND (cal_end-cal_start)%86400=0',__LINE__, __FILE__) as $row)
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal_dates SET cal_end=cal_end-1
-			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'],__LINE__,__FILE__);
+			WHERE cal_id='.(int)$row['cal_id'].' AND cal_start='.(int)$row['cal_start'], __LINE__, __FILE__);
 	}
 
     $GLOBALS['egw_setup']->db->query('UPDATE egw_cal_repeats SET recur_interval=1
-			WHERE recur_interval=0',__LINE__,__FILE__);
+			WHERE recur_interval=0',__LINE__, __FILE__);
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.007';
 }
@@ -1924,17 +1924,17 @@ 
 {
 	// Set UID of series exception to UID of series master
 	// update cal_etag,cal_modified and cal_modifier to distribute changes on GroupDAV devices
-	foreach($GLOBALS['egw_setup']->db->query('
+	foreach ($GLOBALS['egw_setup']->db->query('
 		SELECT cal_ex.cal_id,cal_ex.cal_uid AS cal_uid_ex,cal_master.cal_uid AS cal_uid_master
 		FROM egw_cal cal_ex
 		JOIN egw_cal cal_master ON cal_ex.cal_reference=cal_master.cal_id
-		WHERE cal_ex.cal_reference != 0',__LINE__,__FILE__) as $row)
+		WHERE cal_ex.cal_reference != 0',__LINE__, __FILE__) as $row)
 	{
 		if (strlen($row['cal_uid_master']) > 0 && $row['cal_uid_ex'] != $row['cal_uid_master'])
 		{
 			$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET cal_uid=\''.$row['cal_uid_master'].
 				'\',cal_etag=cal_etag+1,cal_modified='.time().
-				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'],__LINE__,__FILE__);
+				',cal_modifier=NULL WHERE cal_id='.(int)$row['cal_id'], __LINE__, __FILE__);
 		}
 	}
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.008';
@@ -1947,7 +1947,7 @@ 
  */
 function calendar_upgrade1_7_008()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user',array('cal_user_type','cal_user_id'));
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', array('cal_user_type', 'cal_user_id'));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.009';
 }
@@ -1959,22 +1959,22 @@ 
  */
 function calendar_upgrade1_7_009()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_uid');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_owner');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_uid');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_owner');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.7.010';
 }
 
 function calendar_upgrade1_7_010()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','cal_deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'cal_deleted', array(
 		'type' => 'bool',
 		'nullable' => False,
 		'default' => '0',
 		'comment' => '1 if the event has been deleted, but you want to keep it around'
 	));
 
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001';	// was 1.7.011
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.001'; // was 1.7.011
 }
 
 function calendar_upgrade1_7_011()
@@ -1999,7 +1999,7 @@ 
 function calendar_upgrade1_9_001()
 {
 	// delete in the past wrongly created entries for a single recurrence, which mess up the update, beside being wrong anyway
-	$GLOBALS['egw_setup']->db->delete('egw_api_content_history',array(
+	$GLOBALS['egw_setup']->db->delete('egw_api_content_history', array(
 		'sync_appname' => 'calendar',
 		"sync_contentid LIKE '%:%'",
 	), __LINE__, __FILE__);
@@ -2010,36 +2010,36 @@ 
 		'precision' => '8',
 		'comment' => 'ts when event was deleted'
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'auto','nullable' => False),
-			'cal_uid' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'unique id of event(-series)'),
-			'cal_owner' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'event owner / calendar'),
-			'cal_category' => array('type' => 'varchar','precision' => '30','comment' => 'category id'),
-			'cal_modified' => array('type' => 'int','precision' => '8','comment' => 'ts of last modification'),
-			'cal_priority' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '2'),
-			'cal_public' => array('type' => 'int','precision' => '2','nullable' => False,'default' => '1','comment' => '1=public, 0=private event'),
-			'cal_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '1'),
+			'cal_id' => array('type' => 'auto', 'nullable' => False),
+			'cal_uid' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'unique id of event(-series)'),
+			'cal_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'event owner / calendar'),
+			'cal_category' => array('type' => 'varchar', 'precision' => '30', 'comment' => 'category id'),
+			'cal_modified' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts of last modification'),
+			'cal_priority' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '2'),
+			'cal_public' => array('type' => 'int', 'precision' => '2', 'nullable' => False, 'default' => '1', 'comment' => '1=public, 0=private event'),
+			'cal_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '1'),
 			'cal_description' => array('type' => 'text'),
-			'cal_location' => array('type' => 'varchar','precision' => '255'),
-			'cal_reference' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '0','comment' => 'cal_id of series for exception'),
-			'cal_modifier' => array('type' => 'int','precision' => '4','comment' => 'user who last modified event'),
-			'cal_non_blocking' => array('type' => 'int','precision' => '2','default' => '0','comment' => '1 for non-blocking events'),
-			'cal_special' => array('type' => 'int','precision' => '2','default' => '0'),
-			'cal_etag' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'etag for optimistic locking'),
-			'cal_creator' => array('type' => 'int','precision' => '4','nullable' => False,'comment' => 'creating user'),
-			'cal_created' => array('type' => 'int','precision' => '8','nullable' => False,'comment' => 'creation time of event'),
-			'cal_recurrence' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'cal_start of original recurrence for exception'),
-			'tz_id' => array('type' => 'int','precision' => '4','comment' => 'key into egw_cal_timezones'),
-			'cal_deleted' => array('type' => 'int','precision' => '8','comment' => 'ts when event was deleted')
+			'cal_location' => array('type' => 'varchar', 'precision' => '255'),
+			'cal_reference' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '0', 'comment' => 'cal_id of series for exception'),
+			'cal_modifier' => array('type' => 'int', 'precision' => '4', 'comment' => 'user who last modified event'),
+			'cal_non_blocking' => array('type' => 'int', 'precision' => '2', 'default' => '0', 'comment' => '1 for non-blocking events'),
+			'cal_special' => array('type' => 'int', 'precision' => '2', 'default' => '0'),
+			'cal_etag' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'etag for optimistic locking'),
+			'cal_creator' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'comment' => 'creating user'),
+			'cal_created' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'comment' => 'creation time of event'),
+			'cal_recurrence' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'cal_start of original recurrence for exception'),
+			'tz_id' => array('type' => 'int', 'precision' => '4', 'comment' => 'key into egw_cal_timezones'),
+			'cal_deleted' => array('type' => 'int', 'precision' => '8', 'comment' => 'ts when event was deleted')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
-		'ix' => array('cal_uid','cal_owner','cal_deleted'),
+		'ix' => array('cal_uid', 'cal_owner', 'cal_deleted'),
 		'uc' => array()
-	),array(
+	), array(
 		// for deleted rows use cal_modified as deleted date, NULL for not deleted ones
-		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true,'bool').' THEN cal_modified ELSE NULL END',
+		'cal_deleted' => 'CASE cal_deleted WHEN '.$GLOBALS['egw_setup']->db->quote(true, 'bool').' THEN cal_modified ELSE NULL END',
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.002';
@@ -2051,16 +2051,16 @@ 
  */
 function calendar_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'name part of CalDAV URL, if specified by client'
 	));
-	$GLOBALS['egw_setup']->db->query($sql='UPDATE egw_cal SET caldav_name='.
+	$GLOBALS['egw_setup']->db->query($sql = 'UPDATE egw_cal SET caldav_name='.
 		$GLOBALS['egw_setup']->db->concat(
-			$GLOBALS['egw_setup']->db->to_varchar('cal_id'),"'.ics'"),__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->to_varchar('cal_id'), "'.ics'"), __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','caldav_name');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'caldav_name');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.003';
 }
@@ -2071,8 +2071,8 @@ 
  */
 function calendar_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal','cal_modified');
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user','cal_user_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal', 'cal_modified');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_cal_user', 'cal_user_modified');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.004';
 }
@@ -2084,7 +2084,7 @@ 
  */
 function calendar_upgrade1_9_004()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates','recur_exception',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_dates', 'recur_exception', array(
 		'type' => 'bool',
 		'default' => '',
 		'null' => false,
@@ -2092,16 +2092,16 @@ 
 	));
 
 	// migrate existing exceptions to egw_cal_dates
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_repeats',
 		'egw_cal_repeats.cal_id AS cal_id,egw_cal_repeats.recur_exception AS recur_exception,MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 		'egw_cal_repeats.recur_exception IS NOT NULL', __LINE__, __FILE__, false,
 		'GROUP BY egw_cal_repeats.cal_id,egw_cal_repeats.recur_exception', 'calendar', '',
 		'JOIN egw_cal_dates ON egw_cal_repeats.cal_id=egw_cal_dates.cal_id') as $row)
 	{
-		foreach($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
+		foreach ($row['recur_exception'] ? array_unique(explode(',', $row['recur_exception'])) : array() as $recur_exception)
 		{
 			$GLOBALS['egw_setup']->db->insert('egw_cal_dates', array(
-				'cal_end' => $recur_exception+$row['cal_end']-$row['cal_start'],
+				'cal_end' => $recur_exception + $row['cal_end'] - $row['cal_start'],
 				'recur_exception' => true,
 			), array(
 				'cal_id' => $row['cal_id'],
@@ -2113,11 +2113,11 @@ 
 
 	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_enddate' => array('type' => 'int','precision' => '8'),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1'),
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_enddate' => array('type' => 'int', 'precision' => '8'),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
@@ -2138,19 +2138,19 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_description', array(
 			'type' => 'varchar',
 			'precision' => '16384'
 		));
 	}
 	// allow more categories
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'varchar',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
 	// remove silly default of 1
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False
@@ -2165,14 +2165,14 @@ 
 {
 	// PostgreSQL needs temporary a nullable column, to not stall on broken events without dates!
 	// We add that constrain in 1.9.007, after deleting all rows with range_start=0 OR range_start IS NULL
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'startdate (of range)'
 	));
 	$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_start = (SELECT MIN(cal_start) FROM egw_cal_dates WHERE egw_cal_dates.cal_id=egw_cal.cal_id)', __LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal','range_end',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal', 'range_end', array(
 		'type' => 'int',
 		'precision' => '8',
 		'comment' => 'enddate (of range, UNTIL of RRULE)'
@@ -2188,18 +2188,18 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query('UPDATE egw_cal SET range_end=recur_enddate FROM egw_cal_repeats WHERE egw_cal.cal_id=egw_cal_repeats.cal_id', __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_cal_repeats', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'recur_type' => array('type' => 'int','precision' => '2','nullable' => False),
-			'recur_interval' => array('type' => 'int','precision' => '2','default' => '1'),
-			'recur_data' => array('type' => 'int','precision' => '2','default' => '1')
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'recur_type' => array('type' => 'int', 'precision' => '2', 'nullable' => False),
+			'recur_interval' => array('type' => 'int', 'precision' => '2', 'default' => '1'),
+			'recur_data' => array('type' => 'int', 'precision' => '2', 'default' => '1')
 		),
 		'pk' => array('cal_id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'recur_enddate');
+	), 'recur_enddate');
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '1.9.007';
 }
@@ -2211,14 +2211,14 @@ 
  */
 function calendar_upgrade1_9_007()
 {
-	foreach(array('egw_cal_repeats','egw_cal_dates','egw_cal_user','egw_cal_extra') as $table)
+	foreach (array('egw_cal_repeats', 'egw_cal_dates', 'egw_cal_user', 'egw_cal_extra') as $table)
 	{
 		$GLOBALS['egw_setup']->db->query("DELETE FROM $table WHERE cal_id IN (SELECT cal_id FROM egw_cal WHERE range_start=0 OR range_start IS NULL)", __LINE__, __FILE__);
 	}
 	$GLOBALS['egw_setup']->db->query("DELETE FROM egw_cal WHERE range_start=0 OR range_start IS NULL", __LINE__, __FILE__);
 
 	// now we can remove temporary default of 0 from range_start and set it NOT NULL
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','range_start',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'range_start', array(
 		'type' => 'int',
 		'precision' => '8',
 		'nullable' => False,
@@ -2283,7 +2283,7 @@ 
 
 function calendar_upgrade1_9_010()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'varchar',
 		'precision' => '200',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2313,7 +2313,7 @@ 
 SET cal_reference=0,cal_recurrence=0,cal_etag=cal_etag+1,cal_modifier=0,cal_modified=".time()."
 WHERE cal_reference != 0 AND cal_id IN (SELECT cal_id FROM egw_cal_repeats)", __LINE__, __FILE__);
 
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT DISTINCT master.cal_id,egw_cal_user.cal_user_type,egw_cal_user.cal_user_id,'E' AS cal_status
 FROM egw_cal_user
 JOIN egw_cal ON egw_cal_user.cal_id=egw_cal.cal_id
@@ -2340,7 +2340,7 @@ 
  */
 function calendar_upgrade14_1_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query(
+	foreach ($GLOBALS['egw_setup']->db->query(
 "SELECT egw_cal.cal_id AS cal_id,cal_start,cal_end,range_start,range_end,egw_cal_repeats.*,tz_tzid AS tzid
 FROM egw_cal
 JOIN egw_cal_repeats ON egw_cal_repeats.cal_id=egw_cal.cal_id
@@ -2362,7 +2362,7 @@ 
 		$enddate->modify(($event['end'] - $event['start']).' second');
 		if (($range_end = $enddate->format('server')) != $event['range_end'])
 		{
-			$GLOBALS['egw_setup']->db->update('egw_cal',array(
+			$GLOBALS['egw_setup']->db->update('egw_cal', array(
 				'range_end' => $range_end,
 				'cal_etag=cal_etag+1',
 				'cal_modified' => time(),
@@ -2372,7 +2372,7 @@ 
 			//error_log(__FUNCTION__."() #$event[id], start=".date('Y-m-d H:i:s', $event['start']).', end='.date('Y-m-d H:i:s', $event['end']).', range_end='.date('Y-m-d H:i:s', $event['recur_enddate']).' --> '.date('Y-m-d H:i:s', $range_end));
 		}
 	}
-	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002';	// skip 14.2.001 update, as query is fixed now
+	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.002'; // skip 14.2.001 update, as query is fixed now
 }
 
 /**
@@ -2396,7 +2396,7 @@ 
 	// if maximum is bigger then 3
 	if ($values[1] > 3)
 	{
-		switch($GLOBALS['egw_setup']->db->Type)
+		switch ($GLOBALS['egw_setup']->db->Type)
 		{
 			case 'mysql':
 				$sql = "UPDATE egw_cal
@@ -2446,7 +2446,7 @@ 
 
 function calendar_upgrade14_2_003()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_uid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_uid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False,
@@ -2458,13 +2458,13 @@ 
 	{
 		$GLOBALS['egw_setup']->db->query("UPDATE egw_cal SET cal_category='' WHERE cal_category NOT REGEXP '^[0-9,]*$'", __LINE__, __FILE__);
 	}
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','cal_category',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'cal_category', array(
 		'type' => 'ascii',
 		'meta' => 'category',
 		'precision' => '64',
 		'comment' => 'category id(s)'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal','caldav_name',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal', 'caldav_name', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'comment' => 'name part of CalDAV URL, if specified by client'
@@ -2521,22 +2521,22 @@ 
 		'type' => 'auto',
 		'nullable' => False
 	));*/
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_cal_user', array(
 		'fd' => array(
-			'cal_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'cal_recur_date' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'default' => '0'),
-			'cal_user_type' => array('type' => 'ascii','precision' => '1','nullable' => False,'default' => 'u','comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
-			'cal_user_id' => array('type' => 'varchar','meta' => array("cal_user_type='u'" => 'account'),'precision' => '128','nullable' => False,'comment' => 'id or email-address for type=e'),
-			'cal_status' => array('type' => 'ascii','precision' => '1','default' => 'A','comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
-			'cal_quantity' => array('type' => 'int','precision' => '4','default' => '1','comment' => 'only for certain types (eg. resources)'),
-			'cal_role' => array('type' => 'ascii','precision' => '64','default' => 'REQ-PARTICIPANT','comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
-			'cal_user_modified' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'automatic timestamp of last update'),
-			'cal_user_auto' => array('type' => 'auto','nullable' => False)
+			'cal_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'cal_recur_date' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'default' => '0'),
+			'cal_user_type' => array('type' => 'ascii', 'precision' => '1', 'nullable' => False, 'default' => 'u', 'comment' => 'u=user, g=group, c=contact, r=resource, e=email'),
+			'cal_user_id' => array('type' => 'varchar', 'meta' => array("cal_user_type='u'" => 'account'), 'precision' => '128', 'nullable' => False, 'comment' => 'id or email-address for type=e'),
+			'cal_status' => array('type' => 'ascii', 'precision' => '1', 'default' => 'A', 'comment' => 'U=unknown, A=accepted, R=rejected, T=tentative'),
+			'cal_quantity' => array('type' => 'int', 'precision' => '4', 'default' => '1', 'comment' => 'only for certain types (eg. resources)'),
+			'cal_role' => array('type' => 'ascii', 'precision' => '64', 'default' => 'REQ-PARTICIPANT', 'comment' => 'CHAIR, REQ-PARTICIPANT, OPT-PARTICIPANT, NON-PARTICIPANT, X-CAT-$cat_id'),
+			'cal_user_modified' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'automatic timestamp of last update'),
+			'cal_user_auto' => array('type' => 'auto', 'nullable' => False)
 		),
 		'pk' => array('cal_user_auto'),
 		'fk' => array(),
-		'ix' => array('cal_user_modified',array('cal_user_type','cal_user_id')),
-		'uc' => array(array('cal_id','cal_recur_date','cal_user_type','cal_user_id'))
+		'ix' => array('cal_user_modified', array('cal_user_type', 'cal_user_id')),
+		'uc' => array(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id'))
 	));
 
 	return $GLOBALS['setup_info']['calendar']['currentver'] = '14.2.005';
@@ -2545,12 +2545,12 @@ 
 
 function calendar_upgrade14_2_005()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_tzid',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_tzid', array(
 		'type' => 'ascii',
 		'precision' => '128',
 		'nullable' => False
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones','tz_component',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_timezones', 'tz_component', array(
 		'type' => 'ascii',
 		'precision' => '8192',
 		'comment' => 'iCal VTIMEZONE component'
@@ -2566,7 +2566,7 @@ 
  */
 function calendar_upgrade14_3()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user','cal_user_attendee',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_cal_user', 'cal_user_attendee', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'email or json object with attr. cn, url, ...'
@@ -2577,12 +2577,12 @@ 
 
 	// delete all but one row, which would give a doublicate key, after above normalising of email addresses
 	// by ordering by status we prever accepted over tentative over unknow over deleted
-	foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
+	foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "cal_id,cal_recur_date,$email AS email", array(
 		'cal_user_type' => 'e',
 	), __LINE__, __FILE__, false, "GROUP BY cal_id,cal_recur_date,$email HAVING COUNT(*)>1", 'calendar') as $row)
 	{
 		$n = 0;
-		foreach($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
+		foreach ($GLOBALS['egw_setup']->db->select('egw_cal_user', "*,$email AS email", array(
 			'cal_id' => $row['cal_id'],
 			'cal_recur_date' => $row['cal_recur_date'],
 			'cal_user_type' => 'e',
@@ -2590,7 +2590,7 @@ 
 		), __LINE__, __FILE__, false, 'ORDER BY cal_status', 'calendar') as $user)	// order A, T, U, X
 		{
 			if (strpos($user['email'], '@') !== false && !$n++) continue;
-			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id','cal_recur_date','cal_user_type','cal_user_id','cal_status'))));
+			$GLOBALS['egw_setup']->db->delete('egw_cal_user', array_intersect_key($user, array_flip(array('cal_id', 'cal_recur_date', 'cal_user_type', 'cal_user_id', 'cal_status'))));
 		}
 	}
 
@@ -2599,7 +2599,7 @@ 
 		"UPDATE egw_cal_user SET cal_user_attendee=cal_user_id,cal_user_id=MD5($email) WHERE cal_user_type='e'",
 		__LINE__, __FILE__);
 
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user','cal_user_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_cal_user', 'cal_user_id', array(
 		'type' => 'ascii',
 		'meta' => array(
 			"cal_user_type='u'" => 'account'
@@ -2619,7 +2619,7 @@ 
  */
 function calendar_upgrade14_3_001()
 {
-	foreach($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
+	foreach ($GLOBALS['egw_setup']->db->query("SELECT egw_cal_user.cal_id AS cal_id,egw_cal_user.cal_user_id AS cal_user_id,egw_cal_user.cal_user_attendee AS cal_user_attendee
 FROM egw_cal_user
 JOIN egw_cal_user euser ON euser.cal_id=egw_cal_user.cal_id AND euser.cal_user_type='e' AND euser.cal_user_id=egw_cal_user.cal_user_id AND euser.cal_user_attendee IS NULL
 WHERE egw_cal_user.cal_user_type='e' AND egw_cal_user.cal_user_attendee IS NOT NULL