EGroupware / egroupware

calendar/inc/class.calendar_datasource.inc.php

Spacing +9 added lines, -9 removed lines

@@ -24,7 +24,7 @@ 
 	 */
 	function __construct()
 	{
-		if (false) parent::__construct();	// can not be called, but gives IDE warning
+		if (false) parent::__construct(); // can not be called, but gives IDE warning
 
 		$this->datasource('calendar');
 
@@ -48,14 +48,14 @@ 
 
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $cal->read((int) $data_id)))
+			if (!(int)$data_id || !($data = $cal->read((int)$data_id)))
 			{
 				return false;
 			}
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		$ds = array(
 			'pe_title' => $cal->link_title($data),
@@ -65,7 +65,7 @@ 
 			'pe_details'       => $data['description'] ? nl2br($data['description']) : '',
 		);
 		// return first global category, as PM only supports one
-		foreach($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
+		foreach ($data['category'] ? explode(',', $data['category']) : array() as $cat_id)
 		{
 			if (Api\Categories::is_global($cat_id))
 			{
@@ -74,13 +74,13 @@ 
 			}
 		}
 		// calculation of the time
-		$ds['pe_planned_time'] = (int) (($ds['pe_planned_end'] - $ds['pe_planned_start'])/60);	// time is in minutes
+		$ds['pe_planned_time'] = (int)(($ds['pe_planned_end'] - $ds['pe_planned_start']) / 60); // time is in minutes
 
 		// if the event spans multiple days, we have to substract the nights (24h - daily working time specified in PM)
-		if (($ds['pe_planned_time']/ 60 > 24) && date('Y-m-d',$ds['pe_planned_end']) != date('Y-m-d',$ds['pe_planned_start']))
+		if (($ds['pe_planned_time'] / 60 > 24) && date('Y-m-d', $ds['pe_planned_end']) != date('Y-m-d', $ds['pe_planned_start']))
 		{
 			$start = $end = null;
-			foreach(array('start','end') as $name)
+			foreach (array('start', 'end') as $name)
 			{
 				$arr = $cal->date2array($ds['pe_planned_'.$name]);
 				$arr['hour'] = 12;
@@ -92,7 +92,7 @@ 
 
 			if (!is_array($this->pm_config))
 			{
-				$c =& CreateObject('phpgwapi.config','projectmanager');
+				$c = & CreateObject('phpgwapi.config', 'projectmanager');
 				$c->read_repository();
 				$this->pm_config = $c->config_data;
 				unset($c);
@@ -100,7 +100,7 @@ 
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
-		foreach($data['participants'] as $uid => $status)
+		foreach ($data['participants'] as $uid => $status)
 		{
 			if ($status != 'R' && is_numeric($uid))	// only users for now
 			{

Braces +13 added lines, -3 removed lines

@@ -24,7 +24,11 @@ 
 	 */
 	function __construct()
 	{
-		if (false) parent::__construct();	// can not be called, but gives IDE warning
+		if (false)
+		{
+			parent::__construct();
+		}
+		// can not be called, but gives IDE warning
 
 		$this->datasource('calendar');
 
@@ -96,16 +100,22 @@ 
 				$c->read_repository();
 				$this->pm_config = $c->config_data;
 				unset($c);
-				if (!$this->pm_config['hours_per_workday']) $this->pm_config['hours_per_workday'] = 8;
+				if (!$this->pm_config['hours_per_workday'])
+				{
+					$this->pm_config['hours_per_workday'] = 8;
+				}
 			}
 			$ds['pe_planned_time'] -= $nights * 60 * (24 - $this->pm_config['hours_per_workday']);
 		}
 		foreach($data['participants'] as $uid => $status)
 		{
-			if ($status != 'R' && is_numeric($uid))	// only users for now
+			if ($status != 'R' && is_numeric($uid))
+			{
+				// only users for now
 			{
 				$ds['pe_resources'][] = $uid;
 			}
+			}
 		}
 		// if we have multiple participants we have to multiply the time by the number of participants to get the total time
 		$ds['pe_planned_time'] *= count($ds['pe_resources']);

calendar/inc/class.calendar_wizard_import_csv.inc.php

Spacing +2 added lines, -2 removed lines

@@ -33,7 +33,7 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('calendar');
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -53,7 +53,7 @@ 
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" ;
+		$content['msg'] .= "\n*";
 
 		return $result;
 	}

Braces +2 added lines, -1 removed lines

@@ -47,7 +47,8 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

calendar/inc/class.calendar_export_ical.inc.php

Spacing +15 added lines, -15 removed lines

@@ -23,7 +23,7 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 		$this->bo = new calendar_bo();
 		$boical = new calendar_ical();
@@ -34,34 +34,34 @@ 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
 		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
 
-		if($options['selection'] == 'criteria')
+		if ($options['selection'] == 'criteria')
 		{
 			$query = array(
 				'start' => $options['criteria']['start'],
-				'end'   => strtotime('+1 day',$options['criteria']['end'])-1,
+				'end'   => strtotime('+1 day', $options['criteria']['end']) - 1,
 				'categories'	=> $options['categories'],
 				'daywise'       => false,
 				'users'         => $options['criteria']['owner'],
 				'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 			);
-			if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+			if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 				$query['offset'] = 0;
-				$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
+				$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 			}
-			$events =& $this->bo->search($query);
+			$events = & $this->bo->search($query);
 		}
 		// Scheduled export will use 'all', which we don't allow through UI
 		elseif ($options['selection'] == 'search_results' || $options['selection'] == 'all')
 		{
 			$states = Api\Cache::getSession('calendar', 'session_data');
-			if($states['view'] == 'listview')
+			if ($states['view'] == 'listview')
 			{
 				$query = Api\Cache::getSession('calendar', 'calendar_list');
-				$query['num_rows'] = -1;        // all
+				$query['num_rows'] = -1; // all
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
 
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 				$ui = new calendar_uilist();
@@ -73,12 +73,12 @@ 
 				$query = Api\Cache::getSession('calendar', 'session_data');
 				$query['users'] = explode(',', $query['owner']);
 				$query['num_rows'] = -1;
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
 				{
-					$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
+					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 
-				switch($states['view'])
+				switch ($states['view'])
 				{
 					case 'month':
 						$query += calendar_export_csv::get_query_month($states);
@@ -92,7 +92,7 @@ 
 					default:
 						// Let UI set the date ranges
 						$ui = new calendar_uiviews($query);
-						if(method_exists($ui, $states['view']))
+						if (method_exists($ui, $states['view']))
 						{
 							ob_start();
 							$ui->$states['view']();
@@ -114,13 +114,13 @@ 
 		// compile list of unique cal_id's, as iCal should contain whole series, not recurrences
 		// calendar_ical->exportVCal needs to read events again, to get them in server-time
 		$ids = array();
-		foreach($events as $event)
+		foreach ($events as $event)
 		{
 			$id = is_array($event) ? $event['id'] : $event;
 			if (($id = (int)$id)) $ids[$id] = $id;
 		}
 
-		$ical =& $boical->exportVCal($ids,'2.0','PUBLISH',false);
+		$ical = & $boical->exportVCal($ids, '2.0', 'PUBLISH', false);
 		fwrite($_stream, $ical);
 	}
 

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,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;

Braces +28 added lines, -12 removed lines

@@ -16,14 +16,16 @@ 
 /**
  * iCal export plugin of calendar
  */
-class calendar_export_ical extends calendar_export_csv {
+class calendar_export_ical extends calendar_export_csv
+{
 
 	/**
 	 * Exports records as defined in $_definition
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 		$this->bo = new calendar_bo();
 		$boical = new calendar_ical();
@@ -32,7 +34,10 @@ 
 		$cfs = array();
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		if (!$limit_exception)
+		{
+			$export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		}
 
 		if($options['selection'] == 'criteria')
 		{
@@ -44,7 +49,8 @@ 
 				'users'         => $options['criteria']['owner'],
 				'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 			);
-			if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+			if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+			{
 				$query['offset'] = 0;
 				$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
 			}
@@ -61,7 +67,8 @@ 
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
 
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				{
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 				$ui = new calendar_uilist();
@@ -117,7 +124,10 @@ 
 		foreach($events as $event)
 		{
 			$id = is_array($event) ? $event['id'] : $event;
-			if (($id = (int)$id)) $ids[$id] = $id;
+			if (($id = (int)$id))
+			{
+				$ids[$id] = $id;
+			}
 		}
 
 		$ical =& $boical->exportVCal($ids,'2.0','PUBLISH',false);
@@ -129,7 +139,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar iCal export');
 	}
 
@@ -138,7 +149,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports events from your Calendar in iCal format.");
 	}
 
@@ -147,11 +159,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
 		return 'text/calendar';
 	}
 
@@ -159,14 +173,16 @@ 
 	 * return html for options.
 	 *
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 	}
 
 	/**
 	 * returns selectors of this plugin
 	 *
 	 */
-	public function get_selectors_etpl($definition = null) {
+	public function get_selectors_etpl($definition = null)
+	{
 		$data = parent::get_selectors_etpl($definition);
 		return $data;
 	}

calendar/inc/class.calendar_hooks.inc.php

Spacing +34 added lines, -34 removed lines

@@ -28,7 +28,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but in function signature for hooks
+		unset($location); // not used, but in function signature for hooks
 		return array(
 			'query' => 'calendar.calendar_bo.link_query',
 			'title' => 'calendar.calendar_bo.link_title',
@@ -50,7 +50,7 @@ 
 			'add_id'     => 'link_id',
 			'add_popup'  => '850x590',
 			'file_access' => 'calendar.calendar_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'mime' => array(
 				'text/calendar' => array(
 					'menuaction' => 'calendar.calendar_uiforms.edit',
@@ -74,7 +74,7 @@ 
 	 */
 	static function getAppExportLimit($location)
 	{
-		unset($location);	// not used, but in function signature for hooks
+		unset($location); // not used, but in function signature for hooks
 		return $GLOBALS['egw_info']['server']['calendar_export_limit'];
 	}
 
@@ -84,13 +84,13 @@ 
 	static function admin()
 	{
 		$file = Array(
-			'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
-			'Custom fields' => Egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
-			'Global Categories' => Egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
-			'Category ACL' => Egw::link('/index.php','menuaction=calendar.calendar_uiforms.cat_acl'),
-			'Update timezones' => Egw::link('/index.php','menuaction=calendar.calendar_timezones.update'),
+			'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
+			'Custom fields' => Egw::link('/index.php', 'menuaction=admin.customfields.index&appname=calendar'),
+			'Global Categories' => Egw::link('/index.php', 'menuaction=admin.admin_categories.index&appname=calendar'),
+			'Category ACL' => Egw::link('/index.php', 'menuaction=calendar.calendar_uiforms.cat_acl'),
+			'Update timezones' => Egw::link('/index.php', 'menuaction=calendar.calendar_timezones.update'),
 		);
-		display_section('calendar','calendar',$file);
+		display_section('calendar', 'calendar', $file);
 	}
 
 	/**
@@ -160,7 +160,7 @@ 
 		}
 		for ($i = 2; $i <= 4; ++$i)
 		{
-			$muliple_weeks[$i] = lang('%1 weeks',$i);
+			$muliple_weeks[$i] = lang('%1 weeks', $i);
 		}
 
 		for ($i = 2; $i <= 9; $i++)
@@ -198,14 +198,14 @@ 
 		if (!$hook_data['setup'])	// does not work at setup time
 		{
 			$options = array('0' => lang('none'));
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'owngroups','app' => 'calendar')) as $group)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'owngroups', 'app' => 'calendar')) as $group)
 			{
 				$options[$group['account_id']] = Api\Accounts::username($group['account_id']);
 			}
-			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'],$GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
+			$freebusy_url = calendar_bo::freebusy_url($GLOBALS['egw_info']['user']['account_lid'], $GLOBALS['egw_info']['user']['preferences']['calendar']['freebusy_pw']);
 			$freebusy_url = '<a href="'.$freebusy_url.'" target="_blank">'.$freebusy_url.'</a>';
 			$freebusy_help = lang('Should not loged in persons be able to see your freebusy information? You can set an extra password, different from your normal password, to protect this informations. The freebusy information is in iCal format and only include the times when you are busy. It does not include the event-name, description or locations. The URL to your freebusy information is');
-			$freebusy_help .= ' ' . $freebusy_url;
+			$freebusy_help .= ' '.$freebusy_url;
 
 			// Timezone for file exports
 			$export_tzs = array('0' => 'Use Event TZ');
@@ -370,7 +370,7 @@ 
 				'admin'  => False
 			),
 			'default-alarm' => array(
-				'type'   => 'date-duration',//'select',
+				'type'   => 'date-duration', //'select',
 				'label'  => lang('Default alarm for regular events').' ('.lang('empty = no alarm').')',
 				'name'   => 'default-alarm',
 				'help'   => 'Alarm added automatic to new events before event start-time',
@@ -379,7 +379,7 @@ 
 				'default' => '',
 			),
 			'default-alarm-wholeday' => array(
-				'type'   => 'date-duration',//'select',
+				'type'   => 'date-duration', //'select',
 				'label'  => lang('Default alarm for whole-day events').' ('.lang('empty = no alarm').')',
 				'name'   => 'default-alarm-wholeday',
 				'help'   => lang('Alarm added automatic to new events before event start-time').' ('.lang('Midnight').')',
@@ -392,7 +392,7 @@ 
 		{
 			$prefs = $GLOBALS['egw_info']['user']['preferences']['calendar'];
 			$data = array(
-				'prefs' => &$prefs,	// use reference to get preference value back
+				'prefs' => &$prefs, // use reference to get preference value back
 				'preprocess' => true,
 				'type' => 'user',
 			);
@@ -565,9 +565,9 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('calendar')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','calendar_title').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('calendar')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'calendar_title').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -577,9 +577,9 @@ 
 				'size'   => 60,
 				'label'  => 'Directory with documents to insert entries',
 				'name'   => 'document_dir',
-				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.',lang('calendar')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','calendar_title').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the data inserted.', lang('calendar')).' '.
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'calendar_title').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -604,7 +604,7 @@ 
 				}
 				catch (Exception $e)
 				{
-					unset($e);	// not used
+					unset($e); // not used
 					// permission error
 					continue;
 				}
@@ -692,14 +692,14 @@ 
 		if ($data['type'] != 'user') return;
 
 		$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
-		foreach(array(
+		foreach (array(
 			'default-alarm' => 'default-alarm-vevent-datetime:/'.$account_lid.'/:urn:ietf:params:xml:ns:caldav',
 			'default-alarm-wholeday' => 'default-alarm-vevent-date:/'.$account_lid.'/:urn:ietf:params:xml:ns:caldav',
 		) as $name => $dav)
 		{
-			$pref =& $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
-			if (true) $pref = str_replace("\r", '', $pref);	// remove CR messing up multiline preg_match
-			$val =& $data['prefs'][$name];
+			$pref = & $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
+			if (true) $pref = str_replace("\r", '', $pref); // remove CR messing up multiline preg_match
+			$val = & $data['prefs'][$name];
 
 			//error_log(__METHOD__."() groupdav[$dav]=$pref, calendar[$name]=$val");
 
@@ -720,7 +720,7 @@ 
 							'D' => 1440,
 						);
 						$factor = $factors[strtoupper($matches[2])];
-						$val = $factor*(int)$matches[1];
+						$val = $factor * (int)$matches[1];
 					}
 					else
 					{
@@ -751,7 +751,7 @@ 
 				}
 				else
 				{
-					$pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val)/60, 0).'H', $pref);
+					$pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val) / 60, 0).'H', $pref);
 				}
 				$GLOBALS['egw']->preferences->add('groupdav', $dav, $pref, 'user');
 				//error_log(__METHOD__."() storing $name=$val --> $dav='$pref'");
@@ -812,7 +812,7 @@ 
 	 */
 	public static function categories($data)
 	{
-		unset($data);	// not used, but in function signature for hooks
+		unset($data); // not used, but in function signature for hooks
 		return true;
 	}
 
@@ -823,9 +823,9 @@ 
 	 */
 	public static function mail_import($args)
 	{
-		unset($args);	// not used, but required by function signature
+		unset($args); // not used, but required by function signature
 
-		return array (
+		return array(
 			'menuaction' => 'calendar.calendar_uiforms.mail_import',
 			'popup' => Link::get_registry('calendar', 'edit_popup')
 		);
@@ -841,7 +841,7 @@ 
 	$async = new Api\Asyncservice();
 	$async->cancel_timer($id);
 
-	if((float)$config > 0)
+	if ((float)$config > 0)
 	{
 		$result = $async->set_timer(
 			array('month' => '*', 'day' => 1),
@@ -849,7 +849,7 @@ 
 			'calendar.calendar_boupdate.purge',
 			(float)$config
 		);
-		if(!$result)
+		if (!$result)
 		{
 			$GLOBALS['config_error'] = 'Unable to schedule purge';
 		}

Braces +25 added lines, -6 removed lines

@@ -100,9 +100,12 @@ 
 	 */
 	static function settings($hook_data)
 	{
-		if (!$hook_data['setup'])	// does not work on setup time
+		if (!$hook_data['setup'])
+		{
+			// does not work on setup time
 		{
 			$bo = new calendar_bo();
+		}
 			$bo->check_set_default_prefs();
 		}
 		$yesno = array(
@@ -195,9 +198,12 @@ 
 			1		=> lang('Yes'),
 			2		=> lang('With credentials included'),
 		);
-		if (!$hook_data['setup'])	// does not work at setup time
+		if (!$hook_data['setup'])
+		{
+			// does not work at setup time
 		{
 			$options = array('0' => lang('none'));
+		}
 			foreach($GLOBALS['egw']->accounts->search(array('type' => 'owngroups','app' => 'calendar')) as $group)
 			{
 				$options[$group['account_id']] = Api\Accounts::username($group['account_id']);
@@ -388,9 +394,12 @@ 
 				'default' => '',
 			),
 		);
-		if (isset($bo))	// add custom time-spans set by CalDAV clients, not in our prefs
+		if (isset($bo))
+		{
+			// add custom time-spans set by CalDAV clients, not in our prefs
 		{
 			$prefs = $GLOBALS['egw_info']['user']['preferences']['calendar'];
+		}
 			$data = array(
 				'prefs' => &$prefs,	// use reference to get preference value back
 				'preprocess' => true,
@@ -689,7 +698,10 @@ 
 	{
 		//error_log(__METHOD__."(".array2string($data).")");
 		// caldav perfs are always user specific and cant by switched off
-		if ($data['type'] != 'user') return;
+		if ($data['type'] != 'user')
+		{
+			return;
+		}
 
 		$account_lid = $GLOBALS['egw_info']['user']['account_lid'];
 		foreach(array(
@@ -698,16 +710,23 @@ 
 		) as $name => $dav)
 		{
 			$pref =& $GLOBALS['egw_info']['user']['preferences']['groupdav'][$dav];
-			if (true) $pref = str_replace("\r", '', $pref);	// remove CR messing up multiline preg_match
+			if (true)
+			{
+				$pref = str_replace("\r", '', $pref);
+			}
+			// remove CR messing up multiline preg_match
 			$val =& $data['prefs'][$name];
 
 			//error_log(__METHOD__."() groupdav[$dav]=$pref, calendar[$name]=$val");
 
-			if ($data['preprocess'])	// showing preferences
+			if ($data['preprocess'])
+			{
+				// showing preferences
 			{
 				if (!isset($val))	// no calendar pref --> read value from caldav
 				{
 					$matches = null;
+			}
 					if (preg_match('/^ACTION:NONE$/mi', $pref))
 					{
 						$val = '';

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

@@ -464,7 +464,7 @@
 	{
 		unset($args);	// unused, but required by function signature
 		$appname = 'preferences';
-		$file = Array(
+		$file = array(
 			'Site configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
 		);
 		display_section($appname, $file);

calendar/inc/class.calendar_timegrid_etemplate_widget.inc.php

Indentation +13 added lines, -13 removed lines

@@ -1,11 +1,11 @@ 
 <?php
 /**
-  * Egroupware
-  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
-  * @link http://www.egroupware.org
-  * @author Nathan Gray
-  * @version $Id$
-  */
+ * Egroupware
+ * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
+ * @link http://www.egroupware.org
+ * @author Nathan Gray
+ * @version $Id$
+ */
 
 use EGroupware\Api;
 use EGroupware\Api\Etemplate;
@@ -22,13 +22,13 @@ 
  {
 
 	 /**
-	 * Set up what we know on the server side.
-	 *
-	 * Sending a first chunk of rows
-	 *
-	 * @param string $cname
-	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
-	 */
+	  * Set up what we know on the server side.
+	  *
+	  * Sending a first chunk of rows
+	  *
+	  * @param string $cname
+	  * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
+	  */
 	public function beforeSendToClient($cname, array $expand=null)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);

Spacing +9 added lines, -9 removed lines

@@ -29,24 +29,24 @@
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
-		$value =& self::get_array(self::$request->content, $form_name, true);
-		if(!is_array($value)) $value = array();
+		$value = & self::get_array(self::$request->content, $form_name, true);
+		if (!is_array($value)) $value = array();
 
-		foreach($value as &$events)
+		foreach ($value as &$events)
 		{
-			if(!is_array($events))
+			if (!is_array($events))
 			{
 				continue;
 			}
-			foreach($events as &$event)
+			foreach ($events as &$event)
 			{
-				if(!is_array($event)) continue;
-				foreach(array('start','end') as $date)
+				if (!is_array($event)) continue;
+				foreach (array('start', 'end') as $date)
 				{
-					$event[$date] = Api\DateTime::to($event[$date],'Y-m-d\TH:i:s\Z');
+					$event[$date] = Api\DateTime::to($event[$date], 'Y-m-d\TH:i:s\Z');
 				}
 			}
 		}

Braces +8 added lines, -2 removed lines

@@ -33,7 +33,10 @@ 
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 		$value =& self::get_array(self::$request->content, $form_name, true);
-		if(!is_array($value)) $value = array();
+		if(!is_array($value))
+		{
+			$value = array();
+		}
 
 		foreach($value as &$events)
 		{
@@ -43,7 +46,10 @@ 
 			}
 			foreach($events as &$event)
 			{
-				if(!is_array($event)) continue;
+				if(!is_array($event))
+				{
+					continue;
+				}
 				foreach(array('start','end') as $date)
 				{
 					$event[$date] = Api\DateTime::to($event[$date],'Y-m-d\TH:i:s\Z');

calendar/inc/class.calendar_export_csv.inc.php

Indentation +10 added lines, -10 removed lines

@@ -323,17 +323,17 @@
 		$days = $states['days'];
 		$ui = new calendar_uiviews($states);
 		if (!$days)
-                {
-                        $days = isset($_GET['days']) ? $_GET['days'] : $ui->cal_prefs['days_in_weekview'];
-                        if ($days != 5) $days = 7;
-                }
+				{
+						$days = isset($_GET['days']) ? $_GET['days'] : $ui->cal_prefs['days_in_weekview'];
+						if ($days != 5) $days = 7;
+				}
 		if ($states['view'] == 'week' && $days == 4)         // next 4 days view
-                {
-                        $query['start'] = $this->bo->date2ts($states['date']);
-                        $query['end'] = strtotime("+$days days",$query['start']) - 1;
-                }
-                else
-                {
+				{
+						$query['start'] = $this->bo->date2ts($states['date']);
+						$query['end'] = strtotime("+$days days",$query['start']) - 1;
+				}
+				else
+				{
 			$query['start'] = $ui->datetime->get_weekday_start($states['year'],$states['month'],$states['day']);
 			if ($days == 5)         // no weekend-days
 			{

Spacing +53 added lines, -53 removed lines

@@ -29,15 +29,15 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
 		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach ($options['mapping'] + (array)$_definition->filter as $key => $label) {
+			if ($key[0] == '#') $cfs[] = substr($key, 1);
 		}
 
 		$query = array(
@@ -45,34 +45,34 @@ 
 			'num_rows'	=> -1,
 			'csv_export'	=> true
 		);
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'criteria':
 				$query = array(
 					'start' => $options['criteria']['start'],
-					'end'   => strtotime('+1 day',$options['criteria']['end'])-1,
+					'end'   => strtotime('+1 day', $options['criteria']['end']) - 1,
 					'categories'	=> $options['categories'] ? $options['categories'] : $options['criteria']['categories'],
 					//'enum_recuring' => false, // we want the recurring events enumerated for csv export
 					'daywise'       => false,
 					'users'         => $options['criteria']['owner'],
 					'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 				);
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
-				$events =& $this->bo->search($query);
+				$events = & $this->bo->search($query);
 				break;
 			case 'search_results':
 				$states = Api\Cache::getSession('calendar', 'session_data');
-				if($states['view'] == 'listview') {
+				if ($states['view'] == 'listview') {
 					$query = Api\Cache::getSession('calendar', 'calendar_list');
-					$query['num_rows'] = -1;        // all
-					$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+					$query['num_rows'] = -1; // all
+					$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 					$query['start'] = 0;
 					$query['cfs'] = $cfs;
 
-					if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+					if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 						$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 					}
 					$ui = new calendar_uilist();
@@ -81,12 +81,12 @@ 
 					$query = Api\Cache::getSession('calendar', 'session_data');
 					$query['users'] = explode(',', $query['owner']);
 					$query['num_rows'] = -1;
-					if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
-						$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
+					if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+						$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 					}
 
 					$events = array();
-					switch($states['view']) {
+					switch ($states['view']) {
 						case 'month':
 							$query += $this->get_query_month($states);
 							break;
@@ -100,7 +100,7 @@ 
 						default:
 							// Let UI set the date ranges
 							$ui = new calendar_uiviews($query);
-							if(method_exists($ui, $states['view']))
+							if (method_exists($ui, $states['view']))
 							{
 								ob_start();
 								$ui->$states['view']();
@@ -124,35 +124,35 @@ 
 				$filter = $_definition->filter;
 
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'filter' && $value)
+					if ($field == 'filter' && $value)
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					if (!is_array($value) || (!$value['from'] && !$value['to']))
 					{
 						$query['query']["cal_$field"] = $value;
 						continue;
 					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
-					if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					if ($value['from']) $query['sql_filter'][] = "cal_$field >= ".(int)$value['from'];
+					if ($value['to']) $query['sql_filter'][] = "cal_$field <= ".(int)$value['to'];
 
 				}
-				if($query['sql_filter'] && is_array($query['sql_filter']))
+				if ($query['sql_filter'] && is_array($query['sql_filter']))
 				{
 					// Set as an extra parameter
-					$sql_filter = implode(' AND ',$query['sql_filter']);
+					$sql_filter = implode(' AND ', $query['sql_filter']);
 				}
 
 			case 'all':
 				$events = $this->bo->search($query + array(
 					'offset' => 0,
 					'order' => 'cal_start',
-				),$sql_filter);
+				), $sql_filter);
 				break;
 		}
 
@@ -169,24 +169,24 @@ 
 			// Get rid of yearly recurring events that don't belong
 			//if($options['selection']['select'] == 'criteria' && ($event['start'] > $query['end'] || $event['end'] < $query['start'])) continue;
 			// Add in participants
-			if($options['mapping']['participants']) {
-				$event['participants'] = implode(", ",$this->bo->participants($event,true));
+			if ($options['mapping']['participants']) {
+				$event['participants'] = implode(", ", $this->bo->participants($event, true));
 			}
 			if (is_array($event))
 			{
 				$record->set_record($event);
-				if($options['mapping']['recurrence']) {
+				if ($options['mapping']['recurrence']) {
 					$record->recurrence = $recurrence[$record->recur_type];
-					if($record->recur_type != MCAL_RECUR_NONE) $record->recurrence .= ' / '. $record->recur_interval;
+					if ($record->recur_type != MCAL_RECUR_NONE) $record->recurrence .= ' / '.$record->recur_interval;
 				}
 
 				// Standard stuff
-				if($options['convert']) {
+				if ($options['convert']) {
 					importexport_export_csv::convert($record, $convert_fields, 'calendar', $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);
@@ -241,9 +241,9 @@ 
 	public function get_selectors_etpl($definition = null) {
 		$states = $this->bo->cal_prefs['saved_states'];
 		$list = Api\Cache::getSession('calendar', 'calendar_list');
-		if(!$list['startdate'])
+		if (!$list['startdate'])
 		{
-			switch($states['view']) {
+			switch ($states['view']) {
 				case 'month':
 					$query = $this->get_query_month($states);
 					break;
@@ -255,12 +255,12 @@ 
 					$query = $this->get_query_day($states);
 					break;
 			}
-			$start= new Api\DateTime($query['start']);
+			$start = new Api\DateTime($query['start']);
 			$end = new Api\DateTime($query['end']);
 		}
 		else
 		{
-			$start= new Api\DateTime($list['startdate']);
+			$start = new Api\DateTime($list['startdate']);
 			$end = new Api\DateTime($list['enddate']);
 		}
 		if ($states['view'] == 'listview')
@@ -269,24 +269,24 @@ 
 
 			// Use UI to get dates
 			$ui = new calendar_uilist();
-			$list['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$ui->get_rows($list,$rows,$readonlys);
+			$list['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$ui->get_rows($list, $rows, $readonlys);
 			$start = $ui->first ? $ui->first : new Api\DateTime($ui->date);
 			$end = $ui->last;
 
 			// Special handling
-			if($list['filter'] == 'all') $start = $end = null;
-			if($list['filter'] == 'before')
+			if ($list['filter'] == 'all') $start = $end = null;
+			if ($list['filter'] == 'before')
 			{
 				$end = $start;
 				$start = null;
 			}
 			$ui = null;
 		}
-		elseif(!$end)
+		elseif (!$end)
 		{
-			$end = '+1 ' . $states['view'];
-			$end = strtotime($end, $start->format('ts'))-1;
+			$end = '+1 '.$states['view'];
+			$end = strtotime($end, $start->format('ts')) - 1;
 		}
 		$prefs = unserialize($GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]);
 		$data = array(
@@ -311,8 +311,8 @@ 
 	public static function get_query_month($states)
 	{
 		$timespan = array(
-			'start' => mktime(0,0,0,$states['month'],1,$states['year']),
-			'end' => mktime(0,0,0,$states['month']+1,1,$states['year'])-1
+			'start' => mktime(0, 0, 0, $states['month'], 1, $states['year']),
+			'end' => mktime(0, 0, 0, $states['month'] + 1, 1, $states['year']) - 1
 		);
 		return $timespan;
 	}
@@ -330,24 +330,24 @@ 
 		if ($states['view'] == 'week' && $days == 4)         // next 4 days view
                 {
                         $query['start'] = $this->bo->date2ts($states['date']);
-                        $query['end'] = strtotime("+$days days",$query['start']) - 1;
+                        $query['end'] = strtotime("+$days days", $query['start']) - 1;
                 }
                 else
                 {
-			$query['start'] = $ui->datetime->get_weekday_start($states['year'],$states['month'],$states['day']);
+			$query['start'] = $ui->datetime->get_weekday_start($states['year'], $states['month'], $states['day']);
 			if ($days == 5)         // no weekend-days
 			{
-				switch($ui->cal_prefs['weekdaystarts'])
+				switch ($ui->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
-						$query['start'] = strtotime("+2 days",$query['start']);
+						$query['start'] = strtotime("+2 days", $query['start']);
 						break;
 					case 'Sunday':
-						$query['start'] = strtotime("+1 day",$query['start']);
+						$query['start'] = strtotime("+1 day", $query['start']);
 						break;
 				}
 			}
-			$query['end'] = strtotime($states['view'] == 'week' ? "+$days days" : "+{$ui->cal_prefs['multiple_weeks']} weeks",$query['start']) - 1;
+			$query['end'] = strtotime($states['view'] == 'week' ? "+$days days" : "+{$ui->cal_prefs['multiple_weeks']} weeks", $query['start']) - 1;
 		}
 		return $query;
 	}
@@ -357,7 +357,7 @@ 
 		$query = array();
 		$bo = new calendar_bo();
 		$query['start'] = $bo->date2ts((string)$states['date']);
-		$query['end'] = $query['start']+DAY_s-1;
+		$query['end'] = $query['start'] + DAY_s - 1;
 		return $query;
 	}
 
@@ -409,17 +409,17 @@ 
 		);
 		$filters = array_reverse($filters, true);
 
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
 			// Can't filter on a custom field
-			if(strpos($field_name, '#') === 0)
+			if (strpos($field_name, '#') === 0)
 			{
 				unset($filters[$field_name]);
 				continue;
 			}
 
 			// Pass on select options
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 
 	}

Doc Comments +1 added lines, -1 removed lines

@@ -29,7 +29,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;

Braces +97 added lines, -36 removed lines

@@ -16,9 +16,11 @@ 
 /**
  * export CSV plugin of calendar
  */
-class calendar_export_csv implements importexport_iface_export_plugin {
+class calendar_export_csv implements importexport_iface_export_plugin
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		Api\Translation::add_app('calendar');
 		$this->bo = new calendar_bo();
 		$this->get_selects();
@@ -29,15 +31,23 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		if (!$limit_exception)
+		{
+			$export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		}
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach($options['mapping'] + (array)$_definition->filter as $key => $label)
+		{
+			if($key[0] == '#')
+			{
+				$cfs[] = substr($key,1);
+			}
 		}
 
 		$query = array(
@@ -57,7 +67,8 @@ 
 					'users'         => $options['criteria']['owner'],
 					'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 				);
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				{
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
@@ -65,28 +76,34 @@ 
 				break;
 			case 'search_results':
 				$states = Api\Cache::getSession('calendar', 'session_data');
-				if($states['view'] == 'listview') {
+				if($states['view'] == 'listview')
+				{
 					$query = Api\Cache::getSession('calendar', 'calendar_list');
 					$query['num_rows'] = -1;        // all
 					$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 					$query['start'] = 0;
 					$query['cfs'] = $cfs;
 
-					if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+					if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+					{
 						$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 					}
 					$ui = new calendar_uilist();
 					$ui->get_rows($query, $events, $unused);
-				} else {
+				}
+				else
+				{
 					$query = Api\Cache::getSession('calendar', 'session_data');
 					$query['users'] = explode(',', $query['owner']);
 					$query['num_rows'] = -1;
-					if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+					if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+					{
 						$query['num_rows'] = (int)$export_limit;  // ! int of 'no' is 0
 					}
 
 					$events = array();
-					switch($states['view']) {
+					switch($states['view'])
+					{
 						case 'month':
 							$query += $this->get_query_month($states);
 							break;
@@ -138,8 +155,14 @@ 
 					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
-					if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					if($value['from'])
+					{
+						$query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
+					}
+					if($value['to'])
+					{
+						$query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					}
 
 				}
 				if($query['sql_filter'] && is_array($query['sql_filter']))
@@ -157,36 +180,52 @@ 
 		}
 
 		$export_object = new importexport_export_csv($_stream, (array)$options);
-		if (!$limit_exception) $export_object->export_limit = $export_limit;
+		if (!$limit_exception)
+		{
+			$export_object->export_limit = $export_limit;
+		}
 		$export_object->set_mapping($options['mapping']);
 		$convert_fields = calendar_egw_record::$types;
 
 		$recurrence = $this->bo->recur_types;
 
 		$record = new calendar_egw_record();
-		foreach ($events as $event) {
+		foreach ($events as $event)
+		{
 			// the condition below (2 lines) may only work on enum_recuring=false and using the iterator to test an recurring event on the given timerange
 			// Get rid of yearly recurring events that don't belong
 			//if($options['selection']['select'] == 'criteria' && ($event['start'] > $query['end'] || $event['end'] < $query['start'])) continue;
 			// Add in participants
-			if($options['mapping']['participants']) {
+			if($options['mapping']['participants'])
+			{
 				$event['participants'] = implode(", ",$this->bo->participants($event,true));
 			}
 			if (is_array($event))
 			{
 				$record->set_record($event);
-				if($options['mapping']['recurrence']) {
+				if($options['mapping']['recurrence'])
+				{
 					$record->recurrence = $recurrence[$record->recur_type];
-					if($record->recur_type != MCAL_RECUR_NONE) $record->recurrence .= ' / '. $record->recur_interval;
+					if($record->recur_type != MCAL_RECUR_NONE)
+					{
+						$record->recurrence .= ' / '. $record->recur_interval;
+					}
 				}
 
 				// Standard stuff
-				if($options['convert']) {
+				if($options['convert'])
+				{
 					importexport_export_csv::convert($record, $convert_fields, 'calendar', $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);
@@ -201,7 +240,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV export');
 	}
 
@@ -210,7 +250,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports events from your Calendar into a CSV File.");
 	}
 
@@ -219,11 +260,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';
 	}
 
@@ -231,19 +274,22 @@ 
 	 * return html for options.
 	 *
 	 */
-	public function get_options_etpl($definition = null) {
+	public function get_options_etpl($definition = null)
+	{
 	}
 
 	/**
 	 * returns selectors of this plugin
 	 *
 	 */
-	public function get_selectors_etpl($definition = null) {
+	public function get_selectors_etpl($definition = null)
+	{
 		$states = $this->bo->cal_prefs['saved_states'];
 		$list = Api\Cache::getSession('calendar', 'calendar_list');
 		if(!$list['startdate'])
 		{
-			switch($states['view']) {
+			switch($states['view'])
+			{
 				case 'month':
 					$query = $this->get_query_month($states);
 					break;
@@ -275,7 +321,10 @@ 
 			$end = $ui->last;
 
 			// Special handling
-			if($list['filter'] == 'all') $start = $end = null;
+			if($list['filter'] == 'all')
+			{
+				$start = $end = null;
+			}
 			if($list['filter'] == 'before')
 			{
 				$end = $start;
@@ -323,24 +372,33 @@ 
 		$days = $states['days'];
 		$ui = new calendar_uiviews($states);
 		if (!$days)
-                {
+		{
                         $days = isset($_GET['days']) ? $_GET['days'] : $ui->cal_prefs['days_in_weekview'];
-                        if ($days != 5) $days = 7;
+                        if ($days != 5)
+                        {
+                        	$days = 7;
+                        }
                 }
-		if ($states['view'] == 'week' && $days == 4)         // next 4 days view
+		if ($states['view'] == 'week' && $days == 4)
+		{
+			// next 4 days view
                 {
                         $query['start'] = $this->bo->date2ts($states['date']);
+		}
                         $query['end'] = strtotime("+$days days",$query['start']) - 1;
                 }
                 else
                 {
 			$query['start'] = $ui->datetime->get_weekday_start($states['year'],$states['month'],$states['day']);
-			if ($days == 5)         // no weekend-days
+			if ($days == 5)
+			{
+				// no weekend-days
 			{
 				switch($ui->cal_prefs['weekdaystarts'])
 				{
 					case 'Saturday':
 						$query['start'] = strtotime("+2 days",$query['start']);
+			}
 						break;
 					case 'Sunday':
 						$query['start'] = strtotime("+1 day",$query['start']);
@@ -419,7 +477,10 @@ 
 			}
 
 			// Pass on select options
-			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 +2 added lines, -2 removed lines

@@ -366,7 +366,7 @@ 
 	 */
 	protected function get_selects()
 	{
-		$this->selects['priority'] = Array(
+		$this->selects['priority'] = array(
 			0 => lang('None'),
 			1 => lang('Low'),
 			2 => lang('Normal'),
@@ -394,7 +394,7 @@ 
 	/**
 	 * Adjust automatically generated field filters
 	 */
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 
 		// Calendar SO doesn't support filtering by column, so we have to remove pretty much everything

calendar/inc/class.boholiday.inc.php

Spacing +91 added lines, -91 removed lines

@@ -71,25 +71,25 @@ 
 			$this->locales[] = $this->locale;
 		}
 
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo '<-- Locale = '.$this->locales[0].' -->'."\n";
 		}
 
-		$this->total = $this->so->holiday_total($this->locales[0],$this->query,$this->year);
+		$this->total = $this->so->holiday_total($this->locales[0], $this->query, $this->year);
 	}
 
 	/* Begin Calendar functions */
-	function read_entry($id=0)
+	function read_entry($id = 0)
 	{
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo "BO : Reading Holiday ID : ".$id."<br>\n";
 		}
 
-		if(!$id)
+		if (!$id)
 		{
-			if(!$this->id)
+			if (!$this->id)
 			{
 				return Array();
 			}
@@ -102,18 +102,18 @@ 
 		return $this->so->read_holiday($id);
 	}
 
-	function delete_holiday($id=0)
+	function delete_holiday($id = 0)
 	{
-		if(!$id)
+		if (!$id)
 		{
-			if($this->id)
+			if ($this->id)
 			{
 				$id = $this->id;
 			}
 		}
 
-		$this->ui =& CreateObject('calendar.uiholiday');
-		if($id)
+		$this->ui = & CreateObject('calendar.uiholiday');
+		if ($id)
 		{
 			$this->so->delete_holiday($id);
 			$this->ui->edit_locale();
@@ -124,45 +124,45 @@ 
 		}
 	}
 
-	function delete_locale($locale='')
+	function delete_locale($locale = '')
 	{
-		if(!$locale)
+		if (!$locale)
 		{
-			if($this->locales[0])
+			if ($this->locales[0])
 			{
 				$locale = $this->locales[0];
 			}
 		}
 
-		if($locale)
+		if ($locale)
 		{
 			$this->so->delete_locale($locale);
 		}
-		$this->ui =& CreateObject('calendar.uiholiday');
+		$this->ui = & CreateObject('calendar.uiholiday');
 		$this->ui->admin();
 	}
 
 	function accept_holiday()
 	{
-		$send_back_to = str_replace('submitlocale','holiday_admin',$_SERVER['HTTP_REFERER']);
-		if(!@$this->locales[0])
+		$send_back_to = str_replace('submitlocale', 'holiday_admin', $_SERVER['HTTP_REFERER']);
+		if (!@$this->locales[0])
 		{
 			Header('Location: '.$send_back_to);
 		}
 
-		$send_back_to = str_replace('&locale='.$this->locales[0],'',$send_back_to);
+		$send_back_to = str_replace('&locale='.$this->locales[0], '', $send_back_to);
 		$file = './holidays.'.$this->locales[0];
-		if(!file_exists($file) && count($_POST['name']))
+		if (!file_exists($file) && count($_POST['name']))
 		{
-			$fp = fopen($file,'w');
-			fwrite($fp,"charset\t".Api\Translation::charset()."\n");
+			$fp = fopen($file, 'w');
+			fwrite($fp, "charset\t".Api\Translation::charset()."\n");
 
 			$holidays = array();
-			foreach($_POST['name'] as $i => $name)
+			foreach ($_POST['name'] as $i => $name)
 			{
 				$holiday = array(
 					'locale' => $_POST['locale'],
-					'name'   => str_replace('\\','',$name),
+					'name'   => str_replace('\\', '', $name),
 					'day'    => $_POST['day'][$i],
 					'month'  => $_POST['month'][$i],
 					'occurence' => $_POST['occurence'][$i],
@@ -171,10 +171,10 @@ 
 				);
 			}
 			// sort holidays by year / occurence:
-			usort($holidays,'_holiday_cmp');
+			usort($holidays, '_holiday_cmp');
 
 			$last_year = -1;
-			foreach($holidays as $holiday)
+			foreach ($holidays as $holiday)
 			{
 				$year = $holiday['occurence'] <= 0 ? 0 : $holiday['occurence'];
 				if ($year != $last_year)
@@ -182,46 +182,46 @@ 
 					echo "\n".($year ? $year : 'regular (year=0)').":\n";
 					$last_year = $year;
 				}
-				fwrite($fp,"$holiday[locale]\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n");
+				fwrite($fp, "$holiday[locale]\t$holiday[name]\t$holiday[day]\t$holiday[month]\t$holiday[occurence]\t$holiday[dow]\t$holiday[observance_rule]\n");
 			}
 			fclose($fp);
 		}
 		Header('Location: '.$send_back_to);
 	}
 
-	function get_holiday_list($locale='', $sort='', $order='', $query='', $total='', $year=0)
+	function get_holiday_list($locale = '', $sort = '', $order = '', $query = '', $total = '', $year = 0)
 	{
-		$locale = ($locale?$locale:$this->locales[0]);
-		$sort = ($sort?$sort:$this->sort);
-		$order = ($order?$order:$this->order);
-		$query = ($query?$query:$this->query);
-		$year = ($$year?$$year:$this->year);
-		return $this->so->read_holidays($locale,$query,$order,$year);
+		$locale = ($locale ? $locale : $this->locales[0]);
+		$sort = ($sort ? $sort : $this->sort);
+		$order = ($order ? $order : $this->order);
+		$query = ($query ? $query : $this->query);
+		$year = ($$year ? $$year : $this->year);
+		return $this->so->read_holidays($locale, $query, $order, $year);
 	}
 
-	function get_locale_list($sort='', $order='', $query='')
+	function get_locale_list($sort = '', $order = '', $query = '')
 	{
-		$sort = ($sort?$sort:$this->sort);
-		$order = ($order?$order:$this->order);
-		$query = ($query?$query:$this->query);
-		return $this->so->get_locale_list($sort,$order,$query);
+		$sort = ($sort ? $sort : $this->sort);
+		$order = ($order ? $order : $this->order);
+		$query = ($query ? $query : $this->query);
+		return $this->so->get_locale_list($sort, $order, $query);
 	}
 
-	function prepare_read_holidays($year=0,$owner=0)
+	function prepare_read_holidays($year = 0, $owner = 0)
 	{
-		$this->year = (isset($year) && $year > 0?$year: Api\DateTime::to(time() - $GLOBALS['egw']->datetime->tz_offset,'Y'));
-		$this->owner = ($owner?$owner:$GLOBALS['egw_info']['user']['account_id']);
+		$this->year = (isset($year) && $year > 0 ? $year : Api\DateTime::to(time() - $GLOBALS['egw']->datetime->tz_offset, 'Y'));
+		$this->owner = ($owner ? $owner : $GLOBALS['egw_info']['user']['account_id']);
 
-		if($this->debug)
+		if ($this->debug)
 		{
 			echo 'Setting Year to : '.$this->year.'<br>'."\n";
 		}
 
-		if(@$GLOBALS['egw_info']['user']['preferences']['common']['country'])
+		if (@$GLOBALS['egw_info']['user']['preferences']['common']['country'])
 		{
 			$this->locales[] = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
 		}
-		elseif(@$GLOBALS['egw_info']['user']['preferences']['calendar']['locale'])
+		elseif (@$GLOBALS['egw_info']['user']['preferences']['calendar']['locale'])
 		{
 			$this->locales[] = $GLOBALS['egw_info']['user']['preferences']['calendar']['locale'];
 		}
@@ -230,45 +230,45 @@ 
 			$this->locales[] = 'US';
 		}
 
-		if($this->owner != $GLOBALS['egw_info']['user']['account_id'])
+		if ($this->owner != $GLOBALS['egw_info']['user']['account_id'])
 		{
 			$owner_pref = new Api\Preferences($owner);
 			$owner_prefs = $owner_pref->read_repository();
-			if(@$owner_prefs['common']['country'])
+			if (@$owner_prefs['common']['country'])
 			{
 				$this->locales[] = $owner_prefs['common']['country'];
 			}
-			elseif(@$owner_prefs['calendar']['locale'])
+			elseif (@$owner_prefs['calendar']['locale'])
 			{
 				$this->locales[] = $owner_prefs['calendar']['locale'];
 			}
 			unset($owner_pref);
 		}
 
-		if($GLOBALS['egw_info']['server']['auto_load_holidays'] == True && $this->locales)
+		if ($GLOBALS['egw_info']['server']['auto_load_holidays'] == True && $this->locales)
 		{
-			foreach($this->locales as $local)
+			foreach ($this->locales as $local)
 			{
 				$this->auto_load_holidays($local, $year);
 			}
 		}
 	}
 
-	function auto_load_holidays($locale, $year=0)
+	function auto_load_holidays($locale, $year = 0)
 	{
 		//error_log(__METHOD__."('$locale', $year)");
-		if (!Api\Cache::getInstance(__CLASS__, $locale.'-'.$year) &&	// check if autoload has been tried for this locale and year
+		if (!Api\Cache::getInstance(__CLASS__, $locale.'-'.$year) && // check if autoload has been tried for this locale and year
 			(!($total_year = $this->so->holiday_total($locale, '', $year)) ||
 			// automatic try load new holidays, if there are no irregular ones for queried year
 			$total_year == $this->so->holiday_total($locale, '', 1901)))
 		{
 			//error_log(__METHOD__."('$locale', $year) attemption autoload ...");
-			Api\Cache::setInstance(__CLASS__, $locale.'-'.$year, true, 864000);	// do NOT try again for 10 days
+			Api\Cache::setInstance(__CLASS__, $locale.'-'.$year, true, 864000); // do NOT try again for 10 days
 			@set_time_limit(0);
 
 			/* get the file that contains the calendar events for your locale */
 			/* "http://www.egroupware.org/cal/holidays.US.csv";                 */
-			if(isset($GLOBALS['egw_info']['server']['holidays_url_path']) && $GLOBALS['egw_info']['server']['holidays_url_path'] != 'localhost')
+			if (isset($GLOBALS['egw_info']['server']['holidays_url_path']) && $GLOBALS['egw_info']['server']['holidays_url_path'] != 'localhost')
 			{
 				$load_from = $GLOBALS['egw_info']['server']['holidays_url_path'];
 			}
@@ -276,7 +276,7 @@ 
 			{
 				if ($GLOBALS['egw_info']['server']['webserver_url'][0] == '/')
 				{
-					$server_host = ($_SERVER['HTTPS']?'https://':'http://').$_SERVER['HTTP_HOST'].$GLOBALS['egw_info']['server']['webserver_url'];
+					$server_host = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['HTTP_HOST'].$GLOBALS['egw_info']['server']['webserver_url'];
 				}
 				else
 				{
@@ -285,13 +285,13 @@ 
 				$load_from = $server_host.'/calendar/egroupware.org';
 			}
 //				echo 'Loading from: '.$load_from.'/holidays.'.strtoupper($locale).'.csv'."<br>\n";
-			if($GLOBALS['egw_info']['server']['holidays_url_path'] == 'localhost')
+			if ($GLOBALS['egw_info']['server']['holidays_url_path'] == 'localhost')
 			{
 				$lines = file(EGW_SERVER_ROOT.'/calendar/egroupware.org/holidays.'.strtoupper($locale).'.csv');
 			}
 			else
 			{
-				$lines = file($url=$load_from.'/holidays.'.strtoupper($locale).'.csv', 0, Framework::proxy_context());
+				$lines = file($url = $load_from.'/holidays.'.strtoupper($locale).'.csv', 0, Framework::proxy_context());
 				//error_log(__METHOD__."('$locale', $year) file('$url')=".array2string($lines));
 			}
 			if (!$lines)
@@ -299,21 +299,21 @@ 
 				return false;
 			}
 			// reading the holidayfile from egroupware.org via network::gethttpsocketfile contains all the headers!
-			foreach($lines as $line)
+			foreach ($lines as $line)
 			{
-				$fields = preg_split("/[\t\n ]+/",$line);
+				$fields = preg_split("/[\t\n ]+/", $line);
 
 				if ($fields[0] == 'charset' && $fields[1])
 				{
-					$lines = Api\Translation::convert($lines,$fields[1]);
+					$lines = Api\Translation::convert($lines, $fields[1]);
 					break;
 				}
 			}
 			foreach ($lines as $line)
 			{
 //					echo 'Line #'.$i.' : '.$lines[$i]."<br>\n";
-				$holiday = explode("\t",$line);
-				if(count($holiday) == 7)
+				$holiday = explode("\t", $line);
+				if (count($holiday) == 7)
 				{
 					$holiday['locale'] = $holiday[0];
 					$holiday['name'] = $GLOBALS['egw']->db->db_addslashes($holiday[1]);
@@ -336,23 +336,23 @@ 
 
 	function add()
 	{
-		if(@$_POST['submit'])
+		if (@$_POST['submit'])
 		{
 			$holiday = $_POST['holiday'];
 
-			if(empty($holiday['mday']))
+			if (empty($holiday['mday']))
 			{
 				$holiday['mday'] = 0;
 			}
-			if(!isset($this->bo->locales[0]) || $this->bo->locales[0]=='')
+			if (!isset($this->bo->locales[0]) || $this->bo->locales[0] == '')
 			{
 				$this->bo->locales[0] = $holiday['locale'];
 			}
-			elseif(!isset($holiday['locale']) || $holiday['locale']=='')
+			elseif (!isset($holiday['locale']) || $holiday['locale'] == '')
 			{
 				$holiday['locale'] = $this->bo->locales[0];
 			}
-			if(!isset($holiday['hol_id']))
+			if (!isset($holiday['hol_id']))
 			{
 				$holiday['hol_id'] = $this->bo->id;
 			}
@@ -363,7 +363,7 @@ 
 			{
 				$errors[] = lang('You need to set either a day or a occurence !!!');
 			}
-			if($holiday['year'] && $holiday['occurence'])
+			if ($holiday['year'] && $holiday['occurence'])
 			{
 				$errors[] = lang('You can only set a year or a occurence !!!');
 			}
@@ -375,13 +375,13 @@ 
 
 // Still need to put some validation in here.....
 
-			$this->ui =& CreateObject('calendar.uiholiday');
+			$this->ui = & CreateObject('calendar.uiholiday');
 
 			if (is_array($errors))
 			{
 				$holiday['month'] = $holiday['month_num'];
 				$holiday['day']   = $holiday['mday'];
-				$this->ui->edit_holiday($errors,$holiday);
+				$this->ui->edit_holiday($errors, $holiday);
 			}
 			else
 			{
@@ -394,11 +394,11 @@ 
 	function sort_holidays_by_date($holidays)
 	{
 		$c_holidays = count($holidays);
-		for($outer_loop=0;$outer_loop<($c_holidays - 1);$outer_loop++)
+		for ($outer_loop = 0; $outer_loop < ($c_holidays - 1); $outer_loop++)
 		{
-			for($inner_loop=$outer_loop;$inner_loop<$c_holidays;$inner_loop++)
+			for ($inner_loop = $outer_loop; $inner_loop < $c_holidays; $inner_loop++)
 			{
-				if($holidays[$outer_loop]['date'] > $holidays[$inner_loop]['date'])
+				if ($holidays[$outer_loop]['date'] > $holidays[$inner_loop]['date'])
 				{
 					$temp = $holidays[$inner_loop];
 					$holidays[$inner_loop] = $holidays[$outer_loop];
@@ -412,38 +412,38 @@ 
 	function set_holidays_to_date($holidays)
 	{
 		$new_holidays = Array();
-		for($i=0;$i<count($holidays);$i++)
+		for ($i = 0; $i < count($holidays); $i++)
 		{
 //	echo "Setting Holidays Date : ".date('Ymd',$holidays[$i]['date'])."<br>\n";
-			$new_holidays[date('Ymd',$holidays[$i]['date'])][] = $holidays[$i];
+			$new_holidays[date('Ymd', $holidays[$i]['date'])][] = $holidays[$i];
 		}
 		return $new_holidays;
 	}
 
 	function read_holiday()
 	{
-		if(isset($this->cached_holidays))
+		if (isset($this->cached_holidays))
 		{
 			return $this->cached_holidays;
 		}
-		$holidays = $this->so->read_holidays($this->locales,'','',$this->year);
+		$holidays = $this->so->read_holidays($this->locales, '', '', $this->year);
 
-		if(count($holidays) == 0)
+		if (count($holidays) == 0)
 		{
 			return $holidays;
 		}
 
 		$temp_locale = $GLOBALS['egw_info']['user']['preferences']['common']['country'];
-		foreach($holidays as $i => $holiday)
+		foreach ($holidays as $i => $holiday)
 		{
-			if($i == 0 || $holidays[$i]['locale'] != $holidays[$i - 1]['locale'])
+			if ($i == 0 || $holidays[$i]['locale'] != $holidays[$i - 1]['locale'])
 			{
-				if(is_object($holidaycalc))
+				if (is_object($holidaycalc))
 				{
 					unset($holidaycalc);
 				}
 				$GLOBALS['egw_info']['user']['preferences']['common']['country'] = $holidays[$i]['locale'];
-				$holidaycalc =& CreateObject('calendar.holidaycalc');
+				$holidaycalc = & CreateObject('calendar.holidaycalc');
 			}
 			$holidays[$i]['date'] = $holidaycalc->calculate_date($holiday, $holidays, $this->year);
 		}
@@ -457,9 +457,9 @@ 
 
 	function check_admin()
 	{
-		if(!@$GLOBALS['egw_info']['user']['apps']['admin'])
+		if (!@$GLOBALS['egw_info']['user']['apps']['admin'])
 		{
-			Header('Location: ' . $GLOBALS['egw']->link('/index.php'));
+			Header('Location: '.$GLOBALS['egw']->link('/index.php'));
 		}
 	}
 
@@ -470,8 +470,8 @@ 
 			return false;
 		}
 		$monthnames = array(
-			'','January','February','March','April','May','June',
-			'July','August','September','October','November','December'
+			'', 'January', 'February', 'March', 'April', 'May', 'June',
+			'July', 'August', 'September', 'October', 'November', 'December'
 		);
 		$month = $holiday['month'] ? lang($monthnames[$holiday['month']]) : '';
 
@@ -479,15 +479,15 @@ 
 		{
 			$occ = $holiday['occurence'] == 99 ? lang('last') : $holiday['occurence'].'.';
 
-			$dow_str = Array(lang('Sun'),lang('Mon'),lang('Tue'),lang('Wed'),lang('Thu'),lang('Fri'),lang('Sat'));
+			$dow_str = Array(lang('Sun'), lang('Mon'), lang('Tue'), lang('Wed'), lang('Thu'), lang('Fri'), lang('Sat'));
 			$dow = $dow_str[$holiday['dow']];
 
-			$str = lang('%1 %2 in %3',$occ,$dow,$month);
+			$str = lang('%1 %2 in %3', $occ, $dow, $month);
 		}
 		else
 		{
-			$arr = array($month,$holiday['day']);
-			if ($holiday['occurence']>1900) array_unshift ($arr, $holiday['occurence']);
+			$arr = array($month, $holiday['day']);
+			if ($holiday['occurence'] > 1900) array_unshift($arr, $holiday['occurence']);
 			$str = implode('-', $arr);
 		}
 		if ($holiday['observance_rule'])
@@ -498,7 +498,7 @@ 
 	}
 }
 
-function _holiday_cmp($a,$b)
+function _holiday_cmp($a, $b)
 {
 	if (($year_diff = ($a['occurence'] <= 0 ? 0 : $a['occurence']) - ($b['occurence'] <= 0 ? 0 : $b['occurence'])))
 	{

Braces +4 added lines, -1 removed lines

@@ -487,7 +487,10 @@
 		else
 		{
 			$arr = array($month,$holiday['day']);
-			if ($holiday['occurence']>1900) array_unshift ($arr, $holiday['occurence']);
+			if ($holiday['occurence']>1900)
+			{
+				array_unshift ($arr, $holiday['occurence']);
+			}
 			$str = implode('-', $arr);
 		}
 		if ($holiday['observance_rule'])

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

@@ -24,7 +24,7 @@ 
  */
 class boholiday
 {
-	var $public_functions = Array(
+	var $public_functions = array(
 		'add'		=> True,
 		'delete_holiday'	=> True,
 		'delete_locale'	=> True,
@@ -50,7 +50,7 @@ 
 	var $query;
 	var $sort;
 
-	var $locales = Array();
+	var $locales = array();
 	var $holidays;
 	var $cached_holidays;
 
@@ -91,7 +91,7 @@ 
 		{
 			if(!$this->id)
 			{
-				return Array();
+				return array();
 			}
 			else
 			{
@@ -411,7 +411,7 @@ 
 
 	function set_holidays_to_date($holidays)
 	{
-		$new_holidays = Array();
+		$new_holidays = array();
 		for($i=0;$i<count($holidays);$i++)
 		{
 //	echo "Setting Holidays Date : ".date('Ymd',$holidays[$i]['date'])."<br>\n";
@@ -479,7 +479,7 @@ 
 		{
 			$occ = $holiday['occurence'] == 99 ? lang('last') : $holiday['occurence'].'.';
 
-			$dow_str = Array(lang('Sun'),lang('Mon'),lang('Tue'),lang('Wed'),lang('Thu'),lang('Fri'),lang('Sat'));
+			$dow_str = array(lang('Sun'),lang('Mon'),lang('Tue'),lang('Wed'),lang('Thu'),lang('Fri'),lang('Sat'));
 			$dow = $dow_str[$holiday['dow']];
 
 			$str = lang('%1 %2 in %3',$occ,$dow,$month);

calendar/inc/class.calendar_import_ical.inc.php

Indentation +31 added lines, -31 removed lines

@@ -64,8 +64,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -94,9 +94,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.
@@ -202,38 +202,38 @@ 
 	}
 
 	/**
-        * 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;
+		}
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -15,19 +15,19 @@ 
 /**
  * import ical for calendar
  */
-class calendar_import_ical implements importexport_iface_import_plugin  {
+class calendar_import_ical implements importexport_iface_import_plugin {
 
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset',		// string
-		'owner', 		// int
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'owner', // int
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -104,7 +104,7 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import($_stream, importexport_definition $_definition) {
 
 		$this->definition = $_definition;
 
@@ -112,20 +112,20 @@ 
 		$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 addressbook bo
-		$this->bo= new calendar_boupdate();
+		$this->bo = new calendar_boupdate();
 
 
 		// Failures
 		$this->errors = array();
 
-		@set_time_limit(0);     // try switching execution time limit off
+		@set_time_limit(0); // try switching execution time limit off
 
 		$calendar_ical = new calendar_ical;
 		$calendar_ical->setSupportedFields('file', '');
-		if($this->dry_run)
+		if ($this->dry_run)
 		{
 			// No real dry run for iCal
 			echo lang("No preview for iCal");
@@ -136,7 +136,7 @@ 
 		{
 			$_definition->plugin_options['no_notification'] = true;
 		}
-		if (!$calendar_ical->importVCal($_stream, -1,null,false,0,'',null,null,null,$_definition->plugin_options['no_notification']))
+		if (!$calendar_ical->importVCal($_stream, -1, null, false, 0, '', null, null, null, $_definition->plugin_options['no_notification']))
 		{
 			$this->errors[] = lang('Error: importing the iCal');
 		}

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(

Braces +20 added lines, -10 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * import ical for calendar
  */
-class calendar_import_ical implements importexport_iface_import_plugin  {
+class calendar_import_ical implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -104,7 +105,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 
 		$this->definition = $_definition;
 
@@ -154,7 +156,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar iCal import');
 	}
 
@@ -163,7 +166,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports events into your Calendar from an iCal File.");
 	}
 
@@ -172,7 +176,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'ics';
 	}
 
@@ -188,7 +193,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -197,7 +203,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -209,7 +216,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -221,7 +229,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -233,7 +242,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 }
\ No newline at end of file

calendar/inc/class.calendar_favorite_portlet.inc.php

Spacing +41 added lines, -42 removed lines

@@ -32,19 +32,19 @@ 
 		$reload = !is_null($need_reload);
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
-		if($this->favorite['state']['view'] == 'listview')
+		if ($this->favorite['state']['view'] == 'listview')
 		{
 			$this->context['template'] = 'calendar.list.rows';
 			$this->context['sel_options'] = array();
 			$this->nm_settings += array(
 				'csv_export'      => True,
-				'filter_no_lang'  => True,	// I  set no_lang for filter (=dont translate the options)
-				'no_filter2'      => True,	// I  disable the 2. filter (params are the same as for filter)
-				'no_cat'          => True,	// I  disable the cat-selectbox
+				'filter_no_lang'  => True, // I  set no_lang for filter (=dont translate the options)
+				'no_filter2'      => True, // I  disable the 2. filter (params are the same as for filter)
+				'no_cat'          => True, // I  disable the cat-selectbox
 				'filter'          => 'after',
-				'row_id'          => 'row_id',	// set in get rows "$event[id]:$event[recur_date]"
+				'row_id'          => 'row_id', // set in get rows "$event[id]:$event[recur_date]"
 				'row_modified'    => 'modified',
 				'get_rows'	=> 'calendar_favorite_portlet::get_rows',
 				// Use a different template so it can be accessed from client side
@@ -58,17 +58,17 @@ 
 		$need_reload = $reload && $need_reload;
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 
 		// Always load app's javascript, so most actions have a chance of working
-		Framework::includeJS('.','app',$this->context['appname']);
+		Framework::includeJS('.', 'app', $this->context['appname']);
 
 		// Always load app's css
 		Framework::includeCSS('calendar', 'app-'.$GLOBALS['egw_info']['user']['preferences']['common']['theme']) ||
-			Framework::includeCSS('calendar','app');
+			Framework::includeCSS('calendar', 'app');
 
-		if($this->favorite['state']['view'] == 'listview' || is_array($this->favorite) && !$this->favorite['state']['view'])
+		if ($this->favorite['state']['view'] == 'listview' || is_array($this->favorite) && !$this->favorite['state']['view'])
 		{
 			$ui = new calendar_uilist();
 		}
@@ -77,16 +77,16 @@ 
 			$ui = new calendar_uiviews();
 			if ($this->favorite)
 			{
-				if($this->favorite['state']['start']) $ui->search_params['start'] = $this->favorite['state']['start'];
-				if($this->favorite['state']['cat_id']) $ui->search_params['cat_id'] = $this->favorite['state']['cat_id'];
+				if ($this->favorite['state']['start']) $ui->search_params['start'] = $this->favorite['state']['start'];
+				if ($this->favorite['state']['cat_id']) $ui->search_params['cat_id'] = $this->favorite['state']['cat_id'];
 				// Owner can be 0 for current user
-				if(array_key_exists('owner',$this->favorite['state'])) $ui->search_params['users'] = $this->favorite['state']['owner'];
-				if($ui->search_params['users'] && !is_array($ui->search_params['users']))
+				if (array_key_exists('owner', $this->favorite['state'])) $ui->search_params['users'] = $this->favorite['state']['owner'];
+				if ($ui->search_params['users'] && !is_array($ui->search_params['users']))
 				{
-					$ui->search_params['users'] = explode(',',$ui->search_params['users']);
+					$ui->search_params['users'] = explode(',', $ui->search_params['users']);
 				}
-				if($this->favorite['state']['filter']) $ui->search_params['filter'] = $this->favorite['state']['filter'];
-				if($this->favorite['state']['sortby']) $ui->search_params['sortby'] = $this->favorite['state']['sortby'];
+				if ($this->favorite['state']['filter']) $ui->search_params['filter'] = $this->favorite['state']['filter'];
+				if ($this->favorite['state']['sortby']) $ui->search_params['sortby'] = $this->favorite['state']['sortby'];
 				$ui->search_params['weekend'] = $this->favorite['state']['weekend'];
 			}
 			$etemplate->read('home.legacy');
@@ -96,7 +96,7 @@ 
 
 		$content = array('legacy' => '');
 
-		switch($this->favorite['state']['view'])
+		switch ($this->favorite['state']['view'])
 		{
 			case 'listview':
 				$this->context['sel_options']['filter'] = &$ui->date_filters;
@@ -110,9 +110,9 @@ 
 				$content = array();
 				$etemplate->read('calendar.planner');
 				$etemplate->set_dom_id($id);
-				$this->actions =& $etemplate->getElementAttribute('planner', 'actions');
+				$this->actions = & $etemplate->getElementAttribute('planner', 'actions');
 				// Don't notify the calendar app of date changes
-				$etemplate->setElementAttribute('planner','onchange',false);
+				$etemplate->setElementAttribute('planner', 'onchange', false);
 				$ui->planner_view = $this->favorite['state']['planner_view'];
 				$ui->planner(array(), $etemplate);
 				return;
@@ -120,20 +120,19 @@ 
 			case 'weekN':
 				$etemplate->read('calendar.view');
 				$etemplate->set_dom_id($id);
-				$this->actions =& $etemplate->getElementAttribute('view', 'actions');
+				$this->actions = & $etemplate->getElementAttribute('view', 'actions');
 
 				$ui->month($this->favorite['state']['view'] == 'month' ?
-					0 :
-					(int)$ui->cal_prefs['multiple_weeks'],
+					0 : (int)$ui->cal_prefs['multiple_weeks'],
 					$etemplate
 				);
 				return;
 			case 'week':
 				$etemplate->read('calendar.view');
 				$etemplate->set_dom_id($id);
-				$this->actions =& $etemplate->getElementAttribute('view', 'actions');
+				$this->actions = & $etemplate->getElementAttribute('view', 'actions');
 				// Don't notify the calendar app of date changes
-				$etemplate->setElementAttribute('view[0]','onchange',false);
+				$etemplate->setElementAttribute('view[0]', 'onchange', false);
 				$ui->week(array(), $etemplate);
 				return;
 			case 'day':
@@ -143,7 +142,7 @@ 
 				$days = $this->favorite['state']['days'] ? $this->favorite['state']['days'] : (
 					$this->favorite['state']['view'] == 'day' ? 1 : 4
 				);
-				$this->actions =& $etemplate->getElementAttribute('view', 'actions');
+				$this->actions = & $etemplate->getElementAttribute('view', 'actions');
 				$ui->week($days, $etemplate);
 				return;
 		}
@@ -156,7 +155,7 @@ 
 		$old_app = $GLOBALS['egw_info']['flags']['currentapp'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 
-		$etemplate->exec(get_called_class() .'::process',$content);
+		$etemplate->exec(get_called_class().'::process', $content);
 		$GLOBALS['egw_info']['flags']['currentapp'] = $old_app;
 	}
 
@@ -199,27 +198,27 @@ 
 			else
 			{
 				$success = $failed = $action_msg = $msg = null;
-				if ($ui->action($values['nm']['action'],$values['nm']['selected'],$values['nm']['select_all'],
-						$success,$failed,$action_msg,'calendar_list',$msg, $values['nm']['checkboxes']['no_notifications']))
+				if ($ui->action($values['nm']['action'], $values['nm']['selected'], $values['nm']['select_all'],
+						$success, $failed, $action_msg, 'calendar_list', $msg, $values['nm']['checkboxes']['no_notifications']))
 				{
-					$msg .= lang('%1 event(s) %2',$success,$action_msg);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($values['nm']['selected'] as &$id)
+					$msg .= lang('%1 event(s) %2', $success, $action_msg);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($values['nm']['selected'] as &$id)
 					{
 						$id = 'calendar::'.$id;
 					}
 					// Directly request an update - this will get addressbook tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($values['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($values['nm']['selected']));
 				}
-				elseif(is_null($msg))
+				elseif (is_null($msg))
 				{
-					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= lang('%1 entries %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
-				elseif($msg)
+				elseif ($msg)
 				{
-					$msg .= "\n".lang('%1 entries %2, %3 failed.',$success,$action_msg,$failed);
-					Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+					$msg .= "\n".lang('%1 entries %2, %3 failed.', $success, $action_msg, $failed);
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 				}
 				unset($values['nm']['action']);
 				unset($values['nm']['select_all']);
@@ -235,9 +234,9 @@ 
 	public function get_properties()
 	{
 		$properties = parent::get_properties();
-		foreach($properties as &$property)
+		foreach ($properties as &$property)
 		{
-			if($property['name'] == 'favorite')
+			if ($property['name'] == 'favorite')
 			{
 				unset($property['select_options']['blank']);
 				break;
@@ -247,7 +246,7 @@ 
 	}
 
 	public function get_actions() {
-		if($this->favorite['state']['view'] == 'listview' || !$this->actions)
+		if ($this->favorite['state']['view'] == 'listview' || !$this->actions)
 		{
 			return array();
 		}

Braces +22 added lines, -6 removed lines

@@ -77,16 +77,31 @@ 
 			$ui = new calendar_uiviews();
 			if ($this->favorite)
 			{
-				if($this->favorite['state']['start']) $ui->search_params['start'] = $this->favorite['state']['start'];
-				if($this->favorite['state']['cat_id']) $ui->search_params['cat_id'] = $this->favorite['state']['cat_id'];
+				if($this->favorite['state']['start'])
+				{
+					$ui->search_params['start'] = $this->favorite['state']['start'];
+				}
+				if($this->favorite['state']['cat_id'])
+				{
+					$ui->search_params['cat_id'] = $this->favorite['state']['cat_id'];
+				}
 				// Owner can be 0 for current user
-				if(array_key_exists('owner',$this->favorite['state'])) $ui->search_params['users'] = $this->favorite['state']['owner'];
+				if(array_key_exists('owner',$this->favorite['state']))
+				{
+					$ui->search_params['users'] = $this->favorite['state']['owner'];
+				}
 				if($ui->search_params['users'] && !is_array($ui->search_params['users']))
 				{
 					$ui->search_params['users'] = explode(',',$ui->search_params['users']);
 				}
-				if($this->favorite['state']['filter']) $ui->search_params['filter'] = $this->favorite['state']['filter'];
-				if($this->favorite['state']['sortby']) $ui->search_params['sortby'] = $this->favorite['state']['sortby'];
+				if($this->favorite['state']['filter'])
+				{
+					$ui->search_params['filter'] = $this->favorite['state']['filter'];
+				}
+				if($this->favorite['state']['sortby'])
+				{
+					$ui->search_params['sortby'] = $this->favorite['state']['sortby'];
+				}
 				$ui->search_params['weekend'] = $this->favorite['state']['weekend'];
 			}
 			$etemplate->read('home.legacy');
@@ -246,7 +261,8 @@ 
 		return $properties;
 	}
 
-	public function get_actions() {
+	public function get_actions()
+	{
 		if($this->favorite['state']['view'] == 'listview' || !$this->actions)
 		{
 			return array();

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

@@ -49,7 +49,7 @@
 	 *
 	 * @param boolean $need_reload Flag to indicate that the portlet needs to be reloaded (exec will be called)
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		if (false) parent::__construct();