VladPolskiy/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2025-08-16 14:51:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed incorrect error message

Browse Source
This commit is contained in:
Jamie Cameron
2007-05-22 23:39:23 +00:00
parent 6114fb89b7
commit 3e47fb980d
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
backup-config/backup-config-lib.pl
View File

@ -156,10 +156,12 @@ sub parse_backup_destination
local %in = %{$_[1]};
local $mode = $in{"$_[0]_mode"};
if ($mode == 0) {
# Local file
$in{"$_[0]_file"} =~ /^\/\S/ || &error($text{'backup_edest'});
return $in{"$_[0]_file"};
}
elsif ($mode == 1) {
# FTP server
gethostbyname($in{"$_[0]_server"}) || &error($text{'backup_eserver1'});
$in{"$_[0]_path"} =~ /^\/\S/ || &error($text{'backup_epath'});
$in{"$_[0]_user"} =~ /^[^:]*$/ || &error($text{'backup_euser'});
@ -168,8 +170,9 @@ elsif ($mode == 1) {
$in{"$_[0]_server"}.$in{"$_[0]_path"};
}
elsif ($mode == 2) {
# SSH server
gethostbyname($in{"$_[0]_sserver"}) || &error($text{'backup_eserver2'});
$in{"$_[0]_spath"} =~ /^\/\S/ || &error($text{'backup_epath'});
$in{"$_[0]_spath"} =~ /^\/\S/ || &error($text{'backup_epath2'});
$in{"$_[0]_suser"} =~ /^[^:]*$/ || &error($text{'backup_euser'});
$in{"$_[0]_spass"} =~ /^[^\@]*$/ || &error($text{'backup_epass'});
return "ssh://".$in{"$_[0]_suser"}.":".$in{"$_[0]_spass"}."\@".

1
backup-config/lang/en
View File

@ -65,6 +65,7 @@ backup_edest=Missing or invalid absolute local file
backup_eserver1=Missing or invalid FTP server
backup_eserver2=Missing or invalid SSH server
backup_epath=Missing or invalid absolute path on FTP server
backup_epath2=Missing or invalid absolute path on SSH server
backup_euser=Invalid characters in FTP server login
backup_epass=Invalid characters in FTP server password
backup_emods=No modules selected