diff --git a/admin/award_upload.php b/admin/award_upload.php index 670fb9d8..f1fb593d 100644 --- a/admin/award_upload.php +++ b/admin/award_upload.php @@ -53,7 +53,6 @@ function get_winners($awardid, $fairs_id) $student_fields = array('firstname' => 'firstname', 'lastname' => 'lastname', 'email' => 'email', - 'gender' => 'sex', 'grade' => 'grade', 'language' => 'lang', 'birthdate' => 'dateofbirth', diff --git a/admin/cwsfregister.php b/admin/cwsfregister.php index f03f44a2..e1adc6ef 100644 --- a/admin/cwsfregister.php +++ b/admin/cwsfregister.php @@ -83,7 +83,6 @@ function get_cwsf_award_winners() 'firstname' => $s->firstname, 'lastname' => $s->lastname, 'email' => $s->email, - 'gender' => $s->sex, 'grade' => $s->grade, 'language' => $s->lang, 'birthdate' => $s->dateofbirth, diff --git a/admin/reports_students.inc.php b/admin/reports_students.inc.php index 6bfe34e7..823ed646 100644 --- a/admin/reports_students.inc.php +++ b/admin/reports_students.inc.php @@ -349,13 +349,6 @@ $report_students_fields = array( 'table_sort' => 'students.grade', 'table' => "CONCAT('Grade ', students.grade)" ), - 'gender' => array( - 'name' => 'Student -- Gender', - 'header' => 'Gender', - 'width' => 0.5, - 'table' => 'students.sex', - 'value_map' => array('male' => 'Male', 'female' => 'Female') - ), 'birthdate' => array( 'name' => 'Student -- Birthdate', 'header' => 'Birthdate', diff --git a/register_participants.inc.php b/register_participants.inc.php index 1e7722c1..23695ccd 100644 --- a/register_participants.inc.php +++ b/register_participants.inc.php @@ -55,7 +55,7 @@ function studentStatus($reg_id = '') { global $config, $pdo; if ($config['participant_student_personal'] == 'yes') - $required_fields = array('firstname', 'lastname', 'address', 'city', 'postalcode', 'phone', 'email', 'grade', 'dateofbirth', 'schools_id', 'sex'); + $required_fields = array('firstname', 'lastname', 'address', 'city', 'postalcode', 'phone', 'email', 'grade', 'dateofbirth', 'schools_id'); else $required_fields = array('firstname', 'lastname', 'email', 'grade', 'schools_id'); diff --git a/register_participants_students.php b/register_participants_students.php index 8299d796..dfb28448 100644 --- a/register_participants_students.php +++ b/register_participants_students.php @@ -104,12 +104,11 @@ if (get_value_from_array($_POST, 'action') == 'save') { } // INSERT new record $dob = $_POST['year'][$x] . '-' . $_POST['month'][$x] . '-' . $_POST['day'][$x]; - $stmt = $pdo->prepare('INSERT INTO students (registrations_id,firstname,lastname,pronunciation,sex,email,address,city,county,province,postalcode,phone,dateofbirth,grade,schools_id,tshirt,medicalalert,foodreq,teachername,teacheremail,year) VALUES (' + $stmt = $pdo->prepare('INSERT INTO students (registrations_id,firstname,lastname,pronunciation,email,address,city,county,province,postalcode,phone,dateofbirth,grade,schools_id,tshirt,medicalalert,foodreq,teachername,teacheremail,year) VALUES (' . "'" . $_SESSION['registration_id'] . "', " . "'" . stripslashes($_POST['firstname'][$x]) . "', " . "'" . stripslashes($_POST['lastname'][$x]) . "', " . "'" . stripslashes($_POST['pronunciation'][$x]) . "', " - . "'" . stripslashes($_POST['sex'][$x]) . "', " . "'" . stripslashes($_POST['email'][$x]) . "', " . "'" . stripslashes($_POST['address'][$x]) . "', " . "'" . stripslashes($_POST['city'][$x]) . "', " @@ -144,7 +143,6 @@ if (get_value_from_array($_POST, 'action') == 'save') { . "firstname='" . stripslashes($_POST['firstname'][$x]) . "', " . "lastname='" . stripslashes($_POST['lastname'][$x]) . "', " . "pronunciation='" . stripslashes($_POST['pronunciation'][$x]) . "', " - . "sex='" . stripslashes($_POST['sex'][$x]) . "', " . "email='" . stripslashes($_POST['email'][$x]) . "', " . "address='" . stripslashes($_POST['address'][$x]) . "', " . "city='" . stripslashes($_POST['city'][$x]) . "', " @@ -289,29 +287,12 @@ for ($x = 1; $x <= $numtoshow; $x++) { echo "\n"; } - if ($config['participant_student_personal'] == 'yes') { - echo "\n"; - echo ' ' . i18n('Gender') . ''; - echo "' . REQUIREDFIELD; - } echo "\n"; echo " \n"; echo "\n"; echo "\n"; - echo ' ' . i18n('Email Address') . "' . REQUIREDFIELD . "\n"; + echo ' ' . i18n('Email Address') . "' . REQUIREDFIELD . "\n"; if ($config['participant_student_personal'] == 'yes') { echo ' ' . i18n('City') . "' . REQUIREDFIELD . "\n"; @@ -338,7 +319,7 @@ for ($x = 1; $x <= $numtoshow; $x++) { echo ' ' . i18n($config['postalzip']) . ''; echo "' . REQUIREDFIELD . "\n"; echo ' ' . i18n('Phone') . ''; - echo " ' . REQUIREDFIELD . "\n"; + echo " ' . REQUIREDFIELD . "\n"; echo "\n"; echo "\n"; @@ -475,7 +456,7 @@ for ($x = 1; $x <= $numtoshow; $x++) { echo "\n"; echo ' ' . i18n('Teacher Name') . "\n"; - echo ' ' . i18n('TeacherEmail') . "\n"; + echo ' ' . i18n('Teacher Email') . "\n"; echo "\n"; if ($config['participant_regfee_items_enable'] == 'yes') { diff --git a/remote.php b/remote.php index c4eb89bd..c5382fe4 100644 --- a/remote.php +++ b/remote.php @@ -237,7 +237,6 @@ function award_upload_assign(&$fair, &$award, &$prize, &$project, $year, &$respo $student_fields = array('firstname' => 'firstname', 'lastname' => 'lastname', 'email' => 'email', - 'gender' => 'sex', 'grade' => 'grade', 'language' => 'lang', 'birthdate' => 'dateofbirth', diff --git a/user.inc.php b/user.inc.php index 0e6557f4..1e8555f2 100644 --- a/user.inc.php +++ b/user.inc.php @@ -479,7 +479,7 @@ function user_save(&$u) $fields = array('salutation', 'firstname', 'lastname', 'username', 'email', 'phonehome', 'phonework', 'phonecell', 'fax', 'organization', - 'address', 'address2', 'city', 'province', 'postalcode', 'sex', + 'address', 'address2', 'city', 'province', 'postalcode', 'firstaid', 'cpr', 'types', 'lang'); $set = ''; @@ -691,7 +691,7 @@ function user_purge($u, $type = false) function user_dupe_row($table, $key, $val, $newval) { global $config, $pdo; - $nullfields = array('id', 'sex', 'deleteddatetime'); /* Fields that can be null */ + $nullfields = array('id', 'deleteddatetime'); /* Fields that can be null */ $q = $pdo->prepare("SELECT * FROM $table WHERE $key='$val'"); $q->execute(); if ($q->rowCount() != 1) { @@ -965,7 +965,6 @@ $user_personal_fields_map = array( 'salutation' => array('salutation'), 'name' => array('firstname', 'lastname'), 'email' => array('email'), - 'sex' => array('sex'), 'phonehome' => array('phonehome'), 'phonework' => array('phonework'), 'phonecell' => array('phonecell'), diff --git a/user_personal.php b/user_personal.php index 4469542d..f865ebea 100644 --- a/user_personal.php +++ b/user_personal.php @@ -46,7 +46,6 @@ $user_personal_fields = array( 'lang' => array('name' => 'Preferred Language'), 'province' => array('name' => $config['provincestate']), 'organization' => array('name' => 'Organization'), - 'sex' => array('name' => 'Gender'), 'firstaid' => array('name' => 'First Aid Training', 'type' => 'yesno'), 'cpr' => array('name' => 'CPR Training', @@ -301,28 +300,6 @@ item($u, 'phonework'); echo ''; echo "\n"; item($u, 'fax'); -if (in_array('sex', $fields)) { - echo '' . i18n('Gender') . ': '; - echo ''; - echo ''; - if (in_array('sex', $required)) - echo REQUIREDFIELD; - echo ''; -} else { - echo ''; -} echo ''; echo "\n";