[Phpgroupware-cvs] setup config.php,1.83

[fipsfuchs]

Update of setup

Modified Files:
     Branch: MAIN
            config.php lines: +13 -17

Log Message:
tpl set_root fixed

====================================================
Index: setup/config.php
diff -u setup/config.php:1.82 setup/config.php:1.83
--- setup/config.php:1.82       Mon Jan  3 07:47:22 2005
+++ setup/config.php    Sun Jan  9 00:32:07 2005
@@ -108,7 +108,6 @@

        $newsettings = get_var('newsettings',Array('POST'));
        $files_in_docroot = 
in_docroot($GLOBALS['HTTP_POST_VARS']['newsettings']['files_dir']);
-
        if(@get_var('submit',Array('POST')) && @$newsettings && 
!$files_in_docroot)
        {
                $datetime = CreateObject('phpgwapi.datetime');
@@ -222,13 +221,12 @@
        /*$cfg_apps = array('phpgwapi','admin','preferences');
        while(list(,$cfg_app) = each($cfg_apps))
        {*/
-               $t = 
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir('setup'));

-               $t->set_unknowns('keep');
-               $t->set_file(array('config' => 'config.tpl'));
-               $t->set_block('config','body','body');
+               $setup_tpl->set_unknowns('keep');
+               $setup_tpl->set_file(array('config' => 'config.tpl'));
+               $setup_tpl->set_block('config','body','body');

-               $vars = $t->get_undefined('body');
+               $vars = $setup_tpl->get_undefined('body');
                $GLOBALS['phpgw_setup']->hook('config','setup');

                while(list($null,$value) = each($vars))
@@ -246,18 +244,18 @@
                        switch ($type)
                        {
                                case 'lang':
-                                       $t->set_var($value,lang($newval));
+                                       
$setup_tpl->set_var($value,lang($newval));
                                        break;
                                case 'value':
                                        $newval = ereg_replace(' ','_',$newval);
                                        /* Don't show passwords in the form */
                                        if(ereg('passwd',$value) || 
ereg('password',$value) || ereg('root_pw',$value))
                                        {
-                                               $t->set_var($value,'');
+                                               $setup_tpl->set_var($value,'');
                                        }
                                        else
                                        {
-                                               
$t->set_var($value,@$current_config[$newval]);
+                                               
$setup_tpl->set_var($value,@$current_config[$newval]);
                                        }
                                        break;
                                case 'selected':
@@ -273,25 +271,23 @@
                                        /* echo $config . '=' . 
$current_config[$config]; */
                                        if(@$current_config[$config] == 
$setting)
                                        {
-                                               $t->set_var($value,' selected');
+                                               $setup_tpl->set_var($value,' 
selected');
                                        }
                                        else
                                        {
-                                               $t->set_var($value,'');
+                                               $setup_tpl->set_var($value,'');
                                        }
                                        break;
                                case 'hook':
                                        $newval = ereg_replace(' ','_',$newval);
-                                       
$t->set_var($value,$newval($current_config));
+                                       
$setup_tpl->set_var($value,$newval($current_config));
                                        break;
                                default:
-                                       $t->set_var($value,'');
+                                       $setup_tpl->set_var($value,'');
                                        break;
                        }
                }
-
-               $t->pfp('out','body');
-               unset($t);
+               $setup_tpl->pfp('out','body');
        //}

        $setup_tpl->set_var('more_configs',lang('Please login to phpgroupware 
and run the admin application for additional site configuration') . '.');