From 2241ba454026968fffacc4b4c684c7a635ff6d38 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Thu, 13 Dec 2018 22:28:12 -0500 Subject: [PATCH 1/9] Remove uses of HTML escaping in Smarty templates --- view/templates/acl_selector.tpl | 2 +- view/templates/admin/addon_details.tpl | 2 +- view/templates/admin/contactblock.tpl | 14 ++-- view/templates/admin/logs.tpl | 4 +- view/templates/admin/settings_features.tpl | 2 +- view/templates/admin/site.tpl | 30 +++---- view/templates/admin/tos.tpl | 2 +- view/templates/admin/users.tpl | 22 ++--- view/templates/album_edit.tpl | 6 +- view/templates/auto_request.tpl | 10 +-- view/templates/birthdays_reminder.tpl | 4 +- view/templates/comment_item.tpl | 4 +- view/templates/confirm.tpl | 6 +- view/templates/contact_edit.tpl | 2 +- view/templates/contact_template.tpl | 4 +- view/templates/contacts-template.tpl | 6 +- view/templates/crepair.tpl | 2 +- view/templates/cropbody.tpl | 2 +- view/templates/delegate.tpl | 2 +- view/templates/dfrn_req_confirm.tpl | 2 +- view/templates/dfrn_request.tpl | 10 +-- view/templates/directory_header.tpl | 4 +- view/templates/event_form.tpl | 4 +- view/templates/event_stream_item.tpl | 6 +- view/templates/events_reminder.tpl | 4 +- view/templates/field_combobox.tpl | 4 +- view/templates/field_input.tpl | 2 +- view/templates/field_intcheckbox.tpl | 2 +- view/templates/field_openid.tpl | 2 +- view/templates/field_password.tpl | 2 +- view/templates/field_radio.tpl | 2 +- view/templates/field_select.tpl | 2 +- view/templates/field_themeselect.tpl | 2 +- view/templates/field_yesno.tpl | 2 +- view/templates/filebrowser.tpl | 2 +- view/templates/filer_dialog.tpl | 2 +- view/templates/files.tpl | 2 +- view/templates/follow.tpl | 2 +- view/templates/group_edit.tpl | 2 +- view/templates/head.tpl | 2 +- view/templates/hovercard.tpl | 16 ++-- view/templates/install_checks.tpl | 6 +- view/templates/install_db.tpl | 4 +- view/templates/install_settings.tpl | 12 +-- view/templates/intros.tpl | 8 +- view/templates/invite.tpl | 2 +- view/templates/jot.tpl | 28 +++---- view/templates/login.tpl | 10 +-- view/templates/logout.tpl | 2 +- view/templates/lostpass.tpl | 2 +- view/templates/moderated_comment.tpl | 12 +-- view/templates/oauth_authorize.tpl | 2 +- view/templates/peoplefind.tpl | 2 +- view/templates/photo_album.tpl | 4 +- view/templates/photo_edit.tpl | 4 +- view/templates/photo_top.tpl | 6 +- view/templates/photo_view.tpl | 4 +- .../photos_default_uploader_submit.tpl | 2 +- view/templates/poke_content.tpl | 4 +- view/templates/profile_edit.tpl | 54 ++++++------ view/templates/profile_photo.tpl | 2 +- view/templates/profile_vcard.tpl | 8 +- view/templates/prv_message.tpl | 8 +- view/templates/register.tpl | 10 +-- view/templates/remote_friends_common.tpl | 4 +- view/templates/removeme.tpl | 2 +- view/templates/search_item.tpl | 10 +-- view/templates/settings/connectors.tpl | 2 +- view/templates/settings/display.tpl | 4 +- view/templates/settings/features.tpl | 2 +- view/templates/settings/oauth.tpl | 4 +- view/templates/settings/oauth_edit.tpl | 2 +- view/templates/settings/settings.tpl | 12 +-- view/templates/suggestions.tpl | 8 +- view/templates/uimport.tpl | 2 +- view/templates/vcard-widget.tpl | 10 +-- view/templates/wall/content_filter.tpl | 4 +- view/templates/wall_thread.tpl | 50 +++++------ view/templates/wallmessage.tpl | 6 +- view/templates/widget_forumlist.tpl | 8 +- .../duepuntozero/templates/profile_vcard.tpl | 6 +- view/theme/frio/templates/acl_selector.tpl | 2 +- view/theme/frio/templates/admin/addons.tpl | 2 +- .../frio/templates/admin/contactblock.tpl | 14 ++-- view/theme/frio/templates/admin/queue.tpl | 12 +-- view/theme/frio/templates/admin/site.tpl | 30 +++---- view/theme/frio/templates/admin/summary.tpl | 6 +- view/theme/frio/templates/admin/users.tpl | 24 +++--- view/theme/frio/templates/album_edit.tpl | 6 +- view/theme/frio/templates/comment_item.tpl | 14 ++-- view/theme/frio/templates/common_tabs.tpl | 6 +- view/theme/frio/templates/confirm.tpl | 6 +- view/theme/frio/templates/contact_edit.tpl | 76 ++++++++--------- .../theme/frio/templates/contact_template.tpl | 42 +++++----- .../frio/templates/contacts-template.tpl | 4 +- view/theme/frio/templates/credits.tpl | 4 +- view/theme/frio/templates/crepair.tpl | 4 +- .../theme/frio/templates/directory_header.tpl | 2 +- view/theme/frio/templates/event.tpl | 10 +-- view/theme/frio/templates/event_form.tpl | 30 +++---- .../frio/templates/event_stream_item.tpl | 6 +- view/theme/frio/templates/events_js.tpl | 8 +- view/theme/frio/templates/field_input.tpl | 2 +- .../frio/templates/field_intcheckbox.tpl | 2 +- view/theme/frio/templates/field_openid.tpl | 2 +- view/theme/frio/templates/field_password.tpl | 2 +- view/theme/frio/templates/field_select.tpl | 2 +- view/theme/frio/templates/field_yesno.tpl | 2 +- view/theme/frio/templates/filebrowser.tpl | 10 +-- view/theme/frio/templates/follow.tpl | 2 +- view/theme/frio/templates/group_edit.tpl | 4 +- view/theme/frio/templates/head.tpl | 2 +- view/theme/frio/templates/intros.tpl | 20 ++--- view/theme/frio/templates/invite.tpl | 2 +- view/theme/frio/templates/jot.tpl | 2 +- view/theme/frio/templates/like_noshare.tpl | 2 +- view/theme/frio/templates/login.tpl | 10 +-- view/theme/frio/templates/mail_conv.tpl | 4 +- view/theme/frio/templates/mail_list.tpl | 4 +- view/theme/frio/templates/nav.tpl | 84 +++++++++---------- view/theme/frio/templates/peoplefind.tpl | 4 +- view/theme/frio/templates/photo_item.tpl | 2 +- view/theme/frio/templates/photo_top.tpl | 4 +- view/theme/frio/templates/photo_view.tpl | 12 +-- .../photos_default_uploader_submit.tpl | 2 +- view/theme/frio/templates/poke_content.tpl | 4 +- view/theme/frio/templates/profile_edit.tpl | 12 +-- view/theme/frio/templates/profile_entry.tpl | 2 +- view/theme/frio/templates/profile_vcard.tpl | 46 +++++----- view/theme/frio/templates/prv_message.tpl | 18 ++-- view/theme/frio/templates/register.tpl | 10 +-- view/theme/frio/templates/removeme.tpl | 2 +- view/theme/frio/templates/search_item.tpl | 66 +++++++-------- .../frio/templates/settings/connectors.tpl | 8 +- .../theme/frio/templates/settings/display.tpl | 8 +- .../frio/templates/settings/features.tpl | 2 +- view/theme/frio/templates/settings/oauth.tpl | 4 +- .../frio/templates/settings/oauth_edit.tpl | 2 +- .../frio/templates/settings/settings.tpl | 12 +-- view/theme/frio/templates/theme_settings.tpl | 2 +- view/theme/frio/templates/vcard-widget.tpl | 10 +-- view/theme/frio/templates/wall_thread.tpl | 78 ++++++++--------- .../quattro/templates/contact_template.tpl | 8 +- view/theme/quattro/templates/event_form.tpl | 4 +- view/theme/quattro/templates/events.tpl | 2 +- view/theme/quattro/templates/mail_conv.tpl | 18 ++-- view/theme/quattro/templates/photo_item.tpl | 4 +- view/theme/quattro/templates/photo_view.tpl | 2 +- .../theme/quattro/templates/profile_vcard.tpl | 10 +-- view/theme/quattro/templates/search_item.tpl | 36 ++++---- .../theme/quattro/templates/wall_item_tag.tpl | 8 +- view/theme/quattro/templates/wall_thread.tpl | 18 ++-- .../quattro/templates/widget_forumlist.tpl | 4 +- view/theme/smoothly/templates/search_item.tpl | 10 +-- view/theme/smoothly/templates/wall_thread.tpl | 16 ++-- view/theme/vier/templates/ch_connectors.tpl | 2 +- .../vier/templates/ch_directory_item.tpl | 2 +- view/theme/vier/templates/comment_item.tpl | 16 ++-- view/theme/vier/templates/communityhome.tpl | 6 +- view/theme/vier/templates/contact_edit.tpl | 2 +- .../theme/vier/templates/contact_template.tpl | 6 +- view/theme/vier/templates/event_form.tpl | 4 +- view/theme/vier/templates/nav.tpl | 48 +++++------ view/theme/vier/templates/photo_item.tpl | 30 +++---- view/theme/vier/templates/photo_view.tpl | 4 +- view/theme/vier/templates/profile_edit.tpl | 14 ++-- view/theme/vier/templates/profile_vcard.tpl | 8 +- view/theme/vier/templates/search_item.tpl | 36 ++++---- view/theme/vier/templates/wall_item_tag.tpl | 8 +- view/theme/vier/templates/wall_thread.tpl | 60 ++++++------- .../vier/templates/widget_forumlist_right.tpl | 12 +-- 171 files changed, 855 insertions(+), 855 deletions(-) diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 7c68a73064..7df6965a04 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -17,7 +17,7 @@ {{if $networks}}
-
{{$emailcc}}
+
{{$emailcc}}
{{if $jotnets}} {{$jotnets}} diff --git a/view/templates/admin/addon_details.tpl b/view/templates/admin/addon_details.tpl index 96b26d2d09..fb908b7058 100644 --- a/view/templates/admin/addon_details.tpl +++ b/view/templates/admin/addon_details.tpl @@ -18,7 +18,7 @@

{{if $screenshot}} - {{$screenshot.1|escape}} + {{$screenshot.1}} {{/if}} {{if $admin_form}} diff --git a/view/templates/admin/contactblock.tpl b/view/templates/admin/contactblock.tpl index 3afeb5355c..a77084d197 100644 --- a/view/templates/admin/contactblock.tpl +++ b/view/templates/admin/contactblock.tpl @@ -32,19 +32,19 @@ {{foreach $contacts as $contact}} - {{$contact.nickname|escape}} - {{$contact.name|escape}} - {{$contact.addr|escape}} - {{$contact.url}} + {{$contact.nickname}} + {{$contact.name}} + {{$contact.addr}} + {{$contact.url}} {{/foreach}}

{{$select_all}} | {{$select_none}}

{{$paginate}} -
+
{{else}} -

{{$no_data|escape:'html'}}

+

{{$no_data}}

{{/if}} @@ -58,6 +58,6 @@ -
+
diff --git a/view/templates/admin/logs.tpl b/view/templates/admin/logs.tpl index b2e6357a9a..a218a38f56 100644 --- a/view/templates/admin/logs.tpl +++ b/view/templates/admin/logs.tpl @@ -2,13 +2,13 @@

{{$title}} - {{$page}}

- + {{include file="field_checkbox.tpl" field=$debugging}} {{include file="field_input.tpl" field=$logfile}} {{include file="field_select.tpl" field=$loglevel}} -
+
diff --git a/view/templates/admin/settings_features.tpl b/view/templates/admin/settings_features.tpl index 1ca0708bfc..f0b696fae4 100644 --- a/view/templates/admin/settings_features.tpl +++ b/view/templates/admin/settings_features.tpl @@ -17,7 +17,7 @@ {{/foreach}}
- +
{{/foreach}} diff --git a/view/templates/admin/site.tpl b/view/templates/admin/site.tpl index 34b1e3b1b2..dd40654b51 100644 --- a/view/templates/admin/site.tpl +++ b/view/templates/admin/site.tpl @@ -39,7 +39,7 @@ });
-

{{$title|escape}} - {{$page|escape}}

+

{{$title}} - {{$page}}

@@ -58,7 +58,7 @@ {{if $ssl_policy.2 == 1}}{{include file="field_checkbox.tpl" field=$force_ssl}}{{/if}} {{include file="field_checkbox.tpl" field=$hide_help}} {{include file="field_select.tpl" field=$singleuser}} -
+

{{$registration}}

{{include file="field_input.tpl" field=$register_text}} @@ -67,13 +67,13 @@ {{include file="field_checkbox.tpl" field=$no_multi_reg}} {{include file="field_checkbox.tpl" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_regfullname}} -
+

{{$upload}}

{{include file="field_input.tpl" field=$maximagesize}} {{include file="field_input.tpl" field=$maximagelength}} {{include file="field_input.tpl" field=$jpegimagequality}} -
+

{{$corporate}}

{{include file="field_input.tpl" field=$allowed_sites}} @@ -99,14 +99,14 @@ {{/if}} {{include file="field_checkbox.tpl" field=$dfrn_only}} {{include file="field_input.tpl" field=$global_directory}} -
+
{{include file="field_checkbox.tpl" field=$newuser_private}} {{include file="field_checkbox.tpl" field=$enotify_no_content}} {{include file="field_checkbox.tpl" field=$private_addons}} {{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}} {{include file="field_checkbox.tpl" field=$explicit_content}} -
+

{{$advanced}}

{{include file="field_select.tpl" field=$rino}} @@ -123,7 +123,7 @@ {{include file="field_checkbox.tpl" field=$suppress_tags}} {{include file="field_checkbox.tpl" field=$nodeinfo}} {{include file="field_select.tpl" field=$check_new_version_url}} -
+

{{$portable_contacts}}

{{include file="field_checkbox.tpl" field=$poco_completion}} @@ -131,7 +131,7 @@ {{include file="field_select.tpl" field=$poco_discovery}} {{include file="field_select.tpl" field=$poco_discovery_since}} {{include file="field_checkbox.tpl" field=$poco_local_search}} -
+

{{$performance}}

{{include file="field_checkbox.tpl" field=$only_tag_search}} @@ -143,9 +143,9 @@ {{include file="field_input.tpl" field=$dbclean_expire_days}} {{include file="field_input.tpl" field=$dbclean_unclaimed}} {{include file="field_input.tpl" field=$dbclean_expire_conv}} -
+
-

{{$worker_title|escape}}

+

{{$worker_title}}

{{include file="field_input.tpl" field=$maxloadavg}} {{include file="field_input.tpl" field=$min_memory}} {{include file="field_input.tpl" field=$worker_queues}} @@ -153,9 +153,9 @@ {{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$worker_frontend}} -
+
-

{{$relay_title|escape}}

+

{{$relay_title}}

{{include file="field_checkbox.tpl" field=$relay_subscribe}} {{include file="field_input.tpl" field=$relay_server}} {{include file="field_checkbox.tpl" field=$relay_directly}} @@ -163,7 +163,7 @@ {{include file="field_input.tpl" field=$relay_server_tags}} {{include file="field_checkbox.tpl" field=$relay_user_tags}} -
+
@@ -173,8 +173,8 @@

{{$relocate}}

{{$relocate_warning}} {{include file="field_input.tpl" field=$relocate_url}} - -
+ +
diff --git a/view/templates/admin/tos.tpl b/view/templates/admin/tos.tpl index 75244924bd..b5260f3614 100644 --- a/view/templates/admin/tos.tpl +++ b/view/templates/admin/tos.tpl @@ -6,7 +6,7 @@ {{include file="field_checkbox.tpl" field=$displaytos}} {{include file="field_checkbox.tpl" field=$displayprivstatement}} {{include file="field_textarea.tpl" field=$tostext}} -
+

{{$preview}}

{{for $i=1 to 3}} diff --git a/view/templates/admin/users.tpl b/view/templates/admin/users.tpl index f06b0f9734..88feb6136a 100644 --- a/view/templates/admin/users.tpl +++ b/view/templates/admin/users.tpl @@ -35,8 +35,8 @@ {{$u.email}} - - + + @@ -46,7 +46,7 @@
{{$select_all}}
-
+
{{else}}

{{$no_pending}}

{{/if}} @@ -79,8 +79,8 @@ {{foreach $users as $u}} - {{$u.nickname|escape}} - {{$u.name}} + {{$u.nickname}} + {{$u.name}} {{$u.email}} {{$u.register_date}} {{$u.login_date}} @@ -94,8 +94,8 @@ {{/if}} {{if $u.is_deletable}} - - + + {{else}}   {{/if}} @@ -105,7 +105,7 @@
{{$select_all}}
-
+
{{else}} NO USERS?!? {{/if}} @@ -122,8 +122,8 @@ {{foreach $deleted as $u}} - {{$u.nickname|escape}} - {{$u.name}} + {{$u.nickname}} + {{$u.name}} {{$u.email}} {{$u.register_date}} {{$u.login_date}} @@ -150,6 +150,6 @@ -
+
diff --git a/view/templates/album_edit.tpl b/view/templates/album_edit.tpl index 3d1d7573d7..72aedd8b70 100644 --- a/view/templates/album_edit.tpl +++ b/view/templates/album_edit.tpl @@ -4,12 +4,12 @@ - +
- - + + diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl index c7e10482ef..f1cca45464 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -36,12 +36,12 @@ {{if $myaddr}} {{$myaddr}} - + {{else}} - + {{/if}} {{if $url}} - + {{/if}}
@@ -53,8 +53,8 @@
{{if $submit}} - + {{/if}} - +
diff --git a/view/templates/birthdays_reminder.tpl b/view/templates/birthdays_reminder.tpl index 9261ff8d32..6aa51d4702 100644 --- a/view/templates/birthdays_reminder.tpl +++ b/view/templates/birthdays_reminder.tpl @@ -1,10 +1,10 @@ {{if $count}} - - + {{/if}}
diff --git a/view/templates/contact_template.tpl b/view/templates/contact_template.tpl index 6845c62562..06918533ca 100644 --- a/view/templates/contact_template.tpl +++ b/view/templates/contact_template.tpl @@ -5,7 +5,7 @@ onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$contact.id}}')" onmouseout="t{{$contact.id}}=setTimeout('closeMenu(\'contact-photo-menu-button-{{$contact.id}}\'); closeMenu(\'contact-photo-menu-{{$contact.id}}\');',200)" > - {{$contact.name|escape}} + {{$contact.name}} {{if $multiselect}} @@ -31,7 +31,7 @@
- {{$contact.name|escape}} + {{$contact.name}} {{if $contact.account_type}} ({{$contact.account_type}}){{/if}}
{{if $contact.alt_text}}
{{$contact.alt_text}}
{{/if}} diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl index d85fcfb5af..c8c81dbb5e 100644 --- a/view/templates/contacts-template.tpl +++ b/view/templates/contacts-template.tpl @@ -6,8 +6,8 @@
{{$desc}} - - + +
@@ -21,7 +21,7 @@
{{foreach $batch_actions as $n=>$l}} - + {{/foreach}}
diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index 72528bd261..0eab89110c 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -43,6 +43,6 @@ {{include file="field_select.tpl" field=$remote_self}} {{/if}} - + diff --git a/view/templates/cropbody.tpl b/view/templates/cropbody.tpl index 144277310e..dc5e43096c 100644 --- a/view/templates/cropbody.tpl +++ b/view/templates/cropbody.tpl @@ -48,7 +48,7 @@
- +
diff --git a/view/templates/delegate.tpl b/view/templates/delegate.tpl index 0cb6e7e3ec..b2a78fe093 100644 --- a/view/templates/delegate.tpl +++ b/view/templates/delegate.tpl @@ -8,7 +8,7 @@ {{include file="field_select.tpl" field=$parent_user}} {{include file="field_password.tpl" field=$parent_password}} -
+
{{/if}} diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl index d49b5bbf2d..accfd4f83f 100644 --- a/view/templates/dfrn_req_confirm.tpl +++ b/view/templates/dfrn_req_confirm.tpl @@ -17,6 +17,6 @@
- +
\ No newline at end of file diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index 8e686c33dc..ca35ae6747 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -35,12 +35,12 @@ {{if $myaddr}} {{$myaddr}} - + {{else}} - + {{/if}} {{if $url}} - + {{/if}}
@@ -83,8 +83,8 @@
{{if $submit}} - + {{/if}} - +
diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index 46f17de40e..8c05b30c60 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -11,8 +11,8 @@
{{$desc}} - - + +
diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl index de8de44e88..3676ba458a 100644 --- a/view/templates/event_form.tpl +++ b/view/templates/event_form.tpl @@ -39,7 +39,7 @@ {{$acl}}
- - + + diff --git a/view/templates/event_stream_item.tpl b/view/templates/event_stream_item.tpl index af9a554942..15975c5d51 100644 --- a/view/templates/event_stream_item.tpl +++ b/view/templates/event_stream_item.tpl @@ -1,16 +1,16 @@
-
{{$title|escape}}
+
{{$title}}
{{$dtstart_label}}  - {{$dtstart_dt}} + {{$dtstart_dt}}
{{if $finish}}
{{$dtend_label}}  - {{$dtend_dt}} + {{$dtend_dt}}
{{/if}} diff --git a/view/templates/events_reminder.tpl b/view/templates/events_reminder.tpl index 08278954c3..2fcb1908d7 100644 --- a/view/templates/events_reminder.tpl +++ b/view/templates/events_reminder.tpl @@ -1,10 +1,10 @@ {{if $count}} - {{if $prevlink}}{{/if}} -
+
{{if $nextlink}}{{/if}}
-
{{$desc}}
+
{{$desc nofilter}}
{{if $tags}}
{{$tags.0}}
{{$tags.1}}
diff --git a/view/templates/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl index 91444e2d55..e178e977a7 100644 --- a/view/templates/photos_default_uploader_submit.tpl +++ b/view/templates/photos_default_uploader_submit.tpl @@ -1,4 +1,4 @@
- +
diff --git a/view/templates/poke_content.tpl b/view/templates/poke_content.tpl index 18191de03f..56fbde6442 100644 --- a/view/templates/poke_content.tpl +++ b/view/templates/poke_content.tpl @@ -9,7 +9,7 @@
{{$clabel}}
- +
@@ -28,7 +28,7 @@
- + diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl index 2363bd3f06..1e1771ef43 100644 --- a/view/templates/profile_edit.tpl +++ b/view/templates/profile_edit.tpl @@ -5,11 +5,11 @@ @@ -25,19 +25,19 @@ {{include file="field_yesno.tpl" field=$details}}
-
*
+
*
- +
- +
@@ -63,20 +63,20 @@
- +
- +
- +
@@ -100,7 +100,7 @@
- +
@@ -116,7 +116,7 @@ - +
@@ -130,38 +130,38 @@
- +
- +
{{$xmpp.3}}
- +
- +
- +
{{$pub_keywords.3}}
- +
{{$prv_keywords.3}}
@@ -330,13 +330,13 @@ {{/if}}
-
*
+
*
- +
@@ -355,13 +355,13 @@
- +
- +
{{$xmpp.3}}
@@ -370,20 +370,20 @@
- +
- +
- +
@@ -407,13 +407,13 @@
- +
{{$pub_keywords.3}}
- +
{{$prv_keywords.3}}
diff --git a/view/templates/profile_photo.tpl b/view/templates/profile_photo.tpl index 1695d01e27..d0ae4f87dc 100644 --- a/view/templates/profile_photo.tpl +++ b/view/templates/profile_photo.tpl @@ -17,7 +17,7 @@
- +
diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl index 14e1a03736..b56dd607ce 100644 --- a/view/templates/profile_vcard.tpl +++ b/view/templates/profile_vcard.tpl @@ -1,16 +1,16 @@
-
{{$profile.name|escape}}
+
{{$profile.name}}
- {{if $profile.addr}}
{{$profile.addr|escape}}
{{/if}} + {{if $profile.addr}}
{{$profile.addr}}
{{/if}} {{if $profile.pdesc}}
{{$profile.pdesc}}
{{/if}} {{if $profile.picdate}} -
{{$profile.name|escape}}
+
{{$profile.name}}
{{else}} -
{{$profile.name|escape}}
+
{{$profile.name}}
{{/if}} {{if $account_type}}{{/if}} {{if $profile.network_name}}
{{$network}}
{{$profile.network_name}}
{{/if}} diff --git a/view/templates/prv_message.tpl b/view/templates/prv_message.tpl index 654671af0e..d419d4d9b3 100644 --- a/view/templates/prv_message.tpl +++ b/view/templates/prv_message.tpl @@ -18,15 +18,15 @@
- +
-
+
- +
diff --git a/view/templates/register.tpl b/view/templates/register.tpl index 2e5588ae71..30b2429836 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -16,7 +16,7 @@ {{if $oidlabel}}
- +
{{/if}} @@ -35,14 +35,14 @@
- +
- +
@@ -55,7 +55,7 @@
-
@{{$sitename}}
+
@{{$sitename}}
@@ -76,7 +76,7 @@ {{/if}}
- +
diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl index f5f43360a7..354c8e46a2 100644 --- a/view/templates/remote_friends_common.tpl +++ b/view/templates/remote_friends_common.tpl @@ -6,12 +6,12 @@
- {{$item.name|escape}} + {{$item.name}}
- {{$item.name|escape}} + {{$item.name}}
diff --git a/view/templates/removeme.tpl b/view/templates/removeme.tpl index 4acfb9ff1a..4148f94e5f 100644 --- a/view/templates/removeme.tpl +++ b/view/templates/removeme.tpl @@ -14,7 +14,7 @@
- + diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl index a97574b7b4..fbcf770f1b 100644 --- a/view/templates/search_item.tpl +++ b/view/templates/search_item.tpl @@ -6,8 +6,8 @@
- - {{$item.name|escape}} + + {{$item.name}} menu
    @@ -23,12 +23,12 @@
- {{$item.name|escape}} + {{$item.name}}
{{$item.ago}}
-
{{$item.title|escape}}
+
{{$item.title}}
{{$item.body}}
{{if $item.has_cats}} @@ -54,7 +54,7 @@
{{if $item.conv}} - {{$item.conv.title|escape}} + {{$item.conv.title}} {{/if}}
diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl index a237917682..9dd5d0b1ab 100644 --- a/view/templates/settings/connectors.tpl +++ b/view/templates/settings/connectors.tpl @@ -48,7 +48,7 @@ {{include file="field_input.tpl" field=$mail_movetofolder}}
- +
{{/if}} diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl index e1a0123804..951609e1bf 100644 --- a/view/templates/settings/display.tpl +++ b/view/templates/settings/display.tpl @@ -21,12 +21,12 @@ {{include file="field_checkbox.tpl" field=$infinite_scroll}} {{include file="field_checkbox.tpl" field=$bandwidth_saver}} {{include file="field_checkbox.tpl" field=$smart_threading}} -

{{$calendar_title|escape}}

+

{{$calendar_title}}

{{include file="field_select.tpl" field=$first_day_of_week}}
- +
{{if $theme_config}} diff --git a/view/templates/settings/features.tpl b/view/templates/settings/features.tpl index eb3f67f813..2793e477b1 100644 --- a/view/templates/settings/features.tpl +++ b/view/templates/settings/features.tpl @@ -13,7 +13,7 @@ {{include file="field_yesno.tpl" field=$fcat}} {{/foreach}}
- +
{{/foreach}} diff --git a/view/templates/settings/oauth.tpl b/view/templates/settings/oauth.tpl index 164930ecba..edb0ff63ec 100644 --- a/view/templates/settings/oauth.tpl +++ b/view/templates/settings/oauth.tpl @@ -23,8 +23,8 @@ {{/if}} {{/if}} {{if $app.my}} -   -   +   +   {{/if}} {{/foreach}} diff --git a/view/templates/settings/oauth_edit.tpl b/view/templates/settings/oauth_edit.tpl index 9019981542..eed9f6ea33 100644 --- a/view/templates/settings/oauth_edit.tpl +++ b/view/templates/settings/oauth_edit.tpl @@ -11,7 +11,7 @@ {{include file="field_input.tpl" field=$icon}}
- +
diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl index d017367fef..2fa22973e0 100644 --- a/view/templates/settings/settings.tpl +++ b/view/templates/settings/settings.tpl @@ -16,7 +16,7 @@ {{/if}}
- +
@@ -33,7 +33,7 @@
- +
@@ -103,7 +103,7 @@
- +
@@ -187,7 +187,7 @@
- +
@@ -199,7 +199,7 @@ {{$pagetype}}
- +
@@ -208,7 +208,7 @@
{{$relocate_text}}
- +
diff --git a/view/templates/suggestions.tpl b/view/templates/suggestions.tpl index edc0dbdba3..44fe865104 100644 --- a/view/templates/suggestions.tpl +++ b/view/templates/suggestions.tpl @@ -5,18 +5,18 @@

{{$str_notifytype}} {{$notify_type}}

{{if $madeby}}
{{$lbl_madeby}} {{$madeby}}
{{/if}}
{{$fullname}}
-{{$fullname|escape:'html'}} +{{$fullname}}
{{$note}}
- - + +
{{include file="field_checkbox.tpl" field=$hidden}} - +
diff --git a/view/templates/uimport.tpl b/view/templates/uimport.tpl index 0aca00a05f..05c79ab757 100644 --- a/view/templates/uimport.tpl +++ b/view/templates/uimport.tpl @@ -8,7 +8,7 @@
- +
diff --git a/view/templates/vcard-widget.tpl b/view/templates/vcard-widget.tpl index eed94193f5..47b64b68da 100644 --- a/view/templates/vcard-widget.tpl +++ b/view/templates/vcard-widget.tpl @@ -1,14 +1,14 @@
-
{{$name|escape}}
- {{if $addr}}
{{$addr|escape}}
{{/if}} +
{{$name}}
+ {{if $addr}}
{{$addr}}
{{/if}} {{if $pdesc}}
{{$pdesc}}
{{/if}} {{if $url}} -
{{$name|escape}}
+
{{$name}}
{{else}} -
{{$name|escape}}
+
{{$name}}
{{/if}} - {{if $account_type}}{{/if}} + {{if $account_type}}{{/if}} {{if $network_name}}
{{$network}}
{{$network_name}}
{{/if}}
diff --git a/view/templates/wall/content_filter.tpl b/view/templates/wall/content_filter.tpl index 1e2b99c226..37e5a8a4c8 100644 --- a/view/templates/wall/content_filter.tpl +++ b/view/templates/wall/content_filter.tpl @@ -1,7 +1,7 @@ {{if count($reasons) > 1}}

@@ -11,7 +11,7 @@

{{else}}

- {{$reasons.0|escape:html}} + {{$reasons.0}} diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index 6f54d024da..73aad3d9aa 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -18,16 +18,16 @@

{{if $item.owner_url}} -
{{$item.wall|escape}}
+
{{$item.wall}}
{{/if}}
- - {{$item.name|escape}} + + {{$item.name}} menu
    @@ -38,17 +38,17 @@
- {{if $item.lock}}
{{$item.lock|escape}}
+ {{if $item.lock}}
{{$item.lock}}
{{else}}
{{/if}}
{{$item.location}}
- {{$item.name|escape}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name|escape}} {{$item.vwall}}{{/if}}
-
+ {{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
+
-
{{$item.title|escape}}
+
{{$item.title}}
{{$item.body}}
@@ -59,12 +59,12 @@ {{/if}}
{{if $item.has_cats}} -
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
{{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
{{/if}} {{if $item.has_folders}} -
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}} +
{{$item.txt_folders}} {{foreach $item.folders as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
{{/if}}
@@ -72,39 +72,39 @@
{{if $item.vote}} {{/if}} {{if $item.plink}} -
+
{{/if}} {{if $item.edpost}} - + {{/if}} {{if $item.star}} - + {{/if}} {{if $item.tagger}} - + {{/if}} {{if $item.filer}} - + {{/if}} {{if $item.isevent }}
- - - + + +
{{/if}}
- {{if $item.drop.dropping}}{{/if}} + {{if $item.drop.dropping}}{{/if}}
- {{if $item.drop.pagedrop}}{{/if}} + {{if $item.drop.pagedrop}}{{/if}}
diff --git a/view/templates/wallmessage.tpl b/view/templates/wallmessage.tpl index e6a6be908f..579ee0a31e 100644 --- a/view/templates/wallmessage.tpl +++ b/view/templates/wallmessage.tpl @@ -13,7 +13,7 @@ {{$recipname}}
{{$subject}}
- +
{{$yourmessage}}
@@ -22,10 +22,10 @@
- +
diff --git a/view/templates/widget_forumlist.tpl b/view/templates/widget_forumlist.tpl index da30967cd6..32da71f816 100644 --- a/view/templates/widget_forumlist.tpl +++ b/view/templates/widget_forumlist.tpl @@ -21,8 +21,8 @@ function showHideForumlist() { {{if $forum.id <= $visible_forums}} @@ -31,8 +31,8 @@ function showHideForumlist() { {{if $forum.id > $visible_forums}} diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl index 31afc71fea..186b7e4490 100644 --- a/view/theme/duepuntozero/templates/profile_vcard.tpl +++ b/view/theme/duepuntozero/templates/profile_vcard.tpl @@ -1,12 +1,12 @@
-
{{$profile.name|escape}}
+
{{$profile.name}}
- {{if $profile.addr}}
{{$profile.addr|escape}}
{{/if}} + {{if $profile.addr}}
{{$profile.addr}}
{{/if}} {{if $profile.pdesc}}
{{$profile.pdesc}}
{{/if}} -
{{$profile.name|escape}}
+
{{$profile.name}}
{{if $account_type}}{{/if}} diff --git a/view/theme/frio/templates/acl_selector.tpl b/view/theme/frio/templates/acl_selector.tpl index 9ccd5326c1..4e9eabd3b5 100644 --- a/view/theme/frio/templates/acl_selector.tpl +++ b/view/theme/frio/templates/acl_selector.tpl @@ -20,7 +20,7 @@
- +
diff --git a/view/theme/frio/templates/admin/addons.tpl b/view/theme/frio/templates/admin/addons.tpl index 38efb62bd4..220abdc2c4 100644 --- a/view/theme/frio/templates/admin/addons.tpl +++ b/view/theme/frio/templates/admin/addons.tpl @@ -12,7 +12,7 @@
  • - {{$p.2.name|escape}} - {{$p.2.version}} + {{$p.2.name}} - {{$p.2.version}} {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
    {{$p.2.description}}
    • diff --git a/view/theme/frio/templates/admin/contactblock.tpl b/view/theme/frio/templates/admin/contactblock.tpl index 3ac9a25173..4b3a2ae4bb 100644 --- a/view/theme/frio/templates/admin/contactblock.tpl +++ b/view/theme/frio/templates/admin/contactblock.tpl @@ -24,7 +24,7 @@ {{include file="field_input.tpl" field=$contacturl}}
    - +
    @@ -67,9 +67,9 @@
    - {{$contact.nickname|escape}} - {{$contact.name|escape}} - {{$contact.url|escape}} + {{$contact.nickname}} + {{$contact.name}} + {{$contact.url}} {{/foreach}} @@ -78,14 +78,14 @@ {{* Checkbox to select all blocked contacts *}}
    - +
    {{$total_contacts}}
    - +
    @@ -96,7 +96,7 @@ {{$paginate}} {{else}} -

    {{$no_data|escape:'html'}}

    +

    {{$no_data}}

    {{/if}}
    diff --git a/view/theme/frio/templates/admin/queue.tpl b/view/theme/frio/templates/admin/queue.tpl index 3ebe89052e..dde3863999 100644 --- a/view/theme/frio/templates/admin/queue.tpl +++ b/view/theme/frio/templates/admin/queue.tpl @@ -13,12 +13,12 @@ {{foreach $entries as $e}} - {{$e.id|escape}} - {{$e.name|escape}} - {{$e.nurl|escape}} - {{$e.network|escape}} - {{$e.created|escape}} - {{$e.last|escape}} + {{$e.id}} + {{$e.name}} + {{$e.nurl}} + {{$e.network}} + {{$e.created}} + {{$e.last}} {{/foreach}} diff --git a/view/theme/frio/templates/admin/site.tpl b/view/theme/frio/templates/admin/site.tpl index 77ae1d532b..7228b9022b 100644 --- a/view/theme/frio/templates/admin/site.tpl +++ b/view/theme/frio/templates/admin/site.tpl @@ -54,7 +54,7 @@
    -

    {{$title|escape}} - {{$page}}

    +

    {{$title}} - {{$page}}

    @@ -88,7 +88,7 @@ {{include file="field_checkbox.tpl" field=$hide_help}} {{include file="field_select.tpl" field=$singleuser}}
    - +
    @@ -114,7 +114,7 @@ {{include file="field_checkbox.tpl" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_regfullname}}
    - +
    @@ -139,7 +139,7 @@ {{include file="field_input.tpl" field=$maximagelength}} {{include file="field_input.tpl" field=$jpegimagequality}}
    - +
    @@ -182,7 +182,7 @@ {{include file="field_checkbox.tpl" field=$dfrn_only}} {{include file="field_input.tpl" field=$global_directory}}
    - +
    {{include file="field_checkbox.tpl" field=$newuser_private}} {{include file="field_checkbox.tpl" field=$enotify_no_content}} @@ -192,7 +192,7 @@ {{include file="field_checkbox.tpl" field=$explicit_content}}
    - +
    @@ -226,7 +226,7 @@ {{include file="field_checkbox.tpl" field=$nodeinfo}} {{include file="field_select.tpl" field=$check_new_version_url}}
    - +
    @@ -251,7 +251,7 @@ {{include file="field_select.tpl" field=$poco_discovery_since}} {{include file="field_checkbox.tpl" field=$poco_local_search}}
    - +
    @@ -280,7 +280,7 @@ {{include file="field_input.tpl" field=$dbclean_unclaimed}} {{include file="field_input.tpl" field=$dbclean_expire_conv}}
    - +
    @@ -293,7 +293,7 @@ @@ -306,7 +306,7 @@ {{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$worker_frontend}}
    - +
    @@ -319,7 +319,7 @@ @@ -332,7 +332,7 @@ {{include file="field_input.tpl" field=$relay_server_tags}} {{include file="field_checkbox.tpl" field=$relay_user_tags}}
    - +
    @@ -359,10 +359,10 @@ {{include file="field_input.tpl" field=$relocate_url}} - +
    - +
    diff --git a/view/theme/frio/templates/admin/summary.tpl b/view/theme/frio/templates/admin/summary.tpl index 564a660791..388c281f58 100644 --- a/view/theme/frio/templates/admin/summary.tpl +++ b/view/theme/frio/templates/admin/summary.tpl @@ -54,14 +54,14 @@ {{* The Friendica version. *}}
    -
    {{$version.0|escape}}
    -
    {{$platform}} '{{$codename|escape}}' {{$version.1|escape}} - {{$build|escape}}
    +
    {{$version.0}}
    +
    {{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}
    {{* Server Settings. *}}
    -
    {{$serversettings.label|escape}}
    +
    {{$serversettings.label}}
    diff --git a/view/theme/frio/templates/admin/users.tpl b/view/theme/frio/templates/admin/users.tpl index 031ffd0a47..92ef9be6fa 100644 --- a/view/theme/frio/templates/admin/users.tpl +++ b/view/theme/frio/templates/admin/users.tpl @@ -46,11 +46,11 @@ - + {{if $u.note}} @@ -145,8 +145,8 @@   {{/if}} - - + + {{if $order_users == $th_users.2.1}} @@ -169,18 +169,18 @@ {{if $u.page_flags_raw==3}}fa-heart{{/if}} {{* PAGE_FREELOVE *}} {{if $u.page_flags_raw==4}}fa-rss{{/if}} {{* PAGE_BLOG *}} {{if $u.page_flags_raw==5}}fa-user-secret{{/if}} {{* PAGE_PRVGROUP *}} - " title="{{$u.page_flags|escape}}"> + " title="{{$u.page_flags}}"> {{if $u.page_flags_raw==0 && $u.account_type_raw > 0}} {{/if}} - {{if $u.is_admin}}{{/if}} - {{if $u.account_expired}}{{/if}} + {{if $u.is_admin}}{{/if}} + {{if $u.account_expired}}{{/if}} {{/if}} @@ -229,7 +229,7 @@ {{/if}} - + {{else}} @@ -297,8 +297,8 @@ {{foreach $deleted as $u}} - - + + diff --git a/view/theme/frio/templates/album_edit.tpl b/view/theme/frio/templates/album_edit.tpl index f4a60b7d03..0b58d520d8 100644 --- a/view/theme/frio/templates/album_edit.tpl +++ b/view/theme/frio/templates/album_edit.tpl @@ -2,12 +2,12 @@
    - +
    - - + +
    diff --git a/view/theme/frio/templates/comment_item.tpl b/view/theme/frio/templates/comment_item.tpl index 804d07ac01..4ef5f2caa1 100644 --- a/view/theme/frio/templates/comment_item.tpl +++ b/view/theme/frio/templates/comment_item.tpl @@ -33,37 +33,37 @@ {{/if}}
    • -
    • -
    • -
    • -
    • -
    • -
    • -
      • diff --git a/view/theme/frio/templates/common_tabs.tpl b/view/theme/frio/templates/common_tabs.tpl index 207ffefcb9..76c6db0398 100644 --- a/view/theme/frio/templates/common_tabs.tpl +++ b/view/theme/frio/templates/common_tabs.tpl @@ -6,7 +6,7 @@
      • @@ -31,7 +31,7 @@ @@ -35,35 +35,35 @@
      - {{$contact_status|escape}} + {{$contact_status}} {{* Block with status information about the contact *}}
        - {{if $relation_text}}
      • {{$relation_text|escape}}
        • {{/if}} - {{if $nettype}}
      • {{$nettype|escape}}
        • {{/if}} + {{if $relation_text}}
      • {{$relation_text}}
        • {{/if}} + {{if $nettype}}
      • {{$nettype}}
        • {{/if}} {{if $poll_enabled}} -
      • {{$lastupdtext|escape}} {{$last_update|escape}}
        +
      • {{$lastupdtext}} {{$last_update}}
        {{if $poll_interval}}
        - {{$updpub|escape}} {{$poll_interval}} - + {{$updpub}} {{$poll_interval}} + {{/if}}
        • {{/if}} - {{if $lost_contact}}
      • {{$lost_contact|escape}}
        • {{/if}} - {{if $insecure}}
      • {{$insecure|escape}}
        • {{/if}} - {{if $blocked && !$pending}}
      • {{$blocked|escape}}
        • {{/if}} - {{if $pending}}
      • {{$pending|escape}}
        • {{/if}} - {{if $ignored}}
      • {{$ignored|escape}}
        • {{/if}} - {{if $archived}}
      • {{$archived|escape}}
        • {{/if}} + {{if $lost_contact}}
      • {{$lost_contact}}
        • {{/if}} + {{if $insecure}}
      • {{$insecure}}
        • {{/if}} + {{if $blocked && !$pending}}
      • {{$blocked}}
        • {{/if}} + {{if $pending}}
      • {{$pending}}
        • {{/if}} + {{if $ignored}}
      • {{$ignored}}
        • {{/if}} + {{if $archived}}
      • {{$archived}}
        • {{/if}}
      {{* End of contact-edit-status-wrapper *}} @@ -83,38 +83,38 @@
      -
      {{$profileurllabel|escape}}
      {{$profileurl|escape}} +
      {{$profileurllabel}}
      {{$profileurl}}
      {{if $location}}
      -
      {{$location_label|escape}}
      -
      {{$location|escape}}
      +
      {{$location_label}}
      +
      {{$location}}
      {{/if}} {{if $xmpp}}
      -
      {{$xmpp_label|escape}}
      -
      {{$xmpp|escape}}
      +
      {{$xmpp_label}}
      +
      {{$xmpp}}
      {{/if}} {{if $keywords}}
      -
      {{$keywords_label|escape}}
      -
      {{$keywords|escape}}
      +
      {{$keywords_label}}
      +
      {{$keywords}}
      {{/if}} {{if $about}}
      -
      {{$about_label|escape}}
      {{$about}}
      +
      {{$about_label}}
      {{/if}}
      @@ -127,14 +127,14 @@
      - + {{include file="field_checkbox.tpl" field=$notify}} {{if $fetch_further_information}} @@ -144,7 +144,7 @@ {{include file="field_checkbox.tpl" field=$hidden}}
      - +
      @@ -157,7 +157,7 @@ @@ -167,11 +167,11 @@ {{include file="field_textarea.tpl" field=$cinfo}}
      - +
      {{if $reason}} -

      {{$lbl_info2|escape}}

      +

      {{$lbl_info2}}

      {{$reason}}

      {{/if}} @@ -184,7 +184,7 @@ @@ -192,7 +192,7 @@
      {{if $profile_select}}
      -

      {{$lbl_vis2|escape}}

      +

      {{$lbl_vis2}}

      {{$profile_select}} @@ -201,7 +201,7 @@ {{/if}}
      - +
      diff --git a/view/theme/frio/templates/contact_template.tpl b/view/theme/frio/templates/contact_template.tpl index 604f8d7e5d..4ae4cf77cf 100644 --- a/view/theme/frio/templates/contact_template.tpl +++ b/view/theme/frio/templates/contact_template.tpl @@ -6,14 +6,14 @@
      {{* For very small displays we use a dropdown menu for contact relating actions *}} {{/if}} {{if $contact.photo_menu.poke}} - {{/if}} {{if $contact.photo_menu.network}} - + {{/if}} {{if $contact.photo_menu.edit}} - + {{/if}} {{if $contact.photo_menu.drop}} - {{/if}} {{if $contact.photo_menu.follow}} - + {{/if}} {{if $contact.photo_menu.hide}} - + {{/if}} @@ -84,7 +84,7 @@ {{* The button to add or remove contacts from a contact group - group edit page *}} {{if $contact.change_member}}
      - {/if} {if $photo_menu.poke} - {/if} {if $photo_menu.network} - + {/if} {if $photo_menu.edit} - + {/if} {if $photo_menu.drop} - + {/if} {if $photo_menu.follow} - + {/if} @@ -207,7 +207,7 @@ We use this part to filter the contacts with jquery.textcomplete *}} {{* The button to add or remove contacts from a contact group - group edit page *}} {if $contact.change_member}
      -
      @@ -31,7 +31,7 @@ {{* we put here a hidden input element. This is needed to transmit the batch actions with javascript*}} - + {{* We put the contact batch actions in a dropdown menu *}}
        diff --git a/view/theme/frio/templates/credits.tpl b/view/theme/frio/templates/credits.tpl index 75ab272df8..5e5aeecc25 100644 --- a/view/theme/frio/templates/credits.tpl +++ b/view/theme/frio/templates/credits.tpl @@ -1,10 +1,10 @@
        {{include file="section_title.tpl"}} -

        {{$thanks|escape}}

        +

        {{$thanks}}

          {{foreach $names as $name}} -
        • {{$name|escape}}
          • +
        • {{$name}}
          • {{/foreach}}
        diff --git a/view/theme/frio/templates/crepair.tpl b/view/theme/frio/templates/crepair.tpl index d4cdec5018..ec1b7b63fd 100644 --- a/view/theme/frio/templates/crepair.tpl +++ b/view/theme/frio/templates/crepair.tpl @@ -13,7 +13,7 @@ - +
        {{if $update_profile}} @@ -46,7 +46,7 @@ {{/if}}
        - +
        diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl index 4bb739e78c..9ce554a084 100644 --- a/view/theme/frio/templates/directory_header.tpl +++ b/view/theme/frio/templates/directory_header.tpl @@ -15,7 +15,7 @@
        - +
        diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl index 82ed1de092..947d09cb8d 100644 --- a/view/theme/frio/templates/event.tpl +++ b/view/theme/frio/templates/event.tpl @@ -6,7 +6,7 @@
        {{if $event.item.author_name}} - {{$event.item.author_name|escape}} + {{$event.item.author_name}} {{/if}}
        @@ -15,10 +15,10 @@
        - {{if $event.edit}}{{/if}} - {{if $event.copy}}{{/if}} - {{if $event.drop}}{{/if}} - {{if $event.item.plink}}{{/if}} + {{if $event.edit}}{{/if}} + {{if $event.copy}}{{/if}} + {{if $event.drop}}{{/if}} + {{if $event.item.plink}}{{/if}}
        diff --git a/view/theme/frio/templates/event_form.tpl b/view/theme/frio/templates/event_form.tpl index 41b11c5bb7..2325772418 100644 --- a/view/theme/frio/templates/event_form.tpl +++ b/view/theme/frio/templates/event_form.tpl @@ -64,7 +64,7 @@ {{* The submit button - saves the event *}}
        - +
        @@ -79,39 +79,39 @@
    {{$u.created}}{{$u.name|escape}}{{$u.name}} {{$u.email}} - - + +
    {{$u.name|escape}} {{$u.name}} {{$u.email}}{{$u.register_date}}
    {{$u.name|escape}}{{$u.name}} {{$u.email}} {{$u.deleted}}

    {{$select_all}} | {{$select_none}}

    - {{$paginate}} + {{$paginate nofilter}}
    {{else}}

    {{$no_data}}

    diff --git a/view/templates/admin/tos.tpl b/view/templates/admin/tos.tpl index b5260f3614..d4e1bcb48e 100644 --- a/view/templates/admin/tos.tpl +++ b/view/templates/admin/tos.tpl @@ -10,7 +10,7 @@

    {{$preview}}

    {{for $i=1 to 3}} -

    {{$privtext[$i]}}

    +

    {{$privtext[$i] nofilter}}

    {{/for}}
    diff --git a/view/templates/apps.tpl b/view/templates/apps.tpl index 1efd6fdcba..55303b3d74 100644 --- a/view/templates/apps.tpl +++ b/view/templates/apps.tpl @@ -3,6 +3,6 @@ diff --git a/view/templates/auto_request.tpl b/view/templates/auto_request.tpl index f1cca45464..ffc7b19d09 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -13,7 +13,7 @@ {{$invite_desc}}

    -{{$desc}} +{{$desc nofilter}}

    {{/if}} @@ -30,7 +30,7 @@ {{if $url}}
    {{$url_label}}
    {{$url}}
    {{/if}} {{if $location}}
    {{$location_label}}
    {{$location}}
    {{/if}} {{if $keywords}}
    {{$keywords_label}}
    {{$keywords}}
    {{/if}} -{{if $about}}
    {{$about_label}}
    {{$about}}
    {{/if}} +{{if $about}}
    {{$about_label}}
    {{$about nofilter}}
    {{/if}}
    diff --git a/view/templates/categories_widget.tpl b/view/templates/categories_widget.tpl index d2cfbe82a9..e3cf0fc32c 100644 --- a/view/templates/categories_widget.tpl +++ b/view/templates/categories_widget.tpl @@ -1,7 +1,7 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    • {{$all}}
      • diff --git a/view/templates/community.tpl b/view/templates/community.tpl index eb96fabb4d..bb812c502e 100644 --- a/view/templates/community.tpl +++ b/view/templates/community.tpl @@ -4,4 +4,4 @@

      {{$global_community_hint}}

      {{/if}} -{{$content}} +{{$content nofilter}} diff --git a/view/templates/contact_block.tpl b/view/templates/contact_block.tpl index 52e3e1e774..49a0e43582 100644 --- a/view/templates/contact_block.tpl +++ b/view/templates/contact_block.tpl @@ -5,7 +5,7 @@ {{$viewcontacts}}
      {{foreach $micropro as $m}} - {{$m}} + {{$m nofilter}} {{/foreach}}
      {{/if}} diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 19a1c73504..c86add3273 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -1,7 +1,7 @@
      {{* Insert Tab-Nav *}} - {{$tab_str}} + {{$tab_str nofilter}}
      @@ -56,7 +56,7 @@ {{if $location}}
      {{$location_label}}
      {{$location}}
      {{/if}} {{if $xmpp}}
      {{$xmpp_label}}
      {{$xmpp}}
      {{/if}} {{if $keywords}}
      {{$keywords_label}}
      {{$keywords}}
      {{/if}} - {{if $about}}
      {{$about_label}}
      {{$about}}
      {{/if}} + {{if $about}}
      {{$about_label}}
      {{$about nofilter}}
      {{/if}}
      {{* End of contact-edit-links *}} diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl index c8c81dbb5e..b320b0d050 100644 --- a/view/templates/contacts-template.tpl +++ b/view/templates/contacts-template.tpl @@ -5,14 +5,14 @@
      -{{$desc}} +{{$desc nofilter}}
      -{{$tabs}} +{{$tabs nofilter}}
      {{foreach $contacts as $contact}} @@ -53,7 +53,7 @@ }); -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/templates/contacts-widget-sidebar.tpl b/view/templates/contacts-widget-sidebar.tpl index 5b0610fcbd..af578acdaa 100644 --- a/view/templates/contacts-widget-sidebar.tpl +++ b/view/templates/contacts-widget-sidebar.tpl @@ -1,7 +1,7 @@ -{{$vcard_widget}} -{{$findpeople_widget}} -{{$follow_widget}} -{{$groups_widget}} -{{$networks_widget}} +{{$vcard_widget nofilter}} +{{$findpeople_widget nofilter}} +{{$follow_widget nofilter}} +{{$groups_widget nofilter}} +{{$networks_widget nofilter}} diff --git a/view/templates/content_wrapper.tpl b/view/templates/content_wrapper.tpl index e323b12e1b..ae2ad56657 100644 --- a/view/templates/content_wrapper.tpl +++ b/view/templates/content_wrapper.tpl @@ -8,5 +8,6 @@ {{/if}} {{* output the content *}} - {{$content}} + {{$content nofilter}} +
      diff --git a/view/templates/conversation.tpl b/view/templates/conversation.tpl index e46cd1395e..5a4ca2d634 100644 --- a/view/templates/conversation.tpl +++ b/view/templates/conversation.tpl @@ -1,5 +1,5 @@ -{{$live_update}} +{{$live_update nofilter}} {{foreach $threads as $thread}}
      diff --git a/view/templates/crepair.tpl b/view/templates/crepair.tpl index 0eab89110c..bb24e096ea 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -1,10 +1,10 @@ {{include file="section_title.tpl"}} -{{$tab_str}} +{{$tab_str nofilter}} -
      {{$warning}}

      +
      {{$warning nofilter}}

      - {{$info}}
      + {{$info nofilter}}

      diff --git a/view/templates/cropbody.tpl b/view/templates/cropbody.tpl index dc5e43096c..8378e5067e 100644 --- a/view/templates/cropbody.tpl +++ b/view/templates/cropbody.tpl @@ -1,6 +1,6 @@

      {{$title}}

      - {{$desc}} + {{$desc nofilter}}

      diff --git a/view/templates/delegate.tpl b/view/templates/delegate.tpl index b2a78fe093..0a875515d6 100644 --- a/view/templates/delegate.tpl +++ b/view/templates/delegate.tpl @@ -15,7 +15,7 @@

      {{$delegates_header}}

      -
      {{$desc}}
      +
      {{$desc nofilter}}

      {{$head_delegates}}

      diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl index ca35ae6747..39fa295deb 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -12,7 +12,7 @@ {{$invite_desc}}

      -{{$desc}} +{{$desc nofilter}}

      {{/if}} @@ -29,7 +29,7 @@ {{if $url}}
      {{$url_label}}
      {{$url}}
      {{/if}} {{if $location}}
      {{$location_label}}
      {{$location}}
      {{/if}} {{if $keywords}}
      {{$keywords_label}}
      {{$keywords}}
      {{/if}} -{{if $about}}
      {{$about_label}}
      {{$about}}
      {{/if}} +{{if $about}}
      {{$about_label}}
      {{$about nofilter}}
      {{/if}}
      diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index 8c05b30c60..4c9fe1298e 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -10,7 +10,7 @@
      - {{$desc}} + {{$desc nofilter}} @@ -28,4 +28,4 @@
      -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl index 3676ba458a..9e8f28d019 100644 --- a/view/templates/event_form.tpl +++ b/view/templates/event_form.tpl @@ -2,7 +2,7 @@

      {{$title}}

      -{{$desc}} +{{$desc nofilter}}

      diff --git a/view/templates/event_stream_item.tpl b/view/templates/event_stream_item.tpl index 15975c5d51..373b6d3314 100644 --- a/view/templates/event_stream_item.tpl +++ b/view/templates/event_stream_item.tpl @@ -22,7 +22,7 @@
      {{$location_label}}  {{if $location.name}} - {{$location.name}} + {{$location.name nofilter}} {{/if}} {{if $location.map}}{{$location.map}}{{/if}} diff --git a/view/templates/events.tpl b/view/templates/events.tpl index f723cb44c4..2469c4c718 100644 --- a/view/templates/events.tpl +++ b/view/templates/events.tpl @@ -1,5 +1,5 @@ -{{$tabs}} +{{$tabs nofilter}} {{include file="section_title.tpl"}} diff --git a/view/templates/events_js.tpl b/view/templates/events_js.tpl index ed9354bdef..ab375401a2 100644 --- a/view/templates/events_js.tpl +++ b/view/templates/events_js.tpl @@ -1,5 +1,5 @@ -{{$tabs}} +{{$tabs nofilter}}

      {{$title}}

      diff --git a/view/templates/failed_updates.tpl b/view/templates/failed_updates.tpl index 2fd6c3d694..8a5e0c2fa0 100644 --- a/view/templates/failed_updates.tpl +++ b/view/templates/failed_updates.tpl @@ -2,7 +2,7 @@

      {{$banner}}

      -
      {{$desc}}
      +
      {{$desc nofilter}}
      {{if $failed}} {{foreach $failed as $f}} diff --git a/view/templates/field_checkbox.tpl b/view/templates/field_checkbox.tpl index 8275d4595d..4bdb5a0912 100644 --- a/view/templates/field_checkbox.tpl +++ b/view/templates/field_checkbox.tpl @@ -3,6 +3,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
      diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl index 9edc4aeff6..098accec46 100644 --- a/view/templates/field_combobox.tpl +++ b/view/templates/field_combobox.tpl @@ -14,7 +14,7 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
      diff --git a/view/templates/field_custom.tpl b/view/templates/field_custom.tpl index 6649b0ff94..8dcad3ded7 100644 --- a/view/templates/field_custom.tpl +++ b/view/templates/field_custom.tpl @@ -2,8 +2,8 @@
      - {{$field.2}} + {{$field.2 nofilter}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
      diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl index f3f32d8068..b339630d06 100644 --- a/view/templates/field_input.tpl +++ b/view/templates/field_input.tpl @@ -3,6 +3,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
      diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl index 4e2b9bd7b7..0bb6ef2c54 100644 --- a/view/templates/field_intcheckbox.tpl +++ b/view/templates/field_intcheckbox.tpl @@ -4,6 +4,6 @@ {{if $field.4}} - {{$field.4}} + {{$field.4 nofilter}} {{/if}}
      diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl index 063b4c84b7..f436e3820e 100644 --- a/view/templates/field_openid.tpl +++ b/view/templates/field_openid.tpl @@ -3,6 +3,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
      diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl index 7ee2ec69f7..eec05ec6ea 100644 --- a/view/templates/field_password.tpl +++ b/view/templates/field_password.tpl @@ -3,6 +3,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
      diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl index ddd78d5aa3..7fe96a3dd8 100644 --- a/view/templates/field_radio.tpl +++ b/view/templates/field_radio.tpl @@ -2,6 +2,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/templates/field_richtext.tpl b/view/templates/field_richtext.tpl index bc346ddb0b..a121b81f87 100644 --- a/view/templates/field_richtext.tpl +++ b/view/templates/field_richtext.tpl @@ -4,6 +4,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl index 6d0603167c..2016a0bb7e 100644 --- a/view/templates/field_select.tpl +++ b/view/templates/field_select.tpl @@ -6,6 +6,6 @@ {{foreach $field.4 as $opt=>$val}}{{/foreach}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/templates/field_select_raw.tpl b/view/templates/field_select_raw.tpl index 147c028eff..1f4630e995 100644 --- a/view/templates/field_select_raw.tpl +++ b/view/templates/field_select_raw.tpl @@ -3,9 +3,9 @@
    {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/templates/field_textarea.tpl b/view/templates/field_textarea.tpl index 60594a2666..7c84851764 100644 --- a/view/templates/field_textarea.tpl +++ b/view/templates/field_textarea.tpl @@ -4,6 +4,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}} diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl index 936f25382d..6242cc6711 100644 --- a/view/templates/field_themeselect.tpl +++ b/view/templates/field_themeselect.tpl @@ -6,7 +6,7 @@ {{foreach $field.4 as $opt=>$val}}{{/foreach}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}} {{if $field.5}}
    {{/if}} diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl index 2a028d10c8..d268709000 100644 --- a/view/templates/field_yesno.tpl +++ b/view/templates/field_yesno.tpl @@ -11,6 +11,6 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}} diff --git a/view/templates/fileas_widget.tpl b/view/templates/fileas_widget.tpl index 1ba459bd3a..a55c90bc93 100644 --- a/view/templates/fileas_widget.tpl +++ b/view/templates/fileas_widget.tpl @@ -1,7 +1,7 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl index fc9d0b3b30..ece13ccb64 100644 --- a/view/templates/intros.tpl +++ b/view/templates/intros.tpl @@ -8,7 +8,7 @@ {{if $location}}
    {{$lbl_location}}
    {{$location}}
    {{/if}} {{if $gender}}
    {{$lbl_gender}}
    {{$gender}}
    {{/if}} {{if $keywords}}
    {{$lbl_keywords}}
    {{$keywords}}
    {{/if}} -{{if $about}}
    {{$lbl_about}}
    {{$about}}
    {{/if}} +{{if $about}}
    {{$lbl_about}}
    {{$about nofilter}}
    {{/if}}
    {{$lbl_knowyou}} {{$knowyou}}
    {{$note}}
    diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl index 0c450598a4..31b985e232 100644 --- a/view/templates/jot.tpl +++ b/view/templates/jot.tpl @@ -24,7 +24,7 @@ {{/if}}
    - +
    diff --git a/view/templates/lostpass.tpl b/view/templates/lostpass.tpl index e285860820..3c4f422197 100644 --- a/view/templates/lostpass.tpl +++ b/view/templates/lostpass.tpl @@ -2,7 +2,7 @@

    {{$title}}

    -{{$desc}} +{{$desc nofilter}}

    diff --git a/view/templates/manage.tpl b/view/templates/manage.tpl index dd27092e9b..d881e5fb62 100644 --- a/view/templates/manage.tpl +++ b/view/templates/manage.tpl @@ -1,6 +1,6 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    {{$choose}}
    diff --git a/view/templates/photo_view.tpl b/view/templates/photo_view.tpl index 885e929013..d5c3d68269 100644 --- a/view/templates/photo_view.tpl +++ b/view/templates/photo_view.tpl @@ -34,5 +34,5 @@ {{$comments}} -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/templates/photos_recent.tpl b/view/templates/photos_recent.tpl index 19456187bc..b75c5a41a4 100644 --- a/view/templates/photos_recent.tpl +++ b/view/templates/photos_recent.tpl @@ -11,4 +11,4 @@
    -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/templates/photos_upload.tpl b/view/templates/photos_upload.tpl index aeb6e5957b..a594660fdc 100644 --- a/view/templates/photos_upload.tpl +++ b/view/templates/photos_upload.tpl @@ -34,7 +34,7 @@
    - {{$aclselect}} + {{$aclselect nofilter}}
    diff --git a/view/templates/poke_content.tpl b/view/templates/poke_content.tpl index 56fbde6442..91aadcdd8c 100644 --- a/view/templates/poke_content.tpl +++ b/view/templates/poke_content.tpl @@ -1,7 +1,7 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    diff --git a/view/templates/profile-hide-wall.tpl b/view/templates/profile-hide-wall.tpl index e61c4dd963..ff106fa29f 100644 --- a/view/templates/profile-hide-wall.tpl +++ b/view/templates/profile-hide-wall.tpl @@ -1,6 +1,6 @@

    -{{$desc}} +{{$desc nofilter}}

    diff --git a/view/templates/profile-in-directory.tpl b/view/templates/profile-in-directory.tpl index 942c2e3e89..bfc13e85eb 100644 --- a/view/templates/profile-in-directory.tpl +++ b/view/templates/profile-in-directory.tpl @@ -1,6 +1,6 @@

    -{{$desc}} +{{$desc nofilter}}

    diff --git a/view/templates/profile-in-netdir.tpl b/view/templates/profile-in-netdir.tpl index 559caed342..c91601bce8 100644 --- a/view/templates/profile-in-netdir.tpl +++ b/view/templates/profile-in-netdir.tpl @@ -1,6 +1,6 @@

    -{{$desc}} +{{$desc nofilter}}

    diff --git a/view/templates/profile_advanced.tpl b/view/templates/profile_advanced.tpl index 19d4490eaf..f3411b0f18 100644 --- a/view/templates/profile_advanced.tpl +++ b/view/templates/profile_advanced.tpl @@ -58,7 +58,7 @@ {{if $profile.homepage}}
    {{$profile.homepage.0}}
    -
    {{$profile.homepage.1}}
    +
    {{$profile.homepage.1 nofilter}}
    {{/if}} diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl index 1e1771ef43..08e833f10a 100644 --- a/view/templates/profile_edit.tpl +++ b/view/templates/profile_edit.tpl @@ -1,5 +1,5 @@ -{{$default}} +{{$default nofilter}}

    {{$banner}}

    @@ -44,16 +44,16 @@
    -{{$gender}} +{{$gender nofilter}}
    -{{$dob}} +{{$dob nofilter}}
    -{{$hide_friends}} +{{$hide_friends nofilter}}
    @@ -110,8 +110,8 @@
    - -{{$marital}} + +{{$marital nofilter}}
    @@ -122,7 +122,7 @@
    -{{$sexual}} +{{$sexual nofilter}}
    @@ -343,12 +343,12 @@ {{if $personal_account}}
    -{{$gender}} +{{$gender nofilter}}
    -{{$dob}} +{{$dob nofilter}}
    {{/if}} @@ -366,7 +366,7 @@
    -{{$hide_friends}} +{{$hide_friends nofilter}}
    diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl index b56dd607ce..f10a21ca6c 100644 --- a/view/templates/profile_vcard.tpl +++ b/view/templates/profile_vcard.tpl @@ -13,7 +13,7 @@
    {{$profile.name}}
    {{/if}} {{if $account_type}}{{/if}} - {{if $profile.network_name}}
    {{$network}}
    {{$profile.network_name}}
    {{/if}} + {{if $profile.network_name}}
    {{$network}}
    {{$profile.network_name nofilter}}
    {{/if}} {{if $location}}
    {{$location}}
    @@ -47,7 +47,7 @@ {{if $homepage}}
    {{$homepage}}
    {{$profile.homepage}}
    {{/if}} - {{if $about}}
    {{$about}}
    {{$profile.about}}
    {{/if}} + {{if $about}}
    {{$about}}
    {{$profile.about nofilter}}
    {{/if}} {{include file="diaspora_vcard.tpl"}} @@ -70,6 +70,6 @@
    -{{$contact_block}} +{{$contact_block nofilter}} diff --git a/view/templates/prv_message.tpl b/view/templates/prv_message.tpl index d419d4d9b3..f3500e8896 100644 --- a/view/templates/prv_message.tpl +++ b/view/templates/prv_message.tpl @@ -5,7 +5,7 @@
    -{{$parent}} +{{$parent nofilter}}
    {{$to}}
    {{$select}} diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl index 354c8e46a2..4ae682f436 100644 --- a/view/templates/remote_friends_common.tpl +++ b/view/templates/remote_friends_common.tpl @@ -1,6 +1,6 @@
    -
    {{$desc}}      {{if $linkmore}}{{$more}}{{/if}}
    +
    {{$desc nofilter}}      {{if $linkmore}}{{$more}}{{/if}}
    {{if $items}} {{foreach $items as $item}}
    diff --git a/view/templates/removeme.tpl b/view/templates/removeme.tpl index 4148f94e5f..1e52bfa4e5 100644 --- a/view/templates/removeme.tpl +++ b/view/templates/removeme.tpl @@ -3,7 +3,7 @@
    -
    {{$desc}}
    +
    {{$desc nofilter}}
    diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl index fbcf770f1b..3467a81171 100644 --- a/view/templates/search_item.tpl +++ b/view/templates/search_item.tpl @@ -30,7 +30,7 @@
    {{$item.title}}
    -
    {{$item.body}}
    +
    {{$item.body nofilter}}
    {{if $item.has_cats}}
    {{$item.txt_cats}} {{foreach $item.categories as $cat}}{{$cat.name}}{{if $cat.removeurl}} [{{$remove}}]{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
    diff --git a/view/templates/settings/addons.tpl b/view/templates/settings/addons.tpl index 32ec5a0484..567ac81b7f 100644 --- a/view/templates/settings/addons.tpl +++ b/view/templates/settings/addons.tpl @@ -5,7 +5,7 @@ -{{$settings_addons}} +{{$settings_addons nofilter}} diff --git a/view/templates/settings/connectors.tpl b/view/templates/settings/connectors.tpl index 9dd5d0b1ab..e275e68ce3 100644 --- a/view/templates/settings/connectors.tpl +++ b/view/templates/settings/connectors.tpl @@ -14,7 +14,7 @@ {{include file="field_checkbox.tpl" field=$disable_cw}} {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}} {{include file="field_checkbox.tpl" field=$ostatus_autofriend}} - {{$default_group}} + {{$default_group nofilter}} {{include file="field_input.tpl" field=$legacy_contact}}

    {{$repair_ostatus_text}}

    @@ -23,7 +23,7 @@
    -{{$settings_connectors}} +{{$settings_connectors nofilter}} {{if $mail_disabled}} @@ -35,7 +35,7 @@

    {{$h_imap}}

     -

    {{$imap_desc}}

    +

    {{$imap_desc nofilter}}

    {{include file="field_custom.tpl" field=$imap_lastcheck}} {{include file="field_input.tpl" field=$mail_server}} {{include file="field_input.tpl" field=$mail_port}} diff --git a/view/templates/settings/display.tpl b/view/templates/settings/display.tpl index 951609e1bf..4b769d421b 100644 --- a/view/templates/settings/display.tpl +++ b/view/templates/settings/display.tpl @@ -31,7 +31,7 @@ {{if $theme_config}}

    {{$stitle}}

    -{{$theme_config}} +{{$theme_config nofilter}} {{/if}} diff --git a/view/templates/settings/nick_set.tpl b/view/templates/settings/nick_set.tpl index 8decc2dd4f..a6dc4d74ca 100644 --- a/view/templates/settings/nick_set.tpl +++ b/view/templates/settings/nick_set.tpl @@ -1,6 +1,5 @@ - -
    -
    {{$desc}}
    +
    +
    {{$desc nofilter}}
    diff --git a/view/templates/settings/settings.tpl b/view/templates/settings/settings.tpl index 2fa22973e0..8914b9ef0e 100644 --- a/view/templates/settings/settings.tpl +++ b/view/templates/settings/settings.tpl @@ -1,6 +1,6 @@

    {{$ptitle}}

    -{{$nickname_block}} +{{$nickname_block nofilter}}
    @@ -45,21 +45,21 @@ {{include file="field_input.tpl" field=$maxreq}} -{{$profile_in_dir}} +{{$profile_in_dir nofilter}} -{{$profile_in_net_dir}} +{{$profile_in_net_dir nofilter}} -{{$hide_friends}} +{{$hide_friends nofilter}} -{{$hide_wall}} +{{$hide_wall nofilter}} -{{$blockwall}} +{{$blockwall nofilter}} -{{$blocktags}} +{{$blocktags nofilter}} -{{$suggestme}} +{{$suggestme nofilter}} -{{$unkmail}} +{{$unkmail nofilter}} {{include file="field_input.tpl" field=$cntunkmail}} @@ -90,7 +90,7 @@
    - {{$aclselect}} + {{$aclselect nofilter}}
    @@ -99,7 +99,7 @@
    -{{$group_select}} +{{$group_select nofilter}}
    @@ -196,7 +196,7 @@
    {{$h_descadvn}}
    -{{$pagetype}} +{{$pagetype nofilter}}
    diff --git a/view/templates/shared_content.tpl b/view/templates/shared_content.tpl index ee78f842c0..2e892d334b 100644 --- a/view/templates/shared_content.tpl +++ b/view/templates/shared_content.tpl @@ -8,5 +8,5 @@
    {{$posted}}
    -
    {{$content}}
    +
    {{$content nofilter}}
    diff --git a/view/templates/tag_slap.tpl b/view/templates/tag_slap.tpl index b88a9f236d..ac492b6ddd 100644 --- a/view/templates/tag_slap.tpl +++ b/view/templates/tag_slap.tpl @@ -10,7 +10,7 @@ {{$item_id}} {{$title}} {{$published}} - {{$content}} + {{$content nofilter}} http://activitystrea.ms/schema/1.0/person diff --git a/view/templates/threaded_conversation.tpl b/view/templates/threaded_conversation.tpl index 6a230142ba..d993c6b33b 100644 --- a/view/templates/threaded_conversation.tpl +++ b/view/templates/threaded_conversation.tpl @@ -1,5 +1,5 @@ -{{$live_update}} +{{$live_update nofilter}} {{foreach $threads as $thread}} {{include file="{{$thread.template}}" item=$thread}} diff --git a/view/templates/tos.tpl b/view/templates/tos.tpl index 8692c7e940..b0a48406c2 100644 --- a/view/templates/tos.tpl +++ b/view/templates/tos.tpl @@ -1,11 +1,11 @@

    {{$title}}

    -{{$tostext}} +{{$tostext nofilter}} {{if $displayprivstatement}} -

    {{$privstatementtitle}}

    -

    {{$privacy_operate}}

    -

    {{$privacy_distribute}}

    -

    {{$privacy_delete}}

    +

    {{$privstatementtitle nofilter}}

    +

    {{$privacy_operate nofilter}}

    +

    {{$privacy_distribute nofilter}}

    +

    {{$privacy_delete nofilter}}

    {{/if}} diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl index 3ea277a42b..562270e352 100644 --- a/view/templates/viewcontact_template.tpl +++ b/view/templates/viewcontact_template.tpl @@ -1,7 +1,7 @@ {{include file="section_title.tpl"}} -{{$tab_str}} +{{$tab_str nofilter}}
    {{foreach $contacts as $contact}} @@ -11,4 +11,4 @@
    -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/templates/voting_fakelink.tpl b/view/templates/voting_fakelink.tpl index f0d7a5d89d..e3e19be514 100644 --- a/view/templates/voting_fakelink.tpl +++ b/view/templates/voting_fakelink.tpl @@ -1,2 +1,2 @@ -{{$phrase}} +{{$phrase nofilter}} diff --git a/view/templates/wall/content_filter.tpl b/view/templates/wall/content_filter.tpl index 37e5a8a4c8..60cfe7df74 100644 --- a/view/templates/wall/content_filter.tpl +++ b/view/templates/wall/content_filter.tpl @@ -18,5 +18,5 @@

    {{/if}} diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index 73aad3d9aa..05185c32c3 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -50,7 +50,7 @@
    {{$item.title}}
    -
    {{$item.body}} +
    {{$item.body nofilter}}
    {{if !$item.suppress_tags}} {{foreach $item.tags as $tag}} @@ -117,7 +117,7 @@ {{if $item.threaded}} {{if $item.comment}}
    - {{$item.comment}} + {{$item.comment nofilter}}
    {{/if}} {{/if}} @@ -130,7 +130,7 @@ {{if $item.flatten}}
    - {{$item.comment}} + {{$item.comment nofilter}}
    {{/if}}
    diff --git a/view/templates/wallmessage.tpl b/view/templates/wallmessage.tpl index 579ee0a31e..e89cf7952b 100644 --- a/view/templates/wallmessage.tpl +++ b/view/templates/wallmessage.tpl @@ -7,7 +7,7 @@
    -{{$parent}} +{{$parent nofilter}}
    {{$to}}
    {{$recipname}} diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl index 186b7e4490..5027507943 100644 --- a/view/theme/duepuntozero/templates/profile_vcard.tpl +++ b/view/theme/duepuntozero/templates/profile_vcard.tpl @@ -10,7 +10,7 @@ {{if $account_type}}{{/if}} - {{if $profile.network_name}}
    {{$network}}
    {{$profile.network_name}}
    {{/if}} + {{if $profile.network_name}}
    {{$network}}
    {{$profile.network_name nofilter}}
    {{/if}} {{if $location}}
    {{$location}}
    @@ -56,6 +56,6 @@
    -{{$contact_block}} +{{$contact_block nofilter}} diff --git a/view/theme/duepuntozero/templates/prv_message.tpl b/view/theme/duepuntozero/templates/prv_message.tpl index 093e5239ff..6e6bda45d2 100644 --- a/view/theme/duepuntozero/templates/prv_message.tpl +++ b/view/theme/duepuntozero/templates/prv_message.tpl @@ -5,7 +5,7 @@
    -{{$parent}} +{{$parent nofilter}}
    {{$to}}
    diff --git a/view/theme/frio/templates/admin/contactblock.tpl b/view/theme/frio/templates/admin/contactblock.tpl index 4b3a2ae4bb..e79ba65c52 100644 --- a/view/theme/frio/templates/admin/contactblock.tpl +++ b/view/theme/frio/templates/admin/contactblock.tpl @@ -93,7 +93,7 @@ - {{$paginate}} + {{$paginate nofilter}} {{else}}

    {{$no_data}}

    diff --git a/view/theme/frio/templates/contact_block.tpl b/view/theme/frio/templates/contact_block.tpl index 45b582a6ff..0ae6479790 100644 --- a/view/theme/frio/templates/contact_block.tpl +++ b/view/theme/frio/templates/contact_block.tpl @@ -10,7 +10,7 @@
    {{foreach $micropro as $m}} - {{$m}} + {{$m nofilter}} {{/foreach}}
    {{/if}} diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl index 759f759674..b0d201af63 100644 --- a/view/theme/frio/templates/contact_edit.tpl +++ b/view/theme/frio/templates/contact_edit.tpl @@ -5,7 +5,7 @@
    {{* Insert Tab-Nav *}} - {{$tab_str}} + {{$tab_str nofilter}}
    @@ -113,8 +113,8 @@ {{if $about}}
    -
    {{$about}}
    {{$about_label}}
    +
    {{$about nofilter}}
    {{/if}}
    diff --git a/view/theme/frio/templates/contacts-template.tpl b/view/theme/frio/templates/contacts-template.tpl index 2fbb220446..37821a5870 100644 --- a/view/theme/frio/templates/contacts-template.tpl +++ b/view/theme/frio/templates/contacts-template.tpl @@ -3,7 +3,7 @@ var dropContact = "{{$contact_drop_confirm}}"; -{{$tabs}} +{{$tabs nofilter}}
    @@ -61,5 +61,5 @@
    - {{$paginate}} + {{$paginate nofilter}}
    diff --git a/view/theme/frio/templates/crepair.tpl b/view/theme/frio/templates/crepair.tpl index ec1b7b63fd..6695682e0b 100644 --- a/view/theme/frio/templates/crepair.tpl +++ b/view/theme/frio/templates/crepair.tpl @@ -2,11 +2,11 @@
    {{include file="section_title.tpl"}} - {{$tab_str}} + {{$tab_str nofilter}} -
    {{$warning}}

    +
    {{$warning nofilter}}

    - {{$info}}
    + {{$info nofilter}}

    diff --git a/view/theme/frio/templates/directory_header.tpl b/view/theme/frio/templates/directory_header.tpl index 9ce554a084..98ec3f5e2f 100644 --- a/view/theme/frio/templates/directory_header.tpl +++ b/view/theme/frio/templates/directory_header.tpl @@ -37,4 +37,4 @@
    -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/theme/frio/templates/event_stream_item.tpl b/view/theme/frio/templates/event_stream_item.tpl index 87c2e70cad..2b59e61c0b 100644 --- a/view/theme/frio/templates/event_stream_item.tpl +++ b/view/theme/frio/templates/event_stream_item.tpl @@ -22,7 +22,7 @@ {{if $location.name}} - {{$location.name}} + {{$location.name nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/events_js.tpl b/view/theme/frio/templates/events_js.tpl index a4ca9004cd..f233866f0b 100644 --- a/view/theme/frio/templates/events_js.tpl +++ b/view/theme/frio/templates/events_js.tpl @@ -1,5 +1,5 @@
    - {{$tabs}} + {{$tabs nofilter}} {{include file="section_title.tpl" title=$title pullright=1}} {{* The link to create a new event *}} diff --git a/view/theme/frio/templates/field_checkbox.tpl b/view/theme/frio/templates/field_checkbox.tpl index 1fde3634ab..5dc8916666 100644 --- a/view/theme/frio/templates/field_checkbox.tpl +++ b/view/theme/frio/templates/field_checkbox.tpl @@ -5,7 +5,7 @@
    diff --git a/view/theme/frio/templates/field_colorinput.tpl b/view/theme/frio/templates/field_colorinput.tpl index 704db346d2..a7dc404e7b 100644 --- a/view/theme/frio/templates/field_colorinput.tpl +++ b/view/theme/frio/templates/field_colorinput.tpl @@ -7,7 +7,7 @@
    {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_custom.tpl b/view/theme/frio/templates/field_custom.tpl index 158073a64e..5b5c907791 100644 --- a/view/theme/frio/templates/field_custom.tpl +++ b/view/theme/frio/templates/field_custom.tpl @@ -1,8 +1,8 @@
    - {{$field.2}} + {{$field.2 nofilter}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_fileinput.tpl b/view/theme/frio/templates/field_fileinput.tpl index c5f8ac86d2..8c644b3469 100644 --- a/view/theme/frio/templates/field_fileinput.tpl +++ b/view/theme/frio/templates/field_fileinput.tpl @@ -7,7 +7,7 @@
    {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl index 9afad8c75f..5b2beb3ac2 100644 --- a/view/theme/frio/templates/field_input.tpl +++ b/view/theme/frio/templates/field_input.tpl @@ -5,7 +5,7 @@ {{/if}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_intcheckbox.tpl b/view/theme/frio/templates/field_intcheckbox.tpl index 3944f8b7f7..18a2ea6ca5 100644 --- a/view/theme/frio/templates/field_intcheckbox.tpl +++ b/view/theme/frio/templates/field_intcheckbox.tpl @@ -3,7 +3,7 @@ {{if $field.4}} - {{$field.4}} + {{$field.4 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_openid.tpl b/view/theme/frio/templates/field_openid.tpl index 6387903f5d..b2923302fa 100644 --- a/view/theme/frio/templates/field_openid.tpl +++ b/view/theme/frio/templates/field_openid.tpl @@ -3,7 +3,7 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_password.tpl b/view/theme/frio/templates/field_password.tpl index 9591df5bc8..b3931b58ae 100644 --- a/view/theme/frio/templates/field_password.tpl +++ b/view/theme/frio/templates/field_password.tpl @@ -3,7 +3,7 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_radio.tpl b/view/theme/frio/templates/field_radio.tpl index 725e1c96af..35f99c9d61 100644 --- a/view/theme/frio/templates/field_radio.tpl +++ b/view/theme/frio/templates/field_radio.tpl @@ -5,7 +5,7 @@
    diff --git a/view/theme/frio/templates/field_select.tpl b/view/theme/frio/templates/field_select.tpl index 51eaa278c1..2a609ed71d 100644 --- a/view/theme/frio/templates/field_select.tpl +++ b/view/theme/frio/templates/field_select.tpl @@ -5,6 +5,6 @@ {{foreach $field.4 as $opt=>$val}}{{/foreach}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_select_raw.tpl b/view/theme/frio/templates/field_select_raw.tpl index 52b63079c1..bbd8368f26 100644 --- a/view/theme/frio/templates/field_select_raw.tpl +++ b/view/theme/frio/templates/field_select_raw.tpl @@ -2,9 +2,9 @@
    {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_textarea.tpl b/view/theme/frio/templates/field_textarea.tpl index 1aea484de7..baf2e84487 100644 --- a/view/theme/frio/templates/field_textarea.tpl +++ b/view/theme/frio/templates/field_textarea.tpl @@ -3,7 +3,7 @@ {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/field_themeselect.tpl b/view/theme/frio/templates/field_themeselect.tpl index fc1f7243af..78c179436b 100644 --- a/view/theme/frio/templates/field_themeselect.tpl +++ b/view/theme/frio/templates/field_themeselect.tpl @@ -6,7 +6,7 @@ {{foreach $field.4 as $opt=>$val}}{{/foreach}} {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}} {{if $field.5=="preview"}}
    {{/if}}
    diff --git a/view/theme/frio/templates/field_yesno.tpl b/view/theme/frio/templates/field_yesno.tpl index 945914fcef..1b9ab61655 100644 --- a/view/theme/frio/templates/field_yesno.tpl +++ b/view/theme/frio/templates/field_yesno.tpl @@ -15,7 +15,7 @@
    {{if $field.3}} - {{$field.3}} + {{$field.3 nofilter}} {{/if}}
    diff --git a/view/theme/frio/templates/fileas_widget.tpl b/view/theme/frio/templates/fileas_widget.tpl index a4645841f1..b7d867e82a 100644 --- a/view/theme/frio/templates/fileas_widget.tpl +++ b/view/theme/frio/templates/fileas_widget.tpl @@ -1,7 +1,7 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    • {{$all}}
      • diff --git a/view/theme/frio/templates/follow.tpl b/view/theme/frio/templates/follow.tpl index b4faecad23..fadd0a6dfb 100644 --- a/view/theme/frio/templates/follow.tpl +++ b/view/theme/frio/templates/follow.tpl @@ -3,7 +3,7 @@

      {{$connect}}

      - + {{* The input field - For visual consistence we are using a search input field*}}
      diff --git a/view/theme/frio/templates/generic_links_widget.tpl b/view/theme/frio/templates/generic_links_widget.tpl index 5510eae917..e03e46fe1a 100644 --- a/view/theme/frio/templates/generic_links_widget.tpl +++ b/view/theme/frio/templates/generic_links_widget.tpl @@ -1,7 +1,7 @@
      {{if $title}}

      {{$title}}

      {{/if}} - {{if $desc}}
      {{$desc}}
      {{/if}} + {{if $desc}}
      {{$desc nofilter}}
      {{/if}}
        {{foreach $items as $item}} diff --git a/view/theme/frio/templates/home.tpl b/view/theme/frio/templates/home.tpl index dd53a1eae4..ac1cc37be1 100644 --- a/view/theme/frio/templates/home.tpl +++ b/view/theme/frio/templates/home.tpl @@ -5,7 +5,7 @@
        diff --git a/view/theme/frio/templates/intros.tpl b/view/theme/frio/templates/intros.tpl index 126494b920..39ec14da32 100644 --- a/view/theme/frio/templates/intros.tpl +++ b/view/theme/frio/templates/intros.tpl @@ -30,7 +30,7 @@ {{if $location}}
        {{$lbl_location}} {{$location}}
        {{/if}} {{if $gender}}
        {{$lbl_gender}} {{$gender}}
        {{/if}} {{if $keywords}}
        {{$lbl_keywords}} {{$keywords}}
        {{/if}} - {{if $about}}
        {{$lbl_about}} {{$about}}
        {{/if}} + {{if $about}}
        {{$lbl_about}} {{$about nofilter}}
        {{/if}}
        {{$lbl_knowyou}}{{$knowyou}}
        {{$note}}
      @@ -42,7 +42,7 @@ {{if $location}}
      {{$lbl_location}}{{$location}}
      {{/if}} {{if $gender}}
      {{$lbl_gender}}{{$gender}}
      {{/if}} {{if $keywords}}
      {{$lbl_keywords}}{{$keywords}}
      {{/if}} - {{if $about}}
      {{$lbl_about}}{{$about}}
      {{/if}} + {{if $about}}
      {{$lbl_about}}{{$about nofilter}}
      {{/if}}
      {{$lbl_knowyou}}{{$knowyou}}
      {{$note}}
      diff --git a/view/theme/frio/templates/jot.tpl b/view/theme/frio/templates/jot.tpl index b5c061b75c..664a918e4e 100644 --- a/view/theme/frio/templates/jot.tpl +++ b/view/theme/frio/templates/jot.tpl @@ -89,7 +89,7 @@ {{* The jot text field in which the post text is inserted *}}
      - +
    diff --git a/view/theme/frio/templates/photo_album.tpl b/view/theme/frio/templates/photo_album.tpl index 235b9c46db..a34e8ea861 100644 --- a/view/theme/frio/templates/photo_album.tpl +++ b/view/theme/frio/templates/photo_album.tpl @@ -37,7 +37,7 @@
    - {{$paginate}} + {{$paginate nofilter}}
    diff --git a/view/theme/frio/templates/photo_view.tpl b/view/theme/frio/templates/photo_view.tpl index 7dc2db901e..1d39b16eef 100644 --- a/view/theme/frio/templates/photo_view.tpl +++ b/view/theme/frio/templates/photo_view.tpl @@ -47,7 +47,7 @@
    {{* The photo description *}} -
    {{$desc}}
    +
    {{$desc nofilter}}
    {{* Tags and mentions *}} {{if $tags}} @@ -85,5 +85,5 @@ {{$comments}} - {{$paginate}} + {{$paginate nofilter}} diff --git a/view/theme/frio/templates/photos_upload.tpl b/view/theme/frio/templates/photos_upload.tpl index f02246c5c7..ae596d8bd3 100644 --- a/view/theme/frio/templates/photos_upload.tpl +++ b/view/theme/frio/templates/photos_upload.tpl @@ -63,7 +63,7 @@
    - {{$aclselect}} + {{$aclselect nofilter}}
    diff --git a/view/theme/frio/templates/poke_content.tpl b/view/theme/frio/templates/poke_content.tpl index f68b053b5a..b015c4447f 100644 --- a/view/theme/frio/templates/poke_content.tpl +++ b/view/theme/frio/templates/poke_content.tpl @@ -2,7 +2,7 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    diff --git a/view/theme/frio/templates/profile_advanced.tpl b/view/theme/frio/templates/profile_advanced.tpl index 256a4138a4..2e3590c416 100644 --- a/view/theme/frio/templates/profile_advanced.tpl +++ b/view/theme/frio/templates/profile_advanced.tpl @@ -82,7 +82,7 @@
    {{$profile.homepage.0}}
    -
    {{$profile.homepage.1}}
    +
    {{$profile.homepage.1 nofilter}}
    {{/if}} diff --git a/view/theme/frio/templates/profile_edit.tpl b/view/theme/frio/templates/profile_edit.tpl index 63b1c90164..946443cf11 100644 --- a/view/theme/frio/templates/profile_edit.tpl +++ b/view/theme/frio/templates/profile_edit.tpl @@ -65,7 +65,7 @@ {{* Some hints to characteristics of the current profile (if available) *}} {{if $is_default}} -
    {{$default}}
    +
    {{$default nofilter}}
    {{/if}} {{* friendica differs in $detailled_profile (all fields available and a short Version if this is variable false *}} @@ -91,16 +91,15 @@ {{include file="field_input.tpl" field=$pdesc}} -
    - {{$gender}} + {{$gender nofilter}}
    - {{$dob}} + {{$dob nofilter}} - {{$hide_friends}} + {{$hide_friends nofilter}}
    @@ -168,8 +167,8 @@
    - - {{$marital.selector}} + + {{$marital.selector nofilter}}
    @@ -179,7 +178,7 @@
    - {{$sexual.selector}} + {{$sexual.selector nofilter}}
    @@ -261,11 +260,11 @@ {{if $personal_account}}
    - {{$gender}} + {{$gender nofilter}}
    - {{$dob}} + {{$dob nofilter}} {{/if}} @@ -273,7 +272,7 @@ {{include file="field_input.tpl" field=$xmpp}} - {{$hide_friends}} + {{$hide_friends nofilter}} {{include file="field_input.tpl" field=$address}} diff --git a/view/theme/frio/templates/profile_vcard.tpl b/view/theme/frio/templates/profile_vcard.tpl index 1c01be398f..0649f8a551 100644 --- a/view/theme/frio/templates/profile_vcard.tpl +++ b/view/theme/frio/templates/profile_vcard.tpl @@ -129,6 +129,6 @@ {{if $contact_block}}
    - {{$contact_block}} + {{$contact_block nofilter}}
    {{/if}} diff --git a/view/theme/frio/templates/prv_message.tpl b/view/theme/frio/templates/prv_message.tpl index c6bc59d3a3..f59b9e33fa 100644 --- a/view/theme/frio/templates/prv_message.tpl +++ b/view/theme/frio/templates/prv_message.tpl @@ -6,7 +6,7 @@

    {{$header}}

    *}} - {{$parent}} + {{$parent nofilter}} {{* The To: form-group which contains the message recipient *}}
    diff --git a/view/theme/frio/templates/removeme.tpl b/view/theme/frio/templates/removeme.tpl index 52d76acdcf..2410363d5e 100644 --- a/view/theme/frio/templates/removeme.tpl +++ b/view/theme/frio/templates/removeme.tpl @@ -3,7 +3,7 @@ {{include file="section_title.tpl" title=$title }}
    -
    {{$desc}}
    +
    {{$desc nofilter}}
    diff --git a/view/theme/frio/templates/search_item.tpl b/view/theme/frio/templates/search_item.tpl index c6aa9536e6..842698e16e 100644 --- a/view/theme/frio/templates/search_item.tpl +++ b/view/theme/frio/templates/search_item.tpl @@ -132,7 +132,7 @@

    {{$item.title}}


     {{/if}} -
    {{$item.body}}
    +
    {{$item.body nofilter}}
    @@ -231,7 +231,7 @@ {{if $item.responses}}
    {{foreach $item.responses as $verb=>$response}} -
    {{$response.output}}
    +
    {{$response.output nofilter}}
    {{/foreach}}
    {{/if}} diff --git a/view/theme/frio/templates/settings/addons.tpl b/view/theme/frio/templates/settings/addons.tpl index e8824b91a4..b14552381d 100644 --- a/view/theme/frio/templates/settings/addons.tpl +++ b/view/theme/frio/templates/settings/addons.tpl @@ -3,9 +3,9 @@ {{include file="section_title.tpl" title=$title}} - + - {{$settings_addons}} + {{$settings_addons nofilter}} diff --git a/view/theme/frio/templates/settings/connectors.tpl b/view/theme/frio/templates/settings/connectors.tpl index c234132f9a..bf8de450c4 100644 --- a/view/theme/frio/templates/settings/connectors.tpl +++ b/view/theme/frio/templates/settings/connectors.tpl @@ -21,9 +21,13 @@
    {{include file="field_checkbox.tpl" field=$disable_cw}} + {{include file="field_checkbox.tpl" field=$no_intelligent_shortening}} + {{include file="field_checkbox.tpl" field=$ostatus_autofriend}} - {{$default_group}} + + {{$default_group nofilter}} + {{include file="field_input.tpl" field=$legacy_contact}}

    {{$repair_ostatus_text}}

    @@ -37,29 +41,28 @@
    - {{$settings_connectors}} + {{$settings_connectors nofilter}} -{{if $mail_disabled}} - -{{else}} +{{if !$mail_disabled}}

    {{$h_imap}}

     @@ -147,8 +145,7 @@
    - {{$group_select}} - + {{$group_select nofilter}}
    @@ -262,7 +259,7 @@
    {{$h_descadvn}}
    - {{$pagetype}} + {{$pagetype nofilter}}
    diff --git a/view/theme/frio/templates/threaded_conversation.tpl b/view/theme/frio/templates/threaded_conversation.tpl index fc0e2558d7..f8e2222902 100644 --- a/view/theme/frio/templates/threaded_conversation.tpl +++ b/view/theme/frio/templates/threaded_conversation.tpl @@ -1,7 +1,7 @@ {{if $mode == display}}{{/if}} -{{$live_update}} +{{$live_update nofilter}} {{foreach $threads as $thread}}
    diff --git a/view/theme/frio/templates/vcard-widget.tpl b/view/theme/frio/templates/vcard-widget.tpl index 0115abd887..f65db725b2 100644 --- a/view/theme/frio/templates/vcard-widget.tpl +++ b/view/theme/frio/templates/vcard-widget.tpl @@ -32,7 +32,7 @@ {{if $account_type}}{{/if}} - {{if $network_name}}
    {{$network}}
    {{$network_name}}
    {{/if}} + {{if $network_name}}
    {{$network}}
    {{$network_name nofilter}}
    {{/if}}
    diff --git a/view/theme/frio/templates/viewcontact_template.tpl b/view/theme/frio/templates/viewcontact_template.tpl index 4af3a9c28a..90f286558d 100644 --- a/view/theme/frio/templates/viewcontact_template.tpl +++ b/view/theme/frio/templates/viewcontact_template.tpl @@ -4,7 +4,7 @@ at the suggest page and also at many other places *}} {{include file="section_title.tpl"}} -{{$tab_str}} +{{$tab_str nofilter}}
      {{foreach $contacts as $contact}} @@ -14,4 +14,4 @@ at the suggest page and also at many other places *}}
      -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/theme/frio/templates/wall_thread.tpl b/view/theme/frio/templates/wall_thread.tpl index c46fc339dd..0ecceab0f1 100644 --- a/view/theme/frio/templates/wall_thread.tpl +++ b/view/theme/frio/templates/wall_thread.tpl @@ -255,7 +255,7 @@ as the value of $top_child_total (this is done at the end of this file)

      {{$item.title}}


       {{/if}} -
      {{$item.body}}
      +
      {{$item.body nofilter}}
    @@ -356,7 +356,7 @@ as the value of $top_child_total (this is done at the end of this file) {{if $item.responses}}
    {{foreach $item.responses as $verb=>$response}} -
    {{$response.output}}
    +
    {{$response.output nofilter}}
    {{/foreach}}
    {{/if}} @@ -370,7 +370,7 @@ as the value of $top_child_total (this is done at the end of this file) {{* Insert comment box of threaded children *}} {{if $item.threaded}}{{if $item.comment}}{{if $item.indent==comment}} {{/if}}{{/if}}{{/if}} @@ -391,19 +391,19 @@ as the value of $top_child_total (this is done at the end of this file) case it could be opend with the "comment" button *}} {{if $item.total_comments_num}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} {{if $item.flatten}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}} {{else}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} - + {{/if}}{{/if}}{{/if}} {{if $item.flatten}} - + {{/if}} {{/if}}
    diff --git a/view/theme/quattro/templates/conversation.tpl b/view/theme/quattro/templates/conversation.tpl index 9e19fdfe13..ce89d579ea 100644 --- a/view/theme/quattro/templates/conversation.tpl +++ b/view/theme/quattro/templates/conversation.tpl @@ -1,4 +1,4 @@ -{{$live_update}} +{{$live_update nofilter}} {{foreach $threads as $thread}}
    diff --git a/view/theme/quattro/templates/event_form.tpl b/view/theme/quattro/templates/event_form.tpl index 0b6540ffac..ff36282f2e 100644 --- a/view/theme/quattro/templates/event_form.tpl +++ b/view/theme/quattro/templates/event_form.tpl @@ -1,7 +1,7 @@

    {{$title}}

    -

    {{$desc}}

    +

    {{$desc nofilter}}

    diff --git a/view/theme/quattro/templates/events-js.tpl b/view/theme/quattro/templates/events-js.tpl index ec8aa586cc..bfe446f9fd 100644 --- a/view/theme/quattro/templates/events-js.tpl +++ b/view/theme/quattro/templates/events-js.tpl @@ -1,5 +1,5 @@ -{{$tabs}} +{{$tabs nofilter}}

    {{$title}} {{$new_event.1}}

    diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl index 0495b983cf..0428ff8d90 100644 --- a/view/theme/quattro/templates/events.tpl +++ b/view/theme/quattro/templates/events.tpl @@ -1,4 +1,4 @@ -{{$tabs}} +{{$tabs nofilter}}

    {{$title}} {{$new_event.1}}

    diff --git a/view/theme/quattro/templates/fileas_widget.tpl b/view/theme/quattro/templates/fileas_widget.tpl index 23d001d462..7946e8f833 100644 --- a/view/theme/quattro/templates/fileas_widget.tpl +++ b/view/theme/quattro/templates/fileas_widget.tpl @@ -1,6 +1,6 @@

    {{$title}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    • {{$all}}
      • diff --git a/view/theme/quattro/templates/generic_links_widget.tpl b/view/theme/quattro/templates/generic_links_widget.tpl index 1a26c9741d..999f3c29c8 100644 --- a/view/theme/quattro/templates/generic_links_widget.tpl +++ b/view/theme/quattro/templates/generic_links_widget.tpl @@ -1,6 +1,6 @@
      {{if $title}}

      {{$title}}

      {{/if}} - {{if $desc}}
      {{$desc}}
      {{/if}} + {{if $desc}}
      {{$desc nofilter}}
      {{/if}}
        {{foreach $items as $item}} diff --git a/view/theme/quattro/templates/jot.tpl b/view/theme/quattro/templates/jot.tpl index bdf21b8f74..3919b7466b 100644 --- a/view/theme/quattro/templates/jot.tpl +++ b/view/theme/quattro/templates/jot.tpl @@ -19,7 +19,7 @@ {{/if}} - +
      -{{$contact_block}} +{{$contact_block nofilter}} diff --git a/view/theme/quattro/templates/prv_message.tpl b/view/theme/quattro/templates/prv_message.tpl index 45ba137439..c6ca95cbdf 100644 --- a/view/theme/quattro/templates/prv_message.tpl +++ b/view/theme/quattro/templates/prv_message.tpl @@ -3,7 +3,7 @@
      -{{$parent}} +{{$parent nofilter}}
      {{$to}}
      {{if $showinputs}} diff --git a/view/theme/quattro/templates/search_item.tpl b/view/theme/quattro/templates/search_item.tpl index 333924d4ad..316398142d 100644 --- a/view/theme/quattro/templates/search_item.tpl +++ b/view/theme/quattro/templates/search_item.tpl @@ -22,8 +22,8 @@
      {{$item.location}}
      -
      {{$item.body}}
      {{if $item.title}}

      {{$item.title}}

      {{/if}} +
      {{$item.body nofilter}}
    @@ -80,8 +80,8 @@
    - -
    {{$item.dislike}}
    + +
    {{$item.dislike nofilter}}
    {{if $item.conv}}
    {{$item.conv.title}} diff --git a/view/theme/quattro/templates/threaded_conversation.tpl b/view/theme/quattro/templates/threaded_conversation.tpl index a257a29043..0d90db1860 100644 --- a/view/theme/quattro/templates/threaded_conversation.tpl +++ b/view/theme/quattro/templates/threaded_conversation.tpl @@ -1,4 +1,4 @@ -{{$live_update}} +{{$live_update nofilter}} {{foreach $threads as $thread}} diff --git a/view/theme/quattro/templates/wall_item_tag.tpl b/view/theme/quattro/templates/wall_item_tag.tpl index efcb528881..d9dbd1ae2e 100644 --- a/view/theme/quattro/templates/wall_item_tag.tpl +++ b/view/theme/quattro/templates/wall_item_tag.tpl @@ -37,7 +37,7 @@
    {{$item.location}}
    - {{$item.ago}} {{$item.body}} + {{$item.ago}} {{$item.body nofilter}}
    {{if $item.drop.pagedrop}} @@ -59,9 +59,9 @@ {{* top thread comment box *}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} {{if $item.flatten}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}} diff --git a/view/theme/quattro/templates/wall_thread.tpl b/view/theme/quattro/templates/wall_thread.tpl index ee0499c476..caacac9100 100644 --- a/view/theme/quattro/templates/wall_thread.tpl +++ b/view/theme/quattro/templates/wall_thread.tpl @@ -59,8 +59,8 @@
    {{$item.location}}
    - {{$item.body}} {{if $item.title}}

    {{$item.title}}

    {{/if}} + {{$item.body nofilter}}
    @@ -162,7 +162,7 @@
    - {{$item.comment}} + {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} @@ -187,10 +187,10 @@ {{* top thread comment box *}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} {{if $item.flatten}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}} diff --git a/view/theme/smoothly/templates/follow.tpl b/view/theme/smoothly/templates/follow.tpl index 1d110da8ab..4d5248530e 100644 --- a/view/theme/smoothly/templates/follow.tpl +++ b/view/theme/smoothly/templates/follow.tpl @@ -1,7 +1,7 @@

    {{$connect}}

    -
    {{$desc}}
    +
    {{$desc nofilter}}
    diff --git a/view/theme/smoothly/templates/jot.tpl b/view/theme/smoothly/templates/jot.tpl index 34c0b1a2bb..811818020b 100644 --- a/view/theme/smoothly/templates/jot.tpl +++ b/view/theme/smoothly/templates/jot.tpl @@ -26,7 +26,7 @@

    diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl index d441ebe2de..b347ec66a9 100644 --- a/view/theme/smoothly/templates/search_item.tpl +++ b/view/theme/smoothly/templates/search_item.tpl @@ -31,7 +31,7 @@
    {{$item.title}}
    -
    {{$item.body}}
    +
    {{$item.body nofilter}}
    {{$item.name}} diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl index 5aaa9c4eb1..731dd14315 100644 --- a/view/theme/smoothly/templates/wall_thread.tpl +++ b/view/theme/smoothly/templates/wall_thread.tpl @@ -58,7 +58,7 @@
    {{$item.title}}
    -
    {{$item.body}} +
    {{$item.body nofilter}}
    {{if !$item.suppress_tags}} {{foreach $item.tags as $tag}} @@ -136,13 +136,13 @@
    - -
    {{$item.dislike}}
    + +
    {{$item.dislike nofilter}}
    {{if $item.threaded}} {{if $item.comment}}
    - {{$item.comment}} + {{$item.comment nofilter}}
    {{/if}} {{/if}} @@ -156,7 +156,7 @@ {{if $item.flatten}}
    - {{$item.comment}} + {{$item.comment nofilter}}
    {{/if}}
    diff --git a/view/theme/vier/templates/contact_edit.tpl b/view/theme/vier/templates/contact_edit.tpl index 1e30bb83b5..7e53caedc6 100644 --- a/view/theme/vier/templates/contact_edit.tpl +++ b/view/theme/vier/templates/contact_edit.tpl @@ -2,7 +2,7 @@
    {{* Insert Tab-Nav *}} - {{$tab_str}} + {{$tab_str nofilter}}
    @@ -57,7 +57,7 @@ {{if $location}}
    {{$location_label}}
    {{$location}}
    {{/if}} {{if $xmpp}}
    {{$xmpp_label}}
    {{$xmpp}}
    {{/if}} {{if $keywords}}
    {{$keywords_label}}
    {{$keywords}}
    {{/if}} - {{if $about}}
    {{$about_label}}
    {{$about}}
    {{/if}} + {{if $about}}
    {{$about_label}}
    {{$about nofilter}}
    {{/if}}
    {{* End of contact-edit-links *}} diff --git a/view/theme/vier/templates/event_form.tpl b/view/theme/vier/templates/event_form.tpl index 1747118aba..2078e99483 100644 --- a/view/theme/vier/templates/event_form.tpl +++ b/view/theme/vier/templates/event_form.tpl @@ -3,7 +3,7 @@

    {{$title}}

    -{{$desc}} +{{$desc nofilter}}

    diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl index 376fcdc312..2038385d4b 100644 --- a/view/theme/vier/templates/nav.tpl +++ b/view/theme/vier/templates/nav.tpl @@ -105,7 +105,7 @@ {{$nav.apps.1}} diff --git a/view/theme/vier/templates/photo_item.tpl b/view/theme/vier/templates/photo_item.tpl index bc77eaa9cd..dbdf4b7d9f 100644 --- a/view/theme/vier/templates/photo_item.tpl +++ b/view/theme/vier/templates/photo_item.tpl @@ -72,7 +72,7 @@
    - -
    {{$dislike}}
    + +
    {{$dislike nofilter}}
    diff --git a/view/theme/vier/templates/photo_view.tpl b/view/theme/vier/templates/photo_view.tpl index c252960c08..21eda89b35 100644 --- a/view/theme/vier/templates/photo_view.tpl +++ b/view/theme/vier/templates/photo_view.tpl @@ -15,7 +15,7 @@
    {{if $nextlink}}{{/if}}
    -
    {{$desc}}
    +
    {{$desc nofilter}}
    {{if $tags}}
    {{$tags.0}}
    {{$tags.1}}
    @@ -36,5 +36,5 @@ {{$comments}}
    -{{$paginate}} +{{$paginate nofilter}} diff --git a/view/theme/vier/templates/profile_advanced.tpl b/view/theme/vier/templates/profile_advanced.tpl index 702fba8f26..6787ffb406 100644 --- a/view/theme/vier/templates/profile_advanced.tpl +++ b/view/theme/vier/templates/profile_advanced.tpl @@ -63,7 +63,7 @@ {{if $profile.homepage}}
    {{$profile.homepage.0}}
    -
    {{$profile.homepage.1}}
    +
    {{$profile.homepage.1 nofilter}}
    {{/if}} diff --git a/view/theme/vier/templates/profile_edit.tpl b/view/theme/vier/templates/profile_edit.tpl index fbd08e4be0..066b2566f6 100644 --- a/view/theme/vier/templates/profile_edit.tpl +++ b/view/theme/vier/templates/profile_edit.tpl @@ -23,7 +23,7 @@
    -{{$default}} +{{$default nofilter}}
    @@ -83,7 +83,7 @@
    - {{$gender}} + {{$gender nofilter}}
    @@ -107,11 +107,11 @@
    - {{$dob}} + {{$dob nofilter}}
    - {{$hide_friends}} + {{$hide_friends nofilter}}
    {{$about.1}}
    @@ -200,7 +200,7 @@
    - {{$sexual}} + {{$sexual nofilter}}
    @@ -242,8 +242,8 @@
    -{{$hide_friends}} +{{$hide_friends nofilter}}
    diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl index dfa341b260..2acca2fd09 100644 --- a/view/theme/vier/templates/profile_vcard.tpl +++ b/view/theme/vier/templates/profile_vcard.tpl @@ -24,7 +24,7 @@ {{/if}} {{if $account_type}}{{/if}} - {{if $profile.network_name}}
    {{$network}}
    {{$profile.network_name}}
    {{/if}} + {{if $profile.network_name}}
    {{$network}}
    {{$profile.network_name nofilter}}
    {{/if}} {{if $location}}
    {{$location}}
    @@ -58,7 +58,7 @@ {{if $homepage}}
    {{$homepage}}
    {{$profile.homepage}}
    {{/if}} - {{if $about}}
    {{$about}}
    {{$profile.about}}
    {{/if}} + {{if $about}}
    {{$about}}
    {{$profile.about nofilter}}
    {{/if}} {{include file="diaspora_vcard.tpl"}} @@ -81,4 +81,4 @@
    -{{$contact_block}} +{{$contact_block nofilter}} diff --git a/view/theme/vier/templates/search_item.tpl b/view/theme/vier/templates/search_item.tpl index c1383ba434..3cc945b3f5 100644 --- a/view/theme/vier/templates/search_item.tpl +++ b/view/theme/vier/templates/search_item.tpl @@ -30,7 +30,7 @@
    {{if $item.title}}

    {{$item.title}}

    {{/if}} -
    {{$item.body}}
    +
    {{$item.body nofilter}}
    @@ -87,7 +87,7 @@
    - -
    {{$item.dislike}}
    + +
    {{$item.dislike nofilter}}
    diff --git a/view/theme/vier/templates/threaded_conversation.tpl b/view/theme/vier/templates/threaded_conversation.tpl index 3553a5dcbc..885a508fa9 100644 --- a/view/theme/vier/templates/threaded_conversation.tpl +++ b/view/theme/vier/templates/threaded_conversation.tpl @@ -1,4 +1,4 @@ -{{$live_update}} +{{$live_update nofilter}} {{foreach $threads as $thread}}
    diff --git a/view/theme/vier/templates/wall_item_tag.tpl b/view/theme/vier/templates/wall_item_tag.tpl index be6b143b9f..463d5e6e9a 100644 --- a/view/theme/vier/templates/wall_item_tag.tpl +++ b/view/theme/vier/templates/wall_item_tag.tpl @@ -37,7 +37,7 @@
    {{$item.location}}
    - {{$item.ago}} {{$item.body}} + {{$item.ago}} {{$item.body nofilter}}
    {{if $item.drop.pagedrop}} @@ -59,9 +59,9 @@ {{* top thread comment box *}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} {{if $item.flatten}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}} diff --git a/view/theme/vier/templates/wall_thread.tpl b/view/theme/vier/templates/wall_thread.tpl index bcef48c62e..fe95bf9be0 100644 --- a/view/theme/vier/templates/wall_thread.tpl +++ b/view/theme/vier/templates/wall_thread.tpl @@ -65,8 +65,8 @@
    - {{$item.body}} {{if $item.title}}

    {{$item.title}}

    {{/if}} + {{$item.body nofilter}}
    @@ -170,7 +170,7 @@
    {{/if}}{{/if}} @@ -195,18 +195,18 @@ {{if $item.total_comments_num}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}}{{/if}}{{/if}} {{if $item.flatten}} -
    {{$item.comment}}
    +
    {{$item.comment nofilter}}
    {{/if}} {{else}} {{if $item.threaded}}{{if $item.comment}}{{if $item.thread_level==1}} - + {{/if}}{{/if}}{{/if}} {{if $item.flatten}} - + {{/if}} {{/if}} From 698d12af79dc431184c757bc8654c0d078e416f0 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 14 Dec 2018 01:24:26 -0500 Subject: [PATCH 5/9] Unescape variables in events and descriptions --- view/templates/admin/contactblock.tpl | 2 +- view/templates/event.tpl | 2 +- view/templates/event_stream_item.tpl | 4 ++-- view/templates/events.tpl | 2 +- view/templates/http_status.tpl | 2 +- view/theme/frio/templates/admin/contactblock.tpl | 2 +- view/theme/frio/templates/event.tpl | 2 +- view/theme/frio/templates/event_stream_item.tpl | 4 ++-- view/theme/quattro/templates/events.tpl | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/view/templates/admin/contactblock.tpl b/view/templates/admin/contactblock.tpl index efdbd44cd0..f454938627 100644 --- a/view/templates/admin/contactblock.tpl +++ b/view/templates/admin/contactblock.tpl @@ -10,7 +10,7 @@

    {{$title}} - {{$page}}

    -

    {{$description}}

    +

    {{$description nofilter}}

    diff --git a/view/templates/event.tpl b/view/templates/event.tpl index 495cf2eb18..f1d2bf102b 100644 --- a/view/templates/event.tpl +++ b/view/templates/event.tpl @@ -3,7 +3,7 @@
    {{if $event.item.author_name}}{{$event.item.author_name}}{{/if}} - {{$event.html}} + {{$event.html nofilter}} {{if $event.item.plink}}{{/if}} {{if $event.edit}}{{/if}} {{if $event.copy}}{{/if}} diff --git a/view/templates/event_stream_item.tpl b/view/templates/event_stream_item.tpl index 373b6d3314..3480228c10 100644 --- a/view/templates/event_stream_item.tpl +++ b/view/templates/event_stream_item.tpl @@ -15,7 +15,7 @@ {{/if}} {{if $description}} -
    {{$description}}
    +
    {{$description nofilter}}
    {{/if}} {{if $location}} @@ -24,7 +24,7 @@ {{if $location.name}} {{$location.name nofilter}} {{/if}} - {{if $location.map}}{{$location.map}}{{/if}} + {{if $location.map}}{{$location.map nofilter}}{{/if}}
    {{/if}} diff --git a/view/templates/events.tpl b/view/templates/events.tpl index 2469c4c718..cae7b32822 100644 --- a/view/templates/events.tpl +++ b/view/templates/events.tpl @@ -16,7 +16,7 @@
    {{if $event.is_first}}
    {{$event.d}}
    {{/if}} {{if $event.item.author_name}}{{$event.item.author_name}}{{/if}} - {{$event.html}} + {{$event.html nofilter}} {{if $event.item.plink}}{{/if}} {{if $event.edit}}{{/if}}
    diff --git a/view/templates/http_status.tpl b/view/templates/http_status.tpl index 55cc133ff0..6b366d6f04 100644 --- a/view/templates/http_status.tpl +++ b/view/templates/http_status.tpl @@ -4,6 +4,6 @@

    {{$title}}

    -

    {{$description}}

    +

    {{$description nofilter}}

    diff --git a/view/theme/frio/templates/admin/contactblock.tpl b/view/theme/frio/templates/admin/contactblock.tpl index e79ba65c52..7d187aac8e 100644 --- a/view/theme/frio/templates/admin/contactblock.tpl +++ b/view/theme/frio/templates/admin/contactblock.tpl @@ -3,7 +3,7 @@

    {{$title}} - {{$page}}

    -

    {{$description}}

    +

    {{$description nofilter}}

    {{* We organize the settings in collapsable panel-groups *}}
    diff --git a/view/theme/frio/templates/event.tpl b/view/theme/frio/templates/event.tpl index 947d09cb8d..39695819af 100644 --- a/view/theme/frio/templates/event.tpl +++ b/view/theme/frio/templates/event.tpl @@ -10,7 +10,7 @@ {{/if}}
    - {{$event.html}} + {{$event.html nofilter}}
    diff --git a/view/theme/frio/templates/event_stream_item.tpl b/view/theme/frio/templates/event_stream_item.tpl index 2b59e61c0b..330f88cbbb 100644 --- a/view/theme/frio/templates/event_stream_item.tpl +++ b/view/theme/frio/templates/event_stream_item.tpl @@ -29,7 +29,7 @@ {{$author_name}}
    {{if $location.map}} -
    {{$location.map}}
    +
    {{$location.map nofilter}}
    {{/if}}
    @@ -41,7 +41,7 @@ {{* The content of the event description *}} {{if $description}}
    - {{$description}} + {{$description nofilter}}
    {{/if}} diff --git a/view/theme/quattro/templates/events.tpl b/view/theme/quattro/templates/events.tpl index 0428ff8d90..32b2725bac 100644 --- a/view/theme/quattro/templates/events.tpl +++ b/view/theme/quattro/templates/events.tpl @@ -12,7 +12,7 @@
    {{if $event.is_first}}
    {{$event.d}}
    {{/if}} {{if $event.item.author_name}}{{$event.item.author_name}}{{/if}} - {{$event.html}} + {{$event.html nofilter}} {{if $event.item.plink}}{{/if}} {{if $event.edit}}{{/if}}
    From d0fa7f74c5b029ad00b0817c7029a5294c95675c Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 14 Dec 2018 09:32:39 -0500 Subject: [PATCH 6/9] Unescape value of generic input field --- view/theme/frio/templates/field_input.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/theme/frio/templates/field_input.tpl b/view/theme/frio/templates/field_input.tpl index 5b2beb3ac2..ef55203a05 100644 --- a/view/theme/frio/templates/field_input.tpl +++ b/view/theme/frio/templates/field_input.tpl @@ -3,7 +3,7 @@ {{if !isset($label) || $label != false }} {{/if}} - + {{if $field.3}} {{$field.3 nofilter}} {{/if}} From e1b3bcc77def477016ea6a19eaec9eede9ffada4 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Fri, 14 Dec 2018 20:42:24 -0500 Subject: [PATCH 7/9] Unescape yet more values with a focus on the vier theme --- view/templates/acl_selector.tpl | 4 ++-- view/templates/admin/addon_details.tpl | 4 ++-- view/templates/admin/addons.tpl | 2 +- view/templates/event_form.tpl | 7 +++---- view/templates/field_combobox.tpl | 2 +- view/templates/field_input.tpl | 2 +- view/templates/field_openid.tpl | 2 +- view/templates/field_password.tpl | 2 +- view/templates/field_richtext.tpl | 2 +- view/templates/field_textarea.tpl | 2 +- view/templates/field_yesno.tpl | 2 +- view/templates/group_edit.tpl | 2 +- view/templates/jot.tpl | 2 +- view/templates/mail_conv.tpl | 2 +- view/templates/notifications_attend_item.tpl | 2 +- view/templates/notifications_comments_item.tpl | 2 +- view/templates/notifications_dislikes_item.tpl | 2 +- view/templates/notifications_friends_item.tpl | 2 +- view/templates/notifications_likes_item.tpl | 2 +- view/templates/notifications_network_item.tpl | 2 +- view/templates/notifications_posts_item.tpl | 2 +- view/templates/notify.tpl | 2 +- view/templates/profile_advanced.tpl | 2 +- view/templates/profile_photo.tpl | 2 +- view/templates/prv_message.tpl | 2 +- view/templates/saved_searches_aside.tpl | 2 +- view/templates/search_item.tpl | 2 +- view/templates/wall_thread.tpl | 4 ++-- view/theme/duepuntozero/templates/prv_message.tpl | 2 +- view/theme/frio/templates/acl_selector.tpl | 4 ++-- view/theme/frio/templates/admin/addons.tpl | 2 +- view/theme/frio/templates/event_form.tpl | 6 +++--- view/theme/frio/templates/field_colorinput.tpl | 2 +- view/theme/frio/templates/field_fileinput.tpl | 2 +- view/theme/frio/templates/field_openid.tpl | 2 +- view/theme/frio/templates/field_password.tpl | 2 +- view/theme/frio/templates/field_textarea.tpl | 2 +- view/theme/frio/templates/field_yesno.tpl | 2 +- view/theme/frio/templates/jot.tpl | 2 +- view/theme/frio/templates/mail_conv.tpl | 2 +- view/theme/frio/templates/notify.tpl | 2 +- view/theme/frio/templates/profile_advanced.tpl | 2 +- view/theme/frio/templates/prv_message.tpl | 2 +- view/theme/quattro/templates/event_form.tpl | 6 +++--- view/theme/quattro/templates/jot.tpl | 2 +- view/theme/quattro/templates/mail_conv.tpl | 4 ++-- view/theme/quattro/templates/prv_message.tpl | 2 +- .../theme/quattro/templates/saved_searches_aside.tpl | 2 +- view/theme/quattro/templates/search_item.tpl | 2 +- view/theme/quattro/templates/wall_item_tag.tpl | 2 +- view/theme/quattro/templates/wall_thread.tpl | 4 ++-- view/theme/smoothly/templates/jot.tpl | 4 ++-- view/theme/smoothly/templates/search_item.tpl | 2 +- view/theme/smoothly/templates/wall_thread.tpl | 2 +- view/theme/vier/templates/communityhome.tpl | 12 ++++++------ view/theme/vier/templates/event_form.tpl | 8 +++----- view/theme/vier/templates/nav.tpl | 2 +- view/theme/vier/templates/profile_advanced.tpl | 2 +- view/theme/vier/templates/search_item.tpl | 2 +- view/theme/vier/templates/wall_item_tag.tpl | 2 +- view/theme/vier/templates/wall_thread.tpl | 4 ++-- 61 files changed, 82 insertions(+), 85 deletions(-) diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 7df6965a04..48706535f4 100644 --- a/view/templates/acl_selector.tpl +++ b/view/templates/acl_selector.tpl @@ -20,7 +20,7 @@
    {{$emailcc}}
    {{if $jotnets}} -{{$jotnets}} +{{$jotnets nofilter}} {{/if}}{{/if}}