[Phpgroupware-cvs] CVS: setup manageheader.php,1.45.2.12,1.45.2.13

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        manageheader.php 
Log Message:
fix for . in domains

Index: manageheader.php
===================================================================
RCS file: /cvsroot/phpgroupware/setup/manageheader.php,v
retrieving revision 1.45.2.12
retrieving revision 1.45.2.13
diff -C2 -r1.45.2.12 -r1.45.2.13
*** manageheader.php    8 Sep 2003 03:20:51 -0000       1.45.2.12
--- manageheader.php    19 Sep 2003 06:26:03 -0000      1.45.2.13
***************
*** 43,48 ****
                                continue;
                        }
!                       $dom = get_var('setting_'.$k,Array('POST'));
!                       if(!$dom['config_pass'])
                        {
                                $errors .= '<br>' . lang("You didn't enter a 
config password for domain %1",$v);
--- 43,48 ----
                                continue;
                        }
!                       //$dom = get_var("settings['$k']", Array('POST'));
!                       if(!$_POST['settings'][$k]['config_pass'])
                        {
                                $errors .= '<br>' . lang("You didn't enter a 
config password for domain %1",$v);
***************
*** 306,310 ****
                                        
$GLOBALS['phpgw_info']['server']['config_passwd'] = 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
  
!                                       if(@$adddomain)
                                        {
                                                
$GLOBALS['phpgw_domain'][lang('new')] = array();
--- 306,310 ----
                                        
$GLOBALS['phpgw_info']['server']['config_passwd'] = 
$GLOBALS['phpgw_domain'][$GLOBALS['phpgw_info']['server']['default_domain']]['config_passwd'];
  
!                                       if(@$_POST['adddomain'])
                                        {
                                                
$GLOBALS['phpgw_domain'][lang('new')] = array();
***************
*** 364,369 ****
                        {
                                $detected .= lang('Sample configuration not 
found. using built in defaults') . '<br>' . "\n";
!                               $GLOBALS['phpgw_info']['server']['server_root'] 
= '/path/to/phpgroupware';
!                               
$GLOBALS['phpgw_info']['server']['include_root'] = '/path/to/phpgroupware';
                                /* This is the basic include needed on each 
page for phpGroupWare application compliance */
                                
$GLOBALS['phpgw_info']['flags']['htmlcompliant'] = True;
--- 364,369 ----
                        {
                                $detected .= lang('Sample configuration not 
found. using built in defaults') . '<br>' . "\n";
!                               $GLOBALS['phpgw_info']['server']['server_root'] 
= realpath('../'); //'/path/to/phpgroupware';
!                               
$GLOBALS['phpgw_info']['server']['include_root'] = 
realpath('../');//'/path/to/phpgroupware';
                                /* This is the basic include needed on each 
page for phpGroupWare application compliance */
                                
$GLOBALS['phpgw_info']['flags']['htmlcompliant'] = True;
***************
*** 416,420 ****
                                $detected .= lang('Now guessing better values 
for defaults...') . '<br>' . "\n";
                                $this_dir = 
dirname($_SERVER['SCRIPT_FILENAME']);
!                               $updir    = str_replace('/setup','',$this_dir);
                                $GLOBALS['phpgw_info']['server']['server_root'] 
= $updir; 
                                
$GLOBALS['phpgw_info']['server']['include_root'] = $updir; 
--- 416,420 ----
                                $detected .= lang('Now guessing better values 
for defaults...') . '<br>' . "\n";
                                $this_dir = 
dirname($_SERVER['SCRIPT_FILENAME']);
!                               $updir    = realpath('../'); 
//str_replace('/setup','',$this_dir);
                                $GLOBALS['phpgw_info']['server']['server_root'] 
= $updir; 
                                
$GLOBALS['phpgw_info']['server']['include_root'] = $updir;