EGroupware / egroupware

resources/inc/class.resources_import_csv.inc.php

Doc Comments +2 added lines, -4 removed lines

@@ -28,9 +28,7 @@ 
 
 	/**
 	 * imports entries according to given definition object.
-	 * @param resource $_stream
-	 * @param string $_charset
-	 * @param definition $_definition
+	 * @param importexport_definition $_definition
 	 */
 	public function init(importexport_definition $_definition ) {
 
@@ -52,7 +50,7 @@ 
 	*
 	* Updates the count of actions taken
 	*
-	* @return boolean success
+	* @return null|boolean success
 	*/
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{

Indentation +17 added lines, -17 removed lines

@@ -45,15 +45,15 @@ 
 	}
 
 	/**
-	* Import a single record
-	*
-	* You don't need to worry about mappings or translations, they've been done already.
-	* You do need to handle the conditions and the actions taken.
-	*
-	* Updates the count of actions taken
-	*
-	* @return boolean success
-	*/
+	 * Import a single record
+	 *
+	 * You don't need to worry about mappings or translations, they've been done already.
+	 * You do need to handle the conditions and the actions taken.
+	 *
+	 * Updates the count of actions taken
+	 *
+	 * @return boolean success
+	 */
 	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
@@ -250,14 +250,14 @@ 
 	}
 
 	/**
-        * 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;
 	}
 }

Braces +70 added lines, -29 removed lines

@@ -16,7 +16,8 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv
+{
 
 
 	/**
@@ -32,7 +33,8 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition )
+	{
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
@@ -92,7 +94,8 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if($category['last_mod'] >= $this->start_time)
+		{
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -104,35 +107,53 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if(!$record->accessory_of)
+		{
+			$record->accessory_of = -1;
+		}
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
-		if ($this->definition->plugin_options['conditions']) {
+		if ($this->definition->plugin_options['conditions'])
+		{
 		
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ( $this->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->so->search(
 								array( $condition['string'] => $record->$condition['string']),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if ( is_array( $results ) && count( array_keys( $results )) >= 1)
+						{
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ( (array)$results as $resource )
+							{
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['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( $resource['cat_id'] ) )
+									{
+										$resource['cat_id'] = explode( ',', $resource['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, $resource['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() ));
 						}
@@ -143,9 +164,14 @@ 
 						die('condition / action not supported!!!');
 						break;
 				}
-				if ($action['last']) break;
+				if ($action['last'])
+				{
+					break;
+				}
 			}
-		} else {
+		}
+		else
+		{
 			// unconditional insert
 			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
 		}
@@ -159,9 +185,11 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 )
+	{
 		$_data = $record->get_record_array();
-		switch ($_action) {
+		switch ($_action)
+		{
 			case 'none' :
 				return true;
 			case 'update' :
@@ -173,20 +201,27 @@ 
 				
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if($_action == 'insert')
+				{
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ( $this->dry_run )
+				{
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
-				} else {
+				}
+				else
+				{
 					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					if($result && !is_numeric($result))
+					{
 						$this->errors[$record_num] = $result;
 						return false;
-					} else {
+					}
+					else
+					{
 						$this->results[$_action]++;
 						return true;
 					}
@@ -202,7 +237,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Resources CSV import');
 	}
 
@@ -211,7 +247,8 @@ 
 	 *
 	 * @return string descriprion
 	 */
-	public static function get_description() {
+	public static function get_description()
+	{
 		return lang("Imports a list of resources from a CSV file.");
 	}
 
@@ -220,7 +257,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -236,7 +274,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -245,7 +284,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -257,7 +297,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 }

Spacing +33 added lines, -33 removed lines

@@ -15,7 +15,7 @@ 
 /**
  * class to import resources from CSV
  */
-class resources_import_csv extends importexport_basic_import_csv  {
+class resources_import_csv extends importexport_basic_import_csv {
 
 
 	/**
@@ -23,7 +23,7 @@ 
 	 *
 	 * @var array
 	 */
-	protected static $conditions = array( 'exists' );
+	protected static $conditions = array('exists');
 
 	/**
 	 * imports entries according to given definition object.
@@ -31,13 +31,13 @@ 
 	 * @param string $_charset
 	 * @param definition $_definition
 	 */
-	public function init(importexport_definition $_definition ) {
+	public function init(importexport_definition $_definition) {
 
 		// fetch the resource bo
 		$this->bo = new resources_bo();
 
 		// For adding ACLs
-		$this->acl_bo = CreateObject('resources.bo_acl',True);
+		$this->acl_bo = CreateObject('resources.bo_acl', True);
 
 		// For checking categories
 		$this->start_time = time();
@@ -53,33 +53,33 @@ 
 	*
 	* @return boolean success
 	*/
-	protected function import_record(importexport_iface_egw_record &$record, &$import_csv)
+	protected function import_record(importexport_iface_egw_record&$record, &$import_csv)
 	{
 		// Check for an un-matched accessory of, try again on just name
-		if(!is_numeric($record->accessory_of))
+		if (!is_numeric($record->accessory_of))
 		{
 			$accessory_of = $record->accessory_of;
 
 			// Look for exact match in just name
-			$results = $this->bo->so->search(array('name' => $record->accessory_of),array('res_id','name'));
-			if(count($results) >= 1)
+			$results = $this->bo->so->search(array('name' => $record->accessory_of), array('res_id', 'name'));
+			if (count($results) >= 1)
 			{
 				// More than 1 result?  Bad names.  Pick one.
-				foreach($results as $result)
+				foreach ($results as $result)
 				{
-					if($result['name'] == $record->accessory_of)
+					if ($result['name'] == $record->accessory_of)
 					{
 						$record->accessory_of = $result['res_id'];
 						break;
 					}
 				}
-				if(is_numeric($record->accessory_of))
+				if (is_numeric($record->accessory_of))
 				{
 					// Import/Export conversion gave a warning, so cancel it
-					$pattern = lang('Unable to link to %1 "%2"',lang('resources'),$accessory_of) . ' - ('.lang('too many matches') . '|'.lang('no matches') . ')';
+					$pattern = lang('Unable to link to %1 "%2"', lang('resources'), $accessory_of).' - ('.lang('too many matches').'|'.lang('no matches').')';
 					$this->warnings[$import_csv->get_current_position()] = preg_replace($pattern, '', $this->warnings[$import_csv->get_current_position()], 1);
 					// If that was the only warning, clear it for this row
-					if(trim($this->warnings[$import_csv->get_current_position()]) == '')
+					if (trim($this->warnings[$import_csv->get_current_position()]) == '')
 					{
 						unset($this->warnings[$import_csv->get_current_position()]);
 					}
@@ -91,7 +91,7 @@ 
 		// Check for a new category, it needs permissions set
 		$category = $GLOBALS['egw']->categories->read($record->cat_id);
 
-		if($category['last_mod'] >= $this->start_time) {
+		if ($category['last_mod'] >= $this->start_time) {
 			// New category.  Give read & write permissions to the current user's default group
 			$this->acl_bo->set_rights($record['cat_id'],
 				array($GLOBALS['egw_info']['user']['account_primary_group']),
@@ -103,37 +103,37 @@ 
 			// Refresh ACL
 			//$GLOBALS['egw']->acl->read_repository();
 		}
-		if(!$record->accessory_of) $record->accessory_of = -1;
+		if (!$record->accessory_of) $record->accessory_of = -1;
 		//error_log(__METHOD__.__LINE__.array2string($_definition->plugin_options['conditions']));
 		if ($this->definition->plugin_options['conditions']) {
 		
-			foreach ( $this->definition->plugin_options['conditions'] as $condition ) {
+			foreach ($this->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->so->search(
-								array( $condition['string'] => $record->$condition['string']),
+								array($condition['string'] => $record->$condition['string']),
 								False
 							);
 						}
 
-						if ( is_array( $results ) && count( array_keys( $results )) >= 1) {
+						if (is_array($results) && count(array_keys($results)) >= 1) {
 							// apply action to all contacts matching this exists condition
 							$action = $condition['true'];
-							foreach ( (array)$results as $resource ) {
+							foreach ((array)$results as $resource) {
 								$record->res_id = $resource['res_id'];
-								if ( $_definition->plugin_options['update_cats'] == 'add' ) {
-									if ( !is_array( $resource['cat_id'] ) ) $resource['cat_id'] = explode( ',', $resource['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, $resource['cat_id'] ) ) );
+								if ($_definition->plugin_options['update_cats'] == 'add') {
+									if (!is_array($resource['cat_id'])) $resource['cat_id'] = explode(',', $resource['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, $resource['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;
 
@@ -146,7 +146,7 @@ 
 			}
 		} else {
 			// unconditional insert
-			$success = $this->action( 'insert', $record, $import_csv->get_current_position() );
+			$success = $this->action('insert', $record, $import_csv->get_current_position());
 		}
 		return $success;
 	}
@@ -158,7 +158,7 @@ 
 	 * @param importexport_iface_egw_record $record Entry record
 	 * @return bool success or not
 	 */
-	protected function action ( $_action, importexport_iface_egw_record &$record, $record_num = 0 ) {
+	protected function action($_action, importexport_iface_egw_record&$record, $record_num = 0) {
 		$_data = $record->get_record_array();
 		switch ($_action) {
 			case 'none' :
@@ -172,17 +172,17 @@ 
 				
 				// Fall through
 			case 'insert' :
-				if($_action == 'insert') {
+				if ($_action == 'insert') {
 					// Backend doesn't like inserting with ID specified, it can overwrite
 					unset($_data['res_id']);
 				}
-				if ( $this->dry_run ) {
+				if ($this->dry_run) {
 					//print_r($_data);
 					$this->results[$_action]++;
 					return true;
 				} else {
-					$result = $this->bo->save( $_data );
-					if($result && !is_numeric($result)) {
+					$result = $this->bo->save($_data);
+					if ($result && !is_numeric($result)) {
 						$this->errors[$record_num] = $result;
 						return false;
 					} else {

resources/inc/class.resources_so.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 *
 	 * @param string $key key of value to get
 	 * @param int $res_id resource id
-	 * @return mixed value of key and resource, false if key or id not found.
+	 * @return integer value of key and resource, false if key or id not found.
 	 */
 	function get_value($key,$res_id)
 	{

Spacing +6 added lines, -7 removed lines

@@ -22,10 +22,10 @@ 
 {
 	function __construct()
 	{
-		parent::__construct('resources','egw_resources', 'egw_resources_extra', '',
-			'extra_name', 'extra_value', 'extra_id' );
+		parent::__construct('resources', 'egw_resources', 'egw_resources_extra', '',
+			'extra_name', 'extra_value', 'extra_id');
 
-		$this->columns_to_search = array('name','short_description','inventory_number','long_description','location');
+		$this->columns_to_search = array('name', 'short_description', 'inventory_number', 'long_description', 'location');
 	}
 
 	/**
@@ -35,10 +35,9 @@ 
 	 * @param int $res_id resource id
 	 * @return mixed value of key and resource, false if key or id not found.
 	 */
-	function get_value($key,$res_id)
+	function get_value($key, $res_id)
 	{
-		return $res_id == $this->data['res_id'] ? $this->data[$key] :
-			$this->db->select($this->table_name,$key,array('res_id' => $res_id),__LINE__,__FILE__)->fetchColumn();
+		return $res_id == $this->data['res_id'] ? $this->data[$key] : $this->db->select($this->table_name, $key, array('res_id' => $res_id), __LINE__, __FILE__)->fetchColumn();
 	}
 
 	/**
@@ -90,7 +89,7 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if (parent::save() != 0) return false;
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

Braces +8 added lines, -2 removed lines

@@ -51,7 +51,10 @@ 
 	 */
 	function read($res_id)
 	{
-		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id'])) $res_id = $res_id['res_id'];
+		if (is_array($res_id) && count($res_id) == 1 && isset($res_id['res_id']))
+		{
+			$res_id = $res_id['res_id'];
+		}
 
 		/*if (!is_array($res_id) && $res_id == $this->data['res_id'])
 		{
@@ -90,7 +93,10 @@ 
 	function save($resource)
 	{
 		$this->data = $resource;
-		if(parent::save() != 0) return false;
+		if(parent::save() != 0)
+		{
+			return false;
+		}
 		$res_id = $this->data['res_id'];
 
 		return $res_id;

setup/inc/class.setup_cmd_ldap.inc.php

Doc Comments -3 removed lines

@@ -936,9 +936,6 @@
 	 *
 	 * Uses $this->ldap_host, $this->ldap_admin and $this->ldap_admin_pw to connect.
 	 *
-	 * @param string $this->object_class ='qmailUser'
-	 * @param string $this->mbox_attr ='mailmessagestore' lowercase!!!
-	 * @param string $this->mail_login_type ='email' 'email', 'vmailmgr', 'standard' or 'uidNumber'
 	 * @return string with success message N entries modified
 	 * @throws Api\Exception if dn not found, not listable or delete fails
 	 */

Spacing +144 added lines, -147 removed lines

@@ -82,9 +82,9 @@ 
 	 * @param string $ldap_encryption_type ='des'
 	 * @param boolean $truncate_egw_accounts =false truncate accounts table before migration to SQL
 	 */
-	function __construct($domain,$ldap_host=null,$ldap_suffix=null,$ldap_admin=null,$ldap_admin_pw=null,
-		$ldap_base=null,$ldap_root_dn=null,$ldap_root_pw=null,$ldap_context=null,$ldap_search_filter=null,
-		$ldap_group_context=null,$sub_command='create_ldap',$ldap_encryption_type='des',$truncate_egw_accounts=false)
+	function __construct($domain, $ldap_host = null, $ldap_suffix = null, $ldap_admin = null, $ldap_admin_pw = null,
+		$ldap_base = null, $ldap_root_dn = null, $ldap_root_pw = null, $ldap_context = null, $ldap_search_filter = null,
+		$ldap_group_context = null, $sub_command = 'create_ldap', $ldap_encryption_type = 'des', $truncate_egw_accounts = false)
 	{
 		if (!is_array($domain))
 		{
@@ -117,23 +117,23 @@ 
 	 * @throws Exception(lang('Wrong credentials to access the header.inc.php file!'),2);
 	 * @throws Exception('header.inc.php not found!');
 	 */
-	protected function exec($check_only=false)
+	protected function exec($check_only = false)
 	{
-		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i',$this->domain))
+		if (!empty($this->domain) && !preg_match('/^([a-z0-9_-]+\.)*[a-z0-9]+/i', $this->domain))
 		{
-			throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!",$this->domain));
+			throw new egw_exception_wrong_userinput(lang("'%1' is no valid domain name!", $this->domain));
 		}
 		if ($this->remote_id && $check_only && !in_array($this->sub_command, array('set_mailbox', 'sid2uidnumber', 'copy2ad')))
 		{
-			return true;	// further checks can only done locally
+			return true; // further checks can only done locally
 		}
 		$this->_merge_defaults();
 		//_debug_array($this->as_array());
 
-		switch($this->sub_command)
+		switch ($this->sub_command)
 		{
 			case 'test_ldap_root':
-				$msg = $this->connect($this->ldap_admin,$this->ldap_admin_pw);
+				$msg = $this->connect($this->ldap_admin, $this->ldap_admin_pw);
 				break;
 			case 'test_ldap':
 				$msg = $this->connect();
@@ -178,28 +178,28 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function sid2uidnumber($check_only=false)
+	private function sid2uidnumber($check_only = false)
 	{
 		$msg = array();
 		$this->connect();
 
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search='(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
-			array('uidNumber','gidNumber','uid','cn', 'objectClass',self::sambaSID))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = '(&(|(objectClass=posixAccount)(objectClass=posixGroup))('.self::sambaSID.'=*)(!(uid=*$)))',
+			array('uidNumber', 'gidNumber', 'uid', 'cn', 'objectClass', self::sambaSID))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$change = $accounts = array();
 		$cmd_change_account_id = 'admin/admin-cli.php --change-account-id <admin>@<domain>,<adminpw>';
 		$change_account_id = '';
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -234,7 +234,7 @@ 
 
 		// now change them in LDAP
 		$changed = 0;
-		foreach($accounts as $dn => $account)
+		foreach ($accounts as $dn => $account)
 		{
 			$modify = array();
 			if (!empty($account['uidnumber']) && isset($change[$account['uidnumber']]))
@@ -248,7 +248,7 @@ 
 			if (!$check_only && $modify && !ldap_modify($this->test_ldap->ds, $dn, $modify))
 			{
 				throw new egw_exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
-					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
+					"\n- ".implode("\n- ", $msg)); // EGroupware change already run successful
 			}
 			if ($modify) ++$changed;
 		}
@@ -263,13 +263,13 @@ 
 	 *
 	 * @param boolean $check_only =false true: only connect and output necessary commands
 	 */
-	private function copy2ad($check_only=false)
+	private function copy2ad($check_only = false)
 	{
 		$msg = array();
 		$attrs = $rename = array();
-		foreach(explode(',', $this->attributes) as $attr)
+		foreach (explode(',', $this->attributes) as $attr)
 		{
-			if ($attr[0] == '@' ||	// copy whole objectclass without renaming, eg. @inetOrgPerson
+			if ($attr[0] == '@' || // copy whole objectclass without renaming, eg. @inetOrgPerson
 				strpos($attr, '=') === false)
 			{
 				$attrs[] = $attr;
@@ -284,7 +284,7 @@ 
 		$ignore_attr = array_flip(array('dn', 'objectclass', 'cn', 'userpassword'));
 		if (!in_array('uid', $attrs))
 		{
-			$attrs[] = 'uid';	// need to match account
+			$attrs[] = 'uid'; // need to match account
 			$ignore_attr['uid'] = true;
 		}
 		// connect to destination ads
@@ -293,9 +293,8 @@ 
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
 		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
-		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
-			'CN='.$this->ads_admin_user.','.$this->ads_context;
-		switch($this->ads_connection)
+		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user : 'CN='.$this->ads_admin_user.','.$this->ads_context;
+		switch ($this->ads_connection)
 		{
 			case 'ssl':
 				$url = 'ldaps://'.$this->ads_host.'/';
@@ -313,28 +312,27 @@ 
 		// check if ads base does exist
 		if (!@ldap_read($ads->ds, $this->ads_context, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Ads dn "%1" NOT found!',$this->ads_context));
+			throw new egw_exception_wrong_userinput(lang('Ads dn "%1" NOT found!', $this->ads_context));
 		}
 
 		// connect to source ldap
 		$this->connect();
 
 		// check if ldap base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-			$search = $this->no_sid_check ? '(objectClass=posixAccount)' :
-				'(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+			$search = $this->no_sid_check ? '(objectClass=posixAccount)' : '(&(objectClass=posixAccount)('.self::sambaSID.'=*)(!(uid=*$)))', $attrs)) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!',$this->ldap_base, $search));
+			throw new egw_exception(lang('Error searching "dn=%1" for "%2"!', $this->ldap_base, $search));
 		}
 		$changed = 0;
 		$utc_diff = null;
-		foreach($entries as $key => $entry)
+		foreach ($entries as $key => $entry)
 		{
 			if ($key === 'count') continue;
 
@@ -343,7 +341,7 @@ 
 			$entry = array_diff_key($entry_arr, $ignore_attr);
 
 			if (!($sr = ldap_search($ads->ds, $this->ads_context,
-				$search='(&(objectClass=user)(sAMAccountName='.ldap::quote($uid).'))', array('dn'))) ||
+				$search = '(&(objectClass=user)(sAMAccountName='.ldap::quote($uid).'))', array('dn'))) ||
 				!($dest = ldap_get_entries($ads->ds, $sr)))
 			{
 				$msg[] = lang('User "%1" not found!', $uid);
@@ -363,11 +361,11 @@ 
 				{
 					if (is_null($utc_diff)) $utc_diff = date('Z');
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
-						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
+						$entry['shadowexpire'] * 24 * 3600 + $utc_diff); // ldap time to unixTime
 				}
 			}
 			$update = array();
-			foreach($entry as $attr => $value)
+			foreach ($entry as $attr => $value)
 			{
 				if ($value || $attr === '')
 				{
@@ -377,14 +375,14 @@ 
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
-					foreach((array)$value as $val)
+					foreach ((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
 							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
-							foreach($update[$to] as $v)
+							foreach ($update[$to] as $v)
 							{
 								if (!strcasecmp($v, $prefix.$val)) continue 2;
 							}
@@ -416,7 +414,7 @@ 
 		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
 
 		return "Copied data of $changed accounts from LDAP to AD ".
-			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
+			(count($msg) > $changed ? ' ('.(count($msg) - $changed).' errors!)' : '');
 	}
 
 	/**
@@ -459,9 +457,9 @@ 
 		$accounts_created = $groups_created = $errors = $egw_info_set = 0;
 		$emailadmin_src = $ldap_class = null;
 		$target = strtoupper($to);
-		foreach($accounts as $account_id => $account)
+		foreach ($accounts as $account_id => $account)
 		{
-			if (isset($this->only) && !in_array($account_id,$this->only))
+			if (isset($this->only) && !in_array($account_id, $this->only))
 			{
 				continue;
 			}
@@ -481,12 +479,12 @@ 
 			{
 				if (!($sql_account = $accounts_obj->read($account_id)))
 				{
-					$msg[] = lang('%1 does NOT exist in %2.',$what,$target);
+					$msg[] = lang('%1 does NOT exist in %2.', $what, $target);
 					$errors++;
 				}
-				elseif(empty($account['account_pwd']))
+				elseif (empty($account['account_pwd']))
 				{
-					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!',$what);
+					$msg[] = lang('%1 does NOT have a password (userPassword attribute) or we are not allowed to read it!', $what);
 					$errors++;
 				}
 				else
@@ -495,12 +493,12 @@ 
 
 					if (!$accounts_obj->save($sql_account))
 					{
-						$msg[] = lang('Update of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Update of %1 in %2 failed !!!', $what, $target);
 						$errors++;
 					}
 					else
 					{
-						$msg[] = lang('%1 password set in %2.',$what,$target);
+						$msg[] = lang('%1 password set in %2.', $what, $target);
 						$accounts_created++;
 					}
 				}
@@ -511,7 +509,7 @@ 
 			{
 				if ($accounts_obj->exists($account_id))
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 					continue;
 				}
@@ -519,7 +517,7 @@ 
 				{
 					if ($GLOBALS['egw_info']['server']['ldap_extra_attributes'])
 					{
-						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'] . '/' . $account['account_lid'];
+						$account['homedirectory'] = $GLOBALS['egw_info']['server']['ldap_account_home'].'/'.$account['account_lid'];
 						$account['loginshell'] = $GLOBALS['egw_info']['server']['ldap_account_shell'];
 					}
 					$account['account_passwd'] = self::hash_sql2ldap($account['account_pwd']);
@@ -532,12 +530,12 @@ 
 
 				if (!$accounts_obj->save($account))
 				{
-					$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+					$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 					$errors++;
 					continue;
 				}
-				$accounts_obj->set_memberships($account['memberships'],$account_id);
-				$msg[] = lang('%1 created in %2.',$what,$target);
+				$accounts_obj->set_memberships($account['memberships'], $account_id);
+				$msg[] = lang('%1 created in %2.', $what, $target);
 				$accounts_created++;
 
 				// check if we need to migrate mail-account
@@ -546,7 +544,7 @@ 
 					$ldap_class = false;
 					$ldap = new ldap();
 					$ldap->ldapConnect();
-					foreach(array(	// todo: have these enumerated by emailadmin ...
+					foreach (array(	// todo: have these enumerated by emailadmin ...
 						'qmailUser' => 'postfixldap',
 						'dbMailUser' => 'postfixdbmailuser',
 						// nothing to migrate for inetOrgPerson ...
@@ -594,7 +592,7 @@ 
 					// setting up egw_info array with new ldap information, so hook can use ldap::ldapConnect()
 					if (!$egw_info_set++)
 					{
-						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
+						foreach (array('ldap_host', 'ldap_root_dn', 'ldap_root_pw', 'ldap_context', 'ldap_group_context', 'ldap_search_filter', 'ldap_encryptin_type', 'mail_suffix', 'mail_login_type') as $name)
 						{
 							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
 						}
@@ -606,14 +604,14 @@ 
 						// running all addAccount hooks (currently NOT working, as not all work in setup)
 						if ($this->add_account_hook === true)
 						{
-							$GLOBALS['egw']->hooks->process($account,array(),true);
+							$GLOBALS['egw']->hooks->process($account, array(), true);
 						}
-						elseif(is_callable($this->add_account_hook))
+						elseif (is_callable($this->add_account_hook))
 						{
-							call_user_func($this->add_account_hook,$account);
+							call_user_func($this->add_account_hook, $account);
 						}
 					}
-					catch(Exception $e)
+					catch (Exception $e)
 					{
 						$msg[] = $e->getMessage();
 						$errors++;
@@ -627,38 +625,38 @@ 
 				{
 					if (!$accounts_obj->save($account))
 					{
-						$msg[] = lang('Creation of %1 in %2 failed !!!',$what,$target);
+						$msg[] = lang('Creation of %1 in %2 failed !!!', $what, $target);
 						++$errors;
 						continue;
 					}
-					$msg[] = lang('%1 created in %2.',$what,$target);
+					$msg[] = lang('%1 created in %2.', $what, $target);
 					$groups_created++;
 				}
 				else
 				{
-					$msg[] = lang('%1 already exists in %2.',$what,$target);
+					$msg[] = lang('%1 already exists in %2.', $what, $target);
 					$errors++;
 
 					if ($accounts_obj->id2name($account_id) != $account['account_lid'])
 					{
-						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!",$account['account_lid'],$account_id);
+						$msg[] = lang("==> different group '%1' under that gidNumber %2, NOT setting memberships!", $account['account_lid'], $account_id);
 						++$errors;
-						continue;	// different group under that gidnumber!
+						continue; // different group under that gidnumber!
 					}
 				}
 				// now saving / updating the memberships
-				$accounts_obj->set_members($account['members'],$account_id);
+				$accounts_obj->set_members($account['members'], $account_id);
 			}
 		}
 		if ($passwords2sql)
 		{
-			return lang('%1 passwords updated, %3 errors',$accounts_created,$groups_created,$errors).
-				($errors || $this->verbose ? "\n- ".implode("\n- ",$msg) : '');
+			return lang('%1 passwords updated, %3 errors', $accounts_created, $groups_created, $errors).
+				($errors || $this->verbose ? "\n- ".implode("\n- ", $msg) : '');
 		}
 		// migrate addressbook data
-		$GLOBALS['egw_info']['user']['apps']['admin'] = true;	// otherwise migration will not run in setup!
+		$GLOBALS['egw_info']['user']['apps']['admin'] = true; // otherwise migration will not run in setup!
 		$addressbook = new addressbook_so();
-		foreach($this->as_array() as $name => $value)
+		foreach ($this->as_array() as $name => $value)
 		{
 			if (substr($name, 5) == 'ldap_')
 			{
@@ -671,8 +669,8 @@ 
 
 		$this->restore_db();
 
-		return lang('%1 users and %2 groups created, %3 errors',$accounts_created,$groups_created,$errors).
-			($errors || $this->verbose ? "\n- ".implode("\n- ",$msgs) : '');
+		return lang('%1 users and %2 groups created, %3 errors', $accounts_created, $groups_created, $errors).
+			($errors || $this->verbose ? "\n- ".implode("\n- ", $msgs) : '');
 	}
 
 	/**
@@ -686,22 +684,22 @@ 
 		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
 
 		$matches = null;
-		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
+		if (preg_match('/^\\{(.*)\\}(.*)$/', $hash, $matches))
 		{
-			list(,$type,$hash) = $matches;
+			list(,$type, $hash) = $matches;
 		}
-		elseif (preg_match('/^[0-9a-f]{32}$/',$hash))
+		elseif (preg_match('/^[0-9a-f]{32}$/', $hash))
 		{
 			$type = 'md5';
 		}
-		switch(strtolower($type))
+		switch (strtolower($type))
 		{
 			case 'plain':
 				// ldap stores plaintext passwords without {plain} prefix
 				break;
 
 			case 'md5':
-				$hash = base64_encode(pack("H*",$hash));
+				$hash = base64_encode(pack("H*", $hash));
 				// fall through
 			default:
 				$hash = '{'.strtoupper($type).'}'.$hash;
@@ -731,14 +729,14 @@ 
 	 * @param string $type ='both'
 	 * @return array
 	 */
-	public function accounts($from='ldap', $type='both')
+	public function accounts($from = 'ldap', $type = 'both')
 	{
 		$accounts_obj = $this->accounts_obj($from);
 		//error_log(__METHOD__."(from_ldap=".array2string($from_ldap).') get_class(accounts_obj->backend)='.get_class($accounts_obj->backend));
 
 		$accounts = $accounts_obj->search(array('type' => $type, 'objectclass' => true, 'active' => false));
 
-		foreach($accounts as $account_id => &$account)
+		foreach ($accounts as $account_id => &$account)
 		{
 			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
 			{
@@ -749,11 +747,11 @@ 
 
 			if ($account['account_type'] == 'g')
 			{
-				$account['members'] = $accounts_obj->members($account_id,true);
+				$account['members'] = $accounts_obj->members($account_id, true);
 			}
 			else
 			{
-				$account['memberships'] = $accounts_obj->memberships($account_id,true);
+				$account['memberships'] = $accounts_obj->memberships($account_id, true);
 			}
 		}
 		accounts::cache_invalidate();
@@ -769,13 +767,13 @@ 
 	 */
 	private function accounts_obj($type)
 	{
-		static $enviroment_setup=null;
+		static $enviroment_setup = null;
 		if (!$enviroment_setup)
 		{
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql') $this->connect(); // throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -784,8 +782,8 @@ 
 			array(
 				'account_repository' => $GLOBALS['egw_info']['server']['account_repository'],
 			) + $this->as_array()) ||
-			!is_a(self::$egw_setup->accounts,'accounts') ||
-			!is_a(self::$egw_setup->accounts->backend,'accounts_'.$type))
+			!is_a(self::$egw_setup->accounts, 'accounts') ||
+			!is_a(self::$egw_setup->accounts->backend, 'accounts_'.$type))
 		{
 			throw new Exception(lang("Can NOT instancate accounts object for %1", strtoupper($type)));
 		}
@@ -800,7 +798,7 @@ 
 	 * @param string $host =null default $this->ldap_host, hostname, ip or ldap-url
 	 * @throws egw_exception_wrong_userinput Can not connect to ldap ...
 	 */
-	private function connect($dn=null,$pw=null,$host=null)
+	private function connect($dn = null, $pw = null, $host = null)
 	{
 		if (is_null($dn)) $dn = $this->ldap_root_dn;
 		if (is_null($pw)) $pw = $this->ldap_root_pw;
@@ -813,18 +811,18 @@ 
 		$this->test_ldap = new ldap();
 
 		$error_rep = error_reporting();
-		error_reporting($error_rep & ~E_WARNING);	// switch warnings of, in case they are on
+		error_reporting($error_rep&~E_WARNING); // switch warnings of, in case they are on
 		ob_start();
-		$ds = $this->test_ldap->ldapConnect($host,$dn,$pw);
+		$ds = $this->test_ldap->ldapConnect($host, $dn, $pw);
 		ob_end_clean();
 		error_reporting($error_rep);
 
 		if (!$ds)
 		{
 			throw new egw_exception_wrong_userinput(lang('Can not connect to LDAP server on host %1 using DN %2!',
-				$host,$dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
+				$host, $dn).($this->test_ldap->ds ? ' ('.ldap_error($this->test_ldap->ds).')' : ''));
 		}
-		return lang('Successful connected to LDAP server on %1 using DN %2.',$this->ldap_host,$dn);
+		return lang('Successful connected to LDAP server on %1 using DN %2.', $this->ldap_host, $dn);
 	}
 
 	/**
@@ -837,16 +835,16 @@ 
 	{
 		$this->connect();
 
-		$sr = ldap_list($this->test_ldap->ds,$this->ldap_context,'ObjectClass=posixAccount',array('dn','shadowExpire'));
+		$sr = ldap_list($this->test_ldap->ds, $this->ldap_context, 'ObjectClass=posixAccount', array('dn', 'shadowExpire'));
 		if (!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception('Error listing "dn=%1"!',$this->ldap_context);
+			throw new egw_exception('Error listing "dn=%1"!', $this->ldap_context);
 		}
 		$num = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0] * 24 * 3600 < time()) continue;
 			++$num;
 		}
 		return $num;
@@ -860,23 +858,23 @@ 
 	 */
 	private function create()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
-		foreach(array(
+		foreach (array(
 			$this->ldap_base => array(),
 			$this->ldap_context => array(),
 			$this->ldap_group_context => array(),
-			$this->ldap_root_dn => array('userPassword' => auth::encrypt_ldap($this->ldap_root_pw,'ssha')),
+			$this->ldap_root_dn => array('userPassword' => auth::encrypt_ldap($this->ldap_root_pw, 'ssha')),
 		) as $dn => $extra)
 		{
-			if (!$this->_create_node($dn,$extra,$this->check_only) && $dn == $this->ldap_root_dn)
+			if (!$this->_create_node($dn, $extra, $this->check_only) && $dn == $this->ldap_root_dn)
 			{
 				// ldap_root already existed, lets check the pw is correct
 				$this->connect();
 			}
 		}
 		return lang('Successful connected to LDAP server on %1 and created/checked required structur %2.',
-			$this->ldap_host,$this->ldap_base);
+			$this->ldap_host, $this->ldap_base);
 	}
 
 	/**
@@ -887,25 +885,25 @@ 
 	 */
 	private function delete_base()
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// some precausion to not delete whole ldap tree!
-		if (count(explode(',',$this->ldap_base)) < 2)
+		if (count(explode(',', $this->ldap_base)) < 2)
 		{
-			throw new egw_exception_assertion_failed(lang('Refusing to delete dn "%1"!',$this->ldap_base));
+			throw new egw_exception_assertion_failed(lang('Refusing to delete dn "%1"!', $this->ldap_base));
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		return lang('LDAP dn="%1" with %2 entries deleted.',
-			$this->ldap_base,$this->rdelete($this->ldap_base));
+			$this->ldap_base, $this->rdelete($this->ldap_base));
 	}
 
 	/**
@@ -917,20 +915,20 @@ 
 	 */
 	private function rdelete($dn)
 	{
-		if (!($sr = ldap_list($this->test_ldap->ds,$dn,'ObjectClass=*',array(''))) ||
+		if (!($sr = ldap_list($this->test_ldap->ds, $dn, 'ObjectClass=*', array(''))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error listing "dn=%1"!',$dn));
+			throw new egw_exception(lang('Error listing "dn=%1"!', $dn));
 		}
 		$deleted = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 			$deleted += $this->rdelete($entry['dn']);
 		}
-		if (!ldap_delete($this->test_ldap->ds,$dn))
+		if (!ldap_delete($this->test_ldap->ds, $dn))
 		{
-			throw new egw_exception(lang('Error deleting "dn=%1"!',$dn));
+			throw new egw_exception(lang('Error deleting "dn=%1"!', $dn));
 		}
 		return ++$deleted;
 	}
@@ -946,32 +944,32 @@ 
 	 * @return string with success message N entries modified
 	 * @throws egw_exception if dn not found, not listable or delete fails
 	 */
-	private function set_mailbox($check_only=false)
+	private function set_mailbox($check_only = false)
 	{
-		$this->connect($this->ldap_admin,$this->ldap_admin_pw);
+		$this->connect($this->ldap_admin, $this->ldap_admin_pw);
 
 		// if base not set, use context minus one hierarchy, eg. ou=accounts,(o=domain,dc=local)
 		if (empty($this->ldap_base) && $this->ldap_context)
 		{
-			list(,$this->ldap_base) = explode(',',$this->ldap_context,2);
+			list(,$this->ldap_base) = explode(',', $this->ldap_context, 2);
 		}
 		// check if base does exist
-		if (!@ldap_read($this->test_ldap->ds,$this->ldap_base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $this->ldap_base, 'objectClass=*'))
 		{
-			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!',$this->ldap_base));
+			throw new egw_exception_wrong_userinput(lang('Base dn "%1" NOT found!', $this->ldap_base));
 		}
 		$object_class = $this->object_class ? $this->object_class : 'qmailUser';
 		$mbox_attr = $this->mbox_attr ? $this->mbox_attr : 'mailmessagestore';
 		$mail_login_type = $this->mail_login_type ? $this->mail_login_type : 'email';
 
-		if (!($sr = ldap_search($this->test_ldap->ds,$this->ldap_base,
-				'objectClass='.$object_class,array('mail','uidNumber','uid',$mbox_attr))) ||
+		if (!($sr = ldap_search($this->test_ldap->ds, $this->ldap_base,
+				'objectClass='.$object_class, array('mail', 'uidNumber', 'uid', $mbox_attr))) ||
 			!($entries = ldap_get_entries($this->test_ldap->ds, $sr)))
 		{
-			throw new egw_exception(lang('Error listing "dn=%1"!',$this->ldap_base));
+			throw new egw_exception(lang('Error listing "dn=%1"!', $this->ldap_base));
 		}
 		$modified = 0;
-		foreach($entries as $n => $entry)
+		foreach ($entries as $n => $entry)
 		{
 			if ($n === 'count') continue;
 
@@ -979,21 +977,20 @@ 
 				'account_id' => $entry['uidnumber'][0],
 				'account_lid' => $entry['uid'][0],
 				'account_email' => $entry['mail'][0],
-			),$this->domain,$mail_login_type);
+			), $this->domain, $mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0]) continue; // nothing to change
 
-			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
+			if (!$check_only && !ldap_modify($this->test_ldap->ds, $entry['dn'], array(
 				$mbox_attr => $mbox,
 			)))
 			{
-				throw new egw_exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
+				throw new egw_exception(lang("Error modifying dn=%1: %2='%3'!", $entry['dn'], $mbox_attr, $mbox));
 			}
 			++$modified;
 			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
 		}
-		return $check_only ? lang('%1 entries would have been modified.',$modified) :
-			lang('%1 entries modified.',$modified);
+		return $check_only ? lang('%1 entries would have been modified.', $modified) : lang('%1 entries modified.', $modified);
 	}
 
 	/**
@@ -1004,9 +1001,9 @@ 
 	static $requiredObjectclasses = array(
 		'o' => 'organization',
 		'ou' => 'organizationalUnit',
-		'cn' => array('organizationalRole','simpleSecurityObject'),
-		'uid' => array('uidObject','organizationalRole','simpleSecurityObject'),
-		'dc' => array('organization','dcObject'),
+		'cn' => array('organizationalRole', 'simpleSecurityObject'),
+		'uid' => array('uidObject', 'organizationalRole', 'simpleSecurityObject'),
+		'dc' => array('organization', 'dcObject'),
 	);
 
 	/**
@@ -1017,37 +1014,37 @@ 
 	 * @return boolean true if the node was create, false if it was already there
 	 * @throws egw_exception_wrong_userinput
 	 */
-	private function _create_node($dn,$extra=array())
+	private function _create_node($dn, $extra = array())
 	{
 		// check if the node already exists and return if it does
-		if (@ldap_read($this->test_ldap->ds,$dn,'objectClass=*'))
+		if (@ldap_read($this->test_ldap->ds, $dn, 'objectClass=*'))
 		{
 			return false;
 		}
-		list($node,$base) = explode(',',$dn,2);
+		list($node, $base) = explode(',', $dn, 2);
 
-		if (!@ldap_read($this->test_ldap->ds,$base,'objectClass=*'))
+		if (!@ldap_read($this->test_ldap->ds, $base, 'objectClass=*'))
 		{
-			$this->_create_node($base);		// create the base if it's not already there
+			$this->_create_node($base); // create the base if it's not already there
 		}
 		// now we need to create the node itself
-		list($name,$value) = explode('=',$node);
+		list($name, $value) = explode('=', $node);
 
 		if (!isset(self::$requiredObjectclasses[$name]))
 		{
-			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!',$dn).' '.
-				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
+			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!', $dn).' '.
+				lang('Supported node types:').implode(', ', array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc') $extra['o'] = $value; // required by organisation
+		if ($name == 'uid') $extra['cn'] = $value; // required by organizationalRole
 
-		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
+		if (!@ldap_add($this->test_ldap->ds, $dn, $attr = array(
 			$name => $value,
 			'objectClass' => self::$requiredObjectclasses[$name],
-		)+$extra))
+		) + $extra))
 		{
-			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!',$dn).
-				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr,true).')');
+			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!', $dn).
+				' ('.ldap_error($this->test_ldap->ds).', attributes='.print_r($attr, true).')');
 		}
 		return true;
 	}
@@ -1078,30 +1075,30 @@ 
 	 */
 	private function _merge_defaults()
 	{
-		foreach(self::defaults() as $name => $default)
+		foreach (self::defaults() as $name => $default)
 		{
-			if ($this->sub_command == 'delete_ldap' && in_array($name,array('ldap_base','ldap_context')))
+			if ($this->sub_command == 'delete_ldap' && in_array($name, array('ldap_base', 'ldap_context')))
 			{
-				continue;	// no default on what to delete!
+				continue; // no default on what to delete!
 			}
 			if (!$this->$name)
 			{
 				//echo "<p>setting $name='{$this->$name}' to it's default='$default'</p>\n";
 				$this->set_defaults[$name] = $this->$name = $default;
 			}
-			if (strpos($this->$name,'$') !== false)
+			if (strpos($this->$name, '$') !== false)
 			{
 				$this->set_defaults[$name] = $this->$name = str_replace(array(
 					'$domain',
 					'$suffix',
 					'$base',
 					'$admin_pw',
-				),array(
+				), array(
 					$this->domain,
 					$this->ldap_suffix,
 					$this->ldap_base,
 					$this->ldap_admin_pw,
-				),$this->$name);
+				), $this->$name);
 			}
 		}
 	}

Braces +124 added lines, -30 removed lines

@@ -201,7 +201,10 @@ 
 		$change_account_id = '';
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry = ldap::result2array($entry);
 			$accounts[$entry['dn']] = $entry;
@@ -228,7 +231,10 @@ 
 		//print_r($change); die('Stop');
 
 		// change account-ids inside EGroupware
-		if ($check_only) $msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		if ($check_only)
+		{
+			$msg[] = "You need to run now:\n$cmd_change_account_id $change_account_id";
+		}
 		//$cmd = new admin_cmd_change_account_id($change);
 		//$msg[] = $cmd->run($time=null, $set_modifier=false, $skip_checks=false, $check_only);
 
@@ -250,7 +256,10 @@ 
 				throw new egw_exception("Failed to modify ldap: !ldap_modify({$this->test_ldap->ds}, '$dn', ".array2string($modify).") ".ldap_error($this->test_ldap->ds).
 					"\n- ".implode("\n- ", $msg));	// EGroupware change already run successful
 			}
-			if ($modify) ++$changed;
+			if ($modify)
+			{
+				++$changed;
+			}
 		}
 		$msg[] = "You need to run now on your samba share(s):\nsetup/doc/chown.php -R $change_account_id <share>";
 
@@ -277,7 +286,10 @@ 
 			else
 			{
 				list($to, $from) = explode('=', $attr);
-				if ($from) $attrs[] = $from;
+				if ($from)
+				{
+					$attrs[] = $from;
+				}
 				$rename[strtolower($from)] = $to;
 			}
 		}
@@ -292,7 +304,10 @@ 
 		{
 			$this->ads_context = 'CN=Users,DC='.implode(',DC=', explode('.', $this->ads_domain));
 		}
-		if (empty($this->ads_admin_user)) $this->ads_admin_user = 'Administrator';
+		if (empty($this->ads_admin_user))
+		{
+			$this->ads_admin_user = 'Administrator';
+		}
 		$admin_dn = strpos($this->ads_admin_user, '=') !== false ? $this->ads_admin_user :
 			'CN='.$this->ads_admin_user.','.$this->ads_context;
 		switch($this->ads_connection)
@@ -336,7 +351,10 @@ 
 		$utc_diff = null;
 		foreach($entries as $key => $entry)
 		{
-			if ($key === 'count') continue;
+			if ($key === 'count')
+			{
+				continue;
+			}
 
 			$entry_arr = ldap::result2array($entry);
 			$uid = $entry_arr['uid'];
@@ -350,7 +368,10 @@ 
 				continue;
 			}
 			$dn = $dest[0]['dn'];
-			if (isset($rename[''])) $entry[''] = '';
+			if (isset($rename['']))
+			{
+				$entry[''] = '';
+			}
 			// special handling for copying shadowExpires to accountExpires
 			if (strtolower($rename['shadowexpire']) === 'accountexpires')
 			{
@@ -361,7 +382,10 @@ 
 				}
 				else
 				{
-					if (is_null($utc_diff)) $utc_diff = date('Z');
+					if (is_null($utc_diff))
+					{
+						$utc_diff = date('Z');
+					}
 					$entry['shadowexpire'] = accounts_ads::convertUnixTimeToWindowsTime(
 						$entry['shadowexpire']*24*3600+$utc_diff);	// ldap time to unixTime
 				}
@@ -373,20 +397,29 @@ 
 				{
 					$to = isset($rename[$attr]) ? $rename[$attr] : $attr;
 					$prefix = null;
-					if ($to[0] == '{')	// eg. {smtp:}proxyAddresses=forwardTo
+					if ($to[0] == '{')
+					{
+						// eg. {smtp:}proxyAddresses=forwardTo
 					{
 						list($prefix, $to) = explode('}', substr($to, 1));
 					}
+					}
 					foreach((array)$value as $val)
 					{
 						if (isset($update[$to]))
 						{
-							if (!is_array($update[$to])) $update[$to] = array($update[$to]);
+							if (!is_array($update[$to]))
+							{
+								$update[$to] = array($update[$to]);
+							}
 							// we need to check (caseinsensitive) if value already exists in set
 							// as AD chokes on doublicate values "Type or value exists"
 							foreach($update[$to] as $v)
 							{
-								if (!strcasecmp($v, $prefix.$val)) continue 2;
+								if (!strcasecmp($v, $prefix.$val))
+								{
+									continue 2;
+								}
 							}
 							$update[$to][] = $prefix.$val;
 						}
@@ -413,7 +446,10 @@ 
 				$changed++;
 			}
 		}
-		if ($check_only) return lang("%1 accounts to copy found.", count($entries));
+		if ($check_only)
+		{
+			return lang("%1 accounts to copy found.", count($entries));
+		}
 
 		return "Copied data of $changed accounts from LDAP to AD ".
 			(count($msg) > $changed ? ' ('.(count($msg)-$changed).' errors!)' : '');
@@ -429,7 +465,10 @@ 
 	private function migrate($mode)
 	{
 		// support old boolean mode
-		if (is_bool($mode)) $mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		if (is_bool($mode))
+		{
+			$mode = $mode ? 'migrate_to_ldap' : 'migrate_to_sql';
+		}
 
 		$passwords2sql = $mode === "passwords_to_sql";
 		list(,$to) = explode('_to_', $mode);
@@ -596,7 +635,10 @@ 
 					{
 						foreach(array('ldap_host','ldap_root_dn','ldap_root_pw','ldap_context','ldap_group_context','ldap_search_filter','ldap_encryptin_type','mail_suffix','mail_login_type') as $name)
 						{
-							 if (!empty($this->$name)) $GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 if (!empty($this->$name))
+							 {
+							 	$GLOBALS['egw_info']['server'][$name] = $this->$name;
+							 }
 						}
 						//error_log(__METHOD__."() setup up egw_info[server]: ldap_host='{$GLOBALS['egw_info']['server']['ldap_host']}', ldap_root_dn='{$GLOBALS['egw_info']['server']['ldap_root_dn']}', ldap_root_pw='{$GLOBALS['egw_info']['server']['ldap_root_pw']}', ldap_context='{$GLOBALS['egw_info']['server']['ldap_context']}', mail_suffix='{$GLOBALS['egw_info']['server']['mail_suffix']}', mail_logig_type='{$GLOBALS['egw_info']['server']['mail_login-type']}'");
 					}
@@ -683,7 +725,10 @@ 
 	 */
 	public static function hash_sql2ldap($hash)
 	{
-		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type'])) $type = 'md5';
+		if (!($type = $GLOBALS['egw_info']['server']['sql_encryption_type']))
+		{
+			$type = 'md5';
+		}
 
 		$matches = null;
 		if (preg_match('/^\\{(.*)\\}(.*)$/',$hash,$matches))
@@ -717,10 +762,13 @@ 
 	 */
 	public static function hash_ldap2sql($hash)
 	{
-		if ($hash[0] != '{')	// plain has to be explicitly specified for sql, in ldap it's the default
+		if ($hash[0] != '{')
+		{
+			// plain has to be explicitly specified for sql, in ldap it's the default
 		{
 			$hash = '{PLAIN}'.$hash;
 		}
+		}
 		return $hash;
 	}
 
@@ -740,9 +788,12 @@ 
 
 		foreach($accounts as $account_id => &$account)
 		{
-			if ($account_id != $account['account_id'])	// not all backends have as key the account_id
+			if ($account_id != $account['account_id'])
+			{
+				// not all backends have as key the account_id
 			{
 				unset($account);
+			}
 				$account_id = $account['account_id'];
 			}
 			$account += $accounts_obj->read($account_id);
@@ -775,7 +826,11 @@ 
 			parent::_setup_enviroment($this->domain);
 			$enviroment_setup = true;
 		}
-		if ($type != 'sql') $this->connect();	// throws exception, if it can NOT connect
+		if ($type != 'sql')
+		{
+			$this->connect();
+		}
+		// throws exception, if it can NOT connect
 
 		// otherwise search does NOT work, as accounts_sql uses addressbook_bo for it
 		$GLOBALS['egw_info']['server']['account_repository'] = $type;
@@ -802,14 +857,26 @@ 
 	 */
 	private function connect($dn=null,$pw=null,$host=null)
 	{
-		if (is_null($dn)) $dn = $this->ldap_root_dn;
-		if (is_null($pw)) $pw = $this->ldap_root_pw;
-		if (is_null($host)) $host = $this->ldap_host;
+		if (is_null($dn))
+		{
+			$dn = $this->ldap_root_dn;
+		}
+		if (is_null($pw))
+		{
+			$pw = $this->ldap_root_pw;
+		}
+		if (is_null($host))
+		{
+			$host = $this->ldap_host;
+		}
 
-		if (!$pw)	// ldap::ldapConnect use the current eGW's pw otherwise
+		if (!$pw)
+		{
+			// ldap::ldapConnect use the current eGW's pw otherwise
 		{
 			throw new egw_exception_wrong_userinput(lang('You need to specify a password!'));
 		}
+		}
 		$this->test_ldap = new ldap();
 
 		$error_rep = error_reporting();
@@ -845,8 +912,14 @@ 
 		$num = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
-			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time()) continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
+			if (isset($entry['shadowexpire']) && $entry['shadowexpire'][0]*24*3600 < time())
+			{
+				continue;
+			}
 			++$num;
 		}
 		return $num;
@@ -925,7 +998,10 @@ 
 		$deleted = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 			$deleted += $this->rdelete($entry['dn']);
 		}
 		if (!ldap_delete($this->test_ldap->ds,$dn))
@@ -973,7 +1049,10 @@ 
 		$modified = 0;
 		foreach($entries as $n => $entry)
 		{
-			if ($n === 'count') continue;
+			if ($n === 'count')
+			{
+				continue;
+			}
 
 			$mbox = emailadmin_smtp_ldap::mailbox_addr(array(
 				'account_id' => $entry['uidnumber'][0],
@@ -981,7 +1060,11 @@ 
 				'account_email' => $entry['mail'][0],
 			),$this->domain,$mail_login_type);
 
-			if ($mbox === $entry[$mbox_attr][0]) continue;	// nothing to change
+			if ($mbox === $entry[$mbox_attr][0])
+			{
+				continue;
+			}
+			// nothing to change
 
 			if (!$check_only && !ldap_modify($this->test_ldap->ds,$entry['dn'],array(
 				$mbox_attr => $mbox,
@@ -990,7 +1073,10 @@ 
 				throw new egw_exception(lang("Error modifying dn=%1: %2='%3'!",$entry['dn'],$mbox_attr,$mbox));
 			}
 			++$modified;
-			if ($check_only) echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			if ($check_only)
+			{
+				echo "$modified: $entry[dn]: $mbox_attr={$entry[$mbox_attr][0]} --> $mbox\n";
+			}
 		}
 		return $check_only ? lang('%1 entries would have been modified.',$modified) :
 			lang('%1 entries modified.',$modified);
@@ -1038,8 +1124,16 @@ 
 			throw new egw_exception_wrong_userinput(lang('Can not create DN %1!',$dn).' '.
 				lang('Supported node types:').implode(', ',array_keys(self::$requiredObjectclasses)));
 		}
-		if ($name == 'dc') $extra['o'] = $value;	// required by organisation
-		if ($name == 'uid') $extra['cn'] = $value;	// required by organizationalRole
+		if ($name == 'dc')
+		{
+			$extra['o'] = $value;
+		}
+		// required by organisation
+		if ($name == 'uid')
+		{
+			$extra['cn'] = $value;
+		}
+		// required by organizationalRole
 
 		if (!@ldap_add($this->test_ldap->ds,$dn,$attr = array(
 			$name => $value,

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

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)

Spacing +85 added lines, -85 removed lines

@@ -25,12 +25,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;
@@ -50,18 +50,18 @@ 
 	 * @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')
 				{
-					$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table,'*',false,__LINE__,__FILE__);
-					while(@$GLOBALS['egw_setup']->db->next_record())
+					$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->applications_table, '*', false, __LINE__, __FILE__);
+					while (@$GLOBALS['egw_setup']->db->next_record())
 					{
 						$app = $GLOBALS['egw_setup']->db->f('app_name');
 						if (!isset($setup_info[$app]))	// app source no longer there
@@ -77,7 +77,7 @@ 
 					}
 					/* This is to catch old setup installs that did not have phpgwapi listed as an app */
 					$tmp = @$setup_info['phpgwapi']['version']; /* save the file version */
-					if(!@$setup_info['phpgwapi']['currentver'])
+					if (!@$setup_info['phpgwapi']['currentver'])
 					{
 						$setup_info['phpgwapi']['currentver'] = $setup_info['admin']['currentver'];
 						$setup_info['phpgwapi']['version'] = $setup_info['admin']['currentver'];
@@ -97,9 +97,9 @@ 
 				else
 				{
 					$GLOBALS['egw_setup']->db->query('select * from applications');
-					while(@$GLOBALS['egw_setup']->db->next_record())
+					while (@$GLOBALS['egw_setup']->db->next_record())
 					{
-						if($GLOBALS['egw_setup']->db->f('app_name') == 'admin')
+						if ($GLOBALS['egw_setup']->db->f('app_name') == 'admin')
 						{
 							$setup_info['phpgwapi']['currentver'] = $GLOBALS['egw_setup']->db->f('app_version');
 						}
@@ -127,25 +127,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';
 				}
@@ -162,35 +162,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;
@@ -203,17 +203,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';
 							}
@@ -235,9 +235,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]);
 			}
@@ -252,24 +252,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';
@@ -286,7 +286,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'];
 
@@ -294,14 +294,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(egw_exception_db $e) {
+		catch (egw_exception_db $e) {
 			// ignore error
 		}
 
@@ -310,14 +310,14 @@ 
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 1 (Create Database)';
 			return 1;
 		}
-		if(!isset($setup_info['phpgwapi']['currentver']))
+		if (!isset($setup_info['phpgwapi']['currentver']))
 		{
 			$setup_info = $this->get_db_versions($setup_info);
 		}
 		//_debug_array($setup_info);
 		if (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;
@@ -351,14 +351,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
-			$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table,'config_name,config_value',array('config_app' => 'phpgwapi'),__LINE__,__FILE__);
-			while($GLOBALS['egw_setup']->db->next_record())
+			$GLOBALS['egw_setup']->db->select($GLOBALS['egw_setup']->config_table, 'config_name,config_value', array('config_app' => 'phpgwapi'), __LINE__, __FILE__);
+			while ($GLOBALS['egw_setup']->db->next_record())
 			{
 				$config[$GLOBALS['egw_setup']->db->f(0)] = $GLOBALS['egw_setup']->db->f(1);
 			}
@@ -368,21 +368,21 @@ 
 			// 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 (!$this->check_dir($config['files_dir'],$error_msg,true))
+		if (!$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']) && empty($config['backup_dir']))
@@ -390,35 +390,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)
 		{
@@ -430,7 +430,7 @@ 
 
 	function check_lang($check = True)
 	{
-		if($check && $GLOBALS['egw_info']['setup']['stage']['db'] != 10)
+		if ($check && $GLOBALS['egw_info']['setup']['stage']['db'] != 10)
 		{
 			return '';
 		}
@@ -439,21 +439,21 @@ 
 			$GLOBALS['setup_info'] = $GLOBALS['egw_setup']->detection->get_db_versions($GLOBALS['setup_info']);
 		}
 		try {
-			$GLOBALS['egw_setup']->db->query($q = "SELECT DISTINCT lang FROM {$GLOBALS['egw_setup']->lang_table}",__LINE__,__FILE__);
+			$GLOBALS['egw_setup']->db->query($q = "SELECT DISTINCT lang FROM {$GLOBALS['egw_setup']->lang_table}", __LINE__, __FILE__);
 		}
 		catch (egw_exception_db $e) {
 			// ignore db error
 		}
-		if($e || $GLOBALS['egw_setup']->db->num_rows() == 0)
+		if ($e || $GLOBALS['egw_setup']->db->num_rows() == 0)
 		{
 			$GLOBALS['egw_info']['setup']['header_msg'] = 'Stage 3 (No languages installed)';
 			return 1;
 		}
-		while(@$GLOBALS['egw_setup']->db->next_record())
+		while (@$GLOBALS['egw_setup']->db->next_record())
 		{
 			$GLOBALS['egw_info']['setup']['installed_langs'][$GLOBALS['egw_setup']->db->f('lang')] = $GLOBALS['egw_setup']->db->f('lang');
 		}
-		foreach($GLOBALS['egw_info']['setup']['installed_langs'] as $value)
+		foreach ($GLOBALS['egw_info']['setup']['installed_langs'] as $value)
 		{
 			$sql = "SELECT lang_name FROM {$GLOBALS['egw_setup']->languages_table} WHERE lang_id = '".$value."'";
 			$GLOBALS['egw_setup']->db->query($sql);
@@ -471,19 +471,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'];
 				}
@@ -492,19 +492,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;
 					}
@@ -515,9 +515,9 @@ 
 				}
 				else
 				{
-					if($any)
+					if ($any)
 					{
-						if($GLOBALS['DEBUG'])
+						if ($GLOBALS['DEBUG'])
 						{
 							echo '<br>check_app_tables(): Some tables installed';
 						}
@@ -526,9 +526,9 @@ 
 				}
 			}
 		}
-		if($none && $any)
+		if ($none && $any)
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): No tables installed';
 			}
@@ -536,7 +536,7 @@ 
 		}
 		else
 		{
-			if($GLOBALS['DEBUG'])
+			if ($GLOBALS['DEBUG'])
 			{
 				echo '<br>check_app_tables(): All tables installed';
 			}
@@ -552,9 +552,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;
@@ -566,16 +566,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)
 					{

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');
 
 	/**

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'])
 		{

Spacing +134 added lines, -134 removed lines

@@ -12,7 +12,7 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 
@@ -39,7 +39,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $quantity_sum=false;
+	var $quantity_sum = false;
 	/**
 	 * current user
 	 *
@@ -52,7 +52,7 @@ 
 	 * @var array
 	 */
 	var $timestamps = array(
-		'ts_start','ts_modified'
+		'ts_start', 'ts_modified'
 	);
 	/**
 	 * Start of today in user-time
@@ -66,17 +66,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);
@@ -101,7 +101,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Array with status label
 	 *
@@ -161,21 +161,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 = 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);
 	}
@@ -185,15 +185,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'] = '';
 			}
@@ -205,12 +205,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;
 		}
@@ -222,7 +222,7 @@ 
 
 		// Sort 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;
@@ -241,7 +241,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))
 			{
@@ -261,14 +261,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);
 			}
 		}
 	}
@@ -279,12 +279,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] = common::grab_owner_name($uid);
 			}
@@ -303,19 +303,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'])
@@ -338,19 +338,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)
@@ -359,11 +359,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 & EGW_ACL_DELETE) && $this->config_data['history'] == 'history' &&
+		if (($required&EGW_ACL_DELETE) && $this->config_data['history'] == 'history' &&
 			$data['ts_status'] == self::DELETED_STATUS)
 		{
 			$ret = !!($GLOBALS['egw_info']['user']['apps']['admin']);
@@ -380,7 +380,7 @@ 
 	 * @param int &$end
 	 * @return string
 	 */
-	function date_filter($name,&$start,&$end)
+	function date_filter($name, &$start, &$end)
 	{
 		return egw_time::sql_filter($name, $start, $end, 'ts_start', $this->date_filters);
 	}
@@ -405,7 +405,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";
@@ -414,9 +414,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';
 		}
@@ -428,7 +428,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]))
 				{
@@ -442,8 +442,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']))
 		{
@@ -451,15 +451,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);
@@ -483,45 +483,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);
 	}
 
 	/**
@@ -531,16 +531,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(EGW_ACL_READ)))
 		{
-			return false;	// no read rights
+			return false; // no read rights
 		}
 		return $this->data;
 	}
@@ -555,7 +555,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);
 
@@ -573,13 +573,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;
 			}
@@ -590,7 +590,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)
 		{
 			egw_link::restore(TIMESHEET_APP, $new['ts_id']);
 		}
@@ -601,14 +601,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
-			egw_link::notify_update(TIMESHEET_APP,$this->data['ts_id'],$this->data);
+			egw_link::notify_update(TIMESHEET_APP, $this->data['ts_id'], $this->data);
 		}
 
 		return $err;
@@ -621,15 +621,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(EGW_ACL_DELETE,$ts_id) || !($old = $this->read($ts_id)))
+		if (!$ignore_acl && !$this->check_acl(EGW_ACL_DELETE, $ts_id) || !($old = $this->read($ts_id)))
 		{
 			return false;
 		}
@@ -640,12 +640,12 @@ 
 			$delete = $old;
 			$delete['ts_status'] = self::DELETED_STATUS;
 			$ret = !($this->save($delete));
-			egw_link::unlink(0,TIMESHEET_APP,$ts_id,'','','',true);
+			egw_link::unlink(0, TIMESHEET_APP, $ts_id, '', '', '', true);
 		}
 		elseif (($ret = parent::delete($keys)) && $ts_id)
 		{
 			// delete all links to timesheet entry $ts_id
-			egw_link::unlink(0,TIMESHEET_APP,$ts_id);
+			egw_link::unlink(0, TIMESHEET_APP, $ts_id);
 		}
 		return $ret;
 	}
@@ -660,7 +660,7 @@ 
 	function deleteaccount($data)
 	{
 		$account_id = $data['account_id'];
-		$new_owner =  $data['new_owner'];
+		$new_owner = $data['new_owner'];
 
 		if (!$new_owner)
 		{
@@ -684,22 +684,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(EGW_ACL_EDIT,$ts_id) || !$this->read($ts_id,true))
+		if (!$this->check_acl(EGW_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;
 	}
@@ -716,7 +716,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);
 	}
 
 	/**
@@ -727,27 +727,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'];
 	}
 
 	/**
@@ -758,18 +758,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 egw_link about all deletes
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -788,16 +788,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);
 		}
@@ -814,11 +814,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);
 	}
 
 	/**
@@ -830,16 +830,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;
 		}
@@ -852,16 +852,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 = solink::get_links('projectmanager',$pm_ids,'timesheet');	// solink::get_links not egw_links::get_links!
+			$links = solink::get_links('projectmanager', $pm_ids, 'timesheet'); // solink::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;
 		}
@@ -879,17 +879,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'][egw_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'];
@@ -931,17 +931,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(egw_link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
+			foreach (egw_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'] == egw_link::title('projectmanager', $pm_id))
@@ -959,7 +959,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!
 	}
 
 	/**
@@ -971,17 +971,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'] ? egw_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!
 	}
 }

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

@@ -15,18 +15,18 @@ 
 /**
  * class import_csv for timesheet
  */
-class timesheet_import_csv implements importexport_iface_import_plugin  {
+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(
@@ -50,14 +50,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
@@ -105,8 +105,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'],
 		));
@@ -116,7 +116,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();
@@ -134,15 +134,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
@@ -156,9 +156,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
@@ -168,22 +168,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 categories without explicit 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 '':
@@ -194,29 +194,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
 										);
-										config::save_value('status_labels',$this->bo->status_labels_config,TIMESHEET_APP);
+										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;
@@ -228,11 +228,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 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'],
@@ -249,11 +249,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(common::grab_owner_name($account_id)) == strtoupper($record[$field])) {
+					if ($account_id && strtoupper(common::grab_owner_name($account_id)) == strtoupper($record[$field])) {
 						$record[$field] = $account_id;
 					} else {
 						$this->errors[$import_csv->get_current_position()] = lang(
@@ -269,35 +269,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;
 
@@ -310,9 +310,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;
 	}
@@ -324,7 +324,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' :
@@ -334,7 +334,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']);
 				}
@@ -342,35 +342,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']) {
-					egw_link::unlink2(0,TIMESHEET_APP,$_data['ts_id'],0,'projectmanager',$old['pm_id']);
+					egw_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']) {
-						egw_link::link(TIMESHEET_APP,$_data['ts_id'],'projectmanager',$_data['pm_id']);
+						egw_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'];
@@ -382,22 +382,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 = egw_link::link('timesheet',$id,$app,$app_id);
+				$link_id = egw_link::link('timesheet', $id, $app, $app_id);
 			}
 		}
 		return $result;
@@ -493,7 +493,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;
@@ -503,18 +503,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
@@ -523,7 +523,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 +179 added lines, -71 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * class import_csv for timesheet
  */
-class timesheet_import_csv implements importexport_iface_import_plugin  {
+class timesheet_import_csv implements importexport_iface_import_plugin
+{
 
 	private static $plugin_options = array(
 		'fieldsep', 		// char
@@ -105,7 +106,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'],
@@ -134,9 +136,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);
 		}
@@ -156,9 +161,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
@@ -168,24 +177,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 categories without explicit 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
@@ -194,16 +216,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];
@@ -216,9 +243,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;
@@ -228,11 +259,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 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'],
@@ -240,22 +274,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(common::grab_owner_name($account_id)) == strtoupper($record[$field])) {
+					if($account_id && strtoupper(common::grab_owner_name($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],
@@ -273,29 +316,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() ));
 							}
@@ -306,13 +364,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;
 	}
@@ -324,9 +390,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' :
@@ -334,7 +402,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']);
 				}
@@ -342,36 +411,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'])
+				{
 					egw_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'])
+					{
 						egw_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'];
 					}
@@ -382,21 +460,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 = egw_link::link('timesheet',$id,$app,$app_id);
 			}
 		}
@@ -408,7 +495,8 @@ 
 	 *
 	 * @return string name
 	 */
-	public static function get_name() {
+	public static function get_name()
+	{
 		return lang('Timesheet CSV import');
 	}
 
@@ -417,7 +505,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. ");
 	}
 
@@ -426,7 +515,8 @@ 
 	 *
 	 * @return string suffix (comma seperated)
 	 */
-	public static function get_filesuffix() {
+	public static function get_filesuffix()
+	{
 		return 'csv';
 	}
 
@@ -442,7 +532,8 @@ 
 	 * 		preserv		=> array,
 	 * )
 	 */
-	public function get_options_etpl() {
+	public function get_options_etpl()
+	{
 		// lets do it!
 	}
 
@@ -451,7 +542,8 @@ 
 	 *
 	 * @return string etemplate name
 	 */
-	public function get_selectors_etpl() {
+	public function get_selectors_etpl()
+	{
 		// lets do it!
 	}
 
@@ -463,7 +555,8 @@ 
         *       record_# => warning message
         *       )
         */
-        public function get_warnings() {
+        public function get_warnings()
+        {
 		return $this->warnings;
 	}
 
@@ -475,7 +568,8 @@ 
         *       record_# => error message
         *       )
         */
-        public function get_errors() {
+        public function get_errors()
+        {
 		return $this->errors;
 	}
 
@@ -487,13 +581,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;
@@ -503,28 +599,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)

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

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

Spacing +162 added lines, -163 removed lines

@@ -49,10 +49,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_new('timesheet.edit');
 		if (!is_array($content))
@@ -74,20 +74,19 @@ 
 			{
 				$this->data = array(
 					'ts_start' => $this->today,
-					'start_time' => '',	// force empty start-time
-					'end_time' => egw_time::to($this->now,'H:i'),
+					'start_time' => '', // force empty start-time
+					'end_time' => egw_time::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');
 			}
@@ -100,7 +99,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');
 				}
@@ -114,29 +113,29 @@ 
 			{
 				//$content['ts_start'] += $content['start_time'];
 				$start = new egw_time($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 egw_time($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]=".egw_time::to($content['ts_start'])."</p>\n";
 			}
 			if ($content['ts_duration'] > 0) unset($content['end_time']);
@@ -146,18 +145,18 @@ 
 			$referer = $content['referer'];
 			$content['ts_project_blur'] = $content['pm_id'] ? egw_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(EGW_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'] = '';
@@ -175,14 +174,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'];
 					}
@@ -193,9 +192,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']);
@@ -204,26 +203,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'])
 						{
-							egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],'projectmanager',$this->data['pm_id']);
+							egw_link::link(TIMESHEET_APP, $content['link_to']['to_id'], 'projectmanager', $this->data['pm_id']);
 						}
 						if ($this->data['old_pm_id'])
 						{
-							egw_link::unlink2(0,TIMESHEET_APP,$content['link_to']['to_id'],0,'projectmanager',$this->data['old_pm_id']);
+							egw_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')
 							{
@@ -244,26 +243,26 @@ 
 						$msg = lang('Entry saved');
 						if (is_array($content['link_to']['to_id']) && count($content['link_to']['to_id']))
 						{
-							egw_link::link(TIMESHEET_APP,$this->data['ts_id'],$content['link_to']['to_id']);
+							egw_link::link(TIMESHEET_APP, $this->data['ts_id'], $content['link_to']['to_id']);
 						}
 					}
 					egw_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(egw_link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.egw_link::VFS_APPNAME) as $link)
+							foreach (egw_link::get_links(TIMESHEET_APP, $this->data['ts_id'], '!'.egw_link::VFS_APPNAME) as $link)
 							{
-								egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
+								egw_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]);
 						}
@@ -283,7 +282,7 @@ 
 						else
 						{
 							$msg = lang('Error deleting the entry!!!');
-							break;	// dont close window
+							break; // dont close window
 						}
 					}
 					// fall-through for save
@@ -296,7 +295,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'],
@@ -304,8 +303,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),
@@ -315,10 +314,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)
 					{
@@ -326,33 +325,33 @@ 
 							$links[] = $link_id;
 							// fall-through;
 						default:
-							if(!$n)
+							if (!$n)
 							{
 								// get title from first linked app
-								$preserv['ts_title_blur'] = egw_link::title($link_app,$link_id);
+								$preserv['ts_title_blur'] = egw_link::title($link_app, $link_id);
 								// ask first linked app via "timesheet_set" hook, for further data to set, incl. links
-								if (($set = $GLOBALS['egw']->hooks->single(array('location'=>'timesheet_set','id'=>$link_id),$link_app)))
+								if (($set = $GLOBALS['egw']->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])) egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$l_app,$l_id);
+										if (($l_id = $set['link_id'][$i])) egw_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;
 					}
-					egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link_app,$link_id);
+					egw_link::link(TIMESHEET_APP, $content['link_to']['to_id'], $link_app, $link_id);
 				}
 			}
 		}
 		elseif ($this->data['ts_id'])
 		{
-			$links = egw_link::get_links(TIMESHEET_APP,$this->data['ts_id'],'projectmanager');
+			$links = egw_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);
@@ -395,7 +394,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;
 			}
@@ -411,9 +410,9 @@ 
 		{
 			$edit_grants[$content['ts_owner']] = common::grab_owner_name($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';
 		}
@@ -423,19 +422,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);
 	}
 
 	/**
@@ -448,7 +447,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));
 	}
 
 	/**
@@ -462,17 +461,17 @@ 
 	 * @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;
 		if ($query_in['filter'])
 		{
-			$date_filter = $this->date_filter($query_in['filter'],$query_in['startdate'],$query_in['enddate']);
+			$date_filter = $this->date_filter($query_in['filter'], $query_in['startdate'], $query_in['enddate']);
 
 			if ($query_in['startdate'])
 			{
-				$start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60));
-				$end   = explode('-',date('Y-m-d',$query_in['enddate'] ? $query_in['enddate'] : $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', $query_in['enddate'] ? $query_in['enddate'] : $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)
@@ -480,42 +479,42 @@ 
 					$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';
 				}
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP, $query_in);
 
 		// 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
 
-		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']);
@@ -542,10 +541,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 = egw_link::get_links($app,$id,'timesheet')))
+			list($app, $id) = explode(':', $query['col_filter']['linked']);
+			if (!($links = egw_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'])
@@ -553,9 +552,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;
 			}
 		}
@@ -579,13 +578,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
@@ -608,7 +607,7 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.common::grab_owner_name($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
 		{
@@ -621,51 +620,51 @@ 
 			// 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'] .= ': ' . common::show_date($query['startdate']+12*60*60,$df,false);
+				$GLOBALS['egw_info']['flags']['app_header'] .= ': '.common::show_date($query['startdate'] + 12 * 60 * 60, $df, false);
 				if ($start != $end)
 				{
-					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.common::show_date($query['enddate']+12*60*60,$df,false);
+					$GLOBALS['egw_info']['flags']['app_header'] .= ' - '.common::show_date($query['enddate'] + 12 * 60 * 60, $df, false);
 				}
 			}
 		}
-		$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 = egw_link::get_links_multiple(TIMESHEET_APP,$ids,true,'projectmanager');	// only check for pm links!
+		$links3 = egw_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))
 		{
@@ -685,14 +684,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']);
@@ -700,23 +699,23 @@ 
 				// 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'])).' '.common::show_date($row['ts_start'],
-						$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
+						$row['ts_title'] = lang('Sum %1:', lang(date('l', $row['ts_start'])).' '.common::show_date($row['ts_start'],
+						$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], false));
 						$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;
 				}
@@ -726,11 +725,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(EGW_ACL_EDIT,$row))
+			if (!$this->check_acl(EGW_ACL_EDIT, $row))
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
@@ -738,21 +737,21 @@ 
 			{
 				$row['class'] .= ' rowNoEdit ';
 			}
-			if (!$this->check_acl(EGW_ACL_DELETE,$row))
+			if (!$this->check_acl(EGW_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')
 					{
@@ -763,26 +762,26 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if (!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
 
 		}
 		if (!$have_cats || $query['cat_id']) $rows['no_cat_id'] = true;
 		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;
 		if ($query['filter'])
 		{
 			$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']);
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'], 'ts_quantity') === false) $rows['no_ts_quantity'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'], 'ts_unitprice') === false) $rows['no_ts_unitprice'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'], 'ts_total') === false) $rows['no_ts_total'] = 1;
 		}
 		$rows['no_ts_status'] = strpos($query['selectcols'], 'ts_status') === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -796,7 +795,7 @@ 
 	 * @param array $content
 	 * @param string $msg
 	 */
-	function index($content = null,$msg='')
+	function index($content = null, $msg = '')
 	{
 		$etpl = new etemplate_new('timesheet.index');
 
@@ -833,26 +832,26 @@ 
 			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);
 				}
 			}
 		}
 
 		$content = array(
-			'nm' => $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP),
+			'nm' => $GLOBALS['egw']->session->appsession('index', TIMESHEET_APP),
 			'msg' => $msg,
 		);
 		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;
 			}
@@ -861,9 +860,9 @@ 
 			$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'
 				'header_left'    => 'timesheet.index.dates',
 				'header_row'     => 'timesheet.index.add',
 				'filter_onchange' => "app.timesheet.filter_change();",
@@ -872,13 +871,13 @@ 
 				'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,
 			);
 		}
 		$content['nm']['actions'] = $this->get_actions($content['nm']);
 
-		if($_GET['search'])
+		if ($_GET['search'])
 		{
 			$content['nm']['search'] = $_GET['search'];
 		}
@@ -889,25 +888,25 @@ 
 			'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'  => $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);
 	}
 
 	/**
@@ -926,7 +925,7 @@ 
 				'allowOnMultiple' => false,
 				'url' => 'menuaction=timesheet.timesheet_ui.edit&ts_id=$id',
 				'popup' => egw_link::get_registry('timesheet', 'add_popup'),
-				'group' => $group=1,
+				'group' => $group = 1,
 				'disableClass' => 'th',
 			),
 /*
@@ -954,7 +953,7 @@ 
 				'group' => $group,
 			),
 			'cat' => etemplate_widget_nextmatch::category_action(
-				'timesheet',++$group,'Change category','cat_'
+				'timesheet', ++$group, 'Change category', 'cat_'
 			),
 			'status' => array(
 				'icon' => 'apply',
@@ -1006,7 +1005,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'])
 			{
@@ -1029,27 +1028,27 @@ 
 	 * @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)
 		{
 			// get the whole selection
-			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession($session_name,'timesheet');
+			$query = is_array($session_name) ? $session_name : $GLOBALS['egw']->session->appsession($session_name, 'timesheet');
 
 			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
@@ -1058,11 +1057,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))
 					{
@@ -1075,10 +1074,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++;
 					}
@@ -1089,10 +1088,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++;
 					}
@@ -1105,10 +1104,10 @@ 
 			case 'cat':
 				$cat_name = 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++;
 					}
@@ -1136,7 +1135,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;
@@ -1147,13 +1146,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'] !== ''))
@@ -1167,7 +1166,7 @@ 
 					}
 					if ($need_update)
 					{
-						config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+						config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 						$this->config_data = config::read(TIMESHEET_APP);
 						$this->load_statuses();
 						$msg .= lang('Status updated.');
@@ -1184,7 +1183,7 @@ 
 			if (isset($this->status_labels_config[$id]))
 			{
 				unset($this->status_labels_config[$id]);
-				config::save_value('status_labels',$this->status_labels_config,TIMESHEET_APP);
+				config::save_value('status_labels', $this->status_labels_config, TIMESHEET_APP);
 				unset($this->status_labels[$id]);
 				$msg .= lang('Status deleted.');
 			}
@@ -1193,12 +1192,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);
 		}
@@ -1210,6 +1209,6 @@ 
 		$preserv = $content;
 		$sel_options['parent'] = $this->status_labels;
 		$etpl = new etemplate_new('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 +179 added lines, -45 removed lines

@@ -57,7 +57,10 @@ 
 		$etpl = new etemplate_new('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'])
 			{
@@ -110,23 +113,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 egw_time($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 egw_time($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)
 				{
@@ -134,12 +146,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]=".egw_time::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'];
@@ -153,7 +171,10 @@ 
 			switch($button)
 			{
 				case 'edit':
-					if ($this->check_acl(EGW_ACL_EDIT) && !$only_admin_edit) $view = false;
+					if ($this->check_acl(EGW_ACL_EDIT) && !$only_admin_edit)
+					{
+						$view = false;
+					}
 					break;
 
 				case 'undelete':
@@ -167,12 +188,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 !!!'));
@@ -204,7 +228,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'])
@@ -248,14 +276,20 @@ 
 						}
 					}
 					egw_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(egw_link::get_links(TIMESHEET_APP,$this->data['ts_id'],'!'.egw_link::VFS_APPNAME) as $link)
 							{
 								egw_link::link(TIMESHEET_APP,$content['link_to']['to_id'],$link['app'],$link['id'],$link['remark']);
@@ -318,12 +352,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)
@@ -335,8 +372,14 @@ 
 								{
 									foreach((array)$set['link_app'] as $i => $l_app)
 									{
-										if (($l_id=$set['link_id'][$i])) egw_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]))
+										{
+											egw_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']);
@@ -432,8 +475,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);
 	}
@@ -446,7 +497,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));
 	}
@@ -486,7 +540,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;
@@ -508,15 +565,24 @@ 
 			}
 		}
 		//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
-		if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		if (!$id_only && !$query_in['csv_export'])
+		{
+			$GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
+		}
 
 		// Refresh actions (undelete needs this)
 		$query_in['actions'] = $this->get_actions($query_in);
 
 		$query = $query_in;	// keep the original query
 
-		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>';
@@ -529,8 +595,14 @@ 
 		{
 			//$query['col_filter']['ts_id'] = egw_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')
 		{
@@ -594,10 +666,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']);
@@ -608,7 +683,10 @@ 
 			$GLOBALS['egw_info']['flags']['app_header'] .= ': '.common::grab_owner_name($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
 		{
@@ -621,10 +699,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];
@@ -657,7 +738,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)
 		{
@@ -687,12 +771,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)
+			{
+				// 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']);
@@ -721,7 +812,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;
@@ -763,13 +857,25 @@ 
 				}
 			}
 
-			if(!$row['titleClass']) $row['titleClass'] = 'timesheet_titleDetails';
+			if(!$row['titleClass'])
+			{
+				$row['titleClass'] = 'timesheet_titleDetails';
+			}
 
 		}
-		if (!$have_cats || $query['cat_id']) $rows['no_cat_id'] = true;
-		if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
+		if (!$have_cats || $query['cat_id'])
+		{
+			$rows['no_cat_id'] = true;
+		}
+		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;
+		}
 		if ($query['filter'])
 		{
 			$rows += $this->summary;
@@ -780,9 +886,18 @@ 
 		{
 			#_debug_array($query['selectcols']);
 			#ts_quantity,ts_unitprice,ts_total
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false) $rows['no_ts_quantity'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false) $rows['no_ts_unitprice'] = 1;
-			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false) $rows['no_ts_total'] = 1;
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_quantity')===false)
+			{
+				$rows['no_ts_quantity'] = 1;
+			}
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_unitprice')===false)
+			{
+				$rows['no_ts_unitprice'] = 1;
+			}
+			if ($query['selectcols'] && strpos($query['selectcols'],'ts_total')===false)
+			{
+				$rows['no_ts_total'] = 1;
+			}
 		}
 		$rows['no_ts_status'] = strpos($query['selectcols'], 'ts_status') === false && !$this->config_data['history'] ||
 			$query['no_status'];
@@ -800,7 +915,10 @@ 
 	{
 		$etpl = new etemplate_new('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']);
@@ -813,9 +931,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);
 		}
@@ -884,7 +1005,10 @@ 
 		}
 		$read_grants = $this->grant_list(EGW_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')),
@@ -901,7 +1025,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'));
 		}
 
@@ -1105,7 +1232,8 @@ 
 			case 'cat':
 				$cat_name = 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)
@@ -1120,7 +1248,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);
@@ -1172,7 +1303,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');

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

@@ -34,7 +34,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 egw_digest_auth::autocreate_session_callback($account);
 }
@@ -45,8 +45,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_server::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_server::REALM as autoloading and include path not yet setup!
 	)
 );
 require_once('phpgwapi/inc/class.egw_digest_auth.inc.php');