Merge remote-tracking branch 'origin/next' into thirteen

This commit is contained in:
Arne Fitzenreiter
2012-12-17 10:16:46 +01:00
6 changed files with 20 additions and 5 deletions

View File

@@ -118,6 +118,8 @@ if ($settings{'ACTION'} eq $Lang::tr{'toggle enable disable'}) {
}
if ($settings{'ACTION'} eq $Lang::tr{'add'}) {
# Convert subnet masks to CIDR notation.
$settings{'IP'} = &General::iporsubtocidr($settings{'IP'});
# Validate inputs
if (( !&General::validip($settings{'IP'})) and ( !&General::validipandmask($settings{'IP'}))){
@@ -443,4 +445,4 @@ sub SortDataFile
#
sub BuildConfiguration {
system '/usr/local/bin/rebuildroutes';
}
}