extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 17:04:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

xajax uses xml to transport the label, therefore we have to replace not only CR, LF (not allowed unencoded in Javascript strings) but also all utf-8 C0 and C1 plus CR and LF

Browse Source
This commit is contained in:
Ralf Becker 2010-03-19 13:06:18 +00:00
parent ef384f4f70
commit 76f6bcddca
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
etemplate/inc/class.link_widget.inc.php
View File

@ -698,7 +698,10 @@ class link_widget
foreach($found as $id => $option) foreach($found as $id => $option)
{ {
if (!is_array($option)) $option = array('label' => $option); if (!is_array($option)) $option = array('label' => $option);
$option['label'] = str_replace(array("\r","\n"),array(" "," "),$option['label']); // xajax uses xml to transport the label, therefore we have to replace not only CR, LF
// (not allowed unencoded in Javascript strings) but also all utf-8 C0 and C1 plus CR and LF
$option['label'] = preg_replace('/[\000-\037\177-\237]/u',' ',$option['label']);
$script .= "opt = select.options[select.options.length] = new Option('".addslashes($option['label'])."','".addslashes($id)."');\n"; $script .= "opt = select.options[select.options.length] = new Option('".addslashes($option['label'])."','".addslashes($id)."');\n";
if (count($option) > 1) if (count($option) > 1)
{ {
@ -757,7 +760,8 @@ class link_widget
$script = "var select = document.getElementById('$id_res');\nselect.options.length=0;\n"; $script = "var select = document.getElementById('$id_res');\nselect.options.length=0;\n";
if(is_array(egw_link::$app_register[$app]['types'])) { if(is_array(egw_link::$app_register[$app]['types']))
{
$found = egw_link::$app_register[$app]['types']; $found = egw_link::$app_register[$app]['types'];
foreach(egw_link::$app_register[$app]['types'] as $id => $option) foreach(egw_link::$app_register[$app]['types'] as $id => $option)
{ {
@ -772,7 +776,9 @@ class link_widget
} }
} }
$script .= "document.getElementById('$id_res').parentNode.style.display='inline';\n"; $script .= "document.getElementById('$id_res').parentNode.style.display='inline';\n";
} else { }
else
{
$script .= "document.getElementById('$id_res').parentNode.style.display='none';\n"; $script .= "document.getElementById('$id_res').parentNode.style.display='none';\n";
} }
$response->addScript($script); $response->addScript($script);