[Phpgroupware-cvs] admin/inc class.uiconfig.inc.php

[Dave Hall]

CVSROOT:        /cvsroot/phpgroupware
Module name:    admin
Branch:         
Changes by:     Dave Hall <address@hidden>      06/03/26 12:47:26

Modified files:
        inc            : class.uiconfig.inc.php 

Log message:
        get the navbar back

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/admin/inc/class.uiconfig.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: admin/inc/class.uiconfig.inc.php
diff -u admin/inc/class.uiconfig.inc.php:1.18 
admin/inc/class.uiconfig.inc.php:1.19
--- admin/inc/class.uiconfig.inc.php:1.18       Tue Feb 21 14:42:11 2006
+++ admin/inc/class.uiconfig.inc.php    Sun Mar 26 12:47:22 2006
@@ -10,7 +10,7 @@
   *  option) any later version.                                              *
   \**************************************************************************/
 
-  /* $Id: class.uiconfig.inc.php,v 1.18 2006/02/21 14:42:11 skwashd Exp $ */
+  /* $Id: class.uiconfig.inc.php,v 1.19 2006/03/26 12:47:22 skwashd Exp $ */
 
        class uiconfig
        {
@@ -65,14 +65,15 @@
                                        break;
                        }
 
-                       $t = 
CreateObject('phpgwapi.Template',$GLOBALS['phpgw']->common->get_tpl_dir($appname));
+                       $t =& $GLOBALS['phpgw']->template;
+                       
$t->set_root($GLOBALS['phpgw']->common->get_tpl_dir($appname));
                        $t->set_unknowns('keep');
                        $t->set_file(array('config' => 'config.tpl'));
                        $t->set_block('config','header','header');
                        $t->set_block('config','body','body');
                        $t->set_block('config','footer','footer');
 
-                       $c = CreateObject('phpgwapi.config',$config_appname);
+                       $c =& CreateObject('phpgwapi.config',$config_appname);
                        $c->read_repository();
 
                        if ($c->config_data)
@@ -80,17 +81,17 @@
                                $current_config = $c->config_data;
                        }
 
-                       if ($GLOBALS['HTTP_POST_VARS']['cancel'])
+                       if ( isset($_POST['cancel']) && $_POST['cancel'] )
                        {
                                Header('Location: ' . $_redir);
                        }
 
-                       if ($GLOBALS['HTTP_POST_VARS']['submit'])
+                       if ( isset($_POST['submit']) && $_POST['submit'] )
                        {
                                /* Load hook file with functions to validate 
each config (one/none/all) */
                                
$GLOBALS['phpgw']->hooks->single('config_validate',$appname);
 
-                               while (list($key,$config) = 
each($GLOBALS['HTTP_POST_VARS']['newsettings']))
+                               while (list($key,$config) = 
each($_POST['newsettings']))
                                {
                                        if ($config)
                                        {
@@ -155,7 +156,7 @@
                                $t->set_var('error','');
                        }
 
-                       $GLOBALS['phpgw']->common->phpgw_header();
+                       $GLOBALS['phpgw']->common->phpgw_header(true);
 
                        $t->set_var('title',lang('Site Configuration'));
                        
$t->set_var('action_url',$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiconfig.index&appname='
 . $appname));