[Phpgroupware-cvs] CVS: sitemgr/setup default_records.inc.php,1.2,1.3 setup.inc.php,1.11,1.12 tables_current.inc.php,1.10,1.11 tables_update.inc.php,1.10,1.11

[Michael Totschnig <address@hidden>]

Update of /cvsroot/phpgroupware/sitemgr/setup
In directory subversions:/tmp/cvs-serv28077/setup

Modified Files:
        default_records.inc.php setup.inc.php tables_current.inc.php 
        tables_update.inc.php 
Log Message:
reorganise place where modules are stored


Index: default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/default_records.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** default_records.inc.php     18 Jan 2003 06:02:01 -0000      1.2
--- default_records.inc.php     4 Mar 2003 17:26:43 -0000       1.3
***************
*** 2,6 ****
        foreach (array('html','index','toc') as $module)
        {
!               $oProc->query("INSERT INTO phpgw_sitemgr_modules 
(app_name,module_name) VALUES ('sitemgr','$module')",__LINE__,__FILE__);
                $module_id = 
$oProc->m_odb->get_last_insert_id('phpgw_sitemgr_modules','module_id');
                $oProc->query("INSERT INTO phpgw_sitemgr_active_modules 
(area,cat_id,module_id) VALUES ('__PAGE__',0,$module_id)",__LINE__,__FILE__);
--- 2,6 ----
        foreach (array('html','index','toc') as $module)
        {
!               $oProc->query("INSERT INTO phpgw_sitemgr_modules (module_name) 
VALUES ('$module')",__LINE__,__FILE__);
                $module_id = 
$oProc->m_odb->get_last_insert_id('phpgw_sitemgr_modules','module_id');
                $oProc->query("INSERT INTO phpgw_sitemgr_active_modules 
(area,cat_id,module_id) VALUES ('__PAGE__',0,$module_id)",__LINE__,__FILE__);

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/setup.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** setup.inc.php       28 Jan 2003 20:00:00 -0000      1.11
--- setup.inc.php       4 Mar 2003 17:26:43 -0000       1.12
***************
*** 14,18 ****
        $setup_info['sitemgr']['name']      = 'sitemgr';
        $setup_info['sitemgr']['title']     = 'SiteMgr Web Content Manager';
!       $setup_info['sitemgr']['version']   = '0.9.15.002';
        $setup_info['sitemgr']['app_order'] = 8;
        $setup_info['sitemgr']['tables']    = 
array('phpgw_sitemgr_pages','phpgw_sitemgr_pages_lang','phpgw_sitemgr_categories_lang','phpgw_sitemgr_preferences','phpgw_sitemgr_modules','phpgw_sitemgr_content','phpgw_sitemgr_content_lang','phpgw_sitemgr_active_modules','phpgw_sitemgr_properties');
--- 14,18 ----
        $setup_info['sitemgr']['name']      = 'sitemgr';
        $setup_info['sitemgr']['title']     = 'SiteMgr Web Content Manager';
!       $setup_info['sitemgr']['version']   = '0.9.15.003';
        $setup_info['sitemgr']['app_order'] = 8;
        $setup_info['sitemgr']['tables']    = 
array('phpgw_sitemgr_pages','phpgw_sitemgr_pages_lang','phpgw_sitemgr_categories_lang','phpgw_sitemgr_preferences','phpgw_sitemgr_modules','phpgw_sitemgr_content','phpgw_sitemgr_content_lang','phpgw_sitemgr_active_modules','phpgw_sitemgr_properties');

Index: tables_current.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/tables_current.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** tables_current.inc.php      28 Jan 2003 20:00:00 -0000      1.10
--- tables_current.inc.php      4 Mar 2003 17:26:43 -0000       1.11
***************
*** 64,68 ****
                        'fd' => array(
                                'module_id' => array('type' => 'auto', 
'precision' => 4, 'nullable' => false),
-                               'app_name' => array('type' => 'varchar', 
'precision' => 25),
                                'module_name' => array('type' => 'varchar', 
'precision' => 25),
                                'description' => array('type' => 'varchar', 
'precision' => 255)
--- 64,67 ----

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/tables_update.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** tables_update.inc.php       21 Feb 2003 06:16:01 -0000      1.10
--- tables_update.inc.php       4 Mar 2003 17:26:43 -0000       1.11
***************
*** 383,385 ****
--- 383,409 ----
                return $setup_info['sitemgr']['currentver'];                    
         
        }
+ 
+       $test[] = '0.9.15.002';
+       function sitemgr_upgrade0_9_15_002()
+       {
+               global $setup_info,$phpgw_setup;
+               $setup_info['sitemgr']['currentver'] = '0.9.15.003';
+ 
+               $newtbldef = array(
+                       'fd' => array(
+                               'module_id' => array('type' => 'auto', 
'precision' => 4, 'nullable' => false),
+                               'module_name' => array('type' => 'varchar', 
'precision' => 25),
+                               'description' => array('type' => 'varchar', 
'precision' => 255)
+                       ),
+                       'pk' => array('module_id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               );
+ 
+               
$phpgw_setup->oProc->DropColumn('phpgw_sitemgr_modules',$newtbldef,'app_name');
+ 
+               return $setup_info['sitemgr']['currentver'];                    
         
+       }
+ 
  ?>