Debuginformationen aus den CGIs entfernt

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / pakfire.cgi

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 93c493ea7db8646bd0fd652686a2c6d38516f5e9..b10b5a7427e6afdceca34d6327b4370a56ba3357 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -11,8 +11,8 @@
 use strict;
 
 # enable only the following on debugging purpose
-use warnings;
-use CGI::Carp 'fatalsToBrowser';
+#use warnings;
+#use CGI::Carp 'fatalsToBrowser';
 
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
@@ -21,6 +21,8 @@ require "/opt/pakfire/lib/functions.pl";
 
 my %pakfiresettings=();
 my $errormessage = '';
+my %color = ();
+my %mainsettings = ();
 
 &Header::showhttpheaders();
 
@@ -33,6 +35,8 @@ $pakfiresettings{'AUTOUPDATE'} = 'off';
 $pakfiresettings{'UUID'} = 'on';
 
 &Header::getcgihash(\%pakfiresettings);
+&General::readhash("${General::swroot}/main/settings", \%mainsettings);
+&General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1);
 &Header::openbigbox('100%', 'left', '', $errormessage);
@@ -40,12 +44,12 @@ $pakfiresettings{'UUID'} = 'on';
 if ($pakfiresettings{'ACTION'} eq 'install'){
        $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
        if ("$pakfiresettings{'FORCE'}" eq "on") {
-               my $command = "/usr/local/bin/pakfire install --non-interactive $pakfiresettings{'INSPAKS'} &>/dev/null &";
+               my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
                system("$command");
                sleep(2);
        } else {
                &Header::openbox("100%", "center", "Abfrage");
-               my @output = `/usr/local/bin/pakfire resolvedeps $pakfiresettings{'INSPAKS'}`;
+       my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
                print <<END;
                <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
                <pre>           
@@ -77,13 +81,51 @@ END
        }
 } elsif ($pakfiresettings{'ACTION'} eq 'remove') {
 
+       $pakfiresettings{'DELPAKS'} =~ s/\|/\ /g;
+       if ("$pakfiresettings{'FORCE'}" eq "on") {
+               my $command = "/usr/local/bin/pakfire remove --non-interactive --no-colors $pakfiresettings{'DELPAKS'} &>/dev/null &";
+               system("$command");
+               sleep(2);
+       } else {
+               &Header::openbox("100%", "center", "Abfrage");
+       my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'DELPAKS'}`;
+               print <<END;
+               <table><tr><td colspan='2'>$Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'}
+               <pre>           
+END
+               foreach (@output) {
+                       print "$_\n";
+               }
+               print <<END;
+               </pre>
+               <tr><td colspan='2'>$Lang::tr{'pakfire accept all'}
+               <tr><td colspan='2'>&nbsp;
+               <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='DELPAKS' value='$pakfiresettings{'DELPAKS'}' />
+                                                       <input type='hidden' name='FORCE' value='on' />
+                                                       <input type='hidden' name='ACTION' value='remove' />
+                                                       <input type='image' alt='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
+                                               </form>
+                               <td align='left'>
+                                               <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                                       <input type='hidden' name='ACTION' value='' />
+                                                       <input type='image' alt='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
+                                               </form>
+               </table>
+END
+               &Header::closebox();
+               &Header::closebigbox();
+               &Header::closepage();
+               exit;
+       }
+
 } elsif ($pakfiresettings{'ACTION'} eq 'update') {
        
-       system("/usr/local/bin/pakfire update --force");
+       system("/usr/local/bin/pakfire update --force --no-colors");
 
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
        
-       system("/usr/local/bin/pakfire upgrade -y");
+       system("/usr/local/bin/pakfire upgrade -y --no-colors");
        
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
@@ -113,7 +155,7 @@ if ($errormessage) {
 my $return = `pidof pakfire`;
 chomp($return);
 if ($return) {
-       &Header::openbox("100%", "center", "Aktiv");
+       &Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='5;'>" );
        print <<END;
        <table>
                <tr><td>
@@ -126,13 +168,13 @@ if ($return) {
                        </form>
                <tr><td colspan='2' align='left'><pre>
 END
-my @output = `tail /var/log/messages | grep pakfire`;
-foreach (@output) {
-       print "$_";
-}
-print <<END;
-               </pre>
-       </table>
+       my @output = `tail -20 /var/log/pakfire.log`;
+       foreach (@output) {
+               print "$_";
+       }
+       print <<END;
+                       </pre>
+               </table>
 END
        &Header::closebox();
        &Header::closebigbox();
@@ -146,7 +188,8 @@ system("pakfire update &>dev/null");
 
 print <<END;
        <table width='100%'>
-               <tr><td width='40%' align="center">Verfuegbare Addons:<br />
+               <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b></td><td bgcolor='$color{'color20'}'></td><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
+               <tr><td width='40%' align="center">
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <select name="INSPAKS" size="10" multiple>
 END
@@ -169,7 +212,7 @@ print <<END;
                                <input type='hidden' name='ACTION' value='remove' />
                                <input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' />
                </td>
-               <td width='40%' align="center">$Lang::tr{'pakfire installed addons'}<br />
+               <td width='40%' align="center">
                        <select name="DELPAKS" size="10" multiple>
 END
 
@@ -178,10 +221,10 @@ END
 print <<END;
                </select>
        </table></form>
-               <br /><hr /><br />
+       <br />
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
        <table width='100%'>
-               <tr><td colspan='2'>$Lang::tr{'pakfire updates'}
+               <tr><td colspan='3' bgcolor='$color{'color20'}'><b>$Lang::tr{'pakfire updates'}</b></br>
                <tr><td width='20%'>&nbsp;<td width='60%' align='center'>
                        <select name="UPDPAKS" size="5" disabled>
 END
@@ -193,14 +236,15 @@ print <<END;
                <td width='20%' align='center' valign='middle'><input type='hidden' name='ACTION' value='upgrade' />
                        <input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
        </table></form>
-               <br /><hr /><br />
+       <br />
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='100%'>
+                       <tr><td colspan='4' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></br>
                        <tr><td width='40%' align="right">$Lang::tr{'pakfire update daily'}
                                        <td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
                                        <td width='40%' align="right">$Lang::tr{'pakfire register'} 
                                        <td width='10%' align="left"><input type="checkbox" name="UUID" $checked{'UUID'}{'on'} />
-                       <tr><td width='100%' colspan="4" align="right"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
+                       <tr><td width='100%' colspan="4" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
                </table>
        </form>
 END