[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop: [1510] ipcop/trunk/html/cgi-bin
From:       eoberlander () users ! sourceforge ! net
Date:       2008-06-14 16:26:27
Message-ID: E1K7YaB-00087i-UP () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]

Revision: 1510
          http://ipcop.svn.sourceforge.net/ipcop/?rev=1510&view=rev
Author:   eoberlander
Date:     2008-06-14 09:26:27 -0700 (Sat, 14 Jun 2008)

Log Message:
-----------
Add some error box flags.

Modified Paths:
--------------
    ipcop/trunk/html/cgi-bin/dhcp.cgi
    ipcop/trunk/html/cgi-bin/modem.cgi

Modified: ipcop/trunk/html/cgi-bin/dhcp.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/dhcp.cgi	2008-06-13 21:38:43 UTC (rev 1509)
+++ ipcop/trunk/html/cgi-bin/dhcp.cgi	2008-06-14 16:26:27 UTC (rev 1510)
@@ -44,6 +44,8 @@
 our $filename3 = "${General::swroot}/dhcp/advoptions-list"; # List of options+syntax
 our $filename4 = "${General::swroot}/dhcp/parameters-list"; # List of allowed \
'parameters' ; no checking on parameters  my $errormessage = '';
+my $error_dhcp = '';
+my $error_fixed = '';
 my $warnmessage = '';
 my $warnNTPmessage = '';
 my @nosaved=();
@@ -260,6 +262,7 @@
     map ($dhcpsettings{$_} = '',@nosaved,'KEY1','KEY2');	# and reinit vars to empty
     &buildconf;
     ERROR:   							# Leave the faulty field untouched
+    $error_dhcp = 'error' if ($errormessage);
 } else {
     &General::readhash($setting, \%dhcpsettings);   		# Get saved settings and reset \
to good if needed  }
@@ -491,6 +494,8 @@
         #Write changes to dhcpd.conf.
         &sortcurrent2;    # sort newly added/modified entry
         &buildconf;       # before calling buildconf which use fixed lease file !
+    } else {
+        $error_fixed = 'error';
     }
 }
 
@@ -591,7 +596,7 @@
 &Header::openbigbox('100%', 'left', '', $errormessage);
 
 if ($errormessage) {
-    &Header::openbox('100%', 'left', $Lang::tr{'error messages'});
+    &Header::openbox('100%', 'left', $Lang::tr{'error messages'}, 'error');
     print "<font class='base'>$errormessage&nbsp;</font>\n";
     &Header::closebox();
 }
@@ -599,7 +604,7 @@
     $warnNTPmessage = "<font \
color=${Header::colourred}><b>$Lang::tr{'capswarning'}</b></font>: $warnNTPmessage";  \
}  
-&Header::openbox('100%', 'left', 'DHCP');
+&Header::openbox('100%', 'left', 'DHCP', $error_dhcp);
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>";
 
 foreach my $itf (@ITFs) {
@@ -911,7 +916,7 @@
 }
 &Header::closebox();
 
-&Header::openbox('100%', 'left', $Lang::tr{'current fixed leases'});
+&Header::openbox('100%', 'left', $Lang::tr{'current fixed leases'}, $error_fixed);
 # Fixed leases screens
 $checked{'FIX_ENABLED'}{'on'} = ($dhcpsettings{'FIX_ENABLED'} ne 'on') ? '' : \
"checked='checked'";  $dhcpsettings{'FIX_FILENAME'} =~ s/&comma;/,/g;

Modified: ipcop/trunk/html/cgi-bin/modem.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/modem.cgi	2008-06-13 21:38:43 UTC (rev 1509)
+++ ipcop/trunk/html/cgi-bin/modem.cgi	2008-06-14 16:26:27 UTC (rev 1510)
@@ -21,6 +21,7 @@
 
 my %modemsettings=();
 my $errormessage = '';
+my $error_modem = '';
 
 &Header::showhttpheaders();
 
@@ -38,9 +39,11 @@
         }
 ERROR:
         if ($errormessage) {
-                $modemsettings{'VALID'} = 'no'; }
-        else {
-                $modemsettings{'VALID'} = 'yes'; }
+                $modemsettings{'VALID'} = 'no'; 
+                $error_modem = 'error';
+        } else {
+                $modemsettings{'VALID'} = 'yes';
+        }
 
 	&General::writehash("${General::swroot}/modem/settings", \%modemsettings);
 }
@@ -64,7 +67,7 @@
 
 print "<form method='post' action='$ENV{'SCRIPT_NAME'}'>\n";
 
-&Header::openbox('100%', 'left', "$Lang::tr{'modem configuration'}:");
+&Header::openbox('100%', 'left', "$Lang::tr{'modem configuration'}:", $error_modem);
 print <<END
 <table width='100%'>
 <tr>


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

-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]