apps/chippino/template/chip/node/redirect.php @@ -43,7 +43,7 @@ class ChipComponent_PXHTMLNode extends PXHTMLNode { $value = '"'.$result[$key].'"'; break; case 'url': - $value = '"'.$this->route['segments'][$key].'"'; + $value = '"'.(isset($this->route['segments'][$key]) ? $this->route['segments'][$key] : '').'"'; break; case 'local': default: apps/chippino/template/chip/node/component.php @@ -9,18 +9,31 @@ class TalCondition_PXHTMLNode extends PXHTMLNode { $attr = $node->getAttribute('tal:condition'); $attr = str_replace(';;', ';', $attr); - $terms = preg_split('/(([\s]+and[\s]+)|([\s]+or[\s]+))/', $attr, -1, PREG_SPLIT_OFFSET_CAPTURE); + $conditionals = array( + ' lt ' => ' < ', + ' gt ' => ' > ', + ' or ' => ' ) || ( ', + ' and ' => ' ) && ( ', + ' eq ' => ' == ', + ' ne ' => ' != ', + ' lte ' => ' <= ', + ' gte ' => ' >= ', + ); + + $terms = preg_split('/([\s]+(and|or|lt|gt|eq|ne|lte|gte)[\s]+)/', $attr, -1, PREG_SPLIT_OFFSET_CAPTURE); $ifs = array(); $endphps = array(); $phps = array(); + + $ifs[] = '('; // start an opening ( for grouping 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) { + if (stripos($attr, 'not ') === 0) { $attr = trim(substr($attr, 4)); $not = TRUE; } @@ -29,32 +42,52 @@ class TalCondition_PXHTMLNode extends PXHTMLNode { $str = 'try {'; if ($not) { - $str .= $this->processTales($term, $c.' = (%s) ? FALSE : TRUE;', TRUE); + $str .= $this->processTales($term, $c.' = (%s);'); } else { - $str .= $this->processTales($term, $c.' = (%s) ? TRUE : FALSE;', TRUE); + $str .= $this->processTales($term, $c.' = (%s);'); } $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; + $pos_list = array(); + foreach (array_keys($conditionals) as $term) { + $place = strpos($attr, $term, $pos); + if ($place !== FALSE) { + $pos_list[$term] = $place; + } + } + + asort($pos_list); + + // take the first item off the sorted stack + $if_key = NULL; + foreach ($pos_list as $pos_name => $pos_value) { + $if_key = $pos_name; + break; + } + + if ($not) { + $ifs[] = '!('; } - elseif ($or_pos < $and_pos && $pos > 0) { // if "and" is after "or" - $ifs[] = ' && '.$c; + + $ifs[] = $c; + + if ($not) { + $ifs[] = ')'; } - else { // neither "and" nor "or" - $ifs[] = $c; + + if ($if_key !== NULL) { + $ifs[] = $conditionals[$if_key]; } } + $ifs[] = ')'; // closing ) for the stack + $statement_begin = implode('', array( implode('', $phps), + // 'var_dump('.implode(');var_dump(',$cs).');', 'if ('.implode($ifs).') {', )); apps/chippino/template/classes/node/tal/condition.php @@ -21,12 +21,12 @@ class TalDefine_PXHTMLNode extends PXHTMLNode { // are the first 5 words local? if not, global $local = FALSE; - if (strpos($attr, 'local') === 0) { - $attr = trim(substr($attr, 5)); + if (strpos($attr, 'local ') === 0) { + $attr = trim(substr($attr, 6)); $local = TRUE; } - elseif (strpos($attr, 'global') === 0) { - $attr = trim(substr($attr, 6)); + elseif (strpos($attr, 'global ') === 0) { + $attr = trim(substr($attr, 7)); } list($var, $as) = explode(' ', $attr, 2); apps/chippino/template/classes/node/tal/define.php @@ -20,7 +20,7 @@ class PXHTMLTales { return $obj; } - public function process($segments, $stmt, $enable_conditionals = FALSE) { + public function process($segments, $stmt) { $segments = explode('|', $segments); $statements = array(); foreach ($segments as $segment) { @@ -32,22 +32,6 @@ class PXHTMLTales { continue; } - // covert conditional statements with a space on either side - if ($enable_conditionals) { - $conds = array( - ' lt ' => ' < ', - ' gt ' => ' > ', - ' or ' => ' || ', - ' and ' => ' && ', - ' eq ' => ' == ', - ' ne ' => ' != ', - ' lte ' => ' <= ', - ' gte ' => ' >= ', - ); - - $segment = str_replace(array_keys($conds), array_values($conds), $segment); - } - $handlers = self::cfg()->getTalesHandlers(); $handled = FALSE; foreach ($handlers as $handler => $obj) { @@ -73,7 +57,7 @@ class PXHTMLTales { $output .= 'try { '.$statement.' } catch(Exception $e) {'; $output_sfx .= '}'; if ($idx == count($statements) - 1) { - $output .= 'throw new Exception("unresolvable paths: '.implode(' | ', $segments).'");'; + $output .= 'throw new Exception("unresolvable paths: '.implode(' | ', str_replace('$', '$$', $segments)).'");'; } } apps/chippino/template/classes/tales/tales.php @@ -16,7 +16,12 @@ class PXHTMLTemplateContext { } public function setRoot($key, $value) { - $this->stack[count($this->stack) - 1][$key] = $value; + if (count($this->stack)) { + $this->stack[count($this->stack) - 1][$key] = $value; + } + else { + $this->stack[0][$key] = $value; // first thing on stack + } } public function delete($key) { @@ -37,7 +42,8 @@ class PXHTMLTemplateContext { } if ($base_obj === NULL && count($pieces) === 0) { - return ''; + throw new Exception('unseekable path'); + return ''; // empty top level variable } if ($base_obj === NULL) { apps/chippino/template/classes/template/context.php @@ -8,6 +8,8 @@ class PXHTMLTemplatePhpHelper { } protected function resolveCtxDeclarations($string) { + $string = str_replace('$$', '__DBLDOLLAR__', $string); + preg_match_all('/\$\{(.*?)\}/', $string, $matches); if (!$matches[0]) { @@ -20,30 +22,34 @@ class PXHTMLTemplatePhpHelper { // like a TALES expression foreach ($matches[1] as $idx => $attr) { $c = $this->createLocalVariable(); - - if (strpos($attr, ' ') === FALSE) { - $str = PXHTMLTales::getInstance()->process($attr, $c.' = %s;'); - $php_inst = '<'.'?php '.$str.'echo htmlspecialchars('.$c.'); unset('.$c.');'.'?'.'>'; + + $structure = FALSE; + $dump = FALSE; + if (strpos($attr, 'structure ') === 0) { + $attr = trim(substr($attr, 10)); + $structure = TRUE; + } + if (strpos($attr, 'dump ') === 0) { + $attr = trim(substr($attr, 5)); + $dump = TRUE; + } + + $str = PXHTMLTales::getInstance()->process($attr, $c.' = %s;'); + + if ($structure) { + $php_inst = '<'.'?php '.$str.'echo '.$c.'; unset('.$c.');'.'?'.'>'; + } + elseif ($dump) { + $php_inst = '<'.'?php '.$str.'var_dump('.$c.'); unset('.$c.');'.'?'.'>'; } else { - list($type, $attr) = explode(' ', $attr, 2); - if (strtolower($type) === 'structure') { - $str = PXHTMLTales::getInstance()->process($attr, $c.' = %s;'); - $php_inst = '<'.'?php '.$str.'echo '.$c.'; unset('.$c.');'.'?'.'>'; - } - elseif (strtolower($type) === 'dump') { - $str = PXHTMLTales::getInstance()->process($attr, $c.' = %s;'); - $php_inst = '<'.'?php '.$str.'var_dump('.$c.'); unset('.$c.');'.'?'.'>'; - } - else { - throw new Exception ('unknown type for ${...}'); - } + $php_inst = '<'.'?php '.$str.'echo htmlspecialchars('.$c.'); unset('.$c.');'.'?'.'>'; } $replaces[$matches[0][$idx]] = $php_inst; } - return str_replace(array_keys($replaces), array_values($replaces), $string); + return str_replace('__DBLDOLLAR__', '$', str_replace(array_keys($replaces), array_values($replaces), $string)); } public function createLocalVariable() { apps/chippino/template/classes/template/phphelper.php @@ -15,6 +15,7 @@ if (!class_exists('PXHTML')) { chip('#Chippino/Template/Chip/Node/Include')->with(); chip('#Chippino/Template/Chip/Node/Inspect')->with(); chip('#Chippino/Template/Chip/Node/Header')->with(); + chip('#Chippino/Template/Chip/Node/Redirect')->with(); chip('#Chippino/Template/Chip/Expr/Url')->with(); } @@ -34,7 +35,9 @@ if (file_exists($cache_file)) { $content = PXHTML::parse($file, $doctype); file_put_contents('/tmp/'.$chk.'.php', $content); +ob_start(); include '/tmp/'.$chk.'.php'; +ob_end_flush(); // var_dump($content); exit; apps/chippino/template/init.php c04c030164f0b70ff58e9a6b43b27799ebf98bbc Jakob Heuser jakob@felocity.org http://github.com/Jakobo/chippino/commit/690a83a18530ff2d446df46b0a384853e3f7d99a 690a83a18530ff2d446df46b0a384853e3f7d99a 2009-05-21T12:03:03-07:00 2009-05-21T12:03:03-07:00 redirect support, and a few bug fixes discovered regarding define ebaebb9405fc639ea565f56d3aee2c806411eb8c Jakob Heuser jakob@felocity.org