EGroupware / egroupware

calendar/inc/class.calendar_merge.inc.php

Spacing +137 added lines, -137 removed lines

@@ -84,14 +84,14 @@ 
 
 		// Register table plugins
 		$this->table_plugins['participant'] = 'participant';
-		for($i = 0; $i < 7; $i++)
+		for ($i = 0; $i < 7; $i++)
 		{
 			$this->table_plugins[date('l', strtotime("+$i days"))] = 'day_plugin';
 		}
-		for($i = 1; $i <= 31; $i++) {
+		for ($i = 1; $i <= 31; $i++) {
 			$this->table_plugins['day_'.$i] = 'day'; // Numerically by day number (1-31)
 		}
-		foreach(self::$relative as $day) {
+		foreach (self::$relative as $day) {
 			$this->table_plugins[$day] = 'day'; // Current day
 		}
 		$this->query = is_array($this->bo->cal_prefs['saved_states']) ?
@@ -117,11 +117,11 @@ 
 	 * @param string $charset=null charset to override default set by mimetype or export charset
 	 * @return string|boolean merged document or false on error
 	 */
-	function merge_string($content,$ids,$err,$mimetype,$fix)
+	function merge_string($content, $ids, $err, $mimetype, $fix)
 	{
 		//error_log(__METHOD__ . ' IDs: ' . array2string($ids));
 		// Handle merging a list of events into a document with range instead of pagerepeat
-		if((strpos($content, '$$range') !== false || strpos($content, '{{range') !== false) && is_array($ids))
+		if ((strpos($content, '$$range') !== false || strpos($content, '{{range') !== false) && is_array($ids))
 		{
 			//error_log(__METHOD__ . ' Got list of events(?), no pagerepeat tag');
 			// Merging more than one something will fail without pagerepeat
@@ -131,9 +131,9 @@ 
 				$events = $ids;
 				$ids = array('start' => PHP_INT_MAX, 'end' => 0);
 				$this->ids = array();
-				foreach($events as $event) {
-					if($event['start'] && Api\DateTime::to($event['start'],'ts') < $ids['start']) $ids['start'] = Api\DateTime::to($event['start'],'ts');
-					if($event['end'] && Api\DateTime::to($event['end'],'ts') > $ids['end']) $ids['end'] = Api\DateTime::to($event['end'],'ts');
+				foreach ($events as $event) {
+					if ($event['start'] && Api\DateTime::to($event['start'], 'ts') < $ids['start']) $ids['start'] = Api\DateTime::to($event['start'], 'ts');
+					if ($event['end'] && Api\DateTime::to($event['end'], 'ts') > $ids['end']) $ids['end'] = Api\DateTime::to($event['end'], 'ts');
 					// Keep ids for future use
 					$this->ids[] = $event['id'];
 				}
@@ -154,12 +154,12 @@ 
 				'cfs' => strpos($content, '#') !== false ? array_keys(Api\Storage\Customfields::get('calendar')) : null
 			));
 			$ids = array();
-			foreach($events as $event) {
+			foreach ($events as $event) {
 				$ids[] = $event;
 			}
 		}
 
-		return parent::merge_string($content, $ids, $err, $mimetype,$fix);
+		return parent::merge_string($content, $ids, $err, $mimetype, $fix);
 	}
 
 	/**
@@ -169,20 +169,20 @@ 
 	 * @param string &$content=null content to create some replacements only if they are used
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		$prefix = '';
 		// List events ?
-		if(is_array($id) && !$id['id'] && !$id[0]['id'])
+		if (is_array($id) && !$id['id'] && !$id[0]['id'])
 		{
 			$events = $this->bo->search($this->query + $id + array(
 				'offset' => 0,
 				'order' => 'cal_start',
 				'cfs' => strpos($content, '#') !== false ? array_keys(Api\Storage\Customfields::get('calendar')) : null
 			));
-			if(strpos($content,'$$calendar/') !== false || strpos($content, '$$table/day') !== false)
+			if (strpos($content, '$$calendar/') !== false || strpos($content, '$$table/day') !== false)
 			{
-				array_unshift($events,false); unset($events[0]);	// renumber the array to start with key 1, instead of 0
+				array_unshift($events, false); unset($events[0]); // renumber the array to start with key 1, instead of 0
 				$prefix = 'calendar/%d';
 			}
 		}
@@ -192,11 +192,11 @@ 
 			$events = $id;
 			$id = array('start' => PHP_INT_MAX, 'end' => 0);
 			$this->ids = array();
-			foreach($events as $event) {
-				if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-				if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+			foreach ($events as $event) {
+				if ($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
+				if ($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
 				// Keep ids for future use
-				$this->ids[]  = $event['id'];
+				$this->ids[] = $event['id'];
 			}
 			$id = array($id);
 		}
@@ -208,20 +208,20 @@ 
 		// as this function allows to pass query- parameters, we need to check the result of the query against export_limit restrictions
 		if (Api\Storage\Merge::hasExportLimit($this->export_limit) && !Api\Storage\Merge::is_export_limit_excepted() && count($events) > (int)$this->export_limit)
 		{
-			$err = lang('No rights to export more than %1 entries!',(int)$this->export_limit);
+			$err = lang('No rights to export more than %1 entries!', (int)$this->export_limit);
 			throw new Api\Exception\WrongUserinput($err);
 		}
 		$replacements = array();
 		$n = 0;
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
-			$values = $this->calendar_replacements($event,sprintf($prefix,++$n), $content);
-			if(is_array($id) && $id['start'])
+			$values = $this->calendar_replacements($event, sprintf($prefix, ++$n), $content);
+			if (is_array($id) && $id['start'])
 			{
-				foreach(self::$range_tags as $key => $format)
+				foreach (self::$range_tags as $key => $format)
 				{
 					$value = date($format, $key == 'end' ? $id['end'] : $id['start']);
-					if($key == 'month') $value = lang($value);
+					if ($key == 'month') $value = lang($value);
 					$values["$\$range/$key$$"] = $value;
 				}
 			}
@@ -237,10 +237,10 @@ 
 	 * @param boolean $last_event_too=false also include information about the last event
 	 * @return array
 	 */
-	public function calendar_replacements($id,$prefix = '', &$content = '')
+	public function calendar_replacements($id, $prefix = '', &$content = '')
 	{
 		$replacements = array();
-		if(!is_array($id) || !$id['start']) {
+		if (!is_array($id) || !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
 		} else {
 			$event = $id;
@@ -253,68 +253,68 @@ 
 		importexport_export_csv::convert($record, $types, 'calendar');
 
 		$array = $record->get_record_array();
-		foreach($array as $key => $value)
+		foreach ($array as $key => $value)
 		{
-			$replacements['$$'.($prefix?$prefix.'/':'').$key.'$$'] = $value;
+			$replacements['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
 
-		$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
-		foreach($this->bo->event2array($event) as $name => $data)
+		$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_id'.'$$'] = $event['id'];
+		foreach ($this->bo->event2array($event) as $name => $data)
 		{
-			if (substr($name,-4) == 'date') $name = substr($name,0,-4);
-			$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
+			if (substr($name, -4) == 'date') $name = substr($name, 0, -4);
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_'.$name.'$$'] = is_array($data['data']) ? implode(', ', $data['data']) : $data['data'];
 		}
 		// Add seperate lists of participants by type
-		if(strpos($content, 'calendar_participants/')!== false)
+		if (strpos($content, 'calendar_participants/') !== false)
 		{
 			$types = array();
-			foreach($this->bo->resources as $resource)
+			foreach ($this->bo->resources as $resource)
 			{
 				$types[$resource['app']] = array();
 			}
-			foreach($event['participants'] as $uid => $status)
+			foreach ($event['participants'] as $uid => $status)
 			{
 				$type = $this->bo->resources[$uid[0]]['app'];
-				if($type == 'api-accounts')
+				if ($type == 'api-accounts')
 				{
 					$type = ($GLOBALS['egw']->accounts->get_type($uid) == 'g' ? 'group' : 'account');
 				}
 				$types[$type][] = $this->bo->participant_name($uid);
 			}
-			foreach($types as $t_id => $type)
+			foreach ($types as $t_id => $type)
 			{
-				$replacements['$$'.($prefix ? $prefix . '/' : '') . "calendar_participants/{$t_id}$$"] = implode(', ',$type);
+				$replacements['$$'.($prefix ? $prefix.'/' : '')."calendar_participants/{$t_id}$$"] = implode(', ', $type);
 			}
 		}
-		if(!$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'])
+		if (!$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_recur_type$$'])
 		{
 			// Need to set it to '' if not set or previous record may be used
-			$replacements['$$'.($prefix ? $prefix . '/' : '') . 'calendar_recur_type$$'] = '';
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_recur_type$$'] = '';
 		}
-		foreach(array('start','end') as $what)
+		foreach (array('start', 'end') as $what)
 		{
-			foreach(array(
+			foreach (array(
 				'date' => $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],
 				'day'  => 'l',
-				'time' => (date('Ymd',$event['start']) != date('Ymd',$event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '') . ($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
+				'time' => (date('Ymd', $event['start']) != date('Ymd', $event['end']) ? $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'].' ' : '').($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i'),
 			) as $name => $format)
 			{
-				$value = Api\DateTime::to($event[$what],$format);
+				$value = Api\DateTime::to($event[$what], $format);
 				if ($format == 'l') $value = lang($value);
-				$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
+				$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_'.$what.$name.'$$'] = $value;
 			}
 		}
-		$duration = ($event['end'] - $event['start'])/60;
-		$replacements['$$'.($prefix?$prefix.'/':'').'calendar_duration$$'] = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
+		$duration = ($event['end'] - $event['start']) / 60;
+		$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_duration$$'] = floor($duration / 60).lang('h').($duration % 60 ? $duration % 60 : '');
 
 		// Add in contact stuff for owner
-		if (strpos($content,'$$calendar_owner/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($event['owner'],'person_id')))
+		if (strpos($content, '$$calendar_owner/') !== null && ($user = $GLOBALS['egw']->accounts->id2name($event['owner'], 'person_id')))
 		{
-			$replacements += $this->contact_replacements($user,($prefix ? $prefix.'/':'').'calendar_owner');
-			$replacements['$$'.($prefix?$prefix.'/':'').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'],'account_primary_group'));
+			$replacements += $this->contact_replacements($user, ($prefix ? $prefix.'/' : '').'calendar_owner');
+			$replacements['$$'.($prefix ? $prefix.'/' : '').'calendar_owner/primary_group$$'] = $GLOBALS['egw']->accounts->id2name($GLOBALS['egw']->accounts->id2name($event['owner'], 'account_primary_group'));
 		}
 
-		if($content && strpos($content, '$$#') !== FALSE)
+		if ($content && strpos($content, '$$#') !== FALSE)
 		{
 			$this->cf_link_to_expand($event, $content, $replacements);
 		}
@@ -340,82 +340,82 @@ 
 	* @param string $repeat Text being repeated for each entry
 	* @return array
 	*/
-	public function day_plugin($plugin,$date,$n,$repeat)
+	public function day_plugin($plugin, $date, $n, $repeat)
 	{
 		static $days = null;
-		if(is_array($date) && !$date['start']) {
+		if (is_array($date) && !$date['start']) {
 			// List of IDs
-			if($date[0]['start']) {
+			if ($date[0]['start']) {
 				$id = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($date as $event) {
-					if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+				foreach ($date as $event) {
+					if ($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
+					if ($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
 				}
 				$date = $id;
 			} else {
 				$event = $this->bo->read(is_array($date) ? $date['id'] : $date, is_array($date) ? $date['recur_date'] : null);
-				if(date('l',$event['start']) != $plugin) return array();
+				if (date('l', $event['start']) != $plugin) return array();
 				$date = $event['start'];
 			}
 		}
 
 		$_date = $date['start'] ? $date['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if ($days[date('Ymd', $_date)][$plugin]) return $days[date('Ymd', $_date)][$plugin][$n];
 
 		$events = $this->bo->search($this->query + array(
-			'start' => $date['end'] ? $date['start'] : mktime(0,0,0,date('m',$_date),date('d',$_date),date('Y',$_date)),
-			'end' => $date['end'] ? $date['end'] : mktime(23,59,59,date('m',$_date),date('d',$_date),date('Y',$_date)),
+			'start' => $date['end'] ? $date['start'] : mktime(0, 0, 0, date('m', $_date), date('d', $_date), date('Y', $_date)),
+			'end' => $date['end'] ? $date['end'] : mktime(23, 59, 59, date('m', $_date), date('d', $_date), date('Y', $_date)),
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
 			'daywise' => true,
-			'cfs' => array(),	// read all custom-fields
+			'cfs' => array(), // read all custom-fields
 		));
 
 		if (true) $days = array();
 		$replacements = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
-		foreach($events as $day => $list)
+		foreach ($events as $day => $list)
 		{
-			foreach($list as $event)
+			foreach ($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if ($this->ids && !in_array($event['id'], $this->ids)) continue;
 				$start = Api\DateTime::to($event['start'], 'array');
 				$end = Api\DateTime::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
-					$dow = date('l',$event['start']);
+				if ($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+					$dow = date('l', $event['start']);
 				} else {
 					$dow = date('l', strtotime($day));
 					// Fancy date+time formatting for multi-day events
-					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
-					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
+					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0, 0, 0, 0, 0, 1));
+					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23, 59, 59, 0, 0, 0));
 				}
 
-				$days[date('Ymd',$_date)][$dow][] = $replacements;
+				$days[date('Ymd', $_date)][$dow][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if (strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
+				if (!is_array($days[date('Ymd', $_date)][date('l', strtotime($day))])) {
 					$blank = $this->calendar_replacements(array());
-					foreach($blank as &$value)
+					foreach ($blank as &$value)
 					{
 						$value = '';
 					}
-					$days[date('Ymd',$_date)][date('l',strtotime($day))][] = $blank;
+					$days[date('Ymd', $_date)][date('l', strtotime($day))][] = $blank;
 				}
-				$days[date('Ymd',$_date)][date('l',strtotime($day))][0] += $date_marker;
+				$days[date('Ymd', $_date)][date('l', strtotime($day))][0] += $date_marker;
 			}
 			// Add in birthdays
-			if(strpos($repeat, 'day/birthdays') !== false)
+			if (strpos($repeat, 'day/birthdays') !== false)
 			{
-				$days[date('Ymd', $_date)][date('l',strtotime($day))][0]['$$day/birthdays$$'] = $this->get_birthdays($day);
+				$days[date('Ymd', $_date)][date('l', strtotime($day))][0]['$$day/birthdays$$'] = $this->get_birthdays($day);
 			}
 		}
-		return $days[date('Ymd',$_date)][$plugin][0];
+		return $days[date('Ymd', $_date)][$plugin][0];
 	}
 
 	/**
@@ -429,27 +429,27 @@ 
 	* @param string $repeat Text being repeated for each entry
 	* @return array
 	*/
-	public function day($plugin,$id,$n,$repeat)
+	public function day($plugin, $id, $n, $repeat)
 	{
 		static $days = null;
 
 		// Figure out which day
-		list($type, $which) = explode('_',$plugin);
-		if($type == 'day' && $which)
+		list($type, $which) = explode('_', $plugin);
+		if ($type == 'day' && $which)
 		{
-			if($id[0]['start'])
+			if ($id[0]['start'])
 			{
 				$dates = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($id as $event) {
-					if($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
+				foreach ($id as $event) {
+					if ($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
+					if ($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
 				}
 				$id = $dates;
 			}
 			$arr = $this->bo->date2array($id['start']);
 			$arr['day'] = $which;
 			$date = $this->bo->date2ts($arr);
-			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
+			if (is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
 		}
 		elseif ($plugin == 'selected')
 		{
@@ -459,69 +459,69 @@ 
 		{
 			$date = strtotime($plugin);
 		}
-		if($type == 'day' && is_array($id) && !$id['start']) {
+		if ($type == 'day' && is_array($id) && !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-			if($which && date('d',$event['start']) != $which) return array();
-			if(date('Ymd',$date) != date('Ymd', $event['start'])) return array();
+			if ($which && date('d', $event['start']) != $which) return array();
+			if (date('Ymd', $date) != date('Ymd', $event['start'])) return array();
 			return $n == 0 ? $this->calendar_replacements($event) : array();
 		}
 
 		// Use start for cache, in case of multiple months
 		$_date = $id['start'] ? $id['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if ($days[date('Ymd', $_date)][$plugin]) return $days[date('Ymd', $_date)][$plugin][$n];
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date,
-			'end' => mktime(23,59,59,date('m',$date),date('d',$date),date('Y',$date)),
+			'end' => mktime(23, 59, 59, date('m', $date), date('d', $date), date('Y', $date)),
 			'offset' => 0,
 			'num_rows' => 20,
 			'order' => 'cal_start',
 			'daywise' => true,
-			'cfs' => array(),	// read all custom-fields
+			'cfs' => array(), // read all custom-fields
 		));
 
 		$replacements = array();
 		if (true) $days = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
-		foreach($events as $day => $list)
+		foreach ($events as $day => $list)
 		{
-			foreach($list as $event)
+			foreach ($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if ($this->ids && !in_array($event['id'], $this->ids)) continue;
 				$start = Api\DateTime::to($event['start'], 'array');
 				$end = Api\DateTime::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if ($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
 					//$dow = date('l',$event['start']);
 				} else {
 					// Fancy date+time formatting for multi-day events
-					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
-					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
+					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0, 0, 0, 0, 0, 1));
+					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23, 59, 59, 0, 0, 0));
 				}
-				$days[date('Ymd',$_date)][$plugin][] = $replacements;
+				$days[date('Ymd', $_date)][$plugin][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if (strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][$plugin])) {
+				if (!is_array($days[date('Ymd', $_date)][$plugin])) {
 					$blank = $this->calendar_replacements(array());
-					foreach($blank as &$value)
+					foreach ($blank as &$value)
 					{
 						$value = '';
 					}
-					$days[date('Ymd',$_date)][$plugin][] = $blank;
+					$days[date('Ymd', $_date)][$plugin][] = $blank;
 				}
-				$days[date('Ymd',$_date)][$plugin][0] += $date_marker;
+				$days[date('Ymd', $_date)][$plugin][0] += $date_marker;
 			}
 			// Add in birthdays
-			if(strpos($repeat, 'day/birthdays') !== false)
+			if (strpos($repeat, 'day/birthdays') !== false)
 			{
-				$days[date('Ymd', $_date)][date('l',strtotime($day))][0]['$$day/birthdays$$'] = $this->get_birthdays($day);
+				$days[date('Ymd', $_date)][date('l', strtotime($day))][0]['$$day/birthdays$$'] = $this->get_birthdays($day);
 			}
 		}
-		return $days[date('Ymd',$_date)][$plugin][0];
+		return $days[date('Ymd', $_date)][$plugin][0];
 	}
 
 	/**
@@ -534,30 +534,30 @@ 
 	* @param int $n
 	* @return array
 	*/
-	public function participant($plugin,$id,$n)
+	public function participant($plugin, $id, $n)
 	{
-		unset($plugin);	// not used, but required by function signature
+		unset($plugin); // not used, but required by function signature
 
-		if(!is_array($id) || !$id['start']) {
+		if (!is_array($id) || !$id['start']) {
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
 		} else {
 			$event = $id;
 		}
 
-		if(!is_array($event['participants']) || $n >= count($event['participants'])) return array();
+		if (!is_array($event['participants']) || $n >= count($event['participants'])) return array();
 
 		$participant = null;
 		$status = null;
 		$i = -1;
-		foreach($event['participants'] as $participant => $status) {
-			if(++$i == $n) break;
+		foreach ($event['participants'] as $participant => $status) {
+			if (++$i == $n) break;
 		}
 
-		if(!$participant) return array();
+		if (!$participant) return array();
 
 		// Add some common information
 		$quantity = $role = null;
-		calendar_so::split_status($status,$quantity,$role);
+		calendar_so::split_status($status, $quantity, $role);
 		if ($role != 'REQ-PARTICIPANT')
 		{
 			if (isset($this->bo->roles[$role]))
@@ -565,13 +565,13 @@ 
 				$role = lang($this->bo->roles[$role]);
 			}
 			// allow to use cats as roles (beside regular iCal ones)
-			elseif (substr($role,0,6) == 'X-CAT-' && ($cat_id = (int)substr($role,6)) > 0)
+			elseif (substr($role, 0, 6) == 'X-CAT-' && ($cat_id = (int)substr($role, 6)) > 0)
 			{
 				$role = $GLOBALS['egw']->categories->id2name($cat_id);
 			}
 			else
 			{
-				$role = lang(str_replace('X-','',$role));
+				$role = lang(str_replace('X-', '', $role));
 			}
 		}
 		$info = array(
@@ -584,26 +584,26 @@ 
 		switch ($participant[0])
 		{
 			case 'c':
-				$replacements = $this->contact_replacements(substr($participant,1),'');
+				$replacements = $this->contact_replacements(substr($participant, 1), '');
 				break;
 			case 'r':
 				if (is_null(self::$resources)) self::$resources = new resources_bo();
-				if (($resource = self::$resources->read(substr($participant,1))))
+				if (($resource = self::$resources->read(substr($participant, 1))))
 				{
-					foreach($resource as $name => $value)
+					foreach ($resource as $name => $value)
 					{
 					    $replacements['$$'.$name.'$$'] = $value;
 					}
 				}
 				break;
 			default:
-				if (is_numeric($participant) && ($contact = $GLOBALS['egw']->accounts->id2name($participant,'person_id')))
+				if (is_numeric($participant) && ($contact = $GLOBALS['egw']->accounts->id2name($participant, 'person_id')))
 				{
-					$replacements = $this->contact_replacements($contact,'');
+					$replacements = $this->contact_replacements($contact, '');
 				}
 				break;
 		}
-		foreach($info as $name => $value)
+		foreach ($info as $name => $value)
 		{
 			$replacements['$$'.$name.'$$'] = $value;
 		}
@@ -618,7 +618,7 @@ 
 	{
 		$contacts = new Api\Contacts();
 		$birthdays = Array();
-		foreach($contacts->get_addressbooks() as $owner => $name)
+		foreach ($contacts->get_addressbooks() as $owner => $name)
 		{
 			$birthdays += $contacts->read_birthdays($owner, substr($day, 0, 4));
 		}
@@ -640,7 +640,7 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Calendar fields:')."</h3></td></tr>";
 
 		$n = 0;
-		foreach(array(
+		foreach (array(
 			'calendar_id' => lang('Calendar ID'),
 			'calendar_title' => lang('Title'),
 			'calendar_description' => lang('Description'),
@@ -663,7 +663,7 @@ 
 			'calendar_owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('start', 'end')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -676,13 +676,13 @@ 
 
 		echo '<tr><td colspan="4"><h3>'.lang('Range fields').":</h3></td></tr>";
 		echo '<tr><td colspan="4">'.lang('If you select a range (month, week, etc) instead of a list of entries, these extra fields are available').'</td></tr>';
-		foreach(array_keys(self::$range_tags) as $name)
+		foreach (array_keys(self::$range_tags) as $name)
 		{
 			echo '<tr><td>{{range/'.$name.'}}</td><td>'.lang($name)."</td></tr>\n";
 		}
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
 		$custom = Api\Storage\Customfields::get('calendar');
-		foreach($custom as $name => $field)
+		foreach ($custom as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -691,9 +691,9 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Participants').":</h3></td></tr>";
 		echo '<tr><td>{{calendar_participants/account}}</td><td colspan="3">'.lang('Accounts')."</td></tr>\n";
 		echo '<tr><td>{{calendar_participants/group}}</td><td colspan="3">'.lang('Groups')."</td></tr>\n";
-		foreach($this->bo->resources as $resource)
+		foreach ($this->bo->resources as $resource)
 		{
-			if($resource['type'])
+			if ($resource['type'])
 			{
 				echo '<tr><td>{{calendar_participants/'.$resource['app'].'}}</td><td colspan="3">'.lang($resource['app'])."</td></tr>\n";
 			}
@@ -710,19 +710,19 @@ 
 		echo '<tr style="vertical-align:top"><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Day of week tables').":</h3></td></tr>";
 		$days = array();
-		for($i = 0; $i < 7; $i++)
+		for ($i = 0; $i < 7; $i++)
 		{
-			$days[date('N',strtotime("+$i days"))] = date('l',strtotime("+$i days"));
+			$days[date('N', strtotime("+$i days"))] = date('l', strtotime("+$i days"));
 		}
 		ksort($days);
-		foreach($days as $day)
+		foreach ($days as $day)
 		{
-			echo '<tr><td>{{table/'.$day. '}} ... {{endtable}}</td></tr>';
+			echo '<tr><td>{{table/'.$day.'}} ... {{endtable}}</td></tr>';
 		}
 		echo '</table></td><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Daily tables').":</h3></td></tr>";
-		foreach(self::$relative as $value) {
-			echo '<tr><td>{{table/'.$value. '}} ... {{endtable}}</td></tr>';
+		foreach (self::$relative as $value) {
+			echo '<tr><td>{{table/'.$value.'}} ... {{endtable}}</td></tr>';
 		}
 		echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>';
 		echo '</table></td></tr>';
@@ -732,7 +732,7 @@ 
 		echo '<tr><td>{{day/birthdays}}</td><td colspan="3">'.lang('Birthdays').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
 			'attachments' => lang('List of files linked to the current record'),

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

@@ -617,7 +617,7 @@
 	protected function get_birthdays($day)
 	{
 		$contacts = new Api\Contacts();
-		$birthdays = Array();
+		$birthdays = array();
 		foreach($contacts->get_addressbooks() as $owner => $name)
 		{
 			$birthdays += $contacts->read_birthdays($owner, substr($day, 0, 4));

importexport/inc/class.importexport_widget_filter.inc.php

Spacing +21 added lines, -21 removed lines

@@ -41,18 +41,18 @@ 
 	public function beforeSendToClient($cname, Array $expand = Array())
 	{
 		$form_name = self::form_name($cname, $this->id);
-		if($this->getElementAttribute($form_name, 'customfields'))
+		if ($this->getElementAttribute($form_name, 'customfields'))
 		{
 			// Already done?  Still need to process, or sel_options may be missing
 			unset(self::$request->modifications[$form_name]);
 		}
-		$value =& self::get_array(self::$request->content, $form_name, true);
+		$value = & self::get_array(self::$request->content, $form_name, true);
 		$fields = $value['fields'];
 		unset($value['fields']);
 		$relative_dates = $this->attrs['relative_dates'];
 
 		// Fallback, so there's something there...
-		if(!is_array($fields))
+		if (!is_array($fields))
 		{
 			error_log("$this has no fields");
 			self::$transformation = array(
@@ -69,14 +69,14 @@ 
 		$this->setElementAttribute($form_name, 'prefix', self::$prefix);
 		
 		$n = 1;
-		foreach($fields as $lname => &$field)
+		foreach ($fields as $lname => &$field)
 		{
-			$type =& $field['type'];
+			$type = & $field['type'];
 			
 			// No filters are required
 			$field['needed'] = false;
 			
-			switch($type)
+			switch ($type)
 			{
 				case 'date':
 				case 'date-time':
@@ -93,7 +93,7 @@ 
 						'get_rows'      => 'etemplate.ajax_select_widget.array_rows',
 						'id_field'      => ajax_select_widget::ARRAY_KEY,
 					);
-					if($field['rows']) {
+					if ($field['rows']) {
 						$options['num_rows'] = $field['rows'];
 					}
 
@@ -112,22 +112,22 @@ 
 					break;
 				case 'select':
 				default:
-					if(strpos($field['type'],'select') === 0)
+					if (strpos($field['type'], 'select') === 0)
 					{
 						if (count($field['values']) == 1 && isset($field['values']['@']))
 						{
 							$field['values'] = Api\Storage\Customfields::get_options_from_file($field['values']['@']);
 						}
-						foreach((array)$field['values'] as $key => $val)
+						foreach ((array)$field['values'] as $key => $val)
 						{
-							if (substr($val = lang($val),-1) != '*')
+							if (substr($val = lang($val), -1) != '*')
 							{
 								$field['values'][$key] = $val;
 							}
 						}
 
 						// We don't want the 'All' or 'Select...' if it's there
-						if(is_array($field['values']) && $field['values'][''])
+						if (is_array($field['values']) && $field['values'][''])
 						{
 							unset($field['values']['']);
 						}
@@ -135,27 +135,27 @@ 
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'tags', TRUE);
 						$this->setElementAttribute($form_name.'['.self::$prefix.$lname.']', 'multiple', TRUE);
 					}
-					else if( $GLOBALS['egw_info']['apps'][$field['type']])
+					else if ($GLOBALS['egw_info']['apps'][$field['type']])
 					{
 						// Links
 					}
 					else
 					{
-						error_log('Trying to filter with unsupported field type ' . $lname . ': ' . $field['type']);
+						error_log('Trying to filter with unsupported field type '.$lname.': '.$field['type']);
 					}
 			}
 
 			// Send select options
-			if($field['values'])
+			if ($field['values'])
 			{
 				self::$request->sel_options[self::$prefix.$lname] = $field['values'];
 			}
 			$widget = self::factory($type, '<'.$type.' type="'.$type.'" id="'.self::$prefix.$lname.'"/>', self::$prefix.$lname);
-			if(method_exists($widget, 'beforeSendToClient'))
+			if (method_exists($widget, 'beforeSendToClient'))
 			{
 				$widget->id = self::$prefix.$lname;
 				$widget->attrs['type'] = $type;
-				if($type == 'link-to')
+				if ($type == 'link-to')
 				{
 					$widget->attrs['only_app'] = $field['type'];
 				}
@@ -167,22 +167,22 @@ 
 		parent::beforeSendToClient($cname, $expand);
 
 		$this->setElementAttribute($form_name, 'customfields', $fields);
-		$this->setElementAttribute($form_name, 'fields',array_fill_keys(array_keys($fields), true));
+		$this->setElementAttribute($form_name, 'fields', array_fill_keys(array_keys($fields), true));
 		return false;
 	}
 	
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		if (!$this->is_readonly($cname, $form_name))
 		{
 			$value_in = (array)self::get_array($content, $form_name);
-			$valid =& self::get_array($validated, $this->id ? $form_name : $field, true);
+			$valid = & self::get_array($validated, $this->id ? $form_name : $field, true);
 
-			foreach($value_in as $key => $value)
+			foreach ($value_in as $key => $value)
 			{
 				// Client side cf widget automatically prefixes #
-				$valid[substr($key,strlen(self::$prefix))] = $value;
+				$valid[substr($key, strlen(self::$prefix))] = $value;
 			}
 		}
 	}

importexport/inc/class.importexport_export_ui.inc.php

Spacing +73 added lines, -73 removed lines

@@ -36,46 +36,46 @@ 
 	private $export_plugins;
 
 	public function __construct() {
-		Framework::includeJS('.','export_dialog','importexport');
-		Framework::includeJS('.','importexport','importexport');
+		Framework::includeJS('.', 'export_dialog', 'importexport');
+		Framework::includeJS('.', 'importexport', 'importexport');
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
-		$this->export_plugins = importexport_helper_functions::get_plugins('all','export');
+		$this->export_plugins = importexport_helper_functions::get_plugins('all', 'export');
 
 	}
 
-	public function export_dialog($_content=array()) {
+	public function export_dialog($_content = array()) {
 		$tabs = 'general_tab|selection_tab|options_tab';
 		$sel_options = array();
 		$readonlys = array();
 		$preserv = array();
 
-		$et = new Etemplate(self::_appname. '.export_dialog');
+		$et = new Etemplate(self::_appname.'.export_dialog');
 		$_appname = $_content['appname'] ? $_content['appname'] : $_GET['appname'];
 		$_definition = $_content['definition'] ? $_content['definition'] : $_GET['definition'];
 		$_plugin = $_content['plugin'] ? $_content['plugin'] : $_GET['plugin'];
 		// Select all from context menu, means use all search results, not just selected
-		if($_GET['select_all'] == 'true') $_GET['selection'] = 'search';
+		if ($_GET['select_all'] == 'true') $_GET['selection'] = 'search';
 		$_selection = $_content['selection'] ? $_content['selection'] : $_GET['selection'];
-		if($_GET['selection'] || $_content['selection_passed']) $content['selection_passed'] = $preserv['selection_passed'] = true;
+		if ($_GET['selection'] || $_content['selection_passed']) $content['selection_passed'] = $preserv['selection_passed'] = true;
 
 		// Check global setting
-		if(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if (!Api\Storage\Merge::is_export_limit_excepted()) {
 			$export_limit = Api\Storage\Merge::getExportLimit($_appname);
-			if($export_limit == 'no') {
+			if ($export_limit == 'no') {
 				die(lang('Admin disabled exporting'));
 			}
 		}
 			//error_log(__FILE__.__FUNCTION__. '::$_GET[\'appname\']='. $_appname. ',$_GET[\'definition\']='. $_definition. ',$_GET[\'plugin\']='.$_plugin. ',$_GET[\'selection\']='.$_selection);
 		// if appname is given and valid, list available definitions (if no definition is given)
-		$readonlys['appname'] = (!empty($_appname) && $GLOBALS['egw']->acl->check('run',1,$_appname));
+		$readonlys['appname'] = (!empty($_appname) && $GLOBALS['egw']->acl->check('run', 1, $_appname));
 		$content['appname'] = $_appname;
 		$preserv['appname'] = $_appname;
-		if(empty($_appname)) {
-			$et->setElementAttribute('select_definition','disabled',true);
+		if (empty($_appname)) {
+			$et->setElementAttribute('select_definition', 'disabled', true);
 		}
 
 		// Check for preferred definition
-		if(!$_definition && $_appname) {
+		if (!$_definition && $_appname) {
 			$_definition = $GLOBALS['egw_info']['user']['preferences'][$_appname]['nextmatch-export-definition'];
 		}
 		// fill definitions
@@ -97,14 +97,14 @@ 
 			}
 			unset($definition);
 		}
-		if(count($sel_options['definition']) == 2 && !$content['definition']) {
+		if (count($sel_options['definition']) == 2 && !$content['definition']) {
 			$content['definition'] = end($sel_options['definition']);
 			unset($sel_options['definition']['']);
 		}
 		unset($definitions);
 		//$sel_options['definition']['expert'] = lang('Expert options');
 
-		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition'])) {
+		if (isset($_definition) && array_key_exists($_definition, $sel_options['definition'])) {
 			$content['definition'] = $_definition;
 		}
 
@@ -112,8 +112,8 @@ 
 		$sel_options['plugin'] = $this->export_plugins[$_appname]['export'];
 
 		// show definitions or plugins in ui?
-		if($content['definition'] == 'expert') {
-			if(isset($_plugin) && array_key_exists($_plugin,$sel_options['plugin'])) {
+		if ($content['definition'] == 'expert') {
+			if (isset($_plugin) && array_key_exists($_plugin, $sel_options['plugin'])) {
 				$content['plugin'] = $_plugin;
 				$selected_plugin = $_plugin;
 			}
@@ -131,7 +131,7 @@ 
 			$readonlys['save_definition'] = true;
 
 			$definition = new importexport_definition($content['definition']);
-			if($definition) {
+			if ($definition) {
 				$content += (array)$definition->plugin_options;
 				$selected_plugin = $definition->plugin;
 				$content['description'] = $definition->description;
@@ -148,27 +148,27 @@ 
 			'|'	=>	'|',
 			''	=>	lang('Other')
 		);
-		if(!$sel_options['delimiter'][$content['delimiter']]) $sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
-		$sel_options['delimiter'][$content['delimiter']] = lang('Use default') . ' "' . $sel_options['delimiter'][$content['delimiter']] . '"';
+		if (!$sel_options['delimiter'][$content['delimiter']]) $sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
+		$sel_options['delimiter'][$content['delimiter']] = lang('Use default').' "'.$sel_options['delimiter'][$content['delimiter']].'"';
 
-		if(!$_content['delimiter']) $et->setElementAttribute('other_delimiter','disabled',true);
+		if (!$_content['delimiter']) $et->setElementAttribute('other_delimiter', 'disabled', true);
 
 		// Other delimiter (options)
-		if($_content['other_delimiter']) $_content['delimiter'] = $_content['other_delimiter'];
+		if ($_content['other_delimiter']) $_content['delimiter'] = $_content['other_delimiter'];
 
 		// handle selector
-		if($selected_plugin) {
+		if ($selected_plugin) {
 			$content['plugin'] = $selected_plugin;
 			$plugin_object = new $selected_plugin;
 
 			$content['description'] = $plugin_object->get_description();
 
 			// fill options tab
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+ 			if (method_exists($plugin_object, 'get_selectors_html')) {
 				$content['plugin_options_html'] = $plugin_object->get_options_html();
 			} else {
 				$options = $plugin_object->get_options_etpl($definition);
-				if(is_array($options)) {
+				if (is_array($options)) {
 					$content['plugin_options_template'] = $options['name'];
 					$content += (array)$options['content'];
 					$sel_options += (array)$options['sel_options'];
@@ -181,7 +181,7 @@ 
 		}
 
 		// fill selection tab
-		if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
+		if ($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
 			$_selection = $definition->plugin_options['selection'];
 		}
 
@@ -191,11 +191,11 @@ 
 			$preserv['selection'] = $_selection;
 		}
 		elseif ($plugin_object) {
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+ 			if (method_exists($plugin_object, 'get_selectors_html')) {
 				$content['plugin_selectors_html'] = $plugin_object->get_selectors_html();
 			} else {
 				$options = $plugin_object->get_selectors_etpl($definition);
-				if(is_array($options)) {
+				if (is_array($options)) {
 					$content += is_array($options['content']) ? $options['content'] : array('selection' => $options['content']);
 					$sel_options += (array)$options['sel_options'];
 					$readonlys['selection'] = (array)$options['readonlys'];
@@ -205,12 +205,12 @@ 
 					$content['plugin_selectors_template'] = $options;
 				}
 			}
-			if(!$content['plugin_selectors_html'] && !$content['plugin_selectors_template']) {
+			if (!$content['plugin_selectors_html'] && !$content['plugin_selectors_template']) {
 				$readonlys[$tabs]['selection_tab'] = true;
 			}
 			$content['filter'] = $definition->filter;
 			$content['filter']['fields'] = importexport_helper_functions::get_filter_fields($_appname, $selected_plugin);
-			if(!$content['filter']['fields'])
+			if (!$content['filter']['fields'])
 			{
 				$content['no_filter'] = true;
 			}
@@ -228,7 +228,7 @@ 
 		{
 			$content['selection'] = 'filter';
 		}
-		if(!$content['selection'])
+		if (!$content['selection'])
 		{
 			$content['selection'] = 'search';
 		}
@@ -239,33 +239,33 @@ 
 		//error_log(__METHOD__.__LINE__.array2string($apps));
 		if (empty($apps)) throw new Exception('Error: no application profiles available for export');
 		if (!is_array($apps) && $apps) $apps = (array)$apps;
-		$sel_options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
-		if(!$_application && !$selected_plugin) {
+		$sel_options['appname'] = array('' => lang('Select one')) + array_combine($apps, $apps);
+		if (!$_application && !$selected_plugin) {
 			$content['plugin_selectors_html'] = $content['plugin_options_html'] =
 			lang('You need to select an app and format first!');
 			$readonlys[$tabs] = array('selection_tab' => true, 'options_tab' => true);
 		}
 
-		if($_content['preview'] || $_content['export'])
+		if ($_content['preview'] || $_content['export'])
 		{
 			//error_log(__LINE__.__FILE__.'$_content: '.print_r($_content,true));
 			$response = Api\Json\Response::get();
 
 			if ($_content['definition'] == 'expert') {
 				$definition = new importexport_definition();
-				$definition->definition_id	= $_content['definition_id'] ? $_content['definition_id'] : '';
+				$definition->definition_id = $_content['definition_id'] ? $_content['definition_id'] : '';
 				$definition->name		= $_content['name'] ? $_content['name'] : '';
-				$definition->application	= $_content['appname'];
-				$definition->plugin		= $_content['plugin'];
+				$definition->application = $_content['appname'];
+				$definition->plugin = $_content['plugin'];
 				$definition->type		= 'export';
-				$definition->allowed_users	= $_content['allowed_users'] ? $_content['allowed_users'] : $this->user;
-				$definition->owner		= $_content['owner'] ? $_content['owner'] : $this->user;
+				$definition->allowed_users = $_content['allowed_users'] ? $_content['allowed_users'] : $this->user;
+				$definition->owner = $_content['owner'] ? $_content['owner'] : $this->user;
 			}
 			else {
 				$definition = new importexport_definition($_content['definition']);
 			}
 
-			if(!is_array($definition->plugin_options)) {
+			if (!is_array($definition->plugin_options)) {
 				$definition->plugin_options = array(
 					'mapping'	=>	array()
 				);
@@ -275,30 +275,30 @@ 
 			// Note that because not all dates are DB dates, the plugin has to handle them
 			$filter = array();
 			$_content['filter'] = $_content['filter_html'] ? $_content['filter_html'] : $_content['filter_tpl'];
-			if(is_array($_content['filter']))
+			if (is_array($_content['filter']))
 			{
-				foreach($_content['filter'] as $key => $value)
+				foreach ($_content['filter'] as $key => $value)
 				{
 					// Handle multiple values
-					if(!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
+					if (!is_array($value) && strpos($value, ',') !== false) $value = explode(',', $value);
 
 					$filter[$key] = $value;
 
 					// Skip empty values or empty ranges
-					if($value == "" || is_null($value) || (is_array($value) && count($value) == 0) || is_array($value) && array_key_exists('from',$value) && !$value['from'] && !$value['to'] )
+					if ($value == "" || is_null($value) || (is_array($value) && count($value) == 0) || is_array($value) && array_key_exists('from', $value) && !$value['from'] && !$value['to'])
 					{
 						unset($filter[$key]);
 					}
-					if(is_array($value) && array_key_exists('from', $value) && $value['from'])
+					if (is_array($value) && array_key_exists('from', $value) && $value['from'])
 					{
-						$filter[$key]['from'] = Api\DateTime::to($value['from'],'ts');
+						$filter[$key]['from'] = Api\DateTime::to($value['from'], 'ts');
 					}
 					// If user selects an end date, they most likely want entries including that date
-					if(is_array($value) && array_key_exists('to',$value) && $value['to'] )
+					if (is_array($value) && array_key_exists('to', $value) && $value['to'])
 					{
 						// Adjust time to 23:59:59
 						$filter[$key]['to'] = new Api\DateTime($value['to']);
-						$filter[$key]['to']->setTime(23,59,59);
+						$filter[$key]['to']->setTime(23, 59, 59);
 						$filter[$key]['to'] = $filter[$key]['to']->format('ts');
 					}
 				}
@@ -312,19 +312,19 @@ 
 				$_content
 			);
 
-			if(!$definition->plugin_options['selection']) {
-				$response->alert( lang('No records selected'));
+			if (!$definition->plugin_options['selection']) {
+				$response->alert(lang('No records selected'));
 				return;
 			}
 
-			$tmpfname = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'export');
+			$tmpfname = tempnam($GLOBALS['egw_info']['server']['temp_dir'], 'export');
 			$file = fopen($tmpfname, "w+");
-			if (! $charset = $definition->plugin_options['charset']) {
+			if (!$charset = $definition->plugin_options['charset']) {
 				$charset = Api\Translation::charset();
 			}
-			if($charset == 'user')
+			if ($charset == 'user')
 			{
-				switch($definition->plugin)
+				switch ($definition->plugin)
 				{
 					case 'addressbook_export_vcard':
 						$charset = $GLOBALS['egw_info']['user']['preferences']['addressbook']['vcard_charset'];
@@ -334,9 +334,9 @@ 
 				}
 			}
 			$plugin_object = new $definition->plugin;
-			$result = $plugin_object->export( $file, $definition );
+			$result = $plugin_object->export($file, $definition);
 
-			if(is_object($result) && method_exists($result, 'get_num_of_records'))
+			if (is_object($result) && method_exists($result, 'get_num_of_records'))
 			{
 				$record_count = $result->get_num_of_records();
 			}
@@ -344,7 +344,7 @@ 
 			// Store charset to use in header
 			Api\Cache::setSession('importexport', $tmpfname, $charset, 100);
 
-			if($_content['export'] == 'pressed') {
+			if ($_content['export'] == 'pressed') {
 				fclose($file);
 				$filename = pathinfo($tmpfname, PATHINFO_FILENAME);
 				$link_query = array(
@@ -356,25 +356,25 @@ 
 				);
 
 				// Allow plugins to suggest a file name - return false if they have no suggestion
-				if(method_exists($plugin_object, 'get_filename') && $plugin_filename = $plugin_object->get_filename())
+				if (method_exists($plugin_object, 'get_filename') && $plugin_filename = $plugin_object->get_filename())
 				{
 					$link_query['filename'] = $plugin_filename;
 				}
-				$response->redirect( $GLOBALS['egw']->link('/index.php',$link_query),true);
+				$response->redirect($GLOBALS['egw']->link('/index.php', $link_query), true);
 				Framework::window_close();
 				return;
 			}
-			elseif($_content['preview'] == 'pressed') {
+			elseif ($_content['preview'] == 'pressed') {
 				fseek($file, 0);
 				$item_count = 1;
 				$preview = '';
-				$search = array('[\016]','[\017]',
-								'[\020]','[\021]','[\022]','[\023]','[\024]','[\025]','[\026]','[\027]',
-								'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
+				$search = array('[\016]', '[\017]',
+								'[\020]', '[\021]', '[\022]', '[\023]', '[\024]', '[\025]', '[\026]', '[\027]',
+								'[\030]', '[\031]', '[\032]', '[\033]', '[\034]', '[\035]', '[\036]', '[\037]');
 				$replace = $preview = '';
 
-				while(!feof($file) && $item_count < 30) {
-					$preview .= preg_replace($search,$replace,fgets($file,1024));
+				while (!feof($file) && $item_count < 30) {
+					$preview .= preg_replace($search, $replace, fgets($file, 1024));
 					$item_count++;
 				}
 
@@ -382,12 +382,12 @@ 
 				unlink($tmpfname);
 
 				// Convert back to system charset for display
-				$preview = Api\Translation::convert( $preview,
+				$preview = Api\Translation::convert($preview,
 					$charset,
 					Api\Translation::charset()
 				);
 
-				$preview = "<div class='header'>".lang('Preview') . "<span class='count'>".(int)$record_count."</span></div>".$preview;
+				$preview = "<div class='header'>".lang('Preview')."<span class='count'>".(int)$record_count."</span></div>".$preview;
 
 				$et->setElementAttribute('preview-box', 'value', nl2br($preview));
 				return;
@@ -399,7 +399,7 @@ 
 			$readonlys[$tabs]['selection'] = false;
 		}
 		//error_log(print_r($content,true));
-		return $et->exec(self::_appname. '.importexport_export_ui.export_dialog',$content,$sel_options,$readonlys,$preserv,2);
+		return $et->exec(self::_appname.'.importexport_export_ui.export_dialog', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	public function ajax_get_definition_description($_definition) {
@@ -414,7 +414,7 @@ 
 			}
 			unset ($_object);
 		}
-		$_response->assign('importexport-export_dialog_plugin_description','innerHTML',$description);
+		$_response->assign('importexport-export_dialog_plugin_description', 'innerHTML', $description);
 	}
 
 	public function ajax_get_plugin_description($_plugin) {
@@ -424,7 +424,7 @@ 
 		if (is_a($plugin_object, 'importexport_iface_export_plugin')) {
 			$description = $plugin_object->get_description();
 		}
-		$_response->addAssign('importexport-export_dialog_plugin_description','innerHTML',$description);
+		$_response->addAssign('importexport-export_dialog_plugin_description', 'innerHTML', $description);
 
 		unset ($plugin_object);
 	}
@@ -437,7 +437,7 @@ 
 	 */
 	public function download($_tmpfname = '') {
 		$tmpfname = $_tmpfname ? $_tmpfname : $_GET['_filename'];
-		$tmpfname = $GLOBALS['egw_info']['server']['temp_dir'] .'/'. $tmpfname;
+		$tmpfname = $GLOBALS['egw_info']['server']['temp_dir'].'/'.$tmpfname;
 		if (!is_readable($tmpfname)) die();
 
 		$appname = $_GET['_appname'];
@@ -446,13 +446,13 @@ 
 		// Turn off all output buffering
 		while (@ob_end_clean());
 
-		$file = fopen($tmpfname,'rb');
+		$file = fopen($tmpfname, 'rb');
 
 		// Get charset
 		$charset = Api\Cache::getSession('importexport', $tmpfname);
 
 		Api\Header\Content::type($nicefname.'.'.$_GET['_suffix'],
-			($_GET['_type'] ? $_GET['_type'] : 'application/text') . ($charset ? '; charset='.$charset : ''),
+			($_GET['_type'] ? $_GET['_type'] : 'application/text').($charset ? '; charset='.$charset : ''),
 			filesize($tmpfname));
 		fpassthru($file);
 

Braces +129 added lines, -53 removed lines

@@ -18,7 +18,8 @@ 
  * userinterface for exports
  *
  */
-class importexport_export_ui {
+class importexport_export_ui
+{
 	const _appname = 'importexport';
 
 	public $public_functions = array(
@@ -35,7 +36,8 @@ 
 	 */
 	private $export_plugins;
 
-	public function __construct() {
+	public function __construct()
+	{
 		Framework::includeJS('.','export_dialog','importexport');
 		Framework::includeJS('.','importexport','importexport');
 		$this->user = $GLOBALS['egw_info']['user']['user_id'];
@@ -43,7 +45,8 @@ 
 
 	}
 
-	public function export_dialog($_content=array()) {
+	public function export_dialog($_content=array())
+	{
 		$tabs = 'general_tab|selection_tab|options_tab';
 		$sel_options = array();
 		$readonlys = array();
@@ -54,14 +57,22 @@ 
 		$_definition = $_content['definition'] ? $_content['definition'] : $_GET['definition'];
 		$_plugin = $_content['plugin'] ? $_content['plugin'] : $_GET['plugin'];
 		// Select all from context menu, means use all search results, not just selected
-		if($_GET['select_all'] == 'true') $_GET['selection'] = 'search';
+		if($_GET['select_all'] == 'true')
+		{
+			$_GET['selection'] = 'search';
+		}
 		$_selection = $_content['selection'] ? $_content['selection'] : $_GET['selection'];
-		if($_GET['selection'] || $_content['selection_passed']) $content['selection_passed'] = $preserv['selection_passed'] = true;
+		if($_GET['selection'] || $_content['selection_passed'])
+		{
+			$content['selection_passed'] = $preserv['selection_passed'] = true;
+		}
 
 		// Check global setting
-		if(!Api\Storage\Merge::is_export_limit_excepted()) {
+		if(!Api\Storage\Merge::is_export_limit_excepted())
+		{
 			$export_limit = Api\Storage\Merge::getExportLimit($_appname);
-			if($export_limit == 'no') {
+			if($export_limit == 'no')
+			{
 				die(lang('Admin disabled exporting'));
 			}
 		}
@@ -70,12 +81,14 @@ 
 		$readonlys['appname'] = (!empty($_appname) && $GLOBALS['egw']->acl->check('run',1,$_appname));
 		$content['appname'] = $_appname;
 		$preserv['appname'] = $_appname;
-		if(empty($_appname)) {
+		if(empty($_appname))
+		{
 			$et->setElementAttribute('select_definition','disabled',true);
 		}
 
 		// Check for preferred definition
-		if(!$_definition && $_appname) {
+		if(!$_definition && $_appname)
+		{
 			$_definition = $GLOBALS['egw_info']['user']['preferences'][$_appname]['nextmatch-export-definition'];
 		}
 		// fill definitions
@@ -85,26 +98,31 @@ 
 			'application' => isset($content['appname']) ? $content['appname'] : '*',
 			'plugin' => $_plugin ? $_plugin : '*'
 		));
-		foreach ((array)$definitions->get_definitions() as $identifier) {
+		foreach ((array)$definitions->get_definitions() as $identifier)
+		{
 			try {
 				$definition = new importexport_definition($identifier);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// permission error
 				continue;
 			}
-			if ($title = $definition->get_title()) {
+			if ($title = $definition->get_title())
+			{
 				$sel_options['definition'][$definition->get_identifier()] = $title;
 			}
 			unset($definition);
 		}
-		if(count($sel_options['definition']) == 2 && !$content['definition']) {
+		if(count($sel_options['definition']) == 2 && !$content['definition'])
+		{
 			$content['definition'] = end($sel_options['definition']);
 			unset($sel_options['definition']['']);
 		}
 		unset($definitions);
 		//$sel_options['definition']['expert'] = lang('Expert options');
 
-		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition'])) {
+		if(isset($_definition) && array_key_exists($_definition,$sel_options['definition']))
+		{
 			$content['definition'] = $_definition;
 		}
 
@@ -112,8 +130,10 @@ 
 		$sel_options['plugin'] = $this->export_plugins[$_appname]['export'];
 
 		// show definitions or plugins in ui?
-		if($content['definition'] == 'expert') {
-			if(isset($_plugin) && array_key_exists($_plugin,$sel_options['plugin'])) {
+		if($content['definition'] == 'expert')
+		{
+			if(isset($_plugin) && array_key_exists($_plugin,$sel_options['plugin']))
+			{
 				$content['plugin'] = $_plugin;
 				$selected_plugin = $_plugin;
 			}
@@ -126,12 +146,14 @@ 
 */
 			}
 		}
-		else {
+		else
+		{
 			$readonlys['plugin'] = true;
 			$readonlys['save_definition'] = true;
 
 			$definition = new importexport_definition($content['definition']);
-			if($definition) {
+			if($definition)
+			{
 				$content += (array)$definition->plugin_options;
 				$selected_plugin = $definition->plugin;
 				$content['description'] = $definition->description;
@@ -148,64 +170,90 @@ 
 			'|'	=>	'|',
 			''	=>	lang('Other')
 		);
-		if(!$sel_options['delimiter'][$content['delimiter']]) $sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
+		if(!$sel_options['delimiter'][$content['delimiter']])
+		{
+			$sel_options['delimiter'][$content['delimiter']] = $content['delimiter'];
+		}
 		$sel_options['delimiter'][$content['delimiter']] = lang('Use default') . ' "' . $sel_options['delimiter'][$content['delimiter']] . '"';
 
-		if(!$_content['delimiter']) $et->setElementAttribute('other_delimiter','disabled',true);
+		if(!$_content['delimiter'])
+		{
+			$et->setElementAttribute('other_delimiter','disabled',true);
+		}
 
 		// Other delimiter (options)
-		if($_content['other_delimiter']) $_content['delimiter'] = $_content['other_delimiter'];
+		if($_content['other_delimiter'])
+		{
+			$_content['delimiter'] = $_content['other_delimiter'];
+		}
 
 		// handle selector
-		if($selected_plugin) {
+		if($selected_plugin)
+		{
 			$content['plugin'] = $selected_plugin;
 			$plugin_object = new $selected_plugin;
 
 			$content['description'] = $plugin_object->get_description();
 
 			// fill options tab
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+ 			if(method_exists($plugin_object, 'get_selectors_html'))
+ 			{
 				$content['plugin_options_html'] = $plugin_object->get_options_html();
-			} else {
+			}
+			else
+			{
 				$options = $plugin_object->get_options_etpl($definition);
-				if(is_array($options)) {
+				if(is_array($options))
+				{
 					$content['plugin_options_template'] = $options['name'];
 					$content += (array)$options['content'];
 					$sel_options += (array)$options['sel_options'];
 					$readonlys += (array)$options['readonlys'];
 					$preserv += (array)$options['preserv'];
-				} else {
+				}
+				else
+				{
 					$content['plugin_options_template'] = $options;
 				}
 			}
 		}
 
 		// fill selection tab
-		if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed']) {
+		if($definition && is_array($definition->plugin_options) && $definition->plugin_options['selection'] && !$content['selection_passed'])
+		{
 			$_selection = $definition->plugin_options['selection'];
 		}
 
-		if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed'])) {
+		if ($_selection && ($content['old_definition'] == $content['definition'] || $content['selection_passed']))
+		{
 			$readonlys[$tabs]['selection_tab'] = true;
 			$content['selection'] = $_selection;
 			$preserv['selection'] = $_selection;
 		}
-		elseif ($plugin_object) {
- 			if(method_exists($plugin_object, 'get_selectors_html')) {
+		elseif ($plugin_object)
+		{
+ 			if(method_exists($plugin_object, 'get_selectors_html'))
+ 			{
 				$content['plugin_selectors_html'] = $plugin_object->get_selectors_html();
-			} else {
+			}
+			else
+			{
 				$options = $plugin_object->get_selectors_etpl($definition);
-				if(is_array($options)) {
+				if(is_array($options))
+				{
 					$content += is_array($options['content']) ? $options['content'] : array('selection' => $options['content']);
 					$sel_options += (array)$options['sel_options'];
 					$readonlys['selection'] = (array)$options['readonlys'];
 					$preserv['selection'] = (array)$options['preserv'];
 					$content['plugin_selectors_template'] = $options['name'];
-				} else {
+				}
+				else
+				{
 					$content['plugin_selectors_template'] = $options;
 				}
 			}
-			if(!$content['plugin_selectors_html'] && !$content['plugin_selectors_template']) {
+			if(!$content['plugin_selectors_html'] && !$content['plugin_selectors_template'])
+			{
 				$readonlys[$tabs]['selection_tab'] = true;
 			}
 			$content['filter'] = $definition->filter;
@@ -237,10 +285,17 @@ 
 		unset ($plugin_object);
 		$apps = importexport_helper_functions::get_apps('export');
 		//error_log(__METHOD__.__LINE__.array2string($apps));
-		if (empty($apps)) throw new Exception('Error: no application profiles available for export');
-		if (!is_array($apps) && $apps) $apps = (array)$apps;
+		if (empty($apps))
+		{
+			throw new Exception('Error: no application profiles available for export');
+		}
+		if (!is_array($apps) && $apps)
+		{
+			$apps = (array)$apps;
+		}
 		$sel_options['appname'] = array('' => lang('Select one')) + array_combine($apps,$apps);
-		if(!$_application && !$selected_plugin) {
+		if(!$_application && !$selected_plugin)
+		{
 			$content['plugin_selectors_html'] = $content['plugin_options_html'] =
 			lang('You need to select an app and format first!');
 			$readonlys[$tabs] = array('selection_tab' => true, 'options_tab' => true);
@@ -251,7 +306,8 @@ 
 			//error_log(__LINE__.__FILE__.'$_content: '.print_r($_content,true));
 			$response = Api\Json\Response::get();
 
-			if ($_content['definition'] == 'expert') {
+			if ($_content['definition'] == 'expert')
+			{
 				$definition = new importexport_definition();
 				$definition->definition_id	= $_content['definition_id'] ? $_content['definition_id'] : '';
 				$definition->name		= $_content['name'] ? $_content['name'] : '';
@@ -261,11 +317,13 @@ 
 				$definition->allowed_users	= $_content['allowed_users'] ? $_content['allowed_users'] : $this->user;
 				$definition->owner		= $_content['owner'] ? $_content['owner'] : $this->user;
 			}
-			else {
+			else
+			{
 				$definition = new importexport_definition($_content['definition']);
 			}
 
-			if(!is_array($definition->plugin_options)) {
+			if(!is_array($definition->plugin_options))
+			{
 				$definition->plugin_options = array(
 					'mapping'	=>	array()
 				);
@@ -280,7 +338,10 @@ 
 				foreach($_content['filter'] as $key => $value)
 				{
 					// Handle multiple values
-					if(!is_array($value) && strpos($value,',') !== false) $value = explode(',',$value);
+					if(!is_array($value) && strpos($value,',') !== false)
+					{
+						$value = explode(',',$value);
+					}
 
 					$filter[$key] = $value;
 
@@ -312,14 +373,16 @@ 
 				$_content
 			);
 
-			if(!$definition->plugin_options['selection']) {
+			if(!$definition->plugin_options['selection'])
+			{
 				$response->alert( lang('No records selected'));
 				return;
 			}
 
 			$tmpfname = tempnam($GLOBALS['egw_info']['server']['temp_dir'],'export');
 			$file = fopen($tmpfname, "w+");
-			if (! $charset = $definition->plugin_options['charset']) {
+			if (! $charset = $definition->plugin_options['charset'])
+			{
 				$charset = Api\Translation::charset();
 			}
 			if($charset == 'user')
@@ -344,7 +407,8 @@ 
 			// Store charset to use in header
 			Api\Cache::setSession('importexport', $tmpfname, $charset, 100);
 
-			if($_content['export'] == 'pressed') {
+			if($_content['export'] == 'pressed')
+			{
 				fclose($file);
 				$filename = pathinfo($tmpfname, PATHINFO_FILENAME);
 				$link_query = array(
@@ -364,7 +428,8 @@ 
 				Framework::window_close();
 				return;
 			}
-			elseif($_content['preview'] == 'pressed') {
+			elseif($_content['preview'] == 'pressed')
+			{
 				fseek($file, 0);
 				$item_count = 1;
 				$preview = '';
@@ -373,7 +438,8 @@ 
 								'[\030]','[\031]','[\032]','[\033]','[\034]','[\035]','[\036]','[\037]');
 				$replace = $preview = '';
 
-				while(!feof($file) && $item_count < 30) {
+				while(!feof($file) && $item_count < 30)
+				{
 					$preview .= preg_replace($search,$replace,fgets($file,1024));
 					$item_count++;
 				}
@@ -394,7 +460,9 @@ 
 			}
 			//nothing else expected!
 			throw new Exception('Error: unexpected submit in export_dialog!');
-		} else {
+		}
+		else
+		{
 			$readonlys[$tabs]['selection'] = true;
 			$readonlys[$tabs]['selection'] = false;
 		}
@@ -402,14 +470,16 @@ 
 		return $et->exec(self::_appname. '.importexport_export_ui.export_dialog',$content,$sel_options,$readonlys,$preserv,2);
 	}
 
-	public function ajax_get_definition_description($_definition) {
+	public function ajax_get_definition_description($_definition)
+	{
 
 		$_response = Api\Json\Response::get();
 		$description = '';
 		if ($_definition)
 		{
 			$_object = new importexport_definition($_definition);
-			if (is_a($_object, 'importexport_definition')) {
+			if (is_a($_object, 'importexport_definition'))
+			{
 				$description = $_object->description;
 			}
 			unset ($_object);
@@ -417,11 +487,13 @@ 
 		$_response->assign('importexport-export_dialog_plugin_description','innerHTML',$description);
 	}
 
-	public function ajax_get_plugin_description($_plugin) {
+	public function ajax_get_plugin_description($_plugin)
+	{
 		$_respone = Api\Json\Response::get();
 
 		$plugin_object = new $_plugin;
-		if (is_a($plugin_object, 'importexport_iface_export_plugin')) {
+		if (is_a($plugin_object, 'importexport_iface_export_plugin'))
+		{
 			$description = $plugin_object->get_description();
 		}
 		$_response->addAssign('importexport-export_dialog_plugin_description','innerHTML',$description);
@@ -435,10 +507,14 @@ 
 	 * @param sting $_tmpfname
 	 * @todo we need a suffix atibute in plugins e.g. .csv
 	 */
-	public function download($_tmpfname = '') {
+	public function download($_tmpfname = '')
+	{
 		$tmpfname = $_tmpfname ? $_tmpfname : $_GET['_filename'];
 		$tmpfname = $GLOBALS['egw_info']['server']['temp_dir'] .'/'. $tmpfname;
-		if (!is_readable($tmpfname)) die();
+		if (!is_readable($tmpfname))
+		{
+			die();
+		}
 
 		$appname = $_GET['_appname'];
 		$nicefname = $_GET['filename'] ? $_GET['filename'] : 'egw_export_'.$appname.'-'.date('Y-m-d');