From c06ba3b1d66efa1478a5aea39fb833b81d35f846 Mon Sep 17 00:00:00 2001
From: Jason Woofenden
Date: Mon, 18 Apr 2011 04:30:30 -0400
Subject: [PATCH] metaform: php refactor, opt_public_*
---
metaform.php | 31 +++++++---
metaform/main.html | 6 +-
metaform/preview.html | 4 +-
metaform/template.html | 24 ++++----
metaform/template.php | 152 ++++++++++++++++++++++++++++++------------------
5 files changed, 135 insertions(+), 82 deletions(-)
diff --git a/metaform.php b/metaform.php
index cee8033..6ad925c 100644
--- a/metaform.php
+++ b/metaform.php
@@ -70,6 +70,7 @@ function list_available_types() {
function tem_set_globals(&$tem) {
$vars = array(
'file_name',
+ 'public_file_name',
'table_name',
'plural',
'singular');
@@ -84,7 +85,8 @@ function tem_set_globals(&$tem) {
'opt_display',
'opt_pass',
'opt_public_form',
- 'opt_public_display');
+ 'opt_public_display',
+ 'opt_public_something');
foreach($bools as $bool) {
if($GLOBALS[$bool]) {
$tem->set($bool);
@@ -111,6 +113,12 @@ function metaform() {
$GLOBALS['opt_public_form'] = format_bool($_REQUEST['opt_public_form']);
$GLOBALS['opt_public_display'] = format_bool($_REQUEST['opt_public_display']);
+ $GLOBALS['public_file_name'] = $GLOBALS['file_name'];
+ if($GLOBALS['opt_public_form'] || $GLOBALS['opt_public_display']) {
+ $GLOBALS['opt_public_something'] = 1;
+ $GLOBALS['file_name'] = $GLOBALS['file_name'] . _admin;
+ }
+
tem_init();
tem_set_globals($GLOBALS['wfpl_template']);
}
@@ -537,22 +545,27 @@ function preview() {
}
function download_tar() {
- $name = $GLOBALS['file_name'];
- $data = array(
+ $admin_name = $GLOBALS['file_name'];
+ $nice_name = $GLOBALS['public_file_name'];
+ $files = array(
"INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
".htaccess" => make_htaccess(),
- #"run.php ->" => 'code/wfpl/run.php',
+ "run.php ->" => 'code/wfpl/run.php',
"style.less" => read_whole_file('code/wfpl/metaform/style.less'),
"template.html" => read_whole_file('code/wfpl/metaform/site-template.html'),
- "$name.html" => make_html(),
- "$name.php" => make_php());
+ "$admin_name.html" => make_html(),
+ "$admin_name.php" => make_php());
+ if($GLOBALS['opt_public_something']) {
+ $files["$nice_name.html ->"] = "$admin_name.html";
+ $files["$nice_name.php ->"] = "$admin_name.php";
+ }
if($GLOBALS['opt_db']) {
- $data["$name.sql"] = make_sql();
+ $files["$nice_name.sql"] = make_sql();
}
if($GLOBALS['opt_email']) {
- $data["$name.email.txt"] = make_email();
+ $files["$nice_name.email.txt"] = make_email();
}
- make_tar($name, $data);
+ make_tar($nice_name, $files);
}
diff --git a/metaform/main.html b/metaform/main.html
index f168fc5..ef68b63 100644
--- a/metaform/main.html
+++ b/metaform/main.html
@@ -11,7 +11,7 @@
Below, specify the fields you'd like in your form, one field per line. After each field name, put at least one space, then the field type. The following field types are available: , ~type html~.
diff --git a/metaform/preview.html b/metaform/preview.html
index 09e0c4e..5e1d237 100644
--- a/metaform/preview.html
+++ b/metaform/preview.html
@@ -11,10 +11,10 @@
PREVIEW
~preview~
-
+