[Phpgroupware-cvs] CVS: sitemgr/setup tables_update.inc.php,1.9,1.10

[Michael Totschnig <address@hidden>]

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

Modified Files:
        tables_update.inc.php 
Log Message:
correct two errors in upgrading existing sites to new tables


Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/sitemgr/setup/tables_update.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** tables_update.inc.php       28 Jan 2003 20:00:00 -0000      1.9
--- tables_update.inc.php       21 Feb 2003 06:16:01 -0000      1.10
***************
*** 329,333 ****
                //we register some standard modules so that the default site 
template works
                $db2 = $phpgw_setup->db;
!               foreach (array('html','index','toc') as $module)
                {
                        $db2->query("INSERT INTO phpgw_sitemgr_modules 
(app_name,module_name) VALUES ('sitemgr','$module')",__LINE__,__FILE__);
--- 329,333 ----
                //we register some standard modules so that the default site 
template works
                $db2 = $phpgw_setup->db;
!               foreach (array('index','toc','html') as $module)
                {
                        $db2->query("INSERT INTO phpgw_sitemgr_modules 
(app_name,module_name) VALUES ('sitemgr','$module')",__LINE__,__FILE__);
***************
*** 344,347 ****
--- 344,348 ----
                        $page_id = $GLOBALS['phpgw_setup']->oProc->f('page_id');
                        $cat_id = $GLOBALS['phpgw_setup']->oProc->f('cat_id');
+                       //module_id is still the id of html module since it is 
the last inserted above
                        $db2->query("INSERT INTO phpgw_sitemgr_content 
(area,cat_id,page_id,module_id,arguments,sort_order,view,actif) VALUES 
('CENTER',$cat_id,$page_id,$module_id,'$emptyarray',0,0,1)",__LINE__,__FILE__);
                        $block_id = 
$db2->get_last_insert_id('phpgw_sitemgr_content','block_id');
***************
*** 350,354 ****
                        {
                                $lang = $db2->f('lang');
!                               $content = serialize(array('htmlcontent' => 
$db2->f('content')));
                                $db3->query("INSERT INTO 
phpgw_sitemgr_content_lang (block_id,lang,arguments_lang,title) VALUES 
($block_id,'$lang','$content','HTML')",__LINE__,__FILE__);
                        }
--- 351,355 ----
                        {
                                $lang = $db2->f('lang');
!                               $content = 
$db2->db_addslashes(serialize(array('htmlcontent' => 
stripslashes($db2->f('content')))));
                                $db3->query("INSERT INTO 
phpgw_sitemgr_content_lang (block_id,lang,arguments_lang,title) VALUES 
($block_id,'$lang','$content','HTML')",__LINE__,__FILE__);
                        }