Merge pull request #562 from fermionic/20121225-smarty-includes-like-friendicas

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 736403ab440057acb3b014402c6d0efb920f1521..af3cc2494f6716c519cf14fe31866b95a53d5ab6 100644 (file)
--- a/boot.php
+++ b/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'];
                }
 
@@ -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,16 +1345,20 @@ if(! function_exists('profile_sidebar')) {
 
                $tpl = get_markup_template('profile_vcard.tpl');
 
+
+               if($a->theme['template_engine'] === 'internal')
+                       $location = template_escape($location);
+
                $o .= replace_macros($tpl, 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,
                ));
 
@@ -1914,3 +1939,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;
+               }
+       }
+}