From ca6a8106bf3092480a6036ac351aaa6e34931d07 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 9 May 2012 10:18:22 -0400
Subject: Fix validation for pasting in a patch alone, make sure not to offer
 re-fetch if location is blank. version bump.

---
 config/systempatches/system_patches.php      | 2 +-
 config/systempatches/system_patches_edit.php | 4 ++--
 pkg_config.8.xml                             | 2 +-
 pkg_config.8.xml.amd64                       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/systempatches/system_patches.php b/config/systempatches/system_patches.php
index a10cb0bc..2cb6abf9 100644
--- a/config/systempatches/system_patches.php
+++ b/config/systempatches/system_patches.php
@@ -221,7 +221,7 @@ foreach ($a_patches as $thispatch):
 	<td class="listr" onClick="fr_toggle(<?=$npatches;?>)" id="frd<?=$npatches;?>" ondblclick="document.location='system_patches_edit.php?id=<?=$npatches;?>';">
 	<?php if (empty($thispatch['patch'])): ?>
 		<a href="system_patches.php?id=<?=$i;?>&act=fetch"><?php echo gettext("Fetch"); ?></a>
-	<?php else: ?>
+	<?php elseif (!empty($thispatch['location'])): ?>
 		<a href="system_patches.php?id=<?=$i;?>&act=fetch"><?php echo gettext("Re-Fetch"); ?></a>
 	<?php endif; ?>
 	</td>
diff --git a/config/systempatches/system_patches_edit.php b/config/systempatches/system_patches_edit.php
index 32318620..a4038b05 100644
--- a/config/systempatches/system_patches_edit.php
+++ b/config/systempatches/system_patches_edit.php
@@ -75,8 +75,8 @@ if ($_POST) {
 
 	/* input validation */
 	if(empty($_POST['location'])) {
-		$reqdfields = explode(" ", " patch");
-		$reqdfieldsn = array(gettext("Description"),gettext("Patch Contents"));
+		$reqdfields = explode(" ", "patch");
+		$reqdfieldsn = array(gettext("Patch Contents"));
 	} else {
 		$reqdfields = explode(" ", "descr location");
 		$reqdfieldsn = array(gettext("Description"),gettext("URL/Commit ID"));
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index e5f38b33..c36f83bb 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1432,7 +1432,7 @@
 		<name>System Patches</name>
 		<descr>A package to apply and maintain custom system patches.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.7</version>
+		<version>0.7.1</version>
 		<category>System</category>
 		<status>BETA</status>
 		<config_file>http://www.pfsense.com/packages/config/systempatches/systempatches.xml</config_file>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 2f3be6cb..d7c957f9 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -1385,7 +1385,7 @@
 		<name>System Patches</name>
 		<descr>A package to apply and maintain custom system patches.</descr>
 		<maintainer>jimp@pfsense.org</maintainer>
-		<version>0.7</version>
+		<version>0.7.1</version>
 		<category>System</category>
 		<status>BETA</status>
 		<config_file>http://www.pfsense.com/packages/config/systempatches/systempatches.xml</config_file>
-- 
cgit v1.2.3