[Phpgroupware-cvs] CVS: etemplate/inc class.html.inc.php,1.15,1.16 class.uietemplate.inc.php,1.48,1.49

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/etemplate/inc
In directory subversions:/tmp/cvs-serv27124

Modified Files:
        class.html.inc.php class.uietemplate.inc.php 
Log Message:
fix to distinguish between entities (eg. ü) and accesskeys lik &Delete

Index: class.html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.html.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** class.html.inc.php  17 Oct 2002 22:07:00 -0000      1.15
--- class.html.inc.php  18 Oct 2002 21:33:39 -0000      1.16
***************
*** 128,132 ****
                        $lang = lang($lang);
                }
!               if (($accesskey = strstr($lang,'&')) && $accesskey[1] != ' ')
                {
                        $lang_u = 
str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$lang);
--- 128,133 ----
                        $lang = lang($lang);
                }
!               if (($accesskey = strstr($lang,'&')) && $accesskey[1] != ' ' &&
!                       (($pos = strpos($accesskey,';')) === False || $pos > 5))
                {
                        $lang_u = 
str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$lang);

Index: class.uietemplate.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/etemplate/inc/class.uietemplate.inc.php,v
retrieving revision 1.48
retrieving revision 1.49
diff -C2 -r1.48 -r1.49
*** class.uietemplate.inc.php   18 Oct 2002 20:19:58 -0000      1.48
--- class.uietemplate.inc.php   18 Oct 2002 21:33:39 -0000      1.49
***************
*** 769,773 ****
                                        $label = lang($label);
                                }
!                               if (($accesskey = strstr($label,'&')) && 
$accesskey[1] != ' ' && $form_name != '')
                                {
                                        $label = 
str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$label);
--- 769,774 ----
                                        $label = lang($label);
                                }
!                               if (($accesskey = strstr($label,'&')) && 
$accesskey[1] != ' ' && $form_name != '' &&
!                                   (($pos = strpos($accesskey,';')) === False 
|| $pos > 5))
                                {
                                        $label = 
str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$label);