diff --git a/common.inc.php b/common.inc.php index cc2a52c5..b1dbb750 100644 --- a/common.inc.php +++ b/common.inc.php @@ -120,13 +120,13 @@ function i18n($str,$args=array()) function error($str) { - return $str."
"; + return "
$str

"; } function notice($str) { - return $str."
"; + return "
$str

"; } $HEADER_SENT=false; @@ -188,7 +188,11 @@ if(count($config['languages'])>1) ?> +
+
+ + diff --git a/register_participants.inc.php b/register_participants.inc.php index 4862d366..245deeb4 100644 --- a/register_participants.inc.php +++ b/register_participants.inc.php @@ -1,9 +1,10 @@ num; $_SESSION['registration_id']=$r->id; mysql_query("INSERT INTO students (registrations_id,email,year) VALUES ('$r->id','".mysql_escape_string($_SESSION['email'])."','".$config['FAIRYEAR']."')"); - echo mysql_error(); mysql_query("UPDATE registrations SET status='open' WHERE id='$r->id'"); - echo mysql_error(); header("Location: register_participants_main.php"); exit; @@ -44,6 +42,12 @@ header("Location: register_participants_main.php"); exit; } + else + { + send_header("Participant Registration"); + echo error(i18n("Invalid registration number (%1) for email address %2",array($_POST['regnum'],$_SESSION['email']))); + $_POST['action']="login"; + } } else if($_GET['action']=="resend" && $_SESSION['email']) @@ -62,7 +66,14 @@ send_header("Participant Registration"); echo notice(i18n("Your registration number has been resent to your email addess %1",array($_SESSION['email']))); - echo "
"; + } + else if($_GET['action']=="logout") + { + unset($_SESSION['email']); + unset($_SESSION['registration_number']); + unset($_SESSION['registration_id']); + send_header("Participant Registration"); + echo notice(i18n("You have been successfully logged out")); } @@ -102,7 +113,6 @@ AND students.year=".$config['FAIRYEAR']." AND registrations.year=".$config['FAIRYEAR']." AND registrations.status='open'"); - echo mysql_error(); if(mysql_num_rows($q)>0) { echo i18n("Please enter your registration number in order to continue your registration"); diff --git a/register_participants_main.php b/register_participants_main.php index eef0acbb..9bc284d6 100644 --- a/register_participants_main.php +++ b/register_participants_main.php @@ -8,7 +8,7 @@ header("Location: register_participants.php"); exit; } - if(!$_SESSION['registration_number']) + if(! ($_SESSION['registration_number'] && $_SESSION['registration_id'])) { header("Location: register_participants.php"); exit; @@ -91,9 +91,10 @@ echo ""; echo ""; - echo "

"; + echo "".i18n("Logout").""; + send_footer(); ?> diff --git a/register_participants_students.php b/register_participants_students.php index 119c9210..0799ec32 100644 --- a/register_participants_students.php +++ b/register_participants_students.php @@ -7,7 +7,7 @@ header("Location: register_participants.php"); exit; } - if(!$_SESSION['registration_number']) + if(! ($_SESSION['registration_number'] && $_SESSION['registration_id'])) { header("Location: register_participants.php"); exit; @@ -31,9 +31,52 @@ echo mysql_error(); $r=mysql_fetch_object($q); send_header("Participant Registration - Student Information"); -echo "<< ".i18n("Back to Participant Registration Summary")."
"; - echo "

"; + echo "<< ".i18n("Back to Participant Registration Summary")."
"; + echo "
"; + $q=mysql_query("SELECT * FROM students WHERE registrations_id='".$_SESSION['registration_id']."' AND year='".$config['FAIRYEAR']."'"); + + if(mysql_num_rows($q)==0) + { + //uhh oh, we didnt find any, this isnt possible! lets insert one using the logged in persons email address + //although... this can never really happen, since the above queries only allow the page to view if the student + //is found in the students table... soo... well, lets leave it here as a fallback anyways, just incase + mysql_query("INSERT INTO students (registrations_id,email,year) VALUES ('".$_SESSION['registration_id']."','".mysql_escape_string($_SESSION['email'])."','".$config['FAIRYEAR']."')"); + } + else if(mysql_num_rows($q)==1) + { + $numstudents1="checked=\"checked\""; + $numstudents2=""; + + } + else if(mysql_num_rows($q)==2) + { + $numstudents1=""; + $numstudents2="checked=\"checked\""; + + } + else + { + //this should never happen + //we cant have more than two on a project + echo error(i18n("More than two students associated with this registration")); + //FIXME: eventually provide a solution to fix this if it ever happens.. like say.... + // "click here" to remove all students and start again.. or something + } + + echo "
"; + echo " ".i18n("I worked on the project by myself")."
"; + echo " ".i18n("I worked on the project with a partner")."
"; + echo "
"; + + + for($x=1;$x<=2;$x++) + { + $studentinfo=mysql_fetch_object($q); + echo "
\n"; + echo "

Student Details

"; + echo "
\n\n"; + } send_footer(); ?> diff --git a/sfiab.css b/sfiab.css index 49f1c43d..2f852ea9 100644 --- a/sfiab.css +++ b/sfiab.css @@ -1,6 +1,6 @@ body { - font-family: Verdana, Arial; + font-family: Verdana, Arial, Sans-Serif; font-size: 11px; margin: 0; padding: 0; @@ -27,7 +27,7 @@ body left: 10px; width: 175px; background: #EEEEFF; - border: 2px solid silver; + border: 2px solid Silver; padding: 5px; } @@ -38,7 +38,7 @@ body margin-top: 10px; margin-right: 10px; padding: 5px; - border: 2px solid silver; + border: 2px solid Silver; min-height: 400px; } @@ -149,6 +149,6 @@ a { .notice { font-weight: bold; - border: 1px solid silver; + border: 1px solid Silver; background: #E0E0FF; }