diff options
30 files changed, 57 insertions, 60 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 14271dc..93f90d9 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -90,12 +90,12 @@ function captiveportal_configure() { $htmltext = <<<EOD <html> <head> -<title>pfSense captive portal</title> +<title>{$g['product_name']} captive portal</title> </head> <body> <center> -<h2>pfSense captive portal</h2> -Welcome to the pfSense Captive Portal! This is the default page since a custom page has not been defined. +<h2>{$g['product_name']} captive portal</h2> +Welcome to the {$g['product_name']} Captive Portal! This is the default page since a custom page has not been defined. <p> <form method="post" action="\$PORTAL_ACTION\$"> <input name="redirurl" type="hidden" value="\$PORTAL_REDIRURL\$"> @@ -1074,7 +1074,7 @@ function getNasID() $nasId = ""; exec("/bin/hostname", $nasId); if(!$nasId[0]) - $nasId[0] = "pfSense"; + $nasId[0] = "{$g['product_name']}"; return $nasId[0]; } diff --git a/etc/inc/config.inc b/etc/inc/config.inc index ce8265c..864bba4 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -167,7 +167,7 @@ if ($g['booting'] and !file_exists($g['cf_conf_path'] . "/config.xml") ) { ******************************************************************************* * FATAL ERROR * * The device that contains the configuration file (config.xml) could not be * -* found. pfSense cannot continue booting. * +* found. {$g['product_name']} cannot continue booting. * ******************************************************************************* @@ -316,8 +316,8 @@ function restore_backup($file) { conf_mount_rw(); copy("$file","/cf/conf/config.xml"); unlink_if_exists("/tmp/config.cache"); - log_error("pfSense is restoring the configuration $file"); - file_notice("config.xml", "pfSense is restoring the configuration $file", "pfSenseConfigurator", ""); + log_error("{$g['product_name']} is restoring the configuration $file"); + file_notice("config.xml", "{$g['product_name']} is restoring the configuration $file", "pfSenseConfigurator", ""); conf_mount_ro(); } config_unlock(); @@ -356,7 +356,7 @@ function parse_config_bootup() { restore_backup("/cf/conf/backup/{$last_backup}"); } if(!file_exists("{$g['conf_path']}/config.xml")) { - echo "XML configuration file not found. pfSense cannot continue booting.\n"; + echo "XML configuration file not found. {$g['product_name']} cannot continue booting.\n"; mwexec("/sbin/halt"); exit; } @@ -389,9 +389,9 @@ function parse_config_bootup() { ******************************************************************************* * WARNING! * -* The current configuration has been created with a newer version of pfSense * +* The current configuration has been created with a newer version of {$g['product_name']} * * than this one! This can lead to serious misbehavior and even security * -* holes! You are urged to either upgrade to a newer version of pfSense or * +* holes! You are urged to either upgrade to a newer version of {$g['product_name']} or * * revert to the default configuration immediately! * ******************************************************************************* @@ -1387,7 +1387,7 @@ function set_networking_interfaces_ports() { if($avail < 115) { echo "\n\n\n"; echo "DANGER! WARNING!\n\n"; - echo "pfSense requires *ATLEAST* 128 megs of ram to function correctly.\n"; + echo "{$g['product_name']} requires *ATLEAST* 128 megs of ram to function correctly.\n"; echo "Only ($avail) megs of ram has been detected.\n"; echo "\nPress ENTER to continue."; fgets($fp); @@ -1440,13 +1440,13 @@ EOD; echo <<<EOD -*NOTE* pfSense requires *ATLEAST* 2 assigned interfaces to function. +*NOTE* {$g['product_name']} requires *ATLEAST* 2 assigned interfaces to function. If you do not have two interfaces turn off the machine until you do. And now in ENGLISH. If you do not have atleast two *REAL* network interface cards or one nic with multiple VLANS then - pfSense *WILL NOT* run correctly. + {$g['product_name']} *WILL NOT* run correctly. If you do not know the names of your interfaces, you may choose to use auto-detection... In that case, disconnect all interfaces now before diff --git a/etc/inc/globals.inc b/etc/inc/globals.inc index 67cd311..a9b74eb 100644 --- a/etc/inc/globals.inc +++ b/etc/inc/globals.inc @@ -48,6 +48,11 @@ $g = array( "www_path" => "/usr/local/www", "xml_rootobj" => "pfsense", "admin_group" => "admins", + "product_name" => "pfSense", + "product_copyright" => "Scott Ullrich", + "product_copyright_years" => "2005, 2006, 2007, 2008", + "product_website" => "http://www.pfsense.com", + "product_email" => "coreteam@pfsense.com", "pppoe_interface" => "ng0", "n_pptp_units" => 16, /* this value can be overriden in pptp->n_pptp_units */ "pptp_subnet" => 28, /* this value can be overriden in pptp->pptp_subnet */ diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 4a14950..4621e2f 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -536,7 +536,7 @@ function interfaces_wireless_configure($if, $wlcfg) { $fd_set = fopen("/tmp/{$if}_setup.sh","w"); fwrite($fd_set, "#!/bin/sh\n"); - fwrite($fd_set, "# pfSense wireless configuration script.\n\n"); + fwrite($fd_set, "# {$g['product_name']} wireless configuration script.\n\n"); fwrite($fd_set, "# enable shell debugging\n"); fwrite($fd_set, "set -x\n"); diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 7e0e29b..8a51674 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -2132,8 +2132,8 @@ function make_dirs($path, $mode = 0755) { * call_pfsense_method(): Call a method exposed by the pfsense.com XMLRPC server. */ function call_pfsense_method($method, $params, $timeout = 0) { - $ip = gethostbyname('www.pfsense.com'); - if($ip == "www.pfsense.com") + $ip = gethostbyname($g['product_website']); + if($ip == $g['product_website']) return false; global $g, $config; $xmlrpc_base_url = $g['xmlrpcbaseurl']; @@ -2157,8 +2157,8 @@ function call_pfsense_method($method, $params, $timeout = 0) { */ function check_firmware_version($tocheck = "all", $return_php = true) { global $g, $config; - $ip = gethostbyname('www.pfsense.com'); - if($ip == "www.pfsense.com") + $ip = gethostbyname($g['product_website']); + if($ip == $g['product_website']) return false; $rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))), "kernel" => array("version" => trim(file_get_contents('/etc/version_kernel'))), diff --git a/etc/inc/service-utils.inc b/etc/inc/service-utils.inc index 3877e0b..af94452 100644 --- a/etc/inc/service-utils.inc +++ b/etc/inc/service-utils.inc @@ -36,7 +36,7 @@ function write_rcfile($params) { $fileprefix = "/usr/local/etc/rc.d/"; if(!(is_writable($fileprefix . $params['file']) or $params['start'])) return false; - $towrite .= "#!/bin/sh\n# This file was automatically generated\n# by the pfSense service handler.\n\n"; + $towrite .= "#!/bin/sh\n# This file was automatically generated\n# by the {$g['product_website']} service handler.\n\n"; /* write our rc functions */ $towrite .= "rc_start() {\n\t" . $params['start'] . "\n}\n\n"; if($params['stop']) { diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index dc024b7..6f4a99c 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -268,7 +268,7 @@ include("head.inc"); <tr> <td width="22%" valign="baseline" class="vncell"> </td> <td width="78%" class="vtable"> - Open a pfSense configuration XML file and click the button below to restore the configuration. <br /><br /> Restore area: <?php spit_out_select_items("restorearea"); ?> + Open a {$g['[product_name']} configuration XML file and click the button below to restore the configuration. <br /><br /> Restore area: <?php spit_out_select_items("restorearea"); ?> <p><input name="conffile" type="file" class="formfld unknown" id="conffile" size="40"></p> <p><input name="Submit" type="submit" class="formbtn" id="restore" value="Restore configuration"></p> <p><strong><span class="red">Note:</span></strong><br />The firewall may need a reboot after restoring the configuration.<br /></p> diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index ac7be2d..b552b18 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -61,7 +61,7 @@ include("head.inc"); <li>System will be configured as a DHCP server on the default LAN interface</li> <li>Reboot after changes are installed</li> <li>WAN interface will be set to obtain an address automatically from a DHCP server</li> - <li>Default webConfigurator password will be reset to 'pfsense'</li> + <li>Default webConfigurator password will be reset to '{$g['product_name']}'</li> <li>Default webConfigurator username will be reset to 'admin'</li> </ul> Are you sure you want to proceed?</strong></p> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 2bff181..c2a72db 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -204,7 +204,7 @@ function enable_change(enable_over) { <td width="78%"><strong><span class="red">Note:</span></strong><br> syslog sends UDP datagrams to port 514 on the specified remote syslog server. Be sure to set syslogd on the - remote server to accept syslog messages from pfSense. + remote server to accept syslog messages from {$g['product_name']}. </td> </tr> </table> diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php index e960831..9aa913b 100755 --- a/usr/local/www/edit.php +++ b/usr/local/www/edit.php @@ -107,7 +107,7 @@ else Exec+ v1.02-000 - Copyright 2001-2003, All rights reserved Created by technologEase (http://www.technologEase.com). (modified for m0n0wall by Manuel Kasper <mk@neon1.net>) - (modified for pfSense Edit/Save file by Scott Ullrich, Copyright 2004, 2005) + (modified for {$g['product_name']} Edit/Save file by Scott Ullrich, Copyright 2004, 2005) */ // Function: is Blank diff --git a/usr/local/www/fend.inc b/usr/local/www/fend.inc index 54aaec3..8afb52c 100755 --- a/usr/local/www/fend.inc +++ b/usr/local/www/fend.inc @@ -3,7 +3,7 @@ </div> <!-- Content DIV --> <div id="footer"> - <a target="_blank" href="http://www.pfSense.com" class="redlnk">pfSense</a> is © 2004-2007 by Scott Ullrich. All Rights Reserved. + <a target="_blank" href="http://www.pfSense.com" class="redlnk">{$g['product_name']}</a> is © {$g['product_copyright_years']} by {$g['product_copyright']}. All Rights Reserved. [<a href="/license.php" class="tblnk">view license</a>] </div> <!-- Footer DIV --> diff --git a/usr/local/www/firewall_rules_edit.php b/usr/local/www/firewall_rules_edit.php index c3e3743..643c0da 100755 --- a/usr/local/www/firewall_rules_edit.php +++ b/usr/local/www/firewall_rules_edit.php @@ -776,7 +776,7 @@ include("head.inc"); <p> <table width="90%"> <tr><td width="25%"><ul><li>keep state</li></td><td>Works with all IP protocols.</ul></td></tr> - <tr><td width="25%"><ul><li>modulate state</li></td><td>Works only with TCP. pfSense will generate strong Initial Sequence Numbers (ISNs) for packets matching this rule.</li></ul></td></tr> + <tr><td width="25%"><ul><li>modulate state</li></td><td>Works only with TCP. {$g['product_name']} will generate strong Initial Sequence Numbers (ISNs) for packets matching this rule.</li></ul></td></tr> <tr><td width="25%"><ul><li>synproxy state</li></td><td>Proxies incoming TCP connections to help protect servers from spoofed TCP SYN floods. This option includes the functionality of keep state and modulate state combined.</ul></td></tr> <tr><td width="25%"><ul><li>none</li></td><td>Do not use state mechanisms to keep track. This is only useful if you're doing advanced queueing in certain situations. Please check the documentation.</ul></td></tr> </table> diff --git a/usr/local/www/firewall_rules_schedule_logic.php b/usr/local/www/firewall_rules_schedule_logic.php index 9f714b3..f93436d 100644 --- a/usr/local/www/firewall_rules_schedule_logic.php +++ b/usr/local/www/firewall_rules_schedule_logic.php @@ -1,5 +1,5 @@ <pre> -When working with pfSense based schedules, the logic is a bit different from the normal pfSense rules. +When working with {$g['product_name']} based schedules, the logic is a bit different from the normal {$g['product_name']} rules. For example, the rules are evaluated from top to bottom. diff --git a/usr/local/www/index.php b/usr/local/www/index.php index 8d3290b..91f88eb 100755 --- a/usr/local/www/index.php +++ b/usr/local/www/index.php @@ -77,7 +77,7 @@ ## accessed since initial install show this stuff. if(file_exists('/conf/trigger_initial_wizard')) { - $pgtitle = array("pfSense first time setup"); + $pgtitle = array("{$g['product_name']} first time setup"); include('head.inc'); echo "<body link=\"#0000CC\" vlink=\"#0000CC\" alink=\"#0000CC\">\n"; @@ -85,10 +85,10 @@ echo "<center>\n"; echo "<img src=\"/themes/{$g['theme']}/images/logo.gif\" border=\"0\"><p>\n"; echo "<div \" style=\"width:700px;background-color:#ffffff\" id=\"nifty\">\n"; - echo "Welcome to pfSense!<p>\n"; + echo "Welcome to {$g['product_name']}!<p>\n"; echo "One moment while we start the initial setup wizard.<p>\n"; echo "Embedded platform users: Please be patient, the wizard takes a little longer to run than the normal gui.<p>\n"; - echo "To bypass the wizard, click on the pfSense wizard on the initial page.\n"; + echo "To bypass the wizard, click on the {$g['product_name']} wizard on the initial page.\n"; echo "</div>\n"; echo "<meta http-equiv=\"refresh\" content=\"1;url=wizard.php?xml=setup_wizard.xml\">\n"; echo "<script type=\"text/javascript\">\n"; @@ -394,7 +394,7 @@ EOD; $closehead = false; ## Set Page Title and Include Header -$pgtitle = array("pfSense Dashboard"); +$pgtitle = array("{$g['product_name']} Dashboard"); include("head.inc"); diff --git a/usr/local/www/interfaces_vlan.php b/usr/local/www/interfaces_vlan.php index 2ed8151..54cfa40 100755 --- a/usr/local/www/interfaces_vlan.php +++ b/usr/local/www/interfaces_vlan.php @@ -138,7 +138,7 @@ include("head.inc"); <td colspan="3" class="list"><p class="vexpl"><span class="red"><strong> Note:<br> </strong></span> - Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the pfSense handbook for information on supported cards. </p> + Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the {$g['product_name']} handbook for information on supported cards. </p> </td> <td class="list"> </td> </tr> diff --git a/usr/local/www/license.php b/usr/local/www/license.php index d38b332..76f24d0 100755 --- a/usr/local/www/license.php +++ b/usr/local/www/license.php @@ -10,7 +10,7 @@ include("head.inc"); <?php include("fbegin.inc"); ?> <p class="pgtitle">License</p> - <p><strong>pfSense is Copyright © 2004, 2005, 2006, 2007 by Scott Ullrich + <p><strong>{$g['product_name']} is Copyright © {$g['product_copyright_years']} by {$g['product_copyright']} (<a href="mailto:geekgod@geekgod.com">geekgod@geekgod.com</a>).<br> All rights reserved.</strong></p> @@ -117,9 +117,9 @@ include("head.inc"); Peter Curran (<a href="mailto:peter@closeconsultants.com">peter@closeconsultants.com</a>)<br> <em><font color="#666666">OpenVPN support</font></em></p> <hr size="1"> - <p>pfSense is based upon/includes various free software packages, + <p>{$g['product_name']} is based upon/includes various free software packages, listed below.<br> - The author of pfSense would like to thank the authors of these + The author of {$g['product_name']} would like to thank the authors of these software packages for their efforts.</p> <p>FreeBSD (<a href="http://www.freebsd.org" target="_blank">http://www.freebsd.org</a>)<br> Copyright © 1994-2003 FreeBSD, Inc. All rights reserved.<br> diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index 93b80da..1287198 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -42,7 +42,7 @@ if($pkg_info) { $savemsg = "Unable to retrieve package info from {$g['xmlrpcbaseurl']}. Cached data will be used."; $pkg_info = unserialize(@file_get_contents("{$g['tmp_path']}/pkg_info.cache")); } else { - $savemsg = "Unable to communicate to pfSense.com. Please check DNS, default gateway, etc."; + $savemsg = "Unable to communicate to {$g['product_website']}. Please check DNS, default gateway, etc."; } } @@ -165,7 +165,7 @@ include("fbegin.inc"); if($index['maintainer'] != "") { echo "<a href='mailto:{$index['maintainer']}'>{$index['maintainer']}</a>"; } else { - echo "Nobody. <a href='mailto:coreteam@pfsense.com'>Apply</a> for it!"; + echo "Nobody. <a href='mailto:{$g['product_email']}'>Apply</a> for it!"; } ?> </td> diff --git a/usr/local/www/services_captiveportal.php b/usr/local/www/services_captiveportal.php index 30c9ed0..7dd78b2 100755 --- a/usr/local/www/services_captiveportal.php +++ b/usr/local/www/services_captiveportal.php @@ -346,7 +346,7 @@ to access after they've authenticated.</td> <input name="nomacfilter" type="checkbox" class="formfld" id="nomacfilter" value="yes" <?php if ($pconfig['nomacfilter']) echo "checked"; ?>> <strong>Disable MAC filtering</strong><br> If this option is set, no attempts will be made to ensure that the MAC address of clients stays the same while they're logged in. - This is required when the MAC address of the client cannot be determined (usually because there are routers between pfSense and the clients). + This is required when the MAC address of the client cannot be determined (usually because there are routers between {$g['product_name']} and the clients). If this is enabled, RADIUS MAC authentication cannot be used.</td> </tr> <?php @@ -513,7 +513,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> } ?></select><br> If RADIUS type is set to Cisco, in Access-Requests the value of Calling-Station-Id will be set to the client's IP address and - the Called-Station-Id to the client's MAC address. Default behaviour is Calling-Station-Id = client's MAC address and Called-Station-Id = pfSense's WAN IP address.</td> + the Called-Station-Id to the client's MAC address. Default behaviour is Calling-Station-Id = client's MAC address and Called-Station-Id = {$g['product_name']}'s WAN IP address.</td> </tr> </table> </tr> @@ -528,7 +528,7 @@ value="<?=htmlspecialchars($pconfig['radiuskey2']);?>"></td> <td valign="top" class="vncell">HTTPS server name </td> <td class="vtable"> <input name="httpsname" type="text" class="formfld unknown" id="httpsname" size="30" value="<?=htmlspecialchars($pconfig['httpsname']);?>"><br> - This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on pfSense.. </td> + This name will be used in the form action for the HTTPS POST and should match the Common Name (CN) in your certificate (otherwise, the client browser will most likely display a security warning). Make sure captive portal clients can resolve this name in DNS and verify on the client that the IP resolves to the correct interface IP on {$g['product_name']}.. </td> </tr> <tr> <td valign="top" class="vncell">HTTPS certificate</td> diff --git a/usr/local/www/services_dhcp_relay.php b/usr/local/www/services_dhcp_relay.php index 83b39d8..0da3f84 100755 --- a/usr/local/www/services_dhcp_relay.php +++ b/usr/local/www/services_dhcp_relay.php @@ -221,7 +221,7 @@ function enable_change(enable_over) { <td width="78%" class="vtable"> <input name="agentoption" type="checkbox" value="yes" <?php if ($pconfig['agentoption']) echo "checked"; ?>> <strong>Append circuit ID and agent ID to requests</strong><br> - If this is checked, the DHCP relay will append the circuit ID (pfSense interface number) and the agent ID to the DHCP request.</td> + If this is checked, the DHCP relay will append the circuit ID ({$g['product_name']} interface number) and the agent ID to the DHCP request.</td> </tr> <tr> <td width="22%" valign="top" class="vncell">Destination server</td> diff --git a/usr/local/www/services_proxyarp.php b/usr/local/www/services_proxyarp.php index 71f7278..037325f 100755 --- a/usr/local/www/services_proxyarp.php +++ b/usr/local/www/services_proxyarp.php @@ -135,7 +135,7 @@ include("head.inc"); </form> <p class="vexpl"><span class="red"><strong>Notes:<br> </strong></span> - *Proxy ARP can be used if you need pfSense to send ARP replies on an interface for other IP addresses than its own (e.g. for 1:1, advanced outbound or server NAT). It is not necessary on the WAN interface if you have a subnet routed to you or if you use PPPoE/PPTP, and it only works on the WAN interface if it's configured with a static IP address or DHCP.</p> + *Proxy ARP can be used if you need {$g['product_name']} to send ARP replies on an interface for other IP addresses than its own (e.g. for 1:1, advanced outbound or server NAT). It is not necessary on the WAN interface if you have a subnet routed to you or if you use PPPoE/PPTP, and it only works on the WAN interface if it's configured with a static IP address or DHCP.</p> <br> *CARP can be a great replacement for proxyarp. <?php include("fend.inc"); ?> diff --git a/usr/local/www/status.php b/usr/local/www/status.php index 0fc825e..7b2a3bb 100755 --- a/usr/local/www/status.php +++ b/usr/local/www/status.php @@ -162,7 +162,7 @@ defCmdT("vmstat -z","vmstat -z"); exec("/bin/date", $dateOutput, $dateStatus); $currentDate = $dateOutput[0]; -$pgtitle = array("pfSense","status"); +$pgtitle = array("{$g['product_name']}","status"); include("head.inc"); ?> diff --git a/usr/local/www/status_upnp.php b/usr/local/www/status_upnp.php index 7b8cde5..77a8caf 100644 --- a/usr/local/www/status_upnp.php +++ b/usr/local/www/status_upnp.php @@ -46,11 +46,6 @@ $year = date("Y"); $pgtitle = array("Status","UPnP Status"); include("head.inc"); -/* put your custom HTML head content here */ -/* using some of the $pfSenseHead function calls */ -//$pfSenseHead->addMeta("<meta http-equiv=\"refresh\" content=\"120;url={$_SERVER['SCRIPT_NAME']}\" />"); -//echo $pfSenseHead->getHTML(); - ?> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> diff --git a/usr/local/www/system.php b/usr/local/www/system.php index 387393e..b3b1711 100755 --- a/usr/local/www/system.php +++ b/usr/local/www/system.php @@ -270,7 +270,7 @@ include("head.inc"); <input name="dnsallowoverride" type="checkbox" id="dnsallowoverride" value="yes" <?php if ($pconfig['dnsallowoverride']) echo "checked"; ?>> <strong>Allow DNS server list to be overridden by DHCP/PPP on WAN</strong><br> - If this option is set, pfSense will use DNS servers assigned + If this option is set, {$g['product_name']} will use DNS servers assigned by a DHCP/PPP server on WAN for its own purposes (including the DNS forwarder). They will not be assigned to DHCP and PPTP VPN clients, though.</span></p></td> @@ -339,7 +339,7 @@ include("head.inc"); } ?> </select> - <strong>This will change the look and feel of pfSense</strong> + <strong>This will change the look and feel of {$g['product_name']}.</strong> </td> </tr> <tr> diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php index ba199f0..a672d4f 100755 --- a/usr/local/www/system_advanced.php +++ b/usr/local/www/system_advanced.php @@ -473,7 +473,7 @@ include("head.inc"); <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 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. + Not all NICs support polling; see the {$g['product_name']} homepage for a list of supported cards. </td> </tr> @@ -607,7 +607,7 @@ include("head.inc"); <input name="disablefilter" type="checkbox" id="disablefilter" value="yes" <?php if (isset($config['system']['disablefilter'])) echo "checked"; ?> onclick="enable_change(false)" /> <strong>Disable the firewalls filter altogether.</strong> <br /> - <span class="vexpl">Note: This basically converts pfSense into a routing only platform!<br> + <span class="vexpl">Note: This basically converts {$g['product_name']} into a routing only platform!<br> Note: This will turn off NAT! </span> </td> diff --git a/usr/local/www/system_firmware.php b/usr/local/www/system_firmware.php index 664d84e..616caea 100755 --- a/usr/local/www/system_firmware.php +++ b/usr/local/www/system_firmware.php @@ -169,7 +169,7 @@ print_info_box($sig_warning); <div id="mainarea"> <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0"> <tr> - <td colspan="2" class="listtopic">Invoke pfSense Manual Upgrade</td> + <td colspan="2" class="listtopic">Invoke {$g['product_name']} Manual Upgrade</td> </tr> <td width="22%" valign="baseline" class="vncell"> </td> <td width="78%" class="vtable"> diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php index 2f3b5ef..165a995 100755 --- a/usr/local/www/system_firmware_settings.php +++ b/usr/local/www/system_firmware_settings.php @@ -135,7 +135,7 @@ function enable_altfirmwareurl(enable_over) { <tr><td>Base URL:</td><td><input name="firmwareurl" type="input" class="formfld url" id="firmwareurl" size="64" value="<?php if($curcfg['alturl']['firmwareurl']) echo $curcfg['alturl']['firmwareurl']; else echo $g['xmlrpcbaseurl']; ?>"></td></tr> <tr><td>Path:</td><td><input name="firmwarepath" type="input" class="formfld unknown"id="firmwarepath" size="64" value="<?php if($curcfg['alturl']['firmwarepath']) echo $curcfg['alturl']['firmwarepath']; else echo $g['xmlrpcpath']; ?>"></td></tr> </table> - <span class="vexpl">This is where pfSense will check for newer firmware versions when the <a href="system_firmware_check.php">System: Firmware: Auto Update</a> page is viewed.</span></td> + <span class="vexpl">This is where {$g['product_name']} will check for newer firmware versions when the <a href="system_firmware_check.php">System: Firmware: Auto Update</a> page is viewed.</span></td> </tr> <script>enable_altfirmwareurl();</script> <!-- diff --git a/usr/local/www/system_groupmanager.php b/usr/local/www/system_groupmanager.php index 79daaa6..95e600e 100644 --- a/usr/local/www/system_groupmanager.php +++ b/usr/local/www/system_groupmanager.php @@ -95,9 +95,9 @@ function getAdminPageList() { unset($tmp['diag_new_states.php']); unset($tmp['system_usermanager_edit.php']); - $tmp['pkg.php'] = "pfSense package manager"; - $tmp['pkg_edit.php'] = "pfSense package manager edit"; - $tmp['wizard.php'] = "pfSense wizard subsystem"; + $tmp['pkg.php'] = "{$g['prouct_name']} package manager"; + $tmp['pkg_edit.php'] = "{$g['product_name']} package manager edit"; + $tmp['wizard.php'] = "{$g['product_name']} wizard subsystem"; $tmp['graphs.php'] = "Graphing subsystem"; $tmp['headjs.php'] = "*Required for javascript"; diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php index b24b2e0..b4b7872 100644 --- a/usr/local/www/system_usermanager.php +++ b/usr/local/www/system_usermanager.php @@ -437,7 +437,6 @@ if (isSystemAdmin($HTTP_SERVER_VARS['AUTH_USER'])) { <?php include("head.inc"); - //echo $pfSenseHead->getHTML(); ?> <?php include("fbegin.inc");?> <?php if ($input_errors) print_input_errors($input_errors);?> diff --git a/usr/local/www/system_usermanager_edit.php b/usr/local/www/system_usermanager_edit.php index 1560a54..14bf3e5 100644 --- a/usr/local/www/system_usermanager_edit.php +++ b/usr/local/www/system_usermanager_edit.php @@ -161,8 +161,6 @@ if(isAjax()) print_info_box_np($savemsg); include("head.inc"); -/* put your custom HTML head content here */ -/* using some of the $pfSenseHead function calls */ $jscriptstr = <<<EOD <script type="text/javascript"> diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index cc8f05c..c6523a1 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -247,4 +247,4 @@ $server = new XML_RPC_Server( 'signature' => $get_notices_sig) ) ); -?> +?>
\ No newline at end of file |
