EGroupware / egroupware

calendar/inc/class.calendar_timegrid_etemplate_widget.inc.php

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_holidays.inc.php

Braces +32 added lines, -8 removed lines

@@ -41,7 +41,10 @@ 
 	 */
 	public static function read($country, $year=null)
 	{
-		if (!$year) $year = (int)Api\DateTime::to('now', 'Y');
+		if (!$year)
+		{
+			$year = (int)Api\DateTime::to('now', 'Y');
+		}
 		$level = self::is_url($country) ? Api\Cache::INSTANCE : Api\Cache::TREE;
 
 		$holidays = Api\Cache::getCache($level, __CLASS__, $country.':'.$year);
@@ -68,7 +71,10 @@ 
 	 */
 	public static function render($country, $year=null, $until_year=null)
 	{
-		if (!$year) $year = (int)Api\DateTime::to('now', 'Y');
+		if (!$year)
+		{
+			$year = (int)Api\DateTime::to('now', 'Y');
+		}
 		$end_year = $until_year && $year < $until_year ? $until_year : $year;
 
 		$starttime = microtime(true);
@@ -81,22 +87,40 @@ 
 		{
 			$start = new Api\DateTime($event['start']);
 			$end = new Api\DateTime($event['end']);
-			if ($start->format('Y') > $end_year) continue;
-			if ($end->format('Y') < $year && !$event['recur_type']) continue;
+			if ($start->format('Y') > $end_year)
+			{
+				continue;
+			}
+			if ($end->format('Y') < $year && !$event['recur_type'])
+			{
+				continue;
+			}
 
 			// recuring events
 			if ($event['recur_type'])
 			{
 				// calendar_rrule limits no enddate, to 5 years
-				if (!$event['recur_enddate']) $event['recur_enddate'] = (1+$end_year).'0101';
+				if (!$event['recur_enddate'])
+				{
+					$event['recur_enddate'] = (1+$end_year).'0101';
+				}
 
 				$rrule = calendar_rrule::event2rrule($event);
-				if ($rrule->enddate && $rrule->enddate->format('Y') < $year) continue;
+				if ($rrule->enddate && $rrule->enddate->format('Y') < $year)
+				{
+					continue;
+				}
 
 				foreach($rrule as $rtime)
 				{
-					if (($y = (int)$rtime->format('Y')) < $year) continue;
-					if ($y > $end_year) break;
+					if (($y = (int)$rtime->format('Y')) < $year)
+					{
+						continue;
+					}
+					if ($y > $end_year)
+					{
+						break;
+					}
 
 					$ymd = (int)$rtime->format('Ymd');
 					$years[$y][(string)$ymd][] = array(

calendar/inc/class.calendar_import_ical.inc.php

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_timezones.inc.php

Braces +27 added lines, -6 removed lines

@@ -188,10 +188,18 @@ 
 		{
 			$updated = false;
 			$msg = self::import_zones($updated);
-			if ($updated) error_log($msg);	// log that timezones have been updated
+			if ($updated)
+			{
+				error_log($msg);
+			}
+			// log that timezones have been updated
 
 			$alias_msg = self::import_tz_aliases($updated);
-			if ($updated) error_log($alias_msg);	// log that timezone aliases have been updated
+			if ($updated)
+			{
+				error_log($alias_msg);
+			}
+			// log that timezone aliases have been updated
 
 			self::$import_msg = $msg.'<br/>'.$alias_msg;
 
@@ -249,7 +257,11 @@ 
 				if ($type == 'aliases')
 				{
 					$data = array('alias' => $tz2id[$data['aliasTo']]);
-					if (!$data['alias']) continue;	// there's no such tzid
+					if (!$data['alias'])
+					{
+						continue;
+					}
+					// there's no such tzid
 				}
 				// check if already in database
 				$tz2id[$tzid] = $GLOBALS['egw']->db->select('egw_cal_timezones','tz_id',array(
@@ -266,7 +278,10 @@ 
 				),__LINE__,__FILE__,'calendar');
 
 				// only query last insert id, if not already in database (gives warning for PostgreSQL)
-				if (!$tz2id[$tzid]) $tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				if (!$tz2id[$tzid])
+				{
+					$tz2id[$tzid] = $GLOBALS['egw']->db->get_last_insert_id('egw_cal_timezones','tz_id');
+				}
 			}
 		}
 		Api\Config::save_value('tz_version', $tz_version, 'phpgwapi');
@@ -306,13 +321,16 @@ 
 		foreach($tz_aliases as $alias => $tzid)
 		{
 			if ((!($alias_id=self::tz2id($alias, 'alias')) || self::id2tz($alias_id, 'tzid') !== $tzid) &&	// not in DB or different
-				($tz_id = self::tz2id($tzid)))	// given tzid for alias exists in DB
+				($tz_id = self::tz2id($tzid)))
+			{
+				// given tzid for alias exists in DB
 			{
 				$GLOBALS['egw']->db->insert('egw_cal_timezones',array(
 					'tz_alias' => $tz_id,
 				),array(
 					'tz_tzid' => $alias,
 				),__LINE__,__FILE__,'calendar');
+			}
 				++$updates;
 			}
 			//error_log(__METHOD__."() alias=$alias, tzid=$tzid --> self::tz2id('$alias', 'alias') = ".array2string($alias_id).",  self::tz2id('$tzid')=".array2string($tz_id));
@@ -402,7 +420,10 @@ 
 			$prefs = $prefs_obj->read();
 			$tzid = $prefs['common']['tz'];
 		}
-		if (!$tzid) $tzid = Api\DateTime::$server_timezone->getName();
+		if (!$tzid)
+		{
+			$tzid = Api\DateTime::$server_timezone->getName();
+		}
 
 		switch ($type)
 		{

calendar/inc/class.calendar_favorite_portlet.inc.php

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();

calendar/inc/class.calendar_so.inc.php

Braces +366 added lines, -96 removed lines

@@ -154,16 +154,32 @@ 
 	 */
 	protected function cal_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)	// using view without start-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start)
 		{
-			return $this->cal_table;	// no need / use for a view
+			// using view without start-date is slower!
+		{
+			return $this->cal_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
-		if ($end) $where[] = "range_start<".(int)$end;
-		if ($start) $where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where[] = "cal_deleted IS ".($deleted ? '' : 'NOT').' NULL';
+		}
+		if ($end)
+		{
+			$where[] = "range_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "(range_end IS NULL OR range_end>".(int)$start.")";
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		$sql = "(SELECT * FROM $this->cal_table WHERE ".$this->db->expression($this->cal_table, $where).") $this->cal_table";
 
@@ -184,16 +200,32 @@ 
 	 */
 	protected function dates_range_view($start, $end, array $_where=null, $deleted=false)
 	{
-		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)	// using view without start- AND end-date is slower!
+		if ($GLOBALS['egw_info']['server']['no_timerange_views'] || !$start || !$end)
+		{
+			// using view without start- AND end-date is slower!
 		{
-			return $this->dates_table;	// no need / use for a view
+			return $this->dates_table;
+		}
+		// no need / use for a view
 		}
 
 		$where = array();
-		if (isset($deleted)) $where['recur_exception'] = $deleted;
-		if ($end) $where[] = "cal_start<".(int)$end;
-		if ($start) $where[] = "cal_end>".(int)$start;
-		if ($_where) $where = array_merge($where, $_where);
+		if (isset($deleted))
+		{
+			$where['recur_exception'] = $deleted;
+		}
+		if ($end)
+		{
+			$where[] = "cal_start<".(int)$end;
+		}
+		if ($start)
+		{
+			$where[] = "cal_end>".(int)$start;
+		}
+		if ($_where)
+		{
+			$where = array_merge($where, $_where);
+		}
 
 		// Api\Db::union uses Api\Db::select which check if join contains "WHERE"
 		// to support old join syntax like ", other_table WHERE ...",
@@ -243,7 +275,10 @@ 
 			throw new Api\Exception\AssertionFailed("Unsupported value for parameters!");
 		}
 		$where = is_array($params['query']) ? $params['query'] : array();
-		if ($cat_id) $where[] = $this->cat_filter($cat_id);
+		if ($cat_id)
+		{
+			$where[] = $this->cat_filter($cat_id);
+		}
 		$egw_cal = $this->cal_range_view($start, $end, $where, $filter == 'everything' ? null : $filter != 'deleted');
 
 		$status_filter = $this->status_filter($filter, $params['enum_recuring']);
@@ -264,7 +299,10 @@ 
 		if ($users)
 		{
 			// fix $users to also prefix system users and groups (with 'u')
-			if (!is_array($users)) $users = $users ? (array)$users : array();
+			if (!is_array($users))
+			{
+				$users = $users ? (array)$users : array();
+			}
 			foreach($users as &$uid)
 			{
 				$user_type = $user_id = null;
@@ -284,15 +322,22 @@ 
 			$sql .= " AND\n	".$params['sql_filter'];
 		}
 
-		if ($params['order'])	// only order if requested
+		if ($params['order'])
 		{
-			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+			// only order if requested
+		{
+			if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 			$sql .= "\nORDER BY ".$params['order'];
 		}
 
-		if ($offset === false)	// return all rows --> Api\Db::query wants offset=0, num_rows=-1
+		if ($offset === false)
+		{
+			// return all rows --> Api\Db::query wants offset=0, num_rows=-1
 		{
 			$offset = 0;
+		}
 			$num_rows = -1;
 		}
 		$events =& $this->get_events($this->db->query($sql, __LINE__, __FILE__, $offset, $num_rows));
@@ -318,26 +363,35 @@ 
 		$join = "LEFT JOIN $this->repeats_table ON $this->cal_table.cal_id=$this->repeats_table.cal_id";
 
 		$where = array();
-		if (is_scalar($ids) && !is_numeric($ids))	// a single uid
+		if (is_scalar($ids) && !is_numeric($ids))
+		{
+			// a single uid
 		{
 			// We want only the parents to match
 			$where['cal_uid'] = $ids;
+		}
 			$where['cal_reference'] = 0;
 		}
-		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))	// one or more cal_id's
+		elseif(is_array($ids) && isset($ids[count($ids)-1]) || is_scalar($ids))
+		{
+			// one or more cal_id's
 		{
 			$where['cal_id'] = $ids;
 		}
+		}
 		else	// array with column => value pairs
 		{
 			$where = $ids;
 			unset($ids);	// otherwise users get not read!
 		}
-		if (isset($where['cal_id']))	// prevent non-unique column-name cal_id
+		if (isset($where['cal_id']))
+		{
+			// prevent non-unique column-name cal_id
 		{
 			$where[] = $this->db->expression($this->cal_table, $this->cal_table.'.',array(
 				'cal_id' => $where['cal_id'],
 			));
+		}
 			unset($where['cal_id']);
 		}
 		if ((int) $recur_date)
@@ -387,10 +441,16 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 			$events[$row['cal_id']] = Api\Db::strip_array_keys($row,'cal_');
 		}
-		if (!$events) return $events;
+		if (!$events)
+		{
+			return $events;
+		}
 
 		$ids = array_keys($events);
-		if (count($ids) == 1) $ids = $ids[0];
+		if (count($ids) == 1)
+		{
+			$ids = $ids[0];
+		}
 
 		foreach ($events as &$event)
 		{
@@ -464,10 +524,13 @@ 
 			'cal_id'      => $ids,
 			'cal_recur_date' => $recur_date,
 			"cal_status NOT IN ('X','E')",
-		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)	// DESC puts users before resources and contacts
+		),__LINE__,__FILE__,false,'ORDER BY cal_user_type DESC,cal_recur_date ASC,'.self::STATUS_SORT,'calendar') as $row)
+		{
+			// DESC puts users before resources and contacts
 		{
 			// combine all participant data in uid and status values
 			$uid    = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
+		}
 			$status = self::combine_status($row['cal_status'],$row['cal_quantity'],$row['cal_role']);
 
 			$events[$row['cal_id']]['participants'][$uid] = $status;
@@ -524,7 +587,10 @@ 
 			$last_request = time();
 		}
 		$signature = serialize(func_get_args());
-		if (isset($ctags[$signature])) return $ctags[$signature];
+		if (isset($ctags[$signature]))
+		{
+			return $ctags[$signature];
+		}
 
 		$types = array();
 		foreach((array)$users as $uid)
@@ -557,7 +623,10 @@ 
 			// owner can only by users, no groups or resources
 			foreach($users as $key => $user)
 			{
-				if (!($user > 0)) unset($users[$key]);
+				if (!($user > 0))
+				{
+					unset($users[$key]);
+				}
 			}
 			$where = $this->db->expression($this->user_table, '(', $where, ' OR ').
 				$this->db->expression($this->cal_table, array(
@@ -579,7 +648,10 @@ 
 	 */
 	function get_cal_data(array $query, $cols='cal_id,cal_reference,cal_etag,cal_modified,cal_user_modified')
 	{
-		if (!is_array($cols)) $cols = explode(',', $cols);
+		if (!is_array($cols))
+		{
+			$cols = explode(',', $cols);
+		}
 
 		// special handling of cal_user_modified "pseudo" column
 		if (($key = array_search('cal_user_modified', $cols)) !== false)
@@ -604,7 +676,10 @@ 
 		{
 			$cats = $GLOBALS['egw']->categories->return_all_children($cat_id);
 			array_walk($cats,create_function('&$val,$key','$val = (int) $val;'));
-			if (is_array($cat_id) && count($cat_id)==1) $cat_id = $cat_id[0];
+			if (is_array($cat_id) && count($cat_id)==1)
+			{
+				$cat_id = $cat_id[0];
+			}
 			$sql = '(cal_category'.(count($cats) > 1 ? " IN ('".implode("','",$cats)."')" : '='.$this->db->quote((int)$cat_id));
 			foreach($cats as $cat)
 			{
@@ -663,10 +738,13 @@ 
 				$where[] = "$this->user_table.cal_status NOT IN ('X','E')";
 				break;
 			default:
-				if ($enum_recuring)	// regular UI
+				if ($enum_recuring)
+				{
+					// regular UI
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X','E')";
 				}
+				}
 				else	// CalDAV / eSync / iCal need to include 'E' = exceptions
 				{
 					$where[] = "$this->user_table.cal_status NOT IN ('R','X')";
@@ -798,7 +876,10 @@ 
 						$user_ids = array();
 						foreach($ids as $user_id)
 						{
-							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u') $user_ids[] = $user_id;
+							if ($GLOBALS['egw']->accounts->get_type($user_id) === 'u')
+							{
+								$user_ids[] = $user_id;
+							}
 						}
 						$owner_or = $this->db->expression($cal_table_def,array('cal_owner' => $user_ids));
 					}
@@ -818,7 +899,10 @@ 
 				}
 			}
 			// this is only used, when we cannot use UNIONS
-			if (!$useUnionQuery) $where[] = '('.implode(' OR ',$to_or).')';
+			if (!$useUnionQuery)
+			{
+				$where[] = '('.implode(' OR ',$to_or).')';
+			}
 
 			$where = $this->status_filter($filter, $params['enum_recuring'], $where);
 		}
@@ -837,7 +921,11 @@ 
 				$where[] = '('.((int)$start).' < range_end OR range_end IS NULL)';
 			}
 		}
-		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order'])) $params['order'] = 'cal_start';		// gard against SQL injection
+		if (!preg_match('/^[a-z_ ,c]+$/i',$params['order']))
+		{
+			$params['order'] = 'cal_start';
+		}
+		// gard against SQL injection
 
 		// if not enum recuring events, we have to use minimum start- AND end-dates, otherwise we get more then one event per cal_id!
 		if (!$params['enum_recuring'])
@@ -847,9 +935,15 @@ 
 			// in case cal_start is used in a query, eg. calendar_ical::find_event
 			$where = str_replace(array('cal_start','cal_end'), array('range_start','(SELECT MIN(cal_end) FROM egw_cal_dates WHERE egw_cal.cal_id=egw_cal_dates.cal_id)'), $where);
 			$params['order'] = str_replace('cal_start', 'range_start', $params['order']);
-			if ($end) $where[] = (int)$end.' > range_start';
+			if ($end)
+			{
+				$where[] = (int)$end.' > range_start';
+			}
   		}
-		elseif ($end) $where[] = (int)$end.' > cal_start';
+  		elseif ($end)
+		{
+			$where[] = (int)$end.' > cal_start';
+		}
 
 		if ($remove_rejected_by_user && $filter != 'everything')
 		{
@@ -863,7 +957,10 @@ 
 				'rejected_by_user.cal_status IS NULL',
 				"rejected_by_user.cal_status NOT IN ('R','X')",
 			);
-			if ($filter == 'owner') $or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			if ($filter == 'owner')
+			{
+				$or_required[] = 'cal_owner='.(int)$remove_rejected_by_user;
+			}
 			$where[] = '('.implode(' OR ',$or_required).')';
 		}
 		// using a time-range and deleted attribute limited view instead of full table
@@ -885,7 +982,10 @@ 
 		if ($useUnionQuery)
 		{
 			// allow apps to supply participants and/or icons
-			if (!isset($params['cols'])) $cols .= ',NULL AS participants,NULL AS icons';
+			if (!isset($params['cols']))
+			{
+				$cols .= ',NULL AS participants,NULL AS icons';
+			}
 
 			// changed the original OR in the query into a union, to speed up the query execution under MySQL 5
 			// with time-range views benefit is now at best slim for huge tables or none at all!
@@ -940,9 +1040,12 @@ 
 					$selects[count($selects)-1]['where'][] = "$this->user_table.cal_recur_date=cal_start";
 				}
 			}
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				foreach(array_keys($selects) as $key)
 				{
@@ -953,14 +1056,20 @@ 
 							array('range_start AS cal_start','range_end AS cal_end'), $selects[$key]['cols']);
 					}
 				}
-				if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				if (!isset($params['cols']) && !$params['no_integration'])
+				{
+					self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+				}
 
 				$this->total = $this->db->union($selects,__LINE__,__FILE__)->NumRows();
 
 				// restore original cols / selects
 				$selects = $save_selects; unset($save_selects);
 			}
-			if (!isset($params['cols']) && !$params['no_integration']) self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			if (!isset($params['cols']) && !$params['no_integration'])
+			{
+				self::get_union_selects($selects,$start,$end,$users,$cat_id,$filter,$params['query'],$params['users']);
+			}
 
 			$rs = $this->db->union($selects,__LINE__,__FILE__,$params['order'],$offset,$num_rows);
 		}
@@ -978,9 +1087,12 @@ 
 				'table_def' => $cal_table_def,
 			));
 
-			if (is_numeric($offset) && !$params['no_total'])	// get the total too
+			if (is_numeric($offset) && !$params['no_total'])
+			{
+				// get the total too
 			{
 				$save_selects = $selects;
+			}
 				// we only select cal_table.cal_id (and not cal_table.*) to be able to use DISTINCT (eg. MsSQL does not allow it for text-columns)
 				$selects[0]['cols'] = "$this->cal_table.cal_id,cal_start";
 				if (!isset($params['cols']) && !$params['no_integration'] && $this->db->capabilities['union'])
@@ -1008,7 +1120,10 @@ 
 		foreach($rs as $row)
 		{
 			$id = $row['cal_id'];
-			if (is_numeric($id)) $ids[] = $id;
+			if (is_numeric($id))
+			{
+				$ids[] = $id;
+			}
 
 			if ($row['cal_recur_date'])
 			{
@@ -1028,7 +1143,10 @@ 
 			$row['recur_exception'] = $row['alarm'] = array();
 
 			// compile a list of recurrences per cal_id
-			if (!in_array($id,(array)$recur_ids[$row['cal_id']])) $recur_ids[$row['cal_id']][] = $id;
+			if (!in_array($id,(array)$recur_ids[$row['cal_id']]))
+			{
+				$recur_ids[$row['cal_id']][] = $id;
+			}
 
 			$events[$id] = Api\Db::strip_array_keys($row,'cal_');
 		}
@@ -1047,10 +1165,16 @@ 
 					//'cal_id' => array_unique($ids),
 					'cal_recur_date' => $recur_dates,
 				),__LINE__,__FILE__,false,'ORDER BY cal_id,cal_user_type DESC,'.self::STATUS_SORT,'calendar',$num_rows,$join='',
-				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)	// DESC puts users before resources and contacts
+				$this->db->get_table_definitions('calendar',$this->user_table)) as $row)
+			{
+				// DESC puts users before resources and contacts
 			{
 				$id = $row['cal_id'];
-				if ($row['cal_recur_date']) $id .= '-'.$row['cal_recur_date'];
+			}
+				if ($row['cal_recur_date'])
+				{
+					$id .= '-'.$row['cal_recur_date'];
+				}
 
 				// combine all participant data in uid and status values
 				$uid = self::combine_user($row['cal_user_type'], $row['cal_user_id'], $row['cal_user_attendee']);
@@ -1069,7 +1193,10 @@ 
 				}
 
 				// set data, if recurrence is requested
-				if (isset($events[$id])) $events[$id]['participants'][$uid] = $status;
+				if (isset($events[$id]))
+				{
+					$events[$id]['participants'][$uid] = $status;
+				}
 			}
 			// query recurrance exceptions, if needed: enum_recuring && !daywise is used in calendar_groupdav::get_series($uid,...)
 			if (!$params['enum_recuring'] || !$params['daywise'])
@@ -1085,7 +1212,10 @@ 
 					{
 						foreach($events as $id => $event)
 						{
-							if ($event['id'] == $row['cal_id']) break;
+							if ($event['id'] == $row['cal_id'])
+							{
+								break;
+							}
 						}
 					}
 					$events[$id]['recur_exception'][] = $row['cal_start'];
@@ -1095,7 +1225,10 @@ 
 			if (!is_null($params['cfs']))
 			{
 				$where = array('cal_id' => $ids);
-				if ($params['cfs']) $where['cal_extra_name'] = $params['cfs'];
+				if ($params['cfs'])
+				{
+					$where['cal_extra_name'] = $params['cfs'];
+				}
 				foreach($this->db->select($this->extra_table,'*',$where,
 					__LINE__,__FILE__,false,'','calendar') as $row)
 				{
@@ -1115,14 +1248,20 @@ 
 				{
 					$event_start = $alarm['time'] + $alarm['offset'];
 
-					if (isset($events[$cal_id]))	// none recuring event
+					if (isset($events[$cal_id]))
+					{
+						// none recuring event
 					{
 						$events[$cal_id]['alarm'][$id] = $alarm;
 					}
-					elseif (isset($events[$cal_id.'-'.$event_start]))	// recuring event
+					}
+					elseif (isset($events[$cal_id.'-'.$event_start]))
+					{
+						// recuring event
 					{
 						$events[$cal_id.'-'.$event_start]['alarm'][$id] = $alarm;
 					}
+					}
 				}
 			}
 		}
@@ -1222,10 +1361,13 @@ 
 			}
 			foreach((array)$cols as $col)
 			{
-				if (substr($col,0,7) == 'egw_cal')	// remove table name
+				if (substr($col,0,7) == 'egw_cal')
+				{
+					// remove table name
 				{
 					$col = preg_replace('/^egw_cal[a-z_]*\./','',$col);
 				}
+				}
 				if (isset($app_cols[$col]))
 				{
 					$return_cols[] = $app_cols[$col];
@@ -1319,7 +1461,11 @@ 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length']))
 		{
 			$minimum_uid_length = $GLOBALS['egw_info']['user']['preferences']['syncml']['minimum_uid_length'];
-			if (empty($minimum_uid_length) || $minimum_uid_length<=1) $minimum_uid_length = 8; // we just do not accept no uid, or uid way to short!
+			if (empty($minimum_uid_length) || $minimum_uid_length<=1)
+			{
+				$minimum_uid_length = 8;
+			}
+			// we just do not accept no uid, or uid way to short!
 		}
 		else
 		{
@@ -1367,7 +1513,10 @@ 
 			}
 		}
 		// set range_start/_end, but only if we have cal_start/_end, as otherwise we destroy present values!
-		if (isset($event['cal_start'])) $event['range_start'] = $event['cal_start'];
+		if (isset($event['cal_start']))
+		{
+			$event['range_start'] = $event['cal_start'];
+		}
 		if (isset($event['cal_end']))
 		{
 			$event['range_end'] = $event['recur_type'] == MCAL_RECUR_NONE ? $event['cal_end'] :
@@ -1388,7 +1537,10 @@ 
 		$event['cal_category'] = implode(',',$categories);
 
 		// make sure recurring events never reference to an other recurrent event
-		if ($event['recur_type'] != MCAL_RECUR_NONE) $event['cal_reference'] = 0;
+		if ($event['recur_type'] != MCAL_RECUR_NONE)
+		{
+			$event['cal_reference'] = 0;
+		}
 
 		if ($cal_id)
 		{
@@ -1405,7 +1557,10 @@ 
 			{
 				$old_tz_id = $this->db->select($this->cal_table,'tz_id',$where,__LINE__,__FILE__,'calendar')->fetchColumn();
 			}
-			if (!is_null($etag)) $where['cal_etag'] = $etag;
+			if (!is_null($etag))
+			{
+				$where['cal_etag'] = $etag;
+			}
 
 			unset($event['cal_etag']);
 			$event[] = 'cal_etag=cal_etag+1';	// always update the etag, even if none given to check
@@ -1416,14 +1571,24 @@ 
 			{
 				return 0;	// wrong etag, someone else updated the entry
 			}
-			if (!is_null($etag)) ++$etag;
+			if (!is_null($etag))
+			{
+				++$etag;
+			}
 		}
 		else
 		{
 			// new event
-			if (!$event['cal_owner']) $event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			if (!$event['cal_owner'])
+			{
+				$event['cal_owner'] = $GLOBALS['egw_info']['user']['account_id'];
+			}
 
-			if (!$event['cal_id'] && !isset($event['cal_uid'])) $event['cal_uid'] = '';	// uid is NOT NULL!
+			if (!$event['cal_id'] && !isset($event['cal_uid']))
+			{
+				$event['cal_uid'] = '';
+			}
+			// uid is NOT NULL!
 
 			$this->db->insert($this->cal_table,$event,false,__LINE__,__FILE__,'calendar');
 			if (!($cal_id = $this->db->get_last_insert_id($this->cal_table,'cal_id')))
@@ -1575,8 +1740,7 @@ 
 					// recurrences need to be truncated
 					if((int)$event['recur_enddate'] > 0 &&
 						((int)$old_repeats['recur_enddate'] == 0 || (int)$old_repeats['recur_enddate'] > (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$this->db->delete($this->user_table,array('cal_id' => $cal_id,'cal_recur_date >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 						$this->db->delete($this->dates_table,array('cal_id' => $cal_id,'cal_start >= '.($event['recur_enddate'] + 1*DAY_s)),__LINE__,__FILE__,'calendar');
 					}
@@ -1584,8 +1748,7 @@ 
 					// recurrences need to be expanded
 					if(((int)$event['recur_enddate'] == 0 && (int)$old_repeats['recur_enddate'] > 0)
 						|| ((int)$event['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] > 0 && (int)$old_repeats['recur_enddate'] < (int)$event['recur_enddate'])
-					)
-					{
+					) {
 						$set_recurrences = true;
 						$set_recurrences_start = ($old_repeats['recur_enddate'] + 1*DAY_s);
 					}
@@ -1732,12 +1895,18 @@ 
 	{
 		//echo "<p>socal::move($cal_id,$start,$end,$change_since,$old_start,$old_end)</p>\n";
 
-		if (!(int) $cal_id) return false;
+		if (!(int) $cal_id)
+		{
+			return false;
+		}
 
 		if (!$old_start)
 		{
-			if ($change_since !== false) $row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
+			if ($change_since !== false)
+			{
+				$row = $this->db->select($this->dates_table,'MIN(cal_start) AS cal_start,MIN(cal_end) AS cal_end',
 				array('cal_id'=>$cal_id),__LINE__,__FILE__,false,'','calendar')->fetch();
+			}
 			// if no recurrence found, create one with the new dates
 			if ($change_since === false || !$row || !$row['cal_start'] || !$row['cal_end'])
 			{
@@ -1839,7 +2008,10 @@ 
 			$user_type = $uid[0];
 			$email = substr($uid, 1);
 			$matches = null;
-			if (preg_match('/<([^<>]+)>$/', $email, $matches)) $email = $matches[1];
+			if (preg_match('/<([^<>]+)>$/', $email, $matches))
+			{
+				$email = $matches[1];
+			}
 			$user_id = md5(trim(strtolower($email)));
 		}
 		else
@@ -1859,8 +2031,14 @@ 
 	 */
 	static function combine_status($status,$quantity=1,$role='REQ-PARTICIPANT')
 	{
-		if ((int)$quantity > 1) $status .= (int)$quantity;
-		if ($role != 'REQ-PARTICIPANT') $status .= $role;
+		if ((int)$quantity > 1)
+		{
+			$status .= (int)$quantity;
+		}
+		if ($role != 'REQ-PARTICIPANT')
+		{
+			$status .= $role;
+		}
 
 		return $status;
 	}
@@ -1881,8 +2059,14 @@ 
 		$matches = null;
 		if (is_string($status) && strlen($status) > 1 && preg_match('/^.([0-9]*)(.*)$/',$status,$matches))
 		{
-			if ((int)$matches[1] > 0) $quantity = (int)$matches[1];
-			if ($matches[2]) $role = $matches[2];
+			if ((int)$matches[1] > 0)
+			{
+				$quantity = (int)$matches[1];
+			}
+			if ($matches[2])
+			{
+				$role = $matches[2];
+			}
 			$status = $status[0];
 		}
 		elseif ($status === true)
@@ -1993,9 +2177,13 @@ 
 			}
 		}
 
-		if (count($participants))	// participants which need to be added
+		if (count($participants))
+		{
+			// participants which need to be added
 		{
-			if (!count($recurrences)) $recurrences[] = 0;   // insert the default recurrence
+			if (!count($recurrences)) $recurrences[] = 0;
+		}
+		// insert the default recurrence
 
 			$delete_deleted = array();
 
@@ -2067,7 +2255,10 @@ 
 			return false;
 		}
 
-		if (is_numeric($status)) $status = $status_code_short[$status];
+		if (is_numeric($status))
+		{
+			$status = $status_code_short[$status];
+		}
 
 		$uid = self::combine_user($user_type, $user_id);
 		$user_id_md5 = null;
@@ -2087,16 +2278,25 @@ 
 			$where[] = '(cal_recur_date=0 OR cal_recur_date >= '.time().')';
 		}
 
-		if ($status == 'G')		// remove group invitations, as we dont store them in the db
+		if ($status == 'G')
+		{
+			// remove group invitations, as we dont store them in the db
 		{
 			$this->db->delete($this->user_table,$where,__LINE__,__FILE__,'calendar');
+		}
 			$ret = $this->db->affected_rows();
 		}
 		else
 		{
 			$set = array('cal_status' => $status);
-			if ($user_type == 'e' || $attendee) $set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
-			if (!is_null($role) && $role != 'REQ-PARTICIPANT') $set['cal_role'] = $role;
+			if ($user_type == 'e' || $attendee)
+			{
+				$set['cal_user_attendee'] = $attendee ? $attendee : $user_id;
+			}
+			if (!is_null($role) && $role != 'REQ-PARTICIPANT')
+			{
+				$set['cal_role'] = $role;
+			}
 			$this->db->insert($this->user_table,$set,$where,__LINE__,__FILE__,'calendar');
 			// for new or changed group-invitations, remove previously deleted members, so they show up again
 			if (($ret = $this->db->affected_rows()) && $user_type == 'u' && $user_id < 0)
@@ -2129,7 +2329,10 @@ 
 	{
 		//error_log(__METHOD__."($cal_id, $start, $end, ".array2string($participants).", ".array2string($exception));
 		$update = array('cal_end' => $end);
-		if (isset($exception)) $update['recur_exception'] = $exception;
+		if (isset($exception))
+		{
+			$update['recur_exception'] = $exception;
+		}
 
 		$this->db->insert($this->dates_table, $update, array(
 			'cal_id' => $cal_id,
@@ -2144,7 +2347,11 @@ 
 		{
 			foreach($participants as $uid => $status)
 			{
-				if ($status == 'G') continue;	// dont save group-invitations
+				if ($status == 'G')
+				{
+					continue;
+				}
+				// dont save group-invitations
 
 				$type = '';
 				$id = null;
@@ -2373,7 +2580,10 @@ 
 		}
 		$alarm['cal_id'] = $cal_id;		// we need the back-reference
 		// add an alarm uid, if none is given
-		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid')) $alarm['uid'] = (string)new Horde_Support_Uuid;
+		if (empty($alarm['uid']) && class_exists('Horde_Support_Uuid'))
+		{
+			$alarm['uid'] = (string)new Horde_Support_Uuid;
+		}
 		//error_log(__METHOD__.__LINE__.' Save Alarm for CalID:'.$cal_id.'->'.array2string($alarm).'-->'.$id.'#'.function_backtrace());
 		// allways store job with the alarm owner as job-owner to get eg. the correct from address
 		if (!$this->async->set_timer($alarm['time'],$id,'calendar.calendar_boupdate.send_alarm',$alarm,$alarm['owner']))
@@ -2382,10 +2592,16 @@ 
 		}
 
 		// update the modification information of the related event
-		if ($update_modified) $this->updateModified($cal_id, true);
+		if ($update_modified)
+		{
+			$this->updateModified($cal_id, true);
+		}
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $id;
 	}
@@ -2408,7 +2624,10 @@ 
 				$this->async->cancel_timer($id);
 			}
 			// update cache, if used
-			if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, false);
+			if (isset(self::$alarm_cache))
+			{
+				$this->read_alarms($cal_id, false);
+			}
 		}
 		return count($alarms);
 	}
@@ -2431,7 +2650,10 @@ 
 		$ret = $this->async->cancel_timer($id);
 
 		// update cache, if used
-		if (isset(self::$alarm_cache)) $this->read_alarms($cal_id, true);
+		if (isset(self::$alarm_cache))
+		{
+			$this->read_alarms($cal_id, true);
+		}
 
 		return $ret;
 	}
@@ -2455,11 +2677,14 @@ 
 			$user_id = null;
 			self::split_user($old_user,$user_type,$user_id);
 
-			if ($user_type == 'u')	// only accounts can be owners of events
+			if ($user_type == 'u')
+			{
+				// only accounts can be owners of events
 			{
 				foreach($this->db->select($this->cal_table,'cal_id',array('cal_owner' => $old_user),__LINE__,__FILE__,false,'','calendar') as $row)
 				{
 					$this->delete($row['cal_id']);
+			}
 				}
 			}
 			$this->db->delete($this->user_table,array(
@@ -2487,11 +2712,14 @@ 
 			{
 				$ids[] = $row['cal_id'];
 			}
-			if ($ids) $this->db->delete($this->user_table,array(
+			if ($ids)
+			{
+				$this->db->delete($this->user_table,array(
 				'cal_user_type' => 'u',
 				'cal_user_id' => $old_user,
 				'cal_id' => $ids,
 			),__LINE__,__FILE__,'calendar');
+			}
 			// now change participant in the rest to contain new user instead of old user
 			$this->db->update($this->user_table,array(
 				'cal_user_id' => $new_user,
@@ -2516,8 +2744,14 @@ 
 	{
 		$participant_status = array();
 		$where = array('cal_id' => $cal_id);
-		if ($start != 0 && $end == 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2528,7 +2762,10 @@ 
 			// inititalize the array
 			$participant_status[$row['cal_recur_date']] = null;
 		}
-		if (is_null($uid)) return $participant_status;
+		if (is_null($uid))
+		{
+			return $participant_status;
+		}
 		$user_type = $user_id = null;
 		self::split_user($uid, $user_type, $user_id, true);
 
@@ -2537,8 +2774,14 @@ 
 			'cal_user_type'	=> $user_type ? $user_type : 'u',
 			'cal_user_id'   => $user_id,
 		);
-		if ($start != 0 && $end == 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
-		if ($start == 0 && $end != 0) $where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		if ($start != 0 && $end == 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date >= ' . (int)$start . ')';
+		}
+		if ($start == 0 && $end != 0)
+		{
+			$where2[] = '(cal_recur_date = 0 OR cal_recur_date <= ' . (int)$end . ')';
+		}
 		if ($start != 0 && $end != 0)
 		{
 			$where2[] = '(cal_recur_date = 0 OR (cal_recur_date >= ' . (int)$start .
@@ -2628,17 +2871,26 @@ 
 	 */
 	function get_recurrence_exceptions($event, $tz_id=null, $start=0, $end=0, $filter='all')
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		$cal_id = (int) $event['id'];
 		//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 		//		"($cal_id, $tz_id, $filter): " . $event['tzid']);
-		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE) return false;
+		if (!$cal_id || $event['recur_type'] == MCAL_RECUR_NONE)
+		{
+			return false;
+		}
 
 		$days = array();
 
 		$expand_all = (!$this->isWholeDay($event) && $tz_id && $tz_id != $event['tzid']);
 
-		if ($filter == 'tz_only' && !$expand_all) return $days;
+		if ($filter == 'tz_only' && !$expand_all)
+		{
+			return $days;
+		}
 
 		$remote = in_array($filter, array('tz_rrule', 'rrule'));
 
@@ -2681,7 +2933,10 @@ 
 					$remote_rrule->next_no_exception();
 				}
 				$egw_rrule->next_no_exception();
-				if (!$egw_rrule->valid()) return $days;
+				if (!$egw_rrule->valid())
+				{
+					return $days;
+				}
 			}
 			$day = $egw_rrule->current();
 			$locts = (int)Api\DateTime::to($day,'server');
@@ -2835,7 +3090,11 @@ 
 			}
 		}
 
-		if (empty($participants)) return false; // occurrence does not exist at all yet
+		if (empty($participants))
+		{
+			return false;
+		}
+		// occurrence does not exist at all yet
 
 		foreach ($recurrence_zero as $uid => $status)
 		{
@@ -2892,7 +3151,9 @@ 
 			}
 			if (!isset($participants[$uid])
 				|| $participants[$uid] != $status)
-				return true;
+			{
+							return true;
+			}
 			unset($participants[$uid]);
 		}
 		return (!empty($participants));
@@ -2906,7 +3167,10 @@ 
 	 */
 	function isWholeDay($event)
 	{
-		if (!isset($event['start']) || !isset($event['end'])) return false;
+		if (!isset($event['start']) || !isset($event['end']))
+		{
+			return false;
+		}
 
 		if (empty($event['tzid']))
 		{
@@ -2968,8 +3232,14 @@ 
 	 */
 	function updateModified($id, $update_master=false, $time=null, $modifier=null)
 	{
-		if (is_null($time) || !$time) $time = time();
-		if (is_null($modifier)) $modifier = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($time) || !$time)
+		{
+			$time = time();
+		}
+		if (is_null($modifier))
+		{
+			$modifier = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$this->db->update($this->cal_table,
 			array('cal_modified' => $time, 'cal_modifier' => $modifier),

calendar/importexport/class.import_events_csv.inc.php

Braces +94 added lines, -38 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * class import_csv for addressbook
  */
-class import_events_csv implements iface_import_plugin  {
+class import_events_csv implements iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 			// char
@@ -97,7 +98,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, definition $_definition ) {
+	public function import( $_stream, definition $_definition )
+	{
 		$import_csv = new import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -122,7 +124,8 @@ 
 		$import_csv->conversion = $_definition->plugin_options['field_conversion'];
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) ) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) )
+		{
 			$import_csv->skip_records( $_definition->plugin_options['num_header_lines'] );
 		}
 
@@ -131,12 +134,16 @@ 
 			$_definition->plugin_options['events_owner'] : $this->user;
 
 		// trash_users_records ?
-		if ( $_definition->plugin_options['trash_users_records'] === true ) {
-			if ( !$_definition->plugin_options['dry_run'] ) {
+		if ( $_definition->plugin_options['trash_users_records'] === true )
+		{
+			if ( !$_definition->plugin_options['dry_run'] )
+			{
 				$socal = new calendar_socal();
 				$this->bocalupdate->so->deleteaccount( $_definition->plugin_options['events_owner']);
 				unset( $socal );
-			} else {
+			}
+			else
+			{
 				$lid = $GLOBALS['egw']->accounts->id2name( $_definition->plugin_options['events_owner'] );
 				echo "Attension: All Events of '$lid' would be deleted!\n";
 			}
@@ -145,38 +152,63 @@ 
 		$this->errors = array();
 		$this->results = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 
 			// don't import empty events
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
-			if ( $_definition->plugin_options['events_owner'] != -1 ) {
+			if ( $_definition->plugin_options['events_owner'] != -1 )
+			{
 				$record['owner'] = $_definition->plugin_options['events_owner'];
-			} else unset( $record['owner'] );
+			}
+			else {
+				unset( $record['owner'] );
+			}
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
-					switch ( $condition['type'] ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
 
-							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) ) {
+							if ( is_array( $event = $this->bocalupdate->read( $record['uid'], null, $this->is_admin ) ) )
+							{
 								// apply action to event matching this exists condition
 								$record['id'] = $event['id'];
 
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $event['cat_id'] ) ) $event['cat_id'] = explode( ',', $event['cat_id'] );
-									if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+								if ( $_definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $event['cat_id'] ) )
+									{
+										$event['cat_id'] = explode( ',', $event['cat_id'] );
+									}
+									if ( !is_array( $record['cat_id'] ) )
+									{
+										$record['cat_id'] = explode( ',', $record['cat_id'] );
+									}
 									$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $event['cat_id'] ) ) );
 								}
 
 								// check if entry is modiefied
 								$event = array_intersect_key( $event, $record );
 								$diff = array_diff( $event, $record );
-								if( !empty( $diff ) ) $record['modified'] = time();
+								if( !empty( $diff ) )
+								{
+									$record['modified'] = time();
+								}
 
 								$action = $condition['true'];
-							} else $action = $condition['false'];
+							}
+							else {
+								$action = $condition['false'];
+							}
 
 							$this->action( $action['action'], $record );
 							break;
@@ -190,9 +222,14 @@ 
 							throw new Exception('condition not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$this->action( 'insert', $record );
 			}
@@ -206,8 +243,10 @@ 
 	 * @param array $_data event data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data ) {
-		switch ( $_action ) {
+	private function action ( $_action, $_data )
+	{
+		switch ( $_action )
+		{
 			case 'none' :
 				return true;
 
@@ -217,32 +256,42 @@ 
 				// paticipants handling
 				$participants = $_data['participants'] ? split( '[,;]', $_data['participants'] ) : array();
 				$_data['participants'] = array();
-				if ( $this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0 ) {
+				if ( $this->definition->plugin_options['owner_joins_event'] && $this->definition->plugin_options['events_owner'] > 0 )
+				{
 					$_data['participants'][$this->definition->plugin_options['events_owner']] = 'A';
 				}
-				foreach( $participants as $participant ) {
+				foreach( $participants as $participant )
+				{
 					list( $participant, $status ) = explode( '=', $participant );
 					$valid_staties = array('U'=>'U','u'=>'U','A'=>'A','a'=>'A','R'=>'R','r'=>'R','T'=>'T','t'=>'T');
 					$status = isset( $valid_staties[$status] ) ? $valid_staties[$status] : 'U';
-					if ( $participant && is_numeric($participant ) ) {
+					if ( $participant && is_numeric($participant ) )
+					{
 						$_data['participants'][$participant] = $status;
 					}
 				}
 				// no valid participants so far --> add the importing user/owner
-				if ( empty( $_data['participants'] ) ) {
+				if ( empty( $_data['participants'] ) )
+				{
 					$_data['participants'][$this->user] = 'A';
 				}
 
 				// are we serious?
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					print_r($_data);
 					$this->results[$_action]++;
-				} else {
+				}
+				else
+				{
 					$messages = array();
 					$result = $this->bocalupdate->update( $_data, true, !$_data['modified'], $this->is_admin, true, $messages);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors = implode(',', $messages);
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 					}
 					return $result;
@@ -257,7 +306,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV export');
 	}
 
@@ -266,7 +316,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports events into your Calendar from a CSV File. CSV means 'Comma Seperated Values'. However in the options Tab you can also choose other seperators.");
 	}
 
@@ -275,7 +326,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -291,7 +343,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -300,7 +353,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -312,7 +366,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -324,7 +379,8 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
 		return $this->results;
 	}
 } // end of iface_export_plugin

api/asyncservices.php

Braces +4 added lines, -1 removed lines

@@ -14,7 +14,10 @@
 
 use EGroupware\Api\Asyncservice;
 
-if (!isset($_REQUEST['domain'])) $_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+if (!isset($_REQUEST['domain']))
+{
+	$_REQUEST['domain'] = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : 'default';
+}
 $path_to_egroupware = realpath(__DIR__.'/..');	//  need to be adapted if this script is moved somewhere else
 
 // remove the comment from one of the following lines to enable loging

api/images.php

Braces +4 added lines, -1 removed lines

@@ -48,7 +48,10 @@
 	exit;
 }
 
-if (empty($_GET['debug'])) $content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+if (empty($_GET['debug']))
+{
+	$content = 'egw.set_images('.$content.", egw && egw.window !== window);\n";
+}
 
 // we run our own gzip compression, to set a correct Content-Length of the encoded content
 if (in_array('gzip', explode(',',$_SERVER['HTTP_ACCEPT_ENCODING'])) && function_exists('gzencode'))