- Call them 'fair's not 'region's.. to assist linking fairs together.

- This patch references some config variables that don't exist yet, that's ok,
  we dont' want anyone turning these on yet.

admin/winners.php

@@ -36,7 +36,6 @@
 
 
 
-
 if($_GET['edit']) $edit=intval($_GET['edit']);
 if($_POST['edit']) $edit=intval($_POST['edit']);
 

common.inc.php

@@ -427,7 +427,7 @@ echo "<div align=\"right\" style=\"font-size: 0.75em;\">";
 if(isset($_SESSION['users_type'])) {
 	$types = array('volunteer' => 'Volunteer', 'judge' => 'Judge', 
 		'student'=>'Participant','committee'=>'Committee Member',
-		'region'=>'Region');
+		'fair'=>'Science Fair');
 	if($_SESSION['users_type'] != false) {
 		echo i18n($types[$_SESSION['users_type']]);
 	}
@@ -497,20 +497,17 @@ echo "</div>";
 <?
 if($_SESSION['users_type'] == 'committee')
 {
-	if(committee_auth_has_access("admin")){ ?>
+	if(committee_auth_has_access("admin")){ 
-		<li><a href="<?=$config['SFIABDIRECTORY']?>/user_personal.php"><?=i18n("My Profile")?></a></li>
+		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("My Profile").'</a></li>';
-		<li><a href="<?=$config['SFIABDIRECTORY']?>/admin/"><?=i18n("Fair Administration")?></a></li>
+		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/\">".i18n("Fair Administration").'</a></li>';
-<? } 
+	} 
-	if(committee_auth_has_access("config")){ ?>
+	if(committee_auth_has_access("config")){
-		<li><a href="<?=$config['SFIABDIRECTORY']?>/config/"><?=i18n("SFIAB Configuration")?></a></li>
+		echo "<li><a href=\"{$config['SFIABDIRECTORY']}/config/\">".i18n("SFIAB Configuration").'</a></li>';
-<? } 
+	} 
 
-?><li><a href="<?=$config['SFIABDIRECTORY']?>/user_login.php?action=logout"><?=i18n("Committee Logout")?></a></li><?
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">".i18n("Committee Logout").'</a></li>';
-
+} else {
-}
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_login.php?type=committee\">".i18n("Committee Login").'</a></li>';
-else
-{
-?><li><a href="<?=$config['SFIABDIRECTORY']?>/user_login.php?type=committee"><?=i18n("Committee Login")?></a></li><?
 }
 ?></ul>
 <br />
@@ -518,18 +515,16 @@ else
 <?
 if($_SESSION['schoolid'] && $_SESSION['schoolaccesscode'])
 {
-?>
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/schoolaccess.php\">".i18n("School Access").'</a></li>';
-<li><a href="<?=$config['SFIABDIRECTORY']?>/schoolaccess.php"><?=i18n("School Access")?></a></li>
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/schoolaccess.php?action=logout\">".i18n("School Logout")/'</a></li>';
-<li><a href="<?=$config['SFIABDIRECTORY']?>/schoolaccess.php?action=logout"><?=i18n("School Logout")?></a></li>
+} else {
-<?
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/schoolaccess.php\">".i18n("School Login").'</a></li>';
 }
-else
+
-{
+if($config['fairs_enable'] == 'yes' && $config['fairs_allow_login'] == 'yes') {
-?>
+	echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_login.php?type=fair\">".i18n("{$config['fairs_name']} Fair Login").'</a></li>';
-<li><a href="<?=$config['SFIABDIRECTORY']?>/schoolaccess.php"><?=i18n("School Login")?></a></li><?
 }
-?>
+?></ul>
-</ul>
 <br />
 <ul class="mainnav">
 <?

user.inc.php

@@ -24,24 +24,24 @@
 ?>
 <?
 
-$user_types = array('student','judge','committee','volunteer','region');
+$user_types = array('student','judge','committee','volunteer','fair');
 $user_what =  array('student'=>'Participant', 'judge' => 'Judge',
 			'committee'=>'Committee Member','volunteer' => 'Volunteer',
-			'region'=>'Region');
+			'fair'=>'Science Fair');
 
-function user_load_region($u)
+function user_load_fair($u)
 {
 	/* Double check, make sure the user is of this type */
-	if(!in_array('region', $u['types'])) return false;
+	if(!in_array('fair', $u['types'])) return false;
 
-	$q = mysql_query("SELECT * FROM users_region
+	$q = mysql_query("SELECT * FROM users_fair
-				WHERE id='{$u['id']}'
+				WHERE users_id='{$u['id']}'
 			");
 	if(mysql_num_rows($q)!=1) return false;
 
 	$r = mysql_fetch_object($q);
 	$ret = array();
-	$ret['regions_id'] = intval($r->regions_id);
+	$ret['fairs_id'] = intval($r->fairs_id);
 	return $ret;
 }
 
@@ -210,7 +210,7 @@ function user_save_student($u)
 {
 }
 
-function user_save_region($u)
+function user_save_fair($u)
 {
 }
 
@@ -268,7 +268,7 @@ function user_delete_judge($u)
 {
 }
 
-function user_delete_region($u)
+function user_delete_fair($u)
 {
 }
 function user_delete_student($u)
@@ -546,4 +546,14 @@ function user_committee_login($u)
 	$_SESSION['access_super'] = $u['access_super'];// == 'yes') ? true : false;
 }
 
+function user_fair_login($u) 
+{
+	/* Double check, make sure the user is of this type */
+	if(!in_array('fair', $u['types'])) {
+		echo "ERROR: attempted to login fair on a non-fair user\n";
+		exit;
+	}
 
+	$u = user_load($u, true);
+	$_SESSION['fairs_id'] = $u['fairs_id'];// == 'yes') ? true : false;
+}

user_login.php

@@ -109,6 +109,9 @@
  	exit;
 	$reg_open = user_judge_registration_status();
 	break;
+ case 'fair':
+ 	$reg_open = 'notpermitted';
+	break;
  case 'student':
  default:
  	exit;
@@ -342,7 +345,22 @@
 	 <form method="post" action="user_login.php?type=<?="$type$redirect_url"?>">
 	 <input type="hidden" name="action" value="login" />
 	 <table><tr><td>
-	 <?=i18n("Email")?>:</td><td><input type="text" size="20" name="user" />
+	<?
+	if($type == 'fair') {
+		echo i18n("Select Fair").'</td><td><select name="user">';
+		$q = mysql_query("SELECT 
+					users.username,fairs.fairname 
+				FROM users LEFT JOIN users_fair ON users_fair.users_id=users.id
+					LEFT JOIN fairs ON users_fair.fairs_id=fairs.id
+				WHERE types LIKE '%fair%' ORDER BY fairs.fairname");
+		while($r = mysql_fetch_object($q)) {
+			echo "<option value=\"{$r->username}\">{$r->fairname}</option>\n";
+		}
+		echo '</select>';
+	} else {
+	 	echo i18n("Email").'</td><td><input type="text" size="20" name="user" />';
+	}
+	?>
 	 </td></tr><tr><td>
 	 <?=i18n("Password")?>:</td><td><input type="password" size="20" name="pass" />
 	 </td></tr>