From 86bad4961b5da1241dd6d701883ef8b6c7e2df83 Mon Sep 17 00:00:00 2001 From: james Date: Tue, 30 Nov 2004 19:06:35 +0000 Subject: [PATCH] - set proper SFIABDIRECTORY on all menu links (so they work from inside subdirs) - add config directory, update config.inc.php --- common.inc.php | 25 +++++++++++++------------ config.inc.php | 2 -- config/index.php | 8 ++++++++ 3 files changed, 21 insertions(+), 14 deletions(-) create mode 100644 config/index.php diff --git a/common.inc.php b/common.inc.php index c2c811d1..113b595c 100644 --- a/common.inc.php +++ b/common.inc.php @@ -5,14 +5,15 @@ mysql_select_db($DBNAME); session_start(); -//find out the fiar year -$q=mysql_query("SELECT * FROM config WHERE var='FAIRYEAR' AND year='0'"); -$r=mysql_fetch_object($q); -$FAIRYEAR=$r->val; -$config['FAIRYEAR']=$FAIRYEAR; +//find out the fair year and any other 'year=0' configuration parameters (things that dont change as the years go on) +$q=mysql_query("SELECT * FROM config WHERE year='0'"); +while($r=mysql_fetch_object($q)) +{ + $config[$r->var]=$r->val; +} //now pull the rest of the configuration -$q=mysql_query("SELECT * FROM config WHERE year='$FAIRYEAR'"); +$q=mysql_query("SELECT * FROM config WHERE year='".$config['FAIRYEAR']."'"); while($r=mysql_fetch_object($q)) { $config[$r->var]=$r->val; @@ -105,26 +106,26 @@ function send_header($title="") <?=$title?> - +

diff --git a/config.inc.php b/config.inc.php index 32cd2c1f..1b61aa32 100644 --- a/config.inc.php +++ b/config.inc.php @@ -1,8 +1,6 @@ diff --git a/config/index.php b/config/index.php new file mode 100644 index 00000000..85dff812 --- /dev/null +++ b/config/index.php @@ -0,0 +1,8 @@ +