mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2025-12-30 00:53:50 +00:00
Update boolean toggle and the database boolean type (#7522)
* Change the data type to boolean
* Use boolean values in SQL and Conditional Statements
* Schema Data Types: Drop views so that alter tables statements complete
* Update settings.php
* Add extension for call_screen_enabled
* Gateway handle boolean
Add the boolean toggle
- distinct_to
- caller_id_in_from
- supress_cng
- extension_in_contact
- contact_in_ping
* Update gateways.php
* Update voicemail_edit.php
* Replace the ${caller_id_name} with the extensions caller id name
* Phrase - Edit: Update slide toggle with new select beneath.
* Update the input toggle style
* Set the input_toggle_style_switch as boolean
* Update the input toggle style
* Theme: Adjust CSS to wrap description text on form fields.
* Add domain_uuid and domain_name to the SQL SELECT
* Unset the parameters to fix the next query
* Gateway: Integrate new slide toggle switch.
* Dashboard: Update the input toggle style (#7499)
* Dashboard: Update the input toggle style
* Update dashboard_widget_edit.php
* Update dashboard_edit.php
* Inbound Route - Add: Integrate new slide toggle switch and boolean.
* User Settings: Integrate new slide toggle switch.
* Call Block Edit: Update the input toggle style (#7500)
* Bridge Edit: Update the input toggle style (#7501)
* Update phrases.php
* Update domain_edit.php
* Domain Settings Edit: Update the input toggle style
* User Edit: Update the input toggle style
* Update install.php
* Remove fields marked as deprecated
* Use boolean in the select statement
* Streams: New slide toggle and boolean.
* Streams: Remove unnecessary default.
* Queues (FIFO): New slide toggle.
* Call Detail Records: Update the input toggle style (#7503)
* Call Detail Records: Update the input toggle style
* Update xml_cdr_extension_summary.php
* Update xml_cdr_extension_summary.php
* Update xml_cdr_extension_summary.php
* Call Centers: Update the input toggle style (#7502)
* Call Centers: Update the input toggle style
* Update call_center_agent_edit.php
* Conference Centers: Update the input toggle style (#7506)
* Conference Centers: Update the input toggle style
* Update app_config.php
* Update conference_center_edit.php
* Use boolean data type (#7505)
* Call Flow Edit: Update the input toggle style (#7504)
* Devices: Update the input toggle style
* IVR Menus: New slide toggle.
* IVR Menu: Remove deprected file.
* SIP Profile - Edit: New slide toggle.
* Device Profiles: Update the input toggle style
* Ring Groups - List: Fix syntax.
* Theme: Fire onchange event when switching slide toggle control.
* Device Vendors: Update the input toggle style
* Update enabled boolean
* Update device_edit.php
* Ring Groups: New slide toggle.
* Update domain_edit.php
* Email Templates: Update the input toggle style
* Header: Correct default value on input toggle style.
* Default/Domain/User Settings: Adjust Select option label for better clarity.
* Use true boolean types for switch theme toggle or drop-down box (#7507)
* Groups: Update the input toggle style
* Conference Controls: Update the input toggle style (#7509)
* Conference Controls: Update the input toggle style
* Update conference_control_edit.php
* Update conference_control_details.php
* Update conference_control_detail_edit.php
* Conferences: Update the input toggle style (#7511)
* Use true boolean types for switch theme toggle or drop-down box (#7513)
* Dialplans: Update the input toggle style
Also updated outbound route add
* Ring Group: Only adjust ring group forward destination top margin when slide toggle enabled.
* Default/Domain/User Settings - List: Adjust for new 'Select Box' label on input_toggle_style value.
* Use true boolean types for switch theme toggle or drop-down box (#7514)
* Call Forward / Follow Me: Minor javascript adjustments to mirror previous behavior.
* Ring Groups [Dashboard]: New slide toggle.
* Get the contacts details with a seperate SQL Query
* Remove debug info
* Destinations: Update the input toggle style
* Conference Profiles: Update the input toggle style (#7515)
* Conference Profiles: Update the input toggle style
* Update conference_profiles.php
* Update conference_profile_params.php
* Update conference_profile_param_edit.php
* Update conference_profile_edit.php
* Extensions: Update the input toggle style
* Contacts: Update the input toggle style (#7517)
* Contacts: Update the input toggle style
* Update contact_address_edit.php
* Update contact_attachment_edit.php
* Update contact_edit.php
* Update contact_email_edit.php
* Update contact_phone_edit.php
* Update contact_relation_edit.php
* Update contact_setting_edit.php
* Update contact_url_edit.php
* Update contacts.php
* Voicemails: New slide toggle.
* Voicemail Greeting: New slide toggle.
* Modules: New slide toggle.
* Recordings: New slide toggle
* Variables: New slide toggle.
* Time Conditions: New slide toggle.
* Extensions - List: Remove invalid column name.
* Extension Settings: New slide toggle.
* Number Translations: New slide toggle and boolean.
* Sofia global settings: Update the input toggle style
* Update alter table convert to boolean
* Fix contact relation search (#7518)
* Sip Profile Edit: Fix setting enabled labels (#7519)
* Sip Profile Edit: Fix setting enabled labels
* Update sip_profile_edit.php
* Update dialplan_edit.php (#7520)
* Update SQL queries to use true/false for contact primary settings (#7521)
* Update SQL queries to use true/false for contact primary settings
* Update contacts_vcard.php
* Update email.php
* Update totp.php
* Update contact_url_edit.php
* Update contact_email_edit.php
* Update contact_address_edit.php
* Update contact_attachment_edit.php
* Update contact_phone_edit.php
* Add a database views method
* Add database view groups
* Add database users view
* Add database call_recordings view
* Update users.php
* Add database view call block
* Update schema to use the database views method
* Update conference.conf.lua boolean
* Update directory.lua boolean
* Update callcenter.conf.lua agent_status boolean
* Update sofia.conf.lua boolean
* Update number translations lua boolean
* Update directory.lua boolean
* Update group_call.lua fix the cache
* Update reverse-auth-lookup.lua boolean
* Update directory.lua boolean
* Use concat instead of ||
* Update index.lua
---------
Co-authored-by: fusionate <nate@fusionpbx.com>
Co-authored-by: Alex <alex@fusionpbx.com>
Co-authored-by: frytimo <tim@fusionpbx.com>
This commit is contained in:
FusionPBX
@@ -35,7 +35,7 @@
|
||||
$apps[$x]['destinations'][$y]['type'] = "sql";
|
||||
$apps[$x]['destinations'][$y]['label'] = "ring_groups";
|
||||
$apps[$x]['destinations'][$y]['name'] = "ring_groups";
|
||||
$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and ring_group_enabled = 'true' ";
|
||||
$apps[$x]['destinations'][$y]['where'] = "where domain_uuid = '\${domain_uuid}' and ring_group_enabled = true ";
|
||||
$apps[$x]['destinations'][$y]['order_by'] = "natural_sort(ring_group_extension) asc";
|
||||
$apps[$x]['destinations'][$y]['field']['ring_group_uuid'] = "ring_group_uuid";
|
||||
$apps[$x]['destinations'][$y]['field']['uuid'] = "ring_group_uuid";
|
||||
@@ -293,7 +293,7 @@
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the call forward destination.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_forward_enabled";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select enable or disable the ring group call forward.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_caller_id_name";
|
||||
@@ -334,15 +334,15 @@
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select the ringback.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_call_screen_enabled";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_call_forward_enabled";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Choose to follow a ring group destination's call forward.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_follow_me_enabled";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Choose to follow a ring group destination's follow me.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_missed_call_app";
|
||||
@@ -358,7 +358,7 @@
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the context.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_enabled";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['type'] = "boolean";
|
||||
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Select enable or disable the ring group.";
|
||||
$z++;
|
||||
$apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_description";
|
||||
|
||||
@@ -134,7 +134,7 @@
|
||||
|
||||
if (is_array($result) && @sizeof($result) != 0) {
|
||||
foreach ($result as $row) {
|
||||
$stats['forwarding'] += $row['ring_group_forward_enabled'] == 'true' && $row['ring_group_forward_destination'] ? 1 : 0;
|
||||
$stats['forwarding'] += $row['ring_group_forward_enabled'] == true && $row['ring_group_forward_destination'] ? 1 : 0;
|
||||
}
|
||||
$stats['active'] = @sizeof($result) - $stats['forwarding'];
|
||||
}
|
||||
@@ -257,29 +257,21 @@
|
||||
if (permission_exists('ring_group_forward')) {
|
||||
echo " <td valign='top' class='".$row_style[$c]." hud_text input tr_link_void' style='width: 1%; text-align: center;'>";
|
||||
echo " <input type='hidden' name='ring_groups[".$x."][ring_group_uuid]' value=\"".escape($row["ring_group_uuid"])."\">";
|
||||
// switch
|
||||
if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
|
||||
echo " <label class='switch'>\n";
|
||||
echo " <input type='checkbox' id='".escape($row['ring_group_uuid'])."' name='ring_groups[".$x."][ring_group_forward_enabled]' value='true' ".($row["ring_group_forward_enabled"] == 'true' ? "checked='checked'" : null)." onclick=\"this.checked && !document.getElementById('destination_".$x."').value ? document.getElementById('destination_".$x."').focus() : null;\">\n";
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </label>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
// select
|
||||
else {
|
||||
echo " <select class='formfld' id='".escape($row['ring_group_uuid'])."' name='ring_groups[".$x."][ring_group_forward_enabled]' onchange=\"this.selectedIndex && !document.getElementById('destination_".$x."').value ? document.getElementById('destination_".$x."').focus() : null;\">\n";
|
||||
echo " <option value='false'>".$text['option-disabled']."</option>\n";
|
||||
echo " <option value='true' ".($row["ring_group_forward_enabled"] == 'true' ? "selected='selected'" : null).">".$text['option-enabled']."</option>\n";
|
||||
echo " </select>\n";
|
||||
echo " <select class='formfld' id='".escape($row['ring_group_uuid'])."' name='ring_groups[".$x."][ring_group_forward_enabled]' onchange=\"this.value == 'true' && document.getElementById('destination_".$x."').value == '' ? document.getElementById('destination_".$x."').focus() : null;\">\n";
|
||||
echo " <option value='false' ".($row["ring_group_forward_enabled"] === false ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " <option value='true' ".($row["ring_group_forward_enabled"] === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " </select>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </span>\n";
|
||||
}
|
||||
}
|
||||
else {
|
||||
echo " <td valign='top' class='".$row_style[$c]." hud_text' style='width: 1%; text-align: left;'>";
|
||||
if ($row["ring_group_forward_enabled"] == 'true') {
|
||||
echo $text['option-enabled'];
|
||||
}
|
||||
else {
|
||||
echo $text['option-disabled'];
|
||||
}
|
||||
echo $row["ring_group_forward_enabled"] === true ? $text['option-enabled'] : $text['option-disabled'];
|
||||
}
|
||||
echo " </td>\n";
|
||||
if (permission_exists('ring_group_forward')) {
|
||||
@@ -300,7 +292,6 @@
|
||||
|
||||
echo "</table>\n";
|
||||
echo "</div>";
|
||||
//$n++;
|
||||
|
||||
if (permission_exists('ring_group_forward')) {
|
||||
echo "<input type='hidden' name='".$token['name']."' value='".$token['hash']."'>\n";
|
||||
@@ -311,4 +302,4 @@
|
||||
}
|
||||
echo "</div>\n";
|
||||
|
||||
?>
|
||||
?>
|
||||
@@ -200,10 +200,10 @@
|
||||
$ring_group_follow_me_enabled = $_POST["ring_group_follow_me_enabled"];
|
||||
$ring_group_missed_call_app = $_POST["ring_group_missed_call_app"];
|
||||
$ring_group_missed_call_data = $_POST["ring_group_missed_call_data"];
|
||||
$ring_group_forward_enabled = $_POST["ring_group_forward_enabled"] ?? 'false';
|
||||
$ring_group_forward_enabled = !empty($_POST["ring_group_forward_destination"]) ? $_POST["ring_group_forward_enabled"] : 'false';
|
||||
$ring_group_forward_destination = $_POST["ring_group_forward_destination"];
|
||||
$ring_group_forward_toll_allow = $_POST["ring_group_forward_toll_allow"];
|
||||
$ring_group_enabled = $_POST["ring_group_enabled"] ?? 'false';
|
||||
$ring_group_enabled = $_POST["ring_group_enabled"];
|
||||
$ring_group_description = $_POST["ring_group_description"];
|
||||
$dialplan_uuid = $_POST["dialplan_uuid"] ?? null;
|
||||
//$ring_group_timeout_action = "transfer:1001 XML default";
|
||||
@@ -453,7 +453,7 @@
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_delay"] = $row['destination_delay'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_timeout"] = $row['destination_timeout'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_prompt"] = $row['destination_prompt'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_enabled"] = $row['destination_enabled'] ?? 'false';
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_enabled"] = $row['destination_enabled'] ?? false;
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["domain_uuid"] = $domain_uuid;
|
||||
$y++;
|
||||
}
|
||||
@@ -466,7 +466,7 @@
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_delay"] = $row['destination_delay'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_timeout"] = $row['destination_timeout'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_prompt"] = $row['destination_prompt'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_enabled"] = $row['destination_enabled'] ?? 'false';
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["destination_enabled"] = $row['destination_enabled'];
|
||||
$array['ring_groups'][0]["ring_group_destinations"][$y]["domain_uuid"] = $domain_uuid;
|
||||
}
|
||||
$y++;
|
||||
@@ -492,7 +492,7 @@
|
||||
if (isset($ring_group_context)) {
|
||||
$array["dialplans"][0]["dialplan_context"] = $ring_group_context;
|
||||
}
|
||||
$array["dialplans"][0]["dialplan_continue"] = "false";
|
||||
$array["dialplans"][0]["dialplan_continue"] = 'false';
|
||||
$array["dialplans"][0]["dialplan_xml"] = $dialplan_xml;
|
||||
$array["dialplans"][0]["dialplan_order"] = "101";
|
||||
$array["dialplans"][0]["dialplan_enabled"] = $ring_group_enabled;
|
||||
@@ -598,7 +598,6 @@
|
||||
$destination_delay_max = $settings->get('ring_group', 'destination_delay_max', '');
|
||||
$destination_timeout_max = $settings->get('ring_group', 'destination_timeout_max', '');;
|
||||
if (empty($ring_group_call_timeout)) { $ring_group_call_timeout = '30'; }
|
||||
if (empty($ring_group_enabled)) { $ring_group_enabled = 'true'; }
|
||||
|
||||
//get the ring group destination array
|
||||
if ($action == "add") {
|
||||
@@ -640,7 +639,7 @@
|
||||
$sql = "select u.username, r.user_uuid, r.ring_group_uuid ";
|
||||
$sql .= "from v_ring_group_users as r, v_users as u ";
|
||||
$sql .= "where r.user_uuid = u.user_uuid ";
|
||||
$sql .= "and u.user_enabled = 'true' ";
|
||||
$sql .= "and u.user_enabled = true ";
|
||||
$sql .= "and r.domain_uuid = :domain_uuid ";
|
||||
$sql .= "and r.ring_group_uuid = :ring_group_uuid ";
|
||||
$sql .= "order by u.username asc ";
|
||||
@@ -653,15 +652,12 @@
|
||||
//get the users
|
||||
$sql = "select * from v_users ";
|
||||
$sql .= "where domain_uuid = :domain_uuid ";
|
||||
$sql .= "and user_enabled = 'true' ";
|
||||
$sql .= "and user_enabled = true ";
|
||||
$sql .= "order by username asc ";
|
||||
$parameters['domain_uuid'] = $domain_uuid;
|
||||
$users = $database->select($sql, $parameters, 'all');
|
||||
unset($sql, $parameters);
|
||||
|
||||
//set defaults
|
||||
if (empty($ring_group_enabled)) { $ring_group_enabled = 'true'; }
|
||||
|
||||
//set the default ring group context
|
||||
if (empty($ring_group_context)) {
|
||||
$ring_group_context = $domain_name;
|
||||
@@ -946,14 +942,7 @@
|
||||
|
||||
echo " <tr>\n";
|
||||
echo " <td class='formfld'>\n";
|
||||
if (!isset($row['ring_group_destination_uuid'])) { // new record
|
||||
if (substr($settings->get('theme', 'input_toggle_style', ''), 0, 6) == 'switch') {
|
||||
$onkeyup = "onkeyup=\"document.getElementById('ring_group_destinations_".$x."_destination_enabled').checked = (this.value != '' ? true : false);\""; // switch
|
||||
}
|
||||
else {
|
||||
$onkeyup = "onkeyup=\"document.getElementById('ring_group_destinations_".$x."_destination_enabled').value = (this.value != '' ? true : false);\""; // select
|
||||
}
|
||||
}
|
||||
$onkeyup = !isset($row['ring_group_destination_uuid']) ? "onkeyup=\"document.getElementById('ring_group_destinations_".$x."_destination_enabled').value = (this.value != '' ? true : false);\"" : null; // new record
|
||||
echo " <input type=\"text\" name=\"ring_group_destinations[".$x."][destination_number]\" class=\"formfld\" value=\"".escape($row['destination_number'])."\" ".$onkeyup.">\n";
|
||||
echo " </td>\n";
|
||||
echo " <td class='formfld'>\n";
|
||||
@@ -998,19 +987,16 @@
|
||||
echo " <input type=\"text\" name=\"ring_group_destinations[".$x."][destination_description]\" class=\"formfld\" value=\"".escape($row['destination_description'])."\">\n";
|
||||
echo " </td>\n";
|
||||
echo " <td class='formfld'>\n";
|
||||
// switch
|
||||
if (substr($settings->get('theme', 'input_toggle_style', ''), 0, 6) == 'switch') {
|
||||
echo " <label class='switch'>\n";
|
||||
echo " <input type='checkbox' id='ring_group_destinations_".$x."_destination_enabled' name='ring_group_destinations[".$x."][destination_enabled]' value='true' ".(!empty($row['destination_enabled']) && $row['destination_enabled'] == 'true' ? "checked='checked'" : null).">\n";
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </label>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
// select
|
||||
else {
|
||||
echo " <select class='formfld' id='ring_group_destinations_".$x."_destination_enabled' name='ring_group_destinations[".$x."][destination_enabled]'>\n";
|
||||
echo " <option value='false'>".$text['option-false']."</option>\n";
|
||||
echo " <option value='true' ".($row['destination_enabled'] == 'true' ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " </select>\n";
|
||||
echo " <select class='formfld' id='ring_group_destinations_".$x."_destination_enabled' name='ring_group_destinations[".$x."][destination_enabled]'>\n";
|
||||
echo " <option value='false' ".($row['destination_enabled'] === false ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " <option value='true' ".($row['destination_enabled'] === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " </select>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </span>\n";
|
||||
}
|
||||
echo " </td>\n";
|
||||
if ($show_destination_delete && permission_exists('ring_group_destination_delete')) {
|
||||
@@ -1184,13 +1170,13 @@
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='ring_group_call_screen_enabled'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if ($ring_group_call_screen_enabled == "true") {
|
||||
if ($ring_group_call_screen_enabled == true) {
|
||||
echo " <option value='true' selected='selected'>".$text['label-true']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['label-true']."</option>\n";
|
||||
}
|
||||
if ($ring_group_call_screen_enabled == "false") {
|
||||
if ($ring_group_call_screen_enabled == false) {
|
||||
echo " <option value='false' selected='selected'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
@@ -1210,13 +1196,13 @@
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='ring_group_call_forward_enabled'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if (!empty($ring_group_call_forward_enabled) && $ring_group_call_forward_enabled == "true") {
|
||||
if (!empty($ring_group_call_forward_enabled) && $ring_group_call_forward_enabled == true) {
|
||||
echo " <option value='true' selected='selected'>".$text['option-true']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['option-true']."</option>\n";
|
||||
}
|
||||
if (!empty($ring_group_call_forward_enabled) && $ring_group_call_forward_enabled == "false") {
|
||||
if (!empty($ring_group_call_forward_enabled) && $ring_group_call_forward_enabled == false) {
|
||||
echo " <option value='false' selected='selected'>".$text['option-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
@@ -1235,13 +1221,13 @@
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='ring_group_follow_me_enabled'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if (!empty($ring_group_follow_me_enabled) && $ring_group_follow_me_enabled == "true") {
|
||||
if (!empty($ring_group_follow_me_enabled) && $ring_group_follow_me_enabled == true) {
|
||||
echo " <option value='true' selected='selected'>".$text['option-true']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['option-true']."</option>\n";
|
||||
}
|
||||
if (!empty($ring_group_follow_me_enabled) && $ring_group_follow_me_enabled == "false") {
|
||||
if (!empty($ring_group_follow_me_enabled) && $ring_group_follow_me_enabled == false) {
|
||||
echo " <option value='false' selected='selected'>".$text['option-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
@@ -1279,27 +1265,19 @@
|
||||
echo " ".$text['label-ring_group_forward']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
if (substr($_SESSION['theme']['input_toggle_style']['text'], 0, 6) == 'switch') {
|
||||
echo " <label class='switch'>\n";
|
||||
echo " <input type='checkbox' name='ring_group_forward_enabled' value='true' ".(!empty($ring_group_forward_enabled) && $ring_group_forward_enabled == 'true' ? "checked='checked'" : null)." onchange='changed_ring_group_forward_enabled(this);'>\n";
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </label>\n";
|
||||
echo " <script>\n";
|
||||
echo " function changed_ring_group_forward_enabled(el) {\n";
|
||||
echo " if (el.checked) {\n";
|
||||
echo " document.getElementById('ring_group_forward_destination').focus();\n";
|
||||
echo " }\n";
|
||||
echo " }\n";
|
||||
echo " </script>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
else {
|
||||
echo " <select class='formfld' name='ring_group_forward_enabled' id='ring_group_forward_enabled' onchange=\"(this.selectedIndex == 1) ? document.getElementById('ring_group_forward_destination').focus() : null;\">";
|
||||
echo " <option value='false'>".$text['option-disabled']."</option>";
|
||||
echo " <option value='true' ".(!empty($ring_group_forward_enabled) && $ring_group_forward_enabled == 'true' ? "selected='selected'" : null).">".$text['option-enabled']."</option>";
|
||||
echo " </select>";
|
||||
echo " <select class='formfld' id='ring_group_forward_enabled' name='ring_group_forward_enabled' onchange=\"(this.selectedIndex == 1) ? document.getElementById('ring_group_forward_destination').focus() : null;\">\n";
|
||||
echo " <option value='false' ".($ring_group_forward_enabled === false ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " <option value='true' ".($ring_group_forward_enabled === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " </select>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </span>";
|
||||
}
|
||||
echo " ";
|
||||
echo "<input class='formfld' type='text' name='ring_group_forward_destination' id='ring_group_forward_destination' placeholder=\"".$text['label-forward_destination']."\" maxlength='255' value=\"".escape($ring_group_forward_destination)."\">";
|
||||
echo "<input class='formfld' ".($input_toggle_style_switch ? "style='margin-top: -21px;'" : null)." type='text' name='ring_group_forward_destination' id='ring_group_forward_destination' placeholder=\"".$text['label-forward_destination']."\" maxlength='255' value=\"".escape($ring_group_forward_destination)."\">";
|
||||
echo "<br />\n";
|
||||
echo $text['description-ring-group-forward']."\n";
|
||||
echo "</td>\n";
|
||||
@@ -1337,17 +1315,16 @@
|
||||
echo " ".$text['label-enabled']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
if (substr($settings->get('theme', 'input_toggle_style', ''), 0, 6) == 'switch') {
|
||||
echo " <label class='switch'>\n";
|
||||
echo " <input type='checkbox' id='ring_group_enabled' name='ring_group_enabled' value='true' ".($ring_group_enabled == 'true' ? "checked='checked'" : null).">\n";
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </label>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
else {
|
||||
echo " <select class='formfld' id='ring_group_enabled' name='ring_group_enabled'>\n";
|
||||
echo " <option value='true' ".($ring_group_enabled == 'true' ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($ring_group_enabled == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " </select>\n";
|
||||
echo " <select class='formfld' id='ring_group_enabled' name='ring_group_enabled'>\n";
|
||||
echo " <option value='true' ".($ring_group_enabled === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($ring_group_enabled === false ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " </select>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='slider'></span>\n";
|
||||
echo " </span>\n";
|
||||
}
|
||||
echo "<br />\n";
|
||||
echo $text['description-enabled']."\n";
|
||||
@@ -1382,4 +1359,4 @@
|
||||
//include the footer
|
||||
require_once "resources/footer.php";
|
||||
|
||||
?>
|
||||
?>
|
||||
@@ -17,7 +17,7 @@
|
||||
|
||||
The Initial Developer of the Original Code is
|
||||
Mark J Crane <markjcrane@fusionpbx.com>
|
||||
Portions created by the Initial Developer are Copyright (C) 2010-2024
|
||||
Portions created by the Initial Developer are Copyright (C) 2010-2025
|
||||
the Initial Developer. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
@@ -91,7 +91,6 @@
|
||||
$sql = "select count(*) from v_ring_groups ";
|
||||
$sql .= "where domain_uuid = :domain_uuid ";
|
||||
$parameters['domain_uuid'] = $domain_uuid;
|
||||
$database = new database;
|
||||
$total_ring_groups = $database->select($sql, $parameters, 'column');
|
||||
|
||||
//get filtered ring group count
|
||||
@@ -118,12 +117,10 @@
|
||||
$sql .= "lower(ring_group_name) like :search ";
|
||||
$sql .= "or lower(ring_group_extension) like :search ";
|
||||
$sql .= "or lower(ring_group_description) like :search ";
|
||||
$sql .= "or lower(ring_group_enabled) like :search ";
|
||||
$sql .= "or lower(ring_group_strategy) like :search ";
|
||||
$sql .= ") ";
|
||||
$parameters['search'] = '%'.$search.'%';
|
||||
}
|
||||
$database = new database;
|
||||
$num_rows = $database->select($sql, $parameters, 'column');
|
||||
unset($sql, $parameters);
|
||||
|
||||
@@ -138,17 +135,21 @@
|
||||
|
||||
//get the list
|
||||
if ($show == "all" && permission_exists('ring_group_all')) {
|
||||
$sql = "select * from v_ring_groups ";
|
||||
$sql = "select r.ring_group_uuid, r.domain_uuid, r.ring_group_name, r.ring_group_extension, r.ring_group_strategy, ";
|
||||
$sql .= "r.ring_group_forward_destination, r.ring_group_forward_enabled, cast(r.ring_group_enabled as text), r.ring_group_description ";
|
||||
$sql .= "from v_ring_groups as r ";
|
||||
$sql .= "where true ";
|
||||
}
|
||||
elseif (permission_exists('ring_group_domain') || permission_exists('ring_group_all')) {
|
||||
$sql = "select * from v_ring_groups ";
|
||||
else if (permission_exists('ring_group_domain') || permission_exists('ring_group_all')) {
|
||||
$sql = "select r.ring_group_uuid, r.domain_uuid, r.ring_group_name, r.ring_group_extension, r.ring_group_strategy, ";
|
||||
$sql .= "r.ring_group_forward_destination, r.ring_group_forward_enabled, cast(r.ring_group_enabled as text), r.ring_group_description ";
|
||||
$sql .= "from v_ring_groups as r ";
|
||||
$sql .= "where domain_uuid = :domain_uuid ";
|
||||
$parameters['domain_uuid'] = $domain_uuid;
|
||||
}
|
||||
else {
|
||||
$sql = "select r.ring_group_uuid, r.ring_group_name, r.ring_group_extension, r.ring_group_strategy, ";
|
||||
$sql .= "r.ring_group_forward_destination, r.ring_group_forward_enabled, r.ring_group_description ";
|
||||
$sql = "select r.ring_group_uuid, r.domain_uuid, r.ring_group_name, r.ring_group_extension, r.ring_group_strategy, ";
|
||||
$sql .= "r.ring_group_forward_destination, r.ring_group_forward_enabled, cast(r.ring_group_enabled as text), r.ring_group_description ";
|
||||
$sql .= "from v_ring_groups as r, v_ring_group_users as u ";
|
||||
$sql .= "where r.domain_uuid = :domain_uuid ";
|
||||
$sql .= "and r.ring_group_uuid = u.ring_group_uuid ";
|
||||
@@ -161,7 +162,6 @@
|
||||
$sql .= "lower(ring_group_name) like :search ";
|
||||
$sql .= "or lower(ring_group_extension) like :search ";
|
||||
$sql .= "or lower(ring_group_description) like :search ";
|
||||
$sql .= "or lower(ring_group_enabled) like :search ";
|
||||
$sql .= "or lower(ring_group_strategy) like :search ";
|
||||
$sql .= ") ";
|
||||
$parameters['search'] = '%'.$search.'%';
|
||||
@@ -284,7 +284,7 @@
|
||||
echo " </td>\n";
|
||||
echo " <td>".escape($row['ring_group_extension'])." </td>\n";
|
||||
echo " <td>".$text['option-'.escape($row['ring_group_strategy'])]." </td>\n";
|
||||
echo " <td>".($row['ring_group_forward_enabled'] == 'true' ? format_phone(escape($row['ring_group_forward_destination'])) : null)." </td>\n";
|
||||
echo " <td>".($row['ring_group_forward_enabled'] === true && !empty($row['ring_group_forward_destination']) ? format_phone(escape($row['ring_group_forward_destination'])) : null)." </td>\n";
|
||||
if (permission_exists('ring_group_edit')) {
|
||||
echo " <td class='no-link center'>";
|
||||
echo button::create(['type'=>'submit','class'=>'link','label'=>$text['label-'.$row['ring_group_enabled']],'title'=>$text['button-toggle'],'onclick'=>"list_self_check('checkbox_".$x."'); list_action_set('toggle'); list_form_submit('form_list')"]);
|
||||
|
||||
Reference in New Issue
Block a user