]> git.mxchange.org Git - friendica-addons.git/commitdiff
update addons to support Smarty3
authorZach Prezkuta <fermion@gmx.com>
Sat, 22 Dec 2012 20:36:35 +0000 (13:36 -0700)
committerZach Prezkuta <fermion@gmx.com>
Sat, 22 Dec 2012 20:36:35 +0000 (13:36 -0700)
72 files changed:
altpager/admin.tpl [deleted file]
altpager/altpager.php
altpager/view/admin.tpl [new file with mode: 0755]
altpager/view/admin.tpl.old [new file with mode: 0755]
altpager/view/smarty3/admin.tpl [new file with mode: 0644]
blackout/admin.tpl [deleted file]
blackout/blackout.php
blackout/view/admin.tpl [new file with mode: 0644]
blackout/view/smarty3/admin.tpl [new file with mode: 0644]
communityhome/communityhome.php
communityhome/communityhome.tpl [deleted file]
communityhome/directory_item.tpl [deleted file]
communityhome/view/communityhome.tpl [new file with mode: 0755]
communityhome/view/directory_item.tpl [new file with mode: 0755]
communityhome/view/smarty3/communityhome.tpl [new file with mode: 0644]
communityhome/view/smarty3/directory_item.tpl [new file with mode: 0644]
forumdirectory/forumdirectory.php
forumdirectory/forumdirectory_item.tpl [deleted file]
forumdirectory/view/forumdirectory_item.tpl [new file with mode: 0755]
forumdirectory/view/smarty3/forumdirectory_item.tpl [new file with mode: 0644]
gravatar/admin.tpl [deleted file]
gravatar/gravatar.php
gravatar/view/admin.tpl [new file with mode: 0644]
gravatar/view/smarty3/admin.tpl [new file with mode: 0644]
impressum/admin.tpl [deleted file]
impressum/impressum.php
impressum/view/admin.tpl [new file with mode: 0755]
impressum/view/smarty3/admin.tpl [new file with mode: 0644]
libravatar/admin.tpl [deleted file]
libravatar/libravatar.php
libravatar/view/admin.tpl [new file with mode: 0644]
libravatar/view/smarty3/admin.tpl [new file with mode: 0644]
mathjax/admin.tpl [deleted file]
mathjax/mathjax.php
mathjax/view/admin.tpl [new file with mode: 0644]
mathjax/view/smarty3/admin.tpl [new file with mode: 0644]
openstreetmap/admin.tpl [deleted file]
openstreetmap/openstreetmap.php
openstreetmap/view/admin.tpl [new file with mode: 0644]
openstreetmap/view/smarty3/admin.tpl [new file with mode: 0644]
piwik/admin.tpl [deleted file]
piwik/piwik.php
piwik/view/admin.tpl [new file with mode: 0755]
piwik/view/smarty3/admin.tpl [new file with mode: 0644]
remote_permissions/admin.tpl [deleted file]
remote_permissions/remote_permissions.php
remote_permissions/settings.tpl [deleted file]
remote_permissions/view/admin.tpl [new file with mode: 0644]
remote_permissions/view/settings.tpl [new file with mode: 0644]
remote_permissions/view/smarty3/admin.tpl [new file with mode: 0644]
remote_permissions/view/smarty3/settings.tpl [new file with mode: 0644]
statusnet/admin.tpl [deleted file]
statusnet/statusnet.php
statusnet/view/admin.tpl [new file with mode: 0755]
statusnet/view/smarty3/admin.tpl [new file with mode: 0644]
tumblr/tumblr.php
twitter/admin.tpl [deleted file]
twitter/twitter.php
twitter/view/admin.tpl [new file with mode: 0755]
twitter/view/smarty3/admin.tpl [new file with mode: 0644]
uhremotestorage/settings.tpl [deleted file]
uhremotestorage/uhremotestorage.php
uhremotestorage/view/settings.tpl [new file with mode: 0755]
uhremotestorage/view/smarty3/settings.tpl [new file with mode: 0644]
widgets/settings.tpl [deleted file]
widgets/view/settings.tpl [new file with mode: 0755]
widgets/view/smarty3/settings.tpl [new file with mode: 0644]
widgets/view/smarty3/widget_like.tpl [new file with mode: 0644]
widgets/view/widget_like.tpl [new file with mode: 0755]
widgets/widget_like.php
widgets/widget_like.tpl [deleted file]
widgets/widgets.php

diff --git a/altpager/admin.tpl b/altpager/admin.tpl
deleted file mode 100755 (executable)
index 6055880..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ 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>
index 20517d2f16ef41d85e959e1183877d6acb3cead2..ddb6d3520cc76f2418423be7324fac89ba4e5f20 100755 (executable)
@@ -93,8 +93,14 @@ function altpager_settings(&$a,&$s) {
 }
 
 function altpager_plugin_admin(&$a, &$o){
-       $t = file_get_contents( "addon/altpager/admin.tpl" );
-       $o = replace_macros($t, array(
+       $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(
                '$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)
@@ -106,3 +112,4 @@ function altpager_plugin_admin_post(&$a){
        set_config('alt_pager','global',($choice == 1 ? 1 : 0));
        info( t('Settings updated.'). EOL );
 }
+
diff --git a/altpager/view/admin.tpl b/altpager/view/admin.tpl
new file mode 100755 (executable)
index 0000000..1176db4
--- /dev/null
@@ -0,0 +1,3 @@
+{{ inc $field_radio with $field=$global }}{{ endinc }}
+{{ inc $field_radio with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/altpager/view/admin.tpl.old b/altpager/view/admin.tpl.old
new file mode 100755 (executable)
index 0000000..6055880
--- /dev/null
@@ -0,0 +1,3 @@
+{{ 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
new file mode 100644 (file)
index 0000000..5078023
--- /dev/null
@@ -0,0 +1,3 @@
+{{include file="file:{{$field_radio}}" field=$global}}
+{{include file="file:{{$field_radio}}" field=$individual}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/blackout/admin.tpl b/blackout/admin.tpl
deleted file mode 100644 (file)
index 2592219..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ 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
-press the submit button. Users currently logged in will <strong>not</strong> be
-thrown out but can't login again after logging out should the blackout is
-still in place.</div>
-
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
index 2cb7c041d6cf3dff8f60486a10f2e4a4d879ffd4..4c2a74b6de3aadc57bf83a72e31881eb6f27aadf 100644 (file)
@@ -93,8 +93,14 @@ function blackout_plugin_admin(&$a, &$o) {
     if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; }
     $myurl   = get_config('blackout','url');
     if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
-    $t = file_get_contents( dirname(__file__)."/admin.tpl" );
-    $o = replace_macros($t, array(
+    $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(
         '$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
new file mode 100644 (file)
index 0000000..e19bd24
--- /dev/null
@@ -0,0 +1,11 @@
+{{ inc $field_input with $field=$startdate }}{{ endinc }}
+{{ inc $field_input with $field=$enddate }}{{ endinc }}
+{{ inc $field_input 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
+press the submit button. Users currently logged in will <strong>not</strong> be
+thrown out but can't login again after logging out should the blackout is
+still in place.</div>
+
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/blackout/view/smarty3/admin.tpl b/blackout/view/smarty3/admin.tpl
new file mode 100644 (file)
index 0000000..f77a594
--- /dev/null
@@ -0,0 +1,11 @@
+{{include file="file:{{$field_input}}" field=$startdate}}
+{{include file="file:{{$field_input}}" field=$enddate}}
+{{include file="file:{{$field_input}}" 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
+press the submit button. Users currently logged in will <strong>not</strong> be
+thrown out but can't login again after logging out should the blackout is
+still in place.</div>
+
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
index 484842cce7b53e56b7cd4ae091edcf9d4067d6a8..8b831888a330852c7f64c84318082704e42c51cc 100755 (executable)
@@ -47,7 +47,8 @@ function communityhome_home(&$a, &$o){
                0,
                12
        );
-       $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+#      $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+       $tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
        if(count($r)) {
                $photo = 'thumb';
                foreach($r as $rr) {
@@ -114,7 +115,8 @@ function communityhome_home(&$a, &$o){
 
                
        if(count($r)) {
-               $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+#              $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl');
+               $tpl = get_markup_template( 'directory_item.tpl', 'addon/communityhome/' );
                foreach($r as $rr) {
                        $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
                        $photo_url = $a->get_baseurl() . '/photo/' .  $rr['resource-id'] . '-' . $rr['scale'] .'.jpg';
@@ -174,7 +176,8 @@ function communityhome_home(&$a, &$o){
                
        }
        
-       $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+#      $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl');
+       $tpl = get_markup_template('communityhome.tpl', 'addon/communityhome/');
        $a->page['aside'] = replace_macros($tpl, $aside);
        
        $o = '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';
diff --git a/communityhome/communityhome.tpl b/communityhome/communityhome.tpl
deleted file mode 100755 (executable)
index 8468780..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-<script>
-       $(function(){
-               $("#tab_1 a").click(function(e){
-                       $("#login_standard").show();
-                       $("#login_openid").hide();
-                       $("#tab_1").addClass("active");
-                       $("#tab_2").removeClass("active");
-                       e.preventDefault();
-                       return false;
-               });
-               $("#tab_2 a").click(function(e){
-                       $("#login_openid").show();
-                       $("#login_standard").hide();
-                       $("#tab_2").addClass("active");
-                       $("#tab_1").removeClass("active");
-                       e.preventDefault();
-                       return false;
-                       
-               });
-               
-       });
-</script>
-{{ if $noOid }}
-       <h3>$login_title</h3>
-{{ else }}
-<ul class="tabs">
-       <li id="tab_1" class="tab button active"><a href="#">$tab_1</a></li>
-       <li id="tab_2" class="tab button"><a href="#">$tab_2</a></li>
-</ul>
-{{ endif }}
-$login_form
-
-
-{{ if $lastusers_title }}
-<h3>$lastusers_title</h3>
-<div class='items-wrapper'>
-{{ for $lastusers_items as $i }}
-       $i
-{{ endfor }}
-</div>
-{{ endif }}
-
-
-{{ if $activeusers_title }}
-<h3>$activeusers_title</h3>
-<div class='items-wrapper'>
-{{ for $activeusers_items as $i }}
-       $i
-{{ endfor }}
-</div>
-{{ endif }}
-
-{{ if $photos_title }}
-<h3>$photos_title</h3>
-<div class='items-wrapper'>
-{{ for $photos_items as $i }}
-       $i
-{{ endfor }}
-</div>
-{{ endif }}
-
-
-{{ if $like_title }}
-<h3>$like_title</h3>
-<ul id='likes'>
-{{ for $like_items as $i }}
-       <li>$i</li>
-{{ endfor }}
-</ul>
-{{ endif }}
diff --git a/communityhome/directory_item.tpl b/communityhome/directory_item.tpl
deleted file mode 100755 (executable)
index db1936e..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-
-<div class="directory-item" id="directory-item-$id" >
-       <div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
-               <div class="directory-photo" id="directory-photo-$id" >
-                       <a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
-                               <img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
-                       </a>
-               </div>
-       </div>
-</div>
diff --git a/communityhome/view/communityhome.tpl b/communityhome/view/communityhome.tpl
new file mode 100755 (executable)
index 0000000..8468780
--- /dev/null
@@ -0,0 +1,70 @@
+<script>
+       $(function(){
+               $("#tab_1 a").click(function(e){
+                       $("#login_standard").show();
+                       $("#login_openid").hide();
+                       $("#tab_1").addClass("active");
+                       $("#tab_2").removeClass("active");
+                       e.preventDefault();
+                       return false;
+               });
+               $("#tab_2 a").click(function(e){
+                       $("#login_openid").show();
+                       $("#login_standard").hide();
+                       $("#tab_2").addClass("active");
+                       $("#tab_1").removeClass("active");
+                       e.preventDefault();
+                       return false;
+                       
+               });
+               
+       });
+</script>
+{{ if $noOid }}
+       <h3>$login_title</h3>
+{{ else }}
+<ul class="tabs">
+       <li id="tab_1" class="tab button active"><a href="#">$tab_1</a></li>
+       <li id="tab_2" class="tab button"><a href="#">$tab_2</a></li>
+</ul>
+{{ endif }}
+$login_form
+
+
+{{ if $lastusers_title }}
+<h3>$lastusers_title</h3>
+<div class='items-wrapper'>
+{{ for $lastusers_items as $i }}
+       $i
+{{ endfor }}
+</div>
+{{ endif }}
+
+
+{{ if $activeusers_title }}
+<h3>$activeusers_title</h3>
+<div class='items-wrapper'>
+{{ for $activeusers_items as $i }}
+       $i
+{{ endfor }}
+</div>
+{{ endif }}
+
+{{ if $photos_title }}
+<h3>$photos_title</h3>
+<div class='items-wrapper'>
+{{ for $photos_items as $i }}
+       $i
+{{ endfor }}
+</div>
+{{ endif }}
+
+
+{{ if $like_title }}
+<h3>$like_title</h3>
+<ul id='likes'>
+{{ for $like_items as $i }}
+       <li>$i</li>
+{{ endfor }}
+</ul>
+{{ endif }}
diff --git a/communityhome/view/directory_item.tpl b/communityhome/view/directory_item.tpl
new file mode 100755 (executable)
index 0000000..db1936e
--- /dev/null
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-$id" >
+       <div class="directory-photo-wrapper" id="directory-photo-wrapper-$id" > 
+               <div class="directory-photo" id="directory-photo-$id" >
+                       <a href="$profile-link" class="directory-profile-link" id="directory-profile-link-$id" >
+                               <img class="directory-photo-img" src="$photo" alt="$alt-text" title="$alt-text" />
+                       </a>
+               </div>
+       </div>
+</div>
diff --git a/communityhome/view/smarty3/communityhome.tpl b/communityhome/view/smarty3/communityhome.tpl
new file mode 100644 (file)
index 0000000..b8f8038
--- /dev/null
@@ -0,0 +1,70 @@
+<script>
+       $(function(){
+               $("#tab_1 a").click(function(e){
+                       $("#login_standard").show();
+                       $("#login_openid").hide();
+                       $("#tab_1").addClass("active");
+                       $("#tab_2").removeClass("active");
+                       e.preventDefault();
+                       return false;
+               });
+               $("#tab_2 a").click(function(e){
+                       $("#login_openid").show();
+                       $("#login_standard").hide();
+                       $("#tab_2").addClass("active");
+                       $("#tab_1").removeClass("active");
+                       e.preventDefault();
+                       return false;
+                       
+               });
+               
+       });
+</script>
+{{if $noOid}}
+       <h3>{{$login_title}}</h3>
+{{else}}
+<ul class="tabs">
+       <li id="tab_1" class="tab button active"><a href="#">{{$tab_1}}</a></li>
+       <li id="tab_2" class="tab button"><a href="#">{{$tab_2}}</a></li>
+</ul>
+{{/if}}
+{{$login_form}}
+
+
+{{if $lastusers_title}}
+<h3>{{$lastusers_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $lastusers_items as $i}}
+       {{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+
+{{if $activeusers_title}}
+<h3>{{$activeusers_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $activeusers_items as $i}}
+       {{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+{{if $photos_title}}
+<h3>{{$photos_title}}</h3>
+<div class='items-wrapper'>
+{{foreach $photos_items as $i}}
+       {{$i}}
+{{/foreach}}
+</div>
+{{/if}}
+
+
+{{if $like_title}}
+<h3>{{$like_title}}</h3>
+<ul id='likes'>
+{{foreach $like_items as $i}}
+       <li>{{$i}}</li>
+{{/foreach}}
+</ul>
+{{/if}}
diff --git a/communityhome/view/smarty3/directory_item.tpl b/communityhome/view/smarty3/directory_item.tpl
new file mode 100644 (file)
index 0000000..5fb1198
--- /dev/null
@@ -0,0 +1,10 @@
+
+<div class="directory-item" id="directory-item-{{$id}}" >
+       <div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
+               <div class="directory-photo" id="directory-photo-{{$id}}" >
+                       <a href="{{$profile}}-link" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
+                               <img class="directory-photo-img" src="{{$photo}}" alt="{{$alt}}-text" title="{{$alt}}-text" />
+                       </a>
+               </div>
+       </div>
+</div>
index 83f19d011845a92c592f59a9584c724f0f8e2f48..0d7fbee804891533deffd4b888cbc0f09c081546 100644 (file)
@@ -163,7 +163,8 @@ function forumdirectory_content(&$a) {
 
                        $about = ((x($profile,'about') == 1) ?  t('About:') : False);
                        
-                       $tpl = file_get_contents( dirname(__file__).'/forumdirectory_item.tpl');
+#                      $tpl = file_get_contents( dirname(__file__).'/forumdirectory_item.tpl');
+                       $tpl = get_markup_template( 'forumdirectory_item.tpl', 'addon/forumdirectory/' );
 
                        $entry = replace_macros($tpl,array(
                                '$id' => $rr['id'],
diff --git a/forumdirectory/forumdirectory_item.tpl b/forumdirectory/forumdirectory_item.tpl
deleted file mode 100755 (executable)
index 3b24d25..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-
-<div class="forumdirectory-item" id="forumdirectory-item-$id" >
-       <div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-$id" > 
-               <div class="forumdirectory-photo" id="forumdirectory-photo-$id" >
-                       <a href="$profile-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-$id" >
-                               <img class="forumdirectory-photo-img photo" src="$photo" alt="$alt-text" title="$alt-text" />
-                       </a>
-               </div>
-       </div>
-       <div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-$id" >
-               <div class="contact-name" id="forumdirectory-name-$id">$name</div>
-               <div class="page-type">$page-type</div>
-               {{ if $pdesc }}<div class="forumdirectory-profile-title">$profile.pdesc</div>{{ endif }}
-       <div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-$id">
-               <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-$id">       
-                       {{ if $location }}
-                           <dl class="location"><dt class="location-label">$location</dt>
-                               <dd class="adr">
-                                       {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
-                                       <span class="city-state-zip">
-                                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
-                                               <span class="region">$profile.region</span>
-                                               <span class="postal-code">$profile.postal-code</span>
-                                       </span>
-                                       {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
-                               </dd>
-                               </dl>
-                       {{ endif }}
-
-                       {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
-                       </div>  
-                       <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn2-wrapper-$id">       
-                               {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
-
-                               {{ 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 }}
-                       </div>
-               </div>
-               <div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-$id" >
-                       {{ if $about }}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">$about</dt><dd class="forumdirectory-copy-data">$profile.about</dd></dl>{{ endif }}
-               </div>
-       </div>
-</div>
diff --git a/forumdirectory/view/forumdirectory_item.tpl b/forumdirectory/view/forumdirectory_item.tpl
new file mode 100755 (executable)
index 0000000..3b24d25
--- /dev/null
@@ -0,0 +1,42 @@
+
+<div class="forumdirectory-item" id="forumdirectory-item-$id" >
+       <div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-$id" > 
+               <div class="forumdirectory-photo" id="forumdirectory-photo-$id" >
+                       <a href="$profile-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-$id" >
+                               <img class="forumdirectory-photo-img photo" src="$photo" alt="$alt-text" title="$alt-text" />
+                       </a>
+               </div>
+       </div>
+       <div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-$id" >
+               <div class="contact-name" id="forumdirectory-name-$id">$name</div>
+               <div class="page-type">$page-type</div>
+               {{ if $pdesc }}<div class="forumdirectory-profile-title">$profile.pdesc</div>{{ endif }}
+       <div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-$id">
+               <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-$id">       
+                       {{ if $location }}
+                           <dl class="location"><dt class="location-label">$location</dt>
+                               <dd class="adr">
+                                       {{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
+                                       <span class="city-state-zip">
+                                               <span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
+                                               <span class="region">$profile.region</span>
+                                               <span class="postal-code">$profile.postal-code</span>
+                                       </span>
+                                       {{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
+                               </dd>
+                               </dl>
+                       {{ endif }}
+
+                       {{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
+                       </div>  
+                       <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn2-wrapper-$id">       
+                               {{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
+
+                               {{ 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 }}
+                       </div>
+               </div>
+               <div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-$id" >
+                       {{ if $about }}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">$about</dt><dd class="forumdirectory-copy-data">$profile.about</dd></dl>{{ endif }}
+               </div>
+       </div>
+</div>
diff --git a/forumdirectory/view/smarty3/forumdirectory_item.tpl b/forumdirectory/view/smarty3/forumdirectory_item.tpl
new file mode 100644 (file)
index 0000000..540a5ae
--- /dev/null
@@ -0,0 +1,42 @@
+
+<div class="forumdirectory-item" id="forumdirectory-item-{{$id}}" >
+       <div class="forumdirectory-photo-wrapper" id="forumdirectory-photo-wrapper-{{$id}}" > 
+               <div class="forumdirectory-photo" id="forumdirectory-photo-{{$id}}" >
+                       <a href="{{$profile}}-link" class="forumdirectory-profile-link" id="forumdirectory-profile-link-{{$id}}" >
+                               <img class="forumdirectory-photo-img photo" src="{{$photo}}" alt="{{$alt}}-text" title="{{$alt}}-text" />
+                       </a>
+               </div>
+       </div>
+       <div class="forumdirectory-profile-wrapper" id="forumdirectory-profile-wrapper-{{$id}}" >
+               <div class="contact-name" id="forumdirectory-name-{{$id}}">{{$name}}</div>
+               <div class="page-type">{{$page}}-type</div>
+               {{if $pdesc}}<div class="forumdirectory-profile-title">{{$profile.pdesc}}</div>{{/if}}
+       <div class="forumdirectory-detailcolumns-wrapper" id="forumdirectory-detailcolumns-wrapper-{{$id}}">
+               <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn1-wrapper-{{$id}}">   
+                       {{if $location}}
+                           <dl class="location"><dt class="location-label">{{$location}}</dt>
+                               <dd class="adr">
+                                       {{if $profile.address}}<div class="street-address">{{$profile.address}}</div>{{/if}}
+                                       <span class="city-state-zip">
+                                               <span class="locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                                               <span class="region">{{$profile.region}}</span>
+                                               <span class="postal-code">{{$profile.postal-code}}</span>
+                                       </span>
+                                       {{if $profile.country-name}}<span class="country-name">{{$profile.country-name}}</span>{{/if}}
+                               </dd>
+                               </dl>
+                       {{/if}}
+
+                       {{if $gender}}<dl class="mf"><dt class="gender-label">{{$gender}}</dt> <dd class="x-gender">{{$profile.gender}}</dd></dl>{{/if}}
+                       </div>  
+                       <div class="forumdirectory-detailscolumn-wrapper" id="forumdirectory-detailscolumn2-wrapper-{{$id}}">   
+                               {{if $marital}}<dl class="marital"><dt class="marital-label"><span class="heart">&hearts;</span>{{$marital}}</dt><dd class="marital-text">{{$profile.marital}}</dd></dl>{{/if}}
+
+                               {{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>{{/if}}
+                       </div>
+               </div>
+               <div class="forumdirectory-copy-wrapper" id="forumdirectory-copy-wrapper-{{$id}}" >
+                       {{if $about}}<dl class="forumdirectory-copy"><dt class="forumdirectory-copy-label">{{$about}}</dt><dd class="forumdirectory-copy-data">{{$profile.about}}</dd></dl>{{/if}}
+               </div>
+       </div>
+</div>
diff --git a/gravatar/admin.tpl b/gravatar/admin.tpl
deleted file mode 100644 (file)
index 83144e4..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ 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>
index fc5358eb41673088f87bad781fcbe1cc4420eec1..a0b5a02b3ff3c4c72c845b22730aa018a2718163 100644 (file)
@@ -55,7 +55,7 @@ function gravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function gravatar_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
+       $t = get_markup_template( "admin.tpl", "addon/gravatar/" );
 
        $default_avatar = get_config('gravatar', 'default_img');
        $rating = get_config('gravatar', 'rating');
@@ -91,7 +91,13 @@ function gravatar_plugin_admin (&$a, &$o) {
 
        // output Gravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">';
-       $o .= replace_macros( $t, array(
+
+       $includes = array(
+               '$field_select' => 'field_select.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       $o .= replace_macros( $t, $includes + 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
new file mode 100644 (file)
index 0000000..b187e1e
--- /dev/null
@@ -0,0 +1,3 @@
+{{ inc $field_select with $field=$default_avatar}}{{ endinc }}
+{{ inc $field_select 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
new file mode 100644 (file)
index 0000000..30d760a
--- /dev/null
@@ -0,0 +1,3 @@
+{{include file="file:{{$field_select}}" field=$default_avatar}}
+{{include file="file:{{$field_select}}" field=$rating}}
+<div class="submit"><input type="submit" value="{{$submit}}" /></div>
diff --git a/impressum/admin.tpl b/impressum/admin.tpl
deleted file mode 100755 (executable)
index 901df73..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-{{ 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>
index 9d038178beb8eca2ccf65011481e48702c5b559e..305dd9a9452b2ce7df11acef10f1d6644cb31c0a 100755 (executable)
@@ -78,8 +78,15 @@ function impressum_plugin_admin_post (&$a) {
     info( t('Settings updated.'). EOL );
 }
 function impressum_plugin_admin (&$a, &$o) {
-    $t = file_get_contents( dirname(__file__). "/admin.tpl" );
-    $o = replace_macros($t, array(
+    $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(
         '$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
new file mode 100755 (executable)
index 0000000..e365113
--- /dev/null
@@ -0,0 +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 }}
+<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
new file mode 100644 (file)
index 0000000..a3b0ef2
--- /dev/null
@@ -0,0 +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}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/libravatar/admin.tpl b/libravatar/admin.tpl
deleted file mode 100644 (file)
index 814f4a4..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
-<div class="submit"><input type="submit" value="$submit" /></div>
index 08ed6d00b21302d99a0df51920b3e3ff831dedbc..c966052f75508d8e218a72f67fb1e7ecd6d58fa3 100644 (file)
@@ -60,7 +60,7 @@ function libravatar_lookup($a, &$b) {
  * Display admin settings for this addon
  */
 function libravatar_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
+       $t = get_markup_template( "admin.tpl", "addon/libravatar" );
 
        $default_avatar = get_config('libravatar', 'default_img');
 
@@ -95,7 +95,13 @@ function libravatar_plugin_admin (&$a, &$o) {
 
        // output Libravatar settings
        $o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">';
-       $o .= replace_macros( $t, array(
+       $includes = array(
+               '$field_input' => 'field_input.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       $o .= replace_macros( $t, $includes + 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
new file mode 100644 (file)
index 0000000..01b113c
--- /dev/null
@@ -0,0 +1,2 @@
+{{ inc $field_select 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
new file mode 100644 (file)
index 0000000..4e930a7
--- /dev/null
@@ -0,0 +1,2 @@
+{{include file="file:{{$field_select}}" field=$default_avatar}}
+<div class="submit"><input type="submit" value="{{$submit}}" /></div>
diff --git a/mathjax/admin.tpl b/mathjax/admin.tpl
deleted file mode 100644 (file)
index 1c723cd..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-{{ inc field_input.tpl with $field=$baseurl }}{{endinc }}
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
index 7105772ba80fe1120776c422305949186dbae118..33cdd43938af54c5c86b874100396779f85d8328 100644 (file)
@@ -66,11 +66,17 @@ function mathjax_plugin_admin_post (&$a) {
     info( t('Settings updated.'). EOL);
 }
 function mathjax_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
-        if (get_config('mathjax','baseurl','') == '') {
-            set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML');
-        }
-        $o = replace_macros( $t, array(
+       $t = get_markup_template( "admin.tpl", "addon/mathjax/" );
+       if (get_config('mathjax','baseurl','') == '') {
+               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(
                '$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
new file mode 100644 (file)
index 0000000..ed60d73
--- /dev/null
@@ -0,0 +1,2 @@
+{{ inc $field_input 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
new file mode 100644 (file)
index 0000000..8d0388c
--- /dev/null
@@ -0,0 +1,2 @@
+{{include file="file:{{$field_input}}" field=$baseurl}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/openstreetmap/admin.tpl b/openstreetmap/admin.tpl
deleted file mode 100644 (file)
index 75db9cd..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ 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>
index fda29905d411821fb145ce80aae1c01767731ced..bf6632539e05eede6e3f01bc44c36d684c18347a 100755 (executable)
@@ -58,7 +58,8 @@ function openstreetmap_location($a, &$item) {
 
 
 function openstreetmap_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
+#      $t = file_get_contents( dirname(__file__)."/admin.tpl");
+       $t = get_markup_template( "admin.tpl", "addon/openstreetmap/" );
        $tmsserver = get_config('openstreetmap','tmsserver');
        if(! $tmsserver)
                $tmsserver = 'http://openstreetmap.org';
@@ -66,7 +67,12 @@ function openstreetmap_plugin_admin (&$a, &$o) {
        if(! $zoom)
                $zoom = 17;
 
-       $o = replace_macros( $t, array(
+       $includes = array(
+               '$field_input' => 'field_input.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       $o = replace_macros( $t, $includes + 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
new file mode 100644 (file)
index 0000000..f733a91
--- /dev/null
@@ -0,0 +1,3 @@
+{{ inc $field_input with $field=$tmsserver }}{{ endinc }}
+{{ inc $field_input 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
new file mode 100644 (file)
index 0000000..90baf1b
--- /dev/null
@@ -0,0 +1,3 @@
+{{include file="file:{{$field_input}}" field=$tmsserver}}
+{{include file="file:{{$field_input}}" field=$zoom}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/piwik/admin.tpl b/piwik/admin.tpl
deleted file mode 100755 (executable)
index e57758a..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-{{ 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>
index 9ba15db63f9e7dd35445f8cae10d3ef2daad8038..a0dd1c257c7f15d663c3ba9a796517289d302ba2 100755 (executable)
@@ -84,8 +84,16 @@ function piwik_analytics($a,&$b) {
        }
 }
 function piwik_plugin_admin (&$a, &$o) {
-       $t = file_get_contents( dirname(__file__)."/admin.tpl");
-       $o = replace_macros( $t, array(
+#      $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(
                '$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
new file mode 100755 (executable)
index 0000000..21a6ea8
--- /dev/null
@@ -0,0 +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 }}
+<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
new file mode 100644 (file)
index 0000000..3fd3973
--- /dev/null
@@ -0,0 +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}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/remote_permissions/admin.tpl b/remote_permissions/admin.tpl
deleted file mode 100644 (file)
index 6055880..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ 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>
index 95e74ee194598f1068b1758221fb6c46d405b999..3c99f0084af0e15f5855fce6ae50efb96bc85ad6 100644 (file)
@@ -39,7 +39,8 @@ function remote_permissions_settings(&$a,&$o) {
        
        /* Add some HTML to the existing form */
 
-       $t = file_get_contents("addon/remote_permissions/settings.tpl" );
+//     $t = file_get_contents("addon/remote_permissions/settings.tpl" );
+       $t = get_markup_template("settings.tpl", "addon/remote_permissions/" );
        $o .= replace_macros($t, array(
                '$remote_perms_title' => t('Remote Permissions Settings'),
                '$remote_perms_label' => t('Allow recipients of your private posts to see the other recipients of the posts'),
@@ -190,8 +191,15 @@ function remote_permissions_content($a, $item_copy) {
 }
 
 function remote_permissions_plugin_admin(&$a, &$o){
-       $t = file_get_contents( "addon/remote_permissions/admin.tpl" );
-       $o = replace_macros($t, array(
+//     $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(
                '$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/settings.tpl b/remote_permissions/settings.tpl
deleted file mode 100644 (file)
index 9fd9895..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-       <div class="settings-block">
-       <h3>$remote_perms_title</h3>
-       <div id="remote-perms-wrapper">
-       <label id="remote-perms-label" for="remote-perms">$remote_perms_label</label>
-       <input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" $checked />
-       </div><div class="clear"></div>
-       <div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="$submit" /></div></div>
-
diff --git a/remote_permissions/view/admin.tpl b/remote_permissions/view/admin.tpl
new file mode 100644 (file)
index 0000000..1176db4
--- /dev/null
@@ -0,0 +1,3 @@
+{{ inc $field_radio with $field=$global }}{{ endinc }}
+{{ inc $field_radio with $field=$individual }}{{ endinc }}
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/remote_permissions/view/settings.tpl b/remote_permissions/view/settings.tpl
new file mode 100644 (file)
index 0000000..9fd9895
--- /dev/null
@@ -0,0 +1,8 @@
+       <div class="settings-block">
+       <h3>$remote_perms_title</h3>
+       <div id="remote-perms-wrapper">
+       <label id="remote-perms-label" for="remote-perms">$remote_perms_label</label>
+       <input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" $checked />
+       </div><div class="clear"></div>
+       <div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="$submit" /></div></div>
+
diff --git a/remote_permissions/view/smarty3/admin.tpl b/remote_permissions/view/smarty3/admin.tpl
new file mode 100644 (file)
index 0000000..e67afd7
--- /dev/null
@@ -0,0 +1,3 @@
+{{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/remote_permissions/view/smarty3/settings.tpl b/remote_permissions/view/smarty3/settings.tpl
new file mode 100644 (file)
index 0000000..df89a32
--- /dev/null
@@ -0,0 +1,8 @@
+       <div class="settings-block">
+       <h3>{{$remote_perms_title}}</h3>
+       <div id="remote-perms-wrapper">
+       <label id="remote-perms-label" for="remote-perms">{{$remote_perms_label}}</label>
+       <input id="remote-perms-input" type="checkbox" name="remote-perms" value="1" {{$checked}} />
+       </div><div class="clear"></div>
+       <div class="settings-submit-wrapper" ><input type="submit" name="remote-perms-submit" class="settings-submit" value="{{$submit}}" /></div></div>
+
diff --git a/statusnet/admin.tpl b/statusnet/admin.tpl
deleted file mode 100755 (executable)
index b40adf3..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-{{ for $sites as $s }}
-       {{ 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.tpl with $field=$s.delete }}{{ endinc }}
-               <hr>
-       {{ else }}
-               <p>Fill this form to add a new site</p>
-       {{ endif }}
-       
-{{ endfor }}
-
-
-<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
index d7d490fdd3e3aa70235c0f3724e06954fc1c267b..d7af352eabc5b0e1246fb9673729203554ca3b02 100755 (executable)
@@ -698,8 +698,15 @@ function statusnet_plugin_admin(&$a, &$o){
        );
 
        
-       $t = file_get_contents( dirname(__file__). "/admin.tpl" );
-       $o = replace_macros($t, array(
+       $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(
                '$submit' => t('Submit'),
                                                        
                '$sites' => $sitesform,
diff --git a/statusnet/view/admin.tpl b/statusnet/view/admin.tpl
new file mode 100755 (executable)
index 0000000..02eacf7
--- /dev/null
@@ -0,0 +1,16 @@
+{{ 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 }}
+       {{ if $s.delete }}
+               {{ inc $field_checkbox with $field=$s.delete }}{{ endinc }}
+               <hr>
+       {{ else }}
+               <p>Fill this form to add a new site</p>
+       {{ endif }}
+       
+{{ endfor }}
+
+
+<div class="submit"><input type="submit" name="page_site" value="$submit" /></div>
diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/view/smarty3/admin.tpl
new file mode 100644 (file)
index 0000000..5a77b2c
--- /dev/null
@@ -0,0 +1,16 @@
+{{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}}
+       {{if $s.delete}}
+               {{include file="file:{{$field_checkbox}}" field=$s.delete}}
+               <hr>
+       {{else}}
+               <p>Fill this form to add a new site</p>
+       {{/if}}
+       
+{{/foreach}}
+
+
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
index 01ba04bb0a5f7f38f9f6fbbe0c034e34e718c80b..4bbae8e6c06c47234e80d7dc414737fac1900b41 100755 (executable)
-<?php\r
-\r
-/**\r
- * Name: Tumblr Post Connector\r
- * Description: Post to Tumblr\r
- * Version: 1.0\r
- * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>\r
- */\r
-\r
-require_once('library/OAuth1.php');\r
-require_once('addon/tumblr/tumblroauth/tumblroauth.php');\r
-\r
-function tumblr_install() {\r
-    register_hook('post_local',           'addon/tumblr/tumblr.php', 'tumblr_post_local');\r
-    register_hook('notifier_normal',      'addon/tumblr/tumblr.php', 'tumblr_send');\r
-    register_hook('jot_networks',         'addon/tumblr/tumblr.php', 'tumblr_jot_nets');\r
-    register_hook('connector_settings',      'addon/tumblr/tumblr.php', 'tumblr_settings');\r
-    register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');\r
-\r
-}\r
-function tumblr_uninstall() {\r
-    unregister_hook('post_local',       'addon/tumblr/tumblr.php', 'tumblr_post_local');\r
-    unregister_hook('notifier_normal',  'addon/tumblr/tumblr.php', 'tumblr_send');\r
-    unregister_hook('jot_networks',     'addon/tumblr/tumblr.php', 'tumblr_jot_nets');\r
-    unregister_hook('connector_settings',      'addon/tumblr/tumblr.php', 'tumblr_settings');\r
-    unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');\r
-}\r
-\r
-function tumblr_module() {}\r
-\r
-function tumblr_content(&$a) {\r
-\r
-       if(! local_user()) {\r
-               notice( t('Permission denied.') . EOL);\r
-               return '';\r
-       }\r
-\r
-       if (isset($a->argv[1]))\r
-               switch ($a->argv[1]) {\r
-                       case "connect":\r
-                               $o = tumblr_connect($a);\r
-                               break;\r
-                       case "callback":\r
-                               $o = tumblr_callback($a);\r
-                               break;\r
-                       default:\r
-                               $o = print_r($a->argv, true);\r
-                               break;\r
-               }\r
-       else\r
-               $o = tumblr_connect($a);\r
-\r
-       return $o;\r
-}\r
-\r
-function tumblr_connect($a) {\r
-       // Start a session.  This is necessary to hold on to  a few keys the callback script will also need\r
-       session_start();\r
-\r
-       // Include the TumblrOAuth library\r
-       //require_once('addon/tumblr/tumblroauth/tumblroauth.php');\r
-\r
-       // Define the needed keys\r
-       $consumer_key = get_config('tumblr','consumer_key');\r
-       $consumer_secret = get_config('tumblr','consumer_secret');\r
-\r
-       // The callback URL is the script that gets called after the user authenticates with tumblr\r
-       // In this example, it would be the included callback.php\r
-       $callback_url = $a->get_baseurl()."/tumblr/callback";\r
-\r
-       // Let's begin.  First we need a Request Token.  The request token is required to send the user\r
-       // to Tumblr's login page.\r
-\r
-       // Create a new instance of the TumblrOAuth library.  For this step, all we need to give the library is our\r
-       // Consumer Key and Consumer Secret\r
-       $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret);\r
-\r
-       // Ask Tumblr for a Request Token.  Specify the Callback URL here too (although this should be optional)\r
-       $request_token = $tum_oauth->getRequestToken($callback_url);\r
-\r
-       // Store the request token and Request Token Secret as out callback.php script will need this\r
-       $_SESSION['request_token'] = $token = $request_token['oauth_token'];\r
-       $_SESSION['request_token_secret'] = $request_token['oauth_token_secret'];\r
-\r
-       // Check the HTTP Code.  It should be a 200 (OK), if it's anything else then something didn't work.\r
-       switch ($tum_oauth->http_code) {\r
-         case 200:\r
-           // Ask Tumblr to give us a special address to their login page\r
-           $url = $tum_oauth->getAuthorizeURL($token);\r
-\r
-               // Redirect the user to the login URL given to us by Tumblr\r
-           header('Location: ' . $url);\r
-\r
-               // That's it for our side.  The user is sent to a Tumblr Login page and\r
-               // asked to authroize our app.  After that, Tumblr sends the user back to\r
-               // our Callback URL (callback.php) along with some information we need to get\r
-               // an access token.\r
-\r
-           break;\r
-       default:\r
-           // Give an error message\r
-           $o = 'Could not connect to Tumblr. Refresh the page or try again later.';\r
-       }\r
-       return($o);\r
-}\r
-\r
-function tumblr_callback($a) {\r
-\r
-       // Start a session, load the library\r
-       session_start();\r
-       //require_once('addon/tumblr/tumblroauth/tumblroauth.php');\r
-\r
-       // Define the needed keys\r
-       $consumer_key = get_config('tumblr','consumer_key');\r
-       $consumer_secret = get_config('tumblr','consumer_secret');\r
-\r
-       // Once the user approves your app at Tumblr, they are sent back to this script.\r
-       // This script is passed two parameters in the URL, oauth_token (our Request Token)\r
-       // and oauth_verifier (Key that we need to get Access Token).\r
-       // We'll also need out Request Token Secret, which we stored in a session.\r
-\r
-       // Create instance of TumblrOAuth.\r
-       // It'll need our Consumer Key and Secret as well as our Request Token and Secret\r
-       $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);\r
-\r
-       // Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL. \r
-       $access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);\r
-\r
-       // We're done with the Request Token and Secret so let's remove those.\r
-       unset($_SESSION['request_token']);\r
-       unset($_SESSION['request_token_secret']);\r
-\r
-       // Make sure nothing went wrong.\r
-       if (200 == $tum_oauth->http_code) {\r
-         // good to go\r
-       } else {\r
-         return('Unable to authenticate');\r
-       }\r
-\r
-       // What's next?  Now that we have an Access Token and Secret, we can make an API call.\r
-       set_pconfig(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);\r
-       set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);\r
-\r
-       $o = t("You are now authenticated to tumblr.");\r
-       $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';\r
-       return($o);\r
-}\r
-\r
-function tumblr_jot_nets(&$a,&$b) {\r
-    if(! local_user())\r
-        return;\r
-\r
-    $tmbl_post = get_pconfig(local_user(),'tumblr','post');\r
-    if(intval($tmbl_post) == 1) {\r
-        $tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');\r
-        $selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');\r
-        $b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> '\r
-            . t('Post to Tumblr') . '</div>';\r
-    }\r
-}\r
-\r
-\r
-function tumblr_settings(&$a,&$s) {\r
-\r
-    if(! local_user())\r
-        return;\r
-\r
-    /* Add our stylesheet to the page so we can make our settings look nice */\r
-\r
-    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/tumblr/tumblr.css' . '" media="all" />' . "\r\n";\r
-\r
-    /* Get the current state of our config variables */\r
-\r
-    $enabled = get_pconfig(local_user(),'tumblr','post');\r
-\r
-    $checked = (($enabled) ? ' checked="checked" ' : '');\r
-\r
-    $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default');\r
-\r
-    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');\r
-\r
-    /* Add some HTML to the existing form */\r
-\r
-    $s .= '<div class="settings-block">';\r
-    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';\r
-\r
-    $s .= '<div id="tumblr-username-wrapper">';\r
-    $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>';\r
-    $s .= '</div><div class="clear"></div>';\r
-\r
-    $s .= '<div id="tumblr-enable-wrapper">';\r
-    $s .= '<label id="tumblr-enable-label" for="tumblr-checkbox">' . t('Enable Tumblr Post Plugin') . '</label>';\r
-    $s .= '<input id="tumblr-checkbox" type="checkbox" name="tumblr" value="1" ' . $checked . '/>';\r
-    $s .= '</div><div class="clear"></div>';\r
-\r
-    $s .= '<div id="tumblr-bydefault-wrapper">';\r
-    $s .= '<label id="tumblr-bydefault-label" for="tumblr-bydefault">' . t('Post to Tumblr by default') . '</label>';\r
-    $s .= '<input id="tumblr-bydefault" type="checkbox" name="tumblr_bydefault" value="1" ' . $def_checked . '/>';\r
-    $s .= '</div><div class="clear"></div>';\r
-\r
-    $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token");\r
-    $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret");\r
-\r
-    $s .= '<div id="tumblr-password-wrapper">';\r
-    if (($oauth_token != "") and ($oauth_token_secret != "")) {\r
-\r
-       $page = get_pconfig(local_user(),'tumblr','page');\r
-       $consumer_key = get_config('tumblr','consumer_key');\r
-       $consumer_secret = get_config('tumblr','consumer_secret');\r
-\r
-       $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);\r
-\r
-       $userinfo = $tum_oauth->get('user/info');\r
-\r
-       $blogs = array();\r
-\r
-       $s .= t("Post to page:")."<select name='tumblr_page'>";\r
-       foreach($userinfo->response->user->blogs as $blog) {\r
-               $blogurl = substr(str_replace(array("http://", "https://"), array("", ""), $blog->url), 0, -1);\r
-               if ($page == $blogurl)\r
-                       $s .= "<option value='".$blogurl."' selected>".$blogurl."</option>";\r
-               else\r
-                       $s .= "<option value='".$blogurl."'>".$blogurl."</option>";\r
-       }\r
-\r
-       $s .= "</select>";\r
-    } else\r
-       $s .= t("You are not authenticated to tumblr");\r
-    $s .= '</div><div class="clear"></div>';\r
-\r
-    /* provide a submit button */\r
-\r
-    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';\r
-\r
-}\r
-\r
-\r
-function tumblr_settings_post(&$a,&$b) {\r
-\r
-       if(x($_POST,'tumblr-submit')) {\r
-\r
-               set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr']));\r
-               set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']);\r
-               set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault']));\r
-\r
-       }\r
-\r
-}\r
-\r
-function tumblr_post_local(&$a,&$b) {\r
-\r
-       // This can probably be changed to allow editing by pointing to a different API endpoint\r
-\r
-       if($b['edit'])\r
-               return;\r
-\r
-       if((! local_user()) || (local_user() != $b['uid']))\r
-               return;\r
-\r
-       if($b['private'] || $b['parent'])\r
-               return;\r
-\r
-    $tmbl_post   = intval(get_pconfig(local_user(),'tumblr','post'));\r
-\r
-       $tmbl_enable = (($tmbl_post && x($_REQUEST,'tumblr_enable')) ? intval($_REQUEST['tumblr_enable']) : 0);\r
-\r
-       if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'tumblr','post_by_default')))\r
-               $tmbl_enable = 1;\r
-\r
-    if(! $tmbl_enable)\r
-       return;\r
-\r
-    if(strlen($b['postopts']))\r
-       $b['postopts'] .= ',';\r
-     $b['postopts'] .= 'tumblr';\r
-}\r
-\r
-\r
-\r
-\r
-function tumblr_send(&$a,&$b) {\r
-\r
-    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))\r
-        return;\r
-\r
-    if(! strstr($b['postopts'],'tumblr'))\r
-        return;\r
-\r
-    if($b['parent'] != $b['id'])\r
-        return;\r
-\r
-       $oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token");\r
-       $oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret");\r
-       $page = get_pconfig($b['uid'], "tumblr", "page");\r
-       $tmbl_blog = 'blog/'.$page.'/post';\r
-\r
-       if($oauth_token && $oauth_token_secret && $tmbl_blog) {\r
-\r
-               require_once('include/bbcode.php');\r
-\r
-               $tag_arr = array();\r
-               $tags = '';\r
-               $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);\r
-\r
-               if($x) {\r
-                       foreach($matches as $mtch) {\r
-                               $tag_arr[] = $mtch[2];\r
-                       }\r
-               }\r
-               if(count($tag_arr))\r
-                       $tags = implode(',',$tag_arr);\r
-\r
-               $link = "";\r
-               $video = false;\r
-               $title = trim($b['title']);\r
-\r
-               // Checking for a bookmark\r
-               if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {\r
-                       $link = $matches[1];\r
-                       if ($title == '')\r
-                               $title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');\r
-\r
-                       $body = $b['body'];\r
-                       // splitting the text in two parts:\r
-                       // before and after the bookmark\r
-                       $pos = strpos($body, "[bookmark");\r
-                       $body1 = substr($body, 0, $pos);\r
-                       $body2 = substr($body, $pos);\r
-\r
-                       // Removing the bookmark\r
-                       $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);\r
-                       $body = $body1.$body2;\r
-\r
-                       $video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));\r
-               }\r
-\r
-               $params = array(\r
-                       'format' => 'html',\r
-                       'tweet' => 'off',\r
-                       'tags' => $tags);\r
-\r
-               if (($link != '') and $video) {\r
-                       $params['type'] = "video";\r
-                       $params['embed'] = $link;\r
-                       if ($title != '')\r
-                               $params['caption'] = '<h1><a href="'.$link.'">'.$title.\r
-                                                       "</a></h1><p>".bbcode($body, false, false)."</p>";\r
-                       else\r
-                               $params['caption'] = bbcode($body, false, false);\r
-               } else if (($link != '') and !$video) {\r
-                       $params['type'] = "link";\r
-                       $params['title'] = $title;\r
-                       $params['url'] = $link;\r
-                       $params['description'] = bbcode($b["body"], false, false);\r
-               } else {\r
-                       $params['type'] = "text";\r
-                       $params['title'] = $title;\r
-                       $params['body'] = bbcode($b['body'], false, false);\r
-               }\r
-\r
-               $consumer_key = get_config('tumblr','consumer_key');\r
-               $consumer_secret = get_config('tumblr','consumer_secret');\r
-\r
-               $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);\r
-\r
-               // Make an API call with the TumblrOAuth instance.\r
-               $x = $tum_oauth->post($tmbl_blog,$params);\r
-\r
-               $ret_code = $tum_oauth->http_code;\r
-\r
-               if($ret_code == 201)\r
-                       logger('tumblr_send: success');\r
-               elseif($ret_code == 403)\r
-                       logger('tumblr_send: authentication failure');\r
-               else\r
-                       logger('tumblr_send: general error: ' . print_r($x,true));\r
-\r
-       }\r
-}\r
+<?php
+
+/**
+ * Name: Tumblr Post Connector
+ * Description: Post to Tumblr
+ * Version: 1.0
+ * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
+ */
+
+require_once('library/OAuth1.php');
+require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+function tumblr_install() {
+    register_hook('post_local',           'addon/tumblr/tumblr.php', 'tumblr_post_local');
+    register_hook('notifier_normal',      'addon/tumblr/tumblr.php', 'tumblr_send');
+    register_hook('jot_networks',         'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+    register_hook('connector_settings',      'addon/tumblr/tumblr.php', 'tumblr_settings');
+    register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+
+}
+function tumblr_uninstall() {
+    unregister_hook('post_local',       'addon/tumblr/tumblr.php', 'tumblr_post_local');
+    unregister_hook('notifier_normal',  'addon/tumblr/tumblr.php', 'tumblr_send');
+    unregister_hook('jot_networks',     'addon/tumblr/tumblr.php', 'tumblr_jot_nets');
+    unregister_hook('connector_settings',      'addon/tumblr/tumblr.php', 'tumblr_settings');
+    unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
+}
+
+function tumblr_module() {}
+
+function tumblr_content(&$a) {
+
+       if(! local_user()) {
+               notice( t('Permission denied.') . EOL);
+               return '';
+       }
+
+       if (isset($a->argv[1]))
+               switch ($a->argv[1]) {
+                       case "connect":
+                               $o = tumblr_connect($a);
+                               break;
+                       case "callback":
+                               $o = tumblr_callback($a);
+                               break;
+                       default:
+                               $o = print_r($a->argv, true);
+                               break;
+               }
+       else
+               $o = tumblr_connect($a);
+
+       return $o;
+}
+
+function tumblr_connect($a) {
+       // Start a session.  This is necessary to hold on to  a few keys the callback script will also need
+       session_start();
+
+       // Include the TumblrOAuth library
+       //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+       // Define the needed keys
+       $consumer_key = get_config('tumblr','consumer_key');
+       $consumer_secret = get_config('tumblr','consumer_secret');
+
+       // The callback URL is the script that gets called after the user authenticates with tumblr
+       // In this example, it would be the included callback.php
+       $callback_url = $a->get_baseurl()."/tumblr/callback";
+
+       // Let's begin.  First we need a Request Token.  The request token is required to send the user
+       // to Tumblr's login page.
+
+       // Create a new instance of the TumblrOAuth library.  For this step, all we need to give the library is our
+       // Consumer Key and Consumer Secret
+       $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret);
+
+       // Ask Tumblr for a Request Token.  Specify the Callback URL here too (although this should be optional)
+       $request_token = $tum_oauth->getRequestToken($callback_url);
+
+       // Store the request token and Request Token Secret as out callback.php script will need this
+       $_SESSION['request_token'] = $token = $request_token['oauth_token'];
+       $_SESSION['request_token_secret'] = $request_token['oauth_token_secret'];
+
+       // Check the HTTP Code.  It should be a 200 (OK), if it's anything else then something didn't work.
+       switch ($tum_oauth->http_code) {
+         case 200:
+           // Ask Tumblr to give us a special address to their login page
+           $url = $tum_oauth->getAuthorizeURL($token);
+
+               // Redirect the user to the login URL given to us by Tumblr
+           header('Location: ' . $url);
+
+               // That's it for our side.  The user is sent to a Tumblr Login page and
+               // asked to authroize our app.  After that, Tumblr sends the user back to
+               // our Callback URL (callback.php) along with some information we need to get
+               // an access token.
+
+           break;
+       default:
+           // Give an error message
+           $o = 'Could not connect to Tumblr. Refresh the page or try again later.';
+       }
+       return($o);
+}
+
+function tumblr_callback($a) {
+
+       // Start a session, load the library
+       session_start();
+       //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
+
+       // Define the needed keys
+       $consumer_key = get_config('tumblr','consumer_key');
+       $consumer_secret = get_config('tumblr','consumer_secret');
+
+       // Once the user approves your app at Tumblr, they are sent back to this script.
+       // This script is passed two parameters in the URL, oauth_token (our Request Token)
+       // and oauth_verifier (Key that we need to get Access Token).
+       // We'll also need out Request Token Secret, which we stored in a session.
+
+       // Create instance of TumblrOAuth.
+       // It'll need our Consumer Key and Secret as well as our Request Token and Secret
+       $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $_SESSION['request_token'], $_SESSION['request_token_secret']);
+
+       // Ok, let's get an Access Token. We'll need to pass along our oauth_verifier which was given to us in the URL. 
+       $access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
+
+       // We're done with the Request Token and Secret so let's remove those.
+       unset($_SESSION['request_token']);
+       unset($_SESSION['request_token_secret']);
+
+       // Make sure nothing went wrong.
+       if (200 == $tum_oauth->http_code) {
+         // good to go
+       } else {
+         return('Unable to authenticate');
+       }
+
+       // What's next?  Now that we have an Access Token and Secret, we can make an API call.
+       set_pconfig(local_user(), "tumblr", "oauth_token", $access_token['oauth_token']);
+       set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
+
+       $o = t("You are now authenticated to tumblr.");
+       $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
+       return($o);
+}
+
+function tumblr_jot_nets(&$a,&$b) {
+    if(! local_user())
+        return;
+
+    $tmbl_post = get_pconfig(local_user(),'tumblr','post');
+    if(intval($tmbl_post) == 1) {
+        $tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');
+        $selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
+        $b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> '
+            . t('Post to Tumblr') . '</div>';
+    }
+}
+
+
+function tumblr_settings(&$a,&$s) {
+
+    if(! local_user())
+        return;
+
+    /* Add our stylesheet to the page so we can make our settings look nice */
+
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/tumblr/tumblr.css' . '" media="all" />' . "\r\n";
+
+    /* Get the current state of our config variables */
+
+    $enabled = get_pconfig(local_user(),'tumblr','post');
+
+    $checked = (($enabled) ? ' checked="checked" ' : '');
+
+    $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default');
+
+    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+    /* Add some HTML to the existing form */
+
+    $s .= '<div class="settings-block">';
+    $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
+
+    $s .= '<div id="tumblr-username-wrapper">';
+    $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="tumblr-enable-wrapper">';
+    $s .= '<label id="tumblr-enable-label" for="tumblr-checkbox">' . t('Enable Tumblr Post Plugin') . '</label>';
+    $s .= '<input id="tumblr-checkbox" type="checkbox" name="tumblr" value="1" ' . $checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="tumblr-bydefault-wrapper">';
+    $s .= '<label id="tumblr-bydefault-label" for="tumblr-bydefault">' . t('Post to Tumblr by default') . '</label>';
+    $s .= '<input id="tumblr-bydefault" type="checkbox" name="tumblr_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token");
+    $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret");
+
+    $s .= '<div id="tumblr-password-wrapper">';
+    if (($oauth_token != "") and ($oauth_token_secret != "")) {
+
+       $page = get_pconfig(local_user(),'tumblr','page');
+       $consumer_key = get_config('tumblr','consumer_key');
+       $consumer_secret = get_config('tumblr','consumer_secret');
+
+       $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+
+       $userinfo = $tum_oauth->get('user/info');
+
+       $blogs = array();
+
+       $s .= t("Post to page:")."<select name='tumblr_page'>";
+       foreach($userinfo->response->user->blogs as $blog) {
+               $blogurl = substr(str_replace(array("http://", "https://"), array("", ""), $blog->url), 0, -1);
+               if ($page == $blogurl)
+                       $s .= "<option value='".$blogurl."' selected>".$blogurl."</option>";
+               else
+                       $s .= "<option value='".$blogurl."'>".$blogurl."</option>";
+       }
+
+       $s .= "</select>";
+    } else
+       $s .= t("You are not authenticated to tumblr");
+    $s .= '</div><div class="clear"></div>';
+
+    /* provide a submit button */
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="tumblr-submit" name="tumblr-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+}
+
+
+function tumblr_settings_post(&$a,&$b) {
+
+       if(x($_POST,'tumblr-submit')) {
+
+               set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr']));
+               set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']);
+               set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault']));
+
+       }
+
+}
+
+function tumblr_post_local(&$a,&$b) {
+
+       // This can probably be changed to allow editing by pointing to a different API endpoint
+
+       if($b['edit'])
+               return;
+
+       if((! local_user()) || (local_user() != $b['uid']))
+               return;
+
+       if($b['private'] || $b['parent'])
+               return;
+
+    $tmbl_post   = intval(get_pconfig(local_user(),'tumblr','post'));
+
+       $tmbl_enable = (($tmbl_post && x($_REQUEST,'tumblr_enable')) ? intval($_REQUEST['tumblr_enable']) : 0);
+
+       if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'tumblr','post_by_default')))
+               $tmbl_enable = 1;
+
+    if(! $tmbl_enable)
+       return;
+
+    if(strlen($b['postopts']))
+       $b['postopts'] .= ',';
+     $b['postopts'] .= 'tumblr';
+}
+
+
+
+
+function tumblr_send(&$a,&$b) {
+
+    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+        return;
+
+    if(! strstr($b['postopts'],'tumblr'))
+        return;
+
+    if($b['parent'] != $b['id'])
+        return;
+
+       $oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token");
+       $oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret");
+       $page = get_pconfig($b['uid'], "tumblr", "page");
+       $tmbl_blog = 'blog/'.$page.'/post';
+
+       if($oauth_token && $oauth_token_secret && $tmbl_blog) {
+
+               require_once('include/bbcode.php');
+
+               $tag_arr = array();
+               $tags = '';
+               $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
+
+               if($x) {
+                       foreach($matches as $mtch) {
+                               $tag_arr[] = $mtch[2];
+                       }
+               }
+               if(count($tag_arr))
+                       $tags = implode(',',$tag_arr);
+
+               $link = "";
+               $video = false;
+               $title = trim($b['title']);
+
+               // Checking for a bookmark
+               if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
+                       $link = $matches[1];
+                       if ($title == '')
+                               $title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
+
+                       $body = $b['body'];
+                       // splitting the text in two parts:
+                       // before and after the bookmark
+                       $pos = strpos($body, "[bookmark");
+                       $body1 = substr($body, 0, $pos);
+                       $body2 = substr($body, $pos);
+
+                       // Removing the bookmark
+                       $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
+                       $body = $body1.$body2;
+
+                       $video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));
+               }
+
+               $params = array(
+                       'format' => 'html',
+                       'tweet' => 'off',
+                       'tags' => $tags);
+
+               if (($link != '') and $video) {
+                       $params['type'] = "video";
+                       $params['embed'] = $link;
+                       if ($title != '')
+                               $params['caption'] = '<h1><a href="'.$link.'">'.$title.
+                                                       "</a></h1><p>".bbcode($body, false, false)."</p>";
+                       else
+                               $params['caption'] = bbcode($body, false, false);
+               } else if (($link != '') and !$video) {
+                       $params['type'] = "link";
+                       $params['title'] = $title;
+                       $params['url'] = $link;
+                       $params['description'] = bbcode($b["body"], false, false);
+               } else {
+                       $params['type'] = "text";
+                       $params['title'] = $title;
+                       $params['body'] = bbcode($b['body'], false, false);
+               }
+
+               $consumer_key = get_config('tumblr','consumer_key');
+               $consumer_secret = get_config('tumblr','consumer_secret');
+
+               $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
+
+               // Make an API call with the TumblrOAuth instance.
+               $x = $tum_oauth->post($tmbl_blog,$params);
+
+               $ret_code = $tum_oauth->http_code;
+
+               if($ret_code == 201)
+                       logger('tumblr_send: success');
+               elseif($ret_code == 403)
+                       logger('tumblr_send: authentication failure');
+               else
+                       logger('tumblr_send: general error: ' . print_r($x,true));
+
+       }
+}
+
diff --git a/twitter/admin.tpl b/twitter/admin.tpl
deleted file mode 100755 (executable)
index a83eb07..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-{{ 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>
index ee3bd0fbda5467dcc85897f8e327a5bc9ff905c1..6cb2d9cd8a9ca934369d4f4f78162e61cce4edc6 100755 (executable)
@@ -504,8 +504,14 @@ function twitter_plugin_admin_post(&$a){
        info( t('Settings updated.'). EOL );
 }
 function twitter_plugin_admin(&$a, &$o){
-       $t = file_get_contents( dirname(__file__). "/admin.tpl" );
-       $o = replace_macros($t, array(
+       $t = get_markup_template( "admin.tpl", "addon/twitter/" );
+
+       $includes = array(
+               '$field_input' => 'field_input.tpl',
+       );
+       $includes = set_template_includes($a->theme['template_engine'], $includes);
+
+       $o = replace_macros($t, $includes + array(
                '$submit' => t('Submit'),
                                                                // name, label, value, help, [extra values]
                '$consumerkey' => array('consumerkey', t('Consumer key'),  get_config('twitter', 'consumerkey' ), ''),
diff --git a/twitter/view/admin.tpl b/twitter/view/admin.tpl
new file mode 100755 (executable)
index 0000000..d3649fc
--- /dev/null
@@ -0,0 +1,3 @@
+{{ inc $field_input with $field=$consumerkey }}{{ endinc }}
+{{ inc $field_input 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
new file mode 100644 (file)
index 0000000..ad1e07e
--- /dev/null
@@ -0,0 +1,3 @@
+{{include file="file:{{$field_input}}" field=$consumerkey}}
+{{include file="file:{{$field_input}}" field=$consumersecret}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/uhremotestorage/settings.tpl b/uhremotestorage/settings.tpl
deleted file mode 100755 (executable)
index 22d7d60..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="settings-block">
-       <h3>$title</h3>
-       <p>$desc</p>
-       {{ 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>
index a2a8cc3dd107cf4ccdc0ca2e6c5416b82e14eb0d..d7d036922f81c3c5c0edd26fcaefeca0a9ec96f3 100755 (executable)
@@ -78,8 +78,16 @@ function uhremotestorage_settings($a, &$s){
                'Dropbox' => 'Dropbox',
        );
        */
-       $tpl = file_get_contents(dirname(__file__)."/settings.tpl");
-       $s .= replace_macros($tpl, array(
+//     $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(
                '$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
new file mode 100755 (executable)
index 0000000..51650c8
--- /dev/null
@@ -0,0 +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 }}
+       <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
new file mode 100644 (file)
index 0000000..217f069
--- /dev/null
@@ -0,0 +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}}
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>  
+
+</div>
diff --git a/widgets/settings.tpl b/widgets/settings.tpl
deleted file mode 100755 (executable)
index 9d0f21d..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<div class="settings-block">
-       <h3 class="settings-heading">$title</h3>
-       <div class='field noedit'>
-               <label>$label</label>
-               <tt>$key</tt>
-       </div>
-       
-       <div class="settings-submit-wrapper">
-               <input type="submit" value="$submit" class="settings-submit" name="widgets-submit" />
-       </div>
-       
-       <h4>$widgets_h</h4>
-       <ul>
-               {{ for $widgets as $w }}
-                       <li><a href="$baseurl/widgets/$w.0/?k=$key&p=1">$w.1</a></li>
-               {{ endfor }}
-       </ul>
-       
-</div>
diff --git a/widgets/view/settings.tpl b/widgets/view/settings.tpl
new file mode 100755 (executable)
index 0000000..9d0f21d
--- /dev/null
@@ -0,0 +1,19 @@
+<div class="settings-block">
+       <h3 class="settings-heading">$title</h3>
+       <div class='field noedit'>
+               <label>$label</label>
+               <tt>$key</tt>
+       </div>
+       
+       <div class="settings-submit-wrapper">
+               <input type="submit" value="$submit" class="settings-submit" name="widgets-submit" />
+       </div>
+       
+       <h4>$widgets_h</h4>
+       <ul>
+               {{ for $widgets as $w }}
+                       <li><a href="$baseurl/widgets/$w.0/?k=$key&p=1">$w.1</a></li>
+               {{ endfor }}
+       </ul>
+       
+</div>
diff --git a/widgets/view/smarty3/settings.tpl b/widgets/view/smarty3/settings.tpl
new file mode 100644 (file)
index 0000000..017fa12
--- /dev/null
@@ -0,0 +1,19 @@
+<div class="settings-block">
+       <h3 class="settings-heading">{{$title}}</h3>
+       <div class='field noedit'>
+               <label>{{$label}}</label>
+               <tt>{{$key}}</tt>
+       </div>
+       
+       <div class="settings-submit-wrapper">
+               <input type="submit" value="{{$submit}}" class="settings-submit" name="widgets-submit" />
+       </div>
+       
+       <h4>{{$widgets_h}}</h4>
+       <ul>
+               {{foreach $widgets as $w}}
+                       <li><a href="{{$baseurl}}/widgets/{{$w.0}}/?k={{$key}}&p=1">{{$w.1}}</a></li>
+               {{/foreach}}
+       </ul>
+       
+</div>
diff --git a/widgets/view/smarty3/widget_like.tpl b/widgets/view/smarty3/widget_like.tpl
new file mode 100644 (file)
index 0000000..ad52957
--- /dev/null
@@ -0,0 +1,3 @@
+<style>body {font-size: 0.8em; margin: 0px; padding: 0px;}</style>
+<span class='f9k_like' title="{{$strlike}}">{{$like}} <img src="{{$baseurl}}/images/like.gif" alt="like"/></span> 
+<span class='f9k_dislike' title="{{$strdislike}}">{{$dislike}} <img src="{{$baseurl}}/images/dislike.gif" alt="dislike"/></span>
diff --git a/widgets/view/widget_like.tpl b/widgets/view/widget_like.tpl
new file mode 100755 (executable)
index 0000000..3c26d1d
--- /dev/null
@@ -0,0 +1,3 @@
+<style>body {font-size: 0.8em; margin: 0px; padding: 0px;}</style>
+<span class='f9k_like' title="$strlike">$like <img src="$baseurl/images/like.gif" alt="like"/></span> 
+<span class='f9k_dislike' title="$strdislike">$dislike <img src="$baseurl/images/dislike.gif" alt="dislike"/></span>
index 649d4a767ec1b4d65311dc83ae304953c614a731..8f356da976b856b9326a3ceb217be18086314802 100755 (executable)
@@ -52,7 +52,8 @@ function like_widget_content(&$a, $conf){
        
        $o = "";
        
-       $t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
+#      $t = file_get_contents( dirname(__file__). "/widget_like.tpl" );
+       $t = get_markup_template("widget_like.tpl", "addon/widgets/");
        $o .= replace_macros($t, array(
                '$like'         => $likes,
                '$strlike'      => sprintf( tt("%d person likes this", "%d people like this", $likes), $likes),
diff --git a/widgets/widget_like.tpl b/widgets/widget_like.tpl
deleted file mode 100755 (executable)
index 3c26d1d..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-<style>body {font-size: 0.8em; margin: 0px; padding: 0px;}</style>
-<span class='f9k_like' title="$strlike">$like <img src="$baseurl/images/like.gif" alt="like"/></span> 
-<span class='f9k_dislike' title="$strdislike">$dislike <img src="$baseurl/images/dislike.gif" alt="dislike"/></span>
index 47a6e48a6fe6deea6903fb25b3d8f4244206112a..72534ce3bb75863556051ffbbbe91c13738eacc0 100755 (executable)
@@ -51,7 +51,8 @@ function widgets_settings(&$a,&$o) {
 
        
        
-       $t = file_get_contents( dirname(__file__). "/settings.tpl" );
+#      $t = file_get_contents( dirname(__file__). "/settings.tpl" );
+       $t = get_markup_template("settings.tpl", "addon/widgets/");
        $o .= replace_macros($t, array(
                '$submit' => t('Generate new key'),
                '$baseurl' => $a->get_baseurl(),