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

Remove conference center profile and move the profile to the conference room.

Browse Source
This commit is contained in:
Mark Crane
2012-10-13 23:17:59 +00:00
parent a372b64fb2
commit 9223ab435e
5 changed files with 34 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/conference_centers/app_config.php
+8 -4
View File
@@ -131,10 +131,6 @@
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the conference center extension number.'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the conference center extension number.';
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_profile';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference Profile is a collection of settings for the conference.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_description'; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'conference_center_description';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the center description.'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Enter the center description.';
@@ -170,6 +166,10 @@
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Meeting UUID'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Meeting UUID';
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'profile';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select the conference profile.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'record'; $apps[$x]['db'][$y]['fields'][$z]['name']['text'] = 'record';
$apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'recording'; $apps[$x]['db'][$y]['fields'][$z]['name']['deprecated'] = 'recording';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
@@ -233,6 +233,10 @@
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)'; $apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'meeting_uuid'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'meeting_uuid';
$z++; $z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'profile';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Select the conference profile.';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'recording'; $apps[$x]['db'][$y]['fields'][$z]['name'] = 'recording';
$apps[$x]['db'][$y]['fields'][$z]['type'] = 'text'; $apps[$x]['db'][$y]['fields'][$z]['type'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference Recording'; $apps[$x]['db'][$y]['fields'][$z]['description']['en'] = 'Conference Recording';
app/conference_centers/conference_center_edit.php
-24
View File
@@ -48,7 +48,6 @@ else {
$dialplan_uuid = check_str($_POST["dialplan_uuid"]); $dialplan_uuid = check_str($_POST["dialplan_uuid"]);
$conference_center_name = check_str($_POST["conference_center_name"]); $conference_center_name = check_str($_POST["conference_center_name"]);
$conference_center_extension = check_str($_POST["conference_center_extension"]); $conference_center_extension = check_str($_POST["conference_center_extension"]);
$conference_center_profile = check_str($_POST["conference_center_profile"]);
$conference_center_description = check_str($_POST["conference_center_description"]); $conference_center_description = check_str($_POST["conference_center_description"]);
$conference_center_enabled = check_str($_POST["conference_center_enabled"]); $conference_center_enabled = check_str($_POST["conference_center_enabled"]);
@@ -118,7 +117,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//if (strlen($dialplan_uuid) == 0) { $msg .= "Please provide: Dialplan UUID<br>\n"; } //if (strlen($dialplan_uuid) == 0) { $msg .= "Please provide: Dialplan UUID<br>\n"; }
if (strlen($conference_center_name) == 0) { $msg .= "Please provide: Name<br>\n"; } if (strlen($conference_center_name) == 0) { $msg .= "Please provide: Name<br>\n"; }
if (strlen($conference_center_extension) == 0) { $msg .= "Please provide: Extension<br>\n"; } if (strlen($conference_center_extension) == 0) { $msg .= "Please provide: Extension<br>\n"; }
if (strlen($conference_center_profile) == 0) { $msg .= "Please provide: Profile<br>\n"; }
//if (strlen($conference_center_order) == 0) { $msg .= "Please provide: Order<br>\n"; } //if (strlen($conference_center_order) == 0) { $msg .= "Please provide: Order<br>\n"; }
//if (strlen($conference_center_description) == 0) { $msg .= "Please provide: Description<br>\n"; } //if (strlen($conference_center_description) == 0) { $msg .= "Please provide: Description<br>\n"; }
if (strlen($conference_center_enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; } if (strlen($conference_center_enabled) == 0) { $msg .= "Please provide: Enabled<br>\n"; }
@@ -149,7 +147,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "dialplan_uuid, "; $sql .= "dialplan_uuid, ";
$sql .= "conference_center_name, "; $sql .= "conference_center_name, ";
$sql .= "conference_center_extension, "; $sql .= "conference_center_extension, ";
$sql .= "conference_center_profile, ";
$sql .= "conference_center_description, "; $sql .= "conference_center_description, ";
$sql .= "conference_center_enabled "; $sql .= "conference_center_enabled ";
$sql .= ")"; $sql .= ")";
@@ -160,7 +157,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'$dialplan_uuid', "; $sql .= "'$dialplan_uuid', ";
$sql .= "'$conference_center_name', "; $sql .= "'$conference_center_name', ";
$sql .= "'$conference_center_extension', "; $sql .= "'$conference_center_extension', ";
$sql .= "'$conference_center_profile', ";
$sql .= "'$conference_center_description', "; $sql .= "'$conference_center_description', ";
$sql .= "'$conference_center_enabled' "; $sql .= "'$conference_center_enabled' ";
$sql .= ")"; $sql .= ")";
@@ -213,7 +209,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql = "update v_conference_centers set "; $sql = "update v_conference_centers set ";
$sql .= "conference_center_name = '$conference_center_name', "; $sql .= "conference_center_name = '$conference_center_name', ";
$sql .= "conference_center_extension = '$conference_center_extension', "; $sql .= "conference_center_extension = '$conference_center_extension', ";
$sql .= "conference_center_profile = '$conference_center_profile', ";
$sql .= "conference_center_order = '$conference_center_order', "; $sql .= "conference_center_order = '$conference_center_order', ";
$sql .= "conference_center_description = '$conference_center_description', "; $sql .= "conference_center_description = '$conference_center_description', ";
$sql .= "conference_center_enabled = '$conference_center_enabled' "; $sql .= "conference_center_enabled = '$conference_center_enabled' ";
@@ -289,7 +284,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$dialplan_uuid = $row["dialplan_uuid"]; $dialplan_uuid = $row["dialplan_uuid"];
$conference_center_name = $row["conference_center_name"]; $conference_center_name = $row["conference_center_name"];
$conference_center_extension = $row["conference_center_extension"]; $conference_center_extension = $row["conference_center_extension"];
$conference_center_profile = $row["conference_center_profile"];
$conference_center_order = $row["conference_center_order"]; $conference_center_order = $row["conference_center_order"];
$conference_center_description = $row["conference_center_description"]; $conference_center_description = $row["conference_center_description"];
$conference_center_enabled = $row["conference_center_enabled"]; $conference_center_enabled = $row["conference_center_enabled"];
@@ -399,24 +393,6 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
} }
*/ */
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " Profile:\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='conference_center_profile'>\n";
//if the profile has no value set it to default
if ($conference_center_profile == "") { $conference_center_profile = "default"; }
if ($conference_center_profile == "default") { echo "<option value='default' selected='selected'>default</option>\n"; } else { echo "<option value='default'>default</option>\n"; }
if ($conference_center_profile == "wideband") { echo "<option value='wideband' selected='selected'>wideband</option>\n"; } else { echo "<option value='wideband'>wideband</option>\n"; }
if ($conference_center_profile == "ultrawideband") { echo "<option value='ultrawideband' selected='selected'>ultrawideband</option>\n"; } else { echo "<option value='ultrawideband'>ultrawideband</option>\n"; }
if ($conference_center_profile == "cdquality") { echo "<option value='cdquality' selected='selected'>cdquality</option>\n"; } else { echo "<option value='cdquality'>cdquality</option>\n"; }
echo " </select>\n";
echo "<br />\n";
echo "Conference Profile is a collection of settings for the conference center.\n";
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n"; echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " Enabled:\n"; echo " Enabled:\n";
app/conference_centers/conference_centers.php
-2
View File
@@ -126,7 +126,6 @@ require_once "includes/paging.php";
echo "<tr>\n"; echo "<tr>\n";
echo th_order_by('conference_center_name', 'Name', $order_by, $order); echo th_order_by('conference_center_name', 'Name', $order_by, $order);
echo th_order_by('conference_center_extension', 'Extension', $order_by, $order); echo th_order_by('conference_center_extension', 'Extension', $order_by, $order);
echo th_order_by('conference_center_profile', 'Profile', $order_by, $order);
//echo th_order_by('conference_center_order', 'Order', $order_by, $order); //echo th_order_by('conference_center_order', 'Order', $order_by, $order);
echo th_order_by('conference_center_enabled', 'Enabled', $order_by, $order); echo th_order_by('conference_center_enabled', 'Enabled', $order_by, $order);
echo th_order_by('conference_center_description', 'Description', $order_by, $order); echo th_order_by('conference_center_description', 'Description', $order_by, $order);
@@ -147,7 +146,6 @@ require_once "includes/paging.php";
echo "<tr >\n"; echo "<tr >\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$conference_center_name."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$conference_center_name."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_extension']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_extension']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_profile']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_order']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_order']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_enabled']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_enabled']."&nbsp;</td>\n";
echo " <td valign='top' class='row_stylebg' width='35%'>".$row['conference_center_description']."&nbsp;</td>\n"; echo " <td valign='top' class='row_stylebg' width='35%'>".$row['conference_center_description']."&nbsp;</td>\n";
app/conference_centers/conference_room_edit.php
+24
View File
@@ -48,6 +48,7 @@ else {
$conference_center_uuid = check_str($_POST["conference_center_uuid"]); $conference_center_uuid = check_str($_POST["conference_center_uuid"]);
$member_pin = check_str($_POST["member_pin"]); $member_pin = check_str($_POST["member_pin"]);
$member_type = check_str($_POST["member_type"]); $member_type = check_str($_POST["member_type"]);
$profile = check_str($_POST["profile"]);
$record = check_str($_POST["record"]); $record = check_str($_POST["record"]);
$user_uuid = check_str($_POST["user_uuid"]); $user_uuid = check_str($_POST["user_uuid"]);
$max_members = check_str($_POST["max_members"]); $max_members = check_str($_POST["max_members"]);
@@ -107,6 +108,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
//if (strlen($conference_center_uuid) == 0) { $msg .= "Please provide: Conference UUID<br>\n"; } //if (strlen($conference_center_uuid) == 0) { $msg .= "Please provide: Conference UUID<br>\n"; }
//if (strlen($max_members) == 0) { $msg .= "Please provide: Max Members<br>\n"; } //if (strlen($max_members) == 0) { $msg .= "Please provide: Max Members<br>\n"; }
//if (strlen($wait_mod) == 0) { $msg .= "Please provide: Wait for the Moderator<br>\n"; } //if (strlen($wait_mod) == 0) { $msg .= "Please provide: Wait for the Moderator<br>\n"; }
if (strlen($profile) == 0) { $msg .= "Please provide: Conference Profile<br>\n"; }
if (strlen($announce) == 0) { $msg .= "Please provide: Announce<br>\n"; } if (strlen($announce) == 0) { $msg .= "Please provide: Announce<br>\n"; }
//if (strlen($enter_sound) == 0) { $msg .= "Please provide: Enter Sound<br>\n"; } //if (strlen($enter_sound) == 0) { $msg .= "Please provide: Enter Sound<br>\n"; }
if (strlen($mute) == 0) { $msg .= "Please provide: Mute<br>\n"; } if (strlen($mute) == 0) { $msg .= "Please provide: Mute<br>\n"; }
@@ -162,6 +164,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "conference_room_uuid, "; $sql .= "conference_room_uuid, ";
$sql .= "conference_center_uuid, "; $sql .= "conference_center_uuid, ";
$sql .= "meeting_uuid, "; $sql .= "meeting_uuid, ";
$sql .= "profile, ";
$sql .= "record, "; $sql .= "record, ";
$sql .= "max_members, "; $sql .= "max_members, ";
$sql .= "wait_mod, "; $sql .= "wait_mod, ";
@@ -179,6 +182,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql .= "'$conference_room_uuid', "; $sql .= "'$conference_room_uuid', ";
$sql .= "'$conference_center_uuid', "; $sql .= "'$conference_center_uuid', ";
$sql .= "'$meeting_uuid', "; $sql .= "'$meeting_uuid', ";
$sql .= "'$profile', ";
$sql .= "'$record', "; $sql .= "'$record', ";
$sql .= "'$max_members', "; $sql .= "'$max_members', ";
$sql .= "'$wait_mod', "; $sql .= "'$wait_mod', ";
@@ -223,6 +227,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
$sql = "update v_conference_rooms set "; $sql = "update v_conference_rooms set ";
$sql .= "conference_center_uuid = '$conference_center_uuid', "; $sql .= "conference_center_uuid = '$conference_center_uuid', ";
//$sql .= "meeting_uuid = '$meeting_uuid', "; //$sql .= "meeting_uuid = '$meeting_uuid', ";
$sql .= "profile = '$profile', ";
$sql .= "record = '$record', "; $sql .= "record = '$record', ";
$sql .= "max_members = '$max_members', "; $sql .= "max_members = '$max_members', ";
$sql .= "wait_mod = '$wait_mod', "; $sql .= "wait_mod = '$wait_mod', ";
@@ -308,6 +313,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
foreach ($result as &$row) { foreach ($result as &$row) {
$conference_center_uuid = $row["conference_center_uuid"]; $conference_center_uuid = $row["conference_center_uuid"];
$meeting_uuid = $row["meeting_uuid"]; $meeting_uuid = $row["meeting_uuid"];
$profile = $row["profile"];
$record = $row["record"]; $record = $row["record"];
$max_members = $row["max_members"]; $max_members = $row["max_members"];
$wait_mod = $row["wait_mod"]; $wait_mod = $row["wait_mod"];
@@ -492,6 +498,24 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
echo " </td>"; echo " </td>";
echo " </tr>"; echo " </tr>";
echo "<tr>\n";
echo "<td class='vncellreq' valign='top' align='left' nowrap='nowrap'>\n";
echo " Profile:\n";
echo "</td>\n";
echo "<td class='vtable' align='left'>\n";
echo " <select class='formfld' name='profile'>\n";
//if the profile has no value set it to default
if ($profile == "") { $profile = "default"; }
if ($profile == "default") { echo "<option value='default' selected='selected'>default</option>\n"; } else { echo "<option value='default'>default</option>\n"; }
if ($profile == "wideband") { echo "<option value='wideband' selected='selected'>wideband</option>\n"; } else { echo "<option value='wideband'>wideband</option>\n"; }
if ($profile == "ultrawideband") { echo "<option value='ultrawideband' selected='selected'>ultrawideband</option>\n"; } else { echo "<option value='ultrawideband'>ultrawideband</option>\n"; }
if ($profile == "cdquality") { echo "<option value='cdquality' selected='selected'>cdquality</option>\n"; } else { echo "<option value='cdquality'>cdquality</option>\n"; }
echo " </select>\n";
echo "<br />\n";
echo "Conference Profile is a collection of settings for the conference center.\n";
echo "</td>\n";
echo "</tr>\n";
echo "<tr>\n"; echo "<tr>\n";
echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n"; echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
echo " Record:\n"; echo " Record:\n";
app/conference_centers/conference_rooms.php
+2
View File
@@ -98,6 +98,7 @@ require_once "includes/paging.php";
echo "<tr>\n"; echo "<tr>\n";
//echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order); //echo th_order_by('conference_center_uuid', 'Conference UUID', $order_by, $order);
//echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order); //echo th_order_by('meeting_uuid', 'Meeting UUID', $order_by, $order);
echo th_order_by('profile', 'Profile', $order_by, $order);
echo th_order_by('record', 'Record', $order_by, $order); echo th_order_by('record', 'Record', $order_by, $order);
echo th_order_by('max_members', 'Max Members', $order_by, $order); echo th_order_by('max_members', 'Max Members', $order_by, $order);
echo th_order_by('wait_mod', 'Wait for Moderator', $order_by, $order); echo th_order_by('wait_mod', 'Wait for Moderator', $order_by, $order);
@@ -123,6 +124,7 @@ require_once "includes/paging.php";
echo "<tr >\n"; echo "<tr >\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_uuid']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['conference_center_uuid']."&nbsp;</td>\n";
//echo " <td valign='top' class='".$row_style[$c]."'>".$row['meeting_uuid']."&nbsp;</td>\n"; //echo " <td valign='top' class='".$row_style[$c]."'>".$row['meeting_uuid']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['profile']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['record']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['record']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['max_members']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['max_members']."&nbsp;</td>\n";
echo " <td valign='top' class='".$row_style[$c]."'>".$row['wait_mod']."&nbsp;</td>\n"; echo " <td valign='top' class='".$row_style[$c]."'>".$row['wait_mod']."&nbsp;</td>\n";