From 731ec347b15ff4f39b93708a660d58d370dff0c3 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 11 Nov 2017 09:26:23 +0000 Subject: [PATCH] Removed old template parser --- boot.php | 9 - doc/themes.md | 4 +- include/template_processor.php | 311 ------------------------------ include/text.php | 1 - view/theme/duepuntozero/theme.php | 2 +- view/theme/frio/theme.php | 2 +- view/theme/frost-mobile/theme.php | 2 +- view/theme/frost/theme.php | 2 +- view/theme/smoothly/theme.php | 2 +- view/theme/vier/theme.php | 2 +- 10 files changed, 8 insertions(+), 329 deletions(-) delete mode 100644 include/template_processor.php diff --git a/boot.php b/boot.php index 4e20058bcf..8492701a0c 100644 --- a/boot.php +++ b/boot.php @@ -1527,15 +1527,6 @@ function get_spoolpath() return ""; } -/// @deprecated -function set_template_engine(App $a, $engine = 'internal') -{ - /// @note This function is no longer necessary, but keep it as a wrapper to the class method - /// to avoid breaking themes again unnecessarily - /// @TODO maybe output a warning here so the theme developer can see it? PHP won't show such warnings like Java does. - - $a->set_template_engine($engine); -} if (!function_exists('exif_imagetype')) { function exif_imagetype($file) diff --git a/doc/themes.md b/doc/themes.md index fc21b19d6e..531ff9c166 100644 --- a/doc/themes.md +++ b/doc/themes.md @@ -172,7 +172,7 @@ The content of this file should be something like $a-> theme_info = array( 'extends' => 'duepuntozero'. ); - set_template_engine($a, 'smarty3'); + $a->set_template_engine('smarty3'); /* and more stuff e.g. the JavaScript function for the header */ } @@ -253,7 +253,7 @@ So in the case of quattro it is function quattro_init(App $a) { $a->theme_info = array(); - set_template_engine($a, 'smarty3'); + $a->set_template_engine('smarty3'); } Here we have set the basic theme information, in this case they are empty. diff --git a/include/template_processor.php b/include/template_processor.php deleted file mode 100644 index 252375a060..0000000000 --- a/include/template_processor.php +++ /dev/null @@ -1,311 +0,0 @@ - 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 "
";
-		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 $val;
-	}
-
-	/**
-	 * IF node
-	 * 
-	 * {{ if <$var> }}...[{{ else }} ...] {{ endif }}
-	 * {{ if <$var>== }}...[{{ else }} ...]{{ endif }}
-	 * {{ if <$var>!= }}...[{{ else }} ...]{{ endif }}
-	 */
-	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
-	 * 
-	 * {{ for <$var> as $name }}...{{ endfor }}
-	 * {{ for <$var> as $key=>$name }}...{{ endfor }}
-	 */
-	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
-	 * 
-	 * {{ inc  [with $var1=$var2] }}{{ endinc }}
-	 */
-	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
-	 * 
-	 * {{ debug $var [$var [$var [...]]] }}{{ enddebug }}
-	 * 
-	 * replace node with 
var_dump($var, $var, ...);

-	 */
-	private function _replcb_debug($args) {
-		$vars = array_map('trim', explode(" ", $args[2]));
-		$vars[] = $args[1];
-
-		$ret = "
";
-		foreach ($vars as $var) {
-			$ret .= htmlspecialchars(var_export($this->_get_var($var), true));
-			$ret .= "\n";
-		}
-		$ret .= "
";
-		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
-		 * (|[a-zA-Z0-9-_:]+)*		pipe followed by filter name and args, zero or many
-		 * (?(1)\])					if there was opened square bracket
-		 * 							(subgrup 1), match close bracket
-		 */
-		if (preg_match_all('/\$(\[)?([a-zA-Z0-9-_]+\.?)+(\|[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;
-	}
-
-	// TemplateEngine interface
-	public function replace_macros($s, $r) {
-		$this->r = $r;
-
-		// remove comments block
-		$s = preg_replace('/{#(.*?\s*?)*?#}/', "", $s);
-
-		$s = $this->_build_nodes($s);
-
-		$s = preg_replace_callback('/\|\|([0-9]+)\|\|/', array($this, "_replcb_node"), $s);
-		if ($s == Null)
-			$this->_preg_error();
-
-		// replace strings recursively (limit to 10 loops)
-		$os = "";
-		$count = 0;
-		while ($os != $s && $count < 10) {
-			$os = $s;
-			$count++;
-			$s = $this->var_replace($s);
-		}
-		return template_unescape($s);
-	}
-	
-	public function get_template_file($file, $root='') {
-		$a = get_app();
-		$template_file = get_template_file($a, $file, $root);
-		$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/include/text.php b/include/text.php
index 54595452cd..04cf11550b 100644
--- a/include/text.php
+++ b/include/text.php
@@ -6,7 +6,6 @@ use Friendica\Core\PConfig;
 use Friendica\Core\System;
 use Friendica\Database\DBM;
 
-require_once "include/template_processor.php";
 require_once "include/friendica_smarty.php";
 require_once "include/Smilies.php";
 require_once "include/map.php";
diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php
index a8ec75352d..02882ca943 100644
--- a/view/theme/duepuntozero/theme.php
+++ b/view/theme/duepuntozero/theme.php
@@ -6,7 +6,7 @@ use Friendica\Core\PConfig;
 
 function duepuntozero_init(App $a) {
 
-set_template_engine($a, 'smarty3');
+$a->set_template_engine('smarty3');
 
     $colorset = PConfig::get( local_user(), 'duepuntozero','colorset');
     if (!$colorset)
diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 70cac3b3a8..35e40aa965 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -22,7 +22,7 @@ function frio_init(App $a) {
 	// disable the events module link in the profile tab
 	$a->theme_events_in_profile = false;
 
-	set_template_engine($a, 'smarty3');
+	$a->set_template_engine('smarty3');
 
 	$baseurl = System::baseUrl();
 
diff --git a/view/theme/frost-mobile/theme.php b/view/theme/frost-mobile/theme.php
index 2d104dc751..20b304d879 100644
--- a/view/theme/frost-mobile/theme.php
+++ b/view/theme/frost-mobile/theme.php
@@ -18,7 +18,7 @@ function frost_mobile_init(App $a) {
 	$a->videoheight = 200;
 	$a->theme_thread_allow = false;
 	$a->force_max_items = 10;
-	set_template_engine($a, 'smarty3');
+	$a->set_template_engine('smarty3');
 }
 
 function frost_mobile_content_loaded(App $a) {
diff --git a/view/theme/frost/theme.php b/view/theme/frost/theme.php
index 4c38b605d5..a504a542d1 100644
--- a/view/theme/frost/theme.php
+++ b/view/theme/frost/theme.php
@@ -16,7 +16,7 @@ function frost_init(App $a) {
 	$a->videowidth = 400;
 	$a->videoheight = 330;
 	$a->theme_thread_allow = false;
-	set_template_engine($a, 'smarty3');
+	$a->set_template_engine('smarty3');
 }
 
 function frost_content_loaded(App $a) {
diff --git a/view/theme/smoothly/theme.php b/view/theme/smoothly/theme.php
index 293836af13..555b65eed3 100644
--- a/view/theme/smoothly/theme.php
+++ b/view/theme/smoothly/theme.php
@@ -14,7 +14,7 @@ use Friendica\App;
 use Friendica\Core\System;
 
 function smoothly_init(App $a) {
-	set_template_engine($a, 'smarty3');
+	$a->set_template_engine('smarty3');
 
 	$cssFile = null;
 	$ssl_state = null;
diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index e0c385e5e6..7f58b214ed 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -23,7 +23,7 @@ function vier_init(App $a) {
 
 	$a->theme_events_in_profile = false;
 
-	set_template_engine($a, 'smarty3');
+	$a->set_template_engine('smarty3');
 
 	if ($a->argv[0].$a->argv[1] === "profile".$a->user['nickname'] || $a->argv[0] === "network" && local_user()) {
 		vier_community_info();