EGroupware / egroupware

calendar/sitemgr/class.module_calendar_list.inc.php

Braces +16 added lines, -5 removed lines

@@ -165,7 +165,8 @@ 
 			$cat_ids[$category['id']] = $GLOBALS['egw']->strip_html($category['name']);
 		}
 		$this->arguments['category']['options'] = $cat_ids;
-		if (count($cat_ids) > 5) {
+		if (count($cat_ids) > 5)
+		{
 			$this->arguments['category']['multiple'] = 5;
 		}
 
@@ -310,8 +311,16 @@ 
 		foreach((array) $this->bo->search($search_params) as $event)
 		{
 			$event['date'] = $this->bo->date2string($event['start']);
-			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			if (empty($event['description']))
+			{
+				$event['description'] = ' ';
+			}
+			// no description screws the titles horz. alignment
+			if (empty($event['location']))
+			{
+				$event['location'] = ' ';
+			}
+			// no location screws the owner horz. alignment
 			$rows[] = $event;
 		}
 		if (($arguments['showWeeks']) && ((int)$arguments['offset'] == 0))
@@ -337,7 +346,8 @@ 
 				}
 				$last_week = adodb_date('W-Y',$event['start']);
 				$html .= "  <!-- Event -->\n";
-				if ($event_count % 2 == 0) {
+				if ($event_count % 2 == 0)
+				{
 					$html .= '  <div class="cal_list_event cal_event_even">'."\n";
 				}
 				else
@@ -353,7 +363,8 @@ 
 				$html .= '<span class="cal_list_weekday">'.lang(adodb_date('D',$event['end'])).".".($this->bo->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ')."</span>";
 				$html .= $this->bo->format_date($event['end'])."</span></div>\n";
 				$descr = trim($event['description']);
-				if (! empty($descr)) {
+				if (! empty($descr))
+				{
 					$html .= "    <div class=\"cal_list_descr\">\n".preg_replace('/\\n/',"<br>\n",$event['description'])."</div>\n";
 				}
 				$html .= "  </div><!-- cal_list_event -->\n";

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

@@ -280,7 +280,7 @@
 		}
 
 		// set the search parameters
-		$search_params = Array
+		$search_params = array
 		(
 			'offset' => $arguments['entryOffset'] ? (int) $arguments['entryOffset'] : false,
 			'order' => 'cal_start ASC',

Spacing +34 added lines, -35 removed lines

@@ -91,7 +91,7 @@ 
 			'category' => array(
 				'type' => 'select',
 				'label' => lang('Choose a category'),
-				'options' => array(),	// specification of options is postponed into the get_user_interface function
+				'options' => array(), // specification of options is postponed into the get_user_interface function
 				'multiple' => true,
 			),
 			'numWeeks' => array(
@@ -157,8 +157,8 @@ 
 	{
 		//_debug_array($GLOBALS['Common_BO']->sites->current_site);
 		// copied from bookmarks module.
-		$cat = new Api\Categories('','calendar');
-		$cats = $cat->return_array('all',0,False,'','cat_name','',True);
+		$cat = new Api\Categories('', 'calendar');
+		$cats = $cat->return_array('all', 0, False, '', 'cat_name', '', True);
 		$cat_ids = array();
 		while (list(,$category) = @each($cats))
 		{
@@ -173,7 +173,7 @@ 
 		{
 			$GLOBALS['egw']->accounts = new Api\Accounts();
 		}
-		$this->accounts =& $GLOBALS['egw']->accounts;
+		$this->accounts = & $GLOBALS['egw']->accounts;
 		$search_params = array(
 			'type' => 'both',
 			'app' => 'calendar',
@@ -182,8 +182,8 @@ 
 		$users = array();
 		$groups = array();
 		// sort users and groups separately.
-		$anon_user = $this->accounts->name2id($GLOBALS['Common_BO']->sites->current_site['anonymous_user'],'account_lid','u');
-		$anon_groups = $this->accounts->memberships($anon_user,true);
+		$anon_user = $this->accounts->name2id($GLOBALS['Common_BO']->sites->current_site['anonymous_user'], 'account_lid', 'u');
+		$anon_groups = $this->accounts->memberships($anon_user, true);
 		foreach ($accounts as $entry)
 		{
 			$is_group = false;
@@ -191,9 +191,9 @@ 
 			$acl = new Acl($entry['account_id']);
 			$acl->read_repository();
 			// get the rights for each account to check whether the anon user has read permissions.
-			$rights = $acl->get_rights($anon_user,'calendar');
+			$rights = $acl->get_rights($anon_user, 'calendar');
 			// also add the anon user if it's his own calendar.
-			if (($rights & Acl::READ) || ($entry['account_id'] == $anon_user))
+			if (($rights&Acl::READ) || ($entry['account_id'] == $anon_user))
 			{
 				$has_read_permissions = true;
 			}
@@ -203,8 +203,8 @@ 
 				// or ass permissions if this is the anon group's calendar.
 				foreach ($anon_groups as $parent_group)
 				{
-					$rights = $acl->get_rights($parent_group,'calendar');
-					if (($rights & Acl::READ) || ($entry['account_id'] == $parent_group))
+					$rights = $acl->get_rights($parent_group, 'calendar');
+					if (($rights&Acl::READ) || ($entry['account_id'] == $parent_group))
 					{
 						$has_read_permissions = true;
 						break;
@@ -220,7 +220,7 @@ 
 				}
 				else
 				{
-					$users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'],$entry['account_firstname'],$entry['account_lastname']);
+					$users[$entry['account_id']] = Api\Accounts::format_username($entry['account_lid'], $entry['account_firstname'], $entry['account_lastname']);
 				}
 			}
 		}
@@ -240,7 +240,7 @@ 
 		return parent::get_user_interface();
 	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
 		$html = "";
 		Api\Translation::add_app('calendar');
@@ -249,17 +249,17 @@ 
 		$this->ui->allowEdit = false;
 		$this->ui->use_time_grid = isset($arguments['grid']) ? $arguments['grid'] : false;
 
-		$weeks = $arguments['numWeeks'] ? (int) $arguments['numWeeks'] : 4;
-		$dateOffset = $arguments['offset'] ? (int) $arguments['offset'] : 0;
+		$weeks = $arguments['numWeeks'] ? (int)$arguments['numWeeks'] : 4;
+		$dateOffset = $arguments['offset'] ? (int)$arguments['offset'] : 0;
 
-		if (($arguments['acceptDateParam']) && (get_var('date',array('POST','GET'))))
+		if (($arguments['acceptDateParam']) && (get_var('date', array('POST', 'GET'))))
 		{
-			$first = (int) (strtotime(get_var('date',array('POST','GET'))) +
+			$first = (int)(strtotime(get_var('date', array('POST', 'GET'))) +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		else
 		{
-			$first = (int) ($this->bo->now_su +
+			$first = (int)($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		if ($arguments['useWeekStart'])
@@ -269,20 +269,19 @@ 
 			$first = $start->format('ts');
 		}
 
-		$last = (int) ($first +
+		$last = (int)($first +
 				(60 * 60 * 24 * 7 * $weeks));
 
 		if ($arguments['showTitle'])
 		{
 			$html .= '<div id="divAppboxHeader">'.$GLOBALS['egw_info']['apps']['calendar']['title'].' - ';
-			$html .= lang('After %1',$this->bo->long_date($first));
+			$html .= lang('After %1', $this->bo->long_date($first));
 			$html .= "</div>";
 		}
 
 		// set the search parameters
-		$search_params = Array
-		(
-			'offset' => $arguments['entryOffset'] ? (int) $arguments['entryOffset'] : false,
+		$search_params = Array(
+			'offset' => $arguments['entryOffset'] ? (int)$arguments['entryOffset'] : false,
 			'order' => 'cal_start ASC',
 			'start' => $first,
 			'end' => $last,
@@ -302,23 +301,23 @@ 
 		}
 		if ($arguments['numEntries'])
 		{
-			$search_params['num_rows'] = (int) $arguments['numEntries'];
-			$search_params['offset'] =  $arguments['entryOffset'] ? (int) $arguments['entryOffset'] :0;
+			$search_params['num_rows'] = (int)$arguments['numEntries'];
+			$search_params['offset'] = $arguments['entryOffset'] ? (int)$arguments['entryOffset'] : 0;
 		}
 		$rows = array();
 
-		foreach((array) $this->bo->search($search_params) as $event)
+		foreach ((array)$this->bo->search($search_params) as $event)
 		{
 			$event['date'] = $this->bo->date2string($event['start']);
-			if (empty($event['description'])) $event['description'] = ' ';	// no description screws the titles horz. alignment
-			if (empty($event['location'])) $event['location'] = ' ';	// no location screws the owner horz. alignment
+			if (empty($event['description'])) $event['description'] = ' '; // no description screws the titles horz. alignment
+			if (empty($event['location'])) $event['location'] = ' '; // no location screws the owner horz. alignment
 			$rows[] = $event;
 		}
 		if (($arguments['showWeeks']) && ((int)$arguments['offset'] == 0))
 		{
 			$html .= "<div>".lang('Next')." ".lang('%1 weeks', $weeks).":</div>\n";
 		}
-		if (($search_params['offset'] && $this->bo->total == 0) || count($rows)==0)
+		if (($search_params['offset'] && $this->bo->total == 0) || count($rows) == 0)
 		{
 			$html .= "<div>".lang("no events found")."</div>";
 		}
@@ -331,11 +330,11 @@ 
 			$html .= '  <div class="cal_list_weektop"></div>'."\n";
 			foreach ($rows as $event)
 			{
-				if (($last_week != 0) && (adodb_date('W-Y',$event['start']) != $last_week))
+				if (($last_week != 0) && (adodb_date('W-Y', $event['start']) != $last_week))
 				{
 					$html .= '  <div class="cal_list_weeksplit"></div>'."\n";
 				}
-				$last_week = adodb_date('W-Y',$event['start']);
+				$last_week = adodb_date('W-Y', $event['start']);
 				$html .= "  <!-- Event -->\n";
 				if ($event_count % 2 == 0) {
 					$html .= '  <div class="cal_list_event cal_event_even">'."\n";
@@ -347,17 +346,17 @@ 
 				$html .= '    <div class="cal_list_title">'.$event['title']."</div>\n";
 				$html .= '    <div class="cal_list_date">';
 				$html .= '<span class="cal_list_start">';
-				$html .= '<span class="cal_list_weekday">'.lang(adodb_date('D',$event['start'])).".".($this->bo->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ')."</span>";
+				$html .= '<span class="cal_list_weekday">'.lang(adodb_date('D', $event['start'])).".".($this->bo->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ')."</span>";
 				$html .= $this->bo->format_date($event['start'])."</span>";
 				$html .= '<span class="cal_list_end"> - ';
-				$html .= '<span class="cal_list_weekday">'.lang(adodb_date('D',$event['end'])).".".($this->bo->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ')."</span>";
+				$html .= '<span class="cal_list_weekday">'.lang(adodb_date('D', $event['end'])).".".($this->bo->common_prefs['dateformat'][0] != 'd' ? ' ' : ', ')."</span>";
 				$html .= $this->bo->format_date($event['end'])."</span></div>\n";
 				$descr = trim($event['description']);
-				if (! empty($descr)) {
-					$html .= "    <div class=\"cal_list_descr\">\n".preg_replace('/\\n/',"<br>\n",$event['description'])."</div>\n";
+				if (!empty($descr)) {
+					$html .= "    <div class=\"cal_list_descr\">\n".preg_replace('/\\n/', "<br>\n", $event['description'])."</div>\n";
 				}
 				$html .= "  </div><!-- cal_list_event -->\n";
-				$event_count ++;
+				$event_count++;
 			}
 			$html .= '  <div class="cal_list_weekbottom"></div>'."\n";
 			$html .= "<!-- End module -->\n";

calendar/freebusy.php

Braces +12 added lines, -4 removed lines

@@ -44,15 +44,23 @@
 if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
 {
 	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
-}
+	if (isset($_GET['password']))
+	{
+		$_GET['password'] = substr($_GET['password'],2);
+	}
+	if (isset($_GET['cred']))
+	{
+		$_GET['cred'] = substr($_GET['cred'],2);
+	}
+	}
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
 	list(,$domain) = explode('@',$user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
+	{
+		list($user) = explode('@',$user);
+	}
 	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))

Spacing +13 added lines, -13 removed lines

@@ -41,23 +41,23 @@ 
 	$GLOBALS['egw_info']['flags']['currentapp'] = 'calendar';
 }
 // fix for SOGo connector, which does not decode the = in our f/b url
-if (strpos($_SERVER['QUERY_STRING'],'=3D') !== false && substr($_GET['user'],0,2) == '3D')
+if (strpos($_SERVER['QUERY_STRING'], '=3D') !== false && substr($_GET['user'], 0, 2) == '3D')
 {
-	$_GET['user'] = substr($_GET['user'],2);
-	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'],2);
-	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'],2);
+	$_GET['user'] = substr($_GET['user'], 2);
+	if (isset($_GET['password'])) $_GET['password'] = substr($_GET['password'], 2);
+	if (isset($_GET['cred'])) $_GET['cred'] = substr($_GET['cred'], 2);
 }
 if (!is_numeric($user = $_GET['user']))
 {
 	// check if user contains the current domain --> remove it
-	list(,$domain) = explode('@',$user);
+	list(,$domain) = explode('@', $user);
 	if ($domain === $GLOBALS['egw_info']['user']['domain'])
-	list($user) = explode('@',$user);
-	$user = $GLOBALS['egw']->accounts->name2id($user,'account_lid','u');
+	list($user) = explode('@', $user);
+	$user = $GLOBALS['egw']->accounts->name2id($user, 'account_lid', 'u');
 }
 if ($user === false || !($username = $GLOBALS['egw']->accounts->id2name($user)))
 {
-	fail_exit(lang("freebusy: unknown user '%1', wrong password or not available to not logged in users !!!"." $username($user)",$_GET['user']));
+	fail_exit(lang("freebusy: unknown user '%1', wrong password or not available to not logged in users !!!"." $username($user)", $_GET['user']));
 }
 if (!$loged_in)
 {
@@ -78,11 +78,11 @@ 
 		if (strpos($authuser, '@') === false)
 		{
 			$domain = $GLOBALS['egw_info']['server']['default_domain'];
-			$authuser .= '@' . $domain;
+			$authuser .= '@'.$domain;
 		}
 		else
 		{
-			list(, $domain) = explode('@',$authuser, 2);
+			list(, $domain) = explode('@', $authuser, 2);
 		}
 		if (array_key_exists($domain, $GLOBALS['egw_domain']))
 		{
@@ -92,8 +92,8 @@ 
 			$GLOBALS['egw_info']['user']['domain'] = $domain;
 			$GLOBALS['egw_info']['flags']['currentapp'] = 'login';
 			$GLOBALS['egw_info']['flags']['noapi'] = false;
-			require_once(EGW_API_INC . '/functions.inc.php');
-			$loged_in =  $GLOBALS['egw']->session->create($authuser, $password, 'text');
+			require_once(EGW_API_INC.'/functions.inc.php');
+			$loged_in = $GLOBALS['egw']->session->create($authuser, $password, 'text');
 			session_unset();
 			session_destroy();
 		}
@@ -109,7 +109,7 @@ 
 }
 else
 {
-	Api\Header\Content::type('freebusy.ifb','text/calendar');
+	Api\Header\Content::type('freebusy.ifb', 'text/calendar');
 }
 $ical = new calendar_ical();
 echo $ical->freebusy($user, $_GET['end']);

calendar/inc/class.calendar_owner_etemplate_widget.inc.php

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

@@ -111,7 +111,7 @@
 			$value = $value_in =& self::get_array($content, $form_name);
 			if(!is_array($value))
 			{
-				$value = Array($value);
+				$value = array($value);
 			}
 
 			$valid =& self::get_array($validated, $form_name, true);

Braces +12 added lines, -4 removed lines

@@ -66,7 +66,8 @@ 
 			$accounts += $accounts_type;
 		}
 		$sel_options += array_map(
-			function($account_id, $account_name) {
+			function($account_id, $account_name)
+			{
 				return array(
 					'value' => ''.$account_id,
 					'label' => $account_name,
@@ -123,7 +124,10 @@ 
 			}
 
 			$valid =& self::get_array($validated, $form_name, true);
-			if (true) $valid = $value;
+			if (true)
+			{
+				$valid = $value;
+			}
 		}
 	}
 	/**
@@ -192,7 +196,8 @@ 
 					$contacts_obj = new Api\Contacts();
 					$lists = array_filter(
 						$contacts_obj->get_lists(Api\Acl::READ),
-						function($element) use($query) {
+						function($element) use($query)
+						{
 							return (stripos($element, $query) !== false);
 						}
 					);
@@ -249,7 +254,10 @@ 
 	public static function get_owner_label($id)
 	{
 		static $bo;
-		if(!$bo) $bo = new calendar_bo();
+		if(!$bo)
+		{
+			$bo = new calendar_bo();
+		}
 
 		$id = ''.$id;
 		if(!is_numeric($id))

Spacing +38 added lines, -38 removed lines

@@ -30,33 +30,33 @@ 
 	 * @param string $cname
 	 * @param array $expand values for keys 'c', 'row', 'c_', 'row_', 'cont'
 	 */
-	public function beforeSendToClient($cname, array $expand=null)
+	public function beforeSendToClient($cname, array $expand = null)
 	{
 
-		Framework::includeJS('.','et2_widget_owner','calendar');
-		Framework::includeCSS('calendar','calendar');
+		Framework::includeJS('.', 'et2_widget_owner', 'calendar');
+		Framework::includeCSS('calendar', 'calendar');
 
 		$bo = new calendar_bo();
 
 		$form_name = self::form_name($cname, $this->id, $expand);
 
-		$value =& self::get_array(self::$request->content, $form_name);
+		$value = & self::get_array(self::$request->content, $form_name);
 
 		if (!is_array(self::$request->sel_options[$form_name]))
 		{
 			self::$request->sel_options[$form_name] = array();
 		}
-		$sel_options =& self::$request->sel_options[$form_name];
+		$sel_options = & self::$request->sel_options[$form_name];
 
 		// Get user accounts, formatted nicely for grouping and matching
 		// the ajax call calendar_uiforms->ajax_owner() - users first
 		$accounts = array();
 		$list = array('accounts', 'owngroups');
-		foreach($list as $type)
+		foreach ($list as $type)
 		{
 			$account_options = array('account_type' => $type);
-			$accounts_type = Api\Accounts::link_query('',$account_options);
-			if($type == 'accounts')
+			$accounts_type = Api\Accounts::link_query('', $account_options);
+			if ($type == 'accounts')
 			{
 				$accounts_type = array_intersect_key($accounts_type, $GLOBALS['egw']->acl->get_grants('calendar'));
 			}
@@ -73,25 +73,25 @@ 
 			array_keys($accounts), $accounts
 		);
 
-		if(!is_array($value))
+		if (!is_array($value))
 		{
 			// set value with an empty string only if sel options are not
 			// loaded, for example: setting calendar owner via URL when
 			// calendar app is not yet loaded.
-			$value = !empty($sel_options) ? array(): explode(',', $value);
+			$value = !empty($sel_options) ? array() : explode(',', $value);
 		}
 		
 		// Add external owners that a select account widget will not find
-		foreach($value as &$owner)
+		foreach ($value as &$owner)
 		{
 			$label = self::get_owner_label($owner);
 			$info = array();
-			if(!is_numeric($owner))
+			if (!is_numeric($owner))
 			{
-				$resource = $bo->resources[substr($owner, 0,1)];
-				if($resource['info'] && !($info = $bo->resource_info($owner)))
+				$resource = $bo->resources[substr($owner, 0, 1)];
+				if ($resource['info'] && !($info = $bo->resource_info($owner)))
 				{
-					continue;	// ignore that resource, we would get a PHP Fatal: Unsupported operand types
+					continue; // ignore that resource, we would get a PHP Fatal: Unsupported operand types
 				}
 			}
 			else if (!in_array($owner, array_keys($accounts)))
@@ -114,19 +114,19 @@ 
 	 * @param array $content
 	 * @param array &$validated=array() validated content
 	 */
-	public function validate($cname, array $expand, array $content, &$validated=array())
+	public function validate($cname, array $expand, array $content, &$validated = array())
 	{
 		$form_name = self::form_name($cname, $this->id, $expand);
 
 		if (!$this->is_readonly($cname, $form_name))
 		{
-			$value = $value_in =& self::get_array($content, $form_name);
-			if(!is_array($value))
+			$value = $value_in = & self::get_array($content, $form_name);
+			if (!is_array($value))
 			{
 				$value = Array($value);
 			}
 
-			$valid =& self::get_array($validated, $form_name, true);
+			$valid = & self::get_array($validated, $form_name, true);
 			if (true) $valid = $value;
 		}
 	}
@@ -138,7 +138,7 @@ 
 	public static function ajax_owner($id = null)
 	{
 		// Handle a request for a single ID
-		if($id)
+		if ($id)
 		{
 			$label = self::get_owner_label($id);
 			Api\Json\Response::get()->data($label);
@@ -152,7 +152,7 @@ 
 		$options = array('start' => 0, 'num_rows' => 50,
 			// Filter accounts out of addressbook
 			'filter' => array('account_id' => null)) +
-			array_diff_key($_REQUEST, array_flip(array('menuaction','query')));
+			array_diff_key($_REQUEST, array_flip(array('menuaction', 'query')));
 		$results = array();
 
 		// Contacts matching accounts the user does not have permission for cause
@@ -160,14 +160,14 @@ 
 		// we remove those contacts
 		$remove_contacts = array();
 
-		$resources = array_merge(array('' => $bo->resources['']),$bo->resources);
-		foreach($resources as $type => $data)
+		$resources = array_merge(array('' => $bo->resources['']), $bo->resources);
+		foreach ($resources as $type => $data)
 		{
 			$mapped = array();
 			$_results = array();
 
 			// Handle Api\Accounts seperately
-			if($type == '')
+			if ($type == '')
 			{
 				$account_options = $options + array('account_type' => 'both');
 				$_results += $remove_contacts = Api\Accounts::link_query($query, $account_options);
@@ -185,7 +185,7 @@ 
 			// Use standard link registry
 			else if ($data['app'] && Link::get_registry($data['app'], 'query'))
 			{
-				$_results = Link::query($data['app'], $query,$options);
+				$_results = Link::query($data['app'], $query, $options);
 			}
 
 			// There are always special cases
@@ -200,7 +200,7 @@ 
 							return (stripos($element, $query) !== false);
 						}
 					);
-					foreach($lists as $list_id => $list)
+					foreach ($lists as $list_id => $list)
 					{
 						$_results[$list_id] = array(
 							'label' => $list,
@@ -209,14 +209,14 @@ 
 					}
 					break;
 			}
-			if(!$_results)
+			if (!$_results)
 			{
 				continue;
 			}
 
-			foreach(array_unique($_results, SORT_REGULAR) as $id => $title)
+			foreach (array_unique($_results, SORT_REGULAR) as $id => $title)
 			{
-				if($id && $title)
+				if ($id && $title)
 				{
 					// Magicsuggest uses id, not value.
 					$value = array(
@@ -225,14 +225,14 @@ 
 						'label' => $title,
 						'app'	=> lang($data['app'])
 					);
-					if(is_array($value['label']))
+					if (is_array($value['label']))
 					{
 						$value = array_merge($value, $value['label']);
 					}
 					$mapped[] = $value;
 				}
 			}
-			if(count($mapped))
+			if (count($mapped))
 			{
 				$results = array_merge($results, $mapped);
 			}
@@ -253,24 +253,24 @@ 
 	public static function get_owner_label($id)
 	{
 		static $bo;
-		if(!$bo) $bo = new calendar_bo();
+		if (!$bo) $bo = new calendar_bo();
 
 		$id = ''.$id;
-		if(!is_numeric($id))
+		if (!is_numeric($id))
 		{
-			$resource = $bo->resources[substr($id, 0,1)];
-			$label = Link::title($resource['app'], substr($id,1));
+			$resource = $bo->resources[substr($id, 0, 1)];
+			$label = Link::title($resource['app'], substr($id, 1));
 
 			// Could not get via link, try via resources info
-			if($label === false)
+			if ($label === false)
 			{
-				$info = ExecMethod($resource['info'], substr($id,1));
+				$info = ExecMethod($resource['info'], substr($id, 1));
 				$label = $info[0]['name'];
 			}
 		}
 		else
 		{
-			$label = Link::title('api-accounts',$id) ?: Api\Accounts::username($id);
+			$label = Link::title('api-accounts', $id) ?: Api\Accounts::username($id);
 		}
 		return $label;
 	}

calendar/inc/class.calendar_rrule.inc.php

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

@@ -61,7 +61,7 @@
 	 *
 	 * @var array
 	 */
-	static public $types = Array(
+	static public $types = array(
 		self::NONE         => 'None',
 		self::DAILY        => 'Daily',
 		self::WEEKLY       => 'Weekly',

Spacing +101 added lines, -101 removed lines

@@ -76,8 +76,8 @@ 
 	static private $recur_egw2ical_2_0 = array(
 		self::DAILY        => 'DAILY',
 		self::WEEKLY       => 'WEEKLY',
-		self::MONTHLY_WDAY => 'MONTHLY',	// BYDAY={1..7, -1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MONTHLY',	// BYMONHTDAY={1..31, -1 for last day of month}
+		self::MONTHLY_WDAY => 'MONTHLY', // BYDAY={1..7, -1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MONTHLY', // BYMONHTDAY={1..31, -1 for last day of month}
 		self::YEARLY       => 'YEARLY',
 	);
 
@@ -87,8 +87,8 @@ 
 	static private $recur_egw2ical_1_0 = array(
 		self::DAILY        => 'D',
 		self::WEEKLY       => 'W',
-		self::MONTHLY_WDAY => 'MP',	// BYDAY={1..7,-1}{MO..SO, last workday}
-		self::MONTHLY_MDAY => 'MD',	// BYMONHTDAY={1..31,-1}
+		self::MONTHLY_WDAY => 'MP', // BYDAY={1..7,-1}{MO..SO, last workday}
+		self::MONTHLY_MDAY => 'MD', // BYMONHTDAY={1..31,-1}
 		self::YEARLY       => 'YM',
 	);
 
@@ -156,7 +156,7 @@ 
 	const THURSDAY  = 16;
 	const FRIDAY    = 32;
 	const SATURDAY  = 64;
-	const WORKDAYS  = 62;	// Mo, ..., Fr
+	const WORKDAYS  = 62; // Mo, ..., Fr
 	const ALLDAYS   = 127;
 	/**
 	 * Translate weekday bitmasks to labels
@@ -184,14 +184,14 @@ 
 	 *
 	 * @var array
 	 */
-	public $exceptions=array();
+	public $exceptions = array();
 
 	/**
 	 * Array of exceptions as DateTime/egw_time objects
 	 *
 	 * @var array
 	 */
-	public $exceptions_objs=array();
+	public $exceptions_objs = array();
 
 	/**
 	 * Starttime of series
@@ -234,9 +234,9 @@ 
 	 * @param int $weekdays =0 self::SUNDAY=1|self::MONDAY=2|...|self::SATURDAY=64
 	 * @param array $exceptions =null DateTime objects with exceptions
 	 */
-	public function __construct(DateTime $time,$type,$interval=1,DateTime $enddate=null,$weekdays=0,array $exceptions=null)
+	public function __construct(DateTime $time, $type, $interval = 1, DateTime $enddate = null, $weekdays = 0, array $exceptions = null)
 	{
-		switch($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
+		switch ($GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'])
 		{
 			case 'Sunday':
 				$this->lastdayofweek = self::SATURDAY;
@@ -250,7 +250,7 @@ 
 
 		$this->time = $time instanceof Api\DateTime ? $time : new Api\DateTime($time);
 
-		if (!in_array($type,array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
+		if (!in_array($type, array(self::NONE, self::DAILY, self::WEEKLY, self::MONTHLY_MDAY, self::MONTHLY_WDAY, self::YEARLY)))
 		{
 			throw new Api\Exception\WrongParameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -260,16 +260,16 @@ 
 		if ($type == self::MONTHLY_WDAY)
 		{
 			// check for last week of month
-			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time)-7)
+			if (($day = $this->time->format('d')) >= 21 && $day > self::daysInMonth($this->time) - 7)
 			{
 				$this->monthly_byday_num = -1;
 			}
 			else
 			{
-				$this->monthly_byday_num = 1 + floor(($this->time->format('d')-1) / 7);
+				$this->monthly_byday_num = 1 + floor(($this->time->format('d') - 1) / 7);
 			}
 		}
-		elseif($type == self::MONTHLY_MDAY)
+		elseif ($type == self::MONTHLY_MDAY)
 		{
 			$this->monthly_bymonthday = (int)$this->time->format('d');
 			// check for last day of month
@@ -286,7 +286,7 @@ 
 
 		if ((int)$interval < 1)
 		{
-			$interval = 1;	// calendar stores no (extra) interval as null, so using default 1 here
+			$interval = 1; // calendar stores no (extra) interval as null, so using default 1 here
 		}
 		$this->interval = (int)$interval;
 
@@ -317,7 +317,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -333,22 +333,22 @@ 
 	 * @param int $interval =1
 	 * @return int
 	 */
-	public static function recurrence_interval($type, $interval=1)
+	public static function recurrence_interval($type, $interval = 1)
 	{
-		switch($type)
+		switch ($type)
 		{
 			case self::DAILY:
-				$duration = 24*3600;
+				$duration = 24 * 3600;
 				break;
 			case self::WEEKLY:
-				$duration = 7*24*3600;
+				$duration = 7 * 24 * 3600;
 				break;
 			case self::MONTHLY_MDAY:
 			case self::MONTHLY_WDAY:
-				$duration = 31*24*3600;
+				$duration = 31 * 24 * 3600;
 				break;
 			case self::YEARLY:
-				$duration = 366*24*3600;
+				$duration = 366 * 24 * 3600;
 				break;
 		}
 		if ($interval > 1) $duration *= $interval;
@@ -364,9 +364,9 @@ 
 	 */
 	private static function daysInMonth(DateTime $time)
 	{
-		list($year,$month) = explode('-',$time->format('Y-m'));
+		list($year, $month) = explode('-', $time->format('Y-m'));
 		$last_day = new Api\DateTime();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -396,7 +396,7 @@ 
 	 */
 	public function next_no_exception()
 	{
-		switch($this->type)
+		switch ($this->type)
 		{
 			case self::NONE:	// need to add at least one day, to end "series", as enddate == current date
 			case self::DAILY:
@@ -411,28 +411,28 @@ 
 					// --> on the last day of the week we have to additionally advance interval-1 weeks
 					if ($this->interval > 1 && self::getWeekday($this->current) == $this->lastdayofweek)
 					{
-						$this->current->modify(($this->interval-1).' week');
+						$this->current->modify(($this->interval - 1).' week');
 					}
 					$this->current->modify('1 day');
 					//echo __METHOD__.'() '.$this->current->format('l').', '.$this->current.": $this->weekdays & ".self::getWeekday($this->current)."<br />\n";
 				}
-				while(!($this->weekdays & self::getWeekday($this->current)));
+				while (!($this->weekdays & self::getWeekday($this->current)));
 				break;
 
 			case self::MONTHLY_WDAY:	// iCal: BYDAY={1, ..., 5, -1}{MO..SO}
 				// advance to start of next month
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$month += $this->interval+($this->monthly_byday_num < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$this->monthly_byday_num < 0 ? 0 : 1);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$month += $this->interval + ($this->monthly_byday_num < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $this->monthly_byday_num < 0 ? 0 : 1);
 				//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).": setDate($year,$month,1): ".$this->current->format('l').', '.$this->current."<br />\n";
 				// now advance to n-th week
 				if ($this->monthly_byday_num > 1)
 				{
-					$this->current->modify(($this->monthly_byday_num-1).' week');
+					$this->current->modify(($this->monthly_byday_num - 1).' week');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify('.($this->monthly_byday_num-1).' week): '.$this->current->format('l').', '.$this->current."<br />\n";
 				}
 				// advance to given weekday
-				while(!($this->weekdays & self::getWeekday($this->current)))
+				while (!($this->weekdays & self::getWeekday($this->current)))
 				{
 					$this->current->modify(($this->monthly_byday_num < 0 ? -1 : 1).' day');
 					//echo __METHOD__."() $this->monthly_byday_num".substr(self::$days[$this->monthly_byday_wday],0,2).': modify(1 day): '.$this->current->format('l').', '.$this->current."<br />\n";
@@ -440,10 +440,10 @@ 
 				break;
 
 			case self::MONTHLY_MDAY:	// iCal: monthly_bymonthday={1, ..., 31, -1}
-				list($year,$month) = explode('-',$this->current->format('Y-m'));
-				$day = $this->monthly_bymonthday+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$month += $this->interval+($this->monthly_bymonthday < 0 ? 1 : 0);
-				$this->current->setDate($year,$month,$day);
+				list($year, $month) = explode('-', $this->current->format('Y-m'));
+				$day = $this->monthly_bymonthday + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$month += $this->interval + ($this->monthly_bymonthday < 0 ? 1 : 0);
+				$this->current->setDate($year, $month, $day);
 				//echo __METHOD__."() setDate($year,$month,$day): ".$this->current->format('l').', '.$this->current."<br />\n";
 				break;
 
@@ -465,7 +465,7 @@ 
 		{
 			$this->next_no_exception();
 		}
-		while($this->exceptions && in_array($this->current->format('Ymd'),$this->exceptions));
+		while ($this->exceptions && in_array($this->current->format('Ymd'), $this->exceptions));
 	}
 
 	/**
@@ -497,7 +497,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -522,7 +522,7 @@ 
 		// if enddate is now before next acurrence, but not on same day, we use previous recurrence
 		// this can happen if client gives an enddate which is NOT a recurrence date
 		// eg. for a on Monday recurring weekly event a Tuesday as enddate
-		if ($this->enddate < $this->current  && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
+		if ($this->enddate < $this->current && $this->current->format('Ymd') != $this->enddate->format('Ymd'))
 		{
 			$last = $previous;
 		}
@@ -541,7 +541,7 @@ 
 		$this->current = clone $this->time;
 		while ($this->valid() &&
 			$this->exceptions &&
-			in_array($this->current->format('Ymd'),$this->exceptions))
+			in_array($this->current->format('Ymd'), $this->exceptions))
 		{
 			$this->next_no_exception();
 		}
@@ -553,7 +553,7 @@ 
 	 * @param boolean $use_just_date =false default use also time
 	 * @return boolean
 	 */
-	public function valid($use_just_date=false)
+	public function valid($use_just_date = false)
 	{
 		if ($use_just_date)
 		{
@@ -571,7 +571,7 @@ 
 	{
 		$str = '';
 		// Repeated Events
-		if($this->type != self::NONE)
+		if ($this->type != self::NONE)
 		{
 			$str = lang(self::$types[$this->type]);
 			
@@ -589,7 +589,7 @@ 
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('all') : lang('day');
 					}
-					elseif($this->weekdays == self::WORKDAYS)
+					elseif ($this->weekdays == self::WORKDAYS)
 					{
 						$repeat_days[] = $this->type == self::WEEKLY ? lang('workdays') : lang('workday');
 					}
@@ -603,18 +603,18 @@ 
 							}
 						}
 					}
-					if($this->type == self::WEEKLY && count($repeat_days))
+					if ($this->type == self::WEEKLY && count($repeat_days))
 					{
-						$str_extra[] = lang('days repeated').': '.implode(', ',$repeat_days);
+						$str_extra[] = lang('days repeated').': '.implode(', ', $repeat_days);
 					}
-					elseif($this->type == self::MONTHLY_WDAY)
+					elseif ($this->type == self::MONTHLY_WDAY)
 					{
-						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ',$repeat_days);
+						$str_extra[] = ($this->monthly_byday_num == -1 ? lang('last') : $this->monthly_byday_num.'.').' '.implode(', ', $repeat_days);
 					}
 					break;
 
 			}
-			if($this->interval > 1)
+			if ($this->interval > 1)
 			{
 				$str_extra[] = lang('Interval').': '.$this->interval;
 			}
@@ -630,9 +630,9 @@ 
 			{
 				$str_extra[] = $this->time->getTimezone()->getName();
 			}
-			if(count($str_extra))
+			if (count($str_extra))
 			{
-				$str .= ' ('.implode(', ',$str_extra).')';
+				$str .= ' ('.implode(', ', $str_extra).')';
 			}
 		}
 		return $str;
@@ -644,16 +644,16 @@ 
 	 *
 	 * $return array	vCalendar RRULE
 	 */
-	public function generate_rrule($version='2.0')
+	public function generate_rrule($version = '2.0')
 	{
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE) return false; // no recuring event
 
 		if ($version == '1.0')
 		{
-			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type] . $this->interval;
+			$rrule['FREQ'] = self::$recur_egw2ical_1_0[$this->type].$this->interval;
 			switch ($this->type)
 			{
 				case self::WEEKLY:
@@ -661,7 +661,7 @@ 
 					{
 						if ($this->weekdays & $mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(' ', $repeat_days);
@@ -674,7 +674,7 @@ 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}+ {MO..SO}
 					$rrule['BYDAY'] = abs($this->monthly_byday_num);
 					$rrule['BYDAY'] .= ($this->monthly_byday_num < 0) ? '- ' : '+ ';
-					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] .= strtoupper(substr($this->time->format('l'), 0, 2));
 					$rrule['FREQ'] = $rrule['FREQ'].' '.$rrule['BYDAY'];
 					break;
 			}
@@ -694,7 +694,7 @@ 
 					{
 						if ($this->weekdays & $mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(',', $repeat_days);
@@ -705,8 +705,8 @@ 
 					break;
 
 				case self::MONTHLY_WDAY:	// weekday of the month: BDAY={1..5}{MO..SO}
-					$rrule['BYDAY'] = $this->monthly_byday_num .
-						strtoupper(substr($this->time->format('l'),0,2));
+					$rrule['BYDAY'] = $this->monthly_byday_num.
+						strtoupper(substr($this->time->format('l'), 0, 2));
 					break;
 			}
 			if ($this->interval > 1)
@@ -741,12 +741,12 @@ 
 	 *
 	 * @return calendar_rrule		false on error
 	 */
-	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
+	public static function event2rrule(array $event, $usertime = true, $to_tz = null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
+		if (!is_array($event) || !isset($event['tzid'])) return false;
 		if (!$to_tz) $to_tz = $event['tzid'];
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new Api\DateTime($event['start'], $timestamp_tz);
 
 		if (!isset(self::$tz_cache[$to_tz]))
 		{
@@ -759,7 +759,7 @@ 
 		
 		if ($event['recur_enddate'])
 		{
-			$enddate = is_a($event['recur_enddate'],'DateTime') ? clone $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? clone $event['recur_enddate'] : new Api\DateTime($event['recur_enddate'], $timestamp_tz);
 
 			// Check to see if switching timezones changes the date, we'll need to adjust for that
 			$enddate_event_timezone = clone $enddate;
@@ -767,22 +767,22 @@ 
 			$delta = (int)$enddate_event_timezone->format('z') - (int)$enddate->format('z');
 			$enddate->add("$delta days");
 
-			$end = is_a($event['end'],'DateTime') ? clone $event['end'] : new Api\DateTime($event['end'],$timestamp_tz);
+			$end = is_a($event['end'], 'DateTime') ? clone $event['end'] : new Api\DateTime($event['end'], $timestamp_tz);
 			$end->setTimezone($enddate->getTimezone());
-			$enddate->setTime($end->format('H'),$end->format('i'),0);
-			if($event['whole_day'])
+			$enddate->setTime($end->format('H'), $end->format('i'), 0);
+			if ($event['whole_day'])
 			{
-				$enddate->setTime(23,59,59);
+				$enddate->setTime(23, 59, 59);
 			}
 		}
 		if (is_array($event['recur_exception']))
 		{
-			foreach($event['recur_exception'] as $exception)
+			foreach ($event['recur_exception'] as $exception)
 			{
-				$exceptions[] = is_a($exception,'DateTime') ? $exception : new Api\DateTime($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new Api\DateTime($exception, $timestamp_tz);
 			}
 		}
-		return new calendar_rrule($time,$event['recur_type'],$event['recur_interval'],$enddate,$event['recur_data'],$exceptions);
+		return new calendar_rrule($time, $event['recur_type'], $event['recur_interval'], $enddate, $event['recur_data'], $exceptions);
 	}
 
 	/**
@@ -800,7 +800,7 @@ 
 		$exceptions = array();
 
 		list($type, $sub, $conditions) = explode(' (', $rrule);
-		if(!$conditions)
+		if (!$conditions)
 		{
 			$conditions = $sub;
 		}
@@ -810,10 +810,10 @@ 
 		}
 		$conditions = explode(', ', substr($conditions, 0, -1));
 
-		foreach(static::$types as $id => $type_name)
+		foreach (static::$types as $id => $type_name)
 		{
 			$str = lang($type_name);
-			if($str == $type)
+			if ($str == $type)
 			{
 				$type_id = $id;
 				break;
@@ -821,25 +821,25 @@ 
 		}
 
 		// Rejoin some extra splits for conditions with multiple values
-		foreach($conditions as $condition_index => $condition)
+		foreach ($conditions as $condition_index => $condition)
 		{
-			if(((int)$condition || strpos($condition, lang('last')) === 0) &&
-					substr_compare( $condition, lang('day'), -strlen( lang('day') ) ) === 0)
+			if (((int)$condition || strpos($condition, lang('last')) === 0) &&
+					substr_compare($condition, lang('day'), -strlen(lang('day'))) === 0)
 			{
 				$time->setDate($time->format('Y'), $time->format('m'), (int)($condition) ? (int)$condition : $time->format('t'));
 				unset($conditions[$condition_index]);
 				continue;
 			}
-			if(!strpos($condition, ':') && strpos($conditions[$condition_index-1], ':'))
+			if (!strpos($condition, ':') && strpos($conditions[$condition_index - 1], ':'))
 			{
-				$conditions[$condition_index-1] .= ', ' . $condition;
+				$conditions[$condition_index - 1] .= ', '.$condition;
 				unset($conditions[$condition_index]);
 			}
 		}
-		foreach($conditions as $condition_index => $condition)
+		foreach ($conditions as $condition_index => $condition)
 		{
 			list($condition_name, $value) = explode(': ', $condition);
-			if($condition_name == lang('days repeated'))
+			if ($condition_name == lang('days repeated'))
 			{
 				foreach (self::$days as $mask => $label)
 				{
@@ -848,7 +848,7 @@ 
 						$weekdays += $mask;
 					}
 				}
-				if(stripos($condition, lang('all')) !== false)
+				if (stripos($condition, lang('all')) !== false)
 				{
 					$weekdays = self::ALLDAYS;
 				}
@@ -864,7 +864,7 @@ 
 			}
 		}
 		
-		return new calendar_rrule($time,$type_id,$interval,$enddate,$weekdays,$exceptions);
+		return new calendar_rrule($time, $type_id, $interval, $enddate, $weekdays, $exceptions);
 	}
 	/**
 	 * Get recurrence data (keys 'recur_*') to merge into an event
@@ -889,7 +889,7 @@ 
 	 * @param DateTime/string		starttime of the event (in servertime)
 	 * @param string $to_tz			new timezone
 	 */
-	public static function rrule2tz(array &$event,$starttime,$to_tz)
+	public static function rrule2tz(array &$event, $starttime, $to_tz)
 	{
 		// We assume that the difference between timezones can result
 		// in a maximum of one day
@@ -910,7 +910,7 @@ 
 			self::$tz_cache[$to_tz] = calendar_timezones::DateTimeZone($to_tz);
 		}
 
-		$time = is_a($starttime,'DateTime') ?
+		$time = is_a($starttime, 'DateTime') ?
 			$starttime : new Api\DateTime($starttime, Api\DateTime::$server_timezone);
 		$time->setTimezone(self::$tz_cache[$event['tzid']]);
 		$remote = clone $time;
@@ -928,11 +928,11 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask&128) $mask = $mask - 127; // overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask&1) $mask = $mask + 128; // underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -943,7 +943,7 @@ 
 
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
 {
-	ini_set('display_errors',1);
+	ini_set('display_errors', 1);
 	error_reporting(E_ALL & ~E_NOTICE);
 	function lang($str) { return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
@@ -951,7 +951,7 @@ 
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new Api\DateTime('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new Api\DateTime('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -960,29 +960,29 @@ 
 		$_REQUEST['user-tz'] = 'Europe/Berlin';
 	}
 	echo "<html>\n<head>\n\t<title>Test calendar_rrule class</title>\n</head>\n<body>\n<form method='GET'>\n";
-	echo "<p>Date+Time: ".Api\Html::input('time',$_REQUEST['time']).
-		Api\Html::select('tz',$_REQUEST['tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>Type: ".Api\Html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".Api\Html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".Api\Html::input('time', $_REQUEST['time']).
+		Api\Html::select('tz', $_REQUEST['tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>Type: ".Api\Html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".Api\Html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".Api\Html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".Api\Html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".Api\Html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".Api\Html::select('user-tz',$_REQUEST['user-tz'],Api\DateTime::getTimezones())."</p>\n";
-	echo "<p>".Api\Html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".Api\Html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".Api\Html::select('user-tz', $_REQUEST['user-tz'], Api\DateTime::getTimezones())."</p>\n";
+	echo "<p>".Api\Html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	$time = new Api\DateTime($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'], $tz);
+	$weekdays = 0; foreach ((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
+	if ($_REQUEST['exceptions']) foreach (preg_split("/[,\r\n]+ ?/", $_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
 
-	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
+	$rrule = new calendar_rrule($time, $_REQUEST['type'], $_REQUEST['interval'], $enddate, $weekdays, $exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";
-	foreach($rrule as $rtime)
+	foreach ($rrule as $rtime)
 	{
 		$rtime->setTimezone(Api\DateTime::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";

Braces +58 added lines, -14 removed lines

@@ -351,7 +351,10 @@ 
 				$duration = 366*24*3600;
 				break;
 		}
-		if ($interval > 1) $duration *= $interval;
+		if ($interval > 1)
+		{
+			$duration *= $interval;
+		}
 
 		return $duration;
 	}
@@ -494,7 +497,10 @@ 
 		{
 			return clone $this->time;
 		}
-		if (isset($this->current)) $backup = $this->current;
+		if (isset($this->current))
+		{
+			$backup = $this->current;
+		}
 		$this->rewind();
 
 		while(--$count > 0)
@@ -502,7 +508,10 @@ 
 			$this->next_no_exception();
 		}
 		$ret = clone $this->current;
-		if ($backup) $this->current = $backup;
+		if ($backup)
+		{
+			$this->current = $backup;
+		}
 		return $ret;
 	}
 
@@ -649,7 +658,11 @@ 
 		$repeat_days = array();
 		$rrule = array();
 
-		if ($this->type == self::NONE) return false;	// no recuring event
+		if ($this->type == self::NONE)
+		{
+			return false;
+		}
+		// no recuring event
 
 		if ($version == '1.0')
 		{
@@ -743,8 +756,14 @@ 
 	 */
 	public static function event2rrule(array $event,$usertime=true,$to_tz=null)
 	{
-		if (!is_array($event)  || !isset($event['tzid'])) return false;
-		if (!$to_tz) $to_tz = $event['tzid'];
+		if (!is_array($event)  || !isset($event['tzid']))
+		{
+			return false;
+		}
+		if (!$to_tz)
+		{
+			$to_tz = $event['tzid'];
+		}
 		$timestamp_tz = $usertime ? Api\DateTime::$user_timezone : Api\DateTime::$server_timezone;
 		$time = is_a($event['start'],'DateTime') ? $event['start'] : new Api\DateTime($event['start'],$timestamp_tz);
 
@@ -899,7 +918,10 @@ 
 			$event['recur_type'] == self::NONE ||
 			empty($event['recur_data']) || $event['recur_data'] == self::ALLDAYS ||
 			empty($event['tzid']) || empty($to_tz) ||
-			$event['tzid'] == $to_tz) return;
+			$event['tzid'] == $to_tz)
+		{
+			return;
+		}
 
 		if (!isset(self::$tz_cache[$event['tzid']]))
 		{
@@ -928,11 +950,19 @@ 
 					if ($delta == 1 || $delta == -6)
 					{
 						$mask = $mask << 1;
-						if ($mask & 128) $mask = $mask - 127; // overflow
+						if ($mask & 128)
+						{
+							$mask = $mask - 127;
+						}
+						// overflow
 					}
 					else
 					{
-						if ($mask & 1) $mask = $mask + 128; // underflow
+						if ($mask & 1)
+						{
+							$mask = $mask + 128;
+						}
+						// underflow
 						$mask = $mask >> 1;
 					}
 					$event['recur_data'] = $mask;
@@ -941,11 +971,16 @@ 
 	}
 }
 
-if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)
+{
+	// some tests
 {
 	ini_set('display_errors',1);
+}
 	error_reporting(E_ALL & ~E_NOTICE);
-	function lang($str) { return $str; }
+	function lang($str)
+	{
+return $str; }
 	$GLOBALS['egw_info']['user']['preferences']['common']['tz'] = $_REQUEST['user-tz'] ? $_REQUEST['user-tz'] : 'Europe/Berlin';
 	require_once('../../api/src/autoload.php');
 
@@ -976,9 +1011,18 @@ 
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
 	$time = new Api\DateTime($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
-	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask) { $weekdays |= $mask; }
-	if ($_REQUEST['exceptions']) foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception); }
+	if ($_REQUEST['enddate'])
+	{
+		$enddate = new Api\DateTime($_REQUEST['enddate'],$tz);
+	}
+	$weekdays = 0; foreach((array)$_REQUEST['weekdays'] as $mask)
+	{
+$weekdays |= $mask; }
+	if ($_REQUEST['exceptions'])
+	{
+		foreach(preg_split("/[,\r\n]+ ?/",$_REQUEST['exceptions']) as $exception) { $exceptions[] = new Api\DateTime($exception);
+	}
+	}
 
 	$rrule = new calendar_rrule($time,$_REQUEST['type'],$_REQUEST['interval'],$enddate,$weekdays,$exceptions);
 	echo "<h3>".$time->format('l').', '.$time.' ('.$tz->getName().') '.$rrule."</h3>\n";

calendar/inc/class.calendar_wizard_import_csv.inc.php

Braces +2 added lines, -1 removed lines

@@ -33,7 +33,8 @@
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('calendar');
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Indentation +1 added lines, -1 removed lines

@@ -15,7 +15,7 @@
 class calendar_wizard_import_csv extends importexport_wizard_basic_import_csv
 {
 
-    /**
+	/**
 	 * constructor
 	 */
 	function __construct()

Spacing +3 added lines, -3 removed lines

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

calendar/inc/class.calendar_export_csv.inc.php

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

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

Spacing +39 added lines, -39 removed lines

@@ -29,15 +29,15 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
 		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach ($options['mapping'] + (array)$_definition->filter as $key => $label) {
+			if ($key[0] == '#') $cfs[] = substr($key, 1);
 		}
 
 		$query = array(
@@ -45,7 +45,7 @@ 
 			'num_rows'	=> -1,
 			'csv_export'	=> true
 		);
-		switch($options['selection'])
+		switch ($options['selection'])
 		{
 			case 'criteria':
 				$query = array(
@@ -55,33 +55,33 @@ 
 					'users'         => $options['criteria']['owner'],
 					'cfs'		=> $cfs // Otherwise we shouldn't get any custom fields
 				);
-				if($options['criteria']['start'])
+				if ($options['criteria']['start'])
 				{
 					$query['start'] = $options['criteria']['start'];
 				}
-				if($options['criteria']['end'])
+				if ($options['criteria']['end'])
 				{
-					$query['end'] = strtotime('+1 day',$options['criteria']['end'])-1;
+					$query['end'] = strtotime('+1 day', $options['criteria']['end']) - 1;
 				}
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
-				$events =& $this->bo->search($query);
+				$events = & $this->bo->search($query);
 				break;
 			case 'search_results':
 				$states = $this->bo->cal_prefs['saved_states'];
 				$query = Api\Cache::getSession('calendar', 'calendar_list');
-				$query['num_rows'] = -1;        // all
-				$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
+				$query['num_rows'] = -1; // all
+				$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
 				$query['start'] = 0;
 				$query['cfs'] = $cfs;
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				if (Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
 				{
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
 				$ui = new calendar_uilist();
-				if($states['view'] == 'listview')
+				if ($states['view'] == 'listview')
 				{
 					$ui->get_rows($query, $events, $unused);
 				}
@@ -98,35 +98,35 @@ 
 				$filter = $_definition->filter;
 
 				// Handle ranges
-				foreach($filter as $field => $value)
+				foreach ($filter as $field => $value)
 				{
-					if($field == 'filter' && $value)
+					if ($field == 'filter' && $value)
 					{
 						$query['filter'] = $value;
 						continue;
 					}
-					if(!is_array($value) || (!$value['from'] && !$value['to']))
+					if (!is_array($value) || (!$value['from'] && !$value['to']))
 					{
 						$query['query']["cal_$field"] = $value;
 						continue;
 					}
 
 					// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-					if($value['from']) $query['sql_filter'][] = "cal_$field >= " . (int)$value['from'];
-					if($value['to']) $query['sql_filter'][] = "cal_$field <= " . (int)$value['to'];
+					if ($value['from']) $query['sql_filter'][] = "cal_$field >= ".(int)$value['from'];
+					if ($value['to']) $query['sql_filter'][] = "cal_$field <= ".(int)$value['to'];
 
 				}
-				if($query['sql_filter'] && is_array($query['sql_filter']))
+				if ($query['sql_filter'] && is_array($query['sql_filter']))
 				{
 					// Set as an extra parameter
-					$sql_filter = implode(' AND ',$query['sql_filter']);
+					$sql_filter = implode(' AND ', $query['sql_filter']);
 				}
 
 			case 'all':
 				$events = $this->bo->search($query + array(
 					'offset' => 0,
 					'order' => 'cal_start',
-				),$sql_filter);
+				), $sql_filter);
 				break;
 		}
 
@@ -145,11 +145,11 @@ 
 			// 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'])
 			{
-				if(is_array($event['participants']))
+				if (is_array($event['participants']))
 				{
-					$event['participants'] = implode(", ",$this->bo->participants($event,true));
+					$event['participants'] = implode(", ", $this->bo->participants($event, true));
 				}
 				else
 				{
@@ -160,23 +160,23 @@ 
 			if (is_array($event))
 			{
 				$record->set_record($event);
-				if($options['mapping']['recurrence'])
+				if ($options['mapping']['recurrence'])
 				{
 					$rrule = calendar_rrule::event2rrule($event);
 					$record->recurrence = $rrule->__toString();
 				}
 
 				// Standard stuff
-				if($options['convert'])
+				if ($options['convert'])
 				{
 					importexport_export_csv::convert($record, $convert_fields, 'calendar', $this->selects);
 				}
 				else
 				{
 					// Implode arrays, so they don't say 'Array'
-					foreach($record->get_record_array() as $key => $value)
+					foreach ($record->get_record_array() as $key => $value)
 					{
-						if(is_array($value)) $record->$key = implode(',', $value);
+						if (is_array($value)) $record->$key = implode(',', $value);
 					}
 	 			}
 				$export_object->export_record($record);
@@ -238,7 +238,7 @@ 
 		$states = $this->bo->cal_prefs['saved_states'];
 		$list = Api\Cache::getSession('calendar', 'calendar_list');
 
-		$start= new Api\DateTime($list['startdate']);
+		$start = new Api\DateTime($list['startdate']);
 		$end = new Api\DateTime($list['enddate']);
 
 		if ($states['view'] == 'listview')
@@ -247,24 +247,24 @@ 
 
 			// Use UI to get dates
 			$ui = new calendar_uilist();
-			$list['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$ui->get_rows($list,$rows,$readonlys);
+			$list['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$ui->get_rows($list, $rows, $readonlys);
 			$start = $ui->first ? $ui->first : new Api\DateTime($ui->date);
 			$end = $ui->last;
 
 			// Special handling
-			if($list['filter'] == 'all') $start = $end = null;
-			if($list['filter'] == 'before')
+			if ($list['filter'] == 'all') $start = $end = null;
+			if ($list['filter'] == 'before')
 			{
 				$end = $start;
 				$start = null;
 			}
 			$ui = null;
 		}
-		else if(!$end)
+		else if (!$end)
 		{
-			$end = '+1 ' . $states['view'];
-			$end = strtotime($end, $start->format('ts'))-1;
+			$end = '+1 '.$states['view'];
+			$end = strtotime($end, $start->format('ts')) - 1;
 		}
 		$prefs = unserialize($GLOBALS['egw_info']['user']['preferences']['importexport'][$definition->definition_id]);
 		$data = array(
@@ -330,17 +330,17 @@ 
 		);
 		$filters = array_reverse($filters, true);
 
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
 			// Can't filter on a custom field
-			if(strpos($field_name, '#') === 0)
+			if (strpos($field_name, '#') === 0)
 			{
 				unset($filters[$field_name]);
 				continue;
 			}
 
 			// Pass on select options
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 
 	}

Braces +38 added lines, -12 removed lines

@@ -16,9 +16,11 @@ 
 /**
  * export CSV plugin of calendar
  */
-class calendar_export_csv implements importexport_iface_export_plugin {
+class calendar_export_csv implements importexport_iface_export_plugin
+{
 
-	public function __construct() {
+	public function __construct()
+	{
 		Api\Translation::add_app('calendar');
 		$this->bo = new calendar_bo();
 		$this->get_selects();
@@ -29,15 +31,23 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$limit_exception = Api\Storage\Merge::is_export_limit_excepted();
-		if (!$limit_exception) $export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		if (!$limit_exception)
+		{
+			$export_limit = Api\Storage\Merge::getExportLimit('calendar');
+		}
 		// Custom fields need to be specifically requested
 		$cfs = array();
-		foreach($options['mapping'] + (array)$_definition->filter as $key => $label) {
-			if($key[0] == '#') $cfs[] = substr($key,1);
+		foreach($options['mapping'] + (array)$_definition->filter as $key => $label)
+		{
+			if($key[0] == '#')
+			{
+				$cfs[] = substr($key,1);
+			}
 		}
 
 		$query = array(
@@ -63,7 +73,8 @@ 
 				{
 					$query['end'] = strtotime('+1 day',$options['criteria']['end'])-1;
 				}
-				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception) {
+				if(Api\Storage\Merge::hasExportLimit($export_limit) && !$limit_exception)
+				{
 					$query['offset'] = 0;
 					$query['num_rows'] = (int)$export_limit; // ! int of 'no' is 0
 				}
@@ -112,8 +123,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']))
@@ -176,7 +193,10 @@ 
 					// Implode arrays, so they don't say 'Array'
 					foreach($record->get_record_array() as $key => $value)
 					{
-						if(is_array($value)) $record->$key = implode(',', $value);
+						if(is_array($value))
+						{
+							$record->$key = implode(',', $value);
+						}
 					}
 	 			}
 				$export_object->export_record($record);
@@ -253,7 +273,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;
@@ -340,7 +363,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];
+			}
 		}
 
 	}

Doc Comments +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -228,7 +228,7 @@ 
 	 *
 	 * @param $definition Specific definition
 	 *
-	 * @return array (
+	 * @return boolean (
 	 * 		name 		=> string,
 	 * 		content		=> array,
 	 * 		sel_options	=> array,

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

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

@@ -25,7 +25,7 @@
 	 * Construct the portlet
 	 * Calendar complicates things...
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		$context['appname'] = 'calendar';
 		// Reload is NULL when changing properties via AJAX

Spacing +40 added lines, -41 removed lines

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

api/src/Framework/IncludeMgr.php

Braces +16 added lines, -4 removed lines

@@ -80,7 +80,10 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file,'?') !== false)
+		{
+			list($file) = explode('?',$file);
+		}
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -326,12 +329,15 @@ 
 			}
 		}
 
-		if (self::$DEBUG_MODE) // DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
+		if (self::$DEBUG_MODE)
+		{
+			// DEBUG_MODE is currently ALWAYS true. Comment this code out if you don't want error messages.
 		{
 			//error_log(__METHOD__."($package,$file,$app) $path NOT found".($this->debug_processing_file ? " while processing file '{$this->debug_processing_file}'." : "!").' '.function_backtrace());
 		}
 
 		return false;
+		}
 	}
 
 	/**
@@ -377,7 +383,10 @@ 
 	 */
 	public function include_files(array $files, $clear_files=false)
 	{
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 
 		foreach ($files as $file)
 		{
@@ -394,7 +403,10 @@ 
 	public function get_included_files($clear_files=false)
 	{
 		$ret = array_keys($this->included_files);
-		if ($clear_files) $this->included_files = array();
+		if ($clear_files)
+		{
+			$this->included_files = array();
+		}
 		return $ret;
 	}
 

Spacing +12 added lines, -12 removed lines

@@ -80,7 +80,7 @@ 
 	private function parse_file($file)
 	{
 		// file is from url and can contain query-params, eg. /phpgwapi/inc/jscalendar-setup.php?dateformat=d.m.Y&lang=de
-		if (strpos($file,'?') !== false) list($file) = explode('?',$file);
+		if (strpos($file, '?') !== false) list($file) = explode('?', $file);
 
 		// Mark the file as parsed
 		$this->parsed_files[$file] = true;
@@ -256,7 +256,7 @@ 
 	 * @param array $modules pathes to include
 	 * @param boolean $append =true false: prepend modules before already included ones, keeping their order
 	 */
-	private function include_module(array $modules, $append=true)
+	private function include_module(array $modules, $append = true)
 	{
 		if (self::$DEBUG_MODE)
 		{
@@ -295,17 +295,17 @@ 
 	 * @returns the correct path on the server if the file is found or false, if the
 	 *  file is not found or no further processing is needed.
 	 */
-	private function translate_params($package, $file=null, $app='api')
+	private function translate_params($package, $file = null, $app = 'api')
 	{
 		if ($package[0] == '/' && is_readable(EGW_SERVER_ROOT.parse_url($path = $package, PHP_URL_PATH)) ||
 			// fix old /phpgwapi/js/ path by replacing it with /api/js/
 			substr($package, 0, 13) == '/phpgwapi/js/' && is_readable(EGW_SERVER_ROOT.parse_url($path = str_replace('/phpgwapi/js/', '/api/js/', $package), PHP_URL_PATH)) ||
 			$package[0] == '/' && is_readable(EGW_SERVER_ROOT.($path = $package)) ||
-			$package == '.' && is_readable(EGW_SERVER_ROOT.($path="/$app/js/$file.js")) ||
-			is_readable(EGW_SERVER_ROOT.($path="/$app/js/$package/$file.js")) ||
+			$package == '.' && is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$file.js")) ||
+			is_readable(EGW_SERVER_ROOT.($path = "/$app/js/$package/$file.js")) ||
 			// fix not found by using app='api'
-			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path="/api/js/$package/$file.js")) ||
-			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path="/phpgwapi/js/$package/$file.js")))
+			$app != 'api' && is_readable(EGW_SERVER_ROOT.($path = "/api/js/$package/$file.js")) ||
+			$app != 'phpgwapi' && is_readable(EGW_SERVER_ROOT.($path = "/phpgwapi/js/$package/$file.js")))
 		{
 			// normalise /./ to /
 			$path = str_replace('/./', '/', $path);
@@ -316,7 +316,7 @@ 
 			// 	adding the ctime to all js files...
 			if (is_array($file))
 			{
-				foreach($file as $name => $val)
+				foreach ($file as $name => $val)
 				{
 					$args .= (empty($args) ? '?' : '&').$name.'='.urlencode($val);
 				}
@@ -359,7 +359,7 @@ 
 	 * @param string $app ='phpgwapi' application directory to search - default = phpgwapi
 	 * @param boolean $append =true true append file, false prepend (add as first) file used eg. for template itself
 	 */
-	public function include_js_file($package, $file = null, $app = 'phpgwapi', $append=true)
+	public function include_js_file($package, $file = null, $app = 'phpgwapi', $append = true)
 	{
 		// Translate the given parameters into a valid path - false is returned
 		// if the file is not found or the file is already included/has already
@@ -387,7 +387,7 @@ 
 	 * @param array $files
 	 * @param boolean $clear_files =false if true clear list of files, before including given ones
 	 */
-	public function include_files(array $files, $clear_files=false)
+	public function include_files(array $files, $clear_files = false)
 	{
 		if ($clear_files) $this->included_files = array();
 
@@ -403,7 +403,7 @@ 
 	 * @param boolean $clear_files =false if true clear list of files after returning them
 	 * @return array
 	 */
-	public function get_included_files($clear_files=false)
+	public function get_included_files($clear_files = false)
 	{
 		$ret = array_keys($this->included_files);
 		if ($clear_files) $this->included_files = array();
@@ -436,7 +436,7 @@ 
 
 	$paths = !empty($_GET['path']) ? (array)$_GET['path'] : (array)'/stylite/js/filemanager/filemanager.js';
 
-	foreach($paths as $path)
+	foreach ($paths as $path)
 	{
 		echo "\t<h1>".htmlspecialchars($path)."</h1>\n";
 		$mgr->include_js_file($path);

api/src/Framework/About.php

Braces +53 added lines, -21 removed lines

@@ -168,7 +168,11 @@ 
 				}
 			}
 		}
-		if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null;	// app got eg. removed in filesystem
+		if (!isset($setup_info[$app]) || !is_array($setup_info[$app]))
+		{
+			return null;
+		}
+		// app got eg. removed in filesystem
 
 		$app_info  = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
 
@@ -191,7 +195,10 @@ 
 		{
 			$ret['author'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'author');
 			$ret['maintainer'] = $this->_getHtmlPersonalInfo($setup_info[$app], 'maintainer');
-			if ($app_info['version'] != $setup_info[$app]['version']) $ret['version'] .= ' ('.$setup_info[$app]['version'].')';
+			if ($app_info['version'] != $setup_info[$app]['version'])
+			{
+				$ret['version'] .= ' ('.$setup_info[$app]['version'].')';
+			}
 			$ret['license'] = $setup_info[$app]['license'];
 			$ret['description'] = $setup_info[$app]['description'];
 			$ret['note'] = $setup_info[$app]['note'];
@@ -216,39 +223,54 @@ 
 	{
 		$authors = array();
 			// get the author(s)
-			if ($setup_info[$f]) {
+			if ($setup_info[$f])
+			{
 				// author is set
-				if (!is_array($setup_info[$f])) {
+				if (!is_array($setup_info[$f]))
+				{
 					// author is no array
 					$authors[0]['name'] = $setup_info[$f];
-					if ($setup_info[$f.'_email']) {
+					if ($setup_info[$f.'_email'])
+					{
 						$authors[0]['email'] = $setup_info[$f.'_email'];
 					}
-					if ($setup_info[$f.'_url']) {
+					if ($setup_info[$f.'_url'])
+					{
 						$authors[0]['url'] = $setup_info[$f.'_url'];
 					}
 
-				} else {
+				}
+				else
+				{
 					// author is array
-					if ($setup_info[$f]['name']) {
+					if ($setup_info[$f]['name'])
+					{
 						// only one author
 						$authors[0]['name'] = $setup_info[$f]['name'];
-						if ($setup_info[$f]['email']) {
+						if ($setup_info[$f]['email'])
+						{
 							$authors[0]['email'] = $setup_info[$f]['email'];
 						}
-						if ($setup_info[$f]['url']) {
+						if ($setup_info[$f]['url'])
+						{
 							$authors[0]['url'] = $setup_info[$f]['url'];
 						}
-					} else {
+					}
+					else
+					{
 						// may be more authors
-						foreach (array_keys($setup_info[$f]) as $number) {
-							if ($setup_info[$f][$number]['name']) {
+						foreach (array_keys($setup_info[$f]) as $number)
+						{
+							if ($setup_info[$f][$number]['name'])
+							{
 									$authors[$number]['name'] = $setup_info[$f][$number]['name'];
 							}
-							if ($setup_info[$f][$number]['email']) {
+							if ($setup_info[$f][$number]['email'])
+							{
 									$authors[$number]['email'] = $setup_info[$f][$number]['email'];
 							}
-							if ($setup_info[$f][$number]['url']) {
+							if ($setup_info[$f][$number]['url'])
+							{
 									$authors[$number]['url'] = $setup_info[$f][$number]['url'];
 							}
 						}
@@ -258,15 +280,19 @@ 
 
 		// html format authors
 		$s = '';
-		foreach ($authors as $author) {
-			if ($s != '') {
+		foreach ($authors as $author)
+		{
+			if ($s != '')
+			{
 					$s .= '<br />';
 			}
 			$s .= lang('name').': '.$author['name'];
-			if ($author['email']) {
+			if ($author['email'])
+			{
 					$s .= '<br />'.lang('email').': <a href="mailto:'.$author['email'].'">'.$author['email'].'</a>';
 			}
-			if ($author['url']) {
+			if ($author['url'])
+			{
 					$s .= '<br />'.lang('url').': <a href="'.$author['url'].'" target="_blank">'.$author['url'].'</a>';
 			}
 		}
@@ -300,8 +326,14 @@ 
 
 		if (isset(self::$knownLicenses[strtoupper($name)]))
 		{
-			if (empty($url)) $url = self::$knownLicenses[$name=strtoupper($name)][0];
-			if (empty($title)) $title = self::$knownLicenses[$name=strtoupper($name)][1];
+			if (empty($url))
+			{
+				$url = self::$knownLicenses[$name=strtoupper($name)][0];
+			}
+			if (empty($title))
+			{
+				$title = self::$knownLicenses[$name=strtoupper($name)][1];
+			}
 		}
 
 		return array(

Spacing +18 added lines, -18 removed lines

@@ -69,7 +69,7 @@ 
 	 */
 	function index()
 	{
-		$text_content = str_replace('GPLLINK',self::$knownLicenses['GPL'][0],'
+		$text_content = str_replace('GPLLINK', self::$knownLicenses['GPL'][0], '
 <p><b>EGroupware is an enterprise ready multilingual groupware solution</b> for your team.
 It enables you to manage and share your e-mail, contacts, appointments, tasks
 and files within your organisation.</p>
@@ -95,10 +95,10 @@ 
 		{
 			return strcasecmp($a['title'], $b['title']);
 		});
-		array_unshift($apps, false);	// first empty row for eTemplate
+		array_unshift($apps, false); // first empty row for eTemplate
 
 		// putting templates below apps
-		foreach($GLOBALS['egw']->framework->list_templates(true) as $info)
+		foreach ($GLOBALS['egw']->framework->list_templates(true) as $info)
 		{
 			$apps[] = $this->_getParsedTemplateInfo($info);
 		}
@@ -130,7 +130,7 @@ 
 	function _getParsedTemplateInfo($info)
 	{
 		// define the return array
-		$info['image'] = file_exists(EGW_SERVER_ROOT.'/'.$info['icon']) ? $GLOBALS['egw_info']['server']['webserver_url'].'/'.$info['icon'] : Api\Image::find('thisdoesnotexist',array('navbar','nonav'));
+		$info['image'] = file_exists(EGW_SERVER_ROOT.'/'.$info['icon']) ? $GLOBALS['egw_info']['server']['webserver_url'].'/'.$info['icon'] : Api\Image::find('thisdoesnotexist', array('navbar', 'nonav'));
 		$info['author'] = $this->_getHtmlPersonalInfo($info, 'author');
 		$info['maintainer'] = $this->_getHtmlPersonalInfo($info, 'maintainer');
 
@@ -151,10 +151,10 @@ 
 	function _getParsedAppInfo($app)
 	{
 		// we read all setup files once, as no every app has it's own file
-		static $setup_info=null;
+		static $setup_info = null;
 		if (is_null($setup_info))
 		{
-			foreach(array_keys($GLOBALS['egw_info']['apps']) as $_app)
+			foreach (array_keys($GLOBALS['egw_info']['apps']) as $_app)
 			{
 				if (file_exists($file = EGW_INCLUDE_ROOT.'/'.$_app.'/setup/setup.inc.php'))
 				{
@@ -162,14 +162,14 @@ 
 				}
 			}
 		}
-		if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null;	// app got eg. removed in filesystem
+		if (!isset($setup_info[$app]) || !is_array($setup_info[$app])) return null; // app got eg. removed in filesystem
 
-		$app_info  = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
+		$app_info = array_merge($GLOBALS['egw_info']['apps'][$app], $setup_info[$app]);
 
 		// define the return array
 		$icon_app = isset($app_info['icon_app']) ? $app_info['icon_app'] : $app;
 		$icon = isset($app_info['icon']) ? $app_info['icon'] : 'navbar';
-		$ret = $app_info+array(
+		$ret = $app_info + array(
 			'app'           => $app,
 			'title'         => lang(!empty($app_info['title']) ? $app_info['title'] : $app),
 			'image'			=> Api\Image::find($icon_app, $icon) ? $icon_app.'/'.$app : 'api/nonav',
@@ -268,12 +268,12 @@ 
 	}
 
 	static public $knownLicenses = array(
-		'GPL'	=> array('http://opensource.org/licenses/gpl-license.php','GNU General Public License version 2.0 or (at your option) any later version'),
-		'GPL2'	=> array('http://opensource.org/licenses/gpl-2.0.php','GNU General Public License version 2.0'),
-		'GPL3'	=> array('http://opensource.org/licenses/gpl-3.0.php','GNU General Public License version 3.0'),
-		'LGPL'	=> array('http://opensource.org/licenses/lgpl-2.1.php','GNU Lesser General Public License, version 2.1'),
-		'LGPL3'	=> array('http://opensource.org/licenses/lgpl-3.0.php','GNU Lesser General Public License, version 3.0'),
-		'PHP'   => array('http://opensource.org/licenses/php.php','PHP License'),
+		'GPL'	=> array('http://opensource.org/licenses/gpl-license.php', 'GNU General Public License version 2.0 or (at your option) any later version'),
+		'GPL2'	=> array('http://opensource.org/licenses/gpl-2.0.php', 'GNU General Public License version 2.0'),
+		'GPL3'	=> array('http://opensource.org/licenses/gpl-3.0.php', 'GNU General Public License version 3.0'),
+		'LGPL'	=> array('http://opensource.org/licenses/lgpl-2.1.php', 'GNU Lesser General Public License, version 2.1'),
+		'LGPL3'	=> array('http://opensource.org/licenses/lgpl-3.0.php', 'GNU Lesser General Public License, version 3.0'),
+		'PHP'   => array('http://opensource.org/licenses/php.php', 'PHP License'),
 	);
 
 	/**
@@ -294,14 +294,14 @@ 
 
 		if (isset(self::$knownLicenses[strtoupper($name)]))
 		{
-			if (empty($url)) $url = self::$knownLicenses[$name=strtoupper($name)][0];
-			if (empty($title)) $title = self::$knownLicenses[$name=strtoupper($name)][1];
+			if (empty($url)) $url = self::$knownLicenses[$name = strtoupper($name)][0];
+			if (empty($title)) $title = self::$knownLicenses[$name = strtoupper($name)][1];
 		}
 
 		return array(
 			'license' => $name ? $name : 'none',
 			'license_url' => $url,
 			'license_title' => $title,
-		)+$info;
+		) + $info;
 	}
 }