From c4c9973395595793d7d316d0f3eff9facb70dffd Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Wed, 24 Apr 2013 22:25:44 +0000 Subject: [PATCH] Fix the code that makes sure the moderator and participant pin numbers are unique. --- app/conference_centers/conference_room_edit.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index bc78e50796..5cc85995e3 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -169,12 +169,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } //check for a unique pin number and length - if (strlen($moderator_pin) > 0) { + if (strlen($moderator_pin) > 0 || strlen($participant_pin) > 0) { //make sure the moderator pin number is unique $sql = "select count(*) as num_rows from v_meetings "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "and meeting_uuid <> '".$meeting_uuid."' "; - $sql .= "and moderator_pin = '".$moderator_pin."' "; + $sql .= "and (moderator_pin = '".$moderator_pin."' or participant_pin = '".$moderator_pin."') "; $prep_statement = $db->prepare(check_sql($sql)); if ($prep_statement) { $prep_statement->execute(); @@ -183,11 +183,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $msg .= "Please provide a unique moderator pin number.
\n"; } } + //make sure the participant pin number is unique $sql = "select count(*) as num_rows from v_meetings "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; $sql .= "and meeting_uuid <> '".$meeting_uuid."' "; - $sql .= "and participant_pin = '".$participant_pin."' "; + $sql .= "and (moderator_pin = '".$participant_pin."' or participant_pin = '".$participant_pin."') "; $prep_statement = $db->prepare(check_sql($sql)); if ($prep_statement) { $prep_statement->execute(); @@ -196,6 +197,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $msg .= "Please provide a unique participant pin number.
\n"; } } + //additional checks if ($moderator_pin == $participant_pin) { $msg .= "Moderator and Participant PIN number must be unique.\n";