EGroupware / egroupware

timesheet/inc/class.timesheet_wizard_export_csv.inc.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 		// Custom fields
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet', true);
-		foreach($custom as $name => $data) {
+		foreach ($custom as $name => $data) {
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

Braces +4 added lines, -2 removed lines

@@ -14,7 +14,8 @@ 
 
 class timesheet_wizard_export_csv extends importexport_wizard_basic_export_csv
 {
-	public function __construct() {
+	public function __construct()
+	{
 		parent::__construct();
 
 		// Field mapping
@@ -24,7 +25,8 @@ 
 		// Custom fields
 		unset($this->export_fields['customfields']);
 		$custom = Api\Storage\Customfields::get('timesheet', true);
-		foreach($custom as $name => $data) {
+		foreach($custom as $name => $data)
+		{
 			$this->export_fields['#'.$name] = $data['label'];
 		}
 	}

timesheet/inc/class.timesheet_bo.inc.php

Indentation +2 added lines, -2 removed lines

@@ -152,8 +152,8 @@
 	const EXTRA_TABLE = 'egw_timesheet_extra';
 
 	/**
-	* Columns to search when user does a text search
-	*/
+	 * Columns to search when user does a text search
+	 */
 	var $columns_to_search = array('egw_timesheet.ts_id', 'ts_project', 'ts_title', 'ts_description', 'ts_duration', 'ts_quantity', 'ts_unitprice');
 
 	/**

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

@@ -792,7 +792,7 @@
 	 * @param array $options Array of options for the search
 	 * @return array with ts_id - title pairs of the matching entries
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query( $pattern, array &$options = array() )
 	{
 		$limit = false;
 		$need_count = false;

Braces +78 added lines, -20 removed lines

@@ -171,7 +171,10 @@ 
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 
 		// Load & process statuses
-		if($this->config_data['status_labels']) $this->load_statuses();
+		if($this->config_data['status_labels'])
+		{
+			$this->load_statuses();
+		}
 
 		$this->today = mktime(0,0,0,date('m',$this->now),date('d',$this->now),date('Y',$this->now));
 
@@ -189,12 +192,16 @@ 
 	protected function load_statuses()
 	{
 		$this->status_labels =&  $this->config_data['status_labels'];
-		if (!is_array($this->status_labels)) $this->status_labels= array($this->status_labels);
+		if (!is_array($this->status_labels))
+		{
+			$this->status_labels= array($this->status_labels);
+		}
 
 		foreach ($this->status_labels as $status_id => $label)
 		{
 			if (!is_array($label))
-			{	//old values, before parent status
+			{
+//old values, before parent status
 				$name = $label;
 				$label=array();
 				$label['name'] = $name;
@@ -242,7 +249,10 @@ 
 	 */
 	function get_sub_status($status)
 	{
-		if (!isset($this->status_labels_config)) $this->load_statuses();
+		if (!isset($this->status_labels_config))
+		{
+			$this->load_statuses();
+		}
 		$stati = array($status);
 		foreach($this->status_labels_config as $stat)
 		{
@@ -309,7 +319,10 @@ 
 	 */
 	function grant_list($required=Acl::READ, $hide_deactive=null)
 	{
-		if (!isset($hide_deactive)) $hide_deactive = $required == Acl::EDIT;
+		if (!isset($hide_deactive))
+		{
+			$hide_deactive = $required == Acl::EDIT;
+		}
 
 		$result = array();
 		foreach($this->grants as $uid => $grant)
@@ -345,9 +358,16 @@ 
 			$data = $this->read($data,true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data)
+			{
+				return null;
+			}
+			// entry not found
+		}
+		if (!$user)
+		{
+			$user = $this->user;
 		}
-		if (!$user) $user = $this->user;
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) && $data['ts_status'])
 		{
 			if ($this->status_labels_config[$data['ts_status']]['admin'])
@@ -380,9 +400,16 @@ 
 			$data = $this->read($data,true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data)
+			{
+				return null;
+			}
+			// entry not found
+		}
+		if (!$user)
+		{
+			$user = $this->user;
 		}
-		if (!$user) $user = $this->user;
 		if ($user == $this->user)
 		{
 			$grants = $this->grants;
@@ -462,7 +489,10 @@ 
 		}
 		else
 		{
-			if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
+			if (!is_array($filter['ts_owner']))
+			{
+				$filter['ts_owner'] = array($filter['ts_owner']);
+			}
 
 			foreach($filter['ts_owner'] as $key => $owner)
 			{
@@ -517,7 +547,10 @@ 
 		$this->summary = $this->summary[0];
 		$this->summary['max_modified'] = Api\DateTime::server2user($this->summary['max_modified']);
 
-		if ($only_summary) return $this->summary;
+		if ($only_summary)
+		{
+			return $this->summary;
+		}
 
 		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
@@ -593,7 +626,10 @@ 
 	 */
 	function save($keys=null,$touch_modified=true,$ignore_acl=false)
 	{
-		if ($keys) $this->data_merge($keys);
+		if ($keys)
+		{
+			$this->data_merge($keys);
+		}
 
 		if (!$ignore_acl && $this->data['ts_id'] && !$this->check_acl(Acl::EDIT))
 		{
@@ -615,10 +651,13 @@ 
 			$old =& $this->data;
 			$this->data =& $new;
 			$changed = array();
-			if (isset($old)) foreach($old as $name => $value)
+			if (isset($old))
+			{
+				foreach($old as $name => $value)
 			{
 				if (isset($new[$name]) && $new[$name] != $value) $changed[] = $name;
 			}
+			}
 		}
 		if (!$this->data['ts_created'])
 		{
@@ -750,7 +789,10 @@ 
 		}
 
 		$this->data['ts_status'] = $status;
-		if ($this->save($ts_id)!=0) $ret = false;
+		if ($this->save($ts_id)!=0)
+		{
+			$ret = false;
+		}
 
 		return $ret;
 	}
@@ -794,10 +836,13 @@ 
 			return $entry;
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if (date('H:i',$entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
+		if (date('H:i',$entry['ts_start']) != '00:00')
+		{
+			// dont show 00:00 time, as it means date only
 		{
 			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 		}
+		}
 		return date($format,$entry['ts_start']).': '.$entry['ts_title'];
 	}
 
@@ -843,14 +888,18 @@ 
 	{
 		$limit = false;
 		$need_count = false;
-		if($options['start'] || $options['num_rows']) {
+		if($options['start'] || $options['num_rows'])
+		{
 			$limit = array($options['start'], $options['num_rows']);
 			$need_count = true;
 		}
 		$result = array();
 		foreach((array) $this->search($pattern,false,'','','%',false,'OR', $limit, null, '', $need_count) as $ts )
 		{
-			if ($ts) $result[$ts['ts_id']] = $this->link_title($ts);
+			if ($ts)
+			{
+				$result[$ts['ts_id']] = $this->link_title($ts);
+			}
 		}
 		$options['total'] = $need_count ? $this->total : count($result);
 		return $result;
@@ -969,7 +1018,10 @@ 
 				//error_log(__METHOD__."() setting pm_id=$pm_id --> ".array2string($update));
 			}
 		}
-		if ($backup) $this->data = $backup;
+		if ($backup)
+		{
+			$this->data = $backup;
+		}
 	}
 
 
@@ -994,7 +1046,10 @@ 
 			$first_pm_id = null;
 			foreach(Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
 			{
-				if (!isset($first_pm_id)) $first_pm_id = $pm_id;
+				if (!isset($first_pm_id))
+				{
+					$first_pm_id = $pm_id;
+				}
 				if ($data['ts_project'] == Link::title('projectmanager', $pm_id))
 				{
 					$data['pm_id'] = $pm_id;
@@ -1003,7 +1058,10 @@ 
 					break;
 				}
 			}
-			if (!isset($data['pm_id']) && isset($first_pm_id)) $data['pm_id'] = $first_pm_id;
+			if (!isset($data['pm_id']) && isset($first_pm_id))
+			{
+				$data['pm_id'] = $first_pm_id;
+			}
 		}
 		elseif ($data['ts_id'] && $data['pm_id'] && Link::title('projectmanager', $data['pm_id']) == $data['ts_project'])
 		{

Spacing +138 added lines, -139 removed lines

@@ -16,7 +16,7 @@ 
 
 if (!defined('TIMESHEET_APP'))
 {
-	define('TIMESHEET_APP','timesheet');
+	define('TIMESHEET_APP', 'timesheet');
 }
 
 
@@ -43,7 +43,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	var $quantity_sum=false;
+	var $quantity_sum = false;
 	/**
 	 * current user
 	 *
@@ -56,7 +56,7 @@ 
 	 * @var array
 	 */
 	var $timestamps = array(
-		'ts_start','ts_created', 'ts_modified'
+		'ts_start', 'ts_created', 'ts_modified'
 	);
 	/**
 	 * Start of today in user-time
@@ -70,17 +70,17 @@ 
 	 * @var array
 	 */
 	var $date_filters = array(	// Start: year,month,day,week, End: year,month,day,week
-		'Today'       => array(0,0,0,0,  0,0,1,0),
-		'Yesterday'   => array(0,0,-1,0, 0,0,0,0),
-		'This week'   => array(0,0,0,0,  0,0,0,1),
-		'Last week'   => array(0,0,0,-1, 0,0,0,0),
-		'This month'  => array(0,0,0,0,  0,1,0,0),
-		'Last month'  => array(0,-1,0,0, 0,0,0,0),
-		'2 month ago' => array(0,-2,0,0, 0,-1,0,0),
-		'This year'   => array(0,0,0,0,  1,0,0,0),
-		'Last year'   => array(-1,0,0,0, 0,0,0,0),
-		'2 years ago' => array(-2,0,0,0, -1,0,0,0),
-		'3 years ago' => array(-3,0,0,0, -2,0,0,0),
+		'Today'       => array(0, 0, 0, 0, 0, 0, 1, 0),
+		'Yesterday'   => array(0, 0, -1, 0, 0, 0, 0, 0),
+		'This week'   => array(0, 0, 0, 0, 0, 0, 0, 1),
+		'Last week'   => array(0, 0, 0, -1, 0, 0, 0, 0),
+		'This month'  => array(0, 0, 0, 0, 0, 1, 0, 0),
+		'Last month'  => array(0, -1, 0, 0, 0, 0, 0, 0),
+		'2 month ago' => array(0, -2, 0, 0, 0, -1, 0, 0),
+		'This year'   => array(0, 0, 0, 0, 1, 0, 0, 0),
+		'Last year'   => array(-1, 0, 0, 0, 0, 0, 0, 0),
+		'2 years ago' => array(-2, 0, 0, 0, -1, 0, 0, 0),
+		'3 years ago' => array(-3, 0, 0, 0, -2, 0, 0, 0),
 	);
 	/**
 	 * Grants: $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP);
@@ -105,7 +105,7 @@ 
 	 *
 	 * @var array
 	 */
-	var $customfields=array();
+	var $customfields = array();
 	/**
 	 * Array with status label
 	 *
@@ -165,20 +165,20 @@ 
 
 	function __construct()
 	{
-		parent::__construct(TIMESHEET_APP,'egw_timesheet',self::EXTRA_TABLE,'','ts_extra_name','ts_extra_value','ts_id');
+		parent::__construct(TIMESHEET_APP, 'egw_timesheet', self::EXTRA_TABLE, '', 'ts_extra_name', 'ts_extra_value', 'ts_id');
 
 		$this->config_data = Api\Config::read(TIMESHEET_APP);
 		$this->quantity_sum = $this->config_data['quantity_sum'] == 'true';
 
 		// Load & process statuses
-		if($this->config_data['status_labels']) $this->load_statuses();
+		if ($this->config_data['status_labels']) $this->load_statuses();
 
-		$this->today = mktime(0,0,0,date('m',$this->now),date('d',$this->now),date('Y',$this->now));
+		$this->today = mktime(0, 0, 0, date('m', $this->now), date('d', $this->now), date('Y', $this->now));
 
 		// save us in $GLOBALS['timesheet_bo'] for ExecMethod used in hooks
 		if (!is_object($GLOBALS['timesheet_bo']))
 		{
-			$GLOBALS['timesheet_bo'] =& $this;
+			$GLOBALS['timesheet_bo'] = & $this;
 		}
 		$this->grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP);
 	}
@@ -188,15 +188,15 @@ 
 	 */
 	protected function load_statuses()
 	{
-		$this->status_labels =&  $this->config_data['status_labels'];
-		if (!is_array($this->status_labels)) $this->status_labels= array($this->status_labels);
+		$this->status_labels = &  $this->config_data['status_labels'];
+		if (!is_array($this->status_labels)) $this->status_labels = array($this->status_labels);
 
 		foreach ($this->status_labels as $status_id => $label)
 		{
 			if (!is_array($label))
 			{	//old values, before parent status
 				$name = $label;
-				$label=array();
+				$label = array();
 				$label['name'] = $name;
 				$label['parent'] = '';
 			}
@@ -208,12 +208,12 @@ 
 		$map = array(
 			'' => array('substatus' => array())
 		);
-		foreach($this->status_labels_config as $id => &$status)
+		foreach ($this->status_labels_config as $id => &$status)
 		{
 			$status['substatus'] = array();
 			$map[$id] = &$status;
 		}
-		foreach($this->status_labels_config as &$status)
+		foreach ($this->status_labels_config as &$status)
 		{
 			$map[$status['parent']]['substatus'][] = &$status;
 		}
@@ -225,7 +225,7 @@ 
 
 		// Sort Api\Config based on tree
 		$sorted = array();
-		foreach($this->status_labels as $status_id => $label)
+		foreach ($this->status_labels as $status_id => $label)
 		{
 			$sorted[$status_id] = $this->status_labels_config[$status_id];
 			//$sorted[$status_id]['name'] = $label;
@@ -244,7 +244,7 @@ 
 	{
 		if (!isset($this->status_labels_config)) $this->load_statuses();
 		$stati = array($status);
-		foreach($this->status_labels_config as $stat)
+		foreach ($this->status_labels_config as $stat)
 		{
 			if ($stat['parent'] && in_array($stat['parent'], $stati))
 			{
@@ -264,14 +264,14 @@ 
 	 *
 	 * @return None, labels are built in labels parameter
 	 */
-	protected function make_status_labels($statuses, &$labels, $depth=0)
+	protected function make_status_labels($statuses, &$labels, $depth = 0)
 	{
-		foreach($statuses as $status)
+		foreach ($statuses as $status)
 		{
-			$labels[$status['id']] = str_pad('',$depth*12, " ",STR_PAD_LEFT).trim(str_replace(' ','',$status['name']));
-			if(count($status['substatus']) > 0)
+			$labels[$status['id']] = str_pad('', $depth * 12, " ", STR_PAD_LEFT).trim(str_replace(' ', '', $status['name']));
+			if (count($status['substatus']) > 0)
 			{
-				$this->make_status_labels($status['substatus'], $labels, $depth+1);
+				$this->make_status_labels($status['substatus'], $labels, $depth + 1);
 			}
 		}
 	}
@@ -285,14 +285,14 @@ 
 	 */
 	protected function get_status_labels($admin = null)
 	{
-		if(is_null($admin))
+		if (is_null($admin))
 		{
 			$admin = isset($GLOBALS['egw_info']['user']['apps']['admin']);
 		}
 		$labels = array();
-		foreach($this->status_labels as $status_id => $label)
+		foreach ($this->status_labels as $status_id => $label)
 		{
-			if($admin || !$admin && !$this->status_labels_config[$status_id]['admin'])
+			if ($admin || !$admin && !$this->status_labels_config[$status_id]['admin'])
 			{
 				$labels[$status_id] = $label;
 			}
@@ -307,14 +307,14 @@ 
 	 * @param boolean $hide_deactive =null default only Acl::EDIT hides deactivates users
 	 * @return array with uid => Username pairs
 	 */
-	function grant_list($required=Acl::READ, $hide_deactive=null)
+	function grant_list($required = Acl::READ, $hide_deactive = null)
 	{
 		if (!isset($hide_deactive)) $hide_deactive = $required == Acl::EDIT;
 
 		$result = array();
-		foreach($this->grants as $uid => $grant)
+		foreach ($this->grants as $uid => $grant)
 		{
-			if ($grant & $required && (!$hide_deactive || Api\Accounts::getInstance()->is_active($uid)))
+			if ($grant&$required && (!$hide_deactive || Api\Accounts::getInstance()->is_active($uid)))
 			{
 				$result[$uid] = Api\Accounts::username($uid);
 			}
@@ -333,19 +333,19 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if the rights are ok, false if no rights
 	 */
-	function check_statusForEditRights($data=null,$user=null)
+	function check_statusForEditRights($data = null, $user = null)
 	{
 		if (is_null($data) || (int)$data == $this->data['ts_id'])
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true);
+			$data = $this->read($data, true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data) return null; // entry not found
 		}
 		if (!$user) $user = $this->user;
 		if (!isset($GLOBALS['egw_info']['user']['apps']['admin']) && $data['ts_status'])
@@ -368,19 +368,19 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if the rights are ok, null if not found, false if no rights
 	 */
-	function check_acl($required,$data=null,$user=null)
+	function check_acl($required, $data = null, $user = null)
 	{
 		if (is_null($data) || (int)$data == $this->data['ts_id'])
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		if (!is_array($data))
 		{
 			$save_data = $this->data;
-			$data = $this->read($data,true);
+			$data = $this->read($data, true);
 			$this->data = $save_data;
 
-			if (!$data) return null; 	// entry not found
+			if (!$data) return null; // entry not found
 		}
 		if (!$user) $user = $this->user;
 		if ($user == $this->user)
@@ -389,11 +389,11 @@ 
 		}
 		else
 		{
-			$grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP,true,$user);
+			$grants = $GLOBALS['egw']->acl->get_grants(TIMESHEET_APP, true, $user);
 		}
-		$ret = $data && !!($grants[$data['ts_owner']] & $required);
+		$ret = $data && !!($grants[$data['ts_owner']]&$required);
 
-		if(($required & Acl::DELETE) && $this->config_data['history'] == 'history' &&
+		if (($required&Acl::DELETE) && $this->config_data['history'] == 'history' &&
 			$data['ts_status'] == self::DELETED_STATUS)
 		{
 			$ret = !!($GLOBALS['egw_info']['user']['apps']['admin']);
@@ -410,7 +410,7 @@ 
 	 * @param int &$end
 	 * @return string
 	 */
-	function date_filter($name,&$start,&$end)
+	function date_filter($name, &$start, &$end)
 	{
 		return Api\DateTime::sql_filter($name, $start, $end, 'ts_start', $this->date_filters);
 	}
@@ -436,7 +436,7 @@ 
 	 * @param boolean $only_summary =false If true only return the sums as array with keys duration and price, default false
 	 * @return array of matching rows (the row is an array of the cols) or False
 	 */
-	function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false,$only_summary=false)
+	function &search($criteria, $only_keys = True, $order_by = '', $extra_cols = '', $wildcard = '', $empty = False, $op = 'AND', $start = false, $filter = null, $join = '', $need_full_no_count = false, $only_summary = false)
 	{
 		//error_log(__METHOD__."(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')");
 		//echo "<p>".__METHOD__."(".print_r($criteria,true).",'$only_keys','$order_by',".print_r($extra_cols,true).",'$wildcard','$empty','$op','$start',".print_r($filter,true).",'$join')</p>\n";
@@ -445,9 +445,9 @@ 
 
 		if (!is_array($extra_cols))
 		{
-			$extra_cols = $extra_cols ? explode(',',$extra_cols) : array();
+			$extra_cols = $extra_cols ? explode(',', $extra_cols) : array();
 		}
-		if ($only_keys === false || $this->show_sums && strpos($order_by,'ts_start') !== false)
+		if ($only_keys === false || $this->show_sums && strpos($order_by, 'ts_start') !== false)
 		{
 			$extra_cols[] = $total_sql.' AS ts_total';
 		}
@@ -464,7 +464,7 @@ 
 		{
 			if (!is_array($filter['ts_owner'])) $filter['ts_owner'] = array($filter['ts_owner']);
 
-			foreach($filter['ts_owner'] as $key => $owner)
+			foreach ($filter['ts_owner'] as $key => $owner)
 			{
 				if (!isset($this->grants[$owner]))
 				{
@@ -478,8 +478,8 @@ 
 		}
 		else
 		{
-			$filter[] = '(ts_status ' . ($filter['ts_status'] == self::DELETED_STATUS ? '=':'!= ') . self::DELETED_STATUS .
-				($filter['ts_status'] == self::DELETED_STATUS ? '':' OR ts_status IS NULL') . ')';
+			$filter[] = '(ts_status '.($filter['ts_status'] == self::DELETED_STATUS ? '=' : '!= ').self::DELETED_STATUS.
+				($filter['ts_status'] == self::DELETED_STATUS ? '' : ' OR ts_status IS NULL').')';
 		}
 		if (!count($filter['ts_owner']))
 		{
@@ -487,15 +487,15 @@ 
 			$this->summary = array();
 			return array();
 		}
-		if ($only_summary==false && $criteria && $this->show_sums)
+		if ($only_summary == false && $criteria && $this->show_sums)
 		{
 			// if we have a criteria AND intend to show the sums we first query the affected ids,
 			// then we throw away criteria and filter, and replace the filter with the list of ids
-			$ids = parent::search($criteria,'egw_timesheet.ts_id as id','','',$wildcard,$empty,$op,false,$filter,$join);
+			$ids = parent::search($criteria, 'egw_timesheet.ts_id as id', '', '', $wildcard, $empty, $op, false, $filter, $join);
 			//_debug_array($ids);
 			if (empty($ids))
 			{
-				$this->summary = array('duration'=>0,'price'=>null,'quantity'=>0);
+				$this->summary = array('duration'=>0, 'price'=>null, 'quantity'=>0);
 				return array();
 			}
 			unset($criteria);
@@ -519,45 +519,45 @@ 
 
 		if ($only_summary) return $this->summary;
 
-		if ($this->show_sums && strpos($order_by,'ts_start') !== false && 	// sums only make sense if ordered by ts_start
+		if ($this->show_sums && strpos($order_by, 'ts_start') !== false && // sums only make sense if ordered by ts_start
 			$this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
 		{
 			$sum_sql = array(
-				'year'  => $this->db->date_format($from_unixtime_ts_start,'%Y'),
-				'month' => $this->db->date_format($from_unixtime_ts_start,'%Y%m'),
-				'week'  => $this->db->date_format($from_unixtime_ts_start,$GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
-				'day'   => $this->db->date_format($from_unixtime_ts_start,'%Y-%m-%d'),
+				'year'  => $this->db->date_format($from_unixtime_ts_start, '%Y'),
+				'month' => $this->db->date_format($from_unixtime_ts_start, '%Y%m'),
+				'week'  => $this->db->date_format($from_unixtime_ts_start, $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
+				'day'   => $this->db->date_format($from_unixtime_ts_start, '%Y-%m-%d'),
 			);
-			foreach($this->show_sums as $type)
+			foreach ($this->show_sums as $type)
 			{
 				$extra_cols[] = $sum_sql[$type].' AS ts_'.$type;
 				$extra_cols[] = '0 AS is_sum_'.$type;
-				$sum_extra_cols[] = str_replace('ts_start','MIN(ts_start)',$sum_sql[$type]);	// as we dont group by ts_start
+				$sum_extra_cols[] = str_replace('ts_start', 'MIN(ts_start)', $sum_sql[$type]); // as we dont group by ts_start
 				$sum_extra_cols[$type] = '0 AS is_sum_'.$type;
 			}
 			// regular entries
-			parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
+			parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, 'UNION', $filter, $join, $need_full_no_count);
 
-			$sort = substr($order_by,8);
+			$sort = substr($order_by, 8);
 			$union_order = array();
-			$sum_ts_id = array('year' => -3,'month' => -2,'week' => -1,'day' => 0);
-			foreach($this->show_sums as $type)
+			$sum_ts_id = array('year' => -3, 'month' => -2, 'week' => -1, 'day' => 0);
+			foreach ($this->show_sums as $type)
 			{
-				$union_order[] = 'ts_'.$type . ' ' . $sort;
+				$union_order[] = 'ts_'.$type.' '.$sort;
 				$union_order[] = 'is_sum_'.$type;
 				$sum_extra_cols[$type]{0} = '1';
 				// the $type sum
-				parent::search($criteria,array(
-					(string)$sum_ts_id[$type],"''","''","''",'MIN(ts_start)','SUM(ts_duration) AS ts_duration',
+				parent::search($criteria, array(
+					(string)$sum_ts_id[$type], "''", "''", "''", 'MIN(ts_start)', 'SUM(ts_duration) AS ts_duration',
 					($this->quantity_sum ? "SUM(ts_quantity) AS ts_quantity" : '0'),
-					'0','NULL','0','0','0','0','0','0',"SUM($total_sql) AS ts_total"
-				),'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
+					'0', 'NULL', '0', '0', '0', '0', '0', '0', "SUM($total_sql) AS ts_total"
+				), 'GROUP BY '.$sum_sql[$type], $sum_extra_cols, $wildcard, $empty, $op, 'UNION', $filter, $join, $need_full_no_count);
 				$sum_extra_cols[$type]{0} = '0';
 			}
 			$union_order[] = 'ts_start '.$sort;
-			return parent::search('','',implode(',',$union_order),'','',false,'',$start);
+			return parent::search('', '', implode(',', $union_order), '', '', false, '', $start);
 		}
-		return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
+		return parent::search($criteria, $only_keys, $order_by, $extra_cols, $wildcard, $empty, $op, $start, $filter, $join, $need_full_no_count);
 	}
 
 	/**
@@ -567,16 +567,16 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked
 	 * @return array|boolean array with timesheet entry, null if timesheet not found or false if no rights
 	 */
-	function read($ts_id,$ignore_acl=false)
+	function read($ts_id, $ignore_acl = false)
 	{
 		//error_log(__METHOD__."($ts_id,$ignore_acl) ".function_backtrace());
 		if (!(int)$ts_id || (int)$ts_id != $this->data['ts_id'] && !parent::read($ts_id))
 		{
-			return null;	// entry not found
+			return null; // entry not found
 		}
 		if (!$ignore_acl && !($ret = $this->check_acl(Acl::READ)))
 		{
-			return false;	// no read rights
+			return false; // no read rights
 		}
 		return $this->data;
 	}
@@ -591,7 +591,7 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked, returns true if no edit-rigts
 	 * @return int 0 on success and errno != 0 else
 	 */
-	function save($keys=null,$touch_modified=true,$ignore_acl=false)
+	function save($keys = null, $touch_modified = true, $ignore_acl = false)
 	{
 		if ($keys) $this->data_merge($keys);
 
@@ -609,13 +609,13 @@ 
 		// check if we have a real modification of an existing record
 		if ($this->data['ts_id'])
 		{
-			$new =& $this->data;
+			$new = & $this->data;
 			unset($this->data);
 			$this->read($new['ts_id']);
-			$old =& $this->data;
-			$this->data =& $new;
+			$old = & $this->data;
+			$this->data = & $new;
 			$changed = array();
-			if (isset($old)) foreach($old as $name => $value)
+			if (isset($old)) foreach ($old as $name => $value)
 			{
 				if (isset($new[$name]) && $new[$name] != $value) $changed[] = $name;
 			}
@@ -634,17 +634,16 @@ 
 		))
 		{
 			$this->data['ts_project'] = $this->data['pm_id'] ? Link::title('projectmanager', $this->data['pm_id']) : '';
-			if($this->data['ts_title'] == Link::title('projectmanager', $old['pm_id']))
+			if ($this->data['ts_title'] == Link::title('projectmanager', $old['pm_id']))
 			{
 				$this->data['ts_title'] = $this->data['ts_project'];
 			}
 		}
 
-		$type = !isset($old) ? 'add' :
-			($new['ts_status'] == self::DELETED_STATUS ? 'delete' : 'update');
+		$type = !isset($old) ? 'add' : ($new['ts_status'] == self::DELETED_STATUS ? 'delete' : 'update');
 
 		// Check for restore of deleted contact, restore held links
-		if($old && $old['ts_status'] == self::DELETED_STATUS && $new['ts_status'] != self::DELETED_STATUS)
+		if ($old && $old['ts_status'] == self::DELETED_STATUS && $new['ts_status'] != self::DELETED_STATUS)
 		{
 			Link::restore(TIMESHEET_APP, $new['ts_id']);
 			$type = 'add';
@@ -658,9 +657,9 @@ 
 
 				$this->tracking->html_content_allow = true;
 			}
-			if ($this->tracking->track($this->data,$old,$this->user) === false)
+			if ($this->tracking->track($this->data, $old, $this->user) === false)
 			{
-				return implode(', ',$this->tracking->errors);
+				return implode(', ', $this->tracking->errors);
 			}
 			// notify the link-class about the update, as other apps may be subscribt to it
 			Link::notify_update(TIMESHEET_APP, $this->data['ts_id'], $this->data, $type);
@@ -676,15 +675,15 @@ 
 	 * @param boolean $ignore_acl =false should the Acl be checked, returns false if no delete-rigts
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function delete($keys=null,$ignore_acl=false)
+	function delete($keys = null, $ignore_acl = false)
 	{
-		if (!is_array($keys) && (int) $keys)
+		if (!is_array($keys) && (int)$keys)
 		{
-			$keys = array('ts_id' => (int) $keys);
+			$keys = array('ts_id' => (int)$keys);
 		}
 		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
 
-		if (!$ignore_acl && !$this->check_acl(Acl::DELETE,$ts_id) || !($old = $this->read($ts_id)))
+		if (!$ignore_acl && !$this->check_acl(Acl::DELETE, $ts_id) || !($old = $this->read($ts_id)))
 		{
 			return false;
 		}
@@ -695,12 +694,12 @@ 
 			$delete = $old;
 			$delete['ts_status'] = self::DELETED_STATUS;
 			$ret = !($this->save($delete));
-			Link::unlink(0,TIMESHEET_APP,$ts_id,'','','',true);
+			Link::unlink(0, TIMESHEET_APP, $ts_id, '', '', '', true);
 		}
 		elseif (($ret = parent::delete($keys)) && $ts_id)
 		{
 			// delete all links to timesheet entry $ts_id
-			Link::unlink(0,TIMESHEET_APP,$ts_id);
+			Link::unlink(0, TIMESHEET_APP, $ts_id);
 		}
 		return $ret;
 	}
@@ -715,7 +714,7 @@ 
 	function deleteaccount($data)
 	{
 		$account_id = $data['account_id'];
-		$new_owner =  $data['new_owner'];
+		$new_owner = $data['new_owner'];
 
 		if (!$new_owner)
 		{
@@ -739,22 +738,22 @@ 
 	 * @param int $status =0
 	 * @return int affected rows, should be 1 if ok, 0 if an error
 	 */
-	function set_status($keys=null, $status=0)
+	function set_status($keys = null, $status = 0)
 	{
 		$ret = true;
-		if (!is_array($keys) && (int) $keys)
+		if (!is_array($keys) && (int)$keys)
 		{
-			$keys = array('ts_id' => (int) $keys);
+			$keys = array('ts_id' => (int)$keys);
 		}
 		$ts_id = is_null($keys) ? $this->data['ts_id'] : $keys['ts_id'];
 
-		if (!$this->check_acl(Acl::EDIT,$ts_id) || !$this->read($ts_id,true))
+		if (!$this->check_acl(Acl::EDIT, $ts_id) || !$this->read($ts_id, true))
 		{
 			return false;
 		}
 
 		$this->data['ts_status'] = $status;
-		if ($this->save($ts_id)!=0) $ret = false;
+		if ($this->save($ts_id) != 0) $ret = false;
 
 		return $ret;
 	}
@@ -771,7 +770,7 @@ 
 		{
 			return array('duration' => 0, 'quantity' => 0, 'price' => 0, 'max_modified' => null);
 		}
-		return $this->search(array('ts_id'=>$ids),true,'','','',false,'AND',false,null,'',false,true);
+		return $this->search(array('ts_id'=>$ids), true, '', '', '', false, 'AND', false, null, '', false, true);
 	}
 
 	/**
@@ -782,27 +781,27 @@ 
 	 * @param int|array $entry int ts_id or array with timesheet entry
 	 * @return string/boolean string with title, null if timesheet not found, false if no perms to view it
 	 */
-	function link_title( $entry )
+	function link_title($entry)
 	{
 		if (!is_array($entry))
 		{
 			// need to preserve the $this->data
-			$backup =& $this->data;
+			$backup = & $this->data;
 			unset($this->data);
-			$entry = $this->read( $entry,false,false);
+			$entry = $this->read($entry, false, false);
 			// restore the data again
-			$this->data =& $backup;
+			$this->data = & $backup;
 		}
 		if (!$entry)
 		{
 			return $entry;
 		}
 		$format = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
-		if (date('H:i',$entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
+		if (date('H:i', $entry['ts_start']) != '00:00')	// dont show 00:00 time, as it means date only
 		{
 			$format .= ' '.($GLOBALS['egw_info']['user']['preferences']['common']['timeformat'] == 12 ? 'h:i a' : 'H:i');
 		}
-		return date($format,$entry['ts_start']).': '.$entry['ts_title'];
+		return date($format, $entry['ts_start']).': '.$entry['ts_title'];
 	}
 
 	/**
@@ -813,18 +812,18 @@ 
 	 * @param array $ids array with ts_id's
 	 * @return array with titles, see link_title
 	 */
-	function link_titles( array $ids )
+	function link_titles(array $ids)
 	{
 		$titles = array();
-		if (($entries = $this->search(array('ts_id' => $ids),'ts_id,ts_title,ts_start')))
+		if (($entries = $this->search(array('ts_id' => $ids), 'ts_id,ts_title,ts_start')))
 		{
-			foreach($entries as $entry)
+			foreach ($entries as $entry)
 			{
 				$titles[$entry['ts_id']] = $this->link_title($entry);
 			}
 		}
 		// we assume all not returned entries are not readable by the user, as we notify Link about all deletes
-		foreach($ids as $id)
+		foreach ($ids as $id)
 		{
 			if (!isset($titles[$id]))
 			{
@@ -843,16 +842,16 @@ 
 	 * @param array $options Array of options for the search
 	 * @return array with ts_id - title pairs of the matching entries
 	 */
-	function link_query( $pattern, Array &$options = array() )
+	function link_query($pattern, Array &$options = array())
 	{
 		$limit = false;
 		$need_count = false;
-		if($options['start'] || $options['num_rows']) {
+		if ($options['start'] || $options['num_rows']) {
 			$limit = array($options['start'], $options['num_rows']);
 			$need_count = true;
 		}
 		$result = array();
-		foreach((array) $this->search($pattern,false,'','','%',false,'OR', $limit, null, '', $need_count) as $ts )
+		foreach ((array)$this->search($pattern, false, '', '', '%', false, 'OR', $limit, null, '', $need_count) as $ts)
 		{
 			if ($ts) $result[$ts['ts_id']] = $this->link_title($ts);
 		}
@@ -869,11 +868,11 @@ 
 	 * @param int $user =null for which user to check, default current user
 	 * @return boolean true if access is granted or false otherwise
 	 */
-	function file_access($id,$check,$rel_path=null,$user=null)
+	function file_access($id, $check, $rel_path = null, $user = null)
 	{
-		unset($rel_path);	// not used, but required by function signature
+		unset($rel_path); // not used, but required by function signature
 
-		return $this->check_acl($check,$id,$user);
+		return $this->check_acl($check, $id, $user);
 	}
 
 	/**
@@ -885,16 +884,16 @@ 
 	 * @param string $newtitle => the new title of the project
 	 * @return boolean true for success, false for invalid parameters
 	 */
-	 function update_ts_project($oldtitle='', $newtitle='')
+	 function update_ts_project($oldtitle = '', $newtitle = '')
 	 {
-		if(strlen($oldtitle) > 0 && strlen($newtitle) > 0)
+		if (strlen($oldtitle) > 0 && strlen($newtitle) > 0)
 		{
-			$this->db->update('egw_timesheet',array(
+			$this->db->update('egw_timesheet', array(
 				'ts_project' => $newtitle,
 				'ts_title' => $newtitle,
-			),array(
+			), array(
 				'ts_project' => $oldtitle,
-			),__LINE__,__FILE__,TIMESHEET_APP);
+			), __LINE__, __FILE__, TIMESHEET_APP);
 
 			return true;
 		}
@@ -907,16 +906,16 @@ 
 	 * @param int $pm_id ID of selected project
 	 * @return array containing link_id and ts_id
 	 */
-	function get_ts_links($pm_id=0)
+	function get_ts_links($pm_id = 0)
 	{
-		if($pm_id && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
+		if ($pm_id && isset($GLOBALS['egw_info']['user']['apps']['projectmanager']))
 		{
-			$pm_ids = ExecMethod('projectmanager.projectmanager_bo.children',$pm_id);
+			$pm_ids = ExecMethod('projectmanager.projectmanager_bo.children', $pm_id);
 			$pm_ids[] = $pm_id;
-			$links = Link\Storage::get_links('projectmanager',$pm_ids,'timesheet');	// Link\Storage::get_links not egw_links::get_links!
+			$links = Link\Storage::get_links('projectmanager', $pm_ids, 'timesheet'); // Link\Storage::get_links not egw_links::get_links!
 			if ($links)
 			{
-				$links = array_unique(call_user_func_array('array_merge',$links));
+				$links = array_unique(call_user_func_array('array_merge', $links));
 			}
 			return $links;
 		}
@@ -934,17 +933,17 @@ 
 	function notify($data)
 	{
 		//error_log(__METHOD__.'('.array2string($data).')');
-		$backup =& $this->data;	// backup internal data in case class got re-used by ExecMethod
+		$backup = & $this->data; // backup internal data in case class got re-used by ExecMethod
 		unset($this->data);
 
 		if ($data['target_app'] == 'projectmanager' && $this->read($data['id']))
 		{
 			$old_title = isset($data['data']) ? $data['data'][Link::OLD_LINK_TITLE] : null;
-			switch($data['type'])
+			switch ($data['type'])
 			{
 				case 'link':
 				case 'update':
-					if (empty($this->data['ts_project']) ||	// timesheet has not yet project set --> set just linked one
+					if (empty($this->data['ts_project']) || // timesheet has not yet project set --> set just linked one
 						isset($old_title) && $this->data['ts_project'] === $old_title)
 					{
 						$pm_id = $data['target_id'];
@@ -986,17 +985,17 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function db2data($data=null)
+	function db2data($data = null)
 	{
 		if (($intern = !is_array($data)))
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		// get pm_id from links and ts_project: either project matching ts_project or first found project
 		if (!isset($data['pm_id']) && $data['ts_id'])
 		{
 			$first_pm_id = null;
-			foreach(Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
+			foreach (Link::get_links('timesheet', $data['ts_id'], 'projectmanager') as $pm_id)
 			{
 				if (!isset($first_pm_id)) $first_pm_id = $pm_id;
 				if ($data['ts_project'] == Link::title('projectmanager', $pm_id))
@@ -1014,7 +1013,7 @@ 
 			$data['ts_project_blur'] = $data['ts_project'];
 			$data['ts_project'] = '';
 		}
-		return parent::db2data($intern ? null : $data);	// important to use null, if $intern!
+		return parent::db2data($intern ? null : $data); // important to use null, if $intern!
 	}
 
 	/**
@@ -1026,17 +1025,17 @@ 
 	 * @param array $data =null if given works on that array and returns result, else works on internal data-array
 	 * @return array
 	 */
-	function data2db($data=null)
+	function data2db($data = null)
 	{
 		if (($intern = !is_array($data)))
 		{
-			$data =& $this->data;
+			$data = & $this->data;
 		}
 		// allways store ts_project to be able to search for it, even if no custom project is set
 		if (empty($data['ts_project']) && !is_null($data['ts_project']))
 		{
 			$data['ts_project'] = $data['pm_id'] ? Link::title('projectmanager', $data['pm_id']) : '';
 		}
-		return parent::data2db($intern ? null : $data);	// important to use null, if $intern!
+		return parent::data2db($intern ? null : $data); // important to use null, if $intern!
 	}
 }

timesheet/inc/class.timesheet_tracking.inc.php

Spacing +5 added lines, -5 removed lines

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

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

Braces +4 added lines, -1 removed lines

@@ -89,7 +89,10 @@
 	 */
 	public function addGeneric($account_id, $key, $data)
 	{
-		if (!isset($account_id)) $account_id = $GLOBALS['egw_info']['user']['account_id'];
+		if (!isset($account_id))
+		{
+			$account_id = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		self::$db->insert(self::TABLE, array(
 			'account_id'  => $account_id,

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',

notifications/inc/class.notifications.inc.php

Indentation +8 added lines, -8 removed lines

@@ -660,14 +660,14 @@
 	 }
 
 	 /**
-	 * returns notification chains based on admin prefs
-	 * @abstract the available chains can be retrieved in two different output formats:
-	 * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
-	 * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
-	 *
-	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
-	 * @return array containing notification chains, output like given in $_output
-	 */
+	  * returns notification chains based on admin prefs
+	  * @abstract the available chains can be retrieved in two different output formats:
+	  * routing: array with common and enabled chains, chain-name as key and the chain-array as value (used for message-routing)
+	  * human: array with common, enabled and disabled chains, chain-name as key and a human-readable description as value (used for config)
+	  *
+	  * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
+	  * @return array containing notification chains, output like given in $_output
+	  */
 	public function get_available_chains($_output = 'routing') {
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();

Spacing +80 added lines, -80 removed lines

@@ -191,7 +191,7 @@ 
 	 *
 	 */
 	public function __construct() {
-		$this->config = (object) Api\Config::read(self::_appname);
+		$this->config = (object)Api\Config::read(self::_appname);
 	}
 
 	/**
@@ -200,7 +200,7 @@ 
 	 * @param boolean $reset =false true: reset all errors
 	 * @return array
 	 */
-	public static function errors($reset=false)
+	public static function errors($reset = false)
 	{
 		$ret = self::$errors;
 		if ($reset) self::$errors = array();
@@ -215,19 +215,19 @@ 
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
 	public function set_sender($_sender) {
-		if(is_object($_sender)) {
+		if (is_object($_sender)) {
 			$this->sender = $_sender;
 			return true;
 		} else {
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_sender)) {
-				$this->sender = (object) $GLOBALS['egw']->accounts->read($_sender);
+			if (is_numeric($_sender)) {
+				$this->sender = (object)$GLOBALS['egw']->accounts->read($_sender);
 				return true;
 			}
-			if(is_string($_sender) && strpos($_sender,'@')) {
-				$this->sender = (object) array (
-									'account_email' => $this->get_addresspart($_sender,'email'),
-									'account_fullname' => $this->get_addresspart($_sender,'fullname'),
+			if (is_string($_sender) && strpos($_sender, '@')) {
+				$this->sender = (object)array(
+									'account_email' => $this->get_addresspart($_sender, 'email'),
+									'account_fullname' => $this->get_addresspart($_sender, 'fullname'),
 									);
 				return true;
 			}
@@ -267,19 +267,19 @@ 
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
 	public function add_receiver($_receiver) {
-		if(is_object($_receiver)) {
+		if (is_object($_receiver)) {
 			$this->receivers[] = $_receiver;
 			return true;
 		} else {
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_receiver)) {
-				$this->receivers[] = (object) $GLOBALS['egw']->accounts->read($_receiver);
+			if (is_numeric($_receiver)) {
+				$this->receivers[] = (object)$GLOBALS['egw']->accounts->read($_receiver);
 				return true;
 			}
-			if(is_string($_receiver) && strpos($_receiver,'@')) {
-				$this->receivers[] = (object) array (
-									'account_email' => $this->get_addresspart($_receiver,'email'),
-									'account_fullname' => $this->get_addresspart($_receiver,'fullname'),
+			if (is_string($_receiver) && strpos($_receiver, '@')) {
+				$this->receivers[] = (object)array(
+									'account_email' => $this->get_addresspart($_receiver, 'email'),
+									'account_fullname' => $this->get_addresspart($_receiver, 'fullname'),
 									);
 				return true;
 			}
@@ -320,11 +320,11 @@ 
 	 * @param string $_type Type of message, 'plain' or 'html'
 	 */
 	public function set_message($_message, $_type = false) {
-		if(!$_type)
+		if (!$_type)
 		{
 			$_type = strlen($_message) == strlen(strip_tags($_message)) ? 'plain' : 'html';
 		}
-		if($_type == 'plain') {
+		if ($_type == 'plain') {
 			$this->message_plain = $_message;
 		} else {
 			$this->message_html = $_message;
@@ -342,7 +342,7 @@ 
 	 */
 	public function set_popupmessage($_message) {
 		//popup requires html
-		if(strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
+		if (strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
 		$this->message_popup = $_message;
 		return true;
 	}
@@ -354,9 +354,9 @@ 
 	 */
 	public function set_links(array $_links) {
 		$this->links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
-				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'],$link['id']);
+		foreach ($_links as $link) {
+			if (is_array($link)) {
+				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'], $link['id']);
 			}
 		}
 		return true;
@@ -369,8 +369,8 @@ 
 	 */
 	public function set_popuplinks(array $_links) {
 		$this->popup_links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach ($_links as $link) {
+			if (is_array($link)) {
 				$this->add_popuplink($link['text'], $link['view'], $link['popup'], $link['app']);
 			}
 		}
@@ -387,7 +387,7 @@ 
 	 * @param string $_id Application ID, to use link registry (popup & view ignored)
 	 */
 	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false) {
-		if(!$_view || !$_text) { return false; }
+		if (!$_view || !$_text) { return false; }
 		$this->links[] = (object)array(
 			'text'	=> $_text,
 			'view'	=> $_view,
@@ -407,7 +407,7 @@ 
 	 * @param string $_app application name
 	 */
 	public function add_popuplink($_text, $_view, $_popup = false, $_app = '') {
-		if(!$_view || !$_text) { return false; }
+		if (!$_view || !$_text) { return false; }
 		$this->popup_links[] = (object)array(
 										'text'	=> $_text,
 										'view'	=> $_view,
@@ -424,8 +424,8 @@ 
 	 */
 	public function set_attachments(array $_attachments) {
 		$this->attachments = array(); // clear array if set
-		foreach($_attachments as $attachment) {
-			if(is_array($attachment)) {
+		foreach ($_attachments as $attachment) {
+			if (is_array($attachment)) {
 				$this->add_attachment(
 					$attachment['string'],
 					$attachment['filename'],
@@ -449,8 +449,8 @@ 
 	 * @param string $_type File extension (MIME) type.
 	 * @param string $_path optional path to attachment, if !$_string
 	 */
-	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null) {
-		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
+	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path = null) {
+		if (!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
 		$this->attachments[] = (object)array(
 			'string' => $_string,
 			'filename' => $_filename,
@@ -482,7 +482,7 @@ 
 		if (!is_array($this->receivers) || count($this->receivers) == 0) {
 			throw new Exception('Error: cannot send notifications. No receivers supplied');
 		}
-		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
+		if (!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
 			throw new Exception('Error: cannot send notifications. No valid messages supplied');
 		}
 
@@ -496,7 +496,7 @@ 
 			$backend_errors = array();
 			try {
 				// system or non-system user
-				if($receiver->account_id && is_numeric($receiver->account_id)) {
+				if ($receiver->account_id && is_numeric($receiver->account_id)) {
 					// system user, collect data and check for Status and expire state, skip notification if expired or not active
 					$userData = $GLOBALS['egw']->accounts->read($receiver->account_id);
 					//error_log(__METHOD__.__LINE__." fetched data for User:".array2string($userData['account_lid']).'#'.$userData['account_type'].'#'.$userData['account_status'].'#'.$GLOBALS['egw']->accounts->is_expired($userData).'#');
@@ -509,17 +509,17 @@ 
 					}
 					$receiver->handle = $receiver->account_lid;
 					// check if the receiver has rights to run the notifcation app
-					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id,true);
+					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id, true);
 					$ids[] = $receiver->account_id;
-					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications')) {
+					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids, 'run', 'notifications')) {
 						// read the users notification chain
 						$prefs = new Api\Preferences($receiver->account_id);
 						$preferences_all = $prefs->read();
 						$preferences = (object)$preferences_all[self::_appname];
-						if($preferences->notification_chain) {
+						if ($preferences->notification_chain) {
 							// fallback: admin disabled user-chosen chain
-							if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
-								$prepend_message .= lang(	'This eGroupWare notification has been sent to you by mail because your'
+							if (!$notification_chain = $available_chains[$preferences->notification_chain]) {
+								$prepend_message .= lang('This eGroupWare notification has been sent to you by mail because your'
 															.' chosen notification-chain has been disabled by the administrator.'
 															.' Please choose another notification-chain in your preferences!');
 								$notification_chain = $available_chains[self::_fallback];
@@ -536,28 +536,28 @@ 
 					$notification_chain = $available_chains[self::_fallback]; // fallback: non-system user
 				}
 
-				if($notification_chain == 'disable') {
+				if ($notification_chain == 'disable') {
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $backend => $action) {
+				foreach ($notification_chain as $backend => $action) {
 					$notification_backend = null;
 					try {
 						// check if backend should be skipped
-						if( in_array($backend, $this->skip_backends) ) {
+						if (in_array($backend, $this->skip_backends)) {
 							// log as error just for the case too much skipping prevents user from being notified
 							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
 							continue;
 						}
 
 						$notification_backend = self::_appname.'_'.$backend;
-						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
-							throw new Exception('file for '.$notification_backend. ' does not exist');
+						if (!file_exists(EGW_INCLUDE_ROOT.'/'.self::_appname.'/inc/class.'.$notification_backend.'.inc.php')) {
+							throw new Exception('file for '.$notification_backend.' does not exist');
 						}
-						$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
-						if ( !($obj instanceof notifications_iface) ) {
-							unset ( $obj );
-					 		throw new Exception($notification_backend. ' is no implementation of notifications_iface');
+						$obj = new $notification_backend($this->sender, $receiver, $this->config, $preferences);
+						if (!($obj instanceof notifications_iface)) {
+							unset ($obj);
+					 		throw new Exception($notification_backend.' is no implementation of notifications_iface');
 						}
 						$lsubject = $this->subject;
 						$llinks = $this->links;
@@ -567,14 +567,14 @@ 
 							if ($this->popup_links) $llinks = $this->popup_links;
 							if (is_array($this->popup_data)) $popup_data = $this->popup_data;
 						} elseif ($backend == 'email') {
-							if (!empty($this->reply_to)) $popup_data = array( 'reply_to' => $this->reply_to );
+							if (!empty($this->reply_to)) $popup_data = array('reply_to' => $this->reply_to);
 						}
 						$obj->send($this->prepend_message($messages, $prepend_message), $lsubject, $llinks, $this->attachments, $popup_data);
 
 						// This is to make popup_or_email option sensfull since
 						// we save popup notifications in database anyway, email
 						// notifications should be based on user availability.
-						if ($backend == 'popup' && $action== 'fail' && !Api\Session::notifications_active($receiver->account_id))
+						if ($backend == 'popup' && $action == 'fail' && !Api\Session::notifications_active($receiver->account_id))
 						{
 							throw new Exception();
 						}
@@ -582,17 +582,17 @@ 
 					catch (Exception $exception) {
 						$backend_errors[] = $notification_backend.' failed: '.$exception->getMessage();
 						// try next backend
-						if($action == 'fail' || $action == 'continue') {
+						if ($action == 'fail' || $action == 'continue') {
 							continue;
 						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
-					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
+					if ($action == 'stop' || $action == 'fail') { break; } // stop running through chain
 				}
 				// check if the user has been notified at all
-				if(!$user_notified) {
+				if (!$user_notified) {
 					/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
 					foreach($backend_errors as $id=>$backend_error) {
 						error_log($backend_error);
@@ -619,22 +619,22 @@ 
 	 * @return plain and html message in one array, $messages['plain'] and $messages['html'] and, if exists $messages['popup']
 	 */
 	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '') {
-		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
+		if (empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
 		$messages = array();
 
 		// create the messages
-		if(!empty($_message_plain)) {
+		if (!empty($_message_plain)) {
 			$messages['plain'] = $_message_plain;
 		} else {
 			$messages['plain'] = Api\Mail\Html::convertHTMLToText($_message_html, false, true);
 		}
 
-		if(!empty($_message_html)) {
+		if (!empty($_message_html)) {
 			$messages['html'] = $_message_html;
 		} else {
 			$messages['html'] = self::plain2html($_message_plain);
 		}
-		if (!empty($_message_popup)) $messages['popup']=$_message_popup;
+		if (!empty($_message_popup)) $messages['popup'] = $_message_popup;
 		return $messages;
 	}
 
@@ -657,9 +657,9 @@ 
 	 * @return plain and html message in one array including the prepended message, $messages['plain'] and $messages['html']
 	 */
 	 private function prepend_message(array $_messages, $_prepend = null) {
-		if(strlen($_prepend) > 0) {
-			foreach($_messages as $key => $value) {
-				switch($key) {
+		if (strlen($_prepend) > 0) {
+			foreach ($_messages as $key => $value) {
+				switch ($key) {
 					case 'plain':
 						$_messages[$key] = $_prepend."\n\n".$value;
 						break;
@@ -683,17 +683,17 @@ 
 	 * @param string $_part
 	 * @return string chosen part of the address
 	 */
-	private function get_addresspart($_address, $_part='email')
+	private function get_addresspart($_address, $_part = 'email')
 	{
 		$parts = null;
-	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
-	 		$fullname = trim(trim($parts[1]),'\"');
+	 	if (strpos($_address, '<') && preg_match('/^(.*)\S?\<(.*)\>/', $_address, $parts)) { // _address contains a fullname part
+	 		$fullname = trim(trim($parts[1]), '\"');
 	 		$email = $parts[2];
 	 	} else {
 	 		$fullname = false;
 	 		$email = $_address;
 	 	}
-	 	switch($_part) {
+	 	switch ($_part) {
 	 		case 'fullname':
 	 			return $fullname;
 	 		case 'email':
@@ -715,8 +715,8 @@ 
 	public function get_available_chains($_output = 'routing') {
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();
-		foreach($this->backends as $backend) {
-			switch($backend) {
+		foreach ($this->backends as $backend) {
+			switch ($backend) {
 				case 'email':
 				case 'popup':
 				case 'jpopup':
@@ -731,15 +731,15 @@ 
 
 		$enabled_chains = array();
 		$disabled_chains = array();
-		foreach($this->notification_chains as $key => $chain) {
+		foreach ($this->notification_chains as $key => $chain) {
 			$allow_chain = true;
-			if(is_array($chain)) {
-				foreach(array_keys($chain) as $name) {
-					if(!$enabled_backends[$name]) {
+			if (is_array($chain)) {
+				foreach (array_keys($chain) as $name) {
+					if (!$enabled_backends[$name]) {
 						$allow_chain = false; // disable whole chain if one backend is disabled
 					}
 				}
-				if($allow_chain) {
+				if ($allow_chain) {
 					$enabled_chains[$key] = $chain;
 				} else {
 					$disabled_chains[$key] = $chain;
@@ -754,15 +754,15 @@ 
 		// create the 'all' chain from the enabled backends
 		$chain_all = array();
 		$backend_count = 1;
-		foreach($enabled_backends as $backend => $enabled) {
-			if($enabled) {
+		foreach ($enabled_backends as $backend => $enabled) {
+			if ($enabled) {
 				$chain_all[$backend] = count($enabled_backends) == $backend_count ? 'stop' : 'continue';
 			}
 			$backend_count++;
 		}
 		$common_chains['all'] = $chain_all;
 
-		switch($_output) {
+		switch ($_output) {
 			case 'human':
 				$chain_groups = array(
 					lang('Common chains')	=> 'common_chains',
@@ -771,10 +771,10 @@ 
 					);
 				$suffix = '_human';
 				// create descriptions for each chain key in each group
-				foreach($chain_groups as $name => $arr_name) {
+				foreach ($chain_groups as $name => $arr_name) {
 					${$arr_name.$suffix} = array();
-					foreach(array_keys(${$arr_name}) as $key) {
-						if($arr_name == 'disabled_chains') {
+					foreach (array_keys(${$arr_name}) as $key) {
+						if ($arr_name == 'disabled_chains') {
 							${$arr_name.$suffix}[$key] = '('.lang('Disabled').') '.lang($this->chains_descriptions[$key]);
 						} else {
 							${$arr_name.$suffix}[$key] = lang($this->chains_descriptions[$key]);
@@ -783,8 +783,8 @@ 
 				}
 				// summarize all groups with minimum one chain to the final array
 				$chains_final = array();
-				foreach($chain_groups as $name => $arr_name) {
-					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
+				foreach ($chain_groups as $name => $arr_name) {
+					if (is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
 						$chains_final[$name] = ${$arr_name.$suffix};
 					}
 				}
@@ -804,10 +804,10 @@ 
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
 	public function deleteaccount($settings) {
-		foreach($this->backends as $backend) {
-			$backend_hook = array(self::_appname.'_'.$backend,'deleteaccount');
+		foreach ($this->backends as $backend) {
+			$backend_hook = array(self::_appname.'_'.$backend, 'deleteaccount');
 			if (is_callable($backend_hook)) {
-				call_user_func($backend_hook,$settings);
+				call_user_func($backend_hook, $settings);
 			}
 		}
 	}

Braces +237 added lines, -101 removed lines

@@ -24,7 +24,8 @@ 
  * called from this class. The backend's job is to deliver ONE message to ONE recipient.
  *
  */
-class notifications {
+class notifications
+{
 
 	/**
 	 * Appname
@@ -190,7 +191,8 @@ 
 	 * constructor of notifications
 	 *
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->config = (object) Api\Config::read(self::_appname);
 	}
 
@@ -203,7 +205,10 @@ 
 	public static function errors($reset=false)
 	{
 		$ret = self::$errors;
-		if ($reset) self::$errors = array();
+		if ($reset)
+		{
+			self::$errors = array();
+		}
 		return $ret;
 	}
 
@@ -214,17 +219,23 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
-	public function set_sender($_sender) {
-		if(is_object($_sender)) {
+	public function set_sender($_sender)
+	{
+		if(is_object($_sender))
+		{
 			$this->sender = $_sender;
 			return true;
-		} else {
+		}
+		else
+		{
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_sender)) {
+			if(is_numeric($_sender))
+			{
 				$this->sender = (object) $GLOBALS['egw']->accounts->read($_sender);
 				return true;
 			}
-			if(is_string($_sender) && strpos($_sender,'@')) {
+			if(is_string($_sender) && strpos($_sender,'@'))
+			{
 				$this->sender = (object) array (
 									'account_email' => $this->get_addresspart($_sender,'email'),
 									'account_fullname' => $this->get_addresspart($_sender,'fullname'),
@@ -240,7 +251,8 @@ 
 	 *
 	 * @param $_reply_to string for email address to reply to
 	 */
-	public function set_reply_to($_reply_to) {
+	public function set_reply_to($_reply_to)
+	{
 		$this->reply_to = $_reply_to;
 		return true;
 	}
@@ -252,9 +264,11 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an array with the int of the account id or the e-mail address of a non-eGW user
 	 */
-	public function set_receivers(array $_receivers) {
+	public function set_receivers(array $_receivers)
+	{
 		$this->receivers = array();
-		foreach ($_receivers as $receiver) {
+		foreach ($_receivers as $receiver)
+		{
 			$this->add_receiver($receiver);
 		}
 	}
@@ -266,17 +280,23 @@ 
 	 * as long as the accounts class isn't a nice object,
 	 * it's an int with the account id or the e-mail address of a non-eGW user
 	 */
-	public function add_receiver($_receiver) {
-		if(is_object($_receiver)) {
+	public function add_receiver($_receiver)
+	{
+		if(is_object($_receiver))
+		{
 			$this->receivers[] = $_receiver;
 			return true;
-		} else {
+		}
+		else
+		{
 			// no object atm, we have to handle this and make a pseudo-object
-			if(is_numeric($_receiver)) {
+			if(is_numeric($_receiver))
+			{
 				$this->receivers[] = (object) $GLOBALS['egw']->accounts->read($_receiver);
 				return true;
 			}
-			if(is_string($_receiver) && strpos($_receiver,'@')) {
+			if(is_string($_receiver) && strpos($_receiver,'@'))
+			{
 				$this->receivers[] = (object) array (
 									'account_email' => $this->get_addresspart($_receiver,'email'),
 									'account_fullname' => $this->get_addresspart($_receiver,'fullname'),
@@ -292,7 +312,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_subject($_subject) {
+	public function set_subject($_subject)
+	{
 		$this->subject = $_subject;
 		return true;
 	}
@@ -302,7 +323,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_popupsubject($_subject) {
+	public function set_popupsubject($_subject)
+	{
 		$this->popupsubject = $_subject;
 		return true;
 	}
@@ -319,14 +341,18 @@ 
 	 * @param string $_message
 	 * @param string $_type Type of message, 'plain' or 'html'
 	 */
-	public function set_message($_message, $_type = false) {
+	public function set_message($_message, $_type = false)
+	{
 		if(!$_type)
 		{
 			$_type = strlen($_message) == strlen(strip_tags($_message)) ? 'plain' : 'html';
 		}
-		if($_type == 'plain') {
+		if($_type == 'plain')
+		{
 			$this->message_plain = $_message;
-		} else {
+		}
+		else
+		{
 			$this->message_html = $_message;
 		}
 		return true;
@@ -340,9 +366,13 @@ 
 	 *
 	 * @param string $_message
 	 */
-	public function set_popupmessage($_message) {
+	public function set_popupmessage($_message)
+	{
 		//popup requires html
-		if(strlen($_message) == strlen(strip_tags($_message))) $_message = self::plain2html($_message);
+		if(strlen($_message) == strlen(strip_tags($_message)))
+		{
+			$_message = self::plain2html($_message);
+		}
 		$this->message_popup = $_message;
 		return true;
 	}
@@ -352,10 +382,13 @@ 
 	 *
 	 * @param array $_links link array (like defined in $this->add_link)
 	 */
-	public function set_links(array $_links) {
+	public function set_links(array $_links)
+	{
 		$this->links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach($_links as $link)
+		{
+			if(is_array($link))
+			{
 				$this->add_link($link['text'], $link['view'], $link['popup'], $link['app'],$link['id']);
 			}
 		}
@@ -367,10 +400,13 @@ 
 	 *
 	 * @param array $_links link array (like defined in $this->add_link)
 	 */
-	public function set_popuplinks(array $_links) {
+	public function set_popuplinks(array $_links)
+	{
 		$this->popup_links = array(); // clear array if set
-		foreach($_links as $link) {
-			if(is_array($link)) {
+		foreach($_links as $link)
+		{
+			if(is_array($link))
+			{
 				$this->add_popuplink($link['text'], $link['view'], $link['popup'], $link['app']);
 			}
 		}
@@ -386,8 +422,11 @@ 
 	 * @param string $_app Application name, to use link registry (popup & view ignored)
 	 * @param string $_id Application ID, to use link registry (popup & view ignored)
 	 */
-	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false) {
-		if(!$_view || !$_text) { return false; }
+	public function add_link($_text, $_view, $_popup = false, $_app = false, $_id = false)
+	{
+		if(!$_view || !$_text)
+		{
+return false; }
 		$this->links[] = (object)array(
 			'text'	=> $_text,
 			'view'	=> $_view,
@@ -406,8 +445,11 @@ 
 	 * @param string $_popup if link can be viewed in a popup something like '300x200' otherwise false
 	 * @param string $_app application name
 	 */
-	public function add_popuplink($_text, $_view, $_popup = false, $_app = '') {
-		if(!$_view || !$_text) { return false; }
+	public function add_popuplink($_text, $_view, $_popup = false, $_app = '')
+	{
+		if(!$_view || !$_text)
+		{
+return false; }
 		$this->popup_links[] = (object)array(
 										'text'	=> $_text,
 										'view'	=> $_view,
@@ -422,10 +464,13 @@ 
 	 *
 	 * @param array $_attachments attachment array (like defined in $this->add_attachment)
 	 */
-	public function set_attachments(array $_attachments) {
+	public function set_attachments(array $_attachments)
+	{
 		$this->attachments = array(); // clear array if set
-		foreach($_attachments as $attachment) {
-			if(is_array($attachment)) {
+		foreach($_attachments as $attachment)
+		{
+			if(is_array($attachment))
+			{
 				$this->add_attachment(
 					$attachment['string'],
 					$attachment['filename'],
@@ -449,8 +494,12 @@ 
 	 * @param string $_type File extension (MIME) type.
 	 * @param string $_path optional path to attachment, if !$_string
 	 */
-	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null) {
-		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename) return false;
+	public function add_attachment($_string, $_filename, $_encoding = "base64", $_type = "application/octet-stream", $_path=null)
+	{
+		if(!$_string && (!$_path || !file_exists($_path)) || !$_filename)
+		{
+			return false;
+		}
 		$this->attachments[] = (object)array(
 			'string' => $_string,
 			'filename' => $_filename,
@@ -468,21 +517,26 @@ 
 	 * @param array $_skip_backends array with names of the backends to be skipped
 	 * e.g. array('popup', 'winpopup')
 	 */
-	public function set_skip_backends(array $_skip_backends) {
+	public function set_skip_backends(array $_skip_backends)
+	{
 		$this->skip_backends = $_skip_backends;
 	}
 
 	/**
 	 * sends notifications
 	 */
-	public function send() {
-		if (!is_object($this->sender)) {
+	public function send()
+	{
+		if (!is_object($this->sender))
+		{
 			throw new Exception('Error: cannot send notifications. No sender supplied');
 		}
-		if (!is_array($this->receivers) || count($this->receivers) == 0) {
+		if (!is_array($this->receivers) || count($this->receivers) == 0)
+		{
 			throw new Exception('Error: cannot send notifications. No receivers supplied');
 		}
-		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup)) {
+		if(!$messages = $this->create_messages($this->message_plain, $this->message_html, $this->message_popup))
+		{
 			throw new Exception('Error: cannot send notifications. No valid messages supplied');
 		}
 
@@ -490,13 +544,15 @@ 
 
 		$available_chains = $this->get_available_chains('routing');
 
-		foreach ($this->receivers as $receiver) {
+		foreach ($this->receivers as $receiver)
+		{
 			$user_notified = false;
 			$prepend_message = '';
 			$backend_errors = array();
 			try {
 				// system or non-system user
-				if($receiver->account_id && is_numeric($receiver->account_id)) {
+				if($receiver->account_id && is_numeric($receiver->account_id))
+				{
 					// system user, collect data and check for Status and expire state, skip notification if expired or not active
 					$userData = $GLOBALS['egw']->accounts->read($receiver->account_id);
 					//error_log(__METHOD__.__LINE__." fetched data for User:".array2string($userData['account_lid']).'#'.$userData['account_type'].'#'.$userData['account_status'].'#'.$GLOBALS['egw']->accounts->is_expired($userData).'#');
@@ -511,51 +567,65 @@ 
 					// check if the receiver has rights to run the notifcation app
 					$ids = $GLOBALS['egw']->accounts->memberships($receiver->account_id,true);
 					$ids[] = $receiver->account_id;
-					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications')) {
+					if ($GLOBALS['egw']->acl->get_specific_rights_for_account($ids,'run','notifications'))
+					{
 						// read the users notification chain
 						$prefs = new Api\Preferences($receiver->account_id);
 						$preferences_all = $prefs->read();
 						$preferences = (object)$preferences_all[self::_appname];
-						if($preferences->notification_chain) {
+						if($preferences->notification_chain)
+						{
 							// fallback: admin disabled user-chosen chain
-							if(!$notification_chain = $available_chains[$preferences->notification_chain]) {
+							if(!$notification_chain = $available_chains[$preferences->notification_chain])
+							{
 								$prepend_message .= lang(	'This eGroupWare notification has been sent to you by mail because your'
 															.' chosen notification-chain has been disabled by the administrator.'
 															.' Please choose another notification-chain in your preferences!');
 								$notification_chain = $available_chains[self::_fallback];
 							}
-						} else {
+						}
+						else
+						{
 							$notification_chain = $available_chains[self::user_fallback]; // fallback: no prefs
 						}
-					} else {
+					}
+					else
+					{
 						$notification_chain = $available_chains[self::_fallback]; // fallback: no rights to app
 					}
-				} else {
+				}
+				else
+				{
 					// non-system user
 					$receiver->handle = $receiver->account_email;
 					$notification_chain = $available_chains[self::_fallback]; // fallback: non-system user
 				}
 
-				if($notification_chain == 'disable') {
+				if($notification_chain == 'disable')
+				{
 					continue; //user disabled notifications
 				}
 
-				foreach($notification_chain as $backend => $action) {
+				foreach($notification_chain as $backend => $action)
+				{
 					$notification_backend = null;
 					try {
 						// check if backend should be skipped
-						if( in_array($backend, $this->skip_backends) ) {
+						if( in_array($backend, $this->skip_backends) )
+						{
 							// log as error just for the case too much skipping prevents user from being notified
 							$backend_errors[] = $backend.' will be skipped (as defined by calling application)';
 							continue;
 						}
 
 						$notification_backend = self::_appname.'_'.$backend;
-						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php')) {
+						if(!file_exists(EGW_INCLUDE_ROOT.'/'. self::_appname.'/inc/class.'. $notification_backend. '.inc.php'))
+						{
 							throw new Exception('file for '.$notification_backend. ' does not exist');
 						}
 						$obj = new $notification_backend( $this->sender, $receiver, $this->config, $preferences );
-						if ( !($obj instanceof notifications_iface) ) {
+						if ( !($obj instanceof notifications_iface) )
+						{
 							unset ( $obj );
 					 		throw new Exception($notification_backend. ' is no implementation of notifications_iface');
 						}
@@ -563,11 +633,25 @@ 
 						$llinks = $this->links;
 						if ($backend == 'popup')
 						{
-							if (!empty($this->popupsubject)) $lsubject = $this->popupsubject;
-							if ($this->popup_links) $llinks = $this->popup_links;
-							if (is_array($this->popup_data)) $popup_data = $this->popup_data;
-						} elseif ($backend == 'email') {
-							if (!empty($this->reply_to)) $popup_data = array( 'reply_to' => $this->reply_to );
+							if (!empty($this->popupsubject))
+							{
+								$lsubject = $this->popupsubject;
+							}
+							if ($this->popup_links)
+							{
+								$llinks = $this->popup_links;
+							}
+							if (is_array($this->popup_data))
+							{
+								$popup_data = $this->popup_data;
+							}
+						}
+						elseif ($backend == 'email')
+						{
+							if (!empty($this->reply_to))
+							{
+								$popup_data = array( 'reply_to' => $this->reply_to );
+							}
 						}
 						$obj->send($this->prepend_message($messages, $prepend_message), $lsubject, $llinks, $this->attachments, $popup_data);
 
@@ -582,23 +666,30 @@ 
 					catch (Exception $exception) {
 						$backend_errors[] = $notification_backend.' failed: '.$exception->getMessage();
 						// try next backend
-						if($action == 'fail' || $action == 'continue') {
+						if($action == 'fail' || $action == 'continue')
+						{
 							continue;
 						}
 						break; // stop running through chain
 					}
 					// backend sucseeded
 					$user_notified = true;
-					if($action == 'stop' || $action == 'fail') { break; } // stop running through chain
+					if($action == 'stop' || $action == 'fail')
+					{
+break; } // stop running through chain
 				}
 				// check if the user has been notified at all
-				if(!$user_notified) {
+				if(!$user_notified)
+				{
 					/*error_log('Error: notification of receiver '.$receiver->handle.' failed for the following reasons:');
 					foreach($backend_errors as $id=>$backend_error) {
 						error_log($backend_error);
 					}*/
 					$error = implode(', ', $backend_errors);
-					if (stripos($error, (string)$receiver->handle) !== false) $error = $receiver->handle.': '.$error;
+					if (stripos($error, (string)$receiver->handle) !== false)
+					{
+						$error = $receiver->handle.': '.$error;
+					}
 					self::$errors[] = $error;
 				}
 			}
@@ -618,23 +709,35 @@ 
 	 * @param string $_message_popup
 	 * @return plain and html message in one array, $messages['plain'] and $messages['html'] and, if exists $messages['popup']
 	 */
-	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '') {
-		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup)) { return false; } // no message set
+	private function create_messages($_message_plain = '', $_message_html = '', $_message_popup = '')
+	{
+		if(empty($_message_plain) && empty($_message_html) && empty($_message_popup))
+		{
+return false; } // no message set
 		$messages = array();
 
 		// create the messages
-		if(!empty($_message_plain)) {
+		if(!empty($_message_plain))
+		{
 			$messages['plain'] = $_message_plain;
-		} else {
+		}
+		else
+		{
 			$messages['plain'] = Api\Mail\Html::convertHTMLToText($_message_html, false, true);
 		}
 
-		if(!empty($_message_html)) {
+		if(!empty($_message_html))
+		{
 			$messages['html'] = $_message_html;
-		} else {
+		}
+		else
+		{
 			$messages['html'] = self::plain2html($_message_plain);
 		}
-		if (!empty($_message_popup)) $messages['popup']=$_message_popup;
+		if (!empty($_message_popup))
+		{
+			$messages['popup']=$_message_popup;
+		}
 		return $messages;
 	}
 
@@ -656,10 +759,14 @@ 
 	 * @param string $_prepend just a plain message to prepend, no html!
 	 * @return plain and html message in one array including the prepended message, $messages['plain'] and $messages['html']
 	 */
-	 private function prepend_message(array $_messages, $_prepend = null) {
-		if(strlen($_prepend) > 0) {
-			foreach($_messages as $key => $value) {
-				switch($key) {
+	 private function prepend_message(array $_messages, $_prepend = null)
+	 {
+		if(strlen($_prepend) > 0)
+		{
+			foreach($_messages as $key => $value)
+			{
+				switch($key)
+				{
 					case 'plain':
 						$_messages[$key] = $_prepend."\n\n".$value;
 						break;
@@ -686,14 +793,19 @@ 
 	private function get_addresspart($_address, $_part='email')
 	{
 		$parts = null;
-	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts)) { // _address contains a fullname part
+	 	if(strpos($_address,'<') && preg_match('/^(.*)\S?\<(.*)\>/',$_address, $parts))
+	 	{
+// _address contains a fullname part
 	 		$fullname = trim(trim($parts[1]),'\"');
 	 		$email = $parts[2];
-	 	} else {
+	 	}
+	 	else
+	 	{
 	 		$fullname = false;
 	 		$email = $_address;
 	 	}
-	 	switch($_part) {
+	 	switch($_part)
+	 	{
 	 		case 'fullname':
 	 			return $fullname;
 	 		case 'email':
@@ -712,11 +824,14 @@ 
 	 * @param string $_output one of: 'routing' or 'human', defaults to 'routing'
 	 * @return array containing notification chains, output like given in $_output
 	 */
-	public function get_available_chains($_output = 'routing') {
+	public function get_available_chains($_output = 'routing')
+	{
 		// determine enabled backends from Api\Config
 		$enabled_backends = array();
-		foreach($this->backends as $backend) {
-			switch($backend) {
+		foreach($this->backends as $backend)
+		{
+			switch($backend)
+			{
 				case 'email':
 				case 'popup':
 				case 'jpopup':
@@ -731,17 +846,24 @@ 
 
 		$enabled_chains = array();
 		$disabled_chains = array();
-		foreach($this->notification_chains as $key => $chain) {
+		foreach($this->notification_chains as $key => $chain)
+		{
 			$allow_chain = true;
-			if(is_array($chain)) {
-				foreach(array_keys($chain) as $name) {
-					if(!$enabled_backends[$name]) {
+			if(is_array($chain))
+			{
+				foreach(array_keys($chain) as $name)
+				{
+					if(!$enabled_backends[$name])
+					{
 						$allow_chain = false; // disable whole chain if one backend is disabled
 					}
 				}
-				if($allow_chain) {
+				if($allow_chain)
+				{
 					$enabled_chains[$key] = $chain;
-				} else {
+				}
+				else
+				{
 					$disabled_chains[$key] = $chain;
 				}
 			}
@@ -754,15 +876,18 @@ 
 		// create the 'all' chain from the enabled backends
 		$chain_all = array();
 		$backend_count = 1;
-		foreach($enabled_backends as $backend => $enabled) {
-			if($enabled) {
+		foreach($enabled_backends as $backend => $enabled)
+		{
+			if($enabled)
+			{
 				$chain_all[$backend] = count($enabled_backends) == $backend_count ? 'stop' : 'continue';
 			}
 			$backend_count++;
 		}
 		$common_chains['all'] = $chain_all;
 
-		switch($_output) {
+		switch($_output)
+		{
 			case 'human':
 				$chain_groups = array(
 					lang('Common chains')	=> 'common_chains',
@@ -771,20 +896,27 @@ 
 					);
 				$suffix = '_human';
 				// create descriptions for each chain key in each group
-				foreach($chain_groups as $name => $arr_name) {
+				foreach($chain_groups as $name => $arr_name)
+				{
 					${$arr_name.$suffix} = array();
-					foreach(array_keys(${$arr_name}) as $key) {
-						if($arr_name == 'disabled_chains') {
+					foreach(array_keys(${$arr_name}) as $key)
+					{
+						if($arr_name == 'disabled_chains')
+						{
 							${$arr_name.$suffix}[$key] = '('.lang('Disabled').') '.lang($this->chains_descriptions[$key]);
-						} else {
+						}
+						else
+						{
 							${$arr_name.$suffix}[$key] = lang($this->chains_descriptions[$key]);
 						}
 					}
 				}
 				// summarize all groups with minimum one chain to the final array
 				$chains_final = array();
-				foreach($chain_groups as $name => $arr_name) {
-					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0) {
+				foreach($chain_groups as $name => $arr_name)
+				{
+					if(is_array(${$arr_name.$suffix}) && count(${$arr_name.$suffix}) > 0)
+					{
 						$chains_final[$name] = ${$arr_name.$suffix};
 					}
 				}
@@ -803,10 +935,13 @@ 
 	 *
 	 * @param settings array with keys account_id and new_owner (new_owner is optional)
 	 */
-	public function deleteaccount($settings) {
-		foreach($this->backends as $backend) {
+	public function deleteaccount($settings)
+	{
+		foreach($this->backends as $backend)
+		{
 			$backend_hook = array(self::_appname.'_'.$backend,'deleteaccount');
-			if (is_callable($backend_hook)) {
+			if (is_callable($backend_hook))
+			{
 				call_user_func($backend_hook,$settings);
 			}
 		}
@@ -820,7 +955,8 @@ 
 	 * @param array $_data
 	 * @return boolean
 	 */
-	public function set_popupdata($_appname, $_data) {
+	public function set_popupdata($_appname, $_data)
+	{
 		$this->popup_data = array(
 			'appname' => $_appname,
 			'data' => $_data

status.php

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
  * @version $Id$
  */
 // forward for not existing or empty header to setup
-if(!file_exists('header.inc.php') || !filesize('header.inc.php'))
+if (!file_exists('header.inc.php') || !filesize('header.inc.php'))
 {
 	Header('Location: setup/index.php');
 	exit;