diff --git a/view/templates/acl_selector.tpl b/view/templates/acl_selector.tpl index 7c68a7306..7df6965a0 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 96b26d2d0..fb908b705 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 3afeb5355..a77084d19 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 b2e6357a9..a218a38f5 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 1ca0708bf..f0b696fae 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 34b1e3b1b..dd40654b5 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 75244924b..b5260f361 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 f06b0f973..88feb6136 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 3d1d7573d..72aedd8b7 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 c7e10482e..f1cca4546 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 9261ff8d3..6aa51d470 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 6845c6256..06918533c 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 d85fcfb5a..c8c81dbb5 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 72528bd26..0eab89110 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 144277310..dc5e43096 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 0cb6e7e3e..b2a78fe09 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 d49b5bbf2..accfd4f83 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 8e686c33d..ca35ae674 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 46f17de40..8c05b30c6 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 de8de44e8..3676ba458 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 af9a55494..15975c5d5 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 08278954c..2fcb1908d 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 91444e2d5..e178e977a 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 18191de03..56fbde644 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 2363bd3f0..1e1771ef4 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 1695d01e2..d0ae4f87d 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 14e1a0373..b56dd607c 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}}
{{$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 654671af0..d419d4d9b 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 2e5588ae7..30b242983 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 f5f43360a..354c8e46a 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 4acfb9ff1..4148f94e5 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 a97574b7b..fbcf770f1 100644 --- a/view/templates/search_item.tpl +++ b/view/templates/search_item.tpl @@ -6,8 +6,8 @@
- - {{$item.name|escape}} + + {{$item.name}} menu
- {{$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 a23791768..9dd5d0b1a 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 e1a012380..951609e1b 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 eb3f67f81..2793e477b 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 164930ecb..edb0ff63e 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 901998154..eed9f6ea3 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 d017367fe..2fa22973e 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 edc0dbdba..44fe86510 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 0aca00a05..05c79ab75 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 eed94193f..47b64b68d 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}}
{{$account_type|escape}}
{{/if}} + {{if $account_type}}
{{$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 1e2b99c22..37e5a8a4c 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 6f54d024d..73aad3d9a 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -18,16 +18,16 @@

{{if $item.owner_url}}
- - {{$item.owner_name|escape}} + + {{$item.owner_name}}
-
{{$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 e6a6be908..579ee0a31 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 da30967cd..32da71f81 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 31afc71fe..186b7e449 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 9ccd5326c..4e9eabd3b 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 38efb62bd..220abdc2c 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 3ac9a2517..4b3a2ae4b 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 3ebe89052..dde386399 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 77ae1d532..7228b9022 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 564a66079..388c281f5 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 031ffd0a4..92ef9be6f 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 f4a60b7d0..0b58d520d 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 804d07ac0..4ef5f2caa 100644 --- a/view/theme/frio/templates/comment_item.tpl +++ b/view/theme/frio/templates/comment_item.tpl @@ -33,37 +33,37 @@ {{/if}}
    {{$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}}