mirror of
https://github.com/fusionpbx/fusionpbx.git
synced 2026-01-06 11:43: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
@@ -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) 2008-2023
|
||||
Portions created by the Initial Developer are Copyright (C) 2008-2025
|
||||
the Initial Developer. All Rights Reserved.
|
||||
|
||||
Contributor(s):
|
||||
@@ -88,7 +88,7 @@
|
||||
$register_proxy = $_POST["register_proxy"];
|
||||
$outbound_proxy = $_POST["outbound_proxy"];
|
||||
$expire_seconds = $_POST["expire_seconds"];
|
||||
$register = $_POST["register"] ?? 'false';
|
||||
$register = $_POST["register"];
|
||||
$register_transport = $_POST["register_transport"];
|
||||
$contact_params = $_POST["contact_params"];
|
||||
$retry_seconds = $_POST["retry_seconds"];
|
||||
@@ -106,7 +106,7 @@
|
||||
$context = $_POST["context"];
|
||||
$profile = $_POST["profile"];
|
||||
$hostname = $_POST["hostname"];
|
||||
$enabled = $_POST["enabled"] ?? 'false';
|
||||
$enabled = $_POST["enabled"];
|
||||
$description = $_POST["description"];
|
||||
}
|
||||
|
||||
@@ -129,7 +129,7 @@
|
||||
//check for all required data
|
||||
$msg = '';
|
||||
if (empty($gateway)) { $msg .= $text['message-required']." ".$text['label-gateway']."<br>\n"; }
|
||||
if ($register == "true") {
|
||||
if ($register == 'true') {
|
||||
if (empty($username)) { $msg .= $text['message-required']." ".$text['label-username']."<br>\n"; }
|
||||
if (empty($password)) { $msg .= $text['message-required']." ".$text['label-password']."<br>\n"; }
|
||||
}
|
||||
@@ -198,7 +198,7 @@
|
||||
$array['gateways'][$x]["description"] = $description;
|
||||
|
||||
//update gateway session variable
|
||||
if ($enabled == 'true') {
|
||||
if ($enabled) {
|
||||
$_SESSION['gateways'][$gateway_uuid] = $gateway;
|
||||
}
|
||||
else {
|
||||
@@ -216,7 +216,7 @@
|
||||
$message = $database->message;
|
||||
|
||||
//remove xml file (if any) if not enabled
|
||||
if ($enabled != 'true' && !empty($_SESSION['switch']['sip_profiles']['dir'])) {
|
||||
if ($enabled != true && !empty($_SESSION['switch']['sip_profiles']['dir'])) {
|
||||
$gateway_xml_file = $_SESSION['switch']['sip_profiles']['dir']."/".$profile."/v_".$gateway_uuid.".xml";
|
||||
if (file_exists($gateway_xml_file)) {
|
||||
unlink($gateway_xml_file);
|
||||
@@ -285,10 +285,10 @@
|
||||
$ping = $row["ping"];
|
||||
$ping_min = $row["ping_min"];
|
||||
$ping_max = $row["ping_max"];
|
||||
$contact_in_ping = $row["contact_in_ping"];
|
||||
$contact_in_ping = $row["contact_in_ping"] ?? false;
|
||||
$channels = $row["channels"];
|
||||
$caller_id_in_from = $row["caller_id_in_from"];
|
||||
$supress_cng = $row["supress_cng"];
|
||||
$caller_id_in_from = $row["caller_id_in_from"] ?? false;
|
||||
$supress_cng = $row["supress_cng"] ?? false;
|
||||
$sip_cid_type = $row["sip_cid_type"];
|
||||
$codec_prefs = $row["codec_prefs"];
|
||||
$extension_in_contact = $row["extension_in_contact"];
|
||||
@@ -303,7 +303,7 @@
|
||||
|
||||
//get the sip profiles
|
||||
$sql = "select sip_profile_name from v_sip_profiles ";
|
||||
$sql .= "where sip_profile_enabled = 'true' ";
|
||||
$sql .= "where sip_profile_enabled = true ";
|
||||
$sql .= "order by sip_profile_name asc ";
|
||||
$database = new database;
|
||||
$sip_profiles = $database->select($sql, null, 'all');
|
||||
@@ -311,13 +311,10 @@
|
||||
|
||||
//set defaults
|
||||
if (empty($gateway_uuid)) { $gateway_uuid = ""; }
|
||||
if (empty($enabled)) { $enabled = "true"; }
|
||||
if (empty($register)) { $register = "true"; }
|
||||
if (empty($retry_seconds)) { $retry_seconds = "30"; }
|
||||
if (empty($gateway)) { $gateway = ''; }
|
||||
if (empty($username)) { $username = ''; }
|
||||
if (empty($password)) { $password = ''; }
|
||||
if (empty($distinct_to)) { $distinct_to = ''; }
|
||||
if (empty($auth_username)) { $auth_username = ''; }
|
||||
if (empty($realm)) { $realm = ''; }
|
||||
if (empty($from_user)) { $from_user = ''; }
|
||||
@@ -333,17 +330,13 @@
|
||||
if (empty($ping)) { $ping = ''; }
|
||||
if (empty($ping_min)) { $ping_min = ''; }
|
||||
if (empty($ping_max)) { $ping_max = ''; }
|
||||
if (empty($contact_in_ping)) { $contact_in_ping = ''; }
|
||||
if (empty($channels)) { $channels = ''; }
|
||||
if (empty($caller_id_in_from)) { $caller_id_in_from = ''; }
|
||||
if (empty($supress_cng)) { $supress_cng = ''; }
|
||||
if (empty($sip_cid_type)) { $sip_cid_type = ''; }
|
||||
if (empty($codec_prefs)) { $codec_prefs = ''; }
|
||||
if (empty($extension_in_contact)) { $extension_in_contact = ''; }
|
||||
if (empty($context)) { $context = ''; }
|
||||
if (empty($profile)) { $profile = ''; }
|
||||
if (empty($hostname)) { $hostname = ''; }
|
||||
if (empty($enabled)) { $enabled = 'true'; }
|
||||
if (empty($description)) { $description = ''; }
|
||||
|
||||
//create token
|
||||
@@ -489,17 +482,16 @@
|
||||
echo " ".$text['label-register']."\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' name='register' value='true' ".(empty($register) || $register == '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' name='register'>\n";
|
||||
echo " <option value='true'>".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".(!empty($register) && $register == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " </select>\n";
|
||||
echo " <select class='formfld' id='register' name='register'>\n";
|
||||
echo " <option value='true' ".($register === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($register === 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-register']."\n";
|
||||
@@ -540,21 +532,17 @@
|
||||
echo " ".$text['label-distinct_to']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td width='70%' class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='distinct_to'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if ($distinct_to == "true") {
|
||||
echo " <option value='true' selected='selected'>".$text['label-true']."</option>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['label-true']."</option>\n";
|
||||
echo " <select class='formfld' id='distinct_to' name='distinct_to'>\n";
|
||||
echo " <option value='true' ".($distinct_to === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($distinct_to === 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";
|
||||
}
|
||||
if ($distinct_to == "false") {
|
||||
echo " <option value='false' selected='selected'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='false'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
echo " </select>\n";
|
||||
echo "<br />\n";
|
||||
echo $text['description-distinct_to']."\n";
|
||||
echo "</td>\n";
|
||||
@@ -651,21 +639,17 @@
|
||||
echo " ".$text['label-caller_id_in_from']."\n";
|
||||
echo " </td>\n";
|
||||
echo " <td class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='caller_id_in_from'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if ($caller_id_in_from == "true") {
|
||||
echo " <option value='true' selected='selected'>".$text['label-true']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['label-true']."</option>\n";
|
||||
}
|
||||
if ($caller_id_in_from == "false") {
|
||||
echo " <option value='false' selected='selected'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='false'>".$text['label-false']."</option>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
echo " <select class='formfld' id='caller_id_in_from' name='caller_id_in_from'>\n";
|
||||
echo " <option value='true' ".($caller_id_in_from === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($caller_id_in_from === 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-caller_id_in_from']."\n";
|
||||
echo "</td>\n";
|
||||
@@ -676,21 +660,17 @@
|
||||
echo " ".$text['label-supress_cng']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='supress_cng'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if ($supress_cng == "true") {
|
||||
echo " <option value='true' selected='selected'>".$text['label-true']."</option>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['label-true']."</option>\n";
|
||||
echo " <select class='formfld' id='supress_cng' name='supress_cng'>\n";
|
||||
echo " <option value='true' ".($supress_cng === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($supress_cng === 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";
|
||||
}
|
||||
if ($supress_cng == "false") {
|
||||
echo " <option value='false' selected='selected'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='false'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
echo " </select>\n";
|
||||
echo "<br />\n";
|
||||
echo $text['description-supress_cng']."\n";
|
||||
echo "</td>\n";
|
||||
@@ -781,21 +761,17 @@
|
||||
echo " ".$text['label-contact_in_ping']."\n";
|
||||
echo "</td>\n";
|
||||
echo "<td class='vtable' align='left'>\n";
|
||||
echo " <select class='formfld' name='contact_in_ping'>\n";
|
||||
echo " <option value=''></option>\n";
|
||||
if ($contact_in_ping == "true") {
|
||||
echo " <option value='true' selected='selected'>".$text['label-true']."</option>\n";
|
||||
if ($input_toggle_style_switch) {
|
||||
echo " <span class='switch'>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='true'>".$text['label-true']."</option>\n";
|
||||
echo " <select class='formfld' id='contact_in_ping' name='contact_in_ping'>\n";
|
||||
echo " <option value='true' ".($contact_in_ping === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($contact_in_ping === 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";
|
||||
}
|
||||
if ($contact_in_ping == "false") {
|
||||
echo " <option value='false' selected='selected'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
else {
|
||||
echo " <option value='false'>".$text['label-false']."</option>\n";
|
||||
}
|
||||
echo " </select>\n";
|
||||
echo "<br />\n";
|
||||
echo $text['description-contact_in_ping']."\n";
|
||||
echo "</td>\n";
|
||||
@@ -898,17 +874,16 @@
|
||||
echo " ".$text['label-enabled']."\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' id='enabled' name='enabled' value='true' ".($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='enabled' name='enabled'>\n";
|
||||
echo " <option value='true' ".($enabled == 'true' ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($enabled == 'false' ? "selected='selected'" : null).">".$text['option-false']."</option>\n";
|
||||
echo " </select>\n";
|
||||
echo " <select class='formfld' id='enabled' name='enabled'>\n";
|
||||
echo " <option value='true' ".($enabled === true ? "selected='selected'" : null).">".$text['option-true']."</option>\n";
|
||||
echo " <option value='false' ".($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";
|
||||
@@ -948,4 +923,4 @@
|
||||
//include the footer
|
||||
require_once "resources/footer.php";
|
||||
|
||||
?>
|
||||
?>
|
||||
Reference in New Issue
Block a user