Implement Smarty3

boot.php

@@ -380,9 +380,13 @@ if(! class_exists('App')) {
 			'videoheight' => 350,
 			'force_max_items' => 0,
 			'thread_allow' => true,
-			'stylesheet' => ''
+			'stylesheet' => '',
+			'template_engine' => 'internal',
 		);
 
+		public $smarty3_ldelim = '{{';
+		public $smarty3_rdelim = '}}';
+
 		private $scheme;
 		private $hostname;
 		private $baseurl;
@@ -613,6 +617,16 @@ if(! class_exists('App')) {
 			if(!isset($this->page['htmlhead']))
 				$this->page['htmlhead'] = '';
 			$tpl = get_markup_template('head.tpl');
+
+			// If we're using Smarty, then doing replace_macros() will replace
+			// any unrecognized variables with a blank string. Since we delay
+			// replacing $stylesheet until later, we need to replace it now
+			// with another variable name
+			if($this->theme['template_engine'] === 'smarty3')
+				$stylesheet = $this->smarty3_ldelim . '$stylesheet' . $this->smarty3_rdelim;
+			else
+				$stylesheet = '$stylesheet';
+
 			$this->page['htmlhead'] = replace_macros($tpl,array(
 				'$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
 				'$local_user' => local_user(),
@@ -621,7 +635,8 @@ if(! class_exists('App')) {
 				'$comment' => t('Comment'),
 				'$showmore' => t('show more'),
 				'$showfewer' => t('show fewer'),
-				'$update_interval' => $interval
+				'$update_interval' => $interval,
+				'$stylesheet' => $stylesheet
 			)) . $this->page['htmlhead'];
 		}
 
@@ -955,7 +970,15 @@ if(! function_exists('login')) {
 		}
 
 
-		$o .= replace_macros($tpl,array(
+		$includes = array(
+			'$field_input' => 'field_input.tpl',
+			'$field_password' => 'field_password.tpl',
+			'$field_openid' => 'field_openid.tpl',
+			'$field_checkbox' => 'field_checkbox.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($tpl,$includes + array(
 
 			'$dest_url'     => $dest_url,
 			'$logout'       => t('Logout'),
@@ -1324,16 +1347,25 @@ if(! function_exists('profile_sidebar')) {
 
 		$tpl = get_markup_template('profile_vcard.tpl');
 
-		$o .= replace_macros($tpl, array(
+
+		$includes = array(
+			'$diaspora_vcard' => 'diaspora_vcard.tpl'
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		if($a->theme['template_engine'] === 'internal')
+			$location = template_escape($location);
+
+		$o .= replace_macros($tpl, $includes + array(
 			'$profile' => $profile,
 			'$connect'  => $connect,
 			'$wallmessage' => $wallmessage,
-			'$location' => template_escape($location),
+			'$location' => $location,
 			'$gender'   => $gender,
 			'$pdesc'	=> $pdesc,
 			'$marital'  => $marital,
 			'$homepage' => $homepage,
-			'$diaspora' => $diaspora,
+			'$diaspora_info' => $diaspora,
 			'$contact_block' => $contact_block,
 		));
 

include/conversation.php

@@ -581,33 +581,54 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 				list($categories, $folders) = get_cats_and_terms($item);
 
+				if($a->theme['template_engine'] === 'internal') {
+					$profile_name_e = template_escape($profile_name);
+					$item['title_e'] = template_escape($item['title']);
+					$body_e = template_escape($body);
+					$tags_e = template_escape($tags);
+					$hashtags_e = template_escape($hashtags);
+					$mentions_e = template_escape($mentions);
+					$location_e = template_escape($location);
+					$owner_name_e = template_escape($owner_name);
+				}
+				else {
+					$profile_name_e = $profile_name;
+					$item['title_e'] = $item['title'];
+					$body_e = $body;
+					$tags_e = $tags;
+					$hashtags_e = $hashtags;
+					$mentions_e = $mentions;
+					$location_e = $location;
+					$owner_name_e = $owner_name;
+				}
+
 				$tmp_item = array(
 					'template' => $tpl,
 					'id' => (($preview) ? 'P0' : $item['item_id']),
 					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 					'profile_url' => $profile_link,
 					'item_photo_menu' => item_photo_menu($item),
-					'name' => template_escape($profile_name),
+					'name' => $profile_name_e,
 					'sparkle' => $sparkle,
 					'lock' => $lock,
 					'thumb' => $profile_avatar,
-					'title' => template_escape($item['title']),
-					'body' => template_escape($body),
-					'tags' => template_escape($tags),
-					'hashtags' => template_escape($hashtags),
-					'mentions' => template_escape($mentions),
+					'title' => $item['title_e'],
+					'body' => $body_e,
+					'tags' => $tags_e,
+					'hashtags' => $hashtags_e,
+					'mentions' => $mentions_e,
 					'txt_cats' => t('Categories:'),
 					'txt_folders' => t('Filed under:'),
 					'has_cats' => ((count($categories)) ? 'true' : ''),
 					'has_folders' => ((count($folders)) ? 'true' : ''),
 					'categories' => $categories,
 					'folders' => $folders,
-					'text' => strip_tags(template_escape($body)),
+					'text' => strip_tags($body_e),
 					'localtime' => datetime_convert('UTC', date_default_timezone_get(), $item['created'], 'r'),
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'location' => template_escape($location),
+					'location' => $location_e,
 					'indent' => '',
-					'owner_name' => template_escape($owner_name),
+					'owner_name' => $owner_name_e,
 					'owner_url' => $owner_url,
 					'owner_photo' => $owner_photo,
 					'plink' => get_plink($item),
@@ -682,7 +703,6 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
 	$o = replace_macros($page_template, array(
 		'$baseurl' => $a->get_baseurl($ssl_state),
 		'$live_update' => $live_update_div,
-		'$remove' => t('remove'),
 		'$mode' => $mode,
 		'$user' => $a->user,
 		'$threads' => $threads,
@@ -856,12 +876,27 @@ function format_like($cnt,$arr,$type,$id) {
 	if($cnt == 1)
 		$o .= (($type === 'like') ? sprintf( t('%s likes this.'), $arr[0]) : sprintf( t('%s doesn\'t like this.'), $arr[0])) . EOL ;
 	else {
-		$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
-		$o .= (($type === 'like') ?
-					sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt)
-					 :
-					sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt) );
-		$o .= EOL ;
+		//$spanatts = 'class="fakelink" onclick="openClose(\'' . $type . 'list-' . $id . '\');"';
+		switch($type) {
+			case 'like':
+//				$phrase = sprintf( t('<span  %1$s>%2$d people</span> like this.'), $spanatts, $cnt);
+				$mood = t('like this');
+				break;
+			case 'dislike':
+//				$phrase = sprintf( t('<span  %1$s>%2$d people</span> don\'t like this.'), $spanatts, $cnt);
+				$mood = t('don\'t like this');
+				break;
+		}
+		$tpl = get_markup_template("voting_fakelink.tpl");
+		$phrase = replace_macros($tpl, array(
+			'$vote_id' => $type . 'list-' . $id,
+			'$count' => $cnt,
+			'$people' => t('people'),
+			'$vote_mood' => $mood
+		));
+		$o .= $phrase;
+//		$o .= EOL ;
+
 		$total = count($arr);
 		if($total >= MAX_LIKERS)
 			$arr = array_slice($arr, 0, MAX_LIKERS - 1);

include/friendica_smarty.php

@@ -0,0 +1,36 @@
+<?php
+
+require_once("library/Smarty/libs/Smarty.class.php");
+
+class FriendicaSmarty extends Smarty {
+
+	public $filename;
+	public $root;
+
+	function __construct() {
+		parent::__construct();
+
+		$a = get_app();
+
+		//$this->root = $_SERVER['DOCUMENT_ROOT'] . '/';
+		$this->root = '';
+
+		$this->setTemplateDir($this->root . 'view/smarty3/');
+		$this->setCompileDir($this->root . 'view/smarty3/compiled/');
+		$this->setConfigDir($this->root . 'view/smarty3/config/');
+		$this->setCacheDir($this->root . 'view/smarty3/cache/');
+
+		$this->left_delimiter = $a->smarty3_ldelim;
+		$this->right_delimiter = $a->smarty3_rdelim;
+	}
+
+	function parsed($template = '') {
+		if($template) {
+			return $this->fetch('string:' . $template);
+		}
+		return $this->fetch('file:' . $this->root . $this->filename);
+	}
+}
+
+
+

include/text.php

@@ -9,19 +9,38 @@
 // depending on the order in which they were declared in the array.   
 
 require_once("include/template_processor.php");
+require_once("include/friendica_smarty.php");
 
 if(! function_exists('replace_macros')) {  
 function replace_macros($s,$r) {
 	global $t;
-	
-	//$ts = microtime();
-	$r =  $t->replace($s,$r);
-	//$tt = microtime() - $ts;
-	
-	//$a = get_app();
-	//$a->page['debug'] .= "$tt <br>\n";
-	return template_unescape($r);
 
+//	$ts = microtime();
+	$a = get_app();
+
+	if($a->theme['template_engine'] === 'smarty3') {
+		$template = '';
+		if(gettype($s) === 'string') {
+			$template = $s;
+			$s = new FriendicaSmarty();
+		}
+		foreach($r as $key=>$value) {
+			if($key[0] === '$') {
+				$key = substr($key, 1);
+			}
+			$s->assign($key, $value);
+		}
+		$output = $s->parsed($template);
+	}
+	else {
+		$r =  $t->replace($s,$r);
+	
+		$output = template_unescape($r);
+	}
+//	$tt = microtime() - $ts;
+//	$a = get_app();
+//	$a->page['debug'] .= "$tt <br>\n";
+	return $output;
 }}
 
 
@@ -421,29 +440,78 @@ if(! function_exists('get_intltext_template')) {
 function get_intltext_template($s) {
 	global $lang;
 
+	$a = get_app();
+	$engine = '';
+	if($a->theme['template_engine'] === 'smarty3')
+		$engine = "/smarty3";
+
 	if(! isset($lang))
 		$lang = 'en';
 
-	if(file_exists("view/$lang/$s"))
-		return file_get_contents("view/$lang/$s");
-	elseif(file_exists("view/en/$s"))
-		return file_get_contents("view/en/$s");
+	if(file_exists("view/$lang$engine/$s"))
+		return file_get_contents("view/$lang$engine/$s");
+	elseif(file_exists("view/en$engine/$s"))
+		return file_get_contents("view/en$engine/$s");
 	else
-		return file_get_contents("view/$s");
+		return file_get_contents("view$engine/$s");
 }}
 
 if(! function_exists('get_markup_template')) {
-function get_markup_template($s) {
-	$a=get_app();
+function get_markup_template($s, $root = '') {
+//	$ts = microtime();
+	$a = get_app();
+
+	if($a->theme['template_engine'] === 'smarty3') {
+		$template_file = get_template_file($a, 'smarty3/' . $s, $root);
+
+		$template = new FriendicaSmarty();
+		$template->filename = $template_file;
+
+//		$tt = microtime() - $ts;
+//		$a->page['debug'] .= "$tt <br>\n";
+		return $template;
+	}
+	else {
+		$template_file = get_template_file($a, $s, $root);
+//		$file_contents = file_get_contents($template_file);
+//		$tt = microtime() - $ts;
+//		$a->page['debug'] .= "$tt <br>\n";
+//		return $file_contents;
+		return file_get_contents($template_file);
+	}	
+}}
+
+if(! function_exists("get_template_file")) {
+function get_template_file($a, $filename, $root = '') {
 	$theme = current_theme();
-	
-	if(file_exists("view/theme/$theme/$s"))
-		return file_get_contents("view/theme/$theme/$s");
-	elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/$s"))
-		return file_get_contents("view/theme/".$a->theme_info["extends"]."/$s");
+
+	// Make sure $root ends with a slash /
+	if($root !== '' && $root[strlen($root)-1] !== '/')
+		$root = $root . '/';
+
+	if(file_exists($root . "view/theme/$theme/$filename"))
+		$template_file = $root . "view/theme/$theme/$filename";
+	elseif (x($a->theme_info,"extends") && file_exists($root . "view/theme/".$a->theme_info["extends"]."/$filename"))
+		$template_file = $root . "view/theme/".$a->theme_info["extends"]."/$filename";
 	else
-		return file_get_contents("view/$s");
+		$template_file = $root . "view/$filename";
 
+	return $template_file;
+}}
+
+if(! function_exists("set_template_includes")) {
+function set_template_includes($engine, $includes) {
+	if($engine === 'smarty3') {
+		$a = get_app();
+		foreach($includes as $name=>$path) {
+//			$sm_includes[$name] = $_SERVER['DOCUMENT_ROOT'] . '/' . get_template_file($a, 'smarty3/' . $path);
+			$sm_includes[$name] = get_template_file($a, 'smarty3/' . $path);
+		}
+		return $sm_includes;
+	}
+	else {
+		return $includes;
+	}
 }}
 
 

mod/admin.php

@@ -439,7 +439,16 @@ function admin_page_site(&$a) {
 	);
 
 	$t = get_markup_template("admin_site.tpl");
-	return replace_macros($t, array(
+
+	$includes = array(
+		'$field_checkbox'	=> 'field_checkbox.tpl',
+		'$field_input'		=> 'field_input.tpl',
+		'$field_select'		=> 'field_select.tpl',
+		'$field_textarea'	=> 'field_textarea.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	return replace_macros($t, $includes + array(
 		'$title' => t('Administration'),
 		'$page' => t('Site'),
 		'$submit' => t('Submit'),
@@ -488,7 +497,7 @@ function admin_page_site(&$a) {
 		'$poll_interval'	=> array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
 		'$maxloadavg'		=> array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
         '$form_security_token' => get_form_security_token("admin_site"),
-			
+
 	));
 
 }
@@ -1109,7 +1118,14 @@ readable.");
 		}
 	}			
 
-	return replace_macros($t, array(
+	$includes = array(
+		'$field_checkbox'	=> 'field_checkbox.tpl',
+		'$field_input'		=> 'field_input.tpl',
+		'$field_select'		=> 'field_select.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	return replace_macros($t, $includes + array(
 		'$title' => t('Administration'),
 		'$page' => t('Logs'),
 		'$submit' => t('Submit'),
@@ -1168,7 +1184,14 @@ function admin_page_remoteupdate(&$a) {
 	}
 	
 	$tpl = get_markup_template("admin_remoteupdate.tpl");
-	return replace_macros($tpl, array(
+
+	$includes = array(
+		'$field_input'		=> 'field_input.tpl',
+		'$field_password'	=> 'field_password.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	return replace_macros($tpl, $includes + array(
 		'$baseurl' => $a->get_baseurl(true),
 		'$submit' => t("Update now"),
 		'$close' => t("Close"),
@@ -1181,7 +1204,7 @@ function admin_page_remoteupdate(&$a) {
 		'$ftppath'	=> array('ftppath', t("FTP Path"), '/',''),
 		'$ftpuser'	=> array('ftpuser', t("FTP User"), '',''),
 		'$ftppwd'	=> array('ftppwd', t("FTP Password"), '',''),
-		'$remotefile'=>array('remotefile','', $u['2'],'')
+		'$remotefile'=>array('remotefile','', $u['2'],''),
 	));
 	
 }

mod/contacts.php

@@ -346,7 +346,12 @@ function contacts_content(&$a) {
 
 		$lost_contact = (($contact['archive'] && $contact['term-date'] != '0000-00-00 00:00:00' && $contact['term-date'] < datetime_convert('','','now')) ? t('Communications lost with this contact!') : '');
 
-		$o .= replace_macros($tpl,array(
+		$includes = array(
+			'$field_checkbox' => 'field_checkbox.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($tpl,$includes + array(
 			'$header' => t('Contact Editor'),
 			'$tab_str' => $tab_str,
 			'$submit' => t('Submit'),
@@ -388,7 +393,7 @@ function contacts_content(&$a) {
 			'$dir_icon' => $dir_icon,
 			'$alt_text' => $alt_text,
 			'$sparkle' => $sparkle,
-			'$url' => $url
+			'$url' => $url,
 
 		));
 
@@ -571,7 +576,13 @@ function contacts_content(&$a) {
 	}
 	
 	$tpl = get_markup_template("contacts-template.tpl");
-	$o .= replace_macros($tpl,array(
+
+	$includes = array(
+		'$contact_template' => 'contact_template.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl,$includes + array(
 		'$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
 		'$tabs' => $t,
 		'$total' => $total,

mod/content.php

@@ -447,6 +447,23 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 				$shareable = false;
 
 				$body = prepare_body($item,true);
+
+				if($a->theme['template_engine'] === 'internal') {
+					$name_e = template_escape($profile_name);
+					$title_e = template_escape($item['title']);
+					$body_e = template_escape($body);
+					$text_e = strip_tags(template_escape($body));
+					$location_e = template_escape($location);
+					$owner_name_e = template_escape($owner_name);
+				}
+				else {
+					$name_e = $profile_name;
+					$title_e = $item['title'];
+					$body_e = $body;
+					$text_e = strip_tags($body);
+					$location_e = $location;
+					$owner_name_e = $owner_name;
+				}
 				
 				//$tmp_item = replace_macros($tpl,array(
 				$tmp_item = array(
@@ -455,17 +472,17 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 					'profile_url' => $profile_link,
 					'item_photo_menu' => item_photo_menu($item),
-					'name' => template_escape($profile_name),
+					'name' => $name_e,
 					'sparkle' => $sparkle,
 					'lock' => $lock,
 					'thumb' => $profile_avatar,
-					'title' => template_escape($item['title']),
-					'body' => template_escape($body),
-					'text' => strip_tags(template_escape($body)),
+					'title' => $title_e,
+					'body' => $body_e,
+					'text' => $text_e,
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
-					'location' => template_escape($location),
+					'location' => $location_e,
 					'indent' => '',
-					'owner_name' => template_escape($owner_name),
+					'owner_name' => $owner_name_e,
 					'owner_url' => $owner_url,
 					'owner_photo' => $owner_photo,
 					'plink' => get_plink($item),
@@ -802,6 +819,24 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 
 				$body = prepare_body($item,true);
 				//$tmp_item = replace_macros($template,
+
+				if($a->theme['template_engine'] === 'internal') {
+					$body_e = template_escape($body);
+					$text_e = strip_tags(template_escape($body));
+					$name_e = template_escape($profile_name);
+					$title_e = template_escape($item['title']);
+					$location_e = template_escape($location);
+					$owner_name_e = template_escape($owner_name);
+				}
+				else {
+					$body_e = $body;
+					$text_e = strip_tags($body);
+					$name_e = $profile_name;
+					$title_e = $item['title'];
+					$location_e = $location;
+					$owner_name_e = $owner_name;
+				}
+
 				$tmp_item = array(
 					// collapse comments in template. I don't like this much...
 					'comment_firstcollapsed' => $comment_firstcollapsed,
@@ -811,8 +846,8 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 					
 					'type' => implode("",array_slice(explode("/",$item['verb']),-1)),
 					'tags' => $tags,
-					'body' => template_escape($body),
-					'text' => strip_tags(template_escape($body)),
+					'body' => $body_e,
+					'text' => $text_e,
 					'id' => $item['item_id'],
 					'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
 					'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
@@ -821,19 +856,19 @@ function render_content(&$a, $items, $mode, $update, $preview = false) {
 					'vwall' => t('via Wall-To-Wall:'),
 					'profile_url' => $profile_link,
 					'item_photo_menu' => item_photo_menu($item),
-					'name' => template_escape($profile_name),
+					'name' => $name_e,
 					'thumb' => $profile_avatar,
 					'osparkle' => $osparkle,
 					'sparkle' => $sparkle,
-					'title' => template_escape($item['title']),
+					'title' => $title_e,
 					'ago' => (($item['app']) ? sprintf( t('%s from %s'),relative_date($item['created']),$item['app']) : relative_date($item['created'])),
 					'lock' => $lock,
-					'location' => template_escape($location),
+					'location' => $location_e,
 					'indent' => $indent,
 					'shiny' => $shiny,
 					'owner_url' => $owner_url,
 					'owner_photo' => $owner_photo,
-					'owner_name' => template_escape($owner_name),
+					'owner_name' => $owner_name_e,
 					'plink' => get_plink($item),
 					'edpost' => $edpost,
 					'isstarred' => $isstarred,

mod/directory.php

@@ -143,16 +143,23 @@ function directory_content(&$a) {
 			
 			$tpl = get_markup_template('directory_item.tpl');
 
+			if($a->theme['template_engine'] === 'internal') {
+				$location_e = template_escape($location);
+			}
+			else {
+				$location_e = $location;
+			}
+
 			$entry = replace_macros($tpl,array(
 				'$id' => $rr['id'],
-				'$profile-link' => $profile_link,
+				'$profile_link' => $profile_link,
 				'$photo' => $a->get_cached_avatar_image($rr[$photo]),
-				'$alt-text' => $rr['name'],
+				'$alt_text' => $rr['name'],
 				'$name' => $rr['name'],
 				'$details' => $pdesc . $details,
-				'$page-type' => $page_type,
+				'$page_type' => $page_type,
 				'$profile' => $profile,
-				'$location' => template_escape($location),
+				'$location' => $location_e,
 				'$gender'   => $gender,
 				'$pdesc'	=> $pdesc,
 				'$marital'  => $marital,

mod/display.php

@@ -16,7 +16,7 @@ function display_content(&$a, $update = 0) {
 
 	$o = '';
 
-	$a->page['htmlhead'] .= get_markup_template('display-head.tpl');
+	$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
 
 
 	if($update) {

mod/fbrowser.php

@@ -55,9 +55,17 @@ function fbrowser_content($a){
 				global $a;
 				$types = Photo::supportedTypes();
 				$ext = $types[$rr['type']];
+
+				if($a->theme['template_engine'] === 'internal') {
+					$filename_e = template_escape($rr['filename']);
+				}
+				else {
+					$filename_e = $rr['filename'];
+				}
+
 				return array( 
 					$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['hiq'] . '.' .$ext, 
-					template_escape($rr['filename']), 
+					$filename_e, 
 					$a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['loq'] . '.'. $ext
 				);
 			}
@@ -83,7 +91,15 @@ function fbrowser_content($a){
 				function files2($rr){ global $a; 
 					list($m1,$m2) = explode("/",$rr['filetype']);
 					$filetype = ( (file_exists("images/icons/$m1.png"))?$m1:"zip");
-					return array( $a->get_baseurl() . '/attach/' . $rr['id'], template_escape($rr['filename']), $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
+
+					if($a->theme['template_engine'] === 'internal') {
+						$filename_e = template_escape($rr['filename']);
+					}
+					else {
+						$filename_e = $rr['filename'];
+					}
+
+					return array( $a->get_baseurl() . '/attach/' . $rr['id'], $filename_e, $a->get_baseurl() . '/images/icons/16/' . $filetype . '.png'); 
 				}
 				$files = array_map("files2", $files);
 				//echo "<pre>"; var_dump($files); killme();

mod/filer.php

@@ -25,6 +25,12 @@ function filer_content(&$a) {
 		$filetags = file_tag_file_to_list($filetags,'file');
                 $filetags = explode(",", $filetags);
 		$tpl = get_markup_template("filer_dialog.tpl");
+
+		$includes = array(
+			'$field_combobox' => 'field_combobox.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
 		$o = replace_macros($tpl, array(
 			'$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
 			'$submit' => t('Save'),

mod/group.php

@@ -82,7 +82,16 @@ function group_content(&$a) {
 		$switchtotext = 400;
 
 	$tpl = get_markup_template('group_edit.tpl');
-	$context = array('$submit' => t('Submit'));
+
+	$includes = array(
+			'$field_input' => 'field_input.tpl',
+			'$groupeditortpl' => 'groupeditor.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$context = $includes + array(
+			'$submit' => t('Submit'),
+	);
 
 	if(($a->argc == 2) && ($a->argv[1] === 'new')) {
 		
@@ -217,15 +226,16 @@ function group_content(&$a) {
 		}
 	}
 
-	$context['$groupeditor'] = $groupeditor;
 	$context['$desc'] = t('Click on a contact to add or remove.');
 
 	if($change) {
+		$context['$groupeditor'] = $groupeditor;
 		$tpl = get_markup_template('groupeditor.tpl');
 		echo replace_macros($tpl, $context);
 		killme();
 	}
 	
+	$context['$groupedit_info'] = $groupeditor;
 	return replace_macros($tpl, $context);
 
 }

mod/hostxrd.php

@@ -14,10 +14,18 @@ function hostxrd_init(&$a) {
 		set_config('system','site_pubkey', $res['pubkey']);
 	}
 
-	$tpl = file_get_contents('view/xrd_host.tpl');
-	echo str_replace(array(
-		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);
+	//$tpl = file_get_contents('view/xrd_host.tpl');
+	/*echo str_replace(array(
+		'$zhost','$zroot','$domain','$zot_post','$bigkey'),array($a->get_hostname(),z_root(),z_path(),z_root() . '/post', salmon_key(get_config('system','site_pubkey'))),$tpl);*/
+	$tpl = get_markup_template('xrd_host.tpl');
+	echo replace_macros($tpl, array(
+		'$zhost' => $a->get_hostname(),
+		'$zroot' => z_root(),
+		'$domain' => z_path(),
+		'$zot_post' => z_root() . '/post',
+		'$bigkey' => salmon_key(get_config('system','site_pubkey')),
+	));
 	session_write_close();
 	exit();
 
-}
+}

mod/install.php

@@ -220,7 +220,14 @@ function install_content(&$a) {
 			
 
 			$tpl = get_markup_template('install_db.tpl');
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' 	=> 'field_input.tpl',
+				'$field_password' => 'field_password.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl,$includes + array(
 				'$title' => $install_title,
 				'$pass' => t('Database connection'),
 				'$info_01' => t('In order to install Friendica we need to know how to connect to your database.'),
@@ -260,7 +267,13 @@ function install_content(&$a) {
 			$timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
 			
 			$tpl = get_markup_template('install_settings.tpl');
-			$o .= replace_macros($tpl, array(
+
+			$includes = array(
+				'$field_input' => 'field_input.tpl',
+			);
+			$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+			$o .= replace_macros($tpl, $includes + array(
 				'$title' => $install_title,
 				'$pass' => t('Site settings'),
 

mod/message.php

@@ -282,23 +282,25 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('prv_message.tpl');
 		$o .= replace_macros($tpl,array(
-			'$header' => t('Send Private Message'),
-			'$to' => t('To:'),
-			'$showinputs' => 'true', 
-			'$prefill' => $prefill,
-			'$autocomp' => $autocomp,
-			'$preid' => $preid,
-			'$subject' => t('Subject:'),
-			'$subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
-			'$text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
-			'$readonly' => '',
-			'$yourmessage' => t('Your message:'),
-			'$select' => $select,
-			'$parent' => '',
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$wait' => t('Please wait'),
-			'$submit' => t('Submit')
+			'$reply' => array(
+				'header' => t('Send Private Message'),
+				'to' => t('To:'),
+				'showinputs' => 'true', 
+				'prefill' => $prefill,
+				'autocomp' => $autocomp,
+				'preid' => $preid,
+				'subject' => t('Subject:'),
+				'subjtxt' => ((x($_REQUEST,'subject')) ? strip_tags($_REQUEST['subject']) : ''),
+				'text' => ((x($_REQUEST,'body')) ? escape_tags(htmlspecialchars($_REQUEST['body'])) : ''),
+				'readonly' => '',
+				'yourmessage' => t('Your message:'),
+				'select' => $select,
+				'parent' => '',
+				'upload' => t('Upload photo'),
+				'insert' => t('Insert web link'),
+				'wait' => t('Please wait'),
+				'submit' => t('Submit')
+			)
 		));
 
 		return $o;
@@ -346,6 +348,17 @@ function message_content(&$a) {
 			else {
 				$partecipants = sprintf( t("%s and You"), $rr['from-name']);
 			}
+
+			if($a->theme['template_engine'] === 'internal') {
+				$subject_e = template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>'));
+				$body_e = template_escape($rr['body']);
+				$to_name_e = template_escape($rr['name']);
+			}
+			else {
+				$subject_e = (($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>');
+				$body_e = $rr['body'];
+				$to_name_e = $rr['name'];
+			}
 			
 			$o .= replace_macros($tpl, array(
 				'$id' => $rr['id'],
@@ -353,10 +366,10 @@ function message_content(&$a) {
 				'$from_url' => (($rr['network'] === NETWORK_DFRN) ? $a->get_baseurl(true) . '/redir/' . $rr['contact-id'] : $rr['url']),
 				'$sparkle' => ' sparkle',
 				'$from_photo' => (($rr['thumb']) ? $rr['thumb'] : $rr['from-photo']),
-				'$subject' => template_escape((($rr['mailseen']) ? $rr['title'] : '<strong>' . $rr['title'] . '</strong>')),
+				'$subject' => $subject_e,
 				'$delete' => t('Delete conversation'),
-				'$body' => template_escape($rr['body']),
-				'$to_name' => template_escape($rr['name']),
+				'$body' => $body_e,
+				'$to_name' => $to_name_e,
 				'$date' => datetime_convert('UTC',date_default_timezone_get(),$rr['mailcreated'], t('D, d M Y - g:i A')),
                                 '$ago' => relative_date($rr['mailcreated']),
 				'$seen' => $rr['mailseen'],
@@ -371,6 +384,10 @@ function message_content(&$a) {
 
 		$o .= $header;
 
+		$plaintext = true;
+		if( local_user() && feature_enabled(local_user(),'richtext') )
+			$plaintext = false;
+
 		$r = q("SELECT `mail`.*, `contact`.`name`, `contact`.`url`, `contact`.`thumb` 
 			FROM `mail` LEFT JOIN `contact` ON `mail`.`contact-id` = `contact`.`id` 
 			WHERE `mail`.`uid` = %d AND `mail`.`id` = %d LIMIT 1",
@@ -408,14 +425,18 @@ function message_content(&$a) {
 
 		$tpl = get_markup_template('msg-header.tpl');
 		$a->page['htmlhead'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl(true)
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 		$tpl = get_markup_template('msg-end.tpl');
 		$a->page['end'] .= replace_macros($tpl, array(
+			'$baseurl' => $a->get_baseurl(true),
+			'$editselect' => (($plaintext) ? 'none' : '/(profile-jot-text|prvmail-text)/'),
 			'$nickname' => $a->user['nickname'],
-			'$baseurl' => $a->get_baseurl(true)
+			'$linkurl' => t('Please enter a link URL:')
 		));
 
 
@@ -440,16 +461,29 @@ function message_content(&$a) {
 			if($extracted['images'])
 				$message['body'] = item_redir_and_replace_images($extracted['body'], $extracted['images'], $message['contact-id']);
 
+			if($a->theme['template_engine'] === 'internal') {
+				$from_name_e = template_escape($message['from-name']);
+				$subject_e = template_escape($message['title']);
+				$body_e = template_escape(smilies(bbcode($message['body'])));
+				$to_name_e = template_escape($message['name']);
+			}
+			else {
+				$from_name_e = $message['from-name'];
+				$subject_e = $message['title'];
+				$body_e = smilies(bbcode($message['body']));
+				$to_name_e = $message['name'];
+			}
+
 			$mails[] = array(
 				'id' => $message['id'],
-				'from_name' => template_escape($message['from-name']),
+				'from_name' => $from_name_e,
 				'from_url' => $from_url,
 				'sparkle' => $sparkle,
 				'from_photo' => $message['from-photo'],
-				'subject' => template_escape($message['title']),
-				'body' => template_escape(smilies(bbcode($message['body']))),
+				'subject' => $subject_e,
+				'body' => $body_e,
 				'delete' => t('Delete message'),
-				'to_name' => template_escape($message['name']),
+				'to_name' => $to_name_e,
 				'date' => datetime_convert('UTC',date_default_timezone_get(),$message['created'],'D, d M Y - g:i A'),
                                 'ago' => relative_date($message['created']),
 			);
@@ -462,7 +496,21 @@ function message_content(&$a) {
 		$parent = '<input type="hidden" name="replyto" value="' . $message['parent-uri'] . '" />';
 
 		$tpl = get_markup_template('mail_display.tpl');
-		$o = replace_macros($tpl, array(
+
+		$includes = array(
+			'$mail_conv' => 'mail_conv.tpl',
+			'$prv_message' => 'prv_message.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		if($a->theme['template_engine'] === 'internal') {
+			$subjtxt_e = template_escape($message['title']);
+		}
+		else {
+			$subjtxt_e = $message['title'];
+		}
+
+		$o = replace_macros($tpl, $includes + array(
 			'$thread_id' => $a->argv[1],
 			'$thread_subject' => $message['title'],
 			'$thread_seen' => $seen,
@@ -472,20 +520,22 @@ function message_content(&$a) {
 			'$mails' => $mails,
 			
 			// reply
-			'$header' => t('Send Reply'),
-			'$to' => t('To:'),
-			'$showinputs' => '',
-			'$subject' => t('Subject:'),
-			'$subjtxt' => template_escape($message['title']),
-			'$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
-			'$yourmessage' => t('Your message:'),
-			'$text' => '',
-			'$select' => $select,
-			'$parent' => $parent,
-			'$upload' => t('Upload photo'),
-			'$insert' => t('Insert web link'),
-			'$submit' => t('Submit'),
-			'$wait' => t('Please wait')
+			'$reply_info' => array(
+				'header' => t('Send Reply'),
+				'to' => t('To:'),
+				'showinputs' => '',
+				'subject' => t('Subject:'),
+				'subjtxt' => $subjtxt_e,
+				'readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
+				'yourmessage' => t('Your message:'),
+				'text' => '',
+				'select' => $select,
+				'parent' => $parent,
+				'upload' => t('Upload photo'),
+				'insert' => t('Insert web link'),
+				'submit' => t('Submit'),
+				'wait' => t('Please wait'),
+			),
 
 		));
 

mod/nogroup.php

@@ -53,8 +53,15 @@ function nogroup_content(&$a) {
 			);
 		}
 	}
+
 	$tpl = get_markup_template("nogroup-template.tpl");
-	$o .= replace_macros($tpl,array(
+
+	$includes = array(
+		'$contact_template' => 'contact_template.tpl',
+	);
+	$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+	$o .= replace_macros($tpl,$includes + array(
 		'$header' => t('Contacts who are not members of a group'),
 		'$contacts' => $contacts,
 		'$paginate' => paginate($a),

mod/notifications.php

@@ -144,7 +144,13 @@ function notifications_content(&$a) {
 				if($rr['fid']) {
 
 					$return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
-					$notif_content .= replace_macros($sugg,array(
+
+					$includes = array(
+						'$field_checkbox' => 'field_checkbox.tpl',
+					);
+					$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+					$notif_content .= replace_macros($sugg,$includes + array(
 						'$str_notifytype' => t('Notification type: '),
 						'$notify_type' => t('Friend Suggestion'),
 						'$intro_id' => $rr['intro_id'],
@@ -161,7 +167,7 @@ function notifications_content(&$a) {
 						'$note' => $rr['note'],
 						'$request' => $rr['frequest'] . '?addr=' . $return_addr,
 						'$ignore' => t('Ignore'),
-						'$discard' => t('Discard')
+						'$discard' => t('Discard'),
 
 					));
 
@@ -190,7 +196,12 @@ function notifications_content(&$a) {
 					));
 				}			
 
-				$notif_content .= replace_macros($tpl,array(
+				$includes = array(
+					'$field_checkbox' => 'field_checkbox.tpl',
+				);
+				$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+				$notif_content .= replace_macros($tpl,$includes + array(
 					'$str_notifytype' => t('Notification type: '),
 					'$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
 					'$dfrn_text' => $dfrn_text,	
@@ -207,7 +218,7 @@ function notifications_content(&$a) {
 					'$approve' => t('Approve'),
 					'$note' => $rr['note'],
 					'$ignore' => t('Ignore'),
-					'$discard' => t('Discard')
+					'$discard' => t('Discard'),
 
 				));
 			}
@@ -215,9 +226,14 @@ function notifications_content(&$a) {
 		else
 			info( t('No introductions.') . EOL);
 
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -301,9 +317,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more network notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Network Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -331,9 +352,14 @@ function notifications_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('System Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 
@@ -426,9 +452,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more personal notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Personal Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 		
@@ -507,9 +538,14 @@ function notifications_content(&$a) {
 			$notif_content = t('No more home notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('Home Notifications'),
-			'$tabs' => $tabs,
+			'$tabs_data' => $tabs,
 			'$notif_content' => $notif_content,
 		));
 	}

mod/notify.php

@@ -61,13 +61,18 @@ function notify_content(&$a) {
 			$notif_content .= t('No more system notifications.');
 		}
 		
-		$o .= replace_macros($notif_tpl,array(
+		$includes = array(
+			'$common_tabs' => 'common_tabs.tpl',
+		);
+		$includes = set_template_includes($a->theme['template_engine'], $includes);
+
+		$o .= replace_macros($notif_tpl,$includes + array(
 			'$notif_header' => t('System Notifications'),
-			'$tabs' => '', // $tabs,
+			'$tabs_data' => '', // $tabs,
 			'$notif_content' => $notif_content,
 		));
 
 	return $o;
 
 
-}
+}

mod/photos.php

@@ -1039,6 +1039,16 @@ function photos_content(&$a) {
 
 
 		$tpl = get_markup_template('photos_upload.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$albumselect_e = template_escape($albumselect);
+			$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb)));
+		}
+		else {
+			$albumselect_e = $albumselect;
+			$aclselect_e = (($visitor) ? '' : populate_acl($a->user, $celeb));
+		}
+
 		$o .= replace_macros($tpl,array(
 			'$pagename' => t('Upload Photos'),
 			'$sessid' => session_id(),
@@ -1047,9 +1057,9 @@ function photos_content(&$a) {
 			'$newalbum' => t('New album name: '),
 			'$existalbumtext' => t('or existing album name: '),
 			'$nosharetext' => t('Do not show a status post for this upload'),
-			'$albumselect' => template_escape($albumselect),
+			'$albumselect' => $albumselect_e,
 			'$permissions' => t('Permissions'),
-			'$aclselect' => (($visitor) ? '' : template_escape(populate_acl($a->user, $celeb))),
+			'$aclselect' => $aclselect_e,
 			'$uploader' => $ret['addon_text'],
 			'$default' => (($ret['default_upload']) ? $default_upload : ''),
 			'$uploadurl' => $ret['post_url']
@@ -1092,10 +1102,18 @@ function photos_content(&$a) {
 			if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
 				if($can_post) {
 					$edit_tpl = get_markup_template('album_edit.tpl');
+
+					if($a->theme['template_engine'] === 'internal') {
+						$album_e = template_escape($album);
+					}
+					else {
+						$album_e = $album;
+					}
+
 					$o .= replace_macros($edit_tpl,array(
 						'$nametext' => t('New album name: '),
 						'$nickname' => $a->data['user']['nickname'],
-						'$album' => template_escape($album),
+						'$album' => $album_e,
 						'$hexalbum' => bin2hex($album),
 						'$submit' => t('Submit'),
 						'$dropsubmit' => t('Delete Album')
@@ -1135,6 +1153,15 @@ function photos_content(&$a) {
 				
 				$ext = $phototypes[$rr['type']];
 
+				if($a->theme['template_engine'] === 'internal') {
+					$imgalt_e = template_escape($rr['filename']);
+					$desc_e = template_escape($rr['desc']);
+				}
+				else {
+					$imgalt_e = $rr['filename'];
+					$desc_e = $rr['desc'];
+				}
+
 				$o .= replace_macros($tpl,array(
 					'$id' => $rr['id'],
 					'$twist' => ' ' . $twist . rand(2,4),
@@ -1142,8 +1169,8 @@ function photos_content(&$a) {
 						. (($_GET['order'] === 'posted') ? '?f=&order=posted' : ''),
 					'$phototitle' => t('View Photo'),
 					'$imgsrc' => $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] . '.' .$ext,
-					'$imgalt' => template_escape($rr['filename']),
-					'$desc'=> template_escape($rr['desc'])
+					'$imgalt' => $imgalt_e,
+					'$desc'=> $desc_e
 				));
 
 		}
@@ -1344,20 +1371,32 @@ function photos_content(&$a) {
 		$edit = Null;
 		if(($cmd === 'edit') && ($can_post)) {
 			$edit_tpl = get_markup_template('photo_edit.tpl');
+
+			if($a->theme['template_engine'] === 'internal') {
+				$album_e = template_escape($ph[0]['album']);
+				$caption_e = template_escape($ph[0]['desc']);
+				$aclselect_e = template_escape(populate_acl($ph[0]));
+			}
+			else {
+				$album_e = $ph[0]['album'];
+				$caption_e = $ph[0]['desc'];
+				$aclselect_e = populate_acl($ph[0]);
+			}
+
 			$edit = replace_macros($edit_tpl, array(
 				'$id' => $ph[0]['id'],
 				'$rotatecw' => t('Rotate CW (right)'),
 				'$rotateccw' => t('Rotate CCW (left)'),
-				'$album' => template_escape($ph[0]['album']),
+				'$album' => $album_e,
 				'$newalbum' => t('New album name'), 
 				'$nickname' => $a->data['user']['nickname'],
 				'$resource_id' => $ph[0]['resource-id'],
 				'$capt_label' => t('Caption'),
-				'$caption' => template_escape($ph[0]['desc']),
+				'$caption' => $caption_e,
 				'$tag_label' => t('Add a Tag'),
 				'$tags' => $link_item['tag'],
 				'$permissions' => t('Permissions'),
-				'$aclselect' => template_escape(populate_acl($ph[0])),
+				'$aclselect' => $aclselect_e,
 				'$help_tags' => t('Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping'),
 				'$item_id' => ((count($linked_items)) ? $link_item['id'] : 0),
 				'$submit' => t('Submit'),
@@ -1488,14 +1527,25 @@ function photos_content(&$a) {
 						$drop = replace_macros(get_markup_template('photo_drop.tpl'), array('$id' => $item['id'], '$delete' => t('Delete')));
 
 
+					if($a->theme['template_engine'] === 'internal') {
+						$name_e = template_escape($profile_name);
+						$title_e = template_escape($item['title']);
+						$body_e = template_escape(bbcode($item['body']));
+					}
+					else {
+						$name_e = $profile_name;
+						$title_e = $item['title'];
+						$body_e = bbcode($item['body']);
+					}
+
 					$comments .= replace_macros($template,array(
 						'$id' => $item['item_id'],
 						'$profile_url' => $profile_link,
-						'$name' => template_escape($profile_name),
+						'$name' => $name_e,
 						'$thumb' => $profile_avatar,
 						'$sparkle' => $sparkle,
-						'$title' => template_escape($item['title']),
-						'$body' => template_escape(bbcode($item['body'])),
+						'$title' => $title_e,
+						'$body' => $body_e,
 						'$ago' => relative_date($item['created']),
 						'$indent' => (($item['parent'] != $item['item_id']) ? ' comment' : ''),
 						'$drop' => $drop,
@@ -1531,20 +1581,34 @@ function photos_content(&$a) {
 		}
 		
 		$photo_tpl = get_markup_template('photo_view.tpl');
+
+		if($a->theme['template_engine'] === 'internal') {
+			$album_e = array($album_link,template_escape($ph[0]['album']));
+			$tags_e = template_escape($tags);
+			$like_e = template_escape($like);
+			$dislike_e = template_escape($dislike);
+		}
+		else {
+			$album_e = array($album_link,$ph[0]['album']);
+			$tags_e = $tags;
+			$like_e = $like;
+			$dislike_e = $dislike;
+		}
+
 		$o .= replace_macros($photo_tpl, array(
 			'$id' => $ph[0]['id'],
-			'$album' => array($album_link,template_escape($ph[0]['album'])),
+			'$album' => $album_e,
 			'$tools' => $tools,
 			'$lock' => $lock,
 			'$photo' => $photo,
 			'$prevlink' => $prevlink,
 			'$nextlink' => $nextlink,
 			'$desc' => $ph[0]['desc'],
-			'$tags' => template_escape($tags),
+			'$tags' => $tags_e,
 			'$edit' => $edit,	
 			'$likebuttons' => $likebuttons,
-			'$like' => template_escape($like),
-			'$dislike' => template_escape($dislike),
+			'$like' => $like_e,
+			'$dislike' => $dikslike_e,
 			'$comments' => $comments,
 			'$paginate' => $paginate,
 		));
@@ -1588,16 +1652,25 @@ function photos_content(&$a) {
 				$twist = 'rotright';
 			$ext = $phototypes[$rr['type']];
 			
+			if($a->theme['template_engine'] === 'internal') {
+				$alt_e = template_escape($rr['filename']);
+				$name_e = template_escape($rr['album']);
+			}
+			else {
+				$alt_e = $rr['filename'];
+				$name_e = $rr['album'];
+			}
+
 			$photos[] = array(
 				'id'       => $rr['id'],
 				'twist'    => ' ' . $twist . rand(2,4),
 				'link'