EGroupware / egroupware

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

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

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

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'

notifications/inc/class.notifications_push.inc.php

Spacing +3 added lines, -3 removed lines

@@ -39,7 +39,7 @@ 
 
 	public static function get()
 	{
-		$already_send =& Api\Cache::getSession(__CLASS__, 'already_send');
+		$already_send = & Api\Cache::getSession(__CLASS__, 'already_send');
 		$max_id = Api\Cache::getInstance(__CLASS__, 'max_id');
 
 		if (!isset($already_send))
@@ -57,7 +57,7 @@ 
 		{
 			$response = Json\Response::get();
 
-			foreach(self::$db->select(self::TABLE, '*', array(
+			foreach (self::$db->select(self::TABLE, '*', array(
 				'account_id' => array(0, $GLOBALS['egw_info']['user']['account_id']),
 				'notify_type' => self::TYPE,
 				'notify_id > '.(int)$already_send,
@@ -121,7 +121,7 @@ 
 	 */
 	public static function init_static()
 	{
-		self::$db =& $GLOBALS['egw']->db;
+		self::$db = & $GLOBALS['egw']->db;
 	}
 }
 notifications_push::init_static();

notifications/inc/class.notifications_jdesk_ajax.inc.php

Spacing +6 added lines, -6 removed lines

@@ -133,11 +133,11 @@ 
 	{
 		if ($notify_id)
 		{
-			$this->db->delete(self::_notification_table,array(
+			$this->db->delete(self::_notification_table, array(
 				'notify_id' => $notify_id,
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
-			),__LINE__,__FILE__,self::_appname);
+			), __LINE__, __FILE__, self::_appname);
 		}
 	}
 
@@ -148,7 +148,7 @@ 
 	 */
 	private function get_egwpopup($browserNotify = false)
 	{
-		unset($browserNotify);	// not used
+		unset($browserNotify); // not used
 
 		$message = '';
 
@@ -156,9 +156,9 @@ 
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
 			),
-			__LINE__,__FILE__,false,'',self::_appname);
+			__LINE__, __FILE__, false, '', self::_appname);
 
-		if( $rs->NumRows() > 0 )
+		if ($rs->NumRows() > 0)
 		{
 			foreach ($rs as $notification)
 			{
@@ -170,7 +170,7 @@ 
 				$this->response->data($jmessage);
 			}
 
-			switch( $this->preferences[self::_appname]['egwpopup_verbosity'] )
+			switch ($this->preferences[self::_appname]['egwpopup_verbosity'])
 			{
 				case 'low':
 

Braces +5 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 /**
  * jdesk Json methods for notifications
  */
-class notifications_jdesk_ajax {
+class notifications_jdesk_ajax
+{
 
 	public $public_functions = array(
 		'get_notification'	=> true
@@ -92,7 +93,9 @@ 
 	 * destructor
 	 *
 	 */
-	public function __destruct() {}
+	public function __destruct()
+	{
+}
 
 	/**
 	 * public AJAX trigger function to be called by the JavaScript client

notifications/inc/hook_admin.inc.php

Spacing +2 added lines, -2 removed lines

@@ -11,9 +11,9 @@
 
 use EGroupware\Api\Egw;
 
-$file = Array(	'Site Configuration' => Egw::link('/index.php', array(
+$file = Array('Site Configuration' => Egw::link('/index.php', array(
 	'menuaction'	=> 'admin.admin_config.index',
 	'appname'		=> $appname,
 	'ajax'          => 'true',
 )));
-display_section($appname,$file);
+display_section($appname, $file);

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

@@ -11,7 +11,7 @@
 
 use EGroupware\Api\Egw;
 
-$file = Array(	'Site Configuration' => Egw::link('/index.php', array(
+$file = array(	'Site Configuration' => Egw::link('/index.php', array(
 	'menuaction'	=> 'admin.admin_config.index',
 	'appname'		=> $appname,
 	'ajax'          => 'true',