[Phpgroupware-cvs] CVS: news_admin/setup setup.inc.php, 1.5.4.4, 1.5.4.5 tables_current.inc.php, 1.3.4.3, 1.3.4.4 tables_update.inc.php, 1.1.4.3, 1.1.4.4

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/news_admin/setup
In directory subversions:/tmp/cvs-serv14589/setup

Modified Files:
      Tag: Version-0_9_16-branch
        setup.inc.php tables_current.inc.php tables_update.inc.php 
Log Message:
added html support

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/setup/setup.inc.php,v
retrieving revision 1.5.4.4
retrieving revision 1.5.4.5
diff -C2 -r1.5.4.4 -r1.5.4.5
*** setup.inc.php       28 Jun 2003 04:33:47 -0000      1.5.4.4
--- setup.inc.php       11 Jul 2003 10:57:00 -0000      1.5.4.5
***************
*** 15,19 ****
        $setup_info['news_admin']['name']      = 'news_admin';
        //$setup_info['news_admin']['title']     = 'News Admin';
!       $setup_info['news_admin']['version']   = '0.9.14.502';
        $setup_info['news_admin']['app_order'] = 4;
        $setup_info['news_admin']['enable']    = 1;
--- 15,19 ----
        $setup_info['news_admin']['name']      = 'news_admin';
        //$setup_info['news_admin']['title']     = 'News Admin';
!       $setup_info['news_admin']['version']   = '0.9.14.503';
        $setup_info['news_admin']['app_order'] = 4;
        $setup_info['news_admin']['enable']    = 1;
***************
*** 31,33 ****
                 'versions' => Array('0.9.13', '0.9.14', '0.9.15')
        );
! ?>
--- 31,33 ----
                 'versions' => Array('0.9.13', '0.9.14', '0.9.15')
        );
! 

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/setup/tables_current.inc.php,v
retrieving revision 1.3.4.3
retrieving revision 1.3.4.4
diff -C2 -r1.3.4.3 -r1.3.4.4
*** tables_current.inc.php      28 Jun 2003 04:33:47 -0000      1.3.4.3
--- tables_current.inc.php      11 Jul 2003 10:57:00 -0000      1.3.4.4
***************
*** 28,32 ****
                                'news_end' => array('type' => 'int','precision' 
=> '4','nullable' => True),
                                'news_cat' => array('type' => 'int','precision' 
=> '4','nullable' => True),
!                               'news_teaser' => array('type' => 
'varchar','precision' => '255','nullable' => True)
                        ),
                        'pk' => array('news_id'),
--- 28,33 ----
                                'news_end' => array('type' => 'int','precision' 
=> '4','nullable' => True),
                                'news_cat' => array('type' => 'int','precision' 
=> '4','nullable' => True),
!                               'news_teaser' => array('type' => 
'varchar','precision' => '255','nullable' => True),
!                               'is_html' => array('type' => 'int','precision' 
=> '2','nullable' => False,'default' => '0')
                        ),
                        'pk' => array('news_id'),
***************
*** 38,50 ****
                        'fd' => array(
                                'cat_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
-                               //export_types: 0 no export, 1 rss091, 2 rss1, 
3 rss2
                                'export_type' => array('type' => 
'int','precision' => '2','nullable' => True),
                                'export_itemsyntax' => array('type' => 
'int','precision' => '2','nullable' => True),
                                'export_title' => array('type' => 
'varchar','precision' => '255','nullable' => True),
                                'export_link' => array('type' => 
'varchar','precision' => '255','nullable' => True),
!                               'export_description' => array('type' => 'text', 
'nullable' => True),
                                'export_img_title' => array('type' => 
'varchar','precision' => '255','nullable' => True),
                                'export_img_url' => array('type' => 
'varchar','precision' => '255','nullable' => True),
!                               'export_img_link' => array('type' => 
'varchar','precision' => '255','nullable' => True),
                        ),
                        'pk' => array('cat_id'),
--- 39,50 ----
                        'fd' => array(
                                'cat_id' => array('type' => 'int','precision' 
=> '4','nullable' => False),
                                'export_type' => array('type' => 
'int','precision' => '2','nullable' => True),
                                'export_itemsyntax' => array('type' => 
'int','precision' => '2','nullable' => True),
                                'export_title' => array('type' => 
'varchar','precision' => '255','nullable' => True),
                                'export_link' => array('type' => 
'varchar','precision' => '255','nullable' => True),
!                               'export_description' => array('type' => 
'text','nullable' => True),
                                'export_img_title' => array('type' => 
'varchar','precision' => '255','nullable' => True),
                                'export_img_url' => array('type' => 
'varchar','precision' => '255','nullable' => True),
!                               'export_img_link' => array('type' => 
'varchar','precision' => '255','nullable' => True)
                        ),
                        'pk' => array('cat_id'),
***************
*** 52,56 ****
                        'ix' => array(),
                        'uc' => array()
!               ),
        );
  ?>
--- 52,56 ----
                        'ix' => array(),
                        'uc' => array()
!               )
        );
  ?>

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/news_admin/setup/tables_update.inc.php,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -C2 -r1.1.4.3 -r1.1.4.4
*** tables_update.inc.php       28 Jun 2003 04:33:47 -0000      1.1.4.3
--- tables_update.inc.php       11 Jul 2003 10:57:00 -0000      1.1.4.4
***************
*** 128,130 ****
--- 128,146 ----
  
                
+ 
+ 
+       $test[] = '0.9.14.502';
+       function news_admin_upgrade0_9_14_502()
+       {
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_news','is_html',array(
+                       'type' => 'int',
+                       'precision' => '2',
+                       'nullable' => False,
+                       'default' => '0'
+               ));
+ 
+ 
+               $GLOBALS['setup_info']['news_admin']['currentver'] = 
'0.9.14.503';
+               return $GLOBALS['setup_info']['news_admin']['currentver'];
+       }
  ?>