added backupiso to gui

diff --git a/config/backup/backup.pl b/config/backup/backup.pl
index 15dc0ac6ffe91dade3480d020ecd6994dcad6485..5633569fda217449790de58d1d0f6ee68577f9a0 100644 (file)
--- a/config/backup/backup.pl
+++ b/config/backup/backup.pl
@@ -32,7 +32,7 @@ $Monatstag = sprintf("%02d", $Monatstag);
 $Stunden = sprintf("%02d", $Stunden);
 $Minuten = sprintf("%02d", $Minuten);
 
-if ($ARGV[0] eq 'include') {
+if (($ARGV[0] eq 'include') || ($ARGV[0] eq 'iso')) {
   &createinclude;
     my @files = `find / -name *.log* 2>/dev/null`;
     foreach (@files){
@@ -48,6 +48,9 @@ if ($ARGV[0] eq 'include') {
   close(DATEI);
   system("tar -cvzf /var/ipfire/backup/$Jahr$Monat$Monatstag-$Stunden$Minuten.ipf --files-from='/tmp/include' --exclude-from='/var/ipfire/backup/exclude'");
   system("rm /tmp/include");
+  if ($ARGV[0] eq 'iso') {
+       system("/usr/local/bin/backupiso $Jahr$Monat$Monatstag-$Stunden$Minuten &");
+  }
 }
 elsif ($ARGV[0] eq 'exclude') {
   &createinclude;

diff --git a/html/cgi-bin/backup.cgi b/html/cgi-bin/backup.cgi
index a007ea650c211ca4c424ba73215a10864d852b30..0592ef82cdbd63204b98153d765d0e999f2fd23c 100644 (file)
--- a/html/cgi-bin/backup.cgi
+++ b/html/cgi-bin/backup.cgi
@@ -113,8 +113,13 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' cont
 
 if ( $cgiparams{'ACTION'} eq "backup" )
 {
-       if ( $cgiparams{'BACKUPLOGS'} eq "include" ){system("/usr/local/bin/backupctrl include >/dev/null 2>&1");}
-       else {system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1");}
+       if ( $cgiparams{'BACKUPLOGS'} eq "include" ) {
+               system("/usr/local/bin/backupctrl include >/dev/null 2>&1");
+       } elsif ( $cgiparams{'BACKUPLOGS'} eq "exclude" ) {
+               system("/usr/local/bin/backupctrl exclude >/dev/null 2>&1");
+       } elsif ( $cgiparams{'BACKUPLOGS'} eq "iso" ) {
+               system("/usr/local/bin/backupctrl iso >/dev/null 2>&1");
+       }
 }
 if ( $cgiparams{'ACTION'} eq "addonbackup" )
 {
@@ -141,10 +146,14 @@ my @backups = `cd /var/ipfire/backup/ && ls *.ipf 2>/dev/null`;
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
 <table width='95%' cellspacing='0'>
-<tr><td align='left' width='40%'>$Lang::tr{'logs'}</td><td align='left'>$Lang::tr{'include logfiles'}
-       <input type='radio' name='BACKUPLOGS' value='include'/>/
-       <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/>$Lang::tr{'exclude logfiles'}
-</td></tr>
+<tr>
+       <td align='left' width='40%'>$Lang::tr{'logs'}</td>
+       <td align='left'>
+               <input type='radio' name='BACKUPLOGS' value='include'/> $Lang::tr{'include logfiles'}<br/>
+               <input type='radio' name='BACKUPLOGS' value='exclude' checked='checked'/> $Lang::tr{'exclude logfiles'}<br/>
+               <input type='radio' name='BACKUPLOGS' value='iso' /> $Lang::tr{'generate iso'}
+       </td>
+</tr>
 <tr><td align='center' colspan='2'>
        <input type='hidden' name='ACTION' value='backup' />
        <input type='image' alt='$Lang::tr{'backup'}' title='$Lang::tr{'backup'}' src='/images/document-save.png' />

diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi
index 3510b1789c5adfecad77288027d681aec79313f9..362e7b38c62dffd4b076bc799a08cd9e4a8d1829 100644 (file)
--- a/html/cgi-bin/ids.cgi
+++ b/html/cgi-bin/ids.cgi
@@ -459,7 +459,7 @@ print <<END
        <td><b>$Lang::tr{'ids preprocessor'}</b></td>
 </tr>
 <tr>
-       <td><input type='checkbox' name='ENABLE_PREPROCESSOR_HTTP_INSPECT' $checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'on'} />  http_inspect
+       <td><input type='checkbox' name='ENABLE_PREPROCESSOR_HTTP_INSPECT' $checked{'ENABLE_PREPROCESSOR_HTTP_INSPECT'}{'on'} />  http_inspect $Lang::tr{'active'}
 <tr>
        <td><hr /></td>
 </tr>