X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=template.php;h=45857afcecde5532be9c7651ac7a7bbb552bf29a;hb=0c70f6a8cdf46b61c8d30f918833b8f2d8522009;hp=7783a0743522d37b7d1c5d0f9bf6df25daca8bdb;hpb=5615e1e349f58efe93f4b47a51067e3eb018b568;p=wfpl.git
diff --git a/template.php b/template.php
index 7783a07..45857af 100644
--- a/template.php
+++ b/template.php
@@ -57,15 +57,14 @@ function parse_template_file($filename) {
return parse_template(file_get_contents($filename));
}
-# We parse the template string into a tree of strings and sub-templates.
+# We parse the template string into a tree of strings and sub-templates.
# A template is a hash with a name string, a pieces array, and possibly
# an args array.
function parse_template($string) {
$tem =& tem_push();
$tem['pieces'] = array();
- # note: for some reason this captures ''.
- $matches = preg_split("/()/", $string, -1, PREG_SPLIT_DELIM_CAPTURE);
+ $matches = preg_split('/()/', preg_replace('//', '$1', $string), -1, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY);
foreach($matches as $match) {
if($match == '~~') $match = '~';
if(substr($match,0,1) == '~' and strlen($match) > 2) {
@@ -85,13 +84,13 @@ function parse_template($string) {
array_pop($args); # drop '}'
$cur = $tem['name'];
if($name && $name != $cur) {
- die("Invalid template: tried to close '$name', but '$cur' is current.");
+ die("Invalid template: tried to close '$name', but '$cur' is current.");
}
$tem =& $tem['parent'];
} else { # value slot
$tem['pieces'][] = array('name' => $name, 'args' => $args);
}
- } elseif($match and $match != '
#
# row content...
-#
+#
#
#
#
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 $value = 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
+}
+
+# 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
}
# 'show' sections will be shown unless the corresponding data value
-# is false. We check only for false; 0 or '' will not work.
+# is false (only false, not 0 or '' or array()).
function tem_auto_show(&$value) {
if($value !== false) $value = array(array());
@@ -296,8 +314,8 @@ function tem_auto_show(&$value) {
# alternates between 'even' and 'odd'.
function tem_auto_evenodd(&$values) {
- $even = false;
- foreach($values as &$value) {
+ $even = true;
+ if($values) foreach($values as &$value) {
$value['evenodd'] = $even ? 'even' : 'odd';
$even = !$even;
}
@@ -311,6 +329,14 @@ function tem_auto_evenodd(&$values) {
# Backward Compatibility
# ----------------------
+function is_shown($piece) {
+ return $piece['args'][0] == 'hide';
+}
+
+function is_shown_sub_template($piece) {
+ return is_sub_template($piece) and is_shown($piece);
+}
+
# Old-style templates don't show unless explicitly requested.
function tem_auto_hide(&$value, $key, $context) {
unset($context['data'][$key]);
@@ -321,19 +347,22 @@ function tem_auto_hide(&$value, $key, $context) {
# so hide it and insert a value slot for its expansion(s).
function &tem_is_old_sub($name, &$template) {
foreach($template['pieces'] as $key => &$piece) {
- if(is_array($piece) and $piece['pieces']) {
+ if(is_sub_template($piece)) {
if($piece['name'] == $name) {
- if($piece['args'][0] != 'hide') { # if we haven't already
+ if(!is_shown($piece)) {
+ # hide template unless explicitly show()n.
$piece['args'] = array('hide');
+ # insert a value slot with the same name (for the expansion).
$var = array('name' => $name, 'args' => array());
array_splice($template['pieces'], $key, 0, array($var));
}
return $piece;
}
- $tem = tem_old_sub($name, $piece);
+ $tem = tem_is_old_sub($name, $piece);
if($tem) return $tem;
}
}
+ return false;
}
class tem {
@@ -341,9 +370,9 @@ class tem {
var $data;
function tem() {
- $this->template = array();
+ $this->template = array('pieces' => array());
$this->data = array();
- }
+ }
function set($key, $value) {
$this->data[$key] = $value;
@@ -367,7 +396,9 @@ class tem {
function show($name) {
$tem = tem_is_old_sub($name, $this->template);
- $this->data[$name] .= fill_template($tem, $this->data);
+ if($tem) {
+ $this->data[$name] .= fill_template($tem, $this->data);
+ }
}
function show_separated($name) {
@@ -398,13 +429,29 @@ class tem {
print($this->run($tem));
}
- function top_sub_names() {
- return array_keys(top_sub_templates($this->template));
+ # merge top-level sub-templates of $tem (object) into $this,
+ # supporting both new and old semantics.
+ function merge($tem) {
+ # append expansions to $this->data (old style)
+
+ $subs = $tem->top_subs('is_shown_sub_template');
+ if($subs) foreach($subs as $name => $val) {
+ $this->append($name, $val);
+ unset($tem->data[$name]); # so array_merge() won't overwrite things
+ }
+
+ # merge the data arrays and template trees (new style)
+ $this->data = array_merge($this->data, $tem->data);
+ $this->template = merge_templates($this->template, $tem->template);
+ }
+
+ function top_sub_names($is_sub = 'is_sub_template') {
+ return array_keys(top_sub_templates($this->template, $is_sub));
}
- function top_subs() {
+ function top_subs($is_sub = 'is_sub_template') {
$ret = array();
- $names = $this->top_sub_names();
+ $names = $this->top_sub_names($is_sub);
foreach($names as $name) {
$ret[$name] = $this->get($name);
}