diff --git a/app/conferences_active/app_languages.php b/app/conferences_active/app_languages.php
index ba3dc113e7..0961c46c0e 100644
--- a/app/conferences_active/app_languages.php
+++ b/app/conferences_active/app_languages.php
@@ -88,6 +88,8 @@
$text['label-mute-all']['en-us'] = 'Mute All';
+ $text['label-mute-all-alt']['en-us'] = 'Mute all but moderator.';
+
$text['label-unmute-all']['en-us'] = 'Unmute All';
$text['label-end-conference']['en-us'] = 'End Conference';
diff --git a/app/conferences_active/conference_exec.php b/app/conferences_active/conference_exec.php
index c5b4f1cdff..a2d3d155e3 100644
--- a/app/conferences_active/conference_exec.php
+++ b/app/conferences_active/conference_exec.php
@@ -133,7 +133,6 @@ else {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
elseif ($data == "mute" || $data == "unmute" || $data == "mute non_moderator" || $data == "unmute non_moderator") {
- echo "hi -- ";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
elseif ($data == "deaf" || $data == "undeaf" ) {
@@ -142,7 +141,7 @@ else {
elseif ($data == "lock" || $data == "unlock" ) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd);
}
- echo "command: ".$switch_cmd." result: ".$switch_result."
";
+ //echo "command: ".$switch_cmd." result: ".$switch_result."
";
}
}
}
diff --git a/app/conferences_active/conference_interactive_inc.php b/app/conferences_active/conference_interactive_inc.php
index 4964e7c574..892c87d067 100644
--- a/app/conferences_active/conference_interactive_inc.php
+++ b/app/conferences_active/conference_interactive_inc.php
@@ -157,13 +157,13 @@ else {
}
else {
//echo " ".$text['label-lock']." \n";
- echo " \n";
+ echo " \n";
}
}
//echo " ".$text['label-mute-all']." \n";
- echo " \n";
+ echo " \n";
//echo " ".$text['label-end-conference']." \n";
echo " \n";
@@ -188,6 +188,7 @@ else {
echo "\n";
foreach ($xml->conference->members->member as $row) {
+
$id = $row->id;
$record_path = $row->record_path;
$flag_can_hear = $row->flags->can_hear;
@@ -204,8 +205,8 @@ else {
$caller_id_number = $row->caller_id_number;
//format the seconds
- $join_time_formatted = floor($join_time/60)."' ".($join_time - (floor($join_time/60))*60)."\"";
- $last_talking_formatted = floor($last_talking/60)."' ".($last_talking - (floor($last_talking/60))*60)."\"";
+ $join_time_formatted = sprintf("%02s", floor($join_time/3600)).":".sprintf("%02s",floor($join_time/60)).":".sprintf("%02s",($join_time - (floor($join_time/60))*60));
+ $last_talking_formatted = sprintf("%02s",floor($last_talking/3600)).":".sprintf("%02s",floor($last_talking/60)).":".sprintf("%02s",($last_talking - (floor($last_talking/60))*60));
if (strlen($record_path) == 0) {
echo "