diff --git a/app/conference_centers/app_languages.php b/app/conference_centers/app_languages.php
index b2b926cd14..3d5be3fd24 100644
--- a/app/conference_centers/app_languages.php
+++ b/app/conference_centers/app_languages.php
@@ -62,7 +62,7 @@
$text['label-announce']['en-us'] = 'Announce';
$text['label-announce']['pt-pt'] = '';
- $text['label-mute']['en-us'] = 'Mute';
+ $text['label-mute']['en-us'] = 'Mute on Entry';
$text['label-mute']['pt-pt'] = '';
$text['label-enabled']['en-us'] = 'Enabled';
@@ -117,7 +117,7 @@
$text['label-users']['en-us'] = 'Users';
$text['label-users']['pt-pt'] = '';
- $text['description-users']['en-us'] = 'Assign additional users to the conference room.';
+ $text['description-users']['en-us'] = 'Assign additional users as administrators of this conference room.';
$text['description-users']['pt-pt'] = '';
$text['button-add']['en-us'] = 'Add';
diff --git a/app/conference_centers/conference_rooms.php b/app/conference_centers/conference_rooms.php
index 668efbff0d..0c79e77b56 100644
--- a/app/conference_centers/conference_rooms.php
+++ b/app/conference_centers/conference_rooms.php
@@ -285,12 +285,12 @@ else {
echo " \n";
echo " \n";
- echo " | ";
+ echo " | ";
echo " ".$row['description']."\n";
echo " \n";
echo " | \n";
- echo " \n";
+ echo " | \n";
if (permission_exists('conference_room_edit')) {
echo " $v_link_label_edit\n";
}
diff --git a/app/conferences_active/app_config.php b/app/conferences_active/app_config.php
index c354ee6797..4b68554bff 100644
--- a/app/conferences_active/app_config.php
+++ b/app/conferences_active/app_config.php
@@ -35,6 +35,7 @@
$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';
//permission details
$apps[$x]['permissions'][0]['name'] = 'conferences_active_view';
diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php
index 892c87d067..cacd200719 100644
--- a/app/conferences_active/conference_interactive_inc.php
+++ b/app/conferences_active/conference_interactive_inc.php
@@ -42,44 +42,10 @@ else {
}
//get the http get or post and set it as php variables
- $conference_name = check_str($_REQUEST["c"]);
-
-//determine if the user should have access to the conference room
- if (if_group("superadmin") || if_group("admin")) {
- //access granted
- }
- else {
- //get the conference_uuid from the coference_name
- $sql = "select conference_uuid from v_conferences ";
- $sql .= "where conference_name = '".$conference_name."' ";
- $sql .= "and domain_uuid = '".$_SESSION['domain_uuid']."' ";
- $prep_statement = $db->prepare($sql);
- if ($prep_statement) {
- $prep_statement->execute();
- $row = $prep_statement->fetch(PDO::FETCH_ASSOC);
- $conference_uuid = $row['conference_uuid'];
- }
-
- //show only assigned extensions
- $sql = "select count(*) as num_rows from v_conferences as c, v_conference_users as u ";
- $sql .= "where c.conference_uuid = u.conference_uuid ";
- $sql .= "and c.conference_uuid = '".$conference_uuid."' ";
- $sql .= "and c.domain_uuid = '".$_SESSION['domain_uuid']."' ";
- $sql .= "and u.user_uuid = '".$_SESSION['user_uuid']."' ";
- if (strlen($order_by)> 0) { $sql .= "order by $order_by $order "; }
- $prep_statement = $db->prepare($sql);
- if ($prep_statement) {
- $prep_statement->execute();
- $row = $prep_statement->fetch(PDO::FETCH_ASSOC);
- if ($row['num_rows'] == 0) {
- echo $text['message-denied'];
- exit;
- }
- }
- }
+ $conference_uuid = check_str($_REQUEST["c"]);
//replace the space with underscore
- $conference_name = $conference_name.'-'.$_SESSION['domain_name'];
+ $conference_name = $conference_uuid.'-'.$_SESSION['domain_name'];
//create the conference list command
$switch_cmd = "conference '".$conference_name."' xml_list";
@@ -113,6 +79,19 @@ else {
$member_count = $xml->conference['member-count'];
$locked = $xml->conference['locked'];
$recording = $xml->conference['recording'];
+ if (strlen($member_count) == 0) {
+ $member_count = 0;
+ }
+
+ //get mute_all
+ $mute_all = "true";
+ foreach ($xml->conference->members->member as $row) {
+ if ($row->flags->is_moderator == "false") {
+ if ($row->flags->can_speak == "true") {
+ $mute_all = "false";
+ }
+ }
+ }
$c = 0;
$row_style["0"] = "row_style0";
@@ -124,15 +103,14 @@ else {
echo "\n";
echo "\n";
echo "| \n";
- echo " Members: $member_count\n";
+ echo " \n";
+ echo " Members: ".$member_count."\n";
+ echo " \n";
echo " | \n";
echo "\n";
echo " \n";
echo " | \n";
echo "\n";
- if (permission_exists('conferences_active_record') || permission_exists('conferences_active_lock')) {
- //echo " ".$text['label-tools'].": \n";
- }
$recording_dir = $_SESSION['switch']['recordings']['dir'].'/archive/'.date("Y").'/'.date("M").'/'.date("d");
$recording_name = '';
@@ -151,21 +129,20 @@ else {
}
if (permission_exists('conferences_active_lock')) {
if ($locked == "true") {
- //echo " ".$text['label-unlock']." \n";
echo " \n";
-
}
else {
- //echo " ".$text['label-lock']." \n";
echo " \n";
-
}
}
- //echo " ".$text['label-mute-all']." \n";
- echo " \n";
+ if ($mute_all == "true") {
+ echo " \n";
+ }
+ else {
+ echo " \n";
+ }
- //echo " ".$text['label-end-conference']." \n";
echo " \n";
echo " | \n";
diff --git a/includes/templates/conf/autoload_configs/conference.conf.xml b/includes/templates/conf/autoload_configs/conference.conf.xml
index 1c37fc236b..216c3dcb47 100644
--- a/includes/templates/conf/autoload_configs/conference.conf.xml
+++ b/includes/templates/conf/autoload_configs/conference.conf.xml
@@ -10,32 +10,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -44,8 +44,8 @@
@@ -123,7 +123,7 @@
-
+
diff --git a/includes/templates/conf/sip_profiles/internal.xml b/includes/templates/conf/sip_profiles/internal.xml
index 3e6169f5eb..9ffa1cfea8 100644
--- a/includes/templates/conf/sip_profiles/internal.xml
+++ b/includes/templates/conf/sip_profiles/internal.xml
@@ -246,7 +246,7 @@
Used as the public IP address for SDP.
Can be an one of:
ip address - "12.34.56.78"
- a stun server lookup - "stun:stun.server.com"
+ a stun server lookup - "stun:stun.freeswitch.org"
a DNS name - "host:host.server.com"
auto - Use guessed ip.
auto-nat - Use ip learned from NAT-PMP or UPNP
diff --git a/includes/templates/conf/vars.xml b/includes/templates/conf/vars.xml
index 3db9cb28ce..ab3fa644d1 100644
--- a/includes/templates/conf/vars.xml
+++ b/includes/templates/conf/vars.xml
@@ -147,7 +147,7 @@
|