[Phpgroupware-cvs] CVS: setup config.php,1.78.2.4,1.78.2.5

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/setup
In directory subversions:/tmp/cvs-serv28506

Modified Files:
      Tag: Version-0_9_16-branch
        config.php 
Log Message:
added some code to guess the webserver_url and deleteing passwords before 
writeing them, if they got set in the form


Index: config.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/config.php,v
retrieving revision 1.78.2.4
retrieving revision 1.78.2.5
diff -C2 -r1.78.2.4 -r1.78.2.5
*** config.php  10 Aug 2003 22:35:40 -0000      1.78.2.4
--- config.php  13 Aug 2003 12:52:28 -0000      1.78.2.5
***************
*** 83,86 ****
--- 83,91 ----
                $GLOBALS['current_config']['temp_dir'] = '/path/to/temp/dir';
        }
+       // guessing the phpGW url
+       $parts = explode('/',$_SERVER['PHP_SELF']);
+       unset($parts[count($parts)-1]); // config.php
+       unset($parts[count($parts)-1]); // setup
+       $GLOBALS['current_config']['webserver_url'] = implode('/',$parts);
  
        if(@get_var('cancel',Array('POST')))
***************
*** 92,95 ****
--- 97,101 ----
        /* Check api version, use correct table */
        $setup_info = $GLOBALS['phpgw_setup']->detection->get_db_versions();
+ 
        
if($GLOBALS['phpgw_setup']->alessthanb($setup_info['phpgwapi']['currentver'], 
'0.9.10pre7'))
        {
***************
*** 132,136 ****
                        /* echo '<br>Updating: ' . $setting . '=' . $value; */
                        /* Don't erase passwords, since we also do not print 
them below */
!                       if(!ereg('passwd',$setting) && 
!ereg('password',$setting) && !ereg('root_pw',$setting))
                        {
                                @$GLOBALS['phpgw_setup']->db->query("DELETE 
FROM $configtbl WHERE config_name='" . $setting . "'");
--- 138,142 ----
                        /* echo '<br>Updating: ' . $setting . '=' . $value; */
                        /* Don't erase passwords, since we also do not print 
them below */
!                       if($value || (!ereg('passwd',$setting) && 
!ereg('password',$setting) && !ereg('root_pw',$setting)))
                        {
                                @$GLOBALS['phpgw_setup']->db->query("DELETE 
FROM $configtbl WHERE config_name='" . $setting . "'");