dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add title to 'Mute All' so that however displays 'Mute all but moderator'. Fix the lock button label on the active conferences.

This commit is contained in:
Mark Crane 2013-02-02 06:32:40 +00:00
parent c7ad809ed1
commit b80c2912eb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/conferences_active/app_languages.php
View File

@ -88,6 +88,8 @@
$text['label-mute-all']['en-us'] = 'Mute All'; $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-unmute-all']['en-us'] = 'Unmute All';
$text['label-end-conference']['en-us'] = 'End Conference'; $text['label-end-conference']['en-us'] = 'End Conference';

3
app/conferences_active/conference_exec.php
View File

@ -133,7 +133,6 @@ else {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $switch_result = event_socket_request($fp, 'api '.$switch_cmd);
} }
elseif ($data == "mute" || $data == "unmute" || $data == "mute non_moderator" || $data == "unmute non_moderator") { elseif ($data == "mute" || $data == "unmute" || $data == "mute non_moderator" || $data == "unmute non_moderator") {
echo "hi -- ";
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $switch_result = event_socket_request($fp, 'api '.$switch_cmd);
} }
elseif ($data == "deaf" || $data == "undeaf" ) { elseif ($data == "deaf" || $data == "undeaf" ) {
@ -142,7 +141,7 @@ else {
elseif ($data == "lock" || $data == "unlock" ) { elseif ($data == "lock" || $data == "unlock" ) {
$switch_result = event_socket_request($fp, 'api '.$switch_cmd); $switch_result = event_socket_request($fp, 'api '.$switch_cmd);
} }
echo "command: ".$switch_cmd." result: ".$switch_result."<br\n>"; //echo "command: ".$switch_cmd." result: ".$switch_result."<br\n>";
} }
} }
} }

9
app/conferences_active/conference_interactive_inc.php
View File

@ -157,13 +157,13 @@ else {
} }
else { else {
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=lock');\">".$text['label-lock']."</a>&nbsp;\n"; //echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=lock');\">".$text['label-lock']."</a>&nbsp;\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=mute+non_moderator');\" value='".$text['label-mute-all']."'>\n"; echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=lock');\" value='".$text['label-lock']."'>\n";
} }
} }
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=mute+non_moderator');\">".$text['label-mute-all']."</a>&nbsp;\n"; //echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=mute+non_moderator');\">".$text['label-mute-all']."</a>&nbsp;\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=mute+non_moderator');\" value='".$text['label-mute-all']."'>\n"; echo " <input type='button' class='btn' title=\"".$text['label-mute-all-alt']."\" onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=mute+non_moderator');\" value='".$text['label-mute-all']."'>\n";
//echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=kick+all');\">".$text['label-end-conference']."</a>&nbsp;\n"; //echo " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=kick+all');\">".$text['label-end-conference']."</a>&nbsp;\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=kick+all');\" value='".$text['label-end-conference']."'>\n"; echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=kick+all');\" value='".$text['label-end-conference']."'>\n";
@ -188,6 +188,7 @@ else {
echo "</tr>\n"; echo "</tr>\n";
foreach ($xml->conference->members->member as $row) { foreach ($xml->conference->members->member as $row) {
$id = $row->id; $id = $row->id;
$record_path = $row->record_path; $record_path = $row->record_path;
$flag_can_hear = $row->flags->can_hear; $flag_can_hear = $row->flags->can_hear;
@ -204,8 +205,8 @@ else {
$caller_id_number = $row->caller_id_number; $caller_id_number = $row->caller_id_number;
//format the seconds //format the seconds
$join_time_formatted = floor($join_time/60)."' ".($join_time - (floor($join_time/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 = floor($last_talking/60)."' ".($last_talking - (floor($last_talking/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) { if (strlen($record_path) == 0) {
echo "<tr>\n"; echo "<tr>\n";