nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-10 10:38:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve some of the text in conference center. Toggle mute all with unmute all. A few other minor adjustments.

Browse Source
This commit is contained in:
Mark Crane
2013-02-02 09:54:20 +00:00
parent c1c611adb6
commit 5d1a7374cb
7 changed files with 61 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/conference_centers/app_languages.php
View File

@@ -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';

4
app/conference_centers/conference_rooms.php
View File

@@ -285,12 +285,12 @@ else {
echo "  \n";
echo " </td>\n";
echo " <td valign='middle' class='row_stylebg' width='20%' nowrap='nowrap'>";
echo " <td valign='middle' class='row_stylebg' width='20%'>";
echo " ".$row['description']."\n";
echo " &nbsp;\n";
echo " </td>\n";
echo " <td valign='top' align='right'>\n";
echo " <td valign='top' align='right' nowrap='nowrap'>\n";
if (permission_exists('conference_room_edit')) {
echo " <a href='conference_room_edit.php?id=".$row['conference_room_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
}

1
app/conferences_active/app_config.php
View File

@@ -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';

71
app/conferences_active/conference_interactive_inc.php
View File

@@ -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 "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
echo "<tr>\n";
echo "<td colspan='3' >\n";
echo " <strong>Members: $member_count</strong>\n";
echo " <strong>\n";
echo " Members: ".$member_count."\n";
echo " </strong>\n";
echo "</td>\n";
echo "<td colspan='2'>\n";
echo " &nbsp;\n";
echo "</td>\n";
echo "<td colspan='7' align='right'>\n";
if (permission_exists('conferences_active_record') || permission_exists('conferences_active_lock')) {
//echo " <strong>".$text['label-tools'].":</strong> \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 " <a href='javascript:void(0);' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=unlock');\">".$text['label-unlock']."</a>&nbsp;\n";
echo " <input type='button' class='btn' onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=unlock');\" value='".$text['label-unlock']."'>\n";
}
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 " <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 " <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";
if ($mute_all == "true") {
echo " <input type='button' class='btn' title=\"".$text['label-mute-all-alt']."\" onclick=\"send_cmd('conference_exec.php?cmd=conference&name=".$conference_name."&data=unmute+non_moderator');\" value='".$text['label-unmute-all']."'>\n";
}
else {
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 " <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 "</td>\n";

58
includes/templates/conf/autoload_configs/conference.conf.xml
View File

@@ -10,32 +10,32 @@
<!-- Note: none and default are reserved names for group names. Disabled if dist-dtmf member flag is set. -->
<caller-controls>
<group name="default">
<control action="mute" digits=""/>
<control action="deaf mute" digits=""/>
<control action="energy up" digits="9"/>
<control action="energy equ" digits="8"/>
<control action="energy dn" digits="7"/>
<control action="vol talk up" digits="3"/>
<control action="vol talk zero" digits="2"/>
<control action="vol talk dn" digits="1"/>
<control action="vol listen up" digits="6"/>
<control action="vol listen zero" digits="5"/>
<control action="vol listen dn" digits="4"/>
<control action="hangup" digits=""/>
</group>
<group name="moderator">
<control action="mute" digits="#"/>
<control action="deaf mute" digits="*"/>
<control action="energy up" digits="9"/>
<control action="energy equ" digits="8"/>
<control action="energy dn" digits="7"/>
<control action="vol talk up" digits="3"/>
<control action="vol talk zero" digits="2"/>
<control action="vol talk dn" digits="1"/>
<control action="vol listen up" digits="6"/>
<control action="vol listen zero" digits="5"/>
<control action="vol listen dn" digits="4"/>
<control action="hangup" digits=""/>
<control action="mute" digits=""/>
<control action="deaf mute" digits=""/>
<control action="energy up" digits="9"/>
<control action="energy equ" digits="8"/>
<control action="energy dn" digits="7"/>
<control action="vol talk up" digits="3"/>
<control action="vol talk zero" digits="2"/>
<control action="vol talk dn" digits="1"/>
<control action="vol listen up" digits="6"/>
<control action="vol listen zero" digits="5"/>
<control action="vol listen dn" digits="4"/>
<control action="hangup" digits=""/>
</group>
<group name="moderator">
<control action="mute" digits="#"/>
<control action="deaf mute" digits="*"/>
<control action="energy up" digits="9"/>
<control action="energy equ" digits="8"/>
<control action="energy dn" digits="7"/>
<control action="vol talk up" digits="3"/>
<control action="vol talk zero" digits="2"/>
<control action="vol talk dn" digits="1"/>
<control action="vol listen up" digits="6"/>
<control action="vol listen zero" digits="5"/>
<control action="vol listen dn" digits="4"/>
<control action="hangup" digits=""/>
</group>
</caller-controls>
@@ -44,8 +44,8 @@
<!--If no profile is specified it will default to "default"-->
<profile name="default">
<!-- Directory to drop CDR's
'auto' means $PREFIX/logs/conference_cdr/<confernece_uuid>.cdr.xml
a non-absolute path means $PREFIX/logs/<value>/<confernece_uuid>.cdr.xml
'auto' means $PREFIX/logs/conference_cdr/<conference_uuid>.cdr.xml
a non-absolute path means $PREFIX/logs/<value>/<conference_uuid>.cdr.xml
absolute path means <value>/<conference_uuid>.cdr.xml
-->
<param name="cdr-log-dir" value="auto"/>
@@ -123,7 +123,7 @@
<!-- enable comfort noise generation -->
<param name="comfort-noise" value="true"/>
<!-- Uncomment auto-record to toggle recording every conference call. -->
<!-- Another valid value is shout://user:pass@server.com/live.mp3 -->
<!-- Another valid value is shout://user:pass@server.com/live.mp3 -->
<!--
<param name="auto-record" value="$${recordings_dir}/${conference_name}_${strftime(%Y-%m-%d-%H-%M-%S)}.wav"/>
-->

2
includes/templates/conf/sip_profiles/internal.xml
View File

@@ -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

4
includes/templates/conf/vars.xml
View File

@@ -147,7 +147,7 @@
<!-- external_rtp_ip
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"
where fs.mydomain.com is a DNS A record-useful when fs is on
a dynamic IP address, and uses a dynamic DNS updater.
@@ -160,7 +160,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"
where fs.mydomain.com is a DNS A record-useful when fs is on
a dynamic IP address, and uses a dynamic DNS updater.