[Astlinux-commits] SF.net SVN: astlinux:[3448] branches/0.7/package/webinterface/altweb

[<abe...@us...>]

Revision: 3448
          http://astlinux.svn.sourceforge.net/astlinux/?rev=3448&view=rev
Author:   abelbeck
Date:     2009-11-15 17:58:43 +0000 (Sun, 15 Nov 2009)

Log Message:
-----------
Web interface, Firewall sub-tab, add more descriptive error messages when a firewall restart returns with an error

Modified Paths:
--------------
    branches/0.7/package/webinterface/altweb/admin/firewall.php
    branches/0.7/package/webinterface/altweb/common/version.php

Modified: branches/0.7/package/webinterface/altweb/admin/firewall.php
===================================================================
--- branches/0.7/package/webinterface/altweb/admin/firewall.php	2009-11-15 17:58:15 UTC (rev 3447)
+++ branches/0.7/package/webinterface/altweb/admin/firewall.php	2009-11-15 17:58:43 UTC (rev 3448)
@@ -525,7 +525,7 @@
     }
     $result = 99;
     if (isset($_POST['confirm_restart'])) {
-      $result = restartPROCESS('iptables', 10, $result, 'init');
+      $result = restartPROCESS('iptables', 10, 90, 'init');
     } else {
       $result = 2;
     }
@@ -533,7 +533,7 @@
     $result = 99;
     if (isset($_POST['confirm_restart'])) {
       if (upgradeARNOfirewall('upgrade') == 0) {
-        $result = restartPROCESS('iptables', 20, $result, 'init');
+        $result = restartPROCESS('iptables', 20, 91, 'init');
       }
     } else {
       $result = 2;
@@ -570,6 +570,10 @@
       putHtml('<p style="color: green;">Firewall is Upgraded and Restarted. Previous files are in: /mnt/kd/arno-iptables-OLD</p>');
     } elseif ($result == 21) {
       putHtml('<p style="color: green;">New Firewall Rule Added, click "Restart Firewall" to apply any changed settings.</p>');
+    } elseif ($result == 90) {
+      putHtml('<p style="color: red;">Firewall has Restarted. WARNING: Not all firewall rules are applied.</p>');
+    } elseif ($result == 91) {
+      putHtml('<p style="color: red;">Firewall is Upgraded and Restarted. WARNING: Not all firewall rules are applied.</p>');
     } elseif ($result == 99) {
       putHtml('<p style="color: red;">Action Failed.</p>');
     } elseif ($result == 999) {

Modified: branches/0.7/package/webinterface/altweb/common/version.php
===================================================================
--- branches/0.7/package/webinterface/altweb/common/version.php	2009-11-15 17:58:15 UTC (rev 3447)
+++ branches/0.7/package/webinterface/altweb/common/version.php	2009-11-15 17:58:43 UTC (rev 3448)
@@ -1,6 +1,6 @@
 <?php
 // version.php for AstLinux Alternate Web Interface
 
-$GUI_VERSION = '1.6.02';
+$GUI_VERSION = '1.6.03';
 
 ?>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.