diff options
| -rw-r--r-- | config/notes/notes.inc | 62 | ||||
| -rw-r--r-- | config/notes/notes.xml | 44 | ||||
| -rw-r--r-- | pkg_config.10.xml | 2 |
3 files changed, 24 insertions, 84 deletions
diff --git a/config/notes/notes.inc b/config/notes/notes.inc index 29b51396..ddc54a3f 100644 --- a/config/notes/notes.inc +++ b/config/notes/notes.inc @@ -1,14 +1,11 @@ <?php -/* $Id$ */ -/* -/* ========================================================================== */ /* 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: @@ -30,62 +27,11 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - -function notes_sync_package() { - - //global $config; - -} - - -function notes_install_command() { - - global $config; - conf_mount_rw(); - config_lock(); - - if (!is_dir('/usr/local/www/packages/')) { - exec("mkdir /usr/local/www/packages/"); - } - - //if (!is_dir('/usr/local/www/packages/notes/')) { - // exec("mkdir /usr/local/www/packages/notes/"); - //} - - //rename PHP files from .tmp to .php - //exec("cp /tmp/notes.tmp /usr/local/www/packages/phpservice/notes.php"); - //unlink_if_exists("/tmp/notes.tmp"); - - //write_config(); - - //write_rcfile(array( - // "file" => "notes.sh", - // "start" => "/usr/local/bin/php /usr/local/pkg/notes.php", - // "stop" => "rm /tmp/phpmonitor.pid" - // ) - //); - - notes_sync_package(); - - //if (pkg_is_service_running('notes')) { - //documentation purposes - //} - - conf_mount_ro(); - config_unlock(); - -} - - function notes_deinstall_command() { - conf_mount_rw(); - config_lock(); unlink_if_exists("/usr/local/pkg/notes.xml"); unlink_if_exists("/usr/local/pkg/notes.inc"); conf_mount_ro(); - config_unlock(); - } -?>
\ No newline at end of file +?> diff --git a/config/notes/notes.xml b/config/notes/notes.xml index 34d2f676..e74a76f1 100644 --- a/config/notes/notes.xml +++ b/config/notes/notes.xml @@ -1,21 +1,24 @@ <?xml version="1.0" encoding="utf-8" ?> -<!DOCTYPE packagegui SYSTEM "./schema/packages.dtd"> -<?xml-stylesheet type="text/xsl" href="./xsl/package.xsl"?> +<!DOCTYPE packagegui SYSTEM "../schema/packages.dtd"> +<?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?> <packagegui> <copyright> - <![CDATA[ +<![CDATA[ /* $Id$ */ -/* ========================================================================== */ +/* ====================================================================================== */ /* notes.xml + 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. @@ -23,6 +26,7 @@ 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 @@ -34,14 +38,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* ========================================================================== */ - ]]> +/* ====================================================================================== */ + ]]> </copyright> <description>Notes</description> - <requirements>Describe your package requirements here</requirements> - <faq>Currently there are no FAQ items provided.</faq> <name>Notes</name> - <version>0.2.5</version> + <version>0.2.6</version> <title>Settings</title> <include_file>/usr/local/pkg/notes.inc</include_file> <menu> @@ -61,7 +63,6 @@ <configpath>installedpackages->package->$packagename->configuration->notes</configpath> <additional_files_needed> <prefix>/usr/local/pkg/</prefix> - <chmod>0755</chmod> <item>https://packages.pfsense.org/packages/config/notes/notes.inc</item> </additional_files_needed> <adddeleteeditpagefields> @@ -84,11 +85,15 @@ <field> <fielddescr>Category</fielddescr> <fieldname>category</fieldname> - <description>Enter a category.</description> + <description>Enter the category.</description> <type>input</type> </field> <field> - <fielddescr><b>Notes</b> <br /> <br /></fielddescr> + <fielddescr> + <![CDATA[ + <strong>Notes</strong><br /><br /> + ]]> + </fielddescr> <fieldname>notes</fieldname> <description></description> <type>textarea</type> @@ -98,18 +103,7 @@ <rows>20</rows> </field> </fields> - <custom_add_php_command> - </custom_add_php_command> - <custom_php_resync_config_command> - notes_sync_package(); - </custom_php_resync_config_command> - <custom_delete_php_command> - notes_sync_package(); - </custom_delete_php_command> - <custom_php_install_command> - notes_install_command(); - </custom_php_install_command> <custom_php_deinstall_command> notes_deinstall_command(); </custom_php_deinstall_command> -</packagegui>
\ No newline at end of file +</packagegui> diff --git a/pkg_config.10.xml b/pkg_config.10.xml index 26b58489..541f9e72 100644 --- a/pkg_config.10.xml +++ b/pkg_config.10.xml @@ -326,7 +326,7 @@ <category>Status</category> <pkginfolink/> <config_file>https://packages.pfsense.org/packages/config/notes/notes.xml</config_file> - <version>0.2.5</version> + <version>0.2.6</version> <status>Alpha</status> <required_version>2.2</required_version> <maintainer>markjcrane@gmail.com</maintainer> |