Fixed different File handling of IE7 and FF (Fullpath and Filename)

[people/teissler/ipfire-2.x.git] / html / cgi-bin / pakfire.cgi

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index aea7b72e297ad54bb37e26705d9146e5eb4d36a4..28786fa78c7ae4ead6115e51a830406164f3d6fd 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -47,6 +47,7 @@ $pakfiresettings{'AUTOUPGRADE'} = 'off';
 $pakfiresettings{'UUID'} = 'on';
 
 &Header::getcgihash(\%pakfiresettings);
+
 &General::readhash("${General::swroot}/main/settings", \%mainsettings);
 &General::readhash("/srv/web/ipfire/html/themes/".$mainsettings{'THEME'}."/include/colors.txt", \%color);
 
@@ -142,15 +143,15 @@ END
 } elsif ($pakfiresettings{'ACTION'} eq "$Lang::tr{'save'}") {
 
        if ($pakfiresettings{'AUTOUPDATE'} == "on") {
-               system("/usr/local/bin/pakfire enable updates");
+               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");
+               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);
@@ -208,7 +209,7 @@ END
        exit;
 }
 
-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,14 +219,14 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db"
 &Header::openbox("100%", "center", "Pakfire");
 
 print <<END;
-       <table width='100%' cellpadding='5' >
-               <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>(TR) Your system's state:</b>
+       <table width='95%' cellpadding='5' >
+               <tr><td width="50%" bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire system state'}:</b>
                                <td width="50%">
-               <tr><td align="center">(TR) Core-Update-Level: $core_release<hr />
-                                       (TR) Last Update made $core_update_age ago<br />
-                                       (TR) Last server list update made $server_update_age ago<br />
-                                       (TR) Last core list update made $corelist_update_age ago<br />
-                                       (TR) Last packages list update made $packages_update_age ago
+               <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
                                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                                                <input type='hidden' name='ACTION' value='update' />
                                                <input type='submit' value='Liste aktualisieren' /><br />
@@ -246,7 +247,7 @@ END
                <tr><td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire available addons'}</b>
                                <td bgcolor='$color{'color20'}' align="center"><b>$Lang::tr{'pakfire installed addons'}</b>
                <tr><td align="center">
-                       <p>(TR) Please choose one or more items from the list below and click the 'plus' to install.</p>
+                       <p>$Lang::tr{'pakfire install description'}</p>
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>       
                                <select name="INSPAKS" size="10" multiple>
 END
@@ -260,7 +261,7 @@ print <<END;
                        </form>
 
                <td align="center">
-                       <p>(TR) Please choose one or more items from the list below and click the 'minus' to uninstall.</p>
+                       <p>$Lang::tr{'pakfire uninstall description'}</p>
                 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <select name="DELPAKS" size="10" multiple>
 END
@@ -281,16 +282,18 @@ END
 
 print <<END;
        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-               <table width='100%'>
-                       <tr><td colspan='4' bgcolor='$color{'color20'}'><b>$Lang::tr{'basic options'}</b>
-                       <tr><td width='40%' align="right">$Lang::tr{'pakfire update daily'}
-                                       <td width='10%' align="left"><input type="checkbox" name="AUTOUPDATE" $checked{'AUTOUPDATE'}{'on'} />
-                                       <td width='40%' align="right">$Lang::tr{'pakfire register'} 
-                                       <td width='10%' align="left"><input type="checkbox" name="UUID" $checked{'UUID'}{'on'} />
-                       <tr><td width='40%' align="right">(TR) Apply core updates automatically?
-                                       <td width='10%' align="left"><input type="checkbox" name="AUTOUPGRADE" $checked{'AUTOUPGRADE'}{'on'} />
-                                       <td width='50%' colspan="2">&nbsp;
-                       <tr><td width='100%' colspan="4" align="center"><input type="submit" name="ACTION" value="$Lang::tr{'save'}" />
+               <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'} />/
+          <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'} />/
+          <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>
                </table>
        </form>
 END