X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Fpakfire.cgi;h=ca7a4ad4d918aa52f5f885edb91a5e85018b17e2;hp=aea7b72e297ad54bb37e26705d9146e5eb4d36a4;hb=0b09e72214df3d4d62c1a061f1e8866020877017;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index aea7b72e29..ca7a4ad4d9 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -44,9 +44,13 @@ $pakfiresettings{'INSPAKS'} = ''; $pakfiresettings{'DELPAKS'} = ''; $pakfiresettings{'AUTOUPDATE'} = 'off'; $pakfiresettings{'AUTOUPGRADE'} = 'off'; +$pakfiresettings{'HEALTHCHECK'} = 'on'; $pakfiresettings{'UUID'} = 'on'; +sub refreshpage{&Header::openbox( 'Waiting', 1, "" );print "
+END foreach (@output) { + $_ =~ s/\\[[0-1]\;[0-9]+m//g; print "$_\n"; } print </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{'DELPAKS'}`; print < $Lang::tr{'pakfire uninstall package'}.$pakfiresettings{'DELPAKS'}.$Lang::tr{'pakfire possible dependency'} - +END foreach (@output) { + $_ =~ s/\\[[0-1]\;[0-9]+m//g; print "$_\n"; } print </dev/null"); + 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 &>/dev/null"); - + 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'}") { - if ($pakfiresettings{'AUTOUPDATE'} == "on") { - system("/usr/local/bin/pakfire enable updates"); + if ($pakfiresettings{'AUTOUPDATE'} eq 'on') { + system("/usr/local/bin/pakfire enable updates >/dev/null 2>&1"); } else { - system("/usr/local/bin/pakfire disable updates"); + system("/usr/local/bin/pakfire disable updates >/dev/null 2>&1"); } - - if ($pakfiresettings{'AUTOUPGRADE'} == "on") { - system("/usr/local/bin/pakfire enable upgrades"); + + if ($pakfiresettings{'AUTOUPGRADE'} eq 'on') { + system("/usr/local/bin/pakfire enable upgrades >/dev/null 2>&1"); } else { - system("/usr/local/bin/pakfire disable upgrades"); + system("/usr/local/bin/pakfire disable upgrades >/dev/null 2>&1"); } &General::writehash("${General::swroot}/pakfire/settings", \%pakfiresettings); @@ -167,6 +173,9 @@ $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'"; @@ -194,7 +203,7 @@ if ($return) { END - my @output = `tail -20 /var/log/pakfire.log`; + my @output = `grep pakfire /var/log/messages | tail -20`; foreach (@output) { print "$_"; } @@ -206,9 +215,10 @@ END &Header::closebigbox(); &Header::closepage(); exit; + refreshpage(); } -my $core_release = `cat /opt/pakfire/db/core/mine`; +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"); @@ -218,17 +228,17 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" &Header::openbox("100%", "center", "Pakfire"); print <- (TR) Your system's state: + +
$Lang::tr{'pakfire system state'}: - (TR) Core-Update-Level: $core_release
- (TR) Last Update made $core_update_age ago
- (TR) Last server list update made $server_update_age ago
- (TR) Last core list update made $corelist_update_age ago
- (TR) Last packages list update made $packages_update_age ago +$Lang::tr{'pakfire core update level'}: $core_release
+ $Lang::tr{'pakfire last update'} $core_update_age ago
+ $Lang::tr{'pakfire last serverlist update'} $server_update_age ago
+ $Lang::tr{'pakfire last core list update'} $corelist_update_age ago
+ $Lang::tr{'pakfire last package update'} $packages_update_age ago- + $Lang::tr{'pakfire available addons'} $Lang::tr{'pakfire installed addons'} - (TR) Please choose one or more items from the list below and click the 'plus' to install.
-