From 9d3fb417c26d5168eb926a97f451585e84be3c7b Mon Sep 17 00:00:00 2001 From: Fabrixxm Date: Mon, 16 Feb 2015 09:30:12 +0100 Subject: [PATCH 1/3] Escape values to input fields (and some 'title' and 'alt') --- view/templates/admin_aside.tpl | 5 +++ view/templates/admin_logs.tpl | 4 +-- view/templates/admin_remoteupdate.tpl | 8 ++--- view/templates/admin_site.tpl | 22 +++++++----- view/templates/admin_users.tpl | 6 ++-- view/templates/album_edit.tpl | 6 ++-- view/templates/auto_request.tpl | 8 ++--- view/templates/comment_item.tpl | 4 +-- view/templates/confirm.tpl | 6 ++-- view/templates/contact_edit.tpl | 4 +-- view/templates/contacts-template.tpl | 6 ++-- view/templates/crepair.tpl | 18 +++++----- view/templates/cropbody.tpl | 2 +- view/templates/dfrn_req_confirm.tpl | 2 +- view/templates/dfrn_request.tpl | 8 ++--- view/templates/directory_header.tpl | 4 +-- view/templates/event_form.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 | 4 +++ view/templates/follow.tpl | 2 +- view/templates/group_edit.tpl | 2 +- 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 | 30 ++++++++-------- view/templates/lang_selector.tpl | 2 +- view/templates/login.tpl | 8 ++--- view/templates/logout.tpl | 2 +- view/templates/lostpass.tpl | 2 +- view/templates/moderated_comment.tpl | 12 +++---- view/templates/mood_content.tpl | 2 +- view/templates/oauth_authorize.tpl | 2 +- view/templates/peoplefind.tpl | 2 +- view/templates/photo_edit.tpl | 8 ++--- .../photos_default_uploader_submit.tpl | 2 +- view/templates/poke_content.tpl | 4 +-- view/templates/profile_edit.tpl | 34 +++++++++---------- view/templates/profile_photo.tpl | 2 +- view/templates/prv_message.tpl | 8 ++--- view/templates/register.tpl | 10 +++--- view/templates/removeme.tpl | 2 +- view/templates/scroll_loader.tpl | 8 +++++ view/templates/settings.tpl | 12 +++---- view/templates/settings_connectors.tpl | 2 +- view/templates/settings_display.tpl | 2 +- view/templates/settings_features.tpl | 2 +- view/templates/settings_oauth.tpl | 4 +-- view/templates/settings_oauth_edit.tpl | 2 +- view/templates/suggestions.tpl | 8 ++--- view/templates/uimport.tpl | 2 +- view/templates/wall_thread.tpl | 34 +++++++++---------- view/templates/wallmessage.tpl | 6 ++-- 64 files changed, 209 insertions(+), 186 deletions(-) create mode 100644 view/templates/files.tpl create mode 100644 view/templates/scroll_loader.tpl diff --git a/view/templates/admin_aside.tpl b/view/templates/admin_aside.tpl index a9d26a89f0..0f28a1cf37 100644 --- a/view/templates/admin_aside.tpl +++ b/view/templates/admin_aside.tpl @@ -40,3 +40,8 @@
  • {{$admin.logs.1}}
    • +

    {{$diagnosticstxt}}

    + diff --git a/view/templates/admin_logs.tpl b/view/templates/admin_logs.tpl index e5412429f4..4cc0acb66c 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_remoteupdate.tpl b/view/templates/admin_remoteupdate.tpl index 24f7f9bfa6..c3e85f2e80 100644 --- a/view/templates/admin_remoteupdate.tpl +++ b/view/templates/admin_remoteupdate.tpl @@ -66,7 +66,7 @@

    Friendica Update

    - +
    @@ -77,10 +77,10 @@
    New version:
    {{$remoteversion}}
    - + {{if $canwrite}} -
    +
    {{else}}

    Your friendica installation is not writable by web server.

    {{if $canftp}} @@ -89,7 +89,7 @@ {{include file="field_input.tpl" field=$ftppath}} {{include file="field_input.tpl" field=$ftpuser}} {{include file="field_password.tpl" field=$ftppwd}} -
    +
    {{/if}} {{/if}}
    diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl index 166b35e7d4..6880f0fd91 100644 --- a/view/templates/admin_site.tpl +++ b/view/templates/admin_site.tpl @@ -46,7 +46,10 @@ {{include file="field_input.tpl" field=$sitename}} {{include file="field_input.tpl" field=$hostname}} + {{include file="field_input.tpl" field=$sender_email}} {{include file="field_textarea.tpl" field=$banner}} + {{include file="field_input.tpl" field=$shortcut_icon}} + {{include file="field_input.tpl" field=$touch_icon}} {{include file="field_textarea.tpl" field=$info}} {{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$theme}} @@ -58,7 +61,7 @@ {{include file="field_select.tpl" field=$singleuser}} -
    +

    {{$registration}}

    {{include file="field_input.tpl" field=$register_text}} @@ -68,7 +71,7 @@ {{include file="field_checkbox.tpl" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_regfullname}} -
    +

    {{$upload}}

    {{include file="field_input.tpl" field=$maximagesize}} @@ -80,7 +83,8 @@ {{include file="field_input.tpl" field=$allowed_email}} {{include file="field_checkbox.tpl" field=$block_public}} {{include file="field_checkbox.tpl" field=$force_publish}} - {{include file="field_checkbox.tpl" field=$no_community_page}} + {{include file="field_select.tpl" field=$community_page_style}} + {{include file="field_input.tpl" field=$max_author_posts_community_page}} {{include file="field_checkbox.tpl" field=$ostatus_disabled}} {{include file="field_select.tpl" field=$ostatus_poll_interval}} {{include file="field_checkbox.tpl" field=$diaspora_enabled}} @@ -92,7 +96,7 @@ {{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}} -
    +

    {{$advanced}}

    {{include file="field_checkbox.tpl" field=$no_utf}} @@ -108,15 +112,17 @@ {{include file="field_input.tpl" field=$temppath}} {{include file="field_input.tpl" field=$basepath}} {{include file="field_checkbox.tpl" field=$suppress_language}} + {{include file="field_checkbox.tpl" field=$suppress_tags}}

    {{$performance}}

    - {{include file="field_checkbox.tpl" field=$disable_noscrape}} {{include file="field_checkbox.tpl" field=$use_fulltext_engine}} + {{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_input.tpl" field=$itemcache}} {{include file="field_input.tpl" field=$itemcache_duration}} {{include file="field_input.tpl" field=$max_comments}} {{include file="field_checkbox.tpl" field=$proxy_disabled}} -
    + {{include file="field_checkbox.tpl" field=$old_pager}} +
    @@ -125,8 +131,8 @@

    {{$relocate}}

    {{include file="field_input.tpl" field=$relocate_url}} - -
    + +
    diff --git a/view/templates/admin_users.tpl b/view/templates/admin_users.tpl index 4e0b9650ef..fc3c6377f1 100644 --- a/view/templates/admin_users.tpl +++ b/view/templates/admin_users.tpl @@ -43,7 +43,7 @@
    {{$select_all}}
    -
    +
    {{else}}

    {{$no_pending}}

    {{/if}} @@ -88,7 +88,7 @@
    {{$select_all}}
    -
    +
    {{else}} NO USERS?!? {{/if}} @@ -133,6 +133,6 @@ -
    +
    diff --git a/view/templates/album_edit.tpl b/view/templates/album_edit.tpl index 72aedd8b70..3d1d7573d7 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 8d7d3ff3d9..b987b7849c 100644 --- a/view/templates/auto_request.tpl +++ b/view/templates/auto_request.tpl @@ -26,9 +26,9 @@ {{if $myaddr}} {{$myaddr}} - + {{else}} - + {{/if}}
    @@ -39,7 +39,7 @@
    - - + +
    diff --git a/view/templates/comment_item.tpl b/view/templates/comment_item.tpl index 621c15d43e..fa360df3a8 100644 --- a/view/templates/comment_item.tpl +++ b/view/templates/comment_item.tpl @@ -22,14 +22,14 @@ {{/if}}
    diff --git a/view/templates/confirm.tpl b/view/templates/confirm.tpl index 6744ac4f74..bb9e159078 100644 --- a/view/templates/confirm.tpl +++ b/view/templates/confirm.tpl @@ -4,11 +4,11 @@ {{$message}} {{foreach $extra_inputs as $input}} - + {{/foreach}} - - + + diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl index 9b57f17417..65af34c6bb 100644 --- a/view/templates/contact_edit.tpl +++ b/view/templates/contact_edit.tpl @@ -73,7 +73,7 @@

    {{$lbl_info1}}

    - +
    @@ -85,7 +85,7 @@ {{$profile_select}}
    - + diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl index 5797196ebb..896f9af4c9 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 37e2ef417b..a94f1f2d3c 100644 --- a/view/templates/crepair.tpl +++ b/view/templates/crepair.tpl @@ -3,35 +3,35 @@

    {{$contact_name}}

    - +
    - +
    - +
    - +
    - +
    - +
    - +
    - +
    @@ -42,7 +42,7 @@ {{include file="field_select.tpl" field=$remote_self}} {{/if}} - + diff --git a/view/templates/cropbody.tpl b/view/templates/cropbody.tpl index 47bb73b47a..4cf030bc9d 100644 --- a/view/templates/cropbody.tpl +++ b/view/templates/cropbody.tpl @@ -52,7 +52,7 @@
    - +
    diff --git a/view/templates/dfrn_req_confirm.tpl b/view/templates/dfrn_req_confirm.tpl index accfd4f83f..d49b5bbf2d 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 d724785865..44c8ef1e6a 100644 --- a/view/templates/dfrn_request.tpl +++ b/view/templates/dfrn_request.tpl @@ -25,9 +25,9 @@ {{if $myaddr}} {{$myaddr}} - + {{else}} - + {{/if}}
    @@ -69,7 +69,7 @@
    - - + +
    diff --git a/view/templates/directory_header.tpl b/view/templates/directory_header.tpl index 29393aeda3..2274f2e1f8 100644 --- a/view/templates/directory_header.tpl +++ b/view/templates/directory_header.tpl @@ -9,8 +9,8 @@
    {{$desc}} - - + +
    diff --git a/view/templates/event_form.tpl b/view/templates/event_form.tpl index cb7ba53af0..45e2ea71e0 100644 --- a/view/templates/event_form.tpl +++ b/view/templates/event_form.tpl @@ -28,7 +28,7 @@
    {{$t_text}}
    - +
    {{$d_text}}
    @@ -44,7 +44,7 @@ {{$acl}}
    - + diff --git a/view/templates/field_combobox.tpl b/view/templates/field_combobox.tpl index 3d69e2d272..a2f7c3f27e 100644 --- a/view/templates/field_combobox.tpl +++ b/view/templates/field_combobox.tpl @@ -4,13 +4,13 @@ {{* html5 don't work on Chrome, Safari and IE9 - {{foreach $field.4 as $opt=>$val}} *}} {{$field.3}} diff --git a/view/templates/field_input.tpl b/view/templates/field_input.tpl index ae8fe844a3..6a3328c5cc 100644 --- a/view/templates/field_input.tpl +++ b/view/templates/field_input.tpl @@ -1,6 +1,6 @@
    - + {{$field.3}}
    diff --git a/view/templates/field_intcheckbox.tpl b/view/templates/field_intcheckbox.tpl index dd77e50018..2f3c27d920 100644 --- a/view/templates/field_intcheckbox.tpl +++ b/view/templates/field_intcheckbox.tpl @@ -2,6 +2,6 @@
    - + {{$field.4}}
    diff --git a/view/templates/field_openid.tpl b/view/templates/field_openid.tpl index d8a9394a15..e5f236c679 100644 --- a/view/templates/field_openid.tpl +++ b/view/templates/field_openid.tpl @@ -1,6 +1,6 @@
    - + {{$field.3}}
    diff --git a/view/templates/field_password.tpl b/view/templates/field_password.tpl index 2e9e91529a..8a9f0dc330 100644 --- a/view/templates/field_password.tpl +++ b/view/templates/field_password.tpl @@ -1,6 +1,6 @@
    - + {{$field.3}}
    diff --git a/view/templates/field_radio.tpl b/view/templates/field_radio.tpl index 09db114720..86cc8fc47e 100644 --- a/view/templates/field_radio.tpl +++ b/view/templates/field_radio.tpl @@ -2,6 +2,6 @@
    - + {{$field.3}}
    diff --git a/view/templates/field_select.tpl b/view/templates/field_select.tpl index a3274f51af..4fbbd4beb0 100644 --- a/view/templates/field_select.tpl +++ b/view/templates/field_select.tpl @@ -3,7 +3,7 @@
    {{$field.3}}
    diff --git a/view/templates/field_themeselect.tpl b/view/templates/field_themeselect.tpl index b250520d7b..edd25dbe0f 100644 --- a/view/templates/field_themeselect.tpl +++ b/view/templates/field_themeselect.tpl @@ -3,7 +3,7 @@
    {{$field.3}} {{if $field.5}}
    {{/if}} diff --git a/view/templates/field_yesno.tpl b/view/templates/field_yesno.tpl index 4a471ccdc1..de70c5ae6d 100644 --- a/view/templates/field_yesno.tpl +++ b/view/templates/field_yesno.tpl @@ -2,7 +2,7 @@
    - + {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}} diff --git a/view/templates/filebrowser.tpl b/view/templates/filebrowser.tpl index cde4e603ca..b207277a7b 100644 --- a/view/templates/filebrowser.tpl +++ b/view/templates/filebrowser.tpl @@ -78,7 +78,7 @@
    - +
    diff --git a/view/templates/filer_dialog.tpl b/view/templates/filer_dialog.tpl index 77f48e8aee..27aa9b2f5b 100644 --- a/view/templates/filer_dialog.tpl +++ b/view/templates/filer_dialog.tpl @@ -1,5 +1,5 @@ {{include file="field_combobox.tpl"}}
    - +
    diff --git a/view/templates/files.tpl b/view/templates/files.tpl new file mode 100644 index 0000000000..a2a337bd76 --- /dev/null +++ b/view/templates/files.tpl @@ -0,0 +1,4 @@ +{{foreach $items as $item }} +

    {{$item.title}} ({{$item.mime}}) ({{$item.filename}})

    +{{/foreach}} +{{include "paginate.tpl"}} \ No newline at end of file diff --git a/view/templates/follow.tpl b/view/templates/follow.tpl index 32109e82bf..c4d1887657 100644 --- a/view/templates/follow.tpl +++ b/view/templates/follow.tpl @@ -3,7 +3,7 @@

    {{$connect}}

    {{$desc}}
    - +
    diff --git a/view/templates/group_edit.tpl b/view/templates/group_edit.tpl index 7bc4add88a..6b72e776e0 100644 --- a/view/templates/group_edit.tpl +++ b/view/templates/group_edit.tpl @@ -9,7 +9,7 @@ {{include file="field_input.tpl" field=$gname}} {{if $drop}}{{$drop}}{{/if}}
    - +
    diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl index 217f182a50..ca12425f05 100644 --- a/view/templates/install_checks.tpl +++ b/view/templates/install_checks.tpl @@ -12,14 +12,14 @@ {{if $phpath}} - + {{/if}} {{if $passed}} - + {{else}} - + {{/if}} diff --git a/view/templates/install_db.tpl b/view/templates/install_db.tpl index b6bad0a2ee..f66bf119e8 100644 --- a/view/templates/install_db.tpl +++ b/view/templates/install_db.tpl @@ -16,7 +16,7 @@
    - + {{include file="field_input.tpl" field=$dbhost}} @@ -25,7 +25,7 @@ {{include file="field_input.tpl" field=$dbdata}} - +
    diff --git a/view/templates/install_settings.tpl b/view/templates/install_settings.tpl index 53450141d4..735672fe6e 100644 --- a/view/templates/install_settings.tpl +++ b/view/templates/install_settings.tpl @@ -10,17 +10,17 @@
    - - - - - + + + + + {{include file="field_input.tpl" field=$adminmail}} {{$timezone}} - +
    diff --git a/view/templates/intros.tpl b/view/templates/intros.tpl index a14bcf39e6..74fb53b589 100644 --- a/view/templates/intros.tpl +++ b/view/templates/intros.tpl @@ -4,13 +4,13 @@

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

    {{$fullname}}
    -{{$fullname}} +{{$fullname|escape:'html'}}
    {{$knowyou}}
    {{$note}}
    - - + +
    @@ -23,7 +23,7 @@ {{$dfrn_text}} - +
    diff --git a/view/templates/invite.tpl b/view/templates/invite.tpl index 34c032fdc9..6fd8539c5a 100644 --- a/view/templates/invite.tpl +++ b/view/templates/invite.tpl @@ -24,7 +24,7 @@
    - +
    diff --git a/view/templates/jot.tpl b/view/templates/jot.tpl index dba78e34fd..e8e4e04f3c 100644 --- a/view/templates/jot.tpl +++ b/view/templates/jot.tpl @@ -10,15 +10,15 @@
    - - + + -
    +
    {{if $placeholdercategory}} -
    +
    {{/if}}
    @@ -26,37 +26,37 @@
    - +
    -
    +
    -
    +
    - +
    - +
    - +
    - {{$bang}} + {{$bang}}
    - {{if $preview}}{{/if}} + {{if $preview}}{{/if}}
    @@ -66,7 +66,7 @@
    - +
    @@ -75,7 +75,7 @@
    {{$acl}}
    -
    {{$emailcc}}
    +
    {{$emailcc}}
    {{$jotnets}}
    diff --git a/view/templates/lang_selector.tpl b/view/templates/lang_selector.tpl index 484d88fe35..f5fe8bea56 100644 --- a/view/templates/lang_selector.tpl +++ b/view/templates/lang_selector.tpl @@ -4,7 +4,7 @@
    diff --git a/view/templates/login.tpl b/view/templates/login.tpl index 57c735d8f9..37d105c087 100644 --- a/view/templates/login.tpl +++ b/view/templates/login.tpl @@ -17,16 +17,16 @@ {{include file="field_checkbox.tpl" field=$lremember}}
    - +
    {{foreach $hiddens as $k=>$v}} - + {{/foreach}} diff --git a/view/templates/logout.tpl b/view/templates/logout.tpl index ba66f831cc..343088d558 100644 --- a/view/templates/logout.tpl +++ b/view/templates/logout.tpl @@ -2,6 +2,6 @@
    - +
    diff --git a/view/templates/lostpass.tpl b/view/templates/lostpass.tpl index e285860820..3dfbb7a237 100644 --- a/view/templates/lostpass.tpl +++ b/view/templates/lostpass.tpl @@ -12,7 +12,7 @@
    - +
    diff --git a/view/templates/moderated_comment.tpl b/view/templates/moderated_comment.tpl index f61e133d05..6e5eb22e7b 100644 --- a/view/templates/moderated_comment.tpl +++ b/view/templates/moderated_comment.tpl @@ -4,27 +4,27 @@ - +
    - {{$mytitle}} + {{$mytitle|escape:'html'}}
    diff --git a/view/templates/mood_content.tpl b/view/templates/mood_content.tpl index ab2a845fce..5604ff9a36 100644 --- a/view/templates/mood_content.tpl +++ b/view/templates/mood_content.tpl @@ -16,6 +16,6 @@

    - + diff --git a/view/templates/oauth_authorize.tpl b/view/templates/oauth_authorize.tpl index 10d9d5069d..d513d6b2ef 100644 --- a/view/templates/oauth_authorize.tpl +++ b/view/templates/oauth_authorize.tpl @@ -7,5 +7,5 @@

    {{$authorize}}

    -
    +
    diff --git a/view/templates/peoplefind.tpl b/view/templates/peoplefind.tpl index 4f88a1e426..de8cd011b4 100644 --- a/view/templates/peoplefind.tpl +++ b/view/templates/peoplefind.tpl @@ -3,7 +3,7 @@

    {{$findpeople}}

    {{$desc}}
    - +
    diff --git a/view/templates/photo_edit.tpl b/view/templates/photo_edit.tpl index 391543615c..d5e4397a16 100644 --- a/view/templates/photo_edit.tpl +++ b/view/templates/photo_edit.tpl @@ -5,12 +5,12 @@ - +
    - +
    @@ -42,8 +42,8 @@
    - - + +
    diff --git a/view/templates/photos_default_uploader_submit.tpl b/view/templates/photos_default_uploader_submit.tpl index e178e977a7..91444e2d55 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 06a3ec27c6..857dfb2003 100644 --- a/view/templates/poke_content.tpl +++ b/view/templates/poke_content.tpl @@ -9,7 +9,7 @@
    {{$clabel}}

    - +
    @@ -28,6 +28,6 @@

    - + diff --git a/view/templates/profile_edit.tpl b/view/templates/profile_edit.tpl index b68ec5081d..480add4404 100644 --- a/view/templates/profile_edit.tpl +++ b/view/templates/profile_edit.tpl @@ -5,11 +5,11 @@ @@ -23,19 +23,19 @@
    -
    *
    +
    *
    - +
    - +
    @@ -64,20 +64,20 @@
    - +
    - +
    - +
    @@ -101,7 +101,7 @@
    - +
    @@ -117,7 +117,7 @@ - +
    @@ -131,31 +131,31 @@
    - +
    - +
    - +
    - +
    {{$lbl_pubdsc}}
    - +
    {{$lbl_prvdsc}}
    diff --git a/view/templates/profile_photo.tpl b/view/templates/profile_photo.tpl index d0ae4f87dc..1695d01e27 100644 --- a/view/templates/profile_photo.tpl +++ b/view/templates/profile_photo.tpl @@ -17,7 +17,7 @@
    - +
    diff --git a/view/templates/prv_message.tpl b/view/templates/prv_message.tpl index d419d4d9b3..654671af0e 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 aacf76529e..8a941145ab 100644 --- a/view/templates/register.tpl +++ b/view/templates/register.tpl @@ -14,7 +14,7 @@ {{if $oidlabel}}
    - +
    {{/if}} @@ -33,14 +33,14 @@
    - +
    - +
    @@ -48,14 +48,14 @@
    -
    @{{$sitename}}
    +
    @{{$sitename}}
    {{$publish}}
    - +
    diff --git a/view/templates/removeme.tpl b/view/templates/removeme.tpl index 4148f94e5f..4acfb9ff1a 100644 --- a/view/templates/removeme.tpl +++ b/view/templates/removeme.tpl @@ -14,7 +14,7 @@
    - + diff --git a/view/templates/scroll_loader.tpl b/view/templates/scroll_loader.tpl new file mode 100644 index 0000000000..4adaa965b2 --- /dev/null +++ b/view/templates/scroll_loader.tpl @@ -0,0 +1,8 @@ + + + diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl index a3d4bf72db..323b614ef6 100644 --- a/view/templates/settings.tpl +++ b/view/templates/settings.tpl @@ -16,7 +16,7 @@ {{/if}}
    - +
    @@ -32,7 +32,7 @@
    - +
    @@ -102,7 +102,7 @@
    - +
    @@ -138,7 +138,7 @@
    - +
    @@ -150,7 +150,7 @@ {{$pagetype}}
    - +
    @@ -159,7 +159,7 @@
    {{$relocate_text}}
    - +
    diff --git a/view/templates/settings_connectors.tpl b/view/templates/settings_connectors.tpl index 87103b6bbc..bdb928f5b5 100644 --- a/view/templates/settings_connectors.tpl +++ b/view/templates/settings_connectors.tpl @@ -32,7 +32,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 81e73e09cc..12cdd3d668 100644 --- a/view/templates/settings_display.tpl +++ b/view/templates/settings_display.tpl @@ -16,7 +16,7 @@
    - +
    {{if $theme_config}} diff --git a/view/templates/settings_features.tpl b/view/templates/settings_features.tpl index 2793e477b1..eb3f67f813 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 edb0ff63ec..164930ecba 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 eed9f6ea33..9019981542 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/suggestions.tpl b/view/templates/suggestions.tpl index eb273b4463..e2acaa5924 100644 --- a/view/templates/suggestions.tpl +++ b/view/templates/suggestions.tpl @@ -5,18 +5,18 @@

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

    {{$madeby}}
    {{$fullname}}
    -{{$fullname}} +{{$fullname|escape:'html'}}
    {{$note}}
    - - + +
    {{include file="field_checkbox.tpl" field=$hidden}} - +
    diff --git a/view/templates/uimport.tpl b/view/templates/uimport.tpl index 05c79ab757..0aca00a05f 100644 --- a/view/templates/uimport.tpl +++ b/view/templates/uimport.tpl @@ -8,7 +8,7 @@
    - +
    diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl index b38027a8da..2eb741c597 100644 --- a/view/templates/wall_thread.tpl +++ b/view/templates/wall_thread.tpl @@ -12,7 +12,7 @@
    {{if $item.owner_url}}
    {{$item.wall}}
    @@ -20,7 +20,7 @@
    - + {{$item.name}} menu
    @@ -38,8 +38,8 @@
    - {{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
    -
    {{$item.ago}}
    + {{$item.name}}{{if $item.owner_url}} {{$item.to}} {{$item.owner_name}} {{$item.vwall}}{{/if}}
    +
    {{$item.ago}}
    {{$item.title}}
    @@ -51,12 +51,12 @@ {{/foreach}}
    {{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}}
    @@ -64,33 +64,33 @@
    {{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.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 579ee0a31e..e6a6be908f 100644 --- a/view/templates/wallmessage.tpl +++ b/view/templates/wallmessage.tpl @@ -13,7 +13,7 @@ {{$recipname}}
    {{$subject}}
    - +
    {{$yourmessage}}
    @@ -22,10 +22,10 @@
    - +
    From d9f222b33016bf99ecb830c231ce69d9da708b48 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 17 Feb 2015 07:34:04 +0100 Subject: [PATCH 2/3] Bugfix: Friendica contacts were detected as Diaspora contacts. (Poco) --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index 2738f8a70f..fc9d3aecb0 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -157,7 +157,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca if (($network == "") OR ($name == "") OR ($profile_photo == "")) { require_once("include/Scrape.php"); - $data = probe_url($profile_url, PROBE_DIASPORA); + $data = probe_url($profile_url); $network = $data["network"]; $name = $data["name"]; $profile_photo = $data["photo"]; From 4b7ff42a893198b25c83f2c4e1962894f44044ea Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Tue, 17 Feb 2015 19:48:02 +0100 Subject: [PATCH 3/3] Bugfix: See issue 1338 --- view/templates/remote_friends_common.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl index 13d64def86..354c8e46a2 100644 --- a/view/templates/remote_friends_common.tpl +++ b/view/templates/remote_friends_common.tpl @@ -11,7 +11,7 @@
    - {{$item.name}} + {{$item.name}}