###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007 Michael Tremer & Christian Schmidt #
+# Copyright (C) 2011 IPFire Team <info@ipfire.org> #
# #
# 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 #
require '/var/ipfire/general-functions.pl';
require "${General::swroot}/lang.pl";
require "${General::swroot}/header.pl";
+require '/opt/pakfire/lib/functions.pl';
my $configfile = "/var/ipfire/main/send_profile";
if ("$fireinfosettings{'ACTION'}" eq "trigger") {
if ($fireinfosettings{'ENABLE_FIREINFO'} eq 'off') {
&General::log($Lang::tr{'fireinfo is enabled'});
- system ('/usr/bin/touch', $configfile);
+ &General::system('/usr/bin/touch', $configfile);
$fireinfosettings{'ENABLE_FIREINFO'} = 'on';
} else {
&General::log($Lang::tr{'fireinfo is disabled'});
unlink "$configfile";
$fireinfosettings{'ENABLE_FIREINFO'} = 'off';
}
- system("/usr/local/bin/fireinfoctrl &");
+ &General::system_background("/usr/local/bin/fireinfoctrl");
}
&Header::openpage('Fireinfo', 1, '');
if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") {
- &Header::openbox("100%", "left", "Why should I enable fireinfo?");
+ &Header::openbox("100%", "left", "$Lang::tr{'fireinfo why enable'}");
print <<END;
<font color="$Header::colourred">
<p>
- It is very important for the development of IPFire that you enable this
- service. <a href="http://fireinfo.ipfire.org" target="_blank">Read more about the reasons.</a>
+ $Lang::tr{'fireinfo why descr1'}
+ $Lang::tr{'fireinfo why descr2'}<a href="https://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
</p>
</font>
END
if ($errormessage) {
&Header::openbox('100%', 'left', "$Lang::tr{'error messages'}");
- print "<FONT CLASS='base'>$errormessage </FONT>\n";
+ print "<font class='base'>$errormessage </font>\n";
&Header::closebox();
}
my $ipfire_version = `cat /etc/system-release`;
-my $pakfire_version = `cat /opt/pakfire/etc/pakfire.conf | grep "version =" | cut -d\\" -f2`;
+my $pakfire_version = &Pakfire::make_version();
my $kernel_version = `uname -a`;
&Header::openbox('100%', 'left', $Lang::tr{'fireinfo system version'});
print <<END;
- <table width="100%">
+ <table cellspacing='1' cellpadding='0' class='tbl'>
<tr>
- <td>$Lang::tr{'fireinfo ipfire version'}:</td>
- <td>$ipfire_version</td>
+ <td align='center' bgcolor='#F0F0F0' width='15%'>$Lang::tr{'fireinfo ipfire version'}</td>
+ <td bgcolor='#F0F0F0'><code>$ipfire_version</code></td>
</tr>
<tr>
- <td>$Lang::tr{'fireinfo pakfire version'}:</td>
- <td>$pakfire_version</td>
+ <td align='center' bgcolor='#D6D6D6' width='15%'>$Lang::tr{'fireinfo pakfire version'}</td>
+ <td bgcolor='#D6D6D6'><code>$pakfire_version</code></td>
</tr>
<tr>
- <td>$Lang::tr{'fireinfo kernel version'}:</td>
- <td>$kernel_version</td>
+ <td align='center' bgcolor='#F0F0F0' width='15%'>$Lang::tr{'fireinfo kernel version'}</td>
+ <td bgcolor='#F0F0F0'><code>$kernel_version</code></td>
</tr>
</table>
END
<tr>
<td>$Lang::tr{'fireinfo your profile id'}:</td>
<td>
- <a href="http://fireinfo.ipfire.org/profile/$profile_id" target="_blank">$profile_id</a>
+ <a href="https://fireinfo.ipfire.org/profile/$profile_id" target="_blank">$profile_id</a>
</td>
</tr>
<tr>
</tr>
<tr>
<!-- spacer -->
- <td colspan="2"> </td>
+ <td colspan="2"><font color='$Header::colourgreen'> </font></td>
</tr>
<tr>
<td colspan='2'>
- <textarea rows="25" cols="75" readonly="true">$profile</textarea>
+ <textarea rows="25" cols="75" readonly="readonly">$profile</textarea>
</td>
</tr>
</table>