mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-27 19:23:24 +02:00
Merge remote-tracking branch 'stevee/next-ddns-opendns.com-fix' into next
This commit is contained in:
@@ -314,8 +314,17 @@ if ($settings{'ACTION'} eq $Lang::tr{'edit'}) {
|
|||||||
# Splitt lines (splitting element is a single ",") and save values into temp array.
|
# Splitt lines (splitting element is a single ",") and save values into temp array.
|
||||||
@temp = split(/\,/,$line);
|
@temp = split(/\,/,$line);
|
||||||
|
|
||||||
|
# Handle hostname details. Only connect the values with a dott if both are available.
|
||||||
|
my $hostname;
|
||||||
|
|
||||||
|
if (($temp[1]) && ($temp[2])) {
|
||||||
|
$hostname = "$temp[1].$temp[2]";
|
||||||
|
} else {
|
||||||
|
$hostname = "$temp[1]";
|
||||||
|
}
|
||||||
|
|
||||||
$settings{'SERVICE'} = $temp[0];
|
$settings{'SERVICE'} = $temp[0];
|
||||||
$settings{'HOSTNAME'} = "$temp[1].$temp[2]";
|
$settings{'HOSTNAME'} = $hostname;
|
||||||
$settings{'PROXY'} = $temp[3];
|
$settings{'PROXY'} = $temp[3];
|
||||||
$settings{'WILDCARDS'} = $temp[4];
|
$settings{'WILDCARDS'} = $temp[4];
|
||||||
$settings{'LOGIN'} = $temp[5];
|
$settings{'LOGIN'} = $temp[5];
|
||||||
@@ -536,11 +545,20 @@ END
|
|||||||
$col="bgcolor='$color{'color22'}'";
|
$col="bgcolor='$color{'color22'}'";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Handle hostname details. Only connect the values with a dott if both are available.
|
||||||
|
my $hostname="";
|
||||||
|
|
||||||
|
if (($temp[1]) && ($temp[2])) {
|
||||||
|
$hostname="$temp[1].$temp[2]";
|
||||||
|
} else {
|
||||||
|
$hostname="$temp[1]";
|
||||||
|
}
|
||||||
|
|
||||||
# The following HTML Code still is part of the loop.
|
# The following HTML Code still is part of the loop.
|
||||||
print <<END;
|
print <<END;
|
||||||
<tr>
|
<tr>
|
||||||
<td align='center' $col><a href='http://$temp[0]'>$temp[0]</a></td>
|
<td align='center' $col><a href='http://$temp[0]'>$temp[0]</a></td>
|
||||||
<td align='center' $col>$sync$temp[1].$sync$temp[2]</td>
|
<td align='center' $col>$sync$hostname</td>
|
||||||
|
|
||||||
<td align='center' $col><form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
<td align='center' $col><form method='post' action='$ENV{'SCRIPT_NAME'}'>
|
||||||
<input type='hidden' name='ID' value='$id'>
|
<input type='hidden' name='ID' value='$id'>
|
||||||
@@ -641,7 +659,13 @@ sub GenerateDDNSConfigFile {
|
|||||||
# Skip disabled entries.
|
# Skip disabled entries.
|
||||||
next if ($enabled eq "off");
|
next if ($enabled eq "off");
|
||||||
|
|
||||||
print FILE "[$hostname.$domain]\n";
|
# Handle hostname details. Only connect the values with a dott if both are available.
|
||||||
|
if (($hostname) && ($domain)) {
|
||||||
|
print FILE "[$hostname.$domain]\n";
|
||||||
|
} else {
|
||||||
|
print FILE "[$hostname]\n";
|
||||||
|
}
|
||||||
|
|
||||||
print FILE "provider = $provider\n";
|
print FILE "provider = $provider\n";
|
||||||
|
|
||||||
my $use_token = 0;
|
my $use_token = 0;
|
||||||
|
|||||||
Reference in New Issue
Block a user