extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-18 03:11:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

"fix for bug #645: Error with apostrophes in organisation's fields

Browse Source 
--> changed the regular expr for egw::link() in js_pseudo_funcs
--> dont add submitit() call to image buttons with onclick action"
This commit is contained in:
Ralf Becker 2007-05-03 06:38:36 +00:00
parent 3da4294e2b
commit a119c5301e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etemplate/inc/class.uietemplate.inc.php
View File

@ -1146,7 +1146,8 @@
if ($this->java_script() && ($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed']) // use a link instead of a button if ($this->java_script() && ($cell['onchange'] != '' || $img && !$readonly) && !$cell['needed']) // use a link instead of a button
{ {
$onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : ''). $onclick = ($onclick ? preg_replace('/^return(.*);$/','if (\\1) ',$onclick) : '').
(($cell['onchange'] == 1 || $img) ? "return submitit($this->name_form,'$form_name');" : $cell['onchange']).'; return false;'; (((string)$cell['onchange'] === '1' || $img && !$onclick) ?
"return submitit($this->name_form,'$form_name');" : $cell['onchange']).'; return false;';
if (!$this->html->netscape4 && substr($img,-1) == '%' && is_numeric($percent = substr($img,0,-1))) if (!$this->html->netscape4 && substr($img,-1) == '%' && is_numeric($percent = substr($img,0,-1)))
{ {
@ -1649,11 +1650,10 @@
*/ */
function js_pseudo_funcs($on,$cname) function js_pseudo_funcs($on,$cname)
{ {
if (preg_match("/egw::link\\('([^']+)','([^']+)'\\)/",$on,$matches)) if (preg_match("/egw::link\\('([^']+)','(.+?)'\\)/",$on,$matches)) // the ? alters the expression to shortest match
{ { // this way we can correctly parse ' in the 2. argument
$url = $GLOBALS['egw']->link($matches[1],$matches[2]); $url = $GLOBALS['egw']->link($matches[1],$matches[2]);
$on = str_replace($matches[0],'\''.$url.'\'',$on); $on = str_replace($matches[0],'\''.$url.'\'',$on);
//$on = preg_replace('/egw::link\(\'([^\']+)\',\'([^\']+)\'\)/','\''.$url.'\'',$on);
} }
if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches)) if (preg_match_all("/form::name\\('([^']+)'\\)/",$on,$matches))
{ {