[Stack-cvs] stack-dev/install p2.php, 1.22, 1.23 adodbinit.php, 1.5, 1.6

[Chris S. <san...@us...>]

Update of /cvsroot/stack/stack-dev/install
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv8291/install

Modified Files:
	p2.php adodbinit.php 
Log Message:


Index: adodbinit.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/install/adodbinit.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** adodbinit.php	23 Jun 2009 14:39:36 -0000	1.5
--- adodbinit.php	26 Jun 2009 18:08:22 -0000	1.6
***************
*** 284,287 ****
--- 284,288 ----
      }
  
+ 
      if($rs->RecordCount() == NUM_TABLES)
      {
***************
*** 362,364 ****
  }
  
! ?>
--- 363,365 ----
  }
  
! ?>
\ No newline at end of file

Index: p2.php
===================================================================
RCS file: /cvsroot/stack/stack-dev/install/p2.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** p2.php	23 Jun 2009 14:39:36 -0000	1.22
--- p2.php	26 Jun 2009 18:08:21 -0000	1.23
***************
*** 20,24 ****
  {
      session_start();
! 
      $configFile = '../config.php';
      if(file_exists($configFile))
--- 20,24 ----
  {
      session_start();
!     
      $configFile = '../config.php';
      if(file_exists($configFile))
***************
*** 28,43 ****
          global $config;
          $root = $config->get('docroot');
! 
          // Ensure admin is logged in.
          require $root.'/lib/ui/AdminInterface.php';
      }
! 
      $_SESSION['Senv'] = $_POST['env'];
! 
      if ($_SESSION['Senv'] != 'ok')
      {
          header('Location: index.php');
      }
! 
      $server = 'localhost';
      $db = 'stack';
--- 28,43 ----
          global $config;
          $root = $config->get('docroot');
!         
          // Ensure admin is logged in.
          require $root.'/lib/ui/AdminInterface.php';
      }
!     
      $_SESSION['Senv'] = $_POST['env'];
!     
      if ($_SESSION['Senv'] != 'ok')
      {
          header('Location: index.php');
      }
!     
      $server = 'localhost';
      $db = 'stack';
***************
*** 49,53 ****
      $moodlepassword = '';
      $moodleprefix = 'mdl_';
! 
  }
  
--- 49,53 ----
      $moodlepassword = '';
      $moodleprefix = 'mdl_';
!     
  }
  
***************
*** 56,65 ****
      //attempt to load variables from the session
      session_start();
!     $server =    $_SESSION['Sdbserver'];
      $db = $_SESSION['Sdb'];
      $username =  $_SESSION['Sdbusername'];
      $password = $_SESSION['Sdbpassword'];
      $driver = $_SESSION['Sdriver'];
! 
      $moodleserver = $_SESSION['SmoodleDBhost'];
      $moodleusername = $_SESSION['SmoodleDBuser'];
--- 56,65 ----
      //attempt to load variables from the session
      session_start();
!     $server =    $_SESSION['Sdbserver']; 
      $db = $_SESSION['Sdb'];
      $username =  $_SESSION['Sdbusername'];
      $password = $_SESSION['Sdbpassword'];
      $driver = $_SESSION['Sdriver'];
!     
      $moodleserver = $_SESSION['SmoodleDBhost'];
      $moodleusername = $_SESSION['SmoodleDBuser'];
***************
*** 84,88 ****
      $password = addslashes($_POST['password']);
      $driver = addslashes($_POST['driver']);
! 
      $moodleserver   = addslashes($_POST['moodleserver']);
      $moodledb       = addslashes($_POST['moodledb']);
--- 84,88 ----
      $password = addslashes($_POST['password']);
      $driver = addslashes($_POST['driver']);
!     
      $moodleserver   = addslashes($_POST['moodleserver']);
      $moodledb       = addslashes($_POST['moodledb']);
***************
*** 91,100 ****
      $moodleprefix   = addslashes($_POST['moodleprefix']);
      $moodleDriver = addslashes($_POST['moodleDriver']);
! 
      //check can access db with supplied details
      //@$link = mysql_connect($server, $username, $password);
      require_once('adodbinit.php');
      $link = testConnection($server, $username, $password, $db, $driver);
! 
      if (!$link)
      {
--- 91,100 ----
      $moodleprefix   = addslashes($_POST['moodleprefix']);
      $moodleDriver = addslashes($_POST['moodleDriver']);
!     
      //check can access db with supplied details
      //@$link = mysql_connect($server, $username, $password);
      require_once('adodbinit.php');
      $link = testConnection($server, $username, $password, $db, $driver);
!     
      if (!$link)
      {
***************
*** 108,112 ****
      else
      {
! 
          //add to session
          session_start();
--- 108,112 ----
      else
      {
!         
          //add to session
          session_start();
***************
*** 118,122 ****
  
          $result = buildTables($server, $username, $password, $db, $driver);
! 
          if($result != true)
          {
--- 118,122 ----
  
          $result = buildTables($server, $username, $password, $db, $driver);
!         
          if($result != true)
          {
***************
*** 145,153 ****
                      //try to connect to moodle database.
                      //@$link = mysql_connect($moodleserver, $moodleusername, $moodlepassword);
! 
                      //@$selectedDB = mysql_select_db($moodledb, $link);
! 
                      $moodleConn = testConnection($moodleserver, $moodleusername, $moodlepassword, $moodledb, $moodleDriver);
! 
                      if ($moodleConn == false)
                      {
--- 145,153 ----
                      //try to connect to moodle database.
                      //@$link = mysql_connect($moodleserver, $moodleusername, $moodlepassword);
!                     
                      //@$selectedDB = mysql_select_db($moodledb, $link);
!                     
                      $moodleConn = testConnection($moodleserver, $moodleusername, $moodlepassword, $moodledb, $moodleDriver);
!                     
                      if ($moodleConn == false)
                      {
***************
*** 177,184 ****
                          $_SESSION['SmoodleDriver'] = $moodleDriver;
                          $_SESSION['SmoodleSetup'] = 'true';
! 
                          header('Location: p3.php');
                      }
! 
                  }
                  else
--- 177,184 ----
                          $_SESSION['SmoodleDriver'] = $moodleDriver;
                          $_SESSION['SmoodleSetup'] = 'true';
!                         
                          header('Location: p3.php');
                      }
!                     
                  }
                  else
***************
*** 187,196 ****
                      header('Location: p3.php');
                  }
! 
! 
              }
          }
      }
! 
  }
  
--- 187,196 ----
                      header('Location: p3.php');
                  }
!                 
!                 
              }
          }
      }
!     
  }