dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests 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
app/conferences_active/conferences_active_inc.php
+37 -11
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 />";
}
?>