Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements

fixes and tweaks to Smarty processing

diff --git a/boot.php b/boot.php
index 61479bc93ef6b1417ab62785667c1598351a3392..721fbe6e9dfb5833b08b0e1d903e5471caa4c4d6 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -622,7 +622,6 @@ 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
@@ -633,6 +632,7 @@ if(! class_exists('App')) {
                        else
                                $stylesheet = '$stylesheet';
 
+                       $tpl = get_markup_template('head.tpl');
                        $this->page['htmlhead'] = replace_macros($tpl,array(
                                '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!!
                                '$local_user' => local_user(),
@@ -1381,8 +1381,6 @@ if(! function_exists('profile_sidebar')) {
                }
 
 
-               $tpl = get_markup_template('profile_vcard.tpl');
-
                $p = array();
                foreach($profile as $k => $v) {
                        $k = str_replace('-','_',$k);
@@ -1392,6 +1390,7 @@ if(! function_exists('profile_sidebar')) {
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
 
+               $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, array(
                        '$profile' => $p,
                        '$connect'  => $connect,

diff --git a/include/text.php b/include/text.php
index 9b08765c11a3a57b00b1fc4019b8b3805a089157..d1fff85ea358f7cc866976063eefd3d09047e860 100644 (file)
--- a/include/text.php
+++ b/include/text.php
@@ -489,12 +489,12 @@ function get_template_file($a, $filename, $root = '') {
        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";
+       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
-               $template_file = $root . "view/$filename";
+               $template_file = "{$root}view/$filename";
 
        return $template_file;
 }}

diff --git a/mod/display.php b/mod/display.php
index 2e0b8216a4a7fc09316522177001aba54cef5f7d..5c23559c5c7495482855037833570070ad445238 100644 (file)
--- a/mod/display.php
+++ b/mod/display.php
@@ -4,8 +4,6 @@
 function display_init(&$a) {
 
        if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
-               notice( t('Public access denied.') . EOL);
-               killme();
                return;
        }
 
@@ -17,6 +15,11 @@ function display_init(&$a) {
 
 function display_content(&$a, $update = 0) {
 
+       if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
+               notice( t('Public access denied.') . EOL);
+               return;
+       }
+
        require_once("include/bbcode.php");
        require_once('include/security.php');
        require_once('include/conversation.php');

diff --git a/mod/group.php b/mod/group.php
index 13a899ed96aeb66a8fff1831c8b7aa5996129f05..cef4371e94e2448986bce90b03f4e32d0e507438 100644 (file)
--- a/mod/group.php
+++ b/mod/group.php
@@ -220,16 +220,15 @@ 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);
 
 }

diff --git a/mod/message.php b/mod/message.php
index 057797dddaebde38ec350e2e6c042d3ed6ee001f..885cdcd6294cb30d7aaaf8c83e82e3138e87ac5c 100644 (file)
--- a/mod/message.php
+++ b/mod/message.php
@@ -516,7 +516,7 @@ function message_content(&$a) {
                        '$to' => t('To:'),
                        '$showinputs' => '',
                        '$subject' => t('Subject:'),
-                       '$subjtxt' => template_escape($message['title']),
+                       '$subjtxt' => $subjtxt_e,
                        '$readonly' => ' readonly="readonly" style="background: #BBBBBB;" ',
                        '$yourmessage' => t('Your message:'),
                        '$text' => '',

diff --git a/mod/profiles.php b/mod/profiles.php
index 1fc1f484a3035e0043c6b9ef86a5d8df01a73cb5..f517478a1a381d52ebdd864a0cfd67e773539463 100644 (file)
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -6,8 +6,6 @@ function profiles_init(&$a) {
        nav_set_selected('profiles');
 
        if(! local_user()) {
-               notice( t('Permission denied.') . EOL);
-               killme();
                return;
        }
 
@@ -565,6 +563,11 @@ function profile_activity($changed, $value) {
 
 function profiles_content(&$a) {
 
+       if(! local_user()) {
+               notice( t('Permission denied.') . EOL);
+               return;
+       }
+
        $o = '';
 
        if(($a->argc > 1) && (intval($a->argv[1]))) {

diff --git a/object/Item.php b/object/Item.php
index 0ea9954b0a5a2489ad4c6f2228326ab7c5bbc734..e9f114b84d82d519da0c908c331aa5a2904a7e29 100644 (file)
--- a/object/Item.php
+++ b/object/Item.php
@@ -497,13 +497,7 @@ class Item extends BaseObject {
                        return false;
                }
 
-               if($a->theme['template_engine'] === 'smarty3') {
-                       $template_file = get_template_file($a, 'smarty3/' . $this->available_templates[$name]);
-               }
-               else {
-                       $template_file = $this->available_templates[$name];
-               }
-               $this->template = $template_file;
+               $this->template = $this->available_templates[$name];
        }
 
        /**

diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
index 69e3202c37d5623cd2429a5a5e8ad75a12ab181e..ecb342bf44b62a7dde3a4e29564e37b2f45f8a49 100644 (file)
--- a/view/contacts-template.tpl
+++ b/view/contacts-template.tpl
@@ -14,8 +14,8 @@
 $tabs
 
 
-{{ for $contacts as $c }}
-       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 

diff --git a/view/group_edit.tpl b/view/group_edit.tpl
index 35d298111891d96dcbc3e0572936dc72553b1928..2fa2b1a552a0a470a792057af020094accc22b55 100644 (file)
--- a/view/group_edit.tpl
+++ b/view/group_edit.tpl
@@ -15,9 +15,9 @@
 </div>
 
 
-{{ if $groupedit_info }}
+{{ if $groupeditor }}
        <div id="group-update-wrapper">
-               {{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
+               {{ inc groupeditor.tpl }}{{ endinc }}
        </div>
 {{ endif }}
 {{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}

diff --git a/view/mail_display.tpl b/view/mail_display.tpl
index 396aa46c0a945454e09eb1965b49b1240c0a93c7..b328d32a27691a20f80069e567c3ed938a38a5e6 100644 (file)
--- a/view/mail_display.tpl
+++ b/view/mail_display.tpl
@@ -1,6 +1,6 @@
 
-{{ for $mails as $mail_item }}
-       {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+{{ for $mails as $mail }}
+       {{ inc mail_conv.tpl }}{{endinc}}
 {{ endfor }}
 
 {{ if $canreply }}

diff --git a/view/nogroup-template.tpl b/view/nogroup-template.tpl
index f27f158f5ddc814cafdcc4c111b2cf50d7ed29fc..dd00ed097a4e6cdc9b28d35d11e93d99d4b70be6 100644 (file)
--- a/view/nogroup-template.tpl
+++ b/view/nogroup-template.tpl
@@ -1,7 +1,7 @@
 <h1>$header</h1>
 
-{{ for $contacts as $c }}
-       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 

diff --git a/view/photos_recent.tpl b/view/photos_recent.tpl
index 7ae35402454184f5785951bbf02dac1c881b749f..1df78cb7bed30bc4f2df3af7a197b4139f2bb0e5 100644 (file)
--- a/view/photos_recent.tpl
+++ b/view/photos_recent.tpl
@@ -4,8 +4,8 @@
 {{ endif }}
 
 <div class="photos">
-{{ for $photos as $ph }}
-       {{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
+{{ for $photos as $photo }}
+       {{ inc photo_top.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div class="photos-end"></div>

diff --git a/view/poco_xml.tpl b/view/poco_xml.tpl
index 394f6afcf815dda20099845cc82ed1a68ff78110..9549b695d1966450827081777daf2b3911fc4c39 100644 (file)
--- a/view/poco_xml.tpl
+++ b/view/poco_xml.tpl
@@ -9,8 +9,8 @@
 
 
 {{ if $response.totalResults }}
-{{ for $response.entry as $ent }}
-{{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
+{{ for $response.entry as $entry }}
+{{ inc poco_entry_xml.tpl }}{{ endinc }}
 {{ endfor }}
 {{ else }}
 <entry></entry>

diff --git a/view/smarty3/contacts-template.tpl b/view/smarty3/contacts-template.tpl
index 4ab0241a64e136f7c712f7b9948cb6914b6aac88..66f3f5c87bcef5654d2a0df9ed2bf6175e52dfd0 100644 (file)
--- a/view/smarty3/contacts-template.tpl
+++ b/view/smarty3/contacts-template.tpl
@@ -19,8 +19,8 @@
 {{$tabs}}
 
 
-{{foreach $contacts as $c}}
-       {{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 

diff --git a/view/smarty3/group_edit.tpl b/view/smarty3/group_edit.tpl
index a4b8f5906a83c4276f707dd7b8fd1752314f8ae7..b7b14eba37bbbf4dfa775c661a5c21d419c0c4f6 100644 (file)
--- a/view/smarty3/group_edit.tpl
+++ b/view/smarty3/group_edit.tpl
@@ -20,9 +20,9 @@
 </div>
 
 
-{{if $groupedit_info}}
+{{if $groupeditor}}
        <div id="group-update-wrapper">
-               {{include file="groupeditor.tpl" groupeditor=$groupedit_info}}
+               {{include file="groupeditor.tpl"}}
        </div>
 {{/if}}
 {{if $desc}}<div id="group-edit-desc">{{$desc}}</div>{{/if}}

diff --git a/view/smarty3/mail_display.tpl b/view/smarty3/mail_display.tpl
index 1e4c0c74de773a80bf568b2375420c3dd6d2ddb8..23d05bdeb8e2d63628aa00df9cd414bbd89d11f6 100644 (file)
--- a/view/smarty3/mail_display.tpl
+++ b/view/smarty3/mail_display.tpl
@@ -4,8 +4,8 @@
  *
  *}}
 
-{{foreach $mails as $mail_item}}
-       {{include file="mail_conv.tpl" mail=$mail_item}}
+{{foreach $mails as $mail}}
+       {{include file="mail_conv.tpl"}}
 {{/foreach}}
 
 {{if $canreply}}

diff --git a/view/smarty3/nogroup-template.tpl b/view/smarty3/nogroup-template.tpl
index dd045d7da11f1a63cbc27803267a70b29ee7c8cc..7d103a655b2d60932fa4418a5748c059a81f623d 100644 (file)
--- a/view/smarty3/nogroup-template.tpl
+++ b/view/smarty3/nogroup-template.tpl
@@ -5,8 +5,8 @@
  *}}
 <h1>{{$header}}</h1>
 
-{{foreach $contacts as $c}}
-       {{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
 

diff --git a/view/smarty3/photos_recent.tpl b/view/smarty3/photos_recent.tpl
index 8b890b1bd47cb8f2f1a317ec859e6225987b1f6a..cb2411df344ced70620e4ea38d886347295054d7 100644 (file)
--- a/view/smarty3/photos_recent.tpl
+++ b/view/smarty3/photos_recent.tpl
@@ -9,8 +9,8 @@
 {{/if}}
 
 <div class="photos">
-{{foreach $photos as $ph}}
-       {{include file="photo_top.tpl" photo=$ph}}
+{{foreach $photos as $photo}}
+       {{include file="photo_top.tpl"}}
 {{/foreach}}
 </div>
 <div class="photos-end"></div>

diff --git a/view/smarty3/poco_xml.tpl b/view/smarty3/poco_xml.tpl
index 90b6821f91b475771e5d94b64c869cfaf6382592..b8cd8fc081a0ef041102db5c0ecde80e13e9d982 100644 (file)
--- a/view/smarty3/poco_xml.tpl
+++ b/view/smarty3/poco_xml.tpl
@@ -14,8 +14,8 @@
 
 
 {{if $response.totalResults}}
-{{foreach $response.entry as $ent}}
-{{include file="poco_entry_xml.tpl" entry=$ent}}
+{{foreach $response.entry as $entry}}
+{{include file="poco_entry_xml.tpl"}}
 {{/foreach}}
 {{else}}
 <entry></entry>

diff --git a/view/smarty3/viewcontact_template.tpl b/view/smarty3/viewcontact_template.tpl
index 40283b8e9dd5d3e44ce4ab13a6f0351b50fc7093..a9837c7f9bc8a9d64167f529e4ca4213708a1690 100644 (file)
--- a/view/smarty3/viewcontact_template.tpl
+++ b/view/smarty3/viewcontact_template.tpl
@@ -5,8 +5,8 @@
  *}}
 <h3>{{$title}}</h3>
 
-{{foreach $contacts as $c}}
-       {{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
 {{/foreach}}
 
 <div id="view-contact-end"></div>

diff --git a/view/theme/diabook/mail_display.tpl b/view/theme/diabook/mail_display.tpl
index 5d16bd32bbf18620cb8d88cfcdaa27ba95268437..2b680ae428bfa1a7e8c573397595baa57c308265 100644 (file)
--- a/view/theme/diabook/mail_display.tpl
+++ b/view/theme/diabook/mail_display.tpl
@@ -3,9 +3,9 @@
        <a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{ for $mails as $mail_item }}
+{{ for $mails as $mail }}
        <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-               {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+               {{ inc mail_conv.tpl }}{{endinc}}
        </div>
 {{ endfor }}
 

diff --git a/view/theme/diabook/smarty3/mail_display.tpl b/view/theme/diabook/smarty3/mail_display.tpl
index b8c2aea5233cbaaebbef40d80b7838e8e4d44404..dc1fbbc6f5d30f3a15f59e76416c2a5fd536fe6e 100644 (file)
--- a/view/theme/diabook/smarty3/mail_display.tpl
+++ b/view/theme/diabook/smarty3/mail_display.tpl
@@ -8,9 +8,9 @@
        <a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{foreach $mails as $mail_item}}
+{{foreach $mails as $mail}}
        <div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-               {{include file="mail_conv.tpl" mail=$mail_item}}
+               {{include file="mail_conv.tpl"}}
        </div>
 {{/foreach}}
 

diff --git a/view/theme/frost-mobile/contacts-template.tpl b/view/theme/frost-mobile/contacts-template.tpl
index c7e3ca899dfbdc37fe4b3d84e2852eb071a55077..76254c1ca8209b446317818f3ad18899ea4ef858 100644 (file)
--- a/view/theme/frost-mobile/contacts-template.tpl
+++ b/view/theme/frost-mobile/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 <div id="contacts-display-wrapper">
-{{ for $contacts as $c }}
-       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>

diff --git a/view/theme/frost-mobile/smarty3/contacts-template.tpl b/view/theme/frost-mobile/smarty3/contacts-template.tpl
index 5ca4eb6a9422f3c5bb222245bd49f0a437e639cf..b9162c2e9eea8aa44ec21cfd558d5824d2f0a7c6 100644 (file)
--- a/view/theme/frost-mobile/smarty3/contacts-template.tpl
+++ b/view/theme/frost-mobile/smarty3/contacts-template.tpl
@@ -20,8 +20,8 @@
 
 
 <div id="contacts-display-wrapper">
-{{foreach $contacts as $c}}
-       {{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>

diff --git a/view/theme/frost/contacts-template.tpl b/view/theme/frost/contacts-template.tpl
index 326c9d78929cdf2b7d956ea5f17a891ea2214d47..de89b5371e592a242656ed7934e147fa3d1d9e44 100644 (file)
--- a/view/theme/frost/contacts-template.tpl
+++ b/view/theme/frost/contacts-template.tpl
@@ -15,8 +15,8 @@ $tabs
 
 
 <div id="contacts-display-wrapper">
-{{ for $contacts as $c }}
-       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>

diff --git a/view/theme/frost/smarty3/contacts-template.tpl b/view/theme/frost/smarty3/contacts-template.tpl
index b804db35a5128209c02d399a349dd3d93093d15d..de33d141bb02db7eac0a6a2231e79a3ee5220c4e 100644 (file)
--- a/view/theme/frost/smarty3/contacts-template.tpl
+++ b/view/theme/frost/smarty3/contacts-template.tpl
@@ -20,8 +20,8 @@
 
 
 <div id="contacts-display-wrapper">
-{{foreach $contacts as $c}}
-       {{include file="contact_template.tpl" contact=$c}}
+{{foreach $contacts as $contact}}
+       {{include file="contact_template.tpl"}}
 {{/foreach}}
 </div>
 <div id="contact-edit-end"></div>

diff --git a/view/theme/quattro/mail_display.tpl b/view/theme/quattro/mail_display.tpl
index 5d16bd32bbf18620cb8d88cfcdaa27ba95268437..2b680ae428bfa1a7e8c573397595baa57c308265 100644 (file)
--- a/view/theme/quattro/mail_display.tpl
+++ b/view/theme/quattro/mail_display.tpl
@@ -3,9 +3,9 @@
        <a href="message/dropconv/$thread_id" onclick="return confirmDelete();"  title="$delete" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{ for $mails as $mail_item }}
+{{ for $mails as $mail }}
        <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-               {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
+               {{ inc mail_conv.tpl }}{{endinc}}
        </div>
 {{ endfor }}
 

diff --git a/view/theme/quattro/smarty3/mail_display.tpl b/view/theme/quattro/smarty3/mail_display.tpl
index b8c2aea5233cbaaebbef40d80b7838e8e4d44404..dc1fbbc6f5d30f3a15f59e76416c2a5fd536fe6e 100644 (file)
--- a/view/theme/quattro/smarty3/mail_display.tpl
+++ b/view/theme/quattro/smarty3/mail_display.tpl
@@ -8,9 +8,9 @@
        <a href="message/dropconv/{{$thread_id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="mail-delete icon s22 delete"></a>
 </div>
 
-{{foreach $mails as $mail_item}}
+{{foreach $mails as $mail}}
        <div id="tread-wrapper-{{$mail_item.id}}" class="tread-wrapper">
-               {{include file="mail_conv.tpl" mail=$mail_item}}
+               {{include file="mail_conv.tpl"}}
        </div>
 {{/foreach}}
 

diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
index 714bf03fa75f7c98850d73202fde74d90012364e..d6f01643ea6893dbc88150e7d11e2febcdbe8a29 100644 (file)
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
@@ -1,7 +1,7 @@
 <h3>$title</h3>
 
-{{ for $contacts as $c }}
-       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
 {{ endfor }}
 
 <div id="view-contact-end"></div>