diff --git a/db/db_update.php b/db/db_update.php index 64b3f6ed..948dd719 100644 --- a/db/db_update.php +++ b/db/db_update.php @@ -1,3 +1,149 @@ +<<<<<<< .mine +\n"; +if(file_exists("db.code.version.txt")) +{ + $dbcodeversion_file=file("db.code.version.txt"); + $dbcodeversion=trim($dbcodeversion_file[0]); +} +else +{ + echo "Couldnt load current db.code.version.txt\n"; + exit; +} + +//same fix here for mysql 5.1 not truncating the 16 char usernames +$DBUSER=substr($DBUSER,0,16); + +mysql_connect($DBHOST,$DBUSER,$DBPASS); +mysql_select_db($DBNAME); +@mysql_query("SET NAMES latin1"); +$q=mysql_query("SELECT val FROM config WHERE var='DBVERSION' AND year='0'"); +$r=mysql_fetch_object($q); +$dbdbversion=$r->val; +if(!$dbdbversion) +{ + echo "Couldnt get current db version. Is SFIAB properly installed?\n"; + exit; +} + +/* Get the fair year */ +$q=mysql_query("SELECT val FROM config WHERE var='FAIRYEAR' AND year='0'"); +$r=mysql_fetch_object($q); +$config = array('FAIRYEAR' => $r->val); + +/* Load config just in case there's a PHP script that wants it */ +$q=mysql_query("SELECT * FROM config WHERE year='{$config['FAIRYEAR']}'"); +while($r=mysql_fetch_object($q)) $config[$r->var]=$r->val; + + +require_once("../config_editor.inc.php"); // For config_update_variables() + +if($dbcodeversion && $dbdbversion) +{ + //lets see if they match + if($dbcodeversion == $dbdbversion) + { + echo "DB and CODE are all up-to-date. Version: $dbdbversion\n"; + exit; + } + else if($dbcodeversion<$dbdbversion) + { + echo "ERROR: dbcodeversion$dbdbversion) + { + echo "DB update requirements detected\n"; + echo "Current DB Version: $dbdbversion\n"; + echo "Current CODE Version: $dbcodeversion\n"; + + echo "Updating database from $dbdbversion to $dbcodeversion\n"; + + for($ver=$dbdbversion+1;$ver<=$dbcodeversion;$ver++) + { + if(file_exists("db.update.$ver.php")) + { + include("db.update.$ver.php"); + } + if(is_callable("db_update_{$ver}_pre")) { + echo "db.update.$ver.php::db_update_{$ver}_pre() exists - running...\n"; + call_user_func("db_update_{$ver}_pre"); + echo "db.update.$ver.php::db_update_{$ver}_pre() done.\n"; + } + if(file_exists("db.update.$ver.sql")) + { + echo "db.update.$ver.sql detected - running...\n"; + readfile("db.update.$ver.sql"); + echo "\n"; + // dspanogle 2011-02-04 Use each section of the sql file instead of using system("sql" ... + // For windows ISP servers that do not provide "sql: executable - replace system call. + // system("mysql --default-character-set=latin1 -h$DBHOST -u$DBUSER -p$DBPASS $DBNAME ' . $templine . '\': ' . mysql_error() . '

'); + // Reset temp variable to empty + $templine = ''; + } + } + echo "
"; + } + else + { + echo "Version $ver SQL update file not found - skipping over\n"; + } + if(is_callable("db_update_{$ver}_post")) { + echo "db.update.$ver.php::db_update_{$ver}_post() exists - running...\n"; + call_user_func("db_update_{$ver}_post"); + echo "db.update.$ver.php::db_update_{$ver}_post() done.\n"; + } + } + if($db_update_skip_variables != true) { + echo "\nUpdating Configuration Variables...\n"; + config_update_variables($config['FAIRYEAR']); + } + + echo "\nAll done - updating new DB version to $dbcodeversion\n"; + mysql_query("UPDATE config SET val='$dbcodeversion' WHERE var='DBVERSION' AND year='0'"); + + } + +} +else +{ + echo "ERROR: dbcodeversion and dbdbversion are not defined\n"; +} + +echo "\n"; + +?> +======= \n"; ?> +>>>>>>> .r2501 diff --git a/install2.php b/install2.php index d6eaa004..9184fcb3 100644 --- a/install2.php +++ b/install2.php @@ -1,3 +1,204 @@ +<<<<<<< .mine + + Copyright (C) 2005 James Grant + + 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 "\n"; +?> + + +SFIAB Installation + + + +

SFIAB Installation - Step 2

+Installation requires php's system() function to be available\n"; + echo ""; + exit; +} +*/ +if(!file_exists("data/config.inc.php")) +{ + echo "
SFIAB Installation Step 1 is not yet complete.
"; + echo "Go back to installation step 1
"; + echo ""; + exit; +} + +require_once("data/config.inc.php"); +$DBUSER=substr($DBUSER,0,16); +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 "ERROR: Couldnt load current db/db.code.version.txt
"; + exit; + } + echo "version $dbcodeversion
"; + + echo "Checking for existing SFIAB database... "; + + $q=@mysql_query("SELECT val FROM config WHERE var='DBVERSION' AND year='0'"); + $r=@mysql_fetch_object($q); + $dbdbversion=$r->val; + + if($dbdbversion) + { + echo "ERROR: found version $dbdbversion
"; + + //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) + echo "Your SFIAB database needs to be updated. You should run the update script instead of this installer!\n"; + exit; + } + else + { + echo "Not found (good!)
"; + } + + echo "Checking for database installer for version $dbcodeversion... "; + if(file_exists("db/db.full.$dbcodeversion.sql")) + { + echo "db/db.full.$dbcodeversion.sql found
"; + + echo "Setting up database tables... "; + // dspanogle 2011-02-04 Use each section of the sql file instead of using system("sql" ... + // For windows ISP servers that do not provide "sql: executable - replace system call. + // system("mysql --default-character-set=latin1 -h$DBHOST -u$DBUSER -p$DBPASS $DBNAME ' . $templine . '\': ' . mysql_error() . '

'); + // Reset temp variable to empty + $templine = ''; + } + } + echo "
"; + echo "Done! installed database version $dbcodeversion
\n"; + + //now update the db version in the database + mysql_query("UPDATE config SET val='$dbcodeversion' WHERE var='DBVERSION' AND year='0'"); + + echo "
"; + echo "Done!
"; + echo "Proceed to installation step 3
"; + } + else + { + echo "WARNING: Couldnt find db/db.full.$dbcodeversion.sql
"; + echo "Trying to find an older version...
"; + + for($x=$dbcodeversion;$x>0;$x--) + { + if(file_exists("db/db.full.$x.sql")) + { + echo "db/db.full.$x.sql found
"; + echo "Setting up database tables... "; + // dspanogle 2011-02-04 Use each section of the sql file instead of using system("sql" ... + // For windows ISP servers that do not provide "sql: executable - replace system call. + // system("mysql --default-character-set=latin1 -h$DBHOST -u$DBUSER -p$DBPASS $DBNAME ' . $templine . '\': ' . mysql_error() . '

'); + // Reset temp variable to empty + $templine = ''; + } + } + echo "
"; + + echo "Done! installed database version $x
\n"; + + //now update the db version in the database + mysql_query("UPDATE config SET val='$x' WHERE var='DBVERSION' AND year='0'"); + + echo "Attempting to update database using standard update script to update from $x to $dbcodeversion
"; + echo "
Please scroll to the bottom of this page for the link to the next step of the installation process.
"; + chdir ("db"); + /* Update the database, but don't update the config variables yet, because + * We haven't set the FAIRYEAR */ + $db_update_skip_variables = true; + include "db_update.php"; + chdir ("../"); + + echo "
"; + echo "Done!
"; + echo "Proceed to installation step 3
"; + break; + } + } + } + + //only if this file was created will we go ahead with the rest + //creating all the tables and such.. + +?> + + +======= +>>>>>>> .r2501 diff --git a/install3.php b/install3.php index d86b8c50..01fa1adb 100644 --- a/install3.php +++ b/install3.php @@ -1,3 +1,217 @@ +<<<<<<< .mine + + Copyright (C) 2005 James Grant + + 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 "\n"; +?> + + +SFIAB Installation + + + +

SFIAB Installation - Step 3

+SFIAB Installation Step 1 is not yet complete."; + echo "Go back to installation step 1
"; + echo ""; + exit; +} + +require_once("data/config.inc.php"); +require_once("config_editor.inc.php"); +require_once("user.inc.php"); +require_once("committee.inc.php"); +$DBUSER=substr($DBUSER,0,16); +mysql_connect($DBHOST,$DBUSER,$DBPASS); +mysql_select_db($DBNAME); + + echo "Checking for SFIAB database... "; + + $q=@mysql_query("SELECT val FROM config WHERE var='DBVERSION' AND year='0'"); + $r=@mysql_fetch_object($q); + $dbdbversion=$r->val; + + if(!$dbdbversion) + { + echo "
SFIAB Installation Step 2 is not yet complete.
"; + echo "Go back to installation step 2
"; + echo ""; + exit; + } + +//a fresh install should ONLY have DBVERSION defined in the config table. If there are others (FAIRYEAR, SFIABDIRECTORY) then this is NOT fresh +$q=mysql_query("SELECT * FROM config WHERE year='0' AND ( var='DBVERSION' OR var='FAIRYEAR' OR var='SFIABDIRECTORY') "); +//we might get an error if the config table does not exist (ie, installer step 2 failed) +if(mysql_error()) +{ + //we say all tables, but really only we check for config where year=0; + echo "
ERROR: No SFIAB tables detected, It seems like step 2 failed. Please go Back to Installation Step 2 and try again.
"; + echo ""; + exit; + +} +//1 is okay (DBVERSION). More than 1 is bad (already isntalled) +if(mysql_num_rows($q)>1) +{ + //we say all tables, but really only we check for config where year=0; + echo "
ERROR: Detected existing table data, SFIAB Installation Step 3 requires a clean SFIAB database installation.
"; + echo ""; + exit; +} +echo "Found!
"; + +if($_POST['action']=="save") +{ + $err=false; + if(!$_POST['fairyear']) + { + echo "Fair Year is required"; + $err=true; + } + + if(!$_POST['email']) + { + echo "Superuser email address is required"; + $err=true; + } + + if(!( $_POST['pass1'] && $_POST['pass2'])) + { + echo "Superuser password and password confirmation are required"; + $err=true; + } + if($_POST['pass1'] != $_POST['pass2']) + { + echo "Password and Password confirmation do not match"; + $err=true; + } + + if(!$err) + { + echo "Creating configuration settings..."; + mysql_query("INSERT INTO config (var,val,category,ord,year) VALUES ('FAIRYEAR','".$_POST['fairyear']."','Special','0','0')"); + mysql_query("INSERT INTO config (var,val,category,ord,year) VALUES ('FISCALYEAR','".$_POST['fiscalyear']."','Special','0','0')"); + mysql_query("INSERT INTO config (var,val,category,ord,year) VALUES ('SFIABDIRECTORY','".$_POST['sfiabdirectory']."','Special','','0')"); + + $year = intval($_POST['fairyear']); + + //copy over the config defautls + config_update_variables($year); + + // Update some variables + mysql_query("UPDATE config SET + val='".mysql_escape_string(stripslashes($_POST['fairname']))."' + WHERE var='fairname' AND year='$year'"); + + mysql_query("UPDATE config SET + val='".mysql_escape_string(stripslashes($_POST['email']))."' + WHERE var='fairmanageremail' AND year='$year'"); + + $q=mysql_query("SELECT * FROM dates WHERE year='-1'"); + while($r=mysql_fetch_object($q)) + { + mysql_query("INSERT INTO dates (date,name,description,year) VALUES ('$r->date','$r->name','$r->description','".$_POST['fairyear']."')"); + } + + //copy over the award_types defautls + $q=mysql_query("SELECT * FROM award_types WHERE year='-1'"); + while($r=mysql_fetch_object($q)) + { + mysql_query("INSERT INTO award_types (id,type,`order`,year) VALUES ('$r->id','$r->type','$r->order','".$_POST['fairyear']."')"); + } + + echo "Done!
"; + echo "Creating superuser account..."; + + $u = user_create('committee',$_POST['email']); + if($_POST['firstname'] && $_POST['lastname']) { + $u['firstname']=mysql_escape_string(stripslashes($_POST['firstname'])); + $u['lastname']=mysql_escape_string(stripslashes($_POST['lastname'])); + } + else { + $u['firstname'] = 'Superuser'; + $u['lastname'] = 'Account'; + } + $u['emailprivate'] = mysql_escape_string(stripslashes($_POST['email'])); + $u['email'] = mysql_escape_string(stripslashes($_POST['email'])); + $u['username'] = mysql_escape_string(stripslashes($_POST['email'])); + $u['password'] = mysql_escape_string(stripslashes($_POST['pass1'])); + $u['access_admin'] = 'yes'; + $u['access_config'] = 'yes'; + $u['access_super'] = 'yes'; + user_save($u); + + echo "Done!
"; + echo "Installation is now complete! You can now proceed to the following location:
"; + echo "    Your SFIAB main page
"; + echo ""; + exit; + } + +} + +echo "
"; +echo "Please enter the following options
"; +echo "
"; + +$month=date("m"); +if($month>4) $fairyearsuggest=date("Y")+1; +else $fairyearsuggest=date("Y"); + +if($month>6) $fiscalyearsuggest=date("Y")+1; +else $fiscalyearsuggest=date("Y"); +// DES dspanogle 2011-02-05 $_SERVER['REQUEST_URI'] is not available on many Windows servers +//$directorysuggest = substr($_SERVER['REQUEST_URI'],0,-13); +$directorysuggest = substr(getenv("SCRIPT_NAME"),0,-13); +echo "

Options

"; +echo "
"; +echo ""; + +echo ""; +echo ""; +echo ""; +echo ""; +echo ""; + +echo "
Fair NameThe name of the fair you are installing SFIAB to run
Fair YearThe year of the fair you are installing SFIAB to run
Fiscal YearThe current fiscal year (for fundraising/accounting purposes)
DirectoryThe directory of this SFIAB installation as seen by the web browser
"; +echo "
"; +echo "

Superuser Account

"; +echo "Please choose your superuser account which is required to login to SFIAB and configure the system, as well as to add other users.
"; +echo ""; +echo ""; +echo ""; +echo ""; +echo "
Superuser Email Address
Superuser Password
Superuser Password (Confirm)
"; +echo "
"; +echo ""; +echo "
"; + +?> + + +======= "; ?> +>>>>>>> .r2501