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

firewall/rules, move some more parse functions to the base class

Browse Source
This commit is contained in:
Ad Schellevis 2017-12-19 16:52:06 +01:00
parent f58c2ece05
commit 48465e49f0
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/opnsense/mvc/app/library/OPNsense/Firewall/FilterRule.php
View File

@ -65,62 +65,6 @@ class FilterRule extends Rule
'label' => 'parsePlain,label ",",63'
);
/**
* parse plain data
* @param string $value field value
* @param string $prefix prefix when $value is provided
* @param string $suffix suffix when $value is provided
* @param int $maxsize maximum size, cut when longer
* @return string
*/
private function parsePlain($value, $prefix = "", $suffix = "", $maxsize = null)
{
if (!empty($maxsize) && strlen($value) > $maxsize) {
$value = substr($value, 0, $maxsize);
}
return $value == null || $value === '' ? '' : $prefix . $value . $suffix . ' ';
}
/**
* parse plain data
* @param string $value field value
* @param string $prefix prefix when $value is provided
* @return string
*/
private function parsePlainCurly($value, $prefix = "")
{
$suffix = "";
if (strpos($value, '$') === false) {
// don't wrap aliases in curly brackets
$prefix = $prefix . "{";
$suffix = "}";
}
return $value == null || $value === '' ? '' : $prefix . $value . $suffix . ' ';
}
/**
* parse data, use replace map
* @param string $value field value
* @param string $map
* @return string
*/
private function parseReplaceSimple($value, $map, $prefix = "", $suffix = "")
{
$retval = $value;
foreach (explode('|', $map) as $item) {
$tmp = explode(':', $item);
if ($tmp[0] == $value) {
$retval = $tmp[1] . " ";
break;
}
}
if (!empty($retval)) {
return $prefix . $retval . $suffix . " ";
} else {
return "";
}
}
/**
* parse type
* @param string $value field value

56
src/opnsense/mvc/app/library/OPNsense/Firewall/Rule.php
View File

@ -74,6 +74,62 @@ abstract class Rule
}
}
/**
* parse plain data
* @param string $value field value
* @param string $prefix prefix when $value is provided
* @param string $suffix suffix when $value is provided
* @param int $maxsize maximum size, cut when longer
* @return string
*/
protected function parsePlain($value, $prefix = "", $suffix = "", $maxsize = null)
{
if (!empty($maxsize) && strlen($value) > $maxsize) {
$value = substr($value, 0, $maxsize);
}
return $value == null || $value === '' ? '' : $prefix . $value . $suffix . ' ';
}
/**
* parse plain data
* @param string $value field value
* @param string $prefix prefix when $value is provided
* @return string
*/
protected function parsePlainCurly($value, $prefix = "")
{
$suffix = "";
if (strpos($value, '$') === false) {
// don't wrap aliases in curly brackets
$prefix = $prefix . "{";
$suffix = "}";
}
return $value == null || $value === '' ? '' : $prefix . $value . $suffix . ' ';
}
/**
* parse data, use replace map
* @param string $value field value
* @param string $map
* @return string
*/
protected function parseReplaceSimple($value, $map, $prefix = "", $suffix = "")
{
$retval = $value;
foreach (explode('|', $map) as $item) {
$tmp = explode(':', $item);
if ($tmp[0] == $value) {
$retval = $tmp[1] . " ";
break;
}
}
if (!empty($retval)) {
return $prefix . $retval . $suffix . " ";
} else {
return "";
}
}
/**
* convert source/destination address entries as used by the gui
* @param array $rule rule