extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-02 04:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve/work around problem of displaying account info in javasript triggered messages (brackets for emailaddresses) that use the nodes text

Browse Source
This commit is contained in:
Klaus Leithoff 2014-02-05 13:02:51 +00:00
parent 92701be185
commit ae96c5333c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/inc/class.mail_ui.inc.php
View File

@ -573,9 +573,10 @@ class mail_ui
*/ */
public function ajax_foldertree($_nodeID = null,$_subscribedOnly=true) public function ajax_foldertree($_nodeID = null,$_subscribedOnly=true)
{ {
//error_log(__METHOD__.__LINE__.':'.$_nodeID.'->'.$_subscribedOnly);
$nodeID = $_GET['id']; $nodeID = $_GET['id'];
if (!is_null($_nodeID)) $nodeID = $_nodeID; if (!is_null($_nodeID)) $nodeID = $_nodeID;
$subscribedOnly = $_subscribedOnly; $subscribedOnly = (bool)$_subscribedOnly;
//error_log(__METHOD__.__LINE__.'->'.array2string($_REQUEST)); //error_log(__METHOD__.__LINE__.'->'.array2string($_REQUEST));
//error_log(__METHOD__.__LINE__.'->'.array2string($_GET)); //error_log(__METHOD__.__LINE__.'->'.array2string($_GET));
$fetchCounters = !is_null($_nodeID); $fetchCounters = !is_null($_nodeID);
@ -638,7 +639,7 @@ class mail_ui
if ($_profileID && $acc_id != $_profileID) continue; if ($_profileID && $acc_id != $_profileID) continue;
$oA = array('id' => $acc_id, $oA = array('id' => $acc_id,
'text' => $identity_name,// htmlspecialchars($identity_name), 'text' => str_replace(array('<','>'),array('[',']'),$identity_name),// as angle brackets are quoted, display in Javascript messages when used is ugly, so use square brackets instead
'tooltip' => '('.$acc_id.') '.htmlspecialchars_decode($identity_name), 'tooltip' => '('.$acc_id.') '.htmlspecialchars_decode($identity_name),
'im0' => 'thunderbird.png', 'im0' => 'thunderbird.png',
'im1' => 'thunderbird.png', 'im1' => 'thunderbird.png',