'html' => array('html', 'unix', 'text'),
'pulldown' => array('pulldown', 'options', 'varchar(100)'),
'radio' => array('radio', 'oneline', 'varchar(200)'),
- 'checkbox' => array('leftcheck', 'bool', 'int(1)'),
- 'rightcheck' => array('checkbox', 'bool', 'int(1)'),
- 'rightyesno' => array('checkbox', 'yesno', 'varchar(3)'),
- 'yesno' => array('leftcheck', 'yesno', 'varchar(3)'),
+ 'checkbox' => array('checkbox', 'bool', 'int(1)'),
+ 'yesno' => array('checkbox', 'yesno', 'varchar(3)'),
'delete' => array('checkbox', 'yesno', 'n/a'),
'image' => array('image', 'oneline', 'varchar(120)'),
'thumb' => array('image', 'oneline', 'varchar(240)'),
+ 'file' => array('file', 'oneline', 'varchar(100)'),
'submit' => array('submit', 'oneline', 'n/a')
);
if(isset($_REQUEST['singular'])) {
$GLOBALS['file_name'] = format_varname($_REQUEST['file_name']);
$GLOBALS['table_name'] = format_varname($_REQUEST['table_name']);
- $GLOBALS['plural'] = format_varname($_REQUEST['plural']);
+ $GLOBALS['plural'] = format_oneline($_REQUEST['plural']);
# backwards compatibility:
if(isset($_REQUEST['form_name'])) {
$GLOBALS['file_name'] = $GLOBALS['table_name'] = $GLOBALS['plural'] = format_varname($_REQUEST['form_name']);
tem_set('table_name', $GLOBALS['table_name']);
tem_set('plural', $GLOBALS['plural']);
- $GLOBALS['singular'] = format_varname($_REQUEST['singular']);
+ $GLOBALS['singular'] = format_oneline($_REQUEST['singular']);
tem_set('singular', $GLOBALS['singular']);
$GLOBALS['opt_email'] = format_yesno($_REQUEST['opt_email']);
tem_set('opt_email', $GLOBALS['opt_email']);
tem_set('opt_listing', $GLOBALS['opt_listing']);
$GLOBALS['opt_display'] = format_yesno($_REQUEST['opt_display']);
tem_set('opt_display', $GLOBALS['opt_display']);
- $GLOBALS['opt_http_pass'] = format_yesno($_REQUEST['opt_http_pass']);
- tem_set('opt_http_pass', $GLOBALS['opt_http_pass']);
+ $GLOBALS['opt_pass'] = format_yesno($_REQUEST['opt_pass']);
+ tem_set('opt_pass', $GLOBALS['opt_pass']);
}
if(isset($_REQUEST['fields'])) {
function find_always_field($fields) {
foreach($fields as $field) {
list($name, $type, $input, $format, $sql) = $field;
- if($input != 'submit' && $input != 'checkbox' && $input != 'radio') {
+ if($input != 'submit' && $input != 'image' && $input != 'file' && $input != 'checkbox' && $input != 'radio') {
return $name;
}
}
$tem->show('row');
}
- if($input == 'image' && !$uploads_output_already) {
+ if(($input == 'image' || $input == 'file') && !$uploads_output_already) {
$tem->show('uploads');
$tem->set('enctype_attr', '" enctype="multipart/form-data');
$uploads_output_already = true;
$tem->show('display_image');
break;
case 'checkbox':
- case 'leftcheck':
$tem->show('display_yesno');
break;
case 'date':
}
if($GLOBALS['opt_listing'] == 'Yes') {
- if($GLOBALS['opt_display'] != 'Yes') {
- $tem->show('opt_display_a_else');
- }
if(show_in_listing($type, $input, $format, $sql)) {
if($format == 'bool' || $format == 'yesno') {
$tem->set('listing_enc', 'yesno');
$tem->set('listing_enc', 'html');
$tem->show('listing_value_enc');
}
+
+ if($GLOBALS['opt_display'] != 'Yes') {
+ $tem->show('opt_display_a_else');
+ }
$tem->show('listing_head_col');
$tem->show('listing_row_col');
}
if($GLOBALS['opt_display'] == 'Yes') {
$tem->show('opt_display_1');
- $tem->show('opt_display_2');
}
if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
$tem->set('plural', $GLOBALS['plural']);
$fields = get_fields();
$db_fields = '';
- $php_fields = '';
$always_field = find_always_field($fields);
$image_included_yet = false;
foreach($fields as $field) {
if($sql != 'n/a') {
if($db_fields != '') $db_fields .= ',';
$db_fields .= $name;
- if($php_fields != '') $php_fields .= ', ';
- $php_fields .= '$' . $name;
}
if($input == 'image') {
if($type == 'thumb') {
}
$tem->show('image_settings');
$tem->show('image_upload');
- if(!$image_included_yet) {
- $tem->show('image_include');
- $tem->show('upload_max');
- $tem->show('upload_settings');
- $image_included_yet = true;
- }
+ $has_uploads = true;
+ } else if($input == 'file') {
+ $tem->show('file_settings');
+ $tem->show('file_upload');
+ $has_uploads = true;
} else {
if($input == 'html') {
$has_html_editors = true;
}
$tem->show('formats');
}
- $tem->show('tem_sets');
}
if($GLOBALS['opt_listing'] == 'Yes') {
}
}
}
+ if($has_uploads) {
+ $tem->show('uploads_include');
+ $tem->show('upload_max');
+ $tem->show('upload_settings');
+ $image_included_yet = true;
+ }
if($has_html_editors) {
$tem->show('show_extra_headers');
$tem->set('always_field', $always_field);
$tem->set('db_fields', $db_fields);
- $tem->set('php_fields', $php_fields);
$tem->set('metaform_url', edit_url());
if($GLOBALS['opt_listing'] == 'Yes') {
$tem->show('opt_listing_1');
$tem->show('opt_display_2');
} else {
$tem->show('opt_display_1_else');
- $tem->show('opt_display_2_else');
}
if($GLOBALS['opt_db'] == 'Yes') {
$tem->show('opt_db_1');
$tem->show('opt_db_5');
}
if($GLOBALS['opt_email'] == 'Yes') {
+ $this_domain = $_SERVER['HTTP_HOST'];
+ if(substr($this_domain, -2) == '.l') {
+ $this_domain = substr($this_domain, 0, -1) . 'com';
+ }
+ $tem->set('this_domain', $this_domain);
$tem->show('opt_email_1');
$tem->show('opt_email_2');
}
- if($GLOBALS['opt_http_pass'] == 'Yes') {
- $tem->show('opt_http_pass_1');
- $tem->show('opt_http_pass_2');
+ if($GLOBALS['opt_pass'] == 'Yes') {
+ $tem->show('opt_pass');
}
return $tem->run();
}
foreach($fields as $field) {
list($name, $type, $input, $format, $sql) = $field;
$tem->set('name', $name);
- $tem->set('caption', $name); # fixme
+ $tem->set('caption', format_caption($name));
if($type == 'textarea') {
$tem->show('multi_line');
} elseif($type == 'checkbox') {
function download_tar() {
$name = $GLOBALS['file_name'];
$data = 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.css" => read_whole_file('code/wfpl/metaform/style.css'),
"$name.html" => make_html(),
"$name.php" => make_php());