[Phpgroupware-cvs] CVS: phpgwapi/setup default_records.inc.php,1.11,1.12 setup.inc.php,1.52,1.53 tables_update.inc.php,1.63,1.64

[Ralf Becker <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/setup
In directory subversions:/tmp/cvs-serv13451

Modified Files:
        default_records.inc.php setup.inc.php tables_update.inc.php 
Log Message:
2 changes:
- newer lang-files get now installed automaticaly when a user log's in
- Czech is added to the supported lang's
==> phpgwapi version updated to 0.9.14.002


Index: default_records.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/default_records.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** default_records.inc.php     24 Sep 2002 05:21:37 -0000      1.11
--- default_records.inc.php     22 Mar 2003 01:27:47 -0000      1.12
***************
*** 30,34 ****
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ca','Catalan','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('co','Corsican','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('cs','Czech','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('cy','Welsh','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('da','Danish','Yes')");
--- 30,34 ----
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('ca','Catalan','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('co','Corsican','No')");
!       $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('cs','Czech','Yes')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('cy','Welsh','No')");
        $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_languages 
(lang_id, lang_name, available) VALUES ('da','Danish','Yes')");

Index: setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/setup.inc.php,v
retrieving revision 1.52
retrieving revision 1.53
diff -C2 -r1.52 -r1.53
*** setup.inc.php       29 Oct 2002 22:15:32 -0000      1.52
--- setup.inc.php       22 Mar 2003 01:27:47 -0000      1.53
***************
*** 14,18 ****
        /* Basic information about this app */
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
!       $setup_info['phpgwapi']['version']   = '0.9.15.008';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.23';
        $setup_info['phpgwapi']['enable']    = 3;
--- 14,18 ----
        /* Basic information about this app */
        $setup_info['phpgwapi']['name']      = 'phpgwapi';
!       $setup_info['phpgwapi']['version']   = '0.9.15.009';
        $setup_info['phpgwapi']['versions']['current_header'] = '1.23';
        $setup_info['phpgwapi']['enable']    = 3;
***************
*** 31,40 ****
                'name'  => 'Joseph Engo',
                'email' => 'address@hidden'
-       );
- 
-       $setup_info['phpgwapi']['maintainer'][]  = array
-       (
-               'name'  => 'Marc A. Peters',
-               'email' => 'address@hidden'
        );
  
--- 31,34 ----

Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/setup/tables_update.inc.php,v
retrieving revision 1.63
retrieving revision 1.64
diff -C2 -r1.63 -r1.64
*** tables_update.inc.php       25 Nov 2002 18:33:30 -0000      1.63
--- tables_update.inc.php       22 Mar 2003 01:27:47 -0000      1.64
***************
*** 10,14 ****
        
\**************************************************************************/
        /* $Id$ */
! 
        /* Include older phpGroupWare update support */
        include($appdir . 'tables_update_0_9_9.inc.php');
--- 10,14 ----
        
\**************************************************************************/
        /* $Id$ */
!       
        /* Include older phpGroupWare update support */
        include($appdir . 'tables_update_0_9_9.inc.php');
***************
*** 46,49 ****
--- 46,56 ----
        }
  
+       $test[] = '0.9.14.002';
+       function phpgwapi_upgrade0_9_14_002()
+       {
+               $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.001';
+               return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+       }
+ 
        $test[] = '0.9.15.001';
        function phpgwapi_upgrade0_9_15_001()
***************
*** 126,134 ****
        function phpgwapi_upgrade0_9_15_006()
        {
                
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_config','config_value',array(
                        'type' => 'text',
                        'nullable' => False
                ));
! 
  
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.007';
--- 133,179 ----
        function phpgwapi_upgrade0_9_15_006()
        {
+               // Fix bug from update script in 0.9.11.004/5:
+               // column config_app was added to table phpgw_config (which 
places it as last column),
+               // but in the tables_current.inc.php it was added as first 
column.
+               // When setup / schemaproc wants to do the AlterColum it 
recreates the table for pgSql,
+               // as pgSql could not change the column-type. This recreation 
is can not be based on 
+               // tables_current, but on running tables_baseline throught all 
update-scripts.
+               // Which gives at the end two different versions of the table 
on new or updated installs.
+               // I fix it now in the (wrong) order of the tables_current, as 
some apps might depend on!
+               /*
                
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_config','config_value',array(
                        'type' => 'text',
                        'nullable' => False
                ));
!               */
!               $GLOBALS['phpgw_setup']->oProc->query("SELECT * FROM 
phpgw_config");
!               while ($GLOBALS['phpgw_setup']->oProc->next_record())
!               {
!                       $confs[] = array(
!                               'config_app' => 
$GLOBALS['phpgw_setup']->oProc->f('config_app'),
!                               'config_name' => 
$GLOBALS['phpgw_setup']->oProc->f('config_name'),
!                               'config_value' => 
$GLOBALS['phpgw_setup']->oProc->f('config_value')
!                       );
!               }
!               $GLOBALS['phpgw_setup']->oProc->DropTable('phpgw_config');
!               
!               
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_config',array(
!                       'fd' => array(
!                               'config_app' => array('type' => 'varchar', 
'precision' => 50),
!                               'config_name' => array('type' => 'varchar', 
'precision' => 255, 'nullable' => false),
!                               'config_value' => array('type' => 'text')
!                       ),
!                       'pk' => array(),
!                       'fk' => array(),
!                       'ix' => array(),
!                       'uc' => array('config_name')
!               ));
!               
!               foreach($confs as $conf)
!               {
!                       $GLOBALS['phpgw_setup']->oProc->query(
!                               "INSERT INTO phpgw_config 
(config_app,config_name,config_value) VALUES ('".
!                               
$conf['config_app']."','".$conf['config_name']."','".$conf['config_value']."')");
!               }
  
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.007';
***************
*** 157,160 ****
--- 202,215 ----
  
                $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.008';
+               return $GLOBALS['setup_info']['phpgwapi']['currentver'];
+       }
+ 
+       $test[] = '0.9.15.008';
+       function phpgwapi_upgrade0_9_15_008()
+       {
+               // this might already be done in 0.9.14.002, but it does not 
harm to set it again to YES
+               $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_languages 
SET available='Yes' WHERE lang_id='cs'");
+               
+               $GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.15.009';
                return $GLOBALS['setup_info']['phpgwapi']['currentver'];
        }