diff --git a/admin/award_sponsors.php b/admin/award_sponsors.php index 0b0f4ac..1d7d181 100644 --- a/admin/award_sponsors.php +++ b/admin/award_sponsors.php @@ -80,7 +80,7 @@ echo happy("Sponsor successfully unconfirmed"); } - if($_GET['action']=="edit" || $action=="add") + if($_GET['action']=="edit" || $_GET['action']=="add") { echo "<< ".i18n("Back to Award Sponsors")."\n"; @@ -91,7 +91,7 @@ $q=mysql_query("SELECT * FROM award_sponsors WHERE id='".$_GET['edit']."'"); $r=mysql_fetch_object($q); } - else if($action=="add") + else if($_GET['action']=="add") { echo "

".i18n("Add New Award Sponsor")."

\n"; $buttontext="Add Sponsor"; diff --git a/admin/judges_teams_projects.php b/admin/judges_teams_projects.php index 9e4d0ff..4795dd8 100644 --- a/admin/judges_teams_projects.php +++ b/admin/judges_teams_projects.php @@ -347,15 +347,18 @@ if( ($action=="edit" || $action=="assign" ) && $edit) echo ""; echo "".$team['name']." (#".$team['num'].")
"; $memberlist=""; - foreach($team['members'] AS $member) + if(count($team['members'])) { - echo "  "; - if($member['captain']=="yes") - echo ""; - echo $member['firstname']." ".$member['lastname']."
"; - if($member['captain']=="yes") - echo "
"; + foreach($team['members'] AS $member) + { + echo "  "; + if($member['captain']=="yes") + echo ""; + echo $member['firstname']." ".$member['lastname']."
"; + if($member['captain']=="yes") + echo "
"; + } } echo ""; echo ""; diff --git a/admin/judges_teams_timeslots.php b/admin/judges_teams_timeslots.php index 9a70003..724b6e8 100644 --- a/admin/judges_teams_timeslots.php +++ b/admin/judges_teams_timeslots.php @@ -165,15 +165,18 @@ function checkinvert(what) echo ""; echo "".$team['name']." (#".$team['num'].")
"; $memberlist=""; - foreach($team['members'] AS $member) + if(count($team['members'])) { - echo "  "; - if($member['captain']=="yes") - echo ""; - echo $member['firstname']." ".$member['lastname']."
"; - if($member['captain']=="yes") - echo "
"; + foreach($team['members'] AS $member) + { + echo "  "; + if($member['captain']=="yes") + echo ""; + echo $member['firstname']." ".$member['lastname']."
"; + if($member['captain']=="yes") + echo "
"; + } } echo ""; echo ""; diff --git a/admin/schools.php b/admin/schools.php index d098b8b..6460055 100644 --- a/admin/schools.php +++ b/admin/schools.php @@ -71,7 +71,7 @@ echo happy("School successfully deleted"); } - if($_GET['action']=="edit" || $action=="add") + if($_GET['action']=="edit" || $_GET['action']=="add") { echo "<< ".i18n("Back to Schools")."\n"; @@ -82,7 +82,7 @@ $q=mysql_query("SELECT * FROM schools WHERE id='".$_GET['edit']."'"); $r=mysql_fetch_object($q); } - else if($action=="add") + else if($_GET['action']=="add") { echo "

".i18n("Add New School")."

\n"; $buttontext="Add School"; diff --git a/db/db.update.10.sql b/db/db.update.10.sql index e69de29..990598d 100644 --- a/db/db.update.10.sql +++ b/db/db.update.10.sql @@ -0,0 +1,4 @@ +UPDATE `pagetext` SET `text`='Welcome to the online registration and management system for the fair. Using the links on the left the public can register as a participant or register as a judge. \r\n\r\nThe committee can use the Fair Administration link to manage the fair, see who''s registered, generate reports, etc. \r\n\r\nThe SFIAB configuration link is for the committee webmaster to manage the configuration of the Science Fair In A Box for the fair.\r\n' WHERE `textname`='index' AND `year`='-1'; +UPDATE `emails` SET `body`='A new registration account has been created for you. To access your registration account, please enter the following registration number into the registration website:\r\n\r\nRegistration Number: [REGNUM]\r\n' WHERE `val`='new_participant'; +UPDATE `emails` SET `body`='We have received a request for the retrieval of your registration number from this email address. Please find your existing registration number below\r\n\r\nRegistration Number: [REGNUM]\r\n' WHERE `val`='register_participants_resend_regnum'; +UPDATE `config` SET `description`='The single password to use for participant registration if participant_registration_type is singlepassword. Leave blank if not using singlepassword participant registration' WHERE `var`='participant_registration_singlepassword' AND `year`='-1';