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

Category and Search pass-through (#6511) 

* Update default_settings.php

* Update default_setting_edit.php
This commit is contained in:
FusionPBX 2022-12-20 14:12:47 -07:00 committed by GitHub
parent ee17eb2665
commit a44ca60441
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
core/default_settings/default_setting_edit.php
View File

@ -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-2021 Portions created by the Initial Developer are Copyright (C) 2008-2022
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -66,6 +66,20 @@
$default_setting_description = $_POST["default_setting_description"]; $default_setting_description = $_POST["default_setting_description"];
} }
//sanitize the variables
$search = preg_replace('#[^a-zA-Z0-9_\-\. ]#', '', $search);
$default_setting_category = preg_replace('#[^a-zA-Z0-9_\-\.]#', '', $default_setting_category);
//build the query string
$query_string = '';
if ($search != '') {
$query_string .= 'search='.urlencode($search);
}
if ($default_setting_category != '') {
if ($query_string == '') { $query_string = ''; } else { $query_string .= '&'; }
$query_string .= 'default_setting_category='.urlencode($default_setting_category);
}
//process the http post //process the http post
if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) {
@ -81,7 +95,7 @@
$token = new token; $token = new token;
if (!$token->validate($_SERVER['PHP_SELF'])) { if (!$token->validate($_SERVER['PHP_SELF'])) {
message::add($text['message-invalid_token'],'negative'); message::add($text['message-invalid_token'],'negative');
header('Location: default_settings.php'); header('Location: default_settings.php?'.$query_string);
exit; exit;
} }
@ -200,12 +214,12 @@
//set the message and redirect the user //set the message and redirect the user
if ($action == "add" && permission_exists('default_setting_add')) { if ($action == "add" && permission_exists('default_setting_add')) {
message::add($text['message-add']); message::add($text['message-add']);
header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#anchor_".$default_setting_category); header("Location: default_settings.php?".$query_string."#anchor_".$default_setting_category);
return; return;
} }
if ($action == "update" && permission_exists('default_setting_edit')) { if ($action == "update" && permission_exists('default_setting_edit')) {
message::add($text['message-update']); message::add($text['message-update']);
header("Location: default_settings.php".(($search != '') ? "?search=".$search : null)."#anchor_".$default_setting_category); header("Location: default_settings.php?".$query_string."#anchor_".$default_setting_category);
return; return;
} }
} //if ($_POST["persistformvar"] != "true") } //if ($_POST["persistformvar"] != "true")
@ -258,7 +272,7 @@
} }
echo " </div>\n"; echo " </div>\n";
echo " <div class='actions'>\n"; echo " <div class='actions'>\n";
echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'default_settings.php'.($search != '' ? "?search=".urlencode($search) : null)]); echo button::create(['type'=>'button','label'=>$text['button-back'],'icon'=>$_SESSION['theme']['button_icon_back'],'id'=>'btn_back','style'=>'margin-right: 15px;','link'=>'default_settings.php?'.$query_string]);
echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','onclick'=>'submit_form();']); echo button::create(['type'=>'button','label'=>$text['button-save'],'icon'=>$_SESSION['theme']['button_icon_save'],'id'=>'btn_save','onclick'=>'submit_form();']);
echo " </div>\n"; echo " </div>\n";
echo " <div style='clear: both;'></div>\n"; echo " <div style='clear: both;'></div>\n";

19
core/default_settings/default_settings.php
View File

@ -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 - 2021 Portions created by the Initial Developer are Copyright (C) 2008 - 2022
the Initial Developer. All Rights Reserved. the Initial Developer. All Rights Reserved.
Contributor(s): Contributor(s):
@ -59,6 +59,16 @@
$search = preg_replace('#[^a-zA-Z0-9_\-\. ]#', '', $search); $search = preg_replace('#[^a-zA-Z0-9_\-\. ]#', '', $search);
$default_setting_category = preg_replace('#[^a-zA-Z0-9_\-\.]#', '', $default_setting_category); $default_setting_category = preg_replace('#[^a-zA-Z0-9_\-\.]#', '', $default_setting_category);
//build the query string
$query_string = '';
if ($search != '') {
$query_string .= 'search='.urlencode($search);
}
if ($default_setting_category != '') {
if ($query_string == '') { $query_string = ''; } else { $query_string .= '&'; }
$query_string .= 'default_setting_category='.urlencode($default_setting_category);
}
//process the http post data by action //process the http post data by action
if ($action != '' && is_array($default_settings) && @sizeof($default_settings) != 0) { if ($action != '' && is_array($default_settings) && @sizeof($default_settings) != 0) {
switch ($action) { switch ($action) {
@ -82,8 +92,7 @@
} }
break; break;
} }
header('Location: default_settings.php?'.($query_string != '' ? $query_string : null));
header('Location: default_settings.php'.($search != '' ? '?search='.urlencode($search) : null));
exit; exit;
} }
@ -259,7 +268,7 @@
echo button::create(['type'=>'button','label'=>$text['label-domain'],'icon'=>$_SESSION['theme']['button_icon_all'],'style'=>'','link'=>PROJECT_PATH.'/core/domain_settings/domain_settings.php?id='.$domain_uuid]); echo button::create(['type'=>'button','label'=>$text['label-domain'],'icon'=>$_SESSION['theme']['button_icon_all'],'style'=>'','link'=>PROJECT_PATH.'/core/domain_settings/domain_settings.php?id='.$domain_uuid]);
echo button::create(['label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'button_reload','link'=>'default_settings_reload.php'.($search != '' ? '?search='.urlencode($search) : null),'style'=>'margin-right: 15px;']); echo button::create(['label'=>$text['button-reload'],'icon'=>$_SESSION['theme']['button_icon_reset'],'type'=>'button','id'=>'button_reload','link'=>'default_settings_reload.php'.($search != '' ? '?search='.urlencode($search) : null),'style'=>'margin-right: 15px;']);
if (permission_exists('default_setting_add')) { if (permission_exists('default_setting_add')) {
echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'default_setting_edit.php']); echo button::create(['type'=>'button','label'=>$text['button-add'],'icon'=>$_SESSION['theme']['button_icon_add'],'id'=>'btn_add','link'=>'default_setting_edit.php?'.$query_string]);
} }
if (permission_exists('default_setting_add') && $default_settings) { if (permission_exists('default_setting_add') && $default_settings) {
if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) { if (permission_exists("domain_select") && permission_exists("domain_setting_add") && count($_SESSION['domains']) > 1) {
@ -393,7 +402,7 @@
echo "</tr>\n"; echo "</tr>\n";
} }
if (permission_exists('default_setting_edit')) { if (permission_exists('default_setting_edit')) {
$list_row_url = "default_setting_edit.php?id=".urlencode($row['default_setting_uuid']); $list_row_url = "default_setting_edit.php?id=".urlencode($row['default_setting_uuid']).'&'.$query_string;
} }
echo "<tr class='list-row' href='".$list_row_url."'>\n"; echo "<tr class='list-row' href='".$list_row_url."'>\n";
if (permission_exists('default_setting_add') || permission_exists('default_setting_edit') || permission_exists('default_setting_delete')) { if (permission_exists('default_setting_add') || permission_exists('default_setting_edit') || permission_exists('default_setting_delete')) {