diff options
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/captiveportal.inc | 8 | ||||
-rw-r--r-- | etc/inc/config.inc | 18 | ||||
-rw-r--r-- | etc/inc/globals.inc | 5 | ||||
-rw-r--r-- | etc/inc/interfaces.inc | 2 | ||||
-rw-r--r-- | etc/inc/pfsense-utils.inc | 8 | ||||
-rw-r--r-- | etc/inc/service-utils.inc | 2 |
6 files changed, 24 insertions, 19 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']) { |