]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/blobdiff - html/cgi-bin/pakfire.cgi
Fixed language string on pakfire.cgi.
[people/teissler/ipfire-2.x.git] / html / cgi-bin / pakfire.cgi
old mode 100644 (file)
new mode 100755 (executable)
index 42be29b..da761f0
@@ -1,18 +1,29 @@
 #!/usr/bin/perl
-#
-# IPFire CGIs
-#
-# This file is part of the IPFire Project
-# 
-# This code is distributed under the terms of the GPL
-#
-#
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
 
 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 +32,8 @@ require "/opt/pakfire/lib/functions.pl";
 
 my %pakfiresettings=();
 my $errormessage = '';
+my %color = ();
+my %mainsettings = ();
 
 &Header::showhttpheaders();
 
@@ -30,27 +43,41 @@ $pakfiresettings{'VALID'} = '';
 $pakfiresettings{'INSPAKS'} = '';
 $pakfiresettings{'DELPAKS'} = '';
 $pakfiresettings{'AUTOUPDATE'} = 'off';
+$pakfiresettings{'AUTOUPGRADE'} = 'off';
+$pakfiresettings{'HEALTHCHECK'} = 'on';
 $pakfiresettings{'UUID'} = 'on';
 
+sub refreshpage{&Header::openbox( 'Waiting', 1, "<meta http-equiv='refresh' content='1;'>" );print "<center><img src='/images/clock.gif' alt='' /><br/><font color='red'>$Lang::tr{'pagerefresh'}</font></center>";&Header::closebox();}
+
 &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);
 
+# check if reboot is necessary
+my $reboot = 0;
+if (`find /var/run/need_reboot 2>/dev/null`) {
+       $reboot = 1;    
+}
+
 if ($pakfiresettings{'ACTION'} eq 'install'){
        $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
        if ("$pakfiresettings{'FORCE'}" eq "on") {
                my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
                system("$command");
-               sleep(2);
+               system("/bin/sleep 1");
        } else {
-               &Header::openbox("100%", "center", "Abfrage");
-               my @output = `/usr/local/bin/pakfire resolvedeps --no-colors $pakfiresettings{'INSPAKS'}`;
+               &Header::openbox("100%", "center", $Lang::tr{'request'});
+       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>           
+               <pre>
 END
                foreach (@output) {
+                 $_ =~ s/\\e\[[0-1]\;[0-9]+m//g;
                        print "$_\n";
                }
                print <<END;
@@ -77,18 +104,68 @@ 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");
+               system("/bin/sleep 1");
+       } else {
+               &Header::openbox("100%", "center", $Lang::tr{'request'});
+       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) {
+                 $_ =~ s/\\e\[[0-1]\;[0-9]+m//g;
+                       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 --no-colors");
 
+       system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
+       system("/bin/sleep 1");
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
-       
-       system("/usr/local/bin/pakfire upgrade -y --no-colors");
-       
+       my $command = "/usr/local/bin/pakfire upgrade -y --no-colors &>/dev/null &";
+       system("$command");
+       system("/bin/sleep 1");
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
-       &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+       if ($pakfiresettings{'AUTOUPDATE'} eq 'on') {
+               system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1");
+       } else {
+               system("/usr/local/bin/pakfire disable updates  >/dev/null 2>&1");
+       }
 
+       if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') {
+               system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1");
+       } else {
+               system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1");
+       }
+
+       &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
 }
 
 &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
@@ -99,6 +176,12 @@ my %checked=();
 $checked{'AUTOUPDATE'}{'off'} = '';
 $checked{'AUTOUPDATE'}{'on'} = '';
 $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";
+$checked{'AUTOUPGRADE'}{'off'} = '';
+$checked{'AUTOUPGRADE'}{'on'} = '';
+$checked{'AUTOUPGRADE'}{$pakfiresettings{'AUTOUPGRADE'}} = "checked='checked'";
+$checked{'HEALTHCHECK'}{'off'} = '';
+$checked{'HEALTHCHECK'}{'on'} = '';
+$checked{'HEALTHCHECK'}{$pakfiresettings{'HEALTHCHECK'}} = "checked='checked'";
 $checked{'UUID'}{'off'} = '';
 $checked{'UUID'}{'on'} = '';
 $checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'";
@@ -113,7 +196,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='10;'>" );
        print <<END;
        <table>
                <tr><td>
@@ -126,7 +209,7 @@ if ($return) {
                        </form>
                <tr><td colspan='2' align='left'><pre>
 END
-       my @output = `tail -20 /var/log/pakfire.log`;
+       my @output = `grep pakfire /var/log/messages | tail -20`;
        foreach (@output) {
                print "$_";
        }
@@ -138,69 +221,103 @@ END
        &Header::closebigbox();
        &Header::closepage();
        exit;
+       refreshpage();
 }
 
-&Header::openbox("100%", "center", "Pakfire");
+my $core_release = `cat /opt/pakfire/db/core/mine 2>/dev/null`;
+chomp($core_release);
+my $core_update_age = &General::age("/opt/pakfire/db/core/mine");
+my $corelist_update_age = &General::age("/opt/pakfire/db/lists/core-list.db");
+my $server_update_age = &General::age("/opt/pakfire/db/lists/server-list.db");
+my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db");
 
-system("pakfire update &>dev/null");
+&Header::openbox("100%", "center", "Pakfire");
 
 print <<END;
-       <table width='100%'>
-               <tr><td width='40%' align="center">Verfuegbare Addons:<br />
+       <table width='95%' cellpadding='5' >
+END
+if ($reboot == 1) {
+       print "<tr><td align='center' colspan='2'><font color='red'>$Lang::tr{'needreboot'}!</font></td></tr>";
+       print "<tr><td colspan='2'>&nbsp;</font></td></tr>"
+}
+print <<END;
+               <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b>
+                               <td width="50%">
+               <tr><td align="center">$Lang::tr{'pakfire core update level'}: $core_release<hr />
+                                       $Lang::tr{'pakfire last update'} $core_update_age $Lang::tr{'pakfire ago'}<br />
+                                       $Lang::tr{'pakfire last serverlist update'} $server_update_age $Lang::tr{'pakfire ago'}<br />
+                                       $Lang::tr{'pakfire last core list update'} $corelist_update_age $Lang::tr{'pakfire ago'}<br />
+                                       $Lang::tr{'pakfire last package update'} $packages_update_age $Lang::tr{'pakfire ago'}
+                                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                               <input type='hidden' name='ACTION' value='update' />
+                                               <input type='submit' value='$Lang::tr{'calamaris refresh list'}' /><br />
+                                       </form>
+                               <td align="center">
+                                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                                       <select name="UPDPAKS" size="5" disabled>
+END
+                                               &Pakfire::dblist("upgrade", "forweb");
+       print <<END;
+                                       </select>
+                                       <br />
+                                       <input type='hidden' name='ACTION' value='upgrade' />
+                                       <input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
+                                </form>
+
+               <tr><td colspan="2"><!-- Just an empty line -->&nbsp;
+               <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b>
+                               <td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
+               <tr><td align="center">
+                       <p>$Lang::tr{'pakfire install description'}</p>
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                <select name="INSPAKS" size="10" multiple>
 END
                        &Pakfire::dblist("notinstalled", "forweb");
-               
+
 print <<END;
                                </select>
-               </td>
-               <td width='20%' align="center">
+                               <br />
                                <input type='hidden' name='ACTION' value='install' />
                                <input type='image' alt='$Lang::tr{'install'}' src='/images/list-add.png' />
-                       </form><br />
-                       
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='hidden' name='ACTION' value='update' />
-                               <input type='submit' value='Liste aktualisieren' /><br />
                        </form>
-                       
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <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 align="center">
+                       <p>$Lang::tr{'pakfire uninstall description'}</p>
+                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <select name="DELPAKS" size="10" multiple>
 END
 
                        &Pakfire::dblist("installed", "forweb");
 
 print <<END;
-               </select>
-       </table></form>
-               <br /><hr /><br />
-       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-       <table width='100%'>
-               <tr><td colspan='2'>$Lang::tr{'pakfire updates'}
-               <tr><td width='20%'>&nbsp;<td width='60%' align='center'>
-                       <select name="UPDPAKS" size="5" disabled>
+                       </select>
+                       <br />
+                       <input type='hidden' name='ACTION' value='remove' />
+                       <input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' />
+               </form>
+       </table>
 END
 
-                       &Pakfire::dblist("upgrade", "forweb");
+&Header::closebox();
+&Header::openbox("100%", "center", "$Lang::tr{'settings'}");
 
 print <<END;
-                       </select>
-               <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 />
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table width='100%'>
-                       <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'}" />
+               <table width='95%'>
+                       <tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire update daily'}</td><td width="55%" align="left">
+          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} /> |
+          <input type='radio' name='AUTOUPDATE' value='off' $checked{'AUTOUPDATE'}{'off'} /> off </td></tr>
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire core update auto'}</td><td align="left">
+          on <input type='radio' name='AUTOUPGRADE' value='on' $checked{'AUTOUPGRADE'}{'on'} /> |
+          <input type='radio' name='AUTOUPGRADE' value='off' $checked{'AUTOUPGRADE'}{'off'} /> off </td></tr>
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire health check'}</td><td align="left">
+          on <input type='radio' name='HEALTHCHECK' value='on' $checked{'HEALTHCHECK'}{'on'} /> |
+          <input type='radio' name='HEALTHCHECK' value='off' $checked{'HEALTHCHECK'}{'off'} /> off </td></tr>          
+                       <tr><td align='left' width='45%'>$Lang::tr{'pakfire register'}</td><td align="left">
+          on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} /> |
+          <input type='radio' name='UUID' value='off' $checked{'UUID'}{'off'} /> off </td></tr>
+                       <tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
                </table>
        </form>
 END