Misc: Updates for PHP 8.1
This commit is contained in:
parent
09ba7069dc
commit
fa93b4e7f5
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
Portions created by the Initial Developer are Copyright (C) 2016-2022
|
Portions created by the Initial Developer are Copyright (C) 2016-2023
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
*/
|
*/
|
||||||
|
|
@ -69,7 +69,7 @@
|
||||||
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
|
if (count($_POST) > 0 && empty($_POST["persistformvar"])) {
|
||||||
|
|
||||||
//add or update the database
|
//add or update the database
|
||||||
if ($_POST["persistformvar"] != "true") {
|
if (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true") {
|
||||||
|
|
||||||
//validate the token
|
//validate the token
|
||||||
$token = new token;
|
$token = new token;
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
Portions created by the Initial Developer are Copyright (C) 2016-2020
|
Portions created by the Initial Developer are Copyright (C) 2016-2023
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
|
|
@ -96,7 +96,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
|
||||||
}
|
}
|
||||||
|
|
||||||
//add or update the database
|
//add or update the database
|
||||||
if ($_POST["persistformvar"] != "true") {
|
if (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true") {
|
||||||
if ($action == "add" && permission_exists('pin_number_add')) {
|
if ($action == "add" && permission_exists('pin_number_add')) {
|
||||||
//begin array
|
//begin array
|
||||||
$pin_number_uuid = uuid();
|
$pin_number_uuid = uuid();
|
||||||
|
|
@ -134,7 +134,7 @@ if (count($_POST)>0 && empty($_POST["persistformvar"])) {
|
||||||
}
|
}
|
||||||
|
|
||||||
//pre-populate the form
|
//pre-populate the form
|
||||||
if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
|
if (count($_GET) > 0 && (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true")) {
|
||||||
$pin_number_uuid = $_GET["id"];
|
$pin_number_uuid = $_GET["id"];
|
||||||
$sql = "select * from v_pin_numbers ";
|
$sql = "select * from v_pin_numbers ";
|
||||||
$sql .= "where domain_uuid = :domain_uuid ";
|
$sql .= "where domain_uuid = :domain_uuid ";
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
The Initial Developer of the Original Code is
|
The Initial Developer of the Original Code is
|
||||||
Mark J Crane <markjcrane@fusionpbx.com>
|
Mark J Crane <markjcrane@fusionpbx.com>
|
||||||
Portions created by the Initial Developer are Copyright (C) 2008-2020
|
Portions created by the Initial Developer are Copyright (C) 2008-2023
|
||||||
the Initial Developer. All Rights Reserved.
|
the Initial Developer. All Rights Reserved.
|
||||||
|
|
||||||
Contributor(s):
|
Contributor(s):
|
||||||
|
|
@ -69,7 +69,7 @@ if (is_uuid($sip_profile_uuid) && $sip_profile_name != '') {
|
||||||
if (!in_array($sip_profile_name, $sip_profile_names)) {
|
if (!in_array($sip_profile_name, $sip_profile_names)) {
|
||||||
|
|
||||||
//get the sip profile data
|
//get the sip profile data
|
||||||
if (count($_GET) > 0 && $_POST["persistformvar"] != "true") {
|
if (count($_GET) > 0 && (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true")) {
|
||||||
$sql = "select sip_profile_hostname, sip_profile_enabled, sip_profile_description from v_sip_profiles ";
|
$sql = "select sip_profile_hostname, sip_profile_enabled, sip_profile_description from v_sip_profiles ";
|
||||||
$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
|
$sql .= "where sip_profile_uuid = :sip_profile_uuid ";
|
||||||
$parameters['sip_profile_uuid'] = $sip_profile_uuid;
|
$parameters['sip_profile_uuid'] = $sip_profile_uuid;
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
//process the http post
|
//process the http post
|
||||||
if (!empty($_POST) && empty($_POST["persistformvar"])) {
|
if (!empty($_POST) && (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true")) {
|
||||||
|
|
||||||
//set the default_setting_uuid
|
//set the default_setting_uuid
|
||||||
if ($action == "update") {
|
if ($action == "update") {
|
||||||
|
|
@ -136,7 +136,7 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
//add or update the database
|
//add or update the database
|
||||||
if (empty($_POST["persistformvar"])) {
|
if (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true") {
|
||||||
// fix null
|
// fix null
|
||||||
$default_setting_order = ($default_setting_order != '') ? $default_setting_order : 'null';
|
$default_setting_order = ($default_setting_order != '') ? $default_setting_order : 'null';
|
||||||
|
|
||||||
|
|
@ -236,8 +236,8 @@
|
||||||
header("Location: default_settings.php?".$query_string."#anchor_".$default_setting_category);
|
header("Location: default_settings.php?".$query_string."#anchor_".$default_setting_category);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
} //if ($_POST["persistformvar"] != "true")
|
}
|
||||||
} //(count($_POST)>0 && empty($_POST["persistformvar"]))
|
}
|
||||||
|
|
||||||
//pre-populate the form
|
//pre-populate the form
|
||||||
if (count($_GET) > 0 && empty($_POST["persistformvar"])) {
|
if (count($_GET) > 0 && empty($_POST["persistformvar"])) {
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
$user_log_uuid = $_GET['id'];
|
$user_log_uuid = $_GET['id'];
|
||||||
|
|
||||||
//pre-populate the form
|
//pre-populate the form
|
||||||
if (is_array($_GET) && $_POST["persistformvar"] != "true") {
|
if (!empty($_GET) && is_array($_GET) && (empty($_POST["persistformvar"]) || $_POST["persistformvar"] != "true")) {
|
||||||
$sql = "select * from v_user_logs ";
|
$sql = "select * from v_user_logs ";
|
||||||
$sql .= "where user_log_uuid = :user_log_uuid ";
|
$sql .= "where user_log_uuid = :user_log_uuid ";
|
||||||
//$sql .= "and domain_uuid = :domain_uuid ";
|
//$sql .= "and domain_uuid = :domain_uuid ";
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue