[Phpgroupware-cvs] phpgwapi/inc class.setup.inc.php, 1.15.2.11, 1.15.2.12 class.setup_detection.inc.php, 1.6.2.3, 1.6.2.4

[Dave Hall <address@hidden>]

Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv7340

Modified Files:
      Tag: Version-0_9_16-branch
        class.setup.inc.php class.setup_detection.inc.php 
Log Message:
many bug fixes


Index: class.setup.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup.inc.php,v
retrieving revision 1.15.2.11
retrieving revision 1.15.2.12
diff -C2 -d -r1.15.2.11 -r1.15.2.12
*** class.setup.inc.php 22 Sep 2003 20:22:00 -0000      1.15.2.11
--- class.setup.inc.php 28 Oct 2003 01:33:56 -0000      1.15.2.12
***************
*** 27,35 ****
                var $html = '';
                var $appreg = '';
!       
!       /* table name vars */
!       var $tbl_apps;
!       var $tbl_config;
!       var $tbl_hooks;
  
                function setup($html=False, $translation=False)
--- 27,35 ----
                var $html = '';
                var $appreg = '';
!               
!               /* table name vars */
!               var $tbl_apps;
!               var $tbl_config;
!               var $tbl_hooks;
  
                function setup($html=False, $translation=False)
***************
*** 42,49 ****
                        $this->html     = $html ? 
CreateObject('phpgwapi.setup_html') : '';
                        $this->translation = $translation ? 
CreateObject('phpgwapi.setup_translation') : '';
!                 
! //                $this->tbl_apps    = $this->get_apps_table_name();
! //                $this->tbl_config  = $this->get_config_table_name();
!                 $this->tbl_hooks   = $this->get_hooks_table_name();
                }
  
--- 42,49 ----
                        $this->html     = $html ? 
CreateObject('phpgwapi.setup_html') : '';
                        $this->translation = $translation ? 
CreateObject('phpgwapi.setup_translation') : '';
!                       
!                       //$this->tbl_apps    = $this->get_apps_table_name();
!                       //$this->tbl_config  = $this->get_config_table_name();
!                       $this->tbl_hooks   = $this->get_hooks_table_name();
                }
  
***************
*** 803,817 ****
                        }
                }
!       
!        
!        function get_hooks_table_name()
!        {
!                       
if($this->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.8pre5')
 && ($GLOBALS['setup_info']['phpgwapi']['currentver'] != ''))
                        {
                                /* No phpgw_hooks table yet. */
                                return False;
                        }
!                 return 'phpgw_hooks';
!        }
!       }
  ?>
--- 803,816 ----
                        }
                }
! 
!               function get_hooks_table_name()
!               {
!                       
if($this->alessthanb($GLOBALS['setup_info']['phpgwapi']['currentver'],'0.9.8pre5')
 && ($GLOBALS['setup_info']['phpgwapi']['currentver'] != ''))
                        {
                                /* No phpgw_hooks table yet. */
                                return False;
                        }
!                       return 'phpgw_hooks';
!               }
! }
  ?>

Index: class.setup_detection.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup_detection.inc.php,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -C2 -d -r1.6.2.3 -r1.6.2.4
*** class.setup_detection.inc.php       16 Jul 2003 02:52:19 -0000      1.6.2.3
--- class.setup_detection.inc.php       28 Oct 2003 01:33:56 -0000      1.6.2.4
***************
*** 208,212 ****
                        foreach($setup_info as $key => $value)
                        {
!                               if(isset($value['no_mass_update']))
                                {
                                        unset($setup_info[$key]);
--- 208,212 ----
                        foreach($setup_info as $key => $value)
                        {
!                               if(@isset($value['no_mass_update']) || 
address@hidden($value['enable']))
                                {
                                        unset($setup_info[$key]);
***************
*** 253,260 ****
--- 253,265 ----
                        // _debug_array($setup_info);
  
+                       //error message supression
+                       flush(); //push what we have
+                       ob_start(); //get the output
+ 
                        if(!isset($setup_info['phpgwapi']['currentver']))
                        {
                                $setup_info = 
$this->get_db_versions($setup_info);
                        }
+ 
                        // _debug_array($setup_info);
                        if (isset($setup_info['phpgwapi']['currentver']))
***************
*** 275,279 ****
                                /* no tables, so checking if we can create them 
*/
                                $GLOBALS['phpgw_setup']->db->query('CREATE 
TABLE phpgw_testrights ( testfield varchar(5) NOT NULL )');
!                               if(!$GLOBALS['phpgw_setup']->db->Errno)
                                {
                                        
$GLOBALS['phpgw_setup']->db->query('DROP TABLE phpgw_testrights');
--- 280,285 ----
                                /* no tables, so checking if we can create them 
*/
                                $GLOBALS['phpgw_setup']->db->query('CREATE 
TABLE phpgw_testrights ( testfield varchar(5) NOT NULL )');
!                               ob_clean();//dump the output
!                               if($GLOBALS['phpgw_setup']->db->Link_ID && 
!$GLOBALS['phpgw_setup']->db->Errno)
                                {
                                        
$GLOBALS['phpgw_setup']->db->query('DROP TABLE phpgw_testrights');
***************
*** 298,311 ****
  
                        /* Since 0.9.10pre6 config table is named as 
phpgw_config */
!                       $config_table = 'config';
!                       $ver = 
explode('.',@$GLOBALS['phpgw_info']['server']['versions']['phpgwapi']);
! 
!                       if(ereg("([0-9]+)(pre)([0-9]+)",$ver[2],$regs))
!                       {
!                               if(($regs[1] == '10') && ($regs[3] >= '6'))
!                               {
!                                       $config_table = 'phpgw_config';
!                               }
!                       }
  
                        @$GLOBALS['phpgw_setup']->db->query("select 
config_value from $config_table where config_name='freshinstall'");
--- 304,309 ----
  
                        /* Since 0.9.10pre6 config table is named as 
phpgw_config */
!                       /* Support for pre 0.9.10pre6 users removed from 16+ - 
skwahd*/
!                       $config_table = 'phpgw_config';
  
                        @$GLOBALS['phpgw_setup']->db->query("select 
config_value from $config_table where config_name='freshinstall'");