[Phpgroupware-cvs] CVS: news_admin/inc class.uinews.inc.php,1.16,1.17

[Patrick Walsh <address@hidden>]

Update of /cvsroot/phpgroupware/news_admin/inc
In directory subversions:/tmp/cvs-serv1565

Modified Files:
        class.uinews.inc.php 
Log Message:
ok, there are features in head news_admin that should be in 0.9.14.  i made 
some changes so that head news_admin will work under 0.9.14.


Index: class.uinews.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/class.uinews.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** class.uinews.inc.php        31 Aug 2002 23:40:00 -0000      1.16
--- class.uinews.inc.php        31 Aug 2002 23:49:28 -0000      1.17
***************
*** 53,57 ****
                        $this->template->set_block('_news','category');
  
!                       $news_id = get_var('news_id',Array('GET'));
  
                        if($news_id)
--- 53,64 ----
                        $this->template->set_block('_news','category');
  
!                       if (function_exists('get_var'))
!                       {
!                               $news_id = get_var('news_id',Array('GET'));
!                       }
!                       else
!                       {       
!                               $news_id = $GLOBALS['HTTP_GET_VARS']['news_id'];
!                       }
  
                        if($news_id)
***************
*** 64,68 ****
                        }
  
!                       $total = $bonews->get_NumNewsInCat($cat_id);
  
                        $var = Array();
--- 71,75 ----
                        }
  
!                       $total = $this->bonews->get_NumNewsInCat($cat_id);
  
                        $var = Array();
***************
*** 93,97 ****
                                        'subject'       => $newsitem['subject'],
                                        'submitedby'    => 'Submitted by ' . 
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']) . ' on ' . 
$GLOBALS['phpgw']->common->show_date($newsitem['submissiondate']),
!                                       'content'       => 
nl2br($newsitem['news_content'])
                                );
  
--- 100,104 ----
                                        'subject'       => $newsitem['subject'],
                                        'submitedby'    => 'Submitted by ' . 
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']) . ' on ' . 
$GLOBALS['phpgw']->common->show_date($newsitem['submissiondate']),
!                                       'content'       => 
nl2br($newsitem['content'])
                                );
  
***************
*** 180,184 ****
                        $this->template->set_block('_news','category');
  
!                       $news_id = get_var('news_id',Array('GET'));
  
                        if($news_id)
--- 187,198 ----
                        $this->template->set_block('_news','category');
  
!                       if (function_exists('get_var'))
!                       {
!                               $news_id = get_var('news_id',Array('GET'));
!                       }
!                       else
!                       {   
!                               $news_id = $GLOBALS['HTTP_GET_VARS']['news_id'];
!                       }
  
                        if($news_id)