[Phpgroupware-cvs] CVS: headlines preferences.php, 1.23, 1.24 preferences_other.php, 1.3, 1.4

[Mark A Peters <address@hidden>]

Update of /cvsroot/phpgroupware/headlines
In directory subversions:/tmp/cvs-serv19437

Modified Files:
        preferences.php preferences_other.php 
Log Message:
Should now be working ok.

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/preferences.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** preferences.php     12 Aug 2002 03:37:13 -0000      1.23
--- preferences.php     7 Sep 2003 01:53:17 -0000       1.24
***************
*** 24,27 ****
--- 24,29 ----
        if(!$submit)
        {
+               unset($GLOBALS['phpgw_info']['flags']['noheader']);
+               unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
                $GLOBALS['phpgw']->common->phpgw_header();
  
***************
*** 52,56 ****
                
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('submit'));
  
!               $GLOBALS['phpgw']->template->pparse('out','form');
        }
        else
--- 54,58 ----
                
$GLOBALS['phpgw']->template->set_var('lang_submit',lang('submit'));
  
!               $GLOBALS['phpgw']->template->parse('phpgw_body','form');
        }
        else
***************
*** 76,79 ****
                Header('Location: ' . 
$GLOBALS['phpgw']->link('/preferences/index.php'));
        }
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>
--- 78,81 ----
                Header('Location: ' . 
$GLOBALS['phpgw']->link('/preferences/index.php'));
        }
! //    $GLOBALS['phpgw']->common->phpgw_footer();
  ?>

Index: preferences_other.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/preferences_other.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** preferences_other.php       12 Aug 2002 03:37:13 -0000      1.3
--- preferences_other.php       7 Sep 2003 01:53:18 -0000       1.4
***************
*** 25,37 ****
        else
        {
                $GLOBALS['phpgw']->common->phpgw_header();
        }
!       $submit = get_var('submit',Array('POST'));
  
        if($submit)
        {
!               
$GLOBALS['phpgw']->preferences->change('headlines','headlines_layout');
!               
$GLOBALS['phpgw']->preferences->change('headlines','mainscreen_showheadlines');
!               $GLOBALS['phpgw']->preferences->commit(True);
        }
  
--- 25,41 ----
        else
        {
+               unset($GLOBALS['phpgw_info']['flags']['noheader']);
+               unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
                $GLOBALS['phpgw']->common->phpgw_header();
        }
!       $submit                              = get_var('submit',Array('POST'));
!       $GLOBALS['headlines_layout']         = 
get_var('headlines_layout',Array('POST'));
!       $GLOBALS['mainscreen_showheadlines'] = 
get_var('mainscreen_showheadlines',Array('POST'));
  
        if($submit)
        {
!               
$GLOBALS['phpgw']->preferences->change('headlines','headlines_layout',$GLOBALS['headlines_layout']
 );
!               
$GLOBALS['phpgw']->preferences->change('headlines','mainscreen_showheadlines',$GLOBALS['mainscreen_showheadlines']);
!               $GLOBALS['phpgw_info']['user']['preferences'] = 
$GLOBALS['phpgw']->preferences->commit(True);
        }
  
***************
*** 53,57 ****
        if($submit)
        {
!               $selected[$headlines_layout] = ' selected';
        }
        else
--- 57,61 ----
        if($submit)
        {
!               $selected[$GLOBALS['headlines_layout']] = ' selected';
        }
        else
***************
*** 71,75 ****
        $GLOBALS['phpgw']->template->parse('layout_2','layout2');
  
!       $GLOBALS['phpgw']->template->pfp('out','body');
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>
--- 75,79 ----
        $GLOBALS['phpgw']->template->parse('layout_2','layout2');
  
!       $GLOBALS['phpgw']->template->parse('phpgw_body','body');
! //    $GLOBALS['phpgw']->common->phpgw_footer();
  ?>