nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Conferences: Visual adjustments, fixed Active Conferences links.

Browse Source 
Active Conferences: Reworked/renamed permissions, removed Active Conference from the User's menu (addressing Issue 662), misc visual adjustments.
Conference Center: Misc visual adjustments.
This commit is contained in:
Nate Jones
2015-02-12 02:09:59 +00:00
parent 9342d0386e
commit 18589125d3
11 changed files with 181 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/conferences_active/app_config.php
View File

@@ -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";

1
app/conferences_active/app_menu.php
View File

@@ -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";
?>

14
app/conferences_active/conference_interactive.php
View File

@@ -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;
</script>
<?php
echo "<div align='center'>";
echo "<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo " <tr>\n";
echo " <td align='left'><b>".$text['label-interactive']."</b><br>\n";
echo " <td align='left'>";
echo " <b>".$text['label-interactive']."</b><br><br>\n";
echo " ".$text['description-interactive']."\n";
echo " </td>\n";
echo " </tr>\n";
echo "</table>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
echo " <tr class='border'>\n";
echo " <tr>\n";
echo " <td align=\"left\">\n";
echo " <br>\n";
echo " <div id=\"ajax_reponse\"></div>\n";
echo " <div id=\"time_stamp\" style=\"visibility:hidden\">".date('Y-m-d-s')."</div>\n";
echo " </td>";
echo " </tr>";
echo "</table>";
echo "</div>";
//show the header
require_once "resources/footer.php";

21
app/conferences_active/conference_interactive_inc.php
View File

@@ -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 "<img src='resources/images/".(($recording == "true") ? "recording.png" : "not_recording.png")."' style='width: 16px; height: 16px; border: none;' align='absmiddle' title=\"".$text['label-'.(($recording == "true") ? 'recording' : 'not-recording')]."\">&nbsp;&nbsp;";
if (permission_exists('conference_active_lock')) {
if (permission_exists('conference_interactive_lock')) {
if ($locked == "true") {
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=unlock');\" value='".$text['label-unlock']."'>\n";
}
@@ -153,7 +153,7 @@ else {
echo "<th>".$text['label-speak']."</th>\n";
echo "<th>".$text['label-talking']."</th>\n";
echo "<th>".$text['label-last-talk']."</th>\n";
if (permission_exists('conference_active_video')) {
if (permission_exists('conference_interactive_video')) {
echo "<th>".$text['label-video']."</th>\n";
}
echo "<th>".$text['label-floor']."</th>\n";
@@ -213,7 +213,7 @@ else {
echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-no']."</td>\n";
}
echo "<td valign='top' class='".$row_style[$c]."'>$last_talking_formatted</td>\n";
if (permission_exists('conference_active_video')) {
if (permission_exists('conference_interactive_video')) {
if ($flag_has_video == "true") {
echo "<td valign='top' class='".$row_style[$c]."'>".$text['label-yes']."</td>\n";
}
@@ -229,27 +229,27 @@ else {
}
echo "<td valign='top' class='".$row_style[$c]."' style='text-align:right;'>\n";
//energy
if (permission_exists('conference_active_energy')) {
if (permission_exists('conference_interactive_energy')) {
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".$conference_name."&data=energy&id=".$id."');\" value='+".$text['label-energy']."'>\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".$conference_name."&data=energy&id=".$id."');\" value='-".$text['label-energy']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".$conference_name."&data=energy&id=".$id."');\">+".$text['label-energy']."</a>&nbsp;\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".$conference_name."&data=energy&id=".$id."');\">-".$text['label-energy']."</a>&nbsp;\n";
}
//volume
if (permission_exists('conference_active_volume')) {
if (permission_exists('conference_interactive_volume')) {
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".$conference_name."%&data=volume_in&id=".$id."');\" value='+".$text['label-volume']."'>\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".$conference_name."&data=volume_in&id=".$id."');\" value='-".$text['label-volume']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".$conference_name."%&data=volume_in&id=".$id."');\">+".$text['label-volume']."</a>&nbsp;\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".$conference_name."&data=volume_in&id=".$id."');\">-".$text['label-volume']."</a>&nbsp;\n";
}
if (permission_exists('conference_active_gain')) {
if (permission_exists('conference_interactive_gain')) {
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".$conference_name."&data=volume_out&id=".$id."');\" value='+".$text['label-gain']."'>\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".$conference_name."&data=volume_out&id=".$id."');\" value='-".$text['label-gain']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?direction=up&cmd=conference&name=".$conference_name."&data=volume_out&id=".$id."');\">+".$text['label-gain']."</a>&nbsp;\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?direction=down&cmd=conference&name=".$conference_name."&data=volume_out&id=".$id."');\">-".$text['label-gain']."</a>&nbsp;\n";
}
//mute and unmute
if (permission_exists('conference_active_mute')) {
if (permission_exists('conference_interactive_mute')) {
if ($flag_can_speak == "true") {
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=mute&id=".$id."');\" value='".$text['label-mute']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('');\">".$text['label-mute']."</a>&nbsp;\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 " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=deaf&id=".$id."');\" value='".$text['label-deaf']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=deaf&id=".$id."');\">".$text['label-deaf']."</a>&nbsp;\n";
@@ -271,7 +271,7 @@ else {
}
}
//kick someone from the conference
if (permission_exists('conference_active_kick')) {
if (permission_exists('conference_interactive_kick')) {
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=kick&id=".$id."&uuid=".$uuid."');\" value='".$text['label-kick']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=kick&id=".$id."&uuid=".$uuid."');\">".$text['label-kick']."</a>&nbsp;\n";
}
@@ -282,5 +282,6 @@ else {
if ($c==0) { $c=1; } else { $c=0; }
}
echo "</table>\n";
echo "<br /><br />";
}
?>

23
app/conferences_active/conferences_active.php
View File

@@ -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) {
</script>
<?php
echo "<div align='center'>";
echo "<table width=\"100%\" border=\"0\" cellpadding=\"6\" cellspacing=\"0\">\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo " <tr>\n";
echo " <td align='left'><b>".$text['label-active']."</b><br>\n";
echo " <td align='left'><b>".$text['label-active']."</b><br><br>\n";
echo " ".$text['description-active']."\n";
echo " </td>\n";
echo " </tr>\n";
echo "</table>\n";
echo "<br>\n";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='2'>\n";
echo "<tr class='border'>\n";
echo " <td align=\"left\">\n";
echo " <div id=\"ajax_reponse\">\n";
echo " </div>\n";
echo " </td>";
echo " </tr>";
echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo " <td align=\"left\"><div id=\"ajax_reponse\"></div></td>";
echo "</tr>";
echo "</table>";
echo "</div>";
require_once "resources/footer.php";
?>

48
app/conferences_active/conferences_active_inc.php
View File

@@ -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 "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<table class='tr_hover' width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<th>".$text['label-name']."</th>\n";
echo "<th>".$text['label-participant-pin']."</th>\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 "<tr>\n";
echo "<td valign='top' class='".$row_style[$c]."'><a href='conference_interactive.php?c=".$meeting_uuid."'>".$conference_room_name."</a></td>\n";
echo "<td valign='top' class='".$row_style[$c]."'>".$participant_pin."</td>\n";
echo "<td valign='top' class='".$row_style[$c]."'>".$member_count."</td>\n";
echo "<td valign='top' class='".$row_style[$c]."'><a href='conference_interactive.php?c=".$meeting_uuid."'>".$text['button-view']."</a></td>\n";
echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">";
echo (permission_exists('conference_interactive_view')) ? "<a href='conference_interactive.php?c=".$meeting_uuid."'>".$conference_name."</a>" : $conference_name;
echo "</td>\n";
echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$participant_pin."</td>\n";
echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">".$member_count."</td>\n";
echo "<td valign='top' class='".$row_style[$c]."' ".$td_onclick.">";
echo (permission_exists('conference_interactive_view')) ? "<a href='conference_interactive.php?c=".$meeting_uuid."'>".$text['button-view']."</a>" : "&nbsp;";
echo "</td>\n";
echo "</tr>\n";
if ($c==0) { $c=1; } else { $c=0; }
}
}
echo "</table>\n";
echo "<br /><br />";
}
?>