diff options
| -rw-r--r-- | etc/inc/filter.inc | 2 | ||||
| -rw-r--r-- | etc/inc/m0n0/shaper.inc | 2 | ||||
| -rwxr-xr-x | etc/rc.initial.password | 6 | ||||
| -rwxr-xr-x | etc/rc.initial.setlanip | 4 | ||||
| -rw-r--r-- | usr/local/pkg/carp_settings.xml | 2 | ||||
| -rwxr-xr-x | usr/local/www/index.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_assign.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/interfaces_lan.php | 2 | ||||
| -rwxr-xr-x | usr/local/www/license.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/system.php | 8 | ||||
| -rwxr-xr-x | usr/local/www/system_advanced.php | 12 | ||||
| -rw-r--r-- | usr/local/www/wizards/setup_wizard.xml | 4 |
12 files changed, 26 insertions, 26 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 39fab02..00cfc93 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -2706,7 +2706,7 @@ EOD; $ipfrules .= <<<EOD -# make sure the user cannot lock himself out of the webGUI or SSH +# make sure the user cannot lock himself out of the webConfigurator or SSH anchor "anti-lockout" pass in quick on $lanif from any to $lanip keep state label "anti-lockout web rule" diff --git a/etc/inc/m0n0/shaper.inc b/etc/inc/m0n0/shaper.inc index 0b04625..807d4e6 100644 --- a/etc/inc/m0n0/shaper.inc +++ b/etc/inc/m0n0/shaper.inc @@ -131,7 +131,7 @@ function shaper_rules_generate() { $rulei = 50000; /* add a rule to pass all traffic from/to the firewall, - so the user cannot lock himself out of the webGUI */ + so the user cannot lock himself out of the webConfigurator */ $shaperrules = "add $rulei set 4 pass all from $lanip to any\n"; $rulei++; $shaperrules .= "add $rulei set 4 pass all from any to $lanip\n"; $rulei++; diff --git a/etc/rc.initial.password b/etc/rc.initial.password index 9afc90b..a12de05 100755 --- a/etc/rc.initial.password +++ b/etc/rc.initial.password @@ -38,7 +38,7 @@ echo <<<EOD -The webGUI password will be reset to the default (which is 'pfsense'). +The webConfigurator password will be reset to the default (which is 'pfsense'). Do you want to proceed [y|n]? EOD; @@ -53,11 +53,11 @@ EOD; echo <<<EOD -The password for the webGUI has been reset and +The password for the webConfigurator has been reset and the default username has been set to "admin". Remember to set the password to something else than -the default as soon as you have logged into the webGUI. +the default as soon as you have logged into the webConfigurator. Press ENTER to continue. diff --git a/etc/rc.initial.setlanip b/etc/rc.initial.setlanip index e2f7aad..cf8ecc9 100755 --- a/etc/rc.initial.setlanip +++ b/etc/rc.initial.setlanip @@ -92,7 +92,7 @@ if ($config['system']['webgui']['protocol'] == "https") { - echo "\nDo you want to revert to HTTP as the webGUI protocol? (y/n) "; + echo "\nDo you want to revert to HTTP as the webConfigurator protocol? (y/n) "; if (strcasecmp(chop(fgets($fp)), "y") == 0) $config['system']['webgui']['protocol'] = "http"; @@ -109,7 +109,7 @@ echo <<<EOD The LAN IP address has been set to $lanip/$lanbits. -You can now access the webGUI by opening the following URL +You can now access the webConfigurator by opening the following URL in your web browser: http://$lanip/ diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml index 704fb91..6505d83 100644 --- a/usr/local/pkg/carp_settings.xml +++ b/usr/local/pkg/carp_settings.xml @@ -160,7 +160,7 @@ <field> <fielddescr>Remote System Password</fielddescr> <fieldname>password</fieldname> - <description>Enter the webGUI password of the system that you would like to synchronize with.</description> + <description>Enter the webConfigurator password of the system that you would like to synchronize with.</description> <type>password</type> <note>NOTE: You will not use the Synchronize to IP and password option on backup cluster members!</note> </field> diff --git a/usr/local/www/index.php b/usr/local/www/index.php index c6d0985..51276cc 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -73,7 +73,7 @@ } - ## If it is the first time webGUI has been + ## If it is the first time webConfigurator has been ## accessed since initial install show this stuff. if(file_exists('/conf/trigger_initial_wizard')) { @@ -394,7 +394,7 @@ EOD; $closehead = false; ## Set Page Title and Include Header -$pgtitle = "pfSense webGUI"; +$pgtitle = "pfSense webConfigurator"; include("head.inc"); diff --git a/usr/local/www/interfaces_assign.php b/usr/local/www/interfaces_assign.php index dc591ac..0349f62 100755 --- a/usr/local/www/interfaces_assign.php +++ b/usr/local/www/interfaces_assign.php @@ -279,7 +279,7 @@ if(file_exists("/var/run/interface_mismatch_reboot_needed")) <ul> <li><span class="vexpl">change the IP address of your computer</span></li> <li><span class="vexpl">renew its DHCP lease</span></li> - <li><span class="vexpl">access the webGUI with the new IP address</span></li> + <li><span class="vexpl">access the webConfigurator with the new IP address</span></li> </ul></td> </tr> </table> diff --git a/usr/local/www/interfaces_lan.php b/usr/local/www/interfaces_lan.php index fdcef86..85a8493 100755 --- a/usr/local/www/interfaces_lan.php +++ b/usr/local/www/interfaces_lan.php @@ -243,7 +243,7 @@ function enable_change(enable_over) { <ul> <li>change the IP address of your computer</li> <li>renew its DHCP lease</li> - <li>access the webGUI with the new IP address</li> + <li>access the webConfigurator with the new IP address</li> <li>be sure to add <a href="firewall_rules.php">firewall rules</a> to permit traffic through the interface.</li> <li>You also need firewall rules for an interface in bridged mode as the firewall acts as a filtering bridge.</li> </ul> diff --git a/usr/local/www/license.php b/usr/local/www/license.php index e93e5d3..d38b332 100755 --- a/usr/local/www/license.php +++ b/usr/local/www/license.php @@ -63,7 +63,7 @@ include("head.inc"); <br> Rob Whyte (<a href="mailto:rob@g-labs.com">rob@g-labs.com</a>)<br> <em><font color="#666666">Idea/code bits - for encrypted webGUI passwords; minimalized SNMP agent</font></em><br> + for encrypted webConfigurator passwords; minimalized SNMP agent</font></em><br> <br> Petr Verner (<a href="mailto:verner@ipps.cz">verner@ipps.cz</a>)<br> <em><font color="#666666">Advanced outbound @@ -76,7 +76,7 @@ include("head.inc"); Jim McBeath (<a href="mailto:monowall@j.jimmc.org">monowall@j.jimmc.org</a>)<br> <em><font color="#666666">Filter rule patches (ordering, block/pass, disabled); better status page;<br> - webGUI assign network ports page </font></em><br> + webConfigurator assign network ports page </font></em><br> <br> Chris Olive (<a href="mailto:chris@technologEase.com">chris@technologEase.com</a>)<br> <em><font color="#666666">enhanced "execute diff --git a/usr/local/www/system.php b/usr/local/www/system.php index da935f0..87461be 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -98,7 +98,7 @@ if ($_POST) { } if ($_POST['webguiport'] && (!is_numericint($_POST['webguiport']) || ($_POST['webguiport'] < 1) || ($_POST['webguiport'] > 65535))) { - $input_errors[] = "A valid TCP/IP port must be specified for the webGUI port."; + $input_errors[] = "A valid TCP/IP port must be specified for the webConfigurator port."; } if (($_POST['password']) && ($_POST['password'] != $_POST['password2'])) { $input_errors[] = "The passwords do not match."; @@ -224,16 +224,16 @@ include("head.inc"); PPTP VPN clients, though.</span></p></td> </tr> <tr> - <td width="22%" valign="top" class="vncell">webGUI protocol</td> + <td width="22%" valign="top" class="vncell">webConfigurator protocol</td> <td width="78%" class="vtable"> <input name="webguiproto" type="radio" value="http" <?php if ($pconfig['webguiproto'] == "http") echo "checked"; ?>> HTTP <input type="radio" name="webguiproto" value="https" <?php if ($pconfig['webguiproto'] == "https") echo "checked"; ?>> HTTPS</td> </tr> <tr> - <td valign="top" class="vncell">webGUI port</td> + <td valign="top" class="vncell">webConfigurator port</td> <td class="vtable"> <input name="webguiport" type="text" class="formfld unknown" id="webguiport" "size="5" value="<?=htmlspecialchars($config['system']['webgui']['port']);?>"> <br> - <span class="vexpl">Enter a custom port number for the webGUI + <span class="vexpl">Enter a custom port number for the webConfigurator above if you want to override the default (80 for HTTP, 443 for HTTPS). Changes will take effect immediately after save.</span></td> </tr> diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index feab190..f4c9bd4 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -404,7 +404,7 @@ include("head.inc"); <td colspan="2" class="list" height="12"> </td> </tr> <tr> - <td colspan="2" valign="top" class="listtopic">webGUI SSL certificate/key</td> + <td colspan="2" valign="top" class="listtopic">webConfigurator SSL certificate/key</td> </tr> <tr> <td width="22%" valign="top" class="vncell">Certificate</td> @@ -470,7 +470,7 @@ include("head.inc"); <td width="78%" class="vtable"> <input name="polling_enable" type="checkbox" id="polling_enable" value="yes" <?php if ($pconfig['polling_enable']) echo "checked"; ?>> <strong>Use device polling</strong><br> - Device polling is a technique that lets the system periodically poll network devices for new data instead of relying on interrupts. This prevents your webGUI, SSH, etc. from being inaccessible due to interrupt floods when under extreme load. Generally this is not recommended. + Device polling is a technique that lets the system periodically poll network devices for new data instead of relying on interrupts. This prevents your webConfigurator, SSH, etc. from being inaccessible due to interrupt floods when under extreme load. Generally this is not recommended. Not all NICs support polling; see the pfSense homepage for a list of supported cards. </td> </tr> @@ -507,13 +507,13 @@ include("head.inc"); </tr> <?php endif; ?> <tr> - <td width="22%" valign="top" class="vncell">webGUI anti-lockout</td> + <td width="22%" valign="top" class="vncell">webConfigurator anti-lockout</td> <td width="78%" class="vtable"> <input name="noantilockout" type="checkbox" id="noantilockout" value="yes" <?php if ($pconfig['noantilockout']) echo "checked"; ?> /> - <strong>Disable webGUI anti-lockout rule</strong> + <strong>Disable webConfigurator anti-lockout rule</strong> <br /> - By default, access to the webGUI on the LAN interface is always permitted, regardless of the user-defined filter - rule set. Enable this feature to control webGUI access (make sure to have a filter rule in place that allows you + By default, access to the webConfigurator on the LAN interface is always permitted, regardless of the user-defined filter + rule set. Enable this feature to control webConfigurator access (make sure to have a filter rule in place that allows you in, or you will lock yourself out!). <br /> Hint: the "set LAN IP address" option in the console menu resets this setting as well. diff --git a/usr/local/www/wizards/setup_wizard.xml b/usr/local/www/wizards/setup_wizard.xml index fd37c28..9f63a7d 100644 --- a/usr/local/www/wizards/setup_wizard.xml +++ b/usr/local/www/wizards/setup_wizard.xml @@ -399,8 +399,8 @@ </step> <step> <id>6</id> - <title>Set Admin WebGUI Password</title> - <description>On this screen we will set the Admin password which is used to access the WebGUI and also SSH services if you wish to enable.</description> + <title>Set Admin webConfigurator Password</title> + <description>On this screen we will set the Admin password which is used to access the webConfigurator and also SSH services if you wish to enable.</description> <fields> <field> <name>Admin Password</name> |
