From 6ffc3225a97ff703c4d59e50cab09421c3aab39f Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 23:28:21 +0200
Subject: systempatches - some code style cosmetics

Fix copyright header and nuke pointless tags.
---
 config/systempatches/systempatches.xml | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'config/systempatches')

diff --git a/config/systempatches/systempatches.xml b/config/systempatches/systempatches.xml
index ad7f5953..06f024a8 100644
--- a/config/systempatches/systempatches.xml
+++ b/config/systempatches/systempatches.xml
@@ -3,19 +3,22 @@
 <?xml-stylesheet type="text/xsl" href="../xsl/package.xsl"?>
 <packagegui>
 	<copyright>
-	<![CDATA[
-/* ========================================================================== */
+<![CDATA[
+/* $Id$ */
+/* ====================================================================================== */
 /*
 	systempatches.xml
-	part of pfSense (http://www.pfSense.com)
+	part of pfSense (https://www.pfSense.org/)
 	Copyright (C) 2012 Jim Pingle
+	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,30 +38,25 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-/* ==========================================================================	*/
+/* ====================================================================================== */
 	]]>
 	</copyright>
-	<description>System Patches</description>
-	<requirements>None</requirements>
-	<faq>Applies patches supplied by the user to the firewall.</faq>
+	<description>System Patches applies patches supplied by the user to the firewall.</description>
 	<name>System Patches</name>
-	<version>1.0.4</version>
+	<version>1.0.5</version>
 	<title>System: Patches</title>
 	<include_file>/usr/local/pkg/patches.inc</include_file>
 	<menu>
 		<name>Patches</name>
-		<tooltiptext></tooltiptext>
 		<section>System</section>
 		<url>/system_patches.php</url>
 	</menu>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>644</chmod>
 		<item>https://packages.pfsense.org/packages/config/systempatches/system_patches.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/www/</prefix>
-		<chmod>644</chmod>
 		<item>https://packages.pfsense.org/packages/config/systempatches/system_patches_edit.php</item>
 	</additional_files_needed>
 	<additional_files_needed>
@@ -67,7 +66,6 @@
 	</additional_files_needed>
 	<additional_files_needed>
 		<prefix>/usr/local/pkg/</prefix>
-		<chmod>644</chmod>
 		<item>https://packages.pfsense.org/packages/config/systempatches/patches.inc</item>
 	</additional_files_needed>
 	<custom_php_install_command>
@@ -76,4 +74,4 @@
 	<custom_php_deinstall_command>
 		patch_package_deinstall();
 	</custom_php_deinstall_command>
-</packagegui>
\ No newline at end of file
+</packagegui>
-- 
cgit v1.2.3


From e24b12868b5e8655079851b83d143eb130976b95 Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 23:29:58 +0200
Subject: systempatches - some code style cosmetics

- Fix copyright header
- Switch GitHub to HTTPS.
---
 config/systempatches/patches.inc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'config/systempatches')

diff --git a/config/systempatches/patches.inc b/config/systempatches/patches.inc
index f47324c4..0aa37fb8 100644
--- a/config/systempatches/patches.inc
+++ b/config/systempatches/patches.inc
@@ -1,7 +1,9 @@
 <?php
 /*
 	patches.inc
+	part of pfSense (https://www.pfSense.org/)
 	Copyright (C) 2012 Jim Pingle
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -25,12 +27,11 @@
 	ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 	POSSIBILITY OF SUCH DAMAGE.
 */
-
 require_once("globals.inc");
 require_once("util.inc");
 
 global $git_root_url, $patch_suffix, $patch_dir, $patch_cmd;
-$git_root_url = "http://github.com/pfsense/pfsense/commit/";
+$git_root_url = "https://github.com/pfsense/pfsense/commit/";
 $patch_suffix = ".patch";
 $patch_dir = "/var/patches";
 $patch_cmd = "/usr/bin/patch";
-- 
cgit v1.2.3


From ed6c546579d9da6d14356c7ec6dd7748d5ffcb3a Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 23:32:52 +0200
Subject: systempatches - some code style cosmetics

- Fix copyright header
- Some XHTML fixes
---
 config/systempatches/system_patches.php | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'config/systempatches')

diff --git a/config/systempatches/system_patches.php b/config/systempatches/system_patches.php
index feeee07e..c33499cb 100644
--- a/config/systempatches/system_patches.php
+++ b/config/systempatches/system_patches.php
@@ -1,7 +1,9 @@
 <?php
 /*
 	system_patches.php
+	part of pfSense (https://www.pfSense.org/)
 	Copyright (C) 2012 Jim Pingle
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -152,7 +154,7 @@ if (isset($_POST['del_x'])) {
 }
 
 $closehead = false;
-$pgtitle = array(gettext("System"),gettext("Patches"));
+$pgtitle = array(gettext("System"), gettext("Patches"));
 include("head.inc");
 
 ?>
@@ -166,7 +168,7 @@ include("head.inc");
 <body link="#000000" vlink="#000000" alink="#000000">
 <?php include("fbegin.inc"); ?>
 <form action="system_patches.php" method="post" name="iform">
-<script type="text/javascript" language="javascript" src="/javascript/row_toggle.js"></script>
+<script type="text/javascript" src="/javascript/row_toggle.js"></script>
 <?php if ($savemsg) print_info_box_np($savemsg, "Patches", "Close", false); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0" summary="system patches">
 <tr><td><div id="mainarea">
@@ -204,7 +206,7 @@ include("head.inc");
 					<?php if (count($a_patches) == 0): ?>
 						<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected patches");?>" border="0" alt="delete" />
 					<?php else: ?>
-						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected patches"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected patches?");?>')" />
+						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete selected patches"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected patches?");?>')" />
 					<?php endif; ?>
 					</td>
 					<td><a href="system_patches_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new patch"); ?>" alt="add" /></a></td>
@@ -221,7 +223,7 @@ foreach ($a_patches as $thispatch):
 
 ?>
 	<tr valign="top" id="fr<?=$npatches;?>">
-		<td class="listt"><input type="checkbox" id="frc<?=$npatches;?>" name="patch[]" value="<?=$i;?>" onClick="fr_bgcolor('<?=$npatches;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;" /></td>
+		<td class="listt"><input type="checkbox" id="frc<?=$npatches;?>" name="patch[]" value="<?=$i;?>" onclick="fr_bgcolor('<?=$npatches;?>')" style="margin: 0; padding: 0; width: 15px; height: 15px;" /></td>
 		<td class="listlr" onclick="fr_toggle(<?=$npatches;?>)" id="frd<?=$npatches;?>" ondblclick="document.location='system_patches_edit.php?id=<?=$npatches;?>';">
 			<?=$thispatch['descr'];?>
 		</td>
@@ -260,10 +262,10 @@ foreach ($a_patches as $thispatch):
 		<td class="listr" onclick="fr_toggle(<?=$npatches;?>)" id="frd<?=$npatches;?>" ondblclick="document.location='system_patches_edit.php?id=<?=$npatches;?>';">
 			<?= isset($thispatch['autoapply']) ? "Yes" : "No" ?>
 		</td>
-		<td valign="middle" class="list" nowrap>
+		<td valign="middle" class="list" nowrap="nowrap">
 			<table border="0" cellspacing="0" cellpadding="1" summary="edit">
 				<tr>
-					<td><input onmouseover="fr_insline(<?=$npatches;?>, true)" onmouseout="fr_insline(<?=$npatches;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected patches before this patch");?>" height="17" type="image" width="17" border="0" /></td>
+					<td><input onmouseover="fr_insline(<?=$npatches;?>, true)" onmouseout="fr_insline(<?=$npatches;?>, false)" name="move_<?=$i;?>" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected patches before this patch");?>" type="image" /></td>
 					<td><a href="system_patches_edit.php?id=<?=$i;?>"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" title="<?=gettext("edit patch"); ?>" alt="edit" /></a></td>
 				</tr>
 				<tr>
@@ -280,17 +282,17 @@ endforeach;
 ?>
 	<tr>
 		<td class="list" colspan="8"></td>
-		<td class="list" valign="middle" nowrap>
+		<td class="list" valign="middle" nowrap="nowrap">
 			<table border="0" cellspacing="0" cellpadding="1" summary="edit">
 				<tr>
-					<td><?php if ($npatches == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected patches to end"); ?>" border="0" alt="move" /><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" width="17" height="17" title="<?=gettext("move selected patches to end");?>" border="0" alt="move" /><?php endif; ?></td>
+					<td><?php if ($npatches == 0): ?><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_left_d.gif" width="17" height="17" title="<?=gettext("move selected patches to end"); ?>" border="0" alt="move" /><?php else: ?><input name="move_<?=$i;?>" type="image" src="/themes/<?= $g['theme']; ?>/images/icons/icon_left.gif" title="<?=gettext("move selected patches to end");?>" alt="move" /><?php endif; ?></td>
 				</tr>
 				<tr>
 					<td width="17">
 					<?php if (count($a_patches) == 0): ?>
 						<img src="./themes/<?= $g['theme']; ?>/images/icons/icon_x_d.gif" width="17" height="17" title="<?=gettext("delete selected patches");?>" border="0" alt="delete" />
 					<?php else: ?>
-						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" width="17" height="17" title="<?=gettext("delete selected patches"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected patches?");?>')" />
+						<input name="del" type="image" src="./themes/<?= $g['theme']; ?>/images/icons/icon_x.gif" title="<?=gettext("delete selected patches"); ?>" onclick="return confirm('<?=gettext("Do you really want to delete the selected patches?");?>')" />
 					<?php endif; ?>
 					</td>
 					<td><a href="system_patches_edit.php"><img src="/themes/<?= $g['theme']; ?>/images/icons/icon_plus.gif" width="17" height="17" border="0" title="<?=gettext("add new patch"); ?>" alt="add" /></a></td>
-- 
cgit v1.2.3


From fb7a854584d2767abfa04e4b13636579f03709be Mon Sep 17 00:00:00 2001
From: doktornotor <notordoktor@gmail.com>
Date: Tue, 11 Aug 2015 23:34:17 +0200
Subject: systempatches - some code style cosmetics

- Fix copyright header; add missing space.
---
 config/systempatches/system_patches_edit.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'config/systempatches')

diff --git a/config/systempatches/system_patches_edit.php b/config/systempatches/system_patches_edit.php
index 9e1f7a49..9cde3e48 100644
--- a/config/systempatches/system_patches_edit.php
+++ b/config/systempatches/system_patches_edit.php
@@ -1,7 +1,9 @@
 <?php
 /*
 	system_patches_edit.php
+	part of pfSense (https://www.pfSense.org/)
 	Copyright (C) 2012 Jim Pingle
+	Copyright (C) 2015 ESF, LLC
 	All rights reserved.
 
 	Redistribution and use in source and binary forms, with or without
@@ -80,7 +82,7 @@ if ($_POST) {
 	$pconfig = $_POST;
 
 	/* input validation */
-	if(empty($_POST['location'])) {
+	if (empty($_POST['location'])) {
 		$reqdfields = explode(" ", "patch");
 		$reqdfieldsn = array(gettext("Patch Contents"));
 	} else {
-- 
cgit v1.2.3