X-Git-Url: https://jasonwoof.com/gitweb/?p=wfpl.git;a=blobdiff_plain;f=metaform.php;h=f8112aacb0679f8a3c824b153170c9a0c87bb39f;hp=c20701c1a0974f17fba6d4511e9f12fb84109217;hb=062d46e16429f2e55573567518cb01c83b319ac4;hpb=eecd5e3576866afc8091abe9b74352130fd8e6cc diff --git a/metaform.php b/metaform.php index c20701c..f8112aa 100644 --- a/metaform.php +++ b/metaform.php @@ -18,12 +18,12 @@ # This file writes the code for you (sql, php, html, email) to handle a form. -require_once(__DIR__ . '/template.php'); -require_once(__DIR__ . '/http.php'); -require_once(__DIR__ . '/tar.php'); -require_once(__DIR__ . '/format.php'); +require_once(__DIR__.'/'.'template.php'); +require_once(__DIR__.'/'.'http.php'); +require_once(__DIR__.'/'.'tar.php'); +require_once(__DIR__.'/'.'format.php'); -# see code/wfpl/metaform/template.html for the html templates for these elements +# see wfpl/metaform/template.html for the html templates for these elements $GLOBALS['types'] = array( # type input format sql 'varname' => array('textbox', 'varname', 'varchar(50) binary'), @@ -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 } @@ -174,13 +175,24 @@ function get_fields() { $fields_str = rtrim($fields_str); $fields = split("\n", $fields_str); foreach($fields as $field) { + $first_char = substr($field, 0, 1); $field = trim($field); + if ($first_char === ' ' || $first_char === "\t") { + $i = count($GLOBALS['gotten_fields']); + if($i > 0) { + $i -= 1; + if (!$GLOBALS['gotten_fields'][$i]['options']) { + $GLOBALS['gotten_fields'][$i]['options'] = array(); + } + $GLOBALS['gotten_fields'][$i]['options'][] = $field; + continue; + } + } if(substr($field, -1) == '{') { $caption = trim(substr($field, 0, -1)); $name = format_varname($caption); $type = '{'; $options = null; - # FIXME restore parsing of option lists for pulldowns } else { $options = null; $type = null; @@ -239,7 +251,7 @@ function get_fields() { # this one, that you're using to create forms function set_form_action() { - $action = ereg_replace('.*/', '', $_SERVER['REQUEST_URI']); + $action = preg_replace('|.*/|', '', $_SERVER['REQUEST_URI']); if($action == '') $action = './'; tem_set('form_action', $action); } @@ -254,7 +266,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 +309,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)); @@ -316,6 +328,20 @@ function make_html($whole_file = true) { 'caption' => $field['caption'] ) ); + if($field['type'] == 'radio') { + $i = 0; + $opts = array(); + foreach ($field['options'] as $row) { + if (is_array($row)) { + $cap = $row[1]; + } else { + $cap = $row; + } + $opts[] = array('i' => $i, 'option_caption' => $cap); + $i += 1; + } + $visible_fields[count($visible_fields) - 1]['options'] = $opts; + } } if($field['input'] == 'image' || $field['input'] == 'file') { @@ -443,7 +469,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 = ''; @@ -526,10 +552,9 @@ function make_php() { # make a URL for the edit page with all the fields filled in function edit_url() { $url = this_url(); - $url = ereg_replace('view_php=[^&]*', 'edit=yes', $url); - $url = ereg_replace('download_tar=[^&]*', 'edit=yes', $url); - $url = ereg_replace('/[a-z0-9_.]*\?', '/?', $url); - $url = str_replace('jasonwoof.l', 'jasonwoof.com', $url); # so that code generated on Jason's home computer will display a publically accessible link. + $url = preg_replace('|view_php=[^&]*|', 'edit=yes', $url); + $url = preg_replace('|download_tar=[^&]*|', 'edit=yes', $url); + $url = preg_replace('|/[a-z0-9_.]*\?|', '/?', $url); return $url; } @@ -540,7 +565,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 +586,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 +595,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(); @@ -586,7 +611,7 @@ function preview() { } $preview = $preview_tem->run(); unset($preview_tem); - $preview = ereg_replace('type="submit"', 'type="submit" disabled="disabled"', $preview); + $preview = preg_replace('|type="submit"|', 'type="submit" disabled="disabled"', $preview); tem_set('preview', $preview); tem_show('hiddens'); set_form_action(); @@ -597,11 +622,12 @@ function download_tar() { $admin_name = $GLOBALS['file_name']; $nice_name = $GLOBALS['public_file_name']; $files = array( - "INSTALL" => read_whole_file('code/wfpl/metaform/INSTALL'), + "README" => "These files are meant to work with wfpl.\n\nSee: http://sametwice.com/wfpl\n", ".htaccess" => make_htaccess(), - "run.php" => " read_whole_file('code/wfpl/metaform/styl.styl'), - "template.html" => read_whole_file('code/wfpl/metaform/site-template.html'), + "config.php" => " read_whole_file(__DIR__.'/'.'metaform/wfpl_main.php'), + "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 +642,3 @@ function download_tar() { } make_tar($nice_name, $files); } - - -metaform(); -exit();