diff --git a/app/conference_rooms/conference_room_delete.php b/app/conference_rooms/conference_room_delete.php index f0afe6a6c4..c2bd1edfb1 100644 --- a/app/conference_rooms/conference_room_delete.php +++ b/app/conference_rooms/conference_room_delete.php @@ -2,7 +2,7 @@ require_once "root.php"; require_once "includes/require.php"; require_once "includes/checkauth.php"; -if (permission_exists('conference_session_delete')) { +if (permission_exists('conference_room_delete')) { //access granted } else { @@ -17,10 +17,10 @@ if (count($_GET)>0) { if (strlen($id)>0) { //get the meeting_uuid if (count($_GET)>0 && $_POST["persistformvar"] != "true") { - $conference_session_uuid = check_str($_GET["id"]); - $sql = "select * from v_conference_sessions "; + $conference_room_uuid = check_str($_GET["id"]); + $sql = "select * from v_conference_rooms "; $sql .= "where domain_uuid = '$domain_uuid' "; - $sql .= "and conference_session_uuid = '$conference_session_uuid' "; + $sql .= "and conference_room_uuid = '$conference_room_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(); @@ -31,9 +31,9 @@ if (strlen($id)>0) { } //delete the conference session - $sql = "delete from v_conference_sessions "; + $sql = "delete from v_conference_rooms "; $sql .= "where domain_uuid = '$domain_uuid' "; - $sql .= "and conference_session_uuid = '$id' "; + $sql .= "and conference_room_uuid = '$id' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); unset($sql); @@ -65,7 +65,7 @@ if (strlen($id)>0) { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Delete Complete\n"; echo "
\n"; diff --git a/app/conference_rooms/conference_room_edit.php b/app/conference_rooms/conference_room_edit.php index a5a33508ab..719669522d 100644 --- a/app/conference_rooms/conference_room_edit.php +++ b/app/conference_rooms/conference_room_edit.php @@ -2,7 +2,7 @@ require_once "root.php"; require_once "includes/require.php"; require_once "includes/checkauth.php"; -if (permission_exists('conference_session_add') || permission_exists('conference_session_edit')) { +if (permission_exists('conference_room_add') || permission_exists('conference_room_edit')) { //access granted } else { @@ -13,7 +13,7 @@ else { //action add or update if (isset($_REQUEST["id"])) { $action = "update"; - $conference_session_uuid = check_str($_REQUEST["id"]); + $conference_room_uuid = check_str($_REQUEST["id"]); } else { $action = "add"; @@ -21,7 +21,7 @@ else { //get http post variables and set them to php variables if (count($_POST)>0) { - $conference_uuid = check_str($_POST["conference_uuid"]); + $conference_center_uuid = check_str($_POST["conference_center_uuid"]); $member_pin = check_str($_POST["member_pin"]); $member_type = check_str($_POST["member_type"]); $user_uuid = check_str($_POST["user_uuid"]); @@ -40,11 +40,11 @@ else { } //delete the user from the v_extension_users - if ($_GET["a"] == "delete" && permission_exists('conference_session_add') && permission_exists('conference_session_edit')) { + if ($_GET["a"] == "delete" && permission_exists('conference_room_add') && permission_exists('conference_room_edit')) { if (strlen($_REQUEST["meeting_user_uuid"]) > 0) { //set the variables $meeting_user_uuid = check_str($_REQUEST["meeting_user_uuid"]); - $conference_session_uuid = check_str($_REQUEST["conference_session_uuid"]); + $conference_room_uuid = check_str($_REQUEST["conference_room_uuid"]); //delete the extension from the ring_group $sql = "delete from v_meeting_users "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; @@ -55,7 +55,7 @@ else { if (strlen($_REQUEST["meeting_pin_uuid"]) > 0) { //set the variables $meeting_pin_uuid = check_str($_REQUEST["meeting_pin_uuid"]); - $conference_session_uuid = check_str($_REQUEST["conference_session_uuid"]); + $conference_room_uuid = check_str($_REQUEST["conference_room_uuid"]); //delete the extension from the ring_group $sql = "delete from v_meeting_pins "; $sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' "; @@ -65,7 +65,7 @@ else { } //redirect the browser require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
Delete Complete
"; require_once "includes/footer.php"; return; @@ -75,11 +75,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $msg = ''; if ($action == "update") { - $conference_session_uuid = check_str($_POST["conference_session_uuid"]); + $conference_room_uuid = check_str($_POST["conference_room_uuid"]); } //check for all required data - //if (strlen($conference_uuid) == 0) { $msg .= "Please provide: Conference UUID
\n"; } + //if (strlen($conference_center_uuid) == 0) { $msg .= "Please provide: Conference UUID
\n"; } //if (strlen($max_members) == 0) { $msg .= "Please provide: Max Members
\n"; } //if (strlen($wait_mod) == 0) { $msg .= "Please provide: Wait for the Moderator
\n"; } if (strlen($announce) == 0) { $msg .= "Please provide: Announce
\n"; } @@ -105,7 +105,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //add or update the database if ($_POST["persistformvar"] != "true") { - if ($action == "add" && permission_exists('conference_session_add')) { + if ($action == "add" && permission_exists('conference_room_add')) { //add a meeting $meeting_uuid = uuid(); $sql = "insert into v_meetings "; @@ -130,12 +130,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //add a conference session - $conference_session_uuid = uuid(); - $sql = "insert into v_conference_sessions "; + $conference_room_uuid = uuid(); + $sql = "insert into v_conference_rooms "; $sql .= "("; $sql .= "domain_uuid, "; - $sql .= "conference_session_uuid, "; - $sql .= "conference_uuid, "; + $sql .= "conference_room_uuid, "; + $sql .= "conference_center_uuid, "; $sql .= "meeting_uuid, "; $sql .= "max_members, "; $sql .= "wait_mod, "; @@ -150,8 +150,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "values "; $sql .= "("; $sql .= "'$domain_uuid', "; - $sql .= "'$conference_session_uuid', "; - $sql .= "'$conference_uuid', "; + $sql .= "'$conference_room_uuid', "; + $sql .= "'$conference_center_uuid', "; $sql .= "'$meeting_uuid', "; $sql .= "'$max_members', "; $sql .= "'$wait_mod', "; @@ -168,13 +168,13 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } //if ($action == "add") - if ($action == "update" && permission_exists('conference_session_edit')) { + if ($action == "update" && permission_exists('conference_room_edit')) { //get the meeting_uuid if (count($_GET)>0 && $_POST["persistformvar"] != "true") { - $conference_session_uuid = check_str($_GET["id"]); - $sql = "select * from v_conference_sessions "; + $conference_room_uuid = check_str($_GET["id"]); + $sql = "select * from v_conference_rooms "; $sql .= "where domain_uuid = '$domain_uuid' "; - $sql .= "and conference_session_uuid = '$conference_session_uuid' "; + $sql .= "and conference_room_uuid = '$conference_room_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(); @@ -194,8 +194,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { unset($sql); //update conferences sessions - $sql = "update v_conference_sessions set "; - $sql .= "conference_uuid = '$conference_uuid', "; + $sql = "update v_conference_rooms set "; + $sql .= "conference_center_uuid = '$conference_center_uuid', "; //$sql .= "meeting_uuid = '$meeting_uuid', "; $sql .= "max_members = '$max_members', "; $sql .= "wait_mod = '$wait_mod', "; @@ -205,7 +205,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "enabled = '$enabled', "; $sql .= "description = '$description' "; $sql .= "where domain_uuid = '$domain_uuid' "; - $sql .= "and conference_session_uuid = '$conference_session_uuid' "; + $sql .= "and conference_room_uuid = '$conference_room_uuid' "; //echo $sql; //exit; $db->exec(check_sql($sql)); unset($sql); @@ -260,7 +260,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //redirect the user require_once "includes/header.php"; - echo "\n"; + echo "\n"; echo "
\n"; echo "Update Complete\n"; echo "
\n"; @@ -272,15 +272,15 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { //pre-populate the form if (count($_GET)>0 && $_POST["persistformvar"] != "true") { - $conference_session_uuid = check_str($_GET["id"]); - $sql = "select * from v_conference_sessions "; + $conference_room_uuid = check_str($_GET["id"]); + $sql = "select * from v_conference_rooms "; $sql .= "where domain_uuid = '$domain_uuid' "; - $sql .= "and conference_session_uuid = '$conference_session_uuid' "; + $sql .= "and conference_room_uuid = '$conference_room_uuid' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(); foreach ($result as &$row) { - $conference_uuid = $row["conference_uuid"]; + $conference_center_uuid = $row["conference_center_uuid"]; $meeting_uuid = $row["meeting_uuid"]; $max_members = $row["max_members"]; $wait_mod = $row["wait_mod"]; @@ -323,7 +323,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (strlen($meeting_uuid) > 0) { echo " \n"; } - echo " \n"; + echo " \n"; echo "\n"; echo "\n"; @@ -332,7 +332,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " Conference Name:\n"; echo "\n"; echo "\n"; - echo " \n"; $sql = "select * from v_conferences "; $sql .= "where domain_uuid = '$domain_uuid' "; $sql .= "order by conference_name asc "; @@ -341,11 +341,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $x = 0; $result = $prep_statement->fetchAll(PDO::FETCH_ASSOC); foreach ($result as &$row) { - if ($conference_uuid == $row["conference_uuid"]) { - echo " \n"; + if ($conference_center_uuid == $row["conference_center_uuid"]) { + echo " \n"; } else { - echo " \n"; + echo " \n"; } $x++; } @@ -374,7 +374,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " ".$field['username']."\n"; echo " \n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; echo " \n"; echo " \n"; } @@ -420,7 +420,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$field['member_pin']."\n"; echo " ".$field['member_type']."\n"; echo " \n"; - echo " $v_link_label_delete\n"; + echo " $v_link_label_delete\n"; echo " \n"; echo " \n"; } @@ -559,7 +559,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; /* - if ($action == "update" && permission_exists('conference_session_edit')) { + if ($action == "update" && permission_exists('conference_room_edit')) { echo "\n"; echo "\n"; echo " Created:\n"; @@ -627,7 +627,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; if ($action == "update") { - echo " \n"; + echo " \n"; } echo " \n"; echo " \n"; diff --git a/app/conference_rooms/conference_rooms.php b/app/conference_rooms/conference_rooms.php index 74368482ae..0f094c926c 100644 --- a/app/conference_rooms/conference_rooms.php +++ b/app/conference_rooms/conference_rooms.php @@ -2,7 +2,7 @@ require_once "root.php"; require_once "includes/require.php"; require_once "includes/checkauth.php"; -if (permission_exists('conference_session_view')) { +if (permission_exists('conference_room_view')) { //access granted } else { @@ -31,7 +31,7 @@ require_once "includes/paging.php"; echo "\n"; //prepare to page the results - $sql = "select count(*) as num_rows from v_conference_sessions "; + $sql = "select count(*) as num_rows from v_conference_rooms "; $sql .= "where domain_uuid = '$domain_uuid' "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $prep_statement = $db->prepare($sql); @@ -55,7 +55,7 @@ require_once "includes/paging.php"; $offset = $rows_per_page * $page; //get the list - $sql = "select * from v_conference_sessions "; + $sql = "select * from v_conference_rooms "; $sql .= "where domain_uuid = '$domain_uuid' "; if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; } $sql .= "limit $rows_per_page offset $offset "; @@ -72,7 +72,7 @@ require_once "includes/paging.php"; echo "
\n"; echo "\n"; echo "\n"; - //echo th_order_by('conference_uuid', 'Conference UUID', $order_by, $order); + //echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order); //echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order); echo th_order_by('max_members', 'Max Members', $order_by, $order); echo th_order_by('wait_mod', 'Wait for Moderator', $order_by, $order); @@ -84,8 +84,8 @@ require_once "includes/paging.php"; echo th_order_by('enabled', 'Enabled', $order_by, $order); echo th_order_by('description', 'Description', $order_by, $order); echo "\n"; - //echo " \n"; + //echo " \n"; //echo " \n"; echo " \n"; echo " \n"; @@ -108,11 +108,11 @@ require_once "includes/paging.php"; echo " \n"; echo " \n"; echo " \n"; echo "\n"; @@ -128,8 +128,8 @@ require_once "includes/paging.php"; echo " \n"; echo " \n"; echo "
\n"; - if (permission_exists('conference_session_add')) { - echo " $v_link_label_add\n"; + if (permission_exists('conference_room_add')) { + echo " $v_link_label_add\n"; } else { echo "  \n"; @@ -96,7 +96,7 @@ require_once "includes/paging.php"; if ($result_count > 0) { foreach($result as $row) { echo "
".$row['conference_uuid']." ".$row['conference_center_uuid']." ".$row['meeting_uuid']." ".$row['max_members']." ".$row['wait_mod']." ".$row['enabled']." ".$row['description']." \n"; - if (permission_exists('conference_session_edit')) { - echo " $v_link_label_edit\n"; + if (permission_exists('conference_room_edit')) { + echo " $v_link_label_edit\n"; } - if (permission_exists('conference_session_delete')) { - echo " $v_link_label_delete\n"; + if (permission_exists('conference_room_delete')) { + echo " $v_link_label_delete\n"; } echo "
 $paging_controls\n"; - if (permission_exists('conference_session_add')) { - echo " $v_link_label_add\n"; + if (permission_exists('conference_room_add')) { + echo " $v_link_label_add\n"; } else { echo "  \n";