# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2005 Craig Barratt
+# Copyright (C) 2005-2007 Craig Barratt
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
#========================================================================
#
-# Version 3.0.0beta2, released 18 Nov 2006.
+# Version 3.1.0, released 25 Nov 2007.
#
# See http://backuppc.sourceforge.net.
#
{name => "Bzip2Path"},
{text => "CfgEdit_Title_Install_Paths"},
- {name => "TopDir"},
- {name => "ConfDir"},
- {name => "LogDir"},
+ #
+ # Can only edit TopDir and LogDir if we are in FHS mode.
+ # Otherwise they are hardcoded in lib/BackupPC/Lib.pm.
+ #
+ {name => "TopDir",
+ visible => sub { return $_[1]->useFHS(); } },
+ {name => "LogDir",
+ visible => sub { return $_[1]->useFHS(); } },
{name => "CgiDir"},
- {name => "InstallDir"},
+ #
+ # Cannot edit ConfDir or InstallDir, since the real value is hardcoded in
+ # lib/BackupPC/Lib.pm.
+ # {name => "ConfDir"},
+ # {name => "InstallDir"},
+ #
],
},
email => {
{name => "XferMethod", onchangeSubmit => 1},
{name => "XferLogLevel"},
{name => "ClientCharset"},
+ {name => "ClientCharsetLegacy"},
{text => "CfgEdit_Title_Smb_Settings",
visible => sub { return $_[0]->{XferMethod} eq "smb"; } },
}
if ( (my $var = $In{overrideUncheck}) ne "" ) {
#
- # a compound variable was unchecked; delete extra
- # variables to make the shape the same.
+ # a compound variable was unchecked; delete or
+ # add extra variables to make the shape the same.
#
#print STDERR Dumper(\%In);
foreach my $v ( keys(%In) ) {
- next if ( $v !~ /^v_z_(\Q$var\E(_z_.*|$))/ );
- delete($In{$v}) if ( !defined($In{"orig_z_$1"}) );
+ if ( $v =~ /^v_zZ_(\Q$var\E(_zZ_.*|$))/ ) {
+ delete($In{$v}) if ( !defined($In{"orig_zZ_$1"}) );
+ }
+ if ( $v =~ /^orig_zZ_(\Q$var\E(_zZ_.*|$))/ ) {
+ $In{"v_zZ_$1"} = $In{$v};
+ }
}
delete($In{"vflds.$var"});
}
return false;
}
var allVars = {};
- var varRE = new RegExp("^v_z_(" + varName + ".*)");
- var origRE = new RegExp("^orig_z_(" + varName + ".*)");
+ var varRE = new RegExp("^v_zZ_(" + varName + ".*)");
+ var origRE = new RegExp("^orig_zZ_(" + varName + ".*)");
for ( var i = 0 ; i < document.editForm.elements.length ; i++ ) {
var e = document.editForm.elements[i];
var re;
allVars[re[1]] = 0;
}
allVars[re[1]]++;
- //debugMsg("found v_z_ match with " + re[1]);
+ //debugMsg("found v_zZ_ match with " + re[1]);
//debugMsg("allVars[" + re[1] + "] = " + allVars[re[1]]);
} else if ( (re = origRE.exec(e.name)) != null ) {
if ( allVars[re[1]] == null ) {
} else {
// copy the original variable values
//debugMsg("setting " + v);
- eval("document.editForm.v_z_" + v + ".value = document.editForm.orig_z_" + v + ".value");
+ eval("document.editForm.v_zZ_" + v + ".value = document.editForm.orig_zZ_" + v + ".value");
}
}
if ( sameShape ) {
if ( $In{deleteVar} ne "" && %$errors > 0 ) {
my $matchAll = 1;
foreach my $v ( keys(%$errors) ) {
- if ( $v ne $In{deleteVar} && $v !~ /^\Q$In{deleteVar}_z_/ ) {
+ if ( $v ne $In{deleteVar} && $v !~ /^\Q$In{deleteVar}_zZ_/ ) {
$matchAll = 0;
last;
}
($mesg, my $hostChange) = hostsDiffMesg($hostsNew);
$bpc->HostInfoWrite($hostsNew) if ( $hostChange );
foreach my $host ( keys(%$copyConf) ) {
- my $confData = $bpc->ConfigDataRead($copyConf->{$host});
+ #
+ # Currently host names are forced to lc when they
+ # are read from the hosts file. Therefore we need
+ # to force the from and to hosts to lc.
+ #
+ my $confData = $bpc->ConfigDataRead(lc($copyConf->{$host}));
my $fromHost = $copyConf->{$host};
- $err .= $bpc->ConfigDataWrite($host, $confData);
+ $err .= $bpc->ConfigDataWrite(lc($host), $confData);
$mesg .= eval("qq($Lang->{CfgEdit_Log_Copy_host_config})");
}
next if ( $disabled || $menuDisable{$menu}{top} );
if ( ref($paramInfo->{visible}) eq "CODE"
- && !&{$paramInfo->{visible}}($newConf) ) {
+ && !&{$paramInfo->{visible}}($newConf, $bpc) ) {
next;
}
if ( defined($In{menu}) || $In{saveAction} eq "Save" ) {
if ( $In{saveAction} eq "Save" && !$userHost ) {
#
- # Emit the new settings as orig_z_ parameters
+ # Emit the new settings as orig_zZ_ parameters
#
$doneParam = {};
foreach my $param ( keys(%ConfigMeta) ) {
}
} else {
#
- # Just switching menus: copy all the orig_z_ input parameters
+ # Just switching menus: copy all the orig_zZ_ input parameters
#
foreach my $var ( keys(%In) ) {
- next if ( $var !~ /^orig_z_/ );
+ next if ( $var !~ /^orig_zZ_/ );
my $val = decode_utf8($In{$var});
$contentHidden .= <<EOF;
<input type="hidden" name="$var" value="${EscHTML($val)}">
$varValue = [$varValue] if ( ref($varValue) ne "ARRAY" );
for ( my $i = 0 ; $i < @$varValue ; $i++ ) {
- $content .= fieldHiddenBuild($type->{child}, "${varName}_z_$i",
+ $content .= fieldHiddenBuild($type->{child}, "${varName}_zZ_$i",
$varValue->[$i], $prefix);
}
} elsif ( $type->{type} eq "hash" || $type->{type} eq "horizHash" ) {
<input type="hidden" name="vflds.$varName" value="${EscHTML($fld)}">
EOF
}
- $content .= fieldHiddenBuild($childType, "${varName}_z_$fld",
+ $content .= fieldHiddenBuild($childType, "${varName}_zZ_$fld",
$varValue->{$fld}, $prefix);
}
} elsif ( $type->{type} eq "shortlist" ) {
$varValue = [$varValue] if ( ref($varValue) ne "ARRAY" );
$varValue = join(", ", @$varValue);
$content .= <<EOF;
-<input type="hidden" name="${prefix}_z_$varName" value="${EscHTML($varValue)}">
+<input type="hidden" name="${prefix}_zZ_$varName" value="${EscHTML($varValue)}">
EOF
} else {
$content .= <<EOF;
-<input type="hidden" name="${prefix}_z_$varName" value="${EscHTML($varValue)}">
+<input type="hidden" name="${prefix}_zZ_$varName" value="${EscHTML($varValue)}">
EOF
}
return $content;
if ( $level == 0 ) {
my $lcVarName = lc($varName);
$content .= <<EOF;
-<tr><td class="border"><a href="?action=view&type=docs#item_%24conf%7b$lcVarName%7d">$varName</a>
+<tr><td class="border"><a href="?action=view&type=docs#item__conf_${lcVarName}_">$varName</a>
EOF
if ( defined($overrideVar) ) {
my $override_checked = "";
- if ( !$isError && $In{deleteVar} =~ /^\Q${varName}_z_/
- || !$isError && $In{insertVar} =~ /^\Q${varName}\E(_z_|$)/
- || !$isError && $In{addVar} =~ /^\Q${varName}\E(_z_|$)/ ) {
+ if ( !$isError && $In{deleteVar} =~ /^\Q${varName}_zZ_/
+ || !$isError && $In{insertVar} =~ /^\Q${varName}\E(_zZ_|$)/
+ || !$isError && $In{addVar} =~ /^\Q${varName}\E(_zZ_|$)/ ) {
$overrideSet = 1;
}
if ( $overrideSet ) {
$content .= "<td class=\"border\">\n";
$varValue = [] if ( !defined($varValue) );
$varValue = [$varValue] if ( ref($varValue) ne "ARRAY" );
- if ( !$isError && $In{deleteVar} =~ /^\Q${varName}_z_\E(\d+)$/
+ if ( !$isError && $In{deleteVar} =~ /^\Q${varName}_zZ_\E(\d+)$/
&& $1 < @$varValue ) {
#
# User deleted entry in this array
splice(@$varValue, $1, 1) if ( @$varValue > 1 || $type->{emptyOk} );
$In{deleteVar} = "";
}
- if ( !$isError && $In{insertVar} =~ /^\Q${varName}_z_\E(\d+)$/
+ if ( !$isError && $In{insertVar} =~ /^\Q${varName}_zZ_\E(\d+)$/
&& $1 < @$varValue ) {
#
# User inserted entry in this array
if ( @$varValue > 1 || $type->{emptyOk} ) {
$content .= <<EOF;
<td class="border">
-<input type="button" name="del_${varName}_z_$i" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}"
- onClick="deleteSubmit('${varName}_z_$i')">
+<input type="button" name="del_${varName}_zZ_$i" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}"
+ onClick="deleteSubmit('${varName}_zZ_$i')">
</td>
EOF
}
- $content .= fieldEditBuild($type->{child}, "${varName}_z_$i",
+ $content .= fieldEditBuild($type->{child}, "${varName}_zZ_$i",
$varValue->[$i], $errors, $level + 1, undef,
$isError, $onchangeSubmit,
$overrideVar, $overrideSet);
for ( my $i = 0 ; $i < @$varValue ; $i++ ) {
$content .= <<EOF;
<tr><td class="border">
-<input type="button" name="ins_${varName}_z_$i" value="${EscHTML($Lang->{CfgEdit_Button_Insert})}"
- onClick="insertSubmit('${varName}_z_$i')">
+<input type="button" name="ins_${varName}_zZ_$i" value="${EscHTML($Lang->{CfgEdit_Button_Insert})}"
+ onClick="insertSubmit('${varName}_zZ_$i')">
EOF
if ( @$varValue > 1 || $type->{emptyOk} ) {
$content .= <<EOF;
-<input type="button" name="del_${varName}_z_$i" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}"
- onClick="deleteSubmit('${varName}_z_$i')">
+<input type="button" name="del_${varName}_zZ_$i" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}"
+ onClick="deleteSubmit('${varName}_zZ_$i')">
EOF
}
$content .= "</td>\n";
- $content .= fieldEditBuild($type->{child}, "${varName}_z_$i",
+ $content .= fieldEditBuild($type->{child}, "${varName}_zZ_$i",
$varValue->[$i], $errors, $level + 1, undef,
$isError, $onchangeSubmit,
$overrideVar, $overrideSet);
$varValue = {} if ( ref($varValue) ne "HASH" );
if ( !$isError && !$type->{noKeyEdit}
- && $In{deleteVar} !~ /^\Q${varName}_z_\E.*_z_/
- && $In{deleteVar} =~ /^\Q${varName}_z_\E(.*)$/ ) {
+ && $In{deleteVar} !~ /^\Q${varName}_zZ_\E.*_zZ_/
+ && $In{deleteVar} =~ /^\Q${varName}_zZ_\E(.*)$/ ) {
#
# User deleted entry in this hash
#
if ( !$type->{noKeyEdit}
&& (keys(%$varValue) > 1 || $type->{emptyOk}) ) {
$content .= <<EOF;
-<input type="submit" name="del_${varName}_z_$fld" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}"
- onClick="deleteSubmit('${varName}_z_$fld')">
+<input type="submit" name="del_${varName}_zZ_$fld" value="${EscHTML($Lang->{CfgEdit_Button_Delete})}"
+ onClick="deleteSubmit('${varName}_zZ_$fld')">
EOF
}
if ( defined($type->{child}) ) {
EOF
}
$content .= "</td>\n";
- $content .= fieldEditBuild($childType, "${varName}_z_$fld",
+ $content .= fieldEditBuild($childType, "${varName}_zZ_$fld",
$varValue->{$fld}, $errors, $level + 1, undef,
$isError, $onchangeSubmit,
$overrideVar, $overrideSet);
<input type="hidden" name="vflds.$varName" value="${EscHTML($fld)}">
EOF
}
- $content .= fieldEditBuild($childType, "${varName}_z_$fld",
+ $content .= fieldEditBuild($childType, "${varName}_zZ_$fld",
$varValue->{$fld}, $errors, $level + 1, undef,
$isError, $onchangeSubmit,
$overrideVar, $overrideSet);
# in %In, rather than the parsed values in $varValue.
# This is so that the user's erroneous input is preserved.
#
- $varValue = $In{"v_z_$varName"} if ( defined($In{"v_z_$varName"}) );
+ $varValue = $In{"v_zZ_$varName"} if ( defined($In{"v_zZ_$varName"}) );
}
if ( defined($errors->{$varName}) ) {
$content .= <<EOF;
if ( defined($overrideVar) ) {
$onChange .= "checkboxSet('$overrideVar');";
} else {
- $onChange .= "varChange('$overrideVar');";
+ $onChange .= "varChange('$varName');";
}
if ( $onchangeSubmit ) {
$onChange .= "document.editForm.submit();";
}
my $textType = ($varName =~ /Passwd/) ? "password" : "text";
$content .= <<EOF;
-<input type="$textType" class="editTextInput" name="v_z_$varName" size="$size" maxlength="256" value="${EscHTML($varValue)}"$onChange>
+<input type="$textType" class="editTextInput" name="v_zZ_$varName" size="$size" maxlength="256" value="${EscHTML($varValue)}"$onChange>
EOF
} elsif ( $type->{type} eq "boolean" ) {
# checkbox
my $checked = "checked" if ( $varValue );
$content .= <<EOF;
-<input type="checkbox" name="v_z_$varName" $checked value="1"$onChange>
+<input type="checkbox" name="v_zZ_$varName" $checked value="1"$onChange>
EOF
} elsif ( $type->{type} eq "select" ) {
$content .= <<EOF;
-<select name="v_z_$varName"$onChange>
+<select name="v_zZ_$varName"$onChange>
EOF
foreach my $option ( @{$type->{values}} ) {
my $sel = " selected" if ( $varValue eq $option );
my $rowCnt = $varValue =~ tr/\n//;
$rowCnt = 1 if ( $rowCnt < 1 );
$content .= <<EOF;
-<textarea name="v_z_$varName" class="editTextArea" cols="$size" rows="$rowCnt"$onChange>${EscHTML($varValue)}</textarea>
+<textarea name="v_zZ_$varName" class="editTextArea" cols="$size" rows="$rowCnt"$onChange>${EscHTML($varValue)}</textarea>
EOF
}
$content .= "</td>\n";
if ( $type->{type} eq "list" ) {
for ( my $i = 0 ; ; $i++ ) {
- last if ( fieldErrorCheck($type->{child}, "${varName}_z_$i", $errors) );
+ last if ( fieldErrorCheck($type->{child}, "${varName}_zZ_$i", $errors) );
}
} elsif ( $type->{type} eq "hash" || $type->{type} eq "horizHash" ) {
my(@order, $childType);
} else {
$childType = $type->{childType};
}
- $ret ||= fieldErrorCheck($childType, "${varName}_z_$fld", $errors);
+ $ret ||= fieldErrorCheck($childType, "${varName}_zZ_$fld", $errors);
}
return $ret;
} else {
- $In{"v_z_$varName"} = "0" if ( $type->{type} eq "boolean"
- && $In{"v_z_$varName"} eq "" );
+ $In{"v_zZ_$varName"} = "0" if ( $type->{type} eq "boolean"
+ && $In{"v_zZ_$varName"} eq "" );
- return 1 if ( !exists($In{"v_z_$varName"}) );
+ return 1 if ( !exists($In{"v_zZ_$varName"}) );
- (my $var = $varName) =~ s/_z_/./g;
+ (my $var = $varName) =~ s/_zZ_/./g;
if ( $type->{type} eq "integer"
|| $type->{type} eq "boolean" ) {
- if ( $In{"v_z_$varName"} !~ /^-?\d+\s*$/s
- && $In{"v_z_$varName"} ne "" ) {
+ if ( $In{"v_zZ_$varName"} !~ /^-?\d+\s*$/s
+ && $In{"v_zZ_$varName"} ne "" ) {
$errors->{$varName} = eval("qq{$Lang->{CfgEdit_Error__must_be_an_integer}}");
}
} elsif ( $type->{type} eq "float" ) {
- if ( $In{"v_z_$varName"} !~ /^-?\d*(\.\d*)?\s*$/s
- && $In{"v_z_$varName"} ne "" ) {
+ if ( $In{"v_zZ_$varName"} !~ /^-?\d*(\.\d*)?\s*$/s
+ && $In{"v_zZ_$varName"} ne "" ) {
$errors->{$varName}
= eval("qq{$Lang->{CfgEdit_Error__must_be_real_valued_number}}");
}
} elsif ( $type->{type} eq "shortlist" ) {
- my @vals = split(/[,\s]+/, $In{"v_z_$varName"});
+ my @vals = split(/[,\s]+/, $In{"v_zZ_$varName"});
for ( my $i = 0 ; $i < @vals ; $i++ ) {
if ( $type->{child} eq "integer"
&& $vals[$i] !~ /^-?\d+\s*$/s
} elsif ( $type->{type} eq "select" ) {
my $match = 0;
foreach my $option ( @{$type->{values}} ) {
- if ( $In{"v_z_$varName"} eq $option ) {
+ if ( $In{"v_zZ_$varName"} eq $option ) {
$match = 1;
last;
}
$errors->{$varName} = eval("qq{$Lang->{CfgEdit_Error__must_be_valid_option}}")
if ( !$match );
} elsif ( $type->{type} eq "execPath" ) {
- if ( $In{"v_z_$varName"} ne "" && !-x $In{"v_z_$varName"} ) {
+ if ( $In{"v_zZ_$varName"} ne "" && !-x $In{"v_zZ_$varName"} ) {
$errors->{$varName} = eval("qq{$Lang->{CfgEdit_Error__must_be_executable_program}}");
}
} else {
$$value = [];
for ( my $i = 0 ; ; $i++ ) {
my $val;
- last if ( fieldInputParse($type->{child}, "${varName}_z_$i", \$val) );
+ last if ( fieldInputParse($type->{child}, "${varName}_zZ_$i", \$val) );
push(@$$value, $val);
}
$$value = undef if ( $type->{undefIfEmpty} && @$$value == 0 );
} else {
$childType = $type->{childType};
}
- $ret ||= fieldInputParse($childType, "${varName}_z_$fld", \$val);
+ $ret ||= fieldInputParse($childType, "${varName}_zZ_$fld", \$val);
last if ( $ret );
$$value->{$fld} = $val;
}
return $ret;
} else {
if ( $type->{type} eq "boolean" ) {
- $$value = 0 + $In{"v_z_$varName"};
- } elsif ( !exists($In{"v_z_$varName"}) ) {
+ $$value = 0 + $In{"v_zZ_$varName"};
+ } elsif ( !exists($In{"v_zZ_$varName"}) ) {
return 1;
}
- my $v = $In{"v_z_$varName"};
+ my $v = $In{"v_zZ_$varName"};
if ( $type->{type} eq "integer" ) {
if ( $v =~ /^-?\d+\s*$/s || $v eq "" ) {
}
}
} else {
- $$value = decode_utf8($In{"v_z_$varName"});
+ $$value = decode_utf8($In{"v_zZ_$varName"});
$$value =~ s/\r\n/\n/g;
+ # remove leading space from exec paths
+ $$value =~ s/^\s+// if ( $type->{type} eq "execPath" );
}
$$value = undef if ( $type->{undefIfEmpty} && $$value eq "" );
}
projects / BackupPC.git / blobdiff