EGroupware / egroupware

admin/inc/class.admin_wizard_import_users_csv.inc.php

Spacing +1 added lines, -1 removed lines

@@ -59,7 +59,7 @@
 	function wizard_step50(&$content, &$sel_options, &$readonlys, &$preserv)
 	{
 		$result = parent::wizard_step50($content, $sel_options, $readonlys, $preserv);
-		$content['msg'] .= "\n*" ;
+		$content['msg'] .= "\n*";
 		
 		return $result;
 	}

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

@@ -37,11 +37,11 @@
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('14.1')
+	 'versions' => array('14.1')
 );
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('14.1')
+	 'versions' => array('14.1')
 );
 
 // installation checks for importexport

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_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];

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

Spacing +19 added lines, -19 removed lines

@@ -40,7 +40,7 @@ 
 		// List each custom field
 		unset($this->mapping_fields['customfields']);
 		$custom = config::get_customfields('timesheet');
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 
@@ -70,7 +70,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')
@@ -78,13 +78,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
@@ -99,11 +99,11 @@ 
 				'~skip~' => lang('Skip record'),
 				'add' => lang('Add'),
 			);
-			$set_to = lang('Set to') . ':';
-			$categories = new categories('','timesheet');
+			$set_to = lang('Set to').':';
+			$categories = new 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,
@@ -115,8 +115,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'];
@@ -132,7 +132,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
@@ -141,13 +141,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
@@ -156,17 +156,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;
 			}
 

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

Doc Comments -6 removed lines

@@ -62,7 +62,6 @@ 
 	/**
 	 * Constructor
 	 *
-	 * @param timesheet_bo $botimesheet
 	 * @return timesheet_tracking
 	 */
 	function __construct(timesheet_bo $bo)
@@ -81,12 +80,7 @@ 
 	/**
 	 * Get a notification-config value
 	 *
-	 * @param string $what
-	 * 	- 'copy' array of email addresses notifications should be copied too, can depend on $data
-	 *  - 'lang' string lang code for copy mail
-	 *  - 'sender' string send email address
 	 * @param array $data current entry
-	 * @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)

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

notifications/setup/setup.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,7 +11,7 @@ 
 
 if (!defined('NOTIFICATION_APP'))
 {
-	define('NOTIFICATION_APP','notifications');
+	define('NOTIFICATION_APP', 'notifications');
 }
 
 $setup_info[NOTIFICATION_APP]['name']      = NOTIFICATION_APP;
@@ -25,7 +25,7 @@ 
 	'name'  => 'eGroupware coreteam',
 	'email' => 'egroupware-developers@lists.sf.net'
 );
-$setup_info[NOTIFICATION_APP]['license']  = 'GPL';
+$setup_info[NOTIFICATION_APP]['license'] = 'GPL';
 $setup_info[NOTIFICATION_APP]['description'] =
 'Instant notification of users via various channels.';
 

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

@@ -37,11 +37,11 @@
 /* Dependencies for this app to work */
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'phpgwapi',
-	 'versions' => Array('14.1')
+	 'versions' => array('14.1')
 );
 $setup_info['importexport']['depends'][] = array(
 	 'appname' => 'etemplate',
-	 'versions' => Array('14.1')
+	 'versions' => array('14.1')
 );
 
 // installation checks for importexport

notifications/setup/tables_current.inc.php

Spacing +6 added lines, -6 removed lines

@@ -12,15 +12,15 @@
 $phpgw_baseline = array(
 	'egw_notificationpopup' => array(
 		'fd' => array(
-			'notify_id' => array('type' => 'auto','nullable' => False,'comment' => 'primary key'),
-			'account_id' => array('type' => 'int','meta' => 'user','precision' => '20','nullable' => False,'comment' => 'user to notify'),
-			'notify_message' => array('type' => 'varchar','precision' => '16384','comment' => 'notification message'),
-			'notify_created' => array('type' => 'timestamp','meta' => 'timestamp','default' => 'current_timestamp','comment' => 'creation time of notification'),
-			'notify_type' => array('type' => 'ascii','precision' => '32','comment' => 'notification type')
+			'notify_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'primary key'),
+			'account_id' => array('type' => 'int', 'meta' => 'user', 'precision' => '20', 'nullable' => False, 'comment' => 'user to notify'),
+			'notify_message' => array('type' => 'varchar', 'precision' => '16384', 'comment' => 'notification message'),
+			'notify_created' => array('type' => 'timestamp', 'meta' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'creation time of notification'),
+			'notify_type' => array('type' => 'ascii', 'precision' => '32', 'comment' => 'notification type')
 		),
 		'pk' => array('notify_id'),
 		'fk' => array(),
-		'ix' => array('account_id','notify_created'),
+		'ix' => array('account_id', 'notify_created'),
 		'uc' => array()
 	)
 );