EGroupware / egroupware

timesheet/inc/class.timesheet_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)

Braces +177 added lines, -45 removed lines

@@ -63,7 +63,10 @@ 
 		$etpl = new Etemplate('timesheet.edit');
 		if (!is_array($content))
 		{
-			if ($_GET['msg']) $msg = strip_tags($_GET['msg']);
+			if ($_GET['msg'])
+			{
+				$msg = strip_tags($_GET['msg']);
+			}
 
 			if ($view || (int)$_GET['ts_id'])
 			{
@@ -116,23 +119,32 @@ 
 				$content['ts_description'] = $content['ts_description_short'];
 			}
 			// we only need 2 out of 3 values from start-, end-time or duration (the date in ts_start is always required!)
-			if (isset($content['start_time']))		// start-time specified
+			if (isset($content['start_time']))
+			{
+				// start-time specified
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new Api\DateTime($content['ts_start']);
+			}
 				$start_time = explode(':',$content['start_time']);
 				$start->setTime($start_time[0],$start_time[1]);
 				$content['ts_start'] = $start->format('ts');
 			}
-			if (isset($content['end_time']))		// end-time specified
+			if (isset($content['end_time']))
+			{
+				// end-time specified
 			{
 				$end = new Api\DateTime($content['ts_start']);
+			}
 				$end_time = explode(':',$content['end_time']);
 				$end->setTime($end_time[0],$end_time[1]);
 			}
-			if ($end && $start)	// start- & end-time --> calculate the duration
+			if ($end && $start)
+			{
+				// start- & end-time --> calculate the duration
 			{
 				$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
+			}
 				// check if negative duration is caused by wrap over midnight
 				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
 				{
@@ -140,12 +152,18 @@ 
 				}
 				//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
 			}
-			elseif ($content['ts_duration'] && $end)	// no start, calculate from end and duration
+			elseif ($content['ts_duration'] && $end)
+			{
+				// no start, calculate from end and duration
 			{
 				$content['ts_start'] = $end->format('ts') - 60*$content['ts_duration'];
+			}
 				//echo "<p>end_time=$content[end_time], duration=$content[ts_duration] --> ts_start=$content[ts_start]=".Api\DateTime::to($content['ts_start'])."</p>\n";
 			}
-			if ($content['ts_duration'] > 0) unset($content['end_time']);
+			if ($content['ts_duration'] > 0)
+			{
+				unset($content['end_time']);
+			}
 			// now we only deal with start (date+time) and duration
 			list($button) = @each($content['button']);
 			$view = $content['view'];
@@ -159,7 +177,10 @@ 
 			switch($button)
 			{
 				case 'edit':
-					if ($this->check_acl(Acl::EDIT) && !$only_admin_edit) $view = false;
+					if ($this->check_acl(Acl::EDIT) && !$only_admin_edit)
+					{
+						$view = false;
+					}
 					break;
 
 				case 'undelete':
@@ -173,12 +194,15 @@ 
 				case 'save':
 				case 'save_new':
 				case 'apply':
-					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])	// set the quantity (in h) from the duration (in min)
+					if ((!$this->data['ts_quantity'] || $this->ts_viewtype == 'short') && $this->data['ts_duration'])
+					{
+						// set the quantity (in h) from the duration (in min)
 					{
 						// We need to keep the actual value of ts_quantity when we are storing it, as it is used in price calculation
 						// and rounding it causes miscalculation on prices
 						$this->data['ts_quantity'] = $this->data['ts_duration'] / 60.0;
 					}
+					}
 					if (!$this->data['ts_quantity'])
 					{
 						$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
@@ -210,7 +234,11 @@ 
 							unset($content['ts_project_blur']);
 						}
 					}
-					if ($etpl->validation_errors()) break;	// the user need to fix the error, before we can save the entry
+					if ($etpl->validation_errors())
+					{
+						break;
+					}
+					// the user need to fix the error, before we can save the entry
 
 					// account for changed project --> remove old one from links and add new one
 					if ((int) $this->data['pm_id'] != (int) $this->data['old_pm_id'])
@@ -254,14 +282,20 @@ 
 						}
 					}
 					Framework::refresh_opener($msg, 'timesheet', $this->data['ts_id'], $content['ts_id'] ? 'edit' : 'add');
-					if ($button == 'apply') break;
+					if ($button == 'apply')
+					{
+						break;
+					}
 					if ($button == 'save_new')
 					{
 						$msg .= ', '.lang('creating new entry');		// giving some feedback to the user
 
-						if (!is_array($content['link_to']['to_id']))	// set links again, so new entry gets the same links as the existing one
+						if (!is_array($content['link_to']['to_id']))
+						{
+							// set links again, so new entry gets the same links as the existing one
 						{
 							$content['link_to']['to_id'] = 0;
+						}
 							foreach(Link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.Link::VFS_APPNAME) as $link)
 							{
 								Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
@@ -324,12 +358,15 @@ 
 			foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 			{
 				$link_id = $link_ids[$n];
-				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))
+				{
+					// gard against XSS
 				{
 					switch ($link_app)
 					{
 						case 'projectmanager':
 							$links[] = $link_id;
+				}
 							// fall-through;
 						default:
 							if(!$n)
@@ -341,8 +378,14 @@ 
 								{
 									foreach((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
-										if ($l_app == 'projectmanager') $links[] = $l_id;
+										if (($l_id=$set['link_id'][$i]))
+										{
+											Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										}
+										if ($l_app == 'projectmanager')
+										{
+											$links[] = $l_id;
+										}
 									}
 									unset($set['link_app']);
 									unset($set['link_id']);
@@ -438,8 +481,16 @@ 
 			$content['ts_viewtype'] = $readonlys['tabs']['notes'] = true;
 			$content['ts_description_short'] = $content['ts_description'];
 		}
-		if (!$this->customfields) $readonlys['tabs']['customfields'] = true;	// suppress tab if there are not customfields
-		if (!$this->data['ts_id']) $readonlys['tabs']['history']    = true;   //suppress history for the first loading without ID
+		if (!$this->customfields)
+		{
+			$readonlys['tabs']['customfields'] = true;
+		}
+		// suppress tab if there are not customfields
+		if (!$this->data['ts_id'])
+		{
+			$readonlys['tabs']['history']    = true;
+		}
+		//suppress history for the first loading without ID
 
 		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
 	}
@@ -452,7 +503,10 @@ 
 	 */
 	function datetime2time($datetime)
 	{
-		if (!$datetime) return 0;
+		if (!$datetime)
+		{
+			return 0;
+		}
 
 		return $datetime - mktime(0,0,0,date('m',$datetime),date('d',$datetime),date('Y',$datetime));
 	}
@@ -497,7 +551,10 @@ 
 			}
 			// show week-sums, if we are week-aligned (show full weeks)?
 			$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
-			if (!$week_start_day) $week_start_day = 'Sunday';
+			if (!$week_start_day)
+			{
+				$week_start_day = 'Sunday';
+			}
 			switch($week_start_day)
 			{
 				case 'Sunday': $week_end_day = 'Saturday'; break;
@@ -518,7 +575,10 @@ 
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		if (!$id_only && !$query_in['csv_export']) Api\Cache::setSession(TIMESHEET_APP, 'index', $query_in);
+		if (!$id_only && !$query_in['csv_export'])
+		{
+			Api\Cache::setSession(TIMESHEET_APP, 'index', $query_in);
+		}
 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
@@ -526,8 +586,14 @@ 
 		$query = $query_in;	// keep the original query
 		$query['enddate'] = $end_date;
 
-		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
-		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
+		if($this->ts_viewtype == 'short')
+		{
+			$query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		}
+		if ($query['no_status'])
+		{
+			$query_in['options-selectcols']['ts_status'] = false;
+		}
 
 		//_debug_array($query['col_filter']);
 		//echo "PM Integration:".$this->pm_integration.'<br>';
@@ -540,8 +606,14 @@ 
 		{
 			//$query['col_filter']['ts_id'] = Link::get_links('projectmanager',$query['col_filter']['pm_id'],'timesheet');
 			$query['col_filter']['ts_id'] = $this->get_ts_links($query['col_filter']['pm_id']);
-			if (empty($query['col_filter']['ts_id'])) $query['col_filter']['ts_id'] = -1;
-			if (!$query['col_filter']['ts_id']) $query['col_filter']['ts_id'] = 0;
+			if (empty($query['col_filter']['ts_id']))
+			{
+				$query['col_filter']['ts_id'] = -1;
+			}
+			if (!$query['col_filter']['ts_id'])
+			{
+				$query['col_filter']['ts_id'] = 0;
+			}
 		}
 		if ((string)$query['col_filter']['pm_id'] != '' && (string)$query['col_filter']['pm_id'] == '0')
 		{
@@ -605,10 +677,13 @@ 
 			$cats = $GLOBALS['egw']->categories->return_all_children((int)$query['cat_id']);
 			$query['col_filter']['cat_id'] = count($cats) > 1 ? $cats : $query['cat_id'];
 		}
-		elseif ((string)$query['cat_id'] == '0')	// no category
+		elseif ((string)$query['cat_id'] == '0')
+		{
+			// no category
 		{
 			$query['col_filter']['cat_id'] = null;
 		}
+		}
 		else	// all cats --> no filter
 		{
 			unset($query['col_filter']['cat_id']);
@@ -619,7 +694,10 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\Accounts::username($query['col_filter']['ts_owner']);
 			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
 			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
-			if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			if ($query['col_filter']['ts_owner']<0)
+			{
+				$query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			}
 		}
 		else
 		{
@@ -632,10 +710,13 @@ 
 			// generate a meaningful app-header / report title
 			if ($this->show_sums['month'])
 			{
-				if ((int)$start[1] == 1 && (int) $end[1] == 12)		// whole year(s)
+				if ((int)$start[1] == 1 && (int) $end[1] == 12)
+				{
+					// whole year(s)
 				{
 					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . $start[0] . ($start[0] != $end[0] ? ' - '.$end[0] : '');
 				}
+				}
 				else
 				{
 					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang(date('F',$query['startdate']+12*60*60)) . ' ' . $start[0];
@@ -677,7 +758,10 @@ 
 		$ids = array();
 		foreach($rows as &$row)
 		{
-			if ($row['ts_id'] > 0) $ids[] = $row['ts_id'];
+			if ($row['ts_id'] > 0)
+			{
+				$ids[] = $row['ts_id'];
+			}
 		}
 		if ($id_only)
 		{
@@ -707,12 +791,19 @@ 
 		$have_cats = false;
 		foreach($rows as &$row)
 		{
-			if ($row['cat_id']) $have_cats = true;
+			if ($row['cat_id'])
+			{
+				$have_cats = true;
+			}
 
 			$row['class'] = 'row';
-			if ($row['ts_id'] <= 0)	// sums
+			if ($row['ts_id'] <= 0)
 			{
-				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;	// fix for DSL change
+				// sums
+			{
+				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;
+			}
+			// fix for DSL change
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
@@ -740,7 +831,10 @@ 
 						break;
 				}
 				$row['ts_start'] = $row['ts_unitprice'] = '';
-				if (!$this->quantity_sum) $row['ts_quantity'] = '';
+				if (!$this->quantity_sum)
+				{
+					$row['ts_quantity'] = '';
+				}
 				$row['class'] = 'th rowNoEdit rowNoDelete rowNoUndelete';
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
@@ -782,13 +876,22 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if(!$row['titleClass'])
+			{
+				$row['titleClass'] = 'timesheet_titleDetails';
+			}
 
 		}
 		$rows['no_cat_id'] = (!$have_cats || $query['cat_id']);
-		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
+		if ($query['col_filter']['ts_owner'])
+		{
+			$rows['ownerClass'] = 'noPrint';
+		}
 		$rows['no_owner_col'] = $query['no_owner_col'];
-		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
+		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner'))
+		{
+			$rows['no_owner_col'] = 1;
+		}
 
 		$rows += $this->summary;
 
@@ -797,13 +900,23 @@ 
 		if (!$rows['ts_viewtype'])
 		{
 			#_debug_array($query['selectcols']);
-			if(!is_array($query['selectcols'])){
+			if(!is_array($query['selectcols']))
+			{
 				$query['selectcols'] = explode(',',$query['selectcols']);
 			}
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && in_array('ts_quantity_quantity',$query['selectcols'])===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && in_array('ts_total_price',$query['selectcols'])===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && in_array('ts_quantity_quantity',$query['selectcols'])===false)
+			{
+				$rows['no_ts_quantity'] = 1;
+			}
+			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false)
+			{
+				$rows['no_ts_unitprice'] = 1;
+			}
+			if ($query['selectcols'] && in_array('ts_total_price',$query['selectcols'])===false)
+			{
+				$rows['no_ts_total'] = 1;
+			}
 		}
 		$rows['no_ts_status'] = in_array('ts_status', $query['selectcols']) === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -826,7 +939,10 @@ 
 	{
 		$etpl = new Etemplate('timesheet.index');
 
-		if ($_GET['msg']) $msg = $_GET['msg'];
+		if ($_GET['msg'])
+		{
+			$msg = $_GET['msg'];
+		}
 		if ($content['nm']['rows']['delete'])
 		{
 			list($ts_id) = each($content['nm']['rows']['delete']);
@@ -839,9 +955,12 @@ 
 				$msg = lang('Error deleting the entry!!!');
 			}
 		}
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}
@@ -909,7 +1028,10 @@ 
 		}
 		$read_grants = $this->grant_list(Acl::READ);
 		$content['nm']['no_owner_col'] = count($read_grants) == 1;
-		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows']) $content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
+		if ($GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'])
+		{
+			$content['nm']['selectcols'] = $GLOBALS['egw_info']['user']['preferences']['timesheet']['nextmatch-timesheet.index.rows'];
+		}
 		$sel_options = array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
@@ -926,7 +1048,10 @@ 
 		if ($this->pm_integration != 'full')
 		{
 			$projects =& $this->query_list('ts_project');
-			if (!is_array($projects)) $projects = array();
+			if (!is_array($projects))
+			{
+				$projects = array();
+			}
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
 
@@ -1132,7 +1257,8 @@ 
 			case 'cat':
 				$cat_name = Api\Categories::id2name($settings);
 				$action_msg = lang('changed category to %1', $cat_name);
-				foreach((array)$checked as $n => $id) {
+				foreach((array)$checked as $n => $id)
+				{
 					$entry = $this->read($id);
 					$entry['cat_id'] = $settings;
 					if($this->save($entry) == 0)
@@ -1147,7 +1273,10 @@ 
 				break;
 
 			case 'document':
-				if (!$settings) $settings = $GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'];
+				if (!$settings)
+				{
+					$settings = $GLOBALS['egw_info']['user']['preferences']['timesheet']['default_document'];
+				}
 				$document_merge = new timesheet_merge();
 				$msg = $document_merge->download($settings, $checked, '', $GLOBALS['egw_info']['user']['preferences']['timesheet']['document_dir']);
 				$failed = count($checked);
@@ -1199,7 +1328,10 @@ 
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
 					}
-					if ($button == 'apply') break;
+					if ($button == 'apply')
+					{
+						break;
+					}
 					// fall-through
 				case 'cancel':
 					$GLOBALS['egw']->redirect_link('/admin/index.php', null, 'admin');

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

@@ -942,7 +942,7 @@
 	 *
 	 * @return array see nextmatch_widget::egw_actions()
 	 */
-	public function get_actions(Array $query)
+	public function get_actions(array $query)
 	{
 		$actions = array(
 			'open' => array(	// does edit if allowed, otherwise view

Spacing +163 added lines, -164 removed lines

@@ -55,10 +55,10 @@ 
 
 	function view()
 	{
-		$this->edit(null,true);
+		$this->edit(null, true);
 	}
 
-	function edit($content = null,$view = false)
+	function edit($content = null, $view = false)
 	{
 		$etpl = new Etemplate('timesheet.edit');
 		if (!is_array($content))
@@ -80,20 +80,19 @@ 
 			{
 				$this->data = array(
 					'ts_start' => $this->today,
-					'start_time' => '',	// force empty start-time
-					'end_time' => Api\DateTime::to($this->now,'H:i'),
+					'start_time' => '', // force empty start-time
+					'end_time' => Api\DateTime::to($this->now, 'H:i'),
 					'ts_owner' => $GLOBALS['egw_info']['user']['account_id'],
-					'cat_id'   => (int) $_REQUEST['cat_id'],
+					'cat_id'   => (int)$_REQUEST['cat_id'],
 					'ts_status'=> $GLOBALS['egw_info']['user']['preferences']['timesheet']['predefined_status'],
 				);
 			}
 			$matches = null;
-			$referer = preg_match('/menuaction=([^&]+)/',$_SERVER['HTTP_REFERER'],$matches) ? $matches[1] :
-				(strpos($_SERVER['HTTP_REFERER'],'/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
+			$referer = preg_match('/menuaction=([^&]+)/', $_SERVER['HTTP_REFERER'], $matches) ? $matches[1] : (strpos($_SERVER['HTTP_REFERER'], '/infolog/index.php') !== false ? 'infolog.infolog_ui.index' : TIMESHEET_APP.'.timesheet_ui.index');
 
 			if (!$this->check_statusForEditRights($this->data))
 			{
-				$view = true;  //only admin can edit with this status
+				$view = true; //only admin can edit with this status
 				$only_admin_edit = true;
 				$msg = lang('only Admin can edit this status');
 			}
@@ -106,7 +105,7 @@ 
 			{
 				if ($this->status_labels_config[$content['ts_status']]['admin'])
 				{
-					$view = true;  //only admin can edit with this status
+					$view = true; //only admin can edit with this status
 					$only_admin_edit = true;
 					$msg = lang('only Admin can edit this status');
 				}
@@ -120,29 +119,29 @@ 
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new Api\DateTime($content['ts_start']);
-				$start_time = explode(':',$content['start_time']);
-				$start->setTime($start_time[0],$start_time[1]);
+				$start_time = explode(':', $content['start_time']);
+				$start->setTime($start_time[0], $start_time[1]);
 				$content['ts_start'] = $start->format('ts');
 			}
 			if (isset($content['end_time']))		// end-time specified
 			{
 				$end = new Api\DateTime($content['ts_start']);
-				$end_time = explode(':',$content['end_time']);
-				$end->setTime($end_time[0],$end_time[1]);
+				$end_time = explode(':', $content['end_time']);
+				$end->setTime($end_time[0], $end_time[1]);
 			}
 			if ($end && $start)	// start- & end-time --> calculate the duration
 			{
 				$content['ts_duration'] = ($end->format('ts') - $start->format('ts')) / 60;
 				// check if negative duration is caused by wrap over midnight
-				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24*60)
+				if ($content['ts_duration'] < 0 && $content['ts_duration'] > -24 * 60)
 				{
-					$content['ts_duration'] += 24*60;
+					$content['ts_duration'] += 24 * 60;
 				}
 				//echo "<p>end_time=$content[end_time], start_time=$content[start_time] --> duration=$content[ts_duration]</p>\n";
 			}
 			elseif ($content['ts_duration'] && $end)	// no start, calculate from end and duration
 			{
-				$content['ts_start'] = $end->format('ts') - 60*$content['ts_duration'];
+				$content['ts_start'] = $end->format('ts') - 60 * $content['ts_duration'];
 				//echo "<p>end_time=$content[end_time], duration=$content[ts_duration] --> ts_start=$content[ts_start]=".Api\DateTime::to($content['ts_start'])."</p>\n";
 			}
 			if ($content['ts_duration'] > 0) unset($content['end_time']);
@@ -152,18 +151,18 @@ 
 			$referer = $content['referer'];
 			$content['ts_project_blur'] = $content['pm_id'] ? Link::title('projectmanager', $content['pm_id']) : '';
 			$this->data = $content;
-			foreach(array('button','view','referer','tabs','start_time') as $key)
+			foreach (array('button', 'view', 'referer', 'tabs', 'start_time') as $key)
 			{
 				unset($this->data[$key]);
 			}
-			switch($button)
+			switch ($button)
 			{
 				case 'edit':
 					if ($this->check_acl(Acl::EDIT) && !$only_admin_edit) $view = false;
 					break;
 
 				case 'undelete':
-					if($content['ts_status'] == self::DELETED_STATUS)
+					if ($content['ts_status'] == self::DELETED_STATUS)
 					{
 						unset($content['ts_status']);
 						$this->data['ts_status'] = '';
@@ -181,14 +180,14 @@ 
 					}
 					if (!$this->data['ts_quantity'])
 					{
-						$etpl->set_validation_error('ts_quantity',lang('Field must not be empty !!!'));
+						$etpl->set_validation_error('ts_quantity', lang('Field must not be empty !!!'));
 					}
 					if ($this->data['ts_duration'] < 0)
 					{
-						$etpl->set_validation_error('start_time',lang('Starttime has to be before endtime !!!'));
+						$etpl->set_validation_error('start_time', lang('Starttime has to be before endtime !!!'));
 					}
 					// set ts_title to ts_project if short viewtype (title is not editable)
-					if($this->ts_viewtype == 'short')
+					if ($this->ts_viewtype == 'short')
 					{
 						$this->data['ts_title'] = $this->data['ts_project'];
 					}
@@ -199,9 +198,9 @@ 
 
 						if (!$this->data['ts_title'])
 						{
-							$etpl->set_validation_error('ts_title',lang('Field must not be empty !!!'));
+							$etpl->set_validation_error('ts_title', lang('Field must not be empty !!!'));
 						}
-						elseif($button != 'save_new')
+						elseif ($button != 'save_new')
 						{
 							// remove title-blur for same behavior after apply, as for opening the saved entry again
 							unset($this->data['ts_title_blur']);
@@ -210,26 +209,26 @@ 
 							unset($content['ts_project_blur']);
 						}
 					}
-					if ($etpl->validation_errors()) break;	// the user need to fix the error, before we can save the entry
+					if ($etpl->validation_errors()) break; // the user need to fix the error, before we can save the entry
 
 					// account for changed project --> remove old one from links and add new one
-					if ((int) $this->data['pm_id'] != (int) $this->data['old_pm_id'])
+					if ((int)$this->data['pm_id'] != (int)$this->data['old_pm_id'])
 					{
 						// update links accordingly
 						if ($this->data['pm_id'])
 						{
-							Link::link(TIMESHEET_APP,$content['link_to']['to_id'],'projectmanager',$this->data['pm_id']);
+							Link::link(TIMESHEET_APP, $content['link_to']['to_id'], 'projectmanager', $this->data['pm_id']);
 						}
 						if ($this->data['old_pm_id'])
 						{
-							Link::unlink2(0,TIMESHEET_APP,$content['link_to']['to_id'],0,'projectmanager',$this->data['old_pm_id']);
+							Link::unlink2(0, TIMESHEET_APP, $content['link_to']['to_id'], 0, 'projectmanager', $this->data['old_pm_id']);
 							unset($this->data['old_pm_id']);
 						}
 					}
 					// check if we are linked to a project, but that is NOT set as project
 					if (!$this->data['pm_id'] && is_array($content['link_to']['to_id']))
 					{
-						foreach($content['link_to']['to_id'] as $data)
+						foreach ($content['link_to']['to_id'] as $data)
 						{
 							if ($data['app'] == 'projectmanager')
 							{
@@ -250,26 +249,26 @@ 
 						$msg = lang('Entry saved');
 						if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 						{
-							Link::link(TIMESHEET_APP,$this->data['ts_id'],$content['link_to']['to_id']);
+							Link::link(TIMESHEET_APP, $this->data['ts_id'], $content['link_to']['to_id']);
 						}
 					}
 					Framework::refresh_opener($msg, 'timesheet', $this->data['ts_id'], $content['ts_id'] ? 'edit' : 'add');
 					if ($button == 'apply') break;
 					if ($button == 'save_new')
 					{
-						$msg .= ', '.lang('creating new entry');		// giving some feedback to the user
+						$msg .= ', '.lang('creating new entry'); // giving some feedback to the user
 
 						if (!is_array($content['link_to']['to_id']))	// set links again, so new entry gets the same links as the existing one
 						{
 							$content['link_to']['to_id'] = 0;
-							foreach(Link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.Link::VFS_APPNAME) as $link)
+							foreach (Link::get_links(TIMESHEET_APP, $this->data['ts_id'], '!'.Link::VFS_APPNAME) as $link)
 							{
-								Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
+								Link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link['app'], $link['id'], $link['remark']);
 							}
 						}
 						// create a new entry
 						$this->data['ts_start'] += 60 * $this->data['ts_duration'];
-						foreach(array('ts_id','ts_title','ts_description','ts_duration','ts_quantity','ts_modified','ts_modifier') as $name)
+						foreach (array('ts_id', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_modified', 'ts_modifier') as $name)
 						{
 							unset($this->data[$name]);
 						}
@@ -289,7 +288,7 @@ 
 						else
 						{
 							$msg = lang('Error deleting the entry!!!');
-							break;	// dont close window
+							break; // dont close window
 						}
 					}
 					// fall-through for save
@@ -302,7 +301,7 @@ 
 			'referer' => $referer,
 			'ts_title_blur' => $content['ts_title_blur'],
 		);
-		$content = array_merge($this->data,array(
+		$content = array_merge($this->data, array(
 			'msg'  => $msg,
 			'view' => $view,
 			'tabs'  => $content['tabs'],
@@ -310,8 +309,8 @@ 
 				'to_id' => $this->data['ts_id'] ? $this->data['ts_id'] : $content['link_to']['to_id'],
 				'to_app' => TIMESHEET_APP,
 			),
-			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0,3) : '',
-			'ts_quantity' => $this->data['ts_duration']/60.0 == $this->data['ts_quantity'] ? null : $this->data['ts_quantity'],
+			'ts_quantity_blur' => $this->data['ts_duration'] ? round($this->data['ts_duration'] / 60.0, 3) : '',
+			'ts_quantity' => $this->data['ts_duration'] / 60.0 == $this->data['ts_quantity'] ? null : $this->data['ts_quantity'],
 			'start_time' => isset($this->data['start_time']) ? $this->data['start_time'] : $this->data['ts_start'],
 			'pm_integration' => $this->pm_integration,
 			'no_ts_status' => !$this->status_labels && ($this->data['ts_status'] != self::DELETED_STATUS),
@@ -321,10 +320,10 @@ 
 		if (!$this->data['ts_id'] && isset($_REQUEST['link_app']) && isset($_REQUEST['link_id']) && !is_array($content['link_to']['to_id']))
 		{
 			$link_ids = is_array($_REQUEST['link_id']) ? $_REQUEST['link_id'] : array($_REQUEST['link_id']);
-			foreach(is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
+			foreach (is_array($_REQUEST['link_app']) ? $_REQUEST['link_app'] : array($_REQUEST['link_app']) as $n => $link_app)
 			{
 				$link_id = $link_ids[$n];
-				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i',$link_app.':'.$link_id))	// gard against XSS
+				if (preg_match('/^[a-z_0-9-]+:[:a-z_0-9-]+$/i', $link_app.':'.$link_id))	// gard against XSS
 				{
 					switch ($link_app)
 					{
@@ -332,33 +331,33 @@ 
 							$links[] = $link_id;
 							// fall-through;
 						default:
-							if(!$n)
+							if (!$n)
 							{
 								// get title from first linked app
-								$preserv['ts_title_blur'] = Link::title($link_app,$link_id);
+								$preserv['ts_title_blur'] = Link::title($link_app, $link_id);
 								// ask first linked app via "timesheet_set" hook, for further data to set, incl. links
-								if (($set = Api\Hooks::single(array('location'=>'timesheet_set','id'=>$link_id),$link_app)))
+								if (($set = Api\Hooks::single(array('location'=>'timesheet_set', 'id'=>$link_id), $link_app)))
 								{
-									foreach((array)$set['link_app'] as $i => $l_app)
+									foreach ((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										if (($l_id = $set['link_id'][$i])) Link::link(TIMESHEET_APP, $content['link_to']['to_id'], $l_app, $l_id);
 										if ($l_app == 'projectmanager') $links[] = $l_id;
 									}
 									unset($set['link_app']);
 									unset($set['link_id']);
 
-									$content = array_merge($content,$set);
+									$content = array_merge($content, $set);
 								}
 							}
 							break;
 					}
-					Link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link_app,$link_id);
+					Link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link_app, $link_id);
 				}
 			}
 		}
 		elseif ($this->data['ts_id'])
 		{
-			$links = Link::get_links(TIMESHEET_APP,$this->data['ts_id'],'projectmanager');
+			$links = Link::get_links(TIMESHEET_APP, $this->data['ts_id'], 'projectmanager');
 		}
 		// make all linked projects availible for the pm-pricelist widget, to be able to choose prices from all
 		$content['all_pm_ids'] = array_values($links);
@@ -401,7 +400,7 @@ 
 
 		if ($view)
 		{
-			foreach(array_merge(array_keys($this->data),array('pm_id','pl_id','link_to')) as $key)
+			foreach (array_merge(array_keys($this->data), array('pm_id', 'pl_id', 'link_to')) as $key)
 			{
 				$readonlys[$key] = true;
 			}
@@ -417,9 +416,9 @@ 
 		{
 			$edit_grants[$content['ts_owner']] = Api\Accounts::username($content['ts_owner']);
 		}
-		$sel_options['ts_owner']  = $edit_grants;
-		$sel_options['ts_status']  = $this->status_labels;
-		if($this->config_data['history'] && $content['ts_status'] == self::DELETED_STATUS)
+		$sel_options['ts_owner'] = $edit_grants;
+		$sel_options['ts_status'] = $this->status_labels;
+		if ($this->config_data['history'] && $content['ts_status'] == self::DELETED_STATUS)
 		{
 			$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
 		}
@@ -429,19 +428,19 @@ 
 		// supress unknow widget 'projectmanager-*', if projectmanager is not installed or old
 		if (!@file_exists(EGW_INCLUDE_ROOT.'/projectmanager/inc/class.projectmanager_widget.inc.php'))
 		{
-			$etpl->set_cell_attribute('pm_id','disabled',true);
-			$etpl->set_cell_attribute('pl_id','disabled',true);
+			$etpl->set_cell_attribute('pm_id', 'disabled', true);
+			$etpl->set_cell_attribute('pl_id', 'disabled', true);
 		}
 
-		if($this->ts_viewtype == 'short')
+		if ($this->ts_viewtype == 'short')
 		{
 			$content['ts_viewtype'] = $readonlys['tabs']['notes'] = true;
 			$content['ts_description_short'] = $content['ts_description'];
 		}
-		if (!$this->customfields) $readonlys['tabs']['customfields'] = true;	// suppress tab if there are not customfields
-		if (!$this->data['ts_id']) $readonlys['tabs']['history']    = true;   //suppress history for the first loading without ID
+		if (!$this->customfields) $readonlys['tabs']['customfields'] = true; // suppress tab if there are not customfields
+		if (!$this->data['ts_id']) $readonlys['tabs']['history'] = true; //suppress history for the first loading without ID
 
-		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit',$content,$sel_options,$readonlys,$preserv,2);
+		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -454,7 +453,7 @@ 
 	{
 		if (!$datetime) return 0;
 
-		return $datetime - mktime(0,0,0,date('m',$datetime),date('d',$datetime),date('Y',$datetime));
+		return $datetime - mktime(0, 0, 0, date('m', $datetime), date('d', $datetime), date('Y', $datetime));
 	}
 
 	/**
@@ -468,22 +467,22 @@ 
 	 * @param boolean $id_only if true only return (via $rows) an array of contact-ids, dont save state to session
 	 * @return int total number of contacts matching the selection
 	 */
-	function get_rows(&$query_in,&$rows,&$readonlys,$id_only=false)
+	function get_rows(&$query_in, &$rows, &$readonlys, $id_only = false)
 	{
 		$this->show_sums = false;
 
 		// Date filter
 		$end_date = $query_in['enddate'] ? $query_in['enddate'] : false;
-		if($end_date || $query_in['filter'] === 'custom')
+		if ($end_date || $query_in['filter'] === 'custom')
 		{
 			$query_in['startdate'] = $query_in['startdate'] ? $query_in['startdate'] : 1;
 		}
-		$date_filter = $this->date_filter($query_in['filter'],$query_in['startdate'],$end_date);
+		$date_filter = $this->date_filter($query_in['filter'], $query_in['startdate'], $end_date);
 
 		if ($query_in['startdate'])
 		{
-			$start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60));
-			$end   = explode('-',date('Y-m-d',$end_date ? $end_date : $query_in['startdate']+7.5*24*60*60));
+			$start = explode('-', date('Y-m-d', $query_in['startdate'] + 12 * 60 * 60));
+			$end   = explode('-', date('Y-m-d', $end_date ? $end_date : $query_in['startdate'] + 7.5 * 24 * 60 * 60));
 
 			// show year-sums, if we are year-aligned (show full years)?
 			if ((int)$start[2] == 1 && (int)$start[1] == 1 && (int)$end[2] == 31 && (int)$end[1] == 12)
@@ -491,28 +490,28 @@ 
 				$this->show_sums[] = 'year';
 			}
 			// show month-sums, if we are month-aligned (show full monthes)?
-			if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d',mktime(12,0,0,$end[1]+1,0,$end[0])))
+			if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d', mktime(12, 0, 0, $end[1] + 1, 0, $end[0])))
 			{
 				$this->show_sums[] = 'month';
 			}
 			// show week-sums, if we are week-aligned (show full weeks)?
 			$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
 			if (!$week_start_day) $week_start_day = 'Sunday';
-			switch($week_start_day)
+			switch ($week_start_day)
 			{
 				case 'Sunday': $week_end_day = 'Saturday'; break;
 				case 'Monday': $week_end_day = 'Sunday'; break;
 				case 'Saturday': $week_end_day = 'Friday'; break;
 			}
-			$filter_start_day = date('l',$query_in['startdate']+12*60*60);
-			$filter_end_day   = $query_in['enddate'] ? date('l',$query_in['enddate']+12*60*60) : false;
+			$filter_start_day = date('l', $query_in['startdate'] + 12 * 60 * 60);
+			$filter_end_day   = $query_in['enddate'] ? date('l', $query_in['enddate'] + 12 * 60 * 60) : false;
 			//echo "<p align=right>prefs: $week_start_day - $week_end_day, filter: $filter_start_day - $filter_end_day</p>\n";
 			if ($filter_start_day == $week_start_day && (!$filter_end_day || $filter_end_day == $week_end_day))
 			{
 				$this->show_sums[] = 'week';
 			}
 			// show day-sums, if range <= 5 weeks
-			if (!$query_in['enddate'] || $query_in['enddate'] - $query_in['startdate'] < 36*24*60*60)
+			if (!$query_in['enddate'] || $query_in['enddate'] - $query_in['startdate'] < 36 * 24 * 60 * 60)
 			{
 				$this->show_sums[] = 'day';
 			}
@@ -523,10 +522,10 @@ 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
 
-		$query = $query_in;	// keep the original query
+		$query = $query_in; // keep the original query
 		$query['enddate'] = $end_date;
 
-		if($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false,'ts_unitprice'=>false,'ts_total'=>false);
+		if ($this->ts_viewtype == 'short') $query_in['options-selectcols'] = array('ts_quantity'=>false, 'ts_unitprice'=>false, 'ts_total'=>false);
 		if ($query['no_status']) $query_in['options-selectcols']['ts_status'] = false;
 
 		//_debug_array($query['col_filter']);
@@ -553,10 +552,10 @@ 
 		// handle linked filter (show only entries linked to a certain other entry)
 		if ($query['col_filter']['linked'])
 		{
-			list($app,$id) = explode(':',$query['col_filter']['linked']);
-			if (!($links = Link::get_links($app,$id,'timesheet')))
+			list($app, $id) = explode(':', $query['col_filter']['linked']);
+			if (!($links = Link::get_links($app, $id, 'timesheet')))
 			{
-				$rows = array();	// no infologs linked to project --> no rows to return
+				$rows = array(); // no infologs linked to project --> no rows to return
 				return 0;
 			}
 			if (!$query['col_filter']['ts_id'])
@@ -564,9 +563,9 @@ 
 				$query['col_filter']['ts_id'] = array_values(array_unique($links));
 			}
 			// allow to combine with other filters using ts_id --> intersect ids
-			elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'],array_values(array_unique($links)))))
+			elseif (!($query['col_filter']['ts_id'] = array_intersect((array)$query['col_filter']['ts_id'], array_values(array_unique($links)))))
 			{
-				$rows = array();	// no infologs linked to project --> no rows to return
+				$rows = array(); // no infologs linked to project --> no rows to return
 				return 0;
 			}
 		}
@@ -590,13 +589,13 @@ 
 			{
 				if (isset($this->status_labels_substatus['2level'][$status_id]))
 				{
-					$query['col_filter']['ts_status'] = array_merge($query['col_filter']['ts_status'],$this->status_labels_substatus[$status_id]);
+					$query['col_filter']['ts_status'] = array_merge($query['col_filter']['ts_status'], $this->status_labels_substatus[$status_id]);
 				}
 			}
 		}
 		if ((int)$query['filter2'] != (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'])
 		{
-			$GLOBALS['egw']->preferences->add(TIMESHEET_APP,'show_details',(int)$query['filter2']);
+			$GLOBALS['egw']->preferences->add(TIMESHEET_APP, 'show_details', (int)$query['filter2']);
 			$GLOBALS['egw']->preferences->save_repository(true);
 		}
 		// category filter: cat_id or ''=All cats or 0=No cat
@@ -619,7 +618,7 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\Accounts::username($query['col_filter']['ts_owner']);
 			#if ($GLOBALS['egw']->accounts->get_type($query['col_filter']['ts_owner']) == 'g') $GLOBALS['egw_info']['flags']['app_header'] .= ' '. lang("and its members");
 			#_debug_array($GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
-			if ($query['col_filter']['ts_owner']<0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']),$GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'],true));
+			if ($query['col_filter']['ts_owner'] < 0) $query['col_filter']['ts_owner'] = array_merge(array($query['col_filter']['ts_owner']), $GLOBALS['egw']->accounts->members($query['col_filter']['ts_owner'], true));
 		}
 		else
 		{
@@ -632,60 +631,60 @@ 
 			// generate a meaningful app-header / report title
 			if ($this->show_sums['month'])
 			{
-				if ((int)$start[1] == 1 && (int) $end[1] == 12)		// whole year(s)
+				if ((int)$start[1] == 1 && (int)$end[1] == 12)		// whole year(s)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . $start[0] . ($start[0] != $end[0] ? ' - '.$end[0] : '');
+					$GLOBALS['egw_info']['flags']['app_header'] .= ': '.$start[0].($start[0] != $end[0] ? ' - '.$end[0] : '');
 				}
 				else
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang(date('F',$query['startdate']+12*60*60)) . ' ' . $start[0];
+					$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang(date('F', $query['startdate'] + 12 * 60 * 60)).' '.$start[0];
 					if ($start[0] != $end[0] || $start[1] != $end[1])
 					{
-						$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . lang(date('F',$query['enddate']+12*60*60)) . ' ' . $end[0];
+						$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.lang(date('F', $query['enddate'] + 12 * 60 * 60)).' '.$end[0];
 					}
 				}
 			}
 			elseif ($this->show_sums['week'])
 			{
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . lang('week') . ' ' . date('W',$query['startdate']+36*60*60) . '/' . $start[0];
-				if ($query['enddate'] && $query['enddate'] - $query['startdate'] > 10*24*60*60)
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.lang('week').' '.date('W', $query['startdate'] + 36 * 60 * 60).'/'.$start[0];
+				if ($query['enddate'] && $query['enddate'] - $query['startdate'] > 10 * 24 * 60 * 60)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . date('W',$query['enddate']-36*60*60) . '/' . $end[0];
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.date('W', $query['enddate'] - 36 * 60 * 60).'/'.$end[0];
 				}
 			}
 			elseif ($query['startdate'])
 			{
 				$df = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-				$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . Api\DateTime::to($query['startdate']+12*60*60, $df);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.Api\DateTime::to($query['startdate'] + 12 * 60 * 60, $df);
 				if ($start != $end)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.Api\DateTime::to($query['enddate'] ? $query['enddate']+12*60*60:'now', $df);
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.Api\DateTime::to($query['enddate'] ? $query['enddate'] + 12 * 60 * 60 : 'now', $df);
 				}
 			}
 		}
 		// Update start / end dates for custom
-		if($query_in['filter'] != 'custom')
+		if ($query_in['filter'] != 'custom')
 		{
 			Api\Json\Response::get()->call(
 				'app.timesheet.update_timespan',
-				Api\DateTime::to($query['startdate'] ? $query['startdate'] : 'now' , Api\DateTime::ET2),
+				Api\DateTime::to($query['startdate'] ? $query['startdate'] : 'now', Api\DateTime::ET2),
 				$query['filter'] ? Api\DateTime::to($query['enddate'], Api\DateTime::ET2) : null
 			);
 		}
-		$total = parent::get_rows($query,$rows,$readonlys);
+		$total = parent::get_rows($query, $rows, $readonlys);
 
 		$ids = array();
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if ($row['ts_id'] > 0) $ids[] = $row['ts_id'];
 		}
 		if ($id_only)
 		{
 			$rows = $ids;
-			return $this->total;	// no need to set other fields or $readonlys
+			return $this->total; // no need to set other fields or $readonlys
 		}
 		$links = array();
-		$links3 = Link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		$links3 = Link::get_links_multiple(TIMESHEET_APP, $ids, true, 'projectmanager'); // only check for pm links!
 		//as the full array is expected, we must supply the missing but needed (since expected further down) information
 		if (is_array($links3))
 		{
@@ -705,14 +704,14 @@ 
 
 		$readonlys = array();
 		$have_cats = false;
-		foreach($rows as &$row)
+		foreach ($rows as &$row)
 		{
 			if ($row['cat_id']) $have_cats = true;
 
 			$row['class'] = 'row';
 			if ($row['ts_id'] <= 0)	// sums
 			{
-				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200;	// fix for DSL change
+				if ($query['sort'] == 'ASC') $row['ts_start'] -= 7200; // fix for DSL change
 
 				// Remove fake modified date, it breaks nextmatch checks
 				unset($row['ts_modified']);
@@ -720,22 +719,22 @@ 
 				// Set flag to avoid actions on these rows
 				$row['no_actions'] = true;
 
-				switch($row['ts_id'])
+				switch ($row['ts_id'])
 				{
 					case 0:	// day-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('l',$row['ts_start'])).' '.Api\DateTime::to($row['ts_start'], $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
+						$row['ts_title'] = lang('Sum %1:', lang(date('l', $row['ts_start'])).' '.Api\DateTime::to($row['ts_start'], $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']));
 						$row['ts_id'] = 'sum-day-'.$row['ts_start'];
 						break;
 					case -1:	// week-sum
-						$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
+						$row['ts_title'] = lang('Sum %1:', lang('week').' '.substr($row['ts_week'], 4).'/'.substr($row['ts_week'], 0, 4));
 						$row['ts_id'] = 'sum-week-'.$row['ts_week'];
 						break;
 					case -2:	// month-sum
-						$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
+						$row['ts_title'] = lang('Sum %1:', lang(date('F', $row['ts_start'])).' '.substr($row['ts_month'], 0, 4));
 						$row['ts_id'] = 'sum-month-'.$row['ts_month'];
 						break;
 					case -3:	// year-sum
-						$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
+						$row['ts_title'] = lang('Sum %1:', $row['ts_year']);
 						$row['ts_id'] = 'sum-year-'.$row['ts_year'];
 						break;
 				}
@@ -745,11 +744,11 @@ 
 				$row['titleClass'] = 'timesheet_titleSum';
 				continue;
 			}
-			if($row['ts_quantity'])
+			if ($row['ts_quantity'])
 			{
 				$row['ts_quantity'] = round($row['ts_quantity'], 2);
 			}
-			if (!$this->check_acl(Acl::EDIT,$row))
+			if (!$this->check_acl(Acl::EDIT, $row))
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
@@ -757,21 +756,21 @@ 
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
-			if (!$this->check_acl(Acl::DELETE,$row))
+			if (!$this->check_acl(Acl::DELETE, $row))
 			{
 				$row['class'] .= ' rowNoDelete ';
 			}
-			if($row['ts_status'] != self::DELETED_STATUS)
+			if ($row['ts_status'] != self::DELETED_STATUS)
 			{
 				$row['class'] .= ' rowNoUndelete ';
 			}
 			if ($query['col_filter']['ts_project'])
 			{
-				unset($row['ts_project']);	// dont need or want to show it
+				unset($row['ts_project']); // dont need or want to show it
 			}
 			elseif ($links[$row['ts_id']])
 			{
-				foreach($links[$row['ts_id']] as $link)
+				foreach ($links[$row['ts_id']] as $link)
 				{
 					if ($link['app'] == 'projectmanager')
 					{
@@ -782,28 +781,28 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if (!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
 
 		}
 		$rows['no_cat_id'] = (!$have_cats || $query['cat_id']);
 		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
 		$rows['no_owner_col'] = $query['no_owner_col'];
-		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
+		if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'], 'ts_owner')) $rows['no_owner_col'] = 1;
 
 		$rows += $this->summary;
 
 		$rows['pm_integration'] = $this->pm_integration;
-		$rows['ts_viewtype'] =  $rows['no_ts_quantity'] =  $rows['no_ts_unitprice'] =  $rows['no_ts_total'] = $this->ts_viewtype == 'short';
+		$rows['ts_viewtype'] = $rows['no_ts_quantity'] = $rows['no_ts_unitprice'] = $rows['no_ts_total'] = $this->ts_viewtype == 'short';
 		if (!$rows['ts_viewtype'])
 		{
 			#_debug_array($query['selectcols']);
-			if(!is_array($query['selectcols'])){
-				$query['selectcols'] = explode(',',$query['selectcols']);
+			if (!is_array($query['selectcols'])) {
+				$query['selectcols'] = explode(',', $query['selectcols']);
 			}
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && in_array('ts_quantity_quantity',$query['selectcols'])===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols'])===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && in_array('ts_total_price',$query['selectcols'])===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && in_array('ts_quantity_quantity', $query['selectcols']) === false) $rows['no_ts_quantity'] = 1;
+			if ($query['selectcols'] && in_array('ts_unitprice', $query['selectcols']) === false) $rows['no_ts_unitprice'] = 1;
+			if ($query['selectcols'] && in_array('ts_total_price', $query['selectcols']) === false) $rows['no_ts_total'] = 1;
 		}
 		$rows['no_ts_status'] = in_array('ts_status', $query['selectcols']) === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -822,7 +821,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$etpl = new Etemplate('timesheet.index');
 
@@ -859,14 +858,14 @@ 
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($this->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($this->action($content['nm']['action'], $content['nm']['selected'], $content['nm']['select_all'],
+					$success, $failed, $action_msg, 'index', $msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2',$success,$action_msg);
+					$msg .= lang('%1 timesheets(s) %2', $success, $action_msg);
 				}
-				elseif(empty($msg))
+				elseif (empty($msg))
 				{
-					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!',$success,$action_msg,$failed);
+					$msg .= lang('%1 timesheets(s) %2, %3 failed because of insufficent rights !!!', $success, $action_msg, $failed);
 				}
 			}
 		}
@@ -878,7 +877,7 @@ 
 		if (!is_array($content['nm']))
 		{
 			$date_filters = array('All');
-			foreach(array_keys($this->date_filters) as $name)
+			foreach (array_keys($this->date_filters) as $name)
 			{
 				$date_filters[$name] = $name;
 			}
@@ -887,23 +886,23 @@ 
 			$content['nm'] = array(
 				'get_rows'       =>	TIMESHEET_APP.'.timesheet_ui.get_rows',
 				'options-filter' => $date_filters,
-				'options-filter2' => array('No details','Details'),
-				'order'          =>	'ts_start',// IO name of the column to sort after (optional for the sortheaders)
-				'sort'           =>	'DESC',// IO direction of the sort: 'ASC' or 'DESC'
+				'options-filter2' => array('No details', 'Details'),
+				'order'          =>	'ts_start', // IO name of the column to sort after (optional for the sortheaders)
+				'sort'           =>	'DESC', // IO direction of the sort: 'ASC' or 'DESC'
 				'filter_onchange' => "app.timesheet.filter_change();",
 				'filter2_onchange' => "app.timesheet.filter2_change();",
 				'filter2'        => (int)$GLOBALS['egw_info']['user']['preferences'][TIMESHEET_APP]['show_details'],
 				'row_id'         => 'ts_id',
 				'row_modified'   => 'ts_modified',
 				//'actions'        => $this->get_actions(),
-				'default_cols'   => '!legacy_actions',	// switch legacy actions column and row off by default
+				'default_cols'   => '!legacy_actions', // switch legacy actions column and row off by default
 				'pm_integration' => $this->pm_integration,
 				'placeholder_actions' => array('add')
 			);
 		}
 		$content['nm']['actions'] = $this->get_actions($content['nm']);
 
-		if($_GET['search'])
+		if ($_GET['search'])
 		{
 			$content['nm']['search'] = $_GET['search'];
 		}
@@ -914,25 +913,25 @@ 
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
 			'cat_id'     => array(array('value' => '', 'label' => lang('all categories')), array('value' => 0, 'label'=>lang('None'))),
-			'ts_status'  => $this->status_labels+array(lang('No status')),
+			'ts_status'  => $this->status_labels + array(lang('No status')),
 		);
-		if($this->config_data['history'])
+		if ($this->config_data['history'])
 		{
 			$sel_options['ts_status'][self::DELETED_STATUS] = 'Deleted';
 		}
-		$content['nm']['no_status'] = count($sel_options['ts_status']) <= 1;	// 1 because of 'No status'
-		$content['nm']['favorites'] = true;		//Enable favorite
+		$content['nm']['no_status'] = count($sel_options['ts_status']) <= 1; // 1 because of 'No status'
+		$content['nm']['favorites'] = true; //Enable favorite
 
 		if ($this->pm_integration != 'full')
 		{
-			$projects =& $this->query_list('ts_project');
+			$projects = & $this->query_list('ts_project');
 			if (!is_array($projects)) $projects = array();
 			$sel_options['ts_project'] = $projects + array(lang('No project'));
 		}
 
 		// dont show [Export] button if app is not availible to the user or we are on php4
-		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int) phpversion() < 5;
-		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index',$content,$sel_options,$readonlys);
+		$readonlys['export'] = !$GLOBALS['egw_info']['user']['apps']['importexport'] || (int)phpversion() < 5;
+		return $etpl->exec(TIMESHEET_APP.'.timesheet_ui.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -951,9 +950,9 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&ts_id=$id',
 				'popup' => Link::get_registry('timesheet', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
-				'onExecute' => Api\Header\UserAgent::mobile()?'javaScript:app.timesheet.viewEntry':'',
+				'onExecute' => Api\Header\UserAgent::mobile() ? 'javaScript:app.timesheet.viewEntry' : '',
 				'mobileViewTemplate' => 'view?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/timesheet/templates/mobile/view.xet'))
 			),
 /*
@@ -981,7 +980,7 @@ 
 				'group' => $group,
 			),
 			'cat' => Etemplate\Widget\Nextmatch::category_action(
-				'timesheet',++$group,'Change category','cat_'
+				'timesheet', ++$group, 'Change category', 'cat_'
 			),
 			'status' => array(
 				'icon' => 'apply',
@@ -1033,7 +1032,7 @@ 
 			);
 		}
 		// enable additonal edit check for following actions, if they are generally available
-		foreach(array('cat','status') as $action)
+		foreach (array('cat', 'status') as $action)
 		{
 			if ($actions[$action]['enabled'])
 			{
@@ -1056,7 +1055,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)
@@ -1066,17 +1065,17 @@ 
 
 			if ($use_all)
 			{
-				@set_time_limit(0);			// switch off the execution time limit, as it's for big selections to small
-				$query['num_rows'] = -1;	// all
+				@set_time_limit(0); // switch off the execution time limit, as it's for big selections to small
+				$query['num_rows'] = -1; // all
 				$readonlys = null;
-				$this->get_rows($query,$checked,$readonlys,true);	// true = only return the id's
+				$this->get_rows($query, $checked, $readonlys, true); // true = only return the id's
 			}
 		}
 		//error_log(__METHOD__."('$action', ".array2string($checked).', '.array2string($use_all).",,, '$session_name')");
 
-		if (substr($action,0,9) == 'to_status')
+		if (substr($action, 0, 9) == 'to_status')
 		{
-			$to_status = (int)substr($action,10);
+			$to_status = (int)substr($action, 10);
 			$action = 'to_status';
 		}
 		else
@@ -1085,11 +1084,11 @@ 
 			list($action, $settings) = explode('_', $action, 2);
 		}
 
-		switch($action)
+		switch ($action)
 		{
 			case 'delete':
 				$action_msg = lang('deleted');
-				foreach((array)$checked as $n => $id)
+				foreach ((array)$checked as $n => $id)
 				{
 					if ($this->delete($id))
 					{
@@ -1102,10 +1101,10 @@ 
 				}
 				break;
 			case 'undelete':
-				$action_msg =lang('recovered');
-				foreach((array)$checked as $n => $id)
+				$action_msg = lang('recovered');
+				foreach ((array)$checked as $n => $id)
 				{
-					if ($this->set_status($id,''))
+					if ($this->set_status($id, ''))
 					{
 						$success++;
 					}
@@ -1116,10 +1115,10 @@ 
 				}
 				break;
 			case 'to_status':
-				$action_msg =lang('changed status');
-				foreach((array)$checked as $n => $id)
+				$action_msg = lang('changed status');
+				foreach ((array)$checked as $n => $id)
 				{
-					if ($this->set_status($id,$to_status))
+					if ($this->set_status($id, $to_status))
 					{
 						$success++;
 					}
@@ -1132,7 +1131,7 @@ 
 			case 'cat':
 				$cat_name = Api\Categories::id2name($settings);
 				$action_msg = lang('changed category to %1', $cat_name);
-				foreach((array)$checked as $n => $id) {
+				foreach ((array)$checked as $n => $id) {
 					if (($entry = $this->read($id)) &&
 						($entry['cat_id'] = $settings) &&
 						$this->save($entry) == 0)
@@ -1163,7 +1162,7 @@ 
 	 * @param conetnt
 	 * @param view
 	 */
-	function editstatus($content = null,$msg='')
+	function editstatus($content = null, $msg = '')
 	{
 		// this function requires admin rights
 		$GLOBALS['egw_info']['flags']['admin_only'] = true;
@@ -1174,13 +1173,13 @@ 
 			list($button) = @each($content['button']);
 			unset ($content['button']);
 
-			switch($button)
+			switch ($button)
 			{
 				case 'delete':
 					break;
 				case 'apply':
 				case 'save':
-					foreach($content['statis'] as &$cat)
+					foreach ($content['statis'] as &$cat)
 					{
 						$id = $cat['id'];
 						if (($cat ['name'] !== $this->status_labels_config[$id]) && ($cat ['name'] !== '') || ($cat ['parent'] !== $this->status_labels_config[$id]['parent']) && ($cat ['parent'] !== ''))
@@ -1194,7 +1193,7 @@ 
 					}
 					if ($need_update)
 					{
-						Api\Config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+						Api\Config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 						$this->config_data = Api\Config::read(TIMESHEET_APP);
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
@@ -1211,7 +1210,7 @@ 
 			if (isset($this->status_labels_config[$id]))
 			{
 				unset($this->status_labels_config[$id]);
-				Api\Config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+				Api\Config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 				unset($this->status_labels[$id]);
 				$msg .= lang('Status deleted.');
 			}
@@ -1220,12 +1219,12 @@ 
 		$i = 1;
 		$max_id = 0;
 		unset($content['statis']);
-		foreach($this->status_labels_config as $id => $label)
+		foreach ($this->status_labels_config as $id => $label)
 		{
-			$content['statis'][$i]['name']= $label['name'];
-			$content['statis'][$i]['id']= $id;
-			$content['statis'][$i]['parent']= $label['parent'];
-			$content['statis'][$i]['admin']= $label['admin'];
+			$content['statis'][$i]['name'] = $label['name'];
+			$content['statis'][$i]['id'] = $id;
+			$content['statis'][$i]['parent'] = $label['parent'];
+			$content['statis'][$i]['admin'] = $label['admin'];
 			$i++;
 			$max_id = max($id, $max_id);
 		}
@@ -1237,6 +1236,6 @@ 
 		$preserv = $content;
 		$sel_options['parent'] = $this->status_labels;
 		$etpl = new Etemplate('timesheet.editstatus');
-		$etpl->exec('timesheet.timesheet_ui.editstatus',$content,$sel_options,array(),$preserv);
+		$etpl->exec('timesheet.timesheet_ui.editstatus', $content, $sel_options, array(), $preserv);
 	}
 }

webdav.php

Doc Comments +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
  * Create a session or if the user has no account return authenticate header and 401 Unauthorized
  *
  * @param array &$account
- * @return int session-id
+ * @return string session-id
  */
 function check_access(&$account)
 {

Spacing +3 added lines, -3 removed lines

@@ -37,7 +37,7 @@ 
 {
 	if (isset($_GET['auth']))
 	{
-		list($_SERVER['PHP_AUTH_USER'],$_SERVER['PHP_AUTH_PW']) = explode(':',base64_decode($_GET['auth']),2);
+		list($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) = explode(':', base64_decode($_GET['auth']), 2);
 	}
 	return Api\Header\Authenticate::autocreate_session_callback($account);
 }
@@ -48,8 +48,8 @@ 
 		'noheader'  => True,
 		'currentapp' => preg_match('|/webdav.php/apps/([A-Za-z0-9_-]+)/|', $_SERVER['REQUEST_URI'], $matches) ? $matches[1] : 'filemanager',
 		'autocreate_session_callback' => 'check_access',
-		'no_exception_handler' => 'basic_auth',	// we use a basic auth exception handler (sends exception message as basic auth realm)
-		'auth_realm' => 'EGroupware WebDAV server',	// cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
 	)
 );
 

filemanager/setup/setup.inc.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 	'name'  => 'Ralf Becker',
 	'email' => 'ralfbecker@outdoor-training.de'
 );
-$setup_info['filemanager']['license']  = 'GPL';
+$setup_info['filemanager']['license'] = 'GPL';
 
 /* The hooks this app includes, needed for hooks registration */
 $setup_info['filemanager']['hooks']['settings'] = 'filemanager_hooks::settings';

filemanager/inc/class.filemanager_admin.inc.php

Spacing +24 added lines, -24 removed lines

@@ -78,14 +78,14 @@ 
 	 * @param array $content=null
 	 * @param string $msg=''
 	 */
-	public function index(array $content=null, $msg='', $msg_type=null)
+	public function index(array $content = null, $msg = '', $msg_type = null)
 	{
 		if (is_array($content))
 		{
 			//_debug_array($content);
 			if ($content['sudo'])
 			{
-				$msg = $this->sudo($content['user'],$content['password'],self::$is_setup) ?
+				$msg = $this->sudo($content['user'], $content['password'], self::$is_setup) ?
 					lang('Root access granted.') : lang('Wrong username or password!');
 				$msg_type = Vfs::$is_root ? 'success' : 'error';
 			}
@@ -96,14 +96,14 @@ 
 				$backup = Vfs::$is_root;
 				Vfs::$is_root = true;
 				$msg = Vfs::mount($url, $path) ?
-					lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+					lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 				Vfs::$is_root = $backup;
 			}
 			elseif (Vfs::$is_root)
 			{
 				if ($content['logout'])
 				{
-					$msg = $this->sudo('','',self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
+					$msg = $this->sudo('', '', self::$is_setup) ? 'Logout failed!' : lang('Root access stopped.');
 					$msg_type = !Vfs::$is_root ? 'success' : 'error';
 				}
 				if ($content['mounts']['disable'] || self::$is_setup && $content['mounts']['umount'])
@@ -119,18 +119,18 @@ 
 					if (!in_array($path, self::$protected_path) && $path != '/')
 					{
 						$msg = Vfs::umount($path) ?
-							lang('%1 successful unmounted.',$path) : lang('Error unmounting %1!',$path);
+							lang('%1 successful unmounted.', $path) : lang('Error unmounting %1!', $path);
 					}
 					else	// re-mount / with sqlFS, to disable versioning
 					{
-						$msg = Vfs::mount($url=Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url = Vfs\Sqlfs\StreamWrapper::SCHEME.'://default'.$path, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if (($path = $content['mounts']['path']) &&
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
-					$url = str_replace('$path',$path,$content['mounts']['url']);
+					$url = str_replace('$path', $path, $content['mounts']['url']);
 					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
 
 					if ($content['mounts']['enable'] && !$this->versioning)
@@ -140,7 +140,7 @@ 
 					}
 					elseif (!Vfs::file_exists($path) || !Vfs::is_dir($path))
 					{
-						$msg = lang('Path %1 not found or not a directory!',$path);
+						$msg = lang('Path %1 not found or not a directory!', $path);
 						$msg_type = 'error';
 					}
 					// dont allow to change mount of /apps or /templates (eg. switching on versioning)
@@ -151,8 +151,8 @@ 
 					}
 					else
 					{
-						$msg = Vfs::mount($url,$path) ?
-							lang('Successful mounted %1 on %2.',$url,$path) : lang('Error mounting %1 on %2!',$url,$path);
+						$msg = Vfs::mount($url, $path) ?
+							lang('Successful mounted %1 on %2.', $url, $path) : lang('Error mounting %1 on %2!', $url, $path);
 					}
 				}
 				if ($content['allow_delete_versions'] != $GLOBALS['egw_info']['server']['allow_delete_versions'])
@@ -197,8 +197,8 @@ 
 								'hidden' => true,
 								'depth' => true,
 								'path_preg' => '#/\.(attic|versions)/#',
-							)+(!(int)$content['mtime'] ? array() : array(
-								'mtime' => ($content['mtime']<0?'-':'+').(int)$content['mtime'],
+							) + (!(int)$content['mtime'] ? array() : array(
+								'mtime' => ($content['mtime'] < 0 ? '-' : '+').(int)$content['mtime'],
 							)), function($path) use (&$deleted, &$errors)
 							{
 								if (($is_dir = Vfs::is_dir($path)) && Vfs::rmdir($path) ||
@@ -212,7 +212,7 @@ 
 								}
 							});
 						}
-						$time = number_format(microtime(true)-$starttime, 1);
+						$time = number_format(microtime(true) - $starttime, 1);
 						$msg = ($errors ? lang('%1 errors deleting!', $errors)."\n\n" : '').
 							lang('%1 files or directories deleted in %2 seconds.', $deleted, $time);
 						$msg_type = $errors ? 'error' : 'info';
@@ -235,10 +235,10 @@ 
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files']) $content['percent_files'] = number_format(100.0 * $content['version_files'] / $content['total_files'], 1).'%';
+			if ($content['total_size']) $content['percent_size'] = number_format(100.0 * $content['version_size'] / $content['total_size'], 1).'%';
 		}
-		if (!($content['is_root']=Vfs::$is_root))
+		if (!($content['is_root'] = Vfs::$is_root))
 		{
 			if (empty($msg))
 			{
@@ -254,16 +254,16 @@ 
 
 		$n = 2;
 		$content['mounts'] = array();
-		foreach(Vfs::mount() as $path => $url)
+		foreach (Vfs::mount() as $path => $url)
 		{
 			$content['mounts'][$n++] = array(
 				'path' => $path,
 				'url'  => $url,
 			);
 			$readonlys["disable[$path]"] = !$this->versioning || !Vfs::$is_root ||
-				Vfs::parse_url($url,PHP_URL_SCHEME) != $this->versioning;
+				Vfs::parse_url($url, PHP_URL_SCHEME) != $this->versioning;
 		}
-		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true;	// do not allow to unmount / or /apps
+		$readonlys['umount[/]'] = $readonlys['umount[/apps]'] = true; // do not allow to unmount / or /apps
 		$readonlys['url'] = !self::$is_setup;
 
 		$sel_options['allow_delete_versions'] = array(
@@ -274,13 +274,13 @@ 
 		);
 		// show [Mount /etemplates] button for admin, if not already mounted and available
 		$readonlys['etemplates'] = !class_exists('\EGroupware\Stylite\Vfs\Merge\StreamWrapper') ||
-			($fs_tab=Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
+			($fs_tab = Vfs::mount($url)) && isset($fs_tab['/etemplates']) ||
 			!isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		//_debug_array($content);
 
 		$tpl = new Etemplate('filemanager.admin');
 		$GLOBALS['egw_info']['flags']['app_header'] = lang('VFS mounts and versioning');
-		$tpl->exec('filemanager.filemanager_admin.index',$content,$sel_options,$readonlys);
+		$tpl->exec('filemanager.filemanager_admin.index', $content, $sel_options, $readonlys);
 	}
 
 	/**
@@ -300,10 +300,10 @@ 
 		}
 		$content = '<p>'.implode("</p>\n<p>", (array)$msgs)."</p>\n";
 
-		$content .= Api\Html::form('<p>'.($check_only&&is_array($msgs) ?
+		$content .= Api\Html::form('<p>'.($check_only && is_array($msgs) ?
 			Api\Html::submit_button('fix', lang('Fix reported problems')) : '').
 			Api\Html::submit_button('cancel', lang('Cancel')).'</p>',
-			'','/index.php',array('menuaction'=>'filemanager.filemanager_admin.fsck'));
+			'', '/index.php', array('menuaction'=>'filemanager.filemanager_admin.fsck'));
 
 		$GLOBALS['egw']->framework->render($content, lang('Admin').' - '.lang('Check virtual filesystem'), true);
 	}

Doc Comments +1 added lines, -2 removed lines

@@ -127,8 +127,7 @@
 	/**
 	 * Show files shared
 	 *
-	 * @param array $content=null
-	 * @param string $msg=''
+	 * @param array $content
 	 */
 	public function index(array $content=null)
 	{

Braces +16 added lines, -4 removed lines

@@ -131,7 +131,10 @@ 
 					($content['mounts']['enable'] || self::$is_setup && $content['mounts']['mount']))
 				{
 					$url = str_replace('$path',$path,$content['mounts']['url']);
-					if (empty($url) && $this->versioning) $url = Versioning\StreamWrapper::PREFIX.$path;
+					if (empty($url) && $this->versioning)
+					{
+						$url = Versioning\StreamWrapper::PREFIX.$path;
+					}
 
 					if ($content['mounts']['enable'] && !$this->versioning)
 					{
@@ -227,16 +230,25 @@ 
 			$content['versionedpath'] = '/';
 			$content['mtime'] = 100;
 		}
-		if (true) $content = array(
+		if (true)
+		{
+			$content = array(
 			'versionedpath' => $content['versionedpath'],
 			'mtime' => $content['mtime'],
 		);
+		}
 		if ($this->versioning)
 		{
 			// statistical information
 			$content += Versioning\StreamWrapper::summary();
-			if ($content['total_files']) $content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
-			if ($content['total_size']) $content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			if ($content['total_files'])
+			{
+				$content['percent_files'] = number_format(100.0*$content['version_files']/$content['total_files'],1).'%';
+			}
+			if ($content['total_size'])
+			{
+				$content['percent_size'] = number_format(100.0*$content['version_size']/$content['total_size'],1).'%';
+			}
 		}
 		if (!($content['is_root']=Vfs::$is_root))
 		{

filemanager/inc/class.filemanager_select.inc.php

Spacing +36 added lines, -36 removed lines

@@ -65,7 +65,7 @@ 
 	 *
 	 * @param array $content
 	 */
-	function select(array $content=null)
+	function select(array $content = null)
 	{
 		if (!is_array($content))
 		{
@@ -76,10 +76,10 @@ 
 				$content['msg'] = $_GET['msg'];
 				$_GET['mode'] = 'open';
 				$_GET['method'] = 'ckeditor_return';
-				$_GET['CKEditorFuncNum'] = Api\Cache::getSession('filemanager','ckeditorfuncnum');
+				$_GET['CKEditorFuncNum'] = Api\Cache::getSession('filemanager', 'ckeditorfuncnum');
 			}
 			$content['mode'] = $_GET['mode'];
-			if (!in_array($content['mode'],array('open','open-multiple','saveas','select-dir')))
+			if (!in_array($content['mode'], array('open', 'open-multiple', 'saveas', 'select-dir')))
 			{
 				throw new Api\Exception\WrongParameter("Wrong or unset required mode parameter!");
 			}
@@ -94,7 +94,7 @@ 
 			{
 				if (isset($_GET['CKEditorFuncNum']) && is_numeric($_GET['CKEditorFuncNum']))
 				{
-					Api\Cache::setSession('filemanager','ckeditorfuncnum',
+					Api\Cache::setSession('filemanager', 'ckeditorfuncnum',
 						$content['ckeditorfuncnum'] = $_GET['CKEditorFuncNum']);
 				}
 				else
@@ -102,20 +102,20 @@ 
 					throw new Api\Exception\WrongParameter("chkeditor_return has been specified as a method but some parameters are missing or invalid.");
 				}
 			}
-			$content['id']     = $_GET['id'];
+			$content['id'] = $_GET['id'];
 			$content['label'] = isset($_GET['label']) ? $_GET['label'] : lang('Open');
 			if (($content['options-mime'] = isset($_GET['mime'])))
 			{
 				$sel_options['mime'] = array();
-				foreach((array)$_GET['mime'] as $key => $value)
+				foreach ((array)$_GET['mime'] as $key => $value)
 				{
 					if (is_numeric($key))
 					{
-						$sel_options['mime'][$value] = lang('%1 files',strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
+						$sel_options['mime'][$value] = lang('%1 files', strtoupper(Api\MimeMagic::mime2ext($value))).' ('.$value.')';
 					}
 					else
 					{
-						$sel_options['mime'][$key] = lang('%1 files',strtoupper($value)).' ('.$key.')';
+						$sel_options['mime'][$key] = lang('%1 files', strtoupper($value)).' ('.$key.')';
 					}
 				}
 
@@ -123,11 +123,11 @@ 
 				error_log(array2string($content['options-mime']));
 			}
 		}
-		elseif(isset($content['button']))
+		elseif (isset($content['button']))
 		{
 			list($button) = each($content['button']);
 			unset($content['button']);
-			switch($button)
+			switch ($button)
 			{
 				case 'home':
 					$content['path'] = filemanager_ui::get_home_dir();
@@ -139,10 +139,10 @@ 
 						//Set the "content" name filed accordingly to the uploaded file
 						// encode chars which special meaning in url/vfs (some like / get removed!)
 						$content['name'] = Vfs::encodePathComponent($content['file_upload']['name']);
-						$to_path = Vfs::concat($content['path'],$content['name']);
+						$to_path = Vfs::concat($content['path'], $content['name']);
 
 						$copy_result = (Vfs::is_writable($content['path']) || Vfs::is_writable($to_path)) &&
-							copy($content['file_upload']['tmp_name'],Vfs::PREFIX.$to_path);
+							copy($content['file_upload']['tmp_name'], Vfs::PREFIX.$to_path);
 					}
 
 					//Break on an error condition
@@ -161,12 +161,12 @@ 
 						break;
 					}
 
-					switch($content['mode'])
+					switch ($content['mode'])
 					{
 						case 'open-multiple':
-							foreach((array)$content['dir']['selected'] as $name)
+							foreach ((array)$content['dir']['selected'] as $name)
 							{
-								$files[] = Vfs::concat($content['path'],$name);
+								$files[] = Vfs::concat($content['path'], $name);
 							}
 							//Add an uploaded file to the files result array2string
 							if ($copy_result === true) $files[] = $to_path;
@@ -182,33 +182,33 @@ 
 							// Fall through
 
 						default:
-							$files = Vfs::concat($content['path'],$content['name']);
+							$files = Vfs::concat($content['path'], $content['name']);
 							break;
 					}
 
 					if ($content['method'] && $content['method'] != 'ckeditor_return')
 					{
-						$js = ExecMethod2($content['method'],$content['id'],$files);
+						$js = ExecMethod2($content['method'], $content['id'], $files);
 					}
 					else if ($content['method'] == 'ckeditor_return')
 					{
-						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
+						$download_url = Vfs::download_url(Vfs::concat($content['path'], $content['name']));
 						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
 							"'');\negw(window).close();";
 					}
-					if(Api\Json\Response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
+					if (Api\Json\Response::isJSONResponse() && !($content['method'] == 'ckeditor_return'))
 					{
 						$response = Api\Json\Response::get();
-						if($js)
+						if ($js)
 						{
 							$response->script($js);
 						}
 						// Ahh!
 						// The vfs-select widget looks for this
-						$response->script('this.selected_files = '.json_encode($files) . '; egw(this).close();');
+						$response->script('this.selected_files = '.json_encode($files).'; egw(this).close();');
 					}
 					else
 					{
@@ -220,7 +220,7 @@ 
 
 			$sel_options['mime'] = $content['options-mime'];
 		}
-		elseif(isset($content['apps']))
+		elseif (isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
 			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
@@ -229,7 +229,7 @@ 
 		//Deactivate the opload field if the current directory is not writeable or
 		//we're currently not in the single file open mode.
 		$content['no_upload'] = !Vfs::is_writable($content['path']) ||
-			!in_array($content['mode'],array('open'));
+			!in_array($content['mode'], array('open'));
 
 		$content['apps'] = array_keys(self::get_apps());
 
@@ -239,7 +239,7 @@ 
 		}
 
 		// Set a flag for easy detection as we go
-		$favorites_flag = substr($content['path'],0,strlen('/apps/favorites')) == '/apps/favorites';
+		$favorites_flag = substr($content['path'], 0, strlen('/apps/favorites')) == '/apps/favorites';
 
 		if (!$favorites_flag && (!$content['path'] || !Vfs::is_dir($content['path'])))
 		{
@@ -253,12 +253,12 @@ 
 			$files = array();
 			$favorites = Framework\Favorites::get_favorites('filemanager');
 			$n = 0;
-			foreach($favorites as $favorite)
+			foreach ($favorites as $favorite)
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if (!$path) continue;
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -274,29 +274,29 @@ 
 				++$n;
 			}
 		}
-		else if (!($files = Vfs::find($content['path'],array(
+		else if (!($files = Vfs::find($content['path'], array(
 			'dirsontop' => true,
 			'order' => 'name',
 			'sort' => 'ASC',
 			'maxdepth' => 1,
 		))))
 		{
-			$content['msg'] = lang("Can't open directory %1!",$content['path']);
+			$content['msg'] = lang("Can't open directory %1!", $content['path']);
 		}
 		else
 		{
 			$n = 0;
 			$content['dir'] = array('mode' => $content['mode']);
-			foreach($files as $path)
+			foreach ($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path']) continue; // remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
 				$mime = Vfs::mime_content_type($path);
 				if ($content['mime'] && !$is_dir && $mime != $content['mime'])
 				{
-					continue;	// does not match mime-filter --> ignore
+					continue; // does not match mime-filter --> ignore
 				}
 				$content['dir'][$n] = array(
 					'name' => $name,
@@ -310,7 +310,7 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n) $readonlys['selected[]'] = true; // remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -337,7 +337,7 @@ 
 		{
 			Api\Header\ContentSecurityPolicy::add('script-src', 'unsafe-inline');
 		}
-		$tpl->exec('filemanager.filemanager_select.select',$content,$sel_options,$readonlys,$preserve,2);
+		$tpl->exec('filemanager.filemanager_select.select', $content, $sel_options, $readonlys, $preserve, 2);
 	}
 
 	/**
@@ -347,11 +347,11 @@ 
 	 */
 	static function get_apps()
 	{
-		$apps = array(false);	// index starting from 1
+		$apps = array(false); // index starting from 1
 		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
 		$apps += Link::app_list('query');
 
-		unset($apps['mydms']);	// they do NOT support adding files to VFS
+		unset($apps['mydms']); // they do NOT support adding files to VFS
 		unset($apps['wiki']);
 		unset($apps['api-accounts']);
 		unset($apps['addressbook-email']);

Braces +35 added lines, -8 removed lines

@@ -169,7 +169,10 @@ 
 								$files[] = Vfs::concat($content['path'],$name);
 							}
 							//Add an uploaded file to the files result array2string
-							if ($copy_result === true) $files[] = $to_path;
+							if ($copy_result === true)
+							{
+								$files[] = $to_path;
+							}
 							break;
 
 						case 'select-dir':
@@ -193,7 +196,10 @@ 
 					else if ($content['method'] == 'ckeditor_return')
 					{
 						$download_url = Vfs::download_url(Vfs::concat($content['path'],$content['name']));
-						if ($download_url[0] == '/') $download_url = Egw::link($download_url);
+						if ($download_url[0] == '/')
+						{
+							$download_url = Egw::link($download_url);
+						}
 						$js = "window.opener.CKEDITOR.tools.callFunction(".
 							$content['ckeditorfuncnum'].",'".
 							htmlspecialchars($download_url)."',".
@@ -223,7 +229,10 @@ 
 		elseif(isset($content['apps']))
 		{
 			list($app) = each($content['apps']);
-			if ($app == 'home') $content['path'] = filemanager_ui::get_home_dir();
+			if ($app == 'home')
+			{
+				$content['path'] = filemanager_ui::get_home_dir();
+			}
 		}
 
 		//Deactivate the opload field if the current directory is not writeable or
@@ -257,8 +266,15 @@ 
 			{
 				$path = $favorite['state']['path'];
 				// Just directories
-				if(!$path) continue;
-				if ($path == $content['path']) continue;	// remove directory itself
+				if(!$path)
+				{
+					continue;
+				}
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$mime = Vfs::mime_content_type($path);
 				$content['dir'][$n] = array(
@@ -289,7 +305,11 @@ 
 			$content['dir'] = array('mode' => $content['mode']);
 			foreach($files as $path)
 			{
-				if ($path == $content['path']) continue;	// remove directory itself
+				if ($path == $content['path'])
+				{
+					continue;
+				}
+				// remove directory itself
 
 				$name = Vfs::basename($path);
 				$is_dir = Vfs::is_dir($path);
@@ -310,7 +330,11 @@ 
 				}
 				++$n;
 			}
-			if (!$n) $readonlys['selected[]'] = true;	// remove checkbox from empty line
+			if (!$n)
+			{
+				$readonlys['selected[]'] = true;
+			}
+			// remove checkbox from empty line
 		}
 		$readonlys['button[createdir]'] = !Vfs::is_writable($content['path']);
 
@@ -348,7 +372,10 @@ 
 	static function get_apps()
 	{
 		$apps = array(false);	// index starting from 1
-		if (isset($GLOBALS['egw_info']['apps']['stylite'])) $apps = array('favorites' => lang('Favorites'));
+		if (isset($GLOBALS['egw_info']['apps']['stylite']))
+		{
+			$apps = array('favorites' => lang('Favorites'));
+		}
 		$apps += Link::app_list('query');
 
 		unset($apps['mydms']);	// they do NOT support adding files to VFS

filemanager/inc/class.filemanager_merge.inc.php

Indentation +1 added lines, -1 removed lines

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

Spacing +35 added lines, -35 removed lines

@@ -60,7 +60,7 @@ 
 	{
 		parent::__construct();
 
-		if($_dir)
+		if ($_dir)
 		{
 			$this->dir = $_dir;
 		}
@@ -76,7 +76,7 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->filemanager_replacements($id, '', $content)))
 		{
@@ -92,27 +92,27 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function filemanager_replacements($id,$prefix='', &$content = null)
+	public function filemanager_replacements($id, $prefix = '', &$content = null)
 	{
 		$info = array();
-		$file = Vfs::lstat($id,true);
+		$file = Vfs::lstat($id, true);
 
 		$file['mtime'] = Api\DateTime::to($file['mtime']);
 		$file['ctime'] = Api\DateTime::to($file['ctime']);
 
 		$file['name'] = Vfs::basename($id);
 		$file['dir'] = Vfs::decodePath(Vfs::dirname($id));
-		$dirlist = explode('/',$file['dir']);
+		$dirlist = explode('/', $file['dir']);
 		$file['folder'] = array_pop($dirlist);
-		$file['folder_file'] = $file['folder'] . '/'.$file['name'];
+		$file['folder_file'] = $file['folder'].'/'.$file['name'];
 		$file['path'] = $id;
 		$file['rel_path'] = str_replace($this->dir.'/', '', $id);
 		$file['hsize'] = Vfs::hsize($file['size']);
 		$file['mime'] = Vfs::mime_content_type($id);
-		$file['gid'] *= -1;  // our widgets use negative gid's
+		$file['gid'] *= -1; // our widgets use negative gid's
 		if (($props = Vfs::propfind($id)))
 		{
-			foreach($props as $prop)
+			foreach ($props as $prop)
 			{
 				$file[$prop['name']] = $prop['val'];
 			}
@@ -122,22 +122,22 @@ 
 			$file['symlink'] = Vfs::readlink($id);
 		}
 		// Custom fields
-		if($content && strpos($content, '#') !== 0)
+		if ($content && strpos($content, '#') !== 0)
                 {
 			// Expand link-to custom fields
 			 $this->cf_link_to_expand($file, $content, $info);
 
-			foreach(Api\Storage\Customfields::get('filemanager') as $name => $field)
+			foreach (Api\Storage\Customfields::get('filemanager') as $name => $field)
 			{
 				// Set any missing custom fields, or the marker will stay
-				if(!$file['#'.$name])
+				if (!$file['#'.$name])
 				{
 					$file['#'.$name] = '';
 					continue;
 				}
 
 				// Format date cfs per user Api\Preferences
-				if($field['type'] == 'date' || $field['type'] == 'date-time')
+				if ($field['type'] == 'date' || $field['type'] == 'date-time')
 				{
 					$this->date_fields[] = '#'.$name;
 					$file['#'.$name] = Api\DateTime::to($file['#'.$name], $field['type'] == 'date' ? true : '');
@@ -146,51 +146,51 @@ 
 		}
 
 		// If in apps folder, try for app-specific placeholders
-		if($dirlist[1] == 'apps' && count($dirlist) > 1)
+		if ($dirlist[1] == 'apps' && count($dirlist) > 1)
 		{
 			// Try this first - a normal path /apps/appname/id/file
-			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/')+5));
+			list($app, $app_id) = explode('/', substr($file['path'], strpos($file['path'], 'apps/') + 5));
 			// Symlink?
-			if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+			if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 				// Try resolving just app + ID - /apps/App Name/Record Title/file
-				$resolved = Vfs::resolve_url_symlinks(implode('/',array_slice(explode('/',$file['dir']),0,4)));
-				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+				$resolved = Vfs::resolve_url_symlinks(implode('/', array_slice(explode('/', $file['dir']), 0, 4)));
+				list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 
-				if(!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
+				if (!$app || !(int)$app_id || !array_key_exists($app, $GLOBALS['egw_info']['user']['apps'])) {
 					// Get rid of any virtual folders (eg: All$) and symlinks
 					$resolved = Vfs::resolve_url_symlinks($file['path']);
-					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/')+5));
+					list($app, $app_id) = explode('/', substr($resolved, strpos($resolved, 'apps/') + 5));
 				}
 			}
-			if($app && $app_id)
+			if ($app && $app_id)
 			{
-				if($app && $GLOBALS['egw_info']['user']['apps'][$app])
+				if ($app && $GLOBALS['egw_info']['user']['apps'][$app])
 				{
 					$app_merge = null;
 					try
 					{
-						$classname = $app .'_merge';
-						if(class_exists($classname))
+						$classname = $app.'_merge';
+						if (class_exists($classname))
 						{
 							$app_merge = new $classname();
-							if($app_merge && method_exists($app_merge, 'get_replacements'))
+							if ($app_merge && method_exists($app_merge, 'get_replacements'))
 							{
 								$app_placeholders = $app_merge->get_replacements($app_id, $content);
 							}
 						}
 					}
 					// Silently discard & continue
-					catch(Exception $e) {
-						unset($e);	// not used
+					catch (Exception $e) {
+						unset($e); // not used
 					}
 				}
 			}
 		}
 		$link = Link::mime_open($file['url'], $file['mime']);
-		if(is_array($link))
+		if (is_array($link))
 		{
 			// Directories have their internal protocol in path here
-			if($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
+			if ($link['path'] && strpos($link['path'], '://') !== false) $link['path'] = $file['path'];
 			$link = Api\Session::link('/index.php', $link);
 		}
 		else
@@ -209,12 +209,12 @@ 
 		$file['url'] = $link;
 
 		// Add markers
-		foreach($file as $key => &$value)
+		foreach ($file as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
-		if($app_placeholders)
+		if ($app_placeholders)
 		{
 			$info = array_merge($app_placeholders, $info);
 		}
@@ -250,7 +250,7 @@ 
 			'hsize' => 'Size',
 			'size' => 'Size (in bytes)',
 		);
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
 			if (!($n&1)) echo '<tr>';
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
@@ -259,7 +259,7 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach(Api\Storage\Customfields::get('filemanager') as $name => $field)
+		foreach (Api\Storage\Customfields::get('filemanager') as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -268,7 +268,7 @@ 
 		echo '<tr><td colspan="4">'.lang('For files linked to an application entry (inside /apps/appname/id/) the placeholders for that application are also available.  See the specific application for a list of available placeholders.').'</td></tr>';
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'date' => lang('Date'),
 			'user/n_fn' => lang('Name of current user, all other contact fields are valid too'),
 			'user/account_lid' => lang('Username'),

Braces +21 added lines, -7 removed lines

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

filemanager/inc/class.filemanager_favorite_portlet.inc.php

Spacing +9 added lines, -9 removed lines

@@ -28,13 +28,13 @@ 
 		$context['appname'] = 'filemanager';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->nm_settings += array(
 			'get_rows'       => 'filemanager.filemanager_favorite_portlet.get_rows',
 			'csv_export'     => true,
 			// Use a different template so it can be accessed from client side
-			'template'       => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows' ),
+			'template'       => ($this->nm_settings['view'] == 'tile' ? 'filemanager.tile' : 'filemanager.home.rows'),
 			// Filemanager needs this header, it's an important component for actions, but we reduce it to the minimum
 			'header_left'    => 'filemanager.home.header_left',
 			// Use a reduced column set for home, user can change if needed
@@ -46,11 +46,11 @@ 
 			'parent_id'      => 'dir',
 			'is_parent'      => 'mime',
 			'is_parent_value'=> Vfs::DIR_MIME_TYPE,
-			'placeholder_actions' => array('mkdir','file_drop_mail','file_drop_move','file_drop_copy','file_drop_symlink')
+			'placeholder_actions' => array('mkdir', 'file_drop_mail', 'file_drop_move', 'file_drop_copy', 'file_drop_symlink')
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 
 		$this->context['sel_options']['filter'] = array(
@@ -80,7 +80,7 @@ 
 		$ui = new filemanager_ui();
 		$total = $ui->get_rows($query, $rows, $readonlys);
 		// Change template to match selected view
-		if($query['view'])
+		if ($query['view'])
 		{
 			$query['template'] = ($query['view'] == 'row' ? 'filemanager.home.rows' : 'filemanager.tile');
 		}
@@ -103,14 +103,14 @@ 
 		// the etemplate exec to fire again.
 		if ($content['nm']['action'])
 		{
-			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
-			foreach($content['nm']['selected'] as &$id)
+			$msg = filemanager_ui::action($content['nm']['action'], $content['nm']['selected'], $content['nm']['path']);
+			if ($msg) Api\Json\Response::get()->apply('egw.message', array($msg));
+			foreach ($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;
 			}
 			// Directly request an update - this will get filemanager tab too
-			Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+			Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 		}
 	}
  }
\ No newline at end of file

Doc Comments -2 removed lines

@@ -86,8 +86,6 @@
 	 * Here we need to handle any incoming data.  Setup is done in the constructor,
 	 * output is handled by parent.
 	 *
-	 * @param type $id
-	 * @param Etemplate $etemplate
 	 */
 	public static function process($content = array())
 	{

Braces +4 added lines, -1 removed lines

@@ -104,7 +104,10 @@
 		if ($content['nm']['action'])
 		{
 			$msg = filemanager_ui::action($content['nm']['action'],$content['nm']['selected'],$content['nm']['path']);
-			if($msg) Api\Json\Response::get()->apply('egw.message',array($msg));
+			if($msg)
+			{
+				Api\Json\Response::get()->apply('egw.message',array($msg));
+			}
 			foreach($content['nm']['selected'] as &$id)
 			{
 				$id = 'filemanager::'.$id;

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

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

filemanager/test.php

Spacing +15 added lines, -15 removed lines

@@ -18,13 +18,13 @@ 
 );
 include('../header.inc.php');
 
-if (!($path = Api\Cache::getSession('filemanger','test')))
+if (!($path = Api\Cache::getSession('filemanger', 'test')))
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
 if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
-echo Api\Html::form("<p>Path: ".Api\Html::input('path',$path,'text','size="40"').
-	Api\Html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
+echo Api\Html::form("<p>Path: ".Api\Html::input('path', $path, 'text', 'size="40"').
+	Api\Html::submit_button('', lang('Submit'))."</p>\n", array(), '', '', '', '', 'GET');
 
 if (isset($path) && !empty($path))
 {
@@ -32,13 +32,13 @@ 
 	{
 		throw new Api\Exception\WrongUserinput('Not an absolute path!');
 	}
-	Api\Cache::setSession('filemanger','test',$path);
+	Api\Cache::setSession('filemanger', 'test', $path);
 
 	echo "<h2>";
-	foreach(explode('/',$path) as $n => $part)
+	foreach (explode('/', $path) as $n => $part)
 	{
 		$p .= ($p != '/' ? '/' : '').$part;
-		echo ($n > 1 ? ' / ' : '').Api\Html::a_href($n ? $part : ' / ','/filemanager/test.php',array('path'=>$p));
+		echo ($n > 1 ? ' / ' : '').Api\Html::a_href($n ? $part : ' / ', '/filemanager/test.php', array('path'=>$p));
 	}
 	echo "</h2>\n";
 
@@ -50,29 +50,29 @@ 
 
 	$time = microtime(true);
 	$stat = Vfs::stat($path);
-	$stime = number_format(1000*(microtime(true)-$time),1);
+	$stime = number_format(1000 * (microtime(true) - $time), 1);
 
 	$time2 = microtime(true);
 	if ($is_dir)// && ($d = Vfs::opendir($path)))
 	{
 		$files = array();
 		//while(($file = readdir($d)))
-		foreach(Vfs::scandir($path) as $file)
+		foreach (Vfs::scandir($path) as $file)
 		{
-			if (Vfs::is_readable($fpath=Vfs::concat($path,$file)))
+			if (Vfs::is_readable($fpath = Vfs::concat($path, $file)))
 			{
-				$file = Api\Html::a_href($file,'/filemanager/test.php',array('path'=>$fpath));
+				$file = Api\Html::a_href($file, '/filemanager/test.php', array('path'=>$fpath));
 			}
 			$file .= ' ('.Vfs::mime_content_type($fpath).')';
 			$files[] = $file;
 		}
 		//closedir($d);
-		$time2f = number_format(1000*(microtime(true)-$time2),1);
+		$time2f = number_format(1000 * (microtime(true) - $time2), 1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time2f ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if ($files) echo '<ol><li>'.implode("</li>\n<li>", $files).'</ol>'."\n";
 	}
 
-	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.Vfs::int2mode($stat['mode']):'NULL').')';
+	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode']) ? sprintf('%o', $stat['mode']).' = '.Vfs::int2mode($stat['mode']) : 'NULL').')';
 	if (is_array($stat))
 	{
 		_debug_array($stat);
@@ -89,8 +89,8 @@ 
 	echo "<p><b>readlink('$path')</b>=".array2string(Vfs::readlink($path))."</p>\n";
 	$time3 = microtime(true);
 	$lstat = Vfs::lstat($path);
-	$time3f = number_format(1000*(microtime(true)-$time3),1);
-	echo "<p><b>lstat('$path')</b> took $time3f ms (mode = ".(isset($lstat['mode'])?sprintf('%o',$lstat['mode']).' = '.Vfs::int2mode($lstat['mode']):'NULL').')';
+	$time3f = number_format(1000 * (microtime(true) - $time3), 1);
+	echo "<p><b>lstat('$path')</b> took $time3f ms (mode = ".(isset($lstat['mode']) ? sprintf('%o', $lstat['mode']).' = '.Vfs::int2mode($lstat['mode']) : 'NULL').')';
 	if (is_array($lstat))
 	{
 		_debug_array($lstat);

Braces +12 added lines, -3 removed lines

@@ -22,7 +22,10 @@ 
 {
 	$path = '/home/'.$GLOBALS['egw_info']['user']['account_lid'];
 }
-if (isset($_REQUEST['path'])) $path = $_REQUEST['path'];
+if (isset($_REQUEST['path']))
+{
+	$path = $_REQUEST['path'];
+}
 echo Api\Html::form("<p>Path: ".Api\Html::input('path',$path,'text','size="40"').
 	Api\Html::submit_button('',lang('Submit'))."</p>\n",array(),'','','','','GET');
 
@@ -53,9 +56,12 @@ 
 	$stime = number_format(1000*(microtime(true)-$time),1);
 
 	$time2 = microtime(true);
-	if ($is_dir)// && ($d = Vfs::opendir($path)))
+	if ($is_dir)
+	{
+		// && ($d = Vfs::opendir($path)))
 	{
 		$files = array();
+	}
 		//while(($file = readdir($d)))
 		foreach(Vfs::scandir($path) as $file)
 		{
@@ -69,7 +75,10 @@ 
 		//closedir($d);
 		$time2f = number_format(1000*(microtime(true)-$time2),1);
 		echo "<p>".($files ? 'Directory' : 'Empty directory')." took $time2f ms</p>\n";
-		if($files) echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		if($files)
+		{
+			echo '<ol><li>'.implode("</li>\n<li>",$files).'</ol>'."\n";
+		}
 	}
 
 	echo "<p><b>stat('$path')</b> took $stime ms (mode = ".(isset($stat['mode'])?sprintf('%o',$stat['mode']).' = '.Vfs::int2mode($stat['mode']):'NULL').')';

updateGruntfile.php

Spacing +10 added lines, -10 removed lines

@@ -36,11 +36,11 @@ 
 }
 //print_r($config); exit;
 
-$uglify =& $config['uglify'];
+$uglify = & $config['uglify'];
 
-foreach(Bundle::all() as $name => $files)
+foreach (Bundle::all() as $name => $files)
 {
-	if ($name == '.ts') continue;	// ignore timestamp
+	if ($name == '.ts') continue; // ignore timestamp
 
 	// remove leading / from file-names
 	array_walk($files, function(&$path)
@@ -79,16 +79,16 @@ 
 }
 
 // add css for all templates and themes
-$cssmin =& $config['cssmin'];
-$GLOBALS['egw_info']['flags']['currentapp'] = '*grunt*';	// to no find any app.css files
-$GLOBALS['egw_info']['server']['debug_minify'] = 'True';	// otherwise we would only get minified file
-foreach(array('pixelegg','jdots')/*array_keys(Framework::list_templates())*/ as $template)
+$cssmin = & $config['cssmin'];
+$GLOBALS['egw_info']['flags']['currentapp'] = '*grunt*'; // to no find any app.css files
+$GLOBALS['egw_info']['server']['debug_minify'] = 'True'; // otherwise we would only get minified file
+foreach (array('pixelegg', 'jdots')/*array_keys(Framework::list_templates())*/ as $template)
 {
 	$GLOBALS['egw_info']['server']['template_set'] = $template;
 	$tpl = Framework::factory();
 	$themes = $tpl->list_themes();
-	if ($template == 'pixelegg') $themes[] = 'fw_mobile';	// this is for mobile devices
-	foreach($themes as $theme)
+	if ($template == 'pixelegg') $themes[] = 'fw_mobile'; // this is for mobile devices
+	foreach ($themes as $theme)
 	{
 		// skip not working cssmin of pixelegg/traditional: Broken @import declaration of "../../etemplate/templates/default/etemplate2.css"
 		if ($template == 'pixelegg' && $theme == 'traditional') continue;
@@ -114,7 +114,7 @@ 
 $new_json = str_replace("\n", "\n\t",
 	preg_replace_callback('/^( *)/m', function($matches)
 	{
-		return str_repeat("\t", strlen($matches[1])/4);
+		return str_repeat("\t", strlen($matches[1]) / 4);
 	}, json_encode($config, JSON_PRETTY_PRINT|JSON_UNESCAPED_SLASHES)));
 
 $new_content = preg_replace('/^(\s*)"([a-z0-9]+)":/mi', '$1$2:', $new_json);

Braces +22 added lines, -5 removed lines

@@ -13,7 +13,10 @@ 
 use EGroupware\Api\Framework;
 use EGroupware\Api\Framework\Bundle;
 
-if (php_sapi_name() !== 'cli') die("This is a commandline ONLY tool!\n");
+if (php_sapi_name() !== 'cli')
+{
+	die("This is a commandline ONLY tool!\n");
+}
 
 $GLOBALS['egw_info'] = array(
 	'flags' => array(
@@ -40,12 +43,19 @@ 
 
 foreach(Bundle::all() as $name => $files)
 {
-	if ($name == '.ts') continue;	// ignore timestamp
+	if ($name == '.ts')
+	{
+		continue;
+	}
+	// ignore timestamp
 
 	// remove leading / from file-names
 	array_walk($files, function(&$path)
 	{
-		if ($path[0] == '/') $path = substr($path, 1);
+		if ($path[0] == '/')
+		{
+			$path = substr($path, 1);
+		}
 	});
 
 	// api/js/jsapi/egw.js loaded via own tag, and we must not load it twice!
@@ -87,11 +97,18 @@ 
 	$GLOBALS['egw_info']['server']['template_set'] = $template;
 	$tpl = Framework::factory();
 	$themes = $tpl->list_themes();
-	if ($template == 'pixelegg') $themes[] = 'fw_mobile';	// this is for mobile devices
+	if ($template == 'pixelegg')
+	{
+		$themes[] = 'fw_mobile';
+	}
+	// this is for mobile devices
 	foreach($themes as $theme)
 	{
 		// skip not working cssmin of pixelegg/traditional: Broken @import declaration of "../../etemplate/templates/default/etemplate2.css"
-		if ($template == 'pixelegg' && $theme == 'traditional') continue;
+		if ($template == 'pixelegg' && $theme == 'traditional')
+		{
+			continue;
+		}
 		$GLOBALS['egw_info']['user']['preferences']['common']['theme'] = $theme;
 		// empty include list by not-existing file plus last true
 		Framework\CssIncludes::add('*grunt*', null, true, true);