forked from science-ation/science-ation
Update the installer, and split it into two steps (maybe a third to come?)
1) create the data/config.inc.php database connection file 2) create all the tables
This commit is contained in:
parent
85e2569446
commit
8407f7dab9
11
install.php
11
install.php
@ -28,16 +28,17 @@ echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n";
|
||||
<link rel="stylesheet" href="sfiab.css" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<h1>SFIAB Installation - Step 1</h1>
|
||||
<?
|
||||
if(file_exists("data/config.inc.php"))
|
||||
{
|
||||
echo "<div class=\"error\">SFIAB is already installed</div>";
|
||||
echo "<div class=\"error\">SFIAB Installation Step 1 is already complete.</div>";
|
||||
echo "<a href=\"install2.php\">Proceed to installation step 2</a><br />";
|
||||
echo "</body></html>";
|
||||
exit;
|
||||
}
|
||||
?>
|
||||
|
||||
<h1>SFIAB Installation</h1>
|
||||
|
||||
<?
|
||||
$showform=true;
|
||||
@ -63,10 +64,8 @@ if($_POST['dbhost'] && $_POST['dbname'] && $_POST['dbuser'] && $_POST['dbpass'])
|
||||
fputs($fp,"\$DBNAME=\"".$_POST['dbname']."\";\n");
|
||||
fputs($fp,"?>\n");
|
||||
fclose($fp);
|
||||
echo "<b>Done!</b>";
|
||||
|
||||
//only if this file was created will we go ahead with the rest
|
||||
//creating all the tables and such..
|
||||
echo "<b>Done!</b><br />";
|
||||
echo "<a href=\"install2.php\">Proceed to installation step 2</a><br />";
|
||||
}
|
||||
else
|
||||
{
|
||||
|
105
install2.php
Normal file
105
install2.php
Normal file
@ -0,0 +1,105 @@
|
||||
<?
|
||||
/*
|
||||
This file is part of the 'Science Fair In A Box' project
|
||||
SFIAB Website: http://www.sfiab.ca
|
||||
|
||||
Copyright (C) 2005 Sci-Tech Ontario Inc <info@scitechontario.org>
|
||||
Copyright (C) 2005 James Grant <james@lightbox.org>
|
||||
|
||||
This program is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU General Public
|
||||
License as published by the Free Software Foundation, version 2.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
||||
Boston, MA 02111-1307, USA.
|
||||
*/
|
||||
echo "<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>\n";
|
||||
?>
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" >
|
||||
<head><title>SFIAB Installation</title>
|
||||
<link rel="stylesheet" href="sfiab.css" type="text/css" />
|
||||
</head>
|
||||
<body>
|
||||
<h1>SFIAB Installation - Step 2</h1>
|
||||
<?
|
||||
if(!file_exists("data/config.inc.php"))
|
||||
{
|
||||
echo "<div class=\"error\">SFIAB Installation Step 1 is not yet complete.</div>";
|
||||
echo "<a href=\"install.php\">Go back to installation step 1</a><br />";
|
||||
echo "</body></html>";
|
||||
exit;
|
||||
}
|
||||
|
||||
require_once("data/config.inc.php");
|
||||
mysql_connect($DBHOST,$DBUSER,$DBPASS);
|
||||
mysql_select_db($DBNAME);
|
||||
|
||||
echo "Getting database version requirements for code... ";
|
||||
|
||||
if(file_exists("db/db.code.version.txt"))
|
||||
{
|
||||
$dbcodeversion_file=file("db/db.code.version.txt");
|
||||
$dbcodeversion=trim($dbcodeversion_file[0]);
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<b>ERROR: Couldnt load current db/db.code.version.txt</b><br />";
|
||||
exit;
|
||||
}
|
||||
echo "<b>version $dbcodeversion</b><br />";
|
||||
|
||||
|
||||
echo "Checking for existing SFIAB database... ";
|
||||
if(file_exists("db/db.db.version.txt"))
|
||||
{
|
||||
$dbdbversion_file=file("db/db.db.version.txt");
|
||||
$dbdbversion=trim($dbdbversion_file[0]);
|
||||
echo "<b>ERROR: found version $dbdbversion</b><br />";
|
||||
|
||||
//lets see if they match
|
||||
if($dbcodeversion == $dbdbversion)
|
||||
echo "Your SFIAB database is already setup with the required version\n";
|
||||
else if($dbcodeversion<$dbdbversion)
|
||||
echo "ERROR: dbcodeversion<dbdbversion ($dbcodeversion<$dbdbversion). This should not happen!";
|
||||
else if($dbcodeversion>$dbdbversion)
|
||||
echo "Your SFIAB database needs to be updated. You should run the update script instead of this installer!\n";
|
||||
exit;
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<b>Not found (good!)</b><br />";
|
||||
}
|
||||
|
||||
echo "Checking for database installer for version $dbcodeversion... ";
|
||||
if(file_exists("db/db.full.$dbcodeversion.sql"))
|
||||
{
|
||||
echo "<b>db/db.full.$dbcodeversion.sql found</b><br />";
|
||||
|
||||
echo "Setting up database tables... ";
|
||||
|
||||
system("mysql -h$DBHOST -u$DBUSER -p$DBPASS $DBNAME <db.update.$ver.sql");
|
||||
|
||||
echo "<b>Done! installed database version $dbcodeversion</b><br />\n";
|
||||
$fp=fopen("db/db.db.version.txt","w");
|
||||
fputs($fp,$dbcodeversion."\n");
|
||||
fclose($fp);
|
||||
}
|
||||
else
|
||||
{
|
||||
echo "<b>ERROR: Couldnt find db/db.full.$dbcodeversion.sql</b><br />";
|
||||
}
|
||||
|
||||
//only if this file was created will we go ahead with the rest
|
||||
//creating all the tables and such..
|
||||
|
||||
?>
|
||||
|
||||
</body></html>
|
Loading…
Reference in New Issue
Block a user