lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 08:09:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firewall/alias, forgot about updatefreq

Browse Source
This commit is contained in:
Ad Schellevis 2018-08-05 17:52:07 +02:00
parent 26ba02c9af
commit 61697e050e
3 changed files with 68 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/opnsense/mvc/app/models/OPNsense/Firewall/Alias.xml
View File

@ -40,8 +40,10 @@
<IPv6>IPv6</IPv6>
</OptionValues>
</proto>
<content type=".\AliasContentField">
</content>
<updatefreq type="NumericField">
<ValidationMessage>Days and hours should be numeric values or left empty</ValidationMessage>
</updatefreq>
<content type=".\AliasContentField"/>
<description type="TextField">
<Required>N</Required>
<mask>/^([\t\n\v\f\r 0-9a-zA-Z.\-,_\x{00A0}-\x{FFFF}]){1,255}$/u</mask>

3
src/opnsense/mvc/app/models/OPNsense/Firewall/Migrations/M1_0_0.php
View File

@ -79,6 +79,9 @@ class M1_0_0 extends BaseModelMigration
if ($alias->proto) {
$node->proto = (string)$alias->proto;
}
if ($alias->updatefreq) {
$node->updatefreq = (string)$alias->updatefreq;
}
}
}
}

62
src/opnsense/mvc/app/views/OPNsense/Firewall/alias.volt
View File

@ -12,6 +12,10 @@
background-color: transparent !important;
}
.update_table {
background-color: transparent !important;
}
.geo_area_check {
cursor: pointer;
}
@ -128,6 +132,7 @@
*/
$("#alias\\.type").change(function(){
$(".alias_type").hide();
$("#row_alias\\.updatefreq").hide();
switch ($(this).val()) {
case 'geoip':
$("#alias_type_geoip").show();
@ -135,6 +140,8 @@
break;
case 'external':
break;
case 'urltable':
$("#row_alias\\.updatefreq").show();
default:
$("#alias_type_default").show();
$("#alias\\.proto").selectpicker('hide');
@ -157,7 +164,32 @@
});
$(".geoip_select").selectpicker('refresh');
geoip_update_labels();
})
});
/**
* update expiration (updatefreq is splitted into days and hours on the form)
*/
$("#alias\\.updatefreq").change(function(){
var freq = $(this).val();
var freq_hours = ((parseFloat(freq) - parseInt(freq)) * 24.0).toFixed(2);
var freq_days = parseInt(freq);
$("input[data-id=\"alias.updatefreq_hours\"]").val(freq_hours);
$("input[data-id=\"alias.updatefreq_days\"]").val(freq_days);
});
$(".updatefreq").keyup(function(){
var freq = 0.0;
if ($("input[data-id=\"alias.updatefreq_days\"]").val().trim() != "") {
freq = parseFloat($("input[data-id=\"alias.updatefreq_days\"]").val());
}
if ($("input[data-id=\"alias.updatefreq_hours\"]").val().trim() != "") {
freq += (parseFloat($("input[data-id=\"alias.updatefreq_hours\"]").val()) / 24.0);
}
if (freq != 0.0) {
$("#alias\\.updatefreq").val(freq);
} else {
$("#alias\\.updatefreq").val("");
}
});
});
@ -276,6 +308,34 @@
<span class="help-block" id="help_block_alias.type"></span>
</td>
</tr>
<tr id="row_alias.updatefreq">
<td>
<div class="control-label" id="control_label_alias.updatefreq">
<i class="fa fa-info-circle text-muted"></i>
<b>{{lang._('Expiration')}}</b>
</div>
</td>
<td>
<input type="text" class="form-control" id="alias.updatefreq" style="display: none">
<table class="table table-condensed update_table">
<thead>
<tr>
<th>{{lang._('Days')}}</th>
<th>{{lang._('Hours')}}</th>
</tr>
</thead>
<tbody>
<tr>
<td><input data-id="alias.updatefreq_days" type="text" class="updatefreq form-control"></td>
<td><input data-id="alias.updatefreq_hours" type="text" class="updatefreq form-control"></td>
</tr>
</tbody>
</table>
</td>
<td>
<span class="help-block" id="help_block_alias.updatefreq"></span>
</td>
</tr>
<tr id="row_alias.content">
<td>
<div class="control-label" id="control_label_alias.content">