X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=metaform.php;h=ad980a60b1b932b1d04c79449651d63da67eed87;hp=2be93ea925b54c394502921aedf1c2a268bfa314;hb=23dfbcc20fc6d20fb5be211e5af50cdcb8565c8e;hpb=d674720715c4dd8f210d9064db032f1c862dd3fa

diff --git a/metaform.php b/metaform.php
index 2be93ea..ad980a6 100644
--- a/metaform.php
+++ b/metaform.php
@@ -95,7 +95,7 @@ function tem_set_globals(&$tem) {
 	}
 }
 
-function metaform() {
+function metaform_main() {
 	if(isset($_REQUEST['singular'])) {
 		$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
 		$GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
@@ -153,9 +153,10 @@ function metaform() {
 
 
 	set_form_action();
-	tem_load('code/wfpl/metaform/main.html');
+	tem_load(__DIR__.'/'.'metaform/main.html');
 	list_available_types();
 	tem_output();
+	exit(); # in case we're being called by wfpl_main or something
 }
 
 
@@ -254,7 +255,7 @@ function view_headers() {
 
 function make_sql() {
 	$tem = new tem();
-	$tem->load('code/wfpl/metaform/template.sql');
+	$tem->load(__DIR__.'/'.'metaform/template.sql');
 	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
@@ -297,7 +298,7 @@ function find_always_field(&$fields) {
 function make_html($whole_file = true) {
 	$has_html_editors = false;
 	$tem = new tem();
-	$tem->load('code/wfpl/metaform/template.html');
+	$tem->load(__DIR__.'/'.'metaform/template.html');
 	tem_set_globals($tem);
 	$fields = get_fields();
 	$tem->set('always_field', find_always_field($fields));
@@ -443,7 +444,7 @@ function pulldown_options_array($options) {
 function make_php() {
 	$has_html_editors = false;
 	$tem = new tem();
-	$tem->load('code/wfpl/metaform/template.php');
+	$tem->load(__DIR__.'/'.'metaform/template.php');
 	tem_set_globals($tem);
 	$fields = get_fields();
 	$db_fields = '';
@@ -540,7 +541,7 @@ function view_php() {
 
 function make_email() {
 	$tem = new tem();
-	$tem->load('code/wfpl/metaform/template.email.txt');
+	$tem->load(__DIR__.'/'.'metaform/template.email.txt');
 	tem_set_globals($tem);
 	$fields = get_fields();
 	foreach($fields as $field) {
@@ -561,7 +562,7 @@ function make_email() {
 function make_htaccess() {
 	$tem = new tem();
 	$tem->set('form', $GLOBALS['file_name']);
-	return $tem->run('code/wfpl/metaform/htaccess');
+	return $tem->run(__DIR__.'/'.'metaform/htaccess');
 }
 
 function view_email() {
@@ -570,7 +571,7 @@ function view_email() {
 }
 
 function preview() {
-	tem_load('code/wfpl/metaform/preview.html');
+	tem_load(__DIR__.'/'.'metaform/preview.html');
 	tem_set_globals($GLOBALS['wfpl_template']);
 	tem_set('fields', $_REQUEST['fields']);
 	$preview_tem = new tem();
@@ -597,11 +598,11 @@ function download_tar() {
 	$admin_name = $GLOBALS['file_name'];
 	$nice_name = $GLOBALS['public_file_name'];
 	$files = array(
-		"INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'),
+		"INSTALL" => read_whole_file(__DIR__.'/'.'metaform/INSTALL'),
 		".htaccess" => make_htaccess(),
-		"run.php" => "<?php\n\nrequire_once(__DIR__.'/'.'code/wfpl/run.php');\n",
-		"styl.styl" => read_whole_file('code/wfpl/metaform/styl.styl'),
-		"template.html" => read_whole_file('code/wfpl/metaform/site-template.html'),
+		"config.php" => "<?php\n\nrequire_once(__DIR__.'/'.'inc/wfpl/main.php');\nmetaform_main();\n",
+		"styl.styl" => read_whole_file(__DIR__.'/'.'metaform/styl.styl'),
+		"template.html" => read_whole_file(__DIR__.'/'.'metaform/site-template.html'),
 		"$admin_name.html" => make_html(),
 		"$admin_name.php" => make_php());
 	if($GLOBALS['opt_public_something']) {
@@ -616,7 +617,3 @@ function download_tar() {
 	}
 	make_tar($nice_name, $files);
 }
-
-
-metaform();
-exit();