lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter, cleanup, move update_alias_names_upon_change() to firewall_aliases_edit.php now it's only used there.

Browse Source
This commit is contained in:
Ad Schellevis 2017-09-12 13:11:26 +02:00
parent 6f15e5999f
commit 9b112011d2
2 changed files with 47 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/etc/inc/filter.inc
View File

@ -138,52 +138,6 @@ function download_file($url, $destination, $verify_ssl = false, $connect_timeout
return ($http_code == 200);
}
function update_alias_names_upon_change($section, $field, $new_alias_name, $origname, $field_separator=null)
{
global $config;
if (!empty($origname) && !empty($new_alias_name)) {
// find section, return if not found
$sectionref = &config_read_array();
foreach ($section as $sectionname) {
if (!empty($sectionref[$sectionname]) && is_array($sectionref[$sectionname])) {
$sectionref = &$sectionref[$sectionname];
} else {
return;
}
}
// traverse all found sections
foreach($sectionref as $itemkey => $item) {
// locate field within structure
$fieldref = &$sectionref[$itemkey];
foreach($field as $fieldname) {
if (!empty($fieldref[$fieldname])) {
$fieldref = &$fieldref[$fieldname];
} else {
unset($fieldref);
break;
}
}
// if field is found, check and replace
if (isset($fieldref) && !is_array($fieldref)) {
if ($fieldref == $origname) {
$fieldref = $new_alias_name;
} elseif ($field_separator != null) {
// field contains more then one value
$parts = explode($field_separator, $fieldref);
foreach ($parts as &$part) {
if ($part == $origname) {
$part = $new_alias_name;
}
}
$new_field_value = implode($field_separator, $parts);
if ($new_field_value != $fieldref) {
$fieldref = $new_field_value;
}
}
}
}
}
}
function process_alias_urltable($name, $alias_type, $url, $freq, $forceupdate = false)
{

47
src/www/firewall_aliases_edit.php
View File

@ -33,6 +33,53 @@
require_once("guiconfig.inc");
require_once("filter.inc");
function update_alias_names_upon_change($section, $field, $new_alias_name, $origname, $field_separator=null)
{
global $config;
if (!empty($origname) && !empty($new_alias_name)) {
// find section, return if not found
$sectionref = &config_read_array();
foreach ($section as $sectionname) {
if (!empty($sectionref[$sectionname]) && is_array($sectionref[$sectionname])) {
$sectionref = &$sectionref[$sectionname];
} else {
return;
}
}
// traverse all found sections
foreach($sectionref as $itemkey => $item) {
// locate field within structure
$fieldref = &$sectionref[$itemkey];
foreach($field as $fieldname) {
if (!empty($fieldref[$fieldname])) {
$fieldref = &$fieldref[$fieldname];
} else {
unset($fieldref);
break;
}
}
// if field is found, check and replace
if (isset($fieldref) && !is_array($fieldref)) {
if ($fieldref == $origname) {
$fieldref = $new_alias_name;
} elseif ($field_separator != null) {
// field contains more then one value
$parts = explode($field_separator, $fieldref);
foreach ($parts as &$part) {
if ($part == $origname) {
$part = $new_alias_name;
}
}
$new_field_value = implode($field_separator, $parts);
if ($new_field_value != $fieldref) {
$fieldref = $new_field_value;
}
}
}
}
}
}
/**
* generate simple country selection list for geoip
*/