corrected 2 cgi issues

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@1063 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 8ccc3ad6937d584ab8e2d09718a890416cf2ee94..15dc0ac6ffe91dade3480d020ecd6994dcad6485 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -77,7 +77,9 @@ elsif ($ARGV[0] eq '') {
  printf "No argument given, please use <include><exclude><cli>\n"
 }
 elsif ($ARGV[0] eq 'makedirs') {
  printf "No argument given, please use <include><exclude><cli>\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(){
 }
 
 sub createinclude(){

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index bc7f498b14a147ae40b62c041add347afde3513f..552132250d9c3bc34a706808549e6941b63bbe91 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -51,7 +51,7 @@ $cgiparams{'BACKUPLOGS'} = '';
 ############################################################################################################################
 ################################################ Workaround for Directories ################################################
 
 ############################################################################################################################
 ################################################ 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 ###############################################
 
 ############################################################################################################################
 ############################################## System calls ohne Http Header ###############################################

diff --git a/html/cgi-bin/samba.cgi b/html/cgi-bin/samba.cgi
index 8950fecebee2346c274146bc26c77633cfb3377a..787104ad5cba5da72a1ce0d268e86f84c65f4963 100644 (file)
--- 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{'WINSSRV'} = '';
 $sambasettings{'WINSSUPPORT'} = 'on';
 $sambasettings{'REMOTEANNOUNCE'} = '';

+$sambasettings{'REMOTESYNC'} = '';

 $sambasettings{'PASSWORDSYNC'} = 'off';
 $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
 $sambasettings{'GUESTACCOUNT'} = 'samba';
 $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{'WINSSRV'} = '';
        $sambasettings{'WINSSUPPORT'} = 'on';
        $sambasettings{'REMOTEANNOUNCE'} = '';

+       $sambasettings{'REMOTESYNC'} = '';

        $sambasettings{'PASSWORDSYNC'} = 'off';
        $sambasettings{'OTHERINTERFACES'} = '127.0.0.1';
        $sambasettings{'GUESTACCOUNT'} = 'samba';
        $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'}
 interfaces = $sambasettings{'INTERFACES'}
 socket options = $sambasettings{'SOCKETOPTIONS'}
 remote announce = $sambasettings{'REMOTEANNOUNCE'}

+remote browse sync = $sambasettings{'REMOTESYNC'}

 
 username level = 1
 wins support = $sambasettings{'WINSSUPPORT'}
 
 username level = 1
 wins support = $sambasettings{'WINSSUPPORT'}


@@ -463,13 +466,17 @@ print <<END
                                                                                                                                                                                <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
                                                                                                                                                                                <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
                                                                                                                                                                                </select></td></tr>
                                                                                                                                                                                <option value='Bad User' $selected{'MAPTOGUEST'}{'Bad User'}>Bad User</option>
                                                                                                                                                                                <option value='Bad Password' $selected{'MAPTOGUEST'}{'Bad Password'}>Bad Password</option>
                                                                                                                                                                                </select></td></tr>

-<tr><td align='left' width='40%'>$Lang::tr{'unix password sync'}</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
-                                                                                                                                                                                                               <input type='radio' name='PASSWORDSYNC' value='off' $checked{'PASSWORDSYNC'}{'off'} /> off</td></tr>
+END
+;
+#<tr><td align='left' width='40%'>$Lang::tr{'unix password sync'}</td><td align='left'>on <input type='radio' name='PASSWORDSYNC' value='on' $checked{'PASSWORDSYNC'}{'on'} />/
+#                                                                                                                                                                                                              <input type='radio' name='PASSWORDSYNC' value='off' $checked{'PASSWORDSYNC'}{'off'} /> off</td></tr>
+print <<END

 <tr><td align='left'><br /></td><td /></tr>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>
 <tr><td align='left'><br /></td><td /></tr>
 <tr bgcolor='$color{'color20'}'><td colspan='2' align='left'><b>$Lang::tr{'network options'}</b></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'os level'}</td><td align='left'><input type='text' name='OSLEVEL' value='$sambasettings{'OSLEVEL'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'socket options'}</td><td align='left'><input type='text' name='SOCKETOPTIONS' value='$sambasettings{'SOCKETOPTIONS'}' size="30" /></td></tr>
 <tr><td align='left' width='40%'>$Lang::tr{'remote announce'}</td><td align='left'><input type='text' name='REMOTEANNOUNCE' value='$sambasettings{'REMOTEANNOUNCE'}' size="30" /></td></tr>

+<tr><td align='left' width='40%'>$Lang::tr{'remote browse sync'}</td><td align='left'><input type='text' name='REMOTESYNC='$sambasettings{'REMOTESYNC'}' size="30" /></td></tr>

 END
 ;
 if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>$Lang::tr{'wins server'}</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}
 END
 ;
 if ($sambasettings{'WINSSUPPORT'} eq 'off') {print"<tr><td align='left' width='40%'>$Lang::tr{'wins server'}</td><td align='left'><input type='text' name='WINSSRV' value='$sambasettings{'WINSSRV'}' size='30' /></td></tr>";}

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 8385aabc155af60477e9271229944a64406eecc9..7d0798dae41a492a2c12d1e596ed8256f0576341 100644 (file)
--- 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',
 '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:',
 '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 7384db657817193f798e17c6bf55ade3f69342ad..9e0ae473f9516931be7c961668669425ec50d021 100644 (file)
--- 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',
 '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:',
 'remote host/ip' => 'Remote Host/IP',
 'remote logging' => 'Remote logging',
 'remote subnet' => 'Remote subnet:',