metaform: revamp codegen, fix hidden fields

[wfpl.git] / template.php

diff --git a/template.php b/template.php
index 5643502..cbb9466 100644 (file)
--- a/template.php
+++ b/template.php
@@ -300,34 +300,34 @@ function merge_templates(&$main, &$tem) {
 function tem_auto_sep(&$value, $key, $context) {
        $rows =& $context['parent']['parent'];
        if($rows['cur'] != count($rows['rows'])-1)  # last row?
-               return $value = true;  # show once
+               return true;  # show once
 }
 
 # auto-show once, only when this is the first row of the parent
 function tem_auto_last(&$value, $key, $context) {
        $rows =& $context['parent']['parent'];
        if($rows['cur'] == count($rows['rows'])-1)  # last row?
-               return $value = true;  # show once
+               return true;  # show once
 }
 
 # auto-show once, only when this is the last row of the parent
 function tem_auto_first(&$value, $key, $context) {
        $rows =& $context['parent']['parent'];
        if($rows['cur'] == 0)  # first row?
-               return $value = true;  # show once
+               return true;  # show once
 }
 
 # 'show' sections will be shown unless the corresponding data
 # value === false
 function tem_auto_show(&$value) {
-       if($value === null) $value = array(array());
+       if($value === null) return true;
        return $value;
 }
 
 # 'nonempty' sections will not be shown if the corresponding data
 # value is the empty string
 function tem_auto_nonempty(&$value) {
-       if($value === '') $value = null;
+       if($value === '') return null;
        return $value;
 }
 
@@ -335,11 +335,10 @@ function tem_auto_nonempty(&$value) {
 # value is not set (opposite of default)
 function tem_auto_unset(&$value) {
        if($value === null) {
-               $value = '';
+               return '';
        } else {
-               $value = null;
+               return null;
        }
-       return $value;
 }
 
 # 'evenodd' sections are given an 'evenodd' attribute whose value