format_caption/format_varname: split words on camelCase

[wfpl.git] / metaform.php

diff --git a/metaform.php b/metaform.php
index 17b143e..1cfb70c 100644 (file)
--- a/metaform.php
+++ b/metaform.php
@@ -18,40 +18,41 @@
 
 # This file writes the code for you (sql, php, html, email) to handle a form.
 
-require_once('code/wfpl/template.php');
-require_once('code/wfpl/http.php');
-require_once('code/wfpl/tar.php');
-require_once('code/wfpl/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
 $GLOBALS['types'] = array(
 #    type                  input          format        sql     
-       'varname' =>    array('textbox',     'varname',    'varchar(50)'),
-       'name' =>       array('textbox',     'oneline',    'varchar(200)'),
-       'textbox' =>    array('textbox',     'oneline',    'varchar(200)'),
+       'varname' =>    array('textbox',     'varname',    'varchar(50) binary'),
+       'name' =>       array('textbox',     'oneline',    'varchar(200) binary'),
+       'textbox' =>    array('textbox',     'oneline',    'varchar(200) binary'),
        'int' =>        array('textbox',     'int',        'int'),
-       'decimal' =>    array('textbox',     'decimal',    'decimal(12,12)'),
-       'bigint' =>     array('textbox',     'int',        'varchar(100)'), # up to 100 digits, stored as a string
-       'zip' =>        array('textbox',     'zip',        'varchar(20)'),
-       'email' =>      array('textbox',     'email',      'varchar(100)'),
-       'phone' =>      array('textbox',     'phone',      'varchar(32)'),
-       'state' =>      array('states',      'oneline',    'varchar(2)'),
-       'money' =>      array('textbox',     'money',      'varchar(32)'),
-       'date' =>       array('date',        'mdy_to_ymd', 'char(10)'),
-       'dollars' =>    array('textbox',     'dollars',    'varchar(32)'),
-       'url' =>        array('textbox',     'url',        'varchar(200)'),
-       'hidden' =>     array('hidden',      'unix',       'varchar(200)'),
-       'password' =>   array('password',    'oneline',    'varchar(200)'),
-       'textarea' =>   array('textarea',    'unix',       'text'),
-       'html' =>       array('html',        'unix',       'text'),
-       'pulldown' =>   array('pulldown',    'options',    'varchar(100)'),
-       'radio' =>      array('radio',       'options',    'varchar(100)'),
+       'decimal' =>    array('textbox',     'decimal',    'decimal(12,2)'),
+       'bigint' =>     array('textbox',     'int',        'varchar(100) binary'), # up to 100 digits, stored as a string
+       'zip' =>        array('textbox',     'zip',        'varchar(20) binary'),
+       'email' =>      array('email',       'email',      'varchar(100) binary'),
+       'search' =>     array('search',      'oneline',    'varchar(200) binary'),
+       'phone' =>      array('textbox',     'phone',      'varchar(32) binary'),
+       'state' =>      array('states',      'oneline',    'varchar(2) binary'),
+       'money' =>      array('textbox',     'money',      'varchar(32) binary'),
+       'date' =>       array('date',        'mdy_to_ymd', 'char(10) binary'),
+       'dollars' =>    array('textbox',     'dollars',    'varchar(32) binary'),
+       'url' =>        array('textbox',     'url',        'varchar(200) binary'),
+       'hidden' =>     array('hidden',      'unix',       'varchar(200) binary'),
+       'password' =>   array('password',    'oneline',    'varchar(200) binary'),
+       'textarea' =>   array('textarea',    'unix',       'text binary'),
+       'html' =>       array('html',        'unix',       'mediumtext binary'),
+       'pulldown' =>   array('pulldown',    'options',    'varchar(100) binary'),
+       'radio' =>      array('radio',       'options',    'varchar(100) binary'),
        'checkbox' =>   array('checkbox',    'bool',       'int(1)'),
-       'yesno' =>      array('checkbox',    'yesno',      'varchar(3)'),
+       'yesno' =>      array('checkbox',    'yesno',      'varchar(3) binary'),
        'delete' =>     array('checkbox',    'yesno',      'n/a'),
-       'image' =>      array('image',       'oneline',    'varchar(120)'),
-       'thumb' =>      array('image',       'oneline',    'varchar(240)'),
-       'file' =>       array('file',        'oneline',    'varchar(100)'),
+       'image' =>      array('image',       'oneline',    'varchar(120) binary'),
+       'thumb' =>      array('image',       'oneline',    'varchar(240) binary'),
+       'file' =>       array('file',        'oneline',    'varchar(100) binary'),
        'submit' =>     array('submit',      'n/a',        'n/a'),
        '{' =>          array('fieldset',    'n/a',        'n/a'),
        '}' =>          array('end_fieldset','n/a',        'n/a')
@@ -178,10 +179,6 @@ function get_fields() {
                        $name = trim(substr($field, 0, -1)); # FIXME: stop this from getting enc_caption()ed
                        $type = '{';
                        $options = null;
-               } elseif(substr($field, -1) == '{') {
-                       $name = 'ignored';
-                       $type = '}';
-                       $options = null;
                } else {
                        list($name, $type, $options) = split('  *', $field);
                        if($options) $options = explode(',', $options);
@@ -303,7 +300,7 @@ function make_html($whole_file = true) {
                }
 
                if(show_in_listing($type, $input, $format, $sql)) {
-                       $listing_headers[] = array('caption' => format_caption($name));
+                       $listing_headers[] = array('caption' => format_caption($name), 'name' => $name);
                        $listing_field = array('name' => $name);
                        if($format == 'bool' || $format == 'yesno') {
                                $listing_field['enc'] = 'yesno';