[Phpgroupware-cvs] CVS: phpwebhosting/inc html.inc.php,1.12.2.1,1.12.2.2 main.inc.php,1.14,1.14.2.1

[Jason Wies <address@hidden>]

Update of /cvsroot/phpgroupware/phpwebhosting/inc
In directory subversions:/tmp/cvs-serv31406/inc

Modified Files:
      Tag: Version-0_9_14-branch
        html.inc.php main.inc.php 
Log Message:
PHP3 fixes

Index: html.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpwebhosting/inc/html.inc.php,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -C2 -r1.12.2.1 -r1.12.2.2
*** html.inc.php        16 Jan 2002 06:43:28 -0000      1.12.2.1
--- html.inc.php        10 Feb 2002 04:37:57 -0000      1.12.2.2
***************
*** 368,372 ****
  
                /* $phpgw->link requires that the extra vars be passed 
separately */
!               $link_parts = explode ("?", $href, 2);
                $address = $GLOBALS['phpgw']->link ($link_parts[0], 
$link_parts[1]);
        }
--- 368,372 ----
  
                /* $phpgw->link requires that the extra vars be passed 
separately */
!               $link_parts = explode ("?", $href);
                $address = $GLOBALS['phpgw']->link ($link_parts[0], 
$link_parts[1]);
        }

Index: main.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpwebhosting/inc/main.inc.php,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -r1.14 -r1.14.2.1
*** main.inc.php        10 Dec 2001 04:04:56 -0000      1.14
--- main.inc.php        10 Feb 2002 04:37:57 -0000      1.14.2.1
***************
*** 180,184 ****
        if (preg_match ("/=(.*)(&|$)/U", $string))
        {
!               $rstring = preg_replace ("/=(.*)(&|$)/Ue", "'=' . rawurlencode 
(base64_encode ('\\1')) . '\\2'", $string);
        }
        elseif (ereg ('^'.$GLOBALS['hostname'], $string))
--- 180,193 ----
        if (preg_match ("/=(.*)(&|$)/U", $string))
        {
!               $rstring = $string;
! 
!               preg_match_all ("/=(.*)(&|$)/U", $string, $matches, 
PREG_SET_ORDER);
! 
!               reset ($matches);
!               while (list (,$match_array) = each ($matches))
!               {
!                       $var_encoded = rawurlencode (base64_encode 
($match_array[1]));
!                       $rstring = str_replace ($match_array[0], '=' . 
$var_encoded . $match_array[2], $rstring);
!               }
        }
        elseif (ereg ('^'.$GLOBALS['hostname'], $string))