Merge branch '1.8RC'

6 files changed, 580 insertions, 3 deletions

diff --git a/Zotlabs/Render/Comanche.php b/Zotlabs/Render/Comanche.php
index 776874e35..1017ec6aa 100644
--- a/Zotlabs/Render/Comanche.php
+++ b/Zotlabs/Render/Comanche.php
@@ -8,7 +8,6 @@ require_once('include/widgets.php');
 
 
 
-
 class Comanche {
 
 
@@ -95,7 +94,7 @@ class Comanche {
 		$cnt = preg_match_all("/\[region=(.*?)\](.*?)\[\/region\]/ism", $s, $matches, PREG_SET_ORDER);
 		if($cnt) {
 			foreach($matches as $mtch) {
-				\App::$layout['region_' . $mtch[1]] = $this->region($mtch[2]);
+				\App::$layout['region_' . $mtch[1]] = $this->region($mtch[2],$mtch[1]);
 			}
 		}
 	}
@@ -320,7 +319,9 @@ class Comanche {
 	}
 
 
-	function region($s) {
+	function region($s,$region_name) {
+
+		$s = str_replace('$region',$region_name,$s);
 
 		$matches = array();
 
diff --git a/Zotlabs/Render/SimpleTemplate.php b/Zotlabs/Render/SimpleTemplate.php
new file mode 100755
index 000000000..ff1bb5c3c
--- /dev/null
+++ b/Zotlabs/Render/SimpleTemplate.php
@@ -0,0 +1,310 @@
+<?php
+
+namespace Zotlabs\Render;
+
+define ("KEY_NOT_EXISTS", '^R_key_not_Exists^');
+
+class SimpleTemplate implements TemplateEngine {
+
+	static $name ="internal";
+
+	var $r;
+	var $search;
+	var $replace;
+	var $stack = array();
+	var $nodes = array();
+	var $done = false;
+	var $d = false;
+	var $lang = null;
+	var $debug=false;
+
+	private function _preg_error() {
+		switch(preg_last_error()) {
+			case PREG_INTERNAL_ERROR: echo('PREG_INTERNAL_ERROR'); break;
+			case PREG_BACKTRACK_LIMIT_ERROR: echo('PREG_BACKTRACK_LIMIT_ERROR'); break;
+			case PREG_RECURSION_LIMIT_ERROR: echo('PREG_RECURSION_LIMIT_ERROR'); break;
+			case PREG_BAD_UTF8_ERROR: echo('PREG_BAD_UTF8_ERROR'); break;
+// This is only valid for php > 5.3, not certain how to code around it for unit tests
+//			case PREG_BAD_UTF8_OFFSET_ERROR: echo('PREG_BAD_UTF8_OFFSET_ERROR'); break;
+			default:
+				//die("Unknown preg error.");
+				return;
+		}
+		echo "<hr><pre>";
+		debug_print_backtrace();
+		die();
+	}
+
+	private function _push_stack() {
+		$this->stack[] = array($this->r, $this->nodes);
+	}
+
+	private function _pop_stack(){
+		list($this->r, $this->nodes) = array_pop($this->stack);
+	}
+
+	private function _get_var($name, $retNoKey=false) {
+		$keys = array_map('trim',explode(".",$name));
+		if ($retNoKey && !array_key_exists($keys[0], $this->r))
+			return KEY_NOT_EXISTS;
+
+		$val = $this->r;
+		foreach($keys as $k) {
+			$val = (isset($val[$k]) ? $val[$k] : null);
+		}
+
+		return template_escape($val);
+	}
+
+	/**
+	 * IF node
+	 * \code
+	 * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
+	 * {{ if <$var>==<val|$var> }}...[{{ else }} ...]{{ endif }}
+	 * {{ if <$var>!=<val|$var> }}...[{{ else }} ...]{{ endif }}
+	 * \endcode
+	 */
+	private function _replcb_if($args) {
+		if (strpos($args[2],"==")>0){
+			list($a,$b) = array_map("trim",explode("==",$args[2]));
+			$a = $this->_get_var($a);
+			if ($b[0]=="$") $b =  $this->_get_var($b);
+			$val = ($a == $b);
+		} else if (strpos($args[2],"!=")>0){
+			list($a,$b) = array_map("trim", explode("!=",$args[2]));
+			$a = $this->_get_var($a);
+			if ($b[0]=="$") $b =  $this->_get_var($b);
+			$val = ($a != $b);
+		} else {
+			$val = $this->_get_var($args[2]);
+		}
+		$x = preg_split("|{{ *else *}}|", $args[3]);
+
+		return ( ($val) ? $x[0] : (isset($x[1]) ? $x[1] : ""));
+	}
+
+	/**
+	 * FOR node
+	 * \code
+	 * {{ for <$var> as $name }}...{{ endfor }}
+	 * {{ for <$var> as $key=>$name }}...{{ endfor }}
+	 * \endcode
+	 */
+	private function _replcb_for($args) {
+		$m = array_map('trim', explode(" as ", $args[2]));
+		$x = explode("=>",$m[1]);
+		if (count($x) == 1) {
+			$varname = $x[0];
+			$keyname = "";
+		} else {
+			list($keyname, $varname) = $x;
+		}
+		if ($m[0]=="" || $varname=="" || is_null($varname)) die("template error: 'for ".$m[0]." as ".$varname."'") ;
+		//$vals = $this->r[$m[0]];
+		$vals = $this->_get_var($m[0]);
+		$ret="";
+		if (!is_array($vals)) return $ret;
+
+		foreach ($vals as $k=>$v){
+			$this->_push_stack();
+			$r = $this->r;
+			$r[$varname] = $v;
+			if ($keyname!='') $r[$keyname] = (($k === 0) ? '0' : $k);
+			$ret .=  $this->replace($args[3], $r);
+			$this->_pop_stack();
+		}
+
+		return $ret;
+	}
+
+	/**
+	 * INC node
+	 * \code
+	 * {{ inc <templatefile> [with $var1=$var2] }}{{ endinc }}
+	 * \endcode
+	 */
+	private function _replcb_inc($args) {
+		if (strpos($args[2],"with")) {
+			list($tplfile, $newctx) = array_map('trim', explode("with",$args[2]));
+		} else {
+			$tplfile = trim($args[2]);
+			$newctx = null;
+		}
+
+		if ($tplfile[0]=="$") $tplfile = $this->_get_var($tplfile);
+
+		$this->_push_stack();
+		$r = $this->r;
+		if (!is_null($newctx)) {
+			list($a,$b) = array_map('trim', explode("=",$newctx));
+			$r[$a] = $this->_get_var($b); 
+		}
+		$this->nodes = Array();
+		$tpl = get_markup_template($tplfile);
+		$ret = $this->replace($tpl, $r);
+		$this->_pop_stack();
+
+		return $ret;
+	}
+
+	/**
+	 * DEBUG node
+	 * \code
+	 * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
+	 * \endcode
+	 * replace node with <pre>var_dump($var, $var, ...);</pre>
+	 */
+	private function _replcb_debug($args) {
+		$vars = array_map('trim', explode(" ",$args[2]));
+		$vars[] = $args[1];
+
+		$ret = "<pre>";
+		foreach ($vars as $var){
+			$ret .= htmlspecialchars(var_export( $this->_get_var($var), true ));
+			$ret .= "\n";
+		}
+		$ret .= "</pre>";
+
+		return $ret;
+	}
+
+	private function _replcb_node($m) {
+		$node = $this->nodes[$m[1]];
+		if (method_exists($this, "_replcb_".$node[1])){
+			$s = call_user_func(array($this, "_replcb_".$node[1]),  $node);
+		} else {
+			$s = "";
+		}
+		$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+
+		return $s;
+	}
+
+	private function _replcb($m) {
+		//var_dump(array_map('htmlspecialchars', $m));
+		$this->done = false;
+		$this->nodes[] = (array) $m;
+
+		return "||". (count($this->nodes)-1) ."||";
+	}
+
+	private function _build_nodes($s) {
+		$this->done = false;
+		while (!$this->done) {
+			$this->done=true;
+			$s = preg_replace_callback('|{{ *([a-z]*) *([^}]*)}}([^{]*({{ *else *}}[^{]*)?){{ *end\1 *}}|', array($this, "_replcb"), $s);
+			if ($s==Null) $this->_preg_error();
+		}
+		//({{ *else *}}[^{]*)?
+		krsort($this->nodes);
+
+		return $s;
+	}
+
+	private function var_replace($s) {
+		$m = array();
+		/** regexp:
+		 * \$ 						literal $
+		 * (\[)?					optional open square bracket
+		 * ([a-zA-Z0-9-_]+\.?)+		var name, followed by optional
+		 * 							dot, repeated at least 1 time
+		 * (?(1)\])					if there was opened square bracket
+		 * 							(subgrup 1), match close bracket
+		 */
+		if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(?(1)\])/', $s,$m)) {
+			foreach ($m[0] as $var) {
+				$exp = str_replace(array("[", "]"), array("", ""), $var);
+				$exptks = explode("|", $exp);
+
+				$varn = $exptks[0];
+				unset($exptks[0]);
+				$val = $this->_get_var($varn, true);
+				if ($val != KEY_NOT_EXISTS) {
+					/* run filters */
+					/*
+					 * Filter are in form of:
+					 * filtername:arg:arg:arg
+					 *
+					 * "filtername" is function name
+					 * "arg"s are optional, var value is appended to the end
+					 *          if one "arg"==='x' , is replaced with var value
+					 *
+					 * examples:
+					 * $item.body|htmlspecialchars              // escape html chars
+					 * $item.body|htmlspecialchars|strtoupper   // escape html and uppercase result
+					 * $item.created|date:%Y %M %j              // format date (created is a timestamp)
+					 * $item.body|str_replace:cat:dog           // replace all "cat" with "dog"
+					 * $item.body|str_replace:cat:dog:x:1       // replace one "cat" with "dog"
+					 */
+					foreach ($exptks as $filterstr) {
+						$filter = explode(":", $filterstr);
+						$filtername = $filter[0];
+						unset($filter[0]);
+						$valkey = array_search("x", $filter);
+						if ($valkey === false) {
+							$filter[] = $val;
+						} else {
+							$filter[$valkey] = $val;
+						}
+						if (function_exists($filtername)) {
+							$val = call_user_func_array($filtername, $filter);
+						}
+					}
+					$s = str_replace($var, $val, $s);
+				}
+			}
+		}
+
+		return $s;
+	}
+
+	private function replace($s, $r) {
+		$this->replace_macros($s, $r);
+	}
+
+	// TemplateEngine interface
+
+	public function replace_macros($s, $r) {
+		$this->r = $r;
+
+		$s = $this->_build_nodes($s);
+
+		$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
+		if ($s == Null)
+			$this->_preg_error();
+
+		// remove comments block
+		$s = preg_replace('/{#[^#]*#}/', "" , $s);
+
+		//$t2 = dba_timer();
+
+		// replace strings recursively (limit to 10 loops)
+		$os = "";
+		$count=0;
+		while (($os !== $s) && $count<10) {
+			$os=$s;
+			$count++;
+			$s = $this->var_replace($s);
+		}
+
+		return $s;
+	}
+
+	public function get_markup_template($file, $root='') {
+		$template_file = theme_include($file, $root);
+		if ($template_file) {
+			$content = file_get_contents($template_file);
+		}
+
+		return $content;
+	}
+}
+
+
+function template_escape($s) {
+	return str_replace(array('$','{{'),array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),$s);
+}
+
+function template_unescape($s) {
+	return str_replace(array('!_Doll^Ars1Az_!','!_DoubLe^BraceS4Rw_!'),array('$','{{'),$s);
+}
diff --git a/Zotlabs/Render/SmartyInterface.php b/Zotlabs/Render/SmartyInterface.php
new file mode 100755
index 000000000..0e3a47c2f
--- /dev/null
+++ b/Zotlabs/Render/SmartyInterface.php
@@ -0,0 +1,48 @@
+<?php /** @file */
+
+namespace Zotlabs\Render;
+
+require_once('library/Smarty/libs/Smarty.class.php');
+
+class SmartyInterface extends \Smarty {
+
+	public $filename;
+
+	function __construct() {
+		parent::__construct();
+
+		$theme = Theme::current();
+		$thname = $theme[0];
+
+		// setTemplateDir can be set to an array, which Smarty will parse in order.
+		// The order is thus very important here
+
+		$template_dirs = array('theme' => "view/theme/$thname/tpl/");
+		if( x(\App::$theme_info,"extends") )
+			$template_dirs = $template_dirs + array('extends' => "view/theme/" . \App::$theme_info["extends"] . "/tpl/");
+		$template_dirs = $template_dirs + array('base' => 'view/tpl/');
+		$this->setTemplateDir($template_dirs);
+
+        $basecompiledir = \App::$config['system']['smarty3_folder'];
+        
+		$this->setCompileDir($basecompiledir.'/compiled/');
+		$this->setConfigDir($basecompiledir.'/config/');
+		$this->setCacheDir($basecompiledir.'/cache/');
+
+		$this->left_delimiter = \App::get_template_ldelim('smarty3');
+		$this->right_delimiter = \App::get_template_rdelim('smarty3');
+
+		// Don't report errors so verbosely
+		$this->error_reporting = E_ALL & (~E_NOTICE);
+	}
+
+	function parsed($template = '') {
+		if($template) {
+			return $this->fetch('string:' . $template);
+		}
+		return $this->fetch('file:' . $this->filename);
+	}
+}
+
+
+
diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php
new file mode 100755
index 000000000..532d6e42f
--- /dev/null
+++ b/Zotlabs/Render/SmartyTemplate.php
@@ -0,0 +1,75 @@
+<?php /** @file */
+
+namespace Zotlabs\Render;
+
+class SmartyTemplate implements TemplateEngine {
+
+	static $name ="smarty3";
+	
+	public function __construct(){
+
+		// Cannot use get_config() here because it is called during installation when there is no DB.
+		// FIXME: this may leak private information such as system pathnames.
+
+        $basecompiledir = ((array_key_exists('smarty3_folder',\App::$config['system'])) 
+			? \App::$config['system']['smarty3_folder'] : '');
+        if (!$basecompiledir) $basecompiledir = str_replace('Zotlabs','',dirname(__dir__)) . "/" . TEMPLATE_BUILD_PATH;
+        if (!is_dir($basecompiledir)) {
+            echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> does not exist."; killme();
+        }
+		if(!is_writable($basecompiledir)){
+			echo "<b>ERROR:</b> folder <tt>$basecompiledir</tt> must be writable by webserver."; killme();
+		}
+         \App::$config['system']['smarty3_folder'] = $basecompiledir;
+	}
+	
+	// TemplateEngine interface
+
+	public function replace_macros($s, $r) {
+		$template = '';
+		if(gettype($s) === 'string') {
+			$template = $s;
+			$s = new SmartyInterface();
+		}
+		foreach($r as $key=>$value) {
+			if($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+			$s->assign($key, $value);
+		}
+		return $s->parsed($template);		
+	}
+	
+	public function get_markup_template($file, $root=''){
+		$template_file = theme_include($file, $root);
+		if($template_file) {
+			$template = new SmartyInterface();
+			$template->filename = $template_file;
+
+			return $template;
+		}		
+		return "";
+	}
+
+	public function get_intltext_template($file, $root='') {
+
+		$lang = \App::$language;
+    
+		if(file_exists("view/$lang/$file"))
+        	$template_file = "view/$lang/$file";
+	    elseif(file_exists("view/en/$file"))
+        	$template_file = "view/en/$file";
+    	else
+        	$template_file = theme_include($file,$root);
+		if($template_file) {
+			$template = new SmartyInterface();
+			$template->filename = $template_file;
+
+			return $template;
+		}		
+		return "";
+	}
+
+
+
+}
diff --git a/Zotlabs/Render/TemplateEngine.php b/Zotlabs/Render/TemplateEngine.php
new file mode 100755
index 000000000..600ff913e
--- /dev/null
+++ b/Zotlabs/Render/TemplateEngine.php
@@ -0,0 +1,12 @@
+<?php
+
+namespace Zotlabs\Render;
+
+/**
+ * @brief Interface for template engines.
+ */
+
+interface TemplateEngine {
+	public function replace_macros($s, $v);
+	public function get_markup_template($file, $root='');
+}
diff --git a/Zotlabs/Render/Theme.php b/Zotlabs/Render/Theme.php
new file mode 100644
index 000000000..a8b86f371
--- /dev/null
+++ b/Zotlabs/Render/Theme.php
@@ -0,0 +1,131 @@
+<?php
+
+namespace Zotlabs\Render;
+
+
+class Theme {
+
+	static $system_theme = null;
+	static $system_mobile_theme = null;
+
+	static $session_theme = null;
+	static $session_mobile_theme = null;
+
+	static $base_themes = array('redbasic');	
+
+	static public function current(){
+
+		self::$system_theme = ((isset(\App::$config['system']['theme'])) 
+			? \App::$config['system']['theme'] : '');
+		self::$session_theme = ((isset($_SESSION) && x($_SESSION,'theme')) 
+			? $_SESSION['theme'] : self::$system_theme);
+		self::$system_mobile_theme = ((isset(\App::$config['system']['mobile_theme'])) 
+			? \App::$config['system']['mobile_theme'] : '');
+		self::$session_mobile_theme = ((isset($_SESSION) && x($_SESSION,'mobile_theme')) 
+			? $_SESSION['mobile_theme'] : self::$system_mobile_theme);
+
+		$page_theme = null;
+
+		// Find the theme that belongs to the channel whose stuff we are looking at
+
+		if(\App::$profile_uid) {
+			$r = q("select channel_theme from channel where channel_id = %d limit 1",
+				intval(\App::$profile_uid)
+			);
+			if($r) {
+				$page_theme = $r[0]['channel_theme'];
+			}
+		}
+
+		// Themes from Comanche layouts over-ride the channel theme
+
+		if(array_key_exists('theme', \App::$layout) && \App::$layout['theme'])
+			$page_theme = \App::$layout['theme'];
+
+		// If the viewer is on a mobile device, ensure that we're using a mobile
+		// theme of some kind or whatever the viewer's preference is for mobile
+		// viewing (if applicable)
+
+		if(\App::$is_mobile || \App::$is_tablet) {
+			if(isset($_SESSION['show_mobile']) && (! $_SESSION['show_mobile'])) {
+				$chosen_theme = self::$session_theme;
+			}
+			else {
+				$chosen_theme = self::$session_mobile_theme;
+
+				if($chosen_theme === '' || $chosen_theme === '---' ) {
+					// user has selected to have the mobile theme be the same as the normal one
+					$chosen_theme = self::$session_theme;
+				}
+			}
+		}
+		else {
+			$chosen_theme = self::$session_theme;
+
+			if($page_theme) {
+				$chosen_theme = $page_theme;
+			}
+		}
+
+		// Allow theme selection of the form 'theme_name:schema_name'
+
+		$themepair = explode(':', $chosen_theme);
+
+		if($chosen_theme && (file_exists('view/theme/' . $themepair[0] . '/css/style.css') || file_exists('view/theme/' . $themepair[0] . '/php/style.php'))) {
+			return($themepair);
+		}
+
+		foreach(self::$base_themes as $t) {
+			if(file_exists('view/theme/' . $t . '/css/style.css') ||
+				file_exists('view/theme/' . $t . '/php/style.php')) {
+					return(array($t));
+			}
+		}
+
+		// Worst case scenario, the default base theme or themes don't exist; perhaps somebody renamed it/them.
+ 
+		// Find any theme at all and use it. 
+
+		$fallback = array_merge(glob('view/theme/*/css/style.css'),glob('view/theme/*/php/style.php'));
+		if(count($fallback))
+			return(array(str_replace('view/theme/','', substr($fallback[0],0,-14))));
+
+
+	}
+
+
+	/**
+	 * @brief Return full URL to theme which is currently in effect.
+	 *
+	 * Provide a sane default if nothing is chosen or the specified theme does not exist.
+	 *
+	 * @param bool $installing default false
+	 *
+	 * @return string
+	 */
+
+	function url($installing = false) {
+
+		if($installing)
+			return self::$base_themes[0];
+
+		$theme = self::current();
+
+		$t = $theme[0];
+		$s = ((count($theme) > 1) ? $t[1] : '');
+
+		$opts = '';
+		$opts = ((\App::$profile_uid) ? '?f=&puid=' . \App::$profile_uid : '');
+
+		$schema_str = ((x(\App::$layout,'schema')) ? '&schema=' . App::$layout['schema'] : ''); 
+		if(($s) && (! $schema_str))
+			$schema_str = '&schema=' . $s;
+		$opts .= $schema_str;
+
+		if(file_exists('view/theme/' . $t . '/php/style.php'))
+			return('view/theme/' . $t . '/php/style.pcss' . $opts);
+
+		return('view/theme/' . $t . '/css/style.css');
+	}
+}
+