X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=html%2Fcgi-bin%2Findex.cgi;h=a1b0369e6e7da4a6b62eace785a0555bcb3db8aa;hp=b0a90181d1e4328437e783c07f29fb122505d33c;hb=62f1526aab63d038e3d2c164ed36a480c1917451;hpb=1e827a986bbdb30913c73bb1c771565c772e3a6a

diff --git a/html/cgi-bin/index.cgi b/html/cgi-bin/index.cgi
index b0a90181d1..a1b0369e6e 100644
--- a/html/cgi-bin/index.cgi
+++ b/html/cgi-bin/index.cgi
@@ -28,6 +28,7 @@ use strict;
 require '/var/ipfire/general-functions.pl';
 require "${General::swroot}/lang.pl";
 require "${General::swroot}/header.pl";
+require "/opt/pakfire/lib/functions.pl";
 
 my %cgiparams=();
 my %pppsettings=();
@@ -166,55 +167,71 @@ if ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown'}) {
 }
 
 if ($death == 0 && $rebirth == 0) {
-
-if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
-	print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='100%'>
-  <tr>
-    <td colspan="3" align='left'><font color="red">$Lang::tr{'reboot sure'}</font></td>
-    </tr>
-  <tr>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
-</tr>
-</table>
-</form>
+ 	
+if ($mainsettings{'REBOOTQUESTION'} eq "off") {	
+print <<END
+	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+	<table width='100%'>
+	<tr>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
+	</tr>
+	</table>
+	</form>
 END
 ;
-} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) {
-	print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='100%'>
-  <tr>
-    <td colspan="3" align='right'><font color="red">$Lang::tr{'shutdown sure'}</font></td>
-    </tr>
-  <tr>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
-</tr>
-</table>
-</form>
+} else {		
+	if ($cgiparams{'ACTION'} eq $Lang::tr{'reboot ask'}) {
+print <<END
+	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+	<table width='100%'>
+	  <tr>
+	    <td colspan="3" align='left'><font color="red">$Lang::tr{'reboot sure'}</font></td>
+	    </tr>
+	  <tr>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot'}' /></td>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+	</tr>
+	</table>
+	</form>
 END
 ;
-} else {
+	} elsif ($cgiparams{'ACTION'} eq $Lang::tr{'shutdown ask'}) {
 print <<END
-<form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='100%'>
-<tr>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
-	<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
-</tr>
-</table>
-</form>
+	<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+	<table width='100%'>
+	  <tr>
+	    <td colspan="3" align='right'><font color="red">$Lang::tr{'shutdown sure'}</font></td>
+	    </tr>
+	  <tr>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+		<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown'}' /></td>
+	</tr>
+	</table>
+	</form>
 END
 ;
+	} else {
+print <<END
+		<form method='post' action='$ENV{'SCRIPT_NAME'}'>
+		<table width='100%'>
+		<tr>
+			<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'reboot ask'}' /></td>
+			<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'refresh'}' /></td>
+			<td width='33%' align='center'><input type='submit' name='ACTION' value='$Lang::tr{'shutdown ask'}' /></td>
+		</tr>
+		</table>
+		</form>
+END
+;
+	}
 }
 print <<END;
 
+
 <!-- Table of networks -->
 <table border='0' width=80%>
   <tr>	<th bgcolor='$color{'color20'}'>$Lang::tr{'network'}
@@ -386,7 +403,7 @@ foreach my $line (@df) {
 		if ($1<5) {
 			# available:plain value in MB, and not %used as 10% is too much to waste on small disk
 			# and root size should not vary during time
-			$warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !\n";
+			$warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$1M</b> !</li>\n";
 		}
 		
 	} else {
@@ -395,16 +412,31 @@ foreach my $line (@df) {
 		if ($1>90) {
 			@temp = split(/ /,$line);
 			$temp2=int(100-$1);
-			$warnmessage .= "$Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !\n";
+			$warnmessage .= "<li> $Lang::tr{'filesystem full'}: $temp[0] <b>$Lang::tr{'free'}=$temp2%</b> !</li>\n";
 		}
 	}
 }
 
+# S.M.A.R.T. health warning
+my @files = `/bin/ls /var/run/smartctl_out_hddtemp-*`;
+foreach my $file (@files) {
+	chomp ($file);
+	my $disk=`echo $file | cut -d"-" -f2`;
+	chomp ($disk);
+	if (`/bin/grep "SAVE ALL DATA" $file`) {
+		$warnmessage .= "<li> $Lang::tr{'smartwarn1'} /dev/$disk $Lang::tr{'smartwarn2'} !</li>\n\n";
+	}
+}
+
 if ($warnmessage) {
 	print "<tr><td align='center' bgcolor=$Header::colourred colspan='3'><font color='white'>$warnmessage</font></table>";
 }
 print <<END;
 </table>
+END
+;
+&Pakfire::dblist("upgrade", "notice");
+print <<END;
 
 END
 } else {