[geeklog-cvs] Geeklog-1.x/public_html/admin/install index.php, 1.2, 1.3

Oliver ospiess at qs1489.pair.com
Thu Aug 9 04:09:36 EDT 2007


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

Modified Files:
	index.php 
Log Message:
comments for static pages, upgrade code

Index: index.php
===================================================================
RCS file: /usr/home/geeklog2/cvsroot/geeklog/Geeklog-1.x/public_html/admin/install/index.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** index.php	28 Jul 2007 20:32:16 -0000	1.2
--- index.php	9 Aug 2007 08:09:34 -0000	1.3
***************
*** 76,80 ****
  {
      global $_DB_host, $_DB_user, $_DB_pass;
!     
      mysql_connect ($_DB_host, $_DB_user, $_DB_pass);
      $mysqlv = '';
--- 76,80 ----
  {
      global $_DB_host, $_DB_user, $_DB_pass;
! 
      mysql_connect ($_DB_host, $_DB_user, $_DB_pass);
      $mysqlv = '';
***************
*** 200,204 ****
   * Sets up the database tables
   *
!  * @param  bool $use_innodb Whether to use InnoDB table support if using MySQL 
   * @return bool             True if successful
   *
--- 200,204 ----
   * Sets up the database tables
   *
!  * @param  bool $use_innodb Whether to use InnoDB table support if using MySQL
   * @return bool             True if successful
   *
***************
*** 211,215 ****
  
      // 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)
  
--- 211,215 ----
  
      // 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)
  
***************
*** 240,244 ****
                  DB_query ($sql);
              }
!             break;   
      }
  
--- 240,244 ----
                  DB_query ($sql);
              }
!             break;
      }
  
***************
*** 675,678 ****
--- 675,679 ----
              }
              upgrade_PollsPlugin();
+             upgrade_StaticpagesPlugin();
              $current_gl_version = '1.4.2';
              $_SQL = '';
***************
*** 716,720 ****
  /**
   * Check to see if config.php and lib-common.php are writeable by the web
!  * server. If they aren't display a warning message. 
   *
   * @param  string $config_path    Path to config.php
--- 717,721 ----
  /**
   * Check to see if config.php and lib-common.php are writeable by the web
!  * server. If they aren't display a warning message.
   *
   * @param  string $config_path    Path to config.php
***************
*** 724,728 ****
   *
   */
! function INST_checkRequiredPerms($config_path, $libcommon_path) 
  {
  
--- 725,729 ----
   *
   */
! function INST_checkRequiredPerms($config_path, $libcommon_path)
  {
  
***************
*** 733,740 ****
  
      } else {
!     
          // Able to modify, all is well
          return true;
!     
      }
  
--- 734,741 ----
  
      } else {
! 
          // Able to modify, all is well
          return true;
! 
      }
  
***************
*** 755,761 ****
              <div class="install-path-container-inner">
                  <h2>Stop!</h2>
!     
                  <p>It is critical that you change permissions on the files listed below. Geeklog will not be able to be installed until you do so.</p>
!     
                  <br />
                  <p><label class="file-permission-list"><b>File/Directory</b></label> <b>Permissions</b></p>
--- 756,762 ----
              <div class="install-path-container-inner">
                  <h2>Stop!</h2>
! 
                  <p>It is critical that you change permissions on the files listed below. Geeklog will not be able to be installed until you do so.</p>
! 
                  <br />
                  <p><label class="file-permission-list"><b>File/Directory</b></label> <b>Permissions</b></p>
***************
*** 767,771 ****
          $config_perms = sprintf ("%3o", @fileperms ($config_path . 'config.php') & 0777);
          $display .= '<span class="error">Change to 777</span> (Currently ' . $config_perms . ')</p>' . LB ;
!     } else { 
          fclose ($config_file);
      }
--- 768,772 ----
          $config_perms = sprintf ("%3o", @fileperms ($config_path . 'config.php') & 0777);
          $display .= '<span class="error">Change to 777</span> (Currently ' . $config_perms . ')</p>' . LB ;
!     } else {
          fclose ($config_file);
      }
***************
*** 776,780 ****
          $libcommonPerms = sprintf ("%3o", @fileperms ($libcommon_path . 'lib-common.php') & 0777);
          $display .= '<span class="error">Change to 777</span> (Currently ' . $libcommonPerms . ')</p>' . LB ;
!     } else { 
          fclose ($libcommon_file);
      }
--- 777,781 ----
          $libcommonPerms = sprintf ("%3o", @fileperms ($libcommon_path . 'lib-common.php') & 0777);
          $display .= '<span class="error">Change to 777</span> (Currently ' . $libcommonPerms . ')</p>' . LB ;
!     } else {
          fclose ($libcommon_file);
      }
***************
*** 792,796 ****
  
  /**
!  * Returns the HTML form to return the user's inputted data to the 
   * previous page.
   *
--- 793,797 ----
  
  /**
!  * Returns the HTML form to return the user's inputted data to the
   * previous page.
   *
***************
*** 798,805 ****
   *
   */
! function INST_showReturnFormData() 
  {
!     global $site_name, $site_slogan, $db_type, $db_host, $db_name, 
!         $db_user, $db_prefix, $site_url, $site_admin_url, $site_mail, 
          $noreply_mail;
      $display = '
--- 799,806 ----
   *
   */
! function INST_showReturnFormData()
  {
!     global $site_name, $site_slogan, $db_type, $db_host, $db_name,
!         $db_user, $db_prefix, $site_url, $site_admin_url, $site_mail,
          $noreply_mail;
      $display = '
***************
*** 870,874 ****
                      <form action="index.php" method="POST">' . LB;
  
! $_PATH = array( 'config', 'public_html', 'backups', 'data', 'language', 'logs', 'system'); 
  if (isset( $_GET['mode'] ) || isset( $_POST['mode'] )) {
      $value = (isset( $_POST['mode'] )) ? $_POST['mode'] : $_GET['mode'];
--- 871,875 ----
                      <form action="index.php" method="POST">' . LB;
  
! $_PATH = array( 'config', 'public_html', 'backups', 'data', 'language', 'logs', 'system');
  if (isset( $_GET['mode'] ) || isset( $_POST['mode'] )) {
      $value = (isset( $_POST['mode'] )) ? $_POST['mode'] : $_GET['mode'];
***************
*** 914,918 ****
  
      /**
!      * The first thing the script does is to check for the location of 
       * critical Geeklog system files. It checks the default location
       * and the public_html/ directory. If it can't find the files in
--- 915,919 ----
  
      /**
!      * The first thing the script does is to check for the location of
       * critical Geeklog system files. It checks the default location
       * and the public_html/ directory. If it can't find the files in
***************
*** 948,955 ****
              foreach ($_PATH as $name => $path) {
                  if ( !file_exists( $gl_path . $name ) && !file_exists( $gl_path . 'public_html/' . $name ) ) {
!                     // If the file/directory is not located in the default location  
                      // or in public_html have the user enter its location.
!                     $form_fields .= '<p><label>' . $name . '</label> <input type="text" name="' 
!                                   . str_replace( '/', '', str_replace( '.php', '', $name ) ) 
                                    . '_path" value="/path/to/' . $name . '" size="25"></p>'  . LB;
                      $num_errors++;
--- 949,956 ----
              foreach ($_PATH as $name => $path) {
                  if ( !file_exists( $gl_path . $name ) && !file_exists( $gl_path . 'public_html/' . $name ) ) {
!                     // If the file/directory is not located in the default location
                      // or in public_html have the user enter its location.
!                     $form_fields .= '<p><label>' . $name . '</label> <input type="text" name="'
!                                   . str_replace( '/', '', str_replace( '.php', '', $name ) )
                                    . '_path" value="/path/to/' . $name . '" size="25"></p>'  . LB;
                      $num_errors++;
***************
*** 959,963 ****
  
                      // Create a hidden form value incase the form has to be displayed
!                     $form_fields .= '<input type="hidden" name="' . str_replace('/', '', str_replace('.php', '', $name)) 
                                    . '_path" value="' . $_PATH[$name] . '">' . LB;
                  }
--- 960,964 ----
  
                      // Create a hidden form value incase the form has to be displayed
!                     $form_fields .= '<input type="hidden" name="' . str_replace('/', '', str_replace('.php', '', $name))
                                    . '_path" value="' . $_PATH[$name] . '">' . LB;
                  }
***************
*** 966,972 ****
              if ($num_errors == 0) {
                  // If the script was able to locate all the system files/directories move onto the next step
!                 $req_string = 'index.php?mode=check_permissions' . 
!                             '&config_path=' . $_PATH['config.php'] . 
!                             '&public_html_path=' . $_PATH['public_html/'] . 
                              '&backups_path=' . $_PATH['backups/'] .
                              '&data_path=' . $_PATH['data/'] .
--- 967,973 ----
              if ($num_errors == 0) {
                  // If the script was able to locate all the system files/directories move onto the next step
!                 $req_string = 'index.php?mode=check_permissions' .
!                             '&config_path=' . $_PATH['config.php'] .
!                             '&public_html_path=' . $_PATH['public_html/'] .
                              '&backups_path=' . $_PATH['backups/'] .
                              '&data_path=' . $_PATH['data/'] .
***************
*** 1021,1025 ****
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[12] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['config.php'] . ')</p>' . LB ;
              $failed++;
!         } else { 
              fclose( $config_file );
          }
--- 1022,1026 ----
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[12] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['config.php'] . ')</p>' . LB ;
              $failed++;
!         } else {
              fclose( $config_file );
          }
***************
*** 1031,1035 ****
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[12] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['lib-common.php'] . ')</p>' . LB ;
              $failed++;
!         } else { 
              fclose( $libcommon_file );
          }
--- 1032,1036 ----
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[12] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['lib-common.php'] . ')</p>' . LB ;
              $failed++;
!         } else {
              fclose( $libcommon_file );
          }
***************
*** 1063,1067 ****
          if ($_CONF['backend'] > 0) {
              // If GL headlines are enabled
!             if (!$file = @fopen( $_CONF['rdf_file'], 'w' )) { 
                  // Permissions are incorrect
                  $_PERMS['rdf'] = sprintf( "%3o", @fileperms( $_CONF['rdf_file'] ) & 0777 );
--- 1064,1068 ----
          if ($_CONF['backend'] > 0) {
              // If GL headlines are enabled
!             if (!$file = @fopen( $_CONF['rdf_file'], 'w' )) {
                  // Permissions are incorrect
                  $_PERMS['rdf'] = sprintf( "%3o", @fileperms( $_CONF['rdf_file'] ) & 0777 );
***************
*** 1069,1077 ****
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['rdf'] . ') </p>' . LB;
                  $failed++;
!             } else { 
                  // Permissions are correct
                  fclose ($file);
              }
!         } else { 
              // If GL headlines are disabled
              $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path'] . 'public_html/backend' . '</code></label> ' ;
--- 1070,1078 ----
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['rdf'] . ') </p>' . LB;
                  $failed++;
!             } else {
                  // Permissions are correct
                  fclose ($file);
              }
!         } else {
              // If GL headlines are disabled
              $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path'] . 'public_html/backend' . '</code></label> ' ;
***************
*** 1089,1093 ****
                  $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path_images'] . 'userphotos/</code></label>' ;
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['userphoto'] . ') </p>' . LB;
!             } else { 
                  // Permissions are correct
                  fclose( $file );
--- 1090,1094 ----
                  $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path_images'] . 'userphotos/</code></label>' ;
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['userphoto'] . ') </p>' . LB;
!             } else {
                  // Permissions are correct
                  fclose( $file );
***************
*** 1095,1099 ****
                  $successful++;
              }
!         } else { 
              // If user photos are disabled
              $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path_images'] . 'userphotos/</code></label> ' ;
--- 1096,1100 ----
                  $successful++;
              }
!         } else {
              // If user photos are disabled
              $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path_images'] . 'userphotos/</code></label> ' ;
***************
*** 1111,1120 ****
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['articles'] . ') </p>' . LB;
                  $failed++;
!             } else { 
                  // Permissions are correct
                  fclose( $file );
                  unlink( $_CONF['path_images'] . 'articles/test.gif' );
              }
!         } else { 
              // If articles are disabled
              $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path_images'] . 'articles/</code></label> ' ;
--- 1112,1121 ----
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['articles'] . ') </p>' . LB;
                  $failed++;
!             } else {
                  // Permissions are correct
                  fclose( $file );
                  unlink( $_CONF['path_images'] . 'articles/test.gif' );
              }
!         } else {
              // If articles are disabled
              $display_permissions .= '<p><label class="file-permission-list"><code>' . $_CONF['path_images'] . 'articles/</code></label> ' ;
***************
*** 1130,1134 ****
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['topics'] . ') </p>' . LB;
              $failed++;
!         } else { 
              // Permissions are correct
              fclose( $file );
--- 1131,1135 ----
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['topics'] . ') </p>' . LB;
              $failed++;
!         } else {
              // Permissions are correct
              fclose( $file );
***************
*** 1146,1150 ****
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['backups'] . ') </p>' . LB;
                  $failed++;
!             } else { 
                  // Permissions are correct
                  fclose( $file );
--- 1147,1151 ----
                  $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['backups'] . ') </p>' . LB;
                  $failed++;
!             } else {
                  // Permissions are correct
                  fclose( $file );
***************
*** 1160,1164 ****
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['data'] . ') </p>' . LB;
              $failed++;
!         } else { 
              // Permissions are correct
              fclose( $file );
--- 1161,1165 ----
              $display_permissions .= '<span class="error">' . $LANG_INSTALL[14] . ' 777</span> (' . $LANG_INSTALL[13] . ' ' . $_PERMS['data'] . ') </p>' . LB;
              $failed++;
!         } else {
              // Permissions are correct
              fclose( $file );
***************
*** 1172,1176 ****
              $display .= '
              <p>' . $LANG_INSTALL[19] . '</p>
!             ' . $display_permissions . '<br /><p><strong><span class="error">' . $LANG_INSTALL[20] . '</span></strong> 
              ' . $LANG_INSTALL[21] . '</p>
              <p>' . $LANG_INSTALL[22] . '</p>
--- 1173,1177 ----
              $display .= '
              <p>' . $LANG_INSTALL[19] . '</p>
!             ' . $display_permissions . '<br /><p><strong><span class="error">' . $LANG_INSTALL[20] . '</span></strong>
              ' . $LANG_INSTALL[21] . '</p>
              <p>' . $LANG_INSTALL[22] . '</p>
***************
*** 1180,1186 ****
  
          // If the script was able to locate all the system files/directories move onto the next step
!         $req_string = 'index.php?mode=write_paths' . 
!                     '&config_path=' . $_PATH['config.php'] . 
!                     '&public_html_path=' . $_PATH['public_html/'] . 
                      '&backups_path=' . $_PATH['backups/'] .
                      '&data_path=' . $_PATH['data/'] .
--- 1181,1187 ----
  
          // If the script was able to locate all the system files/directories move onto the next step
!         $req_string = 'index.php?mode=write_paths' .
!                     '&config_path=' . $_PATH['config.php'] .
!                     '&public_html_path=' . $_PATH['public_html/'] .
                      '&backups_path=' . $_PATH['backups/'] .
                      '&data_path=' . $_PATH['data/'] .
***************
*** 1227,1231 ****
  
              // /path/to/geeklog
!             $config_data = str_replace( "\$_CONF['path']            = '/path/to/geeklog/'", "\$_CONF['path']            = '" 
                                      . str_replace( 'config.php', '', $_PATH['config.php'] ) . "'", $config_data );
  
--- 1228,1232 ----
  
              // /path/to/geeklog
!             $config_data = str_replace( "\$_CONF['path']            = '/path/to/geeklog/'", "\$_CONF['path']            = '"
                                      . str_replace( 'config.php', '', $_PATH['config.php'] ) . "'", $config_data );
  
***************
*** 1296,1300 ****
  
                  // Set all the form values either with their defaults or with received POST data.
!                 // The only instance where you'd get POST data would be if the user has to 
                  // go back because they entered incorrect database information.
                  $site_name = (isset( $_POST['site_name'] )) ? str_replace( '\\', '', $_POST['site_name'] ) : $LANG_INSTALL[29];
--- 1297,1301 ----
  
                  // Set all the form values either with their defaults or with received POST data.
!                 // The only instance where you'd get POST data would be if the user has to
                  // go back because they entered incorrect database information.
                  $site_name = (isset( $_POST['site_name'] )) ? str_replace( '\\', '', $_POST['site_name'] ) : $LANG_INSTALL[29];
***************
*** 1305,1316 ****
                  if (isset( $_POST['db_type'] )) {
                      switch ($_POST['db_type']) {
!                         case 'mysql-innodb': 
                              $msyql_innodb_selected = ' selected="selected"';
                              break;
!                         case 'mssql': 
!                             $mssql_selected = ' selected="selected"'; 
                              break;
!                         default: 
!                             $mysql_selected = ' selected="selected"'; 
                              break;
                      }
--- 1306,1317 ----
                  if (isset( $_POST['db_type'] )) {
                      switch ($_POST['db_type']) {
!                         case 'mysql-innodb':
                              $msyql_innodb_selected = ' selected="selected"';
                              break;
!                         case 'mssql':
!                             $mssql_selected = ' selected="selected"';
                              break;
!                         default:
!                             $mysql_selected = ' selected="selected"';
                              break;
                      }
***************
*** 1333,1337 ****
                      <input type="hidden" name="step" value="2">
                      <input type="hidden" name="config_path" value="' . $config_path . '">
!                    
                      <p><label>' . $LANG_INSTALL[32] . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="25"></p>
                      <p><label>' . $LANG_INSTALL[33] . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="25"></p><br />
--- 1334,1338 ----
                      <input type="hidden" name="step" value="2">
                      <input type="hidden" name="config_path" value="' . $config_path . '">
! 
                      <p><label>' . $LANG_INSTALL[32] . '</label> <input type="text" name="site_name" value="' . $site_name . '" size="25"></p>
                      <p><label>' . $LANG_INSTALL[33] . '</label> <input type="text" name="site_slogan" value="' . $site_slogan . '" size="25"></p><br />
***************
*** 1412,1416 ****
                                  $outdated_mysql = true;
                      }
!                 } 
                  if ($outdated_mysql === true) { // If MySQL is out of date
                      $display .= '<h1>' . $LANG_INSTALL[51] . '</h1>' . LB;
--- 1413,1417 ----
                                  $outdated_mysql = true;
                      }
!                 }
                  if ($outdated_mysql === true) { // If MySQL is out of date
                      $display .= '<h1>' . $LANG_INSTALL[51] . '</h1>' . LB;
***************
*** 1427,1436 ****
                              if (@mysql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             } 
                              break;
                          case 'mssql':
                              if (@mssql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             } 
                              break;
                      }
--- 1428,1437 ----
                              if (@mysql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             }
                              break;
                          case 'mssql':
                              if (@mssql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             }
                              break;
                      }
***************
*** 1529,1533 ****
                  if ((isset( $_POST['innodb'] ) && $_POST['innodb'] == 'true') || (isset($_GET['innodb']) && $_GET['innodb'] == 'true')) {
                      $use_innodb = true;
!                 } 
  
                  // Let's do this
--- 1530,1534 ----
                  if ((isset( $_POST['innodb'] ) && $_POST['innodb'] == 'true') || (isset($_GET['innodb']) && $_GET['innodb'] == 'true')) {
                      $use_innodb = true;
!                 }
  
                  // Let's do this
***************
*** 1572,1576 ****
                          $display .= "<h2>" . $LANG_INSTALL[67] . "</h2><p>" . $LANG_INSTALL[68] . "</p>"; // Yeah, this isn't a very helpful error...
                      }
!     
                  }
                  break;
--- 1573,1577 ----
                          $display .= "<h2>" . $LANG_INSTALL[67] . "</h2><p>" . $LANG_INSTALL[68] . "</p>"; // Yeah, this isn't a very helpful error...
                      }
! 
                  }
                  break;
***************
*** 1610,1614 ****
  
                  // Set all the form values either with their defaults or with received POST data.
!                 // The only instance where you'd get POST data would be if the user has to 
                  // go back because they entered incorrect database information.
                  require_once( $config_path );
--- 1611,1615 ----
  
                  // Set all the form values either with their defaults or with received POST data.
!                 // The only instance where you'd get POST data would be if the user has to
                  // go back because they entered incorrect database information.
                  require_once( $config_path );
***************
*** 1619,1627 ****
                  $mssql_selected = '';
                  switch ($_DB_dbms) {
!                     case 'mysql': 
                          $mysql_selected = ' selected="selected"';
                          break;
!                     case 'mssql': 
!                         $mssql_selected = ' selected="selected"'; 
                          break;
                  }
--- 1620,1628 ----
                  $mssql_selected = '';
                  switch ($_DB_dbms) {
!                     case 'mysql':
                          $mysql_selected = ' selected="selected"';
                          break;
!                     case 'mssql':
!                         $mssql_selected = ' selected="selected"';
                          break;
                  }
***************
*** 1749,1758 ****
                              if (@mysql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             } 
                              break;
                          case 'mssql':
                              if (@mssql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             } 
                              break;
                      }
--- 1750,1759 ----
                              if (@mysql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             }
                              break;
                          case 'mssql':
                              if (@mssql_select_db( $db_name, $db_handle )) {
                                  $db_exists = true;
!                             }
                              break;
                      }
***************
*** 1797,1801 ****
                          require_once($_CONF['path_system'] . 'lib-database.php');
                          $curv = INST_identifyGeeklogVersion ();
!                         if ($curv == VERSION) { 
                              // If current version is the newest version
                              // then there's no need to update.
--- 1798,1802 ----
                          require_once($_CONF['path_system'] . 'lib-database.php');
                          $curv = INST_identifyGeeklogVersion ();
!                         if ($curv == VERSION) {
                              // If current version is the newest version
                              // then there's no need to update.
***************
*** 1805,1809 ****
  
                              $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','1.3.11','1.4.0','1.4.1');
!                             if (empty( $curv )) { 
                                  // If we were unable to determine the current GL
                                  // version is then ask the user what it is
--- 1806,1810 ----
  
                              $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','1.3.11','1.4.0','1.4.1');
!                             if (empty( $curv )) {
                                  // If we were unable to determine the current GL
                                  // version is then ask the user what it is
***************
*** 1881,1886 ****
                          <p>' . $LANG_INSTALL[79] . '</p>' . LB;
                  }
!                 
!                 break;            
  
          } // End switch (Upgrade steps)
--- 1882,1887 ----
                          <p>' . $LANG_INSTALL[79] . '</p>' . LB;
                  }
! 
!                 break;
  
          } // End switch (Upgrade steps)
***************
*** 1888,1892 ****
          break;
  
! } // end switch (fresh install or upgrade)  
  
  $display .= '
--- 1889,1893 ----
          break;
  
! } // end switch (fresh install or upgrade)
  
  $display .= '




More information about the geeklog-cvs mailing list