EGroupware / egroupware

filemanager/inc/class.filemanager_hooks.inc.php

Indentation +2 added lines, -2 removed lines

@@ -105,7 +105,7 @@ 
 		);
 		if ($location == 'admin')
 		{
-        	display_section(self::$appname,$file);
+			display_section(self::$appname,$file);
 		}
 		else
 		{
@@ -128,7 +128,7 @@ 
 			'yes' => lang('Yes')
 		);
 
-        $settings = array(
+		$settings = array(
 			'startfolder'	=> array(
 				'type'		=> 'input',
 				'name'		=> 'startfolder',

Braces +20 added lines, -5 removed lines

@@ -33,7 +33,10 @@ 
 		$homepath = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 		//echo "<p>admin_prefs_sidebox_hooks::all_hooks(".print_r($args,True).") appname='$appname', location='$location'</p>\n";
 		$config = config::read(self::$appname);
-		if (!empty($config['max_folderlinks'])) self::$foldercount = (int)$config['max_folderlinks'];
+		if (!empty($config['max_folderlinks']))
+		{
+			self::$foldercount = (int)$config['max_folderlinks'];
+		}
 		$file_prefs    = &$GLOBALS['egw_info']['user']['preferences'][self::$appname];
 		if ($location == 'sidebox_menu')
 		{
@@ -75,7 +78,10 @@ 
 			{
 				$file['Basedirectory'] = egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$rootpath,'ajax'=>'true'));
 			}
-			if (!empty($file_prefs['startfolder'])) $file['Startfolder']= egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$file_prefs['startfolder'],'ajax'=>'true'));
+			if (!empty($file_prefs['startfolder']))
+			{
+				$file['Startfolder']= egw::link('/index.php',array('menuaction'=>self::$appname.'.filemanager_ui.index','path'=>$file_prefs['startfolder'],'ajax'=>'true'));
+			}
 			for ($i=1; $i<=self::$foldercount; $i++)
 			{
 				if (!empty($file_prefs['folderlink'.$i]))
@@ -93,7 +99,10 @@ 
 			$file['Shared files'] = egw::link('/index.php','menuaction=filemanager.filemanager_shares.index&ajax=true');
 			display_sidebox(self::$appname,$title,$file);
 		}
-		if ($GLOBALS['egw_info']['user']['apps']['admin']) self::admin(self::$appname);
+		if ($GLOBALS['egw_info']['user']['apps']['admin'])
+		{
+			self::admin(self::$appname);
+		}
 	}
 
 	/**
@@ -103,7 +112,10 @@ 
 	 */
 	static function admin($location = 'admin')
 	{
-		if (is_array($location)) $location = $location['location'];
+		if (is_array($location))
+		{
+			$location = $location['location'];
+		}
 
 		$file = Array(
 			'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname='.self::$appname),
@@ -129,7 +141,10 @@ 
 	static function settings()
 	{
 		$config = config::read(self::$appname);
-		if (!empty($config['max_folderlinks'])) self::$foldercount = (int)$config['max_folderlinks'];
+		if (!empty($config['max_folderlinks']))
+		{
+			self::$foldercount = (int)$config['max_folderlinks'];
+		}
 
 		$yes_no = array(
 			'no'  => lang('No'),

filemanager/inc/class.filemanager_merge.inc.php

Indentation +1 added lines, -1 removed lines

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

Braces +21 added lines, -7 removed lines

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

calendar/setup/tables_update.inc.php

Indentation +1 added lines, -1 removed lines

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

Braces +12 added lines, -3 removed lines

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

calendar/inc/class.calendar_import_csv.inc.php

Indentation +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
 	protected static $conditions = array('exists');
 
 	/**
-	* For figuring out if an entry has changed
-	*/
+	 * For figuring out if an entry has changed
+	 */
 	protected $tracking;
 
 	/**

Braces +80 added lines, -34 removed lines

@@ -17,7 +17,8 @@ 
 /**
  * class import_csv for calendar
  */
-class calendar_import_csv extends importexport_basic_import_csv  {
+class calendar_import_csv extends importexport_basic_import_csv
+{
 
 	/**
 	 * actions wich could be done to data entries
@@ -83,8 +84,10 @@ 
 		$options['owner'] = $options['owner'] ? $options['owner'] : $this->user;
 
 		// Set owner, unless it's supposed to come from CSV file
-		if($options['owner_from_csv']) {
-			if(!is_numeric($record['owner'])) {
+		if($options['owner_from_csv'])
+		{
+			if(!is_numeric($record['owner']))
+			{
 				$this->errors[$import_csv->get_current_position()] = lang(
 					'Invalid owner ID: %1.  Might be a bad field translation.  Used %2 instead.',
 					$record->owner,
@@ -106,14 +109,16 @@ 
 		}
 
 		// Parse particpants
-		if ($record->participants && !is_array($record->participants)) {
+		if ($record->participants && !is_array($record->participants))
+		{
 			// Importing participants in human friendly format:
 			// Name (quantity)? (status) Role[, Name (quantity)? (status) Role]+
 			preg_match_all('/(([^(]+?)(?: \(([\d]+)\))? \(([^,)]+)\)(?: ([^ ,]+))?)(?:, )?/',$record->participants,$participants);
 			$p_participants = array();
 			$missing = array();
 			list($lines, $p, $names, $quantity, $status, $role) = $participants;
-			foreach($names as $key => $name) {
+			foreach($names as $key => $name)
+			{
 				//error_log("Name: $name Quantity: {$quantity[$key]} Status: {$status[$key]} Role: {$role[$key]}");
 
 				// Search for direct account name, then user in accounts first
@@ -121,9 +126,13 @@ 
 				$id = importexport_helper_functions::account_name2id($name);
 
 				// If not found, or not an exact match to a user (account_name2id is pretty generous)
-				if(!$id || $names[$key] !== $this->bo->participant_name($id)) {
+				if(!$id || $names[$key] !== $this->bo->participant_name($id))
+				{
 					$contacts = ExecMethod2('addressbook.addressbook_bo.search', $search,array('contact_id','account_id'),'org_name,n_family,n_given,cat_id,contact_email','','%',false,'OR',array(0,1));
-					if($contacts) $id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+					if($contacts)
+					{
+						$id = $contacts[0]['account_id'] ? $contacts[0]['account_id'] : 'c'.$contacts[0]['contact_id'];
+					}
 				}
 				if(!$id)
 				{
@@ -131,7 +140,10 @@ 
 					foreach($this->bo->resources as $resource)
 					{
 						// Can't search for email
-						if($resource['app'] == 'email') continue;
+						if($resource['app'] == 'email')
+						{
+							continue;
+						}
 						// Special resource search, since it does special stuff in link_query
 						if($resource['app'] == 'resources')
 						{
@@ -140,7 +152,8 @@ 
 								$this->resource_so = new resources_so();
 							}
 							$result = $this->resource_so->search($search,'res_id');
-							if(count($result) >= 1) {
+							if(count($result) >= 1)
+							{
 								$id = $resource['type'].$result[0]['res_id'];
 								break;
 							}
@@ -158,7 +171,8 @@ 
 						}
 					}
 				}
-				if($id) {
+				if($id)
+				{
 					$p_participants[$id] = calendar_so::combine_status(
 						$this->status_map[lang($status[$key])] ? $this->status_map[lang($status[$key])] : $status[$key][0],
 						$quantity[$key] ? $quantity[$key] : 1,
@@ -187,27 +201,38 @@ 
 		}
 		$record->tzid = calendar_timezones::id2tz($record->tz_id);
 
-		if ( $options['conditions'] ) {
-			foreach ( $options['conditions'] as $condition ) {
+		if ( $options['conditions'] )
+		{
+			foreach ( $options['conditions'] as $condition )
+			{
 				$records = array();
-				switch ( $condition['type'] ) {
+				switch ( $condition['type'] )
+				{
 					// exists
 					case 'exists' :
 						// Check for that record
 						$result = $this->exists($record, $condition, $records);
 
-						if ( is_array( $records ) && count( $records ) >= 1) {
+						if ( is_array( $records ) && count( $records ) >= 1)
+						{
 							// apply action to all records matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$records as $event ) {
+							foreach ( (array)$records as $event )
+							{
 								$record->id = $event['id'];
-								if ( $this->definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $record->category ) ) $record->category = explode( ',', $record->category );
+								if ( $this->definition->plugin_options['update_cats'] == 'add' )
+								{
+									if ( !is_array( $record->category ) )
+									{
+										$record->category = explode( ',', $record->category );
+									}
 									$record->category = implode( ',', array_unique( array_merge( $record->category, $event['category'] ) ) );
 								}
 								$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 							}
-						} else {
+						}
+						else
+						{
 							$action = $condition['false'];
 							$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 						}
@@ -218,9 +243,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -239,12 +269,14 @@ 
 	 */
 	protected function exists(importexport_iface_egw_record &$record, Array &$condition, &$records = array())
 	{
-		if($record->__get($condition['string']) && $condition['string'] == 'id') {
+		if($record->__get($condition['string']) && $condition['string'] == 'id')
+		{
 			$event = $this->bo->read($record->__get($condition['string']));
 			$records = array($event);
 		}
 
-		if ( is_array( $records ) && count( $records ) >= 1) {
+		if ( is_array( $records ) && count( $records ) >= 1)
+		{
 			return true;
 		}
 		return false;
@@ -260,7 +292,8 @@ 
 	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
 	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -268,7 +301,8 @@ 
 				$old = $this->bo->read($_data['id']);
 
 				// Don't change a user account into a record
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change owner of an existing record
 					unset($_data['owner']);
 				}
@@ -276,31 +310,40 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0) {
+				if(count($changed) == 0)
+				{
 					return true;
 				}
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, can overwrite existing
 					unset($_data['id']);
 				}
 				// Make sure participants are set
-				if(!$_data['participants']) {
+				if(!$_data['participants'])
+				{
 					$user = $_data['owner'] ? $_data['owner'] : $this->user;
 					$_data['participants'] = array(
 						$user => 'U'
 					);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data, $this->is_admin);
-					if(!$result) {
+					if(!$result)
+					{
 						$this->errors[$record_num] = lang('Unable to save');
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						// This does nothing (yet?) but update the identifier
 						$record->save($result);
@@ -318,7 +361,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV import');
 	}
 
@@ -327,7 +371,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.");
 	}
 
@@ -336,7 +381,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 

calendar/inc/class.calendar_bo.inc.php

Indentation +20 added lines, -20 removed lines

@@ -1490,13 +1490,13 @@ 
 	}
 
 	/**
-	* Converts a participant into a (readable) user- or resource-name
-	*
-	* @param string|int $id id of user or resource
-	* @param string|boolean $use_type =false type-letter or false
-	* @param boolean $append_email =false append email (Name <email>)
-	* @return string with name
-	*/
+	 * Converts a participant into a (readable) user- or resource-name
+	 *
+	 * @param string|int $id id of user or resource
+	 * @param string|boolean $use_type =false type-letter or false
+	 * @param boolean $append_email =false append email (Name <email>)
+	 * @return string with name
+	 */
 	function participant_name($id,$use_type=false, $append_email=false)
 	{
 		static $id2lid = array();
@@ -1525,13 +1525,13 @@ 
 	}
 
 	/**
-	* Converts participants array of an event into array of (readable) participant-names with status
-	*
-	* @param array $event event-data
-	* @param boolean $long_status =false should the long/verbose status or an icon be use
-	* @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
-	* @return array with id / names with status pairs
-	*/
+	 * Converts participants array of an event into array of (readable) participant-names with status
+	 *
+	 * @param array $event event-data
+	 * @param boolean $long_status =false should the long/verbose status or an icon be use
+	 * @param boolean $show_group_invitation =false show group-invitations (status == 'G') or not (default)
+	 * @return array with id / names with status pairs
+	 */
 	function participants($event,$long_status=false,$show_group_invitation=false)
 	{
 		//error_log(__METHOD__.__LINE__.array2string($event['participants']));
@@ -1601,12 +1601,12 @@ 
 	}
 
 	/**
-	* Converts category string of an event into array of (readable) category-names
-	*
-	* @param string $category cat-id (multiple id's commaseparated)
-	* @param int $color color of the category, if multiple cats, the color of the last one with color is returned
-	* @return array with id / names
-	*/
+	 * Converts category string of an event into array of (readable) category-names
+	 *
+	 * @param string $category cat-id (multiple id's commaseparated)
+	 * @param int $color color of the category, if multiple cats, the color of the last one with color is returned
+	 * @return array with id / names
+	 */
 	function categories($category,&$color)
 	{
 		static $id2cat = array();

Braces +202 added lines, -50 removed lines

@@ -11,10 +11,13 @@ 
  * @version $Id$
  */
 
-if (!defined('ACL_TYPE_IDENTIFER'))	// used to mark ACL-values for the debug_message methode
+if (!defined('ACL_TYPE_IDENTIFER'))
+{
+	// used to mark ACL-values for the debug_message methode
 {
 	define('ACL_TYPE_IDENTIFER','***ACL***');
 }
+}
 
 define('HOUR_s',60*60);
 define('DAY_s',24*HOUR_s);
@@ -225,7 +228,10 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_bo::bocal() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_bo::bocal() started',True);
+		}
 
 		$this->so = new calendar_so();
 		$this->datetime = $GLOBALS['egw']->datetime;
@@ -308,7 +314,10 @@ 
 	 */
 	static function email_info($ids)
 	{
-		if (!$ids) return null;
+		if (!$ids)
+		{
+			return null;
+		}
 
 		$data = array();
 		foreach((array)$ids as $id)
@@ -382,22 +391,31 @@ 
 			$user = trim($user);
 			if ($ignore_acl || $this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|($use_freebusy?EGW_ACL_FREEBUSY:0),0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					$users[] = $user;
 				}
+				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
 			{
-				if ($no_enum_groups) continue;
+				if ($no_enum_groups)
+				{
+					continue;
+				}
 
 				$members = $GLOBALS['egw']->accounts->member($user);
 				if (is_array($members))
@@ -477,11 +495,14 @@ 
 		}
 
 		if (!isset($params['users']) || !$params['users'] ||
-			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])	// null or '' casted to an array
+			count($params['users']) == 1 && isset($params['users'][0]) && !$params['users'][0])
+		{
+			// null or '' casted to an array
 		{
 			// for a search use all account you have read grants from
 			$params['users'] = $params['query'] ? array_keys($this->grants) : $this->user;
 		}
+		}
 		// resolve users to add memberships for users and members for groups
 		// for search, do NOT use freebusy rights, as it would allow to probe the content of event entries
 		$users = $this->resolve_users($params['users'], $params['filter'] == 'no-enum-groups', $params['ignore_acl'], empty($params['query']));
@@ -492,7 +513,10 @@ 
 			$params['private_grants'] = array();
 			foreach($this->grants as $user => $rights)
 			{
-				if ($rights & EGW_ACL_PRIVATE) $params['private_grants'][] = $user;
+				if ($rights & EGW_ACL_PRIVATE)
+				{
+					$params['private_grants'][] = $user;
+				}
 			}
 		}
 
@@ -507,7 +531,10 @@ 
 		{
 			return false;
 		}
-		if (isset($params['start'])) $start = $this->date2ts($params['start']);
+		if (isset($params['start']))
+		{
+			$start = $this->date2ts($params['start']);
+		}
 
 		if (isset($params['end']))
 		{
@@ -571,10 +598,13 @@ 
 				$this->debug_message('socalendar::search daywise sorting from %1 to %2 of %3',False,$start,$end,$events);
 			}
 			// create empty entries for each day in the reported time
-			for($ts = $start; $ts <= $end; $ts += DAY_s) // good enough for array creation, but see while loop below.
+			for($ts = $start; $ts <= $end; $ts += DAY_s)
+			{
+				// good enough for array creation, but see while loop below.
 			{
 				$daysEvents[$this->date2string($ts)] = array();
 			}
+			}
 			foreach($events as $k => $event)
 			{
 				$e_start = max($this->date2ts($event['start']),$start);
@@ -626,7 +656,10 @@ 
 			$integration_data = calendar_so::get_integration_data();
 		}
 
-		if (!isset($integration_data[$app])) return null;
+		if (!isset($integration_data[$app]))
+		{
+			return null;
+		}
 
 		return $part ? $integration_data[$app][$part] : $integration_data[$app];
 	}
@@ -673,8 +706,14 @@ 
 	 */
 	function clear_private_infos(&$event,$allowed_participants = array())
 	{
-		if ($event == false) return;
-		if (!is_array($event['participants'])) error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		if ($event == false)
+		{
+			return;
+		}
+		if (!is_array($event['participants']))
+		{
+			error_log(__METHOD__.'('.array2string($event).', '.array2string($allowed_participants).') NO PARTICIPANTS '.function_backtrace());
+		}
 
 		$event = array(
 			'id'    => $event['id'],
@@ -719,19 +758,29 @@ 
 		}
 		$new_horizont = $this->date2ts($_new_horizont,true);	// now we are in server-time, where this function operates
 
-		if ($new_horizont <= $this->config['horizont'])	// no move necessary
+		if ($new_horizont <= $this->config['horizont'])
+		{
+			// no move necessary
 		{
 			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 is bigger ==> nothing to do',true,$new_horizont,(int)$this->config['horizont']);
+		}
 			return;
 		}
 		if (!empty($GLOBALS['egw_info']['server']['calendar_horizont']))
 		{
 			$maxdays = abs($GLOBALS['egw_info']['server']['calendar_horizont']);
 		}
-		if (empty($maxdays)) $maxdays = 1000; // old default
-		if ($new_horizont > time()+$maxdays*DAY_s)		// some user tries to "look" more then the maximum number of days in the future
+		if (empty($maxdays))
+		{
+			$maxdays = 1000;
+		}
+		// old default
+		if ($new_horizont > time()+$maxdays*DAY_s)
+		{
+			// some user tries to "look" more then the maximum number of days in the future
 		{
 			if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) horizont=%2 new horizont more then %3 days from now --> ignoring it',true,$new_horizont,(int)$this->config['horizont'],$maxdays);
+		}
 			$this->warnings['horizont'] = lang('Requested date %1 outside allowed range of %2 days: recurring events obmitted!', egw_time::to($new_horizont,true), $maxdays);
 			return;
 		}
@@ -759,7 +808,10 @@ 
 		// update the horizont
 		config::save_value('horizont',$this->config['horizont'],'calendar');
 
-		if ($this->debug == 'check_move_horizont') $this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		if ($this->debug == 'check_move_horizont')
+		{
+			$this->debug_message('calendar_bo::check_move_horizont(%1) new horizont=%2, exiting',true,$new_horizont,(int)$this->config['horizont']);
+		}
 	}
 
 	/**
@@ -790,7 +842,10 @@ 
 				$event['end'] = $event_read['end'];
 			}
 		}
-		if (!$start) $start = $event['start'];
+		if (!$start)
+		{
+			$start = $event['start'];
+		}
 
 		$events = array();
 		$this->insert_all_recurrences($event,$start,$this->date2usertime($this->config['horizont']),$events);
@@ -831,7 +886,10 @@ 
 	 */
 	function db2data(&$events,$date_format='ts')
 	{
-		if (!is_array($events)) echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		if (!is_array($events))
+		{
+			echo "<p>calendar_bo::db2data(\$events,$date_format) \$events is no array<br />\n".function_backtrace()."</p>\n";
+		}
 		foreach ($events as &$event)
 		{
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
@@ -915,7 +973,10 @@ 
 	 */
 	function date2usertime($ts,$date_format='ts')
 	{
-		if (empty($ts) || $date_format == 'server') return $ts;
+		if (empty($ts) || $date_format == 'server')
+		{
+			return $ts;
+		}
 
 		return egw_time::server2user($ts,$date_format);
 	}
@@ -933,9 +994,15 @@ 
 	 */
 	function read($ids,$date=null,$ignore_acl=False,$date_format='ts',$clear_private_infos_users=null)
 	{
-		if (!$ids) return false;
+		if (!$ids)
+		{
+			return false;
+		}
 
-		if ($date) $date = $this->date2ts($date);
+		if ($date)
+		{
+			$date = $this->date2ts($date);
+		}
 
 		$return = null;
 
@@ -1100,7 +1167,10 @@ 
 	{
 		static $res_info_cache = array();
 
-		if (!is_scalar($uid)) throw new egw_exception_wrong_parameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		if (!is_scalar($uid))
+		{
+			throw new egw_exception_wrong_parameter(__METHOD__.'('.array2string($uid).') parameter must be scalar');
+		}
 
 		if (!isset($res_info_cache[$uid]))
 		{
@@ -1155,7 +1225,10 @@ 
 	 */
 	function check_perms($needed,$event=0,$other=0,$date_format='ts',$date_to_read=null,$user=null)
 	{
-		if (!$user) $user = $this->user;
+		if (!$user)
+		{
+			$user = $this->user;
+		}
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -1194,7 +1267,10 @@ 
 		$grant = $grants[$owner];
 
 		// now any ACL rights (but invite rights!) implicate FREEBUSY rights (at least READ has to include FREEBUSY)
-		if ($grant & ~EGW_ACL_INVITE) $grant |= EGW_ACL_FREEBUSY;
+		if ($grant & ~EGW_ACL_INVITE)
+		{
+			$grant |= EGW_ACL_FREEBUSY;
+		}
 
 		if (is_array($event) && ($needed == EGW_ACL_READ || $needed == EGW_ACL_FREEBUSY))
 		{
@@ -1220,7 +1296,10 @@ 
 					elseif (!is_numeric($uid))
 					{
 						// if the owner only grants EGW_ACL_FREEBUSY we are not interested in the recources explicit rights
-						if ($grant == EGW_ACL_FREEBUSY) continue;
+						if ($grant == EGW_ACL_FREEBUSY)
+						{
+							continue;
+						}
 						// if we have a resource as participant
 						$resource = $this->resource_info($uid);
 						$grant |= $resource['rights'];
@@ -1370,14 +1449,20 @@ 
 						$param = $param ? 'True' : 'False';
 						break;
 					case 'integer':
-						if ($param >= mktime(0,0,0,1,1,2000)) $param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						if ($param >= mktime(0,0,0,1,1,2000))
+						{
+							$param = adodb_date('Y-m-d H:i:s',$param)." ($param)";
+						}
 						break;
 				}
 			}
 			$msg = str_replace('%'.($i-1),$param,$msg);
 		}
 		error_log($msg);
-		if ($backtrace) error_log(function_backtrace(1));
+		if ($backtrace)
+		{
+			error_log(function_backtrace(1));
+		}
 	}
 
 	/**
@@ -1485,14 +1570,20 @@ 
 	function timespan($start_m,$end_m,$both=false)
 	{
 		$duration = $end_m - $start_m;
-		if ($end_m == 24*60-1) ++$duration;
+		if ($end_m == 24*60-1)
+		{
+			++$duration;
+		}
 		$duration = floor($duration/60).lang('h').($duration%60 ? $duration%60 : '');
 
 		$timespan = $t = common::formattime(sprintf('%02d',$start_m/60),sprintf('%02d',$start_m%60));
 
-		if ($both)	// end-time too
+		if ($both)
+		{
+			// end-time too
 		{
 			$timespan .= ' - '.common::formattime(sprintf('%02d',$end_m/60),sprintf('%02d',$end_m%60));
+		}
 			// dont double am/pm if they are the same in both times
 			if ($this->common_prefs['timeformat'] == 12 && substr($timespan,-2) == substr($t,-2))
 			{
@@ -1516,8 +1607,14 @@ 
 		static $id2lid = array();
 		static $id2email = array();
 
-		if ($use_type && $use_type != 'u') $id = $use_type.$id;
-		if($id === 0 || $id === '0') $id = $this->user;
+		if ($use_type && $use_type != 'u')
+		{
+			$id = $use_type.$id;
+		}
+		if($id === 0 || $id === '0')
+		{
+			$id = $this->user;
+		}
 
 		if (!isset($id2lid[$id]))
 		{
@@ -1527,7 +1624,10 @@ 
 				if (($info = $this->resource_info($id)))
 				{
 					$id2lid[$id] = $info['name'] ? $info['name'] : $info['email'];
-					if ($info['name']) $id2email[$id] = $info['email'];
+					if ($info['name'])
+					{
+						$id2email[$id] = $info['email'];
+					}
 				}
 			}
 			else
@@ -1553,11 +1653,18 @@ 
 		$names = array();
 		foreach((array)$event['participants'] as $id => $status)
 		{
-			if (!is_string($status)) continue;
+			if (!is_string($status))
+			{
+				continue;
+			}
 			$quantity = $role = null;
 			calendar_so::split_status($status,$quantity,$role);
 
-			if ($status == 'G' && !$show_group_invitation) continue;	// dont show group-invitation
+			if ($status == 'G' && !$show_group_invitation)
+			{
+				continue;
+			}
+			// dont show group-invitation
 
 			$lang_status = lang($this->verbose_status[$status]);
 			if (!$long_status)
@@ -1630,7 +1737,10 @@ 
 
 		foreach(explode(',',$category) as $cat_id)
 		{
-			if (!$cat_id) continue;
+			if (!$cat_id)
+			{
+				continue;
+			}
 
 			if (!isset($id2cat[$cat_id]))
 			{
@@ -1696,7 +1806,10 @@ 
 	 */
 	public static function list_calendars($user, array $grants=null)
 	{
-		if (is_null($grants)) $grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		if (is_null($grants))
+		{
+			$grants = $GLOBALS['egw']->acl->get_grants('calendar', true, $user);
+		}
 
 		$users = $groups = array();
 		foreach(array_keys($grants) as $id)
@@ -1744,7 +1857,10 @@ 
 	 */
 	function recure2string($event)
 	{
-		if (!is_array($event)) return false;
+		if (!is_array($event))
+		{
+			return false;
+		}
 		return (string)calendar_rrule::event2rrule($event);
 	}
 
@@ -1766,12 +1882,18 @@ 
 	 */
 	function read_holidays($year=0)
 	{
-		if (!$year) $year = (int) date('Y',$this->now_su);
+		if (!$year)
+		{
+			$year = (int) date('Y',$this->now_su);
+		}
 
-		if (!$this->cached_holidays)	// try reading the holidays from the session
+		if (!$this->cached_holidays)
+		{
+			// try reading the holidays from the session
 		{
 			$this->cached_holidays = $GLOBALS['egw']->session->appsession('holidays','calendar');
 		}
+		}
 		if (!isset($this->cached_holidays[$year]))
 		{
 			if (!is_object($this->holidays))
@@ -1811,7 +1933,11 @@ 
 							continue;
 						}
 						list($y,$m,$d) = explode('-',$pers['bday']);
-						if ($y > $year) continue; 	// not yet born
+						if ($y > $year)
+						{
+							continue;
+						}
+						// not yet born
 						$this->cached_holidays[$year][sprintf('%04d%02d%02d',$year,$m,$d)][] = array(
 							'day'       => $d,
 							'month'     => $m,
@@ -1904,7 +2030,10 @@ 
 				}
 			}
 			$str_fields = implode(', ',$extra_fields);
-			if (is_array($extra_fields)) return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			if (is_array($extra_fields))
+			{
+				return $this->format_date($event['start']) . ': ' . $event['title'] . ($str_fields? ', ' . $str_fields:'');
+			}
 		}
 		return $this->format_date($event['start']) . ': ' . $event['title'];
 	}
@@ -1925,7 +2054,8 @@ 
 			'offset' =>	$options['start'],
 			'order' => 'cal_start DESC',
 		);
-		if($options['num_rows']) {
+		if($options['num_rows'])
+		{
 			$query['num_rows'] = $options['num_rows'];
 		}
 		foreach((array) $this->search($query) as $event)
@@ -1991,7 +2121,10 @@ 
 			if ((!isset($default_prefs[$var]) || (string)$default_prefs[$var] === '') && (!isset($forced_prefs[$var]) || (string)$forced_prefs[$var] === ''))
 			{
 				$GLOBALS['egw']->preferences->add('calendar',$var,$default,'default');	// always store default, even if we have a forced too
-				if ($type == 'forced') $GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				if ($type == 'forced')
+				{
+					$GLOBALS['egw']->preferences->add('calendar',$var,$default,'forced');
+				}
 				$this->cal_prefs[$var] = $default;
 				$need_save = True;
 			}
@@ -2011,7 +2144,10 @@ 
 	 */
 	static function freebusy_url($user='',$pw=null)
 	{
-		if (is_numeric($user)) $user = $GLOBALS['egw']->accounts->id2name($user);
+		if (is_numeric($user))
+		{
+			$user = $GLOBALS['egw']->accounts->id2name($user);
+		}
 
 		$credentials = '';
 
@@ -2079,13 +2215,19 @@ 
 	 */
 	public function get_ctag($user, $filter='owner', $master_only=false)
 	{
-		if ($this->debug > 1) $startime = microtime(true);
+		if ($this->debug > 1)
+		{
+			$startime = microtime(true);
+		}
 
 		// resolve users to add memberships for users and members for groups
 		$users = $this->resolve_users($user);
 		$ctag = $users ? $this->so->get_ctag($users, $filter == 'owner', $master_only) : 0;	// no rights, return 0 as ctag (otherwise we get SQL error!)
 
-		if ($this->debug > 1) error_log(__METHOD__. "($user, '$filter') = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		if ($this->debug > 1)
+		{
+			error_log(__METHOD__. "($user, '$filter') = $ctag = ".date('Y-m-d H:i:s',$ctag)." took ".(microtime(true)-$startime)." secs");
+		}
 		return $ctag;
 	}
 
@@ -2127,15 +2269,21 @@ 
 				$content['link_app'][] = $link['app'];
 				$content['link_id'][]  = $link['id'];
 			}
-			if ($link['app'] == 'addressbook')	// prefering contact as primary contact over calendar entry set above
+			if ($link['app'] == 'addressbook')
+			{
+				// prefering contact as primary contact over calendar entry set above
 			{
 				$content['info_contact'] = 'addressbook:'.$link['id'];
 			}
+			}
 		}
 		// Copy same custom fields
 		foreach(array_keys(config::get_customfields('infolog')) as $name)
 		{
-			if ($this->customfields[$name]) $content['#'.$name] = $calendar['#'.$name];
+			if ($this->customfields[$name])
+			{
+				$content['#'.$name] = $calendar['#'.$name];
+			}
 		}
 		//error_log(__METHOD__.'('.array2string($data).') calendar='.array2string($calendar).' returning '.array2string($content));
 		return $content;
@@ -2158,7 +2306,11 @@ 
 			$set['ts_title'] = $this->link_title($event);
 			$set['start_time'] = egw_time::to($event['start'],'H:i');
 			$set['ts_description'] = $event['description'];
-			if ($this->isWholeDay($event)) $event['end']++;	// whole day events are 1sec short
+			if ($this->isWholeDay($event))
+			{
+				$event['end']++;
+			}
+			// whole day events are 1sec short
 			$set['ts_duration']	= ($event['end'] - $event['start']) / 60;
 			$set['ts_quantity'] = ($event['end'] - $event['start']) / 3600;
 			$set['end_time'] = null;	// unset end-time

calendar/inc/class.calendar_boupdate.inc.php

Indentation +39 added lines, -39 removed lines

@@ -1504,22 +1504,22 @@ 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
   		{
-            if (!isset($new_event['participants'][$userid])){
-            	// Attendee will be deleted this way
-            	$new_event['participants'][$userid] = 'G';
-            }
-            elseif ($new_event['participants'][$userid] == $status)
-            {
-            	// Same status -- nothing to do.
-            	unset($new_event['participants'][$userid]);
-            }
+			if (!isset($new_event['participants'][$userid])){
+				// Attendee will be deleted this way
+				$new_event['participants'][$userid] = 'G';
+			}
+			elseif ($new_event['participants'][$userid] == $status)
+			{
+				// Same status -- nothing to do.
+				unset($new_event['participants'][$userid]);
+			}
 		}
 		// write the changes
 		foreach ($new_event['participants'] as $userid => $status)
 		{
 			$this->set_status($old_event, $userid, $status, $recur_date, true, false,$skip_notification);
 		}
-    }
+	}
 
 	/**
 	 * deletes an event
@@ -2493,24 +2493,24 @@ 
 	/**
 	 * classifies an incoming event from the eGW point-of-view
 	 *
-     * exceptions: unlike other calendar apps eGW does not create an event exception
-     * if just the participant state changes - therefore we have to distinguish between
-     * real exceptions and status only exceptions
-     *
-     * @param array $event the event to check
-     *
-     * @return array
-     * 	type =>
-     * 		SINGLE a single event
-     * 		SERIES-MASTER the series master
-     * 		SERIES-EXCEPTION event is a real exception
-	  * 		SERIES-PSEUDO-EXCEPTION event is a status only exception
-	  * 		SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception
-	  * 	stored_event => if event already exists in the database array with event data or false
-	  * 	master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE
-	  * 		the corresponding series master event array
-	  * 		NOTE: this param is false if event is of type SERIES-MASTER
-     */
+	 * exceptions: unlike other calendar apps eGW does not create an event exception
+	 * if just the participant state changes - therefore we have to distinguish between
+	 * real exceptions and status only exceptions
+	 *
+	 * @param array $event the event to check
+	 *
+	 * @return array
+	 * 	type =>
+	 * 		SINGLE a single event
+	 * 		SERIES-MASTER the series master
+	 * 		SERIES-EXCEPTION event is a real exception
+	 * 		SERIES-PSEUDO-EXCEPTION event is a status only exception
+	 * 		SERIES-EXCEPTION-PROPAGATE event was a status only exception in the past and is now a real exception
+	 * 	stored_event => if event already exists in the database array with event data or false
+	 * 	master_event => for event type SERIES-EXCEPTION, SERIES-PSEUDO-EXCEPTION or SERIES-EXCEPTION-PROPAGATE
+	 * 		the corresponding series master event array
+	 * 		NOTE: this param is false if event is of type SERIES-MASTER
+	 */
 	function get_event_info($event)
 	{
 		$type = 'SINGLE'; // default
@@ -2681,16 +2681,16 @@ 
 			'stored_event' => $stored_event,
 			'master_event' => $master_event,
 		);
-    }
-
-    /**
-     * Translates all timestamps for a given event from server-time to user-time.
-     * The update() and save() methods expect timestamps in user-time.
-     * @param &$event	the event we are working on
-     *
-     */
-    function server2usertime (&$event)
-    {
+	}
+
+	/**
+	 * Translates all timestamps for a given event from server-time to user-time.
+	 * The update() and save() methods expect timestamps in user-time.
+	 * @param &$event	the event we are working on
+	 *
+	 */
+	function server2usertime (&$event)
+	{
 		// we run all dates through date2usertime, to adjust to user-time
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
@@ -2713,7 +2713,7 @@ 
 				$event['alarm'][$id]['time'] = $this->date2usertime($alarm['time']);
 			}
 		}
-    }
+	}
 	/**
 	 * Delete events that are more than $age years old
 	 *

Braces +216 added lines, -55 removed lines

@@ -81,11 +81,17 @@ 
 	 */
 	function __construct()
 	{
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() started',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() started',True);
+		}
 
 		parent::__construct();	// calling the parent constructor
 
-		if ($this->debug > 0) $this->debug_message('calendar_boupdate::__construct() finished',True);
+		if ($this->debug > 0)
+		{
+			$this->debug_message('calendar_boupdate::__construct() finished',True);
+		}
 	}
 
 	/**
@@ -115,7 +121,10 @@ 
 	function update(&$event,$ignore_conflicts=false,$touch_modified=true,$ignore_acl=false,$updateTS=true,&$messages=null, $skip_notification=false)
 	{
 		//error_log(__METHOD__."(".array2string($event).",$ignore_conflicts,$touch_modified,$ignore_acl)");
-		if (!is_array($messages)) $messages = $messages ? (array)$messages : array();
+		if (!is_array($messages))
+		{
+			$messages = $messages ? (array)$messages : array();
+		}
 
 		if ($this->debug > 1 || $this->debug == 'update')
 		{
@@ -135,10 +144,13 @@ 
 
 		$status_reset_to_unknown = false;
 
-		if (($new_event = !$event['id']))	// some defaults for new entries
+		if (($new_event = !$event['id']))
+		{
+			// some defaults for new entries
 		{
 			// if no owner given, set user to owner
 			if (!$event['owner']) $event['owner'] = $this->user;
+		}
 			// set owner as participant if none is given
 			if (!is_array($event['participants']) || !count($event['participants']))
 			{
@@ -178,7 +190,10 @@ 
 		// check category based ACL
 		if ($event['category'])
 		{
-			if (!is_array($event['category'])) $event['category'] = explode(',',$event['category']);
+			if (!is_array($event['category']))
+			{
+				$event['category'] = explode(',',$event['category']);
+			}
 			if (!$old_event || !isset($old_event['category']))
 			{
 				$old_event['category'] = array();
@@ -231,18 +246,28 @@ 
 			$types_with_quantity = array();
 			foreach($this->resources as $type => $data)
 			{
-				if ($data['max_quantity']) $types_with_quantity[] = $type;
+				if ($data['max_quantity'])
+				{
+					$types_with_quantity[] = $type;
+				}
 			}
 			// get all NOT rejected participants and evtl. their quantity
 			$quantity = $users = array();
 			foreach($event['participants'] as $uid => $status)
 			{
 				calendar_so::split_status($status,$q,$r);
-				if ($status[0] == 'R') continue;	// ignore rejected participants
+				if ($status[0] == 'R')
+				{
+					continue;
+				}
+				// ignore rejected participants
 
-				if ($uid < 0)	// group, check it's members too
+				if ($uid < 0)
+				{
+					// group, check it's members too
 				{
 					$users += (array)$GLOBALS['egw']->accounts->members($uid,true);
+				}
 					$users = array_unique($users);
 				}
 				$users[] = $uid;
@@ -273,10 +298,13 @@ 
 			{
 				if ($overlap['id'] == $event['id'] ||	// that's the event itself
 					$overlap['id'] == $event['reference'] ||	// event is an exception of overlap
-					$overlap['non_blocking'])			// that's a non_blocking event
+					$overlap['non_blocking'])
+				{
+					// that's a non_blocking event
 				{
 					continue;
 				}
+				}
 				if ($this->debug > 3 || $this->debug == 'update')
 				{
 					$this->debug_message('calendar_boupdate::update() checking overlapping event %1',false,$overlap);
@@ -434,7 +462,11 @@ 
 	 */
 	public function check_acl_invite($uid)
 	{
-		if (!is_numeric($uid)) return true;	// nothing implemented for resources so far
+		if (!is_numeric($uid))
+		{
+			return true;
+		}
+		// nothing implemented for resources so far
 
 		if (!$this->require_acl_invite)
 		{
@@ -775,14 +807,20 @@ 
 		$startdate = new egw_time($event['start']);
 		$enddate = new egw_time($event['end']);
 		$modified = new egw_time($event['modified']);
-		if ($old_event) $olddate = new egw_time($old_event['start']);
+		if ($old_event)
+		{
+			$olddate = new egw_time($old_event['start']);
+		}
 		//error_log(__METHOD__."() date_default_timezone_get()=".date_default_timezone_get().", user-timezone=".egw_time::$user_timezone->getName().", startdate=".$startdate->format().", enddate=".$enddate->format().", updated=".$modified->format().", olddate=".($olddate ? $olddate->format() : ''));
 		$owner_prefs = $ics = null;
 		foreach($to_notify as $userid => $statusid)
 		{
 			$res_info = $quantity = $role = null;
 			calendar_so::split_status($statusid, $quantity, $role);
-			if ($this->debug > 0) error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			if ($this->debug > 0)
+			{
+				error_log(__METHOD__." trying to notify $userid, with $statusid ($role)");
+			}
 
 			if (!is_numeric($userid))
 			{
@@ -801,7 +839,11 @@ 
 
 				if (!isset($userid))
 				{
-					if (empty($res_info['email'])) continue;	// no way to notify
+					if (empty($res_info['email']))
+					{
+						continue;
+					}
+					// no way to notify
 					// check if event-owner wants non-EGroupware users notified
 					if (is_null($owner_prefs))
 					{
@@ -866,11 +908,20 @@ 
 				$details = $this->_get_event_details(isset($cleared_event) ? $cleared_event : $event,
 					$action, $event_arr, $disinvited);
 				$details['to-fullname'] = $fullname;
-				if (isset($tfn)) $details['to-firstname'] = $tfn;
-				if (isset($tln)) $details['to-lastname'] = $tln;
+				if (isset($tfn))
+				{
+					$details['to-firstname'] = $tfn;
+				}
+				if (isset($tln))
+				{
+					$details['to-lastname'] = $tln;
+				}
 
 				// event is in user-time of current user, now we need to calculate the tz-difference to the notified user and take it into account
-				if (!isset($part_prefs['common']['tz'])) $part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				if (!isset($part_prefs['common']['tz']))
+				{
+					$part_prefs['common']['tz'] = $GLOBALS['egw_info']['server']['server_timezone'];
+				}
 				$timezone = new DateTimeZone($part_prefs['common']['tz']);
 				$timeformat = $part_prefs['common']['timeformat'];
 				switch($timeformat)
@@ -905,9 +956,12 @@ 
 				switch($msg_type == MSG_ALARM ? 'extended' : $part_prefs['calendar']['update_format'])
 				{
 					case 'ical':
-						if (is_null($ics) || $m_type != $msg_type)	// need different ical for organizer notification
+						if (is_null($ics) || $m_type != $msg_type)
+						{
+							// need different ical for organizer notification
 						{
 							$calendar_ical = new calendar_ical();
+						}
 							$calendar_ical->setSupportedFields('full');	// full iCal fields+event TZ
 							// we need to pass $event[id] so iCal class reads event again,
 							// as event is in user TZ, but iCal class expects server TZ!
@@ -921,7 +975,10 @@ 
 							'encoding' => '8bit',
 							'type' => 'text/calendar; method='.$method,
 						);
-						if ($m_type != $msg_type) unset($ics);
+						if ($m_type != $msg_type)
+						{
+							unset($ics);
+						}
 						$subject = isset($cleared_event) ? $cleared_event['title'] : $event['title'];
 						// fall through
 					case 'extended':
@@ -972,7 +1029,9 @@ 
 						$notification->set_popupmessage($notify_body."\n\n".$details['description']."\n\n".$details_body);
 						$notification->set_popuplinks(array($details['link_arr']));
 
-						if(is_array($attachment)) { $notification->set_attachments(array($attachment)); }
+						if(is_array($attachment))
+						{
+$notification->set_attachments(array($attachment)); }
 						$notification->send();
 					}
 					catch (Exception $exception) {
@@ -999,7 +1058,10 @@ 
 			translation::init();
 		}
 		// restore timezone, in case we had to reset it to server-timezone
-		if ($restore_tz) date_default_timezone_set($restore_tz);
+		if ($restore_tz)
+		{
+			date_default_timezone_set($restore_tz);
+		}
 
 		return true;
 	}
@@ -1034,10 +1096,13 @@ 
 		{
 			$to_notify = $event['participants'];
 		}
-		elseif ($this->check_perms(EGW_ACL_READ,$event))	// checks agains $this->owner set to $alarm[owner]
+		elseif ($this->check_perms(EGW_ACL_READ,$event))
+		{
+			// checks agains $this->owner set to $alarm[owner]
 		{
 			$to_notify[$alarm['owner']] = 'A';
 		}
+		}
 		else
 		{
 			return False;	// no rights
@@ -1087,7 +1152,10 @@ 
 		if ($event['id'])
 		{
 			// invalidate the read-cache if it contains the event we store now
-			if ($event['id'] == self::$cached_event['id']) self::$cached_event = array();
+			if ($event['id'] == self::$cached_event['id'])
+			{
+				self::$cached_event = array();
+			}
 			$old_event = $this->read($event['id'], $event['recurrence'], false, 'server');
 		}
 		else
@@ -1095,7 +1163,10 @@ 
 			$old_event = null;
 		}
 
-		if (!isset($event['whole_day'])) $event['whole_day'] = $this->isWholeDay($event);
+		if (!isset($event['whole_day']))
+		{
+			$event['whole_day'] = $this->isWholeDay($event);
+		}
 		$save_event = $event;
 		if ($event['whole_day'])
 		{
@@ -1136,7 +1207,10 @@ 
 		foreach($timestamps as $ts)
 		{
 			// we convert here from user-time to timestamps in server-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2ts($event[$ts],true) : 0;
+			}
 		}
 		// convert tzid name to integer tz_id, of set user default
 		if (empty($event['tzid']) || !($event['tz_id'] = calendar_timezones::tz2id($event['tzid'])))
@@ -1186,7 +1260,10 @@ 
 				if (!isset($event['alarm'][$id]))
 				{
 					$alarm['time'] = $event['start'] - $alarm['offset'];
-					if ($alarm['time'] < time()) calendar_so::shift_alarm($event, $alarm);
+					if ($alarm['time'] < time())
+					{
+						calendar_so::shift_alarm($event, $alarm);
+					}
 						// remove (not store) alarms belonging to not longer existing or rejected participants
 					$status = isset($event['participants']) ? $event['participants'][$alarm['owner']] :
 						$old_event['participants'][$alarm['owner']];
@@ -1222,7 +1299,10 @@ 
 			unset($save_event['participants']);
 			$this->set_recurrences($save_event, $set_recurrences_start);
 		}
-		if ($updateTS) $GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, $event['id'] ? 'modify' : 'add', $this->now);
+		if ($updateTS)
+		{
+			$GLOBALS['egw']->contenthistory->updateTimeStamp('calendar', $cal_id, $event['id'] ? 'modify' : 'add', $this->now);
+		}
 
 		// create links for new participants from addressbook, if configured
 		if ($cal_id && $GLOBALS['egw_info']['server']['link_contacts'] && $event['participants'])
@@ -1240,7 +1320,10 @@ 
 
 		// Update history
 		$tracking = new calendar_tracking($this);
-		if (empty($event['id']) && !empty($cal_id)) $event['id']=$cal_id;
+		if (empty($event['id']) && !empty($cal_id))
+		{
+			$event['id']=$cal_id;
+		}
 		$tracking->track($event, $old_event);
 
 		return $cal_id;
@@ -1257,9 +1340,12 @@ 
 	 */
 	function check_status_perms($uid,$event)
 	{
-		if ($uid[0] == 'c' || $uid[0] == 'e')	// for contact we use the owner of the event
+		if ($uid[0] == 'c' || $uid[0] == 'e')
+		{
+			// for contact we use the owner of the event
 		{
 			if (!is_array($event) && !($event = $this->read($event))) return false;
+		}
 
 			return $this->check_perms(EGW_ACL_EDIT,0,$event['owner']);
 		}
@@ -1270,13 +1356,19 @@ 
 			return $access;
 		}
 		// no access or denied access because of category acl --> regular check
-		if (!is_numeric($uid))	// this is eg. for resources (r123)
+		if (!is_numeric($uid))
+		{
+			// this is eg. for resources (r123)
 		{
 			$resource = $this->resource_info($uid);
+		}
 
 			return EGW_ACL_EDIT & $resource['rights'];
 		}
-		if (!is_array($event) && !($event = $this->read($event))) return false;
+		if (!is_array($event) && !($event = $this->read($event)))
+		{
+			return false;
+		}
 
 		// regular user and groups (need to check memberships too)
 		if (!isset($event['participants'][$uid]))
@@ -1300,7 +1392,10 @@ 
 	 */
 	function check_cat_acl($right,$event)
 	{
-		if (!is_array($event)) $event = $this->read($event);
+		if (!is_array($event))
+		{
+			$event = $this->read($event);
+		}
 
 		$ret = null;
 		if ($event['category'])
@@ -1357,7 +1452,10 @@ 
 	public static function set_cat_rights($cat_id,$user,$rights)
 	{
 		//echo "<p>".__METHOD__."($cat_id,$user,$rights)</p>\n";
-		if (!isset(self::$cat_rights_cache)) self::get_cat_rights($cat_id);
+		if (!isset(self::$cat_rights_cache))
+		{
+			self::get_cat_rights($cat_id);
+		}
 
 		if ((int)$rights != (int)self::$cat_rights_cache['L'.$cat_id][$user])
 		{
@@ -1369,7 +1467,10 @@ 
 			else
 			{
 				unset(self::$cat_rights_cache['L'.$cat_id][$user]);
-				if (!self::$cat_rights_cache['L'.$cat_id]) unset(self::$cat_rights_cache['L'.$cat_id]);
+				if (!self::$cat_rights_cache['L'.$cat_id])
+				{
+					unset(self::$cat_rights_cache['L'.$cat_id]);
+				}
 				$GLOBALS['egw']->acl->delete_repository('calendar','L'.$cat_id,$user);
 			}
 			egw_cache::setSession('calendar','cat_rights',self::$cat_rights_cache);
@@ -1402,7 +1503,10 @@ 
 				foreach($cat_rights as $uid => $value)
 				{
 					$all |= $value;
-					if (in_array($uid,$memberships)) $own |= $value;
+					if (in_array($uid,$memberships))
+					{
+						$own |= $value;
+					}
 				}
 			}
 			foreach(array(self::CAT_ACL_ADD,self::CAT_ACL_STATUS) as $mask)
@@ -1449,13 +1553,16 @@ 
 				is_numeric($uid)?$uid:substr($uid,1),$status,
 				$recur_date?$this->date2ts($recur_date,true):0,$role)))
 		{
-			if ($status == 'R')	// remove alarms belonging to rejected participants
+			if ($status == 'R')
+			{
+				// remove alarms belonging to rejected participants
 			{
 				foreach(isset($event['alarm']) ? $event['alarm'] : $old_event['alarm'] as $id => $alarm)
 				{
 					if ((string)$alarm['owner'] === (string)$uid)
 					{
 						$this->so->delete_alarm($id);
+			}
 						//error_log(__LINE__.': '.__METHOD__."(".array2string($event).", '$uid', '$status', ...) deleting alarm=".array2string($alarm).", $status=".array2string($alarm));
 					}
 				}
@@ -1473,8 +1580,15 @@ 
 			);
 			if (isset($status2msg[$status]) && !$skip_notification)
 			{
-				if (!is_array($event)) $event = $this->read($cal_id);
-				if (isset($recur_date)) $event = $this->read($event['id'],$recur_date); //re-read the actually edited recurring event
+				if (!is_array($event))
+				{
+					$event = $this->read($cal_id);
+				}
+				if (isset($recur_date))
+				{
+					$event = $this->read($event['id'],$recur_date);
+				}
+				//re-read the actually edited recurring event
 				$this->send_update($status2msg[$status],$event['participants'],$event);
 			}
 
@@ -1497,12 +1611,16 @@ 
 	 */
 	function update_status($new_event, $old_event , $recur_date=0, $skip_notification=false)
 	{
-		if (!isset($new_event['participants'])) return;
+		if (!isset($new_event['participants']))
+		{
+			return;
+		}
 
 		// check the old list against the new list
 		foreach ($old_event['participants'] as $userid => $status)
-  		{
-            if (!isset($new_event['participants'][$userid])){
+		{
+            if (!isset($new_event['participants'][$userid]))
+            {
             	// Attendee will be deleted this way
             	$new_event['participants'][$userid] = 'G';
             }
@@ -1586,7 +1704,10 @@ 
 					}
 					else
 					{
-						if (!($exception = $this->read($id))) continue;
+						if (!($exception = $this->read($id)))
+						{
+							continue;
+						}
 						$exception['uid'] = common::generate_uid('calendar', $id);
 						$exception['reference'] = $exception['recurrence'] = 0;
 						$this->update($exception, true, true, false, true, $msg=null, true);
@@ -1657,7 +1778,10 @@ 
 		$event_arr = $this->event2array($event);
 		foreach($event_arr as $key => $val)
 		{
-			if ($key == 'recur_type') $key = 'repetition';
+			if ($key == 'recur_type')
+			{
+				$key = 'repetition';
+			}
 			$details[$key] = $val['data'];
 		}
 		$details['participants'] = $details['participants'] ? implode("\n",$details['participants']) : '';
@@ -1830,7 +1954,10 @@ 
 	 */
 	function check_move_alarms(Array &$event, Array $old_event = null, egw_time $instance_date = null)
 	{
-		if ($old_event !== null && $event['start'] == $old_event['start']) return;
+		if ($old_event !== null && $event['start'] == $old_event['start'])
+		{
+			return;
+		}
 
 		$time = new egw_time($event['start']);
 		if(!is_array($event['alarm']))
@@ -1908,7 +2035,10 @@ 
 		if (is_array($old_event) || $old_event > 0)
 		{
 			// preserve categories without users read access
-			if (!is_array($old_event)) $old_event = $this->read($old_event);
+			if (!is_array($old_event))
+			{
+				$old_event = $this->read($old_event);
+			}
 			$old_categories = explode(',',$old_event['category']);
 			$old_cats_preserve = array();
 			if (is_array($old_categories) && count($old_categories) > 0)
@@ -1999,7 +2129,10 @@ 
 				"($filter)[EVENT]:" . array2string($event)."\n",3,$this->logfile);
 		}
 
-		if (!isset($event['recurrence'])) $event['recurrence'] = 0;
+		if (!isset($event['recurrence']))
+		{
+			$event['recurrence'] = 0;
+		}
 
 		if ($filter == 'master')
 		{
@@ -2053,19 +2186,26 @@ 
 							$matchingEvents[] = $egwEvent['id'] . ':' . (int)$event['recurrence'];
 						}
 					}
-				} elseif ($filter != 'master' && ($filter == 'exact' ||
+				}
+				elseif ($filter != 'master' && ($filter == 'exact' ||
 							$event['recur_type'] == $egwEvent['recur_type'] &&
 							strpos($egwEvent['title'], $event['title']) === 0))
 				{
 					$matchingEvents[] = $egwEvent['id']; // we found the event
 				}
 			}
-			if (!empty($matchingEvents) || $filter == 'exact') return $matchingEvents;
+			if (!empty($matchingEvents) || $filter == 'exact')
+			{
+				return $matchingEvents;
+			}
 		}
 		unset($event['id']);
 
 		// No chance to find a master without [U]ID
-		if ($filter == 'master' && empty($event['uid'])) return $matchingEvents;
+		if ($filter == 'master' && empty($event['uid']))
+		{
+			return $matchingEvents;
+		}
 
 		// only query calendars of users, we have READ-grants from
 		$users = array();
@@ -2074,17 +2214,23 @@ 
 			$user = trim($user);
 			if ($this->check_perms(EGW_ACL_READ|EGW_ACL_READ_FOR_PARTICIPANTS|EGW_ACL_FREEBUSY,0,$user))
 			{
-				if ($user && !in_array($user,$users))	// already added?
+				if ($user && !in_array($user,$users))
+				{
+					// already added?
 				{
 					$users[] = $user;
 				}
+				}
 			}
 			elseif ($GLOBALS['egw']->accounts->get_type($user) != 'g')
 			{
 				continue;	// for non-groups (eg. users), we stop here if we have no read-rights
 			}
 			// the further code is only for real users
-			if (!is_numeric($user)) continue;
+			if (!is_numeric($user))
+			{
+				continue;
+			}
 
 			// for groups we have to include the members
 			if ($GLOBALS['egw']->accounts->get_type($user) == 'g')
@@ -2164,7 +2310,10 @@ 
 			}
 			foreach ($matchFields as $key)
 			{
-				if (isset($event[$key])) $query['cal_'.$key] = $event[$key];
+				if (isset($event[$key]))
+				{
+					$query['cal_'.$key] = $event[$key];
+				}
 			}
 		}
 
@@ -2204,7 +2353,10 @@ 
 					'[FOUND]: ' . array2string($egwEvent)."\n",3,$this->logfile);
 			}
 
-			if (in_array($egwEvent['id'], $matchingEvents)) continue;
+			if (in_array($egwEvent['id'], $matchingEvents))
+			{
+				continue;
+			}
 
 			// convert timezone id of event to tzid (iCal id like 'Europe/Berlin')
 			if (!$egwEvent['tz_id'] || !($egwEvent['tzid'] = calendar_timezones::id2tz($egwEvent['tz_id'])))
@@ -2371,13 +2523,16 @@ 
 					foreach ($event['participants'] as $attendee => $status)
 					{
 						if (!isset($egwEvent['participants'][$attendee]) &&
-								$attendee != $egwEvent['owner']) // ||
+								$attendee != $egwEvent['owner'])
+						{
+							// ||
 							//(!$relax && $egw_event['participants'][$attendee] != $status))
 						{
 							if ($this->log)
 							{
 								error_log(__FILE__.'['.__LINE__.'] '.__METHOD__.
 								"() additional event['participants']: $attendee\n",3,$this->logfile);
+						}
 							}
 							continue 2;
 						}
@@ -2699,7 +2854,10 @@ 
 		foreach(array('start','end','recur_enddate','recurrence') as $ts)
 		{
 			// we convert here from server-time to timestamps in user-time!
-			if (isset($event[$ts])) $event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			if (isset($event[$ts]))
+			{
+				$event[$ts] = $event[$ts] ? $this->date2usertime($event[$ts]) : 0;
+			}
 		}
 		// same with the recur exceptions
 		if (isset($event['recur_exception']) && is_array($event['recur_exception']))
@@ -2727,9 +2885,12 @@ 
 	 */
 	function purge($age)
 	{
-		if (is_numeric($age) && $age > 0)	// just make sure bogus values dont delete everything
+		if (is_numeric($age) && $age > 0)
+		{
+			// just make sure bogus values dont delete everything
 		{
 			$this->so->purge(time() - 365*24*3600*(float)$age);
 		}
+		}
 	}
 }

calendar/inc/class.calendar_merge.inc.php

Indentation +34 added lines, -34 removed lines

@@ -326,20 +326,20 @@ 
 	}
 
 	/**
-	* Table plugin for event
-	* Lists events for a certain day of the week.  Only works for one week at a time, so for multiple weeks,
-	* use multiple date ranges.
-	*
-	* Use:
-	* $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$
-	* The day of the week may be language specific (date('l')).
-	*
-	* @param string $plugin (Monday-Sunday)
-	* @param int/array date or date range
-	* @param int $n Row number
-	* @param string $repeat Text being repeated for each entry
-	* @return array
-	*/
+	 * Table plugin for event
+	 * Lists events for a certain day of the week.  Only works for one week at a time, so for multiple weeks,
+	 * use multiple date ranges.
+	 *
+	 * Use:
+	 * $$table/Monday$$ $$starttime$$ $$title$$ $$endtable$$
+	 * The day of the week may be language specific (date('l')).
+	 *
+	 * @param string $plugin (Monday-Sunday)
+	 * @param int/array date or date range
+	 * @param int $n Row number
+	 * @param string $repeat Text being repeated for each entry
+	 * @return array
+	 */
 	public function day_plugin($plugin,$date,$n,$repeat)
 	{
 		static $days = null;
@@ -414,16 +414,16 @@ 
 	}
 
 	/**
-	* Table plugin for a certain date
-	*
-	* Can be either a particular date (2011-02-15) or a day of the month (15)
-	*
-	* @param string $plugin
-	* @param int $id ID for this record
-	* @param int $n Repeated row number
-	* @param string $repeat Text being repeated for each entry
-	* @return array
-	*/
+	 * Table plugin for a certain date
+	 *
+	 * Can be either a particular date (2011-02-15) or a day of the month (15)
+	 *
+	 * @param string $plugin
+	 * @param int $id ID for this record
+	 * @param int $n Repeated row number
+	 * @param string $repeat Text being repeated for each entry
+	 * @return array
+	 */
 	public function day($plugin,$id,$n,$repeat)
 	{
 		static $days = null;
@@ -515,15 +515,15 @@ 
 	}
 
 	/**
-	* Table plugin for participants
-	*
-	* Copied from eventmgr resources
-	*
-	* @param string $plugin
-	* @param int $id
-	* @param int $n
-	* @return array
-	*/
+	 * Table plugin for participants
+	 *
+	 * Copied from eventmgr resources
+	 *
+	 * @param string $plugin
+	 * @param int $id
+	 * @param int $n
+	 * @return array
+	 */
 	public function participant($plugin,$id,$n)
 	{
 		unset($plugin);	// not used, but required by function signature
@@ -582,7 +582,7 @@ 
 				{
 					foreach($resource as $name => $value)
 					{
-					    $replacements['$$'.$name.'$$'] = $value;
+						$replacements['$$'.$name.'$$'] = $value;
 					}
 				}
 				break;

Braces +165 added lines, -52 removed lines

@@ -86,10 +86,12 @@ 
 		{
 			$this->table_plugins[date('l', strtotime("+$i days"))] = 'day_plugin';
 		}
-		for($i = 1; $i <= 31; $i++) {
+		for($i = 1; $i <= 31; $i++)
+		{
 			$this->table_plugins['day_'.$i] = 'day'; // Numerically by day number (1-31)
 		}
-		foreach(self::$relative as $day) {
+		foreach(self::$relative as $day)
+		{
 			$this->table_plugins[$day] = 'day'; // Current day
 		}
 		$this->query = $GLOBALS['egw']->session->appsession('session_data','calendar');
@@ -125,9 +127,16 @@ 
 				$events = $ids;
 				$ids = array('start' => PHP_INT_MAX, 'end' => 0);
 				$this->ids = array();
-				foreach($events as $event) {
-					if($event['start'] && egw_time::to($event['start'],'ts') < $ids['start']) $ids['start'] = egw_time::to($event['start'],'ts');
-					if($event['end'] && egw_time::to($event['end'],'ts') > $ids['end']) $ids['end'] = egw_time::to($event['end'],'ts');
+				foreach($events as $event)
+				{
+					if($event['start'] && egw_time::to($event['start'],'ts') < $ids['start'])
+					{
+						$ids['start'] = egw_time::to($event['start'],'ts');
+					}
+					if($event['end'] && egw_time::to($event['end'],'ts') > $ids['end'])
+					{
+						$ids['end'] = egw_time::to($event['end'],'ts');
+					}
 					// Keep ids for future use
 					$this->ids[] = $event['id'];
 				}
@@ -167,9 +176,16 @@ 
 			$events = $id;
 			$id = array('start' => PHP_INT_MAX, 'end' => 0);
 			$this->ids = array();
-			foreach($events as $event) {
-				if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-				if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+			foreach($events as $event)
+			{
+				if($event['start'] && $event['start'] < $id['start'])
+				{
+					$id['start'] = $event['start'];
+				}
+				if($event['end'] && $event['end'] > $id['end'])
+				{
+					$id['end'] = $event['end'];
+				}
 				// Keep ids for future use
 				$this->ids[]  = $event['id'];
 			}
@@ -196,7 +212,10 @@ 
 				foreach(self::$range_tags as $key => $format)
 				{
 					$value = date($format, $key == 'end' ? $id['end'] : $id['start']);
-					if($key == 'month') $value = lang($value);
+					if($key == 'month')
+					{
+						$value = lang($value);
+					}
 					$values["$\$range/$key$$"] = $value;
 				}
 			}
@@ -215,9 +234,12 @@ 
 	public function calendar_replacements($id,$prefix = '', &$content = '')
 	{
 		$replacements = array();
-		if(!is_array($id) || !$id['start']) {
+		if(!is_array($id) || !$id['start'])
+		{
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-		} else {
+		}
+		else
+		{
 			$event = $id;
 		}
 
@@ -236,7 +258,10 @@ 
 		$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_id'. '$$'] = $event['id'];
 		foreach($this->bo->event2array($event) as $name => $data)
 		{
-			if (substr($name,-4) == 'date') $name = substr($name,0,-4);
+			if (substr($name,-4) == 'date')
+			{
+				$name = substr($name,0,-4);
+			}
 			$replacements['$$' . ($prefix ? $prefix . '/' : '') . 'calendar_'.$name . '$$'] = is_array($data['data']) ? implode(', ',$data['data']) : $data['data'];
 		}
 		// Add seperate lists of participants by type
@@ -275,7 +300,10 @@ 
 			) as $name => $format)
 			{
 				$value = egw_time::to($event[$what],$format);
-				if ($format == 'l') $value = lang($value);
+				if ($format == 'l')
+				{
+					$value = lang($value);
+				}
 				$replacements['$$' .($prefix ? $prefix.'/':'').'calendar_'.$what.$name.'$$'] = $value;
 			}
 		}
@@ -318,24 +346,41 @@ 
 	public function day_plugin($plugin,$date,$n,$repeat)
 	{
 		static $days = null;
-		if(is_array($date) && !$date['start']) {
+		if(is_array($date) && !$date['start'])
+		{
 			// List of IDs
-			if($date[0]['start']) {
+			if($date[0]['start'])
+			{
 				$id = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($date as $event) {
-					if($event['start'] && $event['start'] < $id['start']) $id['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $id['end']) $id['end'] = $event['end'];
+				foreach($date as $event)
+				{
+					if($event['start'] && $event['start'] < $id['start'])
+					{
+						$id['start'] = $event['start'];
+					}
+					if($event['end'] && $event['end'] > $id['end'])
+					{
+						$id['end'] = $event['end'];
+					}
 				}
 				$date = $id;
-			} else {
+			}
+			else
+			{
 				$event = $this->bo->read(is_array($date) ? $date['id'] : $date, is_array($date) ? $date['recur_date'] : null);
-				if(date('l',$event['start']) != $plugin) return array();
+				if(date('l',$event['start']) != $plugin)
+				{
+					return array();
+				}
 				$date = $event['start'];
 			}
 		}
 
 		$_date = $date['start'] ? $date['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if($days[date('Ymd',$_date)][$plugin])
+		{
+			return $days[date('Ymd',$_date)][$plugin][$n];
+		}
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date['end'] ? $date['start'] : mktime(0,0,0,date('m',$_date),date('d',$_date),date('Y',$_date)),
@@ -347,20 +392,29 @@ 
 			'cfs' => array(),	// read all custom-fields
 		));
 
-		if (true) $days = array();
+		if (true)
+		{
+			$days = array();
+		}
 		$replacements = array();
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
 		foreach($events as $day => $list)
 		{
 			foreach($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if($this->ids && !in_array($event['id'], $this->ids))
+				{
+					continue;
+				}
 				$start = egw_time::to($event['start'], 'array');
 				$end = egw_time::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day'])
+				{
 					$dow = date('l',$event['start']);
-				} else {
+				}
+				else
+				{
 					$dow = date('l', strtotime($day));
 					// Fancy date+time formatting for multi-day events
 					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
@@ -369,12 +423,14 @@ 
 
 				$days[date('Ymd',$_date)][$dow][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false)
+			{
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))])) {
+				if(!is_array($days[date('Ymd',$_date)][date('l',strtotime($day))]))
+				{
 					$blank = $this->calendar_replacements(array());
 					foreach($blank as &$value)
 					{
@@ -410,16 +466,26 @@ 
 			if($id[0]['start'])
 			{
 				$dates = array('start' => PHP_INT_MAX, 'end' => 0);
-				foreach($id as $event) {
-					if($event['start'] && $event['start'] < $dates['start']) $dates['start'] = $event['start'];
-					if($event['end'] && $event['end'] > $dates['end']) $dates['end'] = $event['end'];
+				foreach($id as $event)
+				{
+					if($event['start'] && $event['start'] < $dates['start'])
+					{
+						$dates['start'] = $event['start'];
+					}
+					if($event['end'] && $event['end'] > $dates['end'])
+					{
+						$dates['end'] = $event['end'];
+					}
 				}
 				$id = $dates;
 			}
 			$arr = $this->bo->date2array($id['start']);
 			$arr['day'] = $which;
 			$date = $this->bo->date2ts($arr);
-			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
+			if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end']))
+			{
+				return array();
+			}
 		}
 		elseif ($plugin == 'selected')
 		{
@@ -429,16 +495,26 @@ 
 		{
 			$date = strtotime($plugin);
 		}
-		if($type == 'day' && is_array($id) && !$id['start']) {
+		if($type == 'day' && is_array($id) && !$id['start'])
+		{
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-			if($which && date('d',$event['start']) != $which) return array();
-			if(date('Ymd',$date) != date('Ymd', $event['start'])) return array();
+			if($which && date('d',$event['start']) != $which)
+			{
+				return array();
+			}
+			if(date('Ymd',$date) != date('Ymd', $event['start']))
+			{
+				return array();
+			}
 			return $n == 0 ? $this->calendar_replacements($event) : array();
 		}
 
 		// Use start for cache, in case of multiple months
 		$_date = $id['start'] ? $id['start'] : $date;
-		if($days[date('Ymd',$_date)][$plugin]) return $days[date('Ymd',$_date)][$plugin][$n];
+		if($days[date('Ymd',$_date)][$plugin])
+		{
+			return $days[date('Ymd',$_date)][$plugin][$n];
+		}
 
 		$events = $this->bo->search($this->query + array(
 			'start' => $date,
@@ -451,31 +527,42 @@ 
 		));
 
 		$replacements = array();
-		if (true) $days = array();
+		if (true)
+		{
+			$days = array();
+		}
 		$time_format = $GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i';
 		foreach($events as $day => $list)
 		{
 			foreach($list as $event)
 			{
-				if($this->ids && !in_array($event['id'], $this->ids)) continue;
+				if($this->ids && !in_array($event['id'], $this->ids))
+				{
+					continue;
+				}
 				$start = egw_time::to($event['start'], 'array');
 				$end = egw_time::to($event['end'], 'array');
 				$replacements = $this->calendar_replacements($event);
-				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day']) {
+				if($start['year'] == $end['year'] && $start['month'] == $end['month'] && $start['day'] == $end['day'])
+				{
 					//$dow = date('l',$event['start']);
-				} else {
+				}
+				else
+				{
 					// Fancy date+time formatting for multi-day events
 					$replacements['$$calendar_starttime$$'] = date($time_format, $day == date('Ymd', $event['start']) ? $event['start'] : mktime(0,0,0,0,0,1));
 					$replacements['$$calendar_endtime$$'] = date($time_format, $day == date('Ymd', $event['end']) ? $event['end'] : mktime(23,59,59,0,0,0));
 				}
 				$days[date('Ymd',$_date)][$plugin][] = $replacements;
 			}
-			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) {
+			if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false)
+			{
 				$date_marker = array(
 					'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
 					'$$day/name$$' => lang(date('l', strtotime($day)))
 				);
-				if(!is_array($days[date('Ymd',$_date)][$plugin])) {
+				if(!is_array($days[date('Ymd',$_date)][$plugin]))
+				{
 					$blank = $this->calendar_replacements(array());
 					foreach($blank as &$value)
 					{
@@ -503,22 +590,35 @@ 
 	{
 		unset($plugin);	// not used, but required by function signature
 
-		if(!is_array($id) || !$id['start']) {
+		if(!is_array($id) || !$id['start'])
+		{
 			$event = $this->bo->read(is_array($id) ? $id['id'] : $id, is_array($id) ? $id['recur_date'] : null);
-		} else {
+		}
+		else
+		{
 			$event = $id;
 		}
 
-		if(!is_array($event['participants']) || $n >= count($event['participants'])) return array();
+		if(!is_array($event['participants']) || $n >= count($event['participants']))
+		{
+			return array();
+		}
 
 		$participant = null;
 		$status = null;
 		$i = -1;
-		foreach($event['participants'] as $participant => $status) {
-			if(++$i == $n) break;
+		foreach($event['participants'] as $participant => $status)
+		{
+			if(++$i == $n)
+			{
+				break;
+			}
 		}
 
-		if(!$participant) return array();
+		if(!$participant)
+		{
+			return array();
+		}
 
 		// Add some common information
 		$quantity = $role = null;
@@ -552,7 +652,10 @@ 
 				$replacements = $this->contact_replacements(substr($participant,1),'');
 				break;
 			case 'r':
-				if (is_null(self::$resources)) self::$resources = CreateObject('resources.resources_bo');
+				if (is_null(self::$resources))
+				{
+					self::$resources = CreateObject('resources.resources_bo');
+				}
 				if (($resource = self::$resources->read(substr($participant,1))))
 				{
 					foreach($resource as $name => $value)
@@ -613,14 +716,23 @@ 
 			'calendar_owner'    => lang('Owner'),
 		) as $name => $label)
 		{
-			if (in_array($name,array('start','end')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('start','end')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.$label.'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -671,7 +783,8 @@ 
 		}
 		echo '</table></td><td colspan="2"><table >';
 		echo '<tr><td><h3>'.lang('Daily tables').":</h3></td></tr>";
-		foreach(self::$relative as $value) {
+		foreach(self::$relative as $value)
+		{
 			echo '<tr><td>{{table/'.$value. '}} ... {{endtable}}</td></tr>';
 		}
 		echo '<tr><td>{{table/day_n}} ... {{endtable}}</td><td>1 <= n <= 31</td></tr>';

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
 			{

Braces +97 added lines, -36 removed lines

@@ -14,9 +14,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()
+	{
 		translation::add_app('calendar');
 		$this->bo = new calendar_bo();
 		$this->get_selects();
@@ -27,15 +29,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 = bo_merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = bo_merge::getExportLimit('calendar');
+		if (!$limit_exception)
+		{
+			$export_limit = bo_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(
@@ -55,7 +65,8 @@ 
 					'users'         => $options['criteria']['owner'],
 					'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 				);
-				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if(bo_merge::hasExportLimit($export_limit) && !$limit_exception)
+				{
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
@@ -63,28 +74,34 @@ 
 				break;
 			case 'search_results':
 				$states = $GLOBALS['egw']->session->appsession('session_data','calendar');
-				if($states['view'] == 'listview') {
+				if($states['view'] == 'listview')
+				{
 					$query = $GLOBALS['egw']->session->appsession('calendar_list','calendar');
 					$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(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+					if(bo_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 = $GLOBALS['egw']->session->appsession('session_data','calendar');
 					$query['users'] = explode(',', $query['owner']);
 					$query['num_rows'] = -1;
-					if(bo_merge::hasExportLimit($export_limit) && !$limit_exception) {
+					if(bo_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;
@@ -136,8 +153,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']))
@@ -155,36 +178,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);
@@ -199,7 +238,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Calendar CSV export');
 	}
 
@@ -208,7 +248,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.");
 	}
 
@@ -217,11 +258,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';
 	}
 
@@ -229,16 +272,19 @@ 
 	 * 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 = $GLOBALS['egw']->session->appsession('session_data','calendar');
-		switch($states['view']) {
+		switch($states['view'])
+		{
 			case 'month':
 				$query = $this->get_query_month($states);
 				break;
@@ -264,7 +310,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;
@@ -312,24 +361,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']);
@@ -405,7 +463,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];
+			}
 		}
 
 	}

calendar/inc/class.calendar_tracking.inc.php

Indentation +8 added lines, -8 removed lines

@@ -132,10 +132,10 @@ 
 		}
 
 		/**
-		* Do some magic with the participants and recurrance.
-		* If this is one of a recurring event, append the recur_date to the participant field so we can
-		* filter by it later.
-		*/
+		 * Do some magic with the participants and recurrance.
+		 * If this is one of a recurring event, append the recur_date to the participant field so we can
+		 * filter by it later.
+		 */
 		if(is_array($data['participants']))
 		{
 			$participants = $data['participants'];
@@ -195,10 +195,10 @@ 
 	}
 
 	/**
-	* Do some magic with the participants and recurrance.
-	* If this is one of a recurring event, append the recur_date to the participant field so we can
-	* filter by it later.
-	*/
+	 * Do some magic with the participants and recurrance.
+	 * If this is one of a recurring event, append the recur_date to the participant field so we can
+	 * filter by it later.
+	 */
 	protected function alter_participants($participants)
 	{
 		$data = array();