Conferences: Visual adjustments, fixed Active Conferences links.
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:
@@ -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>" : " ";
|
||||
echo "</td>\n";
|
||||
echo "</tr>\n";
|
||||
|
||||
if ($c==0) { $c=1; } else { $c=0; }
|
||||
}
|
||||
}
|
||||
echo "</table>\n";
|
||||
echo "<br /><br />";
|
||||
}
|
||||
?>
|
||||
Reference in New Issue
Block a user