[Phpgroupware-cvs] CVS: /sitemgr/setup tables_update.inc.php,1.4.2.3,1.4.2.4

[Patrick Walsh <address@hidden>]

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

Modified Files:
      Tag: Version-0_9_14-branch
        tables_update.inc.php 
Log Message:
Fixed update routine to make assumptions instead of failing.


Index: tables_update.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware//sitemgr/setup/tables_update.inc.php,v
retrieving revision 1.4.2.3
retrieving revision 1.4.2.4
diff -C2 -r1.4.2.3 -r1.4.2.4
*** tables_update.inc.php       23 Nov 2002 07:38:12 -0000      1.4.2.3
--- tables_update.inc.php       24 Nov 2002 01:24:01 -0000      1.4.2.4
***************
*** 76,87 ****
                global $setup_info,$phpgw_setup;
                $setup_info['sitemgr']['currentver'] = '0.9.14.004';
!               
!               if (!file_exists(PHPGW_SERVER_ROOT 
.'/sitemgr/setup/sitemgr_sitelang'))
!               {
!                       echo '<hr><b>Sitemgr upgrade <i>incomplete</i>.  Please 
read the following instructions below and try again.</b><p>';
!                       echo 'Sitemgr verion ' . 
$setup_info['sitemgr']['currentver'] . ' is now fully multilingual. It stores 
all data in new tables which associate pages and categories to languages. 
<i>Before upgrading to this version, you have to tell the setup program what 
language your existing site has been written for.</i><p> Create a file with the 
name <b>sitemgr_sitelang</b> in the <b>sitemgr/setup</b> directory which first 
line contains the two letter language code for your site.  For example, "en" if 
your existing site is in English (don\'t put the quotes in the sitemgr_sitelang 
file).<hr>';
!                       return false;
!               }
!               else
                {
                        $langfile = file(PHPGW_SERVER_ROOT . 
'/sitemgr/setup/sitemgr_sitelang');
--- 76,81 ----
                global $setup_info,$phpgw_setup;
                $setup_info['sitemgr']['currentver'] = '0.9.14.004';
! 
!               if (file_exists(PHPGW_SERVER_ROOT 
.'/sitemgr/setup/sitemgr_sitelang'))
                {
                        $langfile = file(PHPGW_SERVER_ROOT . 
'/sitemgr/setup/sitemgr_sitelang');
***************
*** 89,97 ****
                        if (strlen($lang) != 2)
                        {
!                               echo 'The first line of' . PHPGW_SERVER_ROOT .
!                                       '/sitemgr/setup/sitemgr_sitelang should 
contain a two letter language code with no spaces or other characters.';
!                               return false;
                        }
!               }
  
                echo 'Updating sitemgr to a multilingual architecture with 
existing site language ' . $lang;
--- 83,93 ----
                        if (strlen($lang) != 2)
                        {
!                               $lang = "en";
                        }
!                 }
!               else
!                 {
!                   $lang = "en";
!                 }
  
                echo 'Updating sitemgr to a multilingual architecture with 
existing site language ' . $lang;