From d261a47f76a5176bf62aca797ebaefd4ad160256 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Thu, 14 Jun 2012 06:50:22 -0400 Subject: [PATCH 1/9] new plugin: profilehome redirects from homepage to a selectable profile. --- profilehome/admin.tpl | 2 ++ profilehome/profilehome.php | 50 +++++++++++++++++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100755 profilehome/admin.tpl create mode 100755 profilehome/profilehome.php diff --git a/profilehome/admin.tpl b/profilehome/admin.tpl new file mode 100755 index 00000000..cf7bc1a7 --- /dev/null +++ b/profilehome/admin.tpl @@ -0,0 +1,2 @@ +{{ inc field_select.tpl with $field=$user }}{{ endinc }} +
\ No newline at end of file diff --git a/profilehome/profilehome.php b/profilehome/profilehome.php new file mode 100755 index 00000000..ad0421b8 --- /dev/null +++ b/profilehome/profilehome.php @@ -0,0 +1,50 @@ + + */ + + + +function profilehome_install() { + register_hook('home_content', 'addon/profilehome/profilehome.php', 'profilehome_home'); + logger("installed profilehome"); +} + +function profilehome_uninstall() { + unregister_hook('home_content', 'addon/profilehome/profilehome.php', 'profilehome_home'); + logger("removed profilehome"); +} + +function profilehome_home(&$a, &$o){ + $user = get_config("profilehome","user"); + if ($user!==false) goaway($a->get_baseurl()."/profile/".$user); +} + +function profilehome_plugin_admin(&$a, &$o){ + $r = q("SELECT nickname, username FROM user WHERE verified=1 AND account_removed=0 AND account_expired=0"); + $users = array("##no##"=>"No redirect (use default home)"); + foreach ($r as $u) { + $users[$u['nickname']] = $u['username']." (".$u['nickname'].")"; + } + + $user = get_config("profilehome","user"); + + $t = file_get_contents(dirname(__file__)."/admin.tpl"); + $o = ''; + $o .= replace_macros( $t, array( + '$submit' => t('Submit'), + '$user' => array('user', t('Profile to use as home page'), $user, "", $users), + )); +} + +function profilehome_plugin_admin_post(&$a){ + check_form_security_token('profilehomesave'); + + $user = ((x($_POST, 'user')) ? notags(trim($_POST['user'])) : false); + if ($user=='##no##') $user=false; + set_config('profilehome', 'user', $user); + info( t('Profile home settings updated.') .EOL); +} \ No newline at end of file From 9bbadf951c0d290821342b91a1a84a2e23ae43e3 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Wed, 11 Jul 2012 03:42:05 -0400 Subject: [PATCH 2/9] move profilehome to friendicablog repo --- profilehome/admin.tpl | 2 -- profilehome/profilehome.php | 50 ------------------------------------- 2 files changed, 52 deletions(-) delete mode 100755 profilehome/admin.tpl delete mode 100755 profilehome/profilehome.php diff --git a/profilehome/admin.tpl b/profilehome/admin.tpl deleted file mode 100755 index cf7bc1a7..00000000 --- a/profilehome/admin.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ inc field_select.tpl with $field=$user }}{{ endinc }} -
\ No newline at end of file diff --git a/profilehome/profilehome.php b/profilehome/profilehome.php deleted file mode 100755 index ad0421b8..00000000 --- a/profilehome/profilehome.php +++ /dev/null @@ -1,50 +0,0 @@ - - */ - - - -function profilehome_install() { - register_hook('home_content', 'addon/profilehome/profilehome.php', 'profilehome_home'); - logger("installed profilehome"); -} - -function profilehome_uninstall() { - unregister_hook('home_content', 'addon/profilehome/profilehome.php', 'profilehome_home'); - logger("removed profilehome"); -} - -function profilehome_home(&$a, &$o){ - $user = get_config("profilehome","user"); - if ($user!==false) goaway($a->get_baseurl()."/profile/".$user); -} - -function profilehome_plugin_admin(&$a, &$o){ - $r = q("SELECT nickname, username FROM user WHERE verified=1 AND account_removed=0 AND account_expired=0"); - $users = array("##no##"=>"No redirect (use default home)"); - foreach ($r as $u) { - $users[$u['nickname']] = $u['username']." (".$u['nickname'].")"; - } - - $user = get_config("profilehome","user"); - - $t = file_get_contents(dirname(__file__)."/admin.tpl"); - $o = ''; - $o .= replace_macros( $t, array( - '$submit' => t('Submit'), - '$user' => array('user', t('Profile to use as home page'), $user, "", $users), - )); -} - -function profilehome_plugin_admin_post(&$a){ - check_form_security_token('profilehomesave'); - - $user = ((x($_POST, 'user')) ? notags(trim($_POST['user'])) : false); - if ($user=='##no##') $user=false; - set_config('profilehome', 'user', $user); - info( t('Profile home settings updated.') .EOL); -} \ No newline at end of file From 974da7e5f57ced9a4e3183ac599e6d50c4e4c841 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Dec 2012 14:13:37 -0800 Subject: [PATCH 3/9] SECURITY: communityhome - can leak photos from people with hidden walls (Thx Chris Case) --- communityhome.tgz | Bin 4043 -> 4023 bytes communityhome/communityhome.php | 1 + 2 files changed, 1 insertion(+) diff --git a/communityhome.tgz b/communityhome.tgz index 129081b613e8d3babac1e5ad3262e5558cf837c1..20f7b9642c0e676d43f9143eb52e1df174bde2ff 100755 GIT binary patch literal 4023 zcmV;o4@mGIiwFScn9ooE1MOUUbK5o&_rKPs*yG8el+oL-j$^r#i`~X|iQRGB_HI(2 zOo@=hny>I-N0Z5Szug5$krWjtt>fI>aqG$=u-F%X9~K~-iRU=6YekE>=ZNmcSD_x# z{{HU9V0UMKFxc7X?d}cscKTedXrn*q?QQS(ceb~;H+uc;y}iK(?0y|{@)U=W5ddsB z#$;v%x0btx&!6q?^}qY>yT`EU5owa^|J+k2^6dxFaZmpbcKQSA|Lwg2vh}dOzrWq< zZ$R%swBJMj=ly>eP6Er1j%u6r#x!;(k>$CK=7-uQK5KuCjPa-shSuy%Y-@6}y9Iu=tSwj(7!5K$bsFg5H@P{BtoPDOr}U#Z=tUS+&4@oR9uU;T&h zYcut&#=j4{NvD4J0M-=hu6J&k@bP19^Kia>RF}3#R%DCAE*21*Kv~3b7~3!*Q-&Ja z7iu^#4s8o8lb_MvOf8J#DDqrTHXj`tFb~9ZsQpztsx$Xt*El-t+EzizphQYZ^TD$D zVK=s=ovw)a`QRwSITeHR$MF9Mx4 zq2#PU<^Usvy2X*KTgn{bBRyRdmp3srO9rUSu$7w6H!a)rj~J(H^XFdV70t>Pe!fMj z)t`x!ZQY1s-=#&$5*(p8kaQ{!vt31eMcp{+j_Q^iLj@y>1L|8N@wcH*t^fYqe-Is? zUjO^MJG+BI{)g-Tpj!VQgATvPUaobYKCQu1I5Qk^056h305l4y{8-2Z1y{%ec!LWe z5H3PGTI32qUo4j!`NoVJ{(|7djryG)JwK15xfdM3560N?ND(%N!+8|>2i@+C70d!J z_B$xI>j&P{vPE}lj05Zad*=w7cM&H7@h-LkG4kArXy}e-F2^j5R~?tXS}j@5Avc~! zmWzFD+l?mRA|HsE6-FW$%{}j?p)K-Le-7ZXUPI(SY!VtmVXdlsN zc&pDN$DRwr)UTj31Rasty@5d3LoJLJwg~4!L>fd3Utn4w-bY<*uc?ec?~t6Ch(=>0 z6mfuo>FC}2-DVMvFfC)KVK_DD9_i>WnH6Hb2177{z*saeb<$WPwpX<)kR_5V4w#;jI{w6INQ2}z0qgd_YX2L}fy{4@E zhl}&q%eL_9l5bt|%fYzrH-VIDu;`Y@2cuAbm`u#qKLHW80hD z2o}|YOoUY^UY))^y@V|jTJ)jO0PfL8e;|iu9XI^gl>JgYKnN2yz_bE#t1%jJ<%nh< zmWfH^1q<$9IxOJ+x2BDW7rRlT9yA%fHf3Ijg7s(~J7b!Fn>c)hF_|M1Cu>0)8 zmC<1cE7Kl2pr?z2j!%t77zMU)QB?3&PdY%qYSIuXl;L>cl1%3zquh|8qrn0-2EwgD^+Nt$~Ti$Z`-Y z*%!%r)l6C%cGM12@9zu*nUgxfQ~@SYWsifAt9Nyx<0KWe5>+!CBzAgIl@qhpQ6{!5K$tBJsMV z3fRo+)}Nku05t6=77eBG#re-?myK&=Z_-%Hs0Jxj&Qn!<4Qj%L!k%6ad+_7M`OiNw zcEl`#Y(U=Y)~9r&-eeR|St^|$Fbs3Uoza9ng5&3xCylf7UvY@H;q(lV`j_XgaH79H zKf8R{l+#?bx=Z(94Hu_BzPyCa3(MfI}5 zFx!~a{Cswb9M509f_s!MWn`5yHhzIl9`fuhjh+og;&}#vD3Bsiq9QuLfM$?A2g?NeoGhX7-8ZPltYh{5NWC&D0 ze4l+d(0iC6Du$$a!n1s4wq_aNmvr=c$WL-Sd0>;t*|O(8g$z$tj7he>JgHc6dCq7MtnazzeMzghW|{#8j?Cn=0e2WkOoae3hI8OE*{YT3+>ry_HHjcu!VDS-ZsHL@Mq8BU)w? z08SAYXMrY7G{-o`8qrF}HJgR{LI=v}Ncl5^X-WF~5Lxvn@R-aP(H46>8ndMg#znlP zYEC(qwV6KFubyRepukV7U>PMsh@+j#=W#)Wdgph4rmHpR>)?ADn-X+Som!t@C!nHV zbu`**cDR(lD3f;QU^tJ6_aSf(=+N2(X3uV&(0(7b!2b_ClWEyUc0YW5jGi7#%0yorA=4A}bZ2l8N83q^%FFBLT;-EC({47nj zNyboyCo46RU=~A%`|N+55Ug))>8L%Gl#4-zr;tpd^n5az>$tKUvL%OLVP3XYN@@vC zDKLQ|n$)F`|N zc5iW~Y{rf+^CcQ5I3f8vDnhy+*rJjViIOv4*2-)TX^ib})Pp(@TGuj+j3^G1rXOqh z=DEh!RC$ua?ZlI!Uo@uid>Ge><%i6uZ-tO z+D`^-_3NPoW!M_j!{2oLyugea~l7p4&Ich0Lj@a2| z4q@3M3eqQe(p%^K-r>A|B=>0VGbhL`Jw%6j?(rrq4 zkZ=8_?(0zg?a9T-^W)bi9mjl79rxY;+u!dM?tks}clN9IzmGx7m%T6PWp6u2wb~_} z_4;;9ud6&{63@L^*0%j`4*o&iVAtE|~f30@vf@4@NC@cYti}Dw}SiTA81>WgE zHgKjVLOLg}%{>=aS6I-;vI)oT)(Wk$WwQvE7D9>3V*R2-wQCJQPFo+(iX1SDwkAJ#cz5`%ENfLYk54?_`ZI=tX;QE4d^<5X)}p_ z3g3(EbCpUEouht2RJn-625g!f@Z=8vwGwH$>VnWrT}JliA))vh7qJTW5W$2rOG6Di z!iVG?f(CqipDXD~le-4}R+r$D-|E-n_kVu=M|YSG;Hoe;oCo|{z|Z{qzs&r{Z@ud8 z{~m+Z_y5EFEdXQu-p;!I-yiJk=lg#^1E9kH$Dr!|e|7)Ay8mC@|F7=WY7L#lO1ZUtRJ4!Ylsrzi)H3NM0<`<(Oyr;ytEZq1?4}Xcxf#)nHTI z(^)kz%Sw4^^=9I$(facrc^Bv*blh|P)7#lyIsfnN?N;YMk3oD-1%C{EKu2aD`3FV;shY-TBtNRZ&G1Ra8+$6;)JGMHN+4QAHJ1R8d70Ra8+$6;)JGMHN+4 dQAHJ1R8d70Ra8+$6;-sc@gEqYyaxby008GZ;J^R? literal 4043 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 diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index 2b14fd33..484842cc 100755 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -105,6 +105,7 @@ function communityhome_home(&$a, &$o){ `user` WHERE `user`.`uid` = `photo`.`uid` AND `user`.`blockwall`=0 + AND `user`.`hidewall` = 0 ORDER BY `photo`.`edited` DESC LIMIT 0, 12", dbesc(t('Contact Photos')), From 66334ec5cb0fa5d114470b5ebf14435c928b9140 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Wed, 19 Dec 2012 17:21:06 +0000 Subject: [PATCH 4/9] Add an INSTALL.txt as an alternative solution to bug #520 --- INSTALL.txt | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 INSTALL.txt diff --git a/INSTALL.txt b/INSTALL.txt new file mode 100644 index 00000000..ec9372e8 --- /dev/null +++ b/INSTALL.txt @@ -0,0 +1,18 @@ +********************* +* Install Using Git * +********************* + +To install all addons using git, cd into your top level Friendica directory and + +git clone https://github.com/friendica/friendica-addons.git addon + +This will clone the entire repository in a directory called addon. They can now be activated in the plugins section of your admin panel. + +******************** +* Install Manually * +******************** + +1. Download the archive (AddonName.tgz) containing the addon you want to install. +2. Unzip the contents of the archive to your harddrive. +3. Upload the extracted directory and all it's contents to /path/to/friendica/addon. You will need to create the addon directory if this is the first addon you have installed. +4. Activate the addon in the plugins section of your admin panel. From 3da6f1471cc8482e626fa3ad4530ee7cd858f813 Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Sat, 22 Dec 2012 13:36:35 -0700 Subject: [PATCH 5/9] update addons to support Smarty3 --- altpager/altpager.php | 11 +- altpager/view/admin.tpl | 3 + altpager/{admin.tpl => view/admin.tpl.old} | 0 altpager/view/smarty3/admin.tpl | 3 + blackout/blackout.php | 10 +- blackout/{ => view}/admin.tpl | 6 +- blackout/view/smarty3/admin.tpl | 11 + communityhome/communityhome.php | 9 +- communityhome/{ => view}/communityhome.tpl | 0 communityhome/{ => view}/directory_item.tpl | 0 communityhome/view/smarty3/communityhome.tpl | 70 ++ communityhome/view/smarty3/directory_item.tpl | 10 + forumdirectory/forumdirectory.php | 3 +- .../{ => view}/forumdirectory_item.tpl | 0 .../view/smarty3/forumdirectory_item.tpl | 42 + gravatar/admin.tpl | 3 - gravatar/gravatar.php | 10 +- gravatar/view/admin.tpl | 3 + gravatar/view/smarty3/admin.tpl | 3 + impressum/admin.tpl | 7 - impressum/impressum.php | 11 +- impressum/view/admin.tpl | 7 + impressum/view/smarty3/admin.tpl | 7 + libravatar/libravatar.php | 10 +- libravatar/{ => view}/admin.tpl | 2 +- libravatar/view/smarty3/admin.tpl | 2 + mathjax/mathjax.php | 18 +- mathjax/{ => view}/admin.tpl | 2 +- mathjax/view/smarty3/admin.tpl | 2 + openstreetmap/admin.tpl | 3 - openstreetmap/openstreetmap.php | 10 +- openstreetmap/view/admin.tpl | 3 + openstreetmap/view/smarty3/admin.tpl | 3 + piwik/admin.tpl | 5 - piwik/piwik.php | 12 +- piwik/view/admin.tpl | 5 + piwik/view/smarty3/admin.tpl | 5 + remote_permissions/admin.tpl | 3 - remote_permissions/remote_permissions.php | 14 +- remote_permissions/view/admin.tpl | 3 + remote_permissions/{ => view}/settings.tpl | 0 remote_permissions/view/smarty3/admin.tpl | 3 + remote_permissions/view/smarty3/settings.tpl | 8 + statusnet/admin.tpl | 16 - statusnet/statusnet.php | 11 +- statusnet/view/admin.tpl | 16 + statusnet/view/smarty3/admin.tpl | 16 + tumblr/tumblr.php | 759 +++++++++--------- twitter/admin.tpl | 3 - twitter/twitter.php | 10 +- twitter/view/admin.tpl | 3 + twitter/view/smarty3/admin.tpl | 3 + uhremotestorage/settings.tpl | 9 - uhremotestorage/uhremotestorage.php | 12 +- uhremotestorage/view/settings.tpl | 9 + uhremotestorage/view/smarty3/settings.tpl | 9 + widgets/{ => view}/settings.tpl | 0 widgets/view/smarty3/settings.tpl | 19 + widgets/view/smarty3/widget_like.tpl | 3 + widgets/{ => view}/widget_like.tpl | 0 widgets/widget_like.php | 3 +- widgets/widgets.php | 3 +- 62 files changed, 778 insertions(+), 468 deletions(-) create mode 100755 altpager/view/admin.tpl rename altpager/{admin.tpl => view/admin.tpl.old} (100%) create mode 100644 altpager/view/smarty3/admin.tpl rename blackout/{ => view}/admin.tpl (70%) create mode 100644 blackout/view/smarty3/admin.tpl rename communityhome/{ => view}/communityhome.tpl (100%) rename communityhome/{ => view}/directory_item.tpl (100%) create mode 100644 communityhome/view/smarty3/communityhome.tpl create mode 100644 communityhome/view/smarty3/directory_item.tpl rename forumdirectory/{ => view}/forumdirectory_item.tpl (100%) create mode 100644 forumdirectory/view/smarty3/forumdirectory_item.tpl delete mode 100644 gravatar/admin.tpl create mode 100644 gravatar/view/admin.tpl create mode 100644 gravatar/view/smarty3/admin.tpl delete mode 100755 impressum/admin.tpl create mode 100755 impressum/view/admin.tpl create mode 100644 impressum/view/smarty3/admin.tpl rename libravatar/{ => view}/admin.tpl (50%) create mode 100644 libravatar/view/smarty3/admin.tpl rename mathjax/{ => view}/admin.tpl (58%) create mode 100644 mathjax/view/smarty3/admin.tpl delete mode 100644 openstreetmap/admin.tpl create mode 100644 openstreetmap/view/admin.tpl create mode 100644 openstreetmap/view/smarty3/admin.tpl delete mode 100755 piwik/admin.tpl create mode 100755 piwik/view/admin.tpl create mode 100644 piwik/view/smarty3/admin.tpl delete mode 100644 remote_permissions/admin.tpl create mode 100644 remote_permissions/view/admin.tpl rename remote_permissions/{ => view}/settings.tpl (100%) create mode 100644 remote_permissions/view/smarty3/admin.tpl create mode 100644 remote_permissions/view/smarty3/settings.tpl delete mode 100755 statusnet/admin.tpl create mode 100755 statusnet/view/admin.tpl create mode 100644 statusnet/view/smarty3/admin.tpl delete mode 100755 twitter/admin.tpl create mode 100755 twitter/view/admin.tpl create mode 100644 twitter/view/smarty3/admin.tpl delete mode 100755 uhremotestorage/settings.tpl create mode 100755 uhremotestorage/view/settings.tpl create mode 100644 uhremotestorage/view/smarty3/settings.tpl rename widgets/{ => view}/settings.tpl (100%) create mode 100644 widgets/view/smarty3/settings.tpl create mode 100644 widgets/view/smarty3/widget_like.tpl rename widgets/{ => view}/widget_like.tpl (100%) diff --git a/altpager/altpager.php b/altpager/altpager.php index 20517d2f..ddb6d352 100755 --- a/altpager/altpager.php +++ b/altpager/altpager.php @@ -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 index 00000000..1176db41 --- /dev/null +++ b/altpager/view/admin.tpl @@ -0,0 +1,3 @@ +{{ inc $field_radio with $field=$global }}{{ endinc }} +{{ inc $field_radio with $field=$individual }}{{ endinc }} +
diff --git a/altpager/admin.tpl b/altpager/view/admin.tpl.old similarity index 100% rename from altpager/admin.tpl rename to altpager/view/admin.tpl.old diff --git a/altpager/view/smarty3/admin.tpl b/altpager/view/smarty3/admin.tpl new file mode 100644 index 00000000..50780231 --- /dev/null +++ b/altpager/view/smarty3/admin.tpl @@ -0,0 +1,3 @@ +{{include file="file:{{$field_radio}}" field=$global}} +{{include file="file:{{$field_radio}}" field=$individual}} +
diff --git a/blackout/blackout.php b/blackout/blackout.php index 2cb7c041..4c2a74b6 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -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
(YYYY-MM-DD hh:mm)", $mystart, "format is YYYY year, MM month, DD day, hh hour and mm minute"), diff --git a/blackout/admin.tpl b/blackout/view/admin.tpl similarity index 70% rename from blackout/admin.tpl rename to blackout/view/admin.tpl index 25922193..e19bd246 100644 --- a/blackout/admin.tpl +++ b/blackout/view/admin.tpl @@ -1,6 +1,6 @@ -{{ inc field_input.tpl with $field=$startdate }}{{ endinc }} -{{ inc field_input.tpl with $field=$enddate }}{{ endinc }} -{{ inc field_input.tpl with $field=$rurl }}{{ endinc }} +{{ inc $field_input with $field=$startdate }}{{ endinc }} +{{ inc $field_input with $field=$enddate }}{{ endinc }} +{{ inc $field_input with $field=$rurl }}{{ endinc }}
Note: The redirect will be active from the moment you diff --git a/blackout/view/smarty3/admin.tpl b/blackout/view/smarty3/admin.tpl new file mode 100644 index 00000000..f77a5948 --- /dev/null +++ b/blackout/view/smarty3/admin.tpl @@ -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}} + +
Note: The redirect will be active from the moment you +press the submit button. Users currently logged in will not be +thrown out but can't login again after logging out should the blackout is +still in place.
+ +
diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index 484842cc..8b831888 100755 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -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 = '

' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '

'; diff --git a/communityhome/communityhome.tpl b/communityhome/view/communityhome.tpl similarity index 100% rename from communityhome/communityhome.tpl rename to communityhome/view/communityhome.tpl diff --git a/communityhome/directory_item.tpl b/communityhome/view/directory_item.tpl similarity index 100% rename from communityhome/directory_item.tpl rename to communityhome/view/directory_item.tpl diff --git a/communityhome/view/smarty3/communityhome.tpl b/communityhome/view/smarty3/communityhome.tpl new file mode 100644 index 00000000..b8f80381 --- /dev/null +++ b/communityhome/view/smarty3/communityhome.tpl @@ -0,0 +1,70 @@ + +{{if $noOid}} +

{{$login_title}}

+{{else}} + +{{/if}} +{{$login_form}} + + +{{if $lastusers_title}} +

{{$lastusers_title}}

+
+{{foreach $lastusers_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} + + +{{if $activeusers_title}} +

{{$activeusers_title}}

+
+{{foreach $activeusers_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} + +{{if $photos_title}} +

{{$photos_title}}

+
+{{foreach $photos_items as $i}} + {{$i}} +{{/foreach}} +
+{{/if}} + + +{{if $like_title}} +

{{$like_title}}

+
    +{{foreach $like_items as $i}} +
  • {{$i}}
    • +{{/foreach}} +
+{{/if}} diff --git a/communityhome/view/smarty3/directory_item.tpl b/communityhome/view/smarty3/directory_item.tpl new file mode 100644 index 00000000..5fb11986 --- /dev/null +++ b/communityhome/view/smarty3/directory_item.tpl @@ -0,0 +1,10 @@ + +
+
+
+ + {{$alt}}-text + +
+
+
diff --git a/forumdirectory/forumdirectory.php b/forumdirectory/forumdirectory.php index 83f19d01..0d7fbee8 100644 --- a/forumdirectory/forumdirectory.php +++ b/forumdirectory/forumdirectory.php @@ -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/view/forumdirectory_item.tpl similarity index 100% rename from forumdirectory/forumdirectory_item.tpl rename to forumdirectory/view/forumdirectory_item.tpl diff --git a/forumdirectory/view/smarty3/forumdirectory_item.tpl b/forumdirectory/view/smarty3/forumdirectory_item.tpl new file mode 100644 index 00000000..540a5aea --- /dev/null +++ b/forumdirectory/view/smarty3/forumdirectory_item.tpl @@ -0,0 +1,42 @@ + +
+
+
+ + {{$alt}}-text + +
+
+
+
{{$name}}
+
{{$page}}-type
+ {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} +
+
+ {{if $location}} +
{{$location}}
+
+ {{if $profile.address}}
{{$profile.address}}
{{/if}} + + {{$profile.locality}}{{if $profile.locality}}, {{/if}} + {{$profile.region}} + {{$profile.postal-code}} + + {{if $profile.country-name}}{{$profile.country-name}}{{/if}} +
+
+ {{/if}} + + {{if $gender}}
{{$gender}}
{{$profile.gender}}
{{/if}} +
+
+ {{if $marital}}
♥{{$marital}}
{{$profile.marital}}
{{/if}} + + {{if $homepage}}
{{$homepage}}
{{$profile.homepage}}
{{/if}} +
+
+
+ {{if $about}}
{{$about}}
{{$profile.about}}
{{/if}} +
+
+
diff --git a/gravatar/admin.tpl b/gravatar/admin.tpl deleted file mode 100644 index 83144e43..00000000 --- a/gravatar/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} -{{ inc field_select.tpl with $field=$rating }}{{ endinc }} -
diff --git a/gravatar/gravatar.php b/gravatar/gravatar.php index fc5358eb..a0b5a02b 100644 --- a/gravatar/gravatar.php +++ b/gravatar/gravatar.php @@ -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 .= ''; - $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 index 00000000..b187e1ea --- /dev/null +++ b/gravatar/view/admin.tpl @@ -0,0 +1,3 @@ +{{ inc $field_select with $field=$default_avatar}}{{ endinc }} +{{ inc $field_select with $field=$rating }}{{ endinc }} +
diff --git a/gravatar/view/smarty3/admin.tpl b/gravatar/view/smarty3/admin.tpl new file mode 100644 index 00000000..30d760af --- /dev/null +++ b/gravatar/view/smarty3/admin.tpl @@ -0,0 +1,3 @@ +{{include file="file:{{$field_select}}" field=$default_avatar}} +{{include file="file:{{$field_select}}" field=$rating}} +
diff --git a/impressum/admin.tpl b/impressum/admin.tpl deleted file mode 100755 index 901df73f..00000000 --- a/impressum/admin.tpl +++ /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 }} -
diff --git a/impressum/impressum.php b/impressum/impressum.php index 9d038178..305dd9a9 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -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 index 00000000..e3651137 --- /dev/null +++ b/impressum/view/admin.tpl @@ -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 }} +
diff --git a/impressum/view/smarty3/admin.tpl b/impressum/view/smarty3/admin.tpl new file mode 100644 index 00000000..a3b0ef27 --- /dev/null +++ b/impressum/view/smarty3/admin.tpl @@ -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}} +
diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index 08ed6d00..c966052f 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -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 .= ''; - $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/admin.tpl b/libravatar/view/admin.tpl similarity index 50% rename from libravatar/admin.tpl rename to libravatar/view/admin.tpl index 814f4a44..01b113c4 100644 --- a/libravatar/admin.tpl +++ b/libravatar/view/admin.tpl @@ -1,2 +1,2 @@ -{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} +{{ inc $field_select with $field=$default_avatar}}{{ endinc }}
diff --git a/libravatar/view/smarty3/admin.tpl b/libravatar/view/smarty3/admin.tpl new file mode 100644 index 00000000..4e930a74 --- /dev/null +++ b/libravatar/view/smarty3/admin.tpl @@ -0,0 +1,2 @@ +{{include file="file:{{$field_select}}" field=$default_avatar}} +
diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 7105772b..33cdd439 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -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/admin.tpl b/mathjax/view/admin.tpl similarity index 58% rename from mathjax/admin.tpl rename to mathjax/view/admin.tpl index 1c723cdd..ed60d734 100644 --- a/mathjax/admin.tpl +++ b/mathjax/view/admin.tpl @@ -1,2 +1,2 @@ -{{ inc field_input.tpl with $field=$baseurl }}{{endinc }} +{{ inc $field_input with $field=$baseurl }}{{endinc }}
diff --git a/mathjax/view/smarty3/admin.tpl b/mathjax/view/smarty3/admin.tpl new file mode 100644 index 00000000..8d0388ca --- /dev/null +++ b/mathjax/view/smarty3/admin.tpl @@ -0,0 +1,2 @@ +{{include file="file:{{$field_input}}" field=$baseurl}} +
diff --git a/openstreetmap/admin.tpl b/openstreetmap/admin.tpl deleted file mode 100644 index 75db9cd7..00000000 --- a/openstreetmap/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }} -{{ inc field_input.tpl with $field=$zoom }}{{ endinc }} -
diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index fda29905..bf663253 100755 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -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 public tile servers')), '$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 index 00000000..f733a917 --- /dev/null +++ b/openstreetmap/view/admin.tpl @@ -0,0 +1,3 @@ +{{ inc $field_input with $field=$tmsserver }}{{ endinc }} +{{ inc $field_input with $field=$zoom }}{{ endinc }} +
diff --git a/openstreetmap/view/smarty3/admin.tpl b/openstreetmap/view/smarty3/admin.tpl new file mode 100644 index 00000000..90baf1be --- /dev/null +++ b/openstreetmap/view/smarty3/admin.tpl @@ -0,0 +1,3 @@ +{{include file="file:{{$field_input}}" field=$tmsserver}} +{{include file="file:{{$field_input}}" field=$zoom}} +
diff --git a/piwik/admin.tpl b/piwik/admin.tpl deleted file mode 100755 index e57758a9..00000000 --- a/piwik/admin.tpl +++ /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 }} -
diff --git a/piwik/piwik.php b/piwik/piwik.php index 9ba15db6..a0dd1c25 100755 --- a/piwik/piwik.php +++ b/piwik/piwik.php @@ -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 index 00000000..21a6ea87 --- /dev/null +++ b/piwik/view/admin.tpl @@ -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 }} +
diff --git a/piwik/view/smarty3/admin.tpl b/piwik/view/smarty3/admin.tpl new file mode 100644 index 00000000..3fd39737 --- /dev/null +++ b/piwik/view/smarty3/admin.tpl @@ -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}} +
diff --git a/remote_permissions/admin.tpl b/remote_permissions/admin.tpl deleted file mode 100644 index 60558808..00000000 --- a/remote_permissions/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_radio.tpl with $field=$global }}{{ endinc }} -{{ inc field_radio.tpl with $field=$individual }}{{ endinc }} -
diff --git a/remote_permissions/remote_permissions.php b/remote_permissions/remote_permissions.php index 95e74ee1..3c99f008 100644 --- a/remote_permissions/remote_permissions.php +++ b/remote_permissions/remote_permissions.php @@ -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/view/admin.tpl b/remote_permissions/view/admin.tpl new file mode 100644 index 00000000..1176db41 --- /dev/null +++ b/remote_permissions/view/admin.tpl @@ -0,0 +1,3 @@ +{{ inc $field_radio with $field=$global }}{{ endinc }} +{{ inc $field_radio with $field=$individual }}{{ endinc }} +
diff --git a/remote_permissions/settings.tpl b/remote_permissions/view/settings.tpl similarity index 100% rename from remote_permissions/settings.tpl rename to remote_permissions/view/settings.tpl diff --git a/remote_permissions/view/smarty3/admin.tpl b/remote_permissions/view/smarty3/admin.tpl new file mode 100644 index 00000000..e67afd73 --- /dev/null +++ b/remote_permissions/view/smarty3/admin.tpl @@ -0,0 +1,3 @@ +{{include file="field_radio.tpl" field=$global}} +{{include file="field_radio.tpl" field=$individual}} +
diff --git a/remote_permissions/view/smarty3/settings.tpl b/remote_permissions/view/smarty3/settings.tpl new file mode 100644 index 00000000..df89a32e --- /dev/null +++ b/remote_permissions/view/smarty3/settings.tpl @@ -0,0 +1,8 @@ +
+

{{$remote_perms_title}}

+
+ + +
+
+ diff --git a/statusnet/admin.tpl b/statusnet/admin.tpl deleted file mode 100755 index b40adf35..00000000 --- a/statusnet/admin.tpl +++ /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 }} -
- {{ else }} -

Fill this form to add a new site

- {{ endif }} - -{{ endfor }} - - -
diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index d7d490fd..d7af352e 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -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 index 00000000..02eacf73 --- /dev/null +++ b/statusnet/view/admin.tpl @@ -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 }} +
+ {{ else }} +

Fill this form to add a new site

+ {{ endif }} + +{{ endfor }} + + +
diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/view/smarty3/admin.tpl new file mode 100644 index 00000000..5a77b2cf --- /dev/null +++ b/statusnet/view/smarty3/admin.tpl @@ -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}} +
+ {{else}} +

Fill this form to add a new site

+ {{/if}} + +{{/foreach}} + + +
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php index 01ba04bb..4bbae8e6 100755 --- a/tumblr/tumblr.php +++ b/tumblr/tumblr.php @@ -1,379 +1,380 @@ - - */ - -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 .= '
'.t("return to the connector page").''; - 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 .= '
' - . t('Post to Tumblr') . '
'; - } -} - - -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'] .= '' . "\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 .= '
'; - $s .= '

' . t('Tumblr Post Settings') . '

'; - - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $s .= '
'; - $s .= ''; - $s .= ''; - $s .= '
'; - - $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token"); - $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret"); - - $s .= '
'; - 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:").""; - } else - $s .= t("You are not authenticated to tumblr"); - $s .= '
'; - - /* provide a submit button */ - - $s .= '
'; - -} - - -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'] = '

'.$title. - "

".bbcode($body, false, false)."

"; - 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)); - - } -} + + */ + +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 .= '
'.t("return to the connector page").''; + 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 .= '
' + . t('Post to Tumblr') . '
'; + } +} + + +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'] .= '' . "\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 .= '
'; + $s .= '

' . t('Tumblr Post Settings') . '

'; + + $s .= '
'; + + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $oauth_token = get_pconfig(local_user(), "tumblr", "oauth_token"); + $oauth_token_secret = get_pconfig(local_user(), "tumblr", "oauth_token_secret"); + + $s .= '
'; + 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:").""; + } else + $s .= t("You are not authenticated to tumblr"); + $s .= '
'; + + /* provide a submit button */ + + $s .= '
'; + +} + + +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'] = '

'.$title. + "

".bbcode($body, false, false)."

"; + 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 index a83eb07a..00000000 --- a/twitter/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }} -{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }} -
diff --git a/twitter/twitter.php b/twitter/twitter.php index ee3bd0fb..6cb2d9cd 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -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 index 00000000..d3649fce --- /dev/null +++ b/twitter/view/admin.tpl @@ -0,0 +1,3 @@ +{{ inc $field_input with $field=$consumerkey }}{{ endinc }} +{{ inc $field_input with $field=$consumersecret }}{{ endinc }} +
diff --git a/twitter/view/smarty3/admin.tpl b/twitter/view/smarty3/admin.tpl new file mode 100644 index 00000000..ad1e07e9 --- /dev/null +++ b/twitter/view/smarty3/admin.tpl @@ -0,0 +1,3 @@ +{{include file="file:{{$field_input}}" field=$consumerkey}} +{{include file="file:{{$field_input}}" field=$consumersecret}} +
diff --git a/uhremotestorage/settings.tpl b/uhremotestorage/settings.tpl deleted file mode 100755 index 22d7d608..00000000 --- a/uhremotestorage/settings.tpl +++ /dev/null @@ -1,9 +0,0 @@ -
-

$title

-

$desc

- {{ inc field_input.tpl with $field=$url }}{{ endinc }} - {{ inc field_input.tpl with $field=$auth }}{{ endinc }} - {{ inc field_select.tpl with $field=$api }}{{ endinc }} -
- -
diff --git a/uhremotestorage/uhremotestorage.php b/uhremotestorage/uhremotestorage.php index a2a8cc3d..d7d03692 100755 --- a/uhremotestorage/uhremotestorage.php +++ b/uhremotestorage/uhremotestorage.php @@ -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 RemoteStorage WebFinger'), $uid ), '$url' => array( 'unhoestedurl', t('Template URL (with {category})'), $url, 'If your are using ownCloud, your unhosted url will be like http://HOST/apps/remoteStorage/WebDAV.php/USER/remoteStorage/{category}'), diff --git a/uhremotestorage/view/settings.tpl b/uhremotestorage/view/settings.tpl new file mode 100755 index 00000000..51650c85 --- /dev/null +++ b/uhremotestorage/view/settings.tpl @@ -0,0 +1,9 @@ +
+

$title

+

$desc

+ {{ inc $field_input with $field=$url }}{{ endinc }} + {{ inc $field_input with $field=$auth }}{{ endinc }} + {{ inc $field_select with $field=$api }}{{ endinc }} +
+ +
diff --git a/uhremotestorage/view/smarty3/settings.tpl b/uhremotestorage/view/smarty3/settings.tpl new file mode 100644 index 00000000..217f069a --- /dev/null +++ b/uhremotestorage/view/smarty3/settings.tpl @@ -0,0 +1,9 @@ +
+

{{$title}}

+

{{$desc}}

+ {{include file="file:{{$field_input}}" field=$url}} + {{include file="file:{{$field_input}}" field=$auth}} + {{include file="file:{{$field_select}}" field=$api}} +
+ +
diff --git a/widgets/settings.tpl b/widgets/view/settings.tpl similarity index 100% rename from widgets/settings.tpl rename to widgets/view/settings.tpl diff --git a/widgets/view/smarty3/settings.tpl b/widgets/view/smarty3/settings.tpl new file mode 100644 index 00000000..017fa120 --- /dev/null +++ b/widgets/view/smarty3/settings.tpl @@ -0,0 +1,19 @@ +
+

{{$title}}

+
+ + {{$key}} +
+ +
+ +
+ +

{{$widgets_h}}

+
    + {{foreach $widgets as $w}} +
  • {{$w.1}}
    • + {{/foreach}} +
+ +
diff --git a/widgets/view/smarty3/widget_like.tpl b/widgets/view/smarty3/widget_like.tpl new file mode 100644 index 00000000..ad529575 --- /dev/null +++ b/widgets/view/smarty3/widget_like.tpl @@ -0,0 +1,3 @@ + +{{$like}} like +{{$dislike}} dislike diff --git a/widgets/widget_like.tpl b/widgets/view/widget_like.tpl similarity index 100% rename from widgets/widget_like.tpl rename to widgets/view/widget_like.tpl diff --git a/widgets/widget_like.php b/widgets/widget_like.php index 649d4a76..8f356da9 100755 --- a/widgets/widget_like.php +++ b/widgets/widget_like.php @@ -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/widgets.php b/widgets/widgets.php index 47a6e48a..72534ce3 100755 --- a/widgets/widgets.php +++ b/widgets/widgets.php @@ -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(), From c12542ef963a841236ebb0b0ff6ab77c53abcb5e Mon Sep 17 00:00:00 2001 From: Zach Prezkuta Date: Tue, 25 Dec 2012 13:25:09 -0700 Subject: [PATCH 6/9] revert addon Smarty3 templates to non-variable-based includes --- altpager.tgz | Bin 1641 -> 1814 bytes altpager/altpager.php | 8 +------- altpager/view/admin.tpl | 4 ++-- altpager/view/smarty3/admin.tpl | 4 ++-- blackout.tgz | Bin 2752 -> 2884 bytes blackout/blackout.php | 7 +------ blackout/view/admin.tpl | 6 +++--- blackout/view/smarty3/admin.tpl | 6 +++--- communityhome.tgz | Bin 4023 -> 4331 bytes forumdirectory.tgz | Bin 3412 -> 3802 bytes fromgplus.tgz | Bin 3426 -> 3576 bytes gravatar.tgz | Bin 2552 -> 2715 bytes gravatar/gravatar.php | 8 +------- gravatar/view/admin.tpl | 4 ++-- gravatar/view/smarty3/admin.tpl | 4 ++-- impressum.tgz | Bin 2376 -> 2474 bytes impressum/impressum.php | 9 +-------- impressum/view/admin.tpl | 12 ++++++------ impressum/view/smarty3/admin.tpl | 12 ++++++------ libravatar.tgz | Bin 7970 -> 8089 bytes libravatar/libravatar.php | 8 +------- libravatar/view/admin.tpl | 2 +- libravatar/view/smarty3/admin.tpl | 2 +- mathjax.tgz | Bin 2138 -> 2301 bytes mathjax/mathjax.php | 7 +------ mathjax/view/admin.tpl | 2 +- mathjax/view/smarty3/admin.tpl | 2 +- openstreetmap.tgz | Bin 1975 -> 2124 bytes openstreetmap/openstreetmap.php | 8 +------- openstreetmap/view/admin.tpl | 4 ++-- openstreetmap/view/smarty3/admin.tpl | 4 ++-- page.tgz | Bin 2489 -> 2464 bytes piwik.tgz | Bin 3349 -> 3453 bytes piwik/piwik.php | 10 +--------- piwik/view/admin.tpl | 8 ++++---- piwik/view/smarty3/admin.tpl | 8 ++++---- privacy_image_cache.tgz | Bin 3693 -> 4269 bytes remote_permissions.tgz | Bin 3144 -> 3322 bytes remote_permissions/remote_permissions.php | 9 +-------- remote_permissions/view/admin.tpl | 4 ++-- statusnet.tgz | Bin 18071 -> 17889 bytes statusnet/statusnet.php | 9 +-------- statusnet/view/admin.tpl | 10 +++++----- statusnet/view/smarty3/admin.tpl | 10 +++++----- tumblr.tgz | Bin 13202 -> 13212 bytes twitter.tgz | Bin 11416 -> 11796 bytes twitter/view/admin.tpl | 4 ++-- twitter/view/smarty3/admin.tpl | 4 ++-- uhremotestorage.tgz | Bin 1599 -> 1700 bytes uhremotestorage/uhremotestorage.php | 10 +--------- uhremotestorage/view/settings.tpl | 6 +++--- uhremotestorage/view/smarty3/settings.tpl | 6 +++--- widgets.tgz | Bin 3944 -> 4149 bytes 53 files changed, 75 insertions(+), 146 deletions(-) mode change 100755 => 100644 altpager/view/admin.tpl mode change 100755 => 100644 impressum/view/admin.tpl mode change 100755 => 100644 piwik/view/admin.tpl mode change 100755 => 100644 statusnet/view/admin.tpl mode change 100755 => 100644 twitter/view/admin.tpl mode change 100755 => 100644 uhremotestorage/view/settings.tpl diff --git a/altpager.tgz b/altpager.tgz index 87bb2f8fc2306b3d89eb6d3572f56e673a388904..fbfd5594954d81a03e5007215e4d0637883ac40e 100644 GIT binary patch literal 1814 zcmV+x2kH19iwFR73))Zs1MOMsZ`(K$&sY1en9~`RTsVHju>+)aiejG!wATXd-G10z z7_>xNL?}@psXR98|NVy4!&c(f-CZY(z2y%HERnkpQGD1{}%^=IAHndza_q$4-2X3Mp}*UM=g-^l9R5ubdJeC-rZOd(!h5n}c)>(! zX1}H?lq@s1=kQfb(iMfQrhugs3FL~UE1)+SXCc#OnnIc<3n~?80g5FVr{JaZno18y z8i6NxWUehKXX&Nt!^fB@xMrM#$|#K>&&p{*BG4?Ms&54PFLJfQjQT@!|2o&PkmvB0 zT~c^U!WENOEQOb`*4g=BkW?f6P$Yv)iY4Q8kRb7eS&jerH)yxp%RCLON>xtGS&C7@ zdC-NscDp6%iYc_wJQm_I@H3vH5$1|&jmj&(2R?}+kq&m|mYuHn)@!;i_OYF3Lh0Yb zyI6=Dv|C)Pa3=6db7LYU%S3C4CGr`2eSE%!X zgqKBN>zG2t5DY`8Ol3o{V~0YKYJ%pn)SdbJcOO0ik&@h6njdHp(+R=wRJp`k>R(Y< z2@M3U2xl1Sib^11DDqUBH6}yY5|l8TgUF@XW64&zERwDi36?_QrkFJu=0qV=5zG%A z+AvGdAw4U*ac+w(gMVO>g@n(IAn5U5e+3-62?}L;wQ-MCzDO8awcBmCFmiP+Qxjpx ze4Z5|2HT8!zPd%%Ccb4cw>vDYKfIN$^K1F@M z3w`+J-J8;TP3NI|YuCNEu>>DB=1TftYep1Vvx@6x1FPOoo$!f6CLg`yhRZKBfw!}B# zb4?*6X%TytveK1fu0hH|YV~V%$nk|)^P?Z@gvXRb{?E{#f&bFfW{{N6yv;5ifWFP> z%+vHn4??9ph$UUlJRkjHSQ+IOMA2ND`q2k}@Tu&@#b%N3K|&)&W@roU!QjFSdOyjZ zQm@qYJEI(G7UojYRHM%3s1nPq?7(D_j4XJqQx!mkwZAw(E7Nb*qxF}BD{4Hj&30&g z8pbrd#ITz|uvyfFSKvcAHS@{~568~Iw_DUMR3f49{l~X&D(}%7EQnRWmddEY9TB^N zkQ1fQAEhsk7pT#tcj3R-ki}zb!6J(u9P3p=*gW!I4h;2+<{m6Et|+tqT9OPaOmhoP z7L+&X?2u=q-VAz`ApcS2L2tDDR4ZVT5He0e>)P!;;#DQA-J~H2OS4=zC9y+Z8Ku_t z3vuH?ik;4uXr}t+I50A9!N{!~X#%#f!vIZkv2FX1Q-Z1$6Mh+@*jrq&h+JWr9%8-_P+4P)$nd+wQi;LKa_>L$hAQ!`9}Wrt`b)s#Ux5tYReov z>xeF%7#&^aR6^usp3O0X&}o_m;926n&bX;%_p;st6Zai~izT&QMh2l2D(L85abyOV zVScAPW?*))Eql+-6$R1G6)WlkB#Z?XG;9WN&36S=w+AD8|E-W1Q)My5+&AH6QjOH< zQRaRRwoCK&u?2p)b+@R-g*Yrl6S64ZFVep@l(@@@9s33!FN)J2DTTuLzm6%&B~6kT zG5?T^L#$Wb;*k8jbBm?`J#3v@2;G{sg5Y5bP-@iewpyC z;;G$2S2Fj4a%*c}te+#SmBVIJ@Zn)EU|Rtw)cmubtNtpeQ}T+@>qmMC^c&v)Oh%It zKL4MbOvmp1&r_i3|GH)$bPxNI=k)ZG{vVIV_xyi4JR7<9KTmPvn0eTk(VKv9JDb<^SpF=*;B*6vRP>;E1fyZwLIK5$?EcXBqV`@iwo82vw)jE1iMKLzgYupsk1qF}y;&AfZ%+=Ip$ zV9WlOE!dR)Lsa{_yRzP|*RJ9p5<6eSA9#;__1`@6Vg3)t=K1ezT73U^`Trznx7+`0 zzP2|X0+(D6eGZ&1^^11vnngN32lP;OgSU7_tXO)y5L$}_hbLxqy~XDN2lH+2&sNmI z!NI}7!NI}7!NI}7!NI}7!NI}7!NI}7!NI}7!NI}7!NI}7!NI}7;r{^t0}5H8bpTKR E0OQ=Q-2eap literal 1641 zcmV-v2A26BiwFRbr^-+O1ML{wZre6Aul84*X+|X%j<0c2q;-O#>$(B$S|Hu_&<+MI z(H0R(6i6yg(B|KFNJ_FDJ58~rDTe7F0VML=?=s;!BMT~fd*2TF2uDZbz2W%aXgECB z>yHnIhX(_DUcla9*gqVOhoceV^#{Z8;n5z9zoAYQu$Pc=fhO>^*+mgvan3 zN$4>==bFltXbSJhg5d)bsk!}$s!+1bydJ}gn4}8|S%m>}DH6yPOBX;dGtNS$%{7HI zPi9mq&;k@oGETuu>5@thNE(4Bcx0X}Drf1r>cab&DOfVjL1mOikY~lUAQ5PmP}MaG z{efJqGJ|g4yg$!%EaWk~VdoUyl<|aTvDVpfuUAF58;YctNik=f_7X%sG1T~vf4ye2 zInUG3npD=rl%<#@oCj_A)ND2+T`+|{n#Mw$2Y$wLbi!0otIQe7nNZ0;RV_}BjLGAY#mc58G>O5rK@Zzw(L(y_Xm;5OJi_yLP7Bz$TV!H9qU40v=IIAc1MbN5v~OBi~! z-EKB8b9F9LlVQkwnmHANbw(XuU14Yw-?Erm9)5?V8qF@4f2f%If3;0Quyig0(1HKF zI9~-I&m!zkQP*!n7hb-7T|{p)co^O)bnk2~!P&}PNf&I-h$8D&u}oL&jbziV45g90 za_5&E8azU0K58jfCtJSUbX04>#f)&6zye)Xc+9JO<8{Du7@l>-Jg5jJFxX_(TUnv> z6{jkum@8}QoAg;y2ubR4&tjIga;!B-SxBvYjTYHIF*G0iSSLKDB=Y})?gad2rZ!T4!w`^W9k*QzB0z4WnnHQO*PtVMwOVaRRmC@j%hc6U`5o1Q}Cg&SoBGuTfzWw6MEqNw_% zBpG&?O%a^TDBr}hN1oAob?B9f{H}^YZ>+p+6);5z87H9)?fM>ZS}JRWY-qyLEZ3Ww z*dwpVQtSJfxbz^!O=nFt(|vP17?`kN=9Ymp3A-Vohb}o;_kGAILDSrYU!*AR78fj{ z*wtN|gjudNdi%}*I`qoTa8j7$)OWWxmESLqcQdPOE4+VJG;UXGy+ZSq{@1%&TrrAC zl(5vcIe63(ZJZb_jmd8IsA#B3_sC|12mEK_8p zDvYA)JFwoA*9R8(h3K~H!%iKRqVrgk->uTGD@>F!v}Z3#7`wTTm_lLZFJp>&NmCw1 z&3~n1A3IgsjmIyC)vW^p*U$&#%>ULfK)ZX(*XlcQ6`G_BUz nR*6uquyu#2p@tf2sG)`$YN(-x8fvJahTGt8Gg 'field_radio.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$global' => array('altpagerchoice', t('Global'), 1, t('Force global use of the alternate pager'), get_config('alt_pager', 'global') == 1), '$individual' => array('altpagerchoice', t('Individual'), 2, t('Each user chooses whether to use the alternate pager'), get_config('alt_pager', 'global') == 0) diff --git a/altpager/view/admin.tpl b/altpager/view/admin.tpl old mode 100755 new mode 100644 index 1176db41..60558808 --- a/altpager/view/admin.tpl +++ b/altpager/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_radio with $field=$global }}{{ endinc }} -{{ inc $field_radio with $field=$individual }}{{ endinc }} +{{ inc field_radio.tpl with $field=$global }}{{ endinc }} +{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
diff --git a/altpager/view/smarty3/admin.tpl b/altpager/view/smarty3/admin.tpl index 50780231..e67afd73 100644 --- a/altpager/view/smarty3/admin.tpl +++ b/altpager/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_radio}}" field=$global}} -{{include file="file:{{$field_radio}}" field=$individual}} +{{include file="field_radio.tpl" field=$global}} +{{include file="field_radio.tpl" field=$individual}}
diff --git a/blackout.tgz b/blackout.tgz index 4b5a5d312d391537ef64ea909cf8ecdcffe15f0c..6d081dc4a55b5fdc050e9cb87f99d9a47af05ac8 100644 GIT binary patch literal 2884 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 GPyhhu!%p4+ diff --git a/blackout/blackout.php b/blackout/blackout.php index 4c2a74b6..83495611 100644 --- a/blackout/blackout.php +++ b/blackout/blackout.php @@ -95,12 +95,7 @@ function blackout_plugin_admin(&$a, &$o) { if (! is_string($myurl)) { $myurl = "http://www.example.com"; } $t = get_markup_template( "admin.tpl", "addon/blackout/" ); - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$rurl' => array("rurl", "Redirect URL", $myurl, "all your visitors from the web will be redirected to this URL"), '$startdate' => array("startdate", "Begin of the Blackout
(YYYY-MM-DD hh:mm)", $mystart, "format is YYYY year, MM month, DD day, hh hour and mm minute"), diff --git a/blackout/view/admin.tpl b/blackout/view/admin.tpl index e19bd246..25922193 100644 --- a/blackout/view/admin.tpl +++ b/blackout/view/admin.tpl @@ -1,6 +1,6 @@ -{{ inc $field_input with $field=$startdate }}{{ endinc }} -{{ inc $field_input with $field=$enddate }}{{ endinc }} -{{ inc $field_input with $field=$rurl }}{{ endinc }} +{{ inc field_input.tpl with $field=$startdate }}{{ endinc }} +{{ inc field_input.tpl with $field=$enddate }}{{ endinc }} +{{ inc field_input.tpl with $field=$rurl }}{{ endinc }}
Note: The redirect will be active from the moment you diff --git a/blackout/view/smarty3/admin.tpl b/blackout/view/smarty3/admin.tpl index f77a5948..11a4d914 100644 --- a/blackout/view/smarty3/admin.tpl +++ b/blackout/view/smarty3/admin.tpl @@ -1,6 +1,6 @@ -{{include file="file:{{$field_input}}" field=$startdate}} -{{include file="file:{{$field_input}}" field=$enddate}} -{{include file="file:{{$field_input}}" field=$rurl}} +{{include file="field_input.tpl" field=$startdate}} +{{include file="field_input.tpl" field=$enddate}} +{{include file="field_input.tpl" field=$rurl}}
Note: The redirect will be active from the moment you diff --git a/communityhome.tgz b/communityhome.tgz index 20f7b9642c0e676d43f9143eb52e1df174bde2ff..71f1f8e30f3e38731dbf8efd496e65f82623ba94 100755 GIT binary patch literal 4331 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 ZQ<=(CrZSbOOlA7g^k3O2d({AV008SYo=^Y) literal 4023 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 diff --git a/forumdirectory.tgz b/forumdirectory.tgz index 09fcb4ce9db4189b230611884834b684a24cae94..249cd22645f56aa842c15b68551b885e89cfbc55 100644 GIT binary patch literal 3802 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 Q_D^m91=AT~H~>%p0OQtj8~^|S literal 3412 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 E0Lr4McK`qY diff --git a/gravatar.tgz b/gravatar.tgz index 25106f2658a5c407d184214ee68f1aa089ad7ae5..561c4aaecc00a7c3a8518f328814358b2e513f88 100644 GIT binary patch literal 2715 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 VHPlc;4K=L5zW{)dR?+}a004JIJ1hVI literal 2552 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'; - - $includes = array( - '$field_select' => 'field_select.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros( $t, $includes + array( + $o .= replace_macros( $t, array( '$submit' => t('Submit'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found at Gravatar. See README'), $default_avatars), '$rating' => array('rating', t('Rating of images'), $rating, t('Select the appropriate avatar rating for your site. See README'), $ratings), diff --git a/gravatar/view/admin.tpl b/gravatar/view/admin.tpl index b187e1ea..83144e43 100644 --- a/gravatar/view/admin.tpl +++ b/gravatar/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_select with $field=$default_avatar}}{{ endinc }} -{{ inc $field_select with $field=$rating }}{{ endinc }} +{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} +{{ inc field_select.tpl with $field=$rating }}{{ endinc }}
diff --git a/gravatar/view/smarty3/admin.tpl b/gravatar/view/smarty3/admin.tpl index 30d760af..5dfd4488 100644 --- a/gravatar/view/smarty3/admin.tpl +++ b/gravatar/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_select}}" field=$default_avatar}} -{{include file="file:{{$field_select}}" field=$rating}} +{{include file="field_select.tpl" field=$default_avatar}} +{{include file="field_select.tpl" field=$rating}}
diff --git a/impressum.tgz b/impressum.tgz index 8c36df6f2b4afa2bdd1a5c080103f3375cb73389..b47b625cf743a9c32a4caa45007446970cc45c63 100755 GIT binary patch literal 2474 zcmV;b303wViwFR83))Zs1MOOEZ`(K$&S(FMSzoY{3)e5P9Usy-yY05c7U*t+Yp}qf zC=6PnEupfgm8iUIkpF%&Bqd97?8Mn5y~Alxps_?ge18G7wN_0;#A7B! z+!Yrgj}hAiPh1e7BSOg>30ERT3~(3{6mx8G1%IYIQFxsOB7O)JTqq<@6hI`<@dB9p zJV3hC-$Bl#;IC)DeFVuCiL!;}CH-)LIKPN+?l00<5j{fK&$xbrD?|wb8lQ$Rh~}4B z-#*Sl!WB%Sbu#buoFS!{GsHvgNCj1Nm)Ia;ArCqYXnatQ6(3R!+a>~E$9#^{fzv>= z8BNBD9dV*j63Lm{&J{!wYTU+L1cA6fK5))rpUncEbMAOjLn#cJy%(_0UY_WOU#vW4 zSzo_c$|TlTScxQGz<&hwJ6kG)(BGeo74Ly(996?+c*tHvq#BwnUm?I8N2H-_z;1Hk z@t7-G=xgW5QF&HKbT7!5fgh5`Zs*FE%nwSsv)m)qJ6a3W9PEsFYiFXwX2!wwlPF+U z+=V3Y7oJ3~6SH}mI81VPS5S;3q^iwii(fKyVQ#xZwj8m%!`gb)6jjD}kp`|-n-+hz zurkfnMDNNk^H$Uwecka;YbMK+xP_!znL00+Sxz8`2<|AN-{C{-N z8&m!_>L1kk|8q#i{%YUv$S8QsG04D&!{J8zkJs!!931rO{Qo)R`WiP6M<-FpP{~U7s6I#2`eet3J zFI2VcXjMg^M{jxJ#J;L~9Azb9DX5^4SDFeHjjYD1>!+&DXs_z6Edu<5$B6>#cMj1D@M8y+{BhQx9W_OUeP)YpF;07)JN4k*J7jYx$1d!bE>}v?ENIu zd_RE+Br=}HJPH{3&d*lcqH3nq##XO3H0n?zs&f`v#ayOwh>c5QSJklhSsQ-bpXCJ9 z*Tn?1tJ(`Lr@F>x7ixU%Qi-qC1{tT^4C~Lq{vm^zfMsRK3Z1)fF(pfK&Np;cK8#T~J7cD6GBd(Qzhqj)CR?#8X-eyx&YNZ#(G6FIUTX|urN5@j; zSI@{+tmrv6zysVTZiUoc3TCX0?G6cY;9LCgtY1tSZRB@7b?H|b`M zcq>T78e;{owCArgE1mk4QIl<(jn&3gn0j1@tgSfB#34J?k?m7Rw| z%TzBcn4Bmz^siRC&_eqSHPD?iM}o>8)83xus8mBo+tOtmeT4w$Ykknn>8fMr&RC|9 zz-bm@?%)!w+R>I}f>w6bz=YY1V3nHjkWE1sBD%5`E?!Cz9YKE-UF!5;j^XfS;{U~upx5~)U)F)6mRf45rIuQ1sil@$ oYN@4`T574KmRf45rIuQ1sil@$YN@4`TK)^$zy05s3+_y7O^ literal 2376 zcmV-O3AgqiiwFSIxlvF61MON{ZyUD~_OpHkt7CLmfuoBh*@11jO`8M_kT$_dP~ad4 z1ZtO(2(OmgCD)D{_`jbSl6%!9w(GbL;XDM^?##!T;qc>-8@@_XCS|tj?R_)pgB*{? zdxzuE@!{cUuRlIIJQ@x3b1Qp;!~WrDI2;`hj`sS4AsFnD@waoSluRm`60*0V!Gfok zJl>+0EXGHJXV0EJhEIXL z!NPu>7Xm(d!DNu~L~#+HkatnG;4x8x06UNXxPS(V@OUoL6-5<%rIw7)naC7y$bu2S zH%~c>Lmto$0{+QTslf)_L;U?bQ%jMakPl+UsU$Bry8w-)n9s@CQmN#m*9*&M-KAKu zEasoPF;hA61??rNnDdDBltwv6;5R&Av4nVrPlJeNl96BDzaWu$3JSeeD`kIWJY`c6 z2h8_)97I{jdb3#|LWZlr>zuY)^DGW@Y$a3j7>Xu}{Ej8dlr6Xf?wl@#xbQt4z5d%f zAReSj#Jw%+3>8XT2=NNX+<=L>oI{%94m;?fmQ=cs^Af z?*Oz;wN|84v0!KW{2f-;{TAtOo->@$QqqKJ;$tn^potwd5}7m?jlVSl{TiySQjf4!A{P5537u*|uD#7uRMRpGW0eq`8d_Fi&7$k+ z>DSM2u4uJ#ZU~EDpV$a#Oe(q?z0+Z>du8h-IX?qM5id;HyyuFMx26El7yIsncwI9p zJe;Ml4r*2}b*i6-A?9+;(0G6kldng1f43Uw8*^dG?6%2xXR3EoTqX%Px-IcrI-o0c z$M}#ft+EAfEoW6r@c08XI^`asiH*dJg%Z1<86&3bvy_EDm(%& zrqsEvuCpHeMJ{Q|=?vCCz+8(gwLnCdFL@8q5l?E8=Q^(T0Lf;&!?^GeEF2P}AQCvL9QgfCdJ2AoqMLe|0TnZ zMH3?@$r^?w!fmmc*G;6##@@uM?fL7TRbMwy<*v=fJAhTild1MFr|4VQ<3@ttHwlkAgv$IUH+pe10nswzxj)7+;pCH*XrFguMBuhfrHbY#V zfwfEDT|sND<|39!KQ1r zjw?>(l}$G6e%n2%G;hB5o47*0&rjmj@yR8pM8?QCx+5U}6B!9;O!P_kmtUdBBe09C zrO;G=#Z9{$aJWD6)^D40WpC(v5DUlJg|G~HswM1tG-XhX5-RK(j$ktuGpd%_@eS7r zw|3er^@`JW?UVI>X}j~5iEouy(`6C=iboOd^<_v!2OM@9PFDG$;%bdHaO_v+9u||f z%iZST4i*V+2ar7Nu6ccn40by168HO+@+58=#&0pk?)%^VaB$T8{xdu}?z{Wn$B^Rc zBEQ^4{&ZwPjddM=D#*dqeYul7i(9X$cq_ppAW zYwY+U9A6W^LA1Z@`sR=YnYWrcCi~vxOya&w0S|oFM^4jTCNySIw?$g7^<(W1h6cJ4 zn$n~=aH89^IPjWJ0lGQD+g3)ygCan1LXX>;izpIT;7{coYklf2RprQw*?XezB+bK* zm0j>taj2{u@D}d)~RTqiY?GjQC=ypz6w2=dPgC zwC{Lh&OTEpVW#iJ1F`zbZ0D!*5(@Yti|ofJT>SaM$|Ki_zN>$Ewa)NTg$7HeZ)|Ew z+~K4>{a52Hd*Le6n3mW?a90;=Q(_lRgYkBIS-T0)kh*`=F0D^Gy>o@5Lo=b2Smg^4 zc?a0=-`?_^RHW?xirat(ALA?iU;h~Y{}=Rs_FBbESulY*mPU>aNKO3_Zzf& zH`_p{e!Vm|XzlYe?SlP=Y9H#&anjabz9m3v)Cr+F=apJ^@6DLlbIC0{{i4!MIoH%jf#EFydRQ?YM$47hsPyhfT!mg44 diff --git a/impressum/impressum.php b/impressum/impressum.php index 305dd9a9..3c1106c9 100755 --- a/impressum/impressum.php +++ b/impressum/impressum.php @@ -79,14 +79,7 @@ function impressum_plugin_admin_post (&$a) { } function impressum_plugin_admin (&$a, &$o) { $t = get_markup_template( "admin.tpl", "addon/impressum/" ); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_textarea' => 'field_textarea.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$owner' => array('owner', t('Site Owner'), get_config('impressum','owner'), t('The page operators name.')), '$ownerprofile' => array('ownerprofile', t('Site Owners Profile'), get_config('impressum','ownerprofile'), t('Profile address of the operator.')), diff --git a/impressum/view/admin.tpl b/impressum/view/admin.tpl old mode 100755 new mode 100644 index e3651137..901df73f --- a/impressum/view/admin.tpl +++ b/impressum/view/admin.tpl @@ -1,7 +1,7 @@ -{{ inc $field_input with $field=$owner }}{{ endinc }} -{{ inc $field_input with $field=$ownerprofile }}{{ endinc }} -{{ inc $field_textarea with $field=$postal }}{{ endinc }} -{{ inc $field_textarea with $field=$notes }}{{ endinc }} -{{ inc $field_input with $field=$email }}{{ endinc }} -{{ inc $field_textarea with $field=$footer_text }}{{ endinc }} +{{ inc field_input.tpl with $field=$owner }}{{ endinc }} +{{ inc field_input.tpl with $field=$ownerprofile }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$postal }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$notes }}{{ endinc }} +{{ inc field_input.tpl with $field=$email }}{{ endinc }} +{{ inc field_textarea.tpl with $field=$footer_text }}{{ endinc }}
diff --git a/impressum/view/smarty3/admin.tpl b/impressum/view/smarty3/admin.tpl index a3b0ef27..80b67824 100644 --- a/impressum/view/smarty3/admin.tpl +++ b/impressum/view/smarty3/admin.tpl @@ -1,7 +1,7 @@ -{{include file="file:{{$field_input}}" field=$owner}} -{{include file="file:{{$field_input}}" field=$ownerprofile}} -{{include file="file:{{$field_textarea}}" field=$postal}} -{{include file="file:{{$field_textarea}}" field=$notes}} -{{include file="file:{{$field_input}}" field=$email}} -{{include file="file:{{$field_textarea}}" field=$footer_text}} +{{include file="field_input.tpl" field=$owner}} +{{include file="field_input.tpl" field=$ownerprofile}} +{{include file="field_textarea.tpl" field=$postal}} +{{include file="field_textarea.tpl" field=$notes}} +{{include file="field_input.tpl" field=$email}} +{{include file="field_textarea.tpl" field=$footer_text}}
diff --git a/libravatar.tgz b/libravatar.tgz index 0405af9bd532c8ec17112fcbbd3b92d65f07ead8..d61f63bafb394b797b18708f861695ff5cd5af27 100644 GIT binary patch literal 8089 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 literal 7970 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 Y6e&`qNRc8%iu4rpFSfFU?f{?w01Q=L!vFvP diff --git a/libravatar/libravatar.php b/libravatar/libravatar.php index c966052f..8cbf1e98 100644 --- a/libravatar/libravatar.php +++ b/libravatar/libravatar.php @@ -95,13 +95,7 @@ function libravatar_plugin_admin (&$a, &$o) { // output Libravatar settings $o .= ''; - - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o .= replace_macros( $t, $includes + array( + $o .= replace_macros( $t, array( '$submit' => t('Submit'), '$default_avatar' => array('avatar', t('Default avatar image'), $default_avatar, t('Select default avatar image if none was found. See README'), $default_avatars), )); diff --git a/libravatar/view/admin.tpl b/libravatar/view/admin.tpl index 01b113c4..814f4a44 100644 --- a/libravatar/view/admin.tpl +++ b/libravatar/view/admin.tpl @@ -1,2 +1,2 @@ -{{ inc $field_select with $field=$default_avatar}}{{ endinc }} +{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }}
diff --git a/libravatar/view/smarty3/admin.tpl b/libravatar/view/smarty3/admin.tpl index 4e930a74..ee958287 100644 --- a/libravatar/view/smarty3/admin.tpl +++ b/libravatar/view/smarty3/admin.tpl @@ -1,2 +1,2 @@ -{{include file="file:{{$field_select}}" field=$default_avatar}} +{{include file="field_select.tpl" field=$default_avatar}}
diff --git a/mathjax.tgz b/mathjax.tgz index 37bfbf616cfff3024c206cfe7fbe8caec319ee62..a340aee4799954fc0fb5c9e128f91dd868b14700 100644 GIT binary patch literal 2301 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 diff --git a/mathjax/mathjax.php b/mathjax/mathjax.php index 33cdd439..e57d69bf 100644 --- a/mathjax/mathjax.php +++ b/mathjax/mathjax.php @@ -71,12 +71,7 @@ function mathjax_plugin_admin (&$a, &$o) { set_config('mathjax','baseurl','http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML'); } - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros( $t, $includes + array( + $o = replace_macros( $t, array( '$baseurl' => array('baseurl', t('MathJax Base URL'), get_config('mathjax','baseurl' ), t('The URL for the javascript file that should be included to use MathJax. Can be either the MathJax CDN or another installation of MathJax.')), )); } diff --git a/mathjax/view/admin.tpl b/mathjax/view/admin.tpl index ed60d734..1c723cdd 100644 --- a/mathjax/view/admin.tpl +++ b/mathjax/view/admin.tpl @@ -1,2 +1,2 @@ -{{ inc $field_input with $field=$baseurl }}{{endinc }} +{{ inc field_input.tpl with $field=$baseurl }}{{endinc }}
diff --git a/mathjax/view/smarty3/admin.tpl b/mathjax/view/smarty3/admin.tpl index 8d0388ca..f6ec03e0 100644 --- a/mathjax/view/smarty3/admin.tpl +++ b/mathjax/view/smarty3/admin.tpl @@ -1,2 +1,2 @@ -{{include file="file:{{$field_input}}" field=$baseurl}} +{{include file="field_input.tpl" field=$baseurl}}
diff --git a/openstreetmap.tgz b/openstreetmap.tgz index c195d151cbcb66c49f95f39d2a8c0a13967fe5c5..967b56017b7e109cf26897381ebb1083ecf3b628 100644 GIT binary patch literal 2124 zcmV-S2($MeiwFR83))Zs1MOLDZ`;Tb_E+;)ObH>P43!cs$vP;u0;36vqUR=vofd5n z2y1aA@l0`f%cT^Z&;PwMyOd1ImhBWiUxV8R0UUB?=Y3{pDUtFdQ<8HvXK8EiH$fZG z@Ac?!(C@X&f7jRx4%)`|t;kKa3FY9<$(F zXTcdu;X|BHqeQPbmn%4nt~i{r@idZ)C~*Mb?=j0W_!o~to?N0|9Oq&dWx&EvB*5ZW zEHhY%9F%}O<6GP(LP8j2Y0OqpGKE--nTkY``Hn-XeB?jpk>qopsEkxV-iC`J5vfs) zm?xZvz(7SYhjT6$Tp|fmkV>&Y#WH;2fJu#vs|tinF+g4ue4(}BxOXKIUg+z?#f(SN zaLzPmv`unIgz}vaF=wO=L#Hs*UR(hRReFbeL0dj$Y|7z-h@M=i^KUe8%o32fHdcaICS`>H)gI4;Kut*Ti4^lfhd9aCiKe;KQ8f|# z+eAl!RiFMV*F(=o0xWfU(GN;^vY8KS6W0MStjcCN#w?Mni)wA* z+k)snWc#J~iY^Oa8KDx{3>`)!%b7sMmqNy&mLB{-#YZc%XgcGWa!QV43sj9=#vEOu zvuSrcb!Jg^YF_?K8TI{imYU=tVH7d9lIiZ+pX)+lMLL9z?qAf0u*E@*{ds6Oey(RL zOv8Eo%jdc#segf!Ev`-Qecv_NGGhzfN=UX^imkj}Fd317nJx#D)W~yiS87E730L#X z#9u2=Ul;Roc~33ZUq8-|{BBqUKOnu%!Gn#Ega4!agS!c+`5(~Yf&c9}2lpr4?|mA- zJgW0wHIJ~8o<+tZ^M9`s^ta~!BYbP;zn8%A8;r8kIyi9P0RF+|d{8~{>GfNljb)Tl z`x@v)9NPNQ)tfipht_GgIH#G_I)S zRMV7H{3nh#TD`yz==n5PGa(0Cvnw1IJ#)T(0*v+^!jssBlSxIe*G1yi(?^Vh%1eTvyahIxlCT;z_;HzaP~0?{>se&yz}@jX71b3 zLysLkZEiXHwar0_2kexqk)iRnj^SqMR7bmw6}NjywF;;8sek9h#{+!7rVq7;#py%; zRuVmGA;s39Pw}a3$`d7O&e~bUQ+3_D&)ILFevEfBCQ+3W*Nk0}ius9K2OsWiz;|^Q zW;n?sfq!eTUw`xS3GK)!aAOhj`-IWv;ZDBCEryE&)Lf??n!Oc&N}j^N4DI1x)0hO+ z0ke3E6g@!<#v)IYS8Qp(5CX%b?7Z;o!ij%Zt}nIYvAHPz zRk=e?i#85Ik&WXP5e_N4_VGH$tNe)F4n|czB{rydVcJa1V?Eh!7`}GaCH_!vF&DOx zxte*eOotKL_?jvTYtH0Vo{mrso_LCT;A(PTrLo(jhr9jJ1`j0VS``V)K z7e08wK;K20co7*CH;{&r)X<0B6Vh>{$0o{2la5&Oy7_+fYNHSD&oA)AE#(b$;6x}k z%{(Qec|lXTLLyDk6gQ!+a5Lr+BfJGJSX^af?v92>(AQkD-8lx8P?PSDZYcb1(vgxg znFvqkRq-_i@-(DtyI*hk@b3MO+L6EaIQ`wB+Nc&0Uq1hjK;QEF&tdnFzW;Z69sB#w zOW>aPZ;rF)lJUszKX~Qej(;!c9ohT;OW^t%+xr-AE<6tL{+i~BB5%H~)%4qw(zJ1N zgYOer(8v1k_K(`O|Gxwti2t*l1CRCp!~Wr> z|95*``u^MNcWwWF30z-ePmc4D>yK9_?p7~%VfzfwZU1R|sP#Wbx4*tF`u)v~?f4cJ z78Vv378Vv378Vv378Vv378Vv378Vv378Vv378Vv378Vv378VwNX#5w2ABZOaPyhh9 C@h<5A literal 1975 zcmV;o2T1rIiwFQi+_F#r1MOISZ`-^P&%e>9xEV$z2cB#vu@kt7i(oB=Va-}J>4vQ+ z4BDbCK9NN|BxTp@lkdJeQg$RKZZe=xx?&~@G#2mWcW>k!WyVu&6z68fvew@3vf8*# zPP%)C-Q$zP!{fbnw|Ce(?%40e+Up#)k9vnl*6HoFJ4d~4cMrP151i`CwP6ZiZ^p(` zq2?mpLYGauz0T?B>2qLu#w9E9|M2GG_2rxIt%CyG>m6^4|IsnVyc+-GE^b5ndjolB z{h!AlhPdDzX2F%sf=iac`y`)=)b4nrC0vRd4wozUcmVL%gykCk!9~Q=5gW&zcO452 zEQ(|bEJ@@-!&2s8B;=ZJNS{arkIABtv;3|NK83rh8f*&jzj=W2m@&a!N z*D)8$N!C^}+NL<9(uCgogfl|J&?yYj%NszY#&XoIiRGhaQx5NCBF4*F-;0gO`mNSN z+=#GJZJ|_C`?*DI!<^WLnPv0-i3W~Y3M#k8Dv*n`3xnFGKLWi!tspO995GJNtFmfyt2q^L`-LQa-Vj`j1(+SgY2rCm;0dS(qW_ivmnXZazW#Q|B z=wD>}NPa<=bzmV7gpSc+M6!q_0$)g#L{@v}l!}jbVlj=mHeShbY>v>_DB;Il(ef^3@`4|sOo1 zNYB%VSZ;5@X z2k?iTCe{3Vy)=U~isshKGi0 zjFA>YB8tg}$hEuQv1z!WmZO@c1o7`U-dK2@utUEuauZ9{-yQk5nKLR<*1}G_YsePvmsURZuH*<4jy_cai9JD_|Vu%8>K)nL*>6FXvkzZ^OKj z6x3N0Uexhgm|5^*68r%Iq)RyN(dSS8TI=Tq{Pr7EH^)+{2zMF{Zy%#&a+SWsfp5Qc z;O%1){F%D}cx(G!%-naQhaEdYVs3f+rCakHrrZo2O|a31H%nbT+U=~k<0WVnNvp2^ zUdN9O{Jy(vzpc(T{dbz^r&Ut0c1|ch^>uloMl0DmtN2yj4<2&%EAY=4U>PHn^O_sG zgh}w~_929O4EW8jL5!0;5`=dKhyJTy&xs?az>Q_ZA5uolgROGUS`0V)h}@34rqvS$FHvKeTaGE0(I^>?7Z;oZGPWuJa%yn@5ToGM&*Z zS9EtXJX{R_f(>3^RXYcv%EnoX2nUp1`#jOSDv!i%5mc2^5`(}C(_%AA>}0zZ_|jXI z__xj$_h2)0Pcy*_cfv?(eBGcpD)3=ZU4~vL1HAbZb*aH{Xg7zAuy!{_(NXr3p9B*B zR2(n&F(2Z!sU+H5H%(wlv1Nete$kBka6SMN_*d>%qiOf~9o+tyfA|?QaX>b?HIEVx&Ku z0h`Yi_FW-_pwqW+5KZWu_KTN?hSSurm)sN5aA?~l%0-ukSnBrB{SwrN@84Zr<4s%2 z8#;MYY1mW;Mu}NLQ+YZM`VYw2 JveE!3002nt@R9%k diff --git a/openstreetmap/openstreetmap.php b/openstreetmap/openstreetmap.php index bf663253..cb9abcd7 100755 --- a/openstreetmap/openstreetmap.php +++ b/openstreetmap/openstreetmap.php @@ -58,7 +58,6 @@ function openstreetmap_location($a, &$item) { function openstreetmap_plugin_admin (&$a, &$o) { -# $t = file_get_contents( dirname(__file__)."/admin.tpl"); $t = get_markup_template( "admin.tpl", "addon/openstreetmap/" ); $tmsserver = get_config('openstreetmap','tmsserver'); if(! $tmsserver) @@ -67,12 +66,7 @@ function openstreetmap_plugin_admin (&$a, &$o) { if(! $zoom) $zoom = 17; - $includes = array( - '$field_input' => 'field_input.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros( $t, $includes + array( + $o = replace_macros( $t, array( '$submit' => t('Submit'), '$tmsserver' => array('tmsserver', t('Tile Server URL'), $tmsserver, t('A list of public tile servers')), '$zoom' => array('zoom', t('Default zoom'), $zoom, t('The default zoom level. (1:world, 18:highest)')), diff --git a/openstreetmap/view/admin.tpl b/openstreetmap/view/admin.tpl index f733a917..75db9cd7 100644 --- a/openstreetmap/view/admin.tpl +++ b/openstreetmap/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_input with $field=$tmsserver }}{{ endinc }} -{{ inc $field_input with $field=$zoom }}{{ endinc }} +{{ inc field_input.tpl with $field=$tmsserver }}{{ endinc }} +{{ inc field_input.tpl with $field=$zoom }}{{ endinc }}
diff --git a/openstreetmap/view/smarty3/admin.tpl b/openstreetmap/view/smarty3/admin.tpl index 90baf1be..6ee07174 100644 --- a/openstreetmap/view/smarty3/admin.tpl +++ b/openstreetmap/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_input}}" field=$tmsserver}} -{{include file="file:{{$field_input}}" field=$zoom}} +{{include file="field_input.tpl" field=$tmsserver}} +{{include file="field_input.tpl" field=$zoom}}
diff --git a/page.tgz b/page.tgz index 02140ce92def21beac5e562e0db67eefd522ff8a..c9610e28bb66cd2f9578de2e642b5cfc1b7d3bc7 100644 GIT binary patch delta 2457 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 diff --git a/piwik.tgz b/piwik.tgz index 080dd9e32c6bfd1513b54dcd98fa04ace138b5ed..a5bd437aa4c566a3518df99c19aad2141aadd904 100755 GIT binary patch literal 3453 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 literal 3349 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 fEws==3oW$JLJKXl&_W9>{E_e 'field_input.tpl', - '$field_checkbox' => 'field_select.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros( $t, $includes + array( + $o = replace_macros( $t, array( '$submit' => t('Submit'), '$baseurl' => array('baseurl', t('Piwik Base URL'), get_config('piwik','baseurl' ), t('Absolute path to your Piwik installation. (without protocol (http/s), with trailing slash)')), '$siteid' => array('siteid', t('Site ID'), get_config('piwik','siteid' ), ''), diff --git a/piwik/view/admin.tpl b/piwik/view/admin.tpl old mode 100755 new mode 100644 index 21a6ea87..e57758a9 --- a/piwik/view/admin.tpl +++ b/piwik/view/admin.tpl @@ -1,5 +1,5 @@ -{{ inc $field_input with $field=$baseurl }}{{ endinc }} -{{ inc $field_input with $field=$siteid }}{{ endinc }} -{{ inc $field_checkbox with $field=$optout }}{{ endinc }} -{{ inc $field_checkbox with $field=$async }}{{ endinc }} +{{ inc field_input.tpl with $field=$baseurl }}{{ endinc }} +{{ inc field_input.tpl with $field=$siteid }}{{ endinc }} +{{ inc field_checkbox.tpl with $field=$optout }}{{ endinc }} +{{ inc field_checkbox.tpl with $field=$async }}{{ endinc }}
diff --git a/piwik/view/smarty3/admin.tpl b/piwik/view/smarty3/admin.tpl index 3fd39737..bfe04aa3 100644 --- a/piwik/view/smarty3/admin.tpl +++ b/piwik/view/smarty3/admin.tpl @@ -1,5 +1,5 @@ -{{include file="file:{{$field_input}}" field=$baseurl}} -{{include file="file:{{$field_input}}" field=$siteid}} -{{include file="file:{{$field_checkbox}}" field=$optout}} -{{include file="file:{{$field_checkbox}}" field=$async}} +{{include file="field_input.tpl" field=$baseurl}} +{{include file="field_input.tpl" field=$siteid}} +{{include file="field_checkbox.tpl" field=$optout}} +{{include file="field_checkbox.tpl" field=$async}}
diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz index 13239d9046359957aae6e93d4b4c9cfe275517a0..b0690fc2bcb02d3f208ae0a54901db629b7a4d0c 100644 GIT binary patch literal 4269 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 Pwab42SO7z@08jt`gm58O literal 3693 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 'field_radio.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$global' => array('remotepermschoice', t('Global'), 1, t('The posts of every user on this server show the post recipients'), get_config('remote_perms', 'global') == 1), '$individual' => array('remotepermschoice', t('Individual'), 2, t('Each user chooses whether his/her posts show the post recipients'), get_config('remote_perms', 'global') == 0) diff --git a/remote_permissions/view/admin.tpl b/remote_permissions/view/admin.tpl index 1176db41..60558808 100644 --- a/remote_permissions/view/admin.tpl +++ b/remote_permissions/view/admin.tpl @@ -1,3 +1,3 @@ -{{ inc $field_radio with $field=$global }}{{ endinc }} -{{ inc $field_radio with $field=$individual }}{{ endinc }} +{{ inc field_radio.tpl with $field=$global }}{{ endinc }} +{{ inc field_radio.tpl with $field=$individual }}{{ endinc }}
diff --git a/statusnet.tgz b/statusnet.tgz index 92a10317412198a219debe3c33b27ff2f60429fe..9801af556eb6fd101242b0ae00ae0ffd1ec39967 100755 GIT binary patch literal 17889 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 Q_@Bl90ZVML9RTnE0GEgLApigX literal 18071 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 'field_input.tpl', - '$field_checkbox' => 'field_checkbox.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $o = replace_macros($t, $includes + array( + $o = replace_macros($t, array( '$submit' => t('Submit'), '$sites' => $sitesform, diff --git a/statusnet/view/admin.tpl b/statusnet/view/admin.tpl old mode 100755 new mode 100644 index 02eacf73..b40adf35 --- a/statusnet/view/admin.tpl +++ b/statusnet/view/admin.tpl @@ -1,10 +1,10 @@ {{ for $sites as $s }} - {{ inc $field_input with $field=$s.sitename }}{{ endinc }} - {{ inc $field_input with $field=$s.apiurl }}{{ endinc }} - {{ inc $field_input with $field=$s.secret }}{{ endinc }} - {{ inc $field_input with $field=$s.key }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.sitename }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.apiurl }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.secret }}{{ endinc }} + {{ inc field_input.tpl with $field=$s.key }}{{ endinc }} {{ if $s.delete }} - {{ inc $field_checkbox with $field=$s.delete }}{{ endinc }} + {{ inc field_checkbox.tpl with $field=$s.delete }}{{ endinc }}
{{ else }}

Fill this form to add a new site

diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/view/smarty3/admin.tpl index 5a77b2cf..e2a8408f 100644 --- a/statusnet/view/smarty3/admin.tpl +++ b/statusnet/view/smarty3/admin.tpl @@ -1,10 +1,10 @@ {{foreach $sites as $s}} - {{include file="file:{{$field_input}}" field=$s.sitename}} - {{include file="file:{{$field_input}}" field=$s.apiurl}} - {{include file="file:{{$field_input}}" field=$s.secret}} - {{include file="file:{{$field_input}}" field=$s.key}} + {{include file="field_input.tpl" field=$s.sitename}} + {{include file="field_input.tpl" field=$s.apiurl}} + {{include file="field_input.tpl" field=$s.secret}} + {{include file="field_input.tpl" field=$s.key}} {{if $s.delete}} - {{include file="file:{{$field_checkbox}}" field=$s.delete}} + {{include file="field_checkbox.tpl" field=$s.delete}}
{{else}}

Fill this form to add a new site

diff --git a/tumblr.tgz b/tumblr.tgz index 4c0fecf33741c642d0080022b164b115fee3b842..b4f6ff9b7b098fddef0af87f795d6c6f49082d8b 100755 GIT binary patch literal 13212 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 Ch5*z6 literal 11416 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 mB`HZsN>Y-Nl%ymjDM?96Qj(ICq$DN%f9PN9

diff --git a/twitter/view/smarty3/admin.tpl b/twitter/view/smarty3/admin.tpl index ad1e07e9..9efcb065 100644 --- a/twitter/view/smarty3/admin.tpl +++ b/twitter/view/smarty3/admin.tpl @@ -1,3 +1,3 @@ -{{include file="file:{{$field_input}}" field=$consumerkey}} -{{include file="file:{{$field_input}}" field=$consumersecret}} +{{include file="field_input.tpl" field=$consumerkey}} +{{include file="field_input.tpl" field=$consumersecret}}
diff --git a/uhremotestorage.tgz b/uhremotestorage.tgz index 4aa58096d8ce8de26c9e0fa783fb64922bdb1ea2..7a758b00d0714884bd790f37e5123e3b2d74e9b4 100755 GIT binary patch literal 1700 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 'Dropbox', ); */ -// $tpl = file_get_contents(dirname(__file__)."/settings.tpl"); $tpl = get_markup_template("settings.tpl", "addon/uhremotestorage/"); - - $includes = array( - '$field_input' => 'field_input.tpl', - '$field_select' => 'field_select.tpl', - ); - $includes = set_template_includes($a->theme['template_engine'], $includes); - - $s .= replace_macros($tpl, $includes + array( + $s .= replace_macros($tpl, array( '$title' => 'Unhosted remote storage', '$desc' => sprintf( t('Allow to use your friendica id (%s) to connecto to external unhosted-enabled storage (like ownCloud). See RemoteStorage WebFinger'), $uid ), '$url' => array( 'unhoestedurl', t('Template URL (with {category})'), $url, 'If your are using ownCloud, your unhosted url will be like http://HOST/apps/remoteStorage/WebDAV.php/USER/remoteStorage/{category}'), diff --git a/uhremotestorage/view/settings.tpl b/uhremotestorage/view/settings.tpl old mode 100755 new mode 100644 index 51650c85..22d7d608 --- a/uhremotestorage/view/settings.tpl +++ b/uhremotestorage/view/settings.tpl @@ -1,9 +1,9 @@

$title

$desc

- {{ inc $field_input with $field=$url }}{{ endinc }} - {{ inc $field_input with $field=$auth }}{{ endinc }} - {{ inc $field_select with $field=$api }}{{ endinc }} + {{ inc field_input.tpl with $field=$url }}{{ endinc }} + {{ inc field_input.tpl with $field=$auth }}{{ endinc }} + {{ inc field_select.tpl with $field=$api }}{{ endinc }}
diff --git a/uhremotestorage/view/smarty3/settings.tpl b/uhremotestorage/view/smarty3/settings.tpl index 217f069a..9a0a55f3 100644 --- a/uhremotestorage/view/smarty3/settings.tpl +++ b/uhremotestorage/view/smarty3/settings.tpl @@ -1,9 +1,9 @@

{{$title}}

{{$desc}}

- {{include file="file:{{$field_input}}" field=$url}} - {{include file="file:{{$field_input}}" field=$auth}} - {{include file="file:{{$field_select}}" field=$api}} + {{include file="field_input.tpl" field=$url}} + {{include file="field_input.tpl" field=$auth}} + {{include file="field_select.tpl" field=$api}}
diff --git a/widgets.tgz b/widgets.tgz index f3b1857838ac7c0594cf2b9c5c6c5a45f5296ec1..d89204f59ae1bec973dba92e42bdac79fa7d9d26 100755 GIT binary patch literal 4149 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 literal 3944 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 Date: Fri, 28 Dec 2012 10:53:32 -0500 Subject: [PATCH 7/9] communityhome: load 'home.html', more config settings, remove twillingham folder update README --- communityhome/README.md | 23 ++ communityhome/communityhome.css | 3 +- communityhome/communityhome.php | 263 ++++++++++---------- communityhome/twillingham/README | 3 - communityhome/twillingham/communityhome.php | 107 -------- communityhome/view/directory_item.tpl | 4 +- 6 files changed, 164 insertions(+), 239 deletions(-) delete mode 100644 communityhome/twillingham/README delete mode 100644 communityhome/twillingham/communityhome.php diff --git a/communityhome/README.md b/communityhome/README.md index 3cf610ec..21f2a946 100755 --- a/communityhome/README.md +++ b/communityhome/README.md @@ -9,3 +9,26 @@ choosed to be in site directory), last ten public photos and last ten In main content is shown the community stream. This plugin doesn't honour your community page visibility site setting: the community stream is shown also if you have choose to not show the community page. + +If 'home.html' is found in your friendica root, its content is inserted +before community stream + +Each elements can be show or not. At the moment, there is no admin page +for settings, so this settings must be added to yout .htconfig.php + + + $a->config['communityhome']['showcommunitystream'] = true; + $a->config['communityhome']['showlastlike'] = true; + $a->config['communityhome']['showlastphotos'] = true; + $a->config['communityhome']['showactiveusers'] = true; + $a->config['communityhome']['showlastusers'] = true; + +If you don't want to show something, set it to false. + +Note: +----- + +- Default is "false". With no settings in .htconfig.php, nothing is +shown, except login form and content of 'home.html' + +- Active users query can be heavy for db, and on some system don't work diff --git a/communityhome/communityhome.css b/communityhome/communityhome.css index 2efb6ebd..45a65537 100755 --- a/communityhome/communityhome.css +++ b/communityhome/communityhome.css @@ -39,4 +39,5 @@ aside .directory-photo-img { max-width: 48px; max-height: 48px; } aside #likes { margin: 0px; padding: 0px; list-style: none; } -aside #login-extra-links { overflow: auto; width: 100%; padding-top:120px;} +aside #div_id_remember { overflow: auto; width: 100%; padding-top:120px;} +#login_openid input { width: 160px; } diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index 8b831888..e2c3deeb 100755 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -35,145 +35,151 @@ function communityhome_home(&$a, &$o){ $aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); // last 12 users - $aside['$lastusers_title'] = t('Latest users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; + if (get_config('communityhome','showlastusers')===true){ + $aside['$lastusers_title'] = t('Latest users'); + $aside['$lastusers_items'] = array(); + $sql_extra = ""; + $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); + $order = " ORDER BY `register_date` DESC "; - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 12 - ); -# $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) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $a->get_cached_avatar_image($rr[$photo]), - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; + $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` + FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` + WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", + 0, + 12 + ); + # $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) { + $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile_link' => $profile_link, + '$photo' => $a->get_cached_avatar_image($rr[$photo]), + '$alt_text' => $rr['name'], + )); + $aside['$lastusers_items'][] = $entry; + } } } - // 12 most active users (by posts and contacts) // this query don't work on some mysql versions - $r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM - (SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`, - (SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`, - ( - SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - UNION ALL - SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - ) AS `uni`, `user`, `profile` - WHERE `uni`.`uid`=`user`.`uid` - AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1 - GROUP BY `uid` - ORDER BY `items` DESC,`contacts` DESC - LIMIT 0,10"); - if($r && count($r)) { - $aside['$activeusers_title'] = t('Most active users'); - $aside['$activeusers_items'] = array(); - - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0')) - )); - $aside['$activeusers_items'][] = $entry; + if (get_config('communityhome','showactiveusers')===true){ + $r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM + (SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`, + (SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`, + ( + SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` + UNION ALL + SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` + ) AS `uni`, `user`, `profile` + WHERE `uni`.`uid`=`user`.`uid` + AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1 + GROUP BY `uid` + ORDER BY `items` DESC,`contacts` DESC + LIMIT 0,10"); + if($r && count($r)) { + $aside['$activeusers_title'] = t('Most active users'); + $aside['$activeusers_items'] = array(); + + $photo = 'thumb'; + foreach($r as $rr) { + $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile_link' => $profile_link, + '$photo' => $rr[$photo], + '$alt_text' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0')) + )); + $aside['$activeusers_items'][] = $entry; + } } } - // last 12 photos - $aside['$photos_title'] = t('Latest photos'); - $aside['$photos_items'] = array(); - $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM - (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` - WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') - AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` - INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, - `user` - WHERE `user`.`uid` = `photo`.`uid` - AND `user`.`blockwall`=0 - AND `user`.`hidewall` = 0 - ORDER BY `photo`.`edited` DESC - LIMIT 0, 12", - dbesc(t('Contact Photos')), - dbesc(t('Profile Photos')) - ); + if (get_config('communityhome','showlastphotos')===true){ + $aside['$photos_title'] = t('Latest photos'); + $aside['$photos_items'] = array(); + $r = q("SELECT `photo`.`id`, `photo`.`resource-id`, `photo`.`scale`, `photo`.`desc`, `user`.`nickname`, `user`.`username` FROM + (SELECT `resource-id`, MAX(`scale`) as maxscale FROM `photo` + WHERE `profile`=0 AND `contact-id`=0 AND `album` NOT IN ('Contact Photos', '%s', 'Profile Photos', '%s') + AND `allow_cid`='' AND `allow_gid`='' AND `deny_cid`='' AND `deny_gid`='' GROUP BY `resource-id`) AS `t1` + INNER JOIN `photo` ON `photo`.`resource-id`=`t1`.`resource-id` AND `photo`.`scale` = `t1`.`maxscale`, + `user` + WHERE `user`.`uid` = `photo`.`uid` + AND `user`.`blockwall`=0 + AND `user`.`hidewall` = 0 + ORDER BY `photo`.`edited` DESC + LIMIT 0, 12", + dbesc(t('Contact Photos')), + dbesc(t('Profile Photos')) + ); - - if(count($r)) { -# $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'; - - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $photo_page, - '$photo' => $photo_url, - '$alt-text' => $rr['username']." : ".$rr['desc'], - )); + + if(count($r)) { + # $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'; + + $entry = replace_macros($tpl,array( + '$id' => $rr['id'], + '$profile_link' => $photo_page, + '$photo' => $photo_url, + '$alt_text' => $rr['username']." : ".$rr['desc'], + )); - $aside['$photos_items'][] = $entry; + $aside['$photos_items'][] = $entry; + } } } // last 10 liked items - $aside['$like_title'] = t('Latest likes'); - $aside['$like_items'] = array(); - $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM - (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` - FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 - INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` - WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' - GROUP BY `uri` - ORDER BY `T1`.`created` DESC - LIMIT 0,10", - $a->get_baseurl(),$a->get_baseurl() - ); + if (get_config('communityhome','showlastlike')===true){ + $aside['$like_title'] = t('Latest likes'); + $aside['$like_items'] = array(); + $r = q("SELECT `T1`.`created`, `T1`.`liker`, `T1`.`liker-link`, `item`.* FROM + (SELECT `parent-uri`, `created`, `author-name` AS `liker`,`author-link` AS `liker-link` + FROM `item` WHERE `verb`='http://activitystrea.ms/schema/1.0/like' GROUP BY `parent-uri` ORDER BY `created` DESC) AS T1 + INNER JOIN `item` ON `item`.`uri`=`T1`.`parent-uri` + WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' + GROUP BY `uri` + ORDER BY `T1`.`created` DESC + LIMIT 0,10", + $a->get_baseurl(),$a->get_baseurl() + ); - foreach ($r as $rr) { - $author = '' . $rr['liker'] . ''; - $objauthor = '' . $rr['author-name'] . ''; - - //var_dump($rr['verb'],$rr['object-type']); killme(); - switch($rr['verb']){ - case 'http://activitystrea.ms/schema/1.0/post': - switch ($rr['object-type']){ - case 'http://activitystrea.ms/schema/1.0/event': - $post_type = t('event'); - break; - default: + foreach ($r as $rr) { + $author = '' . $rr['liker'] . ''; + $objauthor = '' . $rr['author-name'] . ''; + + //var_dump($rr['verb'],$rr['object-type']); killme(); + switch($rr['verb']){ + case 'http://activitystrea.ms/schema/1.0/post': + switch ($rr['object-type']){ + case 'http://activitystrea.ms/schema/1.0/event': + $post_type = t('event'); + break; + default: + $post_type = t('status'); + } + break; + default: + if ($rr['resource-id']){ + $post_type = t('photo'); + $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); + $rr['plink'] = $m[1]; + } else { $post_type = t('status'); - } - break; - default: - if ($rr['resource-id']){ - $post_type = t('photo'); - $m=array(); preg_match("/\[url=([^]]*)\]/", $rr['body'], $m); - $rr['plink'] = $m[1]; - } else { - $post_type = t('status'); - } - } - $plink = '' . $post_type . ''; + } + } + $plink = '' . $post_type . ''; - $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - + $aside['$like_items'][] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); + + } } # $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); @@ -182,8 +188,13 @@ function communityhome_home(&$a, &$o){ $o = '

' . ((x($a->config,'sitename')) ? sprintf( t("Welcome to %s") ,$a->config['sitename']) : "" ) . '

'; - $oldset = get_config('system','no_community_page'); - set_config('system','no_community_page', false); - $o .= community_content($a,1); - set_config('system','no_community_page', $oldset); + if(file_exists('home.html')) + $o = file_get_contents('home.html'); + + if (get_config('communityhome','showcommunitystream')===true){ + $oldset = get_config('system','no_community_page'); + set_config('system','no_community_page', false); + $o .= community_content($a,1); + set_config('system','no_community_page', $oldset); + } } diff --git a/communityhome/twillingham/README b/communityhome/twillingham/README deleted file mode 100644 index dbbe1419..00000000 --- a/communityhome/twillingham/README +++ /dev/null @@ -1,3 +0,0 @@ -This is a variant of the community home. Instead of displaying the community tab in the front page, we still use home.html, but we also add the latest users to the sidebar. - -Simply replace addon/communityhome/communityhome.php with this version then enable community home in your admin panel as usual. \ No newline at end of file diff --git a/communityhome/twillingham/communityhome.php b/communityhome/twillingham/communityhome.php deleted file mode 100644 index 102732ac..00000000 --- a/communityhome/twillingham/communityhome.php +++ /dev/null @@ -1,107 +0,0 @@ - - */ - - -require_once('mod/community.php'); - - -function communityhome_install() { - register_hook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); - logger("installed communityhome"); -} - -function communityhome_uninstall() { - unregister_hook('home_content', 'addon/communityhome/communityhome.php', 'communityhome_home'); - logger("removed communityhome"); -} - -function communityhome_home(&$a, &$o){ - // custom css - $a->page['htmlhead'] .= ''; - - $aside = array( - '$tab_1' => t('Login'), - '$tab_2' => t('OpenID'), - '$noOid' => get_config('system','no_openid'), - ); - - // login form - $aside['$login_title'] = t('Login'); - $aside['$login_form'] = login(($a->config['register_policy'] == REGISTER_CLOSED) ? false : true); - - // last 12 users - $aside['$lastusers_title'] = t('Latest users'); - $aside['$lastusers_items'] = array(); - $sql_extra = ""; - $publish = (get_config('system','publish_all') ? '' : " AND `publish` = 1 " ); - $order = " ORDER BY `register_date` DESC "; - - $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` - FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` - WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", - 0, - 12 - ); - $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); - if(count($r)) { - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => $rr['name'], - )); - $aside['$lastusers_items'][] = $entry; - } - } - - // 12 most active users (by posts and contacts) - // this query don't work on some mysql versions - $r = q("SELECT `uni`.`contacts`,`uni`.`items`, `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname` FROM - (SELECT COUNT(`id`) as `contacts`, `uid` FROM `contact` WHERE `self`=0 GROUP BY `uid`) AS `con`, - (SELECT COUNT(`id`) as `items`, `uid` FROM `item` WHERE `item`.`changed` > DATE(NOW() - INTERVAL 1 MONTH) AND `item`.`wall` = 1 GROUP BY `uid`) AS `ite`, - ( - SELECT `contacts`,`items`,`ite`.`uid` FROM `con` RIGHT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - UNION ALL - SELECT `contacts`,`items`,`con`.`uid` FROM `con` LEFT OUTER JOIN `ite` ON `con`.`uid`=`ite`.`uid` - ) AS `uni`, `user`, `profile` - WHERE `uni`.`uid`=`user`.`uid` - AND `uni`.`uid`=`profile`.`uid` AND `profile`.`publish`=1 - GROUP BY `uid` - ORDER BY `items` DESC,`contacts` DESC - LIMIT 0,10"); - if($r && count($r)) { - $aside['$activeusers_title'] = t('Most active users'); - $aside['$activeusers_items'] = array(); - - $photo = 'thumb'; - foreach($r as $rr) { - $profile_link = $a->get_baseurl() . '/profile/' . ((strlen($rr['nickname'])) ? $rr['nickname'] : $rr['profile_uid']); - $entry = replace_macros($tpl,array( - '$id' => $rr['id'], - '$profile-link' => $profile_link, - '$photo' => $rr[$photo], - '$alt-text' => sprintf("%s (%s posts, %s contacts)",$rr['name'], ($rr['items']?$rr['items']:'0'), ($rr['contacts']?$rr['contacts']:'0')) - )); - $aside['$activeusers_items'][] = $entry; - } - } - - - - - $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); - $a->page['aside'] = replace_macros($tpl, $aside); - $o = ''; - if(file_exists('home.html')) - - $o .= file_get_contents('home.html'); - -} diff --git a/communityhome/view/directory_item.tpl b/communityhome/view/directory_item.tpl index db1936e4..f32f5a4f 100755 --- a/communityhome/view/directory_item.tpl +++ b/communityhome/view/directory_item.tpl @@ -2,8 +2,8 @@
From 0ae7a3f42050b234741a258d1302f18c5ce6c6a2 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Fri, 28 Dec 2012 11:00:07 -0500 Subject: [PATCH 8/9] community home: update version --- communityhome/communityhome.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/communityhome/communityhome.php b/communityhome/communityhome.php index e2c3deeb..ba2af6de 100755 --- a/communityhome/communityhome.php +++ b/communityhome/communityhome.php @@ -2,7 +2,7 @@ /** * Name: Community home * Description: Show last community activity in homepage - * Version: 1.0 + * Version: 2.0 * Author: Fabio Comuni */ From 9c00bd1608cea9aa86fd00691c23d838758607bc Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Fri, 28 Dec 2012 11:01:14 -0500 Subject: [PATCH 9/9] community home: update tgz --- communityhome.tgz | Bin 4331 -> 4471 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/communityhome.tgz b/communityhome.tgz index 71f1f8e30f3e38731dbf8efd496e65f82623ba94..ab251425b711a5e6749dedbf1c4a8f56b036d49a 100755 GIT binary patch literal 4471 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 J8212p001{+!v_EW literal 4331 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 ZQ<=(CrZSbOOlA7g^k3O2d({AV008SYo=^Y)