[geeklog-cvs] Geeklog-1.x/public_html/admin/install install.php, 1.93, 1.94

[Oliver]

Update of /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install
In directory qs1489.pair.com:/tmp/cvs-serv85200

Modified Files:
	install.php 
Log Message:
fix poll upgrade, check for plugin install

Index: install.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/install.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -C2 -d -r1.93 -r1.94
*** install.php	13 Jan 2007 20:07:59 -0000	1.93
--- install.php	11 Jul 2007 02:35:51 -0000	1.94
***************
*** 65,69 ****
  {
      $phpv = explode ('.', phpversion ());
!                                                                                 
      return array ($phpv[0], $phpv[1], (int) $phpv[2]);
  }
--- 65,69 ----
  {
      $phpv = explode ('.', phpversion ());
! 
      return array ($phpv[0], $phpv[1], (int) $phpv[2]);
  }
***************
*** 415,419 ****
              // This is a fresh MySQL installation
              $db_templates->set_var ('upgrade', 0);
!     
              if (innodb_supported ()) {
                  $innodb_option = '<tr><td align="left">';
--- 415,419 ----
              // This is a fresh MySQL installation
              $db_templates->set_var ('upgrade', 0);
! 
              if (innodb_supported ()) {
                  $innodb_option = '<tr><td align="left">';
***************
*** 441,445 ****
  
      // Because the create table syntax can vary from dbms-to-dbms we are
!     // leaving that up to each database driver (e.g. mysql.class.php, 
      // postgresql.class.php, etc)
  
--- 441,445 ----
  
      // Because the create table syntax can vary from dbms-to-dbms we are
!     // leaving that up to each database driver (e.g. mysql.class.php,
      // postgresql.class.php, etc)
  
***************
*** 459,463 ****
                      $sql = str_replace ('MyISAM', 'InnoDB', $sql);
                  }
!             
                  DB_query ($sql);
              }
--- 459,463 ----
                      $sql = str_replace ('MyISAM', 'InnoDB', $sql);
                  }
! 
                  DB_query ($sql);
              }
***************
*** 470,474 ****
                  DB_query ($sql);
              }
!             break;   
      }
  
--- 470,474 ----
                  DB_query ($sql);
              }
!             break;
      }
  
***************
*** 675,679 ****
              $_SQL = '';
              break;
! 	case '1.3.4':
              require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.4_to_1.3.5.php');
              for ($i = 1; $i <= count($_SQL); $i++) {
--- 675,679 ----
              $_SQL = '';
              break;
!         case '1.3.4':
              require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.4_to_1.3.5.php');
              for ($i = 1; $i <= count($_SQL); $i++) {
***************
*** 860,864 ****
              $_SQL = '';
              break;
! 	case '1.3.9':
              require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.9_to_1.3.10.php');
              for ($i = 1; $i <= count($_SQL); $i++) {
--- 860,864 ----
              $_SQL = '';
              break;
!         case '1.3.9':
              require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.9_to_1.3.10.php');
              for ($i = 1; $i <= count($_SQL); $i++) {
***************
*** 893,897 ****
              $_SQL = '';
              break;
! 	case '1.3.10':
              require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.10_to_1.3.11.php');
              for ($i = 1; $i <= count($_SQL); $i++) {
--- 893,897 ----
              $_SQL = '';
              break;
!         case '1.3.10':
              require_once($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.10_to_1.3.11.php');
              for ($i = 1; $i <= count($_SQL); $i++) {
***************
*** 904,908 ****
              break;
  
!     case '1.3.11':
              require_once ($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.11_to_1.4.0.php');
              for ($i = 0; $i < count ($_SQL); $i++) {
--- 904,908 ----
              break;
  
!         case '1.3.11':
              require_once ($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.3.11_to_1.4.0.php');
              for ($i = 0; $i < count ($_SQL); $i++) {
***************
*** 918,922 ****
              break;
  
!     case '1.4.0':
              require_once ($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.4.0_to_1.4.1.php');
              for ($i = 0; $i < count ($_SQL); $i++) {
--- 918,922 ----
              break;
  
!         case '1.4.0':
              require_once ($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.4.0_to_1.4.1.php');
              for ($i = 0; $i < count ($_SQL); $i++) {
***************
*** 933,937 ****
              break;
  
!     case '1.4.1':
              require_once ($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.4.1_to_1.4.2.php');
              for ($i = 0; $i < count ($_SQL); $i++) {
--- 933,937 ----
              break;
  
!         case '1.4.1':
              require_once ($_CONF['path'] . 'sql/updates/' . $_DB_dbms . '_1.4.1_to_1.4.2.php');
              for ($i = 0; $i < count ($_SQL); $i++) {
***************
*** 939,943 ****
                  next ($_SQL);
              }
! 
              $current_gl_version = '1.4.2';
              $_SQL = '';
--- 939,943 ----
                  next ($_SQL);
              }
!             upgrade_PollPlugin();
              $current_gl_version = '1.4.2';
              $_SQL = '';
***************
*** 1031,1035 ****
      }
      $display .= INST_getDatabaseSettings ($_POST['install_type'],
!                                           $_POST['geeklog_path']); 
      break;
  
--- 1031,1035 ----
      }
      $display .= INST_getDatabaseSettings ($_POST['install_type'],
!                                           $_POST['geeklog_path']);
      break;