diff --git a/common.inc.php b/common.inc.php index 113b595c..699c0dee 100644 --- a/common.inc.php +++ b/common.inc.php @@ -60,7 +60,7 @@ if($_GET['switchlanguage']) } -function i18n($str) +function i18n($str,$args=array()) { if(!$str) return ""; @@ -68,16 +68,34 @@ function i18n($str) if($_SESSION['lang']) { if($_SESSION['lang']=="en") + { + for($x=1;$x<=count($args);$x++) + { + $str=str_replace("%$x",$args[$x-1],$str); + } return $str; + } else { $q=mysql_query("SELECT * FROM translations WHERE lang='".$_SESSION['lang']."' AND strmd5='".md5($str)."'"); if($r=@mysql_fetch_object($q)) { if($r->val) - return $r->val; + { + $ret=$r->val; + + for($x=1;$x<=count($args);$x++) + { + $ret=str_replace("%$x",$args[$x-1],$ret); + } + return $ret; + } else { + for($x=1;$x<=count($args);$x++) + { + $str=str_replace("%$x",$args[$x-1],$str); + } return "($str)"; } @@ -85,7 +103,10 @@ function i18n($str) else { mysql_query("INSERT INTO translations (lang,strmd5,str) VALUES ('".$_SESSION['lang']."','".md5($str)."','".mysql_escape_string($str)."')"); - echo mysql_error(); + for($x=1;$x<=count($args);$x++) + { + $str=str_replace("%$x",$args[$x-1],$str); + } return "($str)"; } } @@ -97,15 +118,31 @@ function i18n($str) } } +function error($str) +{ + return $str."
"; +} + +function notice($str) +{ + return $str."
"; +} + +$HEADER_SENT=false; function send_header($title="") { + global $HEADER_SENT; global $config; + + //do this so we can use send_header() a little more loosly and not worry about it being sent more than once. + if($HEADER_SENT) return; + else $HEADER_SENT=true; ?> -<?=$title?> +<?=i18n($title)?> @@ -157,7 +194,7 @@ if(count($config['languages'])>1)
$title"; + echo "

".i18n($title)."

"; } function send_footer() @@ -165,6 +202,7 @@ function send_footer() ?>
diff --git a/register_participants.php b/register_participants.php index 8546565d..e5cfbb75 100644 --- a/register_participants.php +++ b/register_participants.php @@ -1,6 +1,127 @@ num; + $_SESSION['registration_id']=$r->id; + 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($_POST['action']=="continue") + { + + } + + send_header("Participant Registration"); + + if($_POST['action']=="login" && ( $_POST['email'] || $_SESSION['email']) ) + { + if($_POST['email']) + $_SESSION['email']=$_POST['email']; + + echo "
"; + + $allownew=true; + //first, check if they have any registrations waiting to be opened + $q=mysql_query("SELECT * FROM registrations WHERE email='".$_SESSION['email']."' AND status='new' AND year=".$config['FAIRYEAR']); + if(mysql_num_rows($q)>0) + { + echo i18n("Please enter the registration number you received in your email, in order to begin your new registration"); + echo ""; + $allownew=false; + } + else + { + $q=mysql_query("SELECT students.email, + registrations.status + FROM students, + registrations + WHERE + students.email='".$_SESSION['email']."' + AND students.year=".$config['FAIRYEAR']." + AND registrations.year=".$config['FAIRYEAR']." + AND registrations.status='open'"); + if(mysql_num_rows($q)>0) + { + echo i18n("Please enter the registration number in order to continue your registration"); + echo ""; + $allownew=false; + } + } + + if($allownew) + { + $regnum=0; + //now create the new registration record, and assign a random/unique registration number to then. + do + { + //random number between + //100000 and 999999 (six digit integer) + $regnum=rand(100000,999999); + $q=mysql_query("SELECT * FROM registrations WHERE num='$regnum' AND year=".$config['FAIRYEAR']); + }while(mysql_num_rows($q)>0); + + //actually insert it + mysql_query("INSERT INTO registrations (num,email,start,status,year) VALUES (". + "'$regnum',". + "'".$_SESSION['email']."',". + "NOW(),". + "'new',". + $config['FAIRYEAR']. + ")"); + + + $mailbody= "A new registration account has been created for you.\n". + "To access your registration account, please enter\n". + "enter the following registration number into the\n". + "registration website:\n". + "\n". + "Registration Number: $regnum\n". + "\n"; + mail($_SESSION['email'],i18n("Registration for %1",array(i18n($config['fairname']))),$mailbody); + + echo i18n("You have been identified as a new registrant. An email has been sent to %1 which contains your new registration number. Please check your email to obtain your registration number and then enter it below:",array($_SESSION['email'])); + echo ""; + + } + echo "
"; + echo "
"; + echo i18n("Registration Number:"); + echo ""; + echo ""; + echo "
"; + } + else + { + + echo i18n("Please enter your email address to :"); + echo ""; + + ?> +
+ + : + +
+ diff --git a/sfiab.css b/sfiab.css index e89e7995..df19fc6a 100644 --- a/sfiab.css +++ b/sfiab.css @@ -1,6 +1,7 @@ body { font-family: Verdana, Arial; + font-size: 11px; margin: 0; padding: 0; background: #E0E0FF; @@ -82,6 +83,6 @@ ul.mainnav li a:hover { a { text-decoration: none; font-weight: bold; - font-size: 10px; + font-size: 11px; color: #5C6F90; }