EGroupware / egroupware

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_egw_record.inc.php

Spacing +10 added lines, -10 removed lines

@@ -26,7 +26,7 @@ 
 
 	// Used in conversions
 	static $types = array(
-		'select-account' => array('ts_owner','ts_modifier'),
+		'select-account' => array('ts_owner', 'ts_modifier'),
 		'date-time' => array('ts_start', 'ts_modified'),
 		'select-cat' => array('cat_id'),
 		'links' => array('pl_id'),
@@ -41,7 +41,7 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct($_identifier = '') {
 		$this->identifier = $_identifier;
 		$this->botimesheet = new timesheet_bo();
 		$data = $this->botimesheet->read($this->identifier);
@@ -92,7 +92,7 @@ 
 //		if (empty($this->timesheetentry)) {
 //			$this->get_record();
 //		}
-		return $this->timesheetentry['ts_project'] . ' - ' . $this->timesheetentry['ts_title'];
+		return $this->timesheetentry['ts_project'].' - '.$this->timesheetentry['ts_title'];
 	}
 
 	/**
@@ -101,12 +101,12 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record) {
 		$this->timesheetentry = $_record;
 		// Check for linked project ID
-		if($this->timesheetentry['ts_project']) {
+		if ($this->timesheetentry['ts_project']) {
 			$links = Link::get_links('timesheet', $_record['ts_id'], 'projectmanager');
-			foreach($links as $app_id) {
+			foreach ($links as $app_id) {
 				$this->timesheetentry['pm_id'] = $app_id;
 				break;
 			}
@@ -137,7 +137,7 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save($_dst_identifier) {
 		unset($_dst_identifier);
 	}
 
@@ -147,7 +147,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy($_dst_identifier) {
 		unset($_dst_identifier);
 	}
 
@@ -158,7 +158,7 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move($_dst_identifier) {
 		unset($_dst_identifier);
 	}
 
@@ -166,7 +166,7 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete() {
 
 	}
 

Braces +32 added lines, -15 removed lines

@@ -41,12 +41,16 @@ 
 	 *
 	 * @param string $_identifier
 	 */
-	public function __construct( $_identifier='' ){
+	public function __construct( $_identifier='' )
+	{
 		$this->identifier = $_identifier;
 		$this->botimesheet = new timesheet_bo();
 		$data = $this->botimesheet->read($this->identifier);
 		// set ts_project from ts_project_blur, where it get moved, if it is no custom value
-		if (empty($data['ts_project'])) $data['ts_project'] = $data['ts_project_blur'];
+		if (empty($data['ts_project']))
+		{
+			$data['ts_project'] = $data['ts_project_blur'];
+		}
 		$this->set_record($data);
 	}
 
@@ -55,7 +59,8 @@ 
 	 *
 	 * @param string $_attribute_name
 	 */
-	public function __get($_attribute_name) {
+	public function __get($_attribute_name)
+	{
 		return $this->timesheetentry[$_attribute_name];
 	}
 
@@ -65,7 +70,8 @@ 
 	 * @param string $_attribute_name
 	 * @param data $data
 	 */
-	public function __set($_attribute_name, $data) {
+	public function __set($_attribute_name, $data)
+	{
 		$this->timesheetentry[$_attribute_name] = $data;
 	}
 
@@ -77,7 +83,8 @@ 
 	 *
 	 * @return array complete record as associative array
 	 */
-	public function get_record_array() {
+	public function get_record_array()
+	{
 		return $this->timesheetentry;
 	}
 
@@ -101,12 +108,15 @@ 
 	 * @todo add some checks
 	 * @return void
 	 */
-	public function set_record(array $_record){
+	public function set_record(array $_record)
+	{
 		$this->timesheetentry = $_record;
 		// Check for linked project ID
-		if($this->timesheetentry['ts_project']) {
+		if($this->timesheetentry['ts_project'])
+		{
 			$links = Link::get_links('timesheet', $_record['ts_id'], 'projectmanager');
-			foreach($links as $app_id) {
+			foreach($links as $app_id)
+			{
 				$this->timesheetentry['pm_id'] = $app_id;
 				break;
 			}
@@ -118,7 +128,8 @@ 
 	 *
 	 * @return string identifier of current record
 	 */
-	public function get_identifier() {
+	public function get_identifier()
+	{
 		return $this->identifier;
 	}
 
@@ -128,7 +139,8 @@ 
 	 *
 	 * @return string Full URL of an icon, or appname/icon_name
 	 */
-	public function get_icon() {
+	public function get_icon()
+	{
 		return 'timesheet/navbar';
 	}
 
@@ -137,7 +149,8 @@ 
 	 *
 	 * @return string identifier
 	 */
-	public function save ( $_dst_identifier ) {
+	public function save ( $_dst_identifier )
+	{
 		unset($_dst_identifier);
 	}
 
@@ -147,7 +160,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function copy ( $_dst_identifier ) {
+	public function copy ( $_dst_identifier )
+	{
 		unset($_dst_identifier);
 	}
 
@@ -158,7 +172,8 @@ 
 	 * @param string $_dst_identifier
 	 * @return string dst_identifier
 	 */
-	public function move ( $_dst_identifier ) {
+	public function move ( $_dst_identifier )
+	{
 		unset($_dst_identifier);
 	}
 
@@ -166,7 +181,8 @@ 
 	 * delets current record from backend
 	 *
 	 */
-	public function delete () {
+	public function delete ()
+	{
 
 	}
 
@@ -174,7 +190,8 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {
+	public function __destruct()
+	{
 		unset ($this->botimesheet);
 	}
 

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;
 			}
 

timesheet/inc/class.timesheet_hooks.inc.php

Spacing +21 added lines, -21 removed lines

@@ -18,7 +18,7 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 /**
@@ -42,7 +42,7 @@ 
 	 */
 	static function search_link($location)
 	{
-		unset($location);	// not used, but required by function signature
+		unset($location); // not used, but required by function signature
 
 		return array(
 			'query' => TIMESHEET_APP.'.timesheet_bo.link_query',
@@ -64,7 +64,7 @@ 
 			'add_id'     => 'link_id',
 			'add_popup'  => '630x480',
 			'file_access'=> TIMESHEET_APP.'.timesheet_bo.file_access',
-			'file_access_user' => true,	// file_access supports 4th parameter $user
+			'file_access_user' => true, // file_access supports 4th parameter $user
 			'notify'     => TIMESHEET_APP.'.timesheet_bo.notify',
 			'merge' => true,
 		);
@@ -80,10 +80,10 @@ 
 	 */
 	static function cumulate($param)
 	{
-		$links = Link::get_3links(TIMESHEET_APP,'projectmanager',$param['pm_id']);
+		$links = Link::get_3links(TIMESHEET_APP, 'projectmanager', $param['pm_id']);
 
 		$rows = array();
-		foreach($links as $link)
+		foreach ($links as $link)
 		{
 			$rows[$link['id']] = array(
 				'pm_id'       => $link['id2'],
@@ -115,37 +115,37 @@ 
 			display_sidebox($appname, lang('Favorites'), Framework\Favorites::list_favorites($appname));
 
 			$file = array(
-				'Timesheet list' => Egw::link('/index.php',array(
+				'Timesheet list' => Egw::link('/index.php', array(
 					'menuaction' => 'timesheet.timesheet_ui.index',
 					'ajax' => 'true')),
 				array(
-					'text' => lang('Add %1',lang(Link::get_registry($appname, 'entry'))),
+					'text' => lang('Add %1', lang(Link::get_registry($appname, 'entry'))),
 					'no_lang' => true,
 					'link' => "javascript:egw.open('','$appname','add')"
 				),
 			);
-			$file['Placeholders'] = Egw::link('/index.php','menuaction=timesheet.timesheet_merge.show_replacements');
-			display_sidebox($appname,$GLOBALS['egw_info']['apps'][$appname]['title'].' '.lang('Menu'),$file);
+			$file['Placeholders'] = Egw::link('/index.php', 'menuaction=timesheet.timesheet_merge.show_replacements');
+			display_sidebox($appname, $GLOBALS['egw_info']['apps'][$appname]['title'].' '.lang('Menu'), $file);
 		}
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site Configuration' => Egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname,'&ajax=true'),
-				'Custom fields' => Egw::link('/index.php','menuaction=admin.customfields.index&appname='.$appname.'&use_private=1'),
-				'Global Categories'  => Egw::link('/index.php',array(
+				'Site Configuration' => Egw::link('/index.php', 'menuaction=admin.admin_config.index&appname='.$appname, '&ajax=true'),
+				'Custom fields' => Egw::link('/index.php', 'menuaction=admin.customfields.index&appname='.$appname.'&use_private=1'),
+				'Global Categories'  => Egw::link('/index.php', array(
 					'menuaction' => 'admin.admin_categories.index',
 					'appname'    => $appname,
 					'global_cats'=> True)),
-				'Edit Status' => Egw::link('/index.php','menuaction=timesheet.timesheet_ui.editstatus'),
+				'Edit Status' => Egw::link('/index.php', 'menuaction=timesheet.timesheet_ui.editstatus'),
 			);
 			if ($location == 'admin')
 			{
-				display_section($appname,$file);
+				display_section($appname, $file);
 			}
 			else
 			{
-				display_sidebox($appname,lang('Admin'),$file);
+				display_sidebox($appname, lang('Admin'), $file);
 			}
 		}
 	}
@@ -178,9 +178,9 @@ 
 				'size'   => 60,
 				'label'  => 'Default document to insert entries',
 				'name'   => 'default_document',
-				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.',lang('timesheet')).' '.
+				'help'   => lang('If you specify a document (full vfs path) here, %1 displays an extra document icon for each entry. That icon allows to download the specified document with the data inserted.', lang('timesheet')).' '.
 					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'ts_title').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -191,8 +191,8 @@ 
 				'label'  => 'Directory with documents to insert entries',
 				'name'   => 'document_dir',
 				'help'   => lang('If you specify a directory (full vfs path) here, %1 displays an action for each document. That action allows to download the specified document with the %1 data inserted.', lang('timesheet')).' '.
-					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.','ts_title').' '.
-					lang('The following document-types are supported:'). implode(',',Api\Storage\Merge::get_file_extensions()),
+					lang('The document can contain placeholder like {{%1}}, to be replaced with the data.', 'ts_title').' '.
+					lang('The following document-types are supported:').implode(',', Api\Storage\Merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -251,7 +251,7 @@ 
 	 */
 	public static function acl_rights($params)
 	{
-		unset($params);	// not used, but required by function signature
+		unset($params); // not used, but required by function signature
 
 		return array(
 			Acl::READ    => 'read',
@@ -268,7 +268,7 @@ 
 	 */
 	public static function categories($data)
 	{
-		unset($data);	// not used, but required by function signature
+		unset($data); // not used, but required by function signature
 
 		return true;
 	}

Braces +4 added lines, -1 removed lines

@@ -156,7 +156,10 @@
 	static function settings()
 	{
 		$settings = array();
-		if (is_null(self::$timesheet_bo)) self::$timesheet_bo = new timesheet_bo();
+		if (is_null(self::$timesheet_bo))
+		{
+			self::$timesheet_bo = new timesheet_bo();
+		}
 		if (self::$timesheet_bo->status_labels)
 		{
 			$settings['predefined_status'] = array(

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

@@ -108,7 +108,7 @@
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site configuration' => Egw::link('/index.php',array(
 					'menuaction' => 'infolog.infolog_ui.admin' )),
 				'Global Categories'  => Egw::link('/index.php',array(

timesheet/inc/class.timesheet_tracking.inc.php

Spacing +5 added lines, -5 removed lines

@@ -73,8 +73,8 @@ 
 
 		//set fields for tracking
 		$this->field2history = array_keys($this->bo->db_cols);
-		$this->field2history = array_diff(array_combine($this->field2history,$this->field2history),array('ts_modified'));
-		$this->field2history += array('customfields'   => '#c');	// to display old customfield data in history
+		$this->field2history = array_diff(array_combine($this->field2history, $this->field2history), array('ts_modified'));
+		$this->field2history += array('customfields'   => '#c'); // to display old customfield data in history
 
 		// custom fields are now handled by parent::__construct('tracker')
 		parent::__construct('timesheet');
@@ -91,7 +91,7 @@ 
 	 * @param array $old =null old/last state of the entry or null for a new entry
 	 * @return mixed
 	 */
-	function get_config($name,$data,$old=null)
+	function get_config($name, $data, $old = null)
 	{
 		$timesheet = $data['ts_id'];
 
@@ -109,7 +109,7 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_subject($data,$old)
+	function get_subject($data, $old)
 	{
 		return '#'.$data['ts_id'].' - '.$data['ts_title'];
 	}
@@ -121,7 +121,7 @@ 
 	 * @param array $old
 	 * @return string
 	 */
-	function get_message($data,$old)
+	function get_message($data, $old)
 	{
 		if (!$data['ts_modified'] || !$old)
 		{

timesheet/inc/class.timesheet_merge.inc.php

Spacing +24 added lines, -24 removed lines

@@ -70,23 +70,23 @@ 
 	 * @param string &$content=null content to create some replacements only if they are use
 	 * @return array|boolean
 	 */
-	protected function get_replacements($id,&$content=null)
+	protected function get_replacements($id, &$content = null)
 	{
 		if (!($replacements = $this->timesheet_replacements($id, '', $content)))
 		{
 			return false;
 		}
-		if (!(strpos($content,'$$ts_project/') === false))
+		if (!(strpos($content, '$$ts_project/') === false))
 		{
 			// Check to see if it's actually a project, then load
-			if($replacements['$$pm_id$$'])
+			if ($replacements['$$pm_id$$'])
 			{
-				if(!$this->pm)
+				if (!$this->pm)
 				{
 					$this->pm = new projectmanager_merge();
 				}
 				$this->pm->projectmanager_bo = new projectmanager_bo($replacements['$$pm_id$$']);
-				$replacements += $this->pm->projectmanager_replacements($replacements['$$pm_id$$'],'ts_project');
+				$replacements += $this->pm->projectmanager_replacements($replacements['$$pm_id$$'], 'ts_project');
 			}
 		}
 		return $replacements;
@@ -99,14 +99,14 @@ 
 	 * @param string $prefix='' prefix like eg. 'erole'
 	 * @return array|boolean
 	 */
-	public function timesheet_replacements($id,$prefix='', &$content = null)
+	public function timesheet_replacements($id, $prefix = '', &$content = null)
 	{
 		$record = new timesheet_egw_record($id);
 		$info = array();
 
 		// Get project manager ID
-		$links = Link\Storage::get_links('timesheet',$id,'projectmanager');
-		if($links)
+		$links = Link\Storage::get_links('timesheet', $id, 'projectmanager');
+		if ($links)
 		{
 			$record->pm_id = current($links);
 		}
@@ -114,15 +114,15 @@ 
 		// Convert to human friendly values
 		$types = timesheet_egw_record::$types;
 		$_selects = array('status' => $this->bo->status_labels);
-		foreach($_selects['status'] as &$status)
+		foreach ($_selects['status'] as &$status)
 		{
 			$status = str_replace(' ', '', $status);
 		}
-		foreach($_selects as $name => $value)
+		foreach ($_selects as $name => $value)
 		{
 			$selects['ts_'.$name] = $value;
 		}
-		if($content && strpos($content, '#') !== 0)
+		if ($content && strpos($content, '#') !== 0)
 		{
 			$this->cf_link_to_expand($record->get_record_array(), $content, $info);
 		}
@@ -131,25 +131,25 @@ 
 
 		$array = $record->get_record_array();
 		$array['ts_total'] = $array['ts_quantity'] * $array['ts_unitprice'];
-		foreach(array('ts_duration','ts_quantity','ts_unitprice','ts_total') as $key)
+		foreach (array('ts_duration', 'ts_quantity', 'ts_unitprice', 'ts_total') as $key)
 		{
-			$array[$key] = self::number_format($array[$key],2,$this->mimetype);
+			$array[$key] = self::number_format($array[$key], 2, $this->mimetype);
 		}
 
 		// Set any missing custom fields, or the marker will stay
-		foreach(array_keys($this->bo->customfields) as $name)
+		foreach (array_keys($this->bo->customfields) as $name)
 		{
-			if(!$array['#'.$name]) $array['#'.$name] = '';
+			if (!$array['#'.$name]) $array['#'.$name] = '';
 		}
 
 		// Links
 		$array += $this->get_all_links('timesheet', $id, $prefix, $content);
 
 		// Add markers
-		foreach($array as $key => &$value)
+		foreach ($array as $key => &$value)
 		{
-			if(!$value) $value = '';
-			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
+			if (!$value) $value = '';
+			$info['$$'.($prefix ? $prefix.'/' : '').$key.'$$'] = $value;
 		}
 		return $info;
 	}
@@ -169,11 +169,11 @@ 
 
 		$n = 0;
 		$fields = array('ts_id' => lang('Timesheet ID')) + $this->bo->field2label + array('ts_total' => lang('total'));
-		foreach($fields as $name => $label)
+		foreach ($fields as $name => $label)
 		{
-			if (in_array($name,array('pl_id','customfields'))) continue;	// dont show them
+			if (in_array($name, array('pl_id', 'customfields'))) continue; // dont show them
 
-			if (in_array($name,array('ts_title', 'ts_description')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name, array('ts_title', 'ts_description')) && $n&1)		// main values, which should be in the first column
 			{
 				echo "</tr>\n";
 				$n++;
@@ -185,7 +185,7 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('Custom fields').":</h3></td></tr>";
-		foreach($this->bo->customfields as $name => $field)
+		foreach ($this->bo->customfields as $name => $field)
 		{
 			echo '<tr><td>{{#'.$name.'}}</td><td colspan="3">'.$field['label']."</td></tr>\n";
 		}
@@ -193,7 +193,7 @@ 
 		echo '<tr><td colspan="4"><h3>'.lang('Project fields').':</h3></td></tr>';
 		$pm_merge = new projectmanager_merge();
 		$i = 0;
-		foreach($pm_merge->projectmanager_fields as $name => $label)
+		foreach ($pm_merge->projectmanager_fields as $name => $label)
 		{
 			if (!($i&1)) echo '<tr>';
 			echo '<td>{{ts_project/'.$name.'}}</td><td>'.$label.'</td>';
@@ -202,7 +202,7 @@ 
 		}
 
 		echo '<tr><td colspan="4"><h3>'.lang('General fields:')."</h3></td></tr>";
-		foreach(array(
+		foreach (array(
 			'link' => lang('HTML link to the current record'),
 			'links' => lang('Titles of any entries linked to the current record, excluding attached files'),
  			'attachments' => lang('List of files linked to the current record'),

Braces +33 added lines, -8 removed lines

@@ -139,7 +139,10 @@ 
 		// Set any missing custom fields, or the marker will stay
 		foreach(array_keys($this->bo->customfields) as $name)
 		{
-			if(!$array['#'.$name]) $array['#'.$name] = '';
+			if(!$array['#'.$name])
+			{
+				$array['#'.$name] = '';
+			}
 		}
 
 		// Links
@@ -148,7 +151,10 @@ 
 		// Add markers
 		foreach($array as $key => &$value)
 		{
-			if(!$value) $value = '';
+			if(!$value)
+			{
+				$value = '';
+			}
 			$info['$$'.($prefix ? $prefix.'/':'').$key.'$$'] = $value;
 		}
 		return $info;
@@ -171,16 +177,29 @@ 
 		$fields = array('ts_id' => lang('Timesheet ID')) + $this->bo->field2label + array('ts_total' => lang('total'));
 		foreach($fields as $name => $label)
 		{
-			if (in_array($name,array('pl_id','customfields'))) continue;	// dont show them
+			if (in_array($name,array('pl_id','customfields')))
+			{
+				continue;
+			}
+			// dont show them
 
-			if (in_array($name,array('ts_title', 'ts_description')) && $n&1)		// main values, which should be in the first column
+			if (in_array($name,array('ts_title', 'ts_description')) && $n&1)
+			{
+				// main values, which should be in the first column
 			{
 				echo "</tr>\n";
+			}
 				$n++;
 			}
-			if (!($n&1)) echo '<tr>';
+			if (!($n&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{'.$name.'}}</td><td>'.lang($label).'</td>';
-			if ($n&1) echo "</tr>\n";
+			if ($n&1)
+			{
+				echo "</tr>\n";
+			}
 			$n++;
 		}
 
@@ -195,9 +214,15 @@ 
 		$i = 0;
 		foreach($pm_merge->projectmanager_fields as $name => $label)
 		{
-			if (!($i&1)) echo '<tr>';
+			if (!($i&1))
+			{
+				echo '<tr>';
+			}
 			echo '<td>{{ts_project/'.$name.'}}</td><td>'.$label.'</td>';
-			if ($i&1) echo "</tr>\n";
+			if ($i&1)
+			{
+				echo "</tr>\n";
+			}
 			$i++;
 		}
 

timesheet/index.php

Spacing +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@
 {
 	Framework::render('<p style="text-align: center; color:red; font-weight: bold;">'.
 		lang('Your database is NOT up to date (%1 vs. %2), please run %3setup%4 to update your database.',
-		$ts_version,$GLOBALS['egw_info']['apps'][TIMESHEET_APP]['version'],
-		'<a href="../setup/">','</a>')."</p>\n", null, true);
+		$ts_version, $GLOBALS['egw_info']['apps'][TIMESHEET_APP]['version'],
+		'<a href="../setup/">', '</a>')."</p>\n", null, true);
 	exit();
 }
 
-Framework::redirect_link('/index.php',array('menuaction'=>TIMESHEET_APP.'.timesheet_ui.index'));
+Framework::redirect_link('/index.php', array('menuaction'=>TIMESHEET_APP.'.timesheet_ui.index'));

notifications/download.php

Spacing +7 added lines, -7 removed lines

@@ -20,7 +20,7 @@ 
 	)
 );
 
-ini_set('zlib.output_compression',0);
+ini_set('zlib.output_compression', 0);
 include('../header.inc.php');
 
 ob_start();
@@ -28,8 +28,8 @@ 
 check_load_extension('zip', true);
 
 $document = EGW_SERVER_ROOT.'/notifications/java/full-eGwNotifier.jar';
-$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document,'.jar').'-').'.jar';
-$ret=copy($document, $archive);
+$archive = tempnam($GLOBALS['egw_info']['server']['temp_dir'], basename($document, '.jar').'-').'.jar';
+$ret = copy($document, $archive);
 error_log("copy('$document', '$archive' returned ".array2string($ret));
 $document = 'zip://'.$archive.'#'.($config_file = 'lib/conf/egwnotifier.const.xml');
 
@@ -39,7 +39,7 @@ 
 function replace_callback($matches)
 {
 	$replacement = $matches[3];
-	switch($matches[1])
+	switch ($matches[1])
 	{
 		case 'egw_dc_url':
 			$replacement = $GLOBALS['egw_info']['server']['webserver_url'];
@@ -60,7 +60,7 @@ 
 		case 'egw_debuging_level':
 			break;
 		default:
-			$replacement = lang($r=$replacement);
+			$replacement = lang($r = $replacement);
 			/* uncomment this to have missing translations add to en langfile
 			// if no translation found, check if en langfile is writable and add phrase, if not already there
 			if ($r === $replacement)
@@ -89,7 +89,7 @@ 
 
 	if (is_string($htmlscflags))
 	{
-		$htmlscflags = 16;	// #define ENT_XML1		16
+		$htmlscflags = 16; // #define ENT_XML1		16
 	}
 
 	return '<'.$matches[1].'>'.htmlspecialchars($replacement, $htmlscflags, Api\Translation::charset()).'</'.$matches[1].'>';
@@ -118,6 +118,6 @@ 
 ob_end_clean();
 
 Api\Header\Content::type('egroupware-notifier-'.$GLOBALS['egw_info']['user']['account_lid'].'.jar', 'application/x-java-archive', filesize($archive));
-readfile($archive,'rb');
+readfile($archive, 'rb');
 
 @unlink($archive);