[Phpgroupware-cvs] CVS: news_admin/inc class.uinews.inc.php, 1.10.2.6.2.6, 1.10.2.6.2.7

[Dave Hall <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_16-branch
        class.uinews.inc.php 
Log Message:
fixed old and hardcoded image call

Index: class.uinews.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/inc/Attic/class.uinews.inc.php,v
retrieving revision 1.10.2.6.2.6
retrieving revision 1.10.2.6.2.7
diff -C2 -r1.10.2.6.2.6 -r1.10.2.6.2.7
*** class.uinews.inc.php        17 Jul 2003 02:09:16 -0000      1.10.2.6.2.6
--- class.uinews.inc.php        19 Sep 2003 07:48:42 -0000      1.10.2.6.2.7
***************
*** 57,61 ****
                        $right = ($type == 'read') ? PHPGW_ACL_READ : 
PHPGW_ACL_ADD;
                        $selectlist = ($default === false) ? ('<option>' . 
lang($type . ' news') . '</option>') : '';
!                       foreach($this->bo->cats as $cat)
                        {
                                
if($this->bo->acl->is_permitted($cat['id'],$right))
--- 57,62 ----
                        $right = ($type == 'read') ? PHPGW_ACL_READ : 
PHPGW_ACL_ADD;
                        $selectlist = ($default === false) ? ('<option>' . 
lang($type . ' news') . '</option>') : '';
!                       $cats = is_array($this->bo->cats) ? $this->bo->cats : 
array();
!                       foreach($cats as $cat)
                        {
                                
if($this->bo->acl->is_permitted($cat['id'],$right))
***************
*** 82,86 ****
                {
                        $limit = ($GLOBALS['phpgw_info']['common']['maxmatchs'] 
!                                                               ? 
$GLOBALS['phpgw_info']['common']['maxmatchs'] : 5);
  
                        $news_id = get_var('news_id',Array('GET'));
--- 83,87 ----
                {
                        $limit = ($GLOBALS['phpgw_info']['common']['maxmatchs'] 
!                                ? 
$GLOBALS['phpgw_info']['common']['maxmatchs'] : 5);
  
                        $news_id = get_var('news_id',Array('GET'));
***************
*** 159,163 ****
                                'width'     => '100%',
                                'outerborderwidth' => '0',
!                               'header_background_image' => 
$GLOBALS['phpgw']->common->image('phpgwapi/templates/default','bg_filler')
                        ));
  
--- 160,164 ----
                                'width'     => '100%',
                                'outerborderwidth' => '0',
!                               'header_background_image' => 
$GLOBALS['phpgw']->common->image('phpgwapi','bg_filler', 'png', False)
                        ));
  
***************
*** 178,182 ****
                        }
  
!                       $newslist = $this->bo->get_newslist($cat_id);
  
                        $image_path = 
$GLOBALS['phpgw']->common->get_image_path('news_admin');
--- 179,183 ----
                        }
  
!                       $newslist = 
$this->bo->get_newslist($this->cat_id,0,'','',5,True);
  
                        $image_path = 
$GLOBALS['phpgw']->common->get_image_path('news_admin');
***************
*** 184,194 ****
                        if(is_array($newslist))
                        {
!                       foreach($newslist as $newsitem)
!                       {
!                               $portalbox->data[] = array(
!                                       'text' => $newsitem['subject'] . ' - ' 
. lang('Submitted by') . ' ' . 
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']) . ' ' . 
lang('on') . ' ' . $GLOBALS['phpgw']->common->show_date($newsitem['date']),
!                                       'link' => 
$GLOBALS['phpgw']->link('/index.php','menuaction=news_admin.uinews.show_news&news_id='
 . $newsitem['id'])
!                               );
!                       }
                        }
                        else
--- 185,199 ----
                        if(is_array($newslist))
                        {
!                               foreach($newslist as $newsitem)
!                               {
!                                       $portalbox->data[] = array(
!                                               'text' => $newsitem['subject'] 
. ' - ' . lang('Submitted by') . ' ' . 
$GLOBALS['phpgw']->accounts->id2name($newsitem['submittedby']) . ' ' . 
lang('on') . ' ' . $GLOBALS['phpgw']->common->show_date($newsitem['date']),
!                                               'link' => 
$GLOBALS['phpgw']->link('/index.php',
!                                                               
array('menuaction'      => 'news_admin.uinews.show_news',
!                                                                       
'news_id'       =>  $newsitem['id'],
!                                                               )
!                                                       )
!                                       );
!                               }
                        }
                        else
***************
*** 202,205 ****
--- 207,211 ----
                                . '<!-- end News Admin -->'. "\r\n";
                        $this->template->set_var('phpgw_body',$tmp,True);
+                       $this->template->pfp('out', 'phpgw_body');
                }