Got questions, comments, patches, etc.?
Contact Jason Woofenden
gitweb
/
wfpl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
metaform: pretty captions in e-mails
[wfpl.git]
/
metaform.php
diff --git
a/metaform.php
b/metaform.php
index
47ce7fe
..
ed10c8d
100644
(file)
--- a/
metaform.php
+++ b/
metaform.php
@@
-301,7
+301,6
@@
function make_html($whole_file = true) {
if($GLOBALS['opt_display'] == 'Yes') {
$tem->show('opt_display_1');
if($GLOBALS['opt_display'] == 'Yes') {
$tem->show('opt_display_1');
- $tem->show('opt_display_2');
}
if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
}
if($GLOBALS['opt_email'] == 'Yes' && $GLOBALS['opt_db'] != 'Yes') {
@@
-358,7
+357,6
@@
function make_php() {
$tem->set('plural', $GLOBALS['plural']);
$fields = get_fields();
$db_fields = '';
$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) {
$always_field = find_always_field($fields);
$image_included_yet = false;
foreach($fields as $field) {
@@
-370,8
+368,6
@@
function make_php() {
if($sql != 'n/a') {
if($db_fields != '') $db_fields .= ',';
$db_fields .= $name;
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') {
}
if($input == 'image') {
if($type == 'thumb') {
@@
-396,7
+392,6
@@
function make_php() {
}
$tem->show('formats');
}
}
$tem->show('formats');
}
- $tem->show('tem_sets');
}
if($GLOBALS['opt_listing'] == 'Yes') {
}
if($GLOBALS['opt_listing'] == 'Yes') {
@@
-413,7
+408,6
@@
function make_php() {
$tem->set('always_field', $always_field);
$tem->set('db_fields', $db_fields);
$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->set('metaform_url', edit_url());
if($GLOBALS['opt_listing'] == 'Yes') {
$tem->show('opt_listing_1');
@@
-424,7
+418,6
@@
function make_php() {
$tem->show('opt_display_2');
} else {
$tem->show('opt_display_1_else');
$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');
}
if($GLOBALS['opt_db'] == 'Yes') {
$tem->show('opt_db_1');
@@
-434,6
+427,11
@@
function make_php() {
$tem->show('opt_db_5');
}
if($GLOBALS['opt_email'] == 'Yes') {
$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');
}
$tem->show('opt_email_1');
$tem->show('opt_email_2');
}
@@
-469,7
+467,7
@@
function make_email() {
foreach($fields as $field) {
list($name, $type, $input, $format, $sql) = $field;
$tem->set('name', $name);
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') {
if($type == 'textarea') {
$tem->show('multi_line');
} elseif($type == 'checkbox') {