]> git.mxchange.org Git - friendica.git/commitdiff
simplify by making Smarty include directives behave like Friendica native ones
authorZach Prezkuta <fermion@gmx.com>
Tue, 25 Dec 2012 18:48:02 +0000 (11:48 -0700)
committerZach Prezkuta <fermion@gmx.com>
Tue, 25 Dec 2012 18:55:57 +0000 (11:55 -0700)
73 files changed:
boot.php
include/friendica_smarty.php
include/text.php
mod/admin.php
mod/contacts.php
mod/filer.php
mod/group.php
mod/install.php
mod/message.php
mod/nogroup.php
mod/notifications.php
mod/notify.php
mod/photos.php
mod/poco.php
mod/settings.php
mod/uimport.php
mod/viewcontacts.php
view/admin_logs.tpl
view/admin_remoteupdate.tpl
view/admin_site.tpl
view/api_friends_xml.tpl
view/api_timeline_xml.tpl
view/contact_edit.tpl
view/contacts-template.tpl
view/field.tpl
view/filer_dialog.tpl
view/group_edit.tpl
view/install_db.tpl
view/install_settings.tpl
view/intros.tpl
view/login.tpl
view/mail_display.tpl
view/nogroup-template.tpl
view/notifications.tpl
view/pagetypes.tpl
view/photos_recent.tpl
view/poco_xml.tpl
view/profile_vcard.tpl
view/settings.tpl
view/settings_connectors.tpl
view/settings_display.tpl
view/settings_features.tpl
view/settings_oauth_edit.tpl
view/suggestions.tpl
view/theme/cleanzero/config.php
view/theme/cleanzero/theme_settings.tpl
view/theme/diabook/communityhome.tpl
view/theme/diabook/config.php
view/theme/diabook/login.tpl
view/theme/diabook/mail_display.tpl
view/theme/diabook/profile_vcard.tpl
view/theme/diabook/theme.php
view/theme/diabook/theme_settings.tpl
view/theme/dispy/config.php
view/theme/dispy/profile_vcard.tpl
view/theme/duepuntozero/profile_vcard.tpl
view/theme/facepark/profile_vcard.tpl
view/theme/frost-mobile/admin_site.tpl
view/theme/frost-mobile/contacts-template.tpl
view/theme/frost-mobile/login.tpl
view/theme/frost-mobile/profile_vcard.tpl
view/theme/frost-mobile/settings.tpl
view/theme/frost/admin_site.tpl
view/theme/frost/contacts-template.tpl
view/theme/frost/login.tpl
view/theme/frost/profile_vcard.tpl
view/theme/quattro/config.php
view/theme/quattro/mail_display.tpl
view/theme/quattro/profile_vcard.tpl
view/theme/smoothly/login.tpl
view/theme/testbubble/profile_vcard.tpl
view/uimport.tpl
view/viewcontact_template.tpl

index d8bc174b4a25c8bb64ff85713d02e3f8367eda63..640fef5413b71f7a488a5109ef18f7f5c1cf00e7 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -969,16 +969,7 @@ if(! function_exists('login')) {
                        $a->module = 'login';
                }
 
-
-               $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(
+               $o .= replace_macros($tpl, array(
 
                        '$dest_url'     => $dest_url,
                        '$logout'       => t('Logout'),
@@ -997,6 +988,7 @@ if(! function_exists('login')) {
        
                        '$lostpass'     => t('Forgot your password?'),
                        '$lostlink'     => t('Password Reset'),
+
                ));
 
                call_hooks('login_hook',$o);
@@ -1348,15 +1340,10 @@ if(! function_exists('profile_sidebar')) {
                $tpl = get_markup_template('profile_vcard.tpl');
 
 
-               $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(
+               $o .= replace_macros($tpl, array(
                        '$profile' => $profile,
                        '$connect'  => $connect,
                        '$wallmessage' => $wallmessage,
index 2a294e9e240c19bdce6ea49841d962f9e436f404..9ad14ad8a4738e610e6c346ebb14a56ec1720b8b 100644 (file)
@@ -5,20 +5,24 @@ require_once("library/Smarty/libs/Smarty.class.php");
 class FriendicaSmarty extends Smarty {
 
        public $filename;
-       public $root;
 
        function __construct() {
                parent::__construct();
 
                $a = get_app();
+               $theme = current_theme();
 
-               //$this->root = $_SERVER['DOCUMENT_ROOT'] . '/';
-               $this->root = '';
+               // setTemplateDir can be set to an array, which Smarty will parse in order.
+               // The order is thus very important here
+               $template_dirs = array('theme' => "view/theme/$theme/smarty3/");
+               if( x($a->theme_info,"extends") )
+                       $template_dirs = $template_dirs + array('extends' => "view/theme/".$a->theme_info["extends"]."/smarty3/");
+               $template_dirs = $template_dirs + array('base' => 'view/smarty3/');
+               $this->setTemplateDir($template_dirs);
 
-               $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->setCompileDir('view/smarty3/compiled/');
+               $this->setConfigDir('view/smarty3/config/');
+               $this->setCacheDir('view/smarty3/cache/');
 
                $this->left_delimiter = $a->smarty3_ldelim;
                $this->right_delimiter = $a->smarty3_rdelim;
@@ -28,7 +32,7 @@ class FriendicaSmarty extends Smarty {
                if($template) {
                        return $this->fetch('string:' . $template);
                }
-               return $this->fetch('file:' . $this->root . $this->filename);
+               return $this->fetch('file:' . $this->filename);
        }
 }
 
index 0591390a84f5a628736ddb137d1f584a6ff2eeb6..58f69449f4cb3ecf0b2aa3728c8db82a75fd739d 100644 (file)
@@ -477,6 +477,7 @@ function get_markup_template($s, $root = '') {
 //             $tt = microtime() - $ts;
 //             $a->page['debug'] .= "$tt <br>\n";
 //             return $file_contents;
+//             logger($template_file);
                return file_get_contents($template_file);
        }       
 }}
@@ -499,21 +500,6 @@ function get_template_file($a, $filename, $root = '') {
        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;
-       }
-}}
-
 
 
 
index c951dd8b9cd7d4d1b3bb0f58fa9adc900f8e7ceb..0381fcf4cc136d53e9509abd2261fb84023678e0 100644 (file)
@@ -455,16 +455,7 @@ function admin_page_site(&$a) {
        );
 
        $t = get_markup_template("admin_site.tpl");
-
-       $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(
+       return replace_macros($t, array(
                '$title' => t('Administration'),
                '$page' => t('Site'),
                '$submit' => t('Submit'),
@@ -1144,14 +1135,7 @@ readable.");
                }
        }                       
 
-       $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(
+       return replace_macros($t, array(
                '$title' => t('Administration'),
                '$page' => t('Logs'),
                '$submit' => t('Submit'),
@@ -1210,14 +1194,7 @@ function admin_page_remoteupdate(&$a) {
        }
        
        $tpl = get_markup_template("admin_remoteupdate.tpl");
-
-       $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(
+       return replace_macros($tpl, array(
                '$baseurl' => $a->get_baseurl(true),
                '$submit' => t("Update now"),
                '$close' => t("Close"),
index 1a57afbf5ad0b21864cf4e7053192b8cc9b84984..6e62ec8ef5538595ba8e9dccbfdde48a883d7940 100644 (file)
@@ -346,12 +346,7 @@ 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!') : '');
 
-               $includes = array(
-                       '$field_checkbox' => 'field_checkbox.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl,$includes + array(
+               $o .= replace_macros($tpl, array(
                        '$header' => t('Contact Editor'),
                        '$tab_str' => $tab_str,
                        '$submit' => t('Submit'),
@@ -576,13 +571,7 @@ function contacts_content(&$a) {
        }
        
        $tpl = get_markup_template("contacts-template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl,$includes + array(
+       $o .= replace_macros($tpl, array(
                '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
                '$tabs' => $t,
                '$total' => $total,
index c811ba6e2fc9d43cd48b91e96196d61d01780e07..4e79f337dcff22502ac15d4c0673872253678312 100644 (file)
@@ -24,14 +24,9 @@ function filer_content(&$a) {
                $filetags = get_pconfig(local_user(),'system','filetags');
                $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,$includes + array(
+               $tpl = get_markup_template("filer_dialog.tpl");
+               $o = replace_macros($tpl, array(
                        '$field' => array('term', t("Save to Folder:"), '', '', $filetags, t('- select -')),
                        '$submit' => t('Save'),
                ));
index f5a37819ed92e7e44ec580a8006e95358095c555..13a899ed96aeb66a8fff1831c8b7aa5996129f05 100644 (file)
@@ -83,13 +83,7 @@ function group_content(&$a) {
 
        $tpl = get_markup_template('group_edit.tpl');
 
-       $includes = array(
-                       '$field_input' => 'field_input.tpl',
-                       '$groupeditortpl' => 'groupeditor.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $context = $includes + array(
+       $context = array(
                        '$submit' => t('Submit'),
        );
 
index ab6d7d204f7044b9a051b77ea262ba84917b2495..d4e04c1a9d4fd8f005a43cd01dbfd2022a789723 100755 (executable)
@@ -177,6 +177,8 @@ function install_content(&$a) {
 
                        check_htconfig($checks);
 
+                       check_smarty3($checks);
+
                        check_keys($checks);
                        
                        if(x($_POST,'phpath'))
@@ -220,14 +222,7 @@ function install_content(&$a) {
                        
 
                        $tpl = get_markup_template('install_db.tpl');
-
-                       $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(
+                       $o .= replace_macros($tpl, 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.'),
@@ -267,13 +262,7 @@ function install_content(&$a) {
                        $timezone = ((x($_POST,'timezone')) ? ($_POST['timezone']) : 'America/Los_Angeles');
                        
                        $tpl = get_markup_template('install_settings.tpl');
-
-                       $includes = array(
-                               '$field_input' => 'field_input.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl, $includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$title' => $install_title,
                                '$pass' => t('Site settings'),
 
@@ -441,6 +430,22 @@ function check_htconfig(&$checks) {
 
 }
 
+function check_smarty3(&$checks) {
+       $status = true;
+       $help = "";
+       if(     !is_writable('view/smarty3') ) {
+       
+               $status=false;
+               $help = t('Friendica uses the Smarty3 template engine to render its web views. Smarty3 compiles templates to PHP to speed up rendering.') .EOL;
+               $help .= t('In order to store these compiled templates, the web server needs to have write access to the directory view/smarty3/ under the Friendica top level folder.').EOL;
+               $help .= t('Please ensure that the user that your web server runs as (e.g. www-data) has write access to this folder.').EOL;
+               $help .= t('Note: as a security measure, you should give the web server write access to view/smarty3/ only--not the template files (.tpl) that it contains.').EOL; 
+       }
+    
+       check_add($checks, t('view/smarty3 is writable'), $status, true, $help);
+
+}
+
 function check_htaccess(&$checks) {
        $a = get_app();
        $status = true;
index 7ca3fba70af9e939b744ca45b9cdec7797162a22..26275ceab7165a4546552807356320e9a065e408 100644 (file)
@@ -497,12 +497,6 @@ function message_content(&$a) {
 
                $tpl = get_markup_template('mail_display.tpl');
 
-               $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']);
                }
@@ -510,7 +504,7 @@ function message_content(&$a) {
                        $subjtxt_e = $message['title'];
                }
 
-               $o = replace_macros($tpl, $includes + array(
+               $o = replace_macros($tpl, array(
                        '$thread_id' => $a->argv[1],
                        '$thread_subject' => $message['title'],
                        '$thread_seen' => $seen,
index 885ba62c6301e4358d3b027c093bf09892f62981..24d99a59b6c01a0c071828c0f6ce8ede42b93fc3 100644 (file)
@@ -55,13 +55,7 @@ function nogroup_content(&$a) {
        }
 
        $tpl = get_markup_template("nogroup-template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl,$includes + array(
+       $o .= replace_macros($tpl, array(
                '$header' => t('Contacts who are not members of a group'),
                '$contacts' => $contacts,
                '$paginate' => paginate($a),
index 03a39a268e59da896c3a74db5c3f0ba57a1f7bc2..128317eb473b5b5bf0d2c94a684bef4a23b4ea62 100644 (file)
@@ -145,12 +145,7 @@ function notifications_content(&$a) {
 
                                        $return_addr = bin2hex($a->user['nickname'] . '@' . $a->get_hostname() . (($a->path) ? '/' . $a->path : ''));
 
-                                       $includes = array(
-                                               '$field_checkbox' => 'field_checkbox.tpl',
-                                       );
-                                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                                       $notif_content .= replace_macros($sugg,$includes + array(
+                                       $notif_content .= replace_macros($sugg, array(
                                                '$str_notifytype' => t('Notification type: '),
                                                '$notify_type' => t('Friend Suggestion'),
                                                '$intro_id' => $rr['intro_id'],
@@ -196,12 +191,7 @@ function notifications_content(&$a) {
                                        ));
                                }                       
 
-                               $includes = array(
-                                       '$field_checkbox' => 'field_checkbox.tpl',
-                               );
-                               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                               $notif_content .= replace_macros($tpl,$includes + array(
+                               $notif_content .= replace_macros($tpl, array(
                                        '$str_notifytype' => t('Notification type: '),
                                        '$notify_type' => (($rr['network'] !== NETWORK_OSTATUS) ? t('Friend/Connect Request') : t('New Follower')),
                                        '$dfrn_text' => $dfrn_text,     
@@ -226,12 +216,7 @@ function notifications_content(&$a) {
                else
                        info( t('No introductions.') . EOL);
 
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Notifications'),
                        '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
@@ -317,12 +302,7 @@ function notifications_content(&$a) {
                        $notif_content = t('No more network notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Network Notifications'),
                        '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
@@ -352,12 +332,7 @@ function notifications_content(&$a) {
                        $notif_content .= t('No more system notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
                        '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
@@ -452,12 +427,7 @@ function notifications_content(&$a) {
                        $notif_content = t('No more personal notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Personal Notifications'),
                        '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
@@ -538,12 +508,7 @@ function notifications_content(&$a) {
                        $notif_content = t('No more home notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('Home Notifications'),
                        '$tabs_data' => $tabs,
                        '$notif_content' => $notif_content,
index 3abc1185cffc06eb3b44d2970b8f6de6595c30cd..6ff437a38c94b692f5d903a8c1455faf32666ab3 100644 (file)
@@ -61,12 +61,7 @@ function notify_content(&$a) {
                        $notif_content .= t('No more system notifications.');
                }
                
-               $includes = array(
-                       '$common_tabs' => 'common_tabs.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($notif_tpl,$includes + array(
+               $o .= replace_macros($notif_tpl, array(
                        '$notif_header' => t('System Notifications'),
                        '$tabs_data' => '', // $tabs,
                        '$notif_content' => $notif_content,
index 8ac4d8590371f1ed89da07f1d63221e261d7cc58..7035c66904897ffae8c1bcd407a2692b1ae2ee1d 100644 (file)
@@ -1679,13 +1679,7 @@ function photos_content(&$a) {
        }
        
        $tpl = get_markup_template('photos_recent.tpl'); 
-
-       $includes = array(
-               '$photo_top' => 'photo_top.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl,$includes + array(
+       $o .= replace_macros($tpl, array(
                '$title' => t('Recent Photos'),
                '$can_post' => $can_post,
                '$upload' => array(t('Upload New Photos'), $a->get_baseurl().'/photos/'.$a->data['user']['nickname'].'/upload'),
index abe2c8e35d715d2c8427a5203aa1923b8c0df786..ae5f0cef4e360991ccdadf1b5e8ba52bffb7ebdb 100644 (file)
@@ -147,13 +147,7 @@ function poco_init(&$a) {
 
        if($format === 'xml') {
                header('Content-type: text/xml');
-
-               $includes = array(
-                       '$poco_entry_xml' => 'poco_entry_xml.tpl'
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify($includes + array('$response' => $ret)));
+               echo replace_macros(get_markup_template('poco_xml.tpl'),array_xmlify(array('$response' => $ret)));
                http_status_exit(500);
        }
        if($format === 'json') {
index 09a45f832a44e0a4cd076095d52d54daa82f0aa2..dbdd40bc369294c045ac28f88351301e1205185d 100644 (file)
@@ -554,13 +554,7 @@ function settings_content(&$a) {
                
                if(($a->argc > 2) && ($a->argv[2] === 'add')) {
                        $tpl = get_markup_template("settings_oauth_edit.tpl");
-
-                       $includes = array(
-                               '$field_input' => 'field_input.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl, $includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$form_security_token' => get_form_security_token("settings_oauth"),
                                '$title'        => t('Add application'),
                                '$submit'       => t('Submit'),
@@ -586,13 +580,7 @@ function settings_content(&$a) {
                        $app = $r[0];
                        
                        $tpl = get_markup_template("settings_oauth_edit.tpl");
-
-                       $includes = array(
-                               '$field_input' => 'field_input.tpl',
-                       );
-                       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-                       $o .= replace_macros($tpl, $includes + array(
+                       $o .= replace_macros($tpl, array(
                                '$form_security_token' => get_form_security_token("settings_oauth"),
                                '$title'        => t('Add application'),
                                '$submit'       => t('Update'),
@@ -675,13 +663,7 @@ function settings_content(&$a) {
 
 
                $tpl = get_markup_template("settings_features.tpl");
-
-               $includes = array(
-                       '$field_yesno'  => 'field_yesno.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl, $includes + array(
+               $o .= replace_macros($tpl, array(
                        '$form_security_token' => get_form_security_token("settings_features"),
                        '$title'        => t('Additional Features'),
                        '$features' => $arr,
@@ -733,16 +715,7 @@ function settings_content(&$a) {
                }
        
 
-               $includes = array(
-                       '$field_checkbox' => 'field_checkbox.tpl',
-                       '$field_input' => 'field_input.tpl',
-                       '$field_select' => 'field_select.tpl',
-                       '$field_custom' => 'field_custom.tpl',
-                       '$field_password' => 'field_password.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o .= replace_macros($tpl, $includes + array(
+               $o .= replace_macros($tpl, array(
                        '$form_security_token' => get_form_security_token("settings_connectors"),
                        
                        '$title'        => t('Connector Settings'),
@@ -832,15 +805,7 @@ function settings_content(&$a) {
                }
                
                $tpl = get_markup_template("settings_display.tpl");
-
-               $includes = array(
-                       '$field_themeselect' => 'field_themeselect.tpl',
-                       '$field_checkbox' => 'field_checkbox.tpl',
-                       '$field_input' => 'field_input.tpl',
-               );
-               $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-               $o = replace_macros($tpl, $includes + array(
+               $o = replace_macros($tpl, array(
                        '$ptitle'       => t('Display Settings'),
                        '$form_security_token' => get_form_security_token("settings_display"),
                        '$submit'       => t('Submit'),
@@ -926,13 +891,7 @@ function settings_content(&$a) {
 
 
        $pageset_tpl = get_markup_template('pagetypes.tpl');
-
-       $includes = array(
-               '$field_radio' => 'field_radio.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $pagetype = replace_macros($pageset_tpl,$includes + array(
+       $pagetype = replace_macros($pageset_tpl, array(
                '$page_normal'  => array('page-flags', t('Normal Account Page'), PAGE_NORMAL, 
                                                                        t('This account is a normal personal profile'), 
                                                                        ($a->user['page-flags'] == PAGE_NORMAL)),
@@ -1053,17 +1012,7 @@ function settings_content(&$a) {
        require_once('include/group.php');
        $group_select = mini_group_select(local_user(),$a->user['def_gid']);
 
-       $includes = array(
-               '$field_password' => 'field_password.tpl',
-               '$field_input' => 'field_input.tpl',
-               '$field_custom' => 'field_custom.tpl',
-               '$field_checkbox' => 'field_checkbox.tpl',
-               '$field_yesno' => 'field_yesno.tpl',
-               '$field_intcheckbox' => 'field_intcheckbox.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($stpl,$includes + array(
+       $o .= replace_macros($stpl, array(
                '$ptitle'       => t('Account Settings'),
 
                '$submit'       => t('Submit'),
index d28198f69ab9baa7a08b90d71e77c628408f24b7..6cca08cdaff0bfb41cba5b6dbb6380e6bdd676ff 100644 (file)
@@ -60,13 +60,7 @@ function uimport_content(&$a) {
        \r
        \r
     $tpl = get_markup_template("uimport.tpl");\r
-\r
-       $includes = array(\r
-               '$field_custom' => 'field_custom.tpl',\r
-       );\r
-       $includes = set_template_includes($a->theme['template_engine'], $includes);\r
-\r
-    return replace_macros($tpl, $includes + array(\r
+    return replace_macros($tpl, array(\r
         '$regbutt' => t('Import'),\r
         '$import' => array(\r
             'title' => t("Move account"),\r
index f54a76be4c08f3abd8d64d8ed4939a935fc6cb26..8e261e71151d1e23e706ceabd89026779caa45c7 100644 (file)
@@ -72,13 +72,7 @@ function viewcontacts_content(&$a) {
 
 
        $tpl = get_markup_template("viewcontact_template.tpl");
-
-       $includes = array(
-               '$contact_template' => 'contact_template.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($tpl, $includes + array(
+       $o .= replace_macros($tpl, array(
                '$title' => t('View Contacts'),
                '$contacts' => $contacts,
                '$paginate' => paginate($a),
index db1b00c1121b0944cb5fdbe1826663ea9f43751e..b777cf420169d10529ac0bd5d44511c704af9f67 100644 (file)
@@ -4,9 +4,9 @@
        <form action="$baseurl/admin/logs" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_checkbox with $field=$debugging }}{{ endinc }}
-       {{ inc $field_input with $field=$logfile }}{{ endinc }}
-       {{ inc $field_select with $field=$loglevel }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$debugging }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$logfile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$loglevel }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_logs" value="$submit" /></div>
        
index 844cbad272ca47725a4001867d95cf28d2fb79d7..874c6e6267bddd416fac71d8360d51ba43fe0ce4 100644 (file)
                <h3>Your friendica installation is not writable by web server.</h3>
                {{ if $canftp }}
                        <p>You can try to update via FTP</p>
-                       {{ inc $field_input with $field=$ftphost }}{{ endinc }}
-                       {{ inc $field_input with $field=$ftppath }}{{ endinc }}
-                       {{ inc $field_input with $field=$ftpuser }}{{ endinc }}
-                       {{ inc $field_password with $field=$ftppwd }}{{ endinc }}
+                       {{ inc field_input.tpl with $field=$ftphost }}{{ endinc }}
+                       {{ inc field_input.tpl with $field=$ftppath }}{{ endinc }}
+                       {{ inc field_input.tpl with $field=$ftpuser }}{{ endinc }}
+                       {{ inc field_password.tpl with $field=$ftppwd }}{{ endinc }}
                        <div class="submit"><input type="submit" name="remoteupdate" value="$submit" /></div>
                {{ endif }}
        {{ endif }}
index 24cd12b0cb63dcc2889ecad4b3e1c21abccefe46..38d1fb8d043464f87f9b786a57fc5ec105799df1 100644 (file)
        <form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$new_share }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
 
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc $field_input with $field=$register_text }}{{ endinc }}
-       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
-       {{ inc $field_input with $field=$daily_registrations }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
-       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
-       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
-       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
-       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
-       {{ inc $field_input with $field=$lockpath }}{{ endinc }}
-       {{ inc $field_input with $field=$temppath }}{{ endinc }}
-       {{ inc $field_input with $field=$basepath }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
 
        <h3>$performance</h3>
-       {{ inc $field_checkbox with $field=$use_fulltext_engine }}{{ endinc }}
-       {{ inc $field_input with $field=$itemcache }}{{ endinc }}
-       {{ inc $field_input with $field=$itemcache_duration }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
 
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
index 1cabd295dad2a09f3095018eae74bed23f96c772..9bdf53222d5c85287bddeed767292d817d542e2a 100644 (file)
@@ -2,6 +2,6 @@
 
 <users type="array">
        {{for $users as $u }}
-       {{inc $api_user_xml with $user=$u }}{{endinc}}
+       {{inc api_user_xml.tpl with $user=$u }}{{endinc}}
        {{endfor}}
 </users>
index df55d807ad9cb7c5ef80903f909e7d3715b2d63c..4a32b411b58ae613919e80d115e5635b15516c23 100644 (file)
@@ -10,7 +10,7 @@
   <in_reply_to_screen_name>$status.in_reply_to_screen_name</in_reply_to_screen_name>
   <geo>$status.geo</geo>
   <favorited>$status.favorited</favorited>
-{{ inc $api_user_xml with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
+{{ inc api_user_xml.tpl with $user=$status.user }}{{ endinc }}  <statusnet:html>$status.statusnet_html</statusnet:html>
   <statusnet:conversation_id>$status.statusnet_conversation_id</statusnet:conversation_id>
   <url>$status.url</url>
   <coordinates>$status.coordinates</coordinates>
index a11e252b4a31071c0cc1f985f8f98f103378efe0..c68ca7f1db67ef33ac15f27421729a65fbeb61cc 100644 (file)
@@ -65,7 +65,7 @@
        {{ endif }}
        <div id="contact-edit-end" ></div>
 
-       {{inc $field_checkbox with $field=$hidden }}{{endinc}}
+       {{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
 
 <div id="contact-edit-info-wrapper">
 <h4>$lbl_info1</h4>
index efd426bba3a2ad1412a0c60d3b7cb5a01af2fa8f..69e3202c37d5623cd2429a5a5e8ad75a12ab181e 100644 (file)
@@ -15,7 +15,7 @@ $tabs
 
 
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
index 6119ccf22ba394179854d862412cb9901e1c7268..35f5afd39cad089d2a48616bef96eda44295b401 100644 (file)
@@ -1,4 +1,4 @@
 
  {{ if $field.0==select }}
- {{ inc $field_select }}{{ endinc }}
+ {{ inc field_select.tpl }}{{ endinc }}
  {{ endif }}
index f7a253ba50b20e8ff4285facf30b00bf579f75a9..ae837d6b744d493f1112ddd6843c0a82c1a182c1 100644 (file)
@@ -1,4 +1,4 @@
-{{ inc $field_combobox }}{{ endinc }}
+{{ inc field_combobox.tpl }}{{ endinc }}
 <div class="settings-submit-wrapper" >
        <input id="filer_save" type="button" class="settings-submit" value="$submit" />
 </div>
index d60a1b0f97a6c1ff616ddefdf6a9864c9643884c..35d298111891d96dcbc3e0572936dc72553b1928 100644 (file)
@@ -5,7 +5,7 @@
        <form action="group/$gid" id="group-edit-form" method="post" >
                <input type='hidden' name='form_security_token' value='$form_security_token'>
                
-               {{ inc $field_input with $field=$gname }}{{ endinc }}
+               {{ inc field_input.tpl with $field=$gname }}{{ endinc }}
                {{ if $drop }}$drop{{ endif }}
                <div id="group-edit-submit-wrapper" >
                        <input type="submit" name="submit" value="$submit" >
@@ -17,7 +17,7 @@
 
 {{ if $groupedit_info }}
        <div id="group-update-wrapper">
-               {{ inc $groupeditortpl with $groupeditor=$groupedit_info }}{{ endinc }}
+               {{ inc groupeditor.tpl with $groupeditor=$groupedit_info }}{{ endinc }}
        </div>
 {{ endif }}
 {{ if $desc }}<div id="group-edit-desc">$desc</div>{{ endif }}
index bf17256ebf84c3130196b36d73afd22960ec8087..1302b5a708a18ba8a0386782438c4bbf9a76268b 100644 (file)
@@ -18,10 +18,10 @@ $info_03
 <input type="hidden" name="phpath" value="$phpath" />
 <input type="hidden" name="pass" value="3" />
 
-{{ inc $field_input with $field=$dbhost }}{{endinc}}
-{{ inc $field_input with $field=$dbuser }}{{endinc}}
-{{ inc $field_password with $field=$dbpass }}{{endinc}}
-{{ inc $field_input with $field=$dbdata }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbhost }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbuser }}{{endinc}}
+{{ inc field_password.tpl with $field=$dbpass }}{{endinc}}
+{{ inc field_input.tpl with $field=$dbdata }}{{endinc}}
 
 
 <input id="install-submit" type="submit" name="submit" value="$submit" /> 
index 453e2e5cc3fb7566d20bc7e89c7b1e0623f12196..05b87f904e72ad363160e0b9bbe8d43dba991d89 100644 (file)
@@ -16,7 +16,7 @@
 <input type="hidden" name="dbdata" value="$dbdata" />
 <input type="hidden" name="pass" value="4" />
 
-{{ inc $field_input with $field=$adminmail }}{{endinc}}
+{{ inc field_input.tpl with $field=$adminmail }}{{endinc}}
 $timezone
 
 <input id="install-submit" type="submit" name="submit" value="$submit" /> 
index 2dd684079d3dbf74be908937478b4dea102c8491..e7fd53ca4f7504e3791aabb3b1e69e95a3788852 100644 (file)
@@ -14,8 +14,8 @@
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="dfrn_confirm" method="post">
-{{inc $field_checkbox with $field=$hidden }}{{endinc}}
-{{inc $field_checkbox with $field=$activity }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$activity }}{{endinc}}
 <input type="hidden" name="dfrn_id" value="$dfrn_id" >
 <input type="hidden" name="intro_id" value="$intro_id" >
 <input type="hidden" name="contact_id" value="$contact_id" >
index 21ed66a66b99adfe1b8153498a0d69483f16f40c..297b36c9ac8cde502d7892c3790f3670d285930d 100644 (file)
@@ -3,17 +3,17 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
 
-       {{ inc $field_checkbox with $field=$lremember }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
 
        <div id="login-extra-links">
                {{ if $register }}<a href="register" title="$register.title" id="register-link">$register.desc</a>{{ endif }}
index 1b569428b3e7d27a885d78a91cd69ee00676c26f..bc3cd5b7999ea4036fd69d33c7bddf52304da7d5 100644 (file)
@@ -1,10 +1,10 @@
 
 {{ for $mails as $mail_item }}
-       {{ inc $mail_conv with $mail=$mail_item }}{{endinc}}
+       {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
 {{ endfor }}
 
 {{ if $canreply }}
-{{ inc $prv_message with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }}
 {{ else }}
 $unknown_text
 {{endif }}
index be5976ebad06e7c666071714949bc794beb1bf33..f27f158f5ddc814cafdcc4c111b2cf50d7ed29fc 100644 (file)
@@ -1,7 +1,7 @@
 <h1>$header</h1>
 
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 <div id="contact-edit-end"></div>
 
index d6671be57cac7050b4634e9ac1bcc636b5e95694..d6ce0cdd967dbdc09e03c20ded2a1def189ec84d 100644 (file)
@@ -1,7 +1,7 @@
 
 <h1>$notif_header</h1>
 
-{{ inc $common_tabs with $tabs=$tabs_data }}{{ endinc }}
+{{ inc common_tabs.tpl with $tabs=$tabs_data }}{{ endinc }}
 
 <div class="notif-network-wrapper">
        $notif_content
index 2e169c2fc3d95b3154a863a41c7284ccaf01272e..c9022a1c1498b1bdc261f04a1b3d237f2b3bc998 100644 (file)
@@ -1,5 +1,5 @@
-       {{inc $field_radio with $field=$page_normal }}{{endinc}}
-       {{inc $field_radio with $field=$page_community }}{{endinc}}
-       {{inc $field_radio with $field=$page_prvgroup }}{{endinc}}
-       {{inc $field_radio with $field=$page_soapbox }}{{endinc}}
-       {{inc $field_radio with $field=$page_freelove }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_normal }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_community }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_prvgroup }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_soapbox }}{{endinc}}
+       {{inc field_radio.tpl with $field=$page_freelove }}{{endinc}}
index 1a70b6e59be94372270bc0eab1b7d321a4e54967..7ae35402454184f5785951bbf02dac1c881b749f 100644 (file)
@@ -5,7 +5,7 @@
 
 <div class="photos">
 {{ for $photos as $ph }}
-       {{ inc $photo_top with $photo=$ph }}{{ endinc }}
+       {{ inc photo_top.tpl with $photo=$ph }}{{ endinc }}
 {{ endfor }}
 </div>
 <div class="photos-end"></div>
index e115c706aa9afcd12ada52de375748942c1b0755..394f6afcf815dda20099845cc82ed1a68ff78110 100644 (file)
@@ -10,7 +10,7 @@
 
 {{ if $response.totalResults }}
 {{ for $response.entry as $ent }}
-{{ inc $poco_entry_xml with $entry=$ent }}{{ endinc }}
+{{ inc poco_entry_xml.tpl with $entry=$ent }}{{ endinc }}
 {{ endfor }}
 {{ else }}
 <entry></entry>
index cf6a9f718c8b5e27fc3c47cd0ed608c74a6edaa6..cf3d73a544fe1d82693bfb1fab01622a71364fd0 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 46e4228ded344d3506b51ceb8efb122ecc567ab3..bebd0c12a85df299645ec07f007a6d0cbb5cd86f 100644 (file)
@@ -7,11 +7,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_pass</h3>
 
-{{inc $field_password with $field=$password1 }}{{endinc}}
-{{inc $field_password with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
 {{ if $oid_enable }}
-{{inc $field_input with $field=$openid }}{{endinc}}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
 {{ endif }}
 
 <div class="settings-submit-wrapper" >
@@ -21,11 +21,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_basic</h3>
 
-{{inc $field_input with $field=$username }}{{endinc}}
-{{inc $field_input with $field=$email }}{{endinc}}
-{{inc $field_custom with $field=$timezone }}{{endinc}}
-{{inc $field_input with $field=$defloc }}{{endinc}}
-{{inc $field_checkbox with $field=$allowloc }}{{endinc}}
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -38,7 +38,7 @@ $nickname_block
 
 <input type="hidden" name="visibility" value="$visibility" />
 
-{{inc $field_input with $field=$maxreq }}{{endinc}}
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
 $profile_in_dir
 
@@ -57,9 +57,9 @@ $suggestme
 $unkmail
 
 
-{{inc $field_input with $field=$cntunkmail }}{{endinc}}
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
-{{inc $field_input with $field=$expire.days }}{{endinc}}
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
 
 
 <div class="field input">
@@ -67,10 +67,10 @@ $unkmail
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>$expire.advanced</h3>
-                       {{ inc $field_yesno with $field=$expire.items }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.notes }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.starred }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.network_only }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
                </div>
        </div>
 
@@ -108,22 +108,22 @@ $group_select
 
 <div id="settings-activity-desc">$activity_options</div>
 
-{{inc $field_checkbox with $field=$post_newfriend }}{{endinc}}
-{{inc $field_checkbox with $field=$post_joingroup }}{{endinc}}
-{{inc $field_checkbox with $field=$post_profilechange }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
 <div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
-{{inc $field_intcheckbox with $field=$notify1 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify2 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify3 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify4 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify5 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify6 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify7 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify8 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify8 }}{{endinc}}
 </div>
 
 </div>
index 0a1c509869539d628390bd54d5a19831f425967b..bd3d60f0f4bc5273f14536fcd20f9a89015cb9eb 100644 (file)
@@ -14,16 +14,16 @@ $settings_connectors
        <div class="settings-block">
        <h3 class="settings-heading">$h_imap</h3>
        <p>$imap_desc</p>
-       {{inc $field_custom with $field=$imap_lastcheck }}{{endinc}}
-       {{inc $field_input with $field=$mail_server }}{{endinc}}
-       {{inc $field_input with $field=$mail_port }}{{endinc}}
-       {{inc $field_select with $field=$mail_ssl }}{{endinc}}
-       {{inc $field_input with $field=$mail_user }}{{endinc}}
-       {{inc $field_password with $field=$mail_pass }}{{endinc}}
-       {{inc $field_input with $field=$mail_replyto }}{{endinc}}
-       {{inc $field_checkbox with $field=$mail_pubmail }}{{endinc}}
-       {{inc $field_select with $field=$mail_action }}{{endinc}}
-       {{inc $field_input with $field=$mail_movetofolder }}{{endinc}}
+       {{inc field_custom.tpl with $field=$imap_lastcheck }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_server }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_port }}{{endinc}}
+       {{inc field_select.tpl with $field=$mail_ssl }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_user }}{{endinc}}
+       {{inc field_password.tpl with $field=$mail_pass }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_replyto }}{{endinc}}
+       {{inc field_checkbox.tpl with $field=$mail_pubmail }}{{endinc}}
+       {{inc field_select.tpl with $field=$mail_action }}{{endinc}}
+       {{inc field_input.tpl with $field=$mail_movetofolder }}{{endinc}}
 
        <div class="settings-submit-wrapper" >
                <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="$submit" />
index f2c1faef58843b5c703489405e45088786885c10..24fc1102706fe9bc36d2fda10edfcaf840aec6d3 100644 (file)
@@ -3,11 +3,11 @@
 <form action="settings/display" id="settings-form" method="post" autocomplete="off" >
 <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-{{inc $field_themeselect with $field=$theme }}{{endinc}}
-{{inc $field_themeselect with $field=$mobile_theme }}{{endinc}}
-{{inc $field_input with $field=$ajaxint }}{{endinc}}
-{{inc $field_input with $field=$itemspage_network }}{{endinc}}
-{{inc $field_checkbox with $field=$nosmile}}{{endinc}}
+{{inc field_themeselect.tpl with $field=$theme }}{{endinc}}
+{{inc field_themeselect.tpl with $field=$mobile_theme }}{{endinc}}
+{{inc field_input.tpl with $field=$ajaxint }}{{endinc}}
+{{inc field_input.tpl with $field=$itemspage_network }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
index 4065d8fc77cb004ba67e448ce96434cd2ca6233d..1b106d4111a82ada261200e322e78658dbc0e8db 100644 (file)
@@ -8,7 +8,7 @@
 <h3 class="settings-heading">$f.0</h3>
 
 {{ for $f.1 as $fcat }}
-       {{ inc $field_yesno with $field=$fcat }}{{endinc}}
+       {{ inc field_yesno.tpl with $field=$fcat }}{{endinc}}
 {{ endfor }}
 {{ endfor }}
 
index 514e4ef252ac4861e5da3aaff6d208929ff6e394..e6f2abdc24b48c7e197fde4652c7f7661cb42002 100644 (file)
@@ -3,11 +3,11 @@
 <form method="POST">
 <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-{{ inc $field_input with $field=$name }}{{ endinc }}
-{{ inc $field_input with $field=$key }}{{ endinc }}
-{{ inc $field_input with $field=$secret }}{{ endinc }}
-{{ inc $field_input with $field=$redirect }}{{ endinc }}
-{{ inc $field_input with $field=$icon }}{{ endinc }}
+{{ inc field_input.tpl with $field=$name }}{{ endinc }}
+{{ inc field_input.tpl with $field=$key }}{{ endinc }}
+{{ inc field_input.tpl with $field=$secret }}{{ endinc }}
+{{ inc field_input.tpl with $field=$redirect }}{{ endinc }}
+{{ inc field_input.tpl with $field=$icon }}{{ endinc }}
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="$submit" />
index cab2ba83aeec6c93ca57ca623f32b07dd311db2d..656336496c0b6be7248d3ad0f0ce8efd1bd36f61 100644 (file)
@@ -14,7 +14,7 @@
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="$request" method="get">
-{{inc $field_checkbox with $field=$hidden }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$hidden }}{{endinc}}
 <input class="intro-submit-approve" type="submit" name="submit" value="$approve" />
 </form>
 </div>
index a81b05b8fed1971add5f8ab15504309e77f1bf98..88a41be3a16e7f71a8bf910a544aa28e149bfe5e 100644 (file)
@@ -75,15 +75,8 @@ function cleanzero_form(&$a, $color,$font_size,$resize,$theme_width){
                "wide"=>"wide",
                );
 
-//     $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index b2dbf9fec77fc8ed22057da46efd08ff3439032f..bfe18af27d9e3445fec331440f6d3ed84a71600b 100644 (file)
@@ -1,7 +1,7 @@
-{{inc $field_select with $field=$color}}{{endinc}}
-{{inc $field_select with $field=$font_size}}{{endinc}}
-{{inc $field_select with $field=$resize}}{{endinc}}
-{{inc $field_select with $field=$theme_width}}{{endinc}}
+{{inc field_select.tpl with $field=$color}}{{endinc}}
+{{inc field_select.tpl with $field=$font_size}}{{endinc}}
+{{inc field_select.tpl with $field=$resize}}{{endinc}}
+{{inc field_select.tpl with $field=$theme_width}}{{endinc}}
 
 
 <div class="settings-submit-wrapper">
index e140bff3000c6b2f340a7a5cde9925126df855fe..dda674f75b77493e137c2b365aa05370a77a3c13 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="twittersettings" style="display:none">
 <form id="twittersettingsform" action="network" method="post" >
-{{inc $field_input with $field=$TSearchTerm}}{{endinc}}
+{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
 <div class="settings-submit-wrapper">
 <input id="twittersub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-sub"></input>
 </div>
@@ -13,9 +13,9 @@
 <div id="layermanager" style="width: 350px;position: relative;float: right;right:20px;height: 300px;"></div>
 <div id="map2" style="height:350px;width:350px;"></div>
 <div id="mouseposition" style="width: 350px;"></div>
-{{inc $field_input with $field=$ELZoom}}{{endinc}}
-{{inc $field_input with $field=$ELPosX}}{{endinc}}
-{{inc $field_input with $field=$ELPosY}}{{endinc}}
+{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
+{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
+{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
 <div class="settings-submit-wrapper">
 <input id="mapsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-map-sub"></input>
 </div>
@@ -35,16 +35,16 @@ just contact me, if you are intesrested in joining</p>
 <div id="boxsettings" style="display:none">
 <form id="boxsettingsform" action="network" method="post" >
 <fieldset><legend>$boxsettings.title.1</legend>
-{{inc $field_select with $field=$close_pages}}{{endinc}}
-{{inc $field_select with $field=$close_profiles}}{{endinc}}
-{{inc $field_select with $field=$close_helpers}}{{endinc}}
-{{inc $field_select with $field=$close_services}}{{endinc}}
-{{inc $field_select with $field=$close_friends}}{{endinc}}
-{{inc $field_select with $field=$close_lastusers}}{{endinc}}
-{{inc $field_select with $field=$close_lastphotos}}{{endinc}}
-{{inc $field_select with $field=$close_lastlikes}}{{endinc}}
-{{inc $field_select with $field=$close_twitter}}{{endinc}}
-{{inc $field_select with $field=$close_mapquery}}{{endinc}}
+{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
+{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
+{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_services}}{{endinc}}
+{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
+{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
+{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
 <div class="settings-submit-wrapper">
 <input id="boxsub" type="submit" value="$sub" class="settings-submit" name="diabook-settings-box-sub"></input>
 </div>
index 5ea024ec5e7297c18a733af244d65fd4d0d1ce24..e0f579180103770e4308eccfab443841f77263f8 100644 (file)
@@ -147,16 +147,8 @@ function diabook_form(&$a, $font_size, $line_height, $resolution, $color, $TSear
 
 
 
-//     $t = file_get_contents( dirname(__file__). "/theme_settings.tpl" );
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-               '$field_input' => 'field_input.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index dc9c51682a1211fef483b4b05b13ed33522bb90a..efa7c2d6dde35776ae6d4661e64a4e8c1e383fa3 100644 (file)
@@ -3,13 +3,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
        
index fa69f48a0098d274eba362fd0fbee27e4950edae..3dd0b64e77bac9b9452588a27b3290274946f921 100644 (file)
@@ -5,8 +5,8 @@
 
 {{ for $mails as $mail_item }}
        <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-               {{ inc $mail_conv with $mail=$mail_item }}{{endinc}}
+               {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
        </div>
 {{ endfor }}
 
-{{ inc $prv_message with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }}
index 7afe59f7e9072720d40c7bc5ffdc9b37f156939c..ccde72af964483b1360378e91fdefb71522e733c 100644 (file)
@@ -48,7 +48,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index becf1584e60ba2bd71ea4bcdcde4e6ade11e0dbb..6a1109118412105a0330980d384c27dd35606a40 100644 (file)
@@ -656,21 +656,16 @@ if ($color=="dark") $color_path = "/diabook-dark/";
                set_pconfig(local_user(), 'diabook', 'close_lastlikes', $_POST['diabook_close_lastlikes']);
                }
        }
-   $close = t('Settings');
-   $aside['$close'] = $close;
-   //get_baseurl
-   $url = $a->get_baseurl($ssl_state);
-   $aside['$url'] = $url;
-       //print right_aside
-       $tpl = get_markup_template('communityhome.tpl');
+       $close = t('Settings');
+       $aside['$close'] = $close;
 
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-               '$field_input' => 'field_input.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
+       //get_baseurl
+       $url = $a->get_baseurl($ssl_state);
+       $aside['$url'] = $url;
 
-       $a->page['right_aside'] = replace_macros($tpl, $includes + $aside);
+       //print right_aside
+       $tpl = get_markup_template('communityhome.tpl');
+       $a->page['right_aside'] = replace_macros($tpl, $aside);
 
  }
 
index 4bf2abb9b1f1352c20436a5b4fadb10bf4dea68e..ad024dfe998f033384abf3234db9768f800eae88 100644 (file)
@@ -1,33 +1,33 @@
-{{inc $field_select with $field=$color}}{{endinc}}
+{{inc field_select.tpl with $field=$color}}{{endinc}}
 
-{{inc $field_select with $field=$font_size}}{{endinc}}
+{{inc field_select.tpl with $field=$font_size}}{{endinc}}
 
-{{inc $field_select with $field=$line_height}}{{endinc}}
+{{inc field_select.tpl with $field=$line_height}}{{endinc}}
 
-{{inc $field_select with $field=$resolution}}{{endinc}}
+{{inc field_select.tpl with $field=$resolution}}{{endinc}}
 
 <div class="settings-submit-wrapper">
        <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
 </div>
 <br>
 <h3>Show/hide boxes at right-hand column</h3>
-{{inc $field_select with $field=$close_pages}}{{endinc}}
-{{inc $field_select with $field=$close_profiles}}{{endinc}}
-{{inc $field_select with $field=$close_helpers}}{{endinc}}
-{{inc $field_select with $field=$close_services}}{{endinc}}
-{{inc $field_select with $field=$close_friends}}{{endinc}}
-{{inc $field_select with $field=$close_lastusers}}{{endinc}}
-{{inc $field_select with $field=$close_lastphotos}}{{endinc}}
-{{inc $field_select with $field=$close_lastlikes}}{{endinc}}
-{{inc $field_select with $field=$close_twitter}}{{endinc}}
-{{inc $field_input with $field=$TSearchTerm}}{{endinc}}
-{{inc $field_select with $field=$close_mapquery}}{{endinc}}
-
-{{inc $field_input with $field=$ELPosX}}{{endinc}}
-
-{{inc $field_input with $field=$ELPosY}}{{endinc}}
-
-{{inc $field_input with $field=$ELZoom}}{{endinc}}
+{{inc field_select.tpl with $field=$close_pages}}{{endinc}}
+{{inc field_select.tpl with $field=$close_profiles}}{{endinc}}
+{{inc field_select.tpl with $field=$close_helpers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_services}}{{endinc}}
+{{inc field_select.tpl with $field=$close_friends}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastusers}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastphotos}}{{endinc}}
+{{inc field_select.tpl with $field=$close_lastlikes}}{{endinc}}
+{{inc field_select.tpl with $field=$close_twitter}}{{endinc}}
+{{inc field_input.tpl with $field=$TSearchTerm}}{{endinc}}
+{{inc field_select.tpl with $field=$close_mapquery}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELPosX}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELPosY}}{{endinc}}
+
+{{inc field_input.tpl with $field=$ELZoom}}{{endinc}}
 
 <div class="settings-submit-wrapper">
        <input type="submit" value="$submit" class="settings-submit" name="diabook-settings-submit" />
index 78166312dca8e1efaf1a6283127cd527943bdbad..628d5eefa0169e3ee868d6e621a4f953189d99e7 100644 (file)
@@ -66,13 +66,7 @@ function dispy_form(&$a, $font_size, $line_height, $colour) {
        );
 
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index ac19ad935b8f74acf448a71c9d34788535a480e1..70b68447a3c7497520ce091b81c68edee53f8148 100644 (file)
@@ -67,7 +67,7 @@
     target="external-link">$profile.homepage</a></span>
     </div>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index c36f0d54a8054e0bcd74fe3a522b55eeca024ae3..fa0c0a5afeadb5317654dd478579d2eebd52780f 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index b8e52e5f6bd0361aab8f5fc410c03c27fe370d9d..ee73460fc2970fc6b227386871f2fecf666fcd6d 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 9fd18e40753564a82c18a906924c699a8f0425f2..087de4f7dbca41328d27d5e91872b0730e657309 100644 (file)
@@ -5,55 +5,55 @@
        <form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc $field_input with $field=$register_text }}{{ endinc }}
-       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
        
-       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
-       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
-       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
-       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
-       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
index b148fb4a6965b245426297756ee61a2c97252ebe..c7e3ca899dfbdc37fe4b3d84e2852eb071a55077 100644 (file)
@@ -16,7 +16,7 @@ $tabs
 
 <div id="contacts-display-wrapper">
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
index 2d1fd856b207d681805a1ffc91951a60f0ff4c51..05ae364c00d497f747bb10406d3704f035a7bdf3 100644 (file)
@@ -4,13 +4,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
 
@@ -21,7 +21,7 @@
        </div>-->
 
        <br />
-       {{ inc $field_checkbox with $field=$lremember }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
 
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="$login" />
index c36f0d54a8054e0bcd74fe3a522b55eeca024ae3..fa0c0a5afeadb5317654dd478579d2eebd52780f 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index f82d672cdf84c30495fa731617064ea92115f333..5a40b96bca5c114a1a5fdc4454990bd6b7ca7ab8 100644 (file)
@@ -7,11 +7,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_pass</h3>
 
-{{inc $field_password with $field=$password1 }}{{endinc}}
-{{inc $field_password with $field=$password2 }}{{endinc}}
+{{inc field_password.tpl with $field=$password1 }}{{endinc}}
+{{inc field_password.tpl with $field=$password2 }}{{endinc}}
 
 {{ if $oid_enable }}
-{{inc $field_input with $field=$openid }}{{endinc}}
+{{inc field_input.tpl with $field=$openid }}{{endinc}}
 {{ endif }}
 
 <div class="settings-submit-wrapper" >
@@ -21,11 +21,11 @@ $nickname_block
 
 <h3 class="settings-heading">$h_basic</h3>
 
-{{inc $field_input with $field=$username }}{{endinc}}
-{{inc $field_input with $field=$email }}{{endinc}}
-{{inc $field_custom with $field=$timezone }}{{endinc}}
-{{inc $field_input with $field=$defloc }}{{endinc}}
-{{inc $field_checkbox with $field=$allowloc }}{{endinc}}
+{{inc field_input.tpl with $field=$username }}{{endinc}}
+{{inc field_input.tpl with $field=$email }}{{endinc}}
+{{inc field_custom.tpl with $field=$timezone }}{{endinc}}
+{{inc field_input.tpl with $field=$defloc }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}}
 
 
 <div class="settings-submit-wrapper" >
@@ -38,7 +38,7 @@ $nickname_block
 
 <input type="hidden" name="visibility" value="$visibility" />
 
-{{inc $field_input with $field=$maxreq }}{{endinc}}
+{{inc field_input.tpl with $field=$maxreq }}{{endinc}}
 
 $profile_in_dir
 
@@ -57,9 +57,9 @@ $suggestme
 $unkmail
 
 
-{{inc $field_input with $field=$cntunkmail }}{{endinc}}
+{{inc field_input.tpl with $field=$cntunkmail }}{{endinc}}
 
-{{inc $field_input with $field=$expire.days }}{{endinc}}
+{{inc field_input.tpl with $field=$expire.days }}{{endinc}}
 
 
 <div class="field input">
@@ -67,10 +67,10 @@ $unkmail
        <div style="display: none;">
                <div id="advanced-expire-popup" style="width:auto;height:auto;overflow:auto;">
                        <h3>$expire.advanced</h3>
-                       {{ inc $field_yesno with $field=$expire.items }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.notes }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.starred }}{{endinc}}
-                       {{ inc $field_yesno with $field=$expire.network_only }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.items }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.notes }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.starred }}{{endinc}}
+                       {{ inc field_yesno.tpl with $field=$expire.network_only }}{{endinc}}
                </div>
        </div>
 
@@ -108,21 +108,21 @@ $group_select
 
 <div id="settings-activity-desc">$activity_options</div>
 
-{{inc $field_checkbox with $field=$post_newfriend }}{{endinc}}
-{{inc $field_checkbox with $field=$post_joingroup }}{{endinc}}
-{{inc $field_checkbox with $field=$post_profilechange }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_newfriend }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_joingroup }}{{endinc}}
+{{inc field_checkbox.tpl with $field=$post_profilechange }}{{endinc}}
 
 
 <div id="settings-notify-desc">$lbl_not</div>
 
 <div class="group">
-{{inc $field_intcheckbox with $field=$notify1 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify2 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify3 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify4 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify5 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify6 }}{{endinc}}
-{{inc $field_intcheckbox with $field=$notify7 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify1 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify2 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify3 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify4 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify5 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify6 }}{{endinc}}
+{{inc field_intcheckbox.tpl with $field=$notify7 }}{{endinc}}
 </div>
 
 </div>
index 90f1190e9d480d4db89e5ca14066d4a4fc68a8bb..1ae6aba80d8b6158213f03054dcbef1dbac8d231 100644 (file)
@@ -5,55 +5,66 @@
        <form action="$baseurl/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='$form_security_token'>
 
-       {{ inc $field_input with $field=$sitename }}{{ endinc }}
-       {{ inc $field_textarea with $field=$banner }}{{ endinc }}
-       {{ inc $field_select with $field=$language }}{{ endinc }}
-       {{ inc $field_select with $field=$theme }}{{ endinc }}
-       {{ inc $field_select with $field=$theme_mobile }}{{ endinc }}
-       {{ inc $field_select with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$sitename }}{{ endinc }}
+       {{ inc field_textarea.tpl with $field=$banner }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$language }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$theme_mobile }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$ssl_policy }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$new_share }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$registration</h3>
-       {{ inc $field_input with $field=$register_text }}{{ endinc }}
-       {{ inc $field_select with $field=$register_policy }}{{ endinc }}
-       {{ inc $field_input with $field=$daily_registrations }}{{ endinc }}     
-       {{ inc $field_checkbox with $field=$no_multi_reg }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_openid }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_regfullname }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$register_text }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$register_policy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$daily_registrations }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_multi_reg }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_openid }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_regfullname }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
 
        <h3>$upload</h3>
-       {{ inc $field_input with $field=$maximagesize }}{{ endinc }}
-       {{ inc $field_input with $field=$maximagelength }}{{ endinc }}
-       {{ inc $field_input with $field=$jpegimagequality }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagesize }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maximagelength }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$jpegimagequality }}{{ endinc }}
        
        <h3>$corporate</h3>
-       {{ inc $field_input with $field=$allowed_sites }}{{ endinc }}
-       {{ inc $field_input with $field=$allowed_email }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$block_public }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$force_publish }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$no_community_page }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$ostatus_disabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$diaspora_enabled }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$dfrn_only }}{{ endinc }}
-       {{ inc $field_input with $field=$global_directory }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$thread_allow }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$newuser_private }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_sites }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$allowed_email }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$block_public }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$force_publish }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_community_page }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$ostatus_disabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$diaspora_enabled }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$dfrn_only }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$global_directory }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$thread_allow }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$newuser_private }}{{ endinc }}
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
        <h3>$advanced</h3>
-       {{ inc $field_checkbox with $field=$no_utf }}{{ endinc }}
-       {{ inc $field_checkbox with $field=$verifyssl }}{{ endinc }}
-       {{ inc $field_input with $field=$proxy }}{{ endinc }}
-       {{ inc $field_input with $field=$proxyuser }}{{ endinc }}
-       {{ inc $field_input with $field=$timeout }}{{ endinc }}
-       {{ inc $field_input with $field=$delivery_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$poll_interval }}{{ endinc }}
-       {{ inc $field_input with $field=$maxloadavg }}{{ endinc }}
-       {{ inc $field_input with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$no_utf }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$verifyssl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxy }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$proxyuser }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$timeout }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$delivery_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$poll_interval }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$maxloadavg }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$abandon_days }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lockpath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$temppath }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$basepath }}{{ endinc }}
+
+       <h3>$performance</h3>
+       {{ inc field_checkbox.tpl with $field=$use_fulltext_engine }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$itemcache_duration }}{{ endinc }}
+
        
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
        
index b148fb4a6965b245426297756ee61a2c97252ebe..c7e3ca899dfbdc37fe4b3d84e2852eb071a55077 100644 (file)
@@ -16,7 +16,7 @@ $tabs
 
 <div id="contacts-display-wrapper">
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 </div>
 <div id="contact-edit-end"></div>
index 1ba66ba1e6a94ecc9003b4e216038cabf868ebd6..af315ac5e596d317b5007e766c270d04a15ae543 100644 (file)
@@ -4,14 +4,14 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-       {{ inc $field_input with $field=$lname }}{{ endinc }}
-       {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+       {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
        
        {{ if $openid }}
                        <br /><br />
                        <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                        </div>
        {{ endif }}
 
@@ -21,7 +21,7 @@
        </div>-->
 
        <br /><br />
-       {{ inc $field_checkbox with $field=$lremember }}{{ endinc }}
+       {{ inc field_checkbox.tpl with $field=$lremember }}{{ endinc }}
 
        <div id="login-submit-wrapper" >
                <input type="submit" name="submit" id="login-submit-button" value="$login" />
index c36f0d54a8054e0bcd74fe3a522b55eeca024ae3..fa0c0a5afeadb5317654dd478579d2eebd52780f 100644 (file)
@@ -31,7 +31,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
 
        <div id="profile-vcard-break"></div>    
        <div id="profile-extra-links">
index 32179dd9e2b0214cb5d0c1ec8dd4fc6743a790c4..db4356ccc887698b17a559a64355546d2cbf5031 100644 (file)
@@ -60,13 +60,7 @@ function quattro_form(&$a, $align, $color, $tfs, $pfs){
     if ($pfs===false) $pfs="12";
     
        $t = get_markup_template("theme_settings.tpl" );
-
-       $includes = array(
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o .= replace_macros($t, $includes + array(
+       $o .= replace_macros($t, array(
                '$submit' => t('Submit'),
                '$baseurl' => $a->get_baseurl(),
                '$title' => t("Theme settings"),
index fa69f48a0098d274eba362fd0fbee27e4950edae..3dd0b64e77bac9b9452588a27b3290274946f921 100644 (file)
@@ -5,8 +5,8 @@
 
 {{ for $mails as $mail_item }}
        <div id="tread-wrapper-$mail_item.id" class="tread-wrapper">
-               {{ inc $mail_conv with $mail=$mail_item }}{{endinc}}
+               {{ inc mail_conv.tpl with $mail=$mail_item }}{{endinc}}
        </div>
 {{ endfor }}
 
-{{ inc $prv_message with $reply=$reply_info }}{{ endinc }}
+{{ inc prv_message.tpl with $reply=$reply_info }}{{ endinc }}
index 373b47a4f062963f911ebace67c71d2064d184ec..3ea6adfcc193f15f95c2ee98bd25bd2ee7ef0d93 100644 (file)
@@ -49,7 +49,7 @@
         class="homepage-label">$homepage</dt><dd class="homepage-url"><a
         href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index 3cf1f25934e5ed83b07a3706b7b891b3496ee540..281890f4236f5e1d1a0e76bf2936c5ffe9eea901 100644 (file)
@@ -5,13 +5,13 @@
        <input type="hidden" name="auth-params" value="login" />
 
        <div id="login_standard">
-               {{ inc $field_input with $field=$lname }}{{ endinc }}
-               {{ inc $field_password with $field=$lpassword }}{{ endinc }}
+               {{ inc field_input.tpl with $field=$lname }}{{ endinc }}
+               {{ inc field_password.tpl with $field=$lpassword }}{{ endinc }}
        </div>
 
        {{ if $openid }}
                <div id="login_openid">
-                       {{ inc $field_openid with $field=$lopenid }}{{ endinc }}
+                       {{ inc field_openid.tpl with $field=$lopenid }}{{ endinc }}
                </div>
        {{ endif }}
 
index 06f7ed86024eefe53fbe4abf9d9b1c465b89f336..44d0d60e2b86684574759c6eb9d9fd03f086762d 100644 (file)
@@ -29,7 +29,7 @@
 
        {{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
 
-       {{ inc $diaspora_vcard with $diaspora=$diaspora_info }}{{ endinc }}
+       {{ inc diaspora_vcard.tpl with $diaspora=$diaspora_info }}{{ endinc }}
        
        <div id="profile-extra-links">
                <ul>
index fed8e898a4cc91f892ee7d66def99be704ede02b..8950c8b5413891ca9d47333d3b19c30e3bf157ed 100644 (file)
@@ -3,7 +3,7 @@
     <p>$import.intro</p>\r
     <p>$import.instruct</p>\r
     <p><b>$import.warn</b></p>\r
-     {{inc $field_custom with $field=$import.field }}{{ endinc }}\r
+     {{inc field_custom.tpl with $field=$import.field }}{{ endinc }}\r
      \r
      \r
        <div id="register-submit-wrapper">\r
index be4676f06965a0b21552fd57be5dbaa6749f8cce..714bf03fa75f7c98850d73202fde74d90012364e 100644 (file)
@@ -1,7 +1,7 @@
 <h3>$title</h3>
 
 {{ for $contacts as $c }}
-       {{ inc $contact_template with $contact=$c }}{{ endinc }}
+       {{ inc contact_template.tpl with $contact=$c }}{{ endinc }}
 {{ endfor }}
 
 <div id="view-contact-end"></div>