traffic.cgi: Use new perl system functions

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / fireinfo.cgi

diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi
index 0060a117cdf1db0d0ca4152e77a1f409b9e8038a..c4baa61702fc67f63227cd8fe5cfff4eef6dfd33 100644 (file)
--- a/html/cgi-bin/fireinfo.cgi
+++ b/html/cgi-bin/fireinfo.cgi
@@ -28,6 +28,7 @@ use CGI::Carp 'fatalsToBrowser';
 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";
 
@@ -48,14 +49,14 @@ if ( -e "$configfile" ) {
 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, '');
@@ -67,7 +68,7 @@ if ($fireinfosettings{'ENABLE_FIREINFO'} ne "on") {
 <font color="$Header::colourred">
        <p>
                $Lang::tr{'fireinfo why descr1'}
-               $Lang::tr{'fireinfo why descr2'}<a href="http://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
+               $Lang::tr{'fireinfo why descr2'}<a href="https://fireinfo.ipfire.org" target="_blank">$Lang::tr{'fireinfo why read more'}</a>
        </p>
 </font>
 END
@@ -84,23 +85,23 @@ if ($errormessage) {
 }
 
 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
@@ -122,7 +123,7 @@ print <<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>