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

Fix Default Settings Copy feature.

This commit is contained in:
Nate 2019-07-23 17:23:00 -06:00
parent 5d82182695
commit 0df4fad839
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/default_settings/default_settings.php
View File

@ -68,7 +68,7 @@
if ($action == 'copy' && permission_exists('domain_setting_add')) { if ($action == 'copy' && permission_exists('domain_setting_add')) {
$target_domain_uuid = $_POST["target_domain_uuid"]; $target_domain_uuid = $_POST["target_domain_uuid"];
if (is_uuid($target_domain_uuid) && sizeof($default_setting_uuids) > 0) { if (is_uuid($target_domain_uuid) && is_array($default_setting_uuids) && sizeof($default_setting_uuids) > 0) {
$settings_copied = 0; $settings_copied = 0;
foreach ($default_setting_uuids as $default_setting_uuid) { foreach ($default_setting_uuids as $default_setting_uuid) {
@ -107,11 +107,13 @@
$parameters['domain_setting_name'] = $default_setting_name; $parameters['domain_setting_name'] = $default_setting_name;
$database = new database; $database = new database;
$target_domain_setting_uuid = $database->select($sql, $parameters, 'column'); $target_domain_setting_uuid = $database->select($sql, $parameters, 'column');
$message = $database->message;
$action = is_uuid($target_domain_setting_uuid) ? 'update' : 'add'; $action = is_uuid($target_domain_setting_uuid) ? 'update' : 'add';
unset($sql, $parameters); unset($sql, $parameters);
// fix null // fix null
$default_setting_order = $default_setting_order != '' ? $default_setting_order : 'null'; $default_setting_order = $default_setting_order != '' ? $default_setting_order : null;
//begin array //begin array
$array['domain_settings'][0]['domain_uuid'] = $target_domain_uuid; $array['domain_settings'][0]['domain_uuid'] = $target_domain_uuid;
@ -147,7 +149,7 @@
} // foreach } // foreach
// set message // set message
$_SESSION["message"] = $text['message-copy'].": ".escape($settings_copied); message::add($text['message-copy'].": ".escape($settings_copied));
} }
else { else {
// set message // set message

4
core/domain_settings/domain_settings.php
View File

@ -121,7 +121,7 @@
unset($sql, $parameters); unset($sql, $parameters);
// fix null // fix null
$domain_setting_order = $domain_setting_order != '' ? $domain_setting_order : 'null'; $domain_setting_order = $domain_setting_order != '' ? $domain_setting_order : null;
//prepare the array //prepare the array
$array['domain_settings'][$index]['domain_uuid'] = $target_domain_uuid; $array['domain_settings'][$index]['domain_uuid'] = $target_domain_uuid;
@ -147,7 +147,7 @@
$message = $database->message; $message = $database->message;
// set message // set message
$_SESSION["message"] = $text['message-copy'].": ".sizeof($array); message::add($text['message-copy'].": ".sizeof($array));
unset($array); unset($array);
} }