[Phpgroupware-cvs] CVS: headlines editheadline.php,1.13,1.14 index.php,1.28,1.29 preferences.php,1.20,1.21

[Miles Lott <address@hidden>]

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

Modified Files:
        editheadline.php index.php preferences.php 
Log Message:
GLOBALS

Index: editheadline.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/editheadline.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/index.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29

Index: preferences.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/preferences.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** preferences.php     25 Jan 2002 02:53:44 -0000      1.20
--- preferences.php     31 Mar 2002 16:58:53 -0000      1.21
***************
*** 12,16 ****
        /* $Id$ */
  
!       $phpgw_info['flags'] = array(
                'currentapp'              => 'headlines',
                'noheader'                => True,
--- 12,17 ----
        /* $Id$ */
  
!       $phpgw_info = array();
!       $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'              => 'headlines',
                'noheader'                => True,
***************
*** 20,31 ****
        include('../header.inc.php');
  
!       if (! $submit)
        {
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();
!      
                $GLOBALS['phpgw']->template->set_file(array('form' => 
'preferences.tpl'));
!            
!               
$GLOBALS['phpgw']->template->set_var('form_action',$phpgw->link('/headlines/preferences.php'));
                
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
                $GLOBALS['phpgw']->template->set_var('lang_header',lang('select 
headline news sites'));
--- 21,33 ----
        include('../header.inc.php');
  
!       $submit = get_var('submit',array('POST'));
!       if(!$submit)
        {
                $GLOBALS['phpgw']->common->phpgw_header();
                echo parse_navbar();
! 
                $GLOBALS['phpgw']->template->set_file(array('form' => 
'preferences.tpl'));
! 
!               
$GLOBALS['phpgw']->template->set_var('form_action',$GLOBALS['phpgw']->link('/headlines/preferences.php'));
                
$GLOBALS['phpgw']->template->set_var('th_bg',$GLOBALS['phpgw_info']['theme']['th_bg']);
                $GLOBALS['phpgw']->template->set_var('lang_header',lang('select 
headline news sites'));
***************
*** 33,42 ****
  
                $GLOBALS['phpgw']->db->query('SELECT con,display FROM 
phpgw_headlines_sites ORDER BY display asc',__LINE__,__FILE__);
!               while ($GLOBALS['phpgw']->db->next_record())
                {
                        $html_select .= '<option value=\'' . 
$GLOBALS['phpgw']->db->f('con') . '\'';
! //           . $users_headlines[$GLOBALS['phpgw']->db->f('con')];
  
!                       if 
($GLOBALS['phpgw_info']['user']['preferences']['headlines'][$GLOBALS['phpgw']->db->f('con')])
                        {
                                $html_select .= ' selected';
--- 35,44 ----
  
                $GLOBALS['phpgw']->db->query('SELECT con,display FROM 
phpgw_headlines_sites ORDER BY display asc',__LINE__,__FILE__);
!               while($GLOBALS['phpgw']->db->next_record())
                {
                        $html_select .= '<option value=\'' . 
$GLOBALS['phpgw']->db->f('con') . '\'';
!                       //. $users_headlines[$GLOBALS['phpgw']->db->f('con')];
  
!                       
if($GLOBALS['phpgw_info']['user']['preferences']['headlines'][$GLOBALS['phpgw']->db->f('con')])
                        {
                                $html_select .= ' selected';
***************
*** 52,66 ****
  
                $GLOBALS['phpgw']->template->pparse('out','form');
!   } else {
! 
                $i = 0;
!               while 
(is_array($GLOBALS['phpgw_info']['user']['preferences']['headlines']) && 
$preference = each($GLOBALS['phpgw_info']['user']['preferences']['headlines']))
                {
                        
$GLOBALS['phpgw']->preferences->delete('headlines',$preference[0]);
                }
!       
!               if (count($GLOBALS['HTTP_POST_VARS']['headlines']))
                {
!                       while ($value = 
each($GLOBALS['HTTP_POST_VARS']['headlines']))
                        {
                                
$GLOBALS['phpgw']->preferences->add('headlines',$value[1],'True');
--- 54,70 ----
  
                $GLOBALS['phpgw']->template->pparse('out','form');
!       }
!       else
!       {
                $i = 0;
!               
while(is_array($GLOBALS['phpgw_info']['user']['preferences']['headlines']) &&
!                       $preference = 
each($GLOBALS['phpgw_info']['user']['preferences']['headlines']))
                {
                        
$GLOBALS['phpgw']->preferences->delete('headlines',$preference[0]);
                }
! 
!               if(count($GLOBALS['HTTP_POST_VARS']['headlines']))
                {
!                       while($value = 
each($GLOBALS['HTTP_POST_VARS']['headlines']))
                        {
                                
$GLOBALS['phpgw']->preferences->add('headlines',$value[1],'True');