Generalize the firewall's name in user-visible spots of the FreeRADIUS2 package.

6 files changed, 16 insertions, 16 deletions

diff --git a/config/freeradius2/freeradius.inc b/config/freeradius2/freeradius.inc
index 21beb20f..3dd6da00 100644
--- a/config/freeradius2/freeradius.inc
+++ b/config/freeradius2/freeradius.inc
@@ -2573,7 +2573,7 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn
 	$cli->setCredentials('admin', $password);
 		$resp = $cli->send($msg, "150");
 		if(!$resp) {
-			$error = "A communications error occurred while FreeRADIUS was attempting XMLRPC sync with {$url}:{$port} (pfsense.exec_php).";
+			$error = "A communications error occurred while FreeRADIUS was attempting XMLRPC sync with {$url}:{$port} (exec_php).";
 			log_error($error);
 			file_notice("sync_settings", $error, "freeradius Settings Sync", "");
 		} elseif($resp->faultCode()) {
@@ -2583,7 +2583,7 @@ function freeradius_do_xmlrpc_sync($sync_to_ip, $password, $varsyncport, $varsyn
 			log_error($error);
 			file_notice("sync_settings", $error, "freeradius Settings Sync", "");
 		} else {
-			log_error("FreeRADIUS: XMLRPC has reloaded data successfully on {$url}:{$port} (pfsense.exec_php).");
+			log_error("FreeRADIUS: XMLRPC has reloaded data successfully on {$url}:{$port} (exec_php).");
 		}
 
 }
diff --git a/config/freeradius2/freeradius.xml b/config/freeradius2/freeradius.xml
index fbd47013..72ac5b1d 100644
--- a/config/freeradius2/freeradius.xml
+++ b/config/freeradius2/freeradius.xml
@@ -262,7 +262,7 @@
 		<field>
 			<fielddescr>Redirection URL</fielddescr>
 			<fieldname>varuserswisprredirectionurl</fieldname>			
-			<description><![CDATA[Enter the URL the user should be redirected to after successfull login. (e.g.: http://www.pfsense.org)]]></description>
+			<description><![CDATA[Enter the URL the user should be redirected to after successfull login. (e.g.: http://www.google.com)]]></description>
 			<type>input</type>
 		</field>
 		<field>
diff --git a/config/freeradius2/freeradiusauthorizedmacs.xml b/config/freeradius2/freeradiusauthorizedmacs.xml
index f9d9abe9..5b858db0 100644
--- a/config/freeradius2/freeradiusauthorizedmacs.xml
+++ b/config/freeradius2/freeradiusauthorizedmacs.xml
@@ -215,7 +215,7 @@
 		<field>
 			<fielddescr>Redirection URL</fielddescr>
 			<fieldname>varmacsswisprredirectionurl</fieldname>			
-			<description><![CDATA[Enter the URL the MAC should be redirected to after successfull login. (e.g.: http://www.pfsense.org)]]></description>
+			<description><![CDATA[Enter the URL the MAC should be redirected to after successfull login. (e.g.: http://www.google.com)]]></description>
 			<type>input</type>
 		</field>
 		<field>
diff --git a/config/freeradius2/freeradiuscerts.xml b/config/freeradius2/freeradiuscerts.xml
index e3f6365d..21f18643 100644
--- a/config/freeradius2/freeradiuscerts.xml
+++ b/config/freeradius2/freeradiuscerts.xml
@@ -124,7 +124,7 @@
 									This page uses the freeradius2 built-in script called "bootstrap" to create CA and certs. The disatvantage of this script is that nothing of your changes will be saved in the global config.xml file. So after a systemcrash or reinstallation of freeradius2 package
 									all your CA and certs will be lost. If you have a backup of all these files on an USB stick or another server than you can copy them back in the freeradius certs folder.<br><br>
 									
-									<b>The better way is to use the pfsense built-in Cert Manager (SYSTEM-> Cert Manager).</b> The CA-Cert and Server-Cert you created there you just have to choose in EAP.
+									<b>The better way is to use the firewall's built-in Cert Manager (SYSTEM-> Cert Manager).</b> The CA-Cert and Server-Cert you created there you just have to choose in EAP.
 									The advantage of this is that all your CA and certs will be saved in global config.xml and can be restored.]]></description>
 			<type>input</type>
 			<required/>
diff --git a/config/freeradius2/freeradiuseapconf.xml b/config/freeradius2/freeradiuseapconf.xml
index b5358c37..ac761523 100644
--- a/config/freeradius2/freeradiuseapconf.xml
+++ b/config/freeradius2/freeradiuseapconf.xml
@@ -164,26 +164,26 @@
 			<type>listtopic</type>
 		</field>
 		<field>
-			<fielddescr>Choose pfSense Cert-Manager</fielddescr>
+			<fielddescr>Choose Cert-Manager</fielddescr>
 			<fieldname>vareapconfchoosecertmanager</fieldname>
 			<description><![CDATA[Choose your Cert manager. By default it is the freeradius cert manager because the server needs some default certs to start service. For more information take al look at "Certificates"-Tab.<br>
-									To use the pfsense Cert Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).<br><br>
+									To use the firewall's built-in Cert Manager you have to create a CA and an Server Certificate first. (SYSTEM -> Cert Manager).<br><br>
 									<b>uncheked</b>: FreeRADIUS Cert-Manager (not recommended) (Default: unchecked)<br>
-									<b>cheked</b>: pfSense Cert-Manager (recommended)]]></description>
+									<b>cheked</b>: Firewall Cert-Manager (recommended)]]></description>
 			<type>checkbox</type>
 			<enablefields>ssl_ca_cert,ssl_server_cert,vareapconfenableclientp12</enablefields>
 		</field>
 		<field>
 			<fielddescr>Private Key Password</fielddescr>
 			<fieldname>vareapconfprivatekeypassword</fieldname>
-			<description><![CDATA[By default the certificates created by freeradius are protected with an "input/ouput" password from reading the certificate. The certificates created by pfSense Cert Manager are not protected so you must leave this field empty. (Default: whatever)]]></description>
+			<description><![CDATA[By default the certificates created by freeradius are protected with an "input/ouput" password from reading the certificate. The certificates created by the firewall's built-in Cert Manager are not protected so you must leave this field empty. (Default: whatever)]]></description>
 			<type>password</type>
 			<default_value>whatever</default_value>
 		</field>
 		<field>
 			<fielddescr>SSL CA Certificate</fielddescr>
 			<fieldname>ssl_ca_cert</fieldname>
-			<description><![CDATA[Choose the SSL CA Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL CA Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_ca_certs()]]></source>
@@ -193,7 +193,7 @@
 		<field>
 			<fielddescr>SSL Server Certificate</fielddescr>
 			<fieldname>ssl_server_cert</fieldname>
-			<description><![CDATA[Choose the SSL Server Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL Server Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_server_certs()]]></source>
@@ -210,7 +210,7 @@
 		<field>
 			<fielddescr>SSL Client Certificate</fielddescr>
 			<fieldname>ssl_client_cert</fieldname>
-			<description><![CDATA[Choose the SSL Client Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL Client Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_server_certs()]]></source>
diff --git a/config/freeradius2/freeradiusmodulesldap.xml b/config/freeradius2/freeradiusmodulesldap.xml
index f6619afd..0fa98493 100644
--- a/config/freeradius2/freeradiusmodulesldap.xml
+++ b/config/freeradius2/freeradiusmodulesldap.xml
@@ -354,7 +354,7 @@
 		<field>
 			<fielddescr>SSL CA Certificate</fielddescr>
 			<fieldname>ssl_ca_cert1</fieldname>
-			<description><![CDATA[Choose the SSL CA Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL CA Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_ca_certs()]]></source>
@@ -364,7 +364,7 @@
 		<field>
 			<fielddescr>SSL Server Certificate</fielddescr>
 			<fieldname>ssl_server_cert1</fieldname>
-			<description><![CDATA[Choose the SSL Server Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL Server Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_server_certs()]]></source>
@@ -665,7 +665,7 @@
 		<field>
 			<fielddescr>SSL CA Certificate</fielddescr>
 			<fieldname>ssl_ca_cert2</fieldname>
-			<description><![CDATA[Choose the SSL CA Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL CA Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_ca_certs()]]></source>
@@ -675,7 +675,7 @@
 		<field>
 			<fielddescr>SSL Server Certificate</fielddescr>
 			<fieldname>ssl_server_cert2</fieldname>
-			<description><![CDATA[Choose the SSL Server Certficate here which you created with the pfSense Cert Manager.<br>
+			<description><![CDATA[Choose the SSL Server Certficate here which you created with the firewall's Cert Manager.<br>
 									Choose "none" if you do not use any kind of certificates or the freeradius Cert Manager. (Default: none)]]></description>
 			<type>select_source</type>
 			<source><![CDATA[freeradius_get_server_certs()]]></source>