diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index c915bd2bd3..a146cbb856 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -309,18 +309,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
"; - echo "
\n"; - echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "
".$text['title-conference-center']."\n"; + echo "".$text['title-conference-center']."\n"; echo " \n"; if (permission_exists('conference_active_advanced_view')) { echo " \n"; @@ -328,13 +321,12 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo "
\n"; - echo " ".$text['description-conference-center']."\n"; - echo "

\n"; - echo "
\n"; + echo "
"; + echo $text['description-conference-center']."\n"; + echo "

\n"; + echo "\n"; echo "\n"; echo "
\n"; echo " ".$text['label-name'].":\n"; @@ -522,11 +514,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
"; echo ""; - echo "
"; - echo "
"; - //include the footer require_once "resources/footer.php"; ?> \ No newline at end of file diff --git a/app/conference_centers/conference_centers.php b/app/conference_centers/conference_centers.php index c4e77e3b80..76651d1a8d 100644 --- a/app/conference_centers/conference_centers.php +++ b/app/conference_centers/conference_centers.php @@ -53,29 +53,20 @@ else { $order = $_GET["order"]; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo ""; - echo "
\n"; - echo "
"; - - echo "\n"; + echo "
\n"; echo " \n"; - echo "\n"; - echo "\n"; + echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo "\n"; echo "
".$text['title-conference-centers']."\n"; + echo "".$text['title-conference-centers']."\n"; if (permission_exists('conference_active_advanced_view')) { echo " \n"; } echo " \n"; echo "
\n"; - echo " ".$text['description-conference-centers']."\n"; - echo "
\n"; echo "
\n"; + echo $text['description-conference-centers']."\n"; + echo "

\n"; //prepare to page the results if (if_group("superadmin") || if_group("admin")) { @@ -141,7 +132,6 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; echo "\n"; echo "\n"; echo th_order_by('conference_center_name', $text['label-name'], $order_by, $order); @@ -208,15 +198,7 @@ else { echo "\n"; echo "
"; - echo "
"; - echo "

"; - echo "

"; - - echo "
"; - echo "
"; - echo "

"; + echo "
"; //include the footer require_once "resources/footer.php"; diff --git a/app/conferences/app_languages.php b/app/conferences/app_languages.php index 875c75ff11..d906e6f088 100644 --- a/app/conferences/app_languages.php +++ b/app/conferences/app_languages.php @@ -11,20 +11,20 @@ $text['description']['pt-pt'] = "As conferências são utilizadas para configurar salas de conferência com um nome, descrição e número pin opcional."; $text['description']['fr-fr'] = "Ce menu est utilisé pour créer des salles de conférence avec un nom, une description et en option un code PIN."; - $text['title-2']['en-us'] = "Active Conferences"; - $text['title-2']['es-cl'] = "Conferencias Activas"; - $text['title-2']['pt-pt'] = "Conferências Activas"; - $text['title-2']['fr-fr'] = "Conférences actives"; + $text['label-active_conferences']['en-us'] = "Active Conferences"; + $text['label-active_conferences']['es-cl'] = "Conferencias Activas"; + $text['label-active_conferences']['pt-pt'] = "Conferências Activas"; + $text['label-active_conferences']['fr-fr'] = "Conférences actives"; - $text['title-3']['en-us'] = "Active Conference"; - $text['title-3']['es-cl'] = "Conferencia Activa"; - $text['title-3']['pt-pt'] = "Conferência Activa"; - $text['title-3']['fr-fr'] = "Conférence active"; + $text['button-view_active']['en-us'] = "View Active"; + $text['button-view_active']['es-cl'] = "Ver Activo"; + $text['button-view_active']['pt-pt'] = "Ver Ativo"; + $text['button-view_active']['fr-fr'] = "Voir Active"; - $text['description-2']['en-us'] = "and then select a conference to monitor and interact with it."; - $text['description-2']['es-cl'] = "y luego seleccionar una conferencia para monitorear e interacuar con ella."; - $text['description-2']['pt-pt'] = "e selecione uma conferência para monitorizar e poder interagir."; - $text['description-2']['fr-fr'] = "et ensuite sélectionner la conférence à superviser et à gérer."; + $text['button-view']['en-us'] = "View"; + $text['button-view']['es-cl'] = "Ver"; + $text['button-view']['pt-pt'] = "Ver"; + $text['button-view']['fr-fr'] = "Voir"; $text['table-name']['en-us'] = "Name"; $text['table-name']['es-cl'] = "Nombre"; @@ -198,4 +198,24 @@ $text['description-flags']['pt-pt'] = "Flags opcionais de conferências. Exemplos: mute|deaf|waste|moderator"; $text['description-flags']['fr-fr'] = "Flags Optionnels de la conférence. exemple: mute|deaf|waste|moderator"; + $text['label-true']['en-us'] = "True"; + $text['label-true']['es-cl'] = "Verdadero"; + $text['label-true']['pt-pt'] = "Sim"; + $text['label-true']['fr-fr'] = "Oui"; + + $text['label-false']['en-us'] = "False"; + $text['label-false']['es-cl'] = "Falso"; + $text['label-false']['pt-pt'] = "Não"; + $text['label-false']['fr-fr'] = "Non"; + + $text['label-user_list']['en-us'] = "User List"; + $text['label-user_list']['es-cl'] = "Lista de usuarios"; + $text['label-user_list']['pt-pt'] = "Lista de usuários"; + $text['label-user_list']['fr-fr'] = "Liste des utilisateurs"; + + $text['label-flags']['en-us'] = "Flags"; + $text['label-flags']['es-cl'] = "Banderas"; + $text['label-flags']['pt-pt'] = "Bandeiras"; + $text['label-flags']['fr-fr'] = "Drapeaux"; + ?> \ No newline at end of file diff --git a/app/conferences/conference_edit.php b/app/conferences/conference_edit.php index 693cec3a56..2393fca024 100644 --- a/app/conferences/conference_edit.php +++ b/app/conferences/conference_edit.php @@ -319,37 +319,37 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { require_once "resources/header.php"; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " \n"; echo "\n"; echo "\n"; - if (permission_exists('conference_active_video')) { + if (permission_exists('conference_interactive_video')) { echo "\n"; } echo "\n"; @@ -213,7 +213,7 @@ else { echo "\n"; } echo "\n"; - if (permission_exists('conference_active_video')) { + if (permission_exists('conference_interactive_video')) { if ($flag_has_video == "true") { echo "\n"; } @@ -229,27 +229,27 @@ else { } echo "
\n"; - echo "
"; - echo "
\n"; - echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; + echo "\n"; + echo "".$text['label-conference-add'].""; } if ($action == "update") { - echo "\n"; + echo "".$text['label-conference-edit'].""; } - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "

"; + echo $text['description']; + echo "

"; + echo " \n"; + echo " \n"; echo "\n"; + echo "
"; if ($action == "add") { - echo "".$text['label-conference-add']."".$text['label-conference-edit']."
\n"; - echo "".$text['description']." \n"; - echo "Click on ".$text['title-3']." \n"; - echo "".$text['description-3']."

\n"; - echo "		"; + echo " "; + if (permission_exists('conference_active_view')) { + echo " \n"; + } + echo " \n"; + echo "
\n"; + + echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo ""; - echo " "; + echo " "; echo " "; - echo " "; - echo "
\n"; - echo " ".$text['label-name'].":\n"; + echo "\n"; + echo " ".$text['label-name']."\n"; echo "\n"; + echo "\n"; echo " \n"; echo "
\n"; echo "".$text['description-name']."\n"; @@ -358,7 +358,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; - echo " ".$text['label-extension'].":\n"; + echo " ".$text['label-extension']."\n"; echo "\n"; echo " \n"; @@ -369,7 +369,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; - echo " ".$text['label-pin'].":\n"; + echo " ".$text['label-pin']."\n"; echo "\n"; echo " \n"; @@ -381,7 +381,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (if_group("admin") || if_group("superadmin")) { if ($action == "update") { echo "
User List:".$text['label-user_list'].""; echo " \n"; @@ -410,7 +410,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { $sql .= "and user_enabled = 'true' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); - echo " \n"; echo " \n"; $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); foreach($result as $field) { @@ -429,7 +429,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; - echo " \n"; - echo " \n"; + echo " \n"; - echo " "; + echo "
\n"; + echo " \n"; + echo ""; echo "
\n"; - echo " ".$text['table-profile'].":\n"; + echo " ".$text['table-profile']."\n"; echo "\n"; echo "
\n"; - echo " Flags:\n"; + echo " ".$text['label-flags']."\n"; echo "\n"; echo " \n"; @@ -458,7 +458,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; - echo " ".$text['label-order'].":\n"; + echo " ".$text['label-order']."\n"; echo "\n"; echo "
\n"; - echo " ".$text['table-enabled'].":\n"; + echo " ".$text['table-enabled']."\n"; echo "\n"; echo "
\n"; - echo " ".$text['label-description'].":\n"; + echo " ".$text['label-description']."\n"; echo "\n"; echo " \n"; @@ -514,23 +514,18 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; + echo "
\n"; if ($action == "update") { - echo " \n"; - echo " \n"; + echo " \n"; + echo " \n"; } - echo " \n"; - echo "
"; echo ""; - echo "
"; - echo "
"; - //include the footer require_once "resources/footer.php"; ?> diff --git a/app/conferences/conferences.php b/app/conferences/conferences.php index ad1f20a2f5..bfaae94500 100644 --- a/app/conferences/conferences.php +++ b/app/conferences/conferences.php @@ -47,26 +47,19 @@ else { $order = $_GET["order"]; //show the content - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo ""; - echo "
\n"; - echo "
"; - - echo "\n"; + echo "
\n"; echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; echo "
".$text['title']." 
\n"; - echo " ".$text['description']." \n"; - if (permission_exists('conference_active_advanced_view')) { - echo " Show ".$text['title-2']." ".$text['description-2']."

\n"; + echo " 		".$text['title']."\n"; + if (permission_exists('conference_active_view')) { + echo " \n"; } echo "
\n"; + echo "
\n"; + echo $text['description']; + echo "

\n"; //prepare to page the results if (if_group("superadmin") || if_group("admin")) { @@ -98,9 +91,9 @@ else { $rows_per_page = 10; $param = ""; $page = $_GET['page']; - if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } - list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); - $offset = $rows_per_page * $page; + if (strlen($page) == 0) { $page = 0; $_GET['page'] = 0; } + list($paging_controls, $rows_per_page, $var3) = paging($num_rows, $param, $rows_per_page); + $offset = $rows_per_page * $page; //get the list if (if_group("superadmin") || if_group("admin")) { @@ -127,17 +120,15 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo th_order_by('conference_name', $text['table-name'], $order_by, $order); echo th_order_by('conference_extension', $text['table-extension'], $order_by, $order); echo th_order_by('conference_profile', $text['table-profile'], $order_by, $order); - //echo th_order_by('conference_flags', 'Flags', $order_by, $order); echo th_order_by('conference_order', $text['table-order'], $order_by, $order); echo th_order_by('conference_enabled', $text['table-enabled'], $order_by, $order); echo th_order_by('conference_description', $text['table-description'], $order_by, $order); - echo "\n"; - echo "\n"; + echo "\n"; if ($result_count > 0) { foreach($result as $row) { $conference_name = $row['conference_name']; $conference_name = str_replace("-", " ", $conference_name); - echo "\n"; - echo " \n"; + $tr_link = "href='conference_edit.php?id=".$row['conference_uuid']."'"; + echo "\n"; + echo " \n"; echo " \n"; echo " \n"; - //echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; - echo " \n"; + echo "\n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } } //end foreach @@ -179,7 +170,7 @@ else { echo " \n"; echo " \n"; echo " \n"; - echo " \n"; echo "
\n"; + echo "\n"; if (permission_exists('conference_add')) { echo " $v_link_label_add\n"; } @@ -145,28 +136,28 @@ else { echo "  \n"; } echo "
".$conference_name." 
".$conference_name." ".$row['conference_extension']." ".$row['conference_profile']." ".$row['conference_flags']." ".$row['conference_order']." ".$row['conference_enabled']." ".$text['label-'.$row['conference_enabled']]." ".$row['conference_description']." \n"; + echo " "; if (permission_exists('conference_edit')) { - echo " $v_link_label_edit\n"; + echo "$v_link_label_edit"; } if (permission_exists('conference_delete')) { - echo " $v_link_label_delete\n"; + echo "$v_link_label_delete"; } - echo "
 $paging_controls\n"; + echo " \n"; if (permission_exists('conference_add')) { echo " $v_link_label_add\n"; } @@ -193,14 +184,6 @@ else { echo "
"; - echo "
"; - echo "

"; - echo "

"; - - echo "
"; - echo "
"; echo "

"; //include the footer diff --git a/app/conferences_active/app_config.php b/app/conferences_active/app_config.php index e7e3236968..7909eaa80d 100644 --- a/app/conferences_active/app_config.php +++ b/app/conferences_active/app_config.php @@ -22,52 +22,45 @@ //permission details $apps[$x]['permissions'][0]['name'] = "conference_active_view"; $apps[$x]['permissions'][0]['menu']['uuid'] = "2d857bbb-43b9-b8f7-a138-642868e0453a"; - $apps[$x]['permissions'][0]['menu']['uuid'] = "2d857bbb-43b9-b8f7-a138-642868e0453a"; - $apps[$x]['permissions'][0]['groups'][] = "user"; $apps[$x]['permissions'][0]['groups'][] = "admin"; $apps[$x]['permissions'][0]['groups'][] = "superadmin"; - $apps[$x]['permissions'][2]['name'] = "conference_active_lock"; - $apps[$x]['permissions'][2]['groups'][] = "user"; + $apps[$x]['permissions'][1]['name'] = "conference_interactive_view"; + $apps[$x]['permissions'][1]['groups'][] = "admin"; + $apps[$x]['permissions'][1]['groups'][] = "superadmin"; + + $apps[$x]['permissions'][2]['name'] = "conference_interactive_lock"; $apps[$x]['permissions'][2]['groups'][] = "admin"; $apps[$x]['permissions'][2]['groups'][] = "superadmin"; - $apps[$x]['permissions'][3]['name'] = "conference_active_kick"; - $apps[$x]['permissions'][3]['groups'][] = "user"; + $apps[$x]['permissions'][3]['name'] = "conference_interactive_kick"; $apps[$x]['permissions'][3]['groups'][] = "admin"; $apps[$x]['permissions'][3]['groups'][] = "superadmin"; - $apps[$x]['permissions'][4]['name'] = "conference_active_energy"; + $apps[$x]['permissions'][4]['name'] = "conference_interactive_energy"; //$apps[$x]['permissions'][4]['groups'][] = "user"; //$apps[$x]['permissions'][4]['groups'][] = "admin"; //$apps[$x]['permissions'][4]['groups'][] = "superadmin"; - $apps[$x]['permissions'][5]['name'] = "conference_active_volume"; + $apps[$x]['permissions'][5]['name'] = "conference_interactive_volume"; //$apps[$x]['permissions'][5]['groups'][] = "user"; //$apps[$x]['permissions'][5]['groups'][] = "admin"; //$apps[$x]['permissions'][5]['groups'][] = "superadmin"; - $apps[$x]['permissions'][6]['name'] = "conference_active_gain"; + $apps[$x]['permissions'][6]['name'] = "conference_interactive_gain"; //$apps[$x]['permissions'][6]['groups'][] = "user"; //$apps[$x]['permissions'][6]['groups'][] = "admin"; //$apps[$x]['permissions'][6]['groups'][] = "superadmin"; - $apps[$x]['permissions'][7]['name'] = "conference_active_mute"; - $apps[$x]['permissions'][7]['groups'][] = "user"; + $apps[$x]['permissions'][7]['name'] = "conference_interactive_mute"; $apps[$x]['permissions'][7]['groups'][] = "admin"; $apps[$x]['permissions'][7]['groups'][] = "superadmin"; - $apps[$x]['permissions'][8]['name'] = "conferences_active_deaf"; - $apps[$x]['permissions'][8]['groups'][] = "user"; + $apps[$x]['permissions'][8]['name'] = "conference_interactive_deaf"; $apps[$x]['permissions'][8]['groups'][] = "admin"; $apps[$x]['permissions'][8]['groups'][] = "superadmin"; - $apps[$x]['permissions'][8]['name'] = "conference_active_video"; - $apps[$x]['permissions'][8]['groups'][] = "user"; - $apps[$x]['permissions'][8]['groups'][] = "admin"; - $apps[$x]['permissions'][8]['groups'][] = "superadmin"; - - $apps[$x]['permissions'][9]['name'] = "conference_active_advanced_view"; + $apps[$x]['permissions'][9]['name'] = "conference_interactive_video"; $apps[$x]['permissions'][9]['groups'][] = "admin"; $apps[$x]['permissions'][9]['groups'][] = "superadmin"; diff --git a/app/conferences_active/app_menu.php b/app/conferences_active/app_menu.php index a85c301523..4697486daf 100644 --- a/app/conferences_active/app_menu.php +++ b/app/conferences_active/app_menu.php @@ -16,6 +16,5 @@ $apps[$x]['menu'][0]['path'] = "/app/conferences_active/conferences_active.php"; $apps[$x]['menu'][0]['groups'][] = "admin"; $apps[$x]['menu'][0]['groups'][] = "superadmin"; - $apps[$x]['menu'][0]['groups'][] = "user"; ?> \ No newline at end of file diff --git a/app/conferences_active/conference_interactive.php b/app/conferences_active/conference_interactive.php index 003033eda0..24e0e0878e 100644 --- a/app/conferences_active/conference_interactive.php +++ b/app/conferences_active/conference_interactive.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conference_active_view')) { +if (permission_exists('conference_interactive_view')) { //access granted } else { @@ -111,23 +111,21 @@ var record_count = 0; "; -echo "\n"; +echo "
\n"; echo " \n"; -echo " \n"; echo " \n"; -echo "
".$text['label-interactive']."
\n"; +echo " 		"; +echo " ".$text['label-interactive']."

\n"; echo " ".$text['description-interactive']."\n"; echo "
\n"; -echo "\n"; -echo " \n"; +echo " \n"; echo " "; echo " "; echo "
\n"; +echo "
\n"; echo "
\n"; echo "
".date('Y-m-d-s')."
\n"; echo "
"; -echo ""; //show the header require_once "resources/footer.php"; diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php index a86457eb8f..6c69e6be5e 100644 --- a/app/conferences_active/conference_interactive_inc.php +++ b/app/conferences_active/conference_interactive_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conference_active_view')) { +if (permission_exists('conference_interactive_view')) { //access granted } else { @@ -120,7 +120,7 @@ else { echo "  "; - if (permission_exists('conference_active_lock')) { + if (permission_exists('conference_interactive_lock')) { if ($locked == "true") { echo " \n"; } @@ -153,7 +153,7 @@ else { echo "
".$text['label-speak']."".$text['label-talking']."".$text['label-last-talk']."".$text['label-video']."".$text['label-floor']."".$text['label-no']."$last_talking_formatted".$text['label-yes']."\n"; //energy - if (permission_exists('conference_active_energy')) { + if (permission_exists('conference_interactive_energy')) { echo " \n"; echo " \n"; //echo " +".$text['label-energy']." \n"; //echo " -".$text['label-energy']." \n"; } //volume - if (permission_exists('conference_active_volume')) { + if (permission_exists('conference_interactive_volume')) { echo " \n"; echo " \n"; //echo " +".$text['label-volume']." \n"; //echo " -".$text['label-volume']." \n"; } - if (permission_exists('conference_active_gain')) { + if (permission_exists('conference_interactive_gain')) { echo " \n"; echo " \n"; //echo " +".$text['label-gain']." \n"; //echo " -".$text['label-gain']." \n"; } //mute and unmute - if (permission_exists('conference_active_mute')) { + if (permission_exists('conference_interactive_mute')) { if ($flag_can_speak == "true") { echo " \n"; //echo " ".$text['label-mute']." \n"; @@ -260,7 +260,7 @@ else { } } //deaf and undeaf - if (permission_exists('conferences_active_deaf')) { + if (permission_exists('conference_interactive_deaf')) { if ($flag_can_hear == "true") { echo " \n"; //echo " ".$text['label-deaf']." \n"; @@ -271,7 +271,7 @@ else { } } //kick someone from the conference - if (permission_exists('conference_active_kick')) { + if (permission_exists('conference_interactive_kick')) { echo " \n"; //echo " ".$text['label-kick']." \n"; } @@ -282,5 +282,6 @@ else { if ($c==0) { $c=1; } else { $c=0; } } echo "
\n"; + echo "

"; } ?> \ No newline at end of file diff --git a/app/conferences_active/conferences_active.php b/app/conferences_active/conferences_active.php index f9c89b0042..7625ce56e2 100644 --- a/app/conferences_active/conferences_active.php +++ b/app/conferences_active/conferences_active.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conference_active_advanced_view')) { +if (permission_exists('conference_active_view')) { //access granted } else { @@ -91,27 +91,20 @@ else if (window.attachEvent) { "; - -echo "\n"; +echo "
\n"; echo " \n"; -echo " \n"; echo " \n"; echo "
".$text['label-active']."
\n"; +echo " 		".$text['label-active']."

\n"; echo " ".$text['description-active']."\n"; echo "
\n"; +echo "
\n"; -echo "\n"; -echo "\n"; -echo " "; -echo " "; +echo "
\n"; - -echo "
\n"; -echo "
\n"; - -echo "
\n"; +echo "\n"; +echo " "; +echo ""; echo "
"; -echo "
"; require_once "resources/footer.php"; ?> diff --git a/app/conferences_active/conferences_active_inc.php b/app/conferences_active/conferences_active_inc.php index ba6caf4086..d947d01543 100644 --- a/app/conferences_active/conferences_active_inc.php +++ b/app/conferences_active/conferences_active_inc.php @@ -27,7 +27,7 @@ include "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; -if (permission_exists('conference_active_advanced_view')) { +if (permission_exists('conference_active_view')) { //access granted } else { @@ -68,7 +68,7 @@ else { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -83,8 +83,9 @@ else { //show the conferences that have a matching domain $tmp_domain = substr($name, -strlen($_SESSION['domain_name'])); if ($tmp_domain == $_SESSION['domain_name']) { - $meeting_uuid = substr($name, 0, strlen($name) - strlen('-'.$_SESSION['domain_name'])); - if (is_uuid($meeting_uuid)) { + $conference_name = substr($name, 0, strlen($name) - strlen('-'.$_SESSION['domain_name'])); + if (is_uuid($conference_name)) { + $meeting_uuid = $conference_name; $sql = "select "; $sql .= "cr.conference_room_name, "; $sql .= "v.participant_pin "; @@ -93,27 +94,52 @@ else { $sql .= "v_conference_rooms as cr "; $sql .= "where "; $sql .= "v.meeting_uuid = cr.meeting_uuid "; - $sql .= "and v.meeting_uuid = '".$meeting_uuid."' "; + $sql .= "and v.meeting_uuid = '".$conference_name."' "; $prep_statement = $db->prepare(check_sql($sql)); $prep_statement->execute(); $result = $prep_statement->fetchAll(); foreach ($result as $row2) { - $conference_room_name = $row2['conference_room_name']; + $conference_name = $row2['conference_room_name']; $participant_pin = $row2['participant_pin']; } - unset ($prep_statement); + unset ($prep_statement, $row2); + } + else { + $meeting_uuid = $conference_name; + $sql = "select "; + $sql .= "conference_pin_number "; + $sql .= "from "; + $sql .= "v_conferences "; + $sql .= "where "; + $sql .= "domain_uuid = '".$_SESSION['domain_uuid']."' "; + $sql .= "and conference_name = '".$conference_name."' "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + $result = $prep_statement->fetchAll(); + foreach ($result as $row3) { + $participant_pin = $row3['conference_pin_number']; + } + unset ($prep_statement, $row3); } + if (permission_exists('conference_interactive_view')) { + $td_onclick = "onclick=\"document.location.href='conference_interactive.php?c=".$meeting_uuid."'\""; + } echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; if ($c==0) { $c=1; } else { $c=0; } } } echo "
".$text['label-name']."".$text['label-participant-pin']."
".$conference_room_name."".$participant_pin."".$member_count."".$text['button-view'].""; + echo (permission_exists('conference_interactive_view')) ? "".$conference_name."" : $conference_name; + echo "".$participant_pin."".$member_count.""; + echo (permission_exists('conference_interactive_view')) ? "".$text['button-view']."" : " "; + echo "
\n"; + echo "

"; } ?> \ No newline at end of file