Merge pull request #1115 from doktornotor/patch-7

7 files changed, 55 insertions, 11 deletions

diff --git a/config/vhosts/vhosts.inc b/config/vhosts/vhosts.inc
index b0e2db45..b3ae7a7e 100644
--- a/config/vhosts/vhosts.inc
+++ b/config/vhosts/vhosts.inc
@@ -273,7 +273,7 @@ EOF;
 
 					// Set the default port
 					if (strlen($port) == 0) {
-						$port = '8001';
+						$port = '10081';
 					}
 
 					if ($ipaddress . ':' . $port != $ipaddress_and_port_previous_value) {
diff --git a/config/vhosts/vhosts.priv.inc b/config/vhosts/vhosts.priv.inc
new file mode 100644
index 00000000..f29c0813
--- /dev/null
+++ b/config/vhosts/vhosts.priv.inc
@@ -0,0 +1,40 @@
+<?php
+/*
+	vhosts.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-vhosts'] = array();
+$priv_list['page-services-vhosts']['name'] = "WebCfg - Services: vHosts package";
+$priv_list['page-services-vhosts']['descr'] = "Allow access to vHosts package GUI";
+
+$priv_list['page-services-vhosts']['match'] = array();
+$priv_list['page-services-vhosts']['match'][] = "packages/vhosts/vhosts_php.php*";
+$priv_list['page-services-vhosts']['match'][] = "packages/vhosts/vhosts_php_edit.php*";
+$priv_list['page-services-vhosts']['match'][] = "packages/vhosts/system_advanced_create_certs.php*";
+
+?>
diff --git a/config/vhosts/vhosts.xml b/config/vhosts/vhosts.xml
index 306ccc69..d1a6590c 100644
--- a/config/vhosts/vhosts.xml
+++ b/config/vhosts/vhosts.xml
@@ -43,7 +43,7 @@
 	</copyright>
 	<description>vHosts</description>
 	<name>vHosts Settings</name>
-	<version>0.8.0</version>
+	<version>0.8.3</version>
 	<title>vHosts Settings</title>
 	<include_file>/usr/local/pkg/vhosts.inc</include_file>
 	<menu>
@@ -65,6 +65,10 @@
 		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts.inc</item>
 	</additional_files_needed>
 	<additional_files_needed>
+		<prefix>/etc/inc/priv/</prefix>
+		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts.priv.inc</item>
+	</additional_files_needed>
+	<additional_files_needed>
 		<prefix>/usr/local/www/packages/vhosts/</prefix>
 		<item>https://packages.pfsense.org/packages/config/vhosts/vhosts_php.php</item>
 	</additional_files_needed>
diff --git a/config/vhosts/vhosts_php_edit.php b/config/vhosts/vhosts_php_edit.php
index cb5a330f..a0969b9f 100644
--- a/config/vhosts/vhosts_php_edit.php
+++ b/config/vhosts/vhosts_php_edit.php
@@ -201,7 +201,7 @@ function openwindow(url) {
 			<td width="78%" class="vtable">
 				<input name="host" type="text" class="formfld" id="host" size="40" value="<?=htmlspecialchars($pconfig['host']);?>" />
 				<br />
-				Required. If the host is intended for internal you can use the DNS forwarder to set a host name that is valid inside the local network. default: vhost01.local
+				Required. If the host is intended for internal you can use the DNS forwarder to set a host name that is valid inside the local network. Default: vhost01.local
 			</td>
 		</tr>
 		<tr>
@@ -209,7 +209,7 @@ function openwindow(url) {
 			<td width="78%" class="vtable">
 				<input name="ipaddress" type="text" class="formfld" id="ipaddress" size="40" value="<?=htmlspecialchars($pconfig['ipaddress']);?>" />
 				<br />
-				Required. Make sure the IP and Port combination does not conflict with the local system. example: 192.168.0.1
+				Required. Make sure the IP and Port combination does not conflict with the local system. Example: 192.168.0.1
 			</td>
 		</tr>
 		<tr>
@@ -217,7 +217,7 @@ function openwindow(url) {
 			<td width="78%" class="vtable">
 				<input name="port" type="text" class="formfld" id="port" size="40" value="<?=htmlspecialchars($pconfig['port']);?>" />
 				<br />
-				Make sure the IP and Port combination does not conflict with the local system. default: 8001
+				Make sure the IP and Port combination does not conflict with the local system. Default: 10081
 			</td>
 		</tr>
 		<tr>
diff --git a/pkg_config.10.xml b/pkg_config.10.xml
index 923c064a..90c85062 100644
--- a/pkg_config.10.xml
+++ b/pkg_config.10.xml
@@ -373,8 +373,8 @@
 		<port_category>www</port_category>
 		<pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file>
-		<version>0.8.2</version>
-		<status>ALPHA</status>
+		<version>0.8.3</version>
+		<status>Beta</status>
 		<required_version>2.2</required_version>
 		<maintainer>markjcrane@gmail.com</maintainer>
 		<configurationfile>vhosts.xml</configurationfile>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index 3ba19f95..52b25d97 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -452,8 +452,8 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/8/All/</depends_on_package_base_url>
-		<version>0.7.5</version>
-		<status>Stable</status>
+		<version>0.8.3</version>
+		<status>Beta</status>
 		<required_version>1.2.3</required_version>
 		<maintainer>markjcrane@gmail.com</maintainer>
 		<configurationfile>vhosts.xml</configurationfile>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 96c6d878..478a6a6a 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -439,8 +439,8 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/vhosts</pkginfolink>
 		<config_file>https://packages.pfsense.org/packages/config/vhosts/vhosts.xml</config_file>
 		<depends_on_package_base_url>https://files.pfsense.org/packages/amd64/8/All/</depends_on_package_base_url>
-		<version>0.7.5</version>
-		<status>Stable</status>
+		<version>0.8.3</version>
+		<status>Beta</status>
 		<required_version>1.2.3</required_version>
 		<maintainer>markjcrane@gmail.com</maintainer>
 		<configurationfile>vhosts.xml</configurationfile>