X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=7bd0fec4db307377a1277990bc0add0cb2b349fb;hb=8cef0fa80d63e72fe0adb14aaa43eb9c23702a49;hp=023c5807c8a4bb40474198711b25d4746b0dee6c;hpb=a6b1275f16ab67a26ac1a4cc18cffd3d454b0940;p=friendica.git

diff --git a/boot.php b/boot.php
index 023c5807c8..7bd0fec4db 100644
--- a/boot.php
+++ b/boot.php
@@ -12,9 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.1.1559' );
+define ( 'FRIENDICA_VERSION',      '3.1.1572' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1157      );
+define ( 'DB_UPDATE_VERSION',      1159      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -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'];
 		}
 
@@ -954,8 +969,7 @@ if(! function_exists('login')) {
 			$a->module = 'login';
 		}
 
-
-		$o .= replace_macros($tpl,array(
+		$o .= replace_macros($tpl, array(
 
 			'$dest_url'     => $dest_url,
 			'$logout'       => t('Logout'),
@@ -974,6 +988,13 @@ if(! function_exists('login')) {
 	
 			'$lostpass'     => t('Forgot your password?'),
 			'$lostlink'     => t('Password Reset'),
+
+			'$tostitle'	=> t('Website Terms of Service'),
+			'$toslink'	=> t('terms of service'),
+
+			'$privacytitle'	=> t('Website Privacy Policy'),
+			'$privacylink'	=> t('privacy policy'),
+
 		));
 
 		call_hooks('login_hook',$o);
@@ -1324,11 +1345,20 @@ if(! function_exists('profile_sidebar')) {
 
 		$tpl = get_markup_template('profile_vcard.tpl');
 
+		$p = array();
+		foreach($profile as $k => $v) {
+			$k = str_replace('-','_',$k);
+			$p[$k] = $v;
+		}
+
+		if($a->theme['template_engine'] === 'internal')
+			$location = template_escape($location);
+
 		$o .= replace_macros($tpl, array(
-			'$profile' => $profile,
+			'$profile' => $p,
 			'$connect'  => $connect,
 			'$wallmessage' => $wallmessage,
-			'$location' => template_escape($location),
+			'$location' => $location,
 			'$gender'   => $gender,
 			'$pdesc'	=> $pdesc,
 			'$marital'  => $marital,
@@ -1914,3 +1944,18 @@ function clear_cache($basepath = "", $path = "") {
 		closedir($dh);
 	}
 }
+
+function set_template_engine(&$a, $engine = 'internal') {
+
+	$a->theme['template_engine'] = 'internal';
+
+	if(is_writable('view/smarty3/')) {
+		switch($engine) {
+			case 'smarty3':
+				$a->theme['template_engine'] = 'smarty3';
+				break;
+			default:
+				break;
+		}
+	}
+}