EGroupware / egroupware

setup/inc/class.setup_detection.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -252,7 +252,7 @@
 	/**
 	 * Check if header exists and is up to date
 	 *
-	 * @return int 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
+	 * @return string 1=no header.inc.php, 2=no header admin pw, 3=no instances, 4=need upgrade, 10=ok
 	 */
 	function check_header()
 	{

Spacing +80 added lines, -80 removed lines

@@ -27,12 +27,12 @@ 
 	{
 		$setup_info = array();
 		$d = dir(EGW_SERVER_ROOT);
-		while($entry=$d->read())
+		while ($entry = $d->read())
 		{
-			if($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT . '/' . $entry))
+			if ($entry != ".." && $entry != 'setup' && is_dir(EGW_SERVER_ROOT.'/'.$entry))
 			{
-				$f = EGW_SERVER_ROOT . '/' . $entry . '/setup/setup.inc.php';
-				if (@file_exists ($f))
+				$f = EGW_SERVER_ROOT.'/'.$entry.'/setup/setup.inc.php';
+				if (@file_exists($f))
 				{
 					include($f);
 					$setup_info[$entry]['filename'] = $f;
@@ -52,17 +52,17 @@ 
 	 * @param array $setup_info
 	 * @return array $setup_info
 	 */
-	function get_db_versions($setup_info=null)
+	function get_db_versions($setup_info = null)
 	{
 		try {	// catch DB errors
 			$GLOBALS['egw_setup']->set_table_names();
 
-			if($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table),true))
+			if ($GLOBALS['egw_setup']->table_exist(array($GLOBALS['egw_setup']->applications_table), true))
 			{
 				/* one of these tables exists. checking for post/pre beta version */
-				if($GLOBALS['egw_setup']->applications_table != 'applications')
+				if ($GLOBALS['egw_setup']->applications_table != 'applications')
 				{
-					foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__) as $row)
+					foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', false, __LINE__, __FILE__) as $row)
 					{
 						$app = $row['app_name'];
 						if (!isset($setup_info[$app]))	// app source no longer there
@@ -82,7 +82,7 @@ 
 					{
 						// new api, dont care about old pre egroupware stuff
 					}
-					elseif(!@$setup_info['phpgwapi']['currentver'])
+					elseif (!@$setup_info['phpgwapi']['currentver'])
 					{
 						$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
 						$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
@@ -101,9 +101,9 @@ 
 				}
 				else
 				{
-					foreach($GLOBALS['egw_setup']->db->query('select * from applications') as $row)
+					foreach ($GLOBALS['egw_setup']->db->query('select * from applications') as $row)
 					{
-						if($row['app_name'] == 'admin')
+						if ($row['app_name'] == 'admin')
 						{
 							$setup_info['phpgwapi']['currentver'] = $row['app_version'];
 						}
@@ -131,25 +131,25 @@ 
 	 * 	V	Version mismatch at end of upgrade (Not used, proposed only)
 	 * 	M	Missing files at start of upgrade (Not used, proposed only)
 	 */
-	function compare_versions($setup_info,$try_downgrade=false)
+	function compare_versions($setup_info, $try_downgrade = false)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			//echo '<br>'.$value['name'].'STATUS: '.$value['status'];
 			/* Only set this if it has not already failed to upgrade - Milosch */
-			if(!( (@$value['status'] == 'F') || (@$value['status'] == 'C') ))
+			if (!((@$value['status'] == 'F') || (@$value['status'] == 'C')))
 			{
 				//if ($setup_info[$key]['currentver'] > $setup_info[$key]['version'])
-				if(!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'],@$value['version']) ||
+				if (!$try_downgrade && $GLOBALS['egw_setup']->amorethanb($value['currentver'], @$value['version']) ||
 					$value['version'] == 'deleted')
 				{
 					$setup_info[$key]['status'] = 'V';
 				}
-				elseif(@$value['currentver'] == @$value['version'])
+				elseif (@$value['currentver'] == @$value['version'])
 				{
 					$setup_info[$key]['status'] = 'C';
 				}
-				elseif($GLOBALS['egw_setup']->alessthanb(@$value['currentver'],@$value['version']))
+				elseif ($GLOBALS['egw_setup']->alessthanb(@$value['currentver'], @$value['version']))
 				{
 					$setup_info[$key]['status'] = 'U';
 				}
@@ -166,35 +166,35 @@ 
 	function check_depends($setup_info)
 	{
 		/* Run the list of apps */
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
 			/* Does this app have any depends */
-			if(isset($value['depends']))
+			if (isset($value['depends']))
 			{
 				/* If so find out which apps it depends on */
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					/* I set this to False until we find a compatible version of this app */
 					$setup_info['depends'][$depkey]['status'] = False;
 					/* Now we loop thru the versions looking for a compatible version */
 
-					foreach($depvalue['versions'] as $depsvalue)
+					foreach ($depvalue['versions'] as $depsvalue)
 					{
 						$currentver = $setup_info[$depvalue['appname']]['currentver'];
-						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver,0,6) == '0.9.99')
+						if ($depvalue['appname'] == 'phpgwapi' && substr($currentver, 0, 6) == '0.9.99')
 						{
 							$currentver = '0.9.14.508';
 						}
 						$major = $GLOBALS['egw_setup']->get_major($currentver);
-						if ($major >= $depsvalue || $major == $depsvalue && substr($major,0,strlen($depsvalue)+1) == $depsvalue.'.')
+						if ($major >= $depsvalue || $major == $depsvalue && substr($major, 0, strlen($depsvalue) + 1) == $depsvalue.'.')
 						{
 							$setup_info['depends'][$depkey]['status'] = True;
 						}
 						else	// check if majors are equal and minors greater or equal
 						{
 							$major_depsvalue = $GLOBALS['egw_setup']->get_major($depsvalue);
-							$tmp = explode('.',$depsvalue); $minor_depsvalue = array_pop($tmp);
-							$tmp2 = explode('.',$currentver); $minor = array_pop($tmp2);
+							$tmp = explode('.', $depsvalue); $minor_depsvalue = array_pop($tmp);
+							$tmp2 = explode('.', $currentver); $minor = array_pop($tmp2);
 							if ($major == $major_depsvalue && $minor <= $minor_depsvalue)
 							{
 								$setup_info['depends'][$depkey]['status'] = True;
@@ -207,17 +207,17 @@ 
 				 Finally, we loop through the dependencies again to look for apps that still have a failure status
 				 If we find one, we set the apps overall status as a dependency failure.
 				*/
-				foreach($value['depends'] as $depkey => $depvalue)
+				foreach ($value['depends'] as $depkey => $depvalue)
 				{
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if ($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
 							 */
-							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
+							if ($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
 							}
@@ -239,9 +239,9 @@ 
 	 */
 	function upgrade_exclude($setup_info)
 	{
-		foreach($setup_info as $key => $value)
+		foreach ($setup_info as $key => $value)
 		{
-			if(isset($value['no_mass_update']))
+			if (isset($value['no_mass_update']))
 			{
 				unset($setup_info[$key]);
 			}
@@ -256,24 +256,24 @@ 
 	 */
 	function check_header()
 	{
-		if(!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
+		if (!file_exists(EGW_SERVER_ROOT.'/header.inc.php') || filesize(EGW_SERVER_ROOT.'/header.inc.php') < 200)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One';
 			return '1';
 		}
 		else
 		{
-			if(!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
+			if (!@isset($GLOBALS['egw_info']['server']['header_admin_password']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (No header admin password set)';
 				return '2';
 			}
-			elseif(!@isset($GLOBALS['egw_domain']))
+			elseif (!@isset($GLOBALS['egw_domain']))
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Add domains to your header.inc.php)';
 				return '3';
 			}
-			elseif(@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
+			elseif (@$GLOBALS['egw_info']['server']['versions']['header'] != @$GLOBALS['egw_info']['server']['versions']['current_header'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage One (Upgrade your header.inc.php)';
 				return '4';
@@ -290,7 +290,7 @@ 
 	 * @param array $setup_info =null default use $GLOBALS['setup_info']
 	 * @return int 1=no database, 3=empty, 4=need upgrade, 10=complete
 	 */
-	function check_db($setup_info=null)
+	function check_db($setup_info = null)
 	{
 		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
 
@@ -298,14 +298,14 @@ 
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
 			{
 				$old = error_reporting();
-				error_reporting($old & ~E_WARNING);	// no warnings
+				error_reporting($old&~E_WARNING); // no warnings
 				$GLOBALS['egw_setup']->db->connect();
 				error_reporting($old);
 
 				$GLOBALS['egw_setup']->set_table_names();
 			}
 		}
-		catch(Api\Db\Exception $e) {
+		catch (Api\Db\Exception $e) {
 			// ignore error
 		}
 
@@ -314,14 +314,14 @@ 
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
 			return 1;
 		}
-		if(!isset($setup_info['api']['currentver']))
+		if (!isset($setup_info['api']['currentver']))
 		{
 			$setup_info = $this->get_db_versions($setup_info);
 		}
 		// first check new api installed and up to date
 		if (isset($setup_info['api']['currentver']))
 		{
-			if($setup_info['api']['currentver'] == $setup_info['api']['version'])
+			if ($setup_info['api']['currentver'] == $setup_info['api']['version'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Tables Complete)';
 				return 10;
@@ -335,7 +335,7 @@ 
 		// then check old phpgwapi
 		elseif (isset($setup_info['phpgwapi']['currentver']))
 		{
-			if($setup_info['phpgwapi']['currentver'] == $setup_info['phpgwapi']['version'])
+			if ($setup_info['phpgwapi']['currentver'] == $setup_info['phpgwapi']['version'])
 			{
 				$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Tables Complete)';
 				return 10;
@@ -370,14 +370,14 @@ 
 	 */
 	function check_config()
 	{
-		if(@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if (@$GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
 
 		try {	// catch db errors
-			foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,
-				'config_name,config_value',array('config_app' => 'phpgwapi'),__LINE__,__FILE__) as $row)
+			foreach ($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,
+				'config_name,config_value', array('config_app' => 'phpgwapi'), __LINE__, __FILE__) as $row)
 			{
 				$config[$row['config_name']] = $row['config_value'];
 			}
@@ -387,23 +387,23 @@ 
 			// ignore db errors
 		}
 		$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 2 (Needs Configuration)';
-		if(!count($config))
+		if (!count($config))
 		{
 			return 1;
 		}
-		$config_errors =& $GLOBALS['egw_info']['setup']['config_errors'];
+		$config_errors = & $GLOBALS['egw_info']['setup']['config_errors'];
 		$GLOBALS['egw_info']['setup']['config_errors'] = array();
 		$error_msg = null;
-		if (!$this->check_dir($config['temp_dir'],$error_msg))
+		if (!$this->check_dir($config['temp_dir'], $error_msg))
 		{
-			$config_errors[] = lang("Your temporary directory '%1' %2",$config['temp_dir'],$error_msg);
+			$config_errors[] = lang("Your temporary directory '%1' %2", $config['temp_dir'], $error_msg);
 		}
 
 		if ((!isset($config['file_repository']) || $config['file_repository'] == 'sql') &&
 			(!isset($config['file_store_contents']) || $config['file_store_contents'] == 'filesystem') &&
-			!$this->check_dir($config['files_dir'],$error_msg,true))
+			!$this->check_dir($config['files_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your files directory '%1' %2",$config['files_dir'],$error_msg);
+			$config_errors[] = lang("Your files directory '%1' %2", $config['files_dir'], $error_msg);
 		}
 		// set and create the default backup_dir
 		if (@is_writeable($config['files_dir']) && !$config['backup_dir'] && $config['file_store_contents'] == 'filesystem')
@@ -411,35 +411,35 @@ 
 			$config['backup_dir'] = $config['files_dir'].'/db_backup';
 			if (!is_dir($config['backup_dir']) && mkdir($config['backup_dir']))
 			{
-				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+				$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 					'config_value' => $config['backup_dir'],
-				),array(
+				), array(
 					'config_app'  => 'phpgwapi',
 					'config_name' => 'backup_dir',
-				),__LINE__,__FILE__);
+				), __LINE__, __FILE__);
 			}
 		}
 		if (isset($config['backup_mincount']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => $config['backup_mincount'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_mincount',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
 		if (isset($config['backup_files']))
 		{
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => (int)$config['backup_files'],
-				),array(
+				), array(
 				'config_app'  => 'phpgwapi',
 				'config_name' => 'backup_files',
-			),__LINE__,__FILE__);
+			), __LINE__, __FILE__);
 		}
-		if (!$this->check_dir($config['backup_dir'],$error_msg,true))
+		if (!$this->check_dir($config['backup_dir'], $error_msg, true))
 		{
-			$config_errors[] = lang("Your backup directory '%1' %2",$config['backup_dir'],$error_msg);
+			$config_errors[] = lang("Your backup directory '%1' %2", $config['backup_dir'], $error_msg);
 		}
 		if ($config_errors)
 		{
@@ -455,19 +455,19 @@ 
 	 * @param $appname
 	 * @param $any		optional, set to True to see if any of the apps tables are installed
 	 */
-	function check_app_tables($appname,$any=False)
+	function check_app_tables($appname, $any = False)
 	{
 		$none = 0;
 		$setup_info = $GLOBALS['setup_info'];
 
-		if(@$setup_info[$appname]['tables'])
+		if (@$setup_info[$appname]['tables'])
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
 			$tables = Array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
-				foreach($table_names as $key => $val)
+				foreach ($table_names as $key => $val)
 				{
 					$tables[] = $val['table_name'];
 				}
@@ -476,19 +476,19 @@ 
 				unset($e);
 				// ignore db error
 			}
-			foreach($copy[$appname]['tables'] as $key => $val)
+			foreach ($copy[$appname]['tables'] as $key => $val)
 			{
-				if($GLOBALS['DEBUG'])
+				if ($GLOBALS['DEBUG'])
 				{
-					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
+					echo '<br>check_app_tables(): Checking: '.$appname.',table: '.$val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if (!in_array($val, $tables) && !in_array(strtolower($val), $tables))	// names in tables might be lowercase
 				{
-					if($GLOBALS['DEBUG'])
+					if ($GLOBALS['DEBUG'])
 					{
-						echo '<br>check_app_tables(): ' . $val . ' missing!';
+						echo '<br>check_app_tables(): '.$val.' missing!';
 					}
-					if(!$any)
+					if (!$any)
 					{
 						return False;
 					}
@@ -499,9 +499,9 @@ 
 				}
 				else
 				{
-					if($any)
+					if ($any)
 					{
-						if($GLOBALS['DEBUG'])
+						if ($GLOBALS['DEBUG'])
 						{
 							echo '<br>check_app_tables(): Some tables installed';
 						}
@@ -510,9 +510,9 @@ 
 				}
 			}
 		}
-		if($none && $any)
+		if ($none && $any)
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): No tables installed';
 			}
@@ -520,7 +520,7 @@ 
 		}
 		else
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): All tables installed';
 			}
@@ -536,9 +536,9 @@ 
 	 * @param boolean $check_in_docroot =false run an optional in docroot check
 	 * @return boolean
 	 */
-	static function check_dir($dir,&$msg,$check_in_docroot=false)
+	static function check_dir($dir, &$msg, $check_in_docroot = false)
 	{
-		if (!@is_dir($dir) && !@mkdir($dir,0700,true))
+		if (!@is_dir($dir) && !@mkdir($dir, 0700, true))
 		{
 			$msg = lang('does not exist');
 			return false;
@@ -550,16 +550,16 @@ 
 		}
 		if ($check_in_docroot)
 		{
-			$docroots = array(realpath(EGW_SERVER_ROOT),realpath($_SERVER['DOCUMENT_ROOT']));
+			$docroots = array(realpath(EGW_SERVER_ROOT), realpath($_SERVER['DOCUMENT_ROOT']));
 			$dir = realpath($dir);
 
 			foreach ($docroots as $docroot)
 			{
 				$len = strlen($docroot);
 
-				if ($docroot == substr($dir,0,$len) && $len>0)
+				if ($docroot == substr($dir, 0, $len) && $len > 0)
 				{
-					$rest = substr($dir,$len);
+					$rest = substr($dir, $len);
 
 					if (!strlen($rest) || $rest[0] == DIRECTORY_SEPARATOR)
 					{

Braces +20 added lines, -5 removed lines

@@ -65,7 +65,9 @@ 
 					foreach($GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__) as $row)
 					{
 						$app = $row['app_name'];
-						if (!isset($setup_info[$app]))	// app source no longer there
+						if (!isset($setup_info[$app]))
+						{
+							// app source no longer there
 						{
 							$setup_info[$app] = array(
 								'name' => $app,
@@ -73,6 +75,7 @@ 
 								'version' => 'deleted',
 							);
 						}
+						}
 						$setup_info[$app]['currentver'] = $row['app_version'];
 						$setup_info[$app]['enabled'] = $row['app_enabled'];
 					}
@@ -212,7 +215,9 @@ 
 					if ($setup_info['depends'][$depkey]['status'] == False)
 					{
 						/* Only set this if it has not already failed to upgrade - Milosch */
-						if($setup_info[$key]['status'] != 'F')//&& $setup_info[$key]['status'] != 'C')
+						if($setup_info[$key]['status'] != 'F')
+						{
+							//&& $setup_info[$key]['status'] != 'C')
 						{
 							/* Added check for status U - uninstalled apps carry this flag (upgrade from nothing == install).
 							 * This should fix apps showing post-install dep failure when they are not yet installed.
@@ -220,6 +225,7 @@ 
 							if($setup_info[$key]['status'] == 'C' || $setup_info[$key]['status'] == 'U')
 							{
 								$setup_info[$key]['status'] = 'D';
+						}
 							}
 							else
 							{
@@ -292,7 +298,10 @@ 
 	 */
 	function check_db($setup_info=null)
 	{
-		if (!$setup_info) $setup_info = $GLOBALS['setup_info'];
+		if (!$setup_info)
+		{
+			$setup_info = $GLOBALS['setup_info'];
+		}
 
 		try {	// catch DB errors
 			if (!$GLOBALS['egw_setup']->db->Link_ID)
@@ -482,11 +491,14 @@ 
 				{
 					echo '<br>check_app_tables(): Checking: ' . $appname . ',table: ' . $val;
 				}
-				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))	// names in tables might be lowercase
+				if(!in_array($val,$tables) && !in_array(strtolower($val),$tables))
+				{
+					// names in tables might be lowercase
 				{
 					if($GLOBALS['DEBUG'])
 					{
 						echo '<br>check_app_tables(): ' . $val . ' missing!';
+				}
 					}
 					if(!$any)
 					{
@@ -543,9 +555,12 @@ 
 			$msg = lang('does not exist');
 			return false;
 		}
-		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])	// only do the check if we run by the webserver
+		if (!@is_writeable($dir) && $_SERVER['HTTP_HOST'])
+		{
+			// only do the check if we run by the webserver
 		{
 			$msg = lang('is not writeable by the webserver');
+		}
 			return false;
 		}
 		if ($check_in_docroot)

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

@@ -464,7 +464,7 @@
 		{
 			/* Make a copy, else we send some callers into an infinite loop */
 			$copy = $setup_info;
-			$tables = Array();
+			$tables = array();
 			try {
 				$table_names = $GLOBALS['egw_setup']->db->table_names();
 				foreach($table_names as $key => $val)

setup/inc/class.setup_process.inc.php

Doc Comments +1 added lines, -4 removed lines

@@ -53,10 +53,7 @@
 	 * the mother of all multipass upgrade parental loop functions
 	 *
 	 * @param array $setup_info array of application info from setup.inc.php files
-	 * @param string $type='new' defaults to new(install), could also be 'upgrade'
-	 * @param boolean $DEBUG=false print debugging info
-	 * @param boolean $force_en=false install english language files, not used anymore
-	 * @param string $system_charset=null charset to use
+	 * @param boolean $force_en install english language files, not used anymore
 	 * @param array $preset_config=array()
 	 */
 	function pass(array $setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())

Spacing +141 added lines, -141 removed lines

@@ -59,11 +59,11 @@ 
 	 * @param string $system_charset=null charset to use
 	 * @param array $preset_config=array()
 	 */
-	function pass(array $setup_info,$method='new',$DEBUG=False,$force_en=False,$preset_config=array())
+	function pass(array $setup_info, $method = 'new', $DEBUG = False, $force_en = False, $preset_config = array())
 	{
-		unset($force_en);	// no longer used
+		unset($force_en); // no longer used
 
-		if(!$method)
+		if (!$method)
 		{
 			return False;
 		}
@@ -92,23 +92,23 @@ 
 				$pass['phpgwapi'] = $setup_info['phpgwapi'];
 			}
 		}
-		$pass['admin']    = $setup_info['admin'];
+		$pass['admin'] = $setup_info['admin'];
 		$pass['preferences'] = $setup_info['preferences'];
 		if (file_exists(EGW_SERVER_ROOT.'/etemplate'))
 		{
-			$pass['etemplate'] = $setup_info['etemplate'];	// helps to minimize passes, as many apps depend on it
+			$pass['etemplate'] = $setup_info['etemplate']; // helps to minimize passes, as many apps depend on it
 		}
 		$this->api_version_target = $setup_info['api']['version'];
 
 		$i = 1;
 		$passed = array();
 		$passing = array();
-		$pass_string = implode (':', $pass);
-		$passing_string = implode (':', $passing);
-		while($pass_string != $passing_string)
+		$pass_string = implode(':', $pass);
+		$passing_string = implode(':', $passing);
+		while ($pass_string != $passing_string)
 		{
 			$passing = array();
-			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			if ($DEBUG) { echo '<br>process->pass(): #'.$i.' for '.$method.' processing'."\n"; }
 
 			// Check current versions and dependencies
 			$setup_info = $GLOBALS['egw_setup']->detection->check_depends(
@@ -116,25 +116,25 @@ 
 					$GLOBALS['egw_setup']->detection->get_db_versions($setup_info), true));
 
 			// stuff the rest of the apps, but only those with available upgrades
-			foreach($setup_info as $key => $value)
+			foreach ($setup_info as $key => $value)
 			{
 				// check if app is either installed or supports the used database
 				if (!isset($value['currentver']) && isset($value['only_db']) && (
-					is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type,$value['only_db']) ||
+					is_array($value['only_db']) && !in_array($GLOBALS['egw_setup']->db->Type, $value['only_db']) ||
 					!is_array($value['only_db']) && $GLOBALS['egw_setup']->db->Type != $value['only_db']))
 				{
-					continue;	// app does not support this db-type, dont try installing it
+					continue; // app does not support this db-type, dont try installing it
 				}
-				if(/*$value['name'] != 'phpgwapi' &&*/ $value['status'] == 'U')
+				if (/*$value['name'] != 'phpgwapi' &&*/ $value['status'] == 'U')
 				{
-					if($passed[$value['name']]['status'] != 'F' && $passed[$value['name']]['status'] != 'C')
+					if ($passed[$value['name']]['status'] != 'F' && $passed[$value['name']]['status'] != 'C')
 					{
 						$pass[$value['name']] = $setup_info[$value['name']];
 					}
 				}
 			}
 
-			switch($method)
+			switch ($method)
 			{
 				case 'new':
 					if (empty($GLOBALS['egw_info']['server']['temp_dir']))
@@ -142,13 +142,13 @@ 
 						$GLOBALS['egw_info']['server']['temp_dir'] = sys_get_temp_dir();
 					}
 					/* Create tables and insert new records for each app in this list */
-					$passing_c = $this->current($pass,$DEBUG);
+					$passing_c = $this->current($pass, $DEBUG);
 					if (isset($pass['api'])) $this->save_minimal_config($preset_config);
-					$passing = $this->default_records($passing_c,$DEBUG);
+					$passing = $this->default_records($passing_c, $DEBUG);
 					break;
 				case 'upgrade':
 					/* Run upgrade scripts on each app in the list */
-					$passing = $this->upgrade($pass,$DEBUG);
+					$passing = $this->upgrade($pass, $DEBUG);
 					//_debug_array($pass);exit;
 					break;
 				default:
@@ -157,32 +157,32 @@ 
 			}
 
 			$pass = array();
-			foreach($passing as $key => $value)
+			foreach ($passing as $key => $value)
 			{
-				if($value['status'] == 'C')
+				if ($value['status'] == 'C')
 				{
 					$passed[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'].' install completed'."\n"; }
 				}
-				elseif($value['status'] == 'F')
+				elseif ($value['status'] == 'F')
 				{
 					$setup_info[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'].' install failed'."\n"; }
 				}
-				elseif($value['status'] == 'D')
+				elseif ($value['status'] == 'D')
 				{
 					$pass[$value['name']] = $setup_info[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'].' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
 					$tmp = $passing[$value['name']]['name'];
-					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+					if ($DEBUG) { echo '<br>process->pass(): '.$tmp.' skipped on this pass'."\n"; }
 				}
 			}
 
 			$i++;
-			if($i == 20) /* Then oops it broke */
+			if ($i == 20) /* Then oops it broke */
 			{
 				echo '<br>Setup failure: excess looping in process->pass():'."\n";
 				echo '<br>Pass:<br>'."\n";
@@ -191,19 +191,19 @@ 
 				_debug_array($passed);
 				exit;
 			}
-			$pass_string = implode (':', $pass);
-			$passing_string = implode (':', $passing);
+			$pass_string = implode(':', $pass);
+			$passing_string = implode(':', $passing);
 		}
 		try {
 			// flush instance cache: also registers hooks and flushes image cache
 			Api\Cache::flush(Api\Cache::INSTANCE);
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			// ignore exception, as during a new install, there's no cache configured and therefore no need to unset
 		}
 		/* now return the list */
-		return array_merge($setup_info,$passed);
+		return array_merge($setup_info, $passed);
 	}
 
 	/**
@@ -211,20 +211,20 @@ 
 	 *
 	 * @param array $preset_config =array()
 	 */
-	function save_minimal_config(array $preset_config=array())
+	function save_minimal_config(array $preset_config = array())
 	{
-		$is_windows = strtoupper(substr(PHP_OS,0,3)) == 'WIN';
+		$is_windows = strtoupper(substr(PHP_OS, 0, 3)) == 'WIN';
 
 		$current_config['site_title'] = 'EGroupware';
-		$current_config['hostname']  = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
+		$current_config['hostname'] = isset($_SERVER['HTTP_HOST']) ? $_SERVER['HTTP_HOST'] : 'localhost';
 
 		// guessing the eGW url
 		if (isset($_SERVER['HTTP_HOST']))
 		{
-			$parts = explode('/',$_SERVER['PHP_SELF']);
-			array_pop($parts);	// remove config.php
-			array_pop($parts);	// remove setup
-			$current_config['webserver_url'] = implode('/',$parts);
+			$parts = explode('/', $_SERVER['PHP_SELF']);
+			array_pop($parts); // remove config.php
+			array_pop($parts); // remove setup
+			$current_config['webserver_url'] = implode('/', $parts);
 			$egroupwareDirName = end($parts);
 		}
 		else	// eg. cli install --> use defaults
@@ -232,9 +232,9 @@ 
 			$current_config['webserver_url'] = '/egroupware';
 			$egroupwareDirName = 'egroupware';
 		}
-		if(!$is_windows)
+		if (!$is_windows)
 		{
-			if(@is_dir('/tmp'))
+			if (@is_dir('/tmp'))
 			{
 				$current_config['temp_dir'] = '/tmp';
 			}
@@ -248,7 +248,7 @@ 
 		}
 		else
 		{
-			if(@is_dir('c:\\windows\\temp'))
+			if (@is_dir('c:\\windows\\temp'))
 			{
 				$current_config['temp_dir'] = 'c:\\windows\\temp';
 			}
@@ -269,15 +269,15 @@ 
 		$current_config['enabled_spellcheck'] = 'YesBrowserBased';
 
 		// always enable history logging for calendar, addressbook and infolog
-		$current_config['history'] = 'history';	// addressbook: only admin
-		$current_config['calendar_delete_history'] = 'history';	// only admins
+		$current_config['history'] = 'history'; // addressbook: only admin
+		$current_config['calendar_delete_history'] = 'history'; // only admins
 		// infolog does NOT use config_app='phpgwapi', but 'infolog'
-		$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
-			'config_value' => 'history_admin_delete',	// only admins
-		),array(
+		$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
+			'config_value' => 'history_admin_delete', // only admins
+		), array(
 			'config_app' => 'infolog',
 			'config_name' => 'history',
-		),__FILE__,__LINE__);
+		), __FILE__, __LINE__);
 
 
 		// RalfBecker: php.net recommend this for security reasons, it should be our default too
@@ -293,7 +293,7 @@ 
 			$tz = new DateTimeZone(date_default_timezone_get());
 			$current_config['server_timezone'] = $tz->getName();
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			unset($e);
 			// do nothing if new DateTimeZone fails (eg. 'System/Localtime' returned), specially do NOT store it!
@@ -301,42 +301,42 @@ 
 		}
 		$current_config['install_id'] = md5($_SERVER['HTTP_HOST'].microtime(true).$GLOBALS['egw_setup']->ConfigDomain);
 
-		$current_config['postpone_statistics_submit'] = time() + 2 * 30 * 86400;	// ask user in 2 month from now, when he has something to report
+		$current_config['postpone_statistics_submit'] = time() + 2 * 30 * 86400; // ask user in 2 month from now, when he has something to report
 
 		// use securest password hash by default
-		require_once EGW_SERVER_ROOT.'/setup/inc/hook_config.inc.php';	// for sql_passwdhashes, to get securest available password hash
+		require_once EGW_SERVER_ROOT.'/setup/inc/hook_config.inc.php'; // for sql_passwdhashes, to get securest available password hash
 		$securest = null;
 		sql_passwdhashes(array(), true, $securest);
 		$current_config['sql_encryption_type'] = $current_config['ldap_encryption_type'] = $securest;
 
 		if ($preset_config)
 		{
-			$current_config = array_merge($current_config,$preset_config);
+			$current_config = array_merge($current_config, $preset_config);
 		}
 
-		foreach($current_config as $name => $value)
+		foreach ($current_config as $name => $value)
 		{
 			$app = 'phpgwapi';
 			if ($name == 'postpone_statistics_submit')
 			{
 				$app = 'admin';
 			}
-			elseif(strpos($name, '/') !== false)
+			elseif (strpos($name, '/') !== false)
 			{
 				list($app, $name) = explode('/', $name);
 			}
-			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table,array(
+			$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->config_table, array(
 				'config_value' => $value,
-			),array(
+			), array(
 				'config_app' => $app,
 				'config_name' => $name,
-			),__FILE__,__LINE__);
+			), __FILE__, __LINE__);
 		}
 
 		// so the default_records use the current data
 		$GLOBALS['egw_info']['server'] = array_merge((array)$GLOBALS['egw_info']['server'], $current_config);
-		Api\Cache::flush();	// flush whole instance cache
-		Api\Config::init_static();	// flush internal cache of Api\Config class
+		Api\Cache::flush(); // flush whole instance cache
+		Api\Config::init_static(); // flush internal cache of Api\Config class
 		$GLOBALS['egw_setup']->setup_account_object($current_config);
 	}
 
@@ -345,9 +345,9 @@ 
 	 *
 	 * @param $setup_info	array of application info from setup.inc.php files, etc.
 	 */
-	function droptables(array $setup_info,$DEBUG=False)
+	function droptables(array $setup_info, $DEBUG = False)
 	{
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
@@ -355,10 +355,10 @@ 
 		$tablenames = $GLOBALS['egw_setup']->db->table_names();
 		if (!is_array($setup_info) || !is_array($tablenames))
 		{
-			return $setup_info;	// nothing to do
+			return $setup_info; // nothing to do
 		}
 		$tables = array();
-		foreach($tablenames as $data)
+		foreach ($tablenames as $data)
 		{
 			$tables[] = $data['table_name'];
 		}
@@ -367,16 +367,16 @@ 
 		{
 			return $setup_info;
 		}
-		foreach($setup_info as $app_name => $data)
+		foreach ($setup_info as $app_name => $data)
 		{
-			if(is_array($data['tables']))
+			if (is_array($data['tables']))
 			{
-				foreach($data['tables'] as $table)
+				foreach ($data['tables'] as $table)
 				{
 					//echo $table;
-					if(in_array($table,$tables))
+					if (in_array($table, $tables))
 					{
-						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						if ($DEBUG) { echo '<br>process->droptables(): Dropping :'.$app_name.' table: '.$table; }
 						$GLOBALS['egw_setup']->oProc->DropTable($table);
 						// Update the array values for return below
 						$setup_info[$app_name]['status'] = 'U';
@@ -396,31 +396,31 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function current(array $setup_info,$DEBUG=False)
+	function current(array $setup_info, $DEBUG = False)
 	{
 		//echo __METHOD__; _debug_array($setup_info);
-		if(!isset($GLOBALS['egw_setup']->oProc))
+		if (!isset($GLOBALS['egw_setup']->oProc))
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
 			$enabled = False;
 			$apptitle = $appdata['title'];
 
-			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+			if ($DEBUG) { echo '<br>process->current(): Incoming status: '.$appname.',status: '.$appdata['status']; }
 
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
+			if ($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
 			{
-				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				if ($DEBUG) { echo '<br>process->current(): Including: '.$appdir.'tables_current.inc.php'; }
 				$phpgw_baseline = null;
 				include ($appdir.'tables_current.inc.php');
-				$ret = $this->post_process($phpgw_baseline,$DEBUG);
-				if($ret)
+				$ret = $this->post_process($phpgw_baseline, $DEBUG);
+				if ($ret)
 				{
-					if($GLOBALS['egw_setup']->app_registered($appname))
+					if ($GLOBALS['egw_setup']->app_registered($appname))
 					{
 						$GLOBALS['egw_setup']->update_app($appname);
 					}
@@ -435,34 +435,34 @@ 
 				else
 				{
 					/* script processing failed */
-					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					if ($DEBUG) { echo '<br>process->current(): Failed for '.$appname.',status: '.$appdata['status']; }
 					$appdata['status'] = 'F';
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				if ($DEBUG) { echo '<br>process->current(): No current tables for '.$apptitle."\n"; }
 				/*
 				 Add the app, but disable it if it has tables defined.
 				 A manual sql script install is needed, but we do add the hooks
 				*/
 				$enabled = 99;
-				if($appdata['tables'][0] != '')
+				if ($appdata['tables'][0] != '')
 				{
 					$enabled = False;
 				}
-				if($GLOBALS['egw_setup']->app_registered($appname))
+				if ($GLOBALS['egw_setup']->app_registered($appname))
 				{
 					$GLOBALS['egw_setup']->update_app($appname);
 				}
 				else
 				{
-					$GLOBALS['egw_setup']->register_app($appname,$enabled);
+					$GLOBALS['egw_setup']->register_app($appname, $enabled);
 					$GLOBALS['egw_setup']->set_default_preferences($appname);
 				}
 				$appdata['status'] = 'C';
 			}
-			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
+			if ($DEBUG) { echo '<br>process->current(): Outgoing status: '.$appname.',status: '.$appdata['status']; }
 		}
 
 		// update hooks
@@ -479,25 +479,25 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function default_records(array $setup_info,$DEBUG=False)
+	function default_records(array $setup_info, $DEBUG = False)
 	{
 		//echo __METHOD__; _debug_array($setup_info);
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if(file_exists($appdir.'default_records.inc.php'))
+			if (file_exists($appdir.'default_records.inc.php'))
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->default_records(): Including default records for ' . $appname . "\n";
+					echo '<br>process->default_records(): Including default records for '.$appname."\n";
 				}
 				$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
-				$oProc = &$GLOBALS['egw_setup']->oProc;	// to be compatible with old apps
+				$oProc = &$GLOBALS['egw_setup']->oProc; // to be compatible with old apps
 				include ($appdir.'default_records.inc.php');
 				$GLOBALS['egw_setup']->oProc->m_odb->transaction_commit();
 			}
@@ -521,21 +521,21 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function test_data(array $setup_info,$DEBUG=False)
+	function test_data(array $setup_info, $DEBUG = False)
 	{
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if(file_exists($appdir.'test_data.inc.php'))
+			if (file_exists($appdir.'test_data.inc.php'))
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->test_data(): Including baseline test data for ' . $appname . "\n";
+					echo '<br>process->test_data(): Including baseline test data for '.$appname."\n";
 				}
 				$GLOBALS['egw_setup']->oProc->m_odb->transaction_begin();
 				include ($appdir.'test_data.inc.php');
@@ -555,35 +555,35 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function baseline(array $setup_info,$DEBUG=False)
+	function baseline(array $setup_info, $DEBUG = False)
 	{
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
-			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+			$appdir = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-			if(file_exists($appdir.'tables_baseline.inc.php'))
+			if (file_exists($appdir.'tables_baseline.inc.php'))
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->baseline(): Including baseline tables for ' . $appname . "\n";
+					echo '<br>process->baseline(): Including baseline tables for '.$appname."\n";
 				}
 				$phpgw_baseline = null;
 				include ($appdir.'tables_baseline.inc.php');
 				$GLOBALS['egw_setup']->oProc->GenerateScripts($phpgw_baseline, $DEBUG);
-				$this->post_process($phpgw_baseline,$DEBUG);
+				$this->post_process($phpgw_baseline, $DEBUG);
 
 				/* Update the array values for return below */
 				/* $setup_info[$key]['status'] = 'R'; */
 			}
 			else
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
-					echo '<br>process->baseline(): No baseline tables for ' . $appname . "\n";
+					echo '<br>process->baseline(): No baseline tables for '.$appname."\n";
 				}
 				//$setup_info[$key]['status'] = 'C';
 			}
@@ -601,19 +601,19 @@ 
 	 * @param boolean $DEBUG =false output further diagnostics
 	 * @return array $setup_info
 	 */
-	function upgrade($setup_info,$DEBUG=False)
+	function upgrade($setup_info, $DEBUG = False)
 	{
 		//echo __METHOD__; _debug_array($setup_info);
-		if(!@$GLOBALS['egw_setup']->oProc)
+		if (!@$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
 		$GLOBALS['egw_setup']->oProc->m_odb->HaltOnError = 'yes';
 
-		foreach($setup_info as $appname => &$appdata)
+		foreach ($setup_info as $appname => &$appdata)
 		{
 			// check if app is NOT installed
-			if(!$GLOBALS['egw_setup']->app_registered($appname))
+			if (!$GLOBALS['egw_setup']->app_registered($appname))
 			{
 				// check if app wants to be automatically installed on update to version x or allways
 				if (isset($appdata['autoinstall']) && ($appdata['autoinstall'] === true ||
@@ -625,7 +625,7 @@ 
 					continue;
 				}
 				/* Don't try to upgrade an app that is not installed */
-				if($DEBUG)
+				if ($DEBUG)
 				{
 					echo "<p>process->upgrade(): Application not installed: $appname</p>\n";
 				}
@@ -634,41 +634,41 @@ 
 			}
 
 			/* if upgrade required, or if we are running again after an upgrade or dependency failure */
-			if($DEBUG)
+			if ($DEBUG)
 			{
 				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
 			}
-			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			if ($appdata['status'] == 'U' || $appdata['status'] == 'D' || $appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
 			{
 				$currentver = $appdata['currentver'];
-				$targetver  = $appdata['version'];	// The version we need to match when done
-				$appdir     = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
+				$targetver  = $appdata['version']; // The version we need to match when done
+				$appdir     = EGW_SERVER_ROOT.'/'.$appname.'/setup/';
 
-				if(file_exists($appdir . 'tables_update.inc.php'))
+				if (file_exists($appdir.'tables_update.inc.php'))
 				{
 					if (!@$this->updateincluded[$appname])
 					{
-						include ($appdir . 'tables_update.inc.php');
+						include ($appdir.'tables_update.inc.php');
 						$this->updateincluded[$appname] = True;
 					}
 					while ($currentver && $currentver != $targetver &&
-						function_exists($function = $appname . '_upgrade' . str_replace('.','_',$currentver)))
+						function_exists($function = $appname.'_upgrade'.str_replace('.', '_', $currentver)))
 					{
-						if($DEBUG)
+						if ($DEBUG)
 						{
 							echo "<br>process->upgrade(): $appname($currentver --> $targetver): running $function()\n";
 						}
 						if (!($currentver = $function()))
 						{
-							if($DEBUG)
+							if ($DEBUG)
 							{
 								echo "<b>failed!!!</b>\n";
 							}
-							$appstatus  = 'F';
+							$appstatus = 'F';
 						}
 						else
 						{
-							if($DEBUG)
+							if ($DEBUG)
 							{
 								echo "--> $currentver\n";
 							}
@@ -676,7 +676,7 @@ 
 					}
 					if ($currentver == $targetver)	// upgrades succesful
 					{
-						if($DEBUG)
+						if ($DEBUG)
 						{
 							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
 						}
@@ -684,27 +684,27 @@ 
 					}
 					elseif ($currentver)
 					{
-						if($DEBUG)
+						if ($DEBUG)
 						{
 							echo "<br><b>process->upgrade(): No table upgrade available for appname: $appname, version: $currentver</b>\n";
 						}
 						$appdate['currentver'] = $targetver;
-						$appstatus  = 'F';
+						$appstatus = 'F';
 					}
 				}
 				else
 				{
-					if($DEBUG)
+					if ($DEBUG)
 					{
 						echo "<br>process->upgrade(): No table upgrade required/availible for $appname\n";
 					}
-					$appstatus  = 'C';
+					$appstatus = 'C';
 				}
 				if ($appstatus == 'C')	// update successful completed
 				{
 					$appdata['currentver'] = $targetver;
 
-					if($GLOBALS['egw_setup']->app_registered($appname))
+					if ($GLOBALS['egw_setup']->app_registered($appname))
 					{
 						$GLOBALS['egw_setup']->update_app($appname);
 					}
@@ -717,14 +717,14 @@ 
 			}
 			else
 			{
-				if($DEBUG)
+				if ($DEBUG)
 				{
 					echo "<br>process->upgrade(): No upgrade required for $appname\n";
 				}
-				$appstatus  = 'C';
+				$appstatus = 'C';
 			}
 			/* Done with this app, update status */
-			if($DEBUG)
+			if ($DEBUG)
 			{
 				echo "<br>process->upgrade(): Outgoing : appname: $appname, status: $appstatus</div>\n";
 			}
@@ -742,13 +742,13 @@ 
 	 * commit above processing to the db
 	 *
 	 */
-	function post_process($tables,$DEBUG=False)
+	function post_process($tables, $DEBUG = False)
 	{
-		if(!$tables)
+		if (!$tables)
 		{
 			return False;
 		}
-		return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
+		return $GLOBALS['egw_setup']->oProc->ExecuteScripts($tables, $DEBUG);
 	}
 
 	/**
@@ -756,14 +756,14 @@ 
 	 *
 	 * @param	$tablename	table whose array you want to see
 	 */
-	function sql_to_array($tablename='')
+	function sql_to_array($tablename = '')
 	{
-		if(!$tablename)
+		if (!$tablename)
 		{
 			return False;
 		}
 
-		if(!$GLOBALS['egw_setup']->oProc)
+		if (!$GLOBALS['egw_setup']->oProc)
 		{
 			$this->init_process();
 		}
@@ -771,7 +771,7 @@ 
 		$sColumns = null;
 		$GLOBALS['egw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['egw_setup']->oProc, $tablename, $sColumns);
 
-		while(list($key,$tbldata) = each($GLOBALS['egw_setup']->oProc->m_oTranslator->sCol))
+		while (list($key, $tbldata) = each($GLOBALS['egw_setup']->oProc->m_oTranslator->sCol))
 		{
 			$arr .= $tbldata;
 		}
@@ -780,6 +780,6 @@ 
 		$ix = $GLOBALS['egw_setup']->oProc->m_oTranslator->ix;
 		$uc = $GLOBALS['egw_setup']->oProc->m_oTranslator->uc;
 
-		return array($arr,$pk,$fk,$ix,$uc);
+		return array($arr, $pk, $fk, $ix, $uc);
 	}
 }

Braces +53 added lines, -16 removed lines

@@ -108,7 +108,9 @@ 
 		while($pass_string != $passing_string)
 		{
 			$passing = array();
-			if($DEBUG) { echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
+			if($DEBUG)
+			{
+echo '<br>process->pass(): #' . $i . ' for ' . $method . ' processing' . "\n"; }
 
 			// Check current versions and dependencies
 			$setup_info = $GLOBALS['egw_setup']->detection->check_depends(
@@ -143,7 +145,10 @@ 
 					}
 					/* Create tables and insert new records for each app in this list */
 					$passing_c = $this->current($pass,$DEBUG);
-					if (isset($pass['api'])) $this->save_minimal_config($preset_config);
+					if (isset($pass['api']))
+					{
+						$this->save_minimal_config($preset_config);
+					}
 					$passing = $this->default_records($passing_c,$DEBUG);
 					break;
 				case 'upgrade':
@@ -162,29 +167,40 @@ 
 				if($value['status'] == 'C')
 				{
 					$passed[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$passed[$value['name']]['name'] . ' install completed'."\n"; }
 				}
 				elseif($value['status'] == 'F')
 				{
 					$setup_info[$value['name']] = $passing[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install failed'."\n"; }
 				}
 				elseif($value['status'] == 'D')
 				{
 					$pass[$value['name']] = $setup_info[$value['name']];
-					if($DEBUG) { echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency check on this pass'."\n"; }
 				}
 				else
 				{
 					$tmp = $passing[$value['name']]['name'];
-					if($DEBUG) { echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
+					if($DEBUG)
+					{
+echo '<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
 				}
 			}
 
 			$i++;
-			if($i == 20) /* Then oops it broke */
+			if($i == 20)
+			{
+				/* Then oops it broke */
 			{
 				echo '<br>Setup failure: excess looping in process->pass():'."\n";
+			}
 				echo '<br>Pass:<br>'."\n";
 				_debug_array($pass);
 				echo '<br>Passed:<br>'."\n";
@@ -376,7 +392,9 @@ 
 					//echo $table;
 					if(in_array($table,$tables))
 					{
-						if($DEBUG){ echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
+						if($DEBUG)
+						{
+echo '<br>process->droptables(): Dropping :'. $app_name . ' table: ' . $table; }
 						$GLOBALS['egw_setup']->oProc->DropTable($table);
 						// Update the array values for return below
 						$setup_info[$app_name]['status'] = 'U';
@@ -408,13 +426,17 @@ 
 			$enabled = False;
 			$apptitle = $appdata['title'];
 
-			if($DEBUG) { echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Incoming status: ' . $appname . ',status: '. $appdata['status']; }
 
 			$appdir  = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
 			if($appdata['tables'] && file_exists($appdir.'tables_current.inc.php'))
 			{
-				if($DEBUG) { echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
 				$phpgw_baseline = null;
 				include ($appdir.'tables_current.inc.php');
 				$ret = $this->post_process($phpgw_baseline,$DEBUG);
@@ -435,13 +457,17 @@ 
 				else
 				{
 					/* script processing failed */
-					if($DEBUG) { echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
+					if($DEBUG)
+					{
+echo '<br>process->current(): Failed for ' . $appname . ',status: '. $appdata['status']; }
 					$appdata['status'] = 'F';
 				}
 			}
 			else
 			{
-				if($DEBUG) { echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
+				if($DEBUG)
+				{
+echo '<br>process->current(): No current tables for ' . $apptitle . "\n"; }
 				/*
 				 Add the app, but disable it if it has tables defined.
 				 A manual sql script install is needed, but we do add the hooks
@@ -462,7 +488,9 @@ 
 				}
 				$appdata['status'] = 'C';
 			}
-			if($DEBUG) { echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
+			if($DEBUG)
+			{
+echo '<br>process->current(): Outgoing status: ' . $appname . ',status: '. $appdata['status']; }
 		}
 
 		// update hooks
@@ -638,9 +666,12 @@ 
 			{
 				echo '<div style="text-align: left; border: thin dashed black; margin-top: 5px;">'."process->upgrade(): Incoming : appname: $appname, version: $appdata[currentver], status: $appdata[status]\n";
 			}
-			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '') // TODO this is not getting set for api upgrade, sometimes ???
+			if($appdata['status'] == 'U' || $appdata['status'] == 'D' ||$appdata['status'] == 'V' || $appdata['status'] == '')
+			{
+				// TODO this is not getting set for api upgrade, sometimes ???
 			{
 				$currentver = $appdata['currentver'];
+			}
 				$targetver  = $appdata['version'];	// The version we need to match when done
 				$appdir     = EGW_SERVER_ROOT . '/' . $appname . '/setup/';
 
@@ -674,11 +705,14 @@ 
 							}
 						}
 					}
-					if ($currentver == $targetver)	// upgrades succesful
+					if ($currentver == $targetver)
+					{
+						// upgrades succesful
 					{
 						if($DEBUG)
 						{
 							echo "<br>process->upgrade(): Upgrade of $appname to $targetver is completed.\n";
+					}
 						}
 						$appstatus = 'C';
 					}
@@ -700,9 +734,12 @@ 
 					}
 					$appstatus  = 'C';
 				}
-				if ($appstatus == 'C')	// update successful completed
+				if ($appstatus == 'C')
+				{
+					// update successful completed
 				{
 					$appdata['currentver'] = $targetver;
+				}
 
 					if($GLOBALS['egw_setup']->app_registered($appname))
 					{

timesheet/inc/class.timesheet_bo.inc.php

Doc Comments +7 added lines, -9 removed lines

@@ -261,7 +261,7 @@ 
 	 *
 	 * @param statuses List of statuses to process, with sub-statuses in a 'substatus' array
 	 * @param labels Array of labels, pass array() and labels will be built in it
-	 * @param depth Current depth
+	 * @param depth integer depth
 	 *
 	 * @return None, labels are built in labels parameter
 	 */
@@ -305,7 +305,7 @@ 
 	 *
 	 * @param array|int $data =null use $this->data or $this->data['ts_id'] (to fetch the data)
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if the rights are ok, false if no rights
+	 * @return null|boolean true if the rights are ok, false if no rights
 	 */
 	function check_statusForEditRights($data=null,$user=null)
 	{
@@ -340,7 +340,7 @@ 
 	 * @param int $required Acl::READ, EGW_ACL_WRITE, Acl::ADD, Acl::DELETE, EGW_ACL_BUDGET, EGW_ACL_EDIT_BUDGET
 	 * @param array|int $data =null project or project-id to use, default the project in $this->data
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if the rights are ok, null if not found, false if no rights
+	 * @return null|boolean true if the rights are ok, null if not found, false if no rights
 	 */
 	function check_acl($required,$data=null,$user=null)
 	{
@@ -397,11 +397,11 @@ 
 	 * @param array|string $criteria array of key and data cols, OR a SQL query (content for WHERE), fully quoted (!)
 	 * @param boolean|string $only_keys =true True returns only keys, False returns all cols. comma seperated list of keys to return
 	 * @param string $order_by ='' fieldnames + {ASC|DESC} separated by colons ',', can also contain a GROUP BY (if it contains ORDER BY)
-	 * @param string|array $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
+	 * @param string $extra_cols ='' string or array of strings to be added to the SELECT, eg. "count(*) as num"
 	 * @param string $wildcard ='' appended befor and after each criteria
 	 * @param boolean $empty =false False=empty criteria are ignored in query, True=empty have to be empty in row
 	 * @param string $op ='AND' defaults to 'AND', can be set to 'OR' too, then criteria's are OR'ed together
-	 * @param mixed $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
+	 * @param boolean $start =false if != false, return only maxmatch rows begining with start, or array($start,$num)
 	 * @param array $filter =null if set (!=null) col-data pairs, to be and-ed (!) into the query without wildcards
 	 * @param string $join ='' sql to do a join, added as is after the table-name, eg. ", table2 WHERE x=y" or
 	 *	"LEFT JOIN table2 ON (x=y)", Note: there's no quoting done on $join!
@@ -658,8 +658,6 @@ 
 	 * delete / move all timesheets of a given user
 	 *
 	 * @param array $data
-	 * @param int $data['account_id'] owner to change
-	 * @param int $data['new_owner']  new owner or 0 for delete
 	 */
 	function deleteaccount($data)
 	{
@@ -686,7 +684,7 @@ 
 	 *
 	 * @param array $keys =null if given array with col => value pairs to characterise single timesheet or null for $this->data
 	 * @param int $status =0
-	 * @return int affected rows, should be 1 if ok, 0 if an error
+	 * @return boolean affected rows, should be 1 if ok, 0 if an error
 	 */
 	function set_status($keys=null, $status=0)
 	{
@@ -816,7 +814,7 @@ 
 	 * @param int $check Acl::READ for read and Acl::EDIT for write or delete access
 	 * @param string $rel_path =null currently not used in InfoLog
 	 * @param int $user =null for which user to check, default current user
-	 * @return boolean true if access is granted or false otherwise
+	 * @return null|boolean true if access is granted or false otherwise
 	 */
 	function file_access($id,$check,$rel_path=null,$user=null)
 	{

Indentation +2 added lines, -2 removed lines

@@ -152,8 +152,8 @@
 	const EXTRA_TABLE = 'egw_timesheet_extra';
 
 	/**
-	* Columns to search when user does a text search
-	*/
+	 * Columns to search when user does a text search
+	 */
 	var $columns_to_search = array('egw_timesheet.ts_id', 'ts_project', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_unitprice');
 
 	/**

Spacing +134 added lines, -134 removed lines

@@ -16,7 +16,7 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 
@@ -43,7 +43,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $quantity_sum=false;
+	var $quantity_sum = false;
 	/**
 	 * current user
 	 *
@@ -56,7 +56,7 @@ 
 	 * @var array
 	 */
 	var $timestamps = array(
-		'ts_start','ts_modified'
+		'ts_start', 'ts_modified'
 	);
 	/**
 	 * Start of today in user-time
@@ -70,17 +70,17 @@ 
 	 * @var array
 	 */
 	var $date_filters = array(	// Start: year,month,day,week, End: year,month,day,week
-		'Today'       => array(0,0,0,0,  0,0,1,0),
-		'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-		'This week'   => array(0,0,0,0,  0,0,0,1),
-		'Last week'   => array(0,0,0,-1, 0,0,0,0),
-		'This month'  => array(0,0,0,0,  0,1,0,0),
-		'Last month'  => array(0,-1,0,0, 0,0,0,0),
-		'2 month ago' => array(0,-2,0,0, 0,-1,0,0),
-		'This year'   => array(0,0,0,0,  1,0,0,0),
-		'Last year'   => array(-1,0,0,0, 0,0,0,0),
-		'2 years ago' => array(-2,0,0,0, -1,0,0,0),
-		'3 years ago' => array(-3,0,0,0, -2,0,0,0),
+		'Today'       => array(0, 0, 0, 0, 0, 0, 1, 0),
+		'Yesterday'   => array(0, 0, -1, 0, 0, 0, 0, 0),
+		'This week'   => array(0, 0, 0, 0, 0, 0, 0, 1),
+		'Last week'   => array(0, 0, 0, -1, 0, 0, 0, 0),
+		'This month'  => array(0, 0, 0, 0, 0, 1, 0, 0),
+		'Last month'  => array(0, -1, 0, 0, 0, 0, 0, 0),
+		'2 month ago' => array(0, -2, 0, 0, 0, -1, 0, 0),
+		'This year'   => array(0, 0, 0, 0, 1, 0, 0, 0),
+		'Last year'   => array(-1, 0, 0, 0, 0, 0, 0, 0),
+		'2 years ago' => array(-2, 0, 0, 0, -1, 0, 0, 0),
+		'3 years ago' => array(-3, 0, 0, 0, -2, 0, 0, 0),
 	);
 	/**
 	 * Grants: $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP);
@@ -105,7 +105,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Array with status label
 	 *
@@ -165,21 +165,21 @@ 
 
 	function __construct()
 	{
-		parent::__construct(TIMESHEET_APP,'egw_timesheet',self::EXTRA_TABLE,'','ts_extra_name','ts_extra_value','ts_id');
+		parent::__construct(TIMESHEET_APP, 'egw_timesheet', self::EXTRA_TABLE, '', 'ts_extra_name', 'ts_extra_value', 'ts_id');
 
 		if ($this->customfields) $this->columns_to_search[] = self::EXTRA_TABLE.'.ts_extra_value';
 		$this->config_data = Api\Config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 
 		// Load & process statuses
-		if($this->config_data['status_labels']) $this->load_statuses();
+		if ($this->config_data['status_labels']) $this->load_statuses();
 
-		$this->today = mktime(0,0,0,date('m',$this->now),date('d',$this->now),date('Y',$this->now));
+		$this->today = mktime(0, 0, 0, date('m', $this->now), date('d', $this->now), date('Y', $this->now));
 
 		// save us in $GLOBALS['timesheet_bo'] for ExecMethod used in hooks
 		if (!is_object($GLOBALS['timesheet_bo']))
 		{
-			$GLOBALS['timesheet_bo'] =& $this;
+			$GLOBALS['timesheet_bo'] = & $this;
 		}
 		$this->grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP);
 	}
@@ -189,15 +189,15 @@ 
 	 */
 	protected function load_statuses()
 	{
-		$this->status_labels =&  $this->config_data['status_labels'];
-		if (!is_array($this->status_labels)) $this->status_labels= array($this->status_labels);
+		$this->status_labels = &  $this->config_data['status_labels'];
+		if (!is_array($this->status_labels)) $this->status_labels = array($this->status_labels);
 
 		foreach ($this->status_labels as $status_id => $label)
 		{
 			if (!is_array($label))
 			{	//old values, before parent status
 				$name = $label;
-				$label=array();
+				$label = array();
 				$label['name'] = $name;
 				$label['parent'] = '';
 			}
@@ -209,12 +209,12 @@ 
 		$map = array(
 			'' => array('substatus' => array())
 		);
-		foreach($this->status_labels_config as $id => &$status)
+		foreach ($this->status_labels_config as $id => &$status)
 		{
 			$status['substatus'] = array();
 			$map[$id] = &$status;
 		}
-		foreach($this->status_labels_config as &$status)
+		foreach ($this->status_labels_config as &$status)
 		{
 			$map[$status['parent']]['substatus'][] = &$status;
 		}
@@ -226,7 +226,7 @@ 
 
 		// Sort Api\Config based on tree
 		$sorted = array();
-		foreach($this->status_labels as $status_id => $label)
+		foreach ($this->status_labels as $status_id => $label)
 		{
 			$sorted[$status_id] = $this->status_labels_config[$status_id];
 			//$sorted[$status_id]['name'] = $label;
@@ -245,7 +245,7 @@ 
 	{
 		if (!isset($this->status_labels_config)) $this->load_statuses();
 		$stati = array($status);
-		foreach($this->status_labels_config as $stat)
+		foreach ($this->status_labels_config as $stat)
 		{
 			if ($stat['parent'] && in_array($stat['parent'], $stati))
 			{
@@ -265,14 +265,14 @@ 
 	 *
 	 * @return None, labels are built in labels parameter
 	 */
-	protected function make_status_labels($statuses, &$labels, $depth=0)
+	protected function make_status_labels($statuses, &$labels, $depth = 0)
 	{
-		foreach($statuses as $status)
+		foreach ($statuses as $status)
 		{
-			$labels[$status['id']] = str_pad('',$depth*12, " ",STR_PAD_LEFT).trim(str_replace(' ','',$status['name']));
-			if(count($status['substatus']) > 0)
+			$labels[$status['id']] = str_pad('', $depth * 12, " ", STR_PAD_LEFT).trim(str_replace(' ', '', $status['name']));
+			if (count($status['substatus']) > 0)
 			{
-				$this->make_status_labels($status['substatus'], $labels, $depth+1);
+				$this->make_status_labels($status['substatus'], $labels, $depth + 1);
 			}
 		}
 	}
@@ -283,12 +283,12 @@ 
 	 * @param int $required =EGW_ACL_READ
 	 * @return array with uid => Username pairs
 	 */
-	function grant_list($required=EGW_ACL_READ)
+	function grant_list($required = EGW_ACL_READ)
 	{
 		$result = array();
-		foreach($this->grants as $uid => $grant)
+		foreach ($this->grants as $uid => $grant)
 		{
-			if ($grant & $required)
+			if ($grant&$required)
 			{
 				$result[$uid] = Api\Accounts::username($uid);
 			}
@@ -307,19 +307,19 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if the rights are ok, false if no rights
 	 */
-	function check_statusForEditRights($data=null,$user=null)
+	function check_statusForEditRights($data = null, $user = null)
 	{
 		if (is_null($data) || (int)$data == $this->data['ts_id'])
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true);
+			$data = $this->read($data, true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data) return null; // entry not found
 		}
 		if (!$user) $user = $this->user;
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) && $data['ts_status'])
@@ -342,19 +342,19 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if the rights are ok, null if not found, false if no rights
 	 */
-	function check_acl($required,$data=null,$user=null)
+	function check_acl($required, $data = null, $user = null)
 	{
 		if (is_null($data) || (int)$data == $this->data['ts_id'])
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true);
+			$data = $this->read($data, true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data) return null; // entry not found
 		}
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -363,11 +363,11 @@ 
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP,true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP, true, $user);
 		}
-		$ret = $data && !!($grants[$data['ts_owner']] & $required);
+		$ret = $data && !!($grants[$data['ts_owner']]&$required);
 
-		if(($required & Acl::DELETE) && $this->config_data['history'] == 'history' &&
+		if (($required&Acl::DELETE) && $this->config_data['history'] == 'history' &&
 			$data['ts_status'] == self::DELETED_STATUS)
 		{
 			$ret = !!($GLOBALS['egw_info']['user']['apps']['admin']);
@@ -384,7 +384,7 @@ 
 	 * @param int &$end
 	 * @return string
 	 */
-	function date_filter($name,&$start,&$end)
+	function date_filter($name, &$start, &$end)
 	{
 		return Api\DateTime::sql_filter($name, $start, $end, 'ts_start', $this->date_filters);
 	}
@@ -409,7 +409,7 @@ 
 	 * @param boolean $only_summary =false If true only return the sums as array with keys duration and price, default false
 	 * @return array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false,$only_summary=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false, $only_summary = false)
 	{
 		//error_log(__METHOD__."(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')");
 		//echo "<p>".__METHOD__."(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
@@ -418,9 +418,9 @@ 
 
 		if (!is_array($extra_cols))
 		{
-			$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+			$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
 		}
-		if ($only_keys === false || $this->show_sums && strpos($order_by,'ts_start') !== false)
+		if ($only_keys === false || $this->show_sums && strpos($order_by, 'ts_start') !== false)
 		{
 			$extra_cols[] = $total_sql.' AS ts_total';
 		}
@@ -432,7 +432,7 @@ 
 		{
 			if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
 
-			foreach($filter['ts_owner'] as $key => $owner)
+			foreach ($filter['ts_owner'] as $key => $owner)
 			{
 				if (!isset($this->grants[$owner]))
 				{
@@ -446,8 +446,8 @@ 
 		}
 		else
 		{
-			$filter[] = '(ts_status ' . ($filter['ts_status'] == self::DELETED_STATUS ? '=':'!= ') . self::DELETED_STATUS .
-				($filter['ts_status'] == self::DELETED_STATUS ? '':' OR ts_status IS NULL') . ')';
+			$filter[] = '(ts_status '.($filter['ts_status'] == self::DELETED_STATUS ? '=' : '!= ').self::DELETED_STATUS.
+				($filter['ts_status'] == self::DELETED_STATUS ? '' : ' OR ts_status IS NULL').')';
 		}
 		if (!count($filter['ts_owner']))
 		{
@@ -455,15 +455,15 @@ 
 			$this->summary = array();
 			return array();
 		}
-		if ($only_summary==false && $criteria && $this->show_sums)
+		if ($only_summary == false && $criteria && $this->show_sums)
 		{
 			// if we have a criteria AND intend to show the sums we first query the affected ids,
 			// then we throw away criteria and filter, and replace the filter with the list of ids
-			$ids = parent::search($criteria,'egw_timesheet.ts_id as id','','',$wildcard,$empty,$op,false,$filter,$join);
+			$ids = parent::search($criteria, 'egw_timesheet.ts_id as id', '', '', $wildcard, $empty, $op, false, $filter, $join);
 			//_debug_array($ids);
 			if (empty($ids))
 			{
-				$this->summary = array('duration'=>0,'price'=>null,'quantity'=>0);
+				$this->summary = array('duration'=>0, 'price'=>null, 'quantity'=>0);
 				return array();
 			}
 			unset($criteria);
@@ -487,45 +487,45 @@ 
 
 		if ($only_summary) return $this->summary;
 
-		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
+		if ($this->show_sums && strpos($order_by, 'ts_start') !== false && // sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
 		{
 			$sum_sql = array(
-				'year'  => $this->db->date_format($from_unixtime_ts_start,'%Y'),
-				'month' => $this->db->date_format($from_unixtime_ts_start,'%Y%m'),
-				'week'  => $this->db->date_format($from_unixtime_ts_start,$GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
-				'day'   => $this->db->date_format($from_unixtime_ts_start,'%Y-%m-%d'),
+				'year'  => $this->db->date_format($from_unixtime_ts_start, '%Y'),
+				'month' => $this->db->date_format($from_unixtime_ts_start, '%Y%m'),
+				'week'  => $this->db->date_format($from_unixtime_ts_start, $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
+				'day'   => $this->db->date_format($from_unixtime_ts_start, '%Y-%m-%d'),
 			);
-			foreach($this->show_sums as $type)
+			foreach ($this->show_sums as $type)
 			{
 				$extra_cols[] = $sum_sql[$type].' AS ts_'.$type;
 				$extra_cols[] = '0 AS is_sum_'.$type;
-				$sum_extra_cols[] = str_replace('ts_start','MIN(ts_start)',$sum_sql[$type]);	// as we dont group by ts_start
+				$sum_extra_cols[] = str_replace('ts_start', 'MIN(ts_start)', $sum_sql[$type]); // as we dont group by ts_start
 				$sum_extra_cols[$type] = '0 AS is_sum_'.$type;
 			}
 			// regular entries
-			parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
+			parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, 'UNION', $filter, $join, $need_full_no_count);
 
-			$sort = substr($order_by,8);
+			$sort = substr($order_by, 8);
 			$union_order = array();
-			$sum_ts_id = array('year' => -3,'month' => -2,'week' => -1,'day' => 0);
-			foreach($this->show_sums as $type)
+			$sum_ts_id = array('year' => -3, 'month' => -2, 'week' => -1, 'day' => 0);
+			foreach ($this->show_sums as $type)
 			{
-				$union_order[] = 'ts_'.$type . ' ' . $sort;
+				$union_order[] = 'ts_'.$type.' '.$sort;
 				$union_order[] = 'is_sum_'.$type;
 				$sum_extra_cols[$type]{0} = '1';
 				// the $type sum
-				parent::search($criteria,array(
-					(string)$sum_ts_id[$type],"''","''","''",'MIN(ts_start)','SUM(ts_duration) AS ts_duration',
+				parent::search($criteria, array(
+					(string)$sum_ts_id[$type], "''", "''", "''", 'MIN(ts_start)', 'SUM(ts_duration) AS ts_duration',
 					($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0'),
-					'0','NULL','0','0','0','0','0',"SUM($total_sql) AS ts_total"
-				),'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
+					'0', 'NULL', '0', '0', '0', '0', '0', "SUM($total_sql) AS ts_total"
+				), 'GROUP BY '.$sum_sql[$type], $sum_extra_cols, $wildcard, $empty, $op, 'UNION', $filter, $join, $need_full_no_count);
 				$sum_extra_cols[$type]{0} = '0';
 			}
 			$union_order[] = 'ts_start '.$sort;
-			return parent::search('','',implode(',',$union_order),'','',false,'',$start);
+			return parent::search('', '', implode(',', $union_order), '', '', false, '', $start);
 		}
-		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 	}
 
 	/**
@@ -535,16 +535,16 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked
 	 * @return array|boolean array with timesheet entry, null if timesheet not found or false if no rights
 	 */
-	function read($ts_id,$ignore_acl=false)
+	function read($ts_id, $ignore_acl = false)
 	{
 		//error_log(__METHOD__."($ts_id,$ignore_acl) ".function_backtrace());
 		if (!(int)$ts_id || (int)$ts_id != $this->data['ts_id'] && !parent::read($ts_id))
 		{
-			return null;	// entry not found
+			return null; // entry not found
 		}
 		if (!$ignore_acl && !($ret = $this->check_acl(Acl::READ)))
 		{
-			return false;	// no read rights
+			return false; // no read rights
 		}
 		return $this->data;
 	}
@@ -559,7 +559,7 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked, returns true if no edit-rigts
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null,$touch_modified=true,$ignore_acl=false)
+	function save($keys = null, $touch_modified = true, $ignore_acl = false)
 	{
 		if ($keys) $this->data_merge($keys);
 
@@ -577,13 +577,13 @@ 
 		// check if we have a real modification of an existing record
 		if ($this->data['ts_id'])
 		{
-			$new =& $this->data;
+			$new = & $this->data;
 			unset($this->data);
 			$this->read($new['ts_id']);
-			$old =& $this->data;
-			$this->data =& $new;
+			$old = & $this->data;
+			$this->data = & $new;
 			$changed = array();
-			if (isset($old)) foreach($old as $name => $value)
+			if (isset($old)) foreach ($old as $name => $value)
 			{
 				if (isset($new[$name]) && $new[$name] != $value) $changed[] = $name;
 			}
@@ -594,7 +594,7 @@ 
 		}
 
 		// Check for restore of deleted contact, restore held links
-		if($old && $old['ts_status'] == self::DELETED_STATUS && $new['ts_status'] != self::DELETED_STATUS)
+		if ($old && $old['ts_status'] == self::DELETED_STATUS && $new['ts_status'] != self::DELETED_STATUS)
 		{
 			Link::restore(TIMESHEET_APP, $new['ts_id']);
 		}
@@ -605,14 +605,14 @@ 
 
 			$this->tracking->html_content_allow = true;
 		}
-		if ($this->tracking->track($this->data,$old,$this->user) === false)
+		if ($this->tracking->track($this->data, $old, $this->user) === false)
 		{
-			return implode(', ',$this->tracking->errors);
+			return implode(', ', $this->tracking->errors);
 		}
 		if (!($err = parent::save()))
 		{
 			// notify the link-class about the update, as other apps may be subscribt to it
-			Link::notify_update(TIMESHEET_APP,$this->data['ts_id'],$this->data);
+			Link::notify_update(TIMESHEET_APP, $this->data['ts_id'], $this->data);
 		}
 
 		return $err;
@@ -625,15 +625,15 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked, returns false if no delete-rigts
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null,$ignore_acl=false)
+	function delete($keys = null, $ignore_acl = false)
 	{
-		if (!is_array($keys) && (int) $keys)
+		if (!is_array($keys) && (int)$keys)
 		{
-			$keys = array('ts_id' => (int) $keys);
+			$keys = array('ts_id' => (int)$keys);
 		}
 		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
 
-		if (!$ignore_acl && !$this->check_acl(Acl::DELETE,$ts_id) || !($old = $this->read($ts_id)))
+		if (!$ignore_acl && !$this->check_acl(Acl::DELETE, $ts_id) || !($old = $this->read($ts_id)))
 		{
 			return false;
 		}
@@ -644,12 +644,12 @@ 
 			$delete = $old;
 			$delete['ts_status'] = self::DELETED_STATUS;
 			$ret = !($this->save($delete));
-			Link::unlink(0,TIMESHEET_APP,$ts_id,'','','',true);
+			Link::unlink(0, TIMESHEET_APP, $ts_id, '', '', '', true);
 		}
 		elseif (($ret = parent::delete($keys)) && $ts_id)
 		{
 			// delete all links to timesheet entry $ts_id
-			Link::unlink(0,TIMESHEET_APP,$ts_id);
+			Link::unlink(0, TIMESHEET_APP, $ts_id);
 		}
 		return $ret;
 	}
@@ -664,7 +664,7 @@ 
 	function deleteaccount($data)
 	{
 		$account_id = $data['account_id'];
-		$new_owner =  $data['new_owner'];
+		$new_owner = $data['new_owner'];
 
 		if (!$new_owner)
 		{
@@ -688,22 +688,22 @@ 
 	 * @param int $status =0
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function set_status($keys=null, $status=0)
+	function set_status($keys = null, $status = 0)
 	{
 		$ret = true;
-		if (!is_array($keys) && (int) $keys)
+		if (!is_array($keys) && (int)$keys)
 		{
-			$keys = array('ts_id' => (int) $keys);
+			$keys = array('ts_id' => (int)$keys);
 		}
 		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
 
-		if (!$this->check_acl(Acl::EDIT,$ts_id) || !$this->read($ts_id,true))
+		if (!$this->check_acl(Acl::EDIT, $ts_id) || !$this->read($ts_id, true))
 		{
 			return false;
 		}
 
 		$this->data['ts_status'] = $status;
-		if ($this->save($ts_id)!=0) $ret = false;
+		if ($this->save($ts_id) != 0) $ret = false;
 
 		return $ret;
 	}
@@ -720,7 +720,7 @@ 
 		{
 			return array('duration' => 0, 'quantity' => 0, 'price' => 0, 'max_modified' => null);
 		}
-		return $this->search(array('ts_id'=>$ids),true,'','','',false,'AND',false,null,'',false,true);
+		return $this->search(array('ts_id'=>$ids), true, '', '', '', false, 'AND', false, null, '', false, true);
 	}
 
 	/**
@@ -731,27 +731,27 @@ 
 	 * @param int|array $entry int ts_id or array with timesheet entry
 	 * @return string/boolean string with title, null if timesheet not found, false if no perms to view it
 	 */
-	function link_title( $entry )
+	function link_title($entry)
 	{
 		if (!is_array($entry))
 		{
 			// need to preserve the $this->data
-			$backup =& $this->data;
+			$backup = & $this->data;
 			unset($this->data);
-			$entry = $this->read( $entry,false,false);
+			$entry = $this->read($entry, false, false);
 			// restore the data again
-			$this->data =& $backup;
+			$this->data = & $backup;
 		}
 		if (!$entry)
 		{
 			return $entry;
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if (date('H:i',$entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
+		if (date('H:i', $entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
 		{
 			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 		}
-		return date($format,$entry['ts_start']).': '.$entry['ts_title'];
+		return date($format, $entry['ts_start']).': '.$entry['ts_title'];
 	}
 
 	/**
@@ -762,18 +762,18 @@ 
 	 * @param array $ids array with ts_id's
 	 * @return array with titles, see link_title
 	 */
-	function link_titles( array $ids )
+	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($entries = $this->search(array('ts_id' => $ids),'ts_id,ts_title,ts_start')))
+		if (($entries = $this->search(array('ts_id' => $ids), 'ts_id,ts_title,ts_start')))
 		{
-			foreach($entries as $entry)
+			foreach ($entries as $entry)
 			{
 				$titles[$entry['ts_id']] = $this->link_title($entry);
 			}
 		}
 		// we assume all not returned entries are not readable by the user, as we notify Link about all deletes
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -792,16 +792,16 @@ 
 	 * @param array $options Array of options for the search
 	 * @return array with ts_id - title pairs of the matching entries
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query($pattern, Array &$options = array())
 	{
 		$limit = false;
 		$need_count = false;
-		if($options['start'] || $options['num_rows']) {
+		if ($options['start'] || $options['num_rows']) {
 			$limit = array($options['start'], $options['num_rows']);
 			$need_count = true;
 		}
 		$result = array();
-		foreach((array) $this->search($pattern,false,'','','%',false,'OR', $limit, null, '', $need_count) as $ts )
+		foreach ((array)$this->search($pattern, false, '', '', '%', false, 'OR', $limit, null, '', $need_count) as $ts)
 		{
 			if ($ts) $result[$ts['ts_id']] = $this->link_title($ts);
 		}
@@ -818,11 +818,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_acl($check,$id,$user);
+		return $this->check_acl($check, $id, $user);
 	}
 
 	/**
@@ -834,16 +834,16 @@ 
 	 * @param string $newtitle => the new title of the project
 	 * @return boolean true for success, false for invalid parameters
 	 */
-	 function update_ts_project($oldtitle='', $newtitle='')
+	 function update_ts_project($oldtitle = '', $newtitle = '')
 	 {
-		if(strlen($oldtitle) > 0 && strlen($newtitle) > 0)
+		if (strlen($oldtitle) > 0 && strlen($newtitle) > 0)
 		{
-			$this->db->update('egw_timesheet',array(
+			$this->db->update('egw_timesheet', array(
 				'ts_project' => $newtitle,
 				'ts_title' => $newtitle,
-			),array(
+			), array(
 				'ts_project' => $oldtitle,
-			),__LINE__,__FILE__,TIMESHEET_APP);
+			), __LINE__, __FILE__, TIMESHEET_APP);
 
 			return true;
 		}
@@ -856,16 +856,16 @@ 
 	 * @param int $pm_id ID of selected project
 	 * @return array containing link_id and ts_id
 	 */
-	function get_ts_links($pm_id=0)
+	function get_ts_links($pm_id = 0)
 	{
-		if($pm_id && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
+		if ($pm_id && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
 		{
-			$pm_ids = ExecMethod('projectmanager.projectmanager_bo.children',$pm_id);
+			$pm_ids = ExecMethod('projectmanager.projectmanager_bo.children', $pm_id);
 			$pm_ids[] = $pm_id;
-			$links = Link\Storage::get_links('projectmanager',$pm_ids,'timesheet');	// Link\Storage::get_links not egw_links::get_links!
+			$links = Link\Storage::get_links('projectmanager', $pm_ids, 'timesheet'); // Link\Storage::get_links not egw_links::get_links!
 			if ($links)
 			{
-				$links = array_unique(call_user_func_array('array_merge',$links));
+				$links = array_unique(call_user_func_array('array_merge', $links));
 			}
 			return $links;
 		}
@@ -883,17 +883,17 @@ 
 	function notify($data)
 	{
 		//error_log(__METHOD__.'('.array2string($data).')');
-		$backup =& $this->data;	// backup internal data in case class got re-used by ExecMethod
+		$backup = & $this->data; // backup internal data in case class got re-used by ExecMethod
 		unset($this->data);
 
 		if ($data['target_app'] == 'projectmanager' && $this->read($data['id']))
 		{
 			$old_title = isset($data['data']) ? $data['data'][Link::OLD_LINK_TITLE] : null;
-			switch($data['type'])
+			switch ($data['type'])
 			{
 				case 'link':
 				case 'update':
-					if (empty($this->data['ts_project']) ||	// timesheet has not yet project set --> set just linked one
+					if (empty($this->data['ts_project']) || // timesheet has not yet project set --> set just linked one
 						isset($old_title) && $this->data['ts_project'] === $old_title)
 					{
 						$pm_id = $data['target_id'];
@@ -935,17 +935,17 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (($intern = !is_array($data)))
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		// get pm_id from links and ts_project: either project matching ts_project or first found project
 		if (!isset($data['pm_id']) && $data['ts_id'])
 		{
 			$first_pm_id = null;
-			foreach(Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
+			foreach (Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
 			{
 				if (!isset($first_pm_id)) $first_pm_id = $pm_id;
 				if ($data['ts_project'] == Link::title('projectmanager', $pm_id))
@@ -963,7 +963,7 @@ 
 			$data['ts_project_blur'] = $data['ts_project'];
 			$data['ts_project'] = '';
 		}
-		return parent::db2data($intern ? null : $data);	// important to use null, if $intern!
+		return parent::db2data($intern ? null : $data); // important to use null, if $intern!
 	}
 
 	/**
@@ -975,17 +975,17 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (($intern = !is_array($data)))
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		// allways store ts_project to be able to search for it, even if no custom project is set
 		if (empty($data['ts_project']) && !is_null($data['ts_project']))
 		{
 			$data['ts_project'] = $data['pm_id'] ? Link::title('projectmanager', $data['pm_id']) : '';
 		}
-		return parent::data2db($intern ? null : $data);	// important to use null, if $intern!
+		return parent::data2db($intern ? null : $data); // important to use null, if $intern!
 	}
 }

Braces +78 added lines, -20 removed lines

@@ -167,12 +167,18 @@ 
 	{
 		parent::__construct(TIMESHEET_APP,'egw_timesheet',self::EXTRA_TABLE,'','ts_extra_name','ts_extra_value','ts_id');
 
-		if ($this->customfields) $this->columns_to_search[] = self::EXTRA_TABLE.'.ts_extra_value';
+		if ($this->customfields)
+		{
+			$this->columns_to_search[] = self::EXTRA_TABLE.'.ts_extra_value';
+		}
 		$this->config_data = Api\Config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 
 		// Load & process statuses
-		if($this->config_data['status_labels']) $this->load_statuses();
+		if($this->config_data['status_labels'])
+		{
+			$this->load_statuses();
+		}
 
 		$this->today = mktime(0,0,0,date('m',$this->now),date('d',$this->now),date('Y',$this->now));
 
@@ -190,12 +196,16 @@ 
 	protected function load_statuses()
 	{
 		$this->status_labels =&  $this->config_data['status_labels'];
-		if (!is_array($this->status_labels)) $this->status_labels= array($this->status_labels);
+		if (!is_array($this->status_labels))
+		{
+			$this->status_labels= array($this->status_labels);
+		}
 
 		foreach ($this->status_labels as $status_id => $label)
 		{
 			if (!is_array($label))
-			{	//old values, before parent status
+			{
+//old values, before parent status
 				$name = $label;
 				$label=array();
 				$label['name'] = $name;
@@ -243,7 +253,10 @@ 
 	 */
 	function get_sub_status($status)
 	{
-		if (!isset($this->status_labels_config)) $this->load_statuses();
+		if (!isset($this->status_labels_config))
+		{
+			$this->load_statuses();
+		}
 		$stati = array($status);
 		foreach($this->status_labels_config as $stat)
 		{
@@ -319,9 +332,16 @@ 
 			$data = $this->read($data,true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data)
+			{
+				return null;
+			}
+			// entry not found
+		}
+		if (!$user)
+		{
+			$user = $this->user;
 		}
-		if (!$user) $user = $this->user;
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) && $data['ts_status'])
 		{
 			if ($this->status_labels_config[$data['ts_status']]['admin'])
@@ -354,9 +374,16 @@ 
 			$data = $this->read($data,true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data)
+			{
+				return null;
+			}
+			// entry not found
+		}
+		if (!$user)
+		{
+			$user = $this->user;
 		}
-		if (!$user) $user = $this->user;
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -430,7 +457,10 @@ 
 		}
 		else
 		{
-			if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
+			if (!is_array($filter['ts_owner']))
+			{
+				$filter['ts_owner'] = array($filter['ts_owner']);
+			}
 
 			foreach($filter['ts_owner'] as $key => $owner)
 			{
@@ -485,7 +515,10 @@ 
 		$this->summary = $this->summary[0];
 		$this->summary['max_modified'] = Api\DateTime::server2user($this->summary['max_modified']);
 
-		if ($only_summary) return $this->summary;
+		if ($only_summary)
+		{
+			return $this->summary;
+		}
 
 		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
@@ -561,7 +594,10 @@ 
 	 */
 	function save($keys=null,$touch_modified=true,$ignore_acl=false)
 	{
-		if ($keys) $this->data_merge($keys);
+		if ($keys)
+		{
+			$this->data_merge($keys);
+		}
 
 		if (!$ignore_acl && $this->data['ts_id'] && !$this->check_acl(Acl::EDIT))
 		{
@@ -583,10 +619,13 @@ 
 			$old =& $this->data;
 			$this->data =& $new;
 			$changed = array();
-			if (isset($old)) foreach($old as $name => $value)
+			if (isset($old))
+			{
+				foreach($old as $name => $value)
 			{
 				if (isset($new[$name]) && $new[$name] != $value) $changed[] = $name;
 			}
+			}
 		}
 		if (isset($old) && !$changed)
 		{
@@ -703,7 +742,10 @@ 
 		}
 
 		$this->data['ts_status'] = $status;
-		if ($this->save($ts_id)!=0) $ret = false;
+		if ($this->save($ts_id)!=0)
+		{
+			$ret = false;
+		}
 
 		return $ret;
 	}
@@ -747,10 +789,13 @@ 
 			return $entry;
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if (date('H:i',$entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
+		if (date('H:i',$entry['ts_start']) != '00:00')
+		{
+			// dont show 00:00 time, as it means date only
 		{
 			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 		}
+		}
 		return date($format,$entry['ts_start']).': '.$entry['ts_title'];
 	}
 
@@ -796,14 +841,18 @@ 
 	{
 		$limit = false;
 		$need_count = false;
-		if($options['start'] || $options['num_rows']) {
+		if($options['start'] || $options['num_rows'])
+		{
 			$limit = array($options['start'], $options['num_rows']);
 			$need_count = true;
 		}
 		$result = array();
 		foreach((array) $this->search($pattern,false,'','','%',false,'OR', $limit, null, '', $need_count) as $ts )
 		{
-			if ($ts) $result[$ts['ts_id']] = $this->link_title($ts);
+			if ($ts)
+			{
+				$result[$ts['ts_id']] = $this->link_title($ts);
+			}
 		}
 		$options['total'] = $need_count ? $this->total : count($result);
 		return $result;
@@ -922,7 +971,10 @@ 
 				//error_log(__METHOD__."() setting pm_id=$pm_id --> ".array2string($update));
 			}
 		}
-		if ($backup) $this->data = $backup;
+		if ($backup)
+		{
+			$this->data = $backup;
+		}
 	}
 
 
@@ -947,7 +999,10 @@ 
 			$first_pm_id = null;
 			foreach(Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
 			{
-				if (!isset($first_pm_id)) $first_pm_id = $pm_id;
+				if (!isset($first_pm_id))
+				{
+					$first_pm_id = $pm_id;
+				}
 				if ($data['ts_project'] == Link::title('projectmanager', $pm_id))
 				{
 					$data['pm_id'] = $pm_id;
@@ -956,7 +1011,10 @@ 
 					break;
 				}
 			}
-			if (!isset($data['pm_id']) && isset($first_pm_id)) $data['pm_id'] = $first_pm_id;
+			if (!isset($data['pm_id']) && isset($first_pm_id))
+			{
+				$data['pm_id'] = $first_pm_id;
+			}
 		}
 		elseif ($data['ts_id'] && $data['pm_id'] && Link::title('projectmanager', $data['pm_id']) == $data['ts_project'])
 		{

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

@@ -572,7 +572,7 @@
 	 * @param array $options Array of options for the search
 	 *
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query( $pattern, array &$options = array() )
 	{
 		if (is_array($pattern))
 		{

timesheet/inc/class.timesheet_datasource.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -83,7 +83,7 @@
 	 * @param array $element source project element representing an InfoLog entry, $element['pe_app_id'] = info_id
 	 * @param int $target target project id
 	 * @param array $extra =null data of target-project, atm not used by the infolog datasource
-	 * @return array|boolean array(info_id,link_id) on success, false otherwise
+	 * @return boolean array(info_id,link_id) on success, false otherwise
 	 */
 	function copy($element,$target,$extra=null)
 	{

Spacing +5 added lines, -5 removed lines

@@ -43,14 +43,14 @@ 
 		}
 		if (!is_array($data_id))
 		{
-			if (!(int) $data_id || !($data = $GLOBALS['timesheet_bo']->read((int) $data_id)))
+			if (!(int)$data_id || !($data = $GLOBALS['timesheet_bo']->read((int)$data_id)))
 			{
 				return false;
 			}
 		}
 		else
 		{
-			$data =& $data_id;
+			$data = & $data_id;
 		}
 		$ds = array(
 			'pe_title'       => $GLOBALS['timesheet_bo']->link_title($data),
@@ -66,7 +66,7 @@ 
 		);
 		if ($data['ts_duration'])
 		{
-			$ds['pe_real_end'] = $data['ts_start'] + 60*$data['ts_duration'];
+			$ds['pe_real_end'] = $data['ts_start'] + 60 * $data['ts_duration'];
 			$ds['pe_used_time'] = $data['ts_duration'];
 		}
 		if ($this->debug)
@@ -85,9 +85,9 @@ 
 	 * @param array $extra =null data of target-project, atm not used by the infolog datasource
 	 * @return array|boolean array(info_id,link_id) on success, false otherwise
 	 */
-	function copy($element,$target,$extra=null)
+	function copy($element, $target, $extra = null)
 	{
-		unset($element,$target,$extra);	// not used, but required by function signature
+		unset($element, $target, $extra); // not used, but required by function signature
 
 		return false;
 	}

timesheet/inc/class.timesheet_export_csv.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
 	/**
 	 * Exports records as defined in $_definition
 	 *
-	 * @param egw_record $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function export( $_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
@@ -132,7 +132,7 @@ 
 	 * return html for options.
 	 * this way the plugin has all opportunities for options tab
 	 *
-	 * @return string html
+	 * @return boolean html
 	 */
 	public function get_options_etpl() {
 		return false;

Indentation +2 added lines, -2 removed lines

@@ -125,8 +125,8 @@
 	}
 
 	public static function get_mimetype() {
-                return 'text/csv';
-        }
+				return 'text/csv';
+		}
 
 	/**
 	 * return html for options.

Spacing +25 added lines, -25 removed lines

@@ -27,51 +27,51 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export($_stream, importexport_definition $_definition) {
 		$options = $_definition->plugin_options;
 
 		$this->ui = new timesheet_ui();
 		$selection = array();
 
-		if($options['selection'] == 'search') {
-			$query = $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP);
-			$query['num_rows'] = -1;	// all records
-			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
-		} elseif($options['selection'] == 'all') {
+		if ($options['selection'] == 'search') {
+			$query = $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP);
+			$query['num_rows'] = -1; // all records
+			$query['csv_export'] = true; // so get_rows method _can_ produce different content or not store state in the session
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
+		} elseif ($options['selection'] == 'all') {
 			$query = array(
 				'num_rows' => -1,
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
 			);
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
 		}
-		else if($options['selection'] == 'filter')
+		else if ($options['selection'] == 'filter')
 		{
 			$fields = importexport_helper_functions::get_filter_fields($_definition->application, $this);
 			$filter = $_definition->filter;
 			$query = array(
 				'num_rows' => -1,
-				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
+				'csv_export' => true, // so get_rows method _can_ produce different content or not store state in the session
 				'col_filter' => array()
 			);
 
 			// Handle ranges
-			foreach($filter as $field => $value)
+			foreach ($filter as $field => $value)
 			{
-				if($field == 'cat_id')
+				if ($field == 'cat_id')
 				{
 					$query['cat_id'] = $value;
 					continue;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if (!is_array($value) || (!$value['from'] && !$value['to'])) continue;
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if ($value['from']) $query['col_filter'][] = "$field >= ".(int)$value['from'];
+				if ($value['to']) $query['col_filter'][] = "$field <= ".(int)$value['to'];
 				unset($query['col_filter'][$field]);
 			}
-			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
+			$this->ui->get_rows($query, $selection, $readonlys, true); // true = only return the id's
 		}
 
 
@@ -83,12 +83,12 @@ 
 		// support other selectors atm.
 		foreach ($selection as $identifier) {
 			$record = new timesheet_egw_record($identifier);
-			if($options['convert']) {
+			if ($options['convert']) {
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
 			} else {
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach ($record->get_record_array() as $key => $value) {
+					if (is_array($value)) $record->$key = implode(',', $value);
 				}
  			}
 			$export_object->export_record($record);
@@ -151,10 +151,10 @@ 
 	public function get_selects()
 	{
 		$this->selects = array(
-			'ts_status'	=>	$this->ui->status_labels+array(lang('No status'))
+			'ts_status'	=>	$this->ui->status_labels + array(lang('No status'))
 		);
-		foreach($this->selects['ts_status'] as &$status) {
-			$status = str_replace('&nbsp;','',$status); // Remove &nbsp;
+		foreach ($this->selects['ts_status'] as &$status) {
+			$status = str_replace('&nbsp;', '', $status); // Remove &nbsp;
 		}
 
 	}
@@ -163,9 +163,9 @@ 
 	 */
 	public function get_filter_fields(Array &$filters)
 	{
-		foreach($filters as $field_name => &$settings)
+		foreach ($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if ($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
 		}
 	}
 

Braces +52 added lines, -20 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * export plugin of addressbook
  */
-class timesheet_export_csv implements importexport_iface_export_plugin {
+class timesheet_export_csv implements importexport_iface_export_plugin
+{
 
 	public function __construct()
 	{
@@ -27,18 +28,22 @@ 
 	 *
 	 * @param egw_record $_definition
 	 */
-	public function export( $_stream, importexport_definition $_definition) {
+	public function export( $_stream, importexport_definition $_definition)
+	{
 		$options = $_definition->plugin_options;
 
 		$this->ui = new timesheet_ui();
 		$selection = array();
 
-		if($options['selection'] == 'search') {
+		if($options['selection'] == 'search')
+		{
 			$query = $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP);
 			$query['num_rows'] = -1;	// all records
 			$query['csv_export'] = true;	// so get_rows method _can_ produce different content or not store state in the session
 			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
-		} elseif($options['selection'] == 'all') {
+		}
+		elseif($options['selection'] == 'all')
+		{
 			$query = array(
 				'num_rows' => -1,
 				'csv_export' => true,	// so get_rows method _can_ produce different content or not store state in the session
@@ -64,11 +69,20 @@ 
 					continue;
 				}
 				$query['col_filter'][$field] = $value;
-				if(!is_array($value) || (!$value['from'] && !$value['to'])) continue;
+				if(!is_array($value) || (!$value['from'] && !$value['to']))
+				{
+					continue;
+				}
 
 				// Ranges are inclusive, so should be provided that way (from 2 to 10 includes 2 and 10)
-				if($value['from']) $query['col_filter'][] = "$field >= " . (int)$value['from'];
-				if($value['to']) $query['col_filter'][] = "$field <= " . (int)$value['to'];
+				if($value['from'])
+				{
+					$query['col_filter'][] = "$field >= " . (int)$value['from'];
+				}
+				if($value['to'])
+				{
+					$query['col_filter'][] = "$field <= " . (int)$value['to'];
+				}
 				unset($query['col_filter'][$field]);
 			}
 			$this->ui->get_rows($query,$selection,$readonlys,true);	// true = only return the id's
@@ -81,14 +95,22 @@ 
 
 		// $options['selection'] is array of identifiers as this plugin doesn't
 		// support other selectors atm.
-		foreach ($selection as $identifier) {
+		foreach ($selection as $identifier)
+		{
 			$record = new timesheet_egw_record($identifier);
-			if($options['convert']) {
+			if($options['convert'])
+			{
 				importexport_export_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $this->selects);
-			} else {
+			}
+			else
+			{
 				// Implode arrays, so they don't say 'Array'
-				foreach($record->get_record_array() as $key => $value) {
-					if(is_array($value)) $record->$key = implode(',', $value);
+				foreach($record->get_record_array() as $key => $value)
+				{
+					if(is_array($value))
+					{
+						$record->$key = implode(',', $value);
+					}
 				}
  			}
 			$export_object->export_record($record);
@@ -102,7 +124,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Timesheet CSV export');
 	}
 
@@ -111,7 +134,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Exports entries from your Timesheet into a CSV File. ");
 	}
 
@@ -120,11 +144,13 @@ 
 	 *
 	 * @return string suffix
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
-	public static function get_mimetype() {
+	public static function get_mimetype()
+	{
                 return 'text/csv';
         }
 
@@ -134,7 +160,8 @@ 
 	 *
 	 * @return string html
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		return false;
 	}
 
@@ -142,7 +169,8 @@ 
 	 * returns slectors of this plugin via xajax
 	 *
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		return array(
 			'name'	=> 'importexport.export_csv_selectors',
 		);
@@ -153,7 +181,8 @@ 
 		$this->selects = array(
 			'ts_status'	=>	$this->ui->status_labels+array(lang('No status'))
 		);
-		foreach($this->selects['ts_status'] as &$status) {
+		foreach($this->selects['ts_status'] as &$status)
+		{
 			$status = str_replace('&nbsp;','',$status); // Remove &nbsp;
 		}
 
@@ -165,7 +194,10 @@ 
 	{
 		foreach($filters as $field_name => &$settings)
 		{
-			if($this->selects[$field_name]) $settings['values'] = $this->selects[$field_name];
+			if($this->selects[$field_name])
+			{
+				$settings['values'] = $this->selects[$field_name];
+			}
 		}
 	}
 

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

@@ -247,7 +247,7 @@
 		$this->selects['info_status'] = $this->bo->get_status();
 	}
 
-	public function get_filter_fields(Array &$filters)
+	public function get_filter_fields(array &$filters)
 	{
 		foreach($filters as $field_name => &$settings)
 		{

timesheet/inc/class.timesheet_favorite_portlet.inc.php

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

Spacing +15 added lines, -15 removed lines

@@ -28,7 +28,7 @@ 
 		$context['appname'] = 'timesheet';
 
 		// Let parent handle the basic stuff
-		parent::__construct($context,$need_reload);
+		parent::__construct($context, $need_reload);
 
 		$this->context['template'] = 'timesheet.index.rows';
 		$this->nm_settings += array(
@@ -42,24 +42,24 @@ 
 		);
 	}
 
-	public function exec($id = null, Etemplate &$etemplate = null)
+	public function exec($id = null, Etemplate&$etemplate = null)
 	{
 		$ui = new timesheet_ui();
 
 		$date_filters = array('All');
-		foreach(array_keys($ui->date_filters) as $name)
+		foreach (array_keys($ui->date_filters) as $name)
 		{
 			$date_filters[$name] = $name;
 		}
 		$date_filters['custom'] = 'custom';
 		$this->context['sel_options']['filter'] = $date_filters;
-		$this->context['sel_options']['filter2'] = array('No details','Details');
+		$this->context['sel_options']['filter2'] = array('No details', 'Details');
 		$read_grants = $ui->grant_list(Acl::READ);
 		$this->context['sel_options'] += array(
 			'ts_owner'   => $read_grants,
 			'pm_id'      => array(lang('No project')),
 			'cat_id'     => array(array('value' => '', 'label' => lang('all')), array('value' => 0, 'label'=>lang('None'))),
-			'ts_status'  => $ui->status_labels+array(lang('No status')),
+			'ts_status'  => $ui->status_labels + array(lang('No status')),
 		);
 		$this->nm_settings['actions'] = $ui->get_actions($this->nm_settings);
 
@@ -112,29 +112,29 @@ 
 			if (!count($content['nm']['selected']) && !$content['nm']['select_all'])
 			{
 				$msg = lang('You need to select some entries first!');
-				Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+				Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 			}
 			else
 			{
 				$success = $failed = $action_msg = null;
-				if ($ui->action($content['nm']['action'],$content['nm']['selected'],$content['nm']['select_all'],
-					$success,$failed,$action_msg,'index',$msg))
+				if ($ui->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);
 
-					Api\Json\Response::get()->apply('egw.message',array($msg,'success'));
-					foreach($content['nm']['selected'] as &$id)
+					Api\Json\Response::get()->apply('egw.message', array($msg, 'success'));
+					foreach ($content['nm']['selected'] as &$id)
 					{
 						$id = 'timesheet::'.$id;
 					}
 					// Directly request an update - this will get timesheet tab too
-					Api\Json\Response::get()->apply('egw.dataRefreshUIDs',array($content['nm']['selected']));
+					Api\Json\Response::get()->apply('egw.dataRefreshUIDs', array($content['nm']['selected']));
 				}
-				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);
 				}
-				Api\Json\Response::get()->apply('egw.message',array($msg,'error'));
+				Api\Json\Response::get()->apply('egw.message', array($msg, 'error'));
 			}
 		}
 	}

Braces +4 added lines, -1 removed lines

@@ -76,9 +76,12 @@
 
 		// This is just copy+pasted from resources_ui line 816, but we don't want
 		// the etemplate exec to fire again.
-		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);
 		}

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

timesheet/inc/class.timesheet_import_csv.inc.php

Doc Comments +1 added lines, -2 removed lines

@@ -104,8 +104,7 @@
 	/**
 	 * imports entries according to given definition object.
 	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function import( $_stream, importexport_definition $_definition ) {
 		$import_csv = new importexport_import_csv( $_stream, array(

Indentation +31 added lines, -31 removed lines

@@ -72,8 +72,8 @@ 
 	private $bo;
 
 	/**
-	* For figuring out if a record has changed
-	*/
+	 * For figuring out if a record has changed
+	 */
 	protected $tracking;
 
 	/**
@@ -97,9 +97,9 @@ 
 	protected $errors = array();
 
 	/**
-         * List of actions, and how many times that action was taken
-         */
-        protected $results = array();
+	 * List of actions, and how many times that action was taken
+	 */
+		protected $results = array();
 
 	/**
 	 * imports entries according to given definition object.
@@ -458,40 +458,40 @@ 
 	}
 
 	/**
-        * Returns warnings that were encountered during importing
-        * Maximum of one warning message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => warning message
-        *       )
-        */
-        public function get_warnings() {
+	 * Returns warnings that were encountered during importing
+	 * Maximum of one warning message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => warning message
+	 *       )
+	 */
+		public function get_warnings() {
 		return $this->warnings;
 	}
 
 	/**
-        * Returns errors that were encountered during importing
-        * Maximum of one error message per record, but you can append if you need to
-        *
-        * @return Array (
-        *       record_# => error message
-        *       )
-        */
-        public function get_errors() {
+	 * Returns errors that were encountered during importing
+	 * Maximum of one error message per record, but you can append if you need to
+	 *
+	 * @return Array (
+	 *       record_# => error message
+	 *       )
+	 */
+		public function get_errors() {
 		return $this->errors;
 	}
 
 	/**
-        * Returns a list of actions taken, and the number of records for that action.
-        * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
-        *
-        * @return Array (
-        *       action => record count
-        * )
-        */
-        public function get_results() {
-                return $this->results;
-        }
+	 * Returns a list of actions taken, and the number of records for that action.
+	 * Actions are things like 'insert', 'update', 'delete', and may be different for each plugin.
+	 *
+	 * @return Array (
+	 *       action => record count
+	 * )
+	 */
+		public function get_results() {
+				return $this->results;
+		}
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static

Spacing +73 added lines, -73 removed lines

@@ -20,15 +20,15 @@ 
 class timesheet_import_csv implements importexport_iface_import_plugin
 {
 	private static $plugin_options = array(
-		'fieldsep', 		// char
-		'charset', 			// string
-		'update_cats', 			// string {override|add} overides record
+		'fieldsep', // char
+		'charset', // string
+		'update_cats', // string {override|add} overides record
 								// with cat(s) from csv OR add the cat from
 								// csv file to exeisting cat(s) of record
 		'num_header_lines', // int number of header lines
 		'field_conversion', // array( $csv_col_num => conversion)
-		'field_mapping',	// array( $csv_col_num => adb_filed)
-		'conditions',		/* => array containing condition arrays:
+		'field_mapping', // array( $csv_col_num => adb_filed)
+		'conditions', /* => array containing condition arrays:
 				'type' => exists, // exists
 				'string' => '#kundennummer',
 				'true' => array(
@@ -52,14 +52,14 @@ 
 	/**
 	 * actions wich could be done to data entries
 	 */
-	protected static $actions = array( 'none', 'update', 'insert', 'delete', );
+	protected static $actions = array('none', 'update', 'insert', 'delete',);
 
 	/**
 	 * conditions for actions
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * @var definition
@@ -107,8 +107,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
-		$import_csv = new importexport_import_csv( $_stream, array(
+	public function import($_stream, importexport_definition $_definition) {
+		$import_csv = new importexport_import_csv($_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
 		));
@@ -118,7 +118,7 @@ 
 		$this->user = $GLOBALS['egw_info']['user']['account_id'];
 
 		// dry run?
-		$this->dry_run = isset( $_definition->plugin_options['dry_run'] ) ? $_definition->plugin_options['dry_run'] :  false;
+		$this->dry_run = isset($_definition->plugin_options['dry_run']) ? $_definition->plugin_options['dry_run'] : false;
 
 		// fetch the bo
 		$this->bo = new timesheet_bo();
@@ -136,15 +136,15 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if (isset($_definition->plugin_options['num_header_lines']) && $_definition->plugin_options['num_header_lines'] > 0) {
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		} elseif (isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
 
 		// set Owner
-		$_definition->plugin_options['record_owner'] = isset( $_definition->plugin_options['record_owner'] ) ?
+		$_definition->plugin_options['record_owner'] = isset($_definition->plugin_options['record_owner']) ?
 			$_definition->plugin_options['record_owner'] : $this->user;
 
 		// Used to try to automatically match names to account IDs
@@ -158,9 +158,9 @@ 
 		);
 
 		// Status need leading spaces removed
-		foreach($lookups['ts_status'] as $id => &$label) {
-			$label = str_replace(' ', '',trim($label));
-			if($label == '') unset($lookups['ts_status'][$id]);
+		foreach ($lookups['ts_status'] as $id => &$label) {
+			$label = str_replace(' ', '', trim($label));
+			if ($label == '') unset($lookups['ts_status'][$id]);
 		}
 
 		// Start counting successes
@@ -170,22 +170,22 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ($record = $import_csv->get_record()) {
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if (count(array_unique($record)) < 2) continue;
 
 			$result = importexport_import_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if ($result) $this->warnings[$import_csv->get_current_position()] = $result;
 
 			// Automatically handle text Api\Categories without explicit Api\Translation
-			foreach(array('ts_status','cat_id') as $field) {
-				if(!is_numeric($record[$field])) {
-					$translate_key = 'translate'.(substr($field,0,2) == 'ts' ? substr($field,2) : '_cat_id');
-					if(($key = array_search($record[$field], $lookups[$field]))) {
+			foreach (array('ts_status', 'cat_id') as $field) {
+				if (!is_numeric($record[$field])) {
+					$translate_key = 'translate'.(substr($field, 0, 2) == 'ts' ? substr($field, 2) : '_cat_id');
+					if (($key = array_search($record[$field], $lookups[$field]))) {
 						$record[$field] = $key;
-					} elseif(array_key_exists($translate_key, $_definition->plugin_options)) {
+					} elseif (array_key_exists($translate_key, $_definition->plugin_options)) {
 						$t_field = $_definition->plugin_options[$translate_key];
 						switch ($t_field) {
 							case '':
@@ -196,29 +196,29 @@ 
 							case '~skip~':
 								continue 2;
 							default:
-								if(strpos($t_field, 'add') === 0) {
+								if (strpos($t_field, 'add') === 0) {
 									// Check for a parent
-									list($name, $parent_name) = explode('~',$t_field);
-									if($parent_name) {
+									list($name, $parent_name) = explode('~', $t_field);
+									if ($parent_name) {
 										$parent = importexport_helper_functions::cat_name2id($parent_name);
 									}
 
-									if($field == 'cat_id') {
+									if ($field == 'cat_id') {
 										$record[$field] = importexport_helper_functions::cat_name2id($record[$field], $parent);
 									} elseif ($field == 'ts_status') {
 										end($this->bo->status_labels);
-										$id = key($this->bo->status_labels)+1;
+										$id = key($this->bo->status_labels) + 1;
 										$this->bo->status_labels[$id] = $record[$field];
 										$this->bo->status_labels_config[$id] = array(
 											'name'   => $record[$field],
 											'parent' => $parent,
 											'admin'  => false
 										);
-										Api\Config::save_value('status_labels',$this->bo->status_labels_config,TIMESHEET_APP);
+										Api\Config::save_value('status_labels', $this->bo->status_labels_config, TIMESHEET_APP);
 										$lookups[$field][$id] = $name;
 										$record[$field] = $id;
 									}
-								} elseif(($key = array_search($t_field, $lookups[$field]))) {
+								} elseif (($key = array_search($t_field, $lookups[$field]))) {
 									$record[$field] = $key;
 								} else {
 									$record[$field] = $t_field;
@@ -230,11 +230,11 @@ 
 			}
 
 			// Set creator, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
-				if(!is_numeric($record['ts_owner'])) {
+			if ($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
+				if (!is_numeric($record['ts_owner'])) {
 					// Automatically handle text owner without explicit Api\Translation
 					$new_owner = importexport_helper_functions::account_name2id($record['ts_owner']);
-					if($new_owner == '') {
+					if ($new_owner == '') {
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
 							$record['ts_owner'],
@@ -251,11 +251,11 @@ 
 			}
 
 			// Check account IDs
-			foreach(array('ts_modifier') as $field) {
-				if($record[$field] && !is_numeric($record[$field])) {
+			foreach (array('ts_modifier') as $field) {
+				if ($record[$field] && !is_numeric($record[$field])) {
 					// Try an automatic conversion
 					$account_id = importexport_helper_functions::account_name2id($record[$field]);
-					if($account_id && strtoupper(Api\Accounts::username($account_id)) == strtoupper($record[$field])) {
+					if ($account_id && strtoupper(Api\Accounts::username($account_id)) == strtoupper($record[$field])) {
 						$record[$field] = $account_id;
 					} else {
 						$this->errors[$import_csv->get_current_position()] = lang(
@@ -271,35 +271,35 @@ 
 			// Special values
 			if ($record['addressbook'] && !is_numeric($record['addressbook']))
 			{
-				list($lastname,$firstname,$org_name) = explode(',',$record['addressbook']);
-				$record['addressbook'] = self::addr_id($lastname,$firstname,$org_name);
+				list($lastname, $firstname, $org_name) = explode(',', $record['addressbook']);
+				$record['addressbook'] = self::addr_id($lastname, $firstname, $org_name);
 			}
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
+			if ($_definition->plugin_options['conditions']) {
+				foreach ($_definition->plugin_options['conditions'] as $condition) {
 					$results = array();
-					switch ( $condition['type'] ) {
+					switch ($condition['type']) {
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if ($record[$condition['string']]) {
 								$results = $this->bo->search(array($condition['string'] => $record[$condition['string']]));
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1 ) {
+							if (is_array($results) && count(array_keys($results)) >= 1) {
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $result ) {
+								foreach ((array)$results as $result) {
 									$record['ts_id'] = $result['ts_id'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $result['cat_id'] ) ) $result['cat_id'] = explode( ',', $result['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
-										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $result['cat_id'] ) ) );
+									if ($_definition->plugin_options['update_cats'] == 'add') {
+										if (!is_array($result['cat_id'])) $result['cat_id'] = explode(',', $result['cat_id']);
+										if (!is_array($record['cat_id'])) $record['cat_id'] = explode(',', $record['cat_id']);
+										$record['cat_id'] = implode(',', array_unique(array_merge($record['cat_id'], $result['cat_id'])));
 									}
-									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
+									$success = $this->action($action['action'], $record, $import_csv->get_current_position());
 								}
 							} else {
 								$action = $condition['false'];
-								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
+								$success = ($this->action($action['action'], $record, $import_csv->get_current_position()));
 							}
 							break;
 
@@ -312,9 +312,9 @@ 
 				}
 			} else {
 				// unconditional insert
-				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+				$success = $this->action('insert', $record, $import_csv->get_current_position());
 			}
-			if($success) $count++;
+			if ($success) $count++;
 		}
 		return $count;
 	}
@@ -326,7 +326,7 @@ 
 	 * @param array $_data tracker data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action($_action, $_data, $record_num = 0) {
 		$result = true;
 		switch ($_action) {
 			case 'none' :
@@ -336,7 +336,7 @@ 
 				$old_record = new timesheet_egw_record($_data['ts_id']);
 				$old = $old_record->get_record_array();
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if (!$this->definition->plugin_options['change_owner']) {
 					// Don't change creator of an existing ticket
 					unset($_data['ts_owner']);
 				}
@@ -344,35 +344,35 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if (count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
 					break;
 				}
 
 				// Clear old link, if different
 				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id']) {
-					Link::unlink2(0,TIMESHEET_APP,$_data['ts_id'],0,'projectmanager',$old['pm_id']);
+					Link::unlink2(0, TIMESHEET_APP, $_data['ts_id'], 0, 'projectmanager', $old['pm_id']);
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					break;
 				} else {
-					$result = $this->bo->save( $_data);
+					$result = $this->bo->save($_data);
 					$_data['ts_id'] = $this->bo->data['ts_id'];
 
 					// Set projectmanager link
 					if ($_data['pm_id']) {
-						Link::link(TIMESHEET_APP,$_data['ts_id'],'projectmanager',$_data['pm_id']);
+						Link::link(TIMESHEET_APP, $_data['ts_id'], 'projectmanager', $_data['pm_id']);
 					}
 
-					if($result) {
+					if ($result) {
 						$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 							$GLOBALS['egw']->accounts->id2name($_data['owner']),
 							lang($_action)
-						) . ' ' . $result;
+						).' '.$result;
 					} else {
 						$this->results[$_action]++;
 						$result = $this->bo->data['ts_id'];
@@ -384,22 +384,22 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if (!is_numeric($result)) {
 			return $result;
 		}
 		$_link_id = false;
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
+		foreach (self::$special_fields as $field => $desc) {
+			if (!$_data[$field]) continue;
 
 			// Links
-			if(strpos('link', $field) === 0) {
+			if (strpos('link', $field) === 0) {
 				list($app, $id) = explode(':', $_data[$field]);
 			} else {
 				$app = $field;
 				$id = $_data[$field];
 			}
 			if ($app && $app_id) {
-				$link_id = Link::link('timesheet',$id,$app,$app_id);
+				$link_id = Link::link('timesheet', $id, $app, $app_id);
 			}
 		}
 		return $result;
@@ -495,7 +495,7 @@ 
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static
-	public static function addr_id( $n_family,$n_given=null,$org_name=null ) {
+	public static function addr_id($n_family, $n_given = null, $org_name = null) {
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -505,18 +505,18 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if (!is_null($n_given)) $n_given = trim($n_given);
 		if (!is_object($contacts))
 		{
-			$contacts =& CreateObject('phpgwapi.contacts');
+			$contacts = & CreateObject('phpgwapi.contacts');
 		}
 		if (!is_null($org_name))        // org_name given?
 		{
 			$org_name = trim($org_name);
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,n_given=$n_given,org_name=$org_name");
 			if (!count($addrs))
 			{
-				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
+				$addrs = $contacts->read(0, 0, array('id'), '', "n_family=$n_family,org_name=$org_name", '', 'n_family,org_name');
 			}
 		}
 		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
@@ -525,7 +525,7 @@ 
 		}
 		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
 		{
-			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
+			$addrs = $contacts->read(0, 0, array('id'), '', "n_fn=$n_family", '', 'n_fn');
 		}
 		if (count($addrs))
 		{

Braces +177 added lines, -70 removed lines

@@ -107,7 +107,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function import( $_stream, importexport_definition $_definition ) {
+	public function import( $_stream, importexport_definition $_definition )
+	{
 		$import_csv = new importexport_import_csv( $_stream, array(
 			'fieldsep' => $_definition->plugin_options['fieldsep'],
 			'charset' => $_definition->plugin_options['charset'],
@@ -136,9 +137,12 @@ 
 		$import_csv->conversion_class = $this;
 
 		//check if file has a header lines
-		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0) {
+		if ( isset( $_definition->plugin_options['num_header_lines'] ) && $_definition->plugin_options['num_header_lines'] > 0)
+		{
 			$import_csv->skip_records($_definition->plugin_options['num_header_lines']);
-		} elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line']) {
+		}
+		elseif(isset($_definition->plugin_options['has_header_line']) && $_definition->plugin_options['has_header_line'])
+		{
 			// First method is preferred
 			$import_csv->skip_records(1);
 		}
@@ -158,9 +162,13 @@ 
 		);
 
 		// Status need leading spaces removed
-		foreach($lookups['ts_status'] as $id => &$label) {
+		foreach($lookups['ts_status'] as $id => &$label)
+		{
 			$label = str_replace(' ', '',trim($label));
-			if($label == '') unset($lookups['ts_status'][$id]);
+			if($label == '')
+			{
+				unset($lookups['ts_status'][$id]);
+			}
 		}
 
 		// Start counting successes
@@ -170,24 +178,37 @@ 
 		// Failures
 		$this->errors = array();
 
-		while ( $record = $import_csv->get_record() ) {
+		while ( $record = $import_csv->get_record() )
+		{
 			$success = false;
 
 			// don't import empty records
-			if( count( array_unique( $record ) ) < 2 ) continue;
+			if( count( array_unique( $record ) ) < 2 )
+			{
+				continue;
+			}
 
 			$result = importexport_import_csv::convert($record, timesheet_egw_record::$types, 'timesheet', $lookups, $_definition->plugin_options['convert']);
-			if($result) $this->warnings[$import_csv->get_current_position()] = $result;
+			if($result)
+			{
+				$this->warnings[$import_csv->get_current_position()] = $result;
+			}
 
 			// Automatically handle text Api\Categories without explicit Api\Translation
-			foreach(array('ts_status','cat_id') as $field) {
-				if(!is_numeric($record[$field])) {
+			foreach(array('ts_status','cat_id') as $field)
+			{
+				if(!is_numeric($record[$field]))
+				{
 					$translate_key = 'translate'.(substr($field,0,2) == 'ts' ? substr($field,2) : '_cat_id');
-					if(($key = array_search($record[$field], $lookups[$field]))) {
+					if(($key = array_search($record[$field], $lookups[$field])))
+					{
 						$record[$field] = $key;
-					} elseif(array_key_exists($translate_key, $_definition->plugin_options)) {
+					}
+					elseif(array_key_exists($translate_key, $_definition->plugin_options))
+					{
 						$t_field = $_definition->plugin_options[$translate_key];
-						switch ($t_field) {
+						switch ($t_field)
+						{
 							case '':
 							case '0':
 								// Skip that field
@@ -196,16 +217,21 @@ 
 							case '~skip~':
 								continue 2;
 							default:
-								if(strpos($t_field, 'add') === 0) {
+								if(strpos($t_field, 'add') === 0)
+								{
 									// Check for a parent
 									list($name, $parent_name) = explode('~',$t_field);
-									if($parent_name) {
+									if($parent_name)
+									{
 										$parent = importexport_helper_functions::cat_name2id($parent_name);
 									}
 
-									if($field == 'cat_id') {
+									if($field == 'cat_id')
+									{
 										$record[$field] = importexport_helper_functions::cat_name2id($record[$field], $parent);
-									} elseif ($field == 'ts_status') {
+									}
+									elseif ($field == 'ts_status')
+									{
 										end($this->bo->status_labels);
 										$id = key($this->bo->status_labels)+1;
 										$this->bo->status_labels[$id] = $record[$field];
@@ -218,9 +244,13 @@ 
 										$lookups[$field][$id] = $name;
 										$record[$field] = $id;
 									}
-								} elseif(($key = array_search($t_field, $lookups[$field]))) {
+								}
+								elseif(($key = array_search($t_field, $lookups[$field])))
+								{
 									$record[$field] = $key;
-								} else {
+								}
+								else
+								{
 									$record[$field] = $t_field;
 								}
 								break;
@@ -230,11 +260,14 @@ 
 			}
 
 			// Set creator, unless it's supposed to come from CSV file
-			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner']) {
-				if(!is_numeric($record['ts_owner'])) {
+			if($_definition->plugin_options['owner_from_csv'] && $record['ts_owner'])
+			{
+				if(!is_numeric($record['ts_owner']))
+				{
 					// Automatically handle text owner without explicit Api\Translation
 					$new_owner = importexport_helper_functions::account_name2id($record['ts_owner']);
-					if($new_owner == '') {
+					if($new_owner == '')
+					{
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
 							$record['ts_owner'],
@@ -242,22 +275,31 @@ 
 							lang($this->bo->field2label['ts_owner'])
 						);
 						$record['ts_owner'] = $_definition->plugin_options['record_owner'];
-					} else {
+					}
+					else
+					{
 						$record['ts_owner'] = $new_owner;
 					}
 				}
-			} elseif ($_definition->plugin_options['record_owner']) {
+			}
+			elseif ($_definition->plugin_options['record_owner'])
+			{
 				$record['ts_owner'] = $_definition->plugin_options['record_owner'];
 			}
 
 			// Check account IDs
-			foreach(array('ts_modifier') as $field) {
-				if($record[$field] && !is_numeric($record[$field])) {
+			foreach(array('ts_modifier') as $field)
+			{
+				if($record[$field] && !is_numeric($record[$field]))
+				{
 					// Try an automatic conversion
 					$account_id = importexport_helper_functions::account_name2id($record[$field]);
-					if($account_id && strtoupper(Api\Accounts::username($account_id)) == strtoupper($record[$field])) {
+					if($account_id && strtoupper(Api\Accounts::username($account_id)) == strtoupper($record[$field]))
+					{
 						$record[$field] = $account_id;
-					} else {
+					}
+					else
+					{
 						$this->errors[$import_csv->get_current_position()] = lang(
 							'Unable to convert "%1" to account ID.  Using plugin setting (%2) for %3.',
 							$record[$field],
@@ -275,29 +317,44 @@ 
 				$record['addressbook'] = self::addr_id($lastname,$firstname,$org_name);
 			}
 
-			if ( $_definition->plugin_options['conditions'] ) {
-				foreach ( $_definition->plugin_options['conditions'] as $condition ) {
+			if ( $_definition->plugin_options['conditions'] )
+			{
+				foreach ( $_definition->plugin_options['conditions'] as $condition )
+				{
 					$results = array();
-					switch ( $condition['type'] ) {
+					switch ( $condition['type'] )
+					{
 						// exists
 						case 'exists' :
-							if($record[$condition['string']]) {
+							if($record[$condition['string']])
+							{
 								$results = $this->bo->search(array($condition['string'] => $record[$condition['string']]));
 							}
 
-							if ( is_array( $results ) && count( array_keys( $results )) >= 1 ) {
+							if ( is_array( $results ) && count( array_keys( $results )) >= 1 )
+							{
 								// apply action to all records matching this exists condition
 								$action = $condition['true'];
-								foreach ( (array)$results as $result ) {
+								foreach ( (array)$results as $result )
+								{
 									$record['ts_id'] = $result['ts_id'];
-									if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-										if ( !is_array( $result['cat_id'] ) ) $result['cat_id'] = explode( ',', $result['cat_id'] );
-										if ( !is_array( $record['cat_id'] ) ) $record['cat_id'] = explode( ',', $record['cat_id'] );
+									if ( $_definition->plugin_options['update_cats'] == 'add' )
+									{
+										if ( !is_array( $result['cat_id'] ) )
+										{
+											$result['cat_id'] = explode( ',', $result['cat_id'] );
+										}
+										if ( !is_array( $record['cat_id'] ) )
+										{
+											$record['cat_id'] = explode( ',', $record['cat_id'] );
+										}
 										$record['cat_id'] = implode( ',', array_unique( array_merge( $record['cat_id'], $result['cat_id'] ) ) );
 									}
 									$success = $this->action(  $action['action'], $record, $import_csv->get_current_position() );
 								}
-							} else {
+							}
+							else
+							{
 								$action = $condition['false'];
 								$success = ($this->action(  $action['action'], $record, $import_csv->get_current_position() ));
 							}
@@ -308,13 +365,21 @@ 
 							die('condition / action not supported!!!');
 							break;
 					}
-					if ($action['last']) break;
+					if ($action['last'])
+					{
+						break;
+					}
 				}
-			} else {
+			}
+			else
+			{
 				// unconditional insert
 				$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 			}
-			if($success) $count++;
+			if($success)
+			{
+				$count++;
+			}
 		}
 		return $count;
 	}
@@ -326,9 +391,11 @@ 
 	 * @param array $_data tracker data for the action
 	 * @return bool success or not
 	 */
-	private function action ( $_action, $_data, $record_num = 0 ) {
+	private function action ( $_action, $_data, $record_num = 0 )
+	{
 		$result = true;
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -336,7 +403,8 @@ 
 				$old_record = new timesheet_egw_record($_data['ts_id']);
 				$old = $old_record->get_record_array();
 
-				if(!$this->definition->plugin_options['change_owner']) {
+				if(!$this->definition->plugin_options['change_owner'])
+				{
 					// Don't change creator of an existing ticket
 					unset($_data['ts_owner']);
 				}
@@ -344,36 +412,45 @@ 
 				// Merge to deal with fields not in import record
 				$_data = array_merge($old, $_data);
 				$changed = $this->tracking->changed_fields($_data, $old);
-				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp']) {
+				if(count($changed) == 0 && !$this->definition->plugin_options['update_timestamp'])
+				{
 					break;
 				}
 
 				// Clear old link, if different
-				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id']) {
+				if ($_data['ts_id'] && array_key_exists('pm_id', $_data) && $_data['pm_id'] != $old['pm_id'])
+				{
 					Link::unlink2(0,TIMESHEET_APP,$_data['ts_id'],0,'projectmanager',$old['pm_id']);
 				}
 
 				// Fall through
 			case 'insert' :
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					break;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data);
 					$_data['ts_id'] = $this->bo->data['ts_id'];
 
 					// Set projectmanager link
-					if ($_data['pm_id']) {
+					if ($_data['pm_id'])
+					{
 						Link::link(TIMESHEET_APP,$_data['ts_id'],'projectmanager',$_data['pm_id']);
 					}
 
-					if($result) {
+					if($result)
+					{
 						$this->errors[$record_num] = lang('Permissions error - %1 could not %2',
 							$GLOBALS['egw']->accounts->id2name($_data['owner']),
 							lang($_action)
 						) . ' ' . $result;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						$result = $this->bo->data['ts_id'];
 					}
@@ -384,21 +461,30 @@ 
 		}
 
 		// Process some additional fields
-		if(!is_numeric($result)) {
+		if(!is_numeric($result))
+		{
 			return $result;
 		}
 		$_link_id = false;
-		foreach(self::$special_fields as $field => $desc) {
-			if(!$_data[$field]) continue;
+		foreach(self::$special_fields as $field => $desc)
+		{
+			if(!$_data[$field])
+			{
+				continue;
+			}
 
 			// Links
-			if(strpos('link', $field) === 0) {
+			if(strpos('link', $field) === 0)
+			{
 				list($app, $id) = explode(':', $_data[$field]);
-			} else {
+			}
+			else
+			{
 				$app = $field;
 				$id = $_data[$field];
 			}
-			if ($app && $app_id) {
+			if ($app && $app_id)
+			{
 				$link_id = Link::link('timesheet',$id,$app,$app_id);
 			}
 		}
@@ -410,7 +496,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Timesheet CSV import');
 	}
 
@@ -419,7 +506,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports entries into the timesheet from a CSV File. ");
 	}
 
@@ -428,7 +516,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -444,7 +533,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -453,7 +543,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -465,7 +556,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -477,7 +569,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -489,13 +582,15 @@ 
         *       action => record count
         * )
         */
-        public function get_results() {
+        public function get_results()
+        {
                 return $this->results;
         }
 	// end of iface_export_plugin
 
 	// Extra conversion functions - must be static
-	public static function addr_id( $n_family,$n_given=null,$org_name=null ) {
+	public static function addr_id( $n_family,$n_given=null,$org_name=null )
+	{
 
 		// find in Addressbook, at least n_family AND (n_given OR org_name) have to match
 		static $contacts;
@@ -505,28 +600,40 @@ 
 			list($n_family, $n_given, $org_name) = explode(',', $n_family);
 		}
 		$n_family = trim($n_family);
-		if(!is_null($n_given)) $n_given = trim($n_given);
+		if(!is_null($n_given))
+		{
+			$n_given = trim($n_given);
+		}
 		if (!is_object($contacts))
 		{
 			$contacts =& CreateObject('phpgwapi.contacts');
 		}
-		if (!is_null($org_name))        // org_name given?
+		if (!is_null($org_name))
+		{
+			// org_name given?
 		{
 			$org_name = trim($org_name);
+		}
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,n_given=$n_given,org_name=$org_name" );
 			if (!count($addrs))
 			{
 				$addrs = $contacts->read( 0,0,array('id'),'',"n_family=$n_family,org_name=$org_name",'','n_family,org_name');
 			}
 		}
-		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))       // first name given and no result so far
+		if (!is_null($n_given) && (is_null($org_name) || !count($addrs)))
+		{
+			// first name given and no result so far
 		{
 			$addrs = $contacts->search(array('n_family' => $n_family, 'n_given' => $n_given));
 		}
-		if (is_null($n_given) && is_null($org_name))    // just one name given, check against fn (= full name)
+		}
+		if (is_null($n_given) && is_null($org_name))
+		{
+			// just one name given, check against fn (= full name)
 		{
 			$addrs = $contacts->read( 0,0,array('id'),'',"n_fn=$n_family",'','n_fn' );
 		}
+		}
 		if (count($addrs))
 		{
 			return $addrs[0]['id'];

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)

Spacing +164 added lines, -165 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' => 'edit?'.filemtime(Api\Etemplate\Widget\Template::rel2path('/timesheet/templates/mobile/edit.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,10 +1131,10 @@ 
 			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)
+					if ($this->save($entry) == 0)
 					{
 						$success++;
 					}
@@ -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);
 	}
 }

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

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