diff --git a/altpager.tgz b/altpager.tgz index a15a53431..59fe8d345 100644 Binary files a/altpager.tgz and b/altpager.tgz differ diff --git a/altpager/view/smarty3/admin.tpl b/altpager/templates/admin.tpl similarity index 100% rename from altpager/view/smarty3/admin.tpl rename to altpager/templates/admin.tpl diff --git a/altpager/view/admin.tpl b/altpager/view/admin.tpl deleted file mode 100644 index 605588084..000000000 --- a/altpager/view/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/altpager/view/admin.tpl.old b/altpager/view/admin.tpl.old deleted file mode 100755 index 605588084..000000000 --- a/altpager/view/admin.tpl.old +++ /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/blackout.tgz b/blackout.tgz index b32a42bab..30fc200af 100644 Binary files a/blackout.tgz and b/blackout.tgz differ diff --git a/blackout/view/smarty3/admin.tpl b/blackout/templates/admin.tpl similarity index 100% rename from blackout/view/smarty3/admin.tpl rename to blackout/templates/admin.tpl diff --git a/blackout/view/admin.tpl b/blackout/view/admin.tpl deleted file mode 100644 index 25922193d..000000000 --- a/blackout/view/admin.tpl +++ /dev/null @@ -1,11 +0,0 @@ -{{ inc field_input.tpl with $field=$startdate }}{{ endinc }} -{{ inc field_input.tpl with $field=$enddate }}{{ endinc }} -{{ inc field_input.tpl with $field=$rurl }}{{ endinc }} - -
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/blockem.tgz b/blockem.tgz index 0f40b1984..390102e4d 100755 Binary files a/blockem.tgz and b/blockem.tgz differ diff --git a/blogger.tgz b/blogger.tgz index b7e5da4e3..78727bbd8 100644 Binary files a/blogger.tgz and b/blogger.tgz differ diff --git a/buglink.tgz b/buglink.tgz index b3ae78c51..a6426b8ca 100755 Binary files a/buglink.tgz and b/buglink.tgz differ diff --git a/calc.tgz b/calc.tgz index 002917c46..fbee1bf0b 100755 Binary files a/calc.tgz and b/calc.tgz differ diff --git a/communityhome.tgz b/communityhome.tgz index bc59b2266..73088e6d7 100755 Binary files a/communityhome.tgz and b/communityhome.tgz differ diff --git a/communityhome/view/smarty3/communityhome.tpl b/communityhome/templates/communityhome.tpl similarity index 100% rename from communityhome/view/smarty3/communityhome.tpl rename to communityhome/templates/communityhome.tpl diff --git a/communityhome/view/smarty3/directory_item.tpl b/communityhome/templates/directory_item.tpl similarity index 100% rename from communityhome/view/smarty3/directory_item.tpl rename to communityhome/templates/directory_item.tpl diff --git a/communityhome/view/communityhome.tpl b/communityhome/view/communityhome.tpl deleted file mode 100755 index 846878097..000000000 --- a/communityhome/view/communityhome.tpl +++ /dev/null @@ -1,70 +0,0 @@ - -{{ if $noOid }} -

$login_title

-{{ else }} - -{{ endif }} -$login_form - - -{{ if $lastusers_title }} -

$lastusers_title

-
-{{ for $lastusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - - -{{ if $activeusers_title }} -

$activeusers_title

-
-{{ for $activeusers_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - -{{ if $photos_title }} -

$photos_title

-
-{{ for $photos_items as $i }} - $i -{{ endfor }} -
-{{ endif }} - - -{{ if $like_title }} -

$like_title

- -{{ endif }} diff --git a/communityhome/view/directory_item.tpl b/communityhome/view/directory_item.tpl deleted file mode 100755 index f32f5a4f7..000000000 --- a/communityhome/view/directory_item.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -
-
-
- - $alt_text - -
-
-
diff --git a/convert.tgz b/convert.tgz index 766eaf7aa..c53639551 100755 Binary files a/convert.tgz and b/convert.tgz differ diff --git a/convpath.tgz b/convpath.tgz index 2c43d3d38..23d9bac78 100644 Binary files a/convpath.tgz and b/convpath.tgz differ diff --git a/curweather.tgz b/curweather.tgz index 76e0646c8..864b04a0b 100644 Binary files a/curweather.tgz and b/curweather.tgz differ diff --git a/dav.tgz b/dav.tgz index aac108d1d..2775c4a20 100644 Binary files a/dav.tgz and b/dav.tgz differ diff --git a/defaultfeatures.tgz b/defaultfeatures.tgz index c674e1f14..0a4bd0e41 100644 Binary files a/defaultfeatures.tgz and b/defaultfeatures.tgz differ diff --git a/defaultfeatures/view/smarty3/admin.tpl b/defaultfeatures/templates/admin.tpl similarity index 100% rename from defaultfeatures/view/smarty3/admin.tpl rename to defaultfeatures/templates/admin.tpl diff --git a/defaultfeatures/view/admin.tpl b/defaultfeatures/view/admin.tpl deleted file mode 100644 index e7793d3da..000000000 --- a/defaultfeatures/view/admin.tpl +++ /dev/null @@ -1,9 +0,0 @@ - -{{ for $features as $f }} -

$f.0

- -{{ for $f.1 as $fcat }} - {{ inc field_yesno.tpl with $field=$fcat }}{{endinc}} -{{ endfor }} -{{ endfor }} -
diff --git a/dwpost.tgz b/dwpost.tgz index f113526d6..af978461d 100644 Binary files a/dwpost.tgz and b/dwpost.tgz differ diff --git a/editplain.tgz b/editplain.tgz index 18df59d78..94be5bb5b 100644 Binary files a/editplain.tgz and b/editplain.tgz differ diff --git a/extcron.tgz b/extcron.tgz index dabe1d09d..22b99e331 100755 Binary files a/extcron.tgz and b/extcron.tgz differ diff --git a/facebook.tgz b/facebook.tgz index 97fa89ec9..9c158e43e 100644 Binary files a/facebook.tgz and b/facebook.tgz differ diff --git a/facebook_restrict.tgz b/facebook_restrict.tgz index 7688fd8f9..defb3d286 100644 Binary files a/facebook_restrict.tgz and b/facebook_restrict.tgz differ diff --git a/fbpost.tgz b/fbpost.tgz index 2b3b4b9d3..823a4f3cb 100644 Binary files a/fbpost.tgz and b/fbpost.tgz differ diff --git a/fortunate.tgz b/fortunate.tgz index a2dd39d92..e15ed3daa 100644 Binary files a/fortunate.tgz and b/fortunate.tgz differ diff --git a/forumdirectory.tgz b/forumdirectory.tgz index 4b0291196..2acb7eda8 100644 Binary files a/forumdirectory.tgz and b/forumdirectory.tgz differ diff --git a/forumdirectory/view/smarty3/forumdirectory_item.tpl b/forumdirectory/templates/forumdirectory_item.tpl similarity index 100% rename from forumdirectory/view/smarty3/forumdirectory_item.tpl rename to forumdirectory/templates/forumdirectory_item.tpl diff --git a/forumdirectory/view/forumdirectory_item.tpl b/forumdirectory/view/forumdirectory_item.tpl deleted file mode 100755 index e1bbffec8..000000000 --- a/forumdirectory/view/forumdirectory_item.tpl +++ /dev/null @@ -1,42 +0,0 @@ - -
-
-
- - $alt_text - -
-
-
-
$name
-
$page_type
- {{ if $pdesc }}
$profile.pdesc
{{ endif }} -
-
- {{ if $location }} -
$location
-
- {{ if $profile.address }}
$profile.address
{{ endif }} - - $profile.locality{{ if $profile.locality }}, {{ endif }} - $profile.region - $profile.postal-code - - {{ if $profile.country-name }}$profile.country-name{{ endif }} -
-
- {{ endif }} - - {{ if $gender }}
$gender
$profile.gender
{{ endif }} -
-
- {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} -
-
-
- {{ if $about }}
$about
$profile.about
{{ endif }} -
-
-
diff --git a/forumlist.tgz b/forumlist.tgz index cca79c2ea..651b08f17 100644 Binary files a/forumlist.tgz and b/forumlist.tgz differ diff --git a/fromapp.tgz b/fromapp.tgz index fa42ac6f0..cb03bd81f 100644 Binary files a/fromapp.tgz and b/fromapp.tgz differ diff --git a/fromgplus.tgz b/fromgplus.tgz index a4790582a..82a4744f4 100644 Binary files a/fromgplus.tgz and b/fromgplus.tgz differ diff --git a/geonames.tgz b/geonames.tgz index 214701a9c..1936f95a7 100644 Binary files a/geonames.tgz and b/geonames.tgz differ diff --git a/gnot.tgz b/gnot.tgz index 814895432..38e8d5e8b 100644 Binary files a/gnot.tgz and b/gnot.tgz differ diff --git a/gpluspost.tgz b/gpluspost.tgz index e752d9a68..da04520dd 100644 Binary files a/gpluspost.tgz and b/gpluspost.tgz differ diff --git a/gravatar.tgz b/gravatar.tgz index 9d98ec0fd..a28e0d570 100644 Binary files a/gravatar.tgz and b/gravatar.tgz differ diff --git a/gravatar/view/smarty3/admin.tpl b/gravatar/templates/admin.tpl similarity index 100% rename from gravatar/view/smarty3/admin.tpl rename to gravatar/templates/admin.tpl diff --git a/gravatar/view/admin.tpl b/gravatar/view/admin.tpl deleted file mode 100644 index 83144e432..000000000 --- a/gravatar/view/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/group_text.tgz b/group_text.tgz index f5fac4bf2..4a2d6850f 100644 Binary files a/group_text.tgz and b/group_text.tgz differ diff --git a/ijpost.tgz b/ijpost.tgz index 552eb88df..f8949a814 100644 Binary files a/ijpost.tgz and b/ijpost.tgz differ diff --git a/impressum.tgz b/impressum.tgz index 5c29f81bf..c483e0855 100755 Binary files a/impressum.tgz and b/impressum.tgz differ diff --git a/impressum/view/smarty3/admin.tpl b/impressum/templates/admin.tpl similarity index 100% rename from impressum/view/smarty3/admin.tpl rename to impressum/templates/admin.tpl diff --git a/impressum/view/admin.tpl b/impressum/view/admin.tpl deleted file mode 100644 index 901df73fa..000000000 --- a/impressum/view/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/infiniteimprobabilitydrive.tgz b/infiniteimprobabilitydrive.tgz index 7caf653f7..bac4acc00 100644 Binary files a/infiniteimprobabilitydrive.tgz and b/infiniteimprobabilitydrive.tgz differ diff --git a/irc.tgz b/irc.tgz index 7a572c395..c83b8a47f 100644 Binary files a/irc.tgz and b/irc.tgz differ diff --git a/jappixmini.tgz b/jappixmini.tgz index 501d75318..4f32a6166 100644 Binary files a/jappixmini.tgz and b/jappixmini.tgz differ diff --git a/js_upload.tgz b/js_upload.tgz index b4a9addad..eca3659f2 100755 Binary files a/js_upload.tgz and b/js_upload.tgz differ diff --git a/ldapauth.tgz b/ldapauth.tgz index c308e7ea2..7dd3d6c42 100755 Binary files a/ldapauth.tgz and b/ldapauth.tgz differ diff --git a/libertree.tgz b/libertree.tgz index fdb06ecb7..391da40de 100644 Binary files a/libertree.tgz and b/libertree.tgz differ diff --git a/libravatar.tgz b/libravatar.tgz index e1dff4990..b9d43639d 100644 Binary files a/libravatar.tgz and b/libravatar.tgz differ diff --git a/libravatar/view/smarty3/admin.tpl b/libravatar/templates/admin.tpl similarity index 100% rename from libravatar/view/smarty3/admin.tpl rename to libravatar/templates/admin.tpl diff --git a/libravatar/view/admin.tpl b/libravatar/view/admin.tpl deleted file mode 100644 index 814f4a44a..000000000 --- a/libravatar/view/admin.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ inc field_select.tpl with $field=$default_avatar}}{{ endinc }} -
diff --git a/ljpost.tgz b/ljpost.tgz index b2127f221..274296792 100644 Binary files a/ljpost.tgz and b/ljpost.tgz differ diff --git a/mailstream.tgz b/mailstream.tgz index 4a138f2e7..e6d340002 100644 Binary files a/mailstream.tgz and b/mailstream.tgz differ diff --git a/mailstream/view/smarty3/admin.tpl b/mailstream/templates/admin.tpl similarity index 100% rename from mailstream/view/smarty3/admin.tpl rename to mailstream/templates/admin.tpl diff --git a/mailstream/view/smarty3/mail.tpl b/mailstream/templates/mail.tpl similarity index 100% rename from mailstream/view/smarty3/mail.tpl rename to mailstream/templates/mail.tpl diff --git a/mailstream/view/smarty3/settings.tpl b/mailstream/templates/settings.tpl similarity index 100% rename from mailstream/view/smarty3/settings.tpl rename to mailstream/templates/settings.tpl diff --git a/mailstream/view/admin.tpl b/mailstream/view/admin.tpl deleted file mode 100644 index bf5e67a26..000000000 --- a/mailstream/view/admin.tpl +++ /dev/null @@ -1,3 +0,0 @@ -{{ inc field_input.tpl with $field=$frommail }}{{ endinc }} -
- diff --git a/mailstream/view/mail.tpl b/mailstream/view/mail.tpl deleted file mode 100644 index 9eb7ff529..000000000 --- a/mailstream/view/mail.tpl +++ /dev/null @@ -1,5 +0,0 @@ -
$item.body
-{{ if $item.plink }} -
$upstream: $item.plink
-
$local: $item.url
-{{ endif }} diff --git a/mailstream/view/settings.tpl b/mailstream/view/settings.tpl deleted file mode 100644 index 45b0511a0..000000000 --- a/mailstream/view/settings.tpl +++ /dev/null @@ -1,6 +0,0 @@ -
-

$title

-{{ inc field_input.tpl with $field=$address }}{{ endinc }} -{{ inc field_checkbox.tpl with $field=$enabled }}{{ endinc }} - -
diff --git a/mathjax.tgz b/mathjax.tgz index da8409f8a..c639f90fc 100644 Binary files a/mathjax.tgz and b/mathjax.tgz differ diff --git a/mathjax/view/smarty3/admin.tpl b/mathjax/templates/admin.tpl similarity index 100% rename from mathjax/view/smarty3/admin.tpl rename to mathjax/templates/admin.tpl diff --git a/mathjax/view/admin.tpl b/mathjax/view/admin.tpl deleted file mode 100644 index 1c723cddd..000000000 --- a/mathjax/view/admin.tpl +++ /dev/null @@ -1,2 +0,0 @@ -{{ inc field_input.tpl with $field=$baseurl }}{{endinc }} -
diff --git a/membersince.tgz b/membersince.tgz index ec19fddc8..d62be961f 100755 Binary files a/membersince.tgz and b/membersince.tgz differ diff --git a/morechoice.tgz b/morechoice.tgz index 4065a2b78..6352e4017 100644 Binary files a/morechoice.tgz and b/morechoice.tgz differ diff --git a/morepokes.tgz b/morepokes.tgz index 0e6a3a2dd..a5d78a55a 100644 Binary files a/morepokes.tgz and b/morepokes.tgz differ diff --git a/namethingy.tgz b/namethingy.tgz index 9642e3842..af13e8df5 100644 Binary files a/namethingy.tgz and b/namethingy.tgz differ diff --git a/notimeline.tgz b/notimeline.tgz index d42c50265..ebe1851b0 100644 Binary files a/notimeline.tgz and b/notimeline.tgz differ diff --git a/nsfw.tgz b/nsfw.tgz index 740132ea5..c402fb99c 100755 Binary files a/nsfw.tgz and b/nsfw.tgz differ diff --git a/numfriends.tgz b/numfriends.tgz index dcb81aa48..1958a74f8 100644 Binary files a/numfriends.tgz and b/numfriends.tgz differ diff --git a/openstreetmap.tgz b/openstreetmap.tgz index a2d2d259d..621dd9e29 100644 Binary files a/openstreetmap.tgz and b/openstreetmap.tgz differ diff --git a/openstreetmap/view/smarty3/admin.tpl b/openstreetmap/templates/admin.tpl similarity index 100% rename from openstreetmap/view/smarty3/admin.tpl rename to openstreetmap/templates/admin.tpl diff --git a/openstreetmap/view/admin.tpl b/openstreetmap/view/admin.tpl deleted file mode 100644 index 75db9cd7b..000000000 --- a/openstreetmap/view/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/page.tgz b/page.tgz index 26d5d66cd..9a2896fe8 100644 Binary files a/page.tgz and b/page.tgz differ diff --git a/piwik.tgz b/piwik.tgz index 3232352a4..c29229248 100755 Binary files a/piwik.tgz and b/piwik.tgz differ diff --git a/piwik/view/smarty3/admin.tpl b/piwik/templates/admin.tpl similarity index 100% rename from piwik/view/smarty3/admin.tpl rename to piwik/templates/admin.tpl diff --git a/piwik/view/admin.tpl b/piwik/view/admin.tpl deleted file mode 100644 index e57758a9d..000000000 --- a/piwik/view/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/planets.tgz b/planets.tgz index 2c744adff..a545f4295 100644 Binary files a/planets.tgz and b/planets.tgz differ diff --git a/poormancron.tgz b/poormancron.tgz index 8eda6264a..432236f09 100755 Binary files a/poormancron.tgz and b/poormancron.tgz differ diff --git a/posterous.tgz b/posterous.tgz index a3955e840..446dc66eb 100644 Binary files a/posterous.tgz and b/posterous.tgz differ diff --git a/privacy_image_cache.tgz b/privacy_image_cache.tgz index bbf962c63..9fd080dc4 100644 Binary files a/privacy_image_cache.tgz and b/privacy_image_cache.tgz differ diff --git a/procrunner.tgz b/procrunner.tgz index fec9dfa72..cdb0e98c5 100644 Binary files a/procrunner.tgz and b/procrunner.tgz differ diff --git a/public_server.tgz b/public_server.tgz index 7d6beb7db..8fcf61083 100755 Binary files a/public_server.tgz and b/public_server.tgz differ diff --git a/qcomment.tgz b/qcomment.tgz index 3d38facd8..ba0b24565 100644 Binary files a/qcomment.tgz and b/qcomment.tgz differ diff --git a/randplace.tgz b/randplace.tgz index 9dbab84ec..c1ab0b2a7 100755 Binary files a/randplace.tgz and b/randplace.tgz differ diff --git a/remote_permissions.tgz b/remote_permissions.tgz index d50c66c6c..2cc7b0fbd 100644 Binary files a/remote_permissions.tgz and b/remote_permissions.tgz differ diff --git a/remote_permissions/view/smarty3/admin.tpl b/remote_permissions/templates/admin.tpl similarity index 100% rename from remote_permissions/view/smarty3/admin.tpl rename to remote_permissions/templates/admin.tpl diff --git a/remote_permissions/view/smarty3/settings.tpl b/remote_permissions/templates/settings.tpl similarity index 100% rename from remote_permissions/view/smarty3/settings.tpl rename to remote_permissions/templates/settings.tpl diff --git a/remote_permissions/view/admin.tpl b/remote_permissions/view/admin.tpl deleted file mode 100644 index 605588084..000000000 --- a/remote_permissions/view/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/view/settings.tpl b/remote_permissions/view/settings.tpl deleted file mode 100644 index 9fd98957f..000000000 --- a/remote_permissions/view/settings.tpl +++ /dev/null @@ -1,8 +0,0 @@ -
-

$remote_perms_title

-
- - -
-
- diff --git a/rendertime.tgz b/rendertime.tgz index b8ae80860..59f9e47b8 100644 Binary files a/rendertime.tgz and b/rendertime.tgz differ diff --git a/retriever.tgz b/retriever.tgz index 3155099ed..cd87d58a4 100644 Binary files a/retriever.tgz and b/retriever.tgz differ diff --git a/retriever/view/smarty3/extract.tpl b/retriever/templates/extract.tpl similarity index 100% rename from retriever/view/smarty3/extract.tpl rename to retriever/templates/extract.tpl diff --git a/retriever/view/help.tpl b/retriever/templates/help.tpl similarity index 98% rename from retriever/view/help.tpl rename to retriever/templates/help.tpl index 0be2c2c84..23ae297b7 100644 --- a/retriever/view/help.tpl +++ b/retriever/templates/help.tpl @@ -1,3 +1,8 @@ +{{* + * AUTOMATICALLY GENERATED TEMPLATE + * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN + * + *}}

Retriever Plugin Help

This plugin replaces the short excerpts you normally get in RSS feeds diff --git a/retriever/view/smarty3/rule-config.tpl b/retriever/templates/rule-config.tpl similarity index 100% rename from retriever/view/smarty3/rule-config.tpl rename to retriever/templates/rule-config.tpl diff --git a/retriever/view/smarty3/settings.tpl b/retriever/templates/settings.tpl similarity index 100% rename from retriever/view/smarty3/settings.tpl rename to retriever/templates/settings.tpl diff --git a/retriever/view/extract.tpl b/retriever/view/extract.tpl deleted file mode 100644 index e851ddb52..000000000 --- a/retriever/view/extract.tpl +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - - -{{ if $exclude }} - -{{ endif }} - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/retriever/view/rule-config.tpl b/retriever/view/rule-config.tpl deleted file mode 100644 index 3bd2bfce4..000000000 --- a/retriever/view/rule-config.tpl +++ /dev/null @@ -1,111 +0,0 @@ -

- -

$title

-

Get Help

-
- -{{ inc field_checkbox.tpl with $field=$enable }}{{ endinc }} -{{ inc field_input.tpl with $field=$pattern }}{{ endinc }} -{{ inc field_input.tpl with $field=$replace }}{{ endinc }} -{{ inc field_checkbox.tpl with $field=$images }}{{ endinc }} -{{ inc field_input.tpl with $field=$retrospective }}{{ endinc }} -

$include_t:

-
- - - - - -{{ if $include }} - {{ for $include as $k=>$m }} - - - - - - - {{ endfor }} -{{ else }} - - - - - - -{{ endif }} - -
$tag_t$attribute_t$value_t
- -
-

$exclude_t:

-
- - - - - -{{ if $exclude }} - {{ for $exclude as $k=>$r }} - - - - - - - {{ endfor }} -{{ else }} - - - - - - -{{ endif }} - -
TagAttributeValue
- -
- -
-
diff --git a/retriever/view/settings.tpl b/retriever/view/settings.tpl deleted file mode 100644 index 87b952874..000000000 --- a/retriever/view/settings.tpl +++ /dev/null @@ -1,17 +0,0 @@ -
-

$title

-

- Get Help -

- - - - - - - - - - -
$all_photos_t:
-
diff --git a/retriever/view/smarty3/help.tpl b/retriever/view/smarty3/help.tpl deleted file mode 100644 index 9e4811886..000000000 --- a/retriever/view/smarty3/help.tpl +++ /dev/null @@ -1,153 +0,0 @@ -{{* - * AUTOMATICALLY GENERATED TEMPLATE - * DO NOT EDIT THIS FILE, CHANGES WILL BE OVERWRITTEN - * - *}} -

Retriever Plugin Help

-

-This plugin replaces the short excerpts you normally get in RSS feeds -with the full content of the article from the source website. You -specify which part of the page you're interested in with a set of -rules. When each item arrives, the plugin downloads the full page -from the website, extracts content using the rules, and replaces the -original article. -

-

-There's a few reasons you may want to do this. The source website -might be slow or overloaded. The source website might be -untrustworthy, in which case using Friendica to scrub the HTML is a -good idea. You might be on a LAN that blacklists certain websites. -It also works neatly with the mailstream plugin, allowing you to read -a news stream comfortably without needing continuous Internet -connectivity. -

-

-However, setting up retriever can be quite tricky since it depends on -the internal design of the website. This was designed to make life -easy for the website's developers, not for you. You'll need to have -some familiarity with HTML, and be willing to adapt when the website -suddenly changes everything without notice. -

-

Configuring Retriever for a feed

-

-To set up retriever for an RSS feed, go to the "Contacts" page and -find your feed. Then click on the drop-down menu on the contact. -Select "Retriever" to get to the retriever configuration. -

-

-The "Include" configuration section specifies parts of the page to -include in the article. Each row has three components: -

- -

-A simple case is when the article is wrapped in a "div" element: -

-
-    ...
-    <div class="main-content">
-      <h2>Man Bites Dog</h2>
-      <img src="mbd.jpg">
-      <p>
-        Residents of the sleepy community of Nowheresville were
-        shocked yesterday by the sight of creepy local weirdo Jim
-        McOddman assaulting innocent local dog Snufflekins with his
-        false teeth.
-      </p>
-      ...
-    </div>
-    ...
-
-

-You then specify the tag "div", attribute "class", and value -"main-content". Everything else in the page, such as navigation -panels and menus and footers and so on, will be discarded. If there -is more than one section of the page you want to include, specify each -one on a separate row. If the matching section contains some sections -you want to remove, specify those in the "Exclude" section in the same -way. -

-

-Once you've got a configuration that you think will work, you can try -it out on some existing articles. Type a number into the -"Retrospectively Apply" box and click "Submit". After a while -(exactly how long depends on your system's cron configuration) the new -articles should be available. -

-

Techniques

-

-You can leave the attribute and value blank to include all the -corresponding elements with the specified tag name. You can also use -a tag name of "*", which will match any element type with the -specified attribute regardless of the tag. -

-

-Note that the "class" attribute is a special case. Many web page -templates will put multiple different classes in the same element, -separated by spaces. If you specify an attribute of "class" it will -match an element if any of its classes matches the specified value. -For example: -

-
-    <div class="article breaking-news">
-
-

-In this case you can specify a value of "article", or "breaking-news". -You can also specify "article breaking-news", but that won't match if -the website suddenly changes to "breaking-news article", so that's not -recommended. -

-

-One useful trick you can try is using the website's "print" pages. -Many news sites have print versions of all their articles. These are -usually drastically simplified compared to the live website page. -Sometimes this is a good way to get the whole article when it's -normally split across multiple pages. -

-

-Hopefully the URL for the print page is a predictable variant of the -normal article URL. For example, an article URL like: -

-
-    http://www.newssite.com/article-8636.html
-
-

-...might have a print version at: -

-
-    http://www.newssite.com/print/article-8636.html
-
-

-To change the URL used to retrieve the page, use the "URL Pattern" and -"URL Replace" fields. The pattern is a regular expression matching -part of the URL to replace. In this case, you might use a pattern of -"/article" and a replace string of "/print/article". A common pattern -is simply "$", used to add the replace string to the end of the URL. -

-

Background Processing

-

-Note that retrieving and processing the articles can take some time, -so it's done in the background. Incoming articles will be marked as -invisible while they're in the process of being downloaded. If a URL -fails, the plugin will keep trying at progressively longer intervals -for up to a month, in case the website is temporarily overloaded or -the network is down. -

-

Retrieving Images

-

-Retriever can also optionally download images and store them in the -local Friendica instance. Just check the "Download Images" box. You -can also download images in every item from your network, whether it's -an RSS feed or not. Go to the "Settings" page and -click "Plugin settings". Then check the "All -Photos" box in the "Retriever Settings" section and click "Submit". -

-

Configure Feeds:

-
-{{foreach $feeds as $feed}} -{{include file="contact_template.tpl" contact=$feed}} -{{/foreach}} -
diff --git a/showmore.tgz b/showmore.tgz index 623c56d5a..981749f95 100644 Binary files a/showmore.tgz and b/showmore.tgz differ diff --git a/smiley_pack.tgz b/smiley_pack.tgz index 2efe63322..e7ade9edb 100644 Binary files a/smiley_pack.tgz and b/smiley_pack.tgz differ diff --git a/smilies_adult.tgz b/smilies_adult.tgz index 95f12161a..642583eb5 100644 Binary files a/smilies_adult.tgz and b/smilies_adult.tgz differ diff --git a/snautofollow.tgz b/snautofollow.tgz index 0c12e6a73..97c52077d 100644 Binary files a/snautofollow.tgz and b/snautofollow.tgz differ diff --git a/sniper.tgz b/sniper.tgz index fba75c15b..229acb0c9 100755 Binary files a/sniper.tgz and b/sniper.tgz differ diff --git a/startpage.tgz b/startpage.tgz index ab7317993..22d3b60a9 100644 Binary files a/startpage.tgz and b/startpage.tgz differ diff --git a/statusnet.tgz b/statusnet.tgz index 4b283e2ae..0dc3e0c85 100755 Binary files a/statusnet.tgz and b/statusnet.tgz differ diff --git a/statusnet/statusnet.php b/statusnet/statusnet.php index 76ba18fb7..f2f8a5f7a 100755 --- a/statusnet/statusnet.php +++ b/statusnet/statusnet.php @@ -656,7 +656,7 @@ function statusnet_post_hook(&$a,&$b) { // ok, all the links we want to send out are save, now strip // away the remaining bbcode //$msg = strip_tags(bbcode($tmp, false, false)); - $msg = bbcode($tmp, false, false); + $msg = bbcode($tmp, false, false, true); $msg = str_replace(array('
','
'),"\n",$msg); $msg = strip_tags($msg); diff --git a/statusnet/view/smarty3/admin.tpl b/statusnet/templates/admin.tpl similarity index 100% rename from statusnet/view/smarty3/admin.tpl rename to statusnet/templates/admin.tpl diff --git a/statusnet/view/admin.tpl b/statusnet/view/admin.tpl deleted file mode 100644 index 686a4c792..000000000 --- a/statusnet/view/admin.tpl +++ /dev/null @@ -1,17 +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 }} - {{ inc field_input.tpl with $field=$s.applicationname }}{{ 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/superblock.tgz b/superblock.tgz new file mode 100644 index 000000000..7d9523cb7 Binary files /dev/null and b/superblock.tgz differ diff --git a/superblock/lang/C/messages.po b/superblock/lang/C/messages.po new file mode 100644 index 000000000..8089438bb --- /dev/null +++ b/superblock/lang/C/messages.po @@ -0,0 +1,51 @@ +# ADDON blockem +# Copyright (C) +# This file is distributed under the same license as the Friendica blockem addon package. +# +# +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-02-27 05:01-0500\n" +"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"Last-Translator: FULL NAME \n" +"Language-Team: LANGUAGE \n" +"Language: \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#: blockem.php:51 +msgid "\"Blockem\" Settings" +msgstr "" + +#: blockem.php:53 +msgid "Comma separated profile URLS to block" +msgstr "" + +#: blockem.php:57 +msgid "Submit" +msgstr "" + +#: blockem.php:70 +msgid "BLOCKEM Settings saved." +msgstr "" + +#: blockem.php:105 +#, php-format +msgid "Blocked %s - Click to open/close" +msgstr "" + +#: blockem.php:160 +msgid "Unblock Author" +msgstr "" + +#: blockem.php:162 +msgid "Block Author" +msgstr "" + +#: blockem.php:194 +msgid "blockem settings updated" +msgstr "" diff --git a/superblock/lang/ca/strings.php b/superblock/lang/ca/strings.php new file mode 100644 index 000000000..5587acd2c --- /dev/null +++ b/superblock/lang/ca/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "Configuració de \"Bloqueig\""; +$a->strings["Comma separated profile URLS to block"] = "URLS dels perfils a bloquejar, separats per comes"; +$a->strings["Submit"] = "Enviar"; +$a->strings["BLOCKEM Settings saved."] = "Guardada la configuració de BLOQUEIG."; +$a->strings["Blocked %s - Click to open/close"] = "Bloquejar %s - Clica per obrir/tancar"; +$a->strings["Unblock Author"] = "Desbloquejar Autor"; +$a->strings["Block Author"] = "Bloquejar Autor"; +$a->strings["blockem settings updated"] = "Actualitzar la Configuració de bloqueig"; diff --git a/superblock/lang/cs/strings.php b/superblock/lang/cs/strings.php new file mode 100644 index 000000000..174abc631 --- /dev/null +++ b/superblock/lang/cs/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "\"Blockem\" Nastavení"; +$a->strings["Comma separated profile URLS to block"] = "Čárkou oddělené URL adresy profilů určených k ignorování"; +$a->strings["Submit"] = "Odeslat"; +$a->strings["BLOCKEM Settings saved."] = "BLOCKEM nastavení uloženo."; +$a->strings["Blocked %s - Click to open/close"] = "Blokován %s - Klikněte pro otevření/zavření"; +$a->strings["Unblock Author"] = "Odblokovat autora"; +$a->strings["Block Author"] = "Zablokovat autora"; +$a->strings["blockem settings updated"] = "blockem nastavení aktualizováno"; diff --git a/superblock/lang/de/strings.php b/superblock/lang/de/strings.php new file mode 100644 index 000000000..132b68a26 --- /dev/null +++ b/superblock/lang/de/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen"; +$a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)"; +$a->strings["Submit"] = "Senden"; +$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Einstellungen gesichert."; +$a->strings["Blocked %s - Click to open/close"] = "%s blockiert - Zum Öffnen/Schließen klicken"; +$a->strings["Unblock Author"] = "Autor freischalten"; +$a->strings["Block Author"] = "Autor blockieren"; +$a->strings["blockem settings updated"] = "blockem Einstellungen aktualisiert"; diff --git a/superblock/lang/eo/strings.php b/superblock/lang/eo/strings.php new file mode 100644 index 000000000..b6116507a --- /dev/null +++ b/superblock/lang/eo/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj"; +$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo"; +$a->strings["Submit"] = "Sendi"; +$a->strings["BLOCKEM Settings saved."] = "Konservis Agordojn de BLOCKEM."; +$a->strings["Blocked %s - Click to open/close"] = "%s blokita - Klaku por malfermi/fermi"; +$a->strings["Unblock Author"] = "Malbloki Aŭtoron"; +$a->strings["Block Author"] = "Bloki Aŭtoron"; +$a->strings["blockem settings updated"] = "Ĝisdatigis la blockem agordojn"; diff --git a/superblock/lang/es/strings.php b/superblock/lang/es/strings.php new file mode 100644 index 000000000..874d6d7f4 --- /dev/null +++ b/superblock/lang/es/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "Configuración de \"Blockem\""; +$a->strings["Comma separated profile URLS to block"] = "Direcciones separadas por coma de los perfiles a bloquear"; +$a->strings["Submit"] = "Envíar"; +$a->strings["BLOCKEM Settings saved."] = "Configuracion Blockem guardada."; +$a->strings["Blocked %s - Click to open/close"] = "%s bloqueado. Pulsa aquí para mostrar/ocultar"; +$a->strings["Unblock Author"] = "Desbloquear Autor"; +$a->strings["Block Author"] = "Bloquear Autor"; +$a->strings["blockem settings updated"] = "Configuración de Blockem actualizada"; diff --git a/superblock/lang/fr/strings.php b/superblock/lang/fr/strings.php new file mode 100644 index 000000000..b9f311807 --- /dev/null +++ b/superblock/lang/fr/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "Réglages de Blockem"; +$a->strings["Comma separated profile URLS to block"] = "Liste d'URLS de profils à bloquer, séparés par des virgules"; +$a->strings["Submit"] = "Envoyer"; +$a->strings["BLOCKEM Settings saved."] = "Réglages Blockem sauvés."; +$a->strings["Blocked %s - Click to open/close"] = "Bloqué %s - Cliquez pour ouvrir/fermer"; +$a->strings["Unblock Author"] = "Débloquer l'auteur"; +$a->strings["Block Author"] = "Bloquer l'auteur"; +$a->strings["blockem settings updated"] = "Réglages blockem sauvés"; diff --git a/superblock/lang/is/strings.php b/superblock/lang/is/strings.php new file mode 100644 index 000000000..3075c457f --- /dev/null +++ b/superblock/lang/is/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "\"Blockem\" stillingar"; +$a->strings["Comma separated profile URLS to block"] = "Banna lista af forsíðum (komma á milli)"; +$a->strings["Submit"] = "Senda inn"; +$a->strings["BLOCKEM Settings saved."] = "BLOCKEM stillingar vistaðar."; +$a->strings["Blocked %s - Click to open/close"] = "%s sett í straff - Smella til að taka úr/setja á"; +$a->strings["Unblock Author"] = "Leyfa notanda"; +$a->strings["Block Author"] = "Banna notanda"; +$a->strings["blockem settings updated"] = ""; diff --git a/superblock/lang/it/strings.php b/superblock/lang/it/strings.php new file mode 100644 index 000000000..bcee9d0ac --- /dev/null +++ b/superblock/lang/it/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "Impostazioni \"Blockem\""; +$a->strings["Comma separated profile URLS to block"] = "Lista, separata da virgola, di indirizzi da bloccare"; +$a->strings["Submit"] = "Invia"; +$a->strings["BLOCKEM Settings saved."] = "Impostazioni salvate."; +$a->strings["Blocked %s - Click to open/close"] = "%s bloccato - Clicca per aprire/chiudere"; +$a->strings["Unblock Author"] = "Sblocca autore"; +$a->strings["Block Author"] = "Blocca autore"; +$a->strings["blockem settings updated"] = "Impostazioni 'blockem' aggiornate."; diff --git a/superblock/lang/nb-no/strings.php b/superblock/lang/nb-no/strings.php new file mode 100644 index 000000000..0dd6660d9 --- /dev/null +++ b/superblock/lang/nb-no/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = ""; +$a->strings["Comma separated profile URLS to block"] = ""; +$a->strings["Submit"] = "Lagre"; +$a->strings["BLOCKEM Settings saved."] = ""; +$a->strings["Blocked %s - Click to open/close"] = ""; +$a->strings["Unblock Author"] = ""; +$a->strings["Block Author"] = ""; +$a->strings["blockem settings updated"] = ""; diff --git a/superblock/lang/pl/strings.php b/superblock/lang/pl/strings.php new file mode 100644 index 000000000..6d7bcf192 --- /dev/null +++ b/superblock/lang/pl/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = ""; +$a->strings["Comma separated profile URLS to block"] = ""; +$a->strings["Submit"] = "Potwierdź"; +$a->strings["BLOCKEM Settings saved."] = ""; +$a->strings["Blocked %s - Click to open/close"] = ""; +$a->strings["Unblock Author"] = "Odblokuj autora"; +$a->strings["Block Author"] = "Zablokuj autora"; +$a->strings["blockem settings updated"] = ""; diff --git a/superblock/lang/pt-br/strings.php b/superblock/lang/pt-br/strings.php new file mode 100644 index 000000000..49f69cc37 --- /dev/null +++ b/superblock/lang/pt-br/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "Configurações \"Blockem\""; +$a->strings["Comma separated profile URLS to block"] = "URLS de perfis separados por vírgulas a serem bloqueados"; +$a->strings["Submit"] = "Enviar"; +$a->strings["BLOCKEM Settings saved."] = "Configurações BLOCKEM armazenadas."; +$a->strings["Blocked %s - Click to open/close"] = "Bloqueado %s - Clique para abrir/fechar"; +$a->strings["Unblock Author"] = "Desbloqueie Autor"; +$a->strings["Block Author"] = "Bloqueie Autor"; +$a->strings["blockem settings updated"] = "configurações blockem atualizadas"; diff --git a/superblock/lang/ru/strings.php b/superblock/lang/ru/strings.php new file mode 100644 index 000000000..7617b865e --- /dev/null +++ b/superblock/lang/ru/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "\"Blockem\" настройки"; +$a->strings["Comma separated profile URLS to block"] = "URLS, которые заблокировать (список через запятую)"; +$a->strings["Submit"] = "Подтвердить"; +$a->strings["BLOCKEM Settings saved."] = "BLOCKEM-Настройки сохранены."; +$a->strings["Blocked %s - Click to open/close"] = "Заблокированные %s - Нажмите, чтобы открыть/закрыть"; +$a->strings["Unblock Author"] = ""; +$a->strings["Block Author"] = "Блокировать Автора"; +$a->strings["blockem settings updated"] = "\"Blockem\" настройки обновлены"; diff --git a/superblock/lang/sv/strings.php b/superblock/lang/sv/strings.php new file mode 100644 index 000000000..3ec569a78 --- /dev/null +++ b/superblock/lang/sv/strings.php @@ -0,0 +1,3 @@ +strings["Submit"] = "Spara"; diff --git a/superblock/lang/zh-cn/strings.php b/superblock/lang/zh-cn/strings.php new file mode 100644 index 000000000..3a3dfaeb2 --- /dev/null +++ b/superblock/lang/zh-cn/strings.php @@ -0,0 +1,10 @@ +strings["\"Blockem\" Settings"] = "「Blockem」配置"; +$a->strings["Comma separated profile URLS to block"] = "逗号分简介URL为栏"; +$a->strings["Submit"] = "提交"; +$a->strings["BLOCKEM Settings saved."] = "「Blockem」配置保存了。"; +$a->strings["Blocked %s - Click to open/close"] = "%s拦了－点击为开关"; +$a->strings["Unblock Author"] = "不拦作家"; +$a->strings["Block Author"] = "拦作家"; +$a->strings["blockem settings updated"] = "blockem设置更新了"; diff --git a/superblock/superblock.css b/superblock/superblock.css new file mode 100755 index 000000000..368355bdf --- /dev/null +++ b/superblock/superblock.css @@ -0,0 +1,18 @@ + +#superblock-label { + float: left; + width: 300px; + margin-top: 10px; +} + +#superblock-words { + float: left; + margin-top: 10px; + width: 400px; + height: 150px; +} + +#superblock-submit { + margin-top: 15px; +} + diff --git a/superblock/superblock.php b/superblock/superblock.php new file mode 100755 index 000000000..420db76c6 --- /dev/null +++ b/superblock/superblock.php @@ -0,0 +1,133 @@ + + * + */ + +function superblock_install() { + + register_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); + register_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); + register_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); + register_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); +} + + +function superblock_uninstall() { + + unregister_hook('plugin_settings', 'addon/superblock/superblock.php', 'superblock_addon_settings'); + unregister_hook('plugin_settings_post', 'addon/superblock/superblock.php', 'superblock_addon_settings_post'); + unregister_hook('conversation_start', 'addon/superblock/superblock.php', 'superblock_conversation_start'); + unregister_hook('item_photo_menu', 'addon/superblock/superblock.php', 'superblock_item_photo_menu'); + +} + + + + + +function superblock_addon_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"; + + + $words = get_pconfig(local_user(),'system','blocked'); + if(! $words) + $words = ''; + + $s .= '
'; + $s .= '

' . t('"Superblock" Settings') . '

'; + $s .= '
'; + $s .= ''; + $s .= ''; + $s .= '
'; + + $s .= '
'; + + return; + +} + +function superblock_addon_settings_post(&$a,&$b) { + + if(! local_user()) + return; + + if($_POST['superblock-submit']) { + set_pconfig(local_user(),'system','blocked',trim($_POST['superblock-words'])); + info( t('SUPERBLOCK Settings saved.') . EOL); + } +} + +function superblock_conversation_start(&$a,&$b) { + + if(! local_user()) + return; + + $words = get_pconfig(local_user(),'system','blocked'); + if($words) { + $a->data['superblock'] = explode(',',$words); + } + $a->page['htmlhead'] .= <<< EOT + + + +EOT; + +} + +function superblock_item_photo_menu(&$a,&$b) { + + if((! local_user()) || ($b['item']['self'])) + return; + + $blocked = false; + $author = $b['item']['author-link']; + if(is_array($a->data['superblock'])) { + foreach($a->data['superblock'] as $bloke) { + if(link_compare($bloke,$author)) { + $blocked = true; + break; + } + } + } + + $b['menu'][ t('Block Completely')] = 'javascript:superblockBlock(\'' . $author . '\'); return false;'; +} + +function superblock_module() {} + + +function superblock_init(&$a) { + + if(! local_user()) + return; + + $words = get_pconfig(local_user(),'system','blocked'); + + if(array_key_exists('block',$_GET) && $_GET['block']) { + if(strlen($words)) + $words .= ','; + $words .= trim($_GET['block']); + } + + set_pconfig(local_user(),'system','blocked',$words); + info( t('superblock settings updated') . EOL ); + killme(); +} diff --git a/testdrive.tgz b/testdrive.tgz index aeba45487..33a5207c8 100755 Binary files a/testdrive.tgz and b/testdrive.tgz differ diff --git a/tictac.tgz b/tictac.tgz index 7b70687ee..bcc339e00 100755 Binary files a/tictac.tgz and b/tictac.tgz differ diff --git a/tumblr.tgz b/tumblr.tgz index 53d00cdc4..463fad7b6 100755 Binary files a/tumblr.tgz and b/tumblr.tgz differ diff --git a/twitter.tgz b/twitter.tgz index 0b2446779..5e8147145 100755 Binary files a/twitter.tgz and b/twitter.tgz differ diff --git a/twitter/view/smarty3/admin.tpl b/twitter/templates/admin.tpl similarity index 100% rename from twitter/view/smarty3/admin.tpl rename to twitter/templates/admin.tpl diff --git a/twitter/twitter.php b/twitter/twitter.php index 43009709e..21dbc0ba2 100755 --- a/twitter/twitter.php +++ b/twitter/twitter.php @@ -286,7 +286,7 @@ function twitter_shortenmsg($b) { require_once("include/bbcode.php"); require_once("include/html2plain.php"); - $max_char = 140; + $max_char = 130; // Looking for the first image $image = ''; @@ -512,7 +512,7 @@ function twitter_post_hook(&$a,&$b) { // ok, all the links we want to send out are save, now strip // away the remaining bbcode //$msg = strip_tags(bbcode($tmp, false, false)); - $msg = bbcode($tmp, false, false); + $msg = bbcode($tmp, false, false, true); $msg = str_replace(array('
','
'),"\n",$msg); $msg = strip_tags($msg); diff --git a/twitter/view/admin.tpl b/twitter/view/admin.tpl deleted file mode 100644 index b89f51b6c..000000000 --- a/twitter/view/admin.tpl +++ /dev/null @@ -1,4 +0,0 @@ -{{ inc field_input.tpl with $field=$consumerkey }}{{ endinc }} -{{ inc field_input.tpl with $field=$consumersecret }}{{ endinc }} -{{ inc field_input.tpl with $field=$applicationname }}{{ endinc }} -
diff --git a/uhremotestorage.tgz b/uhremotestorage.tgz index 5bd47eb89..a12bc1675 100755 Binary files a/uhremotestorage.tgz and b/uhremotestorage.tgz differ diff --git a/uhremotestorage/view/smarty3/settings.tpl b/uhremotestorage/templates/settings.tpl similarity index 100% rename from uhremotestorage/view/smarty3/settings.tpl rename to uhremotestorage/templates/settings.tpl diff --git a/uhremotestorage/view/settings.tpl b/uhremotestorage/view/settings.tpl deleted file mode 100644 index 22d7d6084..000000000 --- a/uhremotestorage/view/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/viewsrc.tgz b/viewsrc.tgz index 1d9fb2bea..d24eccd26 100644 Binary files a/viewsrc.tgz and b/viewsrc.tgz differ diff --git a/widgets.tgz b/widgets.tgz index 889685418..6dcf96ac3 100755 Binary files a/widgets.tgz and b/widgets.tgz differ diff --git a/widgets/view/smarty3/settings.tpl b/widgets/templates/settings.tpl similarity index 100% rename from widgets/view/smarty3/settings.tpl rename to widgets/templates/settings.tpl diff --git a/widgets/view/smarty3/widget_like.tpl b/widgets/templates/widget_like.tpl similarity index 100% rename from widgets/view/smarty3/widget_like.tpl rename to widgets/templates/widget_like.tpl diff --git a/widgets/view/settings.tpl b/widgets/view/settings.tpl deleted file mode 100755 index 9d0f21d29..000000000 --- a/widgets/view/settings.tpl +++ /dev/null @@ -1,19 +0,0 @@ -
-

$title

-
- - $key -
- -
- -
- -

$widgets_h

-
    - {{ for $widgets as $w }} -
  • $w.1
    • - {{ endfor }} -
- -
diff --git a/widgets/view/widget_like.tpl b/widgets/view/widget_like.tpl deleted file mode 100755 index 3c26d1da3..000000000 --- a/widgets/view/widget_like.tpl +++ /dev/null @@ -1,3 +0,0 @@ - -$like like -$dislike dislike diff --git a/wppost.tgz b/wppost.tgz index 69f22c669..404ea1342 100755 Binary files a/wppost.tgz and b/wppost.tgz differ diff --git a/yourls.tgz b/yourls.tgz index f0f04aae2..036522b4e 100755 Binary files a/yourls.tgz and b/yourls.tgz differ