revert addon Smarty3 templates to non-variable-based includes

diff --git a/altpager.tgz b/altpager.tgz
index 87bb2f8fc2306b3d89eb6d3572f56e673a388904..fbfd5594954d81a03e5007215e4d0637883ac40e 100644 (file)
Binary files a/altpager.tgz and b/altpager.tgz differ

diff --git a/altpager/altpager.php b/altpager/altpager.php
index ddb6d3520cc76f2418423be7324fac89ba4e5f20..c6f537bd45aa785343350ae1f24173f3dc437621 100755 (executable)
--- a/altpager/altpager.php
+++ b/altpager/altpager.php
@@ -94,13 +94,7 @@ function altpager_settings(&$a,&$s) {
 
 function altpager_plugin_admin(&$a, &$o){
        $t = get_markup_template( "admin.tpl", "addon/altpager/" );
- 
-       $includes = array(
-               '$field_radio' => 'field_radio.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o = replace_macros($t, $includes + array(
+       $o = replace_macros($t, array(
                '$submit' => t('Submit'),
                '$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'),  get_config('alt_pager', 'global') == 1),
                '$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'),  get_config('alt_pager', 'global') == 0)

diff --git a/altpager/view/admin.tpl b/altpager/view/admin.tpl
old mode 100755 (executable)
new mode 100644 (file)
index 1176db4..6055880
--- a/altpager/view/admin.tpl
+++ b/altpager/view/admin.tpl
@@ -1,3 +1,3 @@
-{{ inc $field_radio with $field=$global }}{{ endinc }}
-{{ inc $field_radio with $field=$individual }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/altpager/view/smarty3/admin.tpl b/altpager/view/smarty3/admin.tpl
index 50780231879b08e177561f1ee73a0aa15aa1c1db..e67afd737cc8359b8ec1987c7672a835b5538cfa 100644 (file)
--- a/altpager/view/smarty3/admin.tpl
+++ b/altpager/view/smarty3/admin.tpl
@@ -1,3 +1,3 @@
-{{include file="file:{{$field_radio}}" field=$global}}
-{{include file="file:{{$field_radio}}" field=$individual}}
+{{include file="field_radio.tpl" field=$global}}
+{{include file="field_radio.tpl" field=$individual}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/blackout.tgz b/blackout.tgz
index 4b5a5d312d391537ef64ea909cf8ecdcffe15f0c..6d081dc4a55b5fdc050e9cb87f99d9a47af05ac8 100644 (file)
Binary files a/blackout.tgz and b/blackout.tgz differ

diff --git a/blackout/blackout.php b/blackout/blackout.php
index 4c2a74b6de3aadc57bf83a72e31881eb6f27aadf..834956114e4db95385b98e22603847d785ca645b 100644 (file)
--- a/blackout/blackout.php
+++ b/blackout/blackout.php
@@ -95,12 +95,7 @@ function blackout_plugin_admin(&$a, &$o) {
     if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
     $t = get_markup_template( "admin.tpl", "addon/blackout/" );
  
-       $includes = array(
-               '$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'),
         '$rurl' => array("rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"),
         '$startdate' => array("startdate", "Begin of the Blackout<br />(YYYY-MM-DD hh:mm)", $mystart, "format is <em>YYYY</em> year, <em>MM</em> month, <em>DD</em> day, <em>hh</em> hour and <em>mm</em> minute"),

diff --git a/blackout/view/admin.tpl b/blackout/view/admin.tpl
index e19bd246ac74cb45c462ad4ba3faea3471d019b6..25922193ddedde3e17dcd9de8043d649615191c5 100644 (file)
--- a/blackout/view/admin.tpl
+++ b/blackout/view/admin.tpl
@@ -1,6 +1,6 @@
-{{ inc $field_input with $field=$startdate }}{{ endinc }}
-{{ inc $field_input with $field=$enddate }}{{ endinc }}
-{{ inc $field_input with $field=$rurl }}{{ endinc }}
+{{ inc field_input.tpl with $field=$startdate }}{{ endinc }}
+{{ inc field_input.tpl with $field=$enddate }}{{ endinc }}
+{{ inc field_input.tpl with $field=$rurl }}{{ endinc }}
 
 <div style="border: 2px solid #f00; padding: 10px; margin:
 10px;font-size: 1.2em;"><strong>Note</strong>: The redirect will be active from the moment you

diff --git a/blackout/view/smarty3/admin.tpl b/blackout/view/smarty3/admin.tpl
index f77a594846344d8ff4ea3d57a055f5dff8e15312..11a4d9140edbf4b0f060e6b56de5d137d44752d2 100644 (file)
--- a/blackout/view/smarty3/admin.tpl
+++ b/blackout/view/smarty3/admin.tpl
@@ -1,6 +1,6 @@
-{{include file="file:{{$field_input}}" field=$startdate}}
-{{include file="file:{{$field_input}}" field=$enddate}}
-{{include file="file:{{$field_input}}" field=$rurl}}
+{{include file="field_input.tpl" field=$startdate}}
+{{include file="field_input.tpl" field=$enddate}}
+{{include file="field_input.tpl" field=$rurl}}
 
 <div style="border: 2px solid #f00; padding: 10px; margin:
 10px;font-size: 1.2em;"><strong>Note</strong>: The redirect will be active from the moment you

diff --git a/communityhome.tgz b/communityhome.tgz
index 20f7b9642c0e676d43f9143eb52e1df174bde2ff..71f1f8e30f3e38731dbf8efd496e65f82623ba94 100755 (executable)
Binary files a/communityhome.tgz and b/communityhome.tgz differ

diff --git a/forumdirectory.tgz b/forumdirectory.tgz
index 09fcb4ce9db4189b230611884834b684a24cae94..249cd22645f56aa842c15b68551b885e89cfbc55 100644 (file)
Binary files a/forumdirectory.tgz and b/forumdirectory.tgz differ

diff --git a/fromgplus.tgz b/fromgplus.tgz
index 712019e45ab9d7971e278cef2534c7f78ea72950..0a402b7657a8cd0a3007b443006230416981e847 100644 (file)
Binary files a/fromgplus.tgz and b/fromgplus.tgz differ

diff --git a/gravatar.tgz b/gravatar.tgz
index 25106f2658a5c407d184214ee68f1aa089ad7ae5..561c4aaecc00a7c3a8518f328814358b2e513f88 100644 (file)
Binary files a/gravatar.tgz and b/gravatar.tgz differ

diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php
index a0b5a02b3ff3c4c72c845b22730aa018a2718163..12a8e44f2932670c17bb5eb536c38d775099122e 100644 (file)
--- a/gravatar/gravatar.php
+++ b/gravatar/gravatar.php
@@ -91,13 +91,7 @@ function gravatar_plugin_admin (&$a, &$o) {
 
        // output Gravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
-
-       $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'),
                '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars),
                '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings),

diff --git a/gravatar/view/admin.tpl b/gravatar/view/admin.tpl
index b187e1ea46208897e5cb1e7499ccc248e307d9e4..83144e432119f4be145dcbff31f1557da85c168e 100644 (file)
--- a/gravatar/view/admin.tpl
+++ b/gravatar/view/admin.tpl
@@ -1,3 +1,3 @@
-{{ inc $field_select with $field=$default_avatar}}{{ endinc }}
-{{ inc $field_select with $field=$rating }}{{ endinc }}
+{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
+{{ inc field_select.tpl with $field=$rating }}{{ endinc }}
 <div class="submit"><input type="submit" value="$submit" /></div>

diff --git a/gravatar/view/smarty3/admin.tpl b/gravatar/view/smarty3/admin.tpl
index 30d760afddf2171aa774db346d097578aeaeeab4..5dfd4488ef03d5b27b42ae654b91e85831fe2358 100644 (file)
--- a/gravatar/view/smarty3/admin.tpl
+++ b/gravatar/view/smarty3/admin.tpl
@@ -1,3 +1,3 @@
-{{include file="file:{{$field_select}}" field=$default_avatar}}
-{{include file="file:{{$field_select}}" field=$rating}}
+{{include file="field_select.tpl" field=$default_avatar}}
+{{include file="field_select.tpl" field=$rating}}
 <div class="submit"><input type="submit" value="{{$submit}}" /></div>

diff --git a/impressum.tgz b/impressum.tgz
index 8c36df6f2b4afa2bdd1a5c080103f3375cb73389..b47b625cf743a9c32a4caa45007446970cc45c63 100755 (executable)
Binary files a/impressum.tgz and b/impressum.tgz differ

diff --git a/impressum/impressum.php b/impressum/impressum.php
index 305dd9a9452b2ce7df11acef10f1d6644cb31c0a..3c1106c9a9761cf056ae63258c871ccafbdb9cc7 100755 (executable)
--- a/impressum/impressum.php
+++ b/impressum/impressum.php
@@ -79,14 +79,7 @@ function impressum_plugin_admin_post (&$a) {
 }
 function impressum_plugin_admin (&$a, &$o) {
     $t = get_markup_template( "admin.tpl", "addon/impressum/" );
-
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-               '$field_textarea' => 'field_textarea.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-    $o = replace_macros($t, $includes + array(
+    $o = replace_macros($t, array(
         '$submit' => t('Submit'),
         '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')),
         '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')),

diff --git a/impressum/view/admin.tpl b/impressum/view/admin.tpl
old mode 100755 (executable)
new mode 100644 (file)
index e365113..901df73
--- a/impressum/view/admin.tpl
+++ b/impressum/view/admin.tpl
@@ -1,7 +1,7 @@
-{{ inc $field_input with $field=$owner }}{{ endinc }}
-{{ inc $field_input with $field=$ownerprofile }}{{ endinc }}
-{{ inc $field_textarea with $field=$postal }}{{ endinc }}
-{{ inc $field_textarea with $field=$notes }}{{ endinc }}
-{{ inc $field_input with $field=$email }}{{ endinc }}
-{{ inc $field_textarea with $field=$footer_text }}{{ endinc }}
+{{ inc field_input.tpl with $field=$owner }}{{ endinc }}
+{{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }}
+{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }}
+{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }}
+{{ inc field_input.tpl with $field=$email }}{{ endinc }}
+{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/impressum/view/smarty3/admin.tpl b/impressum/view/smarty3/admin.tpl
index a3b0ef272fc7e0d8be2ce57afb548c553496afcb..80b678241ff756d4552257269293a94b3ae2d8d6 100644 (file)
--- a/impressum/view/smarty3/admin.tpl
+++ b/impressum/view/smarty3/admin.tpl
@@ -1,7 +1,7 @@
-{{include file="file:{{$field_input}}" field=$owner}}
-{{include file="file:{{$field_input}}" field=$ownerprofile}}
-{{include file="file:{{$field_textarea}}" field=$postal}}
-{{include file="file:{{$field_textarea}}" field=$notes}}
-{{include file="file:{{$field_input}}" field=$email}}
-{{include file="file:{{$field_textarea}}" field=$footer_text}}
+{{include file="field_input.tpl" field=$owner}}
+{{include file="field_input.tpl" field=$ownerprofile}}
+{{include file="field_textarea.tpl" field=$postal}}
+{{include file="field_textarea.tpl" field=$notes}}
+{{include file="field_input.tpl" field=$email}}
+{{include file="field_textarea.tpl" field=$footer_text}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/libravatar.tgz b/libravatar.tgz
index 0405af9bd532c8ec17112fcbbd3b92d65f07ead8..d61f63bafb394b797b18708f861695ff5cd5af27 100644 (file)
Binary files a/libravatar.tgz and b/libravatar.tgz differ

diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php
index c966052f75508d8e218a72f67fb1e7ecd6d58fa3..8cbf1e980a611fae3332c58bb127072e7f93350d 100644 (file)
--- a/libravatar/libravatar.php
+++ b/libravatar/libravatar.php
@@ -95,13 +95,7 @@ function libravatar_plugin_admin (&$a, &$o) {
 
        // output Libravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">';
- 
-       $includes = array(
-               '$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'),
                '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars),
        ));

diff --git a/libravatar/view/admin.tpl b/libravatar/view/admin.tpl
index 01b113c4b78d61de4dd1b112508da872c4b5512c..814f4a44af2da66d9addadd1df144f790fd94aa4 100644 (file)
--- a/libravatar/view/admin.tpl
+++ b/libravatar/view/admin.tpl
@@ -1,2 +1,2 @@
-{{ inc $field_select with $field=$default_avatar}}{{ endinc }}
+{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
 <div class="submit"><input type="submit" value="$submit" /></div>

diff --git a/libravatar/view/smarty3/admin.tpl b/libravatar/view/smarty3/admin.tpl
index 4e930a74381c381b3267a9d5fb13a61ac30b7601..ee958287a0ede1080dec5acaca0547bc3911f89c 100644 (file)
--- a/libravatar/view/smarty3/admin.tpl
+++ b/libravatar/view/smarty3/admin.tpl
@@ -1,2 +1,2 @@
-{{include file="file:{{$field_select}}" field=$default_avatar}}
+{{include file="field_select.tpl" field=$default_avatar}}
 <div class="submit"><input type="submit" value="{{$submit}}" /></div>

diff --git a/mathjax.tgz b/mathjax.tgz
index 37bfbf616cfff3024c206cfe7fbe8caec319ee62..a340aee4799954fc0fb5c9e128f91dd868b14700 100644 (file)
Binary files a/mathjax.tgz and b/mathjax.tgz differ

diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php
index 33cdd43938af54c5c86b874100396779f85d8328..e57d69bf54f6db84fdbca972622c4d319aea31d2 100644 (file)
--- a/mathjax/mathjax.php
+++ b/mathjax/mathjax.php
@@ -71,12 +71,7 @@ function mathjax_plugin_admin (&$a, &$o) {
                set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML');
        }
 
-       $includes = array(
-               '$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(
                '$baseurl' => array('baseurl', t('MathJax Base URL'), get_config('mathjax','baseurl' ), t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')),
        ));
 }

diff --git a/mathjax/view/admin.tpl b/mathjax/view/admin.tpl
index ed60d734991f903de8080fb789e2e4db3593a07b..1c723cddd8d1b794631d8039906bba1175db7aa4 100644 (file)
--- a/mathjax/view/admin.tpl
+++ b/mathjax/view/admin.tpl
@@ -1,2 +1,2 @@
-{{ inc $field_input with $field=$baseurl }}{{endinc }}
+{{ inc field_input.tpl with $field=$baseurl }}{{endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/mathjax/view/smarty3/admin.tpl b/mathjax/view/smarty3/admin.tpl
index 8d0388ca0abc0e7f7d53b86c25b2c96d71e80a69..f6ec03e0d5fd04a24222bbddba97699f7b315e3e 100644 (file)
--- a/mathjax/view/smarty3/admin.tpl
+++ b/mathjax/view/smarty3/admin.tpl
@@ -1,2 +1,2 @@
-{{include file="file:{{$field_input}}" field=$baseurl}}
+{{include file="field_input.tpl" field=$baseurl}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/openstreetmap.tgz b/openstreetmap.tgz
index c195d151cbcb66c49f95f39d2a8c0a13967fe5c5..967b56017b7e109cf26897381ebb1083ecf3b628 100644 (file)
Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ

diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php
index bf6632539e05eede6e3f01bc44c36d684c18347a..cb9abcd7df691117f281210dbbdf782b5582ea00 100755 (executable)
--- a/openstreetmap/openstreetmap.php
+++ b/openstreetmap/openstreetmap.php
@@ -58,7 +58,6 @@ function openstreetmap_location($a, &$item) {
 
 
 function openstreetmap_plugin_admin (&$a, &$o) {
-#      $t = file_get_contents( dirname(__file__)."/admin.tpl");
        $t = get_markup_template( "admin.tpl", "addon/openstreetmap/" );
        $tmsserver = get_config('openstreetmap','tmsserver');
        if(! $tmsserver)
@@ -67,12 +66,7 @@ function openstreetmap_plugin_admin (&$a, &$o) {
        if(! $zoom)
                $zoom = 17;
 
-       $includes = array(
-               '$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'),
                '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of <a href="http://wiki.openstreetmap.org/wiki/TMS" target="_blank">public tile servers</a>')),
                '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')),

diff --git a/openstreetmap/view/admin.tpl b/openstreetmap/view/admin.tpl
index f733a91740abdd144003114f70135786e25bfa86..75db9cd7b2d72802db235a30fdc53e888a279d2d 100644 (file)
--- a/openstreetmap/view/admin.tpl
+++ b/openstreetmap/view/admin.tpl
@@ -1,3 +1,3 @@
-{{ inc $field_input with $field=$tmsserver }}{{ endinc }}
-{{ inc $field_input with $field=$zoom }}{{ endinc }}
+{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }}
+{{ inc field_input.tpl with $field=$zoom }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/openstreetmap/view/smarty3/admin.tpl b/openstreetmap/view/smarty3/admin.tpl
index 90baf1beac823f89111d67f341dfb4c9649c54ca..6ee07174bf9e380a64dcb518c832f011880a3c56 100644 (file)
--- a/openstreetmap/view/smarty3/admin.tpl
+++ b/openstreetmap/view/smarty3/admin.tpl
@@ -1,3 +1,3 @@
-{{include file="file:{{$field_input}}" field=$tmsserver}}
-{{include file="file:{{$field_input}}" field=$zoom}}
+{{include file="field_input.tpl" field=$tmsserver}}
+{{include file="field_input.tpl" field=$zoom}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/page.tgz b/page.tgz
index 02140ce92def21beac5e562e0db67eefd522ff8a..c9610e28bb66cd2f9578de2e642b5cfc1b7d3bc7 100644 (file)
Binary files a/page.tgz and b/page.tgz differ

diff --git a/piwik.tgz b/piwik.tgz
index 080dd9e32c6bfd1513b54dcd98fa04ace138b5ed..a5bd437aa4c566a3518df99c19aad2141aadd904 100755 (executable)
Binary files a/piwik.tgz and b/piwik.tgz differ

diff --git a/piwik/piwik.php b/piwik/piwik.php
index a0dd1c257c7f15d663c3ba9a796517289d302ba2..3501b2c8c7a040df36776ed4f21dab4b0460d154 100755 (executable)
--- a/piwik/piwik.php
+++ b/piwik/piwik.php
@@ -84,16 +84,8 @@ function piwik_analytics($a,&$b) {
        }
 }
 function piwik_plugin_admin (&$a, &$o) {
-#      $t = file_get_contents( dirname(__file__)."/admin.tpl");
        $t = get_markup_template( "admin.tpl", "addon/piwik/" );
-
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-               '$field_checkbox' => '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' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')),
                '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),

diff --git a/piwik/view/admin.tpl b/piwik/view/admin.tpl
old mode 100755 (executable)
new mode 100644 (file)
index 21a6ea8..e57758a
--- a/piwik/view/admin.tpl
+++ b/piwik/view/admin.tpl
@@ -1,5 +1,5 @@
-{{ inc $field_input with $field=$baseurl }}{{ endinc }}
-{{ inc $field_input with $field=$siteid }}{{ endinc }}
-{{ inc $field_checkbox with $field=$optout }}{{ endinc }}
-{{ inc $field_checkbox with $field=$async }}{{ endinc }}
+{{ inc field_input.tpl with $field=$baseurl }}{{ endinc }}
+{{ inc field_input.tpl with $field=$siteid }}{{ endinc }}
+{{ inc field_checkbox.tpl with $field=$optout }}{{ endinc }}
+{{ inc field_checkbox.tpl with $field=$async }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/piwik/view/smarty3/admin.tpl b/piwik/view/smarty3/admin.tpl
index 3fd397371b1c2da91d71d9cee01f6834232158bf..bfe04aa31ef7d58bd072786e49330f38ce236523 100644 (file)
--- a/piwik/view/smarty3/admin.tpl
+++ b/piwik/view/smarty3/admin.tpl
@@ -1,5 +1,5 @@
-{{include file="file:{{$field_input}}" field=$baseurl}}
-{{include file="file:{{$field_input}}" field=$siteid}}
-{{include file="file:{{$field_checkbox}}" field=$optout}}
-{{include file="file:{{$field_checkbox}}" field=$async}}
+{{include file="field_input.tpl" field=$baseurl}}
+{{include file="field_input.tpl" field=$siteid}}
+{{include file="field_checkbox.tpl" field=$optout}}
+{{include file="field_checkbox.tpl" field=$async}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz
index 13239d9046359957aae6e93d4b4c9cfe275517a0..b0690fc2bcb02d3f208ae0a54901db629b7a4d0c 100644 (file)
Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ

diff --git a/remote_permissions.tgz b/remote_permissions.tgz
index 8c137d10fd65fc5204c3ee7a180b06008ef01559..fef4f39bf5e8e1ed19b3632fdc873034d3870cee 100644 (file)
Binary files a/remote_permissions.tgz and b/remote_permissions.tgz differ

diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php
index 3c99f0084af0e15f5855fce6ae50efb96bc85ad6..8955130f8150176bd29b675cb72ca06dccb1bb3e 100644 (file)
--- a/remote_permissions/remote_permissions.php
+++ b/remote_permissions/remote_permissions.php
@@ -191,15 +191,8 @@ function remote_permissions_content($a, $item_copy) {
 }
 
 function remote_permissions_plugin_admin(&$a, &$o){
-//     $t = file_get_contents( "addon/remote_permissions/admin.tpl" );
        $t = get_markup_template( "admin.tpl", "addon/remote_permissions/" );
-
-       $includes = array(
-               '$field_radio' => 'field_radio.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o = replace_macros($t, $includes + array(
+       $o = replace_macros($t, array(
                '$submit' => t('Submit'),
                '$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'),  get_config('remote_perms', 'global') == 1),
                '$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'),  get_config('remote_perms', 'global') == 0)

diff --git a/remote_permissions/view/admin.tpl b/remote_permissions/view/admin.tpl
index 1176db41c01fd33784fd3b0966a774ae0e2a8637..605588084d4ea2ef9b68e21978361b01b505b7bb 100644 (file)
--- a/remote_permissions/view/admin.tpl
+++ b/remote_permissions/view/admin.tpl
@@ -1,3 +1,3 @@
-{{ inc $field_radio with $field=$global }}{{ endinc }}
-{{ inc $field_radio with $field=$individual }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$global }}{{ endinc }}
+{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/statusnet.tgz b/statusnet.tgz
index 92a10317412198a219debe3c33b27ff2f60429fe..9801af556eb6fd101242b0ae00ae0ffd1ec39967 100755 (executable)
Binary files a/statusnet.tgz and b/statusnet.tgz differ

diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php
index d7af352eabc5b0e1246fb9673729203554ca3b02..4781fcc2558c235f0306990c0e4c9a90bf91ab29 100755 (executable)
--- a/statusnet/statusnet.php
+++ b/statusnet/statusnet.php
@@ -699,14 +699,7 @@ function statusnet_plugin_admin(&$a, &$o){
 
        
        $t = get_markup_template( "admin.tpl", "addon/statusnet/" );
- 
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-               '$field_checkbox' => 'field_checkbox.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $o = replace_macros($t, $includes + array(
+       $o = replace_macros($t, array(
                '$submit' => t('Submit'),
                                                        
                '$sites' => $sitesform,

diff --git a/statusnet/view/admin.tpl b/statusnet/view/admin.tpl
old mode 100755 (executable)
new mode 100644 (file)
index 02eacf7..b40adf3
--- a/statusnet/view/admin.tpl
+++ b/statusnet/view/admin.tpl
@@ -1,10 +1,10 @@
 {{ for $sites as $s }}
-       {{ inc $field_input with $field=$s.sitename }}{{ endinc }}
-       {{ inc $field_input with $field=$s.apiurl }}{{ endinc }}
-       {{ inc $field_input with $field=$s.secret }}{{ endinc }}
-       {{ inc $field_input with $field=$s.key }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$s.sitename }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$s.apiurl }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$s.secret }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$s.key }}{{ endinc }}
        {{ if $s.delete }}
-               {{ inc $field_checkbox with $field=$s.delete }}{{ endinc }}
+               {{ inc field_checkbox.tpl with $field=$s.delete }}{{ endinc }}
                <hr>
        {{ else }}
                <p>Fill this form to add a new site</p>

diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/view/smarty3/admin.tpl
index 5a77b2cf89111afd543252c90db7b5e3b020c53e..e2a8408f8e3a47a4feed29d9b979b398f872e603 100644 (file)
--- a/statusnet/view/smarty3/admin.tpl
+++ b/statusnet/view/smarty3/admin.tpl
@@ -1,10 +1,10 @@
 {{foreach $sites as $s}}
-       {{include file="file:{{$field_input}}" field=$s.sitename}}
-       {{include file="file:{{$field_input}}" field=$s.apiurl}}
-       {{include file="file:{{$field_input}}" field=$s.secret}}
-       {{include file="file:{{$field_input}}" field=$s.key}}
+       {{include file="field_input.tpl" field=$s.sitename}}
+       {{include file="field_input.tpl" field=$s.apiurl}}
+       {{include file="field_input.tpl" field=$s.secret}}
+       {{include file="field_input.tpl" field=$s.key}}
        {{if $s.delete}}
-               {{include file="file:{{$field_checkbox}}" field=$s.delete}}
+               {{include file="field_checkbox.tpl" field=$s.delete}}
                <hr>
        {{else}}
                <p>Fill this form to add a new site</p>

diff --git a/tumblr.tgz b/tumblr.tgz
index 4c0fecf33741c642d0080022b164b115fee3b842..b4f6ff9b7b098fddef0af87f795d6c6f49082d8b 100755 (executable)
Binary files a/tumblr.tgz and b/tumblr.tgz differ

diff --git a/twitter.tgz b/twitter.tgz
index 287619c255709f825338ba63a209d59ceb28746f..0505830c085659c6d51cff518f10849dc12e74f6 100755 (executable)
Binary files a/twitter.tgz and b/twitter.tgz differ

diff --git a/twitter/view/admin.tpl b/twitter/view/admin.tpl
old mode 100755 (executable)
new mode 100644 (file)
index d3649fc..a83eb07
--- a/twitter/view/admin.tpl
+++ b/twitter/view/admin.tpl
@@ -1,3 +1,3 @@
-{{ inc $field_input with $field=$consumerkey }}{{ endinc }}
-{{ inc $field_input with $field=$consumersecret }}{{ endinc }}
+{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }}
+{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }}
 <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

diff --git a/twitter/view/smarty3/admin.tpl b/twitter/view/smarty3/admin.tpl
index ad1e07e913a48fc2fd337977ea0d630628c14140..9efcb06560d2dc987f0c07c3b07b2e63eeaec3c7 100644 (file)
--- a/twitter/view/smarty3/admin.tpl
+++ b/twitter/view/smarty3/admin.tpl
@@ -1,3 +1,3 @@
-{{include file="file:{{$field_input}}" field=$consumerkey}}
-{{include file="file:{{$field_input}}" field=$consumersecret}}
+{{include file="field_input.tpl" field=$consumerkey}}
+{{include file="field_input.tpl" field=$consumersecret}}
 <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

diff --git a/uhremotestorage.tgz b/uhremotestorage.tgz
index 4aa58096d8ce8de26c9e0fa783fb64922bdb1ea2..7a758b00d0714884bd790f37e5123e3b2d74e9b4 100755 (executable)
Binary files a/uhremotestorage.tgz and b/uhremotestorage.tgz differ

diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php
index d7d036922f81c3c5c0edd26fcaefeca0a9ec96f3..85d6b13e8c34186c60a8775686d65eb4a6715af1 100755 (executable)
--- a/uhremotestorage/uhremotestorage.php
+++ b/uhremotestorage/uhremotestorage.php
@@ -78,16 +78,8 @@ function uhremotestorage_settings($a, &$s){
                'Dropbox' => 'Dropbox',
        );
        */
-//     $tpl = file_get_contents(dirname(__file__)."/settings.tpl");
        $tpl = get_markup_template("settings.tpl", "addon/uhremotestorage/");
-
-       $includes = array(
-               '$field_input' => 'field_input.tpl',
-               '$field_select' => 'field_select.tpl',
-       );
-       $includes = set_template_includes($a->theme['template_engine'], $includes);
-
-       $s .= replace_macros($tpl, $includes + array(
+       $s .= replace_macros($tpl, array(
                '$title' => 'Unhosted remote storage',
                '$desc' => sprintf( t('Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See <a href="http://www.w3.org/community/unhosted/wiki/RemoteStorage#WebFinger">RemoteStorage WebFinger</a>'), $uid ),
                '$url'  => array( 'unhoestedurl', t('Template URL (with {category})'), $url, 'If your are using ownCloud, your unhosted url will be like <tt>http://<i>HOST</i>/apps/remoteStorage/WebDAV.php/<i>USER</i>/remoteStorage/{category}</tt>'),

diff --git a/uhremotestorage/view/settings.tpl b/uhremotestorage/view/settings.tpl
old mode 100755 (executable)
new mode 100644 (file)
index 51650c8..22d7d60
--- a/uhremotestorage/view/settings.tpl
+++ b/uhremotestorage/view/settings.tpl
@@ -1,9 +1,9 @@
 <div class="settings-block">
        <h3>$title</h3>
        <p>$desc</p>
-       {{ inc $field_input with $field=$url }}{{ endinc }}
-       {{ inc $field_input with $field=$auth }}{{ endinc }}
-       {{ inc $field_select with $field=$api }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$url }}{{ endinc }}
+       {{ inc field_input.tpl with $field=$auth }}{{ endinc }}
+       {{ inc field_select.tpl with $field=$api }}{{ endinc }}
        <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>      
 
 </div>

diff --git a/uhremotestorage/view/smarty3/settings.tpl b/uhremotestorage/view/smarty3/settings.tpl
index 217f069a8ef4ae1699c73926da808d39cee3011d..9a0a55f33a248fd8b5ec4e51b84ad4960a690ac5 100644 (file)
--- a/uhremotestorage/view/smarty3/settings.tpl
+++ b/uhremotestorage/view/smarty3/settings.tpl
@@ -1,9 +1,9 @@
 <div class="settings-block">
        <h3>{{$title}}</h3>
        <p>{{$desc}}</p>
-       {{include file="file:{{$field_input}}" field=$url}}
-       {{include file="file:{{$field_input}}" field=$auth}}
-       {{include file="file:{{$field_select}}" field=$api}}
+       {{include file="field_input.tpl" field=$url}}
+       {{include file="field_input.tpl" field=$auth}}
+       {{include file="field_select.tpl" field=$api}}
        <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>  
 
 </div>

diff --git a/widgets.tgz b/widgets.tgz
index f3b1857838ac7c0594cf2b9c5c6c5a45f5296ec1..d89204f59ae1bec973dba92e42bdac79fa7d9d26 100755 (executable)
Binary files a/widgets.tgz and b/widgets.tgz differ