Generalize more references.

3 files changed, 119 insertions, 119 deletions

diff --git a/config/zebedee/zebedee.inc b/config/zebedee/zebedee.inc
index d66a269b..90a538e7 100755
--- a/config/zebedee/zebedee.inc
+++ b/config/zebedee/zebedee.inc
@@ -311,7 +311,7 @@ function zebedee_do_xmlrpc_sync($sync_to_ip, $password) {
 	$cli->setCredentials('admin', $password);
 	$resp = $cli->send($msg, "250");
 	if(!$resp) {
-		$error = "A communications error occurred while attempting zebedee XMLRPC sync with {$url}:{$port} (pfsense.exec_php).";
+		$error = "A communications error occurred while attempting zebedee XMLRPC sync with {$url}:{$port} (exec_php).";
 		log_error($error);
 		file_notice("sync_settings", $error, "zebedee Settings Sync", "");
 	} elseif($resp->faultCode()) {
@@ -321,7 +321,7 @@ function zebedee_do_xmlrpc_sync($sync_to_ip, $password) {
 		log_error($error);
 		file_notice("sync_settings", $error, "zebedee Settings Sync", "");
 	} else {
-		log_error("zebedee XMLRPC reload data success with {$url}:{$port} (pfsense.exec_php).");
+		log_error("zebedee XMLRPC reload data success with {$url}:{$port} (exec_php).");
 	}
 
 }
diff --git a/config/zebedee/zebedee.xml b/config/zebedee/zebedee.xml
index 9e3061a0..b56fa1a6 100644
--- a/config/zebedee/zebedee.xml
+++ b/config/zebedee/zebedee.xml
@@ -163,7 +163,7 @@
 			<type>input</type>
 			<size>60</size>
 			<description>
-				This specifies the external name are put in client.zbd file in field serverhost. Ex: 200.111.111.22 or zebedee.pfsense.org   
+				This specifies the external name are put in client.zbd file in field serverhost. Ex: 200.111.111.22 or zebedee.example.com   
 			</description>
 		</field>
 		<field>
diff --git a/config/zebedee/zebedee_sync.xml b/config/zebedee/zebedee_sync.xml
index e2649fc8..2a4a4e14 100644
--- a/config/zebedee/zebedee_sync.xml
+++ b/config/zebedee/zebedee_sync.xml
@@ -1,117 +1,117 @@
-<?xml version="1.0" encoding="utf-8" ?>

-<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">

-<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>

-<packagegui>

-        <copyright>

-        <![CDATA[

-/* ========================================================================== */

-/*

-    zebedee_sync.xml

-    part of pfSense (http://www.pfSense.com)

-    Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com>

-    Copyright (C) 2011 Marcello Coutinho

-    Copyright (C) 2011 Jorge Lustosa

-    All rights reserved.

-                                                                              */

-/* ========================================================================== */

-/*

-    Redistribution and use in source and binary forms, with or without

-    modification, are permitted provided that the following conditions are met:

-

-     1. Redistributions of source code must retain the above copyright notice,

-        this list of conditions and the following disclaimer.

-

-     2. Redistributions in binary form must reproduce the above copyright

-        notice, this list of conditions and the following disclaimer in the

-        documentation and/or other materials provided with the distribution.

-

-    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,

-    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY

-    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE

-    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,

-    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF

-    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS

-    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

-    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

-    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE

-    POSSIBILITY OF SUCH DAMAGE.

-                                                                              */

-/* ========================================================================== */

-        ]]>

-        </copyright>

-    <description>Describe your package here</description>

-    <requirements>Describe your package requirements here</requirements>

-    <faq>Currently there are no FAQ items provided.</faq>

-	<name>zebedeesync</name>

-	<version>1.1</version>

-	<title>Zebedee: Manual Sync</title>

-	<include_file>/usr/local/pkg/zebedee.inc</include_file>

-	<tabs>

-		<tab>

-			<text>Settings</text>

-			<url>/pkg_edit.php?xml=zebedee.xml&amp;id=0</url>

-		</tab>

-		<tab>

-			<text>Tunnels</text>

-			<url>/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0</url>

-		</tab>

-		<tab>

-			<text>Keys</text>

-			<url>/zebedee_keys.php</url>

-		</tab>

-		<tab>

-			<text>XMLRPC Sync</text>

-			<url>/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0</url>

-			<active/>

-		</tab>

-		<tab>

-			<text>View config files</text>

-			<url>/zebedee_view_config.php</url>

-		</tab>

-		<tab>

-			<text>View log files</text>

-			<url>/zebedee_log.php</url>

-		</tab>

-	</tabs>

-	<configpath>installedpackages->package->zebedee</configpath>

-	<fields>

-		<field>

-			<type>listtopic</type>

-			<fieldname>temp</fieldname>

-			<name>Enable Zebedee configuration sync</name>

-		</field>		

-		<field>

-			<fielddescr>Automatically sync Zebedee configuration changes</fielddescr>

-			<fieldname>synconchanges</fieldname>

-			<description>pfSense will automatically sync changes to the hosts defined below.</description>

-			<type>checkbox</type>

-		</field>

-		<field>

-			<fielddescr>Remote Server</fielddescr>

-			<fieldname>none</fieldname>

-			<type>rowhelper</type>

-			<rowhelper>

-			<rowhelperfield>

-				<fielddescr>IP Address</fielddescr>

-				<fieldname>ipaddress</fieldname>

-				<description>IP Address of remote server</description>

-				<type>input</type>

-				<size>20</size>

-			</rowhelperfield>

-			<rowhelperfield>

-				<fielddescr>Password</fielddescr>

-				<fieldname>password</fieldname>

-				<description>Password for remote server.</description>

-				<type>password</type>

-				<size>20</size>

-			</rowhelperfield>

-			</rowhelper>

-		</field>

-	</fields>

-	<custom_php_resync_config_command>

-		zebedee_sync_on_changes();		

-	</custom_php_resync_config_command>

-	<custom_php_command_before_form>	

-		unset($_POST['temp']);

-	</custom_php_command_before_form>

+<?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd">
+<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
+<packagegui>
+        <copyright>
+        <![CDATA[
+/* ========================================================================== */
+/*
+    zebedee_sync.xml
+    part of pfSense (http://www.pfSense.com)
+    Copyright (C) 2008 Scott Ullrich <sullrich@gmail.com>
+    Copyright (C) 2011 Marcello Coutinho
+    Copyright (C) 2011 Jorge Lustosa
+    All rights reserved.
+                                                                              */
+/* ========================================================================== */
+/*
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+     1. Redistributions of source code must retain the above copyright notice,
+        this list of conditions and the following disclaimer.
+
+     2. Redistributions in binary form must reproduce the above copyright
+        notice, this list of conditions and the following disclaimer in the
+        documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+                                                                              */
+/* ========================================================================== */
+        ]]>
+        </copyright>
+    <description>Describe your package here</description>
+    <requirements>Describe your package requirements here</requirements>
+    <faq>Currently there are no FAQ items provided.</faq>
+	<name>zebedeesync</name>
+	<version>1.1</version>
+	<title>Zebedee: Manual Sync</title>
+	<include_file>/usr/local/pkg/zebedee.inc</include_file>
+	<tabs>
+		<tab>
+			<text>Settings</text>
+			<url>/pkg_edit.php?xml=zebedee.xml&amp;id=0</url>
+		</tab>
+		<tab>
+			<text>Tunnels</text>
+			<url>/pkg_edit.php?xml=zebedee_tunnels.xml&amp;id=0</url>
+		</tab>
+		<tab>
+			<text>Keys</text>
+			<url>/zebedee_keys.php</url>
+		</tab>
+		<tab>
+			<text>XMLRPC Sync</text>
+			<url>/pkg_edit.php?xml=zebedee_sync.xml&amp;id=0</url>
+			<active/>
+		</tab>
+		<tab>
+			<text>View config files</text>
+			<url>/zebedee_view_config.php</url>
+		</tab>
+		<tab>
+			<text>View log files</text>
+			<url>/zebedee_log.php</url>
+		</tab>
+	</tabs>
+	<configpath>installedpackages->package->zebedee</configpath>
+	<fields>
+		<field>
+			<type>listtopic</type>
+			<fieldname>temp</fieldname>
+			<name>Enable Zebedee configuration sync</name>
+		</field>		
+		<field>
+			<fielddescr>Automatically sync Zebedee configuration changes</fielddescr>
+			<fieldname>synconchanges</fieldname>
+			<description>Automatically sync changes to the hosts defined below.</description>
+			<type>checkbox</type>
+		</field>
+		<field>
+			<fielddescr>Remote Server</fielddescr>
+			<fieldname>none</fieldname>
+			<type>rowhelper</type>
+			<rowhelper>
+			<rowhelperfield>
+				<fielddescr>IP Address</fielddescr>
+				<fieldname>ipaddress</fieldname>
+				<description>IP Address of remote server</description>
+				<type>input</type>
+				<size>20</size>
+			</rowhelperfield>
+			<rowhelperfield>
+				<fielddescr>Password</fielddescr>
+				<fieldname>password</fieldname>
+				<description>Password for remote server.</description>
+				<type>password</type>
+				<size>20</size>
+			</rowhelperfield>
+			</rowhelper>
+		</field>
+	</fields>
+	<custom_php_resync_config_command>
+		zebedee_sync_on_changes();		
+	</custom_php_resync_config_command>
+	<custom_php_command_before_form>	
+		unset($_POST['temp']);
+	</custom_php_command_before_form>
 </packagegui>
\ No newline at end of file