Merge pull request #1158 from doktornotor/patch-15

5 files changed, 58 insertions, 17 deletions

diff --git a/config/apcupsd/apcupsd.priv.inc b/config/apcupsd/apcupsd.priv.inc
new file mode 100644
index 00000000..5526b99f
--- /dev/null
+++ b/config/apcupsd/apcupsd.priv.inc
@@ -0,0 +1,38 @@
+<?php
+/*
+	apcupsd.priv.inc
+	part of pfSense (http://www.pfSense.org/)
+	Copyright (C) 2015 ESF, LLC
+	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.
+*/
+global $priv_list;
+
+$priv_list['page-services-apcupsd'] = array();
+$priv_list['page-services-apcupsd']['name'] = "WebCfg - Services: apcupsd";
+$priv_list['page-services-apcupsd']['descr'] = "Allow access to apcupsd package GUI";
+$priv_list['page-services-apcupsd']['match'] = array();
+$priv_list['page-services-apcupsd']['match'][] = "pkg_edit.php?xml=apcupsd.xml*";
+$priv_list['page-services-apcupsd']['match'][] = "apcupsd_status.php*";
+
+?>
diff --git a/config/apcupsd/apcupsd.xml b/config/apcupsd/apcupsd.xml
index 38c84e81..cb33b8ef 100644
--- a/config/apcupsd/apcupsd.xml
+++ b/config/apcupsd/apcupsd.xml
@@ -41,17 +41,20 @@
 	</copyright>
 	<name>Apcupsd</name>
 	<title>Services: Apcupsd (General)</title>
-	<category>Monitoring</category>
-	<version>0.3.7</version>
+	<version>0.3.9</version>
 	<include_file>/usr/local/pkg/apcupsd.inc</include_file>
-	<addedit_string>Apcupsd has been created/modified.</addedit_string>
-	<delete_string>Apcupsd has been deleted.</delete_string>
+	<addedit_string>Apcupsd configuration has been created/modified.</addedit_string>
+	<delete_string>Apcupsd configuration has been deleted.</delete_string>
 	<restart_command>/usr/local/etc/rc.d/apcupsd.sh restart</restart_command>
 	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.inc</item>
 		<prefix>/usr/local/pkg/</prefix>
 	</additional_files_needed>
 	<additional_files_needed>
+		<item>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.priv.inc</item>
+		<prefix>/etc/inc/priv/</prefix>
+	</additional_files_needed>
+	<additional_files_needed>
 		<item>https://packages.pfsense.org/packages/config/apcupsd/apcupsd_status.php</item>
 		<prefix>/usr/local/www/</prefix>
 	</additional_files_needed>
@@ -67,18 +70,18 @@
 		<name>Apcupsd</name>
 		<tooltiptext>Setup Apcupsd specific settings</tooltiptext>
 		<section>Services</section>
-		<url>/pkg_edit.php?xml=apcupsd.xml&amp;id=0</url>
+		<url>/pkg_edit.php?xml=apcupsd.xml</url>
 	</menu>
 	<service>
 		<name>apcupsd</name>
 		<rcfile>apcupsd.sh</rcfile>
 		<executable>apcupsd</executable>
-		<description>Apcupsd a daemon for controlling APC UPSes</description>
+		<description>APC UPS Daemon</description>
 	</service>
 	<tabs>
 		<tab>
 			<text>General</text>
-			<url>/pkg_edit.php?xml=apcupsd.xml&amp;id=0</url>
+			<url>/pkg_edit.php?xml=apcupsd.xml</url>
 			<active/>
 		</tab>
 		<tab>
@@ -88,19 +91,19 @@
 	</tabs>
 	<fields>
 		<field>
-			<name>General configuration parameters</name>
+			<name>General Configuration Parameters</name>
 			<type>listtopic</type>
 		</field>
 		<field>
 			<fielddescr>Enable</fielddescr>
 			<fieldname>apcupsdenabled</fieldname>
-			<description>Enable APC UPS Daemon service</description>
+			<description>Enable APC UPS Daemon service.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
 			<fielddescr>UPS Name</fielddescr>
 			<fieldname>upsname</fieldname>
-			<description>Use this to give your UPS a name in log files and such</description>
+			<description>Use this to give your UPS a name in log files and such.</description>
 			<type>input</type>
 			<size>60</size>
 			<required>true</required>
@@ -199,7 +202,7 @@
 		<field>
 			<fielddescr>Kill on Power Fail</fielddescr>
 			<fieldname>killonpowerfail</fieldname>
-			<description>Hibernate UPS on powerfail</description>
+			<description>Hibernate UPS on powerfail.</description>
 			<type>checkbox</type>
 		</field>
 		<field>
@@ -322,7 +325,7 @@
 			<default_value>3551</default_value>
 		</field>
 		<field>
-			<name>Configuration statements used if sharing</name>
+			<name>UPS Sharing Configuration</name>
 			<type>listtopic</type>
 		</field>
 		<field>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index d159b89c..5dae028d 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -1727,7 +1727,7 @@
 		<website>http://www.apcupsd.com/</website>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
-		<version>0.3.8</version>
+		<version>0.3.9</version>
 		<status>BETA</status>
 		<required_version>2.2</required_version>
 		<configurationfile>apcupsd.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 97c48802..f683c27f 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1762,9 +1762,9 @@
 		<descr>Set of programs for controlling APC UPS.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
-		<version>apcupsd-3.14.10_1 pkg v0.3.6</version>
+		<version>apcupsd-3.14.10_1 pkg v0.3.9</version>
 		<status>BETA</status>
-		<required_version>2.0</required_version>
+		<required_version>2.1</required_version>
 		<configurationfile>apcupsd.xml</configurationfile>
 		<maintainer>dbaio@bsd.com.br</maintainer>
 		<build_port_path>/usr/ports/sysutils/apcupsd</build_port_path>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index cd3b7416..9658b52f 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1749,9 +1749,9 @@
 		<descr>Set of programs for controlling APC UPS.</descr>
 		<category>Services</category>
 		<config_file>https://packages.pfsense.org/packages/config/apcupsd/apcupsd.xml</config_file>
-		<version>apcupsd-3.14.10_1 pkg v0.3.6</version>
+		<version>apcupsd-3.14.10_1 pkg v0.3.9</version>
 		<status>BETA</status>
-		<required_version>2.0</required_version>
+		<required_version>2.1</required_version>
 		<configurationfile>apcupsd.xml</configurationfile>
 		<maintainer>dbaio@bsd.com.br</maintainer>
 		<build_port_path>/usr/ports/sysutils/apcupsd</build_port_path>