[Phpgroupware-cvs] CVS: headlines/setup default_records.inc.php,1.4,1.5 tables_update.inc.php,1.1,1.2

[Miles Lott <address@hidden>]

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

Modified Files:
        default_records.inc.php tables_update.inc.php 
Log Message:
formatting and globals



Index: default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/setup/default_records.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** default_records.inc.php     4 Mar 2002 07:18:45 -0000       1.4
--- default_records.inc.php     31 Mar 2002 17:04:23 -0000      1.5
***************
*** 12,26 ****
        /* $Id$ */
  
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Slashdot','http://slashdot.org','/slashdot.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Freshmeat','http://freshmeat.net','/backend/fm.rdf',0,'fm',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Linux Today','http://linuxtoday.com','/backend/linuxtoday.xml',0,'lt',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Linux Game Tome','http://happypenguin.org','/html/news.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('linux-at-work.de','http://linux-at-work.de','/backend.php',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Segfault','http://segfault.org','/stories.xml',0,'sf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('KDE News','http://www.kde.org','/news/kdenews.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Gnome News','http://news.gnome.org','/gnome-news/rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Gimp News','http://www.xach.com','/gimp/news/channel.rdf',0,'rdf-chan',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('Mozilla','http://www.mozilla.org','/news.rdf',0,'rdf-chan',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('MozillaZine','http://www.mozillazine.org','/contents.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("insert into 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) values 
('phpgw.de - deutsche PHPGroupware 
Seite','http://phpgw.de','/backend.php',0,'rdf',60,20)");
  ?>
--- 12,26 ----
        /* $Id$ */
  
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Slashdot','http://slashdot.org','/slashdot.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Freshmeat','http://freshmeat.net','/backend/fm.rdf',0,'fm',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Linux Today','http://linuxtoday.com','/backend/linuxtoday.xml',0,'lt',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Linux Game Tome','http://happypenguin.org','/html/news.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('linux-at-work.de','http://linux-at-work.de','/backend.php',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Segfault','http://segfault.org','/stories.xml',0,'sf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('KDE News','http://www.kde.org','/news/kdenews.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Gnome News','http://news.gnome.org','/gnome-news/rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Gimp News','http://www.xach.com','/gimp/news/channel.rdf',0,'rdf-chan',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('Mozilla','http://www.mozilla.org','/news.rdf',0,'rdf-chan',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('MozillaZine','http://www.mozillazine.org','/contents.rdf',0,'rdf',60,20)");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO 
phpgw_headlines_sites 
(display,base_url,newsfile,lastread,newstype,cachetime,listings) 
VALUES('phpgw.de - deutsche PHPGroupware 
Seite','http://phpgw.de','/backend.php',0,'rdf',60,20)");
  ?>

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/headlines/setup/tables_update.inc.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** tables_update.inc.php       22 Sep 2001 02:05:38 -0000      1.1
--- tables_update.inc.php       31 Mar 2002 17:04:23 -0000      1.2
***************
*** 15,27 ****
        function headlines_upgrade0_8_1()
        {
!               global $phpgw_info, $phpgw_setup;
  
!               
$phpgw_setup->oProc->RenameTable('news_site','phpgw_headlines_sites');
!               
$phpgw_setup->oProc->RenameTable('news_headlines','phpgw_headlines_cached');
!               $phpgw_setup->oProc->DropTable('users_headlines');
! 
!               $setup_info['headlines']['currentver'] = '0.8.1.001';
!               return $setup_info['headlines']['currentver'];
        }
! 
! ?>
\ No newline at end of file
--- 15,24 ----
        function headlines_upgrade0_8_1()
        {
!               
$GLOBALS['phpgw_setup']->oProc->RenameTable('news_site','phpgw_headlines_sites');
!               
$GLOBALS['phpgw_setup']->oProc->RenameTable('news_headlines','phpgw_headlines_cached');
!               $GLOBALS['phpgw_setup']->oProc->DropTable('users_headlines');
  
!               $GLOBALS['setup_info']['headlines']['currentver'] = '0.8.1.001';
!               return $GLOBALS['setup_info']['headlines']['currentver'];
        }
! ?>