diff options
| -rw-r--r-- | include/comanche.php | 12 | ||||
| -rw-r--r-- | view/php/zen.php | 10 |
2 files changed, 20 insertions, 2 deletions
diff --git a/include/comanche.php b/include/comanche.php index c1a98ed6c..7115b5635 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -133,10 +133,11 @@ function comanche_get_channel_id() { return $channel_id; } -function comanche_block($s) { +function comanche_block($s, $class = '') { $var = array(); $matches = array(); $name = $s; + $class = (($class) ? $class : 'bblock widget'); $cnt = preg_match_all("/\[var=(.*?)\](.*?)\[\/var\]/ism", $s, $matches, PREG_SET_ORDER); if($cnt) { @@ -155,7 +156,7 @@ function comanche_block($s) { dbesc($name) ); if($r) { - $o .= (($var['wrap'] == 'none') ? '' : '<div class="bblock widget">'); + $o .= (($var['wrap'] == 'none') ? '' : '<div class="' . $class . '">'); if($r[0]['title']) $o .= '<h3>' . $r[0]['title'] . '</h3>'; @@ -238,6 +239,13 @@ function comanche_region(&$a, $s) { } } + $cnt = preg_match_all("/\[block=(.*?)\](.*?)\[\/block\]/ism", $s, $matches, PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $s = str_replace($mtch[0],comanche_block(trim($mtch[2]),trim($mtch[1])),$s); + } + } + // need to modify this to accept parameters $cnt = preg_match_all("/\[widget=(.*?)\](.*?)\[\/widget\]/ism", $s, $matches, PREG_SET_ORDER); diff --git a/view/php/zen.php b/view/php/zen.php new file mode 100644 index 000000000..6fd11127c --- /dev/null +++ b/view/php/zen.php @@ -0,0 +1,10 @@ +<!DOCTYPE html> +<html> +<head> + <title><?php if(x($page,'title')) echo $page['title'] ?></title> + <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?> +</head> +<body> + <?php if(x($page,'content')) echo $page['content']; ?> +</body> +</html> |