From: Jason Woofenden <jason183@herkamire.com>
Date: Fri, 12 Oct 2007 06:54:47 +0000 (-0400)
Subject: metaform's image handler fixed. metaform's *_main() factored
X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=commitdiff_plain;h=0bdfef457a85585b652827116173a939e4172d0e

metaform's image handler fixed. metaform's *_main() factored
---

diff --git a/metaform/template.html b/metaform/template.html
index a4c088e..e4b85d7 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -36,7 +36,7 @@
   <form action="~form_name~.html~enctype_attr~" method="post"><!--~opt_db_2 start~--><!--~~editing start~~--><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /><!--~~end~~--><!--~end~--><!--~uploads start~--><input type="hidden" name="MAX_FILE_SIZE" value="~~upload_max_filesize~~" /><!--~end~-->
     <table cellspacing="0" cellpadding="4" border="0" summary=""><!--~row start~-->
 
-      <tr><!--~image start~--><td class="caption">~caption.html~: </td><td class="field"><input type="file" name="~name~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td class="field"><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td class="field"><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~pulldown start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.options~~--></select></td><!--~end~--><!--~states start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.states~~--></select></td><!--~end~--><!--~radio start~--><td class="caption">~caption.html~: </td><td class="field"><input type="radio" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~checkbox start~--><td class="caption">~caption.html~? </td><td class="field"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~leftcheck start~--><td class="caption"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><td class="right_caption">~caption.html~?</td><!--~end~--><!--~submit start~--><td class="submit_row" colspan="2"><input type="submit" name="~name~" value="~caption.attr~" /></td><!--~end~--></tr><!--~end~-->
+      <tr><!--~image start~--><td class="caption">~caption.html~: </td><td class="field"><input type="file" name="~name~" /><input type="hidden" name="old_~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td class="field"><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td class="field"><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td class="field"><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~html start~--><td class="caption">~caption.html~: </td><td></td></tr><tr><td colspan="2"><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~pulldown start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.options~~--></select></td><!--~end~--><!--~states start~--><td class="caption">~caption.html~: </td><td class="field"><select name="~name~"><option value="">Choose One:</option><!--~~~name~.states~~--></select></td><!--~end~--><!--~radio start~--><td class="caption">~caption.html~: </td><td class="field"><input type="radio" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~checkbox start~--><td class="caption">~caption.html~? </td><td class="field"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~leftcheck start~--><td class="caption"><input type="checkbox" name="~name~~~~name~.checked~~" /></td><td class="right_caption">~caption.html~?</td><!--~end~--><!--~submit start~--><td class="submit_row" colspan="2"><input type="submit" name="~name~" value="~caption.attr~" /></td><!--~end~--></tr><!--~end~-->
     </table>
   </form>
 <!--~end~--><!--~~end~~-->
diff --git a/metaform/template.php b/metaform/template.php
index 6729930..d408ee8 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -82,7 +82,15 @@ function ~form_name~_display_listing($where = 'order by ~always_field~ limit 100
 	return true;
 }
 <!--~end~-->
-function ~form_name~_main() {<!--~opt_http_pass_2 start~-->
+function ~form_name~_main() {
+	$ret = _~form_name~_main();
+	if($ret) {
+		return $ret;
+	}
+	display_messages()
+}
+
+function _~form_name~_main() {<!--~opt_http_pass_2 start~-->
 	# To remove password protection, just delete this block:
 	if (!isset($_SERVER['PHP_AUTH_USER']) || $_SERVER['PHP_AUTH_USER'] != AUTH_USER || $_SERVER['PHP_AUTH_PW'] != AUTH_PASS) {
 		header('WWW-Authenticate: Basic realm="' . AUTH_REALM . '"');
diff --git a/upload.php b/upload.php
index e349cf0..f6a196b 100644
--- a/upload.php
+++ b/upload.php
@@ -185,10 +185,10 @@ function path_to($prog, $or_die = true) {
 	
 function _path_to($prog, $or_die) {
 	# relies on PHP's short-circuit mechanism
-	if(file_exists($convert = "/usr/local/bin/$prog") ||
-	   file_exists($convert = "/usr/bin/$prog") ||
-	   ($convert = `which convert` != '' && file_exists($convert))) {
-		return $convert;
+	if(file_exists($path = "/usr/local/bin/$prog") ||
+	   file_exists($path = "/usr/bin/$prog") ||
+	   ($path = `which $prog` != '' && file_exists($path))) {
+		return $path;
 	} else {
 		if($or_die) {
 			die("Failed to locate '$prog' executable.");
@@ -268,7 +268,7 @@ function make_thumbnail($filename, $max_width = '70', $max_height = '70') {
 function image_dimensions($image) {
 	$identify = path_to('identify');
 	$command = "$identify -format '%wx%h' " . escapeshellarg($image);
-	$dimensions = substr(`$command`, 0, -1); # substr() to remove newline
+	$dimensions = rtrim(`$command`);
 	if($dimensions == '') {
 		return false;
 	} else {