diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php index a42ffb26cd..b360ff0fc5 100644 --- a/app/conference_centers/app_languages.php +++ b/app/conference_centers/app_languages.php @@ -120,11 +120,20 @@ $text['button-add']['en-us'] = 'Add'; $text['button-add']['pt-pt'] = ''; + $text['label-moderator-pin']['en-us'] = 'Moderator PIN'; + $text['label-moderator-pin']['pt-pt'] = ''; + + $text['label-participant-pin']['en-us'] = 'Participant PIN'; + $text['label-participant-pin']['pt-pt'] = ''; + $text['label-member-pin']['en-us'] = 'PIN Numbers'; $text['label-member-pin']['pt-pt'] = ''; - $text['description-member-pin']['en-us'] = 'Pin numbers for the moderators or participants.'; - $text['description-member-pin']['pt-pt'] = ''; + $text['description-moderator-pin']['en-us'] = 'Pin numbers for the moderators.'; + $text['description-moderator-pin']['pt-pt'] = ''; + + $text['description-participant-pin']['en-us'] = 'Pin numbers for the participants.'; + $text['description-participant-pin']['pt-pt'] = ''; $text['label-member-type-moderator']['en-us'] = 'moderator'; $text['label-member-type-moderator']['pt-pt'] = ''; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index be1e8f2d23..ffa1418b2d 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -53,8 +53,8 @@ else { if (count($_POST) > 0) { $conference_center_uuid = check_str($_POST["conference_center_uuid"]); $meeting_uuid = check_str($_POST["meeting_uuid"]); - $member_pin = check_str($_POST["member_pin"]); - $member_type = check_str($_POST["member_type"]); + $moderator_pin = check_str($_POST["moderator_pin"]); + $participant_pin = check_str($_POST["participant_pin"]); $profile = check_str($_POST["profile"]); $record = check_str($_POST["record"]); $user_uuid = check_str($_POST["user_uuid"]); @@ -69,7 +69,8 @@ else { $description = check_str($_POST["description"]); //remove any pin number formatting - $member_pin = preg_replace('{\D}', '', $member_pin); + $moderator_pin = preg_replace('{\D}', '', $moderator_pin); + $participant_pin = preg_replace('{\D}', '', $participant_pin); } //delete the user @@ -112,16 +113,29 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { } //check for a unique pin number and length - if (strlen($member_pin) > 0) { + if (strlen($moderator_pin) > 0) { $sql = "select count(*) as num_rows from v_meeting_pins "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sql .= "and member_pin = '".$member_pin."' "; + $sql .= "and meeting_uuid <> '".$meeting_uuid."' "; + $sql .= "and member_pin = '".$moderator_pin."' "; $prep_statement = $db->prepare(check_sql($sql)); if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); if ($row['num_rows'] > 0) { - $msg .= "Please provide a unique pin number.
\n"; + $msg .= "Please provide a unique moderator pin number.
\n"; + } + } + $sql = "select count(*) as num_rows from v_meeting_pins "; + $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; + $sql .= "and meeting_uuid <> '".$meeting_uuid."' "; + $sql .= "and member_pin = '".$participant_pin."' "; + $prep_statement = $db->prepare(check_sql($sql)); + if ($prep_statement) { + $prep_statement->execute(); + $row = $prep_statement->fetch(PDO::FETCH_ASSOC); + if ($row['num_rows'] > 0) { + $msg .= "Please provide a unique participant pin number.
\n"; } } $sql = "select conference_center_pin_length from v_conference_centers "; @@ -131,8 +145,11 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if ($prep_statement) { $prep_statement->execute(); $row = $prep_statement->fetch(PDO::FETCH_ASSOC); - if (strlen($member_pin) != $row['conference_center_pin_length']) { - $msg .= "Please provide a PIN number that is the required length\n"; + if (strlen($moderator_pin) != $row['conference_center_pin_length']) { + $msg .= "Please provide a moderator PIN number that is the required length\n"; + } + if (strlen($participant_pin) != $row['conference_center_pin_length']) { + $msg .= "Please provide a participant PIN number that is the required length\n"; } } } @@ -319,8 +336,29 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); } - //assign the pin numbers to the meeting - if (strlen($member_pin) > 0) { + //get the pin numbers for the meeting + $sql = "SELECT * FROM v_meeting_pins "; + $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; + $sql .= "and meeting_uuid = '".$meeting_uuid."' "; + $sql .= "order by member_pin asc "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); + $result_count = count($result); + foreach($result as $field) { + if ($field['member_type'] == "moderator") { + $moderator_member_pin = $field['member_pin']; + $moderator_pin_uuid = $field['meeting_pin_uuid']; + } + else { + $participant_member_pin = $field['member_pin']; + $participant_pin_uuid = $field['meeting_pin_uuid']; + } + } + + //add or update the moderator_pin + if (strlen($moderator_member_pin) == 0) { + //add $meeting_pin_uuid = uuid(); $sql = "insert into v_meeting_pins "; $sql .= "("; @@ -335,13 +373,56 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "'$domain_uuid', "; $sql .= "'$meeting_pin_uuid', "; $sql .= "'$meeting_uuid', "; - $sql .= "'$member_pin', "; - $sql .= "'$member_type' "; + $sql .= "'$moderator_pin', "; + $sql .= "'moderator' "; $sql .= ")"; //echo $sql; //exit; $db->exec(check_sql($sql)); unset($sql); } + else { + //update + $sql = "update v_meeting_pins set "; + $sql .= "member_pin = '$moderator_pin' "; + $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "and meeting_pin_uuid = '$moderator_pin_uuid' "; + $db->exec(check_sql($sql)); + unset($sql); + } + + //add or update the participant_pin + if (strlen($participant_member_pin) == 0) { + //add + $meeting_pin_uuid = uuid(); + $sql = "insert into v_meeting_pins "; + $sql .= "("; + $sql .= "domain_uuid, "; + $sql .= "meeting_pin_uuid, "; + $sql .= "meeting_uuid, "; + $sql .= "member_pin, "; + $sql .= "member_type "; + $sql .= ") "; + $sql .= "values "; + $sql .= "("; + $sql .= "'$domain_uuid', "; + $sql .= "'$meeting_pin_uuid', "; + $sql .= "'$meeting_uuid', "; + $sql .= "'$participant_pin', "; + $sql .= "'participant' "; + $sql .= ")"; + //echo $sql; //exit; + $db->exec(check_sql($sql)); + unset($sql); + } + else { + //update + $sql = "update v_meeting_pins set "; + $sql .= "member_pin = '$participant_pin' "; + $sql .= "where domain_uuid = '$domain_uuid' "; + $sql .= "and meeting_pin_uuid = '$participant_pin_uuid' "; + $db->exec(check_sql($sql)); + unset($sql); + } //redirect the user require_once "includes/header.php"; @@ -382,6 +463,30 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { unset ($prep_statement); } +//get the pin numbers + if ($action == "update") { + $sql = "SELECT * FROM v_meeting_pins "; + $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; + $sql .= "and meeting_uuid = '".$meeting_uuid."' "; + $sql .= "order by member_pin asc "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); + $result_count = count($result); + foreach($result as $field) { + $member_pin = $field['member_pin']; + if (strlen($member_pin) == 9) { + $member_pin = substr($member_pin, 0, 3) ."-". substr($member_pin, 3, 3) ."-". substr($member_pin, -3)."\n"; + } + if ($field['member_type'] == "moderator") { + $moderator_pin = $member_pin; + } + else { + $participant_pin = $member_pin; + } + } + } + //set default values if (strlen($record) == 0) { $record = 'false'; } if (strlen($max_members) == 0) { $max_members = 0; } @@ -495,71 +600,21 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " "; echo " "; - echo " ".$text['label-member-pin'].":"; + echo " ".$text['label-moderator-pin'].":"; echo " "; - if ($action == "update") { - echo " \n"; - $sql = "SELECT * FROM v_meeting_pins "; - $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; - $sql .= "and meeting_uuid = '".$meeting_uuid."' "; - $sql .= "order by member_pin asc "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $result_count = count($result); - foreach($result as $field) { - $member_pin = $field['member_pin']; - if (strlen($member_pin) == 9) { - $member_pin = substr($member_pin, 0, 3) ."-". substr($member_pin, 3, 3) ."-". substr($member_pin, -3)."\n"; - } - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - } - echo "
".$member_pin.""; - if ($field['member_type'] == "moderator") { - echo $text['label-member-type-moderator']; - } - else { - echo $text['label-member-type-participant']; - } - echo "\n"; - echo " $v_link_label_delete\n"; - echo "
\n"; - } + echo " \n"; echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - if ($action == "update") { - echo " \n"; - } - echo " \n"; - echo "
\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
\n"; - unset($sql, $result); - echo " ".$text['description-member-pin'].".\n"; + echo " ".$text['description-moderator-pin']."\n"; + echo "
\n"; + echo " "; + echo " "; + + echo " "; + echo " ".$text['label-participant-pin'].":"; + echo " "; + echo " \n"; + echo "
\n"; + echo " ".$text['description-participant-pin']."\n"; echo "
\n"; echo " "; echo " "; diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php index d64509634a..f974538005 100644 --- a/app/conference_centers/conference_rooms.php +++ b/app/conference_centers/conference_rooms.php @@ -272,7 +272,6 @@ else { echo " \n"; echo " ".$text['label-view']." \n"; echo " ".$text['label-sessions']."\n"; - echo " \n"; echo " ".$row['description']." \n"; echo " \n";