EGroupware / egroupware

timesheet/inc/class.timesheet_wizard_export_csv.inc.php

Spacing +1 added lines, -1 removed lines

@@ -47,7 +47,7 @@
                 );
 
 		$custom = Api\Storage\Customfields::get('resources', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->mapping_fields['#'.$name] = $data['label'];
 		}
 

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class infolog_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -27,7 +28,8 @@ 
 		// Custom fields
 		unset($this->export_fields['custom']); // Heading, not a real field
 		$custom = Api\Storage\Customfields::get('infolog', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

timesheet/inc/class.timesheet_hooks.inc.php

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(

Spacing +18 added lines, -18 removed lines

@@ -12,7 +12,7 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 /**
@@ -56,7 +56,7 @@ 
 			'add_id'     => 'link_id',
 			'add_popup'  => '600x425',
 			'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,
 		);
@@ -72,10 +72,10 @@ 
 	 */
 	static function cumulate($param)
 	{
-		$links = egw_link::get_3links(TIMESHEET_APP,'projectmanager',$param['pm_id']);
+		$links = egw_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'],
@@ -107,37 +107,37 @@ 
 			display_sidebox($appname, lang('Favorites'), egw_framework::favorite_list($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(egw_link::get_registry($appname, 'entry'))),
+					'text' => lang('Add %1', lang(egw_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.uiconfig.index&appname=' . $appname),
-				'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.uiconfig.index&appname='.$appname),
+				'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);
 			}
 		}
 	}
@@ -170,9 +170,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(',',bo_merge::get_file_extensions()),
+					lang('The following document-types are supported:').implode(',', bo_merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,
@@ -183,8 +183,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(',',bo_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(',', bo_merge::get_file_extensions()),
 				'run_lang' => false,
 				'xmlrpc' => True,
 				'admin'  => False,

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

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

Spacing +24 added lines, -24 removed lines

@@ -67,23 +67,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;
@@ -96,14 +96,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 = solink::get_links('timesheet',$id,'projectmanager');
-		if($links)
+		$links = solink::get_links('timesheet', $id, 'projectmanager');
+		if ($links)
 		{
 			$record->pm_id = current($links);
 		}
@@ -111,15 +111,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);
 		}
@@ -128,25 +128,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;
 	}
@@ -166,11 +166,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++;
@@ -182,7 +182,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";
 		}
@@ -190,7 +190,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>';
@@ -199,7 +199,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'),

notifications/inc/class.notifications_iface.inc.php

Braces +2 added lines, -1 removed lines

@@ -12,7 +12,8 @@
 /**
  * Instant user notification
  */
-interface notifications_iface {
+interface notifications_iface
+{
 
 	/**
 	 * constructor

notifications/inc/class.notifications_popup.inc.php

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

@@ -106,7 +106,7 @@
 		// Check access log to see if user is still logged in
 		if ( !Api\Session::notifications_active($this->recipient->account_id) )
 		{
-			throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
+			throw new Exception("user {$this->recipient->account_lid} isn't online. Can't send notification via popup");
 		}
 
 		$message = 	$this->render_infos($_subject)

Doc Comments +3 added lines, -5 removed lines

@@ -117,7 +117,6 @@ 
 	 * saves notification into database so that the client can fetch it from there
 	 *
 	 * @param string $_message
-	 * @param array $_user_sessions
 	 */
 	private function save( $_message ) {
 		$result = $this->db->insert( self::_notification_table, array(
@@ -179,9 +178,8 @@ 
 	 * returns javascript to open a popup window: window.open(...)
 	 *
 	 * @param string $link link or this.href
-	 * @param string $target='_blank' name of target or this.target
-	 * @param int $width=750 width of the window
-	 * @param int $height=400 height of the window
+	 * @param int $width width of the window
+	 * @param int $height height of the window
 	 * @return string javascript (using single quotes)
 	 */
 	private function jspopup($link,$target='_blank',$width=750,$height=410)
@@ -202,7 +200,7 @@ 
 	 * renders additional infos from sender and subject
 	 *
 	 * @param string $_subject
-	 * @return html rendered info as complete string
+	 * @return string rendered info as complete string
 	 */
 	private function render_infos($_subject = false) {
 		$infos = array();

Spacing +27 added lines, -27 removed lines

@@ -81,8 +81,8 @@ 
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
 		//error_log(__METHOD__."(".array2string($_sender).', '.array2string($_recipient).', '.array2string($config).',...)');
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -100,17 +100,17 @@ 
 	 */
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) {
 		// Check access log to see if user is still logged in
-		if ( !egw_session::notifications_active($this->recipient->account_id) )
+		if (!egw_session::notifications_active($this->recipient->account_id))
 		{
 			throw new Exception("User {$this->recipient->account_lid} isn't online. Can't send notification via popup");
 		}
 
-		$message = 	$this->render_infos($_subject)
+		$message = $this->render_infos($_subject)
 					.html::hr()
-					.(isset($_messages['popup'])&&!empty($_messages['popup'])?$_messages['popup']:$_messages['html'])
+					.(isset($_messages['popup']) && !empty($_messages['popup']) ? $_messages['popup'] : $_messages['html'])
 					.$this->render_links($_links);
 
-		$this->save( $message );
+		$this->save($message);
 	}
 
 	/**
@@ -119,12 +119,12 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function save( $_message ) {
-		$result = $this->db->insert( self::_notification_table, array(
+	private function save($_message) {
+		$result = $this->db->insert(self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
-			), false,__LINE__,__FILE__,self::_appname);
+			), false, __LINE__, __FILE__, self::_appname);
 		if ($result === false) throw new Exception("Can't save notification into SQL table");
 	}
 
@@ -136,25 +136,25 @@ 
 	 * @return html rendered link(s) as complete string with jspopup or a new window
 	 */
 	private function render_links($_links = false) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+		if (!is_array($_links) || count($_links) == 0) { return false; }
 		$newline = "<br />";
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if(!$link->popup) { $link->view['no_popup'] = 1; }
+		foreach ($_links as $link) {
+			if (!$link->popup) { $link->view['no_popup'] = 1; }
 
 			$url = html::link('/index.php', $link->view);
 			// do not expose sensitive data
-			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$url);
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', $url);
 			// extract application-icon from menuaction
-			if($link->view['menuaction']) {
-				$menuaction_arr = explode('.',$link->view['menuaction']);
+			if ($link->view['menuaction']) {
+				$menuaction_arr = explode('.', $link->view['menuaction']);
 				$application = $menuaction_arr[0];
-				$image = $application ? html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
+				$image = $application ? html::image($application, 'navbar', $link->text, 'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
 			} else {
 				$image = '';
 			}
-			if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
+			if ($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
 			{
 				$dimensions = explode('x', $link->popup);
 				$data = array(
@@ -164,14 +164,14 @@ 
 					"data-popup = '{$link->popup}'"
 				);
 
-				$rendered_links[] = html::div($image.$link->text,implode(' ',$data),'link');
+				$rendered_links[] = html::div($image.$link->text, implode(' ', $data), 'link');
 			} else {
-				$rendered_links[] = html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>','','link');
+				$rendered_links[] = html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>', '', 'link');
 			}
 
 		}
-		if(count($rendered_links) > 0) {
-			return html::hr().html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
+		if (count($rendered_links) > 0) {
+			return html::hr().html::bold(lang('Linked entries:')).$newline.implode($newline, $rendered_links);
 		}
 	}
 
@@ -184,9 +184,9 @@ 
 	 * @param int $height=400 height of the window
 	 * @return string javascript (using single quotes)
 	 */
-	private function jspopup($link,$target='_blank',$width=750,$height=410)
+	private function jspopup($link, $target = '_blank', $width = 750, $height = 410)
 	{
-		if($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
+		if ($GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
 		{
 			return 'window.open('.($link == 'this.href' ? $link : "'".$link."'").','.
 				($target == 'this.target' ? $target : "'".$target."'").",$width,$height,'yes')";
@@ -210,8 +210,8 @@ 
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = html::bold($_subject); }
-		return implode($newline,$infos);
+		if (!empty($_subject)) { $infos[] = html::bold($_subject); }
+		return implode($newline, $infos);
 	}
 
 	/**
@@ -220,8 +220,8 @@ 
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
 	public static function deleteaccount($settings) {
-		$GLOBALS['egw']->db->delete( self::_notification_table, array(
+		$GLOBALS['egw']->db->delete(self::_notification_table, array(
 			'account_id'	=> $settings['account_id']
-		),__LINE__,__FILE__,self::_appname);
+		), __LINE__, __FILE__, self::_appname);
 	}
 }

Braces +45 added lines, -18 removed lines

@@ -19,7 +19,8 @@ 
  * out the table to look if there is a notificaton for this
  * client. The second stage is done in class.notifications_ajax.inc.php
  */
-class notifications_popup implements notifications_iface {
+class notifications_popup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -79,10 +80,15 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
 		//error_log(__METHOD__."(".array2string($_sender).', '.array2string($_recipient).', '.array2string($config).',...)');
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
 		$this->config = $_config;
@@ -98,7 +104,8 @@ 
 	 * @param array $_links
 	 * @param array $_attachments
 	 */
-	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false) {
+	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false)
+	{
 		// Check access log to see if user is still logged in
 		if ( !egw_session::notifications_active($this->recipient->account_id) )
 		{
@@ -119,13 +126,17 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function save( $_message ) {
+	private function save( $_message )
+	{
 		$result = $this->db->insert( self::_notification_table, array(
 			'account_id'     => $this->recipient->account_id,
 			'notify_message' => $_message,
 			'notify_type'	 => self::_type
 			), false,__LINE__,__FILE__,self::_appname);
-		if ($result === false) throw new Exception("Can't save notification into SQL table");
+		if ($result === false)
+		{
+			throw new Exception("Can't save notification into SQL table");
+		}
 	}
 
 	/**
@@ -135,23 +146,32 @@ 
 	 * @param array $_links
 	 * @return html rendered link(s) as complete string with jspopup or a new window
 	 */
-	private function render_links($_links = false) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+	private function render_links($_links = false)
+	{
+		if(!is_array($_links) || count($_links) == 0)
+		{
+return false; }
 		$newline = "<br />";
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if(!$link->popup) { $link->view['no_popup'] = 1; }
+		foreach($_links as $link)
+		{
+			if(!$link->popup)
+			{
+$link->view['no_popup'] = 1; }
 
 			$url = html::link('/index.php', $link->view);
 			// do not expose sensitive data
 			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',$url);
 			// extract application-icon from menuaction
-			if($link->view['menuaction']) {
+			if($link->view['menuaction'])
+			{
 				$menuaction_arr = explode('.',$link->view['menuaction']);
 				$application = $menuaction_arr[0];
 				$image = $application ? html::image($application,'navbar',$link->text,'align="middle" style="width: 24px; margin-right: 0.5em;"') : '';
-			} else {
+			}
+			else
+			{
 				$image = '';
 			}
 			if($link->popup && !$GLOBALS['egw_info']['user']['preferences']['notifications']['external_mailclient'])
@@ -165,12 +185,15 @@ 
 				);
 
 				$rendered_links[] = html::div($image.$link->text,implode(' ',$data),'link');
-			} else {
+			}
+			else
+			{
 				$rendered_links[] = html::div('<a href="'.$url.'" target="_blank">'.$image.$link->text.'</a>','','link');
 			}
 
 		}
-		if(count($rendered_links) > 0) {
+		if(count($rendered_links) > 0)
+		{
 			return html::hr().html::bold(lang('Linked entries:')).$newline.implode($newline,$rendered_links);
 		}
 	}
@@ -204,13 +227,16 @@ 
 	 * @param string $_subject
 	 * @return html rendered info as complete string
 	 */
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$infos = array();
 		$newline = "<br />";
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = html::bold($_subject); }
+		if(!empty($_subject))
+		{
+$infos[] = html::bold($_subject); }
 		return implode($newline,$infos);
 	}
 
@@ -219,7 +245,8 @@ 
 	 *
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
-	public static function deleteaccount($settings) {
+	public static function deleteaccount($settings)
+	{
 		$GLOBALS['egw']->db->delete( self::_notification_table, array(
 			'account_id'	=> $settings['account_id']
 		),__LINE__,__FILE__,self::_appname);

notifications/inc/class.notifications_ajax.inc.php

Braces +21 added lines, -10 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * Ajax methods for notifications
  */
-class notifications_ajax {
+class notifications_ajax
+{
 	/**
 	 * Appname
 	 */
@@ -91,7 +92,8 @@ 
 	 * constructor
 	 *
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->response = Api\Json\Response::get();
 		$this->recipient = (object)$GLOBALS['egw']->accounts->read($GLOBALS['egw_info']['user']['account_id']);
 
@@ -153,15 +155,18 @@ 
 	 *
 	 * @return boolean true or false
 	 */
-	private function get_egwpopup($browserNotify = false) {
+	private function get_egwpopup($browserNotify = false)
+	{
 		$message = '';
 		$rs = $this->db->select(self::_notification_table, '*', array(
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
 			),
 			__LINE__,__FILE__,false,'',self::_appname);
-		if ($rs->NumRows() > 0)	{
-			foreach ($rs as $notification) {
+		if ($rs->NumRows() > 0)
+		{
+			foreach ($rs as $notification)
+			{
 				$message = null;
 				if($browserNotify)
 				{
@@ -179,7 +184,8 @@ 
 				$this->response->apply('app.notifications.append',array($notification['notify_id'],$notification['notify_message'],$message3));
 			}
 
-			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
+			switch($this->preferences[self::_appname]['egwpopup_verbosity'])
+			{
 				case 'low':
 					$this->response->apply('app.notifications.bell', array('active'));
 					break;
@@ -201,11 +207,15 @@ 
 	 *
 	 * @return boolean true
 	 */
-	private function restore_session_data() {
+	private function restore_session_data()
+	{
 		$session_data = $GLOBALS['egw']->session->appsession('session_data',self::_appname);
-		if(is_array($session_data)) {
+		if(is_array($session_data))
+		{
 			$this->session_data = $session_data;
-		} else {
+		}
+		else
+		{
 			$this->session_data = $this->session_data_defaults;
 		}
 
@@ -217,7 +227,8 @@ 
 	 *
 	 * @return boolean true
 	 */
-	private function save_session_data() {
+	private function save_session_data()
+	{
 		$GLOBALS['egw']->session->appsession('session_data',self::_appname,$this->session_data);
 		return true;
 	}

Spacing +13 added lines, -13 removed lines

@@ -138,11 +138,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);
 		}
 	}
 
@@ -157,27 +157,27 @@ 
 				'account_id' => $this->recipient->account_id,
 				'notify_type' => self::_type
 			),
-			__LINE__,__FILE__,false,'',self::_appname);
-		if ($rs->NumRows() > 0)	{
+			__LINE__, __FILE__, false, '', self::_appname);
+		if ($rs->NumRows() > 0) {
 			foreach ($rs as $notification) {
 				$message = null;
-				if($browserNotify)
+				if ($browserNotify)
 				{
 					$message = $notification['notify_message'];
 
 					// Check for a link - doesn't work in notification
-					if(strpos($message, lang('Linked entries:')))
+					if (strpos($message, lang('Linked entries:')))
 					{
 						$message = substr_replace($message, '', strpos($message, lang('Linked entries:')));
 					}
-					$message = preg_replace('#</?a[^>]*>#is','',$message);
+					$message = preg_replace('#</?a[^>]*>#is', '', $message);
 
-					$message = 'data:text/html;charset=' . translation::charset() .';base64,'.base64_encode($message);
+					$message = 'data:text/html;charset='.translation::charset().';base64,'.base64_encode($message);
 				}
-				$this->response->apply('app.notifications.append',array($notification['notify_id'],$notification['notify_message'],$message));
+				$this->response->apply('app.notifications.append', array($notification['notify_id'], $notification['notify_message'], $message));
 			}
 
-			switch($this->preferences[self::_appname]['egwpopup_verbosity']) {
+			switch ($this->preferences[self::_appname]['egwpopup_verbosity']) {
 				case 'low':
 					$this->response->apply('app.notifications.bell', array('active'));
 					break;
@@ -200,8 +200,8 @@ 
 	 * @return boolean true
 	 */
 	private function restore_session_data() {
-		$session_data = $GLOBALS['egw']->session->appsession('session_data',self::_appname);
-		if(is_array($session_data)) {
+		$session_data = $GLOBALS['egw']->session->appsession('session_data', self::_appname);
+		if (is_array($session_data)) {
 			$this->session_data = $session_data;
 		} else {
 			$this->session_data = $this->session_data_defaults;
@@ -216,7 +216,7 @@ 
 	 * @return boolean true
 	 */
 	private function save_session_data() {
-		$GLOBALS['egw']->session->appsession('session_data',self::_appname,$this->session_data);
+		$GLOBALS['egw']->session->appsession('session_data', self::_appname, $this->session_data);
 		return true;
 	}
 }

mail/inc/class.mail_hooks.inc.php

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

@@ -373,7 +373,7 @@ 
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
 			$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 
-		$file = Array(
+		$file = array(
 			'Site Configuration' => Egw::link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>'mail')),
 		);
 		display_section($appname,$title,$file);
@@ -465,7 +465,7 @@ 
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] && !Api\Header\UserAgent::mobile())
 		{
-			$file = Array(
+			$file = array(
 				'Site Configuration' => Egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
 			);
 			display_sidebox($appname,lang('Admin'),$file);

Indentation +14 added lines, -14 removed lines

@@ -65,14 +65,14 @@ 
 	}
 
 	/**
-     * Hook called by link-class to include mail in the appregistry of the linkage
-     *
-     * @param array/string $location location and other parameters (not used)
-     * @return array with method-names
-     */
-    static function search_link($location)
-    {
-        return array(
+	 * Hook called by link-class to include mail in the appregistry of the linkage
+	 *
+	 * @param array/string $location location and other parameters (not used)
+	 * @return array with method-names
+	 */
+	static function search_link($location)
+	{
+		return array(
 			'view'  => array(
 				'menuaction' => 'mail.mail_ui.displayMessage',
 			),
@@ -101,8 +101,8 @@ 
 			),
 			'entry' => 'Mail',
 			'entries' => 'Mails',
-        );
-    }
+		);
+	}
 
 	/**
 	 * Settings hook
@@ -239,10 +239,10 @@ 
 		);
 
 		$templateOptions = array_merge(
-		    array(
-		        'none' => lang("Don't use template folder")
-		    ),
-		    $folderList
+			array(
+				'none' => lang("Don't use template folder")
+			),
+			$folderList
 		);
 
 		// modify folderlist, add a none entry, to be able to force the regarding settings, if no folders apply

Spacing +49 added lines, -49 removed lines

@@ -32,7 +32,7 @@ 
 
 			if (true /* ToDo check ACL available */ || $account['acc_imap_type'] == 'managementserver_imap')
 			{
-				$actions[] = array (
+				$actions[] = array(
 					'id' => 'mail_acl',
 					'caption' => 'Folder ACL',
 					'icon' => 'lock',
@@ -47,7 +47,7 @@ 
 			}
 			if ($account['acc_sieve_enabled'] || $account['acc_imap_type'] == 'managementserver_imap')
 			{
-				$actions[] = array (
+				$actions[] = array(
 					'id' => 'mail_vacation',
 					'caption' => 'Vacation notice',
 					'icon' => 'mail/navbar',
@@ -140,7 +140,7 @@ 
 			'0' => lang('no'),
 			'1' => lang('yes')
 		);
-		$no_yes_copy = array_merge($no_yes,array('2'=>lang('yes, offer copy option')));
+		$no_yes_copy = array_merge($no_yes, array('2'=>lang('yes, offer copy option')));
 
  		$prefAllowManageFolders = $no_yes;
 
@@ -161,12 +161,12 @@ 
 
 		$trustServersUnseenOptions = array_merge(
 			$no_yes,
-			array('2' => lang('yes') . ' - ' . lang('but check shared folders'))
+			array('2' => lang('yes').' - '.lang('but check shared folders'))
 		);
 
 		$selectOptions = array_merge(
 			$no_yes,
-			array('2' => lang('yes') . ' - ' . lang('small view'))
+			array('2' => lang('yes').' - '.lang('small view'))
  		);
 		$newWindowOptions = array(
 			'1' => lang('only one window'),
@@ -206,12 +206,12 @@ 
 			'always_display'	=> lang('always show html emails'),
 		);
 		$toggle = false;
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] == 'EGW_SELECTMODE_TOGGLE') $toggle=true;
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] == 'EGW_SELECTMODE_TOGGLE') $toggle = true;
 		$rowOrderStyle = array(
 			'mail'	=> lang('mail'),
 			'outlook'	=> 'Outlook',
-			'mail_wCB' => lang('mail').' '.($toggle?lang('(select mails by clicking on the line, like a checkbox)'):lang('(with checkbox enforced)')),
-			'outlook_wCB'	=> 'Outlook'.' '.($toggle?lang('(select mails by clicking on the line, like a checkbox)'):lang('(with checkbox enforced)')),
+			'mail_wCB' => lang('mail').' '.($toggle ? lang('(select mails by clicking on the line, like a checkbox)') : lang('(with checkbox enforced)')),
+			'outlook_wCB'	=> 'Outlook'.' '.($toggle ? lang('(select mails by clicking on the line, like a checkbox)') : lang('(with checkbox enforced)')),
 		);
 
 		// otherwise we get warnings during setup
@@ -439,9 +439,9 @@ 
 			$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 
 		$file = Array(
-			'Site Configuration' => egw::link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>'mail')),
+			'Site Configuration' => egw::link('/index.php', array('menuaction'=>'admin.uiconfig.index', 'appname'=>'mail')),
 		);
-		display_section($appname,$title,$file);
+		display_section($appname, $title, $file);
 	}
 
 	/**
@@ -455,7 +455,7 @@ 
 		// always show the side bar
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
 		$appname = 'mail';
-		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'] . ' '. lang('Menu');
+		$menu_title = $GLOBALS['egw_info']['apps'][$appname]['title'].' '.lang('Menu');
 /*
 		$file = array();
 		$profileID = 0;
@@ -490,7 +490,7 @@ 
 			}
 		}
 */
-		$file=array();
+		$file = array();
 		// Destination div for folder tree
 		$file[] = array(
 			'no_lang' => true,
@@ -510,7 +510,7 @@ 
 		);
 
 		$file += array(
-			'import message' => "javascript:egw_openWindowCentered2('".egw::link('/index.php', $linkData,false)."','importMessageDialog',600,100,'no','$appname');",
+			'import message' => "javascript:egw_openWindowCentered2('".egw::link('/index.php', $linkData, false)."','importMessageDialog',600,100,'no','$appname');",
 		);
 
 
@@ -518,20 +518,20 @@ 
 		if (self::access('createaccount'))
 		{
 			$file += array(
-				'create new account' => "javascript:egw_openWindowCentered2('" .
+				'create new account' => "javascript:egw_openWindowCentered2('".
 					egw::link('/index.php', array('menuaction' => 'mail.mail_wizard.add'), '').
 					"','_blank',640,480,'yes')",
 			);
 		}
 		// display them all
-		display_sidebox($appname,$menu_title,$file);
+		display_sidebox($appname, $menu_title, $file);
 
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+				'Site Configuration' => egw::link('/index.php', 'menuaction=admin.uiconfig.index&appname='.$appname),
 			);
-			display_sidebox($appname,lang('Admin'),$file);
+			display_sidebox($appname, lang('Admin'), $file);
 		}
 	}
 
@@ -543,31 +543,31 @@ 
 	static function notification_check_mailbox()
 	{
 		// should not run more often then every 3 minutes;
-		$lastRun = egw_cache::getCache(egw_cache::INSTANCE,'email','mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*24*2);
+		$lastRun = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 24 * 2);
 		$currentTime = time();
-		if (!empty($lastRun) && $lastRun>$currentTime-3*60)
+		if (!empty($lastRun) && $lastRun > $currentTime - 3 * 60)
 		{
 			//error_log(__METHOD__.__LINE__." Job should not run too often; we limit this to once every 3 Minutes :". ($currentTime-$lastRun). " Seconds to go!");
 			return true;
 		}
-		$accountsToSearchObj = emailadmin_account::search($only_current_user=true, $just_name=true);
+		$accountsToSearchObj = emailadmin_account::search($only_current_user = true, $just_name = true);
 
-		foreach($accountsToSearchObj as $acc_id => $identity_name)
+		foreach ($accountsToSearchObj as $acc_id => $identity_name)
 		{
 			//error_log(__METHOD__.__LINE__.' '.$acc_id.':'.$identity_name);
-			$folders2notify[$acc_id] = emailadmin_notifications::read($acc_id);// read all, even those set for acc_id 0 (folders for all acounts?)
-			$accountsToSearchArray[$acc_id] = str_replace(array('<','>'),array('[',']'),$identity_name);
+			$folders2notify[$acc_id] = emailadmin_notifications::read($acc_id); // read all, even those set for acc_id 0 (folders for all acounts?)
+			$accountsToSearchArray[$acc_id] = str_replace(array('<', '>'), array('[', ']'), $identity_name);
 		}
-		$notified_mail_uidsCache = egw_cache::getCache(egw_cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*24*2);
+		$notified_mail_uidsCache = egw_cache::getCache(egw_cache::INSTANCE, 'email', 'notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']), null, array(), $expiration = 60 * 60 * 24 * 2);
 		//error_log(__METHOD__.__LINE__.array2string($notified_mail_uidsCache));
 		if (!is_array($folders2notify)) return true;
 		foreach ($folders2notify as $nFKey =>$notifyfolders)
 		{
 			try
 			{
-				$currentRecipient = (object)$GLOBALS['egw']->accounts->read(($notifyfolders['notify_account_id']?$notifyfolders['notify_account_id']:$GLOBALS['egw_info']['user']['account_id']));
+				$currentRecipient = (object)$GLOBALS['egw']->accounts->read(($notifyfolders['notify_account_id'] ? $notifyfolders['notify_account_id'] : $GLOBALS['egw_info']['user']['account_id']));
 				$notify_folders = $notifyfolders['notify_folders'];
-				if(count($notify_folders) == 0) {
+				if (count($notify_folders) == 0) {
 					continue; //no folders configured for notifying
 				}
 				//error_log(__METHOD__.__LINE__.' '.$nFKey.' =>'.array2string($notifyfolders));
@@ -575,14 +575,14 @@ 
 				//error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') Active Profile:'.$activeProfile);
 				try
 				{
-					$bomail = mail_bo::getInstance(false, $activeProfile,false);
+					$bomail = mail_bo::getInstance(false, $activeProfile, false);
 				} catch (Exception $e)
 				{
 					error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') notification for Profile:'.$activeProfile.' failed.'.$e->getMessage());
 					continue; //fail silently
 				}
 				//error_log(__METHOD__.__LINE__.' '.$nFKey.' =>'.array2string($bomail->icServer->params));
-				$icServerParams=$bomail->icServer->params;
+				$icServerParams = $bomail->icServer->params;
 				if (empty($icServerParams['acc_imap_host']))
 				{
 					error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') notification for Profile:'.$activeProfile.' failed: NO IMAP HOST configured!');
@@ -603,42 +603,42 @@ 
 				//$notified_mail_uidsCache = array();
 				$recent_messages = array();
 				$folder_status = array();
-				foreach($notify_folders as $id=>$notify_folder) {
+				foreach ($notify_folders as $id=>$notify_folder) {
 					if (empty($notify_folder)) continue;
-					if(!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+					if (!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder])) {
 						$notified_mail_uidsCache[$activeProfile][$notify_folder] = array();
 					}
 					$folder_status[$notify_folder] = $bomail->getFolderStatus($notify_folder);
 					$cutoffdate = time();
-					$cutoffdate = $cutoffdate - (60*60*24*14); // last 14 days
-					$_filter = array('status'=>array('UNSEEN','UNDELETED'),'type'=>"SINCE",'string'=> date("d-M-Y", $cutoffdate));
+					$cutoffdate = $cutoffdate - (60 * 60 * 24 * 14); // last 14 days
+					$_filter = array('status'=>array('UNSEEN', 'UNDELETED'), 'type'=>"SINCE", 'string'=> date("d-M-Y", $cutoffdate));
 					//error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') Mailbox:'.$notify_folder.' filter:'.array2string($_filter));
 					// $_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true
-					$headers = $bomail->getHeaders($notify_folder, 1, 999, 0, true, $_filter,null,false);
-					if(is_array($headers['header']) && count($headers['header']) > 0) {
-						foreach($headers['header'] as $id=>$header) {
+					$headers = $bomail->getHeaders($notify_folder, 1, 999, 0, true, $_filter, null, false);
+					if (is_array($headers['header']) && count($headers['header']) > 0) {
+						foreach ($headers['header'] as $id=>$header) {
 							//error_log(__METHOD__.__LINE__.' Found Message:'.$header['uid'].' Subject:'.$header['subject']);
 							// check if unseen mail has already been notified
-							$headerrowid = mail_ui::generateRowID($activeProfile, $notify_folder, $header['uid'], $_prependApp=false);
-						 	if(!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+							$headerrowid = mail_ui::generateRowID($activeProfile, $notify_folder, $header['uid'], $_prependApp = false);
+						 	if (!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder])) {
 						 		// got a REAL recent message
 						 		$header['folder'] = $notify_folder;
 						 		$header['folder_display_name'] = $folder_status[$notify_folder]['displayName'];
-						 		$header['folder_base64'] =  base64_encode($notify_folder);
+						 		$header['folder_base64'] = base64_encode($notify_folder);
 						 		$recent_messages[] = $header;
 						 	}
 						}
 					}
 				}
 				//error_log(__METHOD__.__LINE__.' Found Messages for Profile'.$activeProfile.':'.array2string($recent_messages).'<->'.array2string($notified_mail_uidsCache[$activeProfile]));
-				if(count($recent_messages) > 0) {
+				if (count($recent_messages) > 0) {
 					// create notify message
 					$notification_subject = lang("You've got new mail").':'.$accountsToSearchArray[$activeProfile];
 					$values = array();
 					$values[] = array(); // content array starts at index 1
-					foreach($recent_messages as $id=>$recent_message) {
+					foreach ($recent_messages as $id=>$recent_message) {
 						//error_log(__METHOD__.__LINE__.' Found Message for Profile '.$activeProfile.':'.array2string($recent_message));
-						$values[] =	array(
+						$values[] = array(
 							'mail_uid'				=> $recent_message['uid'],
 							'mail_folder' 			=> $recent_message['folder_display_name'],
 							'mail_folder_base64' 	=> $recent_message['folder_base64'],
@@ -647,7 +647,7 @@ 
 							'mail_received'			=> $recent_message['date'],
 						);
 						// save notification status
-						$notified_mail_uidsCache[$activeProfile][$recent_message['folder']][] = mail_ui::generateRowID($activeProfile, $recent_message['folder'], $recent_message['uid'], $_prependApp=false);
+						$notified_mail_uidsCache[$activeProfile][$recent_message['folder']][] = mail_ui::generateRowID($activeProfile, $recent_message['folder'], $recent_message['uid'], $_prependApp = false);
 					}
 					// create etemplate
 					$tpl = new etemplate('mail.checkmailbox');
@@ -663,13 +663,13 @@ 
 					$notification->set_skip_backends(array('email'));
 					$notification->send();
 				}
-				egw_cache::setCache(egw_cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),$notified_mail_uidsCache, $expiration=60*60*24*2);
+				egw_cache::setCache(egw_cache::INSTANCE, 'email', 'notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']), $notified_mail_uidsCache, $expiration = 60 * 60 * 24 * 2);
 			} catch (Exception $e) {
 				// fail silently per server, if possible
 				error_log(__METHOD__.__LINE__.' Notification on new messages for Profile '.$activeProfile.' ('.$accountsToSearchArray[$activeProfile].') failed:'.$e->getMessage());
 			}
 		}
-		egw_cache::setCache(egw_cache::INSTANCE,'email','mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']),time(), $expiration=60*60*24*2);
+		egw_cache::setCache(egw_cache::INSTANCE, 'email', 'mailNotifyLastRun'.trim($GLOBALS['egw_info']['user']['account_id']), time(), $expiration = 60 * 60 * 24 * 2);
 		//error_log(__METHOD__.__LINE__.array2string($notified_mail_uidsCache));
 		return true;
 	}
@@ -685,7 +685,7 @@ 
 	{
 		if (substr($name, 0, 5) != 'deny_')
 		{
-			if ($name == 'edit_user') return;	// to ease upgrade, as hook is removed
+			if ($name == 'edit_user') return; // to ease upgrade, as hook is removed
 			throw new egw_exception_wrong_parameter("No method $name!");
 		}
 		$accountsel = new uiaccountsel();
@@ -705,21 +705,21 @@ 
 	 */
 	public static function access($feature)
 	{
-		static $config=null;
+		static $config = null;
 		if ($GLOBALS['egw_info']['user']['apps']['admin'] || $GLOBALS['egw_info']['user']['apps']['emailadmin'])
 		{
-			return true;	// allways give admins or emailadmins all rights, even if they are in a denied group
+			return true; // allways give admins or emailadmins all rights, even if they are in a denied group
 		}
 		if (!isset($config)) $config = (array)config::read('mail');
 		//error_log(__METHOD__.__LINE__.' '.$feature.':'.array2string($config['deny_'.$feature]));
 		if (!empty($config['deny_'.$feature]))
 		{
 			//error_log(__METHOD__.__LINE__.' feature:'.$feature.':'.array2string($config['deny_'.$feature]));
-			$denied_groups = (is_array($config['deny_'.$feature])?$config['deny_'.$feature]:explode(',', $config['deny_'.$feature]));
+			$denied_groups = (is_array($config['deny_'.$feature]) ? $config['deny_'.$feature] : explode(',', $config['deny_'.$feature]));
 			//error_log(__METHOD__.__LINE__.array2string($GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)));
 			//error_log(__METHOD__.__LINE__.array2string(array_intersect($denied_groups, $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true))));
 			// since access asks positively, the stored deny_$feature must return false if we find the denied group in the users membership-list
-			return (array_intersect($denied_groups, $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true))?false:true);
+			return (array_intersect($denied_groups, $GLOBALS['egw']->accounts->memberships($GLOBALS['egw_info']['user']['account_id'], true)) ? false : true);
 		}
 		return true;
 	}

Braces +65 added lines, -22 removed lines

@@ -112,13 +112,18 @@ 
 	static function settings($hook_data)
 	{
 		unset($GLOBALS['egw_info']['user']['preferences']['common']['auto_hide_sidebox']);
-		if (!$hook_data['setup'])	// does not work on setup time
+		if (!$hook_data['setup'])
+		{
+			// does not work on setup time
 		{
 			$folderList = array();
+		}
 
 			$profileID = 0;
 			if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
-				$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			{
+							$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			}
 
 			$mailConfig = config::read('mail');
 		}
@@ -206,7 +211,10 @@ 
 			'always_display'	=> lang('always show html emails'),
 		);
 		$toggle = false;
-		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] == 'EGW_SELECTMODE_TOGGLE') $toggle=true;
+		if ($GLOBALS['egw_info']['user']['preferences']['common']['select_mode'] == 'EGW_SELECTMODE_TOGGLE')
+		{
+			$toggle=true;
+		}
 		$rowOrderStyle = array(
 			'mail'	=> lang('mail'),
 			'outlook'	=> 'Outlook',
@@ -215,7 +223,10 @@ 
 		);
 
 		// otherwise we get warnings during setup
-		if (!is_array($folderList)) $folderList = array();
+		if (!is_array($folderList))
+		{
+			$folderList = array();
+		}
 
 		$trashOptions = array_merge(
 			array(
@@ -420,7 +431,10 @@ 
 				'default' => '0'
 			),
 		);
-		if (!$GLOBALS['egw_info']['apps']['stylite']) unset($settingsArray['attachVCardAtCompose']);
+		if (!$GLOBALS['egw_info']['apps']['stylite'])
+		{
+			unset($settingsArray['attachVCardAtCompose']);
+		}
 		return $settingsArray;
 	}
 
@@ -436,7 +450,9 @@ 
 		$title = $appname = 'mail';
 		$profileID = 0;
 		if (isset($GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID']))
-			$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+		{
+					$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+		}
 
 		$file = Array(
 			'Site Configuration' => egw::link('/index.php',array('menuaction'=>'admin.uiconfig.index','appname'=>'mail')),
@@ -560,14 +576,18 @@ 
 		}
 		$notified_mail_uidsCache = egw_cache::getCache(egw_cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),null,array(),$expiration=60*60*24*2);
 		//error_log(__METHOD__.__LINE__.array2string($notified_mail_uidsCache));
-		if (!is_array($folders2notify)) return true;
+		if (!is_array($folders2notify))
+		{
+			return true;
+		}
 		foreach ($folders2notify as $nFKey =>$notifyfolders)
 		{
 			try
 			{
 				$currentRecipient = (object)$GLOBALS['egw']->accounts->read(($notifyfolders['notify_account_id']?$notifyfolders['notify_account_id']:$GLOBALS['egw_info']['user']['account_id']));
 				$notify_folders = $notifyfolders['notify_folders'];
-				if(count($notify_folders) == 0) {
+				if(count($notify_folders) == 0)
+				{
 					continue; //no folders configured for notifying
 				}
 				//error_log(__METHOD__.__LINE__.' '.$nFKey.' =>'.array2string($notifyfolders));
@@ -576,7 +596,8 @@ 
 				try
 				{
 					$bomail = mail_bo::getInstance(false, $activeProfile,false);
-				} catch (Exception $e)
+				}
+				catch (Exception $e)
 				{
 					error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') notification for Profile:'.$activeProfile.' failed.'.$e->getMessage());
 					continue; //fail silently
@@ -591,11 +612,15 @@ 
 				try
 				{
 					$bomail->openConnection($activeProfile);
-				} catch (Exception $e) {
+				}
+				catch (Exception $e) {
 					// TODO: This is ugly. Log a bit nicer!
 					$error = $e->getMessage();
 					error_log(__METHOD__.__LINE__.' # '.' (user: '.$currentRecipient->account_lid.'): cannot connect to mailbox with Profile:'.$activeProfile.'. Please check your prefs!');
-					if (!empty($error)) error_log(__METHOD__.__LINE__.' # '.$error);
+					if (!empty($error))
+					{
+						error_log(__METHOD__.__LINE__.' # '.$error);
+					}
 					error_log(__METHOD__.__LINE__.' # Instance='.$GLOBALS['egw_info']['user']['domain'].', User='.$GLOBALS['egw_info']['user']['account_lid']);
 					return false; // cannot connect to mailbox
 				}
@@ -603,9 +628,14 @@ 
 				//$notified_mail_uidsCache = array();
 				$recent_messages = array();
 				$folder_status = array();
-				foreach($notify_folders as $id=>$notify_folder) {
-					if (empty($notify_folder)) continue;
-					if(!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+				foreach($notify_folders as $id=>$notify_folder)
+				{
+					if (empty($notify_folder))
+					{
+						continue;
+					}
+					if(!is_array($notified_mail_uidsCache[$activeProfile][$notify_folder]))
+					{
 						$notified_mail_uidsCache[$activeProfile][$notify_folder] = array();
 					}
 					$folder_status[$notify_folder] = $bomail->getFolderStatus($notify_folder);
@@ -615,12 +645,15 @@ 
 					//error_log(__METHOD__.__LINE__.' (user: '.$currentRecipient->account_lid.') Mailbox:'.$notify_folder.' filter:'.array2string($_filter));
 					// $_folderName, $_startMessage, $_numberOfMessages, $_sort, $_reverse, $_filter, $_thisUIDOnly=null, $_cacheResult=true
 					$headers = $bomail->getHeaders($notify_folder, 1, 999, 0, true, $_filter,null,false);
-					if(is_array($headers['header']) && count($headers['header']) > 0) {
-						foreach($headers['header'] as $id=>$header) {
+					if(is_array($headers['header']) && count($headers['header']) > 0)
+					{
+						foreach($headers['header'] as $id=>$header)
+						{
 							//error_log(__METHOD__.__LINE__.' Found Message:'.$header['uid'].' Subject:'.$header['subject']);
 							// check if unseen mail has already been notified
 							$headerrowid = mail_ui::generateRowID($activeProfile, $notify_folder, $header['uid'], $_prependApp=false);
-						 	if(!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder])) {
+						 	if(!in_array($headerrowid, $notified_mail_uidsCache[$activeProfile][$notify_folder]))
+						 	{
 						 		// got a REAL recent message
 						 		$header['folder'] = $notify_folder;
 						 		$header['folder_display_name'] = $folder_status[$notify_folder]['displayName'];
@@ -631,12 +664,14 @@ 
 					}
 				}
 				//error_log(__METHOD__.__LINE__.' Found Messages for Profile'.$activeProfile.':'.array2string($recent_messages).'<->'.array2string($notified_mail_uidsCache[$activeProfile]));
-				if(count($recent_messages) > 0) {
+				if(count($recent_messages) > 0)
+				{
 					// create notify message
 					$notification_subject = lang("You've got new mail").':'.$accountsToSearchArray[$activeProfile];
 					$values = array();
 					$values[] = array(); // content array starts at index 1
-					foreach($recent_messages as $id=>$recent_message) {
+					foreach($recent_messages as $id=>$recent_message)
+					{
 						//error_log(__METHOD__.__LINE__.' Found Message for Profile '.$activeProfile.':'.array2string($recent_message));
 						$values[] =	array(
 							'mail_uid'				=> $recent_message['uid'],
@@ -664,7 +699,8 @@ 
 					$notification->send();
 				}
 				egw_cache::setCache(egw_cache::INSTANCE,'email','notified_mail_uids'.trim($GLOBALS['egw_info']['user']['account_id']),$notified_mail_uidsCache, $expiration=60*60*24*2);
-			} catch (Exception $e) {
+			}
+			catch (Exception $e) {
 				// fail silently per server, if possible
 				error_log(__METHOD__.__LINE__.' Notification on new messages for Profile '.$activeProfile.' ('.$accountsToSearchArray[$activeProfile].') failed:'.$e->getMessage());
 			}
@@ -685,7 +721,11 @@ 
 	{
 		if (substr($name, 0, 5) != 'deny_')
 		{
-			if ($name == 'edit_user') return;	// to ease upgrade, as hook is removed
+			if ($name == 'edit_user')
+			{
+				return;
+			}
+			// to ease upgrade, as hook is removed
 			throw new egw_exception_wrong_parameter("No method $name!");
 		}
 		$accountsel = new uiaccountsel();
@@ -710,7 +750,10 @@ 
 		{
 			return true;	// allways give admins or emailadmins all rights, even if they are in a denied group
 		}
-		if (!isset($config)) $config = (array)config::read('mail');
+		if (!isset($config))
+		{
+			$config = (array)config::read('mail');
+		}
 		//error_log(__METHOD__.__LINE__.' '.$feature.':'.array2string($config['deny_'.$feature]));
 		if (!empty($config['deny_'.$feature]))
 		{

pixelegg/stylesheet2svg.php

Braces +8 added lines, -2 removed lines

@@ -10,18 +10,24 @@
  * @version $Id$
  */
 
-if (php_sapi_name() !== 'cli') die("This is a commandline ONLY tool!\n");
+if (php_sapi_name() !== 'cli')
+{
+	die("This is a commandline ONLY tool!\n");
+}
 
 $args = $_SERVER['argv'];
 $prog = array_shift($args);
 
-if ($_SERVER['argc'] <= 1 || $prog != 'pixelegg/stylesheet2svg.php') die("
+if ($_SERVER['argc'] <= 1 || $prog != 'pixelegg/stylesheet2svg.php')
+{
+	die("
 Usage: pixelegg/stylesheet2svg [-s stylesheet|-c color] svg-image(s)
 Add an external stylesheet to an svg image and sets id of svg tag to app_image
 Examples:
 - pixelegg/stylesheet2svg -s pixelegg/less/svg.css */templates/pixelegg/images/*.svg pixelegg/images/*.svg
 - pixelegg/stylesheet2svg -c '#6e6e6e,#939393' */templates/pixelegg/images/*.svg pixelegg/images/*.svg
 \n");
+}
 
 $stylesheet = 'pixelegg/less/svg.css';
 if ($args[0] == '-s')

Spacing +2 added lines, -2 removed lines

@@ -30,7 +30,7 @@ 
 	array_shift($args);
 }
 
-foreach($args as $path)
+foreach ($args as $path)
 {
 	if (!preg_match('|^([^/]+)/.*/(.*).svg$|', $path, $matches) || !($svg = file_get_contents($path)))
 	{
@@ -56,7 +56,7 @@ 
 	array_pop($i_parts);
 	$rel_parts = $s_parts = explode('/', $stylesheet);
 
-	foreach($i_parts as $n => $i_part)
+	foreach ($i_parts as $n => $i_part)
 	{
 		if (isset($s_parts[$n]) && $s_parts[$n] === $i_part)
 		{

resources/setup/tables_update.inc.php

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

@@ -333,7 +333,7 @@
 	// Give default group all rights to this general cat
 	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
 	$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
-	$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
+	$GLOBALS['egw_setup']->add_acl('resources',"l$locations_cat_id",$defaultgroup,399);
 
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001';
 }

Spacing +111 added lines, -111 removed lines

@@ -13,7 +13,7 @@ 
 
 function resources_upgrade0_0_1_008()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture_src',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'picture_src', array(
 		'type' => 'varchar',
 		'precision' => '20'
 	));
@@ -25,7 +25,7 @@ 
 
 function resources_upgrade0_0_1_012()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','picture_thumb',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'picture_thumb', array(
 		'type' => 'blob'
 	));
 
@@ -36,49 +36,49 @@ 
 
 function resources_upgrade0_0_1_013()
 {
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11'),
-			'useable' => array('type' => 'int','precision' => '11'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11'),
+			'useable' => array('type' => 'int', 'precision' => '11'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '50'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
+			'accessories' => array('type' => 'varchar', 'precision' => '50'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
 			'picture_thumb' => array('type' => 'blob')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'picture');
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	), 'picture');
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11'),
-			'useable' => array('type' => 'int','precision' => '11'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11'),
+			'useable' => array('type' => 'int', 'precision' => '11'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '50'),
-			'picture_src' => array('type' => 'varchar','precision' => '20')
+			'accessories' => array('type' => 'varchar', 'precision' => '50'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'picture_thumb');
+	), 'picture_thumb');
 
 	$GLOBALS['setup_info']['resources']['currentver'] = '0.0.1.014';
 	return $GLOBALS['setup_info']['resources']['currentver'];
@@ -87,12 +87,12 @@ 
 
 function resources_upgrade0_0_1_014()
 {
-	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','quantity',array(
+	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources', 'quantity', array(
 		'type' => 'int',
 		'precision' => '11',
 		'default' => '1'
 	));
-	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','useable',array(
+	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources', 'useable', array(
 		'type' => 'int',
 		'precision' => '11',
 		'default' => '1'
@@ -105,16 +105,16 @@ 
 
 function resources_upgrade0_0_1_015()
 {
-	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources','accessories',array(
+	$GLOBALS['phpgw_setup']->oProc->AlterColumn('egw_resources', 'accessories', array(
 		'type' => 'varchar',
 		'precision' => '100'
 	));
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessory_only',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'accessory_only', array(
 		'type' => 'varchar',
 		'precision' => '1',
 		'default' => '0'
 	));
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','relatives',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'relatives', array(
 		'type' => 'varchar',
 		'precision' => '100'
 	));
@@ -126,70 +126,70 @@ 
 
 function resources_upgrade0_0_1_016()
 {
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '100'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
-			'relatives' => array('type' => 'varchar','precision' => '100')
+			'accessories' => array('type' => 'varchar', 'precision' => '100'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
+			'relatives' => array('type' => 'varchar', 'precision' => '100')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'accessory_only');
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	), 'accessory_only');
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'accessories' => array('type' => 'varchar','precision' => '100'),
-			'picture_src' => array('type' => 'varchar','precision' => '20')
+			'accessories' => array('type' => 'varchar', 'precision' => '100'),
+			'picture_src' => array('type' => 'varchar', 'precision' => '20')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'relatives');
-	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources',array(
+	), 'relatives');
+	$GLOBALS['phpgw_setup']->oProc->DropColumn('egw_resources', array(
 		'fd' => array(
 			'id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'picture_src' => array('type' => 'varchar','precision' => '20')
+			'picture_src' => array('type' => 'varchar', 'precision' => '20')
 		),
 		'pk' => array('id'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
-	),'accessories');
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','accessory_of',array(
+	), 'accessories');
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'accessory_of', array(
 		'type' => 'int',
 		'precision' => '11',
 		'default' => '-1'
@@ -201,22 +201,22 @@ 
 
 function resources_upgrade0_0_1_017()
 {
-	$GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources','id','res_id');
-	$GLOBALS['phpgw_setup']->oProc->RefreshTable('egw_resources',array(
+	$GLOBALS['phpgw_setup']->oProc->RenameColumn('egw_resources', 'id', 'res_id');
+	$GLOBALS['phpgw_setup']->oProc->RefreshTable('egw_resources', array(
 		'fd' => array(
 			'res_id' => array('type' => 'auto'),
-			'name' => array('type' => 'varchar','precision' => '100'),
-			'short_description' => array('type' => 'varchar','precision' => '100'),
-			'cat_id' => array('type' => 'int','precision' => '11','nullable' => False),
-			'quantity' => array('type' => 'int','precision' => '11','default' => '1'),
-			'useable' => array('type' => 'int','precision' => '11','default' => '1'),
-			'location' => array('type' => 'varchar','precision' => '100'),
-			'bookable' => array('type' => 'varchar','precision' => '1'),
-			'buyable' => array('type' => 'varchar','precision' => '1'),
-			'prize' => array('type' => 'varchar','precision' => '200'),
+			'name' => array('type' => 'varchar', 'precision' => '100'),
+			'short_description' => array('type' => 'varchar', 'precision' => '100'),
+			'cat_id' => array('type' => 'int', 'precision' => '11', 'nullable' => False),
+			'quantity' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'useable' => array('type' => 'int', 'precision' => '11', 'default' => '1'),
+			'location' => array('type' => 'varchar', 'precision' => '100'),
+			'bookable' => array('type' => 'varchar', 'precision' => '1'),
+			'buyable' => array('type' => 'varchar', 'precision' => '1'),
+			'prize' => array('type' => 'varchar', 'precision' => '200'),
 			'long_description' => array('type' => 'longtext'),
-			'picture_src' => array('type' => 'varchar','precision' => '20'),
-			'accessory_of' => array('type' => 'int','precision' => '11','default' => '-1')
+			'picture_src' => array('type' => 'varchar', 'precision' => '20'),
+			'accessory_of' => array('type' => 'int', 'precision' => '11', 'default' => '-1')
 		),
 		'pk' => array('res_id'),
 		'fk' => array(),
@@ -231,7 +231,7 @@ 
 
 function resources_upgrade0_0_1_018()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','storage_info',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'storage_info', array(
 		'type' => 'varchar',
 		'precision' => '200'
 	));
@@ -243,7 +243,7 @@ 
 
 function resources_upgrade0_0_1_019()
 {
-	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources','inventory_number',array(
+	$GLOBALS['phpgw_setup']->oProc->AddColumn('egw_resources', 'inventory_number', array(
 		'type' => 'varchar',
 		'precision' => '20'
 	));
@@ -255,14 +255,14 @@ 
 
 function resources_upgrade0_0_1_020()
 {
-	$GLOBALS['egw_setup']->oProc->CreateTable('egw_resources_extra',array(
+	$GLOBALS['egw_setup']->oProc->CreateTable('egw_resources_extra', array(
 		'fd' => array(
-			'extra_id' => array('type' => 'int','precision' => '4','nullable' => False),
-			'extra_name' => array('type' => 'varchar','precision' => '40','nullable' => False),
-			'extra_owner' => array('type' => 'int','precision' => '4','nullable' => False,'default' => '-1'),
-			'extra_value' => array('type' => 'varchar','precision' => '255','nullable' => False,'default' => '')
+			'extra_id' => array('type' => 'int', 'precision' => '4', 'nullable' => False),
+			'extra_name' => array('type' => 'varchar', 'precision' => '40', 'nullable' => False),
+			'extra_owner' => array('type' => 'int', 'precision' => '4', 'nullable' => False, 'default' => '-1'),
+			'extra_value' => array('type' => 'varchar', 'precision' => '255', 'nullable' => False, 'default' => '')
 		),
-		'pk' => array('extra_id','extra_name','extra_owner'),
+		'pk' => array('extra_id', 'extra_name', 'extra_owner'),
 		'fk' => array(),
 		'ix' => array(),
 		'uc' => array()
@@ -295,20 +295,20 @@ 
 	egw_vfs::load_wrapper('sqlfs');
 	if (egw_vfs::is_dir('/resources/pictures'))
 	{
-		egw_vfs::remove('/resources/pictures/thumbs');	// remove thumb dir incl. thumbnails
-		foreach(egw_vfs::find('sqlfs://default/resources/pictures',array('url' => true)) as $url)
+		egw_vfs::remove('/resources/pictures/thumbs'); // remove thumb dir incl. thumbnails
+		foreach (egw_vfs::find('sqlfs://default/resources/pictures', array('url' => true)) as $url)
 		{
-			if (is_numeric($id = basename($url,'.jpg')))
+			if (is_numeric($id = basename($url, '.jpg')))
 			{
 				if (!egw_vfs::is_dir($dir = "/apps/resources/$id"))
 				{
-					egw_vfs::mkdir($dir,0777,STREAM_MKDIR_RECURSIVE);
+					egw_vfs::mkdir($dir, 0777, STREAM_MKDIR_RECURSIVE);
 				}
-				rename($url,'sqlfs://default'.$dir.'/.picture.jpg');	// we need to rename on the same wrapper!
+				rename($url, 'sqlfs://default'.$dir.'/.picture.jpg'); // we need to rename on the same wrapper!
 			}
 		}
-		egw_vfs::rmdir('/resources/pictures',0);
-		egw_vfs::rmdir('/resources',0);
+		egw_vfs::rmdir('/resources/pictures', 0);
+		egw_vfs::rmdir('/resources', 0);
 	}
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.6';
 }
@@ -323,14 +323,14 @@ 
 function resources_upgrade1_8()
 {
 	// add location category required for CalDAV to distinguish between locations and resources
-	$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table,array('cat_parent' => 0, 'cat_owner' => categories::GLOBAL_ACCOUNT,'cat_access' => 'public','cat_appname' => 'resources','cat_name' => 'Locations','cat_description' => 'This category has been added by setup','last_mod' => time()),false,__LINE__,__FILE__);
-	$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table,'cat_id');
+	$GLOBALS['egw_setup']->db->insert($GLOBALS['egw_setup']->cats_table, array('cat_parent' => 0, 'cat_owner' => categories::GLOBAL_ACCOUNT, 'cat_access' => 'public', 'cat_appname' => 'resources', 'cat_name' => 'Locations', 'cat_description' => 'This category has been added by setup', 'last_mod' => time()), false, __LINE__, __FILE__);
+	$locations_cat_id = $GLOBALS['egw_setup']->db->get_last_insert_id($GLOBALS['egw_setup']->cats_table, 'cat_id');
 	config::save_value('location_cats', $locations_cat_id, 'resources');
 
 	// Give default group all rights to this general cat
-	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
-	$GLOBALS['egw_setup']->add_acl('resources','run',$defaultgroup);
-	$GLOBALS['egw_setup']->add_acl('resources',"L$locations_cat_id",$defaultgroup,399);
+	$defaultgroup = $GLOBALS['egw_setup']->add_account('Default', 'Default', 'Group', False, False);
+	$GLOBALS['egw_setup']->add_acl('resources', 'run', $defaultgroup);
+	$GLOBALS['egw_setup']->add_acl('resources', "L$locations_cat_id", $defaultgroup, 399);
 
 	return $GLOBALS['setup_info']['resources']['currentver'] = '1.9.001';
 }
@@ -338,7 +338,7 @@ 
 
 function resources_upgrade1_9_001()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','deleted',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'deleted', array(
 		'type' => 'int',
 		'precision' => '8'
 	));
@@ -355,22 +355,22 @@ 
 
 function resources_upgrade1_9_003()
 {
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_creator',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_creator', array(
 		'type' => 'int',
 		'meta' => 'user',
 		'precision' => '11'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_created',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_created', array(
 		'type' => 'int',
 		'meta' => 'timestamp',
 		'precision' => '8'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_modifier',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_modifier', array(
 		'type' => 'int',
 		'meta' => 'user',
 		'precision' => '11'
 	));
-	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources','res_modified',array(
+	$GLOBALS['egw_setup']->oProc->AddColumn('egw_resources', 'res_modified', array(
 		'type' => 'int',
 		'meta' => 'timestamp',
 		'precision' => '8'