[Phpgroupware-cvs] CVS: headlines index.php,1.30,1.31

[Mark A Peters <address@hidden>]

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

Modified Files:
        index.php 
Log Message:
Just some small fixes working with the new (xml/xsl) presentation.

Index: index.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/index.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -r1.30 -r1.31
*** index.php   12 Aug 2002 03:37:13 -0000      1.30
--- index.php   7 Sep 2003 00:28:54 -0000       1.31
***************
*** 14,18 ****
        /* $Id$ */
  
!       $phpgw_info = array();
        $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'           => 'headlines',
--- 14,18 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_info'] = array();
        $GLOBALS['phpgw_info']['flags'] = array(
                'currentapp'           => 'headlines',
***************
*** 29,32 ****
--- 29,34 ----
        else
        {
+               unset($GLOBALS['phpgw_info']['flags']['noheader']);
+               unset($GLOBALS['phpgw_info']['flags']['nonavbar']);
                $GLOBALS['phpgw']->common->phpgw_header();
        }
***************
*** 50,59 ****
        $headlines = CreateObject('headlines.headlines');
  
!       $GLOBALS['phpgw']->template->set_file(array(
                'layout_row' => 'layout_row.tpl',
                'form'       => 
$GLOBALS['phpgw_info']['user']['preferences']['headlines']['headlines_layout'] 
. '.tpl'
        ));
!       $GLOBALS['phpgw']->template->set_block('form','channel');
!       $GLOBALS['phpgw']->template->set_block('form','row');
  
        $j = 0;
--- 52,65 ----
        $headlines = CreateObject('headlines.headlines');
  
!       $t = &$GLOBALS['phpgw']->template;
! 
!       $t->set_file(array(
                'layout_row' => 'layout_row.tpl',
                'form'       => 
$GLOBALS['phpgw_info']['user']['preferences']['headlines']['headlines_layout'] 
. '.tpl'
        ));
!       $t->set_block('form','channel');
!       $t->set_block('form','row');
! 
!       $l = '';
  
        $j = 0;
***************
*** 61,66 ****
        if(!$i)
        {
!               echo '<center>' . lang('please set your preferences for this 
application') . '.</center>';
        }
        while(list(,$site) = @each($sites))
        {
--- 67,73 ----
        if(!$i)
        {
!               $l = '<center>' . lang('please set your preferences for this 
application') . '.</center>';
        }
+       reset($sites);
        while(list(,$site) = @each($sites))
        {
***************
*** 68,73 ****
                $headlines->readtable($site);
  
!               
$GLOBALS['phpgw']->template->set_var('channel_url',$headlines->base_url);
!               
$GLOBALS['phpgw']->template->set_var('channel_title',$headlines->display);
  
                $links = $headlines->getLinks($site);
--- 75,80 ----
                $headlines->readtable($site);
  
!               $t->set_var('channel_url',$headlines->base_url);
!               $t->set_var('channel_title',$headlines->display);
  
                $links = $headlines->getLinks($site);
***************
*** 79,84 ****
                                'error'      => lang('Unable to retrieve 
links').'.'
                        );
!                       $GLOBALS['phpgw']->template->set_var($var);
!                       $s .= $GLOBALS['phpgw']->template->parse('o_','row');
                }
                else
--- 86,91 ----
                                'error'      => lang('Unable to retrieve 
links').'.'
                        );
!                       $t->set_var($var);
!                       $s .= $t->parse('o_','row');
                }
                else
***************
*** 93,112 ****
                                                'error'      => ''
                                        );
!                                       
$GLOBALS['phpgw']->template->set_var($var);
!                                       $s .= 
$GLOBALS['phpgw']->template->parse('o_','row');
                                }
                        }
                }
!               $GLOBALS['phpgw']->template->set_var('rows',$s);
                unset($s);
  
!               $GLOBALS['phpgw']->template->set_var('section_' . 
$j,$GLOBALS['phpgw']->template->parse('o','channel'));
  
                if($j == 3 || $i == 1)
                {
!                       $GLOBALS['phpgw']->template->pfp('out','layout_row');
!                       $GLOBALS['phpgw']->template->set_var('section_1', '');
!                       $GLOBALS['phpgw']->template->set_var('section_2', '');
!                       $GLOBALS['phpgw']->template->set_var('section_3', '');
                        $j = 0;
                }
--- 100,120 ----
                                                'error'      => ''
                                        );
!                                       $t->set_var($var);
!                                       $s .= $t->parse('o_','row');
                                }
                        }
                }
!               $t->set_var('rows',$s);
                unset($s);
  
!               $t->parse('section_' . $j,'channel');
!               $t->set_var('rows','');
  
                if($j == 3 || $i == 1)
                {
!                       $l .= $t->fp('output','layout_row');
!                       $t->set_var('section_1', '');
!                       $t->set_var('section_2', '');
!                       $t->set_var('section_3', '');
                        $j = 0;
                }
***************
*** 114,117 ****
        }
  
!       $GLOBALS['phpgw']->common->phpgw_footer();
  ?>
--- 122,125 ----
        }
  
!       $t->set_var('phpgw_body',$l);
  ?>