From 2a1f6aa7a8234b3123f4d83fd8ef61fe518765a1 Mon Sep 17 00:00:00 2001 From: maniacikarus Date: Mon, 5 Nov 2007 17:34:56 +0000 Subject: [PATCH] corrected 2 cgi issues git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1063 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- config/backup/backup.pl | 4 +++- html/cgi-bin/backup.cgi | 2 +- html/cgi-bin/samba.cgi | 11 +++++++++-- langs/de/cgi-bin/de.pl | 1 + langs/en/cgi-bin/en.pl | 1 + 5 files changed, 15 insertions(+), 4 deletions(-) diff --git a/config/backup/backup.pl b/config/backup/backup.pl index 8ccc3ad693..15dc0ac6ff 100644 --- a/config/backup/backup.pl +++ b/config/backup/backup.pl @@ -77,7 +77,9 @@ elsif ($ARGV[0] eq '') { printf "No argument given, please use \n" } elsif ($ARGV[0] eq 'makedirs') { - system("mkdir /var/ipfire/backup/addons && mkdir /var/ipfire/backup/addons/backup && mkdir /var/ipfire/backup/addons/includes"); + system("mkdir -p /var/ipfire/backup/addons"); + system("mkdir -p /var/ipfire/backup/addons/backup"); + system("mkdir -p /var/ipfire/backup/addons/includes"); } sub createinclude(){ diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi index bc7f498b14..552132250d 100644 --- a/html/cgi-bin/backup.cgi +++ b/html/cgi-bin/backup.cgi @@ -51,7 +51,7 @@ $cgiparams{'BACKUPLOGS'} = ''; ############################################################################################################################ ################################################ Workaround for Directories ################################################ -system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ipfire/backup/addons'); +system("/usr/local/bin/backupctrl makedirs >/dev/null 2>&1 ") unless ( -e '/var/ipfire/backup/addons/backup') ; ############################################################################################################################ ############################################## System calls ohne Http Header ############################################### diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi index 8950fecebe..787104ad5c 100644 --- a/html/cgi-bin/samba.cgi +++ b/html/cgi-bin/samba.cgi @@ -84,6 +84,7 @@ $sambasettings{'VPN'} = 'off'; $sambasettings{'WINSSRV'} = ''; $sambasettings{'WINSSUPPORT'} = 'on'; $sambasettings{'REMOTEANNOUNCE'} = ''; +$sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; @@ -144,6 +145,7 @@ if ($sambasettings{'ACTION'} eq 'globalresetyes') $sambasettings{'WINSSRV'} = ''; $sambasettings{'WINSSUPPORT'} = 'on'; $sambasettings{'REMOTEANNOUNCE'} = ''; + $sambasettings{'REMOTESYNC'} = ''; $sambasettings{'PASSWORDSYNC'} = 'off'; $sambasettings{'OTHERINTERFACES'} = '127.0.0.1'; $sambasettings{'GUESTACCOUNT'} = 'samba'; @@ -266,6 +268,7 @@ bind interfaces only = true interfaces = $sambasettings{'INTERFACES'} socket options = $sambasettings{'SOCKETOPTIONS'} remote announce = $sambasettings{'REMOTEANNOUNCE'} +remote browse sync = $sambasettings{'REMOTESYNC'} username level = 1 wins support = $sambasettings{'WINSSUPPORT'} @@ -463,13 +466,17 @@ print <Bad User -$Lang::tr{'unix password sync'}on / - off +END +; +#$Lang::tr{'unix password sync'}on / +# off +print <
$Lang::tr{'network options'} $Lang::tr{'os level'} $Lang::tr{'socket options'} $Lang::tr{'remote announce'} +$Lang::tr{'remote browse sync'} END ; if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"$Lang::tr{'wins server'}";} diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index 8385aabc15..7d0798dae4 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -1326,6 +1326,7 @@ 'remark title' => 'Anmerkung:', 'remote access' => 'Fernwartung', 'remote announce' => 'Remote Announce', +'remote browse sync' => 'Remote Browse Sync', 'remote host/ip' => 'Remote Host/IP', 'remote logging' => 'Remote logging', 'remote subnet' => 'Remote Subnetz:', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 7384db6578..9e0ae473f9 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -1355,6 +1355,7 @@ 'remark title' => 'Remark:', 'remote access' => 'Remote access', 'remote announce' => 'Remote Announce', +'remote browse sync' => 'Remote Browse Sync', 'remote host/ip' => 'Remote Host/IP', 'remote logging' => 'Remote logging', 'remote subnet' => 'Remote subnet:', -- 2.39.2