[geeklog-cvs] geeklog-1.3/public_html/admin/install install.php,1.71,1.72

dhaun at iowaoutdoors.org dhaun at iowaoutdoors.org
Sun Dec 19 06:08:09 EST 2004


Update of /var/cvs/geeklog-1.3/public_html/admin/install
In directory www:/tmp/cvs-serv30019/public_html/admin/install

Modified Files:
	install.php 
Log Message:
Update database: The 'sid' field in the gl_comments table has to be able to hold 40 characters.


Index: install.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/public_html/admin/install/install.php,v
retrieving revision 1.71
retrieving revision 1.72
diff -C2 -d -r1.71 -r1.72
*** install.php	13 Oct 2004 13:26:54 -0000	1.71
--- install.php	19 Dec 2004 11:08:07 -0000	1.72
***************
*** 49,53 ****
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.10');
  }
  
--- 49,53 ----
  }
  if (!defined ('VERSION')) {
!     define('VERSION', '1.3.11');
  }
  
***************
*** 61,66 ****
  function INST_welcomePage()
  {
-     global $HTTP_POST_VARS;
- 
      // prepare some hints about what /path/to/geeklog might be ...
      $thisFile = __FILE__;
--- 61,64 ----
***************
*** 79,84 ****
          $glPath = '';
      }
!     if (empty ($glPath) && !empty ($HTTP_POST_VARS['geeklog_path'])) {
!         $glPath = $HTTP_POST_VARS['geeklog_path'];
          $posted = true;
      }
--- 77,82 ----
          $glPath = '';
      }
!     if (empty ($glPath) && !empty ($_POST['geeklog_path'])) {
!         $glPath = $_POST['geeklog_path'];
          $posted = true;
      }
***************
*** 157,161 ****
          $db_templates->set_var('upgrade',1);
          // They already have a lib-database file...they can't change their tables names
!         $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
          $cnt = count ($old_versions);
--- 155,159 ----
          $db_templates->set_var('upgrade',1);
          // They already have a lib-database file...they can't change their tables names
!         $old_versions = array('1.2.5-1','1.3','1.3.1','1.3.2','1.3.2-1','1.3.3','1.3.4','1.3.5','1.3.6','1.3.7','1.3.8','1.3.9','1.3.10');
          $versiondd = '<tr><td align="right"><b>Current Geeklog Version:</b></td><td><select name="version">';
          $cnt = count ($old_versions);
***************
*** 669,672 ****
--- 667,678 ----
              $current_gl_version = '1.3.10';
              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++) {
+                 DB_query(current($_SQL));
+                 next($_SQL);
+             }
+ 
+             $current_gl_version = '1.3.11';
          default:
              $done = true;
***************
*** 677,682 ****
  
  // Main
! if (isset ($HTTP_POST_VARS['page'])) {
!     $page = $HTTP_POST_VARS['page'];
  }
  else {
--- 683,688 ----
  
  // Main
! if (isset ($_POST['page'])) {
!     $page = $_POST['page'];
  }
  else {
***************
*** 684,688 ****
  }
  
! if (isset ($HTTP_POST_VARS['action']) && ($HTTP_POST_VARS['action'] == '<< Previous')) {
      $page = 0;
  }
--- 690,694 ----
  }
  
! if (isset ($_POST['action']) && ($_POST['action'] == '<< Previous')) {
      $page = 0;
  }
***************
*** 694,698 ****
  // Include template class if we got it
  if ($page > 0) {
!     $geeklog_path = trim ($HTTP_POST_VARS['geeklog_path']);
      $notapath = false;
      if (!empty ($geeklog_path)) {
--- 700,704 ----
  // Include template class if we got it
  if ($page > 0) {
!     $geeklog_path = trim ($_POST['geeklog_path']);
      $notapath = false;
      if (!empty ($geeklog_path)) {
***************
*** 729,739 ****
          $display .= '<h2>Geeklog Installation - Error</h2>' . LB;
          if ($notapath) {
!             $display .= '<p><b>' . $HTTP_POST_VARS['geeklog_path'] . '</b> is not a path.<br>Please enter the path to where config.php can be found on your webserver\'s file system.</p>';
          } else {
!             $display .= '<p>Geeklog could not find config.php in the path you just entered: <b>' . $HTTP_POST_VARS['geeklog_path'] . '</b><br>' . LB;
              $display .= 'Please check this path and try again. Remember that you should be using absolute paths, starting at the root of your file system.</p>' . LB;
          }
          $display .= '<form action="install.php" method="post">' . LB;
!         $display .= '<p align="center"><input type="submit" name="action" value="<< Previous"><input type="hidden" name="geeklog_path" value="' . $HTTP_POST_VARS['geeklog_path'] . '"></p>' . LB . '</form>';
          $display .= '</body>' . LB . '</html>';
          echo $display;
--- 735,745 ----
          $display .= '<h2>Geeklog Installation - Error</h2>' . LB;
          if ($notapath) {
!             $display .= '<p><b>' . $_POST['geeklog_path'] . '</b> is not a path.<br>Please enter the path to where config.php can be found on your webserver\'s file system.</p>';
          } else {
!             $display .= '<p>Geeklog could not find config.php in the path you just entered: <b>' . $_POST['geeklog_path'] . '</b><br>' . LB;
              $display .= 'Please check this path and try again. Remember that you should be using absolute paths, starting at the root of your file system.</p>' . LB;
          }
          $display .= '<form action="install.php" method="post">' . LB;
!         $display .= '<p align="center"><input type="submit" name="action" value="<< Previous"><input type="hidden" name="geeklog_path" value="' . $_POST['geeklog_path'] . '"></p>' . LB . '</form>';
          $display .= '</body>' . LB . '</html>';
          echo $display;
***************
*** 746,762 ****
  switch ($page) {
  case 1:
!     if ($HTTP_POST_VARS['install_type'] == 'complete_upgrade') {
          $upgrade = 1;
      } else {
          $upgrade = 0;
      }
!     $display .= INST_getDatabaseSettings ($HTTP_POST_VARS['install_type'],
!                                           $HTTP_POST_VARS['geeklog_path']); 
      break;
  
  case 2:
!     if (!empty($HTTP_POST_VARS['version'])) {
!         if (INST_doDatabaseUpgrades ($HTTP_POST_VARS['version'],
!                                      $HTTP_POST_VARS['prefix'])) {
              // Great, installation is complete
              // Done with installation...redirect to success page
--- 752,767 ----
  switch ($page) {
  case 1:
!     if ($_POST['install_type'] == 'complete_upgrade') {
          $upgrade = 1;
      } else {
          $upgrade = 0;
      }
!     $display .= INST_getDatabaseSettings ($_POST['install_type'],
!                                           $_POST['geeklog_path']); 
      break;
  
  case 2:
!     if (!empty($_POST['version'])) {
!         if (INST_doDatabaseUpgrades ($_POST['version'], $_POST['prefix'])) {
              // Great, installation is complete
              // Done with installation...redirect to success page
***************
*** 765,770 ****
      } else {
          $use_innodb = false;
!         if (isset ($HTTP_POST_VARS['innodb']) &&
!                 ($HTTP_POST_VARS['innodb'] == 'on')) {
              $use_innodb = true;
          }
--- 770,774 ----
      } else {
          $use_innodb = false;
!         if (isset ($_POST['innodb']) && ($_POST['innodb'] == 'on')) {
              $use_innodb = true;
          }




More information about the geeklog-cvs mailing list