X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=html%2Fcgi-bin%2Fpakfire.cgi;h=2a7ca8407f08a29546cb5bf9148a2cc824ac4dc6;hb=1342aaf8dd0a0c55d960817e88cac5d379029054;hp=69bd11d3e23c20fc7ed3b4162bee2f7a035930d4;hpb=7722d5010db2180420bc98ec017ff80087773bc3;p=ipfire-2.x.git

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 69bd11d3e2..2a7ca8407f 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -43,7 +43,7 @@ $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();}
@@ -61,8 +61,9 @@ if ($pakfiresettings{'ACTION'} eq 'install'){
 	if ("$pakfiresettings{'FORCE'}" eq "on") {
 		my $command = "/usr/local/bin/pakfire install --non-interactive --no-colors $pakfiresettings{'INSPAKS'} &>/dev/null &";
 		system("$command");
+		system("/bin/sleep 1");
 	} else {
-		&Header::openbox("100%", "center", "Abfrage");
+		&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'}
@@ -80,12 +81,12 @@ END
 							<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' />
+							<input type='image' alt='$Lang::tr{'install'}' title='$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' />
+							<input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
 						</form>
 		</table>
 END
@@ -100,8 +101,9 @@ END
 	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", "Abfrage");
+		&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'}
@@ -119,12 +121,12 @@ END
 							<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' />
+							<input type='image' alt='$Lang::tr{'uninstall'}' title='$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' />
+							<input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
 						</form>
 		</table>
 END
@@ -137,10 +139,11 @@ END
 } elsif ($pakfiresettings{'ACTION'} eq 'update') {
 
 	system("/usr/local/bin/pakfire update --force --no-colors &>/dev/null &");
-
+	system("/bin/sleep 1");
 } elsif ($pakfiresettings{'ACTION'} eq 'upgrade') {
 	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'} eq 'on') {
@@ -149,12 +152,6 @@ END
 		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);
 }
 
@@ -166,9 +163,9 @@ 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'";
@@ -187,12 +184,12 @@ if ($return) {
 	print <<END;
 	<table>
 		<tr><td>
-				<img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' />&nbsp;
+				<img src='/images/indicator.gif' alt='$Lang::tr{'aktiv'}' title='$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' />
+				<input type='image' alt='$Lang::tr{'reload'}' title='$Lang::tr{'reload'}' src='/images/view-refresh.png' />
 			</form>
 		<tr><td colspan='2' align='left'><pre>
 END
@@ -222,13 +219,19 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
 
 print <<END;
 	<table width='95%' cellpadding='5' >
+END
+if ( -e "/var/run/need_reboot") {
+	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 ago<br />
-					$Lang::tr{'pakfire last serverlist update'} $server_update_age ago<br />
-					$Lang::tr{'pakfire last core list update'} $corelist_update_age ago<br />
-					$Lang::tr{'pakfire last package update'} $packages_update_age ago
+					$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 />
@@ -242,7 +245,7 @@ END
 					</select>
 					<br />
 					<input type='hidden' name='ACTION' value='upgrade' />
-					<input type='image' alt='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
+					<input type='image' alt='$Lang::tr{'upgrade'}' title='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
 				 </form>
 
 		<tr><td colspan="2"><!-- Just an empty line -->&nbsp;
@@ -259,7 +262,7 @@ print <<END;
 				</select>
 				<br />
 				<input type='hidden' name='ACTION' value='install' />
-				<input type='image' alt='$Lang::tr{'install'}' src='/images/list-add.png' />
+				<input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' />
 			</form>
 
 		<td align="center">
@@ -274,7 +277,7 @@ print <<END;
 			</select>
 			<br />
 			<input type='hidden' name='ACTION' value='remove' />
-			<input type='image' alt='$Lang::tr{'remove'}' src='/images/list-remove.png' />
+			<input type='image' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' src='/images/list-remove.png' />
 		</form>
 	</table>
 END
@@ -286,16 +289,16 @@ print <<END;
 	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
 		<table width='95%'>
 			<tr><td colspan='2' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b></td></tr>
-			<tr><td align='left' width='40%'>$Lang::tr{'pakfire update daily'}</td><td align="left">
-          on <input type='radio' name='AUTOUPDATE' value='on' $checked{'AUTOUPDATE'}{'on'} />/
+			<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='40%'>$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='40%'>$Lang::tr{'pakfire register'}</td><td align="left">
-          on <input type='radio' name='UUID' value='on' $checked{'UUID'}{'on'} />/
+			<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 width='100%' colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
+			<tr><td colspan="2" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" /></td></tr>
 		</table>
 	</form>
 END