[Phpgroupware-cvs] CVS: news_admin/website export.php,1.1,1.1.4.1 news.inc.php,1.4,1.4.4.1

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/news_admin/website
In directory subversions:/tmp/cvs-serv10487/website

Modified Files:
      Tag: Version-0_9_14-branch
        export.php news.inc.php 
Log Message:
update table name



Index: export.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/website/export.php,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -r1.1 -r1.1.4.1
*** export.php  20 Dec 2000 03:34:11 -0000      1.1
--- export.php  20 Jan 2002 22:42:59 -0000      1.1.4.1
***************
*** 26,30 ****
                         "row"  => $format . "_row.tpl"));
  
!   $db->query("select * from webpage_news,accounts where news_status='Active' 
order by news_date "
             . "desc limit 5");
  
--- 26,30 ----
                         "row"  => $format . "_row.tpl"));
  
!   $db->query("select * from phpgw_news,accounts where news_status='Active' 
order by news_date "
             . "desc limit 5");
  

Index: news.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/website/news.inc.php,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -r1.4 -r1.4.4.1
*** news.inc.php        23 Dec 2000 06:57:25 -0000      1.4
--- news.inc.php        20 Jan 2002 22:42:59 -0000      1.4.4.1
***************
*** 20,31 ****
                         "row"  => "news_row.tpl"));
  
!   $db->query("select count(*) from webpage_news where news_status='Active'");
    $db->next_record();
    $total = $db->f(0);
  
    if (! $oldnews) {
!      $db->query("select *,account_lid as submittedby from 
webpage_news,accounts where news_status='Active' and 
news_submittedby=accounts.account_id order by news_date desc limit 5");
    } else {  
!      $db->query("select *,account_lid as submittedby from 
webpage_news,accounts where news_status='Active' and 
news_submittedby=accounts.account_id order by news_date desc limit 5,$total");
    }
  
--- 20,31 ----
                         "row"  => "news_row.tpl"));
  
!   $db->query("select count(*) from phpgw_news where news_status='Active'");
    $db->next_record();
    $total = $db->f(0);
  
    if (! $oldnews) {
!      $db->query("select *,account_lid as submittedby from phpgw_news,accounts 
where news_status='Active' and news_submittedby=accounts.account_id order by 
news_date desc limit 5");
    } else {  
!      $db->query("select *,account_lid as submittedby from phpgw_news,accounts 
where news_status='Active' and news_submittedby=accounts.account_id order by 
news_date desc limit 5,$total");
    }