@@ -9,28 +9,88 @@ class TalCondition_PXHTMLNode extends PXHTMLNode {
$attr = $node->getAttribute('tal:condition');
$attr = str_replace(';;', ';', $attr);
- // check for "not". If found, wrap the segment in a not execution
- $not = FALSE;
- if (stripos($attr, 'not:') === 0) {
- $attr = trim(substr($attr, 4));
- $not = TRUE;
+ $terms = preg_split('/(([\s]+and[\s]+)|([\s]+or[\s]+))/', $attr, -1, PREG_SPLIT_OFFSET_CAPTURE);
+
+ $ifs = array();
+ $endphps = array();
+ $phps = array();
+ foreach ($terms as $idx => $term_info) {
+ $term = $term_info[0];
+ $pos = $term_info[1];
+
+ // check for "not". If found, wrap the segment in a not execution
+ $not = FALSE;
+ if (stripos($attr, 'not:') === 0) {
+ $attr = trim(substr($attr, 4));
+ $not = TRUE;
+ }
+
+ $c = $this->createLocalVariable();
+
+ $str = 'try {';
+ if ($not) {
+ $str .= $this->processTales($term, $c.' = (%s) ? FALSE : TRUE;', TRUE);
+ }
+ else {
+ $str .= $this->processTales($term, $c.' = (%s) ? TRUE : FALSE;', TRUE);
+ }
+ $str .= '} catch (Exception $e) { '.$c.' = FALSE; }';
+ $phps[] = $str;
+ $endphps[] = 'unset('.$c.');';
+
+ // get the closest occurance of "and" or "or"
+ $and_pos = strrpos(substr($attr, 0, $pos), ' and ');
+ $or_pos = strrpos(substr($attr, 0, $pos), ' or ');
+
+ if ($and_pos < $or_pos && $pos > 0) { // if "or" is after "and"
+ $ifs[] = ' || '.$c;
+ }
+ elseif ($or_pos < $and_pos && $pos > 0) { // if "and" is after "or"
+ $ifs[] = ' && '.$c;
+ }
+ else { // neither "and" nor "or"
+ $ifs[] = $c;
+ }
}
- // convert the tales expression into a php statement
- $c = $this->createLocalVariable();
- $str = 'try {';
- $str .= $this->processTales($attr, $c.' = (%s) ? TRUE : FALSE;', TRUE);
- $str .= '} catch (Exception $e) { '.$c.' = FALSE; }';
+ $statement_begin = implode('', array(
+ implode('', $phps),
+ 'if ('.implode($ifs).') {',
+ ));
- if ($not) {
- $str .= 'if (!('.$c.')) {';
- }
- else {
- $str .= 'if ('.$c.') {';
- }
+ $statement_end = implode('', array(
+ '}',
+ implode('', $endphps),
+ ));
+
+ // var_dump($statement_begin);
+ // var_dump($statement_end);
+
+ $php_inst_st = $this->createProcessingInstruction($statement_begin);
+ $php_inst_ed = $this->createProcessingInstruction($statement_end);
+
+ // // check for "not". If found, wrap the segment in a not execution
+ // $not = FALSE;
+ // if (stripos($attr, 'not:') === 0) {
+ // $attr = trim(substr($attr, 4));
+ // $not = TRUE;
+ // }
+ //
+ // // convert the tales expression into a php statement
+ // $c = $this->createLocalVariable();
+ // $str = 'try {';
+ // $str .= $this->processTales($attr, $c.' = (%s) ? TRUE : FALSE;', TRUE);
+ // $str .= '} catch (Exception $e) { '.$c.' = FALSE; }';
+ //
+ // if ($not) {
+ // $str .= 'if (!('.$c.')) {';
+ // }
+ // else {
+ // $str .= 'if ('.$c.') {';
+ // }
- $php_inst_st = $this->createProcessingInstruction($str);
- $php_inst_ed = $this->createProcessingInstruction('} unset('.$c.');');
+ // $php_inst_st = $this->createProcessingInstruction($str);
+ // $php_inst_ed = $this->createProcessingInstruction('} unset('.$c.');');
$node->parentNode->insertBefore($php_inst_st, $node);
apps/chippino/template/classes/node/tal/condition.php
d8b0a83ae5e825e14f8c3d87148c485c4d5474fe
Jakob Heuser
jakob@felocity.org
http://github.com/Jakobo/chippino/commit/c04c030164f0b70ff58e9a6b43b27799ebf98bbc
c04c030164f0b70ff58e9a6b43b27799ebf98bbc
2009-04-17T09:07:42-07:00
2009-04-17T09:07:42-07:00
rewrote the way conditionals are formed to support 'and' and 'or' support, as well as 'not' tags on individual clauses
8fc7d10dc09eee6216348d23e75e74749d5c8895
Jakob Heuser
jakob@felocity.org