From e7b81ad7a4bf619c03ef970c994e8100345445f1 Mon Sep 17 00:00:00 2001 From: stompro Date: Tue, 8 Sep 2009 10:37:19 -0500 Subject: Fixed a few typos, expanded HCBI description, Expanded other descriptions. Expanded on the description of the wizard so it is clearer about the situation it is to be used for. Added the LAN acronym to the number of interfaces question, so it would be clearer. --- usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml index 256f7a4..c277839 100644 --- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml +++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml @@ -2,7 +2,7 @@ /* $Id$ */ - traffic_shaper_wizard_multi_lan2.xml + traffic_shaper_wizard_multi_lan.xml part of pfSense (http://www.pfsense.org/) Copyright (C) 2005 Bill Marquette - bill.marquette@gmail.com. @@ -36,13 +36,13 @@ 1 pfSense Traffic Shaper Wizard true - This wizard will guide you through setting up the pfSense traffic shaper. + This wizard will guide you through setting up the pfSense traffic shaper for the situation where you have 1 WAN connection and multiple LAN connections. Enter number of LAN type connections input ^[0-9]+$ - Number of local interfaces you have + Number of local(LAN) interfaces you have ezshaper->step1->numberofconnections @@ -221,7 +221,7 @@ Address input - This allows you to just provide the IP address of the computer(s) or Penalize. NOTE: You can also use a Firewall Alias in this location. + This allows you to just provide the IP address of the computer(s) to penalize. NOTE: You can also use a Firewall Alias in this location. ezshaper->step4->address IP Address field is non-blank and doesn't look like an IP address. @@ -787,7 +787,7 @@ L - Jabber instant messanger + Jabber instant messenger ICQ @@ -1247,7 +1247,7 @@ L - HBCI + Home Banking Computer Interface, for communicating with your bank Next -- cgit v1.1 From 8acfca38c7d05d10d49fba585bf9305952f31562 Mon Sep 17 00:00:00 2001 From: stompro Date: Fri, 11 Sep 2009 09:36:27 -0500 Subject: Fixes error that comes up when wake all is used. This error was coming up when wake all was used from the services WOL page. "Fatal error: Function name must be a string in /usr/local/www/services_wol.php on line 53" --- usr/local/www/services_wol.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'usr/local') diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 89c3636..389047a 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -50,7 +50,7 @@ if($_GET['wakeall'] <> "") { foreach ($a_wol as $wolent) { $mac = $wolent['mac']; $if = $wolent['interface']; - $bcip = gen_subnet_max($get_interface_ip($if), + $bcip = gen_subnet_max(get_interface_ip($if), get_interface_subnet($if)); mwexec("/usr/local/bin/wol -i {$bcip} {$mac}"); $savemsg .= "Sent magic packet to {$mac}.
"; -- cgit v1.1 From 1b197e555d5abc8d2505456cb2f0b347a4d4eaa2 Mon Sep 17 00:00:00 2001 From: stompro Date: Fri, 11 Sep 2009 11:02:50 -0500 Subject: Added checks to wol command execution to make it more obvious when the script fails. If the wol command returns with anything other than 0, alert the user that the command failed, and that they should look at the system log to find out why the command failed. I'm adding this out of frustration with the fact that the wol command hasn't been included at all in recent snapshots, and because the webgui doesn't give any indication of the command not working, it took much longer for me to figure out why it wasn't working. I hope this can save someone else time. --- usr/local/www/services_wol.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'usr/local') diff --git a/usr/local/www/services_wol.php b/usr/local/www/services_wol.php index 389047a..8fe4ad7 100755 --- a/usr/local/www/services_wol.php +++ b/usr/local/www/services_wol.php @@ -50,10 +50,16 @@ if($_GET['wakeall'] <> "") { foreach ($a_wol as $wolent) { $mac = $wolent['mac']; $if = $wolent['interface']; + $description = $wolent['descr']; $bcip = gen_subnet_max(get_interface_ip($if), get_interface_subnet($if)); - mwexec("/usr/local/bin/wol -i {$bcip} {$mac}"); - $savemsg .= "Sent magic packet to {$mac}.
"; + /* Execute wol command and check return code. */ + if(!mwexec("/usr/local/bin/wol -i {$bcip} {$mac}")){ + $savemsg .= "Sent magic packet to {$mac} ({$description}).
"; + } + else { + $savemsg .= "Please check the system log, the wol command for {$description} ({$mac}) did not complete successfully.
"; + } } } @@ -82,9 +88,13 @@ if ($_POST || $_GET['mac']) { /* determine broadcast address */ $bcip = gen_subnet_max(get_interface_ip($if), get_interface_subnet($if)); - - mwexec("/usr/local/bin/wol -i {$bcip} {$mac}"); - $savemsg = "Sent magic packet to {$mac}."; + /* Execute wol command and check return code. */ + if(!mwexec("/usr/local/bin/wol -i {$bcip} {$mac}")){ + $savemsg .= "Sent magic packet to {$mac}."; + } + else { + $savemsg .= "Please check the system log, the wol command for {$mac} did not complete successfully.
"; + } } } -- cgit v1.1