EGroupware / egroupware

resources/inc/class.resources_ui.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1053,7 +1053,7 @@
 	 * @param int &$success number of succeded actions
 	 * @param int &$failed number of failed actions (not enought permissions)
 	 * @param string &$action_msg translated verb for the actions, to be used in a message like %1 timesheets 'deleted'
-	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
+	 * @param string $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
 	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)

Spacing +118 added lines, -119 removed lines

@@ -31,8 +31,8 @@ 
 	function __construct()
 	{
 // 		print_r($GLOBALS['egw_info']); die();
-		$this->tmpl	= new etemplate_new('resources.show');
-		$this->bo	= new resources_bo();
+		$this->tmpl = new etemplate_new('resources.show');
+		$this->bo = new resources_bo();
 // 		$this->calui	= CreateObject('resources.ui_calviews');
 	}
 
@@ -43,36 +43,36 @@ 
 	 * @param array $content content from eTemplate callback
 	 *
 	 */
-	function index($content='')
+	function index($content = '')
 	{
 		if (is_array($content))
 		{
 			$sessiondata = $content['nm'];
 			unset($sessiondata['rows']);
-			$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$sessiondata);
+			$GLOBALS['egw']->session->appsession('session_data', 'resources_index_nm', $sessiondata);
 
 			if (isset($content['btn_delete_selected']))
 			{
-				foreach($content['nm']['rows'] as $row)
+				foreach ($content['nm']['rows'] as $row)
 				{
-					if($res_id = $row['checkbox'][0])
+					if ($res_id = $row['checkbox'][0])
 					{
-						$msg .= '<p>'. $this->bo->delete($res_id). '</p><br>';
+						$msg .= '<p>'.$this->bo->delete($res_id).'</p><br>';
 					}
 				}
 				return $this->index($msg);
 			}
-			foreach($content['nm']['rows'] as $row)
+			foreach ($content['nm']['rows'] as $row)
 			{
-				if(isset($row['delete']))
+				if (isset($row['delete']))
 				{
-					$res_id = array_search('pressed',$row['delete']);
+					$res_id = array_search('pressed', $row['delete']);
 					return $this->index($this->bo->delete($res_id));
 				}
-				if(isset($row['view_acc']))
+				if (isset($row['view_acc']))
 				{
-					$sessiondata['filter2'] = array_search('pressed',$row['view_acc']);
-					$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$sessiondata);
+					$sessiondata['filter2'] = array_search('pressed', $row['view_acc']);
+					$GLOBALS['egw']->session->appsession('session_data', 'resources_index_nm', $sessiondata);
 					return $this->index();
 				}
 			}
@@ -84,18 +84,18 @@ 
 				}
 				else
 				{
-					if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-						$success,$failed,$action_msg,'resources_index_nm',$msg))
+					if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+						$success, $failed, $action_msg, 'resources_index_nm', $msg))
 					{
-						$msg .= lang('%1 resource(s) %2',$success,$action_msg);
+						$msg .= lang('%1 resource(s) %2', $success, $action_msg);
 					}
-					elseif(empty($msg))
+					elseif (empty($msg))
 					{
-						$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+						$msg .= lang('%1 resource(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 					}
 					else
 					{
-						$msg .= lang('%1 resource(s) %2, %3 failed',$success,$action_msg,$failed);
+						$msg .= lang('%1 resource(s) %2, %3 failed', $success, $action_msg, $failed);
 					}
 				}
 			}
@@ -106,74 +106,74 @@ 
 		$content['msg'] = $msg ? $msg : $_GET['msg'];
 
 		$content['nm']['header_row']	= 'resources.show.nm_right';
-		$content['nm']['get_rows']		= 'resources.resources_bo.get_rows';
+		$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
 		$content['nm']['no_filter'] 	= False;
-		$content['nm']['filter_label']	= lang('Category');
-		$content['nm']['filter2_label']	= 'Display';
+		$content['nm']['filter_label'] = lang('Category');
+		$content['nm']['filter2_label'] = 'Display';
 		$content['nm']['filter_no_lang'] = true;
 		$content['nm']['no_cat']	= true;
-		$content['nm']['bottom_too']	= true;
+		$content['nm']['bottom_too'] = true;
 		$content['nm']['order']		= 'name';
-		$content['nm']['sort']		= 'ASC';
-		$content['nm']['store_state']	= 'get_rows';
+		$content['nm']['sort'] = 'ASC';
+		$content['nm']['store_state'] = 'get_rows';
 		$content['nm']['row_id']	= 'res_id';
 		$content['nm']['favorites'] = true;
 
-		$nm_session_data = $GLOBALS['egw']->session->appsession('session_data','resources_index_nm');
-		if($nm_session_data)
+		$nm_session_data = $GLOBALS['egw']->session->appsession('session_data', 'resources_index_nm');
+		if ($nm_session_data)
 		{
 			$content['nm'] = $nm_session_data;
 		}
-		$content['nm']['options-filter']= array(''=>lang('all categories'))+(array)$this->bo->acl->get_cats(EGW_ACL_READ);
+		$content['nm']['options-filter'] = array(''=>lang('all categories')) + (array)$this->bo->acl->get_cats(EGW_ACL_READ);
 		$content['nm']['options-filter2'] = resources_bo::$filter_options;
-		if(!$content['nm']['filter2'])
+		if (!$content['nm']['filter2'])
 		{
 			$content['nm']['filter2'] = key(resources_bo::$filter_options);
 		}
 
 		$config = config::read('resources');
-		if($config['history'])
+		if ($config['history'])
 		{
 			$content['nm']['options-filter2'][resources_bo::DELETED] = lang('Deleted');
 		}
 
-		if($_GET['search']) {
+		if ($_GET['search']) {
 			$content['nm']['search'] = $_GET['search'];
 		}
-		if($_GET['view_accs_of'])
+		if ($_GET['view_accs_of'])
 		{
 			$content['nm']['filter2'] = (int)$_GET['view_accs_of'];
 		}
-		$content['nm']['actions']	= $this->get_actions();
+		$content['nm']['actions'] = $this->get_actions();
 
 		// check if user is permitted to add resources
 		// If they can't read any categories, they won't be able to save it
-		if(!$this->bo->acl->get_cats(EGW_ACL_ADD) || !$this->bo->acl->get_cats(EGW_ACL_READ))
+		if (!$this->bo->acl->get_cats(EGW_ACL_ADD) || !$this->bo->acl->get_cats(EGW_ACL_READ))
 		{
 			$no_button['add'] = $no_button['nm']['add'] = true;
 		}
 		$no_button['back'] = true;
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('resources');
 
-		egw_framework::validate_file('.','resources','resources');
+		egw_framework::validate_file('.', 'resources', 'resources');
 
-		if($content['nm']['filter2'] > 0)
+		if ($content['nm']['filter2'] > 0)
 		{
 			$master = $this->bo->so->read(array('res_id' => $content['nm']['filter2']));
 			$content['nm']['options-filter2'] = resources_bo::$filter_options + array(
-				$master['res_id'] => lang('accessories of') . ' ' . $master['name']
+				$master['res_id'] => lang('accessories of').' '.$master['name']
 			);
-			$content['nm']['get_rows'] 	= 'resources.resources_bo.get_rows';
-			$GLOBALS['egw_info']['flags']['app_header'] = lang('resources') . ' - ' . lang('accessories of '). ' '. $master['name'] .
-				($master['short_description'] ? ' [' . $master['short_description'] . ']' : '');
+			$content['nm']['get_rows'] = 'resources.resources_bo.get_rows';
+			$GLOBALS['egw_info']['flags']['app_header'] = lang('resources').' - '.lang('accessories of ').' '.$master['name'].
+				($master['short_description'] ? ' ['.$master['short_description'].']' : '');
 		}
 		$preserv = $content;
 
 		$options = array();
 
-		$GLOBALS['egw']->session->appsession('session_data','resources_index_nm',$content['nm']);
+		$GLOBALS['egw']->session->appsession('session_data', 'resources_index_nm', $content['nm']);
 		$this->tmpl->read('resources.show');
-		return $this->tmpl->exec('resources.resources_ui.index',$content,$sel_options,$no_button,$preserv);
+		return $this->tmpl->exec('resources.resources_ui.index', $content, $sel_options, $no_button, $preserv);
 	}
 
 	/**
@@ -190,7 +190,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=resources.resources_ui.edit&res_id=$id',
 				'popup' => egw_link::get_registry('resources', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'rowNoEdit',
 			),
 			'add' => array(
@@ -271,7 +271,7 @@ 
 	 * @param string/array $session_name 'index' or 'email', or array with session-data depending if we are in the main list or the popup
 	 * @return boolean true if all actions succeded, false otherwise
 	 */
-	function action($action,$checked,$use_all,&$success,&$failed,&$action_msg,$session_name,&$msg)
+	function action($action, $checked, $use_all, &$success, &$failed, &$action_msg, $session_name, &$msg)
 	{
 		$success = $failed = 0;
 		if ($use_all)
@@ -279,11 +279,11 @@ 
 			// get the whole selection
 			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession('session_data', $session_name);
 
-			@set_time_limit(0);                     // switch off the execution time limit, as it's for big selections to small
-			$query['num_rows'] = -1;        // all
-			$this->bo->get_rows($query,$resources,$readonlys);
+			@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+			$query['num_rows'] = -1; // all
+			$this->bo->get_rows($query, $resources, $readonlys);
 			$checked = array();
-			foreach($resources as $resource)
+			foreach ($resources as $resource)
 			{
 				$checked[] = $resource['res_id'];
 			}
@@ -293,17 +293,17 @@ 
 		// Dialogs to get options
 		list($action, $settings) = explode('_', $action, 2);
 
-		switch($action)
+		switch ($action)
 		{
 			case 'restore':
 				$action_msg = lang('restored');
-				foreach($checked as $n=>$id)
+				foreach ($checked as $n=>$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if (!$id) continue;
 					$resource = $this->bo->read($id);
 					$resource['deleted'] = null;
-					if($resource['accessory_of'] > 0)
+					if ($resource['accessory_of'] > 0)
 					{
 						/*
 						If restoring an accessory, and parent is deleted, and not in
@@ -311,18 +311,18 @@ 
 						*/
 						$parent = $this->bo->read($resource['accessory_of']);
 						$checked_key = array_search($parent['res_id'], $checked);
-						if($checked_key === false && $parent['deleted'])
+						if ($checked_key === false && $parent['deleted'])
 						{
 							$resource['accessory_of'] = -1;
 						}
 					}
 
 					$this->bo->save($resource);
-					if($settings == 'accessories')
+					if ($settings == 'accessories')
 					{
 						// Restore accessories too
-						$accessories = $this->bo->get_acc_list($id,true);
-						foreach($accessories as $acc_id => $name)
+						$accessories = $this->bo->get_acc_list($id, true);
+						foreach ($accessories as $acc_id => $name)
 						{
 							$acc = $this->bo->read($acc_id);
 							$acc['deleted'] = null;
@@ -332,20 +332,20 @@ 
 					}
 					$success++;
 				}
-				if($restored_accessories) $action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				if ($restored_accessories) $action_msg .= ", ".lang('%1 accessories restored', $restored_accessories);
 				break;
 			case 'delete':
 				$action_msg = lang('deleted');
 				$promoted_accessories = 0;
-				foreach($checked as $n => &$id)
+				foreach ($checked as $n => &$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if (!$id) continue;
 					$resource = $this->bo->read($id);
-					if($settings == 'promote')
+					if ($settings == 'promote')
 					{
 						// Handle a selected accessory
-						if($resource['accessory_of'] > 0)
+						if ($resource['accessory_of'] > 0)
 						{
 							$resource['accessory_of'] = -1;
 							$this->bo->save($resource);
@@ -354,8 +354,8 @@ 
 						}
 
 						// Make associated accessories into resources - include deleted
-						$accessories = $this->bo->get_acc_list($id,true);
-						foreach($accessories as $acc_id => $name)
+						$accessories = $this->bo->get_acc_list($id, true);
+						foreach ($accessories as $acc_id => $name)
 						{
 							$acc = $this->bo->read($acc_id);
 							$acc['accessory_of'] = -1;
@@ -366,19 +366,19 @@ 
 
 							// Don't need to process these ones now
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false) unset($checked[$checked_key]);
+							if ($checked_key !== false) unset($checked[$checked_key]);
 						}
 					}
 					else
 					{
 						// Remove checked accessories, deleting resource will remove them
 						// We get an error if we try to delete them after they're gone
-						$accessories = $this->bo->get_acc_list($id,$resource['deleted']);
+						$accessories = $this->bo->get_acc_list($id, $resource['deleted']);
 
-						foreach($accessories as $acc_id => $name)
+						foreach ($accessories as $acc_id => $name)
 						{
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false)
+							if ($checked_key !== false)
 							{
 								$success++;
 								unset($checked[$checked_key]);
@@ -392,11 +392,11 @@ 
 					}
 					else
 					{
-						$msg = $error . "\n";
+						$msg = $error."\n";
 						$failed++;
 					}
 				}
-				if($promoted_accessories) $action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				if ($promoted_accessories) $action_msg .= ", ".lang('%1 accessories now resources', $promoted_accessories);
 				break;
 		}
 		return $failed == 0;
@@ -408,13 +408,13 @@ 
 	 *
 	 * @param $content   Content from the eTemplate Exec call or id on inital call
 	 */
-	function edit($content=0,$accessory_of = -1)
+	function edit($content = 0, $accessory_of = -1)
 	{
 		if (is_array($content))
 		{
 			list($button) = @each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'save':
 				case 'apply':
@@ -425,20 +425,20 @@ 
 // 						// links are already saved by eTemplate
 // 						unset($resource['link_to']['to_id']);
 // 					}
-					if($content['res_id'])
+					if ($content['res_id'])
 					{
 						 $acc_count = count($this->bo->get_acc_list($content['res_id']));
 					}
 					$result = $this->bo->save($content);
 
-					if(is_numeric($result))
+					if (is_numeric($result))
 					{
-						$msg = lang('Resource %1 saved!',$result);
+						$msg = lang('Resource %1 saved!', $result);
 						$content['res_id'] = $result;
-						if($acc_count && $content['accessory_of'] != -1)
+						if ($acc_count && $content['accessory_of'] != -1)
 						{
 							// Resource with accessories changed into accessory
-							if($acc_count) $msg = lang('%1 accessories now resources',$acc_count);
+							if ($acc_count) $msg = lang('%1 accessories now resources', $acc_count);
 						}
 					}
 					else
@@ -449,9 +449,9 @@ 
 					break;
 				case 'delete':
 					unset($content['delete']);
-					if(!$this->bo->delete($content['res_id']))
+					if (!$this->bo->delete($content['res_id']))
 					{
-						$msg = lang('Resource %1 deleted!',$content['res_id']);
+						$msg = lang('Resource %1 deleted!', $content['res_id']);
 					}
 					else
 					{
@@ -459,16 +459,16 @@ 
 						break;
 					}
 			}
-			egw_framework::refresh_opener($msg, 'resources',$content['res_id'],($button == 'delete'?'delete':'edit'));
+			egw_framework::refresh_opener($msg, 'resources', $content['res_id'], ($button == 'delete' ? 'delete' : 'edit'));
 
-			if($button != 'apply')
+			if ($button != 'apply')
 			{
 				egw_framework::window_close();
 			}
 
 		}
 
-		$nm_session_data = $GLOBALS['egw']->session->appsession('session_data','resources_index_nm');
+		$nm_session_data = $GLOBALS['egw']->session->appsession('session_data', 'resources_index_nm');
 		$res_id = is_numeric($content) ? (int)$content : $content['res_id'];
 		if (isset($_GET['res_id'])) $res_id = $_GET['res_id'];
 		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0) $accessory_of = $nm_session_data['filter2'];
@@ -477,7 +477,7 @@ 
 		if ($res_id > 0)
 		{
 			$content = $this->bo->read($res_id);
-			$content['picture_src'] = strpos($content['picture_src'],'.') !== false ? 'gen_src' : $content['picture_src'];
+			$content['picture_src'] = strpos($content['picture_src'], '.') !== false ? 'gen_src' : $content['picture_src'];
 			$content['link_to'] = array(
 				'to_id' => $res_id,
 				'to_app' => 'resources'
@@ -485,7 +485,7 @@ 
 		} elseif ($accessory_of > 0) {
 			// Pre-set according to parent
 			$owner = $this->bo->read($accessory_of);
-			if($owner['accessory_of'] > 0)
+			if ($owner['accessory_of'] > 0)
 			{
 				// Accessory of accessory not allowed, grab parent resource
 				$accessory_of = $owner['accessory_of'];
@@ -498,33 +498,32 @@ 
 			$content['cat_id'] = $nm_session_data['filter'];
 			$content['bookable'] = true;
 		}
-		if($msg) {
+		if ($msg) {
 			$content['msg'] = $msg;
 		}
 
 		if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
 
 		// some presetes
-		$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
+		$content['resource_picture'] = $this->bo->get_picture($content['res_id'], false);
 		// Set original size picture
-		$content['picture_original'] = $content['picture_src'] == 'own_src'?
-				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg': $this->bo->get_picture($content['res_id'],true);
+		$content['picture_original'] = $content['picture_src'] == 'own_src' ?
+				'webdav.php/apps/resources/'.$content['res_id'].'/.picture.jpg' : $this->bo->get_picture($content['res_id'], true);
 
 		$content['quantity'] = $content['quantity'] ? $content['quantity'] : 1;
 		$content['useable'] = $content['useable'] ? $content['useable'] : 1;
 		$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
 
-		if($content['res_id'] && $content['accessory_of'] == -1)
+		if ($content['res_id'] && $content['accessory_of'] == -1)
 		{
 			$content['acc_count'] = count($this->bo->get_acc_list($content['res_id']));
 		}
 		$sel_options['status'] = resources_bo::$field2label;
 
 		//$sel_options['gen_src_list'] = $this->bo->get_genpicturelist();
-		$sel_options['cat_id'] =  $this->bo->acl->get_cats(EGW_ACL_ADD);
-		$sel_options['cat_id'] = count($sel_options['cat_id']) == 1 ? $sel_options['cat_id'] :
-			array('' => lang('select one')) + $sel_options['cat_id'];
-		if($accessory_of > 0 || $content['accessory_of'] > 0)
+		$sel_options['cat_id'] = $this->bo->acl->get_cats(EGW_ACL_ADD);
+		$sel_options['cat_id'] = count($sel_options['cat_id']) == 1 ? $sel_options['cat_id'] : array('' => lang('select one')) + $sel_options['cat_id'];
+		if ($accessory_of > 0 || $content['accessory_of'] > 0)
 		{
 			$content['accessory_of'] = $content['accessory_of'] ? $content['accessory_of'] : $accessory_of;
 		}
@@ -539,19 +538,19 @@ 
 			)
 		);
 
-		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
-		if($res_id) unset($sel_options['accessory_of'][$res_id]);
+		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('', $search_options);
+		if ($res_id) unset($sel_options['accessory_of'][$res_id]);
 
 // 		$content['general|page|pictures|links'] = 'resources.edit_tabs.page';  //debug
 
 		// Permissions
 		$read_only = array();
-		if($res_id && !$this->bo->acl->is_permitted($content['cat_id'],EGW_ACL_EDIT))
+		if ($res_id && !$this->bo->acl->is_permitted($content['cat_id'], EGW_ACL_EDIT))
 		{
 			$read_only['__ALL__'] = true;
 		}
 		$config = config::read('resources');
-		if(!$this->bo->acl->is_permitted($content['cat_id'],EGW_ACL_DELETE) ||
+		if (!$this->bo->acl->is_permitted($content['cat_id'], EGW_ACL_DELETE) ||
 			($content['deleted'] && !$GLOBALS['egw_info']['user']['apps']['admin'] && $config['history'] == 'history'))
 		{
 			$read_only['delete'] = true;
@@ -559,19 +558,19 @@ 
 
 		// Can't make a resource with accessories an accessory
 		$read_only['accessory_of'] = $content['acc_count'];
-		if($read_only['accessory_of'])
+		if ($read_only['accessory_of'])
 		{
 			$content['accessory_label'] = lang('Remove accessories before changing Accessory of');
 		}
 
 		// Disable custom tab if there are no custom fields defined
-		$read_only['tabs']['custom'] = !(config::get_customfields('resources',true));
-		$read_only['tabs']['history'] = ($content['history']['id'] != 0?false:true);
+		$read_only['tabs']['custom'] = !(config::get_customfields('resources', true));
+		$read_only['tabs']['history'] = ($content['history']['id'] != 0 ? false : true);
 
 		$preserv = $content;
 
 		$this->tmpl->read('resources.edit');
-		return $this->tmpl->exec('resources.resources_ui.edit',$content,$sel_options,$read_only,$preserv,2);
+		return $this->tmpl->exec('resources.resources_ui.edit', $content, $sel_options, $read_only, $preserv, 2);
 	}
 
 	/**
@@ -587,70 +586,70 @@ 
 		$cats = $this->bo->acl->get_cats(EGW_ACL_CALREAD);
 		if (!$cats) return array();
 
-		if(array_key_exists('return_array', $param))
+		if (array_key_exists('return_array', $param))
 		{
 			$return_array = $param['return_array'];
 			unset($param['return_array']);
 		}
 
-		$owners = explode(',',$param['owner']);
+		$owners = explode(',', $param['owner']);
 		unset($param['owner']);
 		$res_cats = $selected = array();
 
 		// this gets the resource-ids of the cats and implodes them to the array-key of the selectbox,
 		// so it is possible to select all resources of a category
 		$allowed_list = array();
-		foreach($cats as $cat_id => $cat_name)
+		foreach ($cats as $cat_id => $cat_name)
 		{
-			if ($resources = $this->bo->so->search(array('cat_id' => $cat_id, 'bookable' => '1'),'res_id',
-				'','','',False,'AND',false, array('deleted' => null))
+			if ($resources = $this->bo->so->search(array('cat_id' => $cat_id, 'bookable' => '1'), 'res_id',
+				'', '', '', False, 'AND', false, array('deleted' => null))
 			)
 			{
 				$keys = array();
-				foreach($resources as $res)
+				foreach ($resources as $res)
 				{
 					$keys[] = 'r'.$res['res_id'];
 					$allowed_list[] = $res['res_id'];
 				}
-				$res_cats[implode(',',$keys)] = $cat_name;
+				$res_cats[implode(',', $keys)] = $cat_name;
 
-				if (count(array_intersect($keys,$owners)) == count($keys))
+				if (count(array_intersect($keys, $owners)) == count($keys))
 				{
-					$selected[] = implode(',',$keys);
-					$owners = array_diff($owners,$keys);
+					$selected[] = implode(',', $keys);
+					$owners = array_diff($owners, $keys);
 				}
 			}
 		}
 		// add already selected single resources to the selectbox, eg. call of the resource-calendar from the resources app
 		$resources = array();
 		$res_ids = array();
-		foreach($owners as $key => $owner)
+		foreach ($owners as $key => $owner)
 		{
 			if ($owner{0} == 'r')
 			{
-				$res_ids[] = (int) substr($owner,1);
+				$res_ids[] = (int)substr($owner, 1);
 				$selected[] = $owner;
 			}
 		}
 
 		// Take out resources not allowed by perms, above
-		$res_ids = array_intersect($res_ids,$allowed_list);
+		$res_ids = array_intersect($res_ids, $allowed_list);
 		if (count($res_ids))
 		{
-			foreach($this->bo->so->search(array('res_id' => $res_ids),'res_id,name') as $data)
+			foreach ($this->bo->so->search(array('res_id' => $res_ids), 'res_id,name') as $data)
 			{
 				$resources['r'.$data['res_id']] = $data['name'];
 			}
 		}
-		if(!isset($return_array))
+		if (!isset($return_array))
 		{
 			$selectbox = html::select(
 				'owner',
 				$selected,
-				$options=array_merge(array('r0' => lang('None')),$resources,$res_cats),
-				true,	// no lang
+				$options = array_merge(array('r0' => lang('None')), $resources, $res_cats),
+				true, // no lang
 				' style="width: 100%;" id="uical_select_resource"',
-				min(4, count($options)),	// multiple
+				min(4, count($options)), // multiple
 				false
 			);
 			return array(
@@ -664,7 +663,7 @@ 
 		}
 		else
 		{
-			return array_merge($resources,$res_cats);
+			return array_merge($resources, $res_cats);
 		}
 	}
 }

Braces +62 added lines, -19 removed lines

@@ -99,7 +99,9 @@ 
 					}
 				}
 			}
-		} else {
+		}
+		else
+		{
 			$msg = $content;
 		}
 		$content = array();
@@ -137,7 +139,8 @@ 
 			$content['nm']['options-filter2'][resources_bo::DELETED] = lang('Deleted');
 		}
 
-		if($_GET['search']) {
+		if($_GET['search'])
+		{
 			$content['nm']['search'] = $_GET['search'];
 		}
 		if($_GET['view_accs_of'])
@@ -300,7 +303,10 @@ 
 				foreach($checked as $n=>$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if(!$id)
+					{
+						continue;
+					}
 					$resource = $this->bo->read($id);
 					$resource['deleted'] = null;
 					if($resource['accessory_of'] > 0)
@@ -332,7 +338,10 @@ 
 					}
 					$success++;
 				}
-				if($restored_accessories) $action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				if($restored_accessories)
+				{
+					$action_msg .= ", " . lang('%1 accessories restored',$restored_accessories);
+				}
 				break;
 			case 'delete':
 				$action_msg = lang('deleted');
@@ -340,7 +349,10 @@ 
 				foreach($checked as $n => &$id)
 				{
 					// Extra data
-					if(!$id) continue;
+					if(!$id)
+					{
+						continue;
+					}
 					$resource = $this->bo->read($id);
 					if($settings == 'promote')
 					{
@@ -366,7 +378,10 @@ 
 
 							// Don't need to process these ones now
 							$checked_key = array_search($acc_id, $checked);
-							if($checked_key !== false) unset($checked[$checked_key]);
+							if($checked_key !== false)
+							{
+								unset($checked[$checked_key]);
+							}
 						}
 					}
 					else
@@ -396,7 +411,10 @@ 
 						$failed++;
 					}
 				}
-				if($promoted_accessories) $action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				if($promoted_accessories)
+				{
+					$action_msg .= ", " . lang('%1 accessories now resources',$promoted_accessories);
+				}
 				break;
 		}
 		return $failed == 0;
@@ -438,7 +456,10 @@ 
 						if($acc_count && $content['accessory_of'] != -1)
 						{
 							// Resource with accessories changed into accessory
-							if($acc_count) $msg = lang('%1 accessories now resources',$acc_count);
+							if($acc_count)
+							{
+								$msg = lang('%1 accessories now resources',$acc_count);
+							}
 						}
 					}
 					else
@@ -470,9 +491,18 @@ 
 
 		$nm_session_data = $GLOBALS['egw']->session->appsession('session_data','resources_index_nm');
 		$res_id = is_numeric($content) ? (int)$content : $content['res_id'];
-		if (isset($_GET['res_id'])) $res_id = $_GET['res_id'];
-		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0) $accessory_of = $nm_session_data['filter2'];
-		if (isset($_GET['accessory_of'])) $accessory_of = $_GET['accessory_of'];
+		if (isset($_GET['res_id']))
+		{
+			$res_id = $_GET['res_id'];
+		}
+		if (isset($nm_session_data['filter2']) && $nm_session_data['filter2'] > 0)
+		{
+			$accessory_of = $nm_session_data['filter2'];
+		}
+		if (isset($_GET['accessory_of']))
+		{
+			$accessory_of = $_GET['accessory_of'];
+		}
 		$content = array('res_id' => $res_id);
 		if ($res_id > 0)
 		{
@@ -482,7 +512,9 @@ 
 				'to_id' => $res_id,
 				'to_app' => 'resources'
 			);
-		} elseif ($accessory_of > 0) {
+		}
+		elseif ($accessory_of > 0)
+		{
 			// Pre-set according to parent
 			$owner = $this->bo->read($accessory_of);
 			if($owner['accessory_of'] > 0)
@@ -493,16 +525,22 @@ 
 			}
 			$content['cat_id'] = $owner['cat_id'];
 			$content['bookable'] = true;
-		} else {
+		}
+		else
+		{
 			// New resource
 			$content['cat_id'] = $nm_session_data['filter'];
 			$content['bookable'] = true;
 		}
-		if($msg) {
+		if($msg)
+		{
 			$content['msg'] = $msg;
 		}
 
-		if ($_GET['msg']) $content['msg'] = strip_tags($_GET['msg']);
+		if ($_GET['msg'])
+		{
+			$content['msg'] = strip_tags($_GET['msg']);
+		}
 
 		// some presetes
 		$content['resource_picture'] = $this->bo->get_picture($content['res_id'],false);
@@ -540,7 +578,10 @@ 
 		);
 
 		$sel_options['accessory_of'] = array(-1 => lang('none')) + (array)$this->bo->link_query('',$search_options);
-		if($res_id) unset($sel_options['accessory_of'][$res_id]);
+		if($res_id)
+		{
+			unset($sel_options['accessory_of'][$res_id]);
+		}
 
 // 		$content['general|page|pictures|links'] = 'resources.edit_tabs.page';  //debug
 
@@ -585,7 +626,10 @@ 
 	function get_calendar_sidebox($param)
 	{
 		$cats = $this->bo->acl->get_cats(EGW_ACL_CALREAD);
-		if (!$cats) return array();
+		if (!$cats)
+		{
+			return array();
+		}
 
 		if(array_key_exists('return_array', $param))
 		{
@@ -604,8 +648,7 @@ 
 		{
 			if ($resources = $this->bo->so->search(array('cat_id' => $cat_id, 'bookable' => '1'),'res_id',
 				'','','',False,'AND',false, array('deleted' => null))
-			)
-			{
+			) {
 				$keys = array();
 				foreach($resources as $res)
 				{

filemanager/cli.php

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

@@ -381,13 +381,13 @@ 
 									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
-										die("Unknown $type '$owner_was'!");
+										die("unknown $type '$owner_was'!");
 									}
 								}
 								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
-									die("Unknown $type '$owner_was'!");
+									die("unknown $type '$owner_was'!");
 								}
 							}
 							$params = array($url,$owner);
@@ -445,7 +445,7 @@ 
 					{
 						if (!($f = fopen($url,'r')))
 						{
-							echo "File $url not found !!!\n\n";
+							echo "file $url not found !!!\n\n";
 						}
 						else
 						{
@@ -761,7 +761,7 @@ 
 	}
 	if (!($from_fp = fopen($from,'r')))
 	{
-		die("File $from not found!\n");
+		die("file $from not found!\n");
 	}
 	if (!($to_fp = fopen($to,'w')))
 	{

Spacing +136 added lines, -141 removed lines

@@ -13,9 +13,9 @@ 
  * @todo --domain does NOT work with --user root_* for domains other then the first in header.inc.php
  */
 
-chdir(dirname(__FILE__));	// to enable our relative pathes to work
+chdir(dirname(__FILE__)); // to enable our relative pathes to work
 
-error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
+error_reporting(error_reporting()&~E_NOTICE&~E_DEPRECATED);
 
 if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
 {
@@ -44,7 +44,7 @@ 
  *
  * @param string $error_msg ='' error-message to be printed in front of usage
  */
-function usage($error_msg='')
+function usage($error_msg = '')
 {
 	if ($error_msg)
 	{
@@ -78,8 +78,8 @@ 
 }
 $long = $numeric = $recursive = $perms = $all = $inode = false;
 $args = $_SERVER['argv'];
-$cmd = basename(array_shift($args),'.php');
-if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0],'://') === false)
+$cmd = basename(array_shift($args), '.php');
+if ($args[0][0] != '-' && $args[0][0] != '/' && strpos($args[0], '://') === false)
 {
 	$cmd = array_shift($args);
 }
@@ -87,7 +87,7 @@ 
 if (!$args) $args = array('-h');
 
 $argv = $find_options = array();
-while(!is_null($option = array_shift($args)))
+while (!is_null($option = array_shift($args)))
 {
 	if ($option == '-' || $option[0] != '-')	// no option --> argument
 	{
@@ -95,34 +95,34 @@ 
 		continue;
 	}
 
-	switch($option)
+	switch ($option)
 	{
 		default:
 			if ($cmd == 'find')
 			{
-				if (!in_array($option,array('-type','-depth','-mindepth','-maxdepth','-name','-path',
-					'-uid','-user','-nouser','-gid','-group','-nogroup','-mime',
-					'-empty','-size','-cmin','-ctime','-mmin','-mtime','-limit','-order','-sort',
-					'-hidden','-show-deleted','-name-preg','-path','-path-preg')))
+				if (!in_array($option, array('-type', '-depth', '-mindepth', '-maxdepth', '-name', '-path',
+					'-uid', '-user', '-nouser', '-gid', '-group', '-nogroup', '-mime',
+					'-empty', '-size', '-cmin', '-ctime', '-mmin', '-mtime', '-limit', '-order', '-sort',
+					'-hidden', '-show-deleted', '-name-preg', '-path', '-path-preg')))
 				{
 					usage("Unknown find option '$option'!");
 				}
-				if (in_array($option,array('-empty','-depth','-nouser','-nogroup','-hidden','-show-deleted')))
+				if (in_array($option, array('-empty', '-depth', '-nouser', '-nogroup', '-hidden', '-show-deleted')))
 				{
-					$find_options[substr($option,1)] = true;
+					$find_options[substr($option, 1)] = true;
 				}
 				else
 				{
-					$find_options[str_replace('-','_',substr($option,1))] = array_shift($args);
+					$find_options[str_replace('-', '_', substr($option, 1))] = array_shift($args);
 				}
 				break;
 			}
 			// multiple options, eg. -rp --> -r -p
-			elseif($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
+			elseif ($option[0] == '-' && $option[1] != '-' && strlen($option) > 2)
 			{
-				for($i = 1; $i < strlen($option); ++$i)
+				for ($i = 1; $i < strlen($option); ++$i)
 				{
-					array_unshift($args,'-'.$option[$i]);
+					array_unshift($args, '-'.$option[$i]);
 				}
 				break;
 			}
@@ -178,11 +178,11 @@ 
 }
 if ($user && $passwd)
 {
-	load_egw($user,$passwd,$domain ? $domain : 'default');
+	load_egw($user, $passwd, $domain ? $domain : 'default');
 }
 $argc = count($argv);
 
-switch($cmd)
+switch ($cmd)
 {
 	case 'umount':
 		if ($argc != 1 && !$all)
@@ -190,13 +190,13 @@ 
 			usage('Wrong number of parameters!');
 		}
 		if (($url = $argv[0])) load_wrapper($url);
-		if(!egw_vfs::$is_root)
+		if (!egw_vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
 		if ($all)
 		{
-			config::save_value('vfs_fstab',$GLOBALS['egw_info']['server']['vfs_fstab']='','phpgwapi');
+			config::save_value('vfs_fstab', $GLOBALS['egw_info']['server']['vfs_fstab'] = '', 'phpgwapi');
 			echo "Restored default mounts:\n";
 		}
 		elseif (!egw_vfs::umount($url))
@@ -213,16 +213,16 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		load_wrapper($url=$argv[0]);
+		load_wrapper($url = $argv[0]);
 
-		if($argc > 1 && !egw_vfs::$is_root)
+		if ($argc > 1 && !egw_vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
 		}
-		$fstab = egw_vfs::mount($url,$path=$argv[1]);
+		$fstab = egw_vfs::mount($url, $path = $argv[1]);
 		if (is_array($fstab))
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
@@ -242,7 +242,7 @@ 
 		break;
 
 	case 'find':
-		do_find($argv,$find_options);
+		do_find($argv, $find_options);
 		break;
 
 	case 'lntree':
@@ -250,14 +250,14 @@ 
 		break;
 
 	case 'cp':
-		do_cp($argv,$recursive,$perms);
+		do_cp($argv, $recursive, $perms);
 		break;
 
 	case 'rename':
 		if (count($argv) != 2) usage('Wrong number of parameters!');
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
-		rename($argv[0],$argv[1]);
+		rename($argv[0], $argv[1]);
 		break;
 
 	case 'migrate-db2fs':
@@ -265,21 +265,21 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit; // we need write access, error msg already given
 		$fstab = egw_vfs::mount();
-		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
+		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'], 'storage=db') === false)
 		{
-			foreach($fstab as $path => $url)
+			foreach ($fstab as $path => $url)
 			{
 				echo "$url\t$path\n";
 			}
 			die("\n/ NOT mounted with 'storage=db' --> no need to convert!\n\n");
 		}
-		$num_files = sqlfs_utils::migrate_db2fs();	// throws exception on error
+		$num_files = sqlfs_utils::migrate_db2fs(); // throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
-		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
-		if (egw_vfs::mount($new_url,'/'))
+		$new_url = preg_replace('/storage=db&?/', '', $fstab['/']);
+		if (substr($new_url, -1) == '?') $new_url = substr($new_url, 0, -1);
+		if (egw_vfs::mount($new_url, '/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
 		}
@@ -290,24 +290,24 @@ 
 		break;
 
 	default:
-		while($argv)
+		while ($argv)
 		{
 			$url = array_shift($argv);
 
 			load_wrapper($url);
 			echo "$cmd $url (long=".(int)$long.", numeric=".(int)$numeric.", recursive=".(int)$recursive.")\n";
 
-			switch($cmd)
+			switch ($cmd)
 			{
 				case 'rm':
 					if ($recursive)
 					{
 						if (!class_exists('egw_vfs'))
 						{
-							die("rm -r only implemented for eGW streams!");	// dont want to repeat the code here
+							die("rm -r only implemented for eGW streams!"); // dont want to repeat the code here
 						}
-						array_unshift($argv,$url);
-						egw_vfs::remove($argv,true);
+						array_unshift($argv, $url);
+						egw_vfs::remove($argv, true);
 						$argv = array();
 					}
 					else
@@ -321,27 +321,27 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url, null, $recursive)) echo "Can't create directory, permission denied!\n";
 					break;
 
 				case 'touch':
 				case 'chmod':
 				case 'chown':
 				case 'chgrp':
-					switch($cmd)
+					switch ($cmd)
 					{
 						case 'touch':
-							$params = array($url,$time);
+							$params = array($url, $time);
 							break;
 						case 'chmod':
 							if (!isset($mode))
 							{
-								$mode = $url;	// first param is mode
+								$mode = $url; // first param is mode
 								$url = array_shift($argv);
 							}
-							if (egw_vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// cant use stat or egw_vfs::mode2int otherwise!
+							if (egw_vfs::parse_url($url, PHP_URL_SCHEME)) load_wrapper($url); // cant use stat or egw_vfs::mode2int otherwise!
 
-							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
+							if (strpos($mode, '+') !== false || strpos($mode, '-') !== false)
 							{
 								$stat = stat($url);
 								$set = $stat['mode'];
@@ -352,19 +352,19 @@ 
 							}
 							if (!class_exists('egw_vfs'))
 							{
-								die("chmod only implemented for eGW streams!");	// dont want to repeat the code here
+								die("chmod only implemented for eGW streams!"); // dont want to repeat the code here
 							}
-							$set = egw_vfs::mode2int($mode,$set);
-							$params = array($url,$set);
+							$set = egw_vfs::mode2int($mode, $set);
+							$params = array($url, $set);
 							break;
 						case 'chown':
 						case 'chgrp':
 							$type = $cmd == 'chgrp' ? 'group' : 'user';
 							if (!isset($owner))
 							{
-								$owner = $url;	// first param is owner/group
+								$owner = $url; // first param is owner/group
 								$url = array_shift($argv);
-								if (egw_vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// we need the header loaded
+								if (egw_vfs::parse_url($url, PHP_URL_SCHEME)) load_wrapper($url); // we need the header loaded
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -375,34 +375,34 @@ 
 									{
 										die("only numeric user/group-id's allowed for non eGW streams!");
 									}
-									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was=$owner,'account_lid',$type[0])) ||
+									if (!($owner = $GLOBALS['egw']->accounts->name2id($owner_was = $owner, 'account_lid', $type[0])) ||
 										($owner < 0) != ($cmd == 'chgrp'))
 									{
 										die("Unknown $type '$owner_was'!");
 									}
 								}
-								elseif($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
+								elseif ($owner && is_object($GLOBALS['egw']) && (!$GLOBALS['egw']->accounts->id2name($owner) ||
 										($owner < 0) != ($cmd == 'chgrp')))
 								{
 									die("Unknown $type '$owner_was'!");
 								}
 							}
-							$params = array($url,$owner);
+							$params = array($url, $owner);
 							break;
 					}
-					if (($scheme = egw_vfs::parse_url($url,PHP_URL_SCHEME)))
+					if (($scheme = egw_vfs::parse_url($url, PHP_URL_SCHEME)))
 					{
 						load_wrapper($url);
 					}
 					if ($recursive && class_exists('egw_vfs'))
 					{
-						array_unshift($argv,$url);
-						$params = array($argv,null,$cmd,$params[1]);
-						$cmd = array('egw_vfs','find');
-						$argv = array();	// we processed all url's
+						array_unshift($argv, $url);
+						$params = array($argv, null, $cmd, $params[1]);
+						$cmd = array('egw_vfs', 'find');
+						$argv = array(); // we processed all url's
 					}
 					//echo "calling cmd=".print_r($cmd,true).", params=".print_r($params,true)."\n";
-					call_user_func_array($cmd,$params);
+					call_user_func_array($cmd, $params);
 					break;
 
 				case 'cat':
@@ -412,35 +412,35 @@ 
 					if ($cmd != 'cat' && $recursive && class_exists('egw_vfs'))
 					{
 						load_wrapper($url);
-						array_unshift($argv,$url);
-						egw_vfs::find($argv,array('url'=>true,),'do_stat',array($long,$numeric,true,$inode));
+						array_unshift($argv, $url);
+						egw_vfs::find($argv, array('url'=>true,), 'do_stat', array($long, $numeric, true, $inode));
 						$argv = array();
 					}
 					elseif (is_dir($url) && ($dir = opendir($url)))
 					{
 						if ($argc)
 						{
-							if (!($name = basename(egw_vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(egw_vfs::parse_url($url, PHP_URL_PATH)))) $name = '/';
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
-						list($url,$query) = explode('?',$url,2);
+						list($url, $query) = explode('?', $url, 2);
 						if ($query) $query = '?'.$query;
 
-						if (substr($url,-1) == '/')
+						if (substr($url, -1) == '/')
 						{
-							$url = substr($url,0,-1);
+							$url = substr($url, 0, -1);
 						}
-						while(($file = readdir($dir)) !== false)
+						while (($file = readdir($dir)) !== false)
 						{
-							do_stat($url.'/'.$file.$query,$long,$numeric,false,$inode);
+							do_stat($url.'/'.$file.$query, $long, $numeric, false, $inode);
 						}
 						closedir($dir);
 					}
 					elseif ($cmd == 'cat')
 					{
-						if (!($f = fopen($url,'r')))
+						if (!($f = fopen($url, 'r')))
 						{
 							echo "File $url not found !!!\n\n";
 						}
@@ -448,7 +448,7 @@ 
 						{
 							if ($argc)
 							{
-								echo "\n".basename(egw_vfs::parse_url($url,PHP_URL_PATH)).":\n";
+								echo "\n".basename(egw_vfs::parse_url($url, PHP_URL_PATH)).":\n";
 							}
 							fpassthru($f);
 							fclose($f);
@@ -456,7 +456,7 @@ 
 					}
 					else
 					{
-						do_stat($url,$long,$numeric,false,$inode);
+						do_stat($url, $long, $numeric, false, $inode);
 					}
 					if (!$long && $cmd == 'ls') echo "\n";
 					break;
@@ -471,11 +471,11 @@ 
  */
 function load_wrapper($url)
 {
-	$scheme = parse_url($url,PHP_URL_SCHEME);
+	$scheme = parse_url($url, PHP_URL_SCHEME);
 
-	if (!in_array($scheme,stream_get_wrappers()))
+	if (!in_array($scheme, stream_get_wrappers()))
 	{
-		switch($scheme)
+		switch ($scheme)
 		{
 			case 'webdav':
 			case 'webdavs':
@@ -484,9 +484,9 @@ 
 			case '':	// default scheme is file and always available
 				break;
 			default:
-				if (!isset($GLOBALS['egw']) && !in_array($scheme,array('smb','imap')))
+				if (!isset($GLOBALS['egw']) && !in_array($scheme, array('smb', 'imap')))
 				{
-					load_egw(parse_url($url,PHP_URL_USER), parse_url($url,PHP_URL_PASS), parse_url($url,PHP_URL_HOST));
+					load_egw(parse_url($url, PHP_URL_USER), parse_url($url, PHP_URL_PASS), parse_url($url, PHP_URL_HOST));
 				}
 				// get eGW's __autoload() function
 				include_once(EGW_API_INC.'/common_functions.inc.php');
@@ -507,7 +507,7 @@ 
  * @param string $passwd
  * @param string $domain
  */
-function load_egw($user,$passwd,$domain='default')
+function load_egw($user, $passwd, $domain = 'default')
 {
 	//echo "load_egw($user,$passwd,$domain)\n";
 	$_REQUEST['domain'] = $domain;
@@ -519,7 +519,7 @@ 
 
 	if (ini_get('session.save_handler') == 'files' && !is_writable(ini_get('session.save_path')) && is_dir('/tmp') && is_writable('/tmp'))
 	{
-		ini_set('session.save_path','/tmp');	// regular users may have no rights to apache's session dir
+		ini_set('session.save_path', '/tmp'); // regular users may have no rights to apache's session dir
 	}
 
 	$GLOBALS['egw_info'] = array(
@@ -531,7 +531,7 @@ 
 		)
 	);
 
-	if (substr($user,0,5) != 'root_')
+	if (substr($user, 0, 5) != 'root_')
 	{
 		include('../header.inc.php');
 	}
@@ -557,7 +557,7 @@ 
 	}
 
 	$cmd = $GLOBALS['cmd'];
-	if (!in_array($cmd,array('ls','find','mount','umount','eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
+	if (!in_array($cmd, array('ls', 'find', 'mount', 'umount', 'eacl')) && $GLOBALS['egw_info']['server']['files_dir'] && !is_writable($GLOBALS['egw_info']['server']['files_dir']))
 	{
 		echo "\nError: eGroupWare's files directory {$GLOBALS['egw_info']['server']['files_dir']} is NOT writable by the user running ".basename(__FILE__)."!\n".
 			"--> Please run it as the same user the webserver uses or root, otherwise the $cmd command will fail!\n\n";
@@ -588,22 +588,22 @@ 
 	}
 	if ($argc == 1)
 	{
-		foreach(egw_vfs::get_eacl($url) as $acl)
+		foreach (egw_vfs::get_eacl($url) as $acl)
 		{
-			$mode = ($acl['rights'] & egw_vfs::READABLE ? 'r' : '-').
-				($acl['rights'] & egw_vfs::WRITABLE ? 'w' : '-').
-				($acl['rights'] & egw_vfs::EXECUTABLE ? 'x' : '-');
+			$mode = ($acl['rights']&egw_vfs::READABLE ? 'r' : '-').
+				($acl['rights']&egw_vfs::WRITABLE ? 'w' : '-').
+				($acl['rights']&egw_vfs::EXECUTABLE ? 'x' : '-');
 			echo $acl['path']."\t$mode\t".$GLOBALS['egw']->accounts->id2name($acl['owner'])."\n";
 		}
 		return;
 	}
 	if ($argc > 1 && !is_numeric($argv[1]))
 	{
-		$mode=$argv[1];
+		$mode = $argv[1];
 		$argv[1] = null;
-		for($i = 0; $mode[$i]; ++$i)
+		for ($i = 0; $mode[$i]; ++$i)
 		{
-			switch($mode[$i])
+			switch ($mode[$i])
 			{
 				case 'x': $argv[1] |= egw_vfs::EXECUTABLE; break;
 				case 'w': $argv[1] |= egw_vfs::WRITABLE; break;
@@ -611,7 +611,7 @@ 
 			}
 		}
 	}
-	if (!egw_vfs::eacl($url,$argv[1],$argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
+	if (!egw_vfs::eacl($url, $argv[1], $argc > 2 && !is_numeric($argv[2]) ? $GLOBALS['egw']->accounts->name2id($argv[2]) : $argv[2]))
 	{
 		echo "Error setting extended acl for $argv[0]!\n";
 	}
@@ -626,10 +626,10 @@ 
  * @param boolean $full_path =false true=give full path instead of just filename
  * @param boolean $inode =false true=display inode (sqlfs id)
  */
-function do_stat($url,$long=false,$numeric=false,$full_path=false,$inode=false)
+function do_stat($url, $long = false, $numeric = false, $full_path = false, $inode = false)
 {
 	//echo "do_stat($url,$long,$numeric,$full_path)\n";
-	$bname = egw_vfs::parse_url($url,PHP_URL_PATH);
+	$bname = egw_vfs::parse_url($url, PHP_URL_PATH);
 
 	if (!$full_path)
 	{
@@ -660,25 +660,23 @@ 
 		{
 			if ($stat['uid'])
 			{
-				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
-					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
+				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) : (function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
 				if (is_array($uid)) $uid = $uid['name'];
 				if (empty($uid)) $uid = $stat['uid'];
 			}
 			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
-				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
-					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
+				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) : (function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
 				if (is_array($gid)) $gid = $gid['name'];
 				if (empty($gid)) $gid = $stat['gid'];
 			}
 			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
-		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
+		$mtime = date('Y-m-d H:i:s', $stat['mtime']);
 		$nlink = $stat['nlink'];
-		if (($stat['mode'] & 0xA000) == 0xA000)
+		if (($stat['mode']&0xA000) == 0xA000)
 		{
 			$symlink = " -> ".(class_exists('egw_vfs') ? egw_vfs::readlink($url) : readlink($url));
 		}
@@ -697,12 +695,12 @@ 
 function hsize($size)
 {
 	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
-	return sprintf('%3.1lfM',(float)$size/(1024*1024));
+	if ($size < 1024 * 1024) return sprintf('%3.1lfk', (float)$size / 1024);
+	return sprintf('%3.1lfM', (float)$size / (1024 * 1024));
 }
 
 
-function do_cp($argv,$recursive=false,$perms=false)
+function do_cp($argv, $recursive = false, $perms = false)
 {
 	$to = array_pop($argv);
 	load_wrapper($to);
@@ -714,13 +712,13 @@ 
 		usage("No such directory '$to'!");
 	}
 	$anz_dirs = $anz_files = 0;
-	foreach($argv as $from)
+	foreach ($argv as $from)
 	{
 		if (is_dir($from) && (!file_exists($to) || is_dir($to)) && $recursive && class_exists('egw_vfs'))
 		{
-			foreach(egw_vfs::find($from,array('url' => true)) as $f)
+			foreach (egw_vfs::find($from, array('url' => true)) as $f)
 			{
-				$t = $to.substr($f,strlen($from));
+				$t = $to.substr($f, strlen($from));
 				if (is_dir($f))
 				{
 					++$anz_dirs;
@@ -729,43 +727,43 @@ 
 				else
 				{
 					++$anz_files;
-					_cp($f,$t);
+					_cp($f, $t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms) _cp_perms($f, $t);
 			}
-			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
+			echo ($anz_dirs ? "$anz_dirs dir(s) created and " : '')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
-			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			_cp($from, $to, true);
+			if ($perms) _cp_perms($from, $to);
 		}
 	}
 }
 
-function _cp($from,$to,$verbose=false)
+function _cp($from, $to, $verbose = false)
 {
 	load_wrapper($from);
 
 	if (is_dir($to))
 	{
-		$path = egw_vfs::parse_url($from,PHP_URL_PATH);
+		$path = egw_vfs::parse_url($from, PHP_URL_PATH);
 		if (is_dir($to))
 		{
-			list($to,$query) = explode('?',$to,2);
+			list($to, $query) = explode('?', $to, 2);
 			$to .= '/'.basename($path).($query ? '?'.$query : '');
 		}
 	}
-	if (!($from_fp = fopen($from,'r')))
+	if (!($from_fp = fopen($from, 'r')))
 	{
 		die("File $from not found!\n");
 	}
-	if (!($to_fp = fopen($to,'w')))
+	if (!($to_fp = fopen($to, 'w')))
 	{
 		die("Can't open $to for writing!\n");
 	}
 	//stream_filter_append($from_fp,'convert.base64-decode');
-	$count = stream_copy_to_stream($from_fp,$to_fp);
+	$count = stream_copy_to_stream($from_fp, $to_fp);
 
 	if ($verbose) echo hsize($count)." bytes written to $to\n";
 
@@ -778,11 +776,11 @@ 
 }
 
 
-function _cp_perms($from,$to)
+function _cp_perms($from, $to)
 {
 	if (($from_stat = stat($from)) && ($to_stat = stat($to)))
 	{
-		foreach(array(
+		foreach (array(
 			'mode' => 'chmod',
 			'uid'  => 'chown',
 			'gid'  => 'chgrp',
@@ -791,27 +789,27 @@ 
 			if ($from_stat[$perm] != $to_stat[$perm])
 			{
 				//echo "egw_vfs::$cmd($to,{$from_stat[$perm]}\n";
-				call_user_func(array('egw_vfs',$cmd),$to,$from_stat[$perm]);
+				call_user_func(array('egw_vfs', $cmd), $to, $from_stat[$perm]);
 			}
 		}
 	}
 }
 
-function do_find($bases,$options)
+function do_find($bases, $options)
 {
-	foreach($bases as $url)
+	foreach ($bases as $url)
 	{
 		load_wrapper($url);
 	}
-	$options['url'] = true;	// we use url's not vfs pathes in filemanager/cli.php
+	$options['url'] = true; // we use url's not vfs pathes in filemanager/cli.php
 
-	foreach(egw_vfs::find($bases,$options) as $path)
+	foreach (egw_vfs::find($bases, $options) as $path)
 	{
 		echo "$path\n";
 	}
 }
 
-function do_lntree($from,$to)
+function do_lntree($from, $to)
 {
 	echo "lntree $from $to\n";
 	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
@@ -874,33 +872,33 @@ 
  * @param int $mode
  * @return string
  */
-function int2mode( $mode )
+function int2mode($mode)
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if (($mode&0xA000) == 0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	elseif (($mode&0xC000) == 0xC000) // Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	elseif ($mode&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	elseif ($mode&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	elseif ($mode&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	elseif ($mode&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	elseif ($mode&0x8000) // Regular
 	{
 		$sP = '-';
 	}
@@ -910,22 +908,19 @@ 
 	}
 
 	// owner
-	$sP .= (($mode & 0x0100) ? 'r' : '-') .
-	(($mode & 0x0080) ? 'w' : '-') .
-	(($mode & 0x0040) ? (($mode & 0x0800) ? 's' : 'x' ) :
-	(($mode & 0x0800) ? 'S' : '-'));
+	$sP .= (($mode&0x0100) ? 'r' : '-').
+	(($mode&0x0080) ? 'w' : '-').
+	(($mode&0x0040) ? (($mode&0x0800) ? 's' : 'x') : (($mode&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($mode & 0x0020) ? 'r' : '-') .
-	(($mode & 0x0010) ? 'w' : '-') .
-	(($mode & 0x0008) ? (($mode & 0x0400) ? 's' : 'x' ) :
-	(($mode & 0x0400) ? 'S' : '-'));
+	$sP .= (($mode&0x0020) ? 'r' : '-').
+	(($mode&0x0010) ? 'w' : '-').
+	(($mode&0x0008) ? (($mode&0x0400) ? 's' : 'x') : (($mode&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($mode & 0x0004) ? 'r' : '-') .
-	(($mode & 0x0002) ? 'w' : '-') .
-	(($mode & 0x0001) ? (($mode & 0x0200) ? 't' : 'x' ) :
-	(($mode & 0x0200) ? 'T' : '-'));
+	$sP .= (($mode&0x0004) ? 'r' : '-').
+	(($mode&0x0002) ? 'w' : '-').
+	(($mode&0x0001) ? (($mode&0x0200) ? 't' : 'x') : (($mode&0x0200) ? 'T' : '-'));
 
 	return $sP;
 }

Braces +131 added lines, -32 removed lines

@@ -17,10 +17,13 @@ 
 
 error_reporting(error_reporting() & ~E_NOTICE & ~E_DEPRECATED);
 
-if (php_sapi_name() !== 'cli')	// security precaution: forbit calling filemanager/cli.php as web-page
+if (php_sapi_name() !== 'cli')
+{
+	// security precaution: forbit calling filemanager/cli.php as web-page
 {
 	die('<h1>'.basename(__FILE__).' must NOT be called as web-page --> exiting !!!</h1>');
 }
+}
 
 /**
  * callback if the session-check fails, creates session from user/passwd in $GLOBALS['egw_login_data']
@@ -84,14 +87,20 @@ 
 	$cmd = array_shift($args);
 }
 
-if (!$args) $args = array('-h');
+if (!$args)
+{
+	$args = array('-h');
+}
 
 $argv = $find_options = array();
 while(!is_null($option = array_shift($args)))
 {
-	if ($option == '-' || $option[0] != '-')	// no option --> argument
+	if ($option == '-' || $option[0] != '-')
+	{
+		// no option --> argument
 	{
 		$argv[] = $option;
+	}
 		continue;
 	}
 
@@ -189,7 +198,10 @@ 
 		{
 			usage('Wrong number of parameters!');
 		}
-		if (($url = $argv[0])) load_wrapper($url);
+		if (($url = $argv[0]))
+		{
+			load_wrapper($url);
+		}
 		if(!egw_vfs::$is_root)
 		{
 			die("You need to be root to do that!\n");
@@ -254,7 +266,10 @@ 
 		break;
 
 	case 'rename':
-		if (count($argv) != 2) usage('Wrong number of parameters!');
+		if (count($argv) != 2)
+		{
+			usage('Wrong number of parameters!');
+		}
 		load_wrapper($argv[0]);
 		load_wrapper($argv[1]);
 		rename($argv[0],$argv[1]);
@@ -265,7 +280,11 @@ 
 		{
 			die("\nYou need to be root to do that!\n\n");
 		}
-		if (!is_writable($GLOBALS['egw_info']['server']['files_dir'])) exit;	// we need write access, error msg already given
+		if (!is_writable($GLOBALS['egw_info']['server']['files_dir']))
+		{
+			exit;
+		}
+		// we need write access, error msg already given
 		$fstab = egw_vfs::mount();
 		if (!is_array($fstab) || !isset($fstab['/']) || strpos($fstab['/'],'storage=db') === false)
 		{
@@ -278,7 +297,10 @@ 
 		$num_files = sqlfs_utils::migrate_db2fs();	// throws exception on error
 		echo "\n$num_files files migrated from DB to filesystem.\n";
 		$new_url = preg_replace('/storage=db&?/','',$fstab['/']);
-		if (substr($new_url,-1) == '?') $new_url = substr($new_url,0,-1);
+		if (substr($new_url,-1) == '?')
+		{
+			$new_url = substr($new_url,0,-1);
+		}
 		if (egw_vfs::mount($new_url,'/'))
 		{
 			echo "/ successful re-mounted on $new_url\n";
@@ -321,7 +343,10 @@ 
 					break;
 
 				case 'mkdir':
-					if (!mkdir($url,null,$recursive)) echo "Can't create directory, permission denied!\n";
+					if (!mkdir($url,null,$recursive))
+					{
+						echo "Can't create directory, permission denied!\n";
+					}
 					break;
 
 				case 'touch':
@@ -339,7 +364,11 @@ 
 								$mode = $url;	// first param is mode
 								$url = array_shift($argv);
 							}
-							if (egw_vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// cant use stat or egw_vfs::mode2int otherwise!
+							if (egw_vfs::parse_url($url,PHP_URL_SCHEME))
+							{
+								load_wrapper($url);
+							}
+							// cant use stat or egw_vfs::mode2int otherwise!
 
 							if (strpos($mode,'+') !== false || strpos($mode,'-') !== false)
 							{
@@ -364,7 +393,11 @@ 
 							{
 								$owner = $url;	// first param is owner/group
 								$url = array_shift($argv);
-								if (egw_vfs::parse_url($url,PHP_URL_SCHEME)) load_wrapper($url);	// we need the header loaded
+								if (egw_vfs::parse_url($url,PHP_URL_SCHEME))
+								{
+									load_wrapper($url);
+								}
+								// we need the header loaded
 								if ($owner == 'root')
 								{
 									$owner = 0;
@@ -420,13 +453,19 @@ 
 					{
 						if ($argc)
 						{
-							if (!($name = basename(egw_vfs::parse_url($url,PHP_URL_PATH)))) $name = '/';
+							if (!($name = basename(egw_vfs::parse_url($url,PHP_URL_PATH))))
+							{
+								$name = '/';
+							}
 							echo "\n$name:\n";
 						}
 						// separate evtl. query part, to re-add it after the file-name
 						unset($query);
 						list($url,$query) = explode('?',$url,2);
-						if ($query) $query = '?'.$query;
+						if ($query)
+						{
+							$query = '?'.$query;
+						}
 
 						if (substr($url,-1) == '/')
 						{
@@ -458,7 +497,10 @@ 
 					{
 						do_stat($url,$long,$numeric,false,$inode);
 					}
-					if (!$long && $cmd == 'ls') echo "\n";
+					if (!$long && $cmd == 'ls')
+					{
+						echo "\n";
+					}
 					break;
 			}
 		}
@@ -662,18 +704,36 @@ 
 			{
 				$uid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name($stat['uid']) :
 					(function_exists('posix_getpwuid') ? posix_getpwuid($stat['uid']) : $stat['uid']);
-				if (is_array($uid)) $uid = $uid['name'];
-				if (empty($uid)) $uid = $stat['uid'];
+				if (is_array($uid))
+				{
+					$uid = $uid['name'];
+				}
+				if (empty($uid))
+				{
+					$uid = $stat['uid'];
+				}
+			}
+			if (!isset($uid))
+			{
+				$uid = 'root';
 			}
-			if (!isset($uid)) $uid = 'root';
 			if ($stat['gid'])
 			{
 				$gid = isset($GLOBALS['egw']) ? $GLOBALS['egw']->accounts->id2name(-abs($stat['gid'])) :
 					(function_exists('posix_getgrgid') ? posix_getgrgid($stat['gid']) : $stat['gid']);
-				if (is_array($gid)) $gid = $gid['name'];
-				if (empty($gid)) $gid = $stat['gid'];
+				if (is_array($gid))
+				{
+					$gid = $gid['name'];
+				}
+				if (empty($gid))
+				{
+					$gid = $stat['gid'];
+				}
+			}
+			if (!isset($gid))
+			{
+				$gid = 'root';
 			}
-			if (!isset($gid)) $gid = 'root';
 		}
 		$size = hsize($stat['size']);
 		$mtime = date('Y-m-d H:i:s',$stat['mtime']);
@@ -696,8 +756,14 @@ 
 
 function hsize($size)
 {
-	if ($size < 1024) return $size;
-	if ($size < 1024*1024) return sprintf('%3.1lfk',(float)$size/1024);
+	if ($size < 1024)
+	{
+		return $size;
+	}
+	if ($size < 1024*1024)
+	{
+		return sprintf('%3.1lfk',(float)$size/1024);
+	}
 	return sprintf('%3.1lfM',(float)$size/(1024*1024));
 }
 
@@ -731,14 +797,20 @@ 
 					++$anz_files;
 					_cp($f,$t);
 				}
-				if ($perms) _cp_perms($f,$t);
+				if ($perms)
+				{
+					_cp_perms($f,$t);
+				}
 			}
 			echo ($anz_dirs?"$anz_dirs dir(s) created and ":'')."$anz_files file(s) copied.\n";
 		}
 		else
 		{
 			_cp($from,$to,true);
-			if ($perms) _cp_perms($from,$to);
+			if ($perms)
+			{
+				_cp_perms($from,$to);
+			}
 		}
 	}
 }
@@ -767,7 +839,10 @@ 
 	//stream_filter_append($from_fp,'convert.base64-decode');
 	$count = stream_copy_to_stream($from_fp,$to_fp);
 
-	if ($verbose) echo hsize($count)." bytes written to $to\n";
+	if ($verbose)
+	{
+		echo hsize($count)." bytes written to $to\n";
+	}
 
 	fclose($from_fp);
 
@@ -814,7 +889,10 @@ 
 function do_lntree($from,$to)
 {
 	echo "lntree $from $to\n";
-	if ($from[0] == '/') $from = 'sqlfs://default'.$from;
+	if ($from[0] == '/')
+	{
+		$from = 'sqlfs://default'.$from;
+	}
 	load_wrapper($from);
 
 	if (!file_exists($from))
@@ -876,34 +954,55 @@ 
  */
 function int2mode( $mode )
 {
-	if(($mode & 0xA000) == 0xA000) // Symbolic Link
+	if(($mode & 0xA000) == 0xA000)
+	{
+		// Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif(($mode & 0xC000) == 0xC000) // Socket
+	}
+	elseif(($mode & 0xC000) == 0xC000)
+	{
+		// Socket
 	{
 		$sP = 's';
 	}
-	elseif($mode & 0x1000)     // FIFO pipe
+	}
+	elseif($mode & 0x1000)
+	{
+		// FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($mode & 0x2000) // Character special
+	}
+	elseif($mode & 0x2000)
+	{
+		// Character special
 	{
 		$sP = 'c';
 	}
-	elseif($mode & 0x4000) // Directory
+	}
+	elseif($mode & 0x4000)
+	{
+		// Directory
 	{
 		$sP = 'd';
 	}
-	elseif($mode & 0x6000) // Block special
+	}
+	elseif($mode & 0x6000)
+	{
+		// Block special
 	{
 		$sP = 'b';
 	}
-	elseif($mode & 0x8000) // Regular
+	}
+	elseif($mode & 0x8000)
+	{
+		// Regular
 	{
 		$sP = '-';
 	}
+	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';

calendar/sitemgr/class.module_calendar_month.inc.php

Braces +2 added lines, -1 removed lines

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

Spacing +34 added lines, -35 removed lines

@@ -51,7 +51,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(
@@ -103,8 +103,8 @@ 
 	function get_user_interface()
 	{
 		// copied from bookmarks module.
-		$cat = createobject('phpgwapi.categories','','calendar');
-		$cats = $cat->return_array('all',0,False,'','cat_name','',True);
+		$cat = createobject('phpgwapi.categories', '', 'calendar');
+		$cats = $cat->return_array('all', 0, False, '', 'cat_name', '', True);
 		$cat_ids = array();
 		while (list(,$category) = @each($cats))
 		{
@@ -115,12 +115,12 @@ 
 			$this->arguments['category']['multiple'] = 5;
 		}
 
-		if (! isset($GLOBALS['egw']->accounts))
+		if (!isset($GLOBALS['egw']->accounts))
 		{
 			$GLOBALS['egw']->accounts = new accounts();
 		}
-		$this->accounts =& $GLOBALS['egw']->accounts;
-		$search_params=array(
+		$this->accounts = & $GLOBALS['egw']->accounts;
+		$search_params = array(
 			'type' => 'both',
 			'app' => 'calendar',
 		);
@@ -130,7 +130,7 @@ 
 		// sort users and groups separately.
 		if (isset($GLOBALS['sitemgr_info']['anonymous_user']))
 		{
-			$anon_user = $this->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user'],'account_lid','u');
+			$anon_user = $this->accounts->name2id($GLOBALS['sitemgr_info']['anonymous_user'], 'account_lid', 'u');
 		}
 		else
 		{
@@ -139,7 +139,7 @@ 
 			 * Get possible sitemgr paths from the HTTP_REFERRER in order to unreveal the
 			 * anonymous user for the correct site.
 			 */
-			$sitemgr_path = preg_replace('/^[^\/]+:\/\/[^\/]+\/([^\?]*)(\?.*)*$/',"/\${1}",$_SERVER['HTTP_REFERER']);
+			$sitemgr_path = preg_replace('/^[^\/]+:\/\/[^\/]+\/([^\?]*)(\?.*)*$/', "/\${1}", $_SERVER['HTTP_REFERER']);
 			// Remove the trailing file- / pathname if any
 			$sitemgr_path = preg_replace('/[^\/]*$/', '', $sitemgr_path);
 			// Add leading slash if it has been lost.
@@ -151,17 +151,17 @@ 
 			// Code adapted from sitemgr-site/index.php
 			$site_urls = array();
 			$site_urls[] = $sitemgr_path;
-			$site_urls[] = ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_ADDR'] . $sitemgr_path;
-			$site_urls[] = $site_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://') . $_SERVER['SERVER_NAME'] . $sitemgr_path;
+			$site_urls[] = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_ADDR'].$sitemgr_path;
+			$site_urls[] = $site_url = ($_SERVER['HTTPS'] ? 'https://' : 'http://').$_SERVER['SERVER_NAME'].$sitemgr_path;
 
-			$GLOBALS['egw']->db->select('egw_sitemgr_sites','anonymous_user,anonymous_passwd,site_id',
-				array('site_url' => $site_urls),__LINE__,__FILE__,false,'','sitemgr');
+			$GLOBALS['egw']->db->select('egw_sitemgr_sites', 'anonymous_user,anonymous_passwd,site_id',
+				array('site_url' => $site_urls), __LINE__, __FILE__, false, '', 'sitemgr');
 
 			$GLOBALS['egw']->db->next_record();
-			$anon_user = $this->accounts->name2id($GLOBALS['egw']->db->f('anonymous_user'),'account_lid','u');
+			$anon_user = $this->accounts->name2id($GLOBALS['egw']->db->f('anonymous_user'), 'account_lid', 'u');
 		}
 
-		$anon_groups = $this->accounts->memberships($anon_user,true);
+		$anon_groups = $this->accounts->memberships($anon_user, true);
 		foreach ($accounts as $entry)
 		{
 			$is_group = false;
@@ -169,9 +169,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 & EGW_ACL_READ) || ($entry['account_id'] == $anon_user))
+			if (($rights&EGW_ACL_READ) || ($entry['account_id'] == $anon_user))
 			{
 				$has_read_permissions = true;
 			}
@@ -181,8 +181,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 & EGW_ACL_READ) || ($entry['account_id'] == $parent_group))
+					$rights = $acl->get_rights($parent_group, 'calendar');
+					if (($rights&EGW_ACL_READ) || ($entry['account_id'] == $parent_group))
 					{
 						$has_read_permissions = true;
 						break;
@@ -198,7 +198,7 @@ 
 				}
 				else
 				{
-					$users[$entry['account_id']] = $GLOBALS['egw']->common->display_fullname($entry['account_lid'],$entry['account_firstname'],$entry['account_lastname']);
+					$users[$entry['account_id']] = $GLOBALS['egw']->common->display_fullname($entry['account_lid'], $entry['account_firstname'], $entry['account_lastname']);
 				}
 			}
 		}
@@ -218,7 +218,7 @@ 
 		return parent::get_user_interface();
 	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
 		$html = "";
 		$GLOBALS['egw']->translation->add_app('calendar');
@@ -226,34 +226,33 @@ 
 		$this->ui->allowEdit = false;
 		$this->ui->use_time_grid = isset($arguments['grid']) ? $arguments['grid'] : false;
 
-		$weeks = $arguments['numWeeks'] ? (int) $arguments['numWeeks'] : 2;
+		$weeks = $arguments['numWeeks'] ? (int)$arguments['numWeeks'] : 2;
 
-		if (($arguments['acceptDateParam']) && (get_var('date',array('POST','GET'))))
+		if (($arguments['acceptDateParam']) && (get_var('date', array('POST', 'GET'))))
 		{
-			$start = (int) (strtotime(get_var('date',array('POST','GET'))) +
+			$start = (int)(strtotime(get_var('date', array('POST', 'GET'))) +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		else
 		{
-			$start = (int) ($this->bo->now_su +
+			$start = (int)($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		$first = $this->ui->datetime->get_weekday_start(
-					adodb_date('Y',$start),
-					adodb_date('m',$start),
-					adodb_date('d',$start));
-		$last = strtotime("+$weeks weeks",$first) - 1;
+					adodb_date('Y', $start),
+					adodb_date('m', $start),
+					adodb_date('d', $start));
+		$last = strtotime("+$weeks weeks", $first) - 1;
 
 		if ($arguments['showTitle'])
 		{
 			$html .= '<div id="divAppboxHeader">'.$GLOBALS['egw_info']['apps']['calendar']['title'].' - '.lang('Weekview').": ";
-			$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
-		(
+		$search_params = Array(
 			'offset' => false,
 			'order' => 'cal_start ASC',
 			'start' => $first,
@@ -288,24 +287,24 @@ 
 		$html .= '<!-- END Calendar info -->'."\n";
 		unset($css_file);
 		// we add DAY_s/2 to $this->first (using 12h), to deal with daylight saving changes
-		for ($week_start = $first; $week_start < $last; $week_start = strtotime("+1 week",$week_start))
+		for ($week_start = $first; $week_start < $last; $week_start = strtotime("+1 week", $week_start))
 		{
 			$week = array();
 			for ($i = 0; $i < 7; ++$i)
 			{
-				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days",$week_start) : $week_start);
+				$day_ymd = $this->bo->date2string($i ? strtotime("+$i days", $week_start) : $week_start);
 				$week[$day_ymd] = array_shift($rows);
 			}
 			$week_view = array(
 				'menuaction' => false,
 				'date' => $this->bo->date2string($week_start),
 			);
-			$title = lang('Wk').' '.adodb_date('W',$week_start);
+			$title = lang('Wk').' '.adodb_date('W', $week_start);
 			if (!isset($GLOBALS['egw']->template))
 			{
 				$GLOBALS['egw']->template = new Template;
 			}
-			$html .= $this->ui->timeGridWidget($this->ui->tagWholeDayOnTop($week),$weeks == 2 ? 30 : 60,200,'',$title,0,$week_start+WEEK_s >= $last);
+			$html .= $this->ui->timeGridWidget($this->ui->tagWholeDayOnTop($week), $weeks == 2 ? 30 : 60, 200, '', $title, 0, $week_start + WEEK_s >= $last);
 		}
 		// Initialize Tooltips
 		$html .= '<script language="JavaScript" type="text/javascript" src="'.$GLOBALS['egw_info']['server']['webserver_url'].'/phpgwapi/js/wz_tooltip/wz_tooltip.js"></script>'."\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',

calendar/sitemgr/class.module_calendar_list.inc.php

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 +37 added lines, -38 removed lines

@@ -88,7 +88,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(
@@ -154,8 +154,8 @@ 
 	{
 		//_debug_array($GLOBALS['Common_BO']->sites->current_site);
 		// copied from bookmarks module.
-		$cat = createobject('phpgwapi.categories','','calendar');
-		$cats = $cat->return_array('all',0,False,'','cat_name','',True);
+		$cat = createobject('phpgwapi.categories', '', 'calendar');
+		$cats = $cat->return_array('all', 0, False, '', 'cat_name', '', True);
 		$cat_ids = array();
 		while (list(,$category) = @each($cats))
 		{
@@ -170,7 +170,7 @@ 
 		{
 			$GLOBALS['egw']->accounts = new accounts();
 		}
-		$this->accounts =& $GLOBALS['egw']->accounts;
+		$this->accounts = & $GLOBALS['egw']->accounts;
 		$search_params = array(
 			'type' => 'both',
 			'app' => 'calendar',
@@ -179,8 +179,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;
@@ -188,9 +188,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 & EGW_ACL_READ) || ($entry['account_id'] == $anon_user))
+			if (($rights&EGW_ACL_READ) || ($entry['account_id'] == $anon_user))
 			{
 				$has_read_permissions = true;
 			}
@@ -200,8 +200,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 & EGW_ACL_READ) || ($entry['account_id'] == $parent_group))
+					$rights = $acl->get_rights($parent_group, 'calendar');
+					if (($rights&EGW_ACL_READ) || ($entry['account_id'] == $parent_group))
 					{
 						$has_read_permissions = true;
 						break;
@@ -217,7 +217,7 @@ 
 				}
 				else
 				{
-					$users[$entry['account_id']] = $GLOBALS['egw']->common->display_fullname($entry['account_lid'],$entry['account_firstname'],$entry['account_lastname']);
+					$users[$entry['account_id']] = $GLOBALS['egw']->common->display_fullname($entry['account_lid'], $entry['account_firstname'], $entry['account_lastname']);
 				}
 			}
 		}
@@ -237,7 +237,7 @@ 
 		return parent::get_user_interface();
 	}
 
-	function get_content(&$arguments,$properties)
+	function get_content(&$arguments, $properties)
 	{
 		$html = "";
 		$GLOBALS['egw']->translation->add_app('calendar');
@@ -246,41 +246,40 @@ 
 		$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 = $start = (int) (strtotime(get_var('date',array('POST','GET'))) +
+			$first = $start = (int)(strtotime(get_var('date', array('POST', 'GET'))) +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		else
 		{
-			$first = $start = (int) ($this->bo->now_su +
+			$first = $start = (int)($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
 		if ($arguments['useWeekStart']) 
 		{
 			$first = $this->ui->datetime->get_weekday_start(
-				adodb_date('Y',$start),
-				adodb_date('m',$start),
-				adodb_date('d',$start));
+				adodb_date('Y', $start),
+				adodb_date('m', $start),
+				adodb_date('d', $start));
 		}
 
-		$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,
@@ -300,23 +299,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>";
 		}
@@ -329,11 +328,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";
@@ -345,17 +344,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";

Braces +17 added lines, -6 removed lines

@@ -162,7 +162,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;
 		}
 
@@ -259,7 +260,7 @@ 
 			$first = $start = (int) ($this->bo->now_su +
 					(60 * 60 * 24 * 7 * $dateOffset));
 		}
-		if ($arguments['useWeekStart']) 
+		if ($arguments['useWeekStart'])
 		{
 			$first = $this->ui->datetime->get_weekday_start(
 				adodb_date('Y',$start),
@@ -308,8 +309,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))
@@ -335,7 +344,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
@@ -351,7 +361,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";

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 +14 added lines, -14 removed lines

@@ -39,23 +39,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: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)",$_GET['user']));
+	fail_exit(lang("freebusy: Unknow user '%1', wrong password or not availible to not loged in users !!!"." $username($user)", $_GET['user']));
 }
 if (!$loged_in)
 {
@@ -76,11 +76,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']))
 		{
@@ -90,8 +90,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();
 		}
@@ -107,6 +107,6 @@ 
 }
 else
 {
-	html::content_header('freebusy.ifb','text/calendar');
+	html::content_header('freebusy.ifb', 'text/calendar');
 }
-echo ExecMethod2('calendar.calendar_ical.freebusy',$user,$_GET['end']);
+echo ExecMethod2('calendar.calendar_ical.freebusy', $user, $_GET['end']);

calendar/inc/class.calendar_wizard_export_csv.inc.php

Spacing +1 added lines, -1 removed lines

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

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['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',

Doc Comments +1 added lines, -1 removed lines

@@ -359,7 +359,7 @@
 	/**
 	 * Return the current element
 	 *
-	 * @return DateTime
+	 * @return string
 	 */
 	public function current()
 	{

Spacing +90 added lines, -90 removed lines

@@ -74,8 +74,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',
 	);
 
@@ -85,8 +85,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',
 	);
 
@@ -142,7 +142,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
@@ -170,14 +170,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
@@ -220,9 +220,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;
@@ -236,7 +236,7 @@ 
 
 		$this->time = $time instanceof egw_time ? $time : new egw_time($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 egw_exception_wrong_parameter(__METHOD__."($time,$type,$interval,$enddate,$weekdays,...) type $type is NOT valid!");
 		}
@@ -246,16 +246,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
@@ -272,7 +272,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;
 
@@ -302,7 +302,7 @@ 
 		}
 		if ($exceptions)
 		{
-			foreach($exceptions as $exception)
+			foreach ($exceptions as $exception)
 			{
 				$exception->setTimezone($this->time->getTimezone());
 				$this->exceptions[] = $exception->format('Ymd');
@@ -318,22 +318,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;
@@ -349,9 +349,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 egw_time();
-		$last_day->setDate($year,$month+1,0);
+		$last_day->setDate($year, $month + 1, 0);
 
 		return (int)$last_day->format('d');
 	}
@@ -381,7 +381,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:
@@ -396,28 +396,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";
@@ -425,10 +425,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;
 
@@ -450,7 +450,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));
 	}
 
 	/**
@@ -482,7 +482,7 @@ 
 		if (isset($this->current)) $backup = $this->current;
 		$this->rewind();
 
-		while(--$count > 0)
+		while (--$count > 0)
 		{
 			$this->next_no_exception();
 		}
@@ -507,7 +507,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;
 		}
@@ -526,7 +526,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();
 		}
@@ -537,7 +537,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	public function valid ()
+	public function valid()
 	{
 		return $this->current->format('Ymd') <= $this->enddate_ymd;
 	}
@@ -551,9 +551,9 @@ 
 	{
 		$str = '';
 		// Repeated Events
-		if($this->type != self::NONE)
+		if ($this->type != self::NONE)
 		{
-			list($str) = explode(' (',lang(self::$types[$this->type]));	// remove (by day/date) from Monthly
+			list($str) = explode(' (', lang(self::$types[$this->type])); // remove (by day/date) from Monthly
 
 			$str_extra = array();
 			switch ($this->type)
@@ -569,7 +569,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');
 					}
@@ -577,24 +577,24 @@ 
 					{
 						foreach (self::$days as $mask => $label)
 						{
-							if ($this->weekdays & $mask)
+							if ($this->weekdays&$mask)
 							{
 								$repeat_days[] = lang($label);
 							}
 						}
 					}
-					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;
 			}
@@ -610,9 +610,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;
@@ -624,24 +624,24 @@ 
 	 *
 	 * $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:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(' ', $repeat_days);
@@ -654,7 +654,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;
 			}
@@ -672,9 +672,9 @@ 
 				case self::WEEKLY:
 					foreach (self::$days as $mask => $label)
 					{
-						if ($this->weekdays & $mask)
+						if ($this->weekdays&$mask)
 						{
-							$repeat_days[] = strtoupper(substr($label,0,2));
+							$repeat_days[] = strtoupper(substr($label, 0, 2));
 						}
 					}
 					$rrule['BYDAY'] = implode(',', $repeat_days);
@@ -685,8 +685,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)
@@ -721,12 +721,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 ? egw_time::$user_timezone : egw_time::$server_timezone;
-		$time = is_a($event['start'],'DateTime') ? $event['start'] : new egw_time($event['start'],$timestamp_tz);
+		$time = is_a($event['start'], 'DateTime') ? $event['start'] : new egw_time($event['start'], $timestamp_tz);
 
 		if (!isset(self::$tz_cache[$to_tz]))
 		{
@@ -739,16 +739,16 @@ 
 
 		if ($event['recur_enddate'])
 		{
-			$enddate = is_a($event['recur_enddate'],'DateTime') ? $event['recur_enddate'] : new egw_time($event['recur_enddate'],$timestamp_tz);
+			$enddate = is_a($event['recur_enddate'], 'DateTime') ? $event['recur_enddate'] : new egw_time($event['recur_enddate'], $timestamp_tz);
 		}
 		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 egw_time($exception,$timestamp_tz);
+				$exceptions[] = is_a($exception, 'DateTime') ? $exception : new egw_time($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);
 	}
 
 	/**
@@ -774,7 +774,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
@@ -795,7 +795,7 @@ 
 			self::$tz_cache[$to_tz] = calendar_timezones::DateTimeZone($to_tz);
 		}
 
-		$time = is_a($starttime,'DateTime') ?
+		$time = is_a($starttime, 'DateTime') ?
 			$starttime : new egw_time($starttime, egw_time::$server_timezone);
 		$time->setTimezone(self::$tz_cache[$event['tzid']]);
 		$remote = clone $time;
@@ -813,11 +813,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;
@@ -828,8 +828,8 @@ 
 
 if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__)	// some tests
 {
-	ini_set('display_errors',1);
-	error_reporting(E_ALL & ~E_NOTICE);
+	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';
 	require_once('../../phpgwapi/inc/class.egw_time.inc.php');
@@ -838,7 +838,7 @@ 
 
 	if (!isset($_REQUEST['time']))
 	{
-		$now = new egw_time('now',new DateTimeZone($_REQUEST['tz'] = 'UTC'));
+		$now = new egw_time('now', new DateTimeZone($_REQUEST['tz'] = 'UTC'));
 		$_REQUEST['time'] = $now->format();
 		$_REQUEST['type'] = calendar_rrule::WEEKLY;
 		$_REQUEST['interval'] = 2;
@@ -847,29 +847,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: ".html::input('time',$_REQUEST['time']).
-		html::select('tz',$_REQUEST['tz'],egw_time::getTimezones())."</p>\n";
-	echo "<p>Type: ".html::select('type',$_REQUEST['type'],calendar_rrule::$types)."\n".
-		"Interval: ".html::input('interval',$_REQUEST['interval'])."</p>\n";
+	echo "<p>Date+Time: ".html::input('time', $_REQUEST['time']).
+		html::select('tz', $_REQUEST['tz'], egw_time::getTimezones())."</p>\n";
+	echo "<p>Type: ".html::select('type', $_REQUEST['type'], calendar_rrule::$types)."\n".
+		"Interval: ".html::input('interval', $_REQUEST['interval'])."</p>\n";
 	echo "<table><tr><td>\n";
-	echo "Weekdays:<br />".html::checkbox_multiselect('weekdays',$_REQUEST['weekdays'],calendar_rrule::$days,false,'','7',false,'height: 150px;')."\n";
+	echo "Weekdays:<br />".html::checkbox_multiselect('weekdays', $_REQUEST['weekdays'], calendar_rrule::$days, false, '', '7', false, 'height: 150px;')."\n";
 	echo "</td><td>\n";
-	echo "<p>Exceptions:<br />".html::textarea('exceptions',$_REQUEST['exceptions'],'style="height: 150px;"')."\n";
+	echo "<p>Exceptions:<br />".html::textarea('exceptions', $_REQUEST['exceptions'], 'style="height: 150px;"')."\n";
 	echo "</td></tr></table>\n";
-	echo "<p>Enddate: ".html::input('enddate',$_REQUEST['enddate'])."</p>\n";
-	echo "<p>Display recurances in ".html::select('user-tz',$_REQUEST['user-tz'],egw_time::getTimezones())."</p>\n";
-	echo "<p>".html::submit_button('calc','Calculate')."</p>\n";
+	echo "<p>Enddate: ".html::input('enddate', $_REQUEST['enddate'])."</p>\n";
+	echo "<p>Display recurances in ".html::select('user-tz', $_REQUEST['user-tz'], egw_time::getTimezones())."</p>\n";
+	echo "<p>".html::submit_button('calc', 'Calculate')."</p>\n";
 	echo "</form>\n";
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
-	$time = new egw_time($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new egw_time($_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 egw_time($exception); }
+	$time = new egw_time($_REQUEST['time'], $tz);
+	if ($_REQUEST['enddate']) $enddate = new egw_time($_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 egw_time($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(egw_time::$user_timezone);
 		echo ++$n.': '.$rtime->format('l').', '.$rtime."<br />\n";

Braces +58 added lines, -14 removed lines

@@ -336,7 +336,10 @@ 
 				$duration = 366*24*3600;
 				break;
 		}
-		if ($interval > 1) $duration *= $interval;
+		if ($interval > 1)
+		{
+			$duration *= $interval;
+		}
 
 		return $duration;
 	}
@@ -479,7 +482,10 @@ 
 		{
 			return clone $this->time;
 		}
-		if (isset($this->current)) $backup = $this->current;
+		if (isset($this->current))
+		{
+			$backup = $this->current;
+		}
 		$this->rewind();
 
 		while(--$count > 0)
@@ -487,7 +493,10 @@ 
 			$this->next_no_exception();
 		}
 		$ret = clone $this->current;
-		if ($backup) $this->current = $backup;
+		if ($backup)
+		{
+			$this->current = $backup;
+		}
 		return $ret;
 	}
 
@@ -629,7 +638,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')
 		{
@@ -723,8 +736,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 ? egw_time::$user_timezone : egw_time::$server_timezone;
 		$time = is_a($event['start'],'DateTime') ? $event['start'] : new egw_time($event['start'],$timestamp_tz);
 
@@ -784,7 +803,10 @@ 
 			$event['recur_type'] == self::NONE ||
 			empty($event['recur_data']) || $event['recur_data'] == ALLDAYS ||
 			empty($event['tzid']) || empty($to_tz) ||
-			$event['tzid'] == $to_tz) return;
+			$event['tzid'] == $to_tz)
+		{
+			return;
+		}
 
 		if (!isset(self::$tz_cache[$event['tzid']]))
 		{
@@ -813,11 +835,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;
@@ -826,11 +856,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('../../phpgwapi/inc/class.egw_time.inc.php');
 	require_once('../../phpgwapi/inc/class.html.inc.php');
@@ -863,9 +898,18 @@ 
 
 	$tz = new DateTimeZone($_REQUEST['tz']);
 	$time = new egw_time($_REQUEST['time'],$tz);
-	if ($_REQUEST['enddate']) $enddate = new egw_time($_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 egw_time($exception); }
+	if ($_REQUEST['enddate'])
+	{
+		$enddate = new egw_time($_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 egw_time($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_hooks.inc.php

Braces +25 added lines, -6 removed lines

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

Spacing +36 added lines, -36 removed lines

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

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

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

setup/check_install.php

Braces +119 added lines, -30 removed lines

@@ -239,10 +239,15 @@ 
 		foreach(explode(PATH_SEPARATOR,$open_basedir) as $dir)
 		{
 			$dir = realpath($dir);
-			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir)) break;
+			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir))
+			{
+				break;
+			}
 		}
 	}
-	if ($sp_visible)	// only check if session_save_path is visible by webserver
+	if ($sp_visible)
+	{
+		// only check if session_save_path is visible by webserver
 	{
 		$checks[$session_path] = array(
 			'func' => 'permission_check',
@@ -251,17 +256,25 @@ 
 			'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'),
 		);
 	}
+	}
 }
 $setup_info = $GLOBALS['egw_setup']->detection->get_versions();
 foreach($setup_info as $app => $app_data)
 {
-	if (!isset($app_data['check_install'])) continue;
+	if (!isset($app_data['check_install']))
+	{
+		continue;
+	}
 
 	foreach ($app_data['check_install'] as $name => $data)
 	{
 		if (isset($checks[$name]))
 		{
-			if ($checks[$name] == $data) continue;	// identical check --> ignore it
+			if ($checks[$name] == $data)
+			{
+				continue;
+			}
+			// identical check --> ignore it
 
 			if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
 			{
@@ -269,9 +282,18 @@ 
 				{
 					$checks[$name]['from'] = array($checks[$name]['from']);
 				}
-				if (!isset($data['from'])) $data['from'] = $app;
-				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from'])) $checks[$name]['from'] = array();
-				if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
+				if (!isset($data['from']))
+				{
+					$data['from'] = $app;
+				}
+				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from']))
+				{
+					$checks[$name]['from'] = array();
+				}
+				if (!in_array($data['from'],$checks[$name]['from']))
+				{
+					$checks[$name]['from'][] = $data['from'];
+				}
 			}
 			else
 			{
@@ -280,7 +302,10 @@ 
 		}
 		else
 		{
-			if (!isset($data['from'])) $data['from'] = $app;
+			if (!isset($data['from']))
+			{
+				$data['from'] = $app;
+			}
 			$checks[$name] = $data;
 		}
 		//echo "added check $data[func]($name) for $app"; _debug_array($data);
@@ -298,7 +323,10 @@ 
 		}
 	}
 }
-if ($checks) $sorted_checks += $checks;
+if ($checks)
+{
+	$sorted_checks += $checks;
+}
 
 function php_version($name,$args)
 {
@@ -351,22 +379,35 @@ 
 	}
 	@include_once 'PEAR/Config.php';
 
-	if (!class_exists('PEAR_Config')) return false;
+	if (!class_exists('PEAR_Config'))
+	{
+		return false;
+	}
 
 	$config = new PEAR_Config('',$pear_config);
 	//echo "<pre>config = ".print_r($config,true)."</pre>\n";
 
-	if (empty($channel)) $channel = $config->get('default_channel');
+	if (empty($channel))
+	{
+		$channel = $config->get('default_channel');
+	}
 	//echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
 
-	if (!method_exists($config,'getRegistry')) return false;	// PEAR version to old
+	if (!method_exists($config,'getRegistry'))
+	{
+		return false;
+	}
+	// PEAR version to old
 
 	$reg = &$config->getRegistry();
 	//echo "<pre>reg = ".print_r($reg,true)."</pre>\n";
 
 	// a bug in pear causes an endless loop if the install-dir does not exist
 	// bug reported: http://pear.php.net/bugs/bug.php?id=11317
-	if (!file_exists($reg->install_dir)) return false;
+	if (!file_exists($reg->install_dir))
+	{
+		return false;
+	}
 
 	$installed = $reg->packageInfo(null,null,$channel);
 
@@ -376,7 +417,10 @@ 
 	{
 		$name = isset($package['package']) ? $package['package'] : $package['name'];
 		$version = $package['version'];
-		if (is_array($version)) $version = $version['release'];
+		if (is_array($version))
+		{
+			$version = $version['release'];
+		}
 
 		$packages[$name] = $version;
 		//echo "<p>$name: ".print_r($package['version'],true)."</p>\n";
@@ -415,7 +459,10 @@ 
 		{
 			$pear_available = $found = true;
 			// check if package is installed
-			if ($package && isset($pear_packages[$package])) $available = true;
+			if ($package && isset($pear_packages[$package]))
+			{
+				$available = true;
+			}
 			// check if it's the right version
 			$version_available = $pear_packages[$package ? $package : 'PEAR'];
 		}
@@ -425,7 +472,10 @@ 
 			{
 				$pear_available = @include_once('PEAR.php');
 
-				if (!class_exists('PEAR')) $pear_available = false;
+				if (!class_exists('PEAR'))
+				{
+					$pear_available = false;
+				}
 			}
 			$found = $pear_available;
 			if ($pear_available && $package)
@@ -434,7 +484,10 @@ 
 
 				$found = @include_once($file);
 
-				if (!class_exists($package)) $found = false;
+				if (!class_exists($package))
+				{
+					$found = false;
+				}
 			}
 		}
 	}
@@ -445,10 +498,13 @@ 
 		($available ? ($version_available ? $version_available : lang('True')) :
 		($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
 
-	if (!$available)	// give further info only if not availible
+	if (!$available)
+	{
+		// give further info only if not availible
 	{
 		echo '<div class="setup_info">' . lang('PEAR%1 is needed by: %2.',$package ? '::'.$package : '',
 			is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+	}
 
 		// if using Composer, dont confuse user with PEAR ;-)
 		if (file_exists(EGW_SERVER_ROOT.'/vendor'))
@@ -541,34 +597,55 @@ 
 
 function verbosePerms( $in_Perms )
 {
-	if($in_Perms & 0x1000)     // FIFO pipe
+	if($in_Perms & 0x1000)
+	{
+		// FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($in_Perms & 0x2000) // Character special
+	}
+	elseif($in_Perms & 0x2000)
+	{
+		// Character special
 	{
 		$sP = 'c';
 	}
-	elseif($in_Perms & 0x4000) // Directory
+	}
+	elseif($in_Perms & 0x4000)
+	{
+		// Directory
 	{
 		$sP = 'd';
 	}
-	elseif($in_Perms & 0x6000) // Block special
+	}
+	elseif($in_Perms & 0x6000)
+	{
+		// Block special
 	{
 		$sP = 'b';
 	}
-	elseif($in_Perms & 0x8000) // Regular
+	}
+	elseif($in_Perms & 0x8000)
+	{
+		// Regular
 	{
 		$sP = '-';
 	}
-	elseif($in_Perms & 0xA000) // Symbolic Link
+	}
+	elseif($in_Perms & 0xA000)
+	{
+		// Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif($in_Perms & 0xC000) // Socket
+	}
+	elseif($in_Perms & 0xC000)
+	{
+		// Socket
 	{
 		$sP = 's';
 	}
+	}
 	else                         // UNKNOWN
 	{
 		$sP = 'u';
@@ -709,9 +786,15 @@ 
 				$Ok = $Ok && permission_check(($name!='.'?$name.'/':'').$file,$args,False);
 			}
 		}
-		if ($handle) closedir($handle);
+		if ($handle)
+		{
+			closedir($handle);
+		}
+	}
+	if ($verbose)
+	{
+		echo "\n";
 	}
-	if ($verbose) echo "\n";
 
 	return $Ok;
 }
@@ -719,7 +802,10 @@ 
 function mk_value($value)
 {
 	$matches = null;
-	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches)) return $value;
+	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches))
+	{
+		return $value;
+	}
 
 	return (strtolower($matches[2]) == 'm' ? 1024*1024 : 1024) * (int) $matches[1];
 }
@@ -848,7 +934,8 @@ 
 		'T_footer' => 'footer.tpl',
 	));
 	$ConfigDomain = $_REQUEST['ConfigDomain'];
-	if (@$_GET['intro']) {
+	if (@$_GET['intro'])
+	{
 		if(($ConfigLang = setup::get_lang()))
 		{
 			$GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/');
@@ -865,7 +952,9 @@ 
 		echo '<p><a href="manageheader.php">'.lang('Skip the installation tests (not recommended)')."</a></p>\n";
 		$setup_tpl->pparse('out','T_footer');
 		exit;
-	} else {
+	}
+	else
+	{
 		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : '');
 		echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
 		# echo "<pre style=\"text-align: left;\">\n";;

Doc Comments +1 added lines

@@ -313,6 +313,7 @@
  * Check if given package is installed via composer in EGroupware's vendor directory
  *
  * @param string $package package-name in composer notation eg. "pear-pear.horde.org/Horde_Imap_Client" or "pear-pear.php.net/Net_Sieve"
+ * @return string
  */
 function composer_check($package)
 {

Spacing +121 added lines, -125 removed lines

@@ -10,7 +10,7 @@ 
  * @version $Id$
  */
 $run_by_webserver = !!$_SERVER['PHP_SELF'];
-$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
+$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 
 if ($run_by_webserver)
 {
@@ -38,9 +38,9 @@ 
 	$error_icon = '*** Error: ';
 	$warning_icon = '!!! Warning: ';
 
-	function lang($msg,$arg1=NULL,$arg2=NULL,$arg3=NULL,$arg4=NULL)
+	function lang($msg, $arg1 = NULL, $arg2 = NULL, $arg3 = NULL, $arg4 = NULL)
 	{
-		return is_null($arg1) ? $msg : str_replace(array('%1','%2','%3','%4'),array($arg1,$arg2,$arg3,$arg4),$msg);
+		return is_null($arg1) ? $msg : str_replace(array('%1', '%2', '%3', '%4'), array($arg1, $arg2, $arg3, $arg4), $msg);
 	}
 }
 
@@ -76,13 +76,13 @@ 
 		'func' => 'php_ini_check',
 		'value' => 0,
 		'verbose_value' => 'Off',
-		'warning' => lang('%1 is set to %2. This is NOT recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!','display_errors',ini_get('display_errors')),
+		'warning' => lang('%1 is set to %2. This is NOT recommeded for a production system, as displayed error messages can contain passwords or other sensitive information!', 'display_errors', ini_get('display_errors')),
 	),
 	'memory_limit' => array(
 		'func' => 'php_ini_check',
 		'value' => '128M',
 		'check' => '>=',
-		'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures','24M'),
+		'error' => lang('memory_limit is set to less than %1: some applications of eGroupWare need more than the recommend 8M, expect occasional failures', '24M'),
 		'change' => 'memory_limit = 24M'
 	),
 	'max_execution_time' => array(
@@ -102,14 +102,14 @@ 
 		'func' => 'php_ini_check',
 		'value' => '8M',
 		'check' => '>=',
-		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!','upload_max_filesize',ini_get('upload_max_filesize')),
+		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!', 'upload_max_filesize', ini_get('upload_max_filesize')),
 		'change' => 'upload_max_filesize = 8M'
 	),
 	'post_max_size' => array(
 		'func' => 'php_ini_check',
 		'value' => '8M',
 		'check' => '>=',
-		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!','post_max_size',ini_get('max_post_size')),
+		'error' => lang('%1 is set to %2, you will NOT be able to upload or attach files bigger then that!', 'post_max_size', ini_get('max_post_size')),
 		'change' => 'post_max_size = 8M'
 	),
 	'allow_url_fopen' => array(
@@ -135,7 +135,7 @@ 
 		'verbose_value' => '"System/Localtime"',
 		'check' => '!=',
 		'error' => lang('No VALID timezone set! ("%1" is NOT sufficient, you have to use a timezone identifer like "%2", see %3full list of valid identifers%4)',
-			'System/Localtime','Europe/Berlin','<a href="http://www.php.net/manual/en/timezones.php" target="_blank">','</a>'),
+			'System/Localtime', 'Europe/Berlin', '<a href="http://www.php.net/manual/en/timezones.php" target="_blank">', '</a>'),
 	),
 	'pdo' => array(
 		'func' => 'extension_check',
@@ -143,19 +143,19 @@ 
 	),
 	'mysqli' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','mysql','MySQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'mysql', 'MySQL')
 	),
 	'pdo_mysql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_mysql','MySQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pdo_mysql', 'MySQL')
 	),
 	'pgsql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pgsql','pgSQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pgsql', 'pgSQL')
 	),
 	'pdo_pgsql' => array(
 		'func' => 'extension_check',
-		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.','pdo_pgsql','pgSQL')
+		'warning' => lang('The %1 extension is needed, if you plan to use a %2 database.', 'pdo_pgsql', 'pgSQL')
 	),
 	/* disable checks for other database extensions, as we are not really supporting them anymore
 	'mssql' => array(
@@ -199,7 +199,7 @@ 
 	realpath('..') => array(
 		'func' => 'permission_check',
 		'is_world_writable' => False,
-		'only_if_exists' => true,	// quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir
+		'only_if_exists' => true, // quitens "file does not exist" for doc symlinks in Debian to files outside open_basedir
 		'recursiv' => True
 	),
 	realpath('../header.inc.php') => array(
@@ -233,10 +233,10 @@ 
 	$sp_visible = true;
 	if (($open_basedir = ini_get('open_basedir')) && $open_basedir != 'none')
 	{
-		foreach(explode(PATH_SEPARATOR,$open_basedir) as $dir)
+		foreach (explode(PATH_SEPARATOR, $open_basedir) as $dir)
 		{
 			$dir = realpath($dir);
-			if (($sp_visible = substr($session_path,0,strlen($dir)) == $dir)) break;
+			if (($sp_visible = substr($session_path, 0, strlen($dir)) == $dir)) break;
 		}
 	}
 	if ($sp_visible)	// only check if session_save_path is visible by webserver
@@ -244,13 +244,13 @@ 
 		$checks[$session_path] = array(
 			'func' => 'permission_check',
 			'is_writable' => true,
-			'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver",session_save_path()),
+			'msg' => lang("Checking if php.ini setting session.save_path='%1' is writable by the webserver", session_save_path()),
 			'error' => lang('You will NOT be able to log into eGroupWare using PHP sessions: "session could not be verified" !!!'),
 		);
 	}
 }
 $setup_info = $GLOBALS['egw_setup']->detection->get_versions();
-foreach($setup_info as $app => $app_data)
+foreach ($setup_info as $app => $app_data)
 {
 	if (!isset($app_data['check_install'])) continue;
 
@@ -258,9 +258,9 @@ 
 	{
 		if (isset($checks[$name]))
 		{
-			if ($checks[$name] == $data) continue;	// identical check --> ignore it
+			if ($checks[$name] == $data) continue; // identical check --> ignore it
 
-			if ($data['func'] == 'pear_check' || in_array($data['func'],array('extension_check','php_ini_check')) && !isset($data['warning']))
+			if ($data['func'] == 'pear_check' || in_array($data['func'], array('extension_check', 'php_ini_check')) && !isset($data['warning']))
 			{
 				if (isset($checks[$name]['from']) && $checks[$name]['from'] && !is_array($checks[$name]['from']))
 				{
@@ -268,7 +268,7 @@ 
 				}
 				if (!isset($data['from'])) $data['from'] = $app;
 				if (!isset($checks[$name]['from']) || !is_array($checks[$name]['from'])) $checks[$name]['from'] = array();
-				if (!in_array($data['from'],$checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
+				if (!in_array($data['from'], $checks[$name]['from'])) $checks[$name]['from'][] = $data['from'];
 			}
 			else
 			{
@@ -284,9 +284,9 @@ 
 	}
 }
 $sorted_checks = array();
-foreach(array('php_version','php_ini_check','extension_check','pear_check','gd_check','permission_check') as $func)
+foreach (array('php_version', 'php_ini_check', 'extension_check', 'pear_check', 'gd_check', 'permission_check') as $func)
 {
-	foreach($checks as $name => $data)
+	foreach ($checks as $name => $data)
 	{
 		if ($data['func'] == $func)
 		{
@@ -297,15 +297,15 @@ 
 }
 if ($checks) $sorted_checks += $checks;
 
-function php_version($name,$args)
+function php_version($name, $args)
 {
 	global $passed_icon, $error_icon;
-	unset($name);	// not used, but required by function signature
+	unset($name); // not used, but required by function signature
 
-	$version_ok = version_compare(phpversion(),$args['value']) >= 0;
+	$version_ok = version_compare(phpversion(), $args['value']) >= 0;
 
 	echo '<div>'.($version_ok ? $passed_icon : $error_icon).' <span'.($version_ok ? '' : ' class="setup_error"').'>'.
-		lang('Checking required PHP version %1 (recommended %2)',$args['verbose_value'],$args['recommended']).': '.
+		lang('Checking required PHP version %1 (recommended %2)', $args['verbose_value'], $args['recommended']).': '.
 		phpversion().' ==> '.($version_ok ? lang('True') : lang('False'))."</span></div>\n";
 }
 
@@ -316,13 +316,13 @@ 
  */
 function composer_check($package)
 {
-	static $installed=null;
+	static $installed = null;
 	if (!isset($installed))
 	{
 		$installed = array();
-		if (file_exists(EGW_SERVER_ROOT.'/vendor') && file_exists($json=EGW_SERVER_ROOT.'/vendor/composer/installed.json'))
+		if (file_exists(EGW_SERVER_ROOT.'/vendor') && file_exists($json = EGW_SERVER_ROOT.'/vendor/composer/installed.json'))
 		{
-			foreach(json_decode(file_get_contents($json), true) as $package_data)
+			foreach (json_decode(file_get_contents($json), true) as $package_data)
 			{
 				$installed[strtolower($package_data['name'])] = $package_data['version'];
 			}
@@ -338,9 +338,9 @@ 
  * @param $channel =null use default or given channel
  * @return array with package-name => version pairs, eg. array('Log' => '1.9.8','PEAR' => '1.4.11')
  */
-function get_installed_pear_packages($channel=null)
+function get_installed_pear_packages($channel = null)
 {
-	$pear_config = '';	// use the system default
+	$pear_config = ''; // use the system default
 	// fix for SuSE having the pear.conf only for cli, will fail with open_basedir - no idea what to do then
 	if (@is_dir('/etc/php5/apache2') && !file_exists('/etc/php5/apache2/pear.conf') && @file_exists('/etc/php5/cli/pear.conf'))
 	{
@@ -350,13 +350,13 @@ 
 
 	if (!class_exists('PEAR_Config')) return false;
 
-	$config = new PEAR_Config('',$pear_config);
+	$config = new PEAR_Config('', $pear_config);
 	//echo "<pre>config = ".print_r($config,true)."</pre>\n";
 
 	if (empty($channel)) $channel = $config->get('default_channel');
 	//echo "<pre>channel = ".print_r($channel,true)."</pre>\n";
 
-	if (!method_exists($config,'getRegistry')) return false;	// PEAR version to old
+	if (!method_exists($config, 'getRegistry')) return false; // PEAR version to old
 
 	$reg = &$config->getRegistry();
 	//echo "<pre>reg = ".print_r($reg,true)."</pre>\n";
@@ -365,11 +365,11 @@ 
 	// bug reported: http://pear.php.net/bugs/bug.php?id=11317
 	if (!file_exists($reg->install_dir)) return false;
 
-	$installed = $reg->packageInfo(null,null,$channel);
+	$installed = $reg->packageInfo(null, null, $channel);
 
 	//echo "<pre>installed =".print_r($installed,true)."</pre>\n";
 	$packages = array();
-	foreach($installed as $package)
+	foreach ($installed as $package)
 	{
 		$name = isset($package['package']) ? $package['package'] : $package['name'];
 		$version = $package['version'];
@@ -383,7 +383,7 @@ 
 	return $packages;
 }
 
-function pear_check($package,$args)
+function pear_check($package, $args)
 {
 	global $passed_icon, $warning_icon;
 	static $pear_available = null;
@@ -427,7 +427,7 @@ 
 			$found = $pear_available;
 			if ($pear_available && $package)
 			{
-				$file = str_replace('_','/',$package == 'Mail_Mime' ? 'Mail_mime' : $package).'.php';
+				$file = str_replace('_', '/', $package == 'Mail_Mime' ? 'Mail_mime' : $package).'.php';
 
 				$found = @include_once($file);
 
@@ -436,16 +436,15 @@ 
 		}
 	}
 	// is the right version availible
-	$available = $found && (!$min_version || version_compare($min_version,$version_available) <= 0);
+	$available = $found && (!$min_version || version_compare($min_version, $version_available) <= 0);
 	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.
-		lang('Checking PEAR%1 is installed',($package?($channel?' '.$channel.'/':'::').$package:'').($min_version?" ($min_version)":'')).': '.
-		($available ? ($version_available ? $version_available : lang('True')) :
-		($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
+		lang('Checking PEAR%1 is installed', ($package ? ($channel ? ' '.$channel.'/' : '::').$package : '').($min_version ? " ($min_version)" : '')).': '.
+		($available ? ($version_available ? $version_available : lang('True')) : ($found ? lang('Found, but unknown version') : lang('False')))."</span></div>\n";
 
 	if (!$available)	// give further info only if not availible
 	{
-		echo '<div class="setup_info">' . lang('PEAR%1 is needed by: %2.',$package ? '::'.$package : '',
-			is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+		echo '<div class="setup_info">'.lang('PEAR%1 is needed by: %2.', $package ? '::'.$package : '',
+			is_array($args['from']) ? implode(', ', $args['from']) : $args['from']);
 
 		// if using Composer, dont confuse user with PEAR ;-)
 		if (file_exists(EGW_SERVER_ROOT.'/vendor'))
@@ -458,7 +457,7 @@ 
 			if (!$pear_available)
 			{
 				echo '<br/>'.lang('PEAR (%1) is a PHP repository and is usually in a package called %2.',
-					'<a href="http://pear.php.net" target="_blank">pear.php.net</a>','php-pear');
+					'<a href="http://pear.php.net" target="_blank">pear.php.net</a>', 'php-pear');
 			}
 			elseif ($package && !$found)
 			{
@@ -468,12 +467,12 @@ 
 			}
 			elseif ($min_version && !$version_available)
 			{
-				echo '<br/>'.lang('We could not determine the version of %1, please make sure it is at least %2',$package,$min_version);
+				echo '<br/>'.lang('We could not determine the version of %1, please make sure it is at least %2', $package, $min_version);
 			}
-			elseif ($min_version && version_compare($min_version,$version_available) > 0)
+			elseif ($min_version && version_compare($min_version, $version_available) > 0)
 			{
 				echo '<br/>'.lang('Your installed version of %1 is %2, required is at least %3, please run: ',
-					$package,$version_available,$min_version).' pear upgrade '.$package;
+					$package, $version_available, $min_version).' pear upgrade '.$package;
 			}
 			echo '<br/>'.lang('Alternatively you can use %1Composer%2 to install all requirements at once. Downloading it and run:',
 				'<a href="https://getcomposer.org/" target="_blank">', '</a>').
@@ -486,26 +485,26 @@ 
 	return $available;
 }
 
-function extension_check($name,$args)
+function extension_check($name, $args)
 {
 	//echo "<p>extension_check($name,".print_r($args,true).")</p>\n";
 	global $passed_icon, $warning_icon, $is_windows;
 
 	if (isset($args['win_only']) && $args['win_only'] && !$is_windows)
 	{
-		return True;	// check only under windows
+		return True; // check only under windows
 	}
 	// we check for the existens of 'dl', as multithreaded webservers dont have it !!!
 	$available = check_load_extension($name);
 
-	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking extension %1 is loaded or loadable', $name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
 		if (!isset($args['warning']))
 		{
-			$args['warning'] = lang('The %1 extension is needed from: %2.',$name,
-				is_array($args['from']) ? implode(', ',$args['from']) : $args['from']);
+			$args['warning'] = lang('The %1 extension is needed from: %2.', $name,
+				is_array($args['from']) ? implode(', ', $args['from']) : $args['from']);
 		}
 		echo "<div class='setup_info'>".$args['warning'].'</div>';
 	}
@@ -514,20 +513,20 @@ 
 	return $available;
 }
 
-function function_check($name,$args)
+function function_check($name, $args)
 {
 	global $passed_icon, $warning_icon;
 
 	$available = function_exists($name);
 
-	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking function %1 exists',$name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo '<div>'.($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking function %1 exists', $name).': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
 		if (!isset($args['warning']))
 		{
-			$args['warning'] = lang('The function %1 is needed from: %2.',$name,
-				is_array($args['from'] ? implode(', ',$args['from']) : $args['from']));
+			$args['warning'] = lang('The function %1 is needed from: %2.', $name,
+				is_array($args['from'] ? implode(', ', $args['from']) : $args['from']));
 		}
 		echo "<div class='setup_info'>".$args['warning'].'</div>';
 	}
@@ -536,33 +535,33 @@ 
 	return $available;
 }
 
-function verbosePerms( $in_Perms )
+function verbosePerms($in_Perms)
 {
-	if($in_Perms & 0x1000)     // FIFO pipe
+	if ($in_Perms&0x1000)     // FIFO pipe
 	{
 		$sP = 'p';
 	}
-	elseif($in_Perms & 0x2000) // Character special
+	elseif ($in_Perms&0x2000) // Character special
 	{
 		$sP = 'c';
 	}
-	elseif($in_Perms & 0x4000) // Directory
+	elseif ($in_Perms&0x4000) // Directory
 	{
 		$sP = 'd';
 	}
-	elseif($in_Perms & 0x6000) // Block special
+	elseif ($in_Perms&0x6000) // Block special
 	{
 		$sP = 'b';
 	}
-	elseif($in_Perms & 0x8000) // Regular
+	elseif ($in_Perms&0x8000) // Regular
 	{
 		$sP = '-';
 	}
-	elseif($in_Perms & 0xA000) // Symbolic Link
+	elseif ($in_Perms&0xA000) // Symbolic Link
 	{
 		$sP = 'l';
 	}
-	elseif($in_Perms & 0xC000) // Socket
+	elseif ($in_Perms&0xC000) // Socket
 	{
 		$sP = 's';
 	}
@@ -572,33 +571,30 @@ 
 	}
 
 	// owner
-	$sP .= (($in_Perms & 0x0100) ? 'r' : '-') .
-	(($in_Perms & 0x0080) ? 'w' : '-') .
-	(($in_Perms & 0x0040) ? (($in_Perms & 0x0800) ? 's' : 'x' ) :
-	(($in_Perms & 0x0800) ? 'S' : '-'));
+	$sP .= (($in_Perms&0x0100) ? 'r' : '-').
+	(($in_Perms&0x0080) ? 'w' : '-').
+	(($in_Perms&0x0040) ? (($in_Perms&0x0800) ? 's' : 'x') : (($in_Perms&0x0800) ? 'S' : '-'));
 
 	// group
-	$sP .= (($in_Perms & 0x0020) ? 'r' : '-') .
-	(($in_Perms & 0x0010) ? 'w' : '-') .
-	(($in_Perms & 0x0008) ? (($in_Perms & 0x0400) ? 's' : 'x' ) :
-	(($in_Perms & 0x0400) ? 'S' : '-'));
+	$sP .= (($in_Perms&0x0020) ? 'r' : '-').
+	(($in_Perms&0x0010) ? 'w' : '-').
+	(($in_Perms&0x0008) ? (($in_Perms&0x0400) ? 's' : 'x') : (($in_Perms&0x0400) ? 'S' : '-'));
 
 	// world
-	$sP .= (($in_Perms & 0x0004) ? 'r' : '-') .
-	(($in_Perms & 0x0002) ? 'w' : '-') .
-	(($in_Perms & 0x0001) ? (($in_Perms & 0x0200) ? 't' : 'x' ) :
-	(($in_Perms & 0x0200) ? 'T' : '-'));
+	$sP .= (($in_Perms&0x0004) ? 'r' : '-').
+	(($in_Perms&0x0002) ? 'w' : '-').
+	(($in_Perms&0x0001) ? (($in_Perms&0x0200) ? 't' : 'x') : (($in_Perms&0x0200) ? 'T' : '-'));
 	return $sP;
 }
 
-function permission_check($name,$args,$verbose=True)
+function permission_check($name, $args, $verbose = True)
 {
-	global $passed_icon, $error_icon, $warning_icon,$is_windows;
+	global $passed_icon, $error_icon, $warning_icon, $is_windows;
 	//echo "<p>permision_check('$name',".print_r($args,True).",'$verbose')</p>\n";
 
 	// add a ../ for non-absolute pathes
 	$rel_name = $name;
-	if ($name && substr($name,0,3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name,':') === false)
+	if ($name && substr($name, 0, 3) != '../' && $name[0] != '/' && $name[0] != '\\' && strpos($name, ':') === false)
 	{
 		$name = '../'.$name;
 	}
@@ -620,22 +616,22 @@ 
 	if (isset($args['is_readable']))
 	{
 		$checks[] = lang('readable by the webserver');
-		$check_not = (!$args['is_readable']?lang('not'):'');
+		$check_not = (!$args['is_readable'] ? lang('not') : '');
 	}
 	if (isset($args['is_writable']))
 	{
 		$checks[] = lang('writable by the webserver');
-		$check_not = (!$args['is_writable']?lang('not'):'');
+		$check_not = (!$args['is_writable'] ? lang('not') : '');
 	}
 	if (isset($args['is_world_readable']))
 	{
 		$checks[] = lang('world readable');
-		$check_not = (!$args['is_world_readable']?lang('not'):'');
+		$check_not = (!$args['is_world_readable'] ? lang('not') : '');
 	}
 	if (isset($args['is_world_writable']))
 	{
 		$checks[] = lang('world writable');
-		$check_not = (!$args['is_world_writable']?lang('not'):'');
+		$check_not = (!$args['is_world_writable'] ? lang('not') : '');
 	}
 
 	if (isset($args['msg']) && ($msg = $args['msg']))
@@ -644,7 +640,7 @@ 
 	}
 	else
 	{
-		$msg = lang('Checking file-permissions of %1 for %2 %3: %4',$rel_name,$check_not,implode(', ',$checks),$perms)."<br />\n";
+		$msg = lang('Checking file-permissions of %1 for %2 %3: %4', $rel_name, $check_not, implode(', ', $checks), $perms)."<br />\n";
 	}
 	$extra_error_msg = '';
 	if (isset($args['error']) && $args['error'])
@@ -653,13 +649,13 @@ 
 	}
 	if (!file_exists($name))
 	{
-		echo '<div>'. $error_icon . '<span class="setup_error">' . $msg . lang('%1 does not exist !!!',$rel_name).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.'<span class="setup_error">'.$msg.lang('%1 does not exist !!!', $rel_name).$extra_error_msg."</span></div>\n";
 		return False;
 	}
 	$warning = False;
 	if (!$GLOBALS['run_by_webserver'] && (@$args['is_readable'] || @$args['is_writable']))
 	{
-		echo $warning_icon.' '.$msg. lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
+		echo $warning_icon.' '.$msg.lang('Check can only be performed, if called via a webserver, as the user-id/-name of the webserver is not known.')."\n";
 		unset($args['is_readable']);
 		unset($args['is_writable']);
 		$warning = True;
@@ -667,22 +663,22 @@ 
 	$Ok = True;
 	if (isset($args['is_writable']) && is_writable($name) != $args['is_writable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_writable']?lang('not').' ':'',lang('writable by the webserver')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_writable'] ? lang('not').' ' : '', lang('writable by the webserver')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
 	if (isset($args['is_readable']) && is_readable($name) != $args['is_readable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_readable']?lang('not').' ':'',lang('readable by the webserver')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_readable'] ? lang('not').' ' : '', lang('readable by the webserver')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
-	if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name) & 04) == $args['is_world_readable'])
+	if (!$is_windows && isset($args['is_world_readable']) && !(fileperms($name)&04) == $args['is_world_readable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_readable']?lang('not').' ':'',lang('world readable')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_world_readable'] ? lang('not').' ' : '', lang('world readable')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
-	if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name) & 02) == $args['is_world_writable'])
+	if (!$is_windows && isset($args['is_world_writable']) && !(fileperms($name)&02) == $args['is_world_writable'])
 	{
-		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!',$rel_name,$args['is_world_writable']?lang('not').' ':'',lang('world writable')).$extra_error_msg."</span></div>\n";
+		echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.' '.lang('%1 is %2%3 !!!', $rel_name, $args['is_world_writable'] ? lang('not').' ' : '', lang('world writable')).$extra_error_msg."</span></div>\n";
 		$Ok = False;
 	}
 	if ($Ok && !$warning && $verbose)
@@ -694,16 +690,16 @@ 
 		if ($verbose)
 		{
 			@set_time_limit(0);
-			echo "<div class='setup_info'>" . lang('This might take a while, please wait ...')."</div>\n";
+			echo "<div class='setup_info'>".lang('This might take a while, please wait ...')."</div>\n";
 			flush();
 		}
 		@set_time_limit(0);
 		$handle = @opendir($name);
-		while($handle && ($file = readdir($handle)))
+		while ($handle && ($file = readdir($handle)))
 		{
 			if ($file != '.' && $file != '..')
 			{
-				$Ok = $Ok && permission_check(($name!='.'?$name.'/':'').$file,$args,False);
+				$Ok = $Ok && permission_check(($name != '.' ? $name.'/' : '').$file, $args, False);
 			}
 		}
 		if ($handle) closedir($handle);
@@ -716,12 +712,12 @@ 
 function mk_value($value)
 {
 	$matches = null;
-	if (!preg_match('/^([0-9]+)([mk]+)$/i',$value,$matches)) return $value;
+	if (!preg_match('/^([0-9]+)([mk]+)$/i', $value, $matches)) return $value;
 
-	return (strtolower($matches[2]) == 'm' ? 1024*1024 : 1024) * (int) $matches[1];
+	return (strtolower($matches[2]) == 'm' ? 1024 * 1024 : 1024) * (int)$matches[1];
 }
 
-function php_ini_check($name,$args)
+function php_ini_check($name, $args)
 {
 	global $passed_icon, $error_icon, $warning_icon, $is_windows;
 
@@ -739,20 +735,20 @@ 
 	{
 		case 'not set':
 			$check = lang('not set');
-			$result = !($ini_value & $args['value']);
+			$result = !($ini_value&$args['value']);
 			break;
 		case 'set':
 			$check = lang('set');
-			$result = !!($ini_value & $args['value']);
+			$result = !!($ini_value&$args['value']);
 			break;
 		case '>=':
-			$result = !$ini_value ||	// value not used, eg. no memory limit
-			(int) mk_value($ini_value) >= (int) mk_value($args['value']);
+			$result = !$ini_value || // value not used, eg. no memory limit
+			(int)mk_value($ini_value) >= (int)mk_value($args['value']);
 			break;
 		case 'contain':
 			$check = lang('contain');
 			$sep = $is_windows ? '/[; ]+/' : '/[: ]+/';
-			$result = in_array($args['value'],preg_split($sep,$ini_value));
+			$result = in_array($args['value'], preg_split($sep, $ini_value));
 			break;
 		case '!=':
 			$check = lang('set and not');
@@ -769,9 +765,9 @@ 
 			$tz = new DateTimeZone($ini_value);
 			unset($tz);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
-			$result = false;	// no valid timezone
+			$result = false; // no valid timezone
 		}
 	}
 	$msg = ' '.lang('Checking php.ini').": $name $check $verbose_value: <span class='setup_info'>ini_get('$name')='$ini_value'$ini_value_verbose</span>";
@@ -793,7 +789,7 @@ 
 		elseif (!isset($args['safe_mode']))
 		{
 			echo "<div>".$warning_icon.' <span class="setup_warning">'.$msg.'</span><div class="setup_info">'.
-				lang('%1 is needed by: %2.',$name,is_array($args['from']) ? implode(', ',$args['from']) : $args['from'])
+				lang('%1 is needed by: %2.', $name, is_array($args['from']) ? implode(', ', $args['from']) : $args['from'])
 				."</div></div>\n";
 		}
 		if (isset($args['safe_mode']) && $safe_mode || @$args['change'])
@@ -803,7 +799,7 @@ 
 				echo '<div>'.$error_icon.' <span class="setup_error">'.$msg.'</span></div>';
 			}
 			echo "<div class='setup_error'>\n";
-			echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode']?$args['safe_mode']:$args['change'])."<br />\n";
+			echo '*** '.lang('Please make the following change in your php.ini').' ('.get_php_ini().'): '.(@$args['safe_mode'] ? $args['safe_mode'] : $args['change'])."<br />\n";
 			echo '*** '.lang('AND reload your webserver, so the above changes take effect !!!')."</div>\n";
 		}
 	}
@@ -818,16 +814,16 @@ 
 	ob_end_clean();
 
 	$found = null;
-	return preg_match('/\(php.ini\).*<\/td><td[^>]*>([^ <]+)/',$phpinfo,$found) ? $found[1] : False;
+	return preg_match('/\(php.ini\).*<\/td><td[^>]*>([^ <]+)/', $phpinfo, $found) ? $found[1] : False;
 }
 
 function gd_check()
 {
 	global $passed_icon, $warning_icon;
 
-	$available = (function_exists('imagecopyresampled')  || function_exists('imagecopyresized'));
+	$available = (function_exists('imagecopyresampled') || function_exists('imagecopyresized'));
 
-	echo "<div>".($available ? $passed_icon : $warning_icon).' <span'.($available?'':' class="setup_warning"').'>'.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."</span></div>\n";
+	echo "<div>".($available ? $passed_icon : $warning_icon).' <span'.($available ? '' : ' class="setup_warning"').'>'.lang('Checking for GD support...').': '.($available ? lang('True') : lang('False'))."</span></div>\n";
 
 	if (!$available)
 	{
@@ -839,31 +835,31 @@ 
 if ($run_by_webserver)
 {
 	$tpl_root = $GLOBALS['egw_setup']->html->setup_tpl_dir('setup');
-	$setup_tpl = CreateObject('phpgwapi.Template',$tpl_root);
+	$setup_tpl = CreateObject('phpgwapi.Template', $tpl_root);
 	$setup_tpl->set_file(array(
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
 	));
-	$ConfigDomain = get_var('ConfigDomain',Array('POST','COOKIE'));
+	$ConfigDomain = get_var('ConfigDomain', Array('POST', 'COOKIE'));
 	if (@$_GET['intro']) {
-		if(($ConfigLang = setup::get_lang()))
+		if (($ConfigLang = setup::get_lang()))
 		{
-			$GLOBALS['egw_setup']->set_cookie('ConfigLang',$ConfigLang,(int) (time()+(1200*9)),'/');
+			$GLOBALS['egw_setup']->set_cookie('ConfigLang', $ConfigLang, (int)(time() + (1200 * 9)), '/');
 		}
-		$GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'),False,'config');
+		$GLOBALS['egw_setup']->html->show_header(lang('Welcome to the eGroupWare Installation'), False, 'config');
 		echo '<h1>'.lang('Welcome to the eGroupWare Installation')."</h1>\n";
-		if(!$ConfigLang)
+		if (!$ConfigLang)
 		{
-			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True,'en')."</form></p>\n";
+			echo '<p><form action="check_install.php?intro=1" method="Post">Please Select your language '.setup_html::lang_select(True, 'en')."</form></p>\n";
 		}
 		echo '<p>'.lang('The first step in installing eGroupWare is to ensure your environment has the necessary settings to correctly run the application.').'</p>';
 		echo '<p>'.lang('We will now run a series of tests, which may take a few minutes.  Click the link below to proceed.').'</p>';
 		echo '<h3><a href="check_install.php">'.lang('Run installation tests').'</a></h3>';
 		echo '<p><a href="manageheader.php">'.lang('Skip the installation tests (not recommended)')."</a></p>\n";
-		$setup_tpl->pparse('out','T_footer');
+		$setup_tpl->pparse('out', 'T_footer');
 		exit;
 	} else {
-		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'),False,'config',$ConfigDomain ? $ConfigDomain . '(' . @$GLOBALS['egw_domain'][$ConfigDomain]['db_type'] . ')' : '');
+		$GLOBALS['egw_setup']->html->show_header(lang('Checking the eGroupWare Installation'), False, 'config', $ConfigDomain ? $ConfigDomain.'('.@$GLOBALS['egw_domain'][$ConfigDomain]['db_type'].')' : '');
 		echo '<h1>'.lang('Checking the eGroupWare Installation')."</h1>\n";
 		# echo "<pre style=\"text-align: left;\">\n";;
 	}
@@ -877,7 +873,7 @@ 
 $Ok = True;
 foreach ($sorted_checks as $name => $args)
 {
-	$check_ok = $args['func']($name,$args);
+	$check_ok = $args['func']($name, $args);
 	$Ok = $Ok && $check_ok;
 }
 
@@ -889,9 +885,9 @@ 
 	{
 		if (!$Ok)
 		{
-			echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon)."</h3>\n";
+			echo '<h3>'.lang('Please fix the above errors (%1) and warnings(%2)', $error_icon, $warning_icon)."</h3>\n";
 			echo '<h3><a href="check_install.php">'.lang('Click here to re-run the installation tests')."</a></h3>\n";
-			echo '<h3>'.lang('or %1Continue to the Header Admin%2','<a href="manageheader.php">','</a>')."</h3>\n";
+			echo '<h3>'.lang('or %1Continue to the Header Admin%2', '<a href="manageheader.php">', '</a>')."</h3>\n";
 		}
 		else
 		{
@@ -903,10 +899,10 @@ 
 		echo '<h3>';
 		if (!$Ok)
 		{
-			echo lang('Please fix the above errors (%1) and warnings(%2)',$error_icon,$warning_icon).'. ';
+			echo lang('Please fix the above errors (%1) and warnings(%2)', $error_icon, $warning_icon).'. ';
 		}
-		echo '<br /><a href="'.str_replace('check_install.php','',@$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
+		echo '<br /><a href="'.str_replace('check_install.php', '', @$_SERVER['HTTP_REFERER']).'">'.lang('Return to Setup')."</a></h3>\n";
 	}
-	$setup_tpl->pparse('out','T_footer');
+	$setup_tpl->pparse('out', 'T_footer');
 	//echo "</body>\n</html>\n";
 }

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

@@ -844,7 +844,7 @@
 		'T_head' => 'head.tpl',
 		'T_footer' => 'footer.tpl',
 	));
-	$ConfigDomain = get_var('ConfigDomain',Array('POST','COOKIE'));
+	$ConfigDomain = get_var('ConfigDomain',array('POST','COOKIE'));
 	if (@$_GET['intro']) {
 		if(($ConfigLang = setup::get_lang()))
 		{