EGroupware / egroupware

files/webdav.php

Spacing +6 added lines, -6 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 Api\Header\Authenticate::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::REALM as autoloading and include path not yet setup!
+		'no_exception_handler' => 'basic_auth', // we use a basic auth exception handler (sends exception message as basic auth realm)
+		'auth_realm' => 'EGroupware WebDAV server', // cant use Vfs\WebDAV::REALM as autoloading and include path not yet setup!
 	)
 );
 
@@ -74,12 +74,12 @@ 
 
 // temporary mount ownCloud default /clientsync as /home/$user, if not explicitly mounted
 // so ownCloud dir contains users home-dir by default
-if (strpos($_SERVER['REQUEST_URI'],'/webdav.php/clientsync') !== false &&
-	($fstab=Vfs::mount()) && !isset($fstab['/clientsync']))
+if (strpos($_SERVER['REQUEST_URI'], '/webdav.php/clientsync') !== false &&
+	($fstab = Vfs::mount()) && !isset($fstab['/clientsync']))
 {
 	$is_root_backup = Vfs::$is_root;
 	Vfs::$is_root = true;
-	$ok = Vfs::mount($url='vfs://default/home/$user', $clientsync='/clientsync', null, false);
+	$ok = Vfs::mount($url = 'vfs://default/home/$user', $clientsync = '/clientsync', null, false);
 	Vfs::$is_root = $is_root_backup;
 	//error_log("mounting ownCloud default '$clientsync' as '$url' ".($ok ? 'successful' : 'failed!'));
 }

Doc Comments +1 added lines, -1 removed lines

@@ -28,7 +28,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)
 {

timesheet/setup/setup.inc.php

Spacing +3 added lines, -3 removed lines

@@ -13,13 +13,13 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 $setup_info[TIMESHEET_APP]['name']      = TIMESHEET_APP;
 $setup_info[TIMESHEET_APP]['version']   = '16.1';
 $setup_info[TIMESHEET_APP]['app_order'] = 5;
-$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet','egw_timesheet_extra');
+$setup_info[TIMESHEET_APP]['tables']    = array('egw_timesheet', 'egw_timesheet_extra');
 $setup_info[TIMESHEET_APP]['enable']    = 1;
 $setup_info[TIMESHEET_APP]['index']     = 'timesheet.timesheet_ui.index&ajax=true';
 
@@ -28,7 +28,7 @@ 
 	'name'  => 'Ralf Becker',
 	'email' => 'RalfBecker@outdoor-training.de'
 );
-$setup_info[TIMESHEET_APP]['license']  = 'GPL';
+$setup_info[TIMESHEET_APP]['license'] = 'GPL';
 $setup_info[TIMESHEET_APP]['description'] =
 'Tracking times and other activities for the Projectmanager.';
 $setup_info[TIMESHEET_APP]['note'] =

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

@@ -50,5 +50,5 @@
 /* Dependencies for this app to work */
 $setup_info[TIMESHEET_APP]['depends'][] = array(
 	 'appname' => 'api',
-	 'versions' => Array('16.1')
+	 'versions' => array('16.1')
 );

timesheet/setup/tables_current.inc.php

Spacing +19 added lines, -19 removed lines

@@ -14,33 +14,33 @@
 $phpgw_baseline = array(
 	'egw_timesheet' => array(
 		'fd' => array(
-			'ts_id' => array('type' => 'auto','nullable' => False,'comment' => 'id of the timesheet entry'),
-			'ts_project' => array('type' => 'varchar','precision' => '255','comment' => 'project title'),
-			'ts_title' => array('type' => 'varchar','precision' => '255','nullable' => False,'comment' => 'title of the timesheet entry'),
-			'ts_description' => array('type' => 'varchar','precision' => '16384','comment' => 'description of the timesheet entry'),
-			'ts_start' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'timestamp of the startdate'),
-			'ts_duration' => array('type' => 'int','precision' => '8','nullable' => False,'default' => '0','comment' => 'duration of the timesheet-entry'),
-			'ts_quantity' => array('type' => 'float','precision' => '8','nullable' => False,'comment' => 'quantity'),
-			'ts_unitprice' => array('type' => 'float','precision' => '4','comment' => 'unitprice'),
-			'cat_id' => array('type' => 'int','meta' => 'category','precision' => '4','default' => '0','comment' => 'category'),
-			'ts_owner' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'owner of the timesheet'),
-			'ts_modified' => array('type' => 'int','meta' => 'timestamp','precision' => '8','nullable' => False,'comment' => 'date modified ot the timesheet'),
-			'ts_modifier' => array('type' => 'int','meta' => 'user','precision' => '4','nullable' => False,'comment' => 'account id of the last modifier'),
-			'pl_id' => array('type' => 'int','precision' => '4','default' => '0','comment' => 'id of the linked project'),
-			'ts_status' => array('type' => 'int','precision' => '4','comment' => 'status of the timesheet-entry')
+			'ts_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'id of the timesheet entry'),
+			'ts_project' => array('type' => 'varchar', 'precision' => '255', 'comment' => 'project title'),
+			'ts_title' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'comment' => 'title of the timesheet entry'),
+			'ts_description' => array('type' => 'varchar', 'precision' => '16384', 'comment' => 'description of the timesheet entry'),
+			'ts_start' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'timestamp of the startdate'),
+			'ts_duration' => array('type' => 'int', 'precision' => '8', 'nullable' => False, 'default' => '0', 'comment' => 'duration of the timesheet-entry'),
+			'ts_quantity' => array('type' => 'float', 'precision' => '8', 'nullable' => False, 'comment' => 'quantity'),
+			'ts_unitprice' => array('type' => 'float', 'precision' => '4', 'comment' => 'unitprice'),
+			'cat_id' => array('type' => 'int', 'meta' => 'category', 'precision' => '4', 'default' => '0', 'comment' => 'category'),
+			'ts_owner' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'owner of the timesheet'),
+			'ts_modified' => array('type' => 'int', 'meta' => 'timestamp', 'precision' => '8', 'nullable' => False, 'comment' => 'date modified ot the timesheet'),
+			'ts_modifier' => array('type' => 'int', 'meta' => 'user', 'precision' => '4', 'nullable' => False, 'comment' => 'account id of the last modifier'),
+			'pl_id' => array('type' => 'int', 'precision' => '4', 'default' => '0', 'comment' => 'id of the linked project'),
+			'ts_status' => array('type' => 'int', 'precision' => '4', 'comment' => 'status of the timesheet-entry')
 		),
 		'pk' => array('ts_id'),
 		'fk' => array(),
-		'ix' => array('ts_project','ts_owner','ts_status'),
+		'ix' => array('ts_project', 'ts_owner', 'ts_status'),
 		'uc' => array()
 	),
 	'egw_timesheet_extra' => array(
 		'fd' => array(
-			'ts_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'ts_extra_name' => array('type' => 'varchar','meta' => 'cfname','precision' => '32','nullable' => False),
-			'ts_extra_value' => array('type' => 'varchar','meta' => 'cfvalue','precision' => '255','nullable' => False,'default' => '')
+			'ts_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'ts_extra_name' => array('type' => 'varchar', 'meta' => 'cfname', 'precision' => '32', 'nullable' => False),
+			'ts_extra_value' => array('type' => 'varchar', 'meta' => 'cfvalue', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('ts_id','ts_extra_name'),
+		'pk' => array('ts_id', 'ts_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()

timesheet/setup/tables_update.inc.php

Spacing +12 added lines, -12 removed lines

@@ -15,7 +15,7 @@ 
 
 function timesheet_upgrade0_1_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','pl_id',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet', 'pl_id', array(
 		'type' => 'int',
 		'precision' => '4',
 		'default' => '0'
@@ -27,13 +27,13 @@ 
 
 function timesheet_upgrade0_2_001()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_timesheet_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_timesheet_extra', array(
 		'fd' => array(
-			'ts_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'ts_extra_name' => array('type' => 'varchar','precision' => '32','nullable' => False),
-			'ts_extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'ts_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'ts_extra_name' => array('type' => 'varchar', 'precision' => '32', 'nullable' => False),
+			'ts_extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('ts_id','ts_extra_name'),
+		'pk' => array('ts_id', 'ts_extra_name'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -52,7 +52,7 @@ 
 function timesheet_upgrade1_4()
 {
 	// delete empty cf's generated by 1.4
-	$GLOBALS['egw_setup']->db->delete('egw_timesheet_extra',"ts_extra_value=''",__LINE__,__FILE__,'timesheet');
+	$GLOBALS['egw_setup']->db->delete('egw_timesheet_extra', "ts_extra_value=''", __LINE__, __FILE__, 'timesheet');
 
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.6';
 }
@@ -60,12 +60,12 @@ 
 
 function timesheet_upgrade1_6()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet','ts_status',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_timesheet', 'ts_status', array(
 		'type' => 'int',
 		'precision' => '4'
 	));
 
-	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_timesheet','ts_status');
+	$GLOBALS['egw_setup']->oProc->CreateIndex('egw_timesheet', 'ts_status');
 
 	return $GLOBALS['setup_info']['timesheet']['currentver'] = '1.7.001';
 }
@@ -92,12 +92,12 @@ 
  */
 function timesheet_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_project',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_project', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'comment' => 'project title'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_title',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_title', array(
 		'type' => 'varchar',
 		'precision' => '255',
 		'nullable' => False,
@@ -108,7 +108,7 @@ 
 	// returns NULL, if there are no rows!
 	if ((int)$max_description_length <= 16384 && $GLOBALS['egw_setup']->oProc->max_varchar_length >= 16384)
 	{
-		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet','ts_description',array(
+		$GLOBALS['egw_setup']->oProc->AlterColumn('egw_timesheet', 'ts_description', array(
 			'type' => 'varchar',
 			'precision' => '16384',
 			'comment' => 'description of the timesheet entry'

timesheet/setup/default_records.inc.php

Spacing +3 added lines, -3 removed lines

@@ -9,7 +9,7 @@ 
  * @version $Id$
  */
 
-foreach(array(
+foreach (array(
 	'history'     => 'history',
 ) as $name => $value)
 {
@@ -19,10 +19,10 @@ 
 			'config_app' => 'timesheet',
 			'config_name' => $name,
 			'config_value' => $value,
-		),array(
+		), array(
 			'config_app' => 'timesheet',
 			'config_name' => $name,
-		),__LINE__,__FILE__
+		), __LINE__, __FILE__
 	);
 }
 

timesheet/inc/class.timesheet_datasource.inc.php

Spacing +5 added lines, -5 removed lines

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

timesheet/inc/class.timesheet_wizard_export_csv.inc.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		// Custom fields
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class timesheet_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -24,7 +25,8 @@ 
 		// Custom fields
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

timesheet/inc/class.timesheet_favorite_portlet.inc.php

Spacing +15 added lines, -15 removed lines

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

Braces +4 added lines, -1 removed lines

@@ -96,9 +96,12 @@
 
 		// This is just copy+pasted from timesheet_ui line 816, but we don't want
 		// the etemplate exec to fire again.
-		if (is_array($content) && isset($content['nm']['rows']['document']))  // handle insert in default document button like an action
+		if (is_array($content) && isset($content['nm']['rows']['document']))
+		{
+			// handle insert in default document button like an action
 		{
 			list($id) = @each($content['nm']['rows']['document']);
+		}
 			$content['nm']['action'] = 'document';
 			$content['nm']['selected'] = array($id);
 		}

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

@@ -23,7 +23,7 @@
 	 * Construct the portlet
 	 *
 	 */
-	public function __construct(Array &$context = array(), &$need_reload = false)
+	public function __construct(array &$context = array(), &$need_reload = false)
 	{
 		$context['appname'] = 'timesheet';
 

Doc Comments -2 removed lines

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

timesheet/inc/class.timesheet_wizard_import_csv.inc.php

Indentation +6 added lines, -6 removed lines

@@ -35,9 +35,9 @@ 
 		$this->mapping_fields = array('ts_id' => lang('Timesheet ID')) + $bo->field2label;
 
 		// These aren't in the list
-                $this->mapping_fields += array(
-                        'ts_modified'   => lang('Modified'),
-                );
+				$this->mapping_fields += array(
+						'ts_modified'   => lang('Modified'),
+				);
 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
@@ -113,9 +113,9 @@ 
 				);
 			}
 			$sel_options = array(
-                                'translate_status'	=> $options + array($set_to => $ui->status_labels),
-                                'translate_cat_id'	=> $options + array($set_to => $cat_list),
-                        );
+								'translate_status'	=> $options + array($set_to => $ui->status_labels),
+								'translate_cat_id'	=> $options + array($set_to => $cat_list),
+						);
 			$preserv = $content;
 			foreach($sel_options as $field => $options) {
 				if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];

Spacing +19 added lines, -19 removed lines

@@ -42,7 +42,7 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet');
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -72,7 +72,7 @@ 
 
 	function wizard_step45(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
 
 		// return from step45
 		if ($content['step'] == 'wizard_step45')
@@ -80,13 +80,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step45($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step45($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step45
@@ -101,11 +101,11 @@ 
 				'~skip~' => lang('Skip record'),
 				'add' => lang('Add'),
 			);
-			$set_to = lang('Set to') . ':';
-			$categories = new Api\Categories('','timesheet');
+			$set_to = lang('Set to').':';
+			$categories = new Api\Categories('', 'timesheet');
 			$cat_list = array();
-			foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat) {
-				$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
+			foreach ((array)$categories->return_sorted_array(0, False, '', '', '', true) as $cat) {
+				$s = str_repeat(' ', $cat['level']).stripslashes($cat['name']);
 
 				$cat_list[$cat['id']] = empty($cat['description']) ? $s : array(
 					'label' => $s,
@@ -117,8 +117,8 @@ 
                                 'translate_cat_id'	=> $options + array($set_to => $cat_list),
                         );
 			$preserv = $content;
-			foreach($sel_options as $field => $options) {
-				if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];
+			foreach ($sel_options as $field => $options) {
+				if (!array_key_exists($field, $content)) $content[$field] = $content['plugin_options'][$field];
 			}
 			unset ($preserv['button']);
 			return $this->step_templates['wizard_step45'];
@@ -134,7 +134,7 @@ 
 	
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if ($this->debug) error_log(__METHOD__.'->$content '.print_r($content, true));
 		unset($content['no_owner_map']);
 
 		// return from step60
@@ -143,13 +143,13 @@ 
 			switch (array_search('pressed', $content['button']))
 			{
 				case 'next':
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], 1);
 				case 'previous' :
-					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'],-1);
+					return $GLOBALS['egw']->importexport_definitions_ui->get_step($content['step'], -1);
 				case 'finish':
 					return 'wizard_finish';
 				default :
-					return $this->wizard_step60($content,$sel_options,$readonlys,$preserv);
+					return $this->wizard_step60($content, $sel_options, $readonlys, $preserv);
 			}
 		}
 		// init step60
@@ -158,17 +158,17 @@ 
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
 			$preserv = $content;
-			if(!array_key_exists($content['record_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['record_owner']) && $content['plugin_options']) {
 				$content['record_owner'] = $content['plugin_options']['record_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if (!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if (!array_key_exists($content['change_owner']) && $content['plugin_options']) {
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
-			if(!in_array('ts_owner', $content['field_mapping'])) {
+			if (!in_array('ts_owner', $content['field_mapping'])) {
 				$content['no_owner_map'] = true;
 			}
 

Braces +26 added lines, -10 removed lines

@@ -42,7 +42,8 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet');
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -72,7 +73,10 @@ 
 
 	function wizard_step45(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__.'->$content '.print_r($content,true));
+		}
 
 		// return from step45
 		if ($content['step'] == 'wizard_step45')
@@ -104,7 +108,8 @@ 
 			$set_to = lang('Set to') . ':';
 			$categories = new Api\Categories('','timesheet');
 			$cat_list = array();
-			foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat) {
+			foreach((array)$categories->return_sorted_array(0,False,'','','',true) as $cat)
+			{
 				$s = str_repeat(' ',$cat['level']) . stripslashes($cat['name']);
 
 				$cat_list[$cat['id']] = empty($cat['description']) ? $s : array(
@@ -117,8 +122,12 @@ 
                                 'translate_cat_id'	=> $options + array($set_to => $cat_list),
                         );
 			$preserv = $content;
-			foreach($sel_options as $field => $options) {
-				if(!array_key_exists($field,$content)) $content[$field] = $content['plugin_options'][$field];
+			foreach($sel_options as $field => $options)
+			{
+				if(!array_key_exists($field,$content))
+				{
+					$content[$field] = $content['plugin_options'][$field];
+				}
 			}
 			unset ($preserv['button']);
 			return $this->step_templates['wizard_step45'];
@@ -134,7 +143,10 @@ 
 	
 	function wizard_step60(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
-		if($this->debug) error_log(__METHOD__.'->$content '.print_r($content,true));
+		if($this->debug)
+		{
+			error_log(__METHOD__.'->$content '.print_r($content,true));
+		}
 		unset($content['no_owner_map']);
 
 		// return from step60
@@ -158,17 +170,21 @@ 
 			$content['msg'] = $this->steps['wizard_step60'];
 			$content['step'] = 'wizard_step60';
 			$preserv = $content;
-			if(!array_key_exists($content['record_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['record_owner']) && $content['plugin_options'])
+			{
 				$content['record_owner'] = $content['plugin_options']['record_owner'];
 			}
-			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options']) {
+			if(!array_key_exists($content['owner_from_csv']) && $content['plugin_options'])
+			{
 				$content['owner_from_csv'] = $content['plugin_options']['owner_from_csv'];
 			}
-			if(!array_key_exists($content['change_owner']) && $content['plugin_options']) {
+			if(!array_key_exists($content['change_owner']) && $content['plugin_options'])
+			{
 				$content['change_owner'] = $content['plugin_options']['change_owner'];
 			}
 
-			if(!in_array('ts_owner', $content['field_mapping'])) {
+			if(!in_array('ts_owner', $content['field_mapping']))
+			{
 				$content['no_owner_map'] = true;
 			}