friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

update addons to support Smarty3

pull/88/head
Zach Prezkuta 2012-12-22 13:36:35 -07:00
parent 66334ec5cb
commit 3da6f1471c
62 changed files with 778 additions and 468 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
altpager/altpager.php
View File

@ -93,8 +93,14 @@ function altpager_settings(&$a,&$s) {
} }
function altpager_plugin_admin(&$a, &$o){ function altpager_plugin_admin(&$a, &$o){
$t = file_get_contents( "addon/altpager/admin.tpl" ); $t = get_markup_template( "admin.tpl", "addon/altpager/" );
$o = replace_macros($t, array(
$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'), '$submit' => t('Submit'),
'$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'), get_config('alt_pager', 'global') == 1), '$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) '$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)); set_config('alt_pager','global',($choice == 1 ? 1 : 0));
info( t('Settings updated.'). EOL ); info( t('Settings updated.'). EOL );
} }

3
altpager/view/admin.tpl Executable file
View File

@ -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>

0
altpager/admin.tpl → altpager/view/admin.tpl.old
View File

3
altpager/view/smarty3/admin.tpl Normal file
View File

@ -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>

10
blackout/blackout.php
View File

@ -93,8 +93,14 @@ function blackout_plugin_admin(&$a, &$o) {
if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; } if (! is_string($myend)) { $myend = "YYYY-MM-DD:hhmm"; }
$myurl = get_config('blackout','url'); $myurl = get_config('blackout','url');
if (! is_string($myurl)) { $myurl = "http://www.example.com"; } if (! is_string($myurl)) { $myurl = "http://www.example.com"; }
$t = file_get_contents( dirname(__file__)."/admin.tpl" ); $t = get_markup_template( "admin.tpl", "addon/blackout/" );
$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'), '$submit' => t('Submit'),
'$rurl' => array("rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"), '$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"), '$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"),

6
blackout/admin.tpl → blackout/view/admin.tpl
View File

@ -1,6 +1,6 @@
{{ inc field_input.tpl with $field=$startdate }}{{ endinc }} {{ inc $field_input with $field=$startdate }}{{ endinc }}
{{ inc field_input.tpl with $field=$enddate }}{{ endinc }} {{ inc $field_input with $field=$enddate }}{{ endinc }}
{{ inc field_input.tpl with $field=$rurl }}{{ endinc }} {{ inc $field_input with $field=$rurl }}{{ endinc }}
<div style="border: 2px solid #f00; padding: 10px; margin: <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 10px;font-size: 1.2em;"><strong>Note</strong>: The redirect will be active from the moment you

11
blackout/view/smarty3/admin.tpl Normal file
View File

@ -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>

9
communityhome/communityhome.php
View File

@ -47,7 +47,8 @@ function communityhome_home(&$a, &$o){
0, 0,
12 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)) { if(count($r)) {
$photo = 'thumb'; $photo = 'thumb';
foreach($r as $rr) { foreach($r as $rr) {
@ -114,7 +115,8 @@ function communityhome_home(&$a, &$o){
if(count($r)) { 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) { foreach($r as $rr) {
$photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id']; $photo_page = $a->get_baseurl() . '/photos/' . $rr['nickname'] . '/image/' . $rr['resource-id'];
$photo_url = $a->get_baseurl() . '/photo/' . $rr['resource-id'] . '-' . $rr['scale'] .'.jpg'; $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); $a->page['aside'] = replace_macros($tpl, $aside);
$o = '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>'; $o = '<h1>' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '</h1>';

0
communityhome/communityhome.tpl → communityhome/view/communityhome.tpl
View File

0
communityhome/directory_item.tpl → communityhome/view/directory_item.tpl
View File

70
communityhome/view/smarty3/communityhome.tpl Normal file
View File

@ -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}}

10
communityhome/view/smarty3/directory_item.tpl Normal file
View File

@ -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>

3
forumdirectory/forumdirectory.php
View File

@ -163,7 +163,8 @@ function forumdirectory_content(&$a) {
$about = ((x($profile,'about') == 1) ? t('About:') : False); $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( $entry = replace_macros($tpl,array(
'$id' => $rr['id'], '$id' => $rr['id'],

0
forumdirectory/forumdirectory_item.tpl → forumdirectory/view/forumdirectory_item.tpl
View File

42
forumdirectory/view/smarty3/forumdirectory_item.tpl Normal file
View File

@ -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>

3
gravatar/admin.tpl
View File

@ -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>

10
gravatar/gravatar.php
View File

@ -55,7 +55,7 @@ function gravatar_lookup($a, &$b) {
* Display admin settings for this addon * Display admin settings for this addon
*/ */
function gravatar_plugin_admin (&$a, &$o) { 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'); $default_avatar = get_config('gravatar', 'default_img');
$rating = get_config('gravatar', 'rating'); $rating = get_config('gravatar', 'rating');
@ -91,7 +91,13 @@ function gravatar_plugin_admin (&$a, &$o) {
// output Gravatar settings // output Gravatar settings
$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("gravatarsave") .'">'; $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'), '$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), '$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), '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings),

3
gravatar/view/admin.tpl Normal file
View File

@ -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>

3
gravatar/view/smarty3/admin.tpl Normal file
View File

@ -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>

7
impressum/admin.tpl
View File

@ -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>

11
impressum/impressum.php
View File

@ -78,8 +78,15 @@ function impressum_plugin_admin_post (&$a) {
info( t('Settings updated.'). EOL ); info( t('Settings updated.'). EOL );
} }
function impressum_plugin_admin (&$a, &$o) { function impressum_plugin_admin (&$a, &$o) {
$t = file_get_contents( dirname(__file__). "/admin.tpl" ); $t = get_markup_template( "admin.tpl", "addon/impressum/" );
$o = replace_macros($t, array(
$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'), '$submit' => t('Submit'),
'$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')), '$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.')), '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')),

7
impressum/view/admin.tpl Executable file
View File

@ -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>

7
impressum/view/smarty3/admin.tpl Normal file
View File

@ -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>

10
libravatar/libravatar.php
View File

@ -60,7 +60,7 @@ function libravatar_lookup($a, &$b) {
* Display admin settings for this addon * Display admin settings for this addon
*/ */
function libravatar_plugin_admin (&$a, &$o) { 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'); $default_avatar = get_config('libravatar', 'default_img');
@ -95,7 +95,13 @@ function libravatar_plugin_admin (&$a, &$o) {
// output Libravatar settings // output Libravatar settings
$o .= '<input type="hidden" name="form_security_token" value="' .get_form_security_token("libravatarsave") .'">'; $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'), '$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), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars),
)); ));

2
libravatar/admin.tpl → libravatar/view/admin.tpl
View File

@ -1,2 +1,2 @@
{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} {{ inc $field_select with $field=$default_avatar}}{{ endinc }}
<div class="submit"><input type="submit" value="$submit" /></div> <div class="submit"><input type="submit" value="$submit" /></div>

2
libravatar/view/smarty3/admin.tpl Normal file
View File

@ -0,0 +1,2 @@
{{include file="file:{{$field_select}}" field=$default_avatar}}
<div class="submit"><input type="submit" value="{{$submit}}" /></div>

18
mathjax/mathjax.php
View File

@ -66,11 +66,17 @@ function mathjax_plugin_admin_post (&$a) {
info( t('Settings updated.'). EOL); info( t('Settings updated.'). EOL);
} }
function mathjax_plugin_admin (&$a, &$o) { function mathjax_plugin_admin (&$a, &$o) {
$t = file_get_contents( dirname(__file__)."/admin.tpl"); $t = get_markup_template( "admin.tpl", "addon/mathjax/" );
if (get_config('mathjax','baseurl','') == '') { if (get_config('mathjax','baseurl','') == '') {
set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML');
} }
$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(
'$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.')), '$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.')),
)); ));
} }

2
mathjax/admin.tpl → mathjax/view/admin.tpl
View File

@ -1,2 +1,2 @@
{{ inc field_input.tpl with $field=$baseurl }}{{endinc }} {{ inc $field_input with $field=$baseurl }}{{endinc }}
<div class="submit"><input type="submit" name="page_site" value="$submit" /></div> <div class="submit"><input type="submit" name="page_site" value="$submit" /></div>

2
mathjax/view/smarty3/admin.tpl Normal file
View File

@ -0,0 +1,2 @@
{{include file="file:{{$field_input}}" field=$baseurl}}
<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>

3
openstreetmap/admin.tpl
View File

@ -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>

10
openstreetmap/openstreetmap.php
View File

@ -58,7 +58,8 @@ function openstreetmap_location($a, &$item) {
function openstreetmap_plugin_admin (&$a, &$o) { 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'); $tmsserver = get_config('openstreetmap','tmsserver');
if(! $tmsserver) if(! $tmsserver)
$tmsserver = 'http://openstreetmap.org'; $tmsserver = 'http://openstreetmap.org';
@ -66,7 +67,12 @@ function openstreetmap_plugin_admin (&$a, &$o) {
if(! $zoom) if(! $zoom)
$zoom = 17; $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'), '$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>')), '$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)')), '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')),

3
openstreetmap/view/admin.tpl Normal file
View File

@ -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>

3
openstreetmap/view/smarty3/admin.tpl Normal file
View File

@ -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>

5
piwik/admin.tpl
View File

@ -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>

12
piwik/piwik.php
View File

@ -84,8 +84,16 @@ function piwik_analytics($a,&$b) {
} }
} }
function piwik_plugin_admin (&$a, &$o) { function piwik_plugin_admin (&$a, &$o) {
$t = file_get_contents( dirname(__file__)."/admin.tpl"); # $t = file_get_contents( dirname(__file__)."/admin.tpl");
$o = replace_macros( $t, array( $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'), '$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)')), '$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' ), ''), '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''),

5
piwik/view/admin.tpl Executable file
View File

@ -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>

5
piwik/view/smarty3/admin.tpl Normal file
View File

@ -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>

3
remote_permissions/admin.tpl
View File

@ -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>

14
remote_permissions/remote_permissions.php
View File

@ -39,7 +39,8 @@ function remote_permissions_settings(&$a,&$o) {
/* Add some HTML to the existing form */ /* 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( $o .= replace_macros($t, array(
'$remote_perms_title' => t('Remote Permissions Settings'), '$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'), '$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){ function remote_permissions_plugin_admin(&$a, &$o){
$t = file_get_contents( "addon/remote_permissions/admin.tpl" ); // $t = file_get_contents( "addon/remote_permissions/admin.tpl" );
$o = replace_macros($t, array( $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'), '$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), '$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) '$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'), get_config('remote_perms', 'global') == 0)

3
remote_permissions/view/admin.tpl Normal file
View File

@ -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>

0
remote_permissions/settings.tpl → remote_permissions/view/settings.tpl
View File

3
remote_permissions/view/smarty3/admin.tpl Normal file
View File

@ -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>

8
remote_permissions/view/smarty3/settings.tpl Normal file
View File

@ -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>

16
statusnet/admin.tpl
View File

@ -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>

11
statusnet/statusnet.php
View File

@ -698,8 +698,15 @@ function statusnet_plugin_admin(&$a, &$o){
); );
$t = file_get_contents( dirname(__file__). "/admin.tpl" ); $t = get_markup_template( "admin.tpl", "addon/statusnet/" );
$o = replace_macros($t, array(
$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'), '$submit' => t('Submit'),
'$sites' => $sitesform, '$sites' => $sitesform,

16
statusnet/view/admin.tpl Executable file
View File

@ -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>

16
statusnet/view/smarty3/admin.tpl Normal file
View File

@ -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>

759
tumblr/tumblr.php
View File

@ -1,379 +1,380 @@
<?php <?php
/** /**
* Name: Tumblr Post Connector * Name: Tumblr Post Connector
* Description: Post to Tumblr * Description: Post to Tumblr
* Version: 1.0 * Version: 1.0
* Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Author: Mike Macgirvin <http://macgirvin.com/profile/mike>
*/ */
require_once('library/OAuth1.php'); require_once('library/OAuth1.php');
require_once('addon/tumblr/tumblroauth/tumblroauth.php'); require_once('addon/tumblr/tumblroauth/tumblroauth.php');
function tumblr_install() { function tumblr_install() {
register_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); register_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
register_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); register_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
register_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); 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', 'addon/tumblr/tumblr.php', 'tumblr_settings');
register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); register_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
} }
function tumblr_uninstall() { function tumblr_uninstall() {
unregister_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local'); unregister_hook('post_local', 'addon/tumblr/tumblr.php', 'tumblr_post_local');
unregister_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send'); unregister_hook('notifier_normal', 'addon/tumblr/tumblr.php', 'tumblr_send');
unregister_hook('jot_networks', 'addon/tumblr/tumblr.php', 'tumblr_jot_nets'); 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', 'addon/tumblr/tumblr.php', 'tumblr_settings');
unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post'); unregister_hook('connector_settings_post', 'addon/tumblr/tumblr.php', 'tumblr_settings_post');
} }
function tumblr_module() {} function tumblr_module() {}
function tumblr_content(&$a) { function tumblr_content(&$a) {
if(! local_user()) { if(! local_user()) {
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
return ''; return '';
} }
if (isset($a->argv[1])) if (isset($a->argv[1]))
switch ($a->argv[1]) { switch ($a->argv[1]) {
case "connect": case "connect":
$o = tumblr_connect($a); $o = tumblr_connect($a);
break; break;
case "callback": case "callback":
$o = tumblr_callback($a); $o = tumblr_callback($a);
break; break;
default: default:
$o = print_r($a->argv, true); $o = print_r($a->argv, true);
break; break;
} }
else else
$o = tumblr_connect($a); $o = tumblr_connect($a);
return $o; return $o;
} }
function tumblr_connect($a) { function tumblr_connect($a) {
// Start a session. This is necessary to hold on to a few keys the callback script will also need // Start a session. This is necessary to hold on to a few keys the callback script will also need
session_start(); session_start();
// Include the TumblrOAuth library // Include the TumblrOAuth library
//require_once('addon/tumblr/tumblroauth/tumblroauth.php'); //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys // Define the needed keys
$consumer_key = get_config('tumblr','consumer_key'); $consumer_key = get_config('tumblr','consumer_key');
$consumer_secret = get_config('tumblr','consumer_secret'); $consumer_secret = get_config('tumblr','consumer_secret');
// The callback URL is the script that gets called after the user authenticates with tumblr // 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 // In this example, it would be the included callback.php
$callback_url = $a->get_baseurl()."/tumblr/callback"; $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 // Let's begin. First we need a Request Token. The request token is required to send the user
// to Tumblr's login page. // 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 // 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 // Consumer Key and Consumer Secret
$tum_oauth = new TumblrOAuth($consumer_key, $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) // Ask Tumblr for a Request Token. Specify the Callback URL here too (although this should be optional)
$request_token = $tum_oauth->getRequestToken($callback_url); $request_token = $tum_oauth->getRequestToken($callback_url);
// Store the request token and Request Token Secret as out callback.php script will need this // 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'] = $token = $request_token['oauth_token'];
$_SESSION['request_token_secret'] = $request_token['oauth_token_secret']; $_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. // 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) { switch ($tum_oauth->http_code) {
case 200: case 200:
// Ask Tumblr to give us a special address to their login page // Ask Tumblr to give us a special address to their login page
$url = $tum_oauth->getAuthorizeURL($token); $url = $tum_oauth->getAuthorizeURL($token);
// Redirect the user to the login URL given to us by Tumblr // Redirect the user to the login URL given to us by Tumblr
header('Location: ' . $url); header('Location: ' . $url);
// That's it for our side. The user is sent to a Tumblr Login page and // 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 // 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 // our Callback URL (callback.php) along with some information we need to get
// an access token. // an access token.
break; break;
default: default:
// Give an error message // Give an error message
$o = 'Could not connect to Tumblr. Refresh the page or try again later.'; $o = 'Could not connect to Tumblr. Refresh the page or try again later.';
} }
return($o); return($o);
} }
function tumblr_callback($a) { function tumblr_callback($a) {
// Start a session, load the library // Start a session, load the library
session_start(); session_start();
//require_once('addon/tumblr/tumblroauth/tumblroauth.php'); //require_once('addon/tumblr/tumblroauth/tumblroauth.php');
// Define the needed keys // Define the needed keys
$consumer_key = get_config('tumblr','consumer_key'); $consumer_key = get_config('tumblr','consumer_key');
$consumer_secret = get_config('tumblr','consumer_secret'); $consumer_secret = get_config('tumblr','consumer_secret');
// Once the user approves your app at Tumblr, they are sent back to this script. // 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) // 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). // 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. // We'll also need out Request Token Secret, which we stored in a session.
// Create instance of TumblrOAuth. // Create instance of TumblrOAuth.
// It'll need our Consumer Key and Secret as well as our Request Token and Secret // 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']); $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. // 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']); $access_token = $tum_oauth->getAccessToken($_REQUEST['oauth_verifier']);
// We're done with the Request Token and Secret so let's remove those. // We're done with the Request Token and Secret so let's remove those.
unset($_SESSION['request_token']); unset($_SESSION['request_token']);
unset($_SESSION['request_token_secret']); unset($_SESSION['request_token_secret']);
// Make sure nothing went wrong. // Make sure nothing went wrong.
if (200 == $tum_oauth->http_code) { if (200 == $tum_oauth->http_code) {
// good to go // good to go
} else { } else {
return('Unable to authenticate'); return('Unable to authenticate');
} }
// What's next? Now that we have an Access Token and Secret, we can make an API call. // 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", $access_token['oauth_token']);
set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']); set_pconfig(local_user(), "tumblr", "oauth_token_secret", $access_token['oauth_token_secret']);
$o = t("You are now authenticated to tumblr."); $o = t("You are now authenticated to tumblr.");
$o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>'; $o .= '<br /><a href="'.$a->get_baseurl().'/settings/connectors">'.t("return to the connector page").'</a>';
return($o); return($o);
} }
function tumblr_jot_nets(&$a,&$b) { function tumblr_jot_nets(&$a,&$b) {
if(! local_user()) if(! local_user())
return; return;
$tmbl_post = get_pconfig(local_user(),'tumblr','post'); $tmbl_post = get_pconfig(local_user(),'tumblr','post');
if(intval($tmbl_post) == 1) { if(intval($tmbl_post) == 1) {
$tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default'); $tmbl_defpost = get_pconfig(local_user(),'tumblr','post_by_default');
$selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : ''); $selected = ((intval($tmbl_defpost) == 1) ? ' checked="checked" ' : '');
$b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> ' $b .= '<div class="profile-jot-net"><input type="checkbox" name="tumblr_enable"' . $selected . ' value="1" /> '
. t('Post to Tumblr') . '</div>'; . t('Post to Tumblr') . '</div>';
} }
} }
function tumblr_settings(&$a,&$s) { function tumblr_settings(&$a,&$s) {
if(! local_user()) if(! local_user())
return; return;
/* Add our stylesheet to the page so we can make our settings look nice */ /* 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"; $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 */ /* Get the current state of our config variables */
$enabled = get_pconfig(local_user(),'tumblr','post'); $enabled = get_pconfig(local_user(),'tumblr','post');
$checked = (($enabled) ? ' checked="checked" ' : ''); $checked = (($enabled) ? ' checked="checked" ' : '');
$def_enabled = get_pconfig(local_user(),'tumblr','post_by_default'); $def_enabled = get_pconfig(local_user(),'tumblr','post_by_default');
$def_checked = (($def_enabled) ? ' checked="checked" ' : ''); $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
/* Add some HTML to the existing form */ /* Add some HTML to the existing form */
$s .= '<div class="settings-block">'; $s .= '<div class="settings-block">';
$s .= '<h3>' . t('Tumblr Post Settings') . '</h3>'; $s .= '<h3>' . t('Tumblr Post Settings') . '</h3>';
$s .= '<div id="tumblr-username-wrapper">'; $s .= '<div id="tumblr-username-wrapper">';
$s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>'; $s .= '<a href="'.$a->get_baseurl().'/tumblr/connect">'.t("(Re-)Authenticate your tumblr page").'</a>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div id="tumblr-enable-wrapper">'; $s .= '<div id="tumblr-enable-wrapper">';
$s .= '<label id="tumblr-enable-label" for="tumblr-checkbox">' . t('Enable Tumblr Post Plugin') . '</label>'; $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 .= '<input id="tumblr-checkbox" type="checkbox" name="tumblr" value="1" ' . $checked . '/>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$s .= '<div id="tumblr-bydefault-wrapper">'; $s .= '<div id="tumblr-bydefault-wrapper">';
$s .= '<label id="tumblr-bydefault-label" for="tumblr-bydefault">' . t('Post to Tumblr by default') . '</label>'; $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 .= '<input id="tumblr-bydefault" type="checkbox" name="tumblr_bydefault" value="1" ' . $def_checked . '/>';
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
$oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token"); $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token");
$oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret"); $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret");
$s .= '<div id="tumblr-password-wrapper">'; $s .= '<div id="tumblr-password-wrapper">';
if (($oauth_token != "") and ($oauth_token_secret != "")) { if (($oauth_token != "") and ($oauth_token_secret != "")) {
$page = get_pconfig(local_user(),'tumblr','page'); $page = get_pconfig(local_user(),'tumblr','page');
$consumer_key = get_config('tumblr','consumer_key'); $consumer_key = get_config('tumblr','consumer_key');
$consumer_secret = get_config('tumblr','consumer_secret'); $consumer_secret = get_config('tumblr','consumer_secret');
$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
$userinfo = $tum_oauth->get('user/info'); $userinfo = $tum_oauth->get('user/info');
$blogs = array(); $blogs = array();
$s .= t("Post to page:")."<select name='tumblr_page'>"; $s .= t("Post to page:")."<select name='tumblr_page'>";
foreach($userinfo->response->user->blogs as $blog) { foreach($userinfo->response->user->blogs as $blog) {
$blogurl = substr(str_replace(array("http://", "https://"), array("", ""), $blog->url), 0, -1); $blogurl = substr(str_replace(array("http://", "https://"), array("", ""), $blog->url), 0, -1);
if ($page == $blogurl) if ($page == $blogurl)
$s .= "<option value='".$blogurl."' selected>".$blogurl."</option>"; $s .= "<option value='".$blogurl."' selected>".$blogurl."</option>";
else else
$s .= "<option value='".$blogurl."'>".$blogurl."</option>"; $s .= "<option value='".$blogurl."'>".$blogurl."</option>";
} }
$s .= "</select>"; $s .= "</select>";
} else } else
$s .= t("You are not authenticated to tumblr"); $s .= t("You are not authenticated to tumblr");
$s .= '</div><div class="clear"></div>'; $s .= '</div><div class="clear"></div>';
/* provide a submit button */ /* 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>'; $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) { function tumblr_settings_post(&$a,&$b) {
if(x($_POST,'tumblr-submit')) { if(x($_POST,'tumblr-submit')) {
set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr'])); set_pconfig(local_user(),'tumblr','post',intval($_POST['tumblr']));
set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']); set_pconfig(local_user(),'tumblr','page',$_POST['tumblr_page']);
set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault'])); set_pconfig(local_user(),'tumblr','post_by_default',intval($_POST['tumblr_bydefault']));
} }
} }
function tumblr_post_local(&$a,&$b) { function tumblr_post_local(&$a,&$b) {
// This can probably be changed to allow editing by pointing to a different API endpoint // This can probably be changed to allow editing by pointing to a different API endpoint
if($b['edit']) if($b['edit'])
return; return;
if((! local_user()) || (local_user() != $b['uid'])) if((! local_user()) || (local_user() != $b['uid']))
return; return;
if($b['private'] || $b['parent']) if($b['private'] || $b['parent'])
return; return;
$tmbl_post = intval(get_pconfig(local_user(),'tumblr','post')); $tmbl_post = intval(get_pconfig(local_user(),'tumblr','post'));
$tmbl_enable = (($tmbl_post && x($_REQUEST,'tumblr_enable')) ? intval($_REQUEST['tumblr_enable']) : 0); $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'))) if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'tumblr','post_by_default')))
$tmbl_enable = 1; $tmbl_enable = 1;
if(! $tmbl_enable) if(! $tmbl_enable)
return; return;
if(strlen($b['postopts'])) if(strlen($b['postopts']))
$b['postopts'] .= ','; $b['postopts'] .= ',';
$b['postopts'] .= 'tumblr'; $b['postopts'] .= 'tumblr';
} }
function tumblr_send(&$a,&$b) { function tumblr_send(&$a,&$b) {
if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited'])) if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
return; return;
if(! strstr($b['postopts'],'tumblr')) if(! strstr($b['postopts'],'tumblr'))
return; return;
if($b['parent'] != $b['id']) if($b['parent'] != $b['id'])
return; return;
$oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token"); $oauth_token = get_pconfig($b['uid'], "tumblr", "oauth_token");
$oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret"); $oauth_token_secret = get_pconfig($b['uid'], "tumblr", "oauth_token_secret");
$page = get_pconfig($b['uid'], "tumblr", "page"); $page = get_pconfig($b['uid'], "tumblr", "page");
$tmbl_blog = 'blog/'.$page.'/post'; $tmbl_blog = 'blog/'.$page.'/post';
if($oauth_token && $oauth_token_secret && $tmbl_blog) { if($oauth_token && $oauth_token_secret && $tmbl_blog) {
require_once('include/bbcode.php'); require_once('include/bbcode.php');
$tag_arr = array(); $tag_arr = array();
$tags = ''; $tags = '';
$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER); $x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
if($x) { if($x) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
$tag_arr[] = $mtch[2]; $tag_arr[] = $mtch[2];
} }
} }
if(count($tag_arr)) if(count($tag_arr))
$tags = implode(',',$tag_arr); $tags = implode(',',$tag_arr);
$link = ""; $link = "";
$video = false; $video = false;
$title = trim($b['title']); $title = trim($b['title']);
// Checking for a bookmark // Checking for a bookmark
if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) { if(preg_match("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/is",$b['body'],$matches)) {
$link = $matches[1]; $link = $matches[1];
if ($title == '') if ($title == '')
$title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8'); $title = html_entity_decode($matches[2],ENT_QUOTES,'UTF-8');
$body = $b['body']; $body = $b['body'];
// splitting the text in two parts: // splitting the text in two parts:
// before and after the bookmark // before and after the bookmark
$pos = strpos($body, "[bookmark"); $pos = strpos($body, "[bookmark");
$body1 = substr($body, 0, $pos); $body1 = substr($body, 0, $pos);
$body2 = substr($body, $pos); $body2 = substr($body, $pos);
// Removing the bookmark // Removing the bookmark
$body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2); $body2 = preg_replace("/\[bookmark\=([^\]]*)\](.*?)\[\/bookmark\]/ism",'',$body2);
$body = $body1.$body2; $body = $body1.$body2;
$video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo'))); $video = ((stristr($link,'youtube')) || (stristr($link,'youtu.be')) || (stristr($mtch[1],'vimeo')));
} }
$params = array( $params = array(
'format' => 'html', 'format' => 'html',
'tweet' => 'off', 'tweet' => 'off',
'tags' => $tags); 'tags' => $tags);
if (($link != '') and $video) { if (($link != '') and $video) {
$params['type'] = "video"; $params['type'] = "video";
$params['embed'] = $link; $params['embed'] = $link;
if ($title != '') if ($title != '')
$params['caption'] = '<h1><a href="'.$link.'">'.$title. $params['caption'] = '<h1><a href="'.$link.'">'.$title.
"</a></h1><p>".bbcode($body, false, false)."</p>"; "</a></h1><p>".bbcode($body, false, false)."</p>";
else else
$params['caption'] = bbcode($body, false, false); $params['caption'] = bbcode($body, false, false);
} else if (($link != '') and !$video) { } else if (($link != '') and !$video) {
$params['type'] = "link"; $params['type'] = "link";
$params['title'] = $title; $params['title'] = $title;
$params['url'] = $link; $params['url'] = $link;
$params['description'] = bbcode($b["body"], false, false); $params['description'] = bbcode($b["body"], false, false);
} else { } else {
$params['type'] = "text"; $params['type'] = "text";
$params['title'] = $title; $params['title'] = $title;
$params['body'] = bbcode($b['body'], false, false); $params['body'] = bbcode($b['body'], false, false);
} }
$consumer_key = get_config('tumblr','consumer_key'); $consumer_key = get_config('tumblr','consumer_key');
$consumer_secret = get_config('tumblr','consumer_secret'); $consumer_secret = get_config('tumblr','consumer_secret');
$tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret); $tum_oauth = new TumblrOAuth($consumer_key, $consumer_secret, $oauth_token, $oauth_token_secret);
// Make an API call with the TumblrOAuth instance. // Make an API call with the TumblrOAuth instance.
$x = $tum_oauth->post($tmbl_blog,$params); $x = $tum_oauth->post($tmbl_blog,$params);
$ret_code = $tum_oauth->http_code; $ret_code = $tum_oauth->http_code;
if($ret_code == 201) if($ret_code == 201)
logger('tumblr_send: success'); logger('tumblr_send: success');
elseif($ret_code == 403) elseif($ret_code == 403)
logger('tumblr_send: authentication failure'); logger('tumblr_send: authentication failure');
else else
logger('tumblr_send: general error: ' . print_r($x,true)); logger('tumblr_send: general error: ' . print_r($x,true));
} }
} }

3
twitter/admin.tpl
View File

@ -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>

10
twitter/twitter.php
View File

@ -504,8 +504,14 @@ function twitter_plugin_admin_post(&$a){
info( t('Settings updated.'). EOL ); info( t('Settings updated.'). EOL );
} }
function twitter_plugin_admin(&$a, &$o){ function twitter_plugin_admin(&$a, &$o){
$t = file_get_contents( dirname(__file__). "/admin.tpl" ); $t = get_markup_template( "admin.tpl", "addon/twitter/" );
$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'), '$submit' => t('Submit'),
// name, label, value, help, [extra values] // name, label, value, help, [extra values]
'$consumerkey' => array('consumerkey', t('Consumer key'), get_config('twitter', 'consumerkey' ), ''), '$consumerkey' => array('consumerkey', t('Consumer key'), get_config('twitter', 'consumerkey' ), ''),

3
twitter/view/admin.tpl Executable file
View File

@ -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>

3
twitter/view/smarty3/admin.tpl Normal file
View File

@ -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>

9
uhremotestorage/settings.tpl
View File

@ -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>

12
uhremotestorage/uhremotestorage.php
View File

@ -78,8 +78,16 @@ function uhremotestorage_settings($a, &$s){
'Dropbox' => 'Dropbox', 'Dropbox' => 'Dropbox',
); );
*/ */
$tpl = file_get_contents(dirname(__file__)."/settings.tpl"); // $tpl = file_get_contents(dirname(__file__)."/settings.tpl");
$s .= replace_macros($tpl, array( $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', '$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 ), '$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>'), '$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>'),

9
uhremotestorage/view/settings.tpl Executable file
View File

@ -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>

9
uhremotestorage/view/smarty3/settings.tpl Normal file
View File

@ -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>

0
widgets/settings.tpl → widgets/view/settings.tpl
View File

19
widgets/view/smarty3/settings.tpl Normal file
View File

@ -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>

3
widgets/view/smarty3/widget_like.tpl Normal file
View File

@ -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>

0
widgets/widget_like.tpl → widgets/view/widget_like.tpl
View File

3
widgets/widget_like.php
View File

@ -52,7 +52,8 @@ function like_widget_content(&$a, $conf){
$o = ""; $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( $o .= replace_macros($t, array(
'$like' => $likes, '$like' => $likes,
'$strlike' => sprintf( tt("%d person likes this", "%d people like this", $likes), $likes), '$strlike' => sprintf( tt("%d person likes this", "%d people like this", $likes), $likes),

3
widgets/widgets.php
View File

@ -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( $o .= replace_macros($t, array(
'$submit' => t('Generate new key'), '$submit' => t('Generate new key'),
'$baseurl' => $a->get_baseurl(), '$baseurl' => $a->get_baseurl(),