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 ccde0298c3c32b62144e205af98a545aab6e6032..464d8d8c18e4485d6c38ee8ebe00a6f3ab5647b2 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -29,7 +29,8 @@ $pakfiresettings{'VALID'} = '';
 
 $pakfiresettings{'INSPAKS'} = '';
 $pakfiresettings{'DELPAKS'} = '';
-$pakfiresettings{'AUTOUPDATE'} = '';
+$pakfiresettings{'AUTOUPDATE'} = 'off';
+$pakfiresettings{'UUID'} = 'on';
 
 &Header::getcgihash(\%pakfiresettings);
 
@@ -37,14 +38,16 @@ $pakfiresettings{'AUTOUPDATE'} = '';
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($pakfiresettings{'ACTION'} eq 'install'){
+       $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g;
        if ("$pakfiresettings{'FORCE'}" eq "on") {
-               system("/usr/local/bin/pakfire", "install", "--non-interactive", "$pakfiresettings{'INSPAKS'}", "&");
-               sleep(1);
+               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'>Sie maechten folgende Pakete installieren: $pakfiresettings{'INSPAKS'}. Moeglicherweise haben diese Pakete Abhaengigkeiten, d.h. andere Pakete muessen zusaetzlich installiert werden. Dazu sehen sie unten eine Liste.
+               <table><tr><td colspan='2'>$Lang::tr{'pakfire install package'}.$pakfiresettings{'INSPAKS'}.$Lang::tr{'pakfire possible dependency'}
                <pre>           
 END
                foreach (@output) {
@@ -52,7 +55,7 @@ END
                }
                print <<END;
                </pre>
-               <tr><td colspan='2'>Moechten Sie der Installation aller Pakete zustimmen?
+               <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'}' />
@@ -78,13 +81,14 @@ END
        
        system("/usr/local/bin/pakfire update --force");
 
-} elsif ($pakfiresettings{'ACTION'} eq 'unlock') {
+} elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
        
-       &Pakfire::lock("off");
+       system("/usr/local/bin/pakfire upgrade -y");
        
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
        &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings);
+
 }
 
 &General::readhash("${General::swroot}/pakfire/settings", \%pakfiresettings);
@@ -95,6 +99,9 @@ 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) {
@@ -103,23 +110,32 @@ if ($errormessage) {
        &Header::closebox();
 }
 
-if ( -e "/opt/pakfire/pakfire.lock" ) {
+my $return = `pidof pakfire`;
+chomp($return);
+if ($return) {
        &Header::openbox("100%", "center", "Aktiv");
        print <<END;
        <table>
                <tr><td>
-                       <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <input type='hidden' name='ACTION' value='unlock' />
-                               <input type='image' src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
-                       </form>
+                               <img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
                        <td>
-                               Pakfire fuehrt gerade eine Aufgabe aus... Bitte warten sie, bis diese erfolgreich beendet wurde.
+                               $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();
@@ -128,6 +144,8 @@ END
 
 &Header::openbox("100%", "center", "Pakfire");
 
+system("pakfire update &>dev/null");
+
 print <<END;
        <table width='100%'>
                <tr><td width='40%' align="center">Verfuegbare Addons:<br />
@@ -153,7 +171,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">Installierte Addons:<br />
+               <td width='40%' align="center">$Lang::tr{'pakfire installed addons'}<br />
                        <select name="DELPAKS" size="10" multiple>
 END
 
@@ -163,13 +181,28 @@ 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>
+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%'>
-                       <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'} />
-                       <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