Merge pull request #1024 from doktornotor/patch-4

2 files changed, 0 insertions, 45 deletions

diff --git a/config/notes/notes.inc b/config/notes/notes.inc
deleted file mode 100644
index ddc54a3f..00000000
--- a/config/notes/notes.inc
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/*
-	notes.inc
-	part of pfSense (https://www.pfSense.org/)
-	Copyright (C) 2008 Mark J Crane
-	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.
-*/
-function notes_deinstall_command() {
-	conf_mount_rw();
-	unlink_if_exists("/usr/local/pkg/notes.xml");
-	unlink_if_exists("/usr/local/pkg/notes.inc");
-	conf_mount_ro();
-}
-
-?>
diff --git a/config/notes/notes.xml b/config/notes/notes.xml
index e74a76f1..03c0a01a 100644
--- a/config/notes/notes.xml
+++ b/config/notes/notes.xml
@@ -45,7 +45,6 @@
 	<name>Notes</name>
 	<version>0.2.6</version>
 	<title>Settings</title>
-	<include_file>/usr/local/pkg/notes.inc</include_file>
 	<menu>
 		<name>Notes</name>
 		<tooltiptext>Notes.</tooltiptext>
@@ -61,10 +60,6 @@
 		</tab>
 	</tabs>
 	<configpath>installedpackages->package->$packagename->configuration->notes</configpath>
-	<additional_files_needed>
-		<prefix>/usr/local/pkg/</prefix>
-		<item>https://packages.pfsense.org/packages/config/notes/notes.inc</item>
-	</additional_files_needed>
 	<adddeleteeditpagefields>
 		<columnitem>
 			<fielddescr>Title</fielddescr>
@@ -103,7 +98,4 @@
 			<rows>20</rows>
 		</field>
 	</fields>
-	<custom_php_deinstall_command>
-		notes_deinstall_command();
-	</custom_php_deinstall_command>
 </packagegui>