From: Jason Woofenden <jason183@herkamire.com>
Date: Thu, 3 May 2007 05:28:37 +0000 (-0400)
Subject: Merge branch 'master' of /home/jason/dev/git/wfpl
X-Git-Url: https://jasonwoof.com/gitweb/?a=commitdiff_plain;h=cf7a90640ded556566c93932c4c56c1c7a1ffdae;hp=349ec547cd4bda41fe3b47b8ce4e231a389956e2;p=wfpl.git

Merge branch 'master' of /home/jason/dev/git/wfpl
---

diff --git a/metaform.php b/metaform.php
index f5c71f2..5ba0f44 100644
--- a/metaform.php
+++ b/metaform.php
@@ -42,6 +42,7 @@ $GLOBALS['types'] = array(
 	'password' =>   array('password',    'oneline',    'varchar(200)'),
 	'textarea' =>   array('textarea',    'unix',       'text'),
 	'pulldown' =>   array('pulldown',    'options',    'int'),
+	'radio' =>      array('radio',       'oneline',    'varchar(200)'),
 	'checkbox' =>   array('checkbox',    'yesno',      'varchar(3)'),
 	'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
 	'delete' =>     array('checkbox',    'yesno',      'n/a'),
diff --git a/metaform/template.html b/metaform/template.html
index 57a0d19..531f416 100644
--- a/metaform/template.html
+++ b/metaform/template.html
@@ -19,7 +19,7 @@ div.error { border: 2px solid red; padding: 13px; margin: 20px; background: #ffd
   <form action="~form_name~.html~enctype_attr~" method="post"><!--~~editing start~~--><input type="hidden" name="~form_name~_edit_id" value="~~~form_name~_edit_id.attr~~" /><!--~~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><input type="file" name="~name~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~checkbox start~--><td class="caption">~caption.html~: </td><td><input type="checkbox" name="~name~~~~name~.checked~~" /></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><input type="file" name="~name~" /></td><!--~end~--><!--~textbox start~--><td class="caption">~caption.html~: </td><td><input type="text" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~password start~--><td class="caption">~caption.html~: </td><td><input type="password" name="~name~" value="~~~name~.attr~~" /></td><!--~end~--><!--~textarea start~--><td class="caption">~caption.html~: </td><td><textarea rows="20" cols="50" name="~name~">~~~name~.html~~</textarea></td><!--~end~--><!--~radio start~--><td class="caption">~caption.html~: </td><td><input type="radio" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~checkbox start~--><td class="caption">~caption.html~: </td><td><input type="checkbox" name="~name~~~~name~.checked~~" /></td><!--~end~--><!--~submit start~--><td class="submit_row" colspan="2"><input type="submit" name="~name~" value="~caption.attr~" /></td><!--~end~--></tr><!--~end~-->
 
     </table>
   </form>
diff --git a/metaform/template.php b/metaform/template.php
index 5ebf77c..14836c7 100644
--- a/metaform/template.php
+++ b/metaform/template.php
@@ -32,7 +32,6 @@ require_once('code/wfpl/db.php');<!--~image_include start~-->
 require_once('code/wfpl/upload.php');<!--~end~-->
 
 function ~form_name~_get_fields() {
-	$fields = array();
 	<!--~formats start~-->
 	$~name~ = format_~format~($_REQUEST['~name~']);<!--~end~--><!--~image_upload start~-->
 	$~name~ = save_uploaded_image('~name~', $GLOBALS['upload_directory']);<!--~end~-->
diff --git a/run.php b/run.php
index 03d849a..f449015 100644
--- a/run.php
+++ b/run.php
@@ -57,36 +57,22 @@
 
 require_once('code/wfpl/file_run.php');
 require_once('code/wfpl/http.php');
+require_once('code/wfpl/template.php');
 
 function run_php($basename = false) {
-	if($basename) {
-		$html_file = "$basename.html";
-		$php_file = "$basename.php";
-	} else {
-		$html_file = $_SERVER['REDIRECT_URL'];
-		$html_file = ereg_replace('.*/', '', $html_file);
-		if($html_file == '') {
-			$html_file = 'index.html';
+	if(!$basename) {
+		$basename = $_SERVER['REDIRECT_URL'];
+		$basename = ereg_replace('.*/', '', $basename);
+		$basename = ereg_replace('\.html$', '', $basename);
+		if($basename == '') {
+			$basename = 'index';
 		}
-		$php_file = ereg_replace('\.html$', '.php', $html_file);
 	}
-	if($php_file != $html_file && file_exists($php_file)) {
-		require_once('code/wfpl/template.php');
-		if(file_exists($html_file)) {
-			$GLOBALS['wfpl_template'] = new tem();
-			tem_load($html_file);
-		}
-		$other = file_run($php_file);
-		if($other) {
-			if(strpos($other, ':')) {
-				redirect($other);
-				exit();
-			}
-			run_php($other);
-			return;
-		}
-		if(file_exists($html_file)) tem_output();
-	} else {
+
+	$html_file = "$basename.html";
+	$php_file = "$basename.php";
+
+	if(!file_exists($php_file)) {
 		if(file_exists($html_file)) {
 			readfile($html_file);
 		} else {
@@ -97,6 +83,39 @@ function run_php($basename = false) {
 				echo '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"><html><head><title>404</title></head><body><h1>404 File Not Found</h1></body></html>';
 			}
 		}
+		exit();
+	}
+
+	if(file_exists($html_file)) {
+		$GLOBALS['wfpl_template'] = new tem();
+		tem_load($html_file);
+	}
+
+	$other = file_run($php_file);
+	if($other) {
+		if(strpos($other, ':')) {
+			redirect($other);
+			exit();
+		}
+		run_php($other);
+		return;
+	}
+
+	if($GLOBALS['wfpl_template']) {
+		if(file_exists('template.html')) {
+			$tem = new tem();
+			$tem->load("template.html");
+			$sections = tem_top_subs();
+			if($sections) foreach($sections as $name => $val) {
+				$tem->set($name, $val);
+			}
+			$GLOBALS['wfpl_template'] = $tem;
+		}
+
+		if(function_exists('display_messages')) {
+			display_messages();
+		}
+		tem_output();
 	}
 }