EGroupware / egroupware

mail/inc/class.mail_acl.inc.php

Doc Comments -2 removed lines

@@ -277,8 +277,6 @@
 	 * Update ACL rights of a folder or including subfolders for an account(s)
 	 *
 	 * @param array $content content including the acl rights
-	 * @param Boolean $recursive boolean flag FALSE|TRUE. If it is FALSE, only the folder take in to account, but in case of TRUE
-	 *		the mailbox including all its subfolders will be considered.
 	 * @param string $msg Message
 	 *
 	 */

Braces +28 added lines, -8 removed lines

@@ -97,7 +97,10 @@ 
 			//Todo: Implement autocomplete_url function with admin stuffs consideration
 		}
 		// Unset the content if folder is changed, in order to read acl rights for new selected folder
-		if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete'])) unset($content);
+		if (!is_array($content['button']) && is_array($content['mailbox']) && !is_array($content['grid']['delete']))
+		{
+			unset($content);
+		}
 
 		if (!is_array($content))
 		{
@@ -172,7 +175,9 @@ 
 
 						//Add new row at the end
 						if ($content['grid'][count($content['grid'])]['acc_id'])
-							array_push($content['grid'], array('acc_id'=>''));
+						{
+													array_push($content['grid'], array('acc_id'=>''));
+						}
 					}
 					else
 					{
@@ -180,7 +185,10 @@ 
 					}
 					//Send message
 					Framework::message($msg);
-					if ($button == "apply") break;
+					if ($button == "apply")
+					{
+						break;
+					}
 					Framework::window_close();
 					exit;
 
@@ -304,8 +312,16 @@ 
 				if ($value[$key] == true)
 				{
 					$right = explode("acl_" ,$key);
-					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
-					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
+					if ($right[1] === 'c')
+					{
+						$right[1] = 'kx';
+					}
+					// c = kx , rfc 4314
+					if ($right[1] === 'd')
+					{
+						$right[1] = 'et';
+					}
+					// d = et , rfc 4314
 					$options['rights'] .=  $right[1];
 				}
 			}
@@ -351,7 +367,7 @@ 
 	function retrieve_acl ($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
-		 {
+		{
 			$msg = lang('ACL rights retrieved successfully');
 			return $acl;
 		 }
@@ -374,7 +390,10 @@ 
 	function remove_acl($content, &$msg)
 	{
 		$row_num = array_keys($content['grid']['delete'],"pressed");
-		if ($row_num) $row_num = $row_num[0];
+		if ($row_num)
+		{
+			$row_num = $row_num[0];
+		}
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = self::_extract_acc_id($content['grid'][$row_num]['acc_id']);
 		$content['mailbox'] = is_array($content['mailbox'])? $content['mailbox'][0] : $content['mailbox'];
@@ -514,7 +533,8 @@ 
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
-		} catch (Exception $e) {
+		}
+		catch (Exception $e) {
 			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . "." .$e->getMessage());
 			return false;
 		}

Spacing +43 added lines, -44 removed lines

@@ -83,13 +83,13 @@ 
 	 *
 	 */
 	var $aclRightsAbbrvs = array(
-		'lrs'		=> array('label'=>'readable','title'=>'Allows a user to read the contents of the mailbox.'),
-		'lprs'		=> array('label'=>'post','title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
-		'ilprs'		=> array('label'=>'append','title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
-		'ilprsw'	=> array('label'=>'write','title'=>'Allows a user to read and write the maibox, post to it, append messages to it.'),
-		'eilprswtk'	=> array('label'=>'write & delete','title'=>'Allows a user to read, write and create folders and mails, post to it, append messages to it and delete messages.'),
-		'aeiklprstwx'=> array('label'=>'all','title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
-		'custom'	=> array('label'=>'custom','title'=>'User defined combination of rights for the ACL'),
+		'lrs'		=> array('label'=>'readable', 'title'=>'Allows a user to read the contents of the mailbox.'),
+		'lprs'		=> array('label'=>'post', 'title'=>'Allows a user to read the mailbox and post to it through the delivery system by sending mail to the submission address of the mailbox.'),
+		'ilprs'		=> array('label'=>'append', 'title'=>'Allows a user to read the mailbox and append messages to it, either via IMAP or through the delivery system.'),
+		'ilprsw'	=> array('label'=>'write', 'title'=>'Allows a user to read and write the maibox, post to it, append messages to it.'),
+		'eilprswtk'	=> array('label'=>'write & delete', 'title'=>'Allows a user to read, write and create folders and mails, post to it, append messages to it and delete messages.'),
+		'aeiklprstwx'=> array('label'=>'all', 'title'=>'The user has all possible rights on the mailbox. This is usually granted to users only on the mailboxes they own.'),
+		'custom'	=> array('label'=>'custom', 'title'=>'User defined combination of rights for the ACL'),
 	);
 
 	/**
@@ -112,12 +112,12 @@ 
 	 * @param string $msg = ''
 	 *
 	 */
-	function edit(array $content=null ,$msg='')
+	function edit(array $content = null, $msg = '')
 	{
 		$tmpl = new Etemplate('mail.acl');
 		if (!is_array($content))
 		{
-			$acc_id = $_GET['acc_id']?$_GET['acc_id']:$GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
+			$acc_id = $_GET['acc_id'] ? $_GET['acc_id'] : $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'];
 			if (isset($_GET['account_id']) && !isset($GLOBALS['egw_info']['user']['apps']['admin']))
 			{
 				Framework::window_close(lang('Permission denied'));
@@ -132,8 +132,7 @@ 
 		$account = Mail\Account::read($acc_id, $account_id);
 		$this->imap = $account->imapServer(isset($account_id) ? (int)$account_id : false);
 
-		$mailbox = $_GET['mailbox']? base64_decode($_GET['mailbox']):
-			preg_replace("/^".$acc_id."::/",'',$content['mailbox'][0]);
+		$mailbox = $_GET['mailbox'] ? base64_decode($_GET['mailbox']) : preg_replace("/^".$acc_id."::/", '', $content['mailbox'][0]);
 		if (empty($mailbox))
 		{
 			$mailbox = $this->imap->isAdminConnection ? $this->imap->getUserMailboxString($account_id) : 'INBOX';
@@ -168,14 +167,14 @@ 
 
 					foreach ($rights as $right)
 					{
-						$content['grid'][$n]['acl_'. $right] = true;
+						$content['grid'][$n]['acl_'.$right] = true;
 					}
-					$virtualD = array('e','t');
-					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'],array_intersect($rights,$virtuals['c']))? false: true; //c=kx more information rfc4314, Obsolote Rights
-					$content['grid'][$n]['acl_d'] = array_diff($virtualD,array_intersect($rights,$virtuals['d']))? false: true; //d=et more information rfc4314, Obsolote Rights
+					$virtualD = array('e', 't');
+					$content['grid'][$n]['acl_c'] = array_diff($virtuals['c'], array_intersect($rights, $virtuals['c'])) ? false: true; //c=kx more information rfc4314, Obsolote Rights
+					$content['grid'][$n]['acl_d'] = array_diff($virtualD, array_intersect($rights, $virtuals['d'])) ? false: true; //d=et more information rfc4314, Obsolote Rights
 
 					sort($rights);
-					$acl_abbrvs = implode('',$rights);
+					$acl_abbrvs = implode('', $rights);
 
 					if (array_key_exists($acl_abbrvs, $this->aclRightsAbbrvs))
 					{
@@ -216,7 +215,7 @@ 
 				case 'apply':
 					if ($content)
 					{
-						$validation_err = $this->update_acl($content,$msg);
+						$validation_err = $this->update_acl($content, $msg);
 						if ($validation_err)
 						{
 							foreach ($validation_err as &$row)
@@ -247,7 +246,7 @@ 
 					}
 					else
 					{
-						error_log(__METHOD__.__LINE__. "()" . "The remove_acl suppose to return an array back, something is wrong there");
+						error_log(__METHOD__.__LINE__."()"."The remove_acl suppose to return an array back, something is wrong there");
 					}
 					Framework::message($msg);
 			}
@@ -256,7 +255,7 @@ 
 		$sel_options['acl'] = $this->aclRightsAbbrvs;
 
 		//Make the account owner's fields all readonly as owner has all rights and should not be able to change them
-		foreach($content['grid'] as $key => $fields)
+		foreach ($content['grid'] as $key => $fields)
 		{
 			if (self::_extract_acc_id($fields['acc_id']) == $this->imap->acc_imap_username ||
 					$this->imap->getMailBoxUserName(self::_extract_acc_id($fields['acc_id'])) == $this->imap->acc_imap_username)
@@ -295,7 +294,7 @@ 
 			));
 		}
 
-		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv,2);
+		$tmpl->exec('mail.mail_acl.edit', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -314,7 +313,7 @@ 
 		$mailbox = $imap->isAdminConnection ? $imap->getUserMailboxString($imap->isAdminConnection) : 'INBOX';
 
 		$folders = array();
-		foreach(self::getSubfolders($mailbox, $imap) as $folder)
+		foreach (self::getSubfolders($mailbox, $imap) as $folder)
 		{
 			if (stripos($folder, $_GET['query']) !== false)
 			{
@@ -342,7 +341,7 @@ 
 	 * @param string $msg Message
 	 *
 	 */
-	function update_acl ($content, &$msg)
+	function update_acl($content, &$msg)
 	{
 		$validator = array();
 
@@ -358,10 +357,10 @@ 
 			{
 				if ($value[$key] == true)
 				{
-					$right = explode("acl_" ,$key);
+					$right = explode("acl_", $key);
 					if ($right[1] === 'c') $right[1] = 'kx'; // c = kx , rfc 4314
 					if ($right[1] === 'd') $right[1] = 'et'; // d = et , rfc 4314
-					$options['rights'] .=  $right[1];
+					$options['rights'] .= $right[1];
 				}
 			}
 			$username = self::_extract_acc_id($content['grid'][$keys]['acc_id']);
@@ -374,7 +373,7 @@ 
 			if (!empty($username))
 			{
 				//error_log(__METHOD__."() setACL($content[mailbox], $username, ".array2string($options).", $recursive)");
-				if (($ret=$this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
+				if (($ret = $this->setACL($content['mailbox'], $username, $options, $recursive, $msg)))
 				{
 					$msg = lang("The Folder %1 's ACLs saved", $content['mailbox']);
 
@@ -386,7 +385,7 @@ 
 			}
 			else
 			{
-				if($keys !== count($content['grid']))
+				if ($keys !== count($content['grid']))
 				{
 					array_push($validator, $keys);
 					$msg = lang("Could not save the ACL because some names are empty");
@@ -403,7 +402,7 @@ 
 	 * Retrieve Folder ACL rights
 	 * @todo rights 'c' and 'd' should be fixed
 	 */
-	function retrieve_acl ($mailbox, &$msg)
+	function retrieve_acl($mailbox, &$msg)
 	{
 		if (($acl = $this->getACL($mailbox)))
 		 {
@@ -429,34 +428,34 @@ 
 	 */
 	function remove_acl($content, &$msg)
 	{
-		$row_num = array_keys($content['grid']['delete'],"pressed");
+		$row_num = array_keys($content['grid']['delete'], "pressed");
 		if ($row_num) $row_num = $row_num[0];
 		$recursive = $content['grid'][$row_num]['acl_recursive'];
 		$identifier = self::_extract_acc_id($content['grid'][$row_num]['acc_id']);
-		$content['mailbox'] = is_array($content['mailbox'])? $content['mailbox'][0] : $content['mailbox'];
+		$content['mailbox'] = is_array($content['mailbox']) ? $content['mailbox'][0] : $content['mailbox'];
 		if (is_numeric($identifier) && ($u = $this->imap->getMailBoxUserName($identifier)))
 		{
 			$identifier = $u;
 		}
 		//error_log(__METHOD__.__LINE__."(".$content['mailbox'].", ".$identifier.", ".$recursive.")");
-		if(($res = $this->deleteACL($content['mailbox'], $identifier,$recursive)))
+		if (($res = $this->deleteACL($content['mailbox'], $identifier, $recursive)))
 		{
 			unset($content['grid'][$row_num]);
 			unset($content['grid']['delete']);
 			if ($recursive)
 			{
-				$msg = lang("The %1 's acl, including its subfolders, removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl, including its subfolders, removed from the %2", $content['mailbox'], $identifier);
 			}
 			else
 			{
-				$msg = lang("The %1 's acl removed from the %2",$content['mailbox'],$identifier);
+				$msg = lang("The %1 's acl removed from the %2", $content['mailbox'], $identifier);
 			}
 
 			return array_combine(range(1, count($content['grid'])), array_values($content['grid']));
 		}
 		else
 		{
-			$msg = lang("An error happend while trying to remove ACL rights from the account %1!",$identifier);
+			$msg = lang("An error happend while trying to remove ACL rights from the account %1!", $identifier);
 			return false;
 		}
 	}
@@ -471,7 +470,7 @@ 
 	 *
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success
 	 */
-	function deleteACL ($mailbox, $identifier, $recursive)
+	function deleteACL($mailbox, $identifier, $recursive)
 	{
 		if ($recursive)
 		{
@@ -481,7 +480,7 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
@@ -489,7 +488,7 @@ 
 			}
 			catch (Exception $e)
 			{
-				error_log(__METHOD__. "Could not delete ACL rights of folder " . $mailbox . " for account ". $identifier ."." .$e->getMessage());
+				error_log(__METHOD__."Could not delete ACL rights of folder ".$mailbox." for account ".$identifier.".".$e->getMessage());
 				return false;
 			}
 		}
@@ -532,7 +531,7 @@ 
 	 * @return Boolean FALSE in case of any exceptions and TRUE in case of success,
 	 *
 	 */
-	function setACL($mailbox, $identifier,$options, $recursive, &$msg)
+	function setACL($mailbox, $identifier, $options, $recursive, &$msg)
 	{
 		if ($recursive)
 		{
@@ -542,16 +541,16 @@ 
 		{
 			$folders = (array)$mailbox;
 		}
-		foreach($folders as $sbFolders)
+		foreach ($folders as $sbFolders)
 		{
 			try
 			{
-				$this->imap->setACL($sbFolders,$identifier,$options);
+				$this->imap->setACL($sbFolders, $identifier, $options);
 			}
 			catch (Exception $e)
 			{
 				$msg = $e->getMessage();
-				error_log(__METHOD__. "Could not set ACL rights on folder " . $mailbox . " for account ". $identifier . "." .$e->getMessage());
+				error_log(__METHOD__."Could not set ACL rights on folder ".$mailbox." for account ".$identifier.".".$e->getMessage());
 				return false;
 			}
 		}
@@ -564,14 +563,14 @@ 
 	 * @param String $mailbox folder name that needs to be read
 	 * @return Boolean FALSE in case of any exceptions and if TRUE in case of success,
 	 */
-	function getACL ($mailbox)
+	function getACL($mailbox)
 	{
 		try
 		{
 			$acl = $this->imap->getACL($mailbox);
 			return $acl;
 		} catch (Exception $e) {
-			error_log(__METHOD__. "Could not get ACL rights from folder " . $mailbox . "." .$e->getMessage());
+			error_log(__METHOD__."Could not get ACL rights from folder ".$mailbox.".".$e->getMessage());
 			return false;
 		}
 	}
@@ -583,8 +582,8 @@ 
 	 *
 	 * @return string returns acc_id in flat format
 	 */
-	private static function _extract_acc_id ($acc_id)
+	private static function _extract_acc_id($acc_id)
 	{
-		return is_array($acc_id)?$acc_id[0]:$acc_id;
+		return is_array($acc_id) ? $acc_id[0] : $acc_id;
 	}
 }

mail/inc/class.mail_sieve.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -1278,7 +1278,7 @@
 	 * int $_searchStringLength
 	 * @param boolean $_returnList
 	 * @param int $_mailaccountToSearch
-	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
+	 * @param boolean $_noPrefixId = false, if set to true folders name does not get prefixed by account id
 	 */
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
 	{

Indentation +6 added lines, -6 removed lines

@@ -275,7 +275,7 @@ 
 
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
 			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
-            $error = 0;
+			$error = 0;
 			switch ($button)
 			{
 				case 'save':
@@ -1202,7 +1202,7 @@ 
 	/**
 	 *
 	 * Get the data for iterating the rows on rules list grid
- 	 *
+	 *
 	 * @return {boolean|array} Array of rows | false if failed
 	 */
 	function get_rows()
@@ -1222,7 +1222,7 @@ 
 				{
 					$row['class'] = 'mail_sieve_DISABLED';
 				}
-            }
+			}
 		}
 		else
 		{
@@ -1247,7 +1247,7 @@ 
 				'caption' => 'Edit',
 				'default' => true,
 				'onExecute' => 'javaScript:app.mail.action',
-                'disableClass' => 'th'
+				'disableClass' => 'th'
 			),
 			'add' => array(
 				'caption' => 'Add',
@@ -1257,13 +1257,13 @@ 
 				'caption' => 'Enable',
 				'onExecute' => 'javaScript:app.mail.action',
 				'enableClass' => 'mail_sieve_DISABLED',
-                'hideOnDisabled' => true
+				'hideOnDisabled' => true
 			),
 			'disable' => array(
 				'caption' => 'Disable',
 				'onExecute' => 'javaScript:app.mail.action',
 				'disableClass' => 'mail_sieve_DISABLED',
-                'hideOnDisabled' => true
+				'hideOnDisabled' => true
 			),
 			'delete' => array(
 				'caption' => 'Delete',

Braces +39 added lines, -11 removed lines

@@ -305,11 +305,21 @@ 
 						unset($newRule['action_reject_text']);
 
 						$newRule['flg'] = 0 ;
-						if( $newRule['continue'] ) { $newRule['flg'] += 1; }
-						if( $newRule['gthan'] )    { $newRule['flg'] += 2; }
-						if( $newRule['anyof'] )    { $newRule['flg'] += 4; }
-						if( $newRule['keep'] )     { $newRule['flg'] += 8; }
-						if( $newRule['regexp'] )   { $newRule['flg'] += 128; }
+						if( $newRule['continue'] )
+						{
+$newRule['flg'] += 1; }
+						if( $newRule['gthan'] )
+						{
+$newRule['flg'] += 2; }
+						if( $newRule['anyof'] )
+						{
+$newRule['flg'] += 4; }
+						if( $newRule['keep'] )
+						{
+$newRule['flg'] += 8; }
+						if( $newRule['regexp'] )
+						{
+$newRule['flg'] += 128; }
 
 						if($newRule['action'] && $this->rulesByID['priority'])
 						{
@@ -443,7 +453,10 @@ 
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
-		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
+		if (is_null($accountID))
+		{
+			$accountID = $GLOBALS['egw_info']['user']['account_id'];
+		}
 
 		$account_email =  Api\Accounts::id2name($accountID, 'account_email');
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
@@ -484,7 +497,10 @@ 
 		$vtmpl = new Etemplate('mail.sieve.vacation');
 		$vacation = array();
 
-		if (isset($_GET['account_id'])) $account_id = $preserv['account_id'] = $_GET['account_id'];
+		if (isset($_GET['account_id']))
+		{
+			$account_id = $preserv['account_id'] = $_GET['account_id'];
+		}
 
 		if (isset($content['account_id']))
 		{
@@ -554,7 +570,10 @@ 
 				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text']))==0 && in_array($content['status'],array('on','by_date'))))
 				{
 					$content = $vacation = $vacRules['vacation'];
-					if (!empty($profileID)) $content['acc_id'] = $profileID;
+					if (!empty($profileID))
+					{
+						$content['acc_id'] = $profileID;
+					}
 					if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
 					{
 						$content['addresses'] = $vacRules['aliases'];
@@ -567,7 +586,10 @@ 
 					{
 						$content['forwards'] = '';
 					}
-					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
+					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text'])
+					{
+						$content['text'] = $this->mailConfig['default_vacation_text'];
+					}
 					if (strlen(trim($content['text']))==0)
 					{
 						$content['msg'] = $msg = lang('error').': '.lang('No vacation notice text provided. Please enter a message.');
@@ -757,7 +779,10 @@ 
 		}
 		// setting up an async job to enable/disable the vacation message
 		$async = new Api\Asyncservice();
-		if (empty($_vacation['account_id'])) $_vacation['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+		if (empty($_vacation['account_id']))
+		{
+			$_vacation['account_id'] = $GLOBALS['egw_info']['user']['account_id'];
+		}
 		$async_id = !empty($_vacation['id']) ? $_vacation['id'] : 'mail-vacation-'.$_vacation['account_id'];
 		$async->delete($async_id);
 
@@ -1294,7 +1319,10 @@ 
 	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
 	{
 		$mailCompose = new mail_compose();
-		if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];
+		if ($_REQUEST['noPrefixId'])
+		{
+			$_noPrefixId = $_REQUEST['noPrefixId'];
+		}
 		$mailCompose->ajax_searchFolder($_searchStringLength, $_returnList, $_mailaccountToSearch, $_noPrefixId);
 	}
 }

Spacing +140 added lines, -140 removed lines

@@ -74,8 +74,8 @@ 
 		if ($acc_id > 0)
 		{
 			$this->account = Mail\Account::read($acc_id);
-			$identity = Mail\Account::read_identity($this->account->ident_id,true);
-			$this->currentIdentity = Mail::generateIdentityString($identity,false);
+			$identity = Mail\Account::read_identity($this->account->ident_id, true);
+			$this->currentIdentity = Mail::generateIdentityString($identity, false);
 		}
 
 		$this->restoreSessionData();
@@ -87,7 +87,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function index(array $content=null,$msg=null)
+	function index(array $content = null, $msg = null)
 	{
 		if (!is_array($content))
 		{
@@ -104,10 +104,10 @@ 
 		if ($this->account->acc_sieve_enabled)
 		{
 			//Initializes the Grid contents
-			$content['rg']= $this->get_rows();
+			$content['rg'] = $this->get_rows();
 
 			// Set content-menu actions
-			$tmpl->setElementAttribute('rg', 'actions',$this->get_actions());
+			$tmpl->setElementAttribute('rg', 'actions', $this->get_actions());
 
 			$sel_options = array(
 				'status' => array(
@@ -118,10 +118,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $this->account->acc_id);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$tmpl->exec('mail.mail_sieve.index',$content,$sel_options,array());
+		$tmpl->exec('mail.mail_sieve.index', $content, $sel_options, array());
 	}
 
 	/**
@@ -131,7 +131,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function editEmailNotification($content=null, $msg='')
+	function editEmailNotification($content = null, $msg = '')
 	{
 		//Instantiate an eTemplate object, representing sieve.emailNotification
 		$eNotitmpl = new Etemplate('mail.sieve.emailNotification');
@@ -146,7 +146,7 @@ 
 
 				if (!empty($eNotification['externalEmail']))
 				{
-					$content['externalEmail'] = explode(",",$eNotification['externalEmail']);
+					$content['externalEmail'] = explode(",", $eNotification['externalEmail']);
 				}
 			}
 			else
@@ -155,7 +155,7 @@ 
 				list($button) = @each($content['button']);
 				unset ($content['button']);
 
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -163,11 +163,11 @@ 
 						{
 							$newEmailNotification = $content;
 							if (empty($this->mailConfig['prefpreventforwarding']) ||
-								$this->mailConfig['prefpreventforwarding'] == 0 )
+								$this->mailConfig['prefpreventforwarding'] == 0)
 							{
 								if (is_array($content['externalEmail']) && !empty($content['externalEmail']))
 								{
-									$newEmailNotification['externalEmail'] = implode(",",$content['externalEmail']);
+									$newEmailNotification['externalEmail'] = implode(",", $content['externalEmail']);
 								}
 							}
 						}
@@ -215,10 +215,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$this->account->acc_id);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $this->account->acc_id);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content,$sel_options);
+		$eNotitmpl->exec('mail.mail_sieve.editEmailNotification', $content, $sel_options);
 	}
 
 	/**
@@ -226,18 +226,18 @@ 
 	 *
 	 * @param {array} $content
 	 */
-	function edit ($content=null)
+	function edit($content = null)
 	{
 		//Instantiate an eTemplate object, representing sieve.edit template
 		$etmpl = new Etemplate('mail.sieve.edit');
-		$etmpl->setElementAttribute('action_folder_text','autocomplete_params', array('noPrefixId'=> true));
+		$etmpl->setElementAttribute('action_folder_text', 'autocomplete_params', array('noPrefixId'=> true));
 		if (!is_array($content))
 		{
-			if ( $this->getRules($_GET['ruleID']) && isset($_GET['ruleID']))
+			if ($this->getRules($_GET['ruleID']) && isset($_GET['ruleID']))
 			{
 
 				$rules = $this->rulesByID;
-				$content= $rules;
+				$content = $rules;
 				$content ['ruleID'] = $_GET['ruleID'];
 				switch ($rules['action'])
 				{
@@ -257,7 +257,7 @@ 
 			{
 
 				$this->getRules(null);
-				$newRulePriority = count($this->rules)*2+1;
+				$newRulePriority = count($this->rules) * 2 + 1;
 				$newRules ['priority'] = $newRulePriority;
 				$newRules ['status'] = 'ENABLED';
 				$readonlys = array(
@@ -274,19 +274,19 @@ 
 			list($button) = @each($content['button']);
 
 			//$ruleID is calculated by priority from the selected rule and is an unique ID
-			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] -1) / 2;
+			$content['ruleID'] = $ruleID = ($this->rulesByID['priority'] - 1) / 2;
             $error = 0;
 			switch ($button)
 			{
 				case 'save':
 				case 'apply':
-					if($content)
+					if ($content)
 					{
 						unset($content['button']);
 
 						$newRule = $content;
-						$newRule['priority']	= $this->rulesByID['priority'];
-						$newRule['status']	= $this->rulesByID['status'];
+						$newRule['priority'] = $this->rulesByID['priority'];
+						$newRule['status'] = $this->rulesByID['status'];
 
 						switch ($content['action'])
 						{
@@ -304,14 +304,14 @@ 
 						unset($newRule['action_address_text']);
 						unset($newRule['action_reject_text']);
 
-						$newRule['flg'] = 0 ;
-						if( $newRule['continue'] ) { $newRule['flg'] += 1; }
-						if( $newRule['gthan'] )    { $newRule['flg'] += 2; }
-						if( $newRule['anyof'] )    { $newRule['flg'] += 4; }
-						if( $newRule['keep'] )     { $newRule['flg'] += 8; }
-						if( $newRule['regexp'] )   { $newRule['flg'] += 128; }
+						$newRule['flg'] = 0;
+						if ($newRule['continue']) { $newRule['flg'] += 1; }
+						if ($newRule['gthan']) { $newRule['flg'] += 2; }
+						if ($newRule['anyof']) { $newRule['flg'] += 4; }
+						if ($newRule['keep']) { $newRule['flg'] += 8; }
+						if ($newRule['regexp']) { $newRule['flg'] += 128; }
 
-						if($newRule['action'] && $this->rulesByID['priority'])
+						if ($newRule['action'] && $this->rulesByID['priority'])
 						{
 							$this->rules[$ruleID] = $newRule;
 							$ret = $this->account->imapServer()->setRules($this->rules);
@@ -321,7 +321,7 @@ 
 							}
 							else
 							{
-								$msg .= lang("The rule with priority %1 successfully saved!",$ruleID);
+								$msg .= lang("The rule with priority %1 successfully saved!", $ruleID);
 							}
 							$this->saveSessionData();
 						}
@@ -346,14 +346,14 @@ 
 				case 'delete':
 					if ($button == "delete")
 					{
-						if ($ruleID === count($this->rules)-1)
+						if ($ruleID === count($this->rules) - 1)
 						{
-							$msg = lang('rule with priority ') . $ruleID . lang(' deleted!');
+							$msg = lang('rule with priority ').$ruleID.lang(' deleted!');
 						}
 						else
 						{
 
-							$msg = lang('rule with priority ') . $ruleID . lang(' deleted!') . lang(' And the rule with priority %1, now got the priority %2',$ruleID+1,$ruleID);
+							$msg = lang('rule with priority ').$ruleID.lang(' deleted!').lang(' And the rule with priority %1, now got the priority %2', $ruleID + 1, $ruleID);
 						}
 						unset($this->rules[$ruleID]);
 						$this->rules = array_values($this->rules);
@@ -384,9 +384,9 @@ 
 		);
 
 		//Set the preselect_options for mail/folders as we are not allow free entry for folder taglist
-		$sel_options['action_folder_text'] = $this->ajax_getFolders(0,true,null,true);
+		$sel_options['action_folder_text'] = $this->ajax_getFolders(0, true, null, true);
 
-		return $etmpl->exec('mail.mail_sieve.edit',$content,$sel_options,$readonlys,array(),2);
+		return $etmpl->exec('mail.mail_sieve.edit', $content, $sel_options, $readonlys, array(), 2);
 	}
 
 	/**
@@ -398,7 +398,7 @@ 
 	 */
 	function getEmailNotification()
 	{
-		if(!(empty($this->mailConfig['prefpreventnotificationformailviaemail']) || $this->mailConfig['prefpreventnotificationformailviaemail'] == 0))
+		if (!(empty($this->mailConfig['prefpreventnotificationformailviaemail']) || $this->mailConfig['prefpreventnotificationformailviaemail'] == 0))
 		{
 			throw new Api\Exception\NoPermission();
 		}
@@ -406,7 +406,7 @@ 
 		try {
 			$emailNotification = $this->account->imapServer()->getEmailNotification();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			unset($e);
 			$emailNotification = array();
 		}
@@ -422,7 +422,7 @@ 
 	 */
 	function getVacation($accountID = null)
 	{
-		if(!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
+		if (!(empty($this->mailConfig['prefpreventabsentnotice']) || $this->mailConfig['prefpreventabsentnotice'] == 0))
 		{
 			throw new Api\Exception\NoPermission();
 		}
@@ -439,25 +439,25 @@ 
 				$vacation = $icServer->getVacation();
 			}
 		}
-		catch(Exception $e)
+		catch (Exception $e)
 		{
 			Framework::window_close(lang($e->getMessage()));
 		}
 		if (is_null($accountID)) $accountID = $GLOBALS['egw_info']['user']['account_id'];
 
-		$account_email =  Api\Accounts::id2name($accountID, 'account_email');
+		$account_email = Api\Accounts::id2name($accountID, 'account_email');
 		$accAllIdentities = $this->account->smtpServer()->getAccountEmailAddress(Api\Accounts::id2name($accountID));
-		$allAliases = $this->account->ident_email !=''?
+		$allAliases = $this->account->ident_email != '' ?
 				// Fix ident_email with no domain part set
 				array(Mail::fixInvalidAliasAddress($account_email, $this->account->ident_email))
 				: array();
 		foreach ($accAllIdentities as &$val)
 		{
-			if ($val['type'] !='default')
+			if ($val['type'] != 'default')
 			{
 				// if the alias has no domain part set try to add
 				// default domain extracted from ident_email address
-				$allAliases[] =  Mail::fixInvalidAliasAddress($account_email, $val['address']);
+				$allAliases[] = Mail::fixInvalidAliasAddress($account_email, $val['address']);
 			}
 		}
 		// try to fix already stored aliases
@@ -478,7 +478,7 @@ 
 	 * @param {array} $content
 	 * @param {string} $msg
 	 */
-	function editVacation($content=null, $msg='')
+	function editVacation($content = null, $msg = '')
 	{
 		//Instantiate an eTemplate object, representing the sieve.vacation template
 		$vtmpl = new Etemplate('mail.sieve.vacation');
@@ -491,27 +491,27 @@ 
 			$account_id = $content['account_id'];
 			$preserv['acc_id'] = $content['acc_id'];
 		}
-		if(isset($account_id) && $this->mail_admin)
+		if (isset($account_id) && $this->mail_admin)
 		{
-			foreach(Mail\Account::search($account_id, false, null, false, 0, false) as $account)
+			foreach (Mail\Account::search($account_id, false, null, false, 0, false) as $account)
 			{
 				try {
 					// check if account is valid for multiple users, has admin credentials and sieve enabled
 					if (Mail\Account::is_multiple($account) &&
-						($icServer = $account->imapServer(true)) &&	// check on icServer object, so plugins can overwrite
+						($icServer = $account->imapServer(true)) && // check on icServer object, so plugins can overwrite
 						$icServer->acc_imap_admin_username && $icServer->acc_sieve_enabled)
 					{
 						$allAccounts[$account->acc_id] = $account->acc_name;
 						$accounts[$account->acc_id] = $account;
 					}
 				}
-				catch(Exception $e) {
+				catch (Exception $e) {
 					unset($e);
 					// ignore broken accounts
 				}
 			}
 
-			$profileID = !isset($content['acc_id']) ? key($accounts):$content['acc_id'];
+			$profileID = !isset($content['acc_id']) ? key($accounts) : $content['acc_id'];
 			if (isset($_GET['acc_id']) && isset($allAccounts[$_GET['acc_id']]))
 			{
 				$profileID = $content['acc_id'] = (int)$_GET['acc_id'];
@@ -523,7 +523,7 @@ 
 			$this->is_admin_vac = true;
 			$preserv['account_id'] = $account_id;
 		}
-		elseif(!is_array($content) && isset($_GET['acc_id']))
+		elseif (!is_array($content) && isset($_GET['acc_id']))
 		{
 			$this->account = Mail\Account::read($_GET['acc_id']);
 			$preserv['acc_id'] = $this->account->acc_id;
@@ -539,11 +539,11 @@ 
 		if ($icServer->acc_sieve_enabled)
 		{
 			$vacRules = $this->getVacation($account_id);
-			if ($vacRules['vacation']===false)
+			if ($vacRules['vacation'] === false)
 			{
 				$content['msg'] = lang('error').':'.lang('Serverside Vacationnotice (via Sieve) are not activated').'. '.
-					lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
-				$content['hideIfSieveDisabled']='mail_DisplayNone';
+					lang('Please contact your Administrator to validate if your Server supports Serverside Vacationmessages, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $icServer->ImapServerId);
+				$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 			}
 			else
 			{
@@ -551,24 +551,24 @@ 
 				{
 					$ByDate = array('by_date' => lang('By date'));
 				}
-				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text']))==0 && in_array($content['status'],array('on','by_date'))))
+				if (!is_array($content) || ($content['acc_id'] && !isset($content['button'])) || (strlen(trim($content['text'])) == 0 && in_array($content['status'], array('on', 'by_date'))))
 				{
 					$content = $vacation = $vacRules['vacation'];
 					if (!empty($profileID)) $content['acc_id'] = $profileID;
-					if (empty($vacation['addresses']) || implode('',$vacation['addresses']) == '')
+					if (empty($vacation['addresses']) || implode('', $vacation['addresses']) == '')
 					{
 						$content['addresses'] = $vacRules['aliases'];
 					}
 					if (!empty($vacation['forwards']))
 					{
-						$content['forwards'] = explode(",",$vacation['forwards']);
+						$content['forwards'] = explode(",", $vacation['forwards']);
 					}
 					else
 					{
 						$content['forwards'] = '';
 					}
-					if (strlen(trim($vacation['text']))==0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
-					if (strlen(trim($content['text']))==0)
+					if (strlen(trim($vacation['text'])) == 0 && $this->mailConfig['default_vacation_text']) $content['text'] = $this->mailConfig['default_vacation_text'];
+					if (strlen(trim($content['text'])) == 0)
 					{
 						$content['msg'] = $msg = lang('error').': '.lang('No vacation notice text provided. Please enter a message.');
 						Framework::refresh_opener($msg, 'mail');
@@ -586,7 +586,7 @@ 
 					list($button) = @each($content['button']);
 					unset ($content['button']);
 
-					switch($button)
+					switch ($button)
 					{
 						case 'save':
 						case 'apply':
@@ -604,7 +604,7 @@ 
 								$newVacation = $content;
 
 								if (empty($this->mailConfig['prefpreventforwarding']) ||
-									$this->mailConfig['prefpreventforwarding'] == 0 )
+									$this->mailConfig['prefpreventforwarding'] == 0)
 								{
 									$content['forwards'] = self::strip_rfc882_addresses($content['forwards']);
 									$newVacation['forwards'] = implode(',', $content['forwards']);
@@ -614,7 +614,7 @@ 
 									unset($newVacation ['forwards']);
 								}
 
-								if (!in_array($newVacation['status'],array('on','off','by_date')))
+								if (!in_array($newVacation['status'], array('on', 'off', 'by_date')))
 								{
 									$newVacation['status'] = 'off';
 								}
@@ -626,7 +626,7 @@ 
 										self::strip_rfc882_addresses($content['addresses']);
 								}
 
-								if($this->checkRule($newVacation,$checkAddresses))
+								if ($this->checkRule($newVacation, $checkAddresses))
 								{
 									if (isset($account_id) && $this->mail_admin)
 									{
@@ -639,13 +639,13 @@ 
 
 									if (!$resSetvac)
 									{
-										$msg = lang('vacation update failed') . "\n" . lang('Vacation notice update failed') . ":" . $this->account->imapServer()->error;
+										$msg = lang('vacation update failed')."\n".lang('Vacation notice update failed').":".$this->account->imapServer()->error;
 										break;
 									}
 									// schedule job to switch message on/off, if request and not already in past
 									else
 									{
-										if ($newVacation['status'] == 'by_date' && $newVacation['end_date']+24*3600 > time() ||
+										if ($newVacation['status'] == 'by_date' && $newVacation['end_date'] + 24 * 3600 > time() ||
 											$vacRules && $vacRules['vacation']['status'] == 'by_date')
 										{
 											self::setAsyncJob($newVacation);
@@ -653,29 +653,29 @@ 
 										//Reset vacationNotice cache which is used in mail_ui get_rows
 										if (isset($account_id) && $this->mail_admin)
 										{
-											$account_lid = Api\Accounts::id2name($account_id,'account_lid');
+											$account_lid = Api\Accounts::id2name($account_id, 'account_lid');
 											$cachedVacations = array($icServer->acc_id => $newVacation) + (array)Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$account_lid);
 											//error_log(__METHOD__.__LINE__.' Setting Cache for '.$account_lid.':'.array2string($cachedVacations));
-											Api\Cache::setCache(Api\Cache::INSTANCE,'email', 'vacationNotice'.$account_lid, $cachedVacations);
+											Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$account_lid, $cachedVacations);
 										}
 										else
 										{
 											$cachedVacations = array($icServer->acc_id => $newVacation) + (array)Api\Cache::getCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid']);
 											//error_log(__METHOD__.__LINE__.' Setting Cache for own ('.$GLOBALS['egw_info']['user']['account_lid'].'):'.array2string($cachedVacations));
-											Api\Cache::setCache(Api\Cache::INSTANCE,'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
+											Api\Cache::setCache(Api\Cache::INSTANCE, 'email', 'vacationNotice'.$GLOBALS['egw_info']['user']['account_lid'], $cachedVacations);
 										}
 										$msg = lang('Vacation notice sucessfully updated.');
 									}
 								}
 								else
 								{
-									$msg .= implode("\n",$this->errorStack);
+									$msg .= implode("\n", $this->errorStack);
 								}
 								// refresh vacationNotice on index
 								$response = Api\Json\Response::get();
-								$response->call('app.mail.mail_callRefreshVacationNotice',$icServer->ImapServerId);
+								$response->call('app.mail.mail_callRefreshVacationNotice', $icServer->ImapServerId);
 								Framework::refresh_opener($msg, 'mail');
-								if ($button === 'apply' || $icServer->error !=="")
+								if ($button === 'apply' || $icServer->error !== "")
 								{
 									break;
 								}
@@ -691,7 +691,7 @@ 
 						'on' => lang('Active'),
 						'off' => lang('Deactive'),
 					),
-					'addresses' => array_combine($vacRules['aliases'],$vacRules['aliases']),
+					'addresses' => array_combine($vacRules['aliases'], $vacRules['aliases']),
 				);
 				if (!isset($account_id))
 				{
@@ -715,10 +715,10 @@ 
 		}
 		else
 		{
-			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.',$this->currentIdentity,$icServer->ImapServerId);
-			$content['hideIfSieveDisabled']='mail_DisplayNone';
+			$content['msg'] = lang('error').':'.lang('Serverside Filterrules (Sieve) are not activated').'. '.lang('Please contact your Administrator to validate if your Server supports Serverside Filterrules, and how to enable them in EGroupware for your active Account (%1) with ID:%2.', $this->currentIdentity, $icServer->ImapServerId);
+			$content['hideIfSieveDisabled'] = 'mail_DisplayNone';
 		}
-		$vtmpl->exec('mail.mail_sieve.editVacation',$content,$sel_options,$readonlys,$preserv,2);
+		$vtmpl->exec('mail.mail_sieve.editVacation', $content, $sel_options, $readonlys, $preserv, 2);
 	}
 
 	/**
@@ -732,7 +732,7 @@ 
 	static function strip_rfc882_addresses($_addresses)
 	{
 		$addresses = array();
-		foreach(Mail::parseAddressList($_addresses) as $addr)
+		foreach (Mail::parseAddressList($_addresses) as $addr)
 		{
 			if ($addr->valid)
 			{
@@ -749,7 +749,7 @@ 
 	 * @param boolean $_reschedule do nothing but reschedule the job by 3 minutes
 	 * @return  void
 	 */
-	static function setAsyncJob (array $_vacation, $_reschedule=false)
+	static function setAsyncJob(array $_vacation, $_reschedule = false)
 	{
 		if (!($_vacation['acc_id'] > 0))
 		{
@@ -761,19 +761,19 @@ 
 		$async_id = !empty($_vacation['id']) ? $_vacation['id'] : 'mail-vacation-'.$_vacation['account_id'];
 		$async->delete($async_id);
 
-		$end_date = $_vacation['end_date'] + 24*3600;   // end-date is inclusive, so we have to add 24h
+		$end_date = $_vacation['end_date'] + 24 * 3600; // end-date is inclusive, so we have to add 24h
 		if ($_vacation['status'] == 'by_date' && time() < $end_date && !$_reschedule)
 		{
 			$time = time() < $_vacation['start_date'] ? $_vacation['start_date'] : $end_date;
-			$async->set_timer($time,$async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
+			$async->set_timer($time, $async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
 		}
 		if ($_reschedule)
 		{
-			$_vacation['rescheduled'] = $_vacation['rescheduled'] ? 2*$_vacation['rescheduled'] : 5;
+			$_vacation['rescheduled'] = $_vacation['rescheduled'] ? 2 * $_vacation['rescheduled'] : 5;
 			// only try to reschedule for 2 days max
 			if ($_vacation['rescheduled'] <= 2 * 24 * 60)
 			{
-				$time = time() + 60*($_vacation['rescheduled']);
+				$time = time() + 60 * ($_vacation['rescheduled']);
 				unset($_vacation['next']);
 				unset($_vacation['times']);
 				$async->set_timer($time, $async_id, 'mail_sieve::async_vacation', $_vacation, $_vacation['account_id']);
@@ -809,7 +809,7 @@ 
 		}
 		catch (Exception $e) {
 			error_log(__METHOD__.'('.array2string($_vacation).' failed '.$e->getMessage());
-			self::setAsyncJob($_vacation, true);	// reschedule
+			self::setAsyncJob($_vacation, true); // reschedule
 			$ret = false;
 		}
 
@@ -824,7 +824,7 @@ 
 	 *
 	 * @return boolean
 	 */
-	function checkRule($_vacation,$_checkAddresses=true)
+	function checkRule($_vacation, $_checkAddresses = true)
 	{
 		$this->errorStack = array();
 
@@ -838,12 +838,12 @@ 
 			$this->errorStack['days'] = lang('Please select the number of days to wait between responses').'!';
 		}
 
-		if(is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
+		if (is_array($_vacation['addresses']) && !empty($_vacation['addresses']))
 		{
-			$regexp="/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
+			$regexp = "/^[a-z0-9]+([_\\.-][a-z0-9]+)*@([a-z0-9]+([\.-][a-z0-9]+)*)+\\.[a-z]{2,}$/i";
 			foreach ($_vacation['addresses'] as $addr)
 			{
-				if (!preg_match($regexp,$addr) && $_checkAddresses)
+				if (!preg_match($regexp, $addr) && $_checkAddresses)
 				{
 					$this->errorStack['addresses'] = lang('One address is not valid').'!';
 				}
@@ -859,23 +859,23 @@ 
 			{
 				$this->errorStack['status'] = lang('Activating by date requires a start- AND end-date!');
 			}
-			elseif($_vacation['start_date'] > $_vacation['end_date'])
+			elseif ($_vacation['start_date'] > $_vacation['end_date'])
 			{
 				$this->errorStack['status'] = lang('Vacation start-date must be BEFORE the end-date!');
 			}
 		}
 		if ($_vacation['forwards'])
 		{
-			foreach(preg_split('/, ?/',$_vacation['forwards']) as $addr)
+			foreach (preg_split('/, ?/', $_vacation['forwards']) as $addr)
 			{
-				if (!preg_match($regexp,$addr) && $_checkAddresses)
+				if (!preg_match($regexp, $addr) && $_checkAddresses)
 				{
 					$this->errorStack['forwards'] = lang('One address is not valid'.'!');
 				}
 			}
 		}
 		//error_log(__METHOD__. array2string($this->errorStack));
-		if(count($this->errorStack) == 0)
+		if (count($this->errorStack) == 0)
 		{
 			return true;
 		}
@@ -896,14 +896,14 @@ 
 
 		foreach ($orders as $keys => $val)
 		{
-			$orders[$keys] = $val -1;
+			$orders[$keys] = $val - 1;
 		}
 
 		$this->getRules(null);
 
 		$newrules = $this->rules;
 
-		foreach($orders as $keys => $ruleID)
+		foreach ($orders as $keys => $ruleID)
 		{
 			$newrules[$keys] = $this->rules[$ruleID];
 		}
@@ -932,24 +932,24 @@ 
 		switch ($action)
 		{
 			case 'delete':
-				if ($checked === count($this->rules)-1)
+				if ($checked === count($this->rules) - 1)
 				{
-					$msg = lang('rule with priority ') . $checked . lang(' deleted!');
+					$msg = lang('rule with priority ').$checked.lang(' deleted!');
 				}
 				else
 				{
 
-					$msg = lang('rule with priority ') . $checked . lang(' deleted!') . lang(' And the rule with priority %1, now got the priority %2',$checked+1,$checked);
+					$msg = lang('rule with priority ').$checked.lang(' deleted!').lang(' And the rule with priority %1, now got the priority %2', $checked + 1, $checked);
 				}
 				unset($this->rules[$checked]);
 				$this->rules = array_values($this->rules);
 				break;
 			case 'enable':
-				$msg = lang('rule with priority ') . $checked . lang(' enabled!');
+				$msg = lang('rule with priority ').$checked.lang(' enabled!');
 				$this->rules[$checked][status] = 'ENABLED';
 				break;
 			case 'disable':
-				$msg = lang('rule with priority ') . $checked . lang(' disabled!');
+				$msg = lang('rule with priority ').$checked.lang(' disabled!');
 				$this->rules[$checked][status] = 'DISABLED';
 				break;
 			case 'move':
@@ -961,7 +961,7 @@ 
 
 		$response = Api\Json\Response::get();
 
-		if($result)
+		if ($result)
 		{
 			$response->message($result);
 			return;
@@ -979,11 +979,11 @@ 
 	 */
 	function buildRule($rule)
 	{
-		$andor = ' '. lang('and') .' ';
+		$andor = ' '.lang('and').' ';
 		$started = 0;
 		if ($rule['anyof'])
 		{
-			$andor = ' '. lang('or') .' ';
+			$andor = ' '.lang('or').' ';
 		}
 		$complete = lang('IF').' ';
 		if ($rule['unconditional'])
@@ -992,8 +992,8 @@ 
 		}
 		if ($rule['from'])
 		{
-			$match = $this->setMatchType($rule['from'],$rule['regexp']);
-			$complete .= "'From:' " . $match . " '" . $rule['from'] . "'";
+			$match = $this->setMatchType($rule['from'], $rule['regexp']);
+			$complete .= "'From:' ".$match." '".$rule['from']."'";
 			$started = 1;
 		}
 		if ($rule['to'])
@@ -1002,8 +1002,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['to'],$rule['regexp']);
-			$complete .= "'To:' " . $match . " '" . $rule['to'] . "'";
+			$match = $this->setMatchType($rule['to'], $rule['regexp']);
+			$complete .= "'To:' ".$match." '".$rule['to']."'";
 			$started = 1;
 		}
 		if ($rule['subject'])
@@ -1012,8 +1012,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['subject'],$rule['regexp']);
-			$complete .= "'Subject:' " . $match . " '" . $rule['subject'] . "'";
+			$match = $this->setMatchType($rule['subject'], $rule['regexp']);
+			$complete .= "'Subject:' ".$match." '".$rule['subject']."'";
 			$started = 1;
 		}
 		if ($rule['field'] && $rule['field_val'])
@@ -1022,8 +1022,8 @@ 
 			{
 				$complete .= $andor;
 			}
-			$match = $this->setMatchType($rule['field_val'],$rule['regexp']);
-			$complete .= "'" . $rule['field'] . "' " . $match . " '" . $rule['field_val'] . "'";
+			$match = $this->setMatchType($rule['field_val'], $rule['regexp']);
+			$complete .= "'".$rule['field']."' ".$match." '".$rule['field_val']."'";
 			$started = 1;
 		}
 		if ($rule['size'])
@@ -1037,7 +1037,7 @@ 
 			{
 				$complete .= $andor;
 			}
-			$complete .= "message " . $xthan . $rule['size'] . "KB'";
+			$complete .= "message ".$xthan.$rule['size']."KB'";
 			$started = 1;
 		}
 		if (!empty($rule['field_bodytransform']))
@@ -1046,7 +1046,7 @@ 
 			{
 				$newruletext .= ", ";
 			}
-			$btransform	= " :raw ";
+			$btransform = " :raw ";
 			$match = ' :contains';
 			if ($rule['bodytransform'])
 			{
@@ -1060,11 +1060,11 @@ 
 			{
 				$match = ':regex';
 			}
-			$complete .= " body " . $btransform . $match . " \"" . $rule['field_bodytransform'] . "\"";
+			$complete .= " body ".$btransform.$match." \"".$rule['field_bodytransform']."\"";
 			$started = 1;
 
 		}
-		if ($rule['ctype']!= '0' && !empty($rule['ctype']))
+		if ($rule['ctype'] != '0' && !empty($rule['ctype']))
 		{
 			if ($started)
 			{
@@ -1076,7 +1076,7 @@ 
 			{
 				$ctype_subtype = "/";
 			}
-			$complete .= " body :content " . " \"" . $btransform_ctype . $ctype_subtype . $rule['field_ctype_val'] . "\"" . " :contains \"\"";
+			$complete .= " body :content "." \"".$btransform_ctype.$ctype_subtype.$rule['field_ctype_val']."\""." :contains \"\"";
 			$started = 1;
 			//error_log(__CLASS__."::".__METHOD__.array2string(Mail\Script::$btransform_ctype_array));
 		}
@@ -1084,19 +1084,19 @@ 
 		{
 			$complete .= ' '.lang('THEN').' ';
 		}
-		if (preg_match("/folder/i",$rule['action']))
+		if (preg_match("/folder/i", $rule['action']))
 		{
-			$complete .= lang('file into')." '" . $rule['action_arg'] . "';";
+			$complete .= lang('file into')." '".$rule['action_arg']."';";
 		}
-		if (preg_match("/reject/i",$rule['action']))
+		if (preg_match("/reject/i", $rule['action']))
 		{
-			$complete .= lang('reject with')." '" . $rule['action_arg'] . "'.";
+			$complete .= lang('reject with')." '".$rule['action_arg']."'.";
 		}
-		if (preg_match("/address/i",$rule['action']))
+		if (preg_match("/address/i", $rule['action']))
 		{
-			$complete .= lang('forward to').' ' . $rule['action_arg'] .'.';
+			$complete .= lang('forward to').' '.$rule['action_arg'].'.';
 		}
-		if (preg_match("/discard/i",$rule['action']))
+		if (preg_match("/discard/i", $rule['action']))
 		{
 			$complete .= lang('discard').'.';
 		}
@@ -1118,7 +1118,7 @@ 
 	 * @param {string} $regex regular expresion as pattern to be matched
 	 * @return {string} return the type
 	 */
-	function setMatchType (&$matchstr, $regex = false)
+	function setMatchType(&$matchstr, $regex = false)
 	{
 		$match = lang('contains');
 		if (preg_match("/^\s*!/", $matchstr))
@@ -1143,11 +1143,11 @@ 
 		}
 		if ($regex && preg_match("/^\s*\\\\!/", $matchstr))
 		{
-			$matchstr = preg_replace("/^\s*\\\\!/","!",$matchstr);
+			$matchstr = preg_replace("/^\s*\\\\!/", "!", $matchstr);
 		}
 		else
 		{
-			$matchstr = preg_replace("/^\s*!/","",$matchstr);
+			$matchstr = preg_replace("/^\s*!/", "", $matchstr);
 		}
 		return $match;
 	}
@@ -1157,9 +1157,9 @@ 
 	 */
 	function saveSessionData()
 	{
-		$sessionData['sieve_rules']		= $this->rules;
+		$sessionData['sieve_rules'] = $this->rules;
 		$sessionData['sieve_rulesByID'] = $this->rulesByID;
-		$sessionData['sieve_scriptToEdit']	= $this->scriptToEdit;
+		$sessionData['sieve_scriptToEdit'] = $this->scriptToEdit;
 		Api\Cache::setSession(__CLASS__, 'sieve_session_data', $sessionData);
 	}
 
@@ -1185,15 +1185,15 @@ 
 	{
 		try {
 			$this->account->imapServer()->retrieveRules();
-			$this->rules	= $this->account->imapServer()->getRules();
+			$this->rules = $this->account->imapServer()->getRules();
 			$this->rulesByID = $this->rules[$ruleID];
-			$this->vacation	= $this->account->imapServer()->getVacation();
+			$this->vacation = $this->account->imapServer()->getVacation();
 		}
-		catch(Exception $e) {
+		catch (Exception $e) {
 			error_log(__METHOD__.__LINE__.$e->getMessage().': '.$e->details);
-			$this->rules	= array();
+			$this->rules = array();
 			$this->rulesByID = array();
-			$this->vacation	= array();
+			$this->vacation = array();
 			return false;
 		}
 		return true;
@@ -1205,9 +1205,9 @@ 
 	function restoreSessionData()
 	{
 		$sessionData = Api\Cache::getSession(__CLASS__, 'sieve_session_data');
-		$this->rules		= $sessionData['sieve_rules'];
+		$this->rules = $sessionData['sieve_rules'];
 		$this->rulesByID = $sessionData['sieve_rulesByID'];
-		$this->scriptToEdit	= $sessionData['sieve_scriptToEdit'];
+		$this->scriptToEdit = $sessionData['sieve_scriptToEdit'];
 	}
 
 	/**
@@ -1221,14 +1221,14 @@ 
 		$rows = array();
 		$this->getRules(null);
 
-		if (is_array($this->rules) && !empty($this->rules) )
+		if (is_array($this->rules) && !empty($this->rules))
 		{
 			$rows = $this->rules;
 
-			foreach ($rows as &$row )
+			foreach ($rows as &$row)
 			{
 				$row['rules'] = $this->buildRule($row);
-				$row['ruleID'] =(string)(($row['priority'] -1) / 2 );
+				$row['ruleID'] = (string)(($row['priority'] - 1) / 2);
 				if ($row ['status'] === 'DISABLED')
 				{
 					$row['class'] = 'mail_sieve_DISABLED';
@@ -1241,7 +1241,7 @@ 
 			return false;
 		}
 		// Shift one down, because in grid the first row is reserved for header
-		array_unshift($rows,array(''=> ''));
+		array_unshift($rows, array(''=> ''));
 		return $rows;
 	}
 
@@ -1252,7 +1252,7 @@ 
 	 */
 	private function get_actions()
 	{
-		$actions =array(
+		$actions = array(
 
 			'edit' => array(
 				'caption' => 'Edit',
@@ -1291,7 +1291,7 @@ 
 	 * @param int $_mailaccountToSearch
 	 * @param boolean $_noPrefixID = false, if set to true folders name does not get prefixed by account id
 	 */
-	function ajax_getFolders ($_searchStringLength=2, $_returnList=false, $_mailaccountToSearch=null, $_noPrefixId=false)
+	function ajax_getFolders($_searchStringLength = 2, $_returnList = false, $_mailaccountToSearch = null, $_noPrefixId = false)
 	{
 		$mailCompose = new mail_compose();
 		if ($_REQUEST['noPrefixId']) $_noPrefixId = $_REQUEST['noPrefixId'];

mail/inc/class.mail_tree.inc.php

Doc Comments +5 added lines, -5 removed lines

@@ -76,7 +76,7 @@ 
 	 * @param string $_profileID icServer profile id
 	 * @param string $_err error message to be shown on tree node
 	 * @param mixed $_path
-	 * @param mixed $_parent
+	 * @param string $_parent
 	 * @return array returns an array of tree node
 	 */
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
@@ -123,7 +123,7 @@ 
 	/**
 	 * Check if the given tree id is account node (means root)
 	 *
-	 * @param type $_node a tree id node
+	 * @param string|null $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
 	private static function isAccountNode ($_node)
@@ -155,7 +155,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' icServer id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param $_noCheckboxNS = false no checkbox for namesapaces makes sure to not put checkbox for namespaces node
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
@@ -443,7 +443,7 @@ 
 	 *
 	 * @param type $_profileID = null Null means all accounts and giving profileid means fetches node for the account
 	 * @param type $_noCheckbox = false option to switch checkbox of
-	 * @param type $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
+	 * @param integer $_openTopLevel = 0 option to either start the node opened (1) or closed (0)
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
@@ -491,7 +491,7 @@ 
 	 *
 	 * @param string $_parent = null no parent node means root with the first level of folders
 	 * @param string $_profileID = '' active profile / acc_id
-	 * @param int|boolean $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
+	 * @param integer $_openTopLevel = 1 Open top level folders on load if it's set to 1|true,
 	 *  false|0 leaves them in closed state
 	 * @param boolean $_subscribedOnly = false get only subscribed folders
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go

Braces +54 added lines, -14 removed lines

@@ -116,7 +116,10 @@ 
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
 				in_array('\Haschildren', $_node['ATTRIBUTES']) ||
-				in_array('\HasChildren', $_node['ATTRIBUTES'])) $hasChildren = 1;
+				in_array('\HasChildren', $_node['ATTRIBUTES']))
+		{
+			$hasChildren = 1;
+		}
 		return $hasChildren;
 	}
 
@@ -129,7 +132,10 @@ 
 	private static function isAccountNode ($_node)
 	{
 		list(,$leaf) = explode(self::DELIMITER, $_node);
-		if ($leaf || $_node == null) return false;
+		if ($leaf || $_node == null)
+		{
+			return false;
+		}
 		return true;
 	}
 
@@ -168,17 +174,24 @@ 
 	{
 		//Init mail folders
 		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
-		if (!isset($this->ui->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
+		if (!isset($this->ui->mail_bo))
+		{
+			throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
+		}
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
-		if ($_parent) list($_profileID) = explode(self::DELIMITER, $_parent);
+		if ($_parent)
+		{
+			list($_profileID) = explode(self::DELIMITER, $_parent);
+		}
 
 		if (is_numeric($_profileID) && $_profileID != $this->ui->mail_bo->profileID)
 		{
 			try
 			{
 				$this->ui->changeProfile($_profileID);
-			} catch (Exception $ex) {
+			}
+			catch (Exception $ex) {
 				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
 			}
 		}
@@ -188,9 +201,12 @@ 
 			// *** Note: Should not apply any imap transaction, because in case of exception it will stop the
 			// process of rendering root node
 
-			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
+			if ($_parent && !self::isAccountNode($_parent))
+			{
+				// Single node loader
 			{
 				$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
+			}
 				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
 
 				$childrenNode = array();
@@ -215,15 +231,21 @@ 
 			}
 			else //Top Level Nodes loader
 			{
-				if (self::isAccountNode($_parent)) // An account called for open
+				if (self::isAccountNode($_parent))
+				{
+					// An account called for open
 				{
 					$_openTopLevel = 1;
+				}
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
 				}
 				else // Initial accounts|root nodes
 				{
 					$tree = self::getAccountsRootNode($_profileID, $_noCheckboxNS, $_openTopLevel);
-					if (!$_profileID && !$_openTopLevel) return $tree;
+					if (!$_profileID && !$_openTopLevel)
+					{
+						return $tree;
+					}
 				}
 
 				//List of folders
@@ -323,19 +345,28 @@ 
 			{
 				$helper = array_slice($parents,1,null,true);
 				$parent = $parents[0].self::DELIMITER.implode($del, $helper);
-				if ($parent) $parent .= $del;
+				if ($parent)
+				{
+					$parent .= $del;
+				}
 			}
 			else
 			{
 				$parent = implode(self::DELIMITER, $parents);
-				if ($parent) $parent .= self::DELIMITER;
+				if ($parent)
+				{
+					$parent .= self::DELIMITER;
+				}
 			}
 
 			if (!is_array($insert) || !isset($insert['item']))
 			{
 				// throwing an exeption here seems to be unrecoverable,
 				// even if the cause is a something that can be handeled by the mailserver
-				if (mail_bo::$debug) error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				if (mail_bo::$debug)
+				{
+					error_log(__METHOD__.':'.__LINE__." id=$data[id]: Parent '$parent' of '$component' not found!");
+				}
 				// should we hit the break? if in personal: sure, something is wrong with the folderstructure
 				// if in shared or others we may proceed as access to folders may very well be limited to
 				// a single folder within the tree
@@ -346,11 +377,17 @@ 
 					// we want to create the node in question as we meet the above considerations
 					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::DELIMITER.$nsp['prefix'])===0)
 					{
-						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
+						if (mail_bo::$debug)
+						{
+							error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
+						}
 						$break=false;
 					}
 				}
-				if ($break) break;
+				if ($break)
+				{
+					break;
+				}
 			}
 			if ($insert['item'])
 			{
@@ -458,7 +495,10 @@ 
 
 		foreach(Mail\Account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
+			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID)
+			{
+				continue;
+			}
 			$identity = Mail\Account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
 			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;

Spacing +43 added lines, -43 removed lines

@@ -61,11 +61,11 @@ 
 		$this->ui = $mail_ui;
 
 		// check images available in png or svg
-		foreach(self::$leafImages as &$image)
+		foreach (self::$leafImages as &$image)
 		{
 			if (strpos($image, '.') === false)
 			{
-				$image = basename($img=Api\Image::find('mail', 'dhtmlxtree/'.$image));
+				$image = basename($img = Api\Image::find('mail', 'dhtmlxtree/'.$image));
 			}
 		}
 	}
@@ -82,7 +82,7 @@ 
 	static function treeLeafNoConnectionArray($_profileID, $_err, $_path, $_parent)
 	{
 		$baseNode = array('id' => $_profileID);
-		$leaf =  array(
+		$leaf = array(
 			'id' => $_profileID.self::DELIMITER.'INBOX',
 			'text' => $_err,
 			'tooltip' => $_err,
@@ -94,7 +94,7 @@ 
 		);
 		self::setOutStructure($leaf, $baseNode, self::DELIMITER);
 
-		return ($baseNode?$baseNode:array( // fallback not connected array
+		return ($baseNode ? $baseNode : array( // fallback not connected array
 						'id'=>0,
 						'item'=> array(
 							'text'=>'INBOX',
@@ -111,7 +111,7 @@ 
 	 * @param array $_node array of a node
 	 * @return int returns 1 if it has children flag set otherwise 0
 	 */
-	private static function nodeHasChildren ($_node)
+	private static function nodeHasChildren($_node)
 	{
 		$hasChildren = 0;
 		if (in_array('\haschildren', $_node['ATTRIBUTES']) ||
@@ -126,7 +126,7 @@ 
 	 * @param type $_node a tree id node
 	 * @return boolean returns true if the node is account node otherwise false
 	 */
-	private static function isAccountNode ($_node)
+	private static function isAccountNode($_node)
 	{
 		list(,$leaf) = explode(self::DELIMITER, $_node);
 		if ($leaf || $_node == null) return false;
@@ -164,10 +164,10 @@ 
 	 *
 	 * @return array returns an array of mail tree structure according to provided node
 	 */
-	function getTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly= false, $_allInOneGo = false, $_checkSubscribed = true)
+	function getTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_noCheckboxNS = false, $_subscribedOnly = false, $_allInOneGo = false, $_checkSubscribed = true)
 	{
 		//Init mail folders
-		$tree = array(Tree::ID=> $_parent?$_parent:0,Tree::CHILDREN => array());
+		$tree = array(Tree::ID=> $_parent ? $_parent : 0, Tree::CHILDREN => array());
 		if (!isset($this->ui->mail_bo)) throw new Api\Exception\WrongUserinput(lang('Initialization of mail failed. Please use the Wizard to cope with the problem'));
 		$hDelimiter = $this->ui->mail_bo->getHierarchyDelimiter();
 
@@ -179,7 +179,7 @@ 
 			{
 				$this->ui->changeProfile($_profileID);
 			} catch (Exception $ex) {
-				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+				return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 			}
 		}
 
@@ -191,7 +191,7 @@ 
 			if ($_parent && !self::isAccountNode($_parent)) // Single node loader
 			{
 				$nodeInfo = Mail::pathToFolderData($_parent, $hDelimiter);
-				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'],false,$_allInOneGo?0:2, $_subscribedOnly);
+				$folders = $this->ui->mail_bo->getFolderArrays($nodeInfo['mailbox'], false, $_allInOneGo ? 0 : 2, $_subscribedOnly);
 
 				$childrenNode = array();
 				foreach ($folders as &$node)
@@ -200,14 +200,14 @@ 
 					$nodeData = Mail::pathToFolderData($nodeId, $node['delimiter']);
 					$childrenNode[] = array(
 						Tree::ID=> $nodeId,
-						Tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($node),
+						Tree::AUTOLOAD_CHILDREN => $_allInOneGo ?false:self::nodeHasChildren($node),
 						Tree::CHILDREN =>array(),
 						Tree::LABEL => $nodeData['text'],
 						Tree::TOOLTIP => $nodeData['tooltip'],
 						Tree::IMAGE_LEAF => self::$leafImages['folderLeaf'],
 						Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderOpen'],
 						Tree::IMAGE_FOLDER_CLOSED => self::$leafImages['folderClosed'],
-						Tree::CHECKED => $_checkSubscribed?$node['SUBSCRIBED']:false,
+						Tree::CHECKED => $_checkSubscribed ? $node['SUBSCRIBED'] : false,
 						'parent' => $_parent
 					);
 				}
@@ -227,7 +227,7 @@ 
 				}
 
 				//List of folders
-				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo?0:2,$_subscribedOnly, false);
+				$foldersList = $this->ui->mail_bo->getFolderArrays(null, true, $_allInOneGo ? 0 : 2, $_subscribedOnly, false);
 
 				// User defined folders based on account
 				$definedFolders = array(
@@ -248,14 +248,14 @@ 
 
 					$data = array(
 						Tree::ID=>$_profileID.self::DELIMITER.$folder['MAILBOX'],
-						Tree::AUTOLOAD_CHILDREN => $_allInOneGo?false:self::nodeHasChildren($folder),
+						Tree::AUTOLOAD_CHILDREN => $_allInOneGo ?false:self::nodeHasChildren($folder),
 						Tree::CHILDREN =>array(),
 						Tree::LABEL =>lang($folder['MAILBOX']),
-						Tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel?1:0,
+						Tree::OPEN => self::getNodeLevel($folder['MAILBOX'], $folder['delimiter']) <= $_openTopLevel ? 1 : 0,
 						Tree::TOOLTIP => lang($folder['MAILBOX']),
-						Tree::CHECKED => $_checkSubscribed?$folder['SUBSCRIBED']:false,
+						Tree::CHECKED => $_checkSubscribed ? $folder['SUBSCRIBED'] : false,
 						Tree::NOCHECKBOX => 0,
-						'parent' => $parent?$_profileID.self::DELIMITER.implode($folder['delimiter'], $parent):$_profileID,
+						'parent' => $parent ? $_profileID.self::DELIMITER.implode($folder['delimiter'], $parent) : $_profileID,
 						'path' => $path,
 						'folderarray' => $folder
 					);
@@ -293,7 +293,7 @@ 
 		catch (Exception $ex) // Catch exceptions
 		{
 			//mail_ui::callWizard($ex->getMessage(), false, 'error');
-			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(),array($_profileID), '');
+			return self::treeLeafNoConnectionArray($_profileID, $ex->getMessage(), array($_profileID), '');
 		}
 
 		return $tree;
@@ -310,19 +310,19 @@ 
 	 *					as clearance for access may be limited to a single branch-node of a tree
 	 * @return void
 	 */
-	static function setOutStructure($data, &$out, $del='.', $createMissingParents=true, $nameSpace=array(), $definedFolders= array())
+	static function setOutStructure($data, &$out, $del = '.', $createMissingParents = true, $nameSpace = array(), $definedFolders = array())
 	{
 		//error_log(__METHOD__."(".array2string($data).', '.array2string($out).", '$del')");
 		$components = $data['path'];
-		array_pop($components);	// remove own name
+		array_pop($components); // remove own name
 
 		$insert = &$out;
 		$parents = array();
-		foreach($components as $component)
+		foreach ($components as $component)
 		{
-			if (count($parents)>1)
+			if (count($parents) > 1)
 			{
-				$helper = array_slice($parents,1,null,true);
+				$helper = array_slice($parents, 1, null, true);
 				$parent = $parents[0].self::DELIMITER.implode($del, $helper);
 				if ($parent) $parent .= $del;
 			}
@@ -345,21 +345,21 @@ 
 				{
 					// if (appropriately padded) namespace prefix of (others or shared) is the leading part of parent
 					// we want to create the node in question as we meet the above considerations
-					if ($nsp['type']!='personal' && $nsp['prefix_present'] && stripos($parent,$data['path'][0].self::DELIMITER.$nsp['prefix'])===0)
+					if ($nsp['type'] != 'personal' && $nsp['prefix_present'] && stripos($parent, $data['path'][0].self::DELIMITER.$nsp['prefix']) === 0)
 					{
 						if (mail_bo::$debug) error_log(__METHOD__.__LINE__.' about to create:'.$parent.' in '.$data['path'][0].self::DELIMITER.$nsp['prefix']);
-						$break=false;
+						$break = false;
 					}
 				}
 				if ($break) break;
 			}
 			if ($insert['item'])
 			{
-				foreach($insert['item'] as &$item)
+				foreach ($insert['item'] as &$item)
 				{
 					if ($item['id'] == $parent.$component)
 					{
-						$insert =& $item;
+						$insert = & $item;
 						break;
 					}
 				}
@@ -377,8 +377,8 @@ 
 						'im2' => self::$leafImages["folderNoSelectClosed"],
 						'tooltip' => lang('no access')
 					);
-					$insert['item'][] =& $item;
-					$insert =& $item;
+					$insert['item'][] = & $item;
+					$insert = & $item;
 				}
 				else
 				{
@@ -411,7 +411,7 @@ 
 					$data[Tree::IMAGE_FOLDER_OPEN] =
 					$data [Tree::IMAGE_FOLDER_CLOSED] = "MailFolder".$key.".png";
 			}
-			elseif(stripos(array2string($data['folderarray']['attributes']),'\noselect')!== false)
+			elseif (stripos(array2string($data['folderarray']['attributes']), '\noselect') !== false)
 			{
 				$data[Tree::IMAGE_LEAF] = self::$leafImages['folderNoSelectClosed'];
 				$data[Tree::IMAGE_FOLDER_OPEN] = self::$leafImages['folderNoSelectOpen'];
@@ -453,20 +453,20 @@ 
 	 *
 	 * @return array an array of baseNodes of accounts
 	 */
-	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0 )
+	static function getAccountsRootNode($_profileID = null, $_noCheckbox = false, $_openTopLevel = 0)
 	{
 		$roots = array(Tree::ID => 0, Tree::CHILDREN => array());
 
-		foreach(Mail\Account::search(true, false) as $acc_id => $accObj)
+		foreach (Mail\Account::search(true, false) as $acc_id => $accObj)
 		{
-			if (!$accObj->is_imap()|| $_profileID && $acc_id != $_profileID) continue;
-			$identity = Mail\Account::identity_name($accObj,true,$GLOBALS['egw_info']['user']['acount_id']);
+			if (!$accObj->is_imap() || $_profileID && $acc_id != $_profileID) continue;
+			$identity = Mail\Account::identity_name($accObj, true, $GLOBALS['egw_info']['user']['acount_id']);
 			// Open top level folders for active account
-			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id?1:0;
+			$openActiveAccount = $GLOBALS['egw_info']['user']['preferences']['mail']['ActiveProfileID'] == $acc_id ? 1 : 0;
 
 			$baseNode = array(
 							Tree::ID=> (string)$acc_id,
-							Tree::LABEL => str_replace(array('<','>'),array('[',']'),$identity),
+							Tree::LABEL => str_replace(array('<', '>'), array('[', ']'), $identity),
 							Tree::TOOLTIP => '('.$acc_id.') '.htmlspecialchars_decode($identity),
 							Tree::IMAGE_LEAF => self::$leafImages['folderAccount'],
 							Tree::IMAGE_FOLDER_OPEN => self::$leafImages['folderAccount'],
@@ -475,16 +475,16 @@ 
 							Tree::CHILDREN => array(), // dynamic loading on unfold
 							Tree::AUTOLOAD_CHILDREN => true,
 							'parent' => '',
-							Tree::OPEN => $_openTopLevel?$_openTopLevel:$openActiveAccount,
+							Tree::OPEN => $_openTopLevel ? $_openTopLevel : $openActiveAccount,
 							// mark on account if Sieve is enabled
 							'data' => array(
 										'sieve' => $accObj->imapServer()->acc_sieve_enabled,
-										'spamfolder'=> $accObj->imapServer()->acc_folder_junk&&(strtolower($accObj->imapServer()->acc_folder_junk)!='none')?true:false,
-										'archivefolder'=> $accObj->imapServer()->acc_folder_archive&&(strtolower($accObj->imapServer()->acc_folder_archive)!='none')?true:false
+										'spamfolder'=> $accObj->imapServer()->acc_folder_junk && (strtolower($accObj->imapServer()->acc_folder_junk) != 'none') ?true:false,
+										'archivefolder'=> $accObj->imapServer()->acc_folder_archive && (strtolower($accObj->imapServer()->acc_folder_archive) != 'none') ?true:false
 									),
 							Tree::NOCHECKBOX  => $_noCheckbox
 			);
-			self::setOutStructure($baseNode, $roots,self::DELIMITER);
+			self::setOutStructure($baseNode, $roots, self::DELIMITER);
 		}
 		return $roots;
 	}
@@ -503,15 +503,15 @@ 
 	 * @param boolean $_allInOneGo = false, true will get all folders (dependes on subscribedOnly option) of the account in one go
 	 * @return type an array of tree
 	 */
-	function getInitialIndexTree ($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly= false, $_allInOneGo = false)
+	function getInitialIndexTree($_parent = null, $_profileID = '', $_openTopLevel = 1, $_subscribedOnly = false, $_allInOneGo = false)
 	{
 		$tree = $this->getTree($_parent, '', $_openTopLevel, false, $_subscribedOnly, $_allInOneGo);
-		$branches = $this->getTree($_profileID, $_profileID,1,false,$_subscribedOnly,$_allInOneGo);
+		$branches = $this->getTree($_profileID, $_profileID, 1, false, $_subscribedOnly, $_allInOneGo);
 		foreach ($tree[Tree::CHILDREN] as &$account)
 		{
 			if ($account[Tree::ID] == $_profileID)
 			{
-				$account = array_merge($account , $branches);
+				$account = array_merge($account, $branches);
 			}
 		}
 		return $tree;

notifications/inc/class.notifications.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -434,7 +434,7 @@
 	 * Sets backends that should be skipped even if the user
 	 * defined them in its chain
 	 *
-	 * @param array $_skip_backends array with names of the backends to be skipped
+	 * @param string[] $_skip_backends array with names of the backends to be skipped
 	 * e.g. array('popup', 'winpopup')
 	 */
 	public function set_skip_backends(array $_skip_backends) {

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

@@ -185,7 +185,7 @@ 
 	 *
 	 */
 	public function __construct() {
-		$this->config = (object) Api\Config::read(self::_appname);
+		$this->config = (object)Api\Config::read(self::_appname);
 	}
 
 	/**
@@ -194,7 +194,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();
@@ -209,19 +209,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;
 			}
@@ -251,19 +251,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;
 			}
@@ -304,11 +304,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;
@@ -326,7 +326,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;
 	}
@@ -338,9 +338,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;
@@ -353,8 +353,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']);
 			}
 		}
@@ -371,7 +371,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,
@@ -391,7 +391,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,
@@ -408,8 +408,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'],
@@ -433,8 +433,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,
@@ -466,7 +466,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');
 		}
 
@@ -480,7 +480,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).'#');
@@ -493,17 +493,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];
@@ -520,28 +520,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;
@@ -556,7 +556,7 @@ 
 						// 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();
 						}
@@ -564,17 +564,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);
@@ -601,22 +601,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;
 	}
 
@@ -639,9 +639,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;
@@ -665,17 +665,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':
@@ -697,8 +697,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':
@@ -713,15 +713,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;
@@ -736,15 +736,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',
@@ -753,10 +753,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]);
@@ -765,8 +765,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};
 					}
 				}
@@ -786,10 +786,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 +228 added lines, -98 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
@@ -184,7 +185,8 @@ 
 	 * constructor of notifications
 	 *
 	 */
-	public function __construct() {
+	public function __construct()
+	{
 		$this->config = (object) Api\Config::read(self::_appname);
 	}
 
@@ -197,7 +199,10 @@ 
 	public static function errors($reset=false)
 	{
 		$ret = self::$errors;
-		if ($reset) self::$errors = array();
+		if ($reset)
+		{
+			self::$errors = array();
+		}
 		return $ret;
 	}
 
@@ -208,17 +213,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'),
@@ -236,9 +247,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);
 		}
 	}
@@ -250,17 +263,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'),
@@ -276,7 +295,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_subject($_subject) {
+	public function set_subject($_subject)
+	{
 		$this->subject = $_subject;
 		return true;
 	}
@@ -286,7 +306,8 @@ 
 	 *
 	 * @param string $_subject
 	 */
-	public function set_popupsubject($_subject) {
+	public function set_popupsubject($_subject)
+	{
 		$this->popupsubject = $_subject;
 		return true;
 	}
@@ -303,14 +324,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;
@@ -324,9 +349,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;
 	}
@@ -336,10 +365,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']);
 			}
 		}
@@ -351,10 +383,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']);
 			}
 		}
@@ -370,8 +405,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,
@@ -390,8 +428,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,
@@ -406,10 +447,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'],
@@ -433,8 +477,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,
@@ -452,21 +500,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');
 		}
 
@@ -474,13 +527,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).'#');
@@ -495,51 +550,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');
 						}
@@ -547,9 +616,18 @@ 
 						$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;
+							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;
+							}
 						}
 						$obj->send($this->prepend_message($messages, $prepend_message), $lsubject, $llinks, $this->attachments, $popup_data);
 
@@ -564,23 +642,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;
 				}
 			}
@@ -600,23 +685,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;
 	}
 
@@ -638,10 +735,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;
@@ -668,14 +769,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':
@@ -694,11 +800,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':
@@ -713,17 +822,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;
 				}
 			}
@@ -736,15 +852,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',
@@ -753,20 +872,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};
 					}
 				}
@@ -785,10 +911,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);
 			}
 		}
@@ -802,7 +931,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

notifications/inc/class.notifications_email.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -131,7 +131,7 @@
 	 * @param array $_links
 	 * @param boolean $_render_html
 	 * @param boolean $_render_external
-	 * @return plain or html rendered link(s) as complete string
+	 * @return false|string or html rendered link(s) as complete string
 	 */
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
 		if(!is_array($_links) || count($_links) == 0) { return false; }

Spacing +14 added lines, -14 removed lines

@@ -66,13 +66,13 @@ 
 	 * @param object $_preferences
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		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;
 		$this->preferences = $_preferences;
-		if(is_object($this->mail))
+		if (is_object($this->mail))
 		{
 			unset($this->mail);
 		}
@@ -112,18 +112,18 @@ 
 			// embed images as inline
 			\EGroupware\Api\Mail::processURL2InlineImages($this->mail, $body_html, null);
 		}
-		$this->mail->setHtmlBody($body_html, null, false);	// no automatic alternativ
+		$this->mail->setHtmlBody($body_html, null, false); // no automatic alternativ
 		$this->mail->setBody($body_plain);
 
-		if(is_array($_attachments) && count($_attachments) > 0)
+		if (is_array($_attachments) && count($_attachments) > 0)
 		{
-			foreach($_attachments as $attachment)
+			foreach ($_attachments as $attachment)
 			{
 				if ($attachment->string)
 				{
 					$this->mail->AddStringAttachment($attachment->string, $attachment->filename, $attachment->encoding, $attachment->type);
 				}
-				elseif($attachment->path)
+				elseif ($attachment->path)
 				{
 					$this->mail->AddAttachment($attachment->path, $attachment->filename, $attachment->encoding, $attachment->type);
 				}
@@ -142,27 +142,27 @@ 
 	 * @return plain or html rendered link(s) as complete string
 	 */
 	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+		if (!is_array($_links) || count($_links) == 0) { return false; }
 
 		// provide defaults if given arguments are null
 		// php distinguishes between missing and present(null) arguments
-		if(is_null($_render_html)) { $_render_html = false; }
-		if(is_null($_render_external)) { $_render_external = true; }
+		if (is_null($_render_html)) { $_render_html = false; }
+		if (is_null($_render_external)) { $_render_external = true; }
 		$newline = $_render_html ? "<br />" : "\n";
 		$hruler = $_render_html ? Api\Html::hr() : '';
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
+		foreach ($_links as $link) {
+			if ($_render_external || !$link->popup) { $link->view['no_popup'] = 1; }
 			// do not expose sensitive data
-			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
+			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/', '', Api\Html::link('/index.php', $link->view));
 			// complete missing protocol and domain part if needed
 			if ($url[0] == '/' && $_render_external) $url = Api\Framework::getUrl($url);
 			$a_href = '<a href="'.$url.'" target="_blank">'.$link->text.'</a>';
 			$rendered_links[] = $_render_html ? $a_href : $url;
 		}
 
-		return $hruler.$newline.lang('Linked entries:').$newline.implode($newline,$rendered_links);
+		return $hruler.$newline.lang('Linked entries:').$newline.implode($newline, $rendered_links);
 	}
 
 }

Braces +30 added lines, -11 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * User notification via email.
  */
-class notifications_email implements notifications_iface {
+class notifications_email implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -65,9 +66,14 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
+		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;
@@ -141,23 +147,36 @@ 
 	 * @param boolean $_render_external
 	 * @return plain or html rendered link(s) as complete string
 	 */
-	private function render_links($_links = false, $_render_html = false, $_render_external = true) {
-		if(!is_array($_links) || count($_links) == 0) { return false; }
+	private function render_links($_links = false, $_render_html = false, $_render_external = true)
+	{
+		if(!is_array($_links) || count($_links) == 0)
+		{
+return false; }
 
 		// provide defaults if given arguments are null
 		// php distinguishes between missing and present(null) arguments
-		if(is_null($_render_html)) { $_render_html = false; }
-		if(is_null($_render_external)) { $_render_external = true; }
+		if(is_null($_render_html))
+		{
+$_render_html = false; }
+		if(is_null($_render_external))
+		{
+$_render_external = true; }
 		$newline = $_render_html ? "<br />" : "\n";
 		$hruler = $_render_html ? Api\Html::hr() : '';
 
 		$rendered_links = array();
-		foreach($_links as $link) {
-			if($_render_external || ! $link->popup) { $link->view['no_popup'] = 1; }
+		foreach($_links as $link)
+		{
+			if($_render_external || ! $link->popup)
+			{
+$link->view['no_popup'] = 1; }
 			// do not expose sensitive data
 			$url = preg_replace('/(sessionid|kp3|domain)=[^&]+&?/','',Api\Html::link('/index.php', $link->view));
 			// complete missing protocol and domain part if needed
-			if ($url[0] == '/' && $_render_external) $url = Api\Framework::getUrl($url);
+			if ($url[0] == '/' && $_render_external)
+			{
+				$url = Api\Framework::getUrl($url);
+			}
 			$a_href = '<a href="'.$url.'" target="_blank">'.$link->text.'</a>';
 			$rendered_links[] = $_render_html ? $a_href : $url;
 		}

notifications/inc/class.notifications_jpopup.inc.php

Doc Comments -1 removed lines

@@ -152,7 +152,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(

Braces +17 added lines, -6 removed lines

@@ -74,8 +74,12 @@ 
 	*/
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
-		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;
@@ -138,13 +142,16 @@ 
 	* @param string $_subject
 	* @return string 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[] = Api\Html::bold($_subject); }
+		if(!empty($_subject))
+		{
+$infos[] = Api\Html::bold($_subject); }
 		return implode($newline,$infos);
 	}
 
@@ -154,12 +161,16 @@ 
 	* @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");
+		}
 	}
 }

Indentation +51 added lines, -51 removed lines

@@ -15,63 +15,63 @@ 
 {
 
 	/**
-	* Appname
-	*/
+	 * Appname
+	 */
 	const _appname = 'notifications';
 
 	/**
-	* Notification table in SQL database
-	*/
+	 * Notification table in SQL database
+	 */
 	const _notification_table = 'egw_notificationpopup';
 
 	/**
-	* Notification type
-	*/
+	 * Notification type
+	 */
 	const _type = 'jpopup';
 
 	/**
-	* holds account object for user who sends the message
-	*
-	* @var object
-	*/
+	 * holds account object for user who sends the message
+	 *
+	 * @var object
+	 */
 	private $sender;
 
 	/**
-	* holds account object for user to notify
-	*
-	* @var object
-	*/
+	 * holds account object for user to notify
+	 *
+	 * @var object
+	 */
 	private $recipient;
 
 	/**
-	* holds config object (sitewide application config)
-	*
-	* @var object
-	*/
+	 * holds config object (sitewide application config)
+	 *
+	 * @var object
+	 */
 	private $config;
 
 	/**
-	* holds preferences object of user to notify
-	*
-	* @var object
-	*/
+	 * holds preferences object of user to notify
+	 *
+	 * @var object
+	 */
 	private $preferences;
 
 	/**
-	* holds db object of SQL database
-	*
-	* @var Api\Db
-	*/
+	 * holds db object of SQL database
+	 *
+	 * @var Api\Db
+	 */
 	private $db;
 
 	/**
-	* constructor of notifications_egwpopup
-	*
-	* @param object $_sender
-	* @param object $_recipient
-	* @param object $_config
-	* @param object $_preferences
-	*/
+	 * constructor of notifications_egwpopup
+	 *
+	 * @param object $_sender
+	 * @param object $_recipient
+	 * @param object $_config
+	 * @param object $_preferences
+	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
 		if( !is_object($_sender) ) { throw new Exception("no sender given."); }
@@ -85,14 +85,14 @@ 
 	}
 
 	/**
-	* sends notification if user is online
-	*
-	* @param array $_messages
-	* @param string $_subject
-	* @param array $_links
-	* @param array $_attachments
-	* @param array $_data
-	*/
+	 * sends notification if user is online
+	 *
+	 * @param array $_messages
+	 * @param string $_subject
+	 * @param array $_links
+	 * @param array $_attachments
+	 * @param array $_data
+	 */
 	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false, $_data = false)
 	{
 		unset($_attachments, $_data);	// not used
@@ -134,11 +134,11 @@ 
 	}
 
 	/**
-	* renders additional infos from sender and subject
-	*
-	* @param string $_subject
-	* @return string html rendered info as complete string
-	*/
+	 * renders additional infos from sender and subject
+	 *
+	 * @param string $_subject
+	 * @return string html rendered info as complete string
+	 */
 	private function render_infos($_subject = false) {
 		$infos = array();
 		$newline = "<br />";
@@ -150,11 +150,11 @@ 
 	}
 
 	/**
-	* saves notification into database so that the client can fetch it from there
-	*
-	* @param string $_message
-	* @param array $_user_sessions
-	*/
+	 * 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(
 			'account_id'     => $this->recipient->account_id,

Spacing +21 added lines, -21 removed lines

@@ -74,14 +74,14 @@ 
 	*/
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
 	{
-		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->recipient = $_recipient;
 		$this->config		= $_config;
-		$this->preferences	= $_preferences;
-		$this->db			= $GLOBALS['egw']->db;
+		$this->preferences = $_preferences;
+		$this->db = $GLOBALS['egw']->db;
 	}
 
 	/**
@@ -93,19 +93,19 @@ 
 	* @param array $_attachments
 	* @param array $_data
 	*/
-	public function send(array $_messages, $_subject=false, $_links=false, $_attachments=false, $_data = false)
+	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false, $_data = false)
 	{
-		unset($_attachments, $_data);	// not used
+		unset($_attachments, $_data); // not used
 
 		$jmessage = array();
 
 		// app-message
-		if( ($_links != null) && (count($_links) > 0) )
+		if (($_links != null) && (count($_links) > 0))
 		{
-			$tlink		= $_links[0];
-			$appname	= "";
+			$tlink = $_links[0];
+			$appname = "";
 
-			if( key_exists('menuaction', $tlink->view) )
+			if (key_exists('menuaction', $tlink->view))
 			{
 				$tmp = explode(".", $tlink->view['menuaction']);
 				$appname = $tmp[0];
@@ -113,9 +113,9 @@ 
 
 			$link = array();
 
-			foreach( $tlink->view as $pkey => $pvalue )
+			foreach ($tlink->view as $pkey => $pvalue)
 			{
-				$link[] = $pkey . '=' . $pvalue;
+				$link[] = $pkey.'='.$pvalue;
 			}
 
 			// TODO more links?
@@ -126,11 +126,11 @@ 
 			.Api\Html::hr()
 			.$_messages['html'];
 
-		$jmessage['msghtml']	= $message;
-		$jmessage['app']		= $appname;
+		$jmessage['msghtml'] = $message;
+		$jmessage['app'] = $appname;
 
 
-		$this->save( serialize($jmessage) );
+		$this->save(serialize($jmessage));
 	}
 
 	/**
@@ -145,8 +145,8 @@ 
 
 		$sender = $this->sender->account_fullname ? $this->sender->account_fullname : $this->sender_account_email;
 		$infos[] = lang('Message from').': '.$sender;
-		if(!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
-		return implode($newline,$infos);
+		if (!empty($_subject)) { $infos[] = Api\Html::bold($_subject); }
+		return implode($newline, $infos);
 	}
 
 	/**
@@ -155,12 +155,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");
 	}
 }

notifications/inc/class.notifications_winpopup.inc.php

Doc Comments +2 added lines, -2 removed lines

@@ -155,7 +155,7 @@ 
 	 * checks for a valid IPv4-address without CIDR notation
 	 *
 	 * @param string $_ip
-	 * @return true or false
+	 * @return integer or false
 	 */
 	private function valid_ip($_ip) {
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
@@ -165,7 +165,7 @@ 
 	 * renders additional info from subject
 	 *
 	 * @param string $_subject
-	 * @return plain rendered info as complete string
+	 * @return string|false rendered info as complete string
 	 */
 	private function render_infos($_subject = false) {
 		$newline = "\n";

Spacing +21 added lines, -21 removed lines

@@ -81,12 +81,12 @@ 
 	 * @param object $_preferences
 	 */
 	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
-		if(!$this->netbios_command) {
-			throw new Exception(	'Winpopup plugin not configured yet. Skipped sending notification message. '.
+		if (!is_object($_sender)) { throw new Exception("no sender given."); }
+		if (!is_object($_recipient)) { throw new Exception("no recipient given."); }
+		if (!$this->netbios_command) {
+			throw new Exception('Winpopup plugin not configured yet. Skipped sending notification message. '.
 									'Please check var "netbios_command" in winpopup backend '.
-									'('.EGW_INCLUDE_ROOT. '/'. self::_appname. '/inc/class.notifications_winpopup.inc.php).');
+									'('.EGW_INCLUDE_ROOT.'/'.self::_appname.'/inc/class.notifications_winpopup.inc.php).');
 		}
 		$this->sender = $_sender;
 		$this->recipient = $_recipient;
@@ -105,19 +105,19 @@ 
 	 */
 	public function send(array $_messages, $_subject = false, $_links = false, $_attachments = false, $_data = false)
 	{
-		unset($_links, $_attachments, $_data);	// not used
+		unset($_links, $_attachments, $_data); // not used
 
 		$user_sessions = array();
 		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
-			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
-				if($this->valid_ip($session['session_ip'])) {
+			if ($session['session_lid'] == $this->recipient->account_lid.'@'.$GLOBALS['egw_info']['user']['domain']) {
+				if ($this->valid_ip($session['session_ip'])) {
 					$user_sessions[] = $session['session_ip'];
 				}
 			}
 		}
-		if ( empty($user_sessions) ) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		if (empty($user_sessions)) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
 
-		$this->send_winpopup( $this->render_infos($_subject).$_messages['plain'], $user_sessions );
+		$this->send_winpopup($this->render_infos($_subject).$_messages['plain'], $user_sessions);
 		return true;
 	}
 
@@ -127,15 +127,15 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function send_winpopup( $_message, array $_user_sessions ) {
-		foreach($_user_sessions as $user_session) {
-			$ip_octets=explode(".",$user_session);
+	private function send_winpopup($_message, array $_user_sessions) {
+		foreach ($_user_sessions as $user_session) {
+			$ip_octets = explode(".", $user_session);
 			// format the ip_octets to 3 digits each
-			foreach($ip_octets as $id=>$ip_octet) {
-				if(strlen($ip_octet)==1) { $ip_octets[$id] = '00'.$ip_octet; }
-				if(strlen($ip_octet)==2) { $ip_octets[$id] = '0'.$ip_octet; }
+			foreach ($ip_octets as $id=>$ip_octet) {
+				if (strlen($ip_octet) == 1) { $ip_octets[$id] = '00'.$ip_octet; }
+				if (strlen($ip_octet) == 2) { $ip_octets[$id] = '0'.$ip_octet; }
 			}
-			$placeholders = array(	'/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
+			$placeholders = array('/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
 									'/\[1\]/' => $ip_octets[0],
 									'/\[2\]/' => $ip_octets[1],
 									'/\[3\]/' => $ip_octets[2],
@@ -145,8 +145,8 @@ 
 									);
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			$output = $returncode = null;
-			exec($command,$output,$returncode);
-			if($returncode != 0) {
+			exec($command, $output, $returncode);
+			if ($returncode != 0) {
 				throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
 			}
 		}
@@ -159,7 +159,7 @@ 
 	 * @return true or false
 	 */
 	private function valid_ip($_ip) {
-		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
+		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$', $_ip);
 	}
 
 	/**
@@ -170,7 +170,7 @@ 
 	 */
 	private function render_infos($_subject = false) {
 		$newline = "\n";
-		if(!empty($_subject)) { return $_subject.$newline; }
+		if (!empty($_subject)) { return $_subject.$newline; }
 		return false;
 	}
 }
\ No newline at end of file

Braces +43 added lines, -18 removed lines

@@ -15,7 +15,8 @@ 
 /**
  * User notification via winpopup.
  */
-class notifications_winpopup implements notifications_iface {
+class notifications_winpopup implements notifications_iface
+{
 
 	/**
 	 * Appname
@@ -80,10 +81,16 @@ 
 	 * @param object $_config
 	 * @param object $_preferences
 	 */
-	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null) {
-		if(!is_object($_sender)) { throw new Exception("no sender given."); }
-		if(!is_object($_recipient)) { throw new Exception("no recipient given."); }
-		if(!$this->netbios_command) {
+	public function __construct($_sender, $_recipient, $_config = null, $_preferences = null)
+	{
+		if(!is_object($_sender))
+		{
+throw new Exception("no sender given."); }
+		if(!is_object($_recipient))
+		{
+throw new Exception("no recipient given."); }
+		if(!$this->netbios_command)
+		{
 			throw new Exception(	'Winpopup plugin not configured yet. Skipped sending notification message. '.
 									'Please check var "netbios_command" in winpopup backend '.
 									'('.EGW_INCLUDE_ROOT. '/'. self::_appname. '/inc/class.notifications_winpopup.inc.php).');
@@ -108,14 +115,20 @@ 
 		unset($_links, $_attachments, $_data);	// not used
 
 		$user_sessions = array();
-		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session) {
-			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain']) {
-				if($this->valid_ip($session['session_ip'])) {
+		foreach (Api\Session::session_list(0, 'asc', 'session_dla', true) as $session)
+		{
+			if ($session['session_lid'] == $this->recipient->account_lid. '@'. $GLOBALS['egw_info']['user']['domain'])
+			{
+				if($this->valid_ip($session['session_ip']))
+				{
 					$user_sessions[] = $session['session_ip'];
 				}
 			}
 		}
-		if ( empty($user_sessions) ) throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		if ( empty($user_sessions) )
+		{
+			throw new Exception("User #{$this->recipient->account_id} isn't online. Can't send notification via winpopup");
+		}
 
 		$this->send_winpopup( $this->render_infos($_subject).$_messages['plain'], $user_sessions );
 		return true;
@@ -127,13 +140,20 @@ 
 	 * @param string $_message
 	 * @param array $_user_sessions
 	 */
-	private function send_winpopup( $_message, array $_user_sessions ) {
-		foreach($_user_sessions as $user_session) {
+	private function send_winpopup( $_message, array $_user_sessions )
+	{
+		foreach($_user_sessions as $user_session)
+		{
 			$ip_octets=explode(".",$user_session);
 			// format the ip_octets to 3 digits each
-			foreach($ip_octets as $id=>$ip_octet) {
-				if(strlen($ip_octet)==1) { $ip_octets[$id] = '00'.$ip_octet; }
-				if(strlen($ip_octet)==2) { $ip_octets[$id] = '0'.$ip_octet; }
+			foreach($ip_octets as $id=>$ip_octet)
+			{
+				if(strlen($ip_octet)==1)
+				{
+$ip_octets[$id] = '00'.$ip_octet; }
+				if(strlen($ip_octet)==2)
+				{
+$ip_octets[$id] = '0'.$ip_octet; }
 			}
 			$placeholders = array(	'/\[MESSAGE\]/' => escapeshellarg($_message), // prevent code injection
 									'/\[1\]/' => $ip_octets[0],
@@ -146,7 +166,8 @@ 
 			$command = preg_replace(array_keys($placeholders), $placeholders, $this->netbios_command);
 			$output = $returncode = null;
 			exec($command,$output,$returncode);
-			if($returncode != 0) {
+			if($returncode != 0)
+			{
 				throw new Exception("Failed sending notification message via winpopup. Error while executing the specified command.");
 			}
 		}
@@ -158,7 +179,8 @@ 
 	 * @param string $_ip
 	 * @return true or false
 	 */
-	private function valid_ip($_ip) {
+	private function valid_ip($_ip)
+	{
 		return eregi('^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$',$_ip);
 	}
 
@@ -168,9 +190,12 @@ 
 	 * @param string $_subject
 	 * @return plain rendered info as complete string
 	 */
-	private function render_infos($_subject = false) {
+	private function render_infos($_subject = false)
+	{
 		$newline = "\n";
-		if(!empty($_subject)) { return $_subject.$newline; }
+		if(!empty($_subject))
+		{
+return $_subject.$newline; }
 		return false;
 	}
 }
\ No newline at end of file

pixelegg/inc/class.pixelegg_framework.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	 * Overwritten to load our slider.js
 	 *
 	 * @param array $extra
-	 * @return type
+	 * @return string|null
 	 */
 	function header(array $extra=array())
 	{

Spacing +10 added lines, -10 removed lines

@@ -41,12 +41,12 @@ 
 	 *
 	 * @param string $template ='pixelegg' name of the template
 	 */
-	function __construct($template=self::APP)
+	function __construct($template = self::APP)
 	{
-		parent::__construct($template);		// call the constructor of the extended class
+		parent::__construct($template); // call the constructor of the extended class
 
 		// search 'mobile' dirs first
-		if (Api\Header\UserAgent::mobile()) array_unshift ($this->template_dirs, 'mobile');
+		if (Api\Header\UserAgent::mobile()) array_unshift($this->template_dirs, 'mobile');
 	}
 
 	/**
@@ -57,7 +57,7 @@ 
 	 * @param array $extra
 	 * @return type
 	 */
-	function header(array $extra=array())
+	function header(array $extra = array())
 	{
 		// load our slider.js, but only if framework requested
 		if (!self::$header_done && $_GET['cd'] === 'yes' &&
@@ -79,9 +79,9 @@ 
 	{
 		if ($color[0] == '#') $color = ltrim($color, '#');
 
-		$R = hexdec(substr($color,0,2));
-		$G = hexdec(substr($color,2,2));
-		$B = hexdec(substr($color,4,2));
+		$R = hexdec(substr($color, 0, 2));
+		$G = hexdec(substr($color, 2, 2));
+		$B = hexdec(substr($color, 4, 2));
 
 		$Rs = round($R * (100 + $percent) / 100);
 		$Gs = round($G * (100 + $percent) / 100);
@@ -104,7 +104,7 @@ 
 	{
 		$ret = parent::_get_css();
 		// color to use
-		$color = str_replace('custom',$GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
+		$color = str_replace('custom', $GLOBALS['egw_info']['user']['preferences']['common']['template_custom_color'],
 			$GLOBALS['egw_info']['user']['preferences']['common']['template_color']);
 
 		// Create a dark variant of the color
@@ -129,7 +129,7 @@ 
 			$loginbox_color = $color_darker;
 		}
 
-		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))	// a little xss check
+		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i', $color))	// a little xss check
 		{
 			if (!Api\Header\UserAgent::mobile())
 			{
@@ -206,7 +206,7 @@ 
 	 * @param string $extra_vars for login url
 	 * @param string $change_passwd =null string with message to render input fields for password change
 	 */
-	function login_screen($extra_vars, $change_passwd=null)
+	function login_screen($extra_vars, $change_passwd = null)
 	{
 		if (empty($GLOBALS['loginscreenmessage']))
 		{

Braces +24 added lines, -6 removed lines

@@ -46,7 +46,10 @@ 
 		parent::__construct($template);		// call the constructor of the extended class
 
 		// search 'mobile' dirs first
-		if (Api\Header\UserAgent::mobile()) array_unshift ($this->template_dirs, 'mobile');
+		if (Api\Header\UserAgent::mobile())
+		{
+			array_unshift ($this->template_dirs, 'mobile');
+		}
 	}
 
 	/**
@@ -77,7 +80,10 @@ 
 	 */
 	function _color_shader($color, $percent)
 	{
-		if ($color[0] == '#') $color = ltrim($color, '#');
+		if ($color[0] == '#')
+		{
+			$color = ltrim($color, '#');
+		}
 
 		$R = hexdec(substr($color,0,2));
 		$G = hexdec(substr($color,2,2));
@@ -87,9 +93,18 @@ 
 		$Gs = round($G * (100 + $percent) / 100);
 		$Bs = round($B * (100 + $percent) / 100);
 
-		if ($Rs > 255) $Rs = 255;
-		if ($Gs > 255) $Gs = 255;
-		if ($Bs > 255) $Bs = 255;
+		if ($Rs > 255)
+		{
+			$Rs = 255;
+		}
+		if ($Gs > 255)
+		{
+			$Gs = 255;
+		}
+		if ($Bs > 255)
+		{
+			$Bs = 255;
+		}
 
 		return '#'.sprintf('%02X%02X%02X', $Rs, $Gs, $Bs);
 	}
@@ -129,7 +144,9 @@ 
 			$loginbox_color = $color_darker;
 		}
 
-		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))	// a little xss check
+		if (preg_match('/^(#[0-9A-F]+|[A-Z]+)$/i',$color))
+		{
+			// a little xss check
 		{
 			if (!Api\Header\UserAgent::mobile())
 			{
@@ -177,6 +194,7 @@ 
 .ui-datepicker div.ui-timepicker-div div.ui_tpicker_hour_slider span.ui-slider-handle,
 .ui-widget-header {background-color: $sidebox_color;}
 ";
+		}
 				if ($GLOBALS['egw_info']['user']['preferences']['common']['theme'] == 'traditional')
 				{
 					$ret['app_css'] .= ".dialogFooterToolbar {background-color: $color !important;}";

preferences/inc/class.preferences_settings.inc.php

Doc Comments +1 added lines, -1 removed lines

@@ -292,7 +292,7 @@
 	 * @param array &$sel_options
 	 * @param array &$readonlys
 	 * @param array &$types on return setting-name => setting-type
-	 * @param etemplate $tpl
+	 * @param Etemplate $tpl
 	 * @throws Api\Exception\WrongParameter
 	 * @return array content
 	 */

Spacing +61 added lines, -62 removed lines

@@ -45,7 +45,7 @@ 
 	 * @param array $content =null
 	 * @param string $msg =''
 	 */
-	function index(array $content=null, $msg='')
+	function index(array $content = null, $msg = '')
 	{
 		$tpl = new Etemplate('preferences.settings');
 		if (!is_array($content))
@@ -72,7 +72,7 @@ 
 			{
 				list($button) = each($content['button']);
 				$appname = $content['old_appname'] ? $content['old_appname'] : 'common';
-				switch($button)
+				switch ($button)
 				{
 					case 'save':
 					case 'apply':
@@ -81,10 +81,10 @@ 
 						{
 							throw new Api\Exception\NoPermission\Admin;
 						}
-						list($type,$account_id) = explode(':', $content['old_type']);
+						list($type, $account_id) = explode(':', $content['old_type']);
 						// merge prefs of all tabs together again
 						$prefs = array();
-						foreach($content as $name => $val)
+						foreach ($content as $name => $val)
 						{
 							if (is_array($val) && strpos($name, 'tab') === 0)
 							{
@@ -102,7 +102,7 @@ 
 						$old_values = array_intersect_key($GLOBALS['egw_info']['user']['preferences']['common'], array_flip($require_reload));
 
 						$attribute = $type == 'group' ? 'user' : $type;
-						if (!($msg=$this->process_array($GLOBALS['egw']->preferences->$attribute, $prefs, $content['types'], $appname, $attribute, $content)))
+						if (!($msg = $this->process_array($GLOBALS['egw']->preferences->$attribute, $prefs, $content['types'], $appname, $attribute, $content)))
 						{
 							$msg_type = 'success';
 							$msg = lang('Preferences saved.');
@@ -126,14 +126,14 @@ 
 						// update client-side Api\Preferences in response
 						Framework::ajax_get_preference($appname);
 				}
-				if (in_array($button, array('save','cancel')))
+				if (in_array($button, array('save', 'cancel')))
 				{
 					Api\Json\Response::get()->call('egw.message', $msg, $msg_type);
 					Framework::window_close();
 				}
 			}
 			$appname = $content['appname'] ? $content['appname'] : 'common';
-			list($type,$account_id) = explode(':', $content['type']);
+			list($type, $account_id) = explode(':', $content['type']);
 			//_debug_array($prefs);
 		}
 		if ($account_id && $account_id != $GLOBALS['egw']->preferences->get_account_id())
@@ -152,7 +152,7 @@ 
 		$preserve['current_app'] = $content['current_app'];
 		$GLOBALS['egw_info']['flags']['currentapp'] = $content['current_app'] == 'common' ?
 			'preferences' : $content['current_app'];
-		Framework::includeCSS('preferences','app');
+		Framework::includeCSS('preferences', 'app');
 
 		// if not just saved, call validation before, to be able to show failed validation of current prefs
 		if (!isset($button))
@@ -169,8 +169,8 @@ 
 		$preserve['is_admin'] = $is_admin;
 
 		// preserve the old values since we need them for admin cmd data comparison
-		$preserve['old_values'] = array ();
-		foreach($data as $key => $val)
+		$preserve['old_values'] = array();
+		foreach ($data as $key => $val)
 		{
 			if (is_array($val) && strpos($key, 'tab') === 0)
 			{
@@ -197,15 +197,15 @@ 
 	 */
 	static function admin_cmd_run($content, $values, $account_id)
 	{
-		$changes = array_udiff_assoc($values, $content['old_values'], function($a, $b){
-			return (int) $a !== $b;
+		$changes = array_udiff_assoc($values, $content['old_values'], function($a, $b) {
+			return (int)$a !== $b;
 		});
 		$old = array_intersect_key($content['old_values'], $changes);
 		$cmd = new admin_cmd_edit_preferences(array(
 			'account' => $account_id,
 			'set'	=> $changes,
 			'old' =>$old
-		)+(array)$content['admin_cmd']);
+		) + (array)$content['admin_cmd']);
 		$cmd->run();
 	}
 
@@ -221,7 +221,7 @@ 
 	 * @param boolean $only_verify =false
 	 * @return string with verification error or null on success
 	 */
-	function process_array(array &$repository, array $values, array $types, $appname, $type, $content, $only_verify=false)
+	function process_array(array &$repository, array $values, array $types, $appname, $type, $content, $only_verify = false)
 	{
 		//fetch application specific settings from a hook
 		$settings = Api\Hooks::single(array(
@@ -235,10 +235,10 @@ 
 		unset($prefs['']);
 
 		//_debug_array($values);exit;
-		foreach($values as $var => $value)
+		foreach ($values as $var => $value)
 		{
 			// type specific validation
-			switch((string)$types[$var])
+			switch ((string)$types[$var])
 			{
 				case 'password':	// dont write empty password-fields
 					if (empty($value)) continue 2;
@@ -251,7 +251,7 @@ 
 						// empty is always allowed
 
 						// If forced, empty == not set
-						if($type == 'forced')
+						if ($type == 'forced')
 						{
 							unset($prefs[$var]);
 							// need to call preferences::delete, to also set affective prefs!
@@ -263,19 +263,19 @@ 
 					{
 						if ($value[0] != '/' || !Vfs::stat($value) || Vfs::is_dir($value))
 						{
-							$error = lang('%1 is no existing vfs file!',htmlspecialchars($value));
+							$error = lang('%1 is no existing vfs file!', htmlspecialchars($value));
 						}
 					}
 					else
 					{
 						// split multiple comma or whitespace separated directories
 						// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
-						foreach($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
+						foreach ($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
 						{
-							if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+							if ($n) $dir = '/'.$dir; // re-adding trailing slash removed by split
 							if ($dir[0] != '/' || !Vfs::stat($dir) || !Vfs::is_dir($dir))
 							{
-								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!',$dir);
+								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!', $dir);
 							}
 						}
 					}
@@ -289,7 +289,7 @@ 
 
 			if (isset($value) && $value !== '' && $value !== '**NULL**' && $value !== array())
 			{
-				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',',$value);	// multiselect
+				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',', $value); // multiselect
 
 				$prefs[$var] = $value;
 
@@ -309,7 +309,7 @@ 
 		// if you return something else than False, it is treated as an error-msg and
 		// displayed to the user (the prefs are not saved)
 		//
-		if(($error .= Api\Hooks::single(array(
+		if (($error .= Api\Hooks::single(array(
 				'location' => 'verify_settings',
 				'prefs'    => &$repository[$appname],
 				'type'     => $type,
@@ -330,7 +330,7 @@ 
 			}
 			else
 			{
-				$GLOBALS['egw']->preferences->save_repository(True,$type);
+				$GLOBALS['egw']->preferences->save_repository(True, $type);
 			}
 
 			// certain common prefs (language, template, ...) require the session to be re-created
@@ -368,19 +368,19 @@ 
 		$sel_options = $readonlys = $content = $tabs = array();
 		// disable all but first tab and name current tab "tab1", for apps not using sections
 		$tab = 'tab1';
-		foreach($this->settings as $setting)
+		foreach ($this->settings as $setting)
 		{
 			if (!is_array($setting)) continue;
 			if ($type != 'forced' && (string)$GLOBALS['egw']->preferences->forced[$appname][$setting['name']] !== '')
 			{
-				continue;	// forced preferences are not displayed, unless we edit them
+				continue; // forced preferences are not displayed, unless we edit them
 			}
 			$types[$setting['name']] = $old_type = $setting['type'];
 
-			switch($old_type)
+			switch ($old_type)
 			{
 				case 'section':
-					$tab = 'tab'.(1+count($tabs));
+					$tab = 'tab'.(1 + count($tabs));
 					$tabs[] = array(
 						'id' => $tab,
 						'template' => 'preferences.settings.tab1',
@@ -395,24 +395,24 @@ 
 					if (is_array($setting['values'])) $vars += $setting['values'];
 					$GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']] =
 						$GLOBALS['egw']->preferences->lang_notify($GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']], $vars);
-					$types[$setting['name']] = $vars;	// store vars for re-translation, instead type "notify"
+					$types[$setting['name']] = $vars; // store vars for re-translation, instead type "notify"
 					if ($setting['help'] && ($setting['run_lang'] || !isset($setting['run_lang'])))
 					{
 						$setting['help'] = lang($setting['help']);
 					}
 					$setting['help'] .= '<p><b>'.lang('Substitutions and their meanings:').'</b>';
-					foreach($vars as $var => $var_help)
+					foreach ($vars as $var => $var_help)
 					{
 						$lname = ($lname = lang($var)) == $var.'*' ? $var : $lname;
 						$setting['help'] .= "<br>\n".'<b>$$'.$lname.'$$</b>: '.$var_help;
 					}
 					$setting['help'] .= "</p>\n";
-					$setting['run_lang'] = false;	// already done now
+					$setting['run_lang'] = false; // already done now
 					// handle as textarea
 				case 'textarea':
 					$setting['type'] = is_a($tpl, 'etemplate') ? 'textarea' : 'textbox';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'multiline', 'true');
-					$tpl->setElementAttribute($tab. '[' . $setting['name'] . ']','width', '99%' );
+					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'width', '99%');
 					// anyway setting via css: width: 99%, height: 5em
 					// for old eT use size attribute
 					if (is_a($tpl, 'etemplate') && (!empty($setting['cols']) || !empty($setting['rows'])))
@@ -434,7 +434,7 @@ 
 				case 'multiselect':
 					$setting['type'] = 'select';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'rows', 5);
-					if (!isset($setting['size'])) $setting['size'] = '5';	// old eT
+					if (!isset($setting['size'])) $setting['size'] = '5'; // old eT
 					break;
 				case 'color':
 					$setting['type'] = 'colorpicker';
@@ -442,7 +442,7 @@ 
 				case 'date-duration':
 					if (!isset($setting['size'])) $setting['size'] = 'm,dhm,24,1';
 					$attrs = explode(',', $setting['size']);
-					foreach(array("data_format","display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
+					foreach (array("data_format", "display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
 					{
 						if ((string)$attrs[$n] !== '') $tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
 					}
@@ -450,7 +450,7 @@ 
 				case 'taglist':
 					if ($setting['no_sel_options'])
 					{
-						$tpl->setElementAttribute ($tab.'['.$setting['name'].']', 'autocomplete_url', '');
+						$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'autocomplete_url', '');
 					}
 					break;
 			}
@@ -459,17 +459,17 @@ 
 			{
 				if ($old_type != 'multiselect' && $old_type != 'notify')
 				{
-					switch($type)
+					switch ($type)
 					{
 						case 'user':
-							$setting['values'] = array('' => lang('Use default'))+$setting['values'];
+							$setting['values'] = array('' => lang('Use default')) + $setting['values'];
 							break;
 						case 'default':
 						case 'group':
-							$setting['values'] = array('' => lang('No default'))+$setting['values'];
+							$setting['values'] = array('' => lang('No default')) + $setting['values'];
 							break;
 						case 'forced';
-							$setting['values'] = array('**NULL**' => lang('Users choice'))+$setting['values'];
+							$setting['values'] = array('**NULL**' => lang('Users choice')) + $setting['values'];
 							break;
 					}
 				}
@@ -478,8 +478,7 @@ 
 			if ($type == 'user')
 			{
 				$default = $GLOBALS['egw']->preferences->group[$appname][$setting['name']] ?
-					$GLOBALS['egw']->preferences->group[$appname][$setting['name']] :
-					$GLOBALS['egw']->preferences->default[$appname][$setting['name']];
+					$GLOBALS['egw']->preferences->group[$appname][$setting['name']] : $GLOBALS['egw']->preferences->default[$appname][$setting['name']];
 
 				// replace default value(s) for selectboxes with selectbox labels
 				if (isset($setting['values']) && is_array($setting['values']))
@@ -499,7 +498,7 @@ 
 				'name' => $setting['name'],
 				'type' => $setting['type'],
 				'label' => preg_replace('|<br[ /]*>|i', "\n", $setting['label']),
-				'help' => lang($setting['help']),	// is html
+				'help' => lang($setting['help']), // is html
 				'default' => (string)$default !== '' ? lang('Default').': '.$default : null,
 				'onchange' => $setting['onchange'],
 				'attributes' => $setting['attributes']
@@ -525,7 +524,7 @@ 
 
 		$content['appname'] = $appname;
 		$sel_options['appname'] = array();
-		foreach(Api\Hooks::implemented('settings') as $app)
+		foreach (Api\Hooks::implemented('settings') as $app)
 		{
 			if ($app != 'preferences' && $GLOBALS['egw_info']['user']['apps'][$app])
 			{
@@ -551,7 +550,7 @@ 
 				$user_apps = $GLOBALS['egw']->acl->get_user_applications($id);
 				$sel_options['appname'] = array_intersect_key($sel_options['appname'], $user_apps);
 			}
-			foreach($GLOBALS['egw']->accounts->search(array('type' => 'groups', 'order' => 'account_lid')) as $account_id => $group)
+			foreach ($GLOBALS['egw']->accounts->search(array('type' => 'groups', 'order' => 'account_lid')) as $account_id => $group)
 			{
 				$sel_options['type']['group:'.$account_id] = lang('Preferences').' '.Api\Accounts::format_username($group['account_lid'], '', '', $account_id);
 			}
@@ -574,7 +573,7 @@ 
 	 * @param boolean $lang =true
 	 * @return string comma-separated and translated labels
 	 */
-	protected static function get_default_label($default, array $values, $lang=true)
+	protected static function get_default_label($default, array $values, $lang = true)
 	{
 		// explode comma-separated multiple default values
 		if (!is_array($default) && !isset($values[$default]) && strpos($default, ',') !== false)
@@ -585,7 +584,7 @@ 
 		{
 			$labels = (array)$default;
 		}
-		foreach($labels as &$def)
+		foreach ($labels as &$def)
 		{
 			if (isset($values[$def]))
 			{
@@ -593,7 +592,7 @@ 
 			}
 			else	// value could be in an optgroup
 			{
-				foreach($values as $value)
+				foreach ($values as $value)
 				{
 					if (is_array($value) && !isset($value['label']) && isset($value[$def]))
 					{
@@ -619,16 +618,16 @@ 
 	 * @param int|string $account_id =null account_id for user or group prefs, or "forced" or "default"
 	 * @return boolean
 	 */
-	protected function call_hook($appname, $type='user', $account_id=null)
+	protected function call_hook($appname, $type = 'user', $account_id = null)
 	{
 		$this->appname = $appname == 'common' ? 'preferences' : $appname;
 
 		// Set framework here to make sure we get the right settings for user's [newly] selected template
 		$GLOBALS['egw_info']['server']['template_set'] = $GLOBALS['egw']->preferences->data['common']['template_set'];
 		Api\Translation::add_app($this->appname);
-		if($this->appname != 'preferences')
+		if ($this->appname != 'preferences')
 		{
-			Api\Translation::add_app('preferences');	// we need the prefs translations too
+			Api\Translation::add_app('preferences'); // we need the prefs translations too
 		}
 
 		// make type available, to hooks from Egw\Applications can use it, eg. activesync
@@ -637,7 +636,7 @@ 
 			'type' => $type,
 			'account_id' => $account_id,
 		);
-		$GLOBALS['type'] = $type;	// old global variable
+		$GLOBALS['type'] = $type; // old global variable
 
 		// calling app specific settings hook
 		$settings = Api\Hooks::single($hook_data, $this->appname);
@@ -646,30 +645,30 @@ 
 		{
 			$this->settings = array_merge($this->settings, $settings);
 		}
-		elseif(isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
+		elseif (isset($GLOBALS['settings']) && is_array($GLOBALS['settings']) && $GLOBALS['settings'])
 		{
 			$this->settings = array_merge($this->settings, $GLOBALS['settings']);
 		}
 		else
 		{
-			return False;	// no settings returned
+			return False; // no settings returned
 		}
 
 		// calling settings hook all apps can answer (for a specific app)
 		$hook_data['location'] = 'settings_'.$this->appname;
-		foreach(Api\Hooks::process($hook_data, $this->appname,true) as $settings)
+		foreach (Api\Hooks::process($hook_data, $this->appname, true) as $settings)
 		{
 			if (isset($settings) && is_array($settings) && $settings)
 			{
-				$this->settings = array_merge($this->settings,$settings);
+				$this->settings = array_merge($this->settings, $settings);
 			}
 		}
 		/* Remove ui-only settings */
-		if($this->xmlrpc)
+		if ($this->xmlrpc)
 		{
-			foreach($this->settings as $key => $valarray)
+			foreach ($this->settings as $key => $valarray)
 			{
-				if(!$valarray['xmlrpc'])
+				if (!$valarray['xmlrpc'])
 				{
 					unset($this->settings[$key]);
 				}
@@ -681,10 +680,10 @@ 
 			 This is not handled by the hooks class and is only valid if not using xml-rpc.
 			*/
 			$tmpl_settings = EGW_SERVER_ROOT.$GLOBALS['egw']->framework->template_dir.'/hook_settings.inc.php';
-			if($this->appname == 'preferences' && file_exists($tmpl_settings))
+			if ($this->appname == 'preferences' && file_exists($tmpl_settings))
 			{
 				include($tmpl_settings);
-				$this->settings = array_merge($this->settings,$GLOBALS['settings']);
+				$this->settings = array_merge($this->settings, $GLOBALS['settings']);
 			}
 		}
 		// check if we have a default/forced value from the settings hook,
@@ -705,9 +704,9 @@ 
 		}
 		if ($need_update)
 		{
-			$GLOBALS['egw']->preferences->save_repository(false,'default',true);
+			$GLOBALS['egw']->preferences->save_repository(false, 'default', true);
 		}
-		if($this->debug)
+		if ($this->debug)
 		{
 			_debug_array($this->settings);
 		}

Braces +69 added lines, -17 removed lines

@@ -176,14 +176,23 @@ 
 			{
 				foreach ($val as $k => $v)
 				{
-					if (!is_int($k)) $preserve['old_values'][$k] = $v;
+					if (!is_int($k))
+					{
+						$preserve['old_values'][$k] = $v;
+					}
 				}
 			}
 		}
 
-		if (isset($old_tab)) $data['tabs'] = $old_tab;
+		if (isset($old_tab))
+		{
+			$data['tabs'] = $old_tab;
+		}
 
-		if ($msg) Framework::message($msg, $msg_type ? $msg_type : 'error');
+		if ($msg)
+		{
+			Framework::message($msg, $msg_type ? $msg_type : 'error');
+		}
 
 		$tpl->exec('preferences.preferences_settings.index', $data, $sel_options, $readonlys, $preserve, 2);
 	}
@@ -197,7 +206,8 @@ 
 	 */
 	static function admin_cmd_run($content, $values, $account_id)
 	{
-		$changes = array_udiff_assoc($values, $content['old_values'], function($a, $b){
+		$changes = array_udiff_assoc($values, $content['old_values'], function($a, $b)
+		{
 			return (int) $a !== $b;
 		});
 		$old = array_intersect_key($content['old_values'], $changes);
@@ -241,7 +251,10 @@ 
 			switch((string)$types[$var])
 			{
 				case 'password':	// dont write empty password-fields
-					if (empty($value)) continue 2;
+					if (empty($value))
+					{
+						continue 2;
+					}
 					break;
 				case 'vfs_file':
 				case 'vfs_dir':
@@ -255,7 +268,10 @@ 
 						{
 							unset($prefs[$var]);
 							// need to call preferences::delete, to also set affective prefs!
-							if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+							if (!$only_verify)
+							{
+								$GLOBALS['egw']->preferences->delete($appname, $var, $type);
+							}
 							continue 2;
 						}
 					}
@@ -272,7 +288,11 @@ 
 						// to still allow space or comma in dirnames, we also use the trailing slash of all pathes to split
 						foreach($types[$var] == 'vfs_dir' ? array($value) : preg_split('/[,\s]+\//', $value) as $n => $dir)
 						{
-							if ($n) $dir = '/'.$dir;	// re-adding trailing slash removed by split
+							if ($n)
+							{
+								$dir = '/'.$dir;
+							}
+							// re-adding trailing slash removed by split
 							if ($dir[0] != '/' || !Vfs::stat($dir) || !Vfs::is_dir($dir))
 							{
 								$error .= ($error ? ' ' : '').lang('%1 is no existing vfs directory!',$dir);
@@ -289,19 +309,29 @@ 
 
 			if (isset($value) && $value !== '' && $value !== '**NULL**' && $value !== array())
 			{
-				if (is_array($value) && !$settings[$var]['no_sel_options']) $value = implode(',',$value);	// multiselect
+				if (is_array($value) && !$settings[$var]['no_sel_options'])
+				{
+					$value = implode(',',$value);
+				}
+				// multiselect
 
 				$prefs[$var] = $value;
 
 				// need to call preferences::add, to also set affective prefs!
-				if (!$only_verify) $GLOBALS['egw']->preferences->add($appname, $var, $prefs[$var], $type);
+				if (!$only_verify)
+				{
+					$GLOBALS['egw']->preferences->add($appname, $var, $prefs[$var], $type);
+				}
 			}
 			else
 			{
 				unset($prefs[$var]);
 
 				// need to call preferences::delete, to also set affective prefs!
-				if (!$only_verify) $GLOBALS['egw']->preferences->delete($appname, $var, $type);
+				if (!$only_verify)
+				{
+					$GLOBALS['egw']->preferences->delete($appname, $var, $type);
+				}
 			}
 		}
 
@@ -370,7 +400,10 @@ 
 		$tab = 'tab1';
 		foreach($this->settings as $setting)
 		{
-			if (!is_array($setting)) continue;
+			if (!is_array($setting))
+			{
+				continue;
+			}
 			if ($type != 'forced' && (string)$GLOBALS['egw']->preferences->forced[$appname][$setting['name']] !== '')
 			{
 				continue;	// forced preferences are not displayed, unless we edit them
@@ -392,7 +425,10 @@ 
 
 				case 'notify':
 					$vars = $GLOBALS['egw']->preferences->vars;
-					if (is_array($setting['values'])) $vars += $setting['values'];
+					if (is_array($setting['values']))
+					{
+						$vars += $setting['values'];
+					}
 					$GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']] =
 						$GLOBALS['egw']->preferences->lang_notify($GLOBALS['egw']->preferences->{$attribute}[$appname][$setting['name']], $vars);
 					$types[$setting['name']] = $vars;	// store vars for re-translation, instead type "notify"
@@ -434,17 +470,27 @@ 
 				case 'multiselect':
 					$setting['type'] = 'select';
 					$tpl->setElementAttribute($tab.'['.$setting['name'].']', 'rows', 5);
-					if (!isset($setting['size'])) $setting['size'] = '5';	// old eT
+					if (!isset($setting['size']))
+					{
+						$setting['size'] = '5';
+					}
+					// old eT
 					break;
 				case 'color':
 					$setting['type'] = 'colorpicker';
 					break;
 				case 'date-duration':
-					if (!isset($setting['size'])) $setting['size'] = 'm,dhm,24,1';
+					if (!isset($setting['size']))
+					{
+						$setting['size'] = 'm,dhm,24,1';
+					}
 					$attrs = explode(',', $setting['size']);
 					foreach(array("data_format","display_format", "hours_per_day", "empty_not_0", "short_labels") as $n => $name)
 					{
-						if ((string)$attrs[$n] !== '') $tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
+						if ((string)$attrs[$n] !== '')
+						{
+							$tpl->setElementAttribute($tab.'['.$setting['name'].']', $name, $attrs[$n]);
+						}
 					}
 					break;
 				case 'taglist':
@@ -486,10 +532,13 @@ 
 				{
 					$default = self::get_default_label($default, $setting['values']);
 				}
-				if (is_array($types[$setting['name']]))	// translate the substitution names
+				if (is_array($types[$setting['name']]))
+				{
+					// translate the substitution names
 				{
 					$default = $GLOBALS['egw']->preferences->lang_notify($default, $types[$setting['name']]);
 				}
+				}
 			}
 			if ($setting['help'] && ($setting['run_lang'] || !isset($setting['run_lang'])))
 			{
@@ -602,7 +651,10 @@ 
 					}
 				}
 			}
-			if ($lang) $def = lang($def);
+			if ($lang)
+			{
+				$def = lang($def);
+			}
 		}
 		$label = implode(', ', $labels);
 		//error_log(__METHOD__."(".array2string($default).', '.array2string($values).") returning $label");