EGroupware / egroupware

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'] =

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

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

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

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.';
 

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

notifications/setup/tables_update.inc.php

Spacing +14 added lines, -14 removed lines

@@ -12,7 +12,7 @@ 
 
 function notifications_upgrade0_5()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup','account_id',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup', 'account_id', array(
 		'type' => 'int',
 		'precision' => '20',
 		'nullable' => False
@@ -41,16 +41,16 @@ 
 
 function notifications_upgrade1_8()
 {
-	$GLOBALS['egw_setup']->oProc->DropColumn('egw_notificationpopup',array(
+	$GLOBALS['egw_setup']->oProc->DropColumn('egw_notificationpopup', array(
 		'fd' => array(
-			'account_id' => array('type' => 'int','precision' => '20','nullable' => False),
+			'account_id' => array('type' => 'int', 'precision' => '20', 'nullable' => False),
 			'message' => array('type' => 'longtext')
 		),
 		'pk' => array(),
 		'fk' => array(),
 		'ix' => array('account_id'),
 		'uc' => array()
-	),'session_id');
+	), 'session_id');
 
 	return $GLOBALS['setup_info']['notifications']['currentver'] = '1.9.001';
 }
@@ -71,18 +71,18 @@ 
  */
 function notifications_upgrade1_9_002()
 {
-	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_notificationpopup',array(
+	$GLOBALS['egw_setup']->oProc->RefreshTable('egw_notificationpopup', array(
 		'fd' => array(
-			'notify_id' => array('type' => 'auto','nullable' => False,'comment' => 'primary key'),
-			'account_id' => array('type' => 'int','precision' => '20','nullable' => False,'comment' => 'user to notify'),
-			'notify_message' => array('type' => 'text','comment' => 'notification message'),
-			'notify_created' => array('type' => 'timestamp','default' => 'current_timestamp','comment' => 'creation time of notification')
+			'notify_id' => array('type' => 'auto', 'nullable' => False, 'comment' => 'primary key'),
+			'account_id' => array('type' => 'int', 'precision' => '20', 'nullable' => False, 'comment' => 'user to notify'),
+			'notify_message' => array('type' => 'text', 'comment' => 'notification message'),
+			'notify_created' => array('type' => 'timestamp', 'default' => 'current_timestamp', 'comment' => 'creation time of notification')
 		),
 		'pk' => array('notify_id'),
 		'fk' => array(),
-		'ix' => array('account_id','notify_created'),
+		'ix' => array('account_id', 'notify_created'),
 		'uc' => array()
-	),array(
+	), array(
 		'notify_message' => 'message',
 	));
 
@@ -92,7 +92,7 @@ 
 
 function notifications_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_notificationpopup','notify_type',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_notificationpopup', 'notify_type', array(
 		'type' => 'varchar',
 		'precision' => '32',
 		'comment' => 'notification type'
@@ -109,12 +109,12 @@ 
 
 function notifications_upgrade14_1()
 {
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup','notify_message',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup', 'notify_message', array(
 		'type' => 'varchar',
 		'precision' => '16384',
 		'comment' => 'notification message'
 	));
-	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup','notify_type',array(
+	$GLOBALS['egw_setup']->oProc->AlterColumn('egw_notificationpopup', 'notify_type', array(
 		'type' => 'ascii',
 		'precision' => '32',
 		'comment' => 'notification type'