Control Skripe korrigiert

[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 83a0524c412b7c8826a485b267756579cefea702..464d8d8c18e4485d6c38ee8ebe00a6f3ab5647b2 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -6,9 +6,6 @@
 # 
 # This code is distributed under the terms of the GPL
 #
 # 
 # This code is distributed under the terms of the GPL
 #

-# (c) Eric Oberlander June 2002
-#
-# (c) Darren Critchley June 2003 - added real time clock setting, etc

 #
 
 use strict;
 #
 
 use strict;


@@ -32,56 +29,123 @@ $pakfiresettings{'VALID'} = '';
 
 $pakfiresettings{'INSPAKS'} = '';
 $pakfiresettings{'DELPAKS'} = '';
 
 $pakfiresettings{'INSPAKS'} = '';
 $pakfiresettings{'DELPAKS'} = '';

-$pakfiresettings{'AUTOUPDATE'} = '';
+$pakfiresettings{'AUTOUPDATE'} = 'off';
+$pakfiresettings{'UUID'} = 'on';

 
 &Header::getcgihash(\%pakfiresettings);
 
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1);
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 
 &Header::getcgihash(\%pakfiresettings);
 
 &Header::openpage($Lang::tr{'pakfire configuration'}, 1);
 &Header::openbigbox('100%', 'left', '', $errormessage);
 

-if ($pakfiresettings{'ACTION'} eq 'install')
-{
-       my @inspaks = split(/\|/, "$pakfiresettings{'INSPAKS'}");
-       &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
-       my @deps = "";
-       foreach (@inspaks) {
-               push(@deps, $_);
-               my @add = split(/ /, `/usr/local/bin/pakfire resolvedeps $_`);
-               foreach (@add) { push(@deps, $_); }
+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 &";
+               system("$command");
+               sleep(2);
+       } else {
+               &Header::openbox("100%", "center", "Abfrage");
+               my @output = `/usr/local/bin/pakfire resolvedeps $pakfiresettings{'INSPAKS'}`;
+               print <<END;
+               <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$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='INSPAKS' value='$pakfiresettings{'INSPAKS'}' />
+                                                       <input type='hidden' name='FORCE' value='on' />
+                                                       <input type='hidden' name='ACTION' value='install' />
+                                                       <input type='image' alt='$Lang::tr{'install'}' 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;

        }
        }

-       &Header::openbox("100%", "center", "Pakfire");
-       print "Wenn sie die Pakete @inspaks installieren wollen müssen sie auch folgende Pakete installieren: @deps";
-       &Header::closebox();
-       exit 0;
-}
-elsif ($pakfiresettings{'ACTION'} eq 'remove')
-{
-       $errormessage = "$pakfiresettings{'DELPAKS'}";
-       &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
-} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}")
-{
+} elsif ($pakfiresettings{'ACTION'} eq 'remove') {
+
+} elsif ($pakfiresettings{'ACTION'} eq 'update') {
+       
+       system("/usr/local/bin/pakfire update --force");
+
+} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
+       
+       system("/usr/local/bin/pakfire upgrade -y");
+       
+} elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
+

        &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
        &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);

+

 }
 
 &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
 
 }
 
 &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
 

-

 my %selected=();
 my %checked=();
 
 $checked{'AUTOUPDATE'}{'off'} = '';
 $checked{'AUTOUPDATE'}{'on'} = '';
 $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";
 my %selected=();
 my %checked=();
 
 $checked{'AUTOUPDATE'}{'off'} = '';
 $checked{'AUTOUPDATE'}{'on'} = '';
 $checked{'AUTOUPDATE'}{$pakfiresettings{'AUTOUPDATE'}} = "checked='checked'";

+$checked{'UUID'}{'off'} = '';
+$checked{'UUID'}{'on'} = '';
+$checked{'UUID'}{$pakfiresettings{'UUID'}} = "checked='checked'";

 
 # DPC move error message to top so it is seen!
 if ($errormessage) {
        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
        print "<font class='base'>$errormessage&nbsp;</font>\n";
        &Header::closebox();
 
 # DPC move error message to top so it is seen!
 if ($errormessage) {
        &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
        print "<font class='base'>$errormessage&nbsp;</font>\n";
        &Header::closebox();

-       }
+}
+
+my $return = `pidof pakfire`;
+chomp($return);
+if ($return) {
+       &Header::openbox("100%", "center", "Aktiv");
+       print <<END;
+       <table>
+               <tr><td>
+                               <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
+                       <td>
+                               $Lang::tr{'pakfire working'}
+               <tr><td colspan='2' align='center'>
+                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+                               <input type='image' alt='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
+                       </form>
+               ### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
+               <tr><td colspan='2' align='left'><pre>
+END
+my @output = `tail /var/log/messages | grep pakfire`;
+foreach (@output) {
+       print "$_";
+}
+print <<END;
+               </pre>
+       </table>
+END
+       ### TO BE CONTINUED.... WE HAVE TO BEAUTIFY THIS A LITTLE BIT :D
+       &Header::closebox();
+       &Header::closebigbox();
+       &Header::closepage();
+       exit;
+}

 
 &Header::openbox("100%", "center", "Pakfire");
 
 
 &Header::openbox("100%", "center", "Pakfire");
 

+system("pakfire update &>dev/null");
+

 print <<END;
        <table width='100%'>
                <tr><td width='40%' align="center">Verfuegbare Addons:<br />
 print <<END;
        <table width='100%'>
                <tr><td width='40%' align="center">Verfuegbare Addons:<br />


@@ -99,6 +163,7 @@ print <<END;
                        </form><br />
                        
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        </form><br />
                        
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>

+                               <input type='hidden' name='ACTION' value='update' />

                                <input type='submit' value='Liste aktualisieren' /><br />
                        </form>
                        
                                <input type='submit' value='Liste aktualisieren' /><br />
                        </form>
                        


@@ -106,26 +171,42 @@ print <<END;
                                <input type='hidden' name='ACTION' value='remove' />
                                <input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' />
                </td>
                                <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">Installierte Addons:<br />
+               <td width='40%' align="center">$Lang::tr{'pakfire installed addons'}<br />

                        <select name="DELPAKS" size="10" multiple>
                        <select name="DELPAKS" size="10" multiple>

-                       <option value="postfix">Postfix v2.4.0-1</option>
+END
+
+                       &Pakfire::dblist("installed", "forweb");
+
+print <<END;

                </select>
        </table></form>
                <br /><hr /><br />
                </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>
+END
+
+                       &Pakfire::dblist("upgrade", "forweb");
+
+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%'>
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                <table width='100%'>

-                       <tr><td width='40%' align="right">Automatische Updates taeglich ausfuehren:
-                                       <td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
-                                       <td width='40%' align="right">Test:
+                       <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='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />

-                       <tr><td width='100%' colspan="4" align="right"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />                                  
+                                       <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>
        </form>
 END
 
 &Header::closebox();
                </table>
        </form>
 END
 
 &Header::closebox();

-

 &Header::closebigbox();
 &Header::closebigbox();

-

 &Header::closepage();
 &Header::closepage();

-