]> git.mxchange.org Git - friendica.git/commitdiff
Remove uses of HTML escaping in Smarty templates
authorHypolite Petovan <hypolite@mrpetovan.com>
Fri, 14 Dec 2018 03:28:12 +0000 (22:28 -0500)
committerHypolite Petovan <hypolite@mrpetovan.com>
Mon, 17 Dec 2018 03:38:30 +0000 (22:38 -0500)
171 files changed:
view/templates/acl_selector.tpl
view/templates/admin/addon_details.tpl
view/templates/admin/contactblock.tpl
view/templates/admin/logs.tpl
view/templates/admin/settings_features.tpl
view/templates/admin/site.tpl
view/templates/admin/tos.tpl
view/templates/admin/users.tpl
view/templates/album_edit.tpl
view/templates/auto_request.tpl
view/templates/birthdays_reminder.tpl
view/templates/comment_item.tpl
view/templates/confirm.tpl
view/templates/contact_edit.tpl
view/templates/contact_template.tpl
view/templates/contacts-template.tpl
view/templates/crepair.tpl
view/templates/cropbody.tpl
view/templates/delegate.tpl
view/templates/dfrn_req_confirm.tpl
view/templates/dfrn_request.tpl
view/templates/directory_header.tpl
view/templates/event_form.tpl
view/templates/event_stream_item.tpl
view/templates/events_reminder.tpl
view/templates/field_combobox.tpl
view/templates/field_input.tpl
view/templates/field_intcheckbox.tpl
view/templates/field_openid.tpl
view/templates/field_password.tpl
view/templates/field_radio.tpl
view/templates/field_select.tpl
view/templates/field_themeselect.tpl
view/templates/field_yesno.tpl
view/templates/filebrowser.tpl
view/templates/filer_dialog.tpl
view/templates/files.tpl
view/templates/follow.tpl
view/templates/group_edit.tpl
view/templates/head.tpl
view/templates/hovercard.tpl
view/templates/install_checks.tpl
view/templates/install_db.tpl
view/templates/install_settings.tpl
view/templates/intros.tpl
view/templates/invite.tpl
view/templates/jot.tpl
view/templates/login.tpl
view/templates/logout.tpl
view/templates/lostpass.tpl
view/templates/moderated_comment.tpl
view/templates/oauth_authorize.tpl
view/templates/peoplefind.tpl
view/templates/photo_album.tpl
view/templates/photo_edit.tpl
view/templates/photo_top.tpl
view/templates/photo_view.tpl
view/templates/photos_default_uploader_submit.tpl
view/templates/poke_content.tpl
view/templates/profile_edit.tpl
view/templates/profile_photo.tpl
view/templates/profile_vcard.tpl
view/templates/prv_message.tpl
view/templates/register.tpl
view/templates/remote_friends_common.tpl
view/templates/removeme.tpl
view/templates/search_item.tpl
view/templates/settings/connectors.tpl
view/templates/settings/display.tpl
view/templates/settings/features.tpl
view/templates/settings/oauth.tpl
view/templates/settings/oauth_edit.tpl
view/templates/settings/settings.tpl
view/templates/suggestions.tpl
view/templates/uimport.tpl
view/templates/vcard-widget.tpl
view/templates/wall/content_filter.tpl
view/templates/wall_thread.tpl
view/templates/wallmessage.tpl
view/templates/widget_forumlist.tpl
view/theme/duepuntozero/templates/profile_vcard.tpl
view/theme/frio/templates/acl_selector.tpl
view/theme/frio/templates/admin/addons.tpl
view/theme/frio/templates/admin/contactblock.tpl
view/theme/frio/templates/admin/queue.tpl
view/theme/frio/templates/admin/site.tpl
view/theme/frio/templates/admin/summary.tpl
view/theme/frio/templates/admin/users.tpl
view/theme/frio/templates/album_edit.tpl
view/theme/frio/templates/comment_item.tpl
view/theme/frio/templates/common_tabs.tpl
view/theme/frio/templates/confirm.tpl
view/theme/frio/templates/contact_edit.tpl
view/theme/frio/templates/contact_template.tpl
view/theme/frio/templates/contacts-template.tpl
view/theme/frio/templates/credits.tpl
view/theme/frio/templates/crepair.tpl
view/theme/frio/templates/directory_header.tpl
view/theme/frio/templates/event.tpl
view/theme/frio/templates/event_form.tpl
view/theme/frio/templates/event_stream_item.tpl
view/theme/frio/templates/events_js.tpl
view/theme/frio/templates/field_input.tpl
view/theme/frio/templates/field_intcheckbox.tpl
view/theme/frio/templates/field_openid.tpl
view/theme/frio/templates/field_password.tpl
view/theme/frio/templates/field_select.tpl
view/theme/frio/templates/field_yesno.tpl
view/theme/frio/templates/filebrowser.tpl
view/theme/frio/templates/follow.tpl
view/theme/frio/templates/group_edit.tpl
view/theme/frio/templates/head.tpl
view/theme/frio/templates/intros.tpl
view/theme/frio/templates/invite.tpl
view/theme/frio/templates/jot.tpl
view/theme/frio/templates/like_noshare.tpl
view/theme/frio/templates/login.tpl
view/theme/frio/templates/mail_conv.tpl
view/theme/frio/templates/mail_list.tpl
view/theme/frio/templates/nav.tpl
view/theme/frio/templates/peoplefind.tpl
view/theme/frio/templates/photo_item.tpl
view/theme/frio/templates/photo_top.tpl
view/theme/frio/templates/photo_view.tpl
view/theme/frio/templates/photos_default_uploader_submit.tpl
view/theme/frio/templates/poke_content.tpl
view/theme/frio/templates/profile_edit.tpl
view/theme/frio/templates/profile_entry.tpl
view/theme/frio/templates/profile_vcard.tpl
view/theme/frio/templates/prv_message.tpl
view/theme/frio/templates/register.tpl
view/theme/frio/templates/removeme.tpl
view/theme/frio/templates/search_item.tpl
view/theme/frio/templates/settings/connectors.tpl
view/theme/frio/templates/settings/display.tpl
view/theme/frio/templates/settings/features.tpl
view/theme/frio/templates/settings/oauth.tpl
view/theme/frio/templates/settings/oauth_edit.tpl
view/theme/frio/templates/settings/settings.tpl
view/theme/frio/templates/theme_settings.tpl
view/theme/frio/templates/vcard-widget.tpl
view/theme/frio/templates/wall_thread.tpl
view/theme/quattro/templates/contact_template.tpl
view/theme/quattro/templates/event_form.tpl
view/theme/quattro/templates/events.tpl
view/theme/quattro/templates/mail_conv.tpl
view/theme/quattro/templates/photo_item.tpl
view/theme/quattro/templates/photo_view.tpl
view/theme/quattro/templates/profile_vcard.tpl
view/theme/quattro/templates/search_item.tpl
view/theme/quattro/templates/wall_item_tag.tpl
view/theme/quattro/templates/wall_thread.tpl
view/theme/quattro/templates/widget_forumlist.tpl
view/theme/smoothly/templates/search_item.tpl
view/theme/smoothly/templates/wall_thread.tpl
view/theme/vier/templates/ch_connectors.tpl
view/theme/vier/templates/ch_directory_item.tpl
view/theme/vier/templates/comment_item.tpl
view/theme/vier/templates/communityhome.tpl
view/theme/vier/templates/contact_edit.tpl
view/theme/vier/templates/contact_template.tpl
view/theme/vier/templates/event_form.tpl
view/theme/vier/templates/nav.tpl
view/theme/vier/templates/photo_item.tpl
view/theme/vier/templates/photo_view.tpl
view/theme/vier/templates/profile_edit.tpl
view/theme/vier/templates/profile_vcard.tpl
view/theme/vier/templates/search_item.tpl
view/theme/vier/templates/wall_item_tag.tpl
view/theme/vier/templates/wall_thread.tpl
view/theme/vier/templates/widget_forumlist_right.tpl

index 7c68a73064ee065113c9ec507283df026b5cee65..7df6965a0422f2c4ce517b6e3d84342862391c8d 100644 (file)
@@ -17,7 +17,7 @@
 
 {{if $networks}}
 <hr style="clear:both"/>
-<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle|escape:'html'}}" />
+<div id="profile-jot-email-label">{{$emailcc}}</div><input type="text" name="emailcc" id="profile-jot-email" title="{{$emtitle}}" />
 <div id="profile-jot-email-end"></div>
 {{if $jotnets}}
 {{$jotnets}}
index 96b26d2d096563e6693f0ee9dbff6f7d37a369ca..fb908b70583ee2e4b7a00b9f77e67cbc92e2f577 100644 (file)
@@ -18,7 +18,7 @@
        </p>
 
        {{if $screenshot}}
-       <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1|escape}}" /></a>
+       <a href="{{$screenshot.0}}" class='screenshot'><img src="{{$screenshot.0}}" alt="{{$screenshot.1}}" /></a>
        {{/if}}
 
        {{if $admin_form}}
index 3afeb5355c99f20da8c58ce1c19f03f234cb3441..a77084d197ee8fcb060bf26d1387bc205c487f65 100644 (file)
                                {{foreach $contacts as $contact}}
                                <tr>
                                        <td class="checkbox"><input type="checkbox" class="contacts_ckbx" id="id_contact_{{$contact.id}}" name="contacts[]" value="{{$contact.id}}"/></td>
-                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname|escape}}" title="{{$contact.nickname|escape}}"></td>
-                                       <td class="name">{{$contact.name|escape}}</td>
-                                       <td class="addr">{{$contact.addr|escape}}</td>
-                                       <td class="addr"><a href="{{$contact.url}}" title="{{$contact.nickname|escape}}" >{{$contact.url}}</a></td>
+                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname}}" title="{{$contact.nickname}}"></td>
+                                       <td class="name">{{$contact.name}}</td>
+                                       <td class="addr">{{$contact.addr}}</td>
+                                       <td class="addr"><a href="{{$contact.url}}" title="{{$contact.nickname}}" >{{$contact.url}}</a></td>
                                </tr>
                                {{/foreach}}
                        </tbody>
                </table>
                <p><a href="#" onclick="return selectall('contacts_ckbx');">{{$select_all}}</a> | <a href="#" onclick="return selectnone('contacts_ckbx');">{{$select_none}}</a></p>
                {{$paginate}}
-               <div class="submit"><input type="submit" name="page_contactblock_unblock" value="{{$unblock|escape:'html'}}" /></div>
+               <div class="submit"><input type="submit" name="page_contactblock_unblock" value="{{$unblock}}" /></div>
        {{else}}
-               <p>{{$no_data|escape:'html'}}</p>
+               <p>{{$no_data}}</p>
        {{/if}}
        </form>
 
@@ -58,6 +58,6 @@
                                </tr>
                        </tbody>
                </table>
-               <div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit|escape:'html'}}" /></div>
+               <div class="submit"><input type="submit" name="page_contactblock_block" value="{{$submit}}" /></div>
        </form>
 </div>
index b2e6357a9a14f41402c67355910083e8a36dd62c..a218a38f56523d78418b727f93dd465641a10159 100644 (file)
@@ -2,13 +2,13 @@
     <h1>{{$title}} - {{$page}}</h1>
        
        <form action="{{$baseurl}}/admin/logs" method="post">
-           <input type='hidden' name='form_security_token' value="{{$form_security_token|escape:'html'}}">
+           <input type='hidden' name='form_security_token' value="{{$form_security_token}}">
 
            {{include file="field_checkbox.tpl" field=$debugging}}
            {{include file="field_input.tpl" field=$logfile}}
            {{include file="field_select.tpl" field=$loglevel}}
        
-           <div class="submit"><input type="submit" name="page_logs" value="{{$submit|escape:'html'}}" /></div>
+           <div class="submit"><input type="submit" name="page_logs" value="{{$submit}}" /></div>
        
        </form>
 
index 1ca0708bfcd1474fb7bef53639115688383bb890..f0b696fae42ffd9637ed29de353749c3d412c3a8 100644 (file)
@@ -17,7 +17,7 @@
                {{/foreach}}
 
                <div class="settings-submit-wrapper" >
-                       <input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
                </div>
        </div>
        {{/foreach}}
index 34b1e3b1b207d813622c9d37869c3e615e52c47c..dd40654b51b550204d250625ce298deeb50f6bfd 100644 (file)
@@ -39,7 +39,7 @@
        });
 </script>
 <div id='adminpage'>
-       <h1>{{$title|escape}} - {{$page|escape}}</h1>
+       <h1>{{$title}} - {{$page}}</h1>
 
        <form action="{{$baseurl}}/admin/site" method="post">
     <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
@@ -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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$registration}}</h3>
        {{include file="field_input.tpl" field=$register_text}}
        {{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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$upload}}</h3>
        {{include file="field_input.tpl" field=$maximagesize}}
        {{include file="field_input.tpl" field=$maximagelength}}
        {{include file="field_input.tpl" field=$jpegimagequality}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$corporate}}</h3>
        {{include file="field_input.tpl" field=$allowed_sites}}
        {{/if}}
        {{include file="field_checkbox.tpl" field=$dfrn_only}}
        {{include file="field_input.tpl" field=$global_directory}}
-       <div class="submit"><input type="submit" name="republish_directory" value="{{$republish|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="republish_directory" value="{{$republish}}" /></div>
        {{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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$advanced}}</h3>
        {{include file="field_select.tpl" field=$rino}}
        {{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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$portable_contacts}}</h3>
        {{include file="field_checkbox.tpl" field=$poco_completion}}
        {{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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        <h3>{{$performance}}</h3>
        {{include file="field_checkbox.tpl" field=$only_tag_search}}
        {{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}}
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-       <h3>{{$worker_title|escape}}</h3>
+       <h3>{{$worker_title}}</h3>
        {{include file="field_input.tpl" field=$maxloadavg}}
        {{include file="field_input.tpl" field=$min_memory}}
        {{include file="field_input.tpl" field=$worker_queues}}
        {{include file="field_checkbox.tpl" field=$worker_fastlane}}
        {{include file="field_checkbox.tpl" field=$worker_frontend}}
 
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
-       <h3>{{$relay_title|escape}}</h3>
+       <h3>{{$relay_title}}</h3>
        {{include file="field_checkbox.tpl" field=$relay_subscribe}}
        {{include file="field_input.tpl" field=$relay_server}}
        {{include file="field_checkbox.tpl" field=$relay_directly}}
        {{include file="field_input.tpl" field=$relay_server_tags}}
        {{include file="field_checkbox.tpl" field=$relay_user_tags}}
 
-       <div class="submit"><input type="submit" name="page_site" value="{{$submit|escape:'html'}}" /></div>
+       <div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
 
        </form>
 
        <h3>{{$relocate}}</h3>
        <strong>{{$relocate_warning}}</strong>
        {{include file="field_input.tpl" field=$relocate_url}}
-       <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
-       <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div>
+       <input type="hidden" name="page_site" value="{{$submit}}">
+       <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}" /></div>
        </form>
 
 </div>
index 75244924bd14f1865e86442399c5a7687dfb394b..b5260f361413518f8e0af0411095516edd4e7492 100644 (file)
@@ -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}}
-               <div class="submit"><input type="submit" name="page_tos" value="{{$submit|escape:'html'}}" /></div>
+               <div class="submit"><input type="submit" name="page_tos" value="{{$submit}}" /></div>
        </form>
        <h2>{{$preview}}</h2>
        {{for $i=1 to 3}}
index f06b0f9734b31b9a11601654195ec150e1ed63f7..88feb6136a22148ede0f58f902620df5ea74d8d7 100644 (file)
@@ -35,8 +35,8 @@
                                        <td class="email">{{$u.email}}</td>
                                        <td class="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
                                        <td class="tools">
-                                               <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve|escape}}'><span class='icon like'></span></a>
-                                               <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny|escape}}'><span class='icon dislike'></span></a>
+                                               <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve}}'><span class='icon like'></span></a>
+                                               <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
                                        </td>
                                </tr>
                                <tr>
@@ -46,7 +46,7 @@
                                </tbody>
                        </table>
                        <div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div>
-                       <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny|escape:'html'}}"/> <input type="submit" name="page_users_approve" value="{{$approve|escape:'html'}}" /></div>                    
+                       <div class="submit"><input type="submit" name="page_users_deny" value="{{$deny}}"/> <input type="submit" name="page_users_approve" value="{{$approve}}" /></div>
                {{else}}
                        <p>{{$no_pending}}</p>
                {{/if}}
@@ -79,8 +79,8 @@
                                <tbody>
                                {{foreach $users as $u}}
                                        <tr>
-                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname|escape}}" title="{{$u.nickname|escape}}"></td>
-                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname|escape}}" >{{$u.name}}</a></td>
+                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
                                                <td class='email'>{{$u.email}}</td>
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
@@ -94,8 +94,8 @@
                                                {{/if}}
                                                <td class="tools">
                                                {{if $u.is_deletable}}
-                                                       <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock|escape}}{{else}}{{$block|escape}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
-                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete|escape}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
+                                                       <a href="{{$baseurl}}/admin/users/block/{{$u.uid}}?t={{$form_security_token}}" title='{{if $u.blocked}}{{$unblock}}{{else}}{{$block}}{{/if}}'><span class='icon block {{if $u.blocked==0}}dim{{/if}}'></span></a>
+                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" title='{{$delete}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></span></a>
                                                {{else}}
                                                        &nbsp;
                                                {{/if}}
                                </tbody>
                        </table>
                        <div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div>
-                       <div class="submit"><input type="submit" name="page_users_block" value="{{$block|escape:'html'}}/{{$unblock|escape:'html'}}" /> <input type="submit" name="page_users_delete" value="{{$delete|escape:'html'}}" onclick="return confirm_delete_multi()" /></div>                                                
+                       <div class="submit"><input type="submit" name="page_users_block" value="{{$block}}/{{$unblock}}" /> <input type="submit" name="page_users_delete" value="{{$delete}}" onclick="return confirm_delete_multi()" /></div>
                {{else}}
                        NO USERS?!?
                {{/if}}
                                <tbody>
                                {{foreach $deleted as $u}}
                                        <tr>
-                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname|escape}}" title="{{$u.nickname|escape}}"></td>
-                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname|escape}}" >{{$u.name}}</a></td>
+                                               <td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname}}" title="{{$u.nickname}}"></td>
+                                               <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
                                                <td class='email'>{{$u.email}}</td>
                                                <td class='register_date'>{{$u.register_date}}</td>
                                                <td class='login_date'>{{$u.login_date}}</td>
     </tr> 
       </tbody> 
   </table> 
-  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit|escape:'html'}}" /></div>             
+  <div class="submit"><input type="submit" name="add_new_user_submit" value="{{$submit}}" /></div>
   </form>
 </div>
index 3d1d7573d7d51c1a289be4eb463ff3ca32debb7d..72aedd8b70aa02afc9a0f5e588a6eaa1401ea2e8 100644 (file)
@@ -4,12 +4,12 @@
 
 
 <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
-<input type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" >
+<input type="text" size="64" name="albumname" value="{{$album}}" >
 
 <div id="photo-album-edit-name-end"></div>
 
-<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+<input id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
 
 </form>
 </div>
index c7e10482ef0875e942c50ce9a5b51eaf135aca2f..f1cca45464ec3d59b172140698ba20e73d2a609e 100644 (file)
        <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
         {{if $myaddr}}
                 {{$myaddr}}
-                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr|escape:'html'}}" />
+                <input type="hidden" name="dfrn_url" id="dfrn-url" value="{{$myaddr}}" />
         {{else}}
-        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+        <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
         {{/if}}
         {{if $url}}
-                <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+                <input type="hidden" name="url" id="url" value="{{$url}}" />
         {{/if}}
        <div id="dfrn-request-url-end"></div>
 </div>
@@ -53,8 +53,8 @@
 
        <div id="dfrn-request-submit-wrapper">
                {{if $submit}}
-                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
                {{/if}}
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
        </div>
 </form>
index 9261ff8d32af1e912266d98aaa3cffba217ac5b2..6aa51d470267c7eb3a3b54d564f984484d3e3ce4 100644 (file)
@@ -1,10 +1,10 @@
 
 {{if $count}}
 <div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title|escape}}</div>
+<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">{{$event_title}}</div>
 <div id="birthday-title-end"></div>
 {{foreach $events as $event}}
-<div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title|escape}}</a> {{$event.date}} </div>
+<div class="birthday-list" id="birthday-{{$event.id}}"> <a href="{{$event.link}}">{{$event.title}}</a> {{$event.date}} </div>
 {{/foreach}}
 </div>
 {{/if}}
index 63ec5d728b453d75fbefae77afe4bd69c1c57b23..6ad01b991b94dd31fad05118f08d3249db80765b 100644 (file)
                                        <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
                                        <option value=""></option>
                                {{foreach $qcomment as $qc}}
-                                       <option value="{{$qc|escape:'html'}}">{{$qc}}</option>
+                                       <option value="{{$qc}}">{{$qc}}</option>
                                {{/foreach}}
                                        </select>
                                {{/if}}
 
                                <div class="comment-edit-text-end"></div>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" >
-                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit|escape:'html'}}" />
+                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
                                        {{if $preview}}<span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>{{/if}}
                                        <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
                                </div>
index a365678184b400804dcf0af7a986d9103f41c95a..496724e3d9c4209c5b9281e5f2613e8e6b13fb0f 100644 (file)
@@ -4,11 +4,11 @@
 
        <h3 id="confirm-message">{{$message}}</h3>
        {{foreach $extra_inputs as $input}}
-       <input type="hidden" name="{{$input.name}}" value="{{$input.value|escape:'html'}}" />
+       <input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
        {{/foreach}}
 
-       <input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm|escape:'html'}}" />
-       <input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel|escape:'html'}}" />
+       <input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm}}" />
+       <input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
 
 </form>
 </center>
index 590af0205d2a52460e44509f188ce7612f1d0f85..19a1c7350459228a6f17536025cedf07dc9d4042 100644 (file)
                                {{/if}}
                        </div>
 
-                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
                        {{/if}}
                        <div class="contact-edit-submit-end clearfix"></div>
 
index 6845c6256261fb6b31b7977e28ec6e1ec2f17d5b..06918533ca0ee4bcfcbbb33b194142b6d7683cc0 100644 (file)
@@ -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)" >
 
-                       <a href="{{$contact.url}}" title="{{$contact.img_hover|escape}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" /></a>
+                       <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
                        {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
@@ -31,7 +31,7 @@
 
        <div class="contact-entry-desc">
                <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
-                       {{$contact.name|escape}}
+                       {{$contact.name}}
                        {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
                </div>
                {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
index d85fcfb5af41460c698b20a0c4a8ea57d2eea377..c8c81dbb5e1801e4fe53d2b4ae78807dcd1a2054 100644 (file)
@@ -6,8 +6,8 @@
 <div id="contacts-search-wrapper">
 <form id="contacts-search-form" action="{{$cmd}}" method="get" >
 <span class="contacts-search-desc">{{$desc}}</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
-<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit|escape:'html'}}" />
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+<input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
 </form>
 </div>
 <div id="contacts-search-end"></div>
@@ -21,7 +21,7 @@
 <div id="contact-edit-end"></div>
 <div id="contacts-actions">
 {{foreach $batch_actions as $n=>$l}}
- <input class="batch-action" name="{{$n}}" value="{{$l|escape:'html'}}" type="submit">
+ <input class="batch-action" name="{{$n}}" value="{{$l}}" type="submit">
  {{/foreach}}
  </div>
 </form>
index 72528bd26193246ff80c4684dc73e3e549ed4904..0eab89110cd5bf10c1b2458422c4158ad5351040 100644 (file)
@@ -43,6 +43,6 @@
        {{include file="field_select.tpl" field=$remote_self}}
        {{/if}}
 
-       <input type="submit" name="submit" value="{{$lbl_submit|escape:'html'}}" />
+       <input type="submit" name="submit" value="{{$lbl_submit}}" />
 
 </form>
index 144277310e0c1c50dc984d339c8530c70f33b972..dc5e43096cf70ac4cde7ce11fdd2e550c945c794 100644 (file)
@@ -48,7 +48,7 @@
        <input type="hidden" name="width"  id="width" />
 
        <div id="crop-image-submit-wrapper" >
-               <input type="submit" name="submit" value="{{$done|escape:'html'}}" />
+               <input type="submit" name="submit" value="{{$done}}" />
        </div>
 
 </form>
index 0cb6e7e3ece4ca5a51d322f72f56ef23a2ade331..b2a78fe093567849b7f1d47cbe7cb62f3c878e99 100644 (file)
@@ -8,7 +8,7 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 {{include file="field_select.tpl" field=$parent_user}}
 {{include file="field_password.tpl" field=$parent_password}}
-<div class="submit"><input type="submit" name="delegate" value="{{$submit|escape:'html'}}" /></div>
+<div class="submit"><input type="submit" name="delegate" value="{{$submit}}" /></div>
 </form>
 </div>
 {{/if}}
index d49b5bbf2d44e8a68c0ff40b48bc8671c4e23015..accfd4f83f162bcf5054a3bd1c73d3fd64351e49 100644 (file)
@@ -17,6 +17,6 @@
 
 
 <div id="dfrn-request-homecoming-submit-wrapper" >
-<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input id="dfrn-request-homecoming-submit" type="submit" name="submit" value="{{$submit}}" />
 </div>
 </form>
\ No newline at end of file
index 8e686c33dc1642df69898dc0ba7cfc3cbe6aa0aa..ca35ae6747cb3bcb6b924aab62dd0daf6f72d1ee 100644 (file)
        <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
        {{if $myaddr}}
                {{$myaddr}}
-               <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+               <input type="hidden" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
        {{else}}
-       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr|escape:'html'}}" />
+       <input type="text" name="dfrn_url" id="dfrn-url" size="32" value="{{$myaddr}}" />
        {{/if}}
        {{if $url}}
-               <input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" />
+               <input type="hidden" name="url" id="url" value="{{$url}}" />
        {{/if}}
        <div id="dfrn-request-url-end"></div>
 </div>
@@ -83,8 +83,8 @@
 
        <div id="dfrn-request-submit-wrapper">
                {{if $submit}}
-                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" id="dfrn-request-submit-button" value="{{$submit}}" />
                {{/if}}
-               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel|escape:'html'}}" />
+               <input type="submit" name="cancel" id="dfrn-request-cancel-button" value="{{$cancel}}" />
        </div>
 </form>
index 46f17de40e06849636fe3761d4e04ece19a8c12c..8c05b30c6083c93b36ff08a5031b02a49884a9d5 100644 (file)
@@ -11,8 +11,8 @@
 <div id="directory-search-wrapper">
        <form id="directory-search-form" action="directory" method="get" >
                <span class="dirsearch-desc">{{$desc}}</span>
-               <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" />
-               <input type="submit" name="submit" id="directory-search-submit" value="{{$submit|escape:'html'}}" class="button" />
+               <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search}}" />
+               <input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
        </form>
 </div>
 
index de8de44e88ce43341e50ce2454967c5bc5537383..3676ba458af07cd9c9e641fd03cc098bf070b110 100644 (file)
@@ -39,7 +39,7 @@
 {{$acl}}
 
 <div class="clear"></div>
-<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
-<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
 
index af9a554942e8c3f7745f7aa7c310475a0cbc27d7..15975c5d5155aa0edf7891c8e11a28d3da67f133 100644 (file)
@@ -1,16 +1,16 @@
 
 <div class="vevent">
-       <div class="summary event-summary">{{$title|escape}}</div>
+       <div class="summary event-summary">{{$title}}</div>
 
        <div class="event-start">
                <span class="event-label">{{$dtstart_label}}</span>&nbsp;
-               <span class="dtstart" title="{{$dtstart_title|escape}}">{{$dtstart_dt}}</span>
+               <span class="dtstart" title="{{$dtstart_title}}">{{$dtstart_dt}}</span>
        </div>
 
        {{if $finish}}
        <div class="event-end">
                <span class="event-label">{{$dtend_label}}</span>&nbsp;
-               <span class="dtend" title="{{$dtend_title|escape}}">{{$dtend_dt}}</span>
+               <span class="dtend" title="{{$dtend_title}}">{{$dtend_dt}}</span>
        </div>
        {{/if}}
 
index 08278954c3b99f0dd5e939b5a91afc098226b362..2fcb1908d70b2e419036f30485ad819d12126808 100644 (file)
@@ -1,10 +1,10 @@
 
 {{if $count}}
 <div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div>
-<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title|escape}}</div>
+<div id="event-wrapper" style="display: none;" ><div id="event-title">{{$event_title}}</div>
 <div id="event-title-end"></div>
 {{foreach $events as $event}}
-<div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="events/?id={{$event.id}}">{{$event.title|escape}}</a> - {{$event.date}} </div>
+<div class="event-list" id="event-{{$event.id}}"> <a class="ajax-popupbox" href="events/?id={{$event.id}}">{{$event.title}}</a> - {{$event.date}} </div>
 {{/foreach}}
 </div>
 {{/if}}
index 876e607cdfef9958c6f48acfe2442be10bda180e..9edc4aeff630fbcdefe1aebffb1f87b5b5ba4d54 100644 (file)
@@ -4,13 +4,13 @@
                {{* html5 don't work on Chrome, Safari and IE9
                <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
                <datalist id="data_{{$field.0}}" >
-                  {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{/foreach}}
+                  {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{/foreach}}
                </datalist> *}}
                
                <input id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'>
                <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
                        <option value="">{{$field.5}}</option>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$val|escape:'html'}}">{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$val}}">{{$val}}</option>{{/foreach}}
                </select>
                
                {{if $field.3}}
index 850656bb8c8f0da0cc8a814f2bdcfc2839737efe..f3f32d806870309a16ebf8c0f528d99ddf918185 100644 (file)
@@ -1,7 +1,7 @@
        
        <div class='field input' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <input{{if $field.6 eq 'email'}} type='email'{{elseif $field.6 eq 'url'}} type='url'{{else}} type="text"{{/if}} name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby='{{$field.0}}_tip'>
                {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
                {{/if}}
index 9c5f04e796d6ddeefc403e4622dc289f66b6a597..4e2b9bd7b757ef5ed0e33ee85c1bfe1f4e52a02b 100644 (file)
@@ -2,7 +2,7 @@
        
        <div class='field checkbox'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <input type="checkbox" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.3}}" {{if $field.2}}checked="true"{{/if}} aria-describedby='{{$field.0}}_tip'>
                {{if $field.4}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span>
                {{/if}}
index 9a18bbc13c3cb02a9659090be948e5364ea1ae55..063b4c84b7078f93e2d075cc2550204dd5d382bf 100644 (file)
@@ -1,7 +1,7 @@
        
        <div class='field input openid' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
+               <input name='{{$field.0}}' id='id_{{$field.0}}' type="text" value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'>
                {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
                {{/if}}
index 4b4d4f2b2e3a5905390007ad63fdfed33ec0d571..7ee2ec69f7a9fc15986efda2e3a61554bcb56c6f 100644 (file)
@@ -1,7 +1,7 @@
        
        <div class='field password' id='wrapper_{{$field.0}}'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
-               <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
+               <input type='password' name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
                {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span>
                {{/if}}
index 1e1d8e0b10c129131380e846a7eca61ef2421bba..ddd78d5aa396fba334244de5c3677b86287fb185 100644 (file)
@@ -1,6 +1,6 @@
        <div class='field radio'>
                <label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label>
-               <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2|escape:'html'}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
+               <input type="radio" name='{{$field.0}}' id='id_{{$field.0}}_{{$field.2}}' value="{{$field.2}}" {{if $field.4}}checked{{/if}} aria-describedby={{$field.0}}_{{$field.2}}_tip'>
                {{if $field.3}}
                <span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span>
                {{/if}}
index 87a2ab9ff8eb6fedbd2ab8a99c01e69963689c71..6d0603167c522f1d14641a2f832b6beb34e52642 100644 (file)
@@ -3,7 +3,7 @@
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
                {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
index 5f56c187ef957df5a4a253cbe233645612a34379..936f25382d9a15f523318431254c12046d296e1b 100644 (file)
@@ -3,7 +3,7 @@
        <div class='field select'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <select name='{{$field.0}}' id='id_{{$field.0}}' {{if $field.5}}onchange="previewTheme(this);"{{/if}} aria-describedby='{{$field.0}}_tip'>
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
                {{if $field.3}}
                <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span>
index 7e7c3cc4eea64f683cf1692058f02d0a5a093cdf..2a028d10c87ba7c9beac162a35c21b17c0418a4e 100644 (file)
@@ -2,7 +2,7 @@
        <div class='field yesno'>
                <label for='id_{{$field.0}}'>{{$field.1}}</label>
                <div class='onoff' id="id_{{$field.0}}_onoff">
-                       <input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2|escape:'html'}}" aria-describedby='{{$field.0}}_tip'>
+                       <input  type="hidden" name='{{$field.0}}' id='id_{{$field.0}}' value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'>
                        <a href="#" class='off'>
                                {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
                        </a>
index 27a73d0398a6201ae3dc741653ebe631c52dfa3d..f1417c12dba440674cadec73d043e369c12629f5 100644 (file)
@@ -40,7 +40,7 @@
        </div>
 
        <div class="upload">
-               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" /> {{$upload}}</button>
+               <button id="upload-{{$type}}"><img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> {{$upload}}</button>
        </div>
 </div>
 
index 27aa9b2f5b3ab5c9180ebef9d67cbee3e6ec9cc2..77f48e8aee1bc0a360d466d6e440be6fb9b4077d 100644 (file)
@@ -1,5 +1,5 @@
 
 {{include file="field_combobox.tpl"}}
 <div class="settings-submit-wrapper" >
-       <input id="filer_save" type="button" class="settings-submit" value="{{$submit|escape:'html'}}" />
+       <input id="filer_save" type="button" class="settings-submit" value="{{$submit}}" />
 </div>
index b622bb3e1dd0a65e28ee68a1c2b90cd10331c244..07e64d89c9caa443891b5c86079c5dfd115bb261 100644 (file)
@@ -1,4 +1,4 @@
 {{foreach $items as $item }}\r
-<p>{{$item.title|escape}}  ({{$item.mime|escape}}) ({{$item.filename|escape}})</p>\r
+<p>{{$item.title}}  ({{$item.mime}}) ({{$item.filename}})</p>\r
 {{/foreach}}\r
 {{include "paginate.tpl"}}\r
index ece5ed17b860e6e6a1388507d501400c4c5b12ed..71d0625072ea2b692c6ef61216e8bdc454559129 100644 (file)
@@ -3,7 +3,7 @@
        <h3>{{$connect}}</h3>
        <div id="connect-desc">{{$desc}}</div>
        <form action="follow" method="get" >
-               <input id="side-follow-url" type="text" name="url" value="{{$value|escape:'html'}}" size="24" placeholder="{{$hint|escape:'html'}}" title="{{$hint|escape:'html'}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow|escape:'html'}}" />
+               <input id="side-follow-url" type="text" name="url" value="{{$value}}" size="24" placeholder="{{$hint}}" title="{{$hint}}" /><input id="side-follow-submit" type="submit" name="submit" value="{{$follow}}" />
        </form>
 </div>
 
index cb9f4198b4cfbccf7316b0c113d64493f02f8b75..c37e8b48ac2791b07207d31883f9e3ba509f6fbc 100644 (file)
@@ -10,7 +10,7 @@
                {{include file="field_input.tpl" field=$gname}}
                {{if $drop}}{{$drop}}{{/if}}
                <div id="group-edit-submit-wrapper" >
-                       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" >
+                       <input type="submit" name="submit" value="{{$submit}}" >
                </div>
                <div id="group-edit-select-end" ></div>
        </form>
index f1983d7dc6d9137b3860ce5e92ef2ff3647ec8ea..e76b97b8b94c87822daf51c9ee43f49d3b369ff6 100644 (file)
@@ -9,7 +9,7 @@
 <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
 
 {{foreach $stylesheets as $stylesheetUrl}}
-<link rel="stylesheet" href="{{$stylesheetUrl|escape:"html":"UTF-8"}}" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="screen" />
 {{/foreach}}
 
 <link rel="shortcut icon" href="{{$shortcut_icon}}" />
index ec87591b9fa03b864dc92fb2fdeeda9a832c398f..7bf37e74b3b63088d53b5d3a6c6fca89c62e03c0 100644 (file)
@@ -3,15 +3,15 @@
                <div class="hover-card-header left-align">
                        <div class="hover-card-pic left-align">
                                <span class="image-wrapper medium">
-                                       <a href="{{$profile.url}}" title="{{$profile.name|escape}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}" alt="{{$profile.name|escape}}"></a>
+                                       <a href="{{$profile.url}}" title="{{$profile.name}}"><img href="" class="left-align thumbnail" src="{{$profile.thumb}}" alt="{{$profile.name}}"></a>
                                </span>
                        </div>
                        <div class="hover-card-content">
                                <div class="profile-entry-name">
-                                       <h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name|escape}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}
+                                       <h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}
                                </div>
                                <div class="profile-details">
-                                       <span class="profile-addr">{{$profile.addr|escape}}</span>
+                                       <span class="profile-addr">{{$profile.addr}}</span>
                                        {{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}
                                </div>
                                {{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}}
                                {{* here are the differnt actions like privat message, poke, delete and so on *}}
                                {{* @todo we have two different photo menus one for contacts and one for items at the network stream. We currently use the contact photo menu, so the items options are missing We need to move them *}}
                                <div class="hover-card-actions-social">
-                                       {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.pm.1}}')" aria-label="{{$profile.actions.pm.0}}" title="{{$profile.actions.pm.0|escape}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
-                                       {{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.poke.1}}')" aria-label="{{$profile.actions.poke.0}}" title="{{$profile.actions.poke.0|escape}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.pm}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.pm.1}}')" aria-label="{{$profile.actions.pm.0}}" title="{{$profile.actions.pm.0}}"><i class="fa fa-envelope" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.poke}}<a class="btn btn-labeled btn-primary btn-sm" onclick="addToModal('{{$profile.actions.poke.1}}')" aria-label="{{$profile.actions.poke.0}}" title="{{$profile.actions.poke.0}}"><i class="fa fa-heartbeat" aria-hidden="true"></i></a>{{/if}}
                                </div>
                                <div class="hover-card-actions-connection">
-                                       {{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0|escape}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
-                                       {{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" aria-label="{{$profile.actions.edit.0}}" title="{{$profile.actions.edit.0|escape}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
-                                       {{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" aria-label="{{$profile.actions.follow.0}}" title="{{$profile.actions.follow.0|escape}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.network}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.network.1}}" aria-label="{{$profile.actions.network.0}}" title="{{$profile.actions.network.0}}"><i class="fa fa-cloud" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.edit}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.edit.1}}" aria-label="{{$profile.actions.edit.0}}" title="{{$profile.actions.edit.0}}"><i class="fa fa-user" aria-hidden="true"></i></a>{{/if}}
+                                       {{if $profile.actions.follow}}<a class="btn btn-labeled btn-primary btn-sm" href="{{$profile.actions.follow.1}}" aria-label="{{$profile.actions.follow.0}}" title="{{$profile.actions.follow.0}}"><i class="fa fa-user-plus" aria-hidden="true"></i></a>{{/if}}
                                </div>
                        </div>
                </div>
index f960729111f77d862577f1203d31532003c3a68c..cdb562f3a460e1600e6b838c748b2811f675f5cc 100644 (file)
 </table>
 
 {{if $phpath}}
-       <input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}">
+       <input type="hidden" name="phpath" value="{{$phpath}}">
 {{/if}}
 
 {{if $passed}}
        <input type="hidden" name="pass" value="2">
-       <input type="submit" value="{{$next|escape:'html'}}">
+       <input type="submit" value="{{$next}}">
 {{else}}
        <input type="hidden" name="pass" value="1">
-       <input type="submit" value="{{$reload|escape:'html'}}">
+       <input type="submit" value="{{$reload}}">
 {{/if}}
 </form>
index 6c018db722922647c8577e81992c3ea1fab98b10..67250abf0bac6535e5e8bb4c6fd46b4c0e4e9a2b 100644 (file)
@@ -21,7 +21,7 @@
 
 <form id="install-form" action="{{$baseurl}}/install" method="post">
 
-<input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}" />
+<input type="hidden" name="phpath" value="{{$phpath}}" />
 <input type="hidden" name="pass" value="3" />
 
 {{include file="field_input.tpl" field=$dbhost}}
@@ -30,7 +30,7 @@
 {{include file="field_input.tpl" field=$dbdata}}
 
 
-<input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> 
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
 
 </form>
 
index 55e5ea34b10e95d46bbb00afe4ce8931c230fb8f..fca11a042593782fc2c956da4577dabbc5882c6e 100644 (file)
@@ -6,18 +6,18 @@
 
 <form id="install-form" action="{{$baseurl}}/install" method="post">
 
-<input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}" />
-<input type="hidden" name="dbhost" value="{{$dbhost|escape:'html'}}" />
-<input type="hidden" name="dbuser" value="{{$dbuser|escape:'html'}}" />
-<input type="hidden" name="dbpass" value="{{$dbpass|escape:'html'}}" />
-<input type="hidden" name="dbdata" value="{{$dbdata|escape:'html'}}" />
+<input type="hidden" name="phpath" value="{{$phpath}}" />
+<input type="hidden" name="dbhost" value="{{$dbhost}}" />
+<input type="hidden" name="dbuser" value="{{$dbuser}}" />
+<input type="hidden" name="dbpass" value="{{$dbpass}}" />
+<input type="hidden" name="dbdata" value="{{$dbdata}}" />
 <input type="hidden" name="pass" value="4" />
 
 {{include file="field_input.tpl" field=$adminmail}}
 {{$timezone}}
 {{include file="field_select.tpl" field=$language}}
 
-<input id="install-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" /> 
+<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
 
 </form>
 
index 9ebd256db8eb168a7cadb5fd5ecab4b2509a6d67..fc9d0b3b30ba2cf2844597b9daaf5b0f8763911c 100644 (file)
@@ -3,7 +3,7 @@
 <div class="intro-wrapper" id="intro-{{$contact_id}}" >
 
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
-<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+<img id="photo-{{$contact_id}}" class="intro-photo" src="{{$photo}}" width="175" height=175" title="{{$fullname}}" alt="{{$fullname}}" />
 <dl><dt>{{$lbl_url}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>
 {{if $location}}<dl><dt>{{$lbl_location}}</dt><dd>{{$location}}</dd></dl>{{/if}}
 {{if $gender}}<dl><dt>{{$lbl_gender}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
@@ -13,8 +13,8 @@
 <div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
 <div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
 <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
-{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />{{/if}}
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
 </form>
 <div class="intro-form-end"></div>
 
@@ -26,7 +26,7 @@
 
 {{$dfrn_text}}
 
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}" />
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>
index 2087635e4fb34c42b8b9b7e4f62448c1a222b750..6f161fd4f53798e831d5a891c605142f689d0f1b 100644 (file)
@@ -11,7 +11,7 @@
                {{include file="field_textarea.tpl" field=$message}}
 
                <div id="invite-submit-wrapper">
-                       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                       <input type="submit" name="submit" value="{{$submit}}" />
                </div>
 
        </div>
index ca6d506ac6a8411a5a8a063136084fca66281f16..0c450598a417e8b0b78f4793b13e9088c7b90197 100644 (file)
@@ -9,8 +9,8 @@
                <input type="hidden" name="wall" value="{{$wall}}" />
                <input type="hidden" name="post_type" value="{{$posttype}}" />
                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
-               <input type="hidden" name="return" value="{{$return_path|escape:'html'}}" />
-               <input type="hidden" name="location" id="jot-location" value="{{$defloc|escape:'html'}}" />
+               <input type="hidden" name="return" value="{{$return_path}}" />
+               <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
                <input type="hidden" name="coord" id="jot-coord" value="" />
                <input type="hidden" name="post_id" value="{{$post_id}}" />
                <input type="hidden" name="preview" id="jot-preview" value="0" />
@@ -18,9 +18,9 @@
                {{if $notes_cid}}
                <input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
                {{/if}}
-               <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle|escape:'html'}}" value="{{$title|escape:'html'}}" class="jothidden" style="display:none"></div>
+               <div id="jot-title-wrap"><input name="title" id="jot-title" type="text" placeholder="{{$placeholdertitle}}" value="{{$title}}" class="jothidden" style="display:none"></div>
                {{if $placeholdercategory}}
-               <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory|escape:'html'}}" value="{{$category|escape:'html'}}" class="jothidden" style="display:none" /></div>
+               <div id="jot-category-wrap"><input name="category" id="jot-category" type="text" placeholder="{{$placeholdercategory}}" value="{{$category}}" class="jothidden" style="display:none" /></div>
                {{/if}}
                <div id="jot-text-wrap">
                <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
                </div>
 
 <div id="profile-jot-submit-wrapper" class="jothidden">
-       <input type="submit" id="profile-jot-submit" name="submit" value="{{$share|escape:'html'}}" />
+       <input type="submit" id="profile-jot-submit" name="submit" value="{{$share}}" />
 
        <div id="profile-upload-wrapper" style="display: {{$visitor}};" >
-               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload|escape:'html'}}"></a></div>
+               <div id="wall-image-upload-div" ><a href="#" onclick="return false;" id="wall-image-upload" class="icon camera" title="{{$upload}}"></a></div>
        </div>
        <div id="profile-attach-wrapper" style="display: {{$visitor}};" >
-               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach|escape:'html'}}"></a></div>
+               <div id="wall-file-upload-div" ><a href="#" onclick="return false;" id="wall-file-upload" class="icon attach" title="{{$attach}}"></a></div>
        </div>
 
        <div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" >
                <a id="profile-link" class="icon link" title="{{$weblink}}" ondragenter="return linkdropper(event);" ondragover="return linkdropper(event);" ondrop="linkdrop(event);" onclick="jotGetLink(); return false;"></a>
        </div>
        <div id="profile-video-wrapper" style="display: {{$visitor}};" >
-               <a id="profile-video" class="icon video" title="{{$video|escape:'html'}}" onclick="jotVideoURL();return false;"></a>
+               <a id="profile-video" class="icon video" title="{{$video}}" onclick="jotVideoURL();return false;"></a>
        </div>
        <div id="profile-audio-wrapper" style="display: {{$visitor}};" >
-               <a id="profile-audio" class="icon audio" title="{{$audio|escape:'html'}}" onclick="jotAudioURL();return false;"></a>
+               <a id="profile-audio" class="icon audio" title="{{$audio}}" onclick="jotAudioURL();return false;"></a>
        </div>
        <div id="profile-location-wrapper" style="display: {{$visitor}};" >
-               <a id="profile-location" class="icon globe" title="{{$setloc|escape:'html'}}" onclick="jotGetLocation();return false;"></a>
+               <a id="profile-location" class="icon globe" title="{{$setloc}}" onclick="jotGetLocation();return false;"></a>
        </div>
        <div id="profile-nolocation-wrapper" style="display: none;" >
-               <a id="profile-nolocation" class="icon noglobe" title="{{$noloc|escape:'html'}}" onclick="jotClearLocation();return false;"></a>
+               <a id="profile-nolocation" class="icon noglobe" title="{{$noloc}}" onclick="jotClearLocation();return false;"></a>
        </div>
 
        <div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" >
-               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset|escape:'html'}}" ></a>{{$bang}}
+               <a href="#profile-jot-acl-wrapper" id="jot-perms-icon" class="icon {{$lockstate}}"  title="{{$permset}}" ></a>{{$bang}}
        </div>
 
        <!-- {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}} -->
-       {{if $preview}}<input type="submit" onclick="preview_post(); return false;" id="jot-preview-link" value="{{$preview|escape:'html'}}" />{{/if}}
+       {{if $preview}}<input type="submit" onclick="preview_post(); return false;" id="jot-preview-link" value="{{$preview}}" />{{/if}}
 
        <div id="profile-jot-perms-end"></div>
 
@@ -68,7 +68,7 @@
        </div>
 
        <div id="profile-rotator-wrapper" style="display: {{$visitor}};" >
-               <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait|escape:'html'}}" style="display: none;" />
+               <img id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
        </div>
 
        <div id="jot-preview-content" style="display:none;"></div>
index 029ebb0343591c35b34ca9465966be0d4d7e5a1f..19db6afc7c6240174e0f757cec748049c5a8fa50 100644 (file)
@@ -10,7 +10,7 @@
        {{include file="field_input.tpl" field=$lname}}
        {{include file="field_password.tpl" field=$lpassword}}
        <div id="login-lost-password-link">
-               <a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
+               <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
        </div>
        </div>
        
        {{/if}}
 
        <div id="login-submit-wrapper" >
-               <input type="submit" name="submit" id="login-submit-button" value="{{$login|escape:'html'}}" />
+               <input type="submit" name="submit" id="login-submit-button" value="{{$login}}" />
        </div>
 
        {{include file="field_checkbox.tpl" field=$lremember}}
        
        {{foreach $hiddens as $k=>$v}}
-               <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
+               <input type="hidden" name="{{$k}}" value="{{$v}}" />
        {{/foreach}}
        
 </div>
@@ -35,8 +35,8 @@
 
 {{if $register}}
 <div id="login-extra-links">
-       <h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
-       <a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a>
+       <h3 id="login-head" class="sr-only">{{$register.title}}</h3>
+       <a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>
 </div>
 {{/if}}
 
index 343088d5582719652e169c32fb8151b0ae46640d..ba66f831cc3874c8cb0493669d1d7818818403a1 100644 (file)
@@ -2,6 +2,6 @@
 <form action="{{$dest_url}}" method="post" >
 <div class="logout-wrapper">
 <input type="hidden" name="auth-params" value="logout" />
-<input type="submit" name="submit" id="logout-button" value="{{$logout|escape:'html'}}" />
+<input type="submit" name="submit" id="logout-button" value="{{$logout}}" />
 </div>
 </form>
index 3dfbb7a2375b094559236d416f536082ff3e94f5..e28586082044a99b63f17c3b67e533bd286495ff 100644 (file)
@@ -12,7 +12,7 @@
 </div>
 <div id="login-extra-end"></div>
 <div id="login-submit-wrapper" >
-        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit|escape:'html'}}" />
+        <input type="submit" name="submit" id="lostpass-submit-button" value="{{$submit}}" />
 </div>
 <div id="login-submit-end"></div>
 </form>
index 1fc4df37ff64439175526471c1966a3e64b5251f..d52bf172a0e1957c6802dd51d30e664b100216cc 100644 (file)
@@ -4,27 +4,27 @@
                                <input type="hidden" name="type" value="{{$type}}" />
                                <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
                                <input type="hidden" name="parent" value="{{$parent}}" />
-                               <input type="hidden" name="return" value="{{$return_path|escape:'html'}}" />
+                               <input type="hidden" name="return" value="{{$return_path}}" />
                                <input type="hidden" name="jsreload" value="{{$jsreload}}" />
                                <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
 
                                <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
-                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle|escape:'html'}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle|escape:'html'}}" title="{{$mytitle|escape:'html'}}" /></a>
+                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
                                </div>
                                <div class="comment-edit-photo-end"></div>
                                <div id="mod-cmnt-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
                                        <div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div>
-                                       <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname|escape:'html'}}" />
+                                       <input type="text" id="mod-cmnt-name-{{$id}}" class="mod-cmnt-name" name="mod-cmnt-name" value="{{$modname}}" />
                                        <div id="mod-cmnt-email-lbl-{{$id}}" class="mod-cmnt-email-lbl">{{$lbl_modemail}}</div>
-                                       <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail|escape:'html'}}" />
+                                       <input type="text" id="mod-cmnt-email-{{$id}}" class="mod-cmnt-email" name="mod-cmnt-email" value="{{$modemail}}" />
                                        <div id="mod-cmnt-url-lbl-{{$id}}" class="mod-cmnt-url-lbl">{{$lbl_modurl}}</div>
-                                       <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl|escape:'html'}}" />
+                                       <input type="text" id="mod-cmnt-url-{{$id}}" class="mod-cmnt-url" name="mod-cmnt-url" value="{{$modurl}}" />
                                </div>
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});" onBlur="commentClose(this,{{$id}});"></textarea>
 
                                <div class="comment-edit-text-end"></div>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
-                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit|escape:'html'}}" />
+                                       <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
                                        <span onclick="preview_comment({{$id}});" id="comment-edit-preview-link-{{$id}}" class="fakelink">{{$preview}}</span>
                                        <div id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
                                </div>
index d513d6b2efde4b1125dfaab769806fde94ccc2cb..10d9d5069dc70d5130ab80d5ad48ef5599129fbc 100644 (file)
@@ -7,5 +7,5 @@
 </div>
 <h3>{{$authorize}}</h3>
 <form method="POST">
-<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes|escape:'html'}}" /></div>
+<div class="settings-submit-wrapper"><input  class="settings-submit"  type="submit" name="oauth_yes" value="{{$yes}}" /></div>
 </form>
index 67f7a8086ba9c3efe368388542607a53163abb2d..d4d99c2dac8df4975b3c4da4917fdb4decadebd4 100644 (file)
@@ -3,7 +3,7 @@
        <h3>{{$nv.findpeople}}</h3>
        <div id="peoplefind-desc">{{$nv.desc}}</div>
        <form action="dirfind" method="get" />
-               <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint|escape:'html'}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem|escape:'html'}}" />
+               <input id="side-peoplefind-url" type="text" name="search" size="24" title="{{$nv.hint}}" /><input id="side-peoplefind-submit" type="submit" name="submit" value="{{$nv.findthem}}" />
        </form>
        <div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div>
        <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>
index 08df8f7567fccaddc0ed63fada74df73e2b92b88..d3e7ca4874a8b3481d7a6e2c4acf523e122b03c1 100644 (file)
@@ -10,8 +10,8 @@
 
 {{foreach $photos as $photo}}
 <div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$photo.id}}">
-       <a href="{{$photo.link}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$photo.id}}" title="{{$photo.title|escape}}">
-               <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name|escape}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt|escape}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title|escape}}" class="photo-album-photo lframe resize{{$photo.twist}}" id="photo-album-photo-{{$photo.id}}" />
+       <a href="{{$photo.link}}" class="photo-album-photo-link" id="photo-album-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+               <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" class="photo-album-photo lframe resize{{$photo.twist}}" id="photo-album-photo-{{$photo.id}}" />
                <p class='caption'>{{$photo.desc}}</p>          
        </a>
 </div>
index 8bad963020dd40327436173c4fee6aecba2dd53b..dd08783f8b765ced661f7739c2ab503d4057f7f5 100644 (file)
@@ -27,8 +27,8 @@
        </div>
        <div id="photo-edit-perms-end"></div>
 
-       <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-       <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete|escape:'html'}}" onclick="return confirmDelete();" />
+       <input id="photo-edit-submit-button" type="submit" name="submit" value="{{$submit}}" />
+       <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete();" />
 
        <div id="photo-edit-end"></div>
 </form>
index 0dd8c4e996a3ed56329debee9edd87350b702244..902f742327bc905eece8222ff40a9e768fba74ee 100644 (file)
@@ -1,7 +1,7 @@
 <div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}">
-       <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title|escape}}">
-               <img src="{{$photo.src}}" alt="{{$photo.alt|escape}}" title="{{$photo.title|escape}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
+       <a href="{{$photo.link}}" class="photo-top-photo-link" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+               <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
        </a>
-       <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt|escape}}" >{{$photo.album.name|escape}}</a></div>
+       <div class="photo-top-album-name"><a href="{{$photo.album.link}}" class="photo-top-album-link" title="{{$photo.album.alt}}" >{{$photo.album.name}}</a></div>
 </div>
 
index 8fa3de61d224435162ac12af323b6f6ffb794875..885e9290139367bc90638679b4c987ed8fac6862 100644 (file)
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-photo-end"></div>
-<div id="photo-caption">{{$desc}}</div>
+<div id="photo-caption">{{$desc nofilter}}</div>
 {{if $tags}}
 <div id="in-this-photo-text">{{$tags.0}}</div>
 <div id="in-this-photo">{{$tags.1}}</div>
index 91444e2d55473a8770247221cc62d100a39dfc69..e178e977a710917510436e700a034e6c85928cf1 100644 (file)
@@ -1,4 +1,4 @@
 
 <div class="photos-upload-submit-wrapper" >
-       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" id="photos-upload-submit" />
+       <input type="submit" name="submit" value="{{$submit}}" id="photos-upload-submit" />
 </div>
index 18191de03fc4e633c7265fa644af4729a19a6e97..56fbde6442cae1e8c7dddc69e68a9fedb794db65 100644 (file)
@@ -9,7 +9,7 @@
 
        <div id="poke-recipient">
                <div id="poke-recip-label">{{$clabel}}</div>
-               <input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
+               <input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
                <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
                <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
        </div>
@@ -28,7 +28,7 @@
                <input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
        </div>
 
-       <input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+       <input type="submit" name="submit" value="{{$submit}}" />
 
        </form>
 </div>
index 2363bd3f060b3d74d1933e3f91173788dd43219e..1e1771ef437048ad7b4991261ab0da9074341cbe 100644 (file)
@@ -5,11 +5,11 @@
 
 <div id="profile-edit-links">
 <ul>
-<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}">{{$profpic}}</a></li>
-<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
-<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
+<li><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></li>
+<li><a href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+<li><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
 <li></li>
-<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof|escape:'html'}}" {{$disabled}} >{{$del_prof}}</a></li>
+<li><a href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}" {{$disabled}} >{{$del_prof}}</a></li>
 
 </ul>
 </div>
 {{include file="field_yesno.tpl" field=$details}}
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 <div id="profile-edit-pdesc-wrapper" >
 <label id="profile-edit-pdesc-label" for="profile-edit-pdesc" >{{$pdesc.1}} </label>
-<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1|escape:'html'}}" />
+<input type="text" size="32" name="pdesc" id="profile-edit-pdesc" value="{{$pdesc.1}}" />
 </div>
 <div id="profile-edit-pdesc-end"></div>
 
 
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 
 <div id="profile-edit-hometown-wrapper" >
 <label id="profile-edit-hometown-label" for="profile-edit-hometown" >{{$hometown.1}} </label>
-<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2|escape:'html'}}" />
+<input type="text" size="32" name="hometown" id="profile-edit-hometown" value="{{$hometown.2}}" />
 </div>
 <div id="profile-edit-hometown-end"></div>
 
 <label id="profile-edit-with-label" for="profile-edit-with" > {{$with.1}} </label>
 <input type="text" size="32" name="with" id="profile-edit-with" title="{{$with.3}}" value="{{$with.2}}" />
 <label id="profile-edit-howlong-label" for="profile-edit-howlong" > {{$howlong.1}} </label>
-<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.1|escape:'html'}}" />
+<input type="text" size="32" name="howlong" id="profile-edit-howlong" title="{{$howlong.1}}" value="{{$howlong.1}}" />
 
 <div id="profile-edit-marital-end"></div>
 
 
 <div id="profile-edit-homepage-wrapper" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2|escape:'html'}}" />
+<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>
 
 <div id="profile-edit-xmpp-wrapper" >
 <label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
-<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2|escape:'html'}}" />
+<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}" />
 </div><div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
 <div id="profile-edit-xmpp-end"></div>
 
 
 <div id="profile-edit-politic-wrapper" >
 <label id="profile-edit-politic-label" for="profile-edit-politic" >{{$politic.1}} </label>
-<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2|escape:'html'}}" />
+<input type="text" size="32" name="politic" id="profile-edit-politic" value="{{$politic.2}}" />
 </div>
 <div id="profile-edit-politic-end"></div>
 
 <div id="profile-edit-religion-wrapper" >
 <label id="profile-edit-religion-label" for="profile-edit-religion" >{{$religion.1}} </label>
-<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2|escape:'html'}}" />
+<input type="text" size="32" name="religion" id="profile-edit-religion" value="{{$religion.2}}" />
 </div>
 <div id="profile-edit-religion-end"></div>
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
 </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
 {{/if}}
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 
 <div id="profile-edit-homepage-wrapper" >
 <label id="profile-edit-homepage-label" for="profile-edit-homepage" >{{$homepage.1}} </label>
-<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2|escape:'html'}}" />
+<input type="url" size="32" name="homepage" id="profile-edit-homepage" value="{{$homepage.2}}" />
 </div>
 <div id="profile-edit-homepage-end"></div>
 
 <div id="profile-edit-xmpp-wrapper" >
 <label id="profile-edit-xmpp-label" for="profile-edit-xmpp" >{{$xmpp.1}} </label>
-<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2|escape:'html'}}" />
+<input type="text" size="32" name="xmpp" id="profile-edit-xmpp" title="{{$lbl_ex2}}" value="{{$xmpp.2}}" />
 </div><div id="profile-edit-xmpp-desc">{{$xmpp.3}}</div>
 <div id="profile-edit-xmpp-end"></div>
 
 
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
 </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
index 1695d01e273d3d6118818286da5575a4fa3c0796..d0ae4f87dc5b14819bb63259dafc3fc4ec5de245 100644 (file)
@@ -17,7 +17,7 @@
 </select>
 
 <div id="profile-photo-submit-wrapper">
-<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit|escape:'html'}}">
+<input type="submit" name="submit" id="profile-photo-submit" value="{{$submit}}">
 </div>
 
 </form>
index 14e1a03736dffca63725199882c630bf3a2caea0..b56dd607ce726c57849faf5585111e7295398c7e 100644 (file)
@@ -1,16 +1,16 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name|escape}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
        
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
        {{/if}}
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
        {{if $profile.network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$profile.network_name}}</dd></dl>{{/if}}
index 654671af0ecd8e3e13852b0d7ed0677d7d7f7753..d419d4d9b353ddc8cdebcfb73e630caddba0d4b1 100644 (file)
 
 
 <div id="prvmail-submit-wrapper" >
-       <input type="submit" id="prvmail-submit" name="submit" value="{{$submit|escape:'html'}}" tabindex="13" />
+       <input type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" tabindex="13" />
        <div id="prvmail-upload-wrapper" >
-               <div id="prvmail-upload" class="icon border camera" title="{{$upload|escape:'html'}}" ></div>
+               <div id="prvmail-upload" class="icon border camera" title="{{$upload}}" ></div>
        </div> 
        <div id="prvmail-link-wrapper" >
-               <div id="prvmail-link" class="icon border link" title="{{$insert|escape:'html'}}" onclick="jotGetLink();" ></div>
+               <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
        </div> 
        <div id="prvmail-rotator-wrapper" >
-               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait|escape:'html'}}" title="{{$wait|escape:'html'}}" style="display: none;" />
+               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
        </div> 
 </div>
 <div id="prvmail-end"></div>
index 2e5588ae71ff0220274301cb50fe9da49934318e..30b2429836760d44ecbb8a46e818d4111b9000d7 100644 (file)
@@ -16,7 +16,7 @@
 
 {{if $oidlabel}}
        <div id="register-openid-wrapper" >
-       <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input    type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid|escape:'html'}}" >
+       <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input    type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
        </div>
        <div id="register-openid-end" ></div>
 {{/if}}
 
        <div id="register-name-wrapper" >
                <label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-               <input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username|escape:'html'}}" >
+               <input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
        </div>
        <div id="register-name-end" ></div>
 
 
        <div id="register-email-wrapper" >
                <label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-               <input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email|escape:'html'}}" >
+               <input type="text" maxlength="60" size="32" name="email" id="register-email" value="{{$email}}" >
        </div>
        <div id="register-email-end" ></div>
 
@@ -55,7 +55,7 @@
 
        <div id="register-nickname-wrapper" >
                <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-               <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname|escape:'html'}}" ><div id="register-sitename">@{{$sitename}}</div>
+               <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" value="{{$nickname}}" ><div id="register-sitename">@{{$sitename}}</div>
        </div>
        <div id="register-nickname-end" ></div>
 
@@ -76,7 +76,7 @@
        {{/if}}
 
        <div id="register-submit-wrapper">
-               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt|escape:'html'}}" />
+               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
        </div>
        <div id="register-submit-end" ></div>
 
index f5f43360a71a6e51c44ecfdee6050e8299a01df0..354c8e46a2843af69c544f43d1e87044ba5c3f41 100644 (file)
@@ -6,12 +6,12 @@
        <div class="profile-match-wrapper">
                <div class="profile-match-photo">
                        <a href="{{$item.url}}">
-                               <img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name|escape}}" title="{{$item.name|escape}}" />
+                               <img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name}}" title="{{$item.name}}" />
                        </a>
                </div>
                <div class="profile-match-break"></div>
                <div class="profile-match-name">
-                       <a href="{{$item.url}}" title="{{$item.name|escape}}">{{$item.name|escape}}</a>
+                       <a href="{{$item.url}}" title="{{$item.name}}">{{$item.name}}</a>
                </div>
                <div class="profile-match-end"></div>
        </div>
index 4acfb9ff1a3589ea908c8699b09dc35a960dc880..4148f94e5f8548a081a7b99e6eafb99c194bbce3 100644 (file)
@@ -14,7 +14,7 @@
 </div>
 <div id="remove-account-pass-end"></div>
 
-<input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" value="{{$submit}}" />
 
 </form>
 </div>
index a97574b7b4f5e93d8f3f52f23a39a17d0e3d703b..fbcf770f1b2a8c0791cedb0feaac0321d33dcb7e 100644 (file)
@@ -6,8 +6,8 @@
                        <div class="wall-item-photo-wrapper" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
                                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                                        <ul>
                        </div>
                </div>
                <div class="wall-item-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
                                
                </div>                  
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
                        <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
                        {{if $item.has_cats}}
@@ -54,7 +54,7 @@
 
        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
        {{if $item.conv}}
-                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'>{{$item.conv.title|escape}}</a>
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
        {{/if}}
        </div>
 
index a237917682c39eafabb8a24461ed5090b89a801a..9dd5d0b1ab7c7a75efd91b54a2d2d9c3cb8738e6 100644 (file)
@@ -48,7 +48,7 @@
        {{include file="field_input.tpl" field=$mail_movetofolder}}
 
        <div class="settings-submit-wrapper" >
-               <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+               <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
        </div>
        </div>
 {{/if}}
index e1a01238045ae114f7adc536fc15a255443532b9..951609e1bff0b68e2cefcf47a3dd381d135ff095 100644 (file)
 {{include file="field_checkbox.tpl" field=$infinite_scroll}}
 {{include file="field_checkbox.tpl" field=$bandwidth_saver}}
 {{include file="field_checkbox.tpl" field=$smart_threading}}
-<h2>{{$calendar_title|escape}}</h2>
+<h2>{{$calendar_title}}</h2>
 {{include file="field_select.tpl" field=$first_day_of_week}}
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 
 {{if $theme_config}}
index eb3f67f8136d5d1c6bad619195ad97c72c6d0418..2793e477b1dbde77b59915284ac6f916c9f674ed 100644 (file)
@@ -13,7 +13,7 @@
        {{include file="field_yesno.tpl" field=$fcat}}
 {{/foreach}}
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-features-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
 </div>
 </div>
 {{/foreach}}
index 164930ecbad5a37c8b97932605b01a4be2f6da0a..edb0ff63ec16738aacfb4a0c0d6a373530845576 100644 (file)
@@ -23,8 +23,8 @@
                        {{/if}}
                {{/if}}
                {{if $app.my}}
-               <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit|escape:'html'}}">&nbsp;</a>
-               <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete|escape:'html'}}">&nbsp;</a>
+               <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="icon s22 edit" title="{{$edit}}">&nbsp;</a>
+               <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="icon s22 delete" title="{{$delete}}">&nbsp;</a>
                {{/if}}         
        </div>
        {{/foreach}}
index 9019981542a34772d6d609c45bdbd938a6d912fb..eed9f6ea339da473d854bfa3055bfe9bd976031d 100644 (file)
@@ -11,7 +11,7 @@
 {{include file="field_input.tpl" field=$icon}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 <!-- <input type="submit" name="cancel" class="settings-submit" value="{{$cancel}}" /> -->
 </div>
 
index d017367fef43b81d57f7b6108837e80c9c4ea707..2fa22973e08f734ff8c273bdd03e582e515b5116 100644 (file)
@@ -16,7 +16,7 @@
 {{/if}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
@@ -33,7 +33,7 @@
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 </div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 {{$pagetype}}
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
+<input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
 </div>
 
 <div id="settings-pagetype-desc">{{$relocate_text}}</div>
 
 <div class="settings-submit-wrapper" >
-<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button|escape:'html'}}" />
+<input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
 </div>
 </div>
 
index edc0dbdba3ac9759866a7d369eb060129b54f3ab..44fe86510448c8f59902b24b7e328c359044c9f9 100644 (file)
@@ -5,18 +5,18 @@
 <p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p>
 {{if $madeby}}<div class="intro-madeby">{{$lbl_madeby}} {{$madeby}}</div>{{/if}}
 <div class="intro-fullname" >{{$fullname}}</div>
-<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" /></a>
+<a class="intro-url-link" href="{{$url}}" ><img class="intro-photo lframe" src="{{$photo}}" width="175" height="175" title="{{$fullname}}" alt="{{$fullname}}" /></a>
 <div class="intro-note" >{{$note}}</div>
 <div class="intro-wrapper-end"></div>
 <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}" />
-<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />
+<input class="intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}" />
+<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />
 </form>
 <div class="intro-form-end"></div>
 
 <form class="intro-approve-form" action="{{$request}}" method="get">
 {{include file="field_checkbox.tpl" field=$hidden}}
-<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}" />
+<input class="intro-submit-approve" type="submit" name="submit" value="{{$approve}}" />
 </form>
 </div>
 <div class="intro-end"></div>
index 0aca00a05f4c9f2d4203be3fe6923468626b94e2..05c79ab75763ae66ba2bc38c7a7067463c4fd870 100644 (file)
@@ -8,7 +8,7 @@
      \r
      \r
        <div id="register-submit-wrapper">\r
-               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt|escape:'html'}}" />\r
+               <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />\r
        </div>\r
        <div id="register-submit-end" ></div>    \r
 </form>\r
index eed94193f5a598ab84f7d8250cf0cb74be330dda..47b64b68dafe5d0f561b8071ff3e0340173d527c 100644 (file)
@@ -1,14 +1,14 @@
 
 <div class="vcard h-card">
-       <div class="fn p-name">{{$name|escape}}</div>
-       {{if $addr}}<div class="p-addr">{{$addr|escape}}</div>{{/if}}
+       <div class="fn p-name">{{$name}}</div>
+       {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
        {{if $pdesc}}<div class="title p-job-title">{{$pdesc}}</div>{{/if}}
        {{if $url}}
-       <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name|escape}}" /></a></div>
+       <div id="profile-photo-wrapper"><a href="{{$url}}"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></a></div>
        {{else}}
-       <div id="profile-photo-wrapper"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name|escape}}" /></div>
+       <div id="profile-photo-wrapper"><img class="vcard-photo photo u-photo" style="width: 175px; height: 175px;" src="{{$photo}}" alt="{{$name}}" /></div>
        {{/if}}
-       {{if $account_type}}<div class="account-type">{{$account_type|escape}}</div>{{/if}}
+       {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
        {{if $network_name}}<dl class="network"><dt class="network-label">{{$network}}</dt><dd class="x-network">{{$network_name}}</dd></dl>{{/if}}
        <div id="profile-vcard-break"></div>
 </div>
index 1e2b99c22618b612fb4c739563e2d1d0de465d72..37e5a8a4c8ddea6e7462f8eda89cc6146bb241d6 100644 (file)
@@ -1,7 +1,7 @@
 {{if count($reasons) > 1}}
 <ul class="content-filter-reasons">
        {{foreach $reasons as $reason}}
-       <li>{{$reason|escape:html}}</li>
+       <li>{{$reason}}</li>
        {{/foreach}}
 </ul>
 <p>
@@ -11,7 +11,7 @@
 </p>
 {{else}}
 <p>
-       {{$reasons.0|escape:html}}
+       {{$reasons.0}}
        <button type="button" id="content-filter-wrap-{{$rnd}}" class="btn btn-default btn-xs content-filter-button" onclick="openClose('content-filter-{{$rnd}}');">
                <i class="glyphicon glyphicon-eye-open"></i> {{$openclose}}
        </button>
index 6f54d024da47ad0354976fd262d9300b5f51e8c2..73aad3d9aa733e9b48df6bfc8efd9381aa178798 100644 (file)
                <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
                        {{if $item.owner_url}}
                        <div class="wall-item-photo-wrapper wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape:'html'}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name|escape}}" /></a>
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
                        </div>
-                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall|escape}}" /></div>
+                       <div class="wall-item-arrowphoto-wrapper" ><img src="images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
                        <div class="wall-item-photo-wrapper{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} u-photo p-name" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
                        </div>
                        <div class="wall-item-photo-end"></div>
                        <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
-                               {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock|escape}}" onclick="lockview(event,{{$item.id}});" /></div>
+                               {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
                                {{else}}<div class="wall-item-lock"></div>{{/if}}
                                <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div>
                        </div>
                </div>
                <div class="wall-item-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape:'html'}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape:'html'}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a> {{$item.vwall}}{{/if}}<br />
-                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime|escape:'html'}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>{{if $item.owner_url}} {{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}{{/if}}<br />
+                               <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
                        <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}<span>
                        <div class="body-tag">
                        {{/if}}
                        </div>
                        {{if $item.has_cats}}
-                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="categorytags"><span>{{$item.txt_cats}} {{foreach $item.categories as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}} {{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                        </div>
                        {{/if}}
 
                        {{if $item.has_folders}}
-                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove|escape:'html'}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
+                       <div class="filesavetags"><span>{{$item.txt_folders}} {{foreach $item.folders as $cat}}<span class="p-category">{{$cat.name}}</span>{{if $cat.removeurl}} <a href="{{$cat.removeurl}}" title="{{$remove}}">[{{$remove}}]</a>{{/if}}{{if $cat.last}}{{else}}, {{/if}}{{/foreach}}
                        </div>
                        {{/if}}
                        </div>
                <div class="wall-item-tools" id="wall-item-tools-{{$item.id}}">
                        {{if $item.vote}}
                        <div class="wall-item-like-buttons" id="wall-item-like-buttons-{{$item.id}}">
-                               <a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0|escape:'html'}}" onclick="dolike({{$item.id}},'like'); return false"></a>
-                               {{if $item.vote.dislike}}<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0|escape:'html'}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
-                               {{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0|escape:'html'}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
-                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape:'html'}}" title="{{$item.wait|escape:'html'}}" style="display: none;" />
+                               <a href="#" class="icon like{{if $item.responses.like.self}} active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"></a>
+                               {{if $item.vote.dislike}}<a href="#" class="icon dislike{{if $item.responses.dislike.self}} active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"></a>{{/if}}
+                               {{if $item.vote.share}}<a href="#" class="icon recycle wall-item-share-buttons" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"></a>{{/if}}
+                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                        </div>
                        {{/if}}
                        {{if $item.plink}}
-                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title|escape:'html'}}" target="_blank" class="icon remote-link{{$item.sparkle}} u-url"></a></div>
+                               <div class="wall-item-links-wrapper"><a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="_blank" class="icon remote-link{{$item.sparkle}} u-url"></a></div>
                        {{/if}}
                        {{if $item.edpost}}
-                               <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape:'html'}}"></a>
+                               <a class="editpost icon pencil" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                        {{/if}}
 
                        {{if $item.star}}
-                       <a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle|escape:'html'}}"></a>
+                       <a href="#" id="starred-{{$item.id}}" onclick="dostar({{$item.id}}); return false;" class="star-item icon {{$item.isstarred}}" title="{{$item.star.toggle}}"></a>
                        {{/if}}
                        {{if $item.tagger}}
-                       <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add|escape:'html'}}"></a>
+                       <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="tag-item icon tagged" title="{{$item.tagger.add}}"></a>
                        {{/if}}
                        {{if $item.filer}}
-                       <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer|escape:'html'}}"></a>
+                       <a href="#" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"></a>
                        {{/if}}
                        {{if $item.isevent }}
                        <div class="wall-item-attend-wrapper">
-                               <a href="#" id="attendyes-{{$item.id}}" class="icon attendyes{{if $item.responses.attendyes.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0|escape:'html'}}"></a>
-                               <a href="#" id="attendno-{{$item.id}}" class="icon attendno{{if $item.responses.attendno.self}} active{{/if}}"  onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1|escape:'html'}}"></a>
-                               <a href="#" id="attendmaybe-{{$item.id}}"  class="icon attendmaybe{{if $item.responses.attendmaybe.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2|escape:'html'}}"></a>
+                               <a href="#" id="attendyes-{{$item.id}}" class="icon attendyes{{if $item.responses.attendyes.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendyes'); return false;" title="{{$item.attend.0}}"></a>
+                               <a href="#" id="attendno-{{$item.id}}" class="icon attendno{{if $item.responses.attendno.self}} active{{/if}}"  onclick="dolike({{$item.id}},'attendno'); return false;" title="{{$item.attend.1}}"></a>
+                               <a href="#" id="attendmaybe-{{$item.id}}"  class="icon attendmaybe{{if $item.responses.attendmaybe.self}} active{{/if}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;" title="{{$item.attend.2}}"></a>
                        </div>
                        {{/if}}
                        <div class="wall-item-delete-wrapper" id="wall-item-delete-wrapper-{{$item.id}}" >
-                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete|escape:'html'}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
+                               {{if $item.drop.dropping}}<a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon drophide" title="{{$item.drop.delete}}" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a>{{/if}}
                        </div>
-                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select|escape:'html'}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
+                               {{if $item.drop.pagedrop}}<input type="checkbox" onclick="checkboxhighlight(this);" title="{{$item.drop.select}}" class="item-select" name="itemselected[]" value="{{$item.id}}" />{{/if}}
                        <div class="wall-item-delete-end"></div>
                </div>
        </div>
index e6a6be908fb6d9d9c447ba70180ea37699ec435b..579ee0a31ec4c4594a9cfdda8a309f1ad1fdecb5 100644 (file)
@@ -13,7 +13,7 @@
 {{$recipname}}
 
 <div id="prvmail-subject-label">{{$subject}}</div>
-<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt|escape:'html'}}" {{$readonly}} tabindex="11" />
+<input type="text" size="64" maxlength="255" id="prvmail-subject" name="subject" value="{{$subjtxt}}" {{$readonly}} tabindex="11" />
 
 <div id="prvmail-message-label">{{$yourmessage}}</div>
 <textarea rows="8" cols="72" class="prvmail-text" id="prvmail-text" name="body" tabindex="12">{{$text}}</textarea>
 <div id="prvmail-submit-wrapper" >
        <input type="submit" id="prvmail-submit" name="submit" value="Submit" tabindex="13" />
        <div id="prvmail-link-wrapper" >
-               <div id="prvmail-link" class="icon border link" title="{{$insert|escape:'html'}}" onclick="jotGetLink();" ></div>
+               <div id="prvmail-link" class="icon border link" title="{{$insert}}" onclick="jotGetLink();" ></div>
        </div> 
        <div id="prvmail-rotator-wrapper" >
-               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait|escape:'html'}}" title="{{$wait|escape:'html'}}" style="display: none;" />
+               <img id="prvmail-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
        </div> 
 </div>
 <div id="prvmail-end"></div>
index da30967cd6ed6a55f616ea85a60d2e4f0454cb6f..32da71f816633b51fc3d08ad4bfa683238847714 100644 (file)
@@ -21,8 +21,8 @@ function showHideForumlist() {
                {{if $forum.id <= $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
                        <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
@@ -31,8 +31,8 @@ function showHideForumlist() {
                {{if $forum.id > $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
                        <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
index 31afc71fea646d9c34ac0e96eee766384a201a57..186b7e44900e5d6e1951fc5767558a12dc66100c 100644 (file)
@@ -1,12 +1,12 @@
 
 <div class="vcard h-card">
 
-       <div class="fn label p-name">{{$profile.name|escape}}</div>
+       <div class="fn label p-name">{{$profile.name}}</div>
        
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
        
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></div>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div>
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
index 9ccd5326c18358231a53071991fe094608422808..4e9eabd3b52c9b89e7e708348a5c16e328d14656 100644 (file)
@@ -20,7 +20,7 @@
 <hr style="clear:both"/>
 <div class="form-group">
        <label for="profile-jot-email" id="profile-jot-email-label">{{$emailcc}}</label>
-       <input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle|escape:'html'}}" />
+       <input type="text" name="emailcc" id="profile-jot-email" class="form-control" title="{{$emtitle}}" />
 </div>
 <div id="profile-jot-email-end"></div>
 
index 38efb62bd464944c41e87277bf4dda2f06360690..220abdc2c4a0a6eeaa32bef53a91712b15478feb 100644 (file)
@@ -12,7 +12,7 @@
                        <li class="addon {{$p.1}}">
                                <span class="offset-anchor" id="{{$p.0}}"></span>
                                <a class='toggleaddon' href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}?a=t&amp;t={{$form_security_token}}#{{$p.0}}' title="{{if $p.1==on}}Disable{{else}}Enable{{/if}}" ><span class='icon {{$p.1}}'></span></a>
-                               <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name|escape}}</span></a> - <span class="version">{{$p.2.version}}</span>
+                               <a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</span></a> - <span class="version">{{$p.2.version}}</span>
                                {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
                                <div class='desc'>{{$p.2.description}}</div>
                        </li>
index 3ac9a25173e864634f4b3bd35f9a8a8e3ca72b97..4b3a2ae4bb85fd87279a5329d9f5651b62762c91 100644 (file)
@@ -24,7 +24,7 @@
                                        {{include file="field_input.tpl" field=$contacturl}}
 
                                        <div class="admin-settings-submit-wrapper form-group pull-right">
-                                               <button type="submit" class="btn btn-primary" name="page_contactblock_block" value="1">{{$submit|escape:'html'}}</button>
+                                               <button type="submit" class="btn btn-primary" name="page_contactblock_block" value="1">{{$submit}}</button>
                                        </div>
                                        <div class="clear"></div>
                                </form>
@@ -67,9 +67,9 @@
                                                                                        <label for="id_contact_{{$contact.id}}"></label>
                                                                                </div>
                                                                        </td>
-                                                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname|escape}}" title="{{$contact.addr|escape}}"></td>
-                                                                       <td class="name">{{$contact.name|escape}}</td>
-                                                                       <td class="addr" colspan="3"><a href="{{$contact.url}}" title="{{$contact.addr|escape}}" >{{$contact.url|escape}}</a></td>
+                                                                       <td><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname}}" title="{{$contact.addr}}"></td>
+                                                                       <td class="name">{{$contact.name}}</td>
+                                                                       <td class="addr" colspan="3"><a href="{{$contact.url}}" title="{{$contact.addr}}" >{{$contact.url}}</a></td>
                                                                </tr>
                                                        {{/foreach}}
                                                </tbody>
                                                                <td>
                                                                        {{* Checkbox to select all blocked contacts *}}
                                                                        <div class="checkbox">
-                                                                               <input type="checkbox" id="contactblock-select" class="selecttoggle contacts_ckbx" data-select-class="contacts_ckbx" data-select-all="{{$select_all}}" data-select-none="{{$select_none}}" title="{{$select_all|escape}}"/>
+                                                                               <input type="checkbox" id="contactblock-select" class="selecttoggle contacts_ckbx" data-select-class="contacts_ckbx" data-select-all="{{$select_all}}" data-select-none="{{$select_none}}" title="{{$select_all}}"/>
                                                                                <label for="contactblock-select"></label>
                                                                        </div>
                                                                </td>
                                                                <td colspan="5">
                                                                        {{$total_contacts}}
                                                                        <div class="admin-settings-submit-wrapper form-group pull-right">
-                                                                               <button type="submit" class="btn btn-small btn-default pull-right" name="page_contactblock_unblock" value="1">{{$unblock|escape:'html'}}</button>
+                                                                               <button type="submit" class="btn btn-small btn-default pull-right" name="page_contactblock_unblock" value="1">{{$unblock}}</button>
                                                                        </div>
                                                                        <div class="clear"></div>
                                                                </td>
@@ -96,7 +96,7 @@
                                        {{$paginate}}
 
                                        {{else}}
-                                       <p>{{$no_data|escape:'html'}}</p>
+                                       <p>{{$no_data}}</p>
                                        {{/if}}
                                </form>
                        </div>
index 3ebe89052e243545bfe2e6eedac37ca72b0a6902..dde38639991636fe3fbcdf427e8f0e4551260bc9 100644 (file)
                </tr>
                {{foreach $entries as $e}}
                <tr>
-                       <td>{{$e.id|escape}}</td>
-                       <td>{{$e.name|escape}}</td>
-                       <td><a href="{{$e.nurl}}">{{$e.nurl|escape}}</a></td>
-                       <td>{{$e.network|escape}}</td>
-                       <td>{{$e.created|escape}}</td>
-                       <td>{{$e.last|escape}}</td>
+                       <td>{{$e.id}}</td>
+                       <td>{{$e.name}}</td>
+                       <td><a href="{{$e.nurl}}">{{$e.nurl}}</a></td>
+                       <td>{{$e.network}}</td>
+                       <td>{{$e.created}}</td>
+                       <td>{{$e.last}}</td>
                </tr>
                {{/foreach}}
        </table>
index 77ae1d532b9eba6803e6f4bdab83cb79ef2e7202..7228b9022bd878ea3bdd78d6f9fa119d25fef434 100644 (file)
@@ -54,7 +54,7 @@
 <link rel="stylesheet" href="view/theme/frio/css/mod_admin.css" type="text/css" media="screen"/>
 
 <div id='adminpage' class="adminpage generic-page-wrapper">
-       <h1>{{$title|escape}} - {{$page}}</h1>
+       <h1>{{$title}} - {{$page}}</h1>
        <form action="{{$baseurl}}/admin/site" method="post">
                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                <input type='hidden' name='active_panel' value=''>
@@ -88,7 +88,7 @@
                                        {{include file="field_checkbox.tpl" field=$hide_help}}
                                        {{include file="field_select.tpl" field=$singleuser}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_checkbox.tpl" field=$no_openid}}
                                        {{include file="field_checkbox.tpl" field=$no_regfullname}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_input.tpl" field=$maximagelength}}
                                        {{include file="field_input.tpl" field=$jpegimagequality}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_checkbox.tpl" field=$dfrn_only}}
                                        {{include file="field_input.tpl" field=$global_directory}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish|escape:'html'}}"/>
+                                               <input type="submit" name="republish_directory" class="btn btn-primary" value="{{$republish}}"/>
                                        </div>
                                        {{include file="field_checkbox.tpl" field=$newuser_private}}
                                        {{include file="field_checkbox.tpl" field=$enotify_no_content}}
                                        {{include file="field_checkbox.tpl" field=$explicit_content}}
 
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_checkbox.tpl" field=$nodeinfo}}
                                        {{include file="field_select.tpl" field=$check_new_version_url}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_select.tpl" field=$poco_discovery_since}}
                                        {{include file="field_checkbox.tpl" field=$poco_local_search}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                        {{include file="field_input.tpl" field=$dbclean_unclaimed}}
                                        {{include file="field_input.tpl" field=$dbclean_expire_conv}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                <div class="section-subtitle-wrapper" role="tab" id="admin-settings-worker">
                                        <h4>
                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-worker-collapse" aria-expanded="false" aria-controls="admin-settings-worker-collapse">
-                                                       {{$worker_title|escape}}
+                                                       {{$worker_title}}
                                                </a>
                                        </h4>
                                </div>
                                        {{include file="field_checkbox.tpl" field=$worker_fastlane}}
                                        {{include file="field_checkbox.tpl" field=$worker_frontend}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                                <div class="section-subtitle-wrapper" role="tab" id="admin-relay-corporate">
                                        <h4>
                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#admin-settings" href="#admin-settings-relay-collapse" aria-expanded="false" aria-controls="admin-settings-relay-collapse">
-                                                       {{$relay_title|escape}}
+                                                       {{$relay_title}}
                                                </a>
                                        </h4>
                                </div>
                                        {{include file="field_input.tpl" field=$relay_server_tags}}
                                        {{include file="field_checkbox.tpl" field=$relay_user_tags}}
                                        <div class="panel-footer">
-                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit|escape:'html'}}"/>
+                                               <input type="submit" name="page_site" class="btn btn-primary" value="{{$submit}}"/>
                                        </div>
                                </div>
                        </div>
                        <form action="{{$baseurl}}/admin/site" method="post">
                                <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
                                {{include file="field_input.tpl" field=$relocate_url}}
-                               <input type="hidden" name="page_site" value="{{$submit|escape:'html'}}">
+                               <input type="hidden" name="page_site" value="{{$submit}}">
                                <input type='hidden' name='active_panel' value='admin-settings-relocate-collapse'>
                                <div class="panel-footer">
-                                       <input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}"/>
+                                       <input type="submit" name="relocate" class="btn btn-primary" value="{{$relocate_button}}"/>
                                </div>
                        </form>
                </div>
index 564a6607918c38c3fae2e0bc0465b4d10540646c..388c281f58702700ee232c90ace4a049aae4fb4a 100644 (file)
                {{* The Friendica version. *}}
                <div id="admin-summary-version" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
                        <hr class="admin-summary-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$version.0|escape}}</div>
-                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename|escape}}' {{$version.1|escape}} - {{$build|escape}}</div>
+                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$version.0}}</div>
+                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">{{$platform}} '{{$codename}}' {{$version.1}} - {{$build}}</div>
                </div>
 
                {{* Server Settings. *}}
                <div id="admin-summary-php" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 admin-summary">
                        <hr class="admin-summary-separator">
-                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$serversettings.label|escape}}</div>
+                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 admin-summary-label-name text-muted">{{$serversettings.label}}</div>
                        <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 admin-summary-entry">
                                <table class="table">
                                <tbody>
index 031ffd0a474ed20f8ea82e206ddc0e630a8a313d..92ef9be6fa4c7115f43f2d3ea5021c7da01e7a92 100644 (file)
                                                                        </div>
                                                                </td>
                                                                <td>{{$u.created}}</td>
-                                                               <td>{{$u.name|escape}}</td>
+                                                               <td>{{$u.name}}</td>
                                                                <td>{{$u.email}}</td>
                                                                <td>
-                                                                       <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="admin-settings-action-link" title="{{$approve|escape}}"><i class="fa fa-check" aria-hidden="true"></i></a>
-                                                                       <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="admin-settings-action-link" title="{{$deny|escape}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a>
+                                                                       <a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" class="admin-settings-action-link" title="{{$approve}}"><i class="fa fa-check" aria-hidden="true"></i></a>
+                                                                       <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" class="admin-settings-action-link" title="{{$deny}}"><i class="fa fa-trash-o" aria-hidden="true"></i></a>
                                                                </td>
                                                        </tr>
                                                        {{if $u.note}}
                                                                &nbsp;
                                                                {{/if}}
                                                                </td>
-                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname|escape}}"></td>
-                                                               <td><a href="{{$u.url}}" title="{{$u.nickname|escape}}"> {{$u.name|escape}}</a></td>
+                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+                                                               <td><a href="{{$u.url}}" title="{{$u.nickname}}"> {{$u.name}}</a></td>
                                                                <td>{{$u.email}}</td>
                                                                {{if $order_users == $th_users.2.1}}
                                                                <td>{{$u.register_date}}</td>
                                                                                {{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}}">
                                                                        </i>
                                                                        {{if $u.page_flags_raw==0 && $u.account_type_raw > 0}}
                                                                        <i class="fa
                                                                                {{if $u.account_type_raw==1}}fa-sitemap{{/if}}          {{* ACCOUNT_TYPE_ORGANISATION *}}
                                                                                {{if $u.account_type_raw==2}}fa-newspaper-o{{/if}}      {{* ACCOUNT_TYPE_NEWS *}}
                                                                                {{if $u.account_type_raw==3}}fa-comments{{/if}}         {{* ACCOUNT_TYPE_COMMUNITY *}}
-                                                                               " title="{{$u.account_type|escape}}">
+                                                                               " title="{{$u.account_type}}">
                                                                        </i>
                                                                        {{/if}}
-                                                                       {{if $u.is_admin}}<i class="fa fa-user-md text-primary" title="{{$siteadmin|escape}}"></i>{{/if}}
-                                                                       {{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired|escape}}"></i>{{/if}}
+                                                                       {{if $u.is_admin}}<i class="fa fa-user-md text-primary" title="{{$siteadmin}}"></i>{{/if}}
+                                                                       {{if $u.account_expired}}<i class="fa fa-clock-o text-warning" title="{{$accountexpired}}"></i>{{/if}}
                                                                </td>
                                                                {{/if}}
 
                                                                                <i class="fa fa-circle-o" aria-hidden="true"></i>
                                                                                {{/if}}
                                                                        </a>
-                                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete|escape}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name|escape}}')">
+                                                                       <a href="{{$baseurl}}/admin/users/delete/{{$u.uid}}?t={{$form_security_token}}" class="admin-settings-action-link" title="{{$delete}}" onclick="return confirm_delete('{{$confirm_delete}}','{{$u.name}}')">
                                                                                <i class="fa fa-trash" aria-hidden="true"></i>
                                                                        </a>
                                                                        {{else}}
                                                <tbody>
                                                {{foreach $deleted as $u}}
                                                        <tr>
-                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname|escape}}"></td>
-                                                               <td><a href="{{$u.url}}" title="{{$u.nickname|escape}}" >{{$u.name|escape}}</a></td>
+                                                               <td><img class="avatar-nano" src="{{$u.micro}}" title="{{$u.nickname}}"></td>
+                                                               <td><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
                                                                <td>{{$u.email}}</td>
                                                                <td>{{$u.deleted}}</td>
                                                        </tr>
index f4a60b7d038716e5933959ae5f2039b6d78a7067..0b58d520d8b305f333a18cbd3bab072b69911dfe 100644 (file)
@@ -2,12 +2,12 @@
        <form name="photo-album-edit-form" id="photo-album-edit-form" action="photos/{{$nickname}}/album/{{$hexalbum}}" method="post" >
                <label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label>
                <div class="pull-left photo-album-edit-name">
-                       <input class="form-control" type="text" size="64" name="albumname" value="{{$album|escape:'html'}}" id="photo-album-edit-name">
+                       <input class="form-control" type="text" size="64" name="albumname" value="{{$album}}" id="photo-album-edit-name">
                </div>
 
                <div class="pull-right">
-                       <input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
-                       <input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" />
+                       <input class="btn-primary btn btn-small" id="photo-album-edit-submit" type="submit" name="submit" value="{{$submit}}" />
+                       <input class="btn-primary btn btn-small" id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
                </div>
        </form>
        <div class="clear"></div>
index 804d07ac01476ced53f302cecaafe2db4e1fb203..4ef5f2caa1114d589ffa07798a63fdb616d83244 100644 (file)
                        {{/if}}
                        <ul class="comment-edit-bb-{{$id}} comment-icon-list nav nav-pills pull-right">
                                <li>
-                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg|escape}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
+                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" aria-label="{{$edimg}}" title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}">
                                                <i class="fa fa-picture-o"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl|escape}}" onclick="insertFormatting('url',{{$id}});">
+                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" aria-label="{{$edurl}}" title="{{$edurl}}" onclick="insertFormatting('url',{{$id}});">
                                                <i class="fa fa-link"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach|escape}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
+                                       <button type="button" class="btn-link icon" style="cursor: pointer;" aria-label="{{$edattach}}" title="{{$edattach}}" ondragenter="return commentLinkDrop(event, {{$id}});" ondragover="return commentLinkDrop(event, {{$id}});" ondrop="commentLinkDropper(event);" onclick="commentGetLink({{$id}}, '{{$prompttext}}');">
                                                <i class="fa fa-paperclip"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline|escape}}" onclick="insertFormatting('u',{{$id}});">
+                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" aria-label="{{$eduline}}" title="{{$eduline}}" onclick="insertFormatting('u',{{$id}});">
                                                <i class="fa fa-underline"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic|escape}}" onclick="insertFormatting('i',{{$id}});">
+                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" aria-label="{{$editalic}}" title="{{$editalic}}" onclick="insertFormatting('i',{{$id}});">
                                                <i class="fa fa-italic"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold|escape}}" onclick="insertFormatting('b',{{$id}});">
+                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;" aria-label="{{$edbold}}" title="{{$edbold}}" onclick="insertFormatting('b',{{$id}});">
                                                <i class="fa fa-bold"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote|escape}}" onclick="insertFormatting('quote',{{$id}});">
+                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" aria-label="{{$edquote}}" title="{{$edquote}}" onclick="insertFormatting('quote',{{$id}});">
                                                <i class="fa fa-quote-left"></i>
                                        </button>
                                </li>
index 207ffefcb94424a609ac72295ffc1cda365078aa..76c6db039820712b43d5b72c1356429a8063a554 100644 (file)
@@ -6,7 +6,7 @@
                <li>
                        <ul class="tabs  flex-nav" role="menu" >
                        {{foreach $tabs as $tab}}
-                               <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title|escape}}"{{/if}}>{{$tab.label}}</a></li>
+                               <li id="{{$tab.id}}" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.accesskey}}accesskey="{{$tab.accesskey}}"{{/if}} {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
                        {{/foreach}}
                        </ul>
                </li>
@@ -31,7 +31,7 @@
                        <ul class="tabs" role="menu">
                                {{foreach $tabs as $tab}}
                                        {{if $tab.sel}}
-                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title|escape}}"{{/if}}>{{$tab.label}}</a></li>
+                                       <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
                                        {{else}}
                                        {{$exttabs[]=$tab}}
                                        {{/if}}
@@ -50,7 +50,7 @@
                                        </button>
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools">
                                                {{foreach $exttabs as $tab}}
-                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title|escape}}"{{/if}}>{{$tab.label}}</a></li>
+                                               <li id="{{$tab.id}}-xs" role="presentation" {{if $tab.sel}} class="{{$tab.sel}}" {{/if}}><a role="menuitem" href="{{$tab.url}}" {{if $tab.title}} title="{{$tab.title}}"{{/if}}>{{$tab.label}}</a></li>
                                                {{/foreach}}
                                        </ul>
                                </li>
index d0de608319a9bb27e079bfbdb7f21ea40296060e..62611593c80dcc4fd1cb522e85dd3e5cdbd21813 100644 (file)
@@ -3,12 +3,12 @@
 
        <div id="confirm-message">{{$message}}</div>
        {{foreach $extra_inputs as $input}}
-       <input type="hidden" name="{{$input.name}}" value="{{$input.value|escape:'html'}}" />
+       <input type="hidden" name="{{$input.name}}" value="{{$input.value}}" />
        {{/foreach}}
 
        <div class="form-group pull-right settings-submit-wrapper" >
-               <button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm|escape:'html'}}">{{$confirm|escape:'html'}}</button>
-               <button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel|escape:'html'}}</button>
+               <button type="submit" name="{{$confirm_name}}" id="confirm-submit-button" class="btn btn-primary confirm-button" value="{{$confirm}}">{{$confirm}}</button>
+               <button type="submit" name="canceled" id="confirm-cancel-button" class="btn confirm-button" data-dismiss="modal">{{$cancel}}</button>
        </div>
 
 </form>
index adddcb3dde7653b65802ddfd71bce13fd7fa1a93..759f759674ca8beeb76f3886d840fdcd1926b62c 100644 (file)
@@ -1,6 +1,6 @@
 
 <div class="generic-page-wrapper">
-       {{if $header}}<h3>{{$header|escape}}:&nbsp;{{$name|escape}}{{if $account_type}}&nbsp;<small>({{$account_type|escape}})</small>{{/if}}</h3>{{/if}}
+       {{if $header}}<h3>{{$header}}:&nbsp;{{$name}}{{if $account_type}}&nbsp;<small>({{$account_type}})</small>{{/if}}</h3>{{/if}}
 
        <div id="contact-edit-wrapper" >
 
                                                </button>
 
                                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="contact-edit-actions-button" aria-haspopup="true" id="contact-actions-menu" >
-                                                       {{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title|escape}}">{{$contact_actions.suggest.label|escape}}</a></li>{{/if}}
-                                                       {{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title|escape}}">{{$contact_actions.update.label|escape}}</a></li>{{/if}}
+                                                       {{if $lblsuggest}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.suggest.url}}" title="{{$contact_actions.suggest.title}}">{{$contact_actions.suggest.label}}</a></li>{{/if}}
+                                                       {{if $poll_enabled}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.update.url}}" title="{{$contact_actions.update.title}}">{{$contact_actions.update.label}}</a></li>{{/if}}
                                                        {{if $lblsuggest || $poll_enabled}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{/if}}
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title|escape}}">{{$contact_actions.block.label|escape}}</a></li>
-                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title|escape}}">{{$contact_actions.ignore.label|escape}}</a></li>
-                                                       {{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title|escape}}">{{$contact_actions.archive.label|escape}}</a></li>{{/if}}
-                                                       {{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title|escape}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label|escape}}</button></li>{{/if}}
+                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.block.url}}" title="{{$contact_actions.block.title}}">{{$contact_actions.block.label}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" href="{{$contact_actions.ignore.url}}" title="{{$contact_actions.ignore.title}}">{{$contact_actions.ignore.label}}</a></li>
+                                                       {{if $contact_actions.archive.url}}<li role="presentation"><a role="menuitem" href="{{$contact_actions.archive.url}}" title="{{$contact_actions.archive.title}}">{{$contact_actions.archive.label}}</a></li>{{/if}}
+                                                       {{if $contact_actions.delete.url}}<li role="presentation"><button role="menuitem" type="button" class="btn-link" title="{{$contact_actions.delete.title}}" onclick="addToModal('{{$contact_actions.delete.url}}?confirm=1');">{{$contact_actions.delete.label}}</button></li>{{/if}}
                                                </ul>
                                        </li>
                                </ul>
 
 
                                <div id="contact-edit-status-wrapper">
-                                       <span id="contact-edit-contact-status">{{$contact_status|escape}}</span>
+                                       <span id="contact-edit-contact-status">{{$contact_status}}</span>
 
                                        {{* Block with status information about the contact *}}
                                        <ul>
-                                               {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text|escape}}</div></li>{{/if}}
-                                               {{if $nettype}}<li><div id="contact-edit-nettype">{{$nettype|escape}}</div></li>{{/if}}
+                                               {{if $relation_text}}<li><div id="contact-edit-rel">{{$relation_text}}</div></li>{{/if}}
+                                               {{if $nettype}}<li><div id="contact-edit-nettype">{{$nettype}}</div></li>{{/if}}
 
                                                {{if $poll_enabled}}
-                                                       <li><div id="contact-edit-last-update-text">{{$lastupdtext|escape}} <span id="contact-edit-last-updated">{{$last_update|escape}}</span></div>
+                                                       <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
                                                        {{if $poll_interval}}
                                                                <form id="contact-edit-poll-form" action="/contact/{{$contact_id}}" method="post"> 
-                                                                       <span id="contact-edit-poll-text">{{$updpub|escape}}</span> {{$poll_interval}}
-                                                                       <input class="btn btn-primary" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                                                                       <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}}
+                                                                       <input class="btn btn-primary" type="submit" name="submit" value="{{$submit}}" />
                                                                </form>
                                                        {{/if}}
                                                        </li>
                                                {{/if}}
 
-                                               {{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact|escape}}</div></li>{{/if}}
-                                               {{if $insecure}}<li><div id="insecure-message">{{$insecure|escape}}</div></li>  {{/if}}
-                                               {{if $blocked && !$pending}}<li><div id="block-message">{{$blocked|escape}}</div></li>{{/if}}
-                                               {{if $pending}}<li><div id="pending-message">{{$pending|escape}}</div></li>{{/if}}
-                                               {{if $ignored}}<li><div id="ignore-message">{{$ignored|escape}}</div></li>{{/if}}
-                                               {{if $archived}}<li><div id="archive-message">{{$archived|escape}}</div></li>{{/if}}
+                                               {{if $lost_contact}}<li><div id="lost-contact-message">{{$lost_contact}}</div></li>{{/if}}
+                                               {{if $insecure}}<li><div id="insecure-message">{{$insecure}}</div></li> {{/if}}
+                                               {{if $blocked && !$pending}}<li><div id="block-message">{{$blocked}}</div></li>{{/if}}
+                                               {{if $pending}}<li><div id="pending-message">{{$pending}}</div></li>{{/if}}
+                                               {{if $ignored}}<li><div id="ignore-message">{{$ignored}}</div></li>{{/if}}
+                                               {{if $archived}}<li><div id="archive-message">{{$archived}}</div></li>{{/if}}
                                        </ul>
 
                                        <ul>
-                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent|escape}}</a></li> -->
-                                               {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text|escape}}</a></div></li>{{/if}}
+                                               <!-- <li><a href="network/?cid={{$contact_id}}" id="contact-edit-view-recent">{{$lblrecent}}</a></li> -->
+                                               {{if $follow}}<li><div id="contact-edit-follow"><a href="{{$follow}}">{{$follow_text}}</a></div></li>{{/if}}
                                        </ul>
                                </div> {{* End of contact-edit-status-wrapper *}}
 
                                                <div id="contact-edit-profile-collapse" class="panel-collapse collapse in" role="tabpanel" aria-labelledby="contact-edit-profile">
                                                        <div class="section-content-tools-wrapper">
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$profileurllabel|escape}}</div><a target="blank" href="{{$url}}">{{$profileurl|escape}}</a>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$profileurllabel}}</div><a target="blank" href="{{$url}}">{{$profileurl}}</a>
                                                                </div>
 
                                                                {{if $location}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$location_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$location_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$location}}</div>
                                                                </div>
                                                                {{/if}}
 
                                                                {{if $xmpp}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$xmpp_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$xmpp|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$xmpp_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$xmpp}}</div>
                                                                </div>
                                                                {{/if}}
 
                                                                {{if $keywords}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label|escape}}</div>
-                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords|escape}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$keywords_label}}</div>
+                                                                       <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$keywords}}</div>
                                                                </div>
                                                                {{/if}}
 
                                                                {{if $about}}
                                                                <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12">
                                                                        <hr class="profile-separator">
-                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$about_label|escape}}</div>
                                                                        <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12">{{$about}}</div>
+                                                                       <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 text-muted">{{$about_label}}</div>
                                                                </div>
                                                                {{/if}}
                                                        </div>
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-settings">
                                                        <h4>
                                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-settings-collapse" aria-expanded="false" aria-controls="contact-edit-settings-collapse">
-                                                                       {{$contact_settings_label|escape}}
+                                                                       {{$contact_settings_label}}
                                                                </a>
                                                        </h4>
                                                </div>
                                                <div id="contact-edit-settings-collapse" class="panel-collapse collapse" role="tabpanel" aria-labelledby="contact-edit-settings">
                                                        <div class="section-content-tools-wrapper">
 
-                                                               <input type="hidden" name="contact_id" value="{{$contact_id|escape}}">
+                                                               <input type="hidden" name="contact_id" value="{{$contact_id}}">
 
                                                                {{include file="field_checkbox.tpl" field=$notify}}
                                                                {{if $fetch_further_information}}
                                                                {{include file="field_checkbox.tpl" field=$hidden}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit|escape}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                        </div>
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-info">
                                                        <h4>
                                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-info-collapse" aria-expanded="false" aria-controls="contact-edit-info-collapse">
-                                                                       {{$lbl_info1|escape}}
+                                                                       {{$lbl_info1}}
                                                                </a>
                                                        </h4>
                                                </div>
                                                                {{include file="field_textarea.tpl" field=$cinfo}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit|escape}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                                {{if $reason}}
-                                                               <h4>{{$lbl_info2|escape}}</h4>
+                                                               <h4>{{$lbl_info2}}</h4>
                                                                <p>{{$reason}}</p>
                                                                <div class="clear"></div>
                                                                {{/if}}
                                                <div class="section-subtitle-wrapper" role="tab" id="contact-edit-profile-select">
                                                        <h4>
                                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#contact-edit-tools" href="#contact-edit-profile-select-collapse" aria-expanded="false" aria-controls="contact-edit-profile-select-collapse">
-                                                                       {{$lbl_vis1|escape}}
+                                                                       {{$lbl_vis1}}
                                                                </a>
                                                        </h4>
                                                </div>
                                                        <div class="section-content-tools-wrapper">
                                                                {{if $profile_select}}
                                                                        <div id="contact-edit-profile-select-text">
-                                                                               <p>{{$lbl_vis2|escape}}</p>
+                                                                               <p>{{$lbl_vis2}}</p>
                                                                        </div>
                                                                        <div class="form-group">
                                                                        {{$profile_select}}
                                                                {{/if}}
 
                                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit|escape}}</button>
+                                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                                </div>
                                                                <div class="clear"></div>
                                                        </div>
index 604f8d7e5dce1063969879687c24f58fd7955133..4ae4cf77cf0db0d15396e2b1b4308dab90beae1e 100644 (file)
@@ -6,14 +6,14 @@
                        <div class="contact-entry-photo mframe" id="contact-entry-photo-{{$contact.id}}">
 
                                <div class="contact-photo-image-wrapper hidden-xs">
-                                       <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" />
+                                       <img class="contact-photo media-object xl" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
                                </div>
 
                                {{* For very small displays we use a dropdown menu for contact relating actions *}}
                                <button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button-{{$contact.id}}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                        {{* use a smaller picture on very small displays (e.g. mobiles) *}}
                                        <div class="contact-photo-image-wrapper visible-xs">
-                                               <img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" />
+                                               <img class="contact-photo-xs media-object" src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
                                                {{* Overlay background on hover the avatar picture *}}
                                                <div class="contact-photo-overlay">
                        {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                        <div class="contact-actions pull-right nav-pills preferences hidden-xs">
                                {{if $contact.photo_menu.pm}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0|escape}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.pm.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.pm.0}}">
                                        <i class="fa fa-envelope" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.poke}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0|escape}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.poke.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.poke.0}}">
                                        <i class="fa fa-heartbeat" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.network}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.network.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.network.0}}">
                                        <i class="fa fa-cloud" aria-hidden="true"></i>
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.edit}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.edit.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.edit.0}}">
                                        <i class="fa fa-user" aria-hidden="true"></i>
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.drop}}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0|escape}}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{{$contact.photo_menu.drop.1}}'); return false;" data-toggle="tooltip" title="{{$contact.photo_menu.drop.0}}">
                                        <i class="fa fa-user-times" aria-hidden="true"></i>
                                </button>
                                {{/if}}
                                {{if $contact.photo_menu.follow}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.follow.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.follow.0}}">
                                        <i class="fa fa-user-plus" aria-hidden="true"></i>
                                </a>
                                {{/if}}
                                {{if $contact.photo_menu.hide}}
-                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0|escape}}">
+                               <a class="contact-action-link btn-link" href="{{$contact.photo_menu.hide.1}}" data-toggle="tooltip" title="{{$contact.photo_menu.hide.0}}">
                                        <i class="fa fa-times" aria-hidden="true"></i>
                                </a>
                                {{/if}}
@@ -84,7 +84,7 @@
                        {{* The button to add or remove contacts from a contact group - group edit page *}}
                        {{if $contact.change_member}}
                        <div class="contact-group-actions pull-right nav-pills preferences">
-                               <button type="button" class="contact-action-link contact-group-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title|escape}}">
+                               <button type="button" class="contact-action-link contact-group-link btn-link" onclick="groupChangeMember({{$contact.change_member.gid}},{{$contact.change_member.cid}},'{{$contact.change_member.sec_token}}'); return true;" data-toggle="tooltip" title="{{$contact.change_member.title}}">
                                        {{if $contact.label == "members"}}
                                        <i class="fa fa-times-circle" aria-hidden="true"></i>
                                        {{elseif $contact.label == "contacts"}}
@@ -97,7 +97,7 @@
                        {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
                        <div class="contact-entry-desc">
                                <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}">
-                                       <h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name|escape}}</a>
+                                       <h4 class="media-heading"><a href="{{$contact.url}}">{{$contact.name}}</a>
                                        {{if $contact.account_type}} <small class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</small>{{/if}}
                                        {{if $contact.account_type == 'Forum'}}<i class="fa fa-comments-o" aria-hidden="true"></i>{{/if}}
                                        {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
@@ -133,14 +133,14 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        <div class="contact-entry-photo mframe" id="contact-entry-photo-{$id}">
 
                                <div class="contact-photo-image-wrapper hidden-xs">
-                                       <img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name|escape}" />
+                                       <img class="contact-photo media-object xl" src="{$thumb}" {11} alt="{$name}" />
                                </div>
 
                                {{* For very small displays we use a drobdown menu for contact relating actions *}}
                                <button type="button" class="btn btn-link dropdown-toggle visible-xs" id="contact-photo-menu-button{$id}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                        {{* use a smaller picture on very small displays (e.g. mobiles) *}}
                                        <div class="contact-photo-image-wrapper visible-xs">
-                                               <img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$name|escape}" />
+                                               <img class="contact-photo-xs media-object" src="{$thumb}" {11} alt="{$name}" />
 
                                                {{* Overlay background on hover the avatar picture *}}
                                                <div class="contact-photo-overlay">
@@ -172,32 +172,32 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        {{* The contact actions like private mail, delete contact, edit contact and so on *}}
                        <div class="contact-actions pull-right nav-pills preferences hidden-xs">
                                {if $photo_menu.pm}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0|escape}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.pm.1}')" data-toggle="tooltip" title="{$photo_menu.pm.0}">
                                        <i class="fa fa-envelope" aria-hidden="true"></i>
                                </button>
                                {/if}
                                {if $photo_menu.poke}
-                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0|escape}">
+                               <button type="button" class="contact-action-link btn-link" onclick="addToModal('{$photo_menu.poke.1}')" data-toggle="tooltip" title="{$photo_menu.poke.0}">
                                        <i class="fa fa-heartbeat" aria-hidden="true"></i>
                                </button>
                                {/if}
                                {if $photo_menu.network}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.network.1}" data-toggle="tooltip" title="{$photo_menu.network.0}">
                                        <i class="fa fa-cloud" aria-hidden="true"></i>
                                </a>
                                {/if}
                                {if $photo_menu.edit}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.edit.1}" data-toggle="tooltip" title="{$photo_menu.edit.0}">
                                        <i class="fa fa-pencil" aria-hidden="true"></i>
                                </a>
                                {/if}
                                {if $photo_menu.drop}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.drop.1}" data-toggle="tooltip" title="{$photo_menu.drop.0}">
                                        <i class="fa fa-user-times" aria-hidden="true"></i>
                                </a>
                                {/if}
                                {if $photo_menu.follow}
-                               <a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0|escape}">
+                               <a class="contact-action-link btn-link" href="{$photo_menu.follow.1}" data-toggle="tooltip" title="{$photo_menu.follow.0}">
                                        <i class="fa fa-user-plus" aria-hidden="true"></i>
                                </a>
                                {/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}
                        <div class="contact-group-actions pull-right nav-pills preferences">
-                               <button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title|escape}">
+                               <button type="button" class="contact-action-link btn-link" onclick="groupChangeMember({$contact.change_member.gid},{$contact.change_member.cid},'{$contact.change_member.sec_token}'); return true;" data-toggle="tooltip" title="{$contact.change_member.title}">
                                        {if $contact.label == "members"}
                                        <i class="fa fa-times-circle" aria-hidden="true"></i>
                                        {elseif $contact.label == "contacts"}
@@ -220,7 +220,7 @@ We use this part to filter the contacts with jquery.textcomplete *}}
                        {{* The contact description (e.g. Name, Network, kind of connection and so on *}}
                        <div class="contact-entry-desc">
                                <div class="contact-entry-name" id="contact-entry-name-{$id}">
-                                       <h4 class="media-heading"><a href="{$url}">{$name|escape}</a>
+                                       <h4 class="media-heading"><a href="{$url}">{$name}</a>
                                        {if $account_type} <small class="contact-entry-details" id="contact-entry-accounttype-{$id}">({$account_type})</small>{/if}
                                        {if $account_type == 'Forum'}<i class="fa fa-comments-o" aria-hidden="true"></i>{/if}
                                        {{* @todo this needs some changing in core because $contact.account_type contains a translated string which may notbe the same in every language *}}
index 705e377ed358ebc9e19d17c9b0bcb4eebe25a5e3..2fbb22044607b7d59f512126b64df007d7e34804 100644 (file)
@@ -17,7 +17,7 @@
                <form id="contacts-search-form" class="navbar-form" role="search" action="{{$cmd}}" method="get" >
                        <div class="row">
                                <div class="form-group form-group-search">
-                                       <input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
+                                       <input type="text" name="search" id="contacts-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
                                        <button class="btn btn-default btn-sm form-button-search" type="submit" id="contacts-search-submit">{{$submit}}</button>
                                </div>
                        </div>
@@ -31,7 +31,7 @@
        <form name="batch_actions_submit" action="{{$baseurl}}/contact/batch/" method="POST">
 
                {{* we put here a hidden input element. This is needed to transmit the batch actions with javascript*}}
-               <input type="hidden" class="batch-action no-input fakelist" name="batch_submit" value="{{$l|escape:'html'}}">
+               <input type="hidden" class="batch-action no-input fakelist" name="batch_submit" value="{{$l}}">
 
                {{* We put the contact batch actions in a dropdown menu *}}
                <ul class="nav nav-pills preferences">
index 75ab272df84fa09cd11dbfa16a6c0beffa2116e0..5e5aeecc253199bc50906aa7263afbe77d082171 100644 (file)
@@ -1,10 +1,10 @@
 <div id="credits" class="generic-page-wrapper">
         {{include file="section_title.tpl"}}
-        <p>{{$thanks|escape}}</p>
+        <p>{{$thanks}}</p>
 
         <ul class="credits">
                 {{foreach $names as $name}}
-                 <li>{{$name|escape}}</li>
+                 <li>{{$name}}</li>
                 {{/foreach}}
         </ul>
         <div class="clear"></div>
index d4cdec5018920961dc3506724b420eddd5372f33..ec1b7b63fdc3eeaa0e198497a4d4775780321c82 100644 (file)
@@ -13,7 +13,7 @@
 
        <form id="crepair-form" action="crepair/{{$contact_id}}" method="post" >
 
-               <!-- <h4>{{$contact_name|escape}}</h4> -->
+               <!-- <h4>{{$contact_name}}</h4> -->
 
                <div id="contact-update-profile-wrapper">
                {{if $update_profile}}
@@ -46,7 +46,7 @@
                {{/if}}
 
                <div class="pull-right settings-submit-wrapper" >
-                       <button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit|escape:'html'}}">{{$lbl_submit|escape:'html'}}</button>
+                       <button type="submit" name="submit" class="btn btn-primary" value="{{$lbl_submit}}">{{$lbl_submit}}</button>
                </div>
                <div class="clear"></div>
 
index 4bb739e78cba951e6e16c55be8e4776e48de27e5..9ce554a084265c6c9642b664cd9cfd1bfb7cbc27 100644 (file)
@@ -15,7 +15,7 @@
                        <div class="col-md-2"></div>
                        <div class="col-md-8 ">
                                <div class="form-group form-group-search">
-                                       <input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search|escape:'html'}}" placeholder="{{$desc}}"/>
+                                       <input type="text" name="search" id="directory-search" class="search-input form-control form-search" onfocus="this.select();" value="{{$search}}" placeholder="{{$desc nofilter}}"/>
                                        <button class="btn btn-default btn-sm form-button-search" type="submit" id="directory-search-submit">{{$submit}}</button>
                                </div>
                        </div>
index 82ed1de09288862c557ba73d7e90addec1b6cbc7..947d09cb8d97828c6175e32ebfebc1e3817c2c3f 100644 (file)
@@ -6,7 +6,7 @@
                                <div class="event-owner media-left">
                                        {{if $event.item.author_name}}
                                        <a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" /></a>
-                                       <a href="{{$event.item.author_link}}" >{{$event.item.author_name|escape}}</a>
+                                       <a href="{{$event.item.author_link}}" >{{$event.item.author_name}}</a>
                                        {{/if}}
                                </div>
                                <div class="media-body">
                        </div>
 
                        <div class="event-buttons pull-right">
-                               {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1|escape}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
-                               {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1|escape}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
-                               {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1|escape}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
-                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1|escape}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.edit}}<button type="button" class="btn" onclick="eventEdit('{{$event.edit.0}}')" title="{{$event.edit.1}}"><i class="fa fa-pencil" aria-hidden="true"></i></button>{{/if}}
+                               {{if $event.copy}}<button type="button" class="btn" onclick="eventEdit('{{$event.copy.0}}')" title="{{$event.copy.1}}"><i class="fa fa-files-o" aria-hidden="true"></i></button>{{/if}}
+                               {{if $event.drop}}<a href="{{$event.drop.0}}" onclick="return confirmDelete();" title="{{$event.drop.1}}" class="drop-event-link btn"><i class="fa fa-trash-o" aria-hidden="true"></i></a>{{/if}}
+                               {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" class="plink-event-link btn "><i class="fa fa-external-link" aria-hidden="true"></i></a>{{/if}}
                        </div>
                        <div class="clear"></div>
                </div>
index 41b11c5bb781d8478e6b26886064d4f96d591e61..2325772418c908d1977db080105cf416cd6523a8 100644 (file)
@@ -64,7 +64,7 @@
 
                        {{* The submit button - saves the event *}}
                        <div class="pull-right" >
-                               <button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                               <button id="event-submit" type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                        </div>
                        <div class="clear"></div>
                </div>
                                <ul id="event-desc-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                        {{* commented out because it isn't implemented yet
                                        <li>
-                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="desc">
                                                        <i class="fa fa-picture-o"></i>
                                                </button>
                                        </li>
                                        *}}
                                        <li>
-                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="desc">
                                                        <i class="fa fa-link"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="desc">
                                                        <i class="fa fa-video-camera"></i>
                                                </button>
                                        </li>
 
                                        <li>
-                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="desc">
                                                        <i class="fa fa-underline"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="desc">
                                                        <i class="fa fa-italic"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="desc">
                                                        <i class="fa fa-bold"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="desc">
                                                        <i class="fa fa-quote-left"></i>
                                                </button>
                                        </li>
                                <ul id="comment-tools-loc" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                        {{* commented out because it isn't implemented yet
                                        <li>
-                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="img" data-id="loc">
                                                        <i class="fa fa-picture-o"></i>
                                                </button>
                                        </li>
                                        *}}
                                        <li>
-                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="loc">
                                                        <i class="fa fa-link"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
+                                               <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="loc">
                                                        <i class="fa fa-video-camera"></i>
                                                </button>
                                        </li>
 
                                        <li>
-                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
+                                               <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="loc">
                                                        <i class="fa fa-underline"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
+                                               <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="loc">
                                                        <i class="fa fa-italic"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
+                                               <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="loc">
                                                        <i class="fa fa-bold"></i>
                                                </button>
                                        </li>
                                        <li>
-                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
+                                               <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="loc">
                                                        <i class="fa fa-quote-left"></i>
                                                </button>
                                        </li>
index 5331461b7261d2756c6f87bc08be01971bcba5ae..87c2e70caddf84c27a2a172c67c8ab5d4ba36a0a 100644 (file)
@@ -17,8 +17,8 @@
                                        {{if $location.map}}<button id="event-map-btn-{{$id}}" class="event-map-btn btn-link fakelink nav nav-pills preferences" data-map-id="event-location-map-{{$id}}" data-show-label="{{$show_map_label}}" data-hide-label="{{$hide_map_label}}">{{$map_btn_label}}</button>{{/if}}
                                        <div class="event-property">
                                                <span class="event-date">
-                                                       <span class="event-start dtstart" title="{{$dtstart_title|escape}}">{{$start_short}}</span>
-                                                       {{if $finish}} - <span class="event-end dtend" title="{{$dtend_title|escape}}">{{if $same_date}}{{$end_time}}{{else}}{{$end_short}}{{/if}}</span>{{/if}}
+                                                       <span class="event-start dtstart" title="{{$dtstart_title}}">{{$start_short}}</span>
+                                                       {{if $finish}} - <span class="event-end dtend" title="{{$dtend_title}}">{{if $same_date}}{{$end_time}}{{else}}{{$end_short}}{{/if}}</span>{{/if}}
                                                </span>
                                                {{if $location.name}}
                                                <span role="presentation" aria-hidden="true"> Â· </span>
@@ -26,7 +26,7 @@
                                                {{/if}}
                                        </div>
                                        <div class="event-card-profile-name profile-entry-name">
-                                               <a href="{{$author_link}}" class="userinfo">{{$author_name|escape}}</a>
+                                               <a href="{{$author_link}}" class="userinfo">{{$author_name}}</a>
                                        </div>
                                        {{if $location.map}}
                                        <div id="event-location-map-{{$id}}" class="event-location-map">{{$location.map}}</div>
index 3866282a33e19e9438acf9d0057352406f105876..a4ca9004cd08295688c58dc3969d09ce7937cd2c 100644 (file)
@@ -5,7 +5,7 @@
        {{* The link to create a new event *}}
        {{if $new_event.0}}
        <div class="pull-right" id="new-event-link">
-               <button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1|escape}}" data-toggle="tooltip">
+               <button type="button" class="btn-link page-action faded-icon" onclick="addToModal('{{$new_event.0}}')" title="{{$new_event.1}}" data-toggle="tooltip">
                        <i class="fa fa-plus"></i>
                </button>
        </div>
@@ -40,9 +40,9 @@
 
                {{* The buttons to change the month/weeks/days *}}
                <div id="fc-fc-header-left" class="btn-group">
-                       <button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1|escape}}"><i class="fa fa-angle-up" aria-hidden="true"></i></button>
-                       <button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1|escape}}"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
-                       <button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today|escape}}"><i class="fa fa-bullseye" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav" onclick="changeView('prev', false);" title="{{$previous.1}}"><i class="fa fa-angle-up" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav btn-separator" onclick="changeView('next', false);" title="{{$next.1}}"><i class="fa fa-angle-down" aria-hidden="true"></i></button>
+                       <button class="btn btn-eventnav btn-separator" onclick="changeView('today', false);" title="{{$today}}"><i class="fa fa-bullseye" aria-hidden="true"></i></button>
                </div>
 
                {{* The title (e.g. name of the mont/week/day) *}}
index 6ea3923b92db286cccf005ddb6ff1af17ef95b40..9afad8c75faf7e22798c4917d3963dc655e5af6a 100644 (file)
@@ -3,7 +3,7 @@
        {{if !isset($label) || $label != false }}
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
        {{/if}}
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2|escape:'html'}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
+       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}"{{if $field.6 eq "email"}} type="email"{{elseif $field.6 eq "url"}} type="url"{{else}} type="text"{{/if}} value="{{$field.2}}"{{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
        <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
        {{/if}}
index f898c87faf0001b5a81035afafd2db179492559c..3944f8b7f7bb9e114382686d945e7de4286f896c 100644 (file)
@@ -1,6 +1,6 @@
 
        <div class="form-group field checkbox">
-               <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3|escape:'html'}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
+               <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.3}}" {{if $field.2}}checked="checked"{{/if}} aria-checked="{{if $field.2}}true{{else}}false{{/if}}" aria-describedby="{{$field.0}}_tip">
                <label for="id_{{$field.0}}">{{$field.1}}</label>
                {{if $field.4}}
                <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.4}}</span>
index 66f8c9e80927c1dedc91b4c510594011b24ab306..6387903f5d7f783cb66c55c39f2dc9cfbd134cb5 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="id_{{$field.0}}_wrapper" class="form-group field input openid">
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}</label>
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
+       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
        <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
        {{/if}}
index 7bef420a18aea32fbdb187d8eef47cf4d43f3f0b..9591df5bc840979c7f8c656868181c701a3e6634 100644 (file)
@@ -1,7 +1,7 @@
 
 <div id="id_{{$field.0}}_wrapper" class="form-group field input password">
        <label for="id_{{$field.0}}" id="label_{{$field.0}}">{{$field.1}}{{if $field.4}}<span class="required"> {{$field.4}}</span>{{/if}}</label>
-       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2|escape:'html'}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
+       <input class="form-control" name="{{$field.0}}" id="id_{{$field.0}}" type="password" value="{{$field.2}}" {{if $field.4 eq "required"}} required{{/if}}{{if $field.5 eq "autofocus"}} autofocus{{elseif $field.5}} {{$field.5}}{{/if}} aria-describedby="{{$field.0}}_tip">
        {{if $field.3}}
        <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
        {{/if}}
index 594b91002efa5e246f783772ec538c106f9c6ed6..51eaa278c19b58515d18839933429401a4804365 100644 (file)
@@ -2,7 +2,7 @@
 <div class="form-group field select">
                <label for="id_{{$field.0}}">{{$field.1}}</label>
                <select name="{{$field.0}}" id="id_{{$field.0}}" class="form-control" aria-describedby="{{$field.0}}_tip">
-                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt|escape:'html'}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
+                       {{foreach $field.4 as $opt=>$val}}<option value="{{$opt}}" {{if $opt==$field.2}}selected="selected"{{/if}}>{{$val}}</option>{{/foreach}}
                </select>
                {{if $field.3}}
                <span class="help-block" id="{{$field.0}}_tip" role="tooltip">{{$field.3}}</span>
index 47649fe676b6cc28695da3b2f08e0f1a45a7c11f..945914fcefd197360fee7df9f261e28c68487538 100644 (file)
@@ -4,7 +4,7 @@
                <div class="onoff toggle btn btn-xs pull-right" id="id_{{$field.0}}_onoff">
                        
                        <div class="switchlabel toggle-group">
-                               <input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2|escape:'html'}}" aria-describedby="{{$field.0}}_tip">
+                               <input  type="hidden" name="{{$field.0}}" id="id_{{$field.0}}" value="{{$field.2}}" aria-describedby="{{$field.0}}_tip">
                                <label class="btn btn-default btn-xs  active toggle-off">
                                        {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
                                </label>
index ce58ef0b98165c6e8e5551febd91ea991cfb4db9..d452810c88a1d4453557f42372902e496fa2f585 100644 (file)
@@ -9,8 +9,8 @@
 
 <div class="fbrowser {{$type}}">
        <div class="fbrowser-content">
-               <input id="fb-nickname" type="hidden" name="type" value="{{$nickname|escape}}" />
-               <input id="fb-type" type="hidden" name="type" value="{{$type|escape}}" />
+               <input id="fb-nickname" type="hidden" name="type" value="{{$nickname}}" />
+               <input id="fb-type" type="hidden" name="type" value="{{$type}}" />
 
                <div class="error hidden">
                        <span></span> <button type="button" class="btn btn-link close" aria-label="Close">X</a>
@@ -47,9 +47,9 @@
                                <div class="fbrowser-content-container">
                                        {{foreach $files as $f}}
                                        <div class="photo-album-image-wrapper">
-                                               <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1|escape}}" data-img="{{$f.2|escape}}">
-                                                       <img src="{{$f.2}}" alt="{{$f.1|escape}}">
-                                                       <p>{{$f.1|escape}}</p>
+                                               <a href="#" class="photo-album-photo-link" data-link="{{$f.0}}" data-filename="{{$f.1}}" data-img="{{$f.2}}">
+                                                       <img src="{{$f.2}}" alt="{{$f.1}}">
+                                                       <p>{{$f.1}}</p>
                                                </a>
                                        </div>
                                        {{/foreach}}
index 99ab29ac35627d4a705ebf9d68fdd2c8cafe329f..b4faecad2351673db548d594e7a8f453272f2836 100644 (file)
@@ -6,7 +6,7 @@
                <label for="side-follow-url" id="connect-desc">{{$desc}}</label>
                {{* The input field - For visual consistence we are using a search input field*}}
                <div class="form-group form-group-search">
-                       <input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value|escape:'html'}}" placeholder="{{$hint|escape:'html'}}" data-toggle="tooltip" title="{{$hint|escape:'html'}}" />
+                       <input id="side-follow-url" class="search-input form-control form-search" type="text" name="url" value="{{$value}}" placeholder="{{$hint}}" data-toggle="tooltip" title="{{$hint}}" />
                        <button id="side-follow-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$follow}}</button>
                </div>
        </form>
index 9d663b3edd0ab0f796c17929c8f60675f9efdddf..c57f7c3099051a21878a5cd22c3996efe2831349 100644 (file)
@@ -32,8 +32,8 @@
                                {{include file="field_input.tpl" field=$gname label=false}}
                                </div>
                                <div id="group-edit-submit-wrapper" class="form-group pull-right">
-                                       <button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit|escape:'html'}}">
-                                               {{$submit|escape:'html'}}
+                                       <button class="btn btn-primary btn-small" type="submit" name="submit" value="{{$submit}}">
+                                               {{$submit}}
                                        </button>
                                </div>
                        </form>
index c8d30c0b5010cb510298eae5e114706b59998544..d8f8b1d82dc531bc1e7906d81eb534226e1606fc 100644 (file)
@@ -26,7 +26,7 @@
 <link rel="stylesheet" href="view/theme/frio/font/open_sans/open-sans.css" type="text/css" media="screen"/>
 
 {{foreach $stylesheets as $stylesheetUrl}}
-<link rel="stylesheet" href="{{$stylesheetUrl|escape:"html":"UTF-8"}}" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{$stylesheetUrl}}" type="text/css" media="screen" />
 {{/foreach}}
 
 {{* own css files *}}
index 9b34afcd9efc4e97583336ecd9b645ab0d024c12..126494b920689e4ab97e32290d85ad8213e808dd 100644 (file)
@@ -5,20 +5,20 @@
 
        {{* Contact Photo *}}
        <div class="intro-photo-wrapper dropdown pull-left" >
-               <img id="photo-{{$intro_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname|escape:'html'}}" alt="{{$fullname|escape:'html'}}" />
+               <img id="photo-{{$intro_id}}" class="intro-photo media-object" src="{{$photo}}" title="{{$fullname}}" alt="{{$fullname}}" />
        </div>
 
        <div class="media-body">
                {{* The intro actions like approve, ignore, discard intro*}}
                <div class="intro-actions pull-right nav-pills preferences">
-                       <button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve|escape:'html'}}" title="{{$approve|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
+                       <button class="btn-link intro-action-link" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}');" aria-label="{{$approve}}" title="{{$approve}}" data-toggle="tooltip"><i class="fa fa-check" aria-hidden="true"></i></button>
 
                        <form class="intro-form" action="notifications/{{$intro_id}}" method="post">
-                               <button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore|escape:'html'}}" aria-label="{{$ignore|escape:'html'}}" title="{{$ignore|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
-                               {{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard|escape:'html'}}" aria-label="{{$discard|escape:'html'}}" title="{{$discard|escape:'html'}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
+                               <button class="btn-link intro-submit-ignore intro-action-link" type="submit" name="submit" value="{{$ignore}}" aria-label="{{$ignore}}" title="{{$ignore}}" data-toggle="tooltip"><i class="fa fa-ban" aria-hidden="true"></i></button>
+                               {{if $discard}}<button class="btn-link intro-submit-discard intro-action-link" type="submit" name="submit" value="{{$discard}}" aria-label="{{$discard}}" title="{{$discard}}" data-toggle="tooltip"><i class="fa fa-trash-o" aria-hidden="true"></i></button>{{/if}}
                        </form>
                </div>
-               <div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname|escape}}</a></h4></div>
+               <div class='intro-enty-name'><h4 class="media-heading"><a href="{{$zrl}}">{{$fullname}}</a></h4></div>
                <div class="intro-desc"><span class="intro-desc-label">{{$str_notifytype}}</span>&nbsp;{{$notify_type}}</div>
                {{* if the contact was suggestested by another contact, the contact who made the suggestion is displayed*}}
                {{if $madeby}}<div class="intro-madeby"><span class="intro-madeby-label">{{$lbl_madeby}}</span>&nbsp;<a href="{{$madeby_zrl}}">{{$madeby}}</a></div>{{/if}}
@@ -51,7 +51,7 @@
                a bootstrap modal in the case of approval *}}
                <div id="intro-approve-wrapper-{{$intro_id}}" style="display: none;">
 
-                       <h3 class="heading">{{$fullname|escape}}{{if $addr}}&nbsp;({{$addr}}){{/if}}</h3>
+                       <h3 class="heading">{{$fullname}}{{if $addr}}&nbsp;({{$addr}}){{/if}}</h3>
                        <form class="intro-approve-form" {{if $request}}action="{{$request}}" method="get"{{else}}action="dfrn_confirm" method="post"{{/if}}>
                                {{include file="field_checkbox.tpl" field=$hidden}}
                                {{if $type != "friend_suggestion"}}
@@ -63,7 +63,7 @@
                                {{$dfrn_text}}
 
                                <div class="pull-right">
-                                       <button class="btn btn-primary intro-submit-approve" type="submit" name="submit" value="{{$approve|escape:'html'}}">{{$approve|escape:'html'}}</button>
+                                       <button class="btn btn-primary intro-submit-approve" type="submit" name="submit" value="{{$approve}}">{{$approve}}</button>
                                </div>
                                <div class="clear"></div>
                        </form>
        {{if $APP->is_mobile}}
        <div class="intro-action-buttons">
                <form class="intro-form pull-left" action="notifications/{{$intro_id}}" method="post">
-                       <button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore|escape:'html'}}">{{$ignore|escape:'html'}}</button>
-                       {{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}">{{$discard|escape:'html'}}</button>&nbsp;{{/if}}
+                       <button class="btn btn-small btn-default intro-submit-ignore" type="submit" name="submit" value="{{$ignore}}">{{$ignore}}</button>
+                       {{if $discard}}<button class="btn btn-small btn-default intro-submit-discard" type="submit" name="submit" value="{{$discard}}">{{$discard}}</button>&nbsp;{{/if}}
                </form>
-               <button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}')">{{$approve|escape:'html'}}</button>
+               <button class="btn btn-small btn-primary intro-submit-approve pull-right" onclick="addElmToModal('#intro-approve-wrapper-{{$intro_id}}')">{{$approve}}</button>
        </div>
        <div class="clear"></div>
        {{/if}}
index 9ff20240aefc08463d084c962daca4be1393153f..31da60665c2c34de279e9fd6718c346f1a8585cf 100644 (file)
@@ -11,7 +11,7 @@
                        {{include file="field_textarea.tpl" field=$message}}
 
                        <div id="invite-submit-wrapper" class="form-group pull-right">
-                               <button type="submit" name="submit" class="btn btn-primary">{{$submit|escape:'html'}}</button>
+                               <button type="submit" name="submit" class="btn btn-primary">{{$submit}}</button>
                        </div>
                        <div class="clear"></div>
                </div>
index 13e4d2ec1d2802cb3038c89b7e77a0ea683593d0..b5c061b75c07447e612d190dc0119e45c7f8e9c0 100644 (file)
                                                <li role="presentation" class="pull-right"><button class="btn btn-primary" type="submit" id="profile-jot-submit" name="submit" ><i class="fa fa-slideshare fa-fw" aria-hidden="true"></i> {{$share}}</button></li>
                                                <li role="presentation" id="character-counter" class="grey jothidden text-info pull-right"></li>
                                                <li role="presentation" id="profile-rotator-wrapper" class="pull-right" style="display: {{$visitor}};" >
-                                                       <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait|escape}}" title="{{$wait|escape}}" style="display: none;" />
+                                                       <img role="presentation" id="profile-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
                                                </li>
                                                <li role="presentation" id="profile-jot-plugin-wrapper">
                                                        {{$jotplugins}}
index f58a7698ba75d979928ad3aa5836555d805274ff..deb2383f4badd624d9d06ef52caa6050fa04339e 100644 (file)
@@ -9,5 +9,5 @@
                <i class="faded-icon page-action fa fa-thumbs-down" aria-hidden="true"></i>
        </button>
        {{/if}}
-       <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait|escape}}" title="{{$wait|escape}}" style="display: none;" />
+       <img id="like-rotator-{{$id}}" class="like-rotator" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
 </div>
index ae586a3e6a020bbded3e3612aafaa6b7f87b7438..ebbdeee41066a98a5a1acabdbfcc0a737197663f 100644 (file)
@@ -9,7 +9,7 @@
                        {{include file="field_input.tpl" field=$lname}}
                        {{include file="field_password.tpl" field=$lpassword}}
                        <div id="login-lost-password-link">
-                               <a href="lostpass" title="{{$lostpass|escape:'html'}}" id="lost-password-link" >{{$lostlink}}</a>
+                               <a href="lostpass" title="{{$lostpass}}" id="lost-password-link" >{{$lostlink}}</a>
                        </div>
                        <div id="login-end"></div>
                </div>
 
                <div id="login-submit-wrapper">
                        <div class="pull-right" >
-                               <button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login|escape:'html'}}">{{$login|escape:'html'}}</button>
+                               <button type="submit" name="submit" id="login-submit-button" class="btn btn-primary" value="{{$login}}">{{$login}}</button>
                        </div>
                </div>
 
 
                {{foreach $hiddens as $k=>$v}}
-                       <input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" />
+                       <input type="hidden" name="{{$k}}" value="{{$v}}" />
                {{/foreach}}
 
                <div id="login-end"></div>
@@ -39,8 +39,8 @@
 
 {{if $register}}
 <div id="login-extra-links">
-       <h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3>
-       <a href="register" title="{{$register.title|escape:'html'}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
+       <h3 id="login-head" class="sr-only">{{$register.title}}</h3>
+       <a href="register" title="{{$register.title}}" id="register-link" class="btn btn-default">{{$register.desc}}</a>
 </div>
 {{/if}}
 
index b5154aa4c086f90da5804a54cf49d9220693deaf..2ad9898495b355b67f2619db574fae4538d2cfd8 100644 (file)
@@ -2,13 +2,13 @@
        <div class="media">
                <div class="pull-left contact-photo-wrapper">
                        <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">
-                               <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name|escape}}" title="{{$mail.from_addr}}" />
+                               <img class="media-object" src="{{$mail.from_photo}}" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" />
                        </a>
                </div>
                <div class="media-body">
                        <div class="text-muted time mail-ago pull-right" title="{{$mail.date}}" data-toggle="tooltip">{{$mail.date}}</div>
                        <div class="mail-conv-delete-end"></div>
-                       <h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">{{$mail.from_name|escape}}</a></h4>
+                       <h4 class="media-heading"><a href="{{$mail.from_url}}" title="{{$mail.from_addr}}">{{$mail.from_name}}</a></h4>
 
                        <div class="mail-body">
                                {{$mail.body}}
index e6a024f11c68a123d25e8a823f9d0001abebbf7e..4a797d47c0b760cb48aa3a51e18998457f51318f 100644 (file)
@@ -5,13 +5,13 @@
                <div class="media">
                        <div class="pull-left contact-photo-wrapper">
                                <a href="{{$from_url}}" title="{{$from_addr}}">
-                                       <img class="media-object" src="{{$from_photo}}" alt="{{$from_name|escape}}" title="{{$from_addr|escape}}" />
+                                       <img class="media-object" src="{{$from_photo}}" alt="{{$from_name}}" title="{{$from_addr}}" />
                                </a>
                        </div>
                        <div class="media-body">
                                <div class="text-muted time ago pull-right" title="{{$date}}">{{$ago}}</div>
 
-                               <h4 class="media-heading">{{$from_name|escape}}</h4>
+                               <h4 class="media-heading">{{$from_name}}</h4>
                                <div class="mail-list-subject"><a href="message/{{$id}}">{{$subject}}</a></div>
                                <a href="message/dropconv/{{$id}}" onclick="return confirmDelete();"  title="{{$delete}}" class="pull-right" onmouseover="imgbright(this);" onmouseout="imgdull(this);">
                                <i class="faded-icon fa fa-trash"></i>
index 6f20c247c4cb6c3ddecdae001e34d72b77c4d34f..d64eae9c49a3169a1fc09f7e90fdc44ef5e95eeb 100644 (file)
                                <ul class="nav navbar-nav navbar-left" role="menubar">
                                        <li id="nav-communication" class="nav-segment" role="presentation">
                                                {{if $nav.network}}
-                                               <a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3|escape}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a>
+                                               <a accesskey="n" role="menuitem" class="nav-menu {{$sel.network}}" href="{{$nav.network.0}}" data-toggle="tooltip" aria-label="{{$nav.network.3}}" title="{{$nav.network.3}}"><i class="fa fa-lg fa-th" aria-hidden="true"></i><span id="net-update" class="nav-network-badge badge nav-notify"></span></a>
                                                {{/if}}
 
                                                {{if $nav.home}}
-                                               <a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3|escape}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a>
+                                               <a accesskey="p" role="menuitem" class="nav-menu {{$sel.home}}" href="{{$nav.home.0}}" data-toggle="tooltip" aria-label="{{$nav.home.3}}" title="{{$nav.home.3}}"><i class="fa fa-lg fa-home" aria-hidden="true"></i><span id="home-update" class="nav-home-badge badge nav-notify"></span></a>
                                                {{/if}}
 
                                                {{if $nav.community}}
-                                               <a accesskey="c" role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" aria-label="{{$nav.community.3}}" title="{{$nav.community.3|escape}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
+                                               <a accesskey="c" role="menuitem" class="nav-menu {{$sel.community}}" href="{{$nav.community.0}}" data-toggle="tooltip" aria-label="{{$nav.community.3}}" title="{{$nav.community.3}}"><i class="fa fa-lg fa-bullseye" aria-hidden="true"></i></a>
                                                {{/if}}
                                        </li>
 
                                        <li id="nav-personal" class="nav-segment hidden-xs" role="presentation">
                                                {{if $nav.messages}}
-                                               <a role="menuitem" id="nav-messages-link" href="{{$nav.messages.0}}" data-toggle="tooltip" aria-label="{{$nav.messages.1}}" title="{{$nav.messages.1|escape}}" class="nav-menu {{$sel.messages}}"><i class="fa fa-envelope fa-lg" aria-hidden="true"></i><span id="mail-update" class="nav-mail-badge badge nav-notify"></span></a>
+                                               <a role="menuitem" id="nav-messages-link" href="{{$nav.messages.0}}" data-toggle="tooltip" aria-label="{{$nav.messages.1}}" title="{{$nav.messages.1}}" class="nav-menu {{$sel.messages}}"><i class="fa fa-envelope fa-lg" aria-hidden="true"></i><span id="mail-update" class="nav-mail-badge badge nav-notify"></span></a>
                                                {{/if}}
 
                                                {{if $nav.events}}
-                                               <a accesskey="e" role="menuitem" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip" aria-label="{{$nav.events.1}}" title="{{$nav.events.1|escape}}" class="nav-menu"><i class="fa fa-lg fa-calendar"></i></a>
+                                               <a accesskey="e" role="menuitem" id="nav-events-link" href="{{$nav.events.0}}" data-toggle="tooltip" aria-label="{{$nav.events.1}}" title="{{$nav.events.1}}" class="nav-menu"><i class="fa fa-lg fa-calendar"></i></a>
                                                {{/if}}
 
                                                {{if $nav.contacts}}
-                                               <a role="menuitem" id="nav-contacts-link" class="nav-menu {{$sel.contacts}} {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" data-toggle="tooltip" aria-label="{{$nav.contacts.1}}" title="{{$nav.contacts.1|escape}}" ><i class="fa fa-users fa-lg" aria-hidden="true"></i></a>
-                                               <span id="intro-update" class="nav-intro-badge badge nav-notify" onclick="window.location.href = '{{$nav.introductions.0}}' " data-toggle="tooltip" aria-label="{{$nav.introductions.3}}" title="{{$nav.introductions.3|escape}}"></span>
+                                               <a role="menuitem" id="nav-contacts-link" class="nav-menu {{$sel.contacts}} {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" data-toggle="tooltip" aria-label="{{$nav.contacts.1}}" title="{{$nav.contacts.1}}" ><i class="fa fa-users fa-lg" aria-hidden="true"></i></a>
+                                               <span id="intro-update" class="nav-intro-badge badge nav-notify" onclick="window.location.href = '{{$nav.introductions.0}}' " data-toggle="tooltip" aria-label="{{$nav.introductions.3}}" title="{{$nav.introductions.3}}"></span>
                                                {{/if}}
                                        </li>
 
                                        {{* The notifications dropdown *}}
                                        {{if $nav.notifications}}
                                                <li id="nav-notification" class="nav-segment hidden-xs" role="presentation">
-                                                       <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1|escape}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                                       <a href="{{$nav.notifications.0}}" rel="#nav-notifications-menu" data-toggle="tooltip" aria-label="{{$nav.notifications.1}}" title="{{$nav.notifications.1}}" role="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                                                <i class="fa fa-exclamation-circle fa-lg" aria-hidden="true"></i>
                                                                <span role="menuitem" class="sr-only">{{$nav.notifications.1}}</span>
                                                                <span id="notify-update" class="nav-notify-badge badge nav-notify dropdown" data-toggle="dropdown"></span>
@@ -84,7 +84,7 @@
                                                                        <div class="arrow"></div>
                                                                        {{$nav.notifications.1}}
                                                                        <div class="dropdown-header-link">
-                                                                               <button role="menuitem" type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" aria-label="{{$nav.notifications.mark.3}}" title="{{$nav.notifications.mark.3|escape}}">{{$nav.notifications.mark.1}}</button>
+                                                                               <button role="menuitem" type="button" class="btn-link" onclick="notifyMarkAll();" data-toggle="tooltip" aria-label="{{$nav.notifications.mark.3}}" title="{{$nav.notifications.mark.3}}">{{$nav.notifications.mark.1}}</button>
                                                                        </div>
 
                                                                </li>
                                        {{if $nav.search}}
                                        <li id="search-box" class="hidden-xs">
                                                        <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
-                                                               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
+                                                               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
                                                                <div class="form-group form-group-search">
-                                                                       <input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint|escape}}" placeholder="{{$nav.search.1}}">
+                                                                       <input accesskey="s" id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
                                                                        <button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
                                                                </div>
                                                        </form>
                                        <li id="nav-user-linkmenu" class="dropdown account nav-menu hidden-xs">
                                                <button accesskey="u" id="main-menu" class="btn-link dropdown-toggle nav-avatar" data-toggle="dropdown" type="button" aria-haspopup="true" aria-expanded="false" aria-controls="nav-user-menu">
                                                        <div class="user-title pull-left hidden-xs hidden-sm hidden-md">
-                                                               <strong>{{$nav.userinfo.name|escape}}</strong><br>
+                                                               <strong>{{$nav.userinfo.name}}</strong><br>
                                                                {{if $nav.remote}}<span class="trunctate">{{$nav.remote}}</span>{{/if}}
                                                        </div>
 
-                                                       <img  id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}">
+                                                       <img  id="avatar" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}">
                                                        <span class="caret"></span>
                                                </button>
 
                                                {{* The list of available usermenu links *}}
                                                <ul id="nav-user-menu" class="dropdown-menu pull-right menu-popup" role="menu" aria-labelledby="main-menu">
                                                        {{if $nav.remote}}{{if $nav.sitename}}
-                                                       <li id="nav-sitename" role="menuitem">{{$nav.sitename|escape}}</li>
+                                                       <li id="nav-sitename" role="menuitem">{{$nav.sitename}}</li>
                                                        <li role="presentation" class="divider"></li>
                                                        {{/if}}{{/if}}
                                                        {{foreach $nav.usermenu as $usermenu}}
-                                                       <li role="presentation"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3|escape}}">{{$usermenu.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
                                                        {{/foreach}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.notifications}}
-                                                       <li role="presentation"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1|escape}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.messages}}
-                                                       <li role="presentation"><a role="menuitem" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3|escape}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li>
+                                                       <li role="presentation"><a role="menuitem" class="nav-commlink {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}} <span id="mail-update-li" class="nav-mail-badge badge nav-notify"></span></a></li>
                                                        {{/if}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.contacts}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3|escape}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notify"></span></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-menu-contacts-link" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a><span id="intro-update-li" class="nav-intro-badge badge nav-notify"></span></li>
                                                        {{/if}}
                                                        {{if $nav.manage}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3|escape}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-manage-link" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
                                                        {{/if}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3|escape}}"><i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>{{$nav.directory.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-directory-link" class="nav-link {{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="fa fa-sitemap fa-fw" aria-hidden="true"></i>{{$nav.directory.1}}</a></li>
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.apps}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-apps-link" class="nav-link {{$nav.apps.2}} {{$sel.manage}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3|escape}}" ><i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}</a>
+                                                       <li role="presentation"><a role="menuitem" id="nav-apps-link" class="nav-link {{$nav.apps.2}} {{$sel.manage}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" ><i class="fa fa-puzzle-piece fa-fw" aria-hidden="true"></i> {{$nav.apps.1}}</a>
                                                        <li role="presentation" class="divider"></li>
                                                        {{/if}}
                                                        {{if $nav.help}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3|escape}}" ><i class="fa fa-question-circle fa-fw" aria-hidden="true"></i> {{$nav.help.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-help-link" class="nav-link {{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" ><i class="fa fa-question-circle fa-fw" aria-hidden="true"></i> {{$nav.help.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.settings}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3|escape}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-settings-link" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.admin}}
-                                                       <li role="presentation"><a accesskey="a" role="menuitem" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3|escape}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
+                                                       <li role="presentation"><a accesskey="a" role="menuitem" id="nav-admin-link" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
                                                        {{/if}}
                                                        {{if $nav.tos}}
                                                        <li role="presentation" class="divider"></li>
-                                                       <li role="presentation"><a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3|escape}}" ><i class="fa fa-file-text" aria-hidden="true"></i> {{$nav.tos.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-tos-link" class="nav-link {{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" ><i class="fa fa-file-text" aria-hidden="true"></i> {{$nav.tos.1}}</a></li>
                                                        {{/if}}
                                                        <li role="presentation" class="divider"></li>
                                                        {{if $nav.logout}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3|escape}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-logout-link" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
                                                        {{else}}
-                                                       <li role="presentation"><a role="menuitem" id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3|escape}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
+                                                       <li role="presentation"><a role="menuitem" id="nav-login-link" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
                                                        {{/if}}
                                                </ul>
                                        </li>{{* End of userinfo dropdown menu *}}
                                <div class="nav-container">
                                        <ul role="menu" class="list-group">
                                                {{if $nav.remote}}{{if $nav.sitename}}
-                                               <li role="menuitem" class="nav-sitename list-group-item">{{$nav.sitename|escape}}</li>
+                                               <li role="menuitem" class="nav-sitename list-group-item">{{$nav.sitename}}</li>
                                                {{/if}}{{/if}}
-                                               <li role="presentation" class="list-group-item"><img src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}" style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;"> {{$nav.userinfo.name|escape}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}</li>
+                                               <li role="presentation" class="list-group-item"><img src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:15px; max-height:15px; min-width:15px; min-height:15px; width:15px; height:15px;"> {{$nav.userinfo.name}}{{if $nav.remote}} ({{$nav.remote}}){{/if}}</li>
                                                {{foreach $nav.usermenu as $usermenu}}
-                                               <li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3|escape}}">{{$usermenu.1}}</a></li>
+                                               <li role="menuitem" class="list-group-item"><a role="menuitem" class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li>
                                                {{/foreach}}
                                                {{if $nav.notifications}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1|escape}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" href="{{$nav.notifications.all.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation-circle fa-fw" aria-hidden="true"></i> {{$nav.notifications.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.contacts}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3|escape}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}"><i class="fa fa-users fa-fw" aria-hidden="true"></i> {{$nav.contacts.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.messages}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3|escape}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.messages.2}} {{$sel.messages}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope fa-fw" aria-hidden="true"></i> {{$nav.messages.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.manage}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3|escape}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-commlink {{$nav.manage.2}} {{$sel.manage}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}"><i class="fa fa-flag fa-fw" aria-hidden="true"></i> {{$nav.manage.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.settings}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3|escape}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}"><i class="fa fa-cog fa-fw" aria-hidden="true"></i> {{$nav.settings.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.admin}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3|escape}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><i class="fa fa-user-secret fa-fw" aria-hidden="true"></i> {{$nav.admin.1}}</a></li>
                                                {{/if}}
                                                {{if $nav.logout}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3|escape}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-link {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" ><i class="fa fa fa-sign-out fa-fw" aria-hidden="true"></i> {{$nav.logout.1}}</a></li>
                                                {{else}}
-                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3|escape}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
+                                               <li role="presentation" class="list-group-item"><a role="menuitem" class="nav-login-link {{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" ><i class="fa fa-power-off fa-fw" aria-hidden="true"></i> {{$nav.login.1}}</a></li>
                                                {{/if}}
                                        </ul>
                                </div>
                        <ul class="nav navbar-nav navbar-right">
                                <li role="presentation">
                                        <a href="login?mode=none" id="nav-login"
-                                               data-toggle="tooltip" aria-label="{{$nav.login.3}}" title="{{$nav.login.3|escape}}">
+                                               data-toggle="tooltip" aria-label="{{$nav.login.3}}" title="{{$nav.login.3}}">
                                                        <i class="fa fa-sign-in fa-fw" aria-hidden="true"></i>
                                        </a>
                                </li>
                                <li role="presentation">
-                                       <a href="{{$nav.about.0}}" id="nav-about" data-toggle="tooltip" aria-label="{{$nav.about.3}}" title="{{$nav.about.3|escape}}">
+                                       <a href="{{$nav.about.0}}" id="nav-about" data-toggle="tooltip" aria-label="{{$nav.about.3}}" title="{{$nav.about.3}}">
                                                <i class="fa fa-info fa-fw" aria-hidden="true"></i>
                                        </a>
                                </li>
 {{* provide a a search input for mobile view, which expands by pressing the search icon *}}
 <div id="search-mobile" class="hidden-lg hidden-md collapse">
        <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
-               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name|escape}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
+               <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
                <div class="form-group form-group-search">
-                       <input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint|escape}}" placeholder="{{$nav.search.1}}">
+                       <input id="nav-search-input-field-mobile" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
                        <button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
                </div>
        </form>
index 21b3e47e839fae395dd7d51a03c698f21037d55c..fc5d249b4b5c7e97c66e129895396fee6366ca6b 100644 (file)
@@ -5,8 +5,8 @@
                {{* The search field *}}
                <label for="side-peoplefind-url" id="peoplefind-desc">{{$nv.desc}}</label>
                <div class="form-group form-group-search">
-                       <input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$nv.hint|escape:'html'}}" />
-                       <button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$nv.findthem|escape: 'html'}}</button>
+                       <input id="side-peoplefind-url" class="search-input form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$nv.hint}}" />
+                       <button id="side-peoplefind-submit" class="btn btn-default btn-sm form-button-search" type="submit">{{$nv.findthem}}</button>
                </div>
        </form>
 
index 8267fd6315469c05b43d525a31a6fe9d90be243d..935e6288b3ef8bd344fe7a0739b049138a08bf1e 100644 (file)
@@ -23,7 +23,7 @@
        <div class="contact-photo-wrapper mframe p-author h-card pull-left">
                <a class="userinfo u-url" id="wall-item-photo-menu-{{$id}}" href="{{$profile_url}}">
                        <div class="contact-photo-image-wrapper">
-                               <img src="{{$thumb}}" class="contact-photo-xs media-object p-name u-photo" id="wall-item-photo-{{$id}}" alt="{{$name|escape}}" />
+                               <img src="{{$thumb}}" class="contact-photo-xs media-object p-name u-photo" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
                        </div>
                </a>
        </div>
index c64f9b89b5d55a7c405445dd0eb0fc5a849ebe69..a86aa7f80926e46c105980a0c6c8687f17c17692 100644 (file)
@@ -1,4 +1,4 @@
-<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title|escape}}">
-       <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name|escape}}{{elseif $photo.desc}}{{$photo.desc|escape}}{{elseif $photo.alt}}{{$photo.alt|escape}}{{else}}{{$photo.unknown|escape}}{{/if}}" title="{{$photo.title|escape}}" id="photo-top-photo-{{$photo.id}}" />
+<a href="{{$photo.link}}" id="photo-top-photo-link-{{$photo.id}}" title="{{$photo.title}}">
+       <img src="{{$photo.src}}" alt="{{if $photo.album.name}}{{$photo.album.name}}{{elseif $photo.desc}}{{$photo.desc}}{{elseif $photo.alt}}{{$photo.alt}}{{else}}{{$photo.unknown}}{{/if}}" title="{{$photo.title}}" id="photo-top-photo-{{$photo.id}}" />
 </a>
 
index e540a03f90fe7412b248f69b17d58e24d9ca7027..7dc2db901e2f7492ed450a69b0b1688aa916c284 100644 (file)
@@ -5,24 +5,24 @@
 
 <div id="photo-view-{{$id}}" class="generic-page-wrapper">
        <div class="pull-left" id="photo-edit-link-wrap">
-               <a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1|escape}}" data-toggle="tooltip">
+               <a class="page-action faded-icon" id="photo-album-link" href="{{$album.0}}" title="{{$album.1}}" data-toggle="tooltip">
                        <i class="fa fa-folder-open"></i>&nbsp;{{$album.1}}
                </a>
        </div>
        <div class="pull-right" id="photo-edit-link-wrap">
                {{if $tools}}
                <span class="icon-padding"> </span>
-               <a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1|escape}}" data-toggle="tooltip">
+               <a id="photo-edit-link" href="{{$tools.edit.0}}" title="{{$tools.edit.1}}" data-toggle="tooltip">
                        <i class="page-action faded-icon fa fa-pencil"></i>
                </a>
                <span class="icon-padding"> </span>
-               <a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1|escape}}" data-toggle="tooltip">
+               <a id="photo-toprofile-link" href="{{$tools.profile.0}}" title="{{$tools.profile.1}}" data-toggle="tooltip">
                        <i class="page-action faded-icon fa fa-user"></i>
                </a>
                {{/if}}
                {{if $lock}}
                <span class="icon-padding"> </span>
-               <a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock|escape}}" data-toggle="tooltip">
+               <a id="photo-lock-link" onclick="lockview(event,'photo/{{$id}}');" title="{{$lock}}" data-toggle="tooltip">
                        <i class="page-action faded-icon fa fa-lock"></i>
                </a>
                {{/if}}
@@ -33,7 +33,7 @@
                <div id="photo-photo">
                        {{* The photo *}}
                        <div class="photo-container">
-                               <a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" alt="{{$photo.filename|escape}}"/></a>
+                               <a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" alt="{{$photo.filename}}"/></a>
                        </div>
 
                        {{* Overlay buttons for previous and next photo *}}
@@ -54,7 +54,7 @@
                <div id="photo-tags">{{$tags.title}}
                        {{foreach $tags.tags as $t}}
                        <span class="category label btn-success sm">
-                               <span class="p-category">{{$t.name|escape}}</span>
+                               <span class="p-category">{{$t.name}}</span>
                                {{if $t.removeurl}} <a href="{{$t.removeurl}}">(X)</a> {{/if}}
                        </span>
                        {{/foreach}}
index 73d5e506453b84bc3ae6a3c3aaf14c62dffdd315..b1ff212e20a773cb338a677097295806d5a4ed2b 100644 (file)
@@ -1,2 +1,2 @@
 
-<button id="photos-upload-submit" class="btn btn-primary">{{$submit|escape:'html'}}</button>
+<button id="photos-upload-submit" class="btn btn-primary">{{$submit}}</button>
index 6fb3b399b1c0d34c5d863cf0295baf3e5d290a7b..f68b053b5a171603b621f213ee390152702065b3 100644 (file)
@@ -11,7 +11,7 @@
                        {{* The input field with the recipient name*}}
                        <div id="poke-recip-wrapper" class="form-group">
                                <label for="poke-recip">{{$clabel}}</label>
-                               <input id="poke-recip" class="form-control" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" name="pokename" autocomplete="off" />
+                               <input id="poke-recip" class="form-control" type="text" size="64" maxlength="255" value="{{$name}}" name="pokename" autocomplete="off" />
                                <input id="poke-recip-complete" type="hidden" value="{{$id}}" name="cid" />
                                <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
                        </div>
@@ -37,7 +37,7 @@
                <div id="poke-content-wrapper-end"></div>
 
                <div id="poke-submit-wrapper">
-                       <button class="btn btn-primary pull-right" type="submit" name="submit" value="{{$submit|escape:'html'}}"><i class="fa fa-slideshare"></i>&nbsp;{{$submit|escape:'html'}}</button>
+                       <button class="btn btn-primary pull-right" type="submit" name="submit" value="{{$submit}}"><i class="fa fa-slideshare"></i>&nbsp;{{$submit}}</button>
                </div>
 
                <div id="poke-submit-wrapper-end"></div>
index 89353e1a6c23923a13596eddc15b88000319c8a9..63b1c901643b90c2dc0beb78e4db79ab30d2364f 100644 (file)
                                        <i class="fa fa-angle-down"  aria-hidden="true"></i>&nbsp;{{$profile_action}}
                                </button>
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="profile-edit-links-dropdown">
-                                       <li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link" title="{{$profpic|escape:'html'}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
-                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$lbl_profile_photo|escape:'html'}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$lbl_profile_photo}}</button></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$profpiclink}}" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$profpic}}</a></li>
+                                       <li role="presentation"><button role="menuitem" type="button" class="btn-link" id="profile-photo_upload-link-new" title="{{$lbl_profile_photo}}" onclick="openClose('profile-photo-upload-section');"><i class="fa fa-user" aria-hidden="true"></i>&nbsp;{{$lbl_profile_photo}}</button></li>
                                        {{if ! $is_default}}
                                        <li role="presentation" class="nav-item"><a role="menuitem" href="profperm/{{$profile_id}}" id="profile-edit-visibility-link" title="{{$editvis}}"><i class="fa fa-pencil" aria-hidden="true"></i>&nbsp;{{$editvis}}</a>
                                        </li>
                                        {{/if}}
                                        <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof|escape:'html'}}">{{$viewprof}}</a></li>
-                                       <li role="presentation"><a role="menuitem" href="profiles" id="profile-edit-view-link" title="{{$viewallprof|escape:'html'}}">{{$viewallprof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="profile/{{$profile_id}}/view?tab=profile" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="profiles" id="profile-edit-view-link" title="{{$viewallprof}}">{{$viewallprof}}</a></li>
                                        {{if $profile_clone_link}}
                                        <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof|escape:'html'}}">{{$cl_prof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></li>
                                        {{/if}}
                                        {{if !$is_default}}
                                        <li role="presentation" class="divider"></li>
-                                       <li role="presentation"><a role="menuitem" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;{{$del_prof}}</a></li>
+                                       <li role="presentation"><a role="menuitem" href="{{$profile_drop_link}}" id="profile-edit-drop-link" title="{{$del_prof}}"><i class="fa fa-trash" aria-hidden="true"></i>&nbsp;{{$del_prof}}</a></li>
                                        {{/if}}
                                </ul>
                        </li>
index 1ee9eda85ccca5ef4306e83edeeeca5ad8de27fb..fb5436fb52bacd80de9331f53bddf1f617394da7 100644 (file)
@@ -1,7 +1,7 @@
 
 <div class="profile-listing-row" >
        <div class="profile-listing-cell" >
-               <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt|escape}}" /></a>
+               <a href="profiles/{{$id}}" class="profile-listing-edit-link"><img class="profile-listing-photo" id="profile-listing-photo-{{$id}}" src="{{$photo}}" alt="{{$alt}}" /></a>
        </div>
        <div class="profile-listing-photo-end"></div>
        <div class="profile-listing-cell" id="profile-listing-name-{{$id}}">
index 793fec753af80935358308c177c95d6aef913a88..1c01be398f9013e3a00efa15ad91b52fdbafe6dc 100644 (file)
@@ -2,19 +2,19 @@
 
        <div id="profile-photo-wrapper">
                {{if $profile.picdate}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}" /></a>
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></a>
                {{else}}
-               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name|escape}}" /></a>
+               <a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}" /></a>
                {{/if}}
 
                <div class="tool visible-lg visible-md">
                        {{if $profile.edit}}
                        <div class="action">
-                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3|escape}}"><i class="fa fa-pencil-square-o"></i></a>
+                               <a class="" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><i class="fa fa-pencil-square-o"></i></a>
                        </div>
                        {{else}}
                                {{if $profile.menu}}
-                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile|escape}}" href="profiles" ></a></div>
+                               <div class="profile-edit-side-div"><a class="profile-edit-side-link icon edit" title="{{$editprofile}}" href="profiles" ></a></div>
                                {{/if}}
                        {{/if}}
                </div>
        <div id="vcard-short-info-wrapper" style="display: none;">
                <div id="vcard-short-info" class="media" style="display: none">
                        <div id="vcard-short-photo-wrapper" class="pull-left">
-                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name|escape}}" />
+                               <img class="media-object" src="{{$profile.photo}}" alt="{{$profile.name}}" />
                        </div>
 
                        <div id="vcard-short-desc" class="media-body">
-                               <h4 class="media-heading">{{$profile.name|escape}}</h4>
-                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr|escape}}</div>{{/if}}
+                               <h4 class="media-heading">{{$profile.name}}</h4>
+                               {{if $profile.addr}}<div class="vcard-short-addr">{{$profile.addr}}</div>{{/if}}
                        </div>
                </div>
        </div>
 
        <div class="panel-body">
                <div class="profile-header">
-                       <h3 class="fn p-name">{{$profile.name|escape}}</h3>
+                       <h3 class="fn p-name">{{$profile.name}}</h3>
 
-                       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+                       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
-                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc|escape}}</div>{{/if}}
+                       {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
                </div>
 
                <div id="profile-extra-links">
@@ -62,7 +62,7 @@
                        {{/if}}
                        {{if $wallmessage}}
                        <div id="wallmessage-link-botton">
-                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link|escape}}')">
+                               <button type="button" id="wallmessage-link" class="btn btn-labeled btn-primary btn-sm" onclick="openWallMessage('{{$wallmessage_link}}')">
                                        <span class=""><i class="fa fa-envelope"></i></span>
                                        <span class="">{{$wallmessage}}</span>
                                </button>
                        <span class="adr">
                                {{if $profile.address}}<span class="street-address p-street-address">{{$profile.address}}</span>{{/if}}
                                <span class="city-state-zip">
-                                       <span class="locality p-locality">{{$profile.locality|escape}}</span>{{if $profile.locality}}, {{/if}}
-                                       <span class="region p-region">{{$profile.region|escape}}</span>
-                                       <span class="postal-code p-postal-code">{{$profile.postal_code|escape}}</span>
+                                       <span class="locality p-locality">{{$profile.locality}}</span>{{if $profile.locality}}, {{/if}}
+                                       <span class="region p-region">{{$profile.region}}</span>
+                                       <span class="postal-code p-postal-code">{{$profile.postal_code}}</span>
                                </span>
-                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name|escape}}</span>{{/if}}
+                               {{if $profile.country_name}}<span class="country-name p-country-name">{{$profile.country_name}}</span>{{/if}}
                        </span>
                </div>
                {{/if}}
                {{if $profile.xmpp}}
                <div class="xmpp">
                        <span class="xmpp-label icon"><i class="fa fa-comments"></i></span>
-                       <span class="xmpp-data">{{$profile.xmpp|escape}}</span>
+                       <span class="xmpp-data">{{$profile.xmpp}}</span>
                </div>
                {{/if}}
 
                {{if $gender}}
                <div class="mf detail">
                        <span class="gender-label icon"><i class="fa fa-venus-mars"></i></span>
-                       <span class="p-gender">{{$profile.gender|escape}}</span>
+                       <span class="p-gender">{{$profile.gender}}</span>
                </div>
                {{/if}}
 
-               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey|escape}}</div>{{/if}}
+               {{if $profile.pubkey}}<div class="key u-key" style="display:none;">{{$profile.pubkey}}</div>{{/if}}
 
-               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts|escape}}</div>{{/if}}
+               {{if $contacts}}<div class="contacts" style="display:none;">{{$contacts}}</div>{{/if}}
 
-               {{if $updated}}<div class="updated" style="display:none;">{{$updated|escape}}</div>{{/if}}
+               {{if $updated}}<div class="updated" style="display:none;">{{$updated}}</div>{{/if}}
 
                {{if $marital}}
                <div class="marital detail">
                        <span class="marital-label icon"><i class="fa fa-heart"></i></span>
-                       <span class="marital-text icon">{{$profile.marital|escape}}</span>
+                       <span class="marital-text icon">{{$profile.marital}}</span>
                </div>
                {{/if}}
 
                {{if $homepage}}
                <div class="homepage detail">
                        <span class="homepage-label icon"><i class="fa fa-external-link-square"></i></span>
-                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage|escape}}</a></span>
+                       <span class="homepage-url u-url"><a href="{{$profile.homepage}}" rel="me" target="_blank">{{$profile.homepage}}</a></span>
                </div>
                {{/if}}
 
-               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about|escape}}</dt><dd class="x-network">{{$profile.about}}</dd></dl>{{/if}}
+               {{if $about}}<dl class="about"  style="display:none;"><dt class="about-label">{{$about}}</dt><dd class="x-network">{{$profile.about nofilter}}</dd></dl>{{/if}}
 
                {{include file="diaspora_vcard.tpl"}}
        </div>
index 9077c4d4c1e274433c0ed846694de64261df7152..c6bc59d3a33b29ce9cefc231f26a04ebb6aae6e2 100644 (file)
 
        <ul id="prvmail-text-edit-bb" class="comment-edit-bb comment-icon-list nav nav-pills hidden-xs pull-left">
                                <li>
-                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="imgprv" data-id="input">
+                                       <button type="button" class="btn-link icon bb-img" style="cursor: pointer;" title="{{$edimg}}" data-role="insert-formatting" data-comment=" " data-bbcode="imgprv" data-id="input">
                                                <i class="fa fa-picture-o" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
+                                       <button type="button" class="btn-link icon bb-url" style="cursor: pointer;" title="{{$edurl}}" data-role="insert-formatting" data-comment=" " data-bbcode="url" data-id="input">
                                                <i class="fa fa-link" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
+                                       <button type="button" class="btn-link icon bb-video" style="cursor: pointer;" title="{{$edvideo}}" data-role="insert-formatting" data-comment=" " data-bbcode="video" data-id="input">
                                                <i class="fa fa-video-camera" aria-hidden="true"></i>
                                        </button>
                                </li>
 
                                <li>
-                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
+                                       <button type="button" class="btn-link icon underline" style="cursor: pointer;" title="{{$eduline}}" data-role="insert-formatting" data-comment=" " data-bbcode="u" data-id="input">
                                                <i class="fa fa-underline" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
+                                       <button type="button" class="btn-link icon italic" style="cursor: pointer;" title="{{$editalic}}" data-role="insert-formatting" data-comment=" " data-bbcode="i" data-id="input">
                                                <i class="fa fa-italic" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
+                                       <button type="button" class="btn-link icon bold" style="cursor: pointer;"  title="{{$edbold}}" data-role="insert-formatting" data-comment=" " data-bbcode="b" data-id="input">
                                                <i class="fa fa-bold" aria-hidden="true"></i>
                                        </button>
                                </li>
                                <li>
-                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote|escape:'html'}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
+                                       <button type="button" class="btn-link icon quote" style="cursor: pointer;" title="{{$edquote}}" data-role="insert-formatting" data-comment=" " data-bbcode="quote" data-id="input">
                                                <i class="fa fa-quote-left" aria-hidden="true"></i>
                                        </button>
                                </li>
@@ -74,9 +74,9 @@
 
        {{* The submit button *}}
        <div id="prvmail-submit-wrapper">
-               <button type="submit" id="prvmail-submit" name="submit" value="{{$submit|escape:'html'}}" class="btn btn-primary pull-right"  tabindex="13">
+               <button type="submit" id="prvmail-submit" name="submit" value="{{$submit}}" class="btn btn-primary pull-right"  tabindex="13">
                        <i class="fa fa-slideshare fa-fw" aria-hidden="true"></i>
-                       {{$submit|escape:'html'}}
+                       {{$submit}}
                </button>
        </div>
 
index c148b6063fd101fcd3af6d91dafdff3e42714bda..2167c418df44bb7e81033d0894659f92e027e72d 100644 (file)
@@ -16,7 +16,7 @@
                {{if $oidlabel}}
                <div id="register-openid-wrapper" class="form-group">
                        <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="openid_url" class="openid form-control" id="register-openid" value="{{$openid}}">
                        <span class="help-block" id="openid_url_tip">{{$fillwith}}&nbsp;{{$fillext}}</span>
                </div>
                <div id="register-openid-end" ></div>
 
                <div id="register-name-wrapper" class="form-group">
                        <label for="register-name" id="label-register-name" >{{$namelabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="username" id="register-name" class="form-control" value="{{$username}}">
                </div>
                <div id="register-name-end" ></div>
 
 
                <div id="register-email-wrapper" class="form-group">
                        <label for="register-email" id="label-register-email" >{{$addrlabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="email" id="register-email" class="form-control" value="{{$email|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="email" id="register-email" class="form-control" value="{{$email}}">
                </div>
                <div id="register-email-end" ></div>
 
@@ -51,7 +51,7 @@
 
                <div id="register-nickname-wrapper" class="form-group">
                        <label for="register-nickname" id="label-register-nickname" >{{$nicklabel}}</label>
-                       <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname|escape:'html'}}">
+                       <input type="text" maxlength="60" size="32" name="nickname" id="register-nickname" class="form-control" value="{{$nickname}}">
                        <span class="help-block" id="nickname_tip">{{$nickdesc}}</span>
                </div>
                <div id="register-nickname-end" ></div>
@@ -73,7 +73,7 @@
                {{/if}}
 
                <div id="register-submit-wrapper" class="pull-right">
-                       <button type="submit" name="submit" id="register-submit-button" class="btn btn-primary" value="{{$regbutt|escape:'html'}}">{{$regbutt|escape:'html'}}</button>
+                       <button type="submit" name="submit" id="register-submit-button" class="btn btn-primary" value="{{$regbutt}}">{{$regbutt}}</button>
                </div>
                <div id="register-submit-end" class="clear"></div>
 
index 2e599a0dab1245d968f732fc37c2583e28d6d447..52d76acdcfb45554f11adc9c1e57747acc8a02b3 100644 (file)
@@ -15,7 +15,7 @@
                        <div id="remove-account-pass-end"></div>
 
                        <div class="form-group pull-right settings-submit-wrapper" >
-                               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
+                               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}"><i class="fa fa-trash fa-fw"></i>&nbsp;{{$submit}}</button>
                        </div>
                        <div class="clear"></div>
                </form>
index f31b7b7a44787336c343d9f9daca0eb37729e2b5..c6aa9536e6d9c8827c8fb64a8989c3d612d4a894 100644 (file)
@@ -1,7 +1,7 @@
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
-       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred}}</span>
-       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock|escape}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
+       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
+       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event, {{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock" aria-hidden="true"></span>{{/if}}
 </div>
 <!-- ./TODO => Unknow block -->
 
@@ -12,7 +12,7 @@
                        {{* Put additional actions in a top-right dropdown menu *}}
 
                        <ul class="nav nav-pills preferences">
-                               <li><span class="wall-item-network" title="{{$item.app|escape}}">{{$item.network_name|escape}}</span></li>
+                               <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
 
                                {{if $item.plink || $item.star || $item.drop.dropping || $item.edpost || $item.subthread}}
                                <li class="dropdown">
                                        <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                                {{if $item.plink}}      {{*link to the original source of the item *}}
                                                <li role="menuitem">
-                                                       <a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title|escape}}</a>
+                                                       <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title}}</a>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.edpost}} {{* edit the posting *}}
                                                <li role="menuitem">
-                                                       <button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
+                                                       <button type="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.tagger}} {{* tag the post *}}
                                                <li role="menuitem">
-                                                       <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add|escape}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
+                                                       <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.filer}}
                                                <li role="menuitem">
-                                                       <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer|escape}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
+                                                       <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.star}}
                                                <li role="menuitem">
-                                                       <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do|escape}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
-                                                       <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo|escape}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
+                                                       <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
+                                                       <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.subthread}}
                                                <li role="menuitem">
-                                                       <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title|escape}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title|escape}}</button>
+                                                       <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>
                                                </li>
                                                {{/if}}
 
                                                {{if $item.drop.dropping}}
                                                <li role="separator" class="divider"></li>
                                                <li role="menuitem">
-                                                       <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete|escape}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
+                                                       <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
                                                </li>
                                                {{/if}}
                                        </ul>
                                <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                        <a href="{{$item.profile_url}}" class="userinfo u-url" id="wall-item-photo-menu-{{$item.id}}">
                                                <div class="contact-photo-image-wrapper">
-                                                       <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                                       <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                                </div>
                                        </a>
                                </div>
                                <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                        <a href="{{$item.profile_url}}" class="userinfo u-url" id="wall-item-photo-menu-xs-{{$item.id}}">
                                                <div class="contact-photo-image-wrapper">
-                                                       <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                                       <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
                                                </div>
                                        </a>
                                </div>
 
                        {{* contact info header*}}
                        <div role="heading " class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-                               <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name|escape}}</span></a>
-                                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a>{{/if}}
-                                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock|escape}}">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
+                               <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event, {{$item.id}});" title="{{$item.lock}}">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
 
                                        <div class="additional-info text-muted">
                                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime|escape}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
+                                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</span></a></small>
                                                </div>
 
                                                {{if $item.location}}
                        {{* contact info header for smartphones *}}
                        <div role="heading " class="contact-info-xs hidden-lg hidden-md">
                                <h5 class="media-heading">
-                                       <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span>{{$item.name|escape}}</span></a>
+                                       <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
                                        <p class="text-muted"><small>
                                                <span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
                                        </p>
                                {{/if}}
 
                                {{if $item.title}}
-                               <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title|escape}}</a></h4><br /></span>
+                               <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}}">{{$item.title}}</a></h4><br /></span>
                                {{/if}}
 
                                <div class="wall-item-body" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
                        {{/if}}
 
                                {{foreach $item.folders as $cat}}
-                                       <span class="folder label btn-danger sm">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                                       <span class="folder label btn-danger sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                {{/foreach}}
 
                                {{foreach $item.categories as $cat}}
-                                       <span class="category label btn-success sm">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                                       <span class="category label btn-success sm">{{$cat.name}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                                {{/foreach}}
                                </div>
-                               {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']|escape}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+                               {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                        </div>
                        <!-- ./TODO -->
 
                                <div class="wall-item-actions-left pull-left">
                                        <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                        <div id="button-reply" class="pull-left">
-                                               <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment|escape}}"></i> </span>
+                                               <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
                                        </div>
                                        {{/if}}{{/if}}-->
 
                                        {{* Buttons for like and dislike *}}
                                        {{if $item.vote}}
                                                {{if $item.vote.like}}
-                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0|escape}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}}, 'like');">{{$item.vote.like.0}}</button>
                                                {{/if}}
                                                {{if $item.vote.like AND $item.vote.dislike}}
                                        <span role="presentation" class="separator">•</span>
                                                {{/if}}
 
                                                {{if $item.vote.dislike}}
-                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0|escape}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
+                                       <button type="button" class="btn btn-defaultbutton-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}}, 'dislike');">{{$item.vote.dislike.0}}</button>
                                                {{/if}}
                                                {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
                                        <span role="presentation" class="separator">•</span>
 
                                        {{* Button to open the comment text field *}}
                                        {{if $item.comment}}
-                                               <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment|escape}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
+                                               <button type="button" class="btn btn-default" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});">{{$item.switchcomment}}</button>
                                        {{/if}}
 
                                        {{* Button for sharing the item *}}
                                                        {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
                                        <span role="presentation" class="separator">•</span>
                                                        {{/if}}
-                                       <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>
+                                       <button type="button" class="btn btn-default" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.0}}</button>
                                                {{/if}}
                                        {{/if}}
-                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+                                       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                                </div>
 
 
                                        {{* Event attendance buttons *}}
                                        {{if $item.isevent}}
                                        <div class="vote-event">
-                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0|escape}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1|escape}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2|escape}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}}, 'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}}, 'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                               <button type="button" class="btn btn-defaultbutton-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}}, 'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                        </div>
                                        {{/if}}
 
                                        <div class="pull-right checkbox">
                                                {{if $item.drop.pagedrop}}
-                                               <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
+                                               <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                                <label for="checkbox-{{$item.id}}"></label>
                                                {{/if}}
                                        </div>
 
                        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
                        {{if $item.conv}}
-                               <a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title|escape}}">{{$item.conv.title|escape}}</a>
+                               <a href="{{$item.conv.href}}" id="context-{{$item.id}}" title="{{$item.conv.title}}">{{$item.conv.title}}</a>
                        {{/if}}
                        </div>
                </div><!--./media>-->
index 7a18c46f778b7e8be5d7084ffa4989352b7c019e..c234132f9a53f53182f19274c54fb4f89d6882ea 100644 (file)
@@ -29,7 +29,7 @@
                                                <p><a href="{{$repair_ostatus_url}}">{{$repair_ostatus_text}}</a></p>
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" id="general-submit" name="general-submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -61,9 +61,9 @@
                {{include file="field_select.tpl" field=$mail_action}}
                {{include file="field_input.tpl" field=$mail_movetofolder}}
 
-               <div class="settings-submit-wrapper" >
-                       <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit|escape:'html'}}" />
-               </div>
+                       <div class="settings-submit-wrapper" >
+                               <input type="submit" id="imap-submit" name="imap-submit" class="settings-submit" value="{{$submit}}" />
+                       </div>
                </div>
 {{/if}}
 
index 70307c440c0daeddad23f49c779c3f8104096829..658ee9cfce06879244df2f7168ccb1986af54542 100644 (file)
@@ -28,7 +28,7 @@
                                                {{/if}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
 
@@ -78,7 +78,7 @@
                                                {{include file="field_checkbox.tpl" field=$smart_threading}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -89,7 +89,7 @@
                                <div class="section-subtitle-wrapper" role="tab" id="calendar-settings-title">
                                        <h4>
                                                <a class="accordion-toggle collapsed" data-toggle="collapse" data-parent="#settings" href="#calendar-settings-content" aria-expanded="false" aria-controls="calendar-settings-content">
-                                                       {{$calendar_title|escape}}
+                                                       {{$calendar_title}}
                                                </a>
                                        </h4>
                                </div>
@@ -99,7 +99,7 @@
                                                {{include file="field_select.tpl" field=$first_day_of_week}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
index c811b8cf3e24ed3f6538b19f619e9cb2dd97ab32..e5f8ce065a68a127f57cfe187332ec8cd1239b6a 100644 (file)
@@ -23,7 +23,7 @@
                                                {{/foreach}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
index ffd40f2ab67c00af9dda77d83733f8f8963f4888..c6103cbc82a1749adf93585a322dca89c85ba4ac 100644 (file)
@@ -34,8 +34,8 @@
                                {{/if}}
                        {{/if}}
                        {{if $app.my}}
-                       <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="btn" title="{{$edit|escape:'html'}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;</a>
-                       <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="btn" title="{{$delete|escape:'html'}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
+                       <a href="{{$baseurl}}/settings/oauth/edit/{{$app.client_id}}" class="btn" title="{{$edit}}"><i class="fa fa-pencil-square-o" aria-hidden="true"></i>&nbsp;</a>
+                       <a href="{{$baseurl}}/settings/oauth/delete/{{$app.client_id}}?t={{$form_security_token}}" class="btn" title="{{$delete}}"><i class="fa fa-trash" aria-hidden="true"></i></a>
                        {{/if}}
                </div>
                {{/foreach}}
index 91dfa045516efd53e4a1851bba27a68a1031aff2..477adf77c799ea03e9b5139ef23e2413dfeef2c0 100644 (file)
@@ -11,7 +11,7 @@
        {{include file="field_input.tpl" field=$icon}}
 
        <div class="form-group pull-right settings-submit-wrapper" >
-               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+               <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
        </div>
        <div class="clear"></div>
 
index 40b0497a0813058374c87ac175b25d4297ecf69b..f5358b29db903f730cf854a3f0ae358e6b0922fd 100644 (file)
@@ -29,7 +29,7 @@
                                                {{/if}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
@@ -57,7 +57,7 @@
                                                {{include file="field_checkbox.tpl" field=$allowloc}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
 
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
                                                </div>
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
                                                {{$pagetype}}
 
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit|escape:'html'}}">{{$submit}}</button>
+                                                       <button type="submit" name="submit" class="btn btn-primary" value="{{$submit}}">{{$submit}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
 
                                                <br/>
                                                <div class="form-group pull-right settings-submit-wrapper" >
-                                                       <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$relocate_button|escape:'html'}}">{{$relocate_button|escape:'html'}}</button>
+                                                       <button type="submit" name="resend_relocate" class="btn btn-primary" value="{{$relocate_button}}">{{$relocate_button}}</button>
                                                </div>
                                                <div class="clear"></div>
                                        </div>
index 9b8322a85d429ee9ec538223ed14f2d51c3a0ce2..50a8934d1ba1cacd519a92a4e5d36a74c2f32880 100644 (file)
@@ -25,7 +25,7 @@
 {{if $background_image}}{{include file="field_fileinput.tpl" field=$background_image}}{{/if}}
 
 <div id="frio_bg_image_options" style="display: none;">
-       <label>{{$bg_image_options_title|escape}}:</label>
+       <label>{{$bg_image_options_title}}:</label>
 {{foreach $bg_image_options as $options}}
        {{include file="field_radio.tpl" field=$options}}
 {{/foreach}}
index ab6f52f472e66caa40ad0ff0a9933bae40cbad0e..0115abd887799fe1ed092f18dcc9360c4a49c964 100644 (file)
@@ -2,9 +2,9 @@
 
        <div id="profile-photo-wrapper">
                {{if $url}}
-               <a href="{{$url}}"><img class="photo u-photo" src="{{$photo}}" alt="{{$name|escape}}" /></a>
+               <a href="{{$url}}"><img class="photo u-photo" src="{{$photo}}" alt="{{$name}}" /></a>
                {{else}}
-               <img class="photo u-photo" src="{{$photo}}" alt="{{$name|escape}}" />
+               <img class="photo u-photo" src="{{$photo}}" alt="{{$name}}" />
                {{/if}}
        </div>
 
        <div id="vcard-short-info-wrapper" style="display: none;">
                <div id="vcard-short-info" class="media" style="display: none">
                        <div id="vcard-short-photo-wrapper" class="pull-left">
-                               <img class="media-object" src="{{$photo}}" alt="{{$name|escape}}" />
+                               <img class="media-object" src="{{$photo}}" alt="{{$name}}" />
                        </div>
 
                        <div id="vcard-short-desc" class="media-body">
-                               <h4 class="media-heading">{{$name|escape}}</h4>
+                               <h4 class="media-heading">{{$name}}</h4>
                                {{if $addr}}<div class="vcard-short-addr">{{$addr}}</div>{{/if}}
                        </div>
                </div>
@@ -24,7 +24,7 @@
 
        <div class="panel-body">
                <div class="profile-header">
-                       <h3 class="fn p-name">{{$name|escape}}</h3>
+                       <h3 class="fn p-name">{{$name}}</h3>
 
                        {{if $addr}}<div class="p-addr">{{$addr}}</div>{{/if}}
 
index 77fdf8dae53977809a5ffffb849cf36b80f0e931..c46fc339dd1ff742fb7a6d8658f31c4779e3aae2 100644 (file)
@@ -58,9 +58,9 @@ as the value of $top_child_total (this is done at the end of this file)
 <!-- TODO => Unknow block -->
 <div class="wall-item-decor" style="display:none;">
        {{if $item.star}}
-       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred}}</span>
+       <span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>
        {{/if}}
-       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}"></span><span class="fa fa-lock"></span>{{/if}}
+       {{if $item.lock}}<span class="navicon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}"></span><span class="fa fa-lock"></span>{{/if}}
 </div>
 <!-- ./TODO => Unknow block -->
 
@@ -82,7 +82,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* Put addional actions in a top-right dropdown menu *}}
 
                <ul class="nav nav-pills preferences">
-                       <li><span class="wall-item-network" title="{{$item.app|escape}}">{{$item.network_name|escape}}</span></li>
+                       <li><span class="wall-item-network" title="{{$item.app}}">{{$item.network_name}}</span></li>
 
                        {{if $item.plink || $item.drop.dropping || $item.edpost || $item.ignore || $item.tagger || $item.star || $item.filer || $item.subthread}}
                        <li class="dropdown">
@@ -91,38 +91,38 @@ as the value of $top_child_total (this is done at the end of this file)
                                <ul class="dropdown-menu pull-right" role="menu" aria-labelledby="dropdownMenuTools-{{$item.id}}">
                                        {{if $item.plink}}      {{*link to the original source of the item *}}
                                        <li role="menuitem">
-                                               <a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" class="navicon plink u-url"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title|escape}}</a>
+                                               <a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="navicon plink u-url"><i class="fa fa-external-link" aria-hidden="true"></i> {{$item.plink.title}}</a>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.edpost}} {{* edit the posting *}}
                                        <li role="menuitem">
-                                               <button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1|escape}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
+                                               <button type="button" onclick="editpost('{{$item.edpost.0}}?mode=none');" title="{{$item.edpost.1}}" class="btn-link navicon pencil"><i class="fa fa-pencil" aria-hidden="true"></i> {{$item.edpost.1}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.tagger}} {{* tag the post *}}
                                        <li role="menuitem">
-                                               <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add|escape}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
+                                               <button type="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}});" class="btn-link {{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="fa fa-tag" aria-hidden="true"></i> {{$item.tagger.add}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.filer}}
                                        <li role="menuitem">
-                                               <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer|escape}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
+                                               <button type="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}});" class="btn-link filer-item filer-icon" title="{{$item.filer}}"><i class="fa fa-folder" aria-hidden="true"></i>&nbsp;{{$item.filer}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.star}}
                                        <li role="menuitem">
-                                               <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do|escape}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
-                                               <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo|escape}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
+                                               <button type="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classdo}}" title="{{$item.star.do}}"><i class="fa fa-star-o" aria-hidden="true"></i>&nbsp;{{$item.star.do}}</button>
+                                               <button type="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}});" class="btn-link {{$item.star.classundo}}" title="{{$item.star.undo}}"><i class="fa fa-star" aria-hidden="true"></i>&nbsp;{{$item.star.undo}}</button>
                                        </li>
                                        {{/if}}
 
                                        {{if $item.subthread}}
                                        <li role="menuitem">
-                                               <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title|escape}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>
+                                               <button type="button" id="subthread-{{$item.id}}" onclick="{{$item.subthread.action}}" class="btn-link" title="{{$item.subthread.title}}"><i class="fa fa-plus" aria-hidden="true"></i>&nbsp;{{$item.subthread.title}}</button>
                                        </li>
                                        {{/if}}
 
@@ -132,16 +132,16 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                        {{if $item.ignore}}
                                                <li role="menuitem">
-                                                       <button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do|escape}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</button>
+                                                       <button type="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classdo}}" title="{{$item.ignore.do}}"><i class="fa fa-eye-slash" aria-hidden="true"></i> {{$item.ignore.do}}</button>
                                                </li>
                                                <li role="menuitem">
-                                                       <button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo|escape}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</button>
+                                                       <button type="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}});" class="btn-link {{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="fa fa-eye" aria-hidden="true"></i> {{$item.ignore.undo}}</button>
                                                </li>
                                        {{/if}}
 
                                        {{if $item.drop.dropping}}
                                        <li role="menuitem">
-                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete|escape}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
+                                               <button type="button" class="btn-link navicon delete" onclick="dropItem('item/drop/{{$item.id}}/{{$item.return}}', 'item-{{$item.guid}}');" title="{{$item.drop.delete}}"><i class="fa fa-trash" aria-hidden="true"></i> {{$item.drop.delete}}</button>
                                        </li>
                                        {{/if}}
                                </ul>
@@ -156,14 +156,14 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="hidden-sm hidden-xs contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
                                <a class="userinfo  u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
                        <div class="hidden-lg hidden-md contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}}">
                                <a class="userinfo u-url" id="wall-item-photo-menu-xs-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}}" id="wall-item-photo-xs-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
@@ -171,8 +171,8 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{* The litle overlay avatar picture if someone is posting directly to a wall or a forum *}}
                        {{if $item.owner_url}}
                        <div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name|escape}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                </a>
                        </div>
                        {{/if}}
@@ -184,7 +184,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
                                <a class="userinfo u-url" id="wall-item-photo-menu-{{$item.id}}" href="{{$item.profile_url}}">
                                        <div class="contact-photo-image-wrapper">
-                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name|escape}}" />
+                                               <img src="{{$item.thumb}}" class="contact-photo-xs media-object {{$item.sparkle}} p-name u-photo" id="wall-item-photo-comment-{{$item.id}}" alt="{{$item.name}}" />
                                        </div>
                                </a>
                        </div>
@@ -196,14 +196,14 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* contact info header*}}
                {{if $item.thread_level==1}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info hidden-sm hidden-xs media-body"><!-- <= For computer -->
-                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name|escape}}</span></a>
-                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a>{{/if}}
-                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
+                       <h4 class="media-heading"><a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.sparkle}}">{{$item.name}}</span></a>
+                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link userinfo"><span class="wall-item-name {{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
+                       {{if $item.lock}}<span class="navicon lock fakelink" onClick="lockview(event,{{$item.id}});" title="{{$item.lock}}" data-toggle="tooltip">&nbsp;<small><i class="fa fa-lock" aria-hidden="true"></i></small></span>{{/if}}
                        </h4>
 
                        <div class="additional-info text-muted">
                                <div id="wall-item-ago-{{$item.id}}" class="wall-item-ago">
-                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime|escape}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
+                                       <small><a href="{{$item.plink.orig}}"><span class="time" title="{{$item.localtime}}" data-toggle="tooltip"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span></a></small>
                                </div>
 
                                {{if $item.location}}
@@ -218,7 +218,7 @@ as the value of $top_child_total (this is done at the end of this file)
                {{* contact info header for smartphones *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-xs hidden-lg hidden-md"><!-- <= For smartphone (responsive) -->
                        <h5 class="media-heading">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span>{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
                                <p class="text-muted">
                                        <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
                                </p>
@@ -231,9 +231,9 @@ as the value of $top_child_total (this is done at the end of this file)
                <div class="media-body">{{*this is the media body for comments - this div must be closed at the end of the file *}}
                <div role="heading " aria-level="{{$item.thread_level}}" class="contact-info-comment">
                        <h5 class="media-heading">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
                                <span class="text-muted">
-                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime|escape}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
+                                       <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small>
                                </span>
                        </h5>
                </div>
@@ -252,7 +252,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        {{/if}}
 
                        {{if $item.title}}
-                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title|escape}}</a></h4><br /></span>
+                       <span class="wall-item-title" id="wall-item-title-{{$item.id}}"><h4 class="media-heading"><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h4><br /></span>
                        {{/if}}
 
                        <div class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}" id="wall-item-body-{{$item.id}}">{{$item.body}}</div>
@@ -273,14 +273,14 @@ as the value of $top_child_total (this is done at the end of this file)
                {{/if}}
 
                        {{foreach $item.folders as $cat}}
-                               <span class="folder label btn-danger sm"><span class="p-category">{{$cat.name|escape}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="folder label btn-danger sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
 
                        {{foreach $item.categories as $cat}}
-                               <span class="category label btn-success sm"><span class="p-category">{{$cat.name|escape}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="category label btn-success sm"><span class="p-category">{{$cat.name}}</span></a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                        </div>
-                       {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']|escape}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
+                       {{if $item.edited}}<div class="itemedited text-muted">{{$item.edited['label']}} (<span title="{{$item.edited['date']}}">{{$item.edited['relative']}}</span>)</div>{{/if}}
                </div>
                <!-- ./TODO -->
 
@@ -290,7 +290,7 @@ as the value of $top_child_total (this is done at the end of this file)
                        <div class="wall-item-actions-left pull-left">
                                <!--comment this out to try something different {{if $item.threaded}}{{if $item.comment}}
                                <div id="button-reply" class="pull-left">
-                                       <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment|escape}}"></i> </span>
+                                       <button type="button" class="btn-link" id="comment-{{$item.id}}" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"><i class="fa fa-reply" title="{{$item.switchcomment}}"></i> </span>
                                </div>
                                {{/if}}{{/if}}-->
 
@@ -299,13 +299,13 @@ as the value of $top_child_total (this is done at the end of this file)
                                {{* Buttons for like and dislike *}}
                                {{if $item.vote}}
                                        {{if $item.vote.like}}
-                                       <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0|escape}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;{{$item.vote.like.1}}</button>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.like.self}} active" aria-pressed="true{{/if}}" id="like-{{$item.id}}" title="{{$item.vote.like.0}}" onclick="doLikeAction({{$item.id}},'like');" data-toggle="button"><i class="fa fa-thumbs-up" aria-hidden="true"></i>&nbsp;{{$item.vote.like.1}}</button>
                                        {{/if}}
                                        {{if $item.vote.like AND $item.vote.dislike}}
                                        <span role="presentation" class="separator">•</span>
                                        {{/if}}
                                        {{if $item.vote.dislike}}
-                                       <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0|escape}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button>
+                                       <button type="button" class="btn-link button-likes{{if $item.responses.dislike.self}} active" aria-pressed="true{{/if}}" id="dislike-{{$item.id}}" title="{{$item.vote.dislike.0}}" onclick="doLikeAction({{$item.id}},'dislike');" data-toggle="button"><i class="fa fa-thumbs-down" aria-hidden="true"></i>&nbsp;{{$item.vote.dislike.1}}</button>
                                        {{/if}}
 
                                        {{if ($item.vote.like OR $item.vote.dislike) AND $item.comment}}
@@ -315,7 +315,7 @@ as the value of $top_child_total (this is done at the end of this file)
 
                                {{* Button to open the comment text field *}}
                                {{if $item.comment}}
-                               <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment|escape}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
+                               <button type="button" class="btn-link button-comments" id="comment-{{$item.id}}" title="{{$item.switchcomment}}" {{if $item.thread_level != 1}}onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" {{else}} onclick="showHide('item-comments-{{$item.id}}'); commentExpand({{$item.id}});"{{/if}}><i class="fa fa-commenting" aria-hidden="true"></i>&nbsp;{{$item.switchcomment}}</button>
                                {{/if}}
 
                                {{* Button for sharing the item *}}
@@ -324,25 +324,25 @@ as the value of $top_child_total (this is done at the end of this file)
                                                {{if $item.vote.like OR $item.vote.dislike OR $item.comment}}
                                        <span role="presentation" class="separator">•</span>
                                                {{/if}}
-                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>
+                                       <button type="button" class="btn-link button-votes" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}});"><i class="fa fa-retweet" aria-hidden="true"></i>&nbsp;{{$item.vote.share.1}}</button>
                                        {{/if}}
                                {{/if}}
-                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+                               <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
                        </div>
 
                        <div class="wall-item-actions-right pull-right">
                                {{* Event attendance buttons *}}
                                {{if $item.isevent}}
                                <div class="vote-event">
-                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0|escape}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
-                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1|escape}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
-                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2|escape}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendyes.self}} active" aria-pressed="true{{/if}}" id="attendyes-{{$item.id}}" title="{{$item.attend.0}}" onclick="doLikeAction({{$item.id}},'attendyes');"><i class="fa fa-check" aria-hidden="true"><span class="sr-only">{{$item.attend.0}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendno.self}} active" aria-pressed="true{{/if}}" id="attendno-{{$item.id}}" title="{{$item.attend.1}}" onclick="doLikeAction({{$item.id}},'attendno');"><i class="fa fa-times" aria-hidden="true"><span class="sr-only">{{$item.attend.1}}</span></i></button>
+                                       <button type="button" class="btn btn-xs btn-default button-event{{if $item.responses.attendmaybe.self}} active" aria-pressed="true{{/if}}" id="attendmaybe-{{$item.id}}" title="{{$item.attend.2}}" onclick="doLikeAction({{$item.id}},'attendmaybe');"><i class="fa fa-question" aria-hidden="true"><span class="sr-only">{{$item.attend.2}}</span></i></button>
                                </div>
                                {{/if}}
 
                                <div class="pull-right checkbox">
                                        {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" id="checkbox-{{$item.id}}" class="item-select" value="{{$item.id}}" />
                                        <label for="checkbox-{{$item.id}}"></label>
                                {{/if}}
                                </div>
index bc7bd595572a9758f4288ef9972953a63e2d0eea..2d59a8a256a4008e7e658aede46b8cf9f192c65c 100644 (file)
@@ -1,12 +1,12 @@
 
 <div class="contact-wrapper" id="contact-entry-wrapper-{{$id}}" >
-       {{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore|escape}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>{{/if}}
+       {{if $contact.ignlnk}}<a href="{{$contact.ignlnk}}" title="{{$contact.ignore}}" class="icon drophide profile-match-ignore" onmouseout="imgdull(this);" onmouseover="imgbright(this);" onclick="return confirmDelete();" ></a>{{/if}}
        <div class="contact-photo-wrapper" >
                <div class="contact-photo mframe" id="contact-entry-photo-{{$contact.id}}"
                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)" >
 
-                       <a href="{{$contact.url}}" title="{{$contact.img_hover|escape}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" /></a>
+                       <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /><img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" /></a>
 
                        {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
@@ -27,7 +27,7 @@
                        
        </div>
        <div class="contact-name" id="contact-entry-name-{{$contact.id}}" >
-               {{$contact.name|escape}}
+               {{$contact.name}}
                {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
        </div>
        {{if $contact.alt_text}}<div class="contact-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
@@ -37,7 +37,7 @@
        {{if $contact.network}}<div class="contact-details" id="contact-entry-network-{{$contact.id}}" >{{$contact.network}}</div>{{/if}}
 
        {{if $contact.connlnk}}
-       <div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt|escape}}">{{$contact.conntxt|escape}}</a></div>
+       <div class="contact-entry-connect"><a href="{{$contact.connlnk}}" title="{{$contact.conntxt}}">{{$contact.conntxt}}</a></div>
        {{/if}}
 
 
index 484fe6744b09a27d651a357cbfa827d3504f38d4..0b6540ffacad0f2da155892ed6f653c11028a565 100644 (file)
@@ -31,8 +31,8 @@
        {{$acl}}
 
        <div class="settings-submit-wrapper" >
-               <input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
-               <input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+               <input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+               <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
        </div>
 </form>
 
index 0d3db22671f2be39a85d429b20d6db11c3bbf706..0495b983cfc6445a6e8532d335578e48a0c50130 100644 (file)
@@ -11,7 +11,7 @@
 {{foreach $events as $event}}
        <div class="event">
        {{if $event.is_first}}<hr /><a name="link-{{$event.j}}" ><div class="event-list-date">{{$event.d}}</div></a>{{/if}}
-       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name|escape}}</a>{{/if}}
+       {{if $event.item.author_name}}<a href="{{$event.item.author_link}}" ><img src="{{$event.item.author_avatar}}" height="32" width="32" />{{$event.item.author_name}}</a>{{/if}}
        {{$event.html}}
        {{if $event.item.plink}}<a href="{{$event.plink.0}}" title="{{$event.plink.1}}" target="_blank" class="plink-event-link icon s22 remote-link"></a>{{/if}}
        {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
index f06d1cbcfb05da8d6b8b4fd9cc2544fbce87d858..89827cd314ab485515cbc6281b8dc369e870f9c0 100644 (file)
@@ -2,8 +2,8 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper"
-                               <a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name|escape}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
-                                       <img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name|escape}}" />
+                               <a href="{{$mail.profile_url}}" target="redir" title="{{$mail.from_name}}" class="contact-photo-link" id="wall-item-photo-link-{{$mail.id}}">
+                                       <img src="{{$mail.from_photo}}" class="contact-photo{{$mail.sparkle}}" id="wall-item-photo-{{$mail.id}}" alt="{{$mail.from_name}}" />
                                </a>
                        </div>
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
                                <a href="{{$mail.from_url}}" target="redir"
-                                class="wall-item-name-link" title="{{$mail.from_addr|escape}}"><span
-                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name|escape}}</span></a>
-                                <span class="wall-item-ago" title="{{$mail.date|escape}}">{{$mail.ago|escape}}</span>
+                                class="wall-item-name-link" title="{{$mail.from_addr}}"><span
+                                class="wall-item-name{{$mail.sparkle}}">{{$mail.from_name}}</span></a>
+                                <span class="wall-item-ago" title="{{$mail.date}}">{{$mail.ago}}</span>
                        </div>
                        
                        <div class="wall-item-actions-social">
                        </div>
                        
                        <div class="wall-item-actions-tools">
-                               <a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete|escape}}">{{$mail.delete|escape}}</a>
+                               <a href="message/drop/{{$mail.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$mail.delete}}">{{$mail.delete}}</a>
                        </div>
                        
                </div>
 
 <div class="mail-conv-outside-wrapper">
        <div class="mail-conv-sender" >
-               <a href="{{$mail.from_url}}" title="{{$mail.from_addr|escape}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name|escape}}" title="{{$mail.from_addr|escape}}" /></a>
+               <a href="{{$mail.from_url}}" title="{{$mail.from_addr}}" class="mail-conv-sender-url" ><img class="mframe mail-conv-sender-photo{{$mail.sparkle}}" src="{{$mail.from_photo}}" heigth="80" width="80" alt="{{$mail.from_name}}" title="{{$mail.from_addr}}" /></a>
        </div>
        <div class="mail-conv-detail" >
-               <div class="mail-conv-sender-name" >{{$mail.from_name|escape}}</div>
+               <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
                <div class="mail-conv-date">{{$mail.date}}</div>
                <div class="mail-conv-subject">{{$mail.subject}}</div>
                <div class="mail-conv-body">{{$mail.body}}</div>
-       <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete|escape}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
+       <div class="mail-conv-delete-wrapper" id="mail-conv-delete-wrapper-{{$mail.id}}" ><a href="message/drop/{{$mail.id}}" class="icon drophide delete-icon mail-list-delete-icon" onclick="return confirmDelete();" title="{{$mail.delete}}" id="mail-conv-delete-icon-{{$mail.id}}" class="mail-conv-delete-icon" onmouseover="imgbright(this);" onmouseout="imgdull(this);" ></a></div><div class="mail-conv-delete-end"></div>
        <div class="mail-conv-outside-wrapper-end"></div>
 </div>
 </div>
index e37a7242cbe9c8d8a3169048269c3690e7088e97..6dfacdb78c680632e27d048867ed883109461806 100644 (file)
@@ -24,7 +24,7 @@
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       {{if $plink}}<a class="icon s16 link" title="{{$plink.title|escape}}" href="{{$plink.href}}">{{$plink.title|escape}}</a>{{/if}}
+                       {{if $plink}}<a class="icon s16 link" title="{{$plink.title}}" href="{{$plink.href}}">{{$plink.title}}</a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
@@ -69,7 +69,7 @@
                <div class="wall-item-dislike" id="wall-item-dislike-{{$id}}">{{$dislike}}</div>
                {{if $conv}}
                <div class="wall-item-conv" id="wall-item-conv-{{$id}}" >
-                       <a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title|escape}}'>{{$conv.title|escape}}</a>
+                       <a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title}}'>{{$conv.title}}</a>
                </div>
                {{/if}}
        </div>
index f41fd9a96d86807f81dcbc225ab570b049c881b3..f4a780a0ac3af5fca0299328380cf757314cd6e5 100644 (file)
@@ -10,7 +10,7 @@
 {{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
 </div>
 
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-caption">{{$desc}}</div>
index a316f58aa52787f7f19ea256172da6263e1991d0..d25234b73340e9cf9b224ce4362e8179c8343143 100644 (file)
@@ -1,15 +1,15 @@
 <div class="vcard h-card">
 
        <div class="tool">
-               <div class="fn label p-name">{{$profile.name|escape}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                {{if $profile.edit}}
                        <div class="action">
-                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3|escape}}"><span>{{$profile.edit.1}}</span></a>
+                       <a class="icon s16 edit ttright" href="#" rel="#profiles-menu" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                        <ul id="profiles-menu" class="menu-popup">
                        {{if $profile.menu.entries}}
                                {{foreach $profile.menu.entries as $e}}
                                <li>
-                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name|escape}}</a>
+                                       <a href="profiles/{{$e.id}}"><img src='{{$e.photo}}'>{{$e.profile_name}}</a>
                                </li>
                                {{/foreach}}
                        {{else}}
                {{/if}}
        </div>
 
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
        {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
-       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}" /></div>
+       <div id="profile-photo-wrapper"><img class="photo u-photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}" /></div>
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
 
index 8e7b9ee2807219638ccc2f2caa7ea8eaa28a3ef5..333924d4adf17d7c85e5c5d985e5fda8ceb54108 100644 (file)
@@ -1,7 +1,7 @@
 <div class="wall-item-decor">
-       {{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred|escape}}</span>{{/if}}
-       {{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}">{{$item.lock|escape}}</span>{{/if}}
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+       {{if $item.star}}<span class="icon s22 star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
+       {{if $item.lock}}<span class="icon s22 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 
 <div class="wall-item-container {{$item.indent}}">
@@ -10,8 +10,8 @@
                        <div class="contact-photo-wrapper"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
@@ -22,8 +22,8 @@
                        <div class="wall-item-location">{{$item.location}}</div>
                </div>
                <div class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title|escape}}</a></h2>{{/if}}
                        <div class="wall-item-body">{{$item.body}}</div>
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}
                </div>
        </div>
        <div class="wall-item-bottom">
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       {{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}">{{$item.plink.title|escape}}</a>{{/if}}
+                       {{if $item.plink}}<a class="icon s16 link" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a> <span class="wall-item-ago" title="{{$item.localtime|escape}}">{{$item.ago}}</span>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a> <span class="wall-item-ago" title="{{$item.localtime}}">{{$item.ago}}</span>
                        </div>
 
                        <div class="wall-item-actions-social">
                        {{if $item.star}}
-                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do|escape}}">{{$item.star.do}}</a>
-                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo|escape}}">{{$item.star.undo}}</a>
-                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger|escape}}">{{$item.star.tagger}}</a>
+                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
                        {{/if}}
 
                        {{if $item.vote}}
-                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$item.vote.like.0|escape}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0|escape}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active{{/if}}" title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active{{/if}}" title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
                        {{/if}}
 
                        {{if $item.vote.share}}
-                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}
-                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}"></a>
+                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                                {{/if}}
                        </div>
 
@@ -84,7 +84,7 @@
                <div class="wall-item-dislike" id="wall-item-dislike-{{$item.id}}">{{$item.dislike}}</div>
                {{if $item.conv}}
                <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
-                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'>{{$item.conv.title|escape}}</a>
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
                </div>
                {{/if}}
        </div>
index d9510da438fe687f0be06ce60a361edae1c12e16..efcb5288816374aae07878e0031c5f8151d2e355 100644 (file)
@@ -26,8 +26,8 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
                                {{$item.item_photo_menu}}
                </div>
                        <div class="wall-item-tools">
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                        </div>
        </div>
index cc6ab7d623944f34a95934c7779e575bd6ba7244..ee0499c4765a4fabb8b4d0ad368179fcde371530 100644 (file)
@@ -40,8 +40,8 @@
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
-                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                </a>
                                <a href="#" rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a>
                                <ul class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
                        </div>
                        {{if $item.owner_url}}
                        <div class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name|escape}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                </a>
                        </div>
                        {{/if}}
                        <div class="wall-item-location">{{$item.location}}</div>
                </div>
                <div class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title|escape}}</a></h2>{{/if}}
                        <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
                </div>
        </div>
        <div class="wall-item-bottom">
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links">
-                       {{if $item.plink}}<a class="icon s16 link{{$item.sparkle}} u-url" title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}">{{$item.plink.title|escape}}</a>{{/if}}
+                       {{if $item.plink}}<a class="icon s16 link{{$item.sparkle}} u-url" title="{{$item.plink.title}}" href="{{$item.plink.href}}">{{$item.plink.title}}</a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-author">
                                <a href="{{$item.profile_url}}" target="redir"
-                                title="{{$item.linktitle|escape}}"
+                                title="{{$item.linktitle}}"
                                 class="wall-item-name-link"><span
-                                class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a>
+                                class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
                                 <span class="wall-item-ago" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></span>
-                                {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a> {{$item.vwall}}
+                                {{if $item.owner_url}}<br/>{{$item.to}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a> {{$item.vwall}}
                                 {{/if}}
                        </div>
 
index 050c991cfefc921f0b588e9e9a0141dc0dcc731a..35c54bc690192633d8a68ad12abe0eb76712dc7f 100644 (file)
@@ -24,7 +24,7 @@ function showHideForumlist() {
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
        
@@ -34,7 +34,7 @@ function showHideForumlist() {
                        <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
                                <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
                {{/foreach}}
index 2c9e621935f254fbfa725ff2ecf17634f1aeca3b..d441ebe2de103c68b217172f5d65f1e063a292e9 100644 (file)
@@ -5,8 +5,8 @@
                        <div class="wall-item-photo-wrapper mframe" id="wall-item-photo-wrapper-{{$item.id}}" 
                                 onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')" 
                                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                                <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                                        <ul>
                        <div class="wall-item-delete-end"></div>
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
-                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
                        <div class="wall-item-body" id="wall-item-body-{{$item.id}}" >{{$item.body}}</div>
                </div>
                <div class="wall-item-author">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span></a>
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
                                
                </div>                  
@@ -45,7 +45,7 @@
 
        <div class="wall-item-conv" id="wall-item-conv-{{$item.id}}" >
        {{if $item.conv}}
-                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'>{{$item.conv.title|escape}}</a>
+                       <a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'>{{$item.conv.title}}</a>
        {{/if}}
        </div>
        <div class="wall-item-wrapper-end"></div>
index 616c20f4dc9b03a528401fbacf93297beb421284..5aaa9c4eb1ee53d91a40cc1495872abb281c5064 100644 (file)
                <div class="wall-item-info{{if $item.owner_url}} wallwall{{/if}}" id="wall-item-info-{{$item.id}}">
                        {{if $item.owner_url}}
                        <div class="wall-item-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" title="{{$item.olinktitle|escape}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
-                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name|escape}}" /></a>
+                               <a href="{{$item.owner_url}}" title="{{$item.olinktitle}}" class="wall-item-photo-link" id="wall-item-ownerphoto-link-{{$item.id}}">
+                               <img src="{{$item.owner_photo}}" class="wall-item-photo{{$item.osparkle}}" id="wall-item-ownerphoto-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.owner_name}}" /></a>
                        </div>
                        <div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
                        <div class="wall-item-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card" id="wall-item-photo-wrapper-{{$item.id}}"
                                onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                 onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)">
-                               <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
-                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name|escape}}" /></a>
+                               <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-photo-link u-url" id="wall-item-photo-link-{{$item.id}}">
+                               <img src="{{$item.thumb}}" class="wall-item-photo{{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" style="height: 80px; width: 80px;" alt="{{$item.name}}" /></a>
                                <span onclick="openClose('wall-item-photo-menu-{{$item.id}}');" class="fakelink wall-item-photo-menu-button" id="wall-item-photo-menu-button-{{$item.id}}">menu</span>
                 <div class="wall-item-photo-menu" id="wall-item-photo-menu-{{$item.id}}">
                     <ul>
@@ -46,8 +46,8 @@
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >
                <div class="wall-item-author">
-                       <a href="{{$item.profile_url}}" title="{{$item.linktitle|escape}}" class="wall-item-name-link">
-                       <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</span>
+                       <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link">
+                       <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name}}</span>
                        </a>
                        <div class="wall-item-ago">&bull;</div>
                        <div class="wall-item-ago" id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.ago}}</time></div>
@@ -56,7 +56,7 @@
                <div>
                <hr class="line-dots">
                </div>
-                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title|escape}}</div>
+                       <div class="wall-item-title p-name" id="wall-item-title-{{$item.id}}">{{$item.title}}</div>
                        <div class="wall-item-title-end"></div>
                        <div class="wall-item-body" id="wall-item-body-{{$item.id}}" ><span class="e-content">{{$item.body}}</span>
                                <div class="body-tag">
@@ -99,7 +99,7 @@
 
                        {{if $item.plink}}
                        <div class="wall-item-links-wrapper">
-                               <a href="{{$item.plink.href}}" title="{{$item.plink.title|escape}}" target="external-link" class="icon remote-link u-url"></a>
+                               <a href="{{$item.plink.href}}" title="{{$item.plink.title}}" target="external-link" class="icon remote-link u-url"></a>
                        </div>
                        {{/if}}
 
index 9aa81740b98bbd2346fee8c0d88d6d86b1580b03..2ca114807beeedf9c3aefa23122cef47aeac4292 100644 (file)
@@ -1,2 +1,2 @@
-<a href="{{$url}}/settings/connectors"><img alt="{{$alt_text|escape}}" src="{{$photo}}" title="{{$alt_text|escape}}"></a>
+<a href="{{$url}}/settings/connectors"><img alt="{{$alt_text}}" src="{{$photo}}" title="{{$alt_text}}"></a>
 
index 9d25b3294b8e4a47b7356f6100f5ddd083827d29..6813e1186e1df1e3f66c0dff4922286c8e2fe1d8 100644 (file)
@@ -4,7 +4,7 @@
        <div class="directory-photo-wrapper" id="directory-photo-wrapper-{{$id}}" > 
                <div class="directory-photo" id="directory-photo-{{$id}}" >
                        <a href="{{$profile_link}}" class="directory-profile-link" id="directory-profile-link-{{$id}}" >
-                               <img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text|escape}}" title="{{$alt_text|escape}}" />
+                               <img class="directory-photo-img" src="{{$photo}}" alt="{{$alt_text}}" title="{{$alt_text}}" />
                        </a>
                </div>
        </div>
index af8fa4c9d1fc269fcb1c1101c3a2308b42c4c3b8..3e72df6dc6cf40d61640195dfa3902202b816af2 100644 (file)
@@ -14,7 +14,7 @@
                                <input type="hidden" name="post_id_random" value="{{$rand_num}}" />
 
                                <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}">
-                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle|escape}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle|escape}}" title="{{$mytitle|escape}}" /></a>
+                                       <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a>
                                </div>
                                <div class="comment-edit-photo-end"></div>
                                <textarea id="comment-edit-text-{{$id}}" class="comment-edit-text-empty" name="body" placeholder="{{$comment}}" onFocus="commentOpen(this,{{$id}});"></textarea>
                                <div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;">
 
                                <div class="comment-edit-bb">
-                                       <a title="{{$edimg|escape}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
-                                       <a title="{{$edurl|escape}}" data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
-                                       <a title="{{$edvideo|escape}}" data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
-
-                                       <a title="{{$eduline|escape}}" data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
-                                       <a title="{{$editalic|escape}}" data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
-                                       <a title="{{$edbold|escape}}" data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
-                                       <a title="{{$edquote|escape}}" data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
+                                       <a title="{{$edimg}}" data-role="insert-formatting" data-bbcode="img" data-id="{{$id}}"><i class="icon-picture"></i></a>
+                                       <a title="{{$edurl}}" data-role="insert-formatting" data-bbcode="url" data-id="{{$id}}"><i class="icon-link"></i></a>
+                                       <a title="{{$edvideo}}" data-role="insert-formatting" data-bbcode="video" data-id="{{$id}}"><i class="icon-film"></i></a>
+
+                                       <a title="{{$eduline}}" data-role="insert-formatting" data-bbcode="u" data-id="{{$id}}"><i class="icon-underline"></i></a>
+                                       <a title="{{$editalic}}" data-role="insert-formatting" data-bbcode="i" data-id="{{$id}}"><i class="icon-italic"></i></a>
+                                       <a title="{{$edbold}}" data-role="insert-formatting" data-bbcode="b" data-id="{{$id}}"><i class="icon-bold"></i></a>
+                                       <a title="{{$edquote}}" data-role="insert-formatting" data-bbcode="quote" data-id="{{$id}}"><i class="icon-quote-left"></i></a>
 
                                 </div>
                                        <input type="submit" onclick="post_comment({{$id}}); return false;" id="comment-edit-submit-{{$id}}" class="comment-edit-submit" name="submit" value="{{$submit}}" />
index 94e2312d094f7bccd78860ef922019eba362db4a..b32b63804223409c22c247699dc445e389ff2c0d 100644 (file)
@@ -6,7 +6,7 @@
 
 {{if $comunity_profiles_title}}
 <div id="right_profiles" class="widget">
-<h3>{{$comunity_profiles_title|escape}}</h3>
+<h3>{{$comunity_profiles_title}}</h3>
 <div id='lastusers-wrapper' class='items-wrapper'>
 {{foreach $comunity_profiles_items as $i}}
        {{$i}}
@@ -44,7 +44,7 @@
 
 {{if $lastusers_title}}
 <div id="right_lastusers" class="widget">
-<h3>{{$lastusers_title|escape}}</h3>
+<h3>{{$lastusers_title}}</h3>
 <div id='lastusers-wrapper' class='items-wrapper'>
 {{foreach $lastusers_items as $i}}
        {{$i}}
@@ -55,7 +55,7 @@
 {{/if}}
 
 {{if $activeusers_title}}
-<h3>{{$activeusers_title|escape}}</h3>
+<h3>{{$activeusers_title}}</h3>
 <div class='items-wrapper'>
 {{foreach $activeusers_items as $i}}
        {{$i}}
index 21f75ac94658b6d43468f80b0aaece385d70d51a..1e30bb83b5414b51d3a47dea4c7c65c7d6466b8f 100644 (file)
                                        <div id="contact-edit-profile-select-end"></div>
                                {{/if}}
                        </div>
-                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+                       <input class="contact-edit-submit" type="submit" name="submit" value="{{$submit}}" />
                        {{/if}}
 
                        <div class="contact-edit-submit-end clearfix"></div>
index f36995e9c2918a472d11275db0c3407c1528296f..c4ed99caa479293649e86358167e996f69f98252 100644 (file)
@@ -5,8 +5,8 @@
                <!-- 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)" > -->
 
-                       <!-- <a href="{{$contact.url}}" title="{{$contact.img_hover|escape}}" /></a> -->
-                       <img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name|escape}}" />
+                       <!-- <a href="{{$contact.url}}" title="{{$contact.img_hover}}" /></a> -->
+                       <img src="{{$contact.thumb}}" {{$contact.sparkle}} alt="{{$contact.name}}" />
 
                        {{if $multiselect}}
                        <input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}">
@@ -32,7 +32,7 @@
        
        <div class="contact-entry-desc">
                <div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" >
-                       {{$contact.name|escape}}
+                       {{$contact.name}}
                        {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
                </div>
                {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}
index 35e05c02d502fac307eae582b4c0cae88943fc38..1747118aba5015c94005e410032917342f7f4948 100644 (file)
@@ -59,8 +59,8 @@
 {{$acl}}
 
 <div class="clear"></div>
-<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" />
-<input id="event-submit" type="submit" name="submit" value="{{$submit|escape:'html'}}" />
+<input id="event-edit-preview" type="submit" name="preview" value="{{$preview}}" onclick="doEventPreview(); return false;" />
+<input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
 </form>
 
 
index 70dee37550d5fb37d23a11ebdf8395d29d4b8402..376fcdc312b0a6bbe1026e3b76b22d913e73f8d5 100644 (file)
                </li>
                {{if $nav.home}}
                        <li role="menuitem" id="nav-home-link" class="nav-menu {{$sel.home}}">
-                               <a accesskey="p" class="{{$nav.home.2}} desktop-view" href="{{$nav.home.0}}" title="{{$nav.home.3|escape}}" >{{$nav.home.1}}</a>
-                               <a class="{{$nav.home.2}} mobile-view" href="{{$nav.home.0}}" title="{{$nav.home.3|escape}}" ><i class="icon s22 icon-home"></i></a>
+                               <a accesskey="p" class="{{$nav.home.2}} desktop-view" href="{{$nav.home.0}}" title="{{$nav.home.3}}" >{{$nav.home.1}}</a>
+                               <a class="{{$nav.home.2}} mobile-view" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="icon s22 icon-home"></i></a>
                                <span id="home-update" class="nav-notify"></span>
                        </li>
                {{/if}}
                {{if $nav.network}}
                        <li role="menuitem" id="nav-network-link" class="nav-menu {{$sel.network}}">
-                               <a accesskey="n" class="{{$nav.network.2}} desktop-view" href="{{$nav.network.0}}" title="{{$nav.network.3|escape}}" >{{$nav.network.1}}</a>
-                               <a class="{{$nav.network.2}} mobile-view" href="{{$nav.network.0}}" title="{{$nav.network.3|escape}}" ><i class="icon s22 icon-th"></i></a>
+                               <a accesskey="n" class="{{$nav.network.2}} desktop-view" href="{{$nav.network.0}}" title="{{$nav.network.3}}" >{{$nav.network.1}}</a>
+                               <a class="{{$nav.network.2}} mobile-view" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon s22 icon-th"></i></a>
                                <span id="net-update" class="nav-notify"></span>
                        </li>
                {{/if}}
                {{if $nav.events}}
                        <li role="menuitem" id="nav-events-link" class="nav-menu {{$sel.events}}">
-                               <a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3|escape}}" >{{$nav.events.1}}</a>
-                               <a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3|escape}}" ><i class="icon s22 icon-calendar"></i></a>
+                               <a accesskey="e" class="{{$nav.events.2}} desktop-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}" >{{$nav.events.1}}</a>
+                               <a class="{{$nav.events.2}} mobile-view" href="{{$nav.events.0}}" title="{{$nav.events.3}}" ><i class="icon s22 icon-calendar"></i></a>
                        </li>
                {{/if}}
                {{if $nav.community}}
                        <li role="menuitem" id="nav-community-link" class="nav-menu {{$sel.community}}">
-                               <a accesskey="c" class="{{$nav.community.2}} desktop-view" href="{{$nav.community.0}}" title="{{$nav.community.3|escape}}" >{{$nav.community.1}}</a>
-                               <a class="{{$nav.community.2}} mobile-view" href="{{$nav.community.0}}" title="{{$nav.community.3|escape}}" ><i class="icon s22 icon-bullseye"></i></a>
+                               <a accesskey="c" class="{{$nav.community.2}} desktop-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}" >{{$nav.community.1}}</a>
+                               <a class="{{$nav.community.2}} mobile-view" href="{{$nav.community.0}}" title="{{$nav.community.3}}" ><i class="icon s22 icon-bullseye"></i></a>
                        </li>
                {{/if}}
 
                <li role="menu" aria-haspopup="true" id="nav-site-linkmenu" class="nav-menu-icon"><a><span class="icon s22 icon-question"><span class="sr-only">{{$nav.help.3}}</span></span></a>
                        <ul id="nav-site-menu" class="menu-popup">
-                               {{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3|escape}}" >{{$nav.help.1}}</a></li>{{/if}}
-                               <li role="menuitem"><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3|escape}}" >{{$nav.about.1}}</a></li>
-                               {{if $nav.tos}}<a class="{{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3|escape}}" >{{$nav.tos.1}}</a></li>{{/if}}
-                               <li role="menuitem"><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3|escape}}" >{{$nav.directory.1}}</a></li>
+                               {{if $nav.help}} <li role="menuitem"><a class="{{$nav.help.2}}" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a></li>{{/if}}
+                               <li role="menuitem"><a class="{{$nav.about.2}}" href="{{$nav.about.0}}" title="{{$nav.about.3}}" >{{$nav.about.1}}</a></li>
+                               {{if $nav.tos}}<a class="{{$nav.tos.2}}" href="{{$nav.tos.0}}" title="{{$nav.tos.3}}" >{{$nav.tos.1}}</a></li>{{/if}}
+                               <li role="menuitem"><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" >{{$nav.directory.1}}</a></li>
                        </ul>
                </li>
 
                {{if $nav.notifications}}
-                       <li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon"><a title="{{$nav.notifications.1|escape}}"><span class="icon s22 icon-bell tilted-icon"><span class="sr-only">{{$nav.notifications.1}}</span></span></a>
+                       <li role="menu" aria-haspopup="true" id="nav-notifications-linkmenu" class="nav-menu-icon"><a title="{{$nav.notifications.1}}"><span class="icon s22 icon-bell tilted-icon"><span class="sr-only">{{$nav.notifications.1}}</span></span></a>
                                <span id="notify-update" class="nav-notify"></span>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <li role="menuitem" id="nav-notifications-mark-all"><a onclick="notifyMarkAll(); return false;">{{$nav.notifications.mark.1}}</a></li>
 
                {{if $userinfo}}
                        <li role="menu" aria-haspopup="true" id="nav-user-linkmenu" class="nav-menu">
-                               <a accesskey="u" title="{{$sitelocation|escape}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name|escape}}"><span id="nav-user-linklabel">{{$userinfo.name|escape}}</span><span id="intro-update" class="nav-notify"></span></a>
+                               <a accesskey="u" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span id="nav-user-linklabel">{{$userinfo.name}}</span><span id="intro-update" class="nav-notify"></span></a>
                                <ul id="nav-user-menu" class="menu-popup">
-                                       {{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3|escape}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
-                                       {{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3|escape}}" >{{$nav.contacts.1}}</a></li>{{/if}}
-                                       {{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3|escape}}" >{{$nav.messages.1}}</a><span id="mail-update" class="nav-notify"></span></a></li>{{/if}}
-                                       {{if $nav.manage}}<li role="menuitem"><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3|escape}}">{{$nav.manage.1}}</a></li>{{/if}}
-                                       {{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3|escape}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
-                                       {{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3|escape}}">{{$nav.settings.1}}</a></li>{{/if}}
-                                       {{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3|escape}}" >{{$nav.logout.1}}</a></li>{{/if}}
+                                       {{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
+                                       {{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
+                                       {{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}}</a><span id="mail-update" class="nav-notify"></span></a></li>{{/if}}
+                                       {{if $nav.manage}}<li role="menuitem"><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
+                                       {{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
+                                       {{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+                                       {{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
                                </ul>
                        </li>
                {{/if}}
 
                {{if $nav.login}}
                        <li role="menuitem" id="nav-login-link" class="nav-menu">
-                               <a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3|escape}}" >{{$nav.login.1}}</a>
+                               <a class="{{$nav.login.2}}" href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a>
                        </li>
                {{/if}}
 
 
                {{if $nav.admin}}
                        <li role="menuitem" id="nav-admin-link" class="nav-menu">
-                               <a accesskey="a" class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3|escape}}" ><span class="sr-only">{{$nav.admin.3|escape}}</span></a>
+                               <a accesskey="a" class="{{$nav.admin.2}} icon-sliders" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" ><span class="sr-only">{{$nav.admin.3}}</span></a>
                        </li>
                {{/if}}
 
                {{if $nav.apps}}
                        <li role="menu" aria-haspopup="true" id="nav-apps-link" class="nav-menu {{$sel.apps}}">
-                               <a class=" {{$nav.apps.2}}" title="{{$nav.apps.3|escape}}" >{{$nav.apps.1}}</a>
+                               <a class=" {{$nav.apps.2}}" title="{{$nav.apps.3}}" >{{$nav.apps.1}}</a>
                                <ul id="nav-apps-menu" class="menu-popup">
                                        {{foreach $apps as $ap}}
                                        <li role="menuitem">{{$ap}}</li>
index f696a683a6d5a7e74bd21d4ef362ed9ea9a213ea..bc77eaa9cd93ea182978902cd51ebb5552b01502 100644 (file)
@@ -2,15 +2,15 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
-                               <a href="{{$profile_url}}" target="redir" title="{{$linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
-                                       <img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name|escape}}" />
+                               <a href="{{$profile_url}}" target="redir" title="{{$linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$id}}">
+                                       <img src="{{$thumb}}" class="contact-photo{{$sparkle}}" id="wall-item-photo-{{$id}}" alt="{{$name}}" />
                                </a>
                        </div>
                </div>
                <div class="wall-item-actions-author">
-                       <a href="{{$profile_url}}" target="redir" title="{{$linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name|escape}}</span></a>
+                       <a href="{{$profile_url}}" target="redir" title="{{$linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$sparkle}}">{{$name}}</span></a>
                        <span class="wall-item-ago">
-                               {{if $plink}}<a class="link" title="{{$plink.title|escape}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
+                               {{if $plink}}<a class="link" title="{{$plink.title}}" href="{{$plink.href}}" style="color: #999">{{$ago}}</a>{{else}} {{$ago}} {{/if}}
                                {{if $lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$id}});">{{$lock}}</span> {{/if}}
                        </span>
                </div>
@@ -31,8 +31,8 @@
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       <!-- {{if $plink}}<a title="{{$plink.title|escape}}" href="{{$plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
-                       {{if $conv}}<a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title|escape}}'><i class="icon-link icon-large"></i></a>{{/if}}
+                       <!-- {{if $plink}}<a title="{{$plink.title}}" href="{{$plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+                       {{if $conv}}<a href='{{$conv.href}}' id='context-{{$id}}' title='{{$conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
 
 
                        <div class="wall-item-actions-social">
                        {{if $star}}
-                               <a href="#" id="star-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classdo}}"  title="{{$star.do|escape}}">{{$star.do}}</a>
-                               <a href="#" id="unstar-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classundo}}"  title="{{$star.undo|escape}}">{{$star.undo}}</a>
-                               <a href="#" id="tagger-{{$id}}" onclick="itemTag({{$id}}); return false;" class="{{$star.classtagger}}" title="{{$star.tagger|escape}}">{{$star.tagger}}</a>
+                               <a href="#" id="star-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classdo}}"  title="{{$star.do}}">{{$star.do}}</a>
+                               <a href="#" id="unstar-{{$id}}" onclick="dostar({{$id}}); return false;"  class="{{$star.classundo}}"  title="{{$star.undo}}">{{$star.undo}}</a>
+                               <a href="#" id="tagger-{{$id}}" onclick="itemTag({{$id}}); return false;" class="{{$star.classtagger}}" title="{{$star.tagger}}">{{$star.tagger}}</a>
                        {{/if}}
 
                        {{if $vote}}
-                               <a href="#" id="like-{{$id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$vote.like.0|escape}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
-                               <a href="#" id="dislike-{{$id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$vote.dislike.0|escape}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
+                               <a href="#" id="like-{{$id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$vote.like.0}}" onclick="dolike({{$id}},'like'); return false">{{$vote.like.1}}</a>
+                               <a href="#" id="dislike-{{$id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$vote.dislike.0}}" onclick="dolike({{$id}},'dislike'); return false">{{$vote.dislike.1}}</a>
                        {{/if}}
 
                        {{if $vote.share}}
-                               <a href="#" id="share-{{$id}}" title="{{$vote.share.0|escape}}" onclick="jotShare({{$id}}); return false">{{$vote.share.1}}</a>
+                               <a href="#" id="share-{{$id}}" title="{{$vote.share.0}}" onclick="jotShare({{$id}}); return false">{{$vote.share.1}}</a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $drop.pagedrop}}
-                                       <input type="checkbox" title="{{$drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$id}}" />
+                                       <input type="checkbox" title="{{$drop.select}}" name="itemselected[]" class="item-select" value="{{$id}}" />
                                {{/if}}
                                {{if $drop.dropping}}
-                                       <a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$drop.delete|escape}}">{{$drop.delete}}</a>
+                                       <a href="item/drop/{{$id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$drop.delete}}">{{$drop.delete}}</a>
                                {{/if}}
                                {{if $edpost}}
-                                       <a class="icon edit s16" href="{{$edpost.0}}" title="{{$edpost.1|escape}}"></a>
+                                       <a class="icon edit s16" href="{{$edpost.0}}" title="{{$edpost.1}}"></a>
                                {{/if}}
                        </div>
 
index 5a6613dd1eb9ec0023bf831b5b3dacff579d495d..c252960c08389d38aad9282d796d39f99503c9d9 100644 (file)
@@ -8,11 +8,11 @@
 |
 <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a>
 {{/if}}
-{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock|escape}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
+{{if $lock}} | <img src="images/lock_icon.gif" class="lockview" alt="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');" /> {{/if}}
 </div>
 
 {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}}
-<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title|escape}}"><img src="{{$photo.src}}" /></a></div>
+<div id="photo-photo"><a href="{{$photo.href}}" title="{{$photo.title}}"><img src="{{$photo.src}}" /></a></div>
 {{if $nextlink}}<div id="photo-next-link"><a href="{{$nextlink.0}}">{{$nextlink.1}}</a></div>{{/if}}
 <div id="photo-photo-end"></div>
 <div id="photo-caption">{{$desc}}</div>
index 0951847b0a018321e72d9e2061eb2ef0159f67ec..fbd08e4be0fee60c44215eb698e20bfafe01db62 100644 (file)
 {{/if}}
 <div id="profile-edit-profile-name-wrapper" >
 <label id="profile-edit-profile-name-label" for="profile-edit-profile-name" >{{$profile_name.1}} </label>
-<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2|escape:'html'}}" /><div class="required">*</div>
+<input type="text" size="32" name="profile_name" id="profile-edit-profile-name" value="{{$profile_name.2}}" /><div class="required">*</div>
 </div>
 <div id="profile-edit-profile-name-end"></div>
 
 <div id="profile-edit-name-wrapper" >
 <label id="profile-edit-name-label" for="profile-edit-name" >{{$name.1}} </label>
-<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2|escape:'html'}}" />
+<input type="text" size="32" name="name" id="profile-edit-name" value="{{$name.2}}" />
 </div>
 <div id="profile-edit-name-end"></div>
 
 
 <div id="profile-edit-address-wrapper" >
 <label id="profile-edit-address-label" for="profile-edit-address" >{{$address.1}} </label>
-<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2|escape:'html'}}" />
+<input type="text" size="32" name="address" id="profile-edit-address" value="{{$address.2}}" />
 </div>
 <div id="profile-edit-address-end"></div>
 
 <div id="profile-edit-locality-wrapper" >
 <label id="profile-edit-locality-label" for="profile-edit-locality" >{{$locality.1}} </label>
-<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2|escape:'html'}}" />
+<input type="text" size="32" name="locality" id="profile-edit-locality" value="{{$locality.2}}" />
 </div>
 <div id="profile-edit-locality-end"></div>
 
 
 <div id="profile-edit-postal-code-wrapper" >
 <label id="profile-edit-postal-code-label" for="profile-edit-postal-code" >{{$postal_code.1}} </label>
-<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2|escape:'html'}}" />
+<input type="text" size="32" name="postal_code" id="profile-edit-postal-code" value="{{$postal_code.2}}" />
 </div>
 <div id="profile-edit-postal-code-end"></div>
 
 
 <div id="profile-edit-pubkeywords-wrapper" >
 <label id="profile-edit-pubkeywords-label" for="profile-edit-pubkeywords" >{{$pub_keywords.1}} </label>
-<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="pub_keywords" id="profile-edit-pubkeywords" title="{{$lbl_ex2}}" value="{{$pub_keywords.2}}" />
 </div><div id="profile-edit-pubkeywords-desc">{{$pub_keywords.3}}</div>
 <div id="profile-edit-pubkeywords-end"></div>
 
 <div id="profile-edit-prvkeywords-wrapper" >
 <label id="profile-edit-prvkeywords-label" for="profile-edit-prvkeywords" >{{$prv_keywords.1}} </label>
-<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2|escape:'html'}}" />
+<input type="text" size="32" name="prv_keywords" id="profile-edit-prvkeywords" title="{{$lbl_ex2}}" value="{{$prv_keywords.2}}" />
 </div><div id="profile-edit-prvkeywords-desc">{{$prv_keywords.3}}</div>
 <div id="profile-edit-prvkeywords-end"></div>
 
index a464416959b9971c9e00286435bb55f0b2d2789b..dfa341b2601c585f3c71a90a021c906e3f93f5c2 100644 (file)
@@ -1,7 +1,7 @@
 <div class="vcard h-card">
 
        <div class="tool">
-               <div class="fn label p-name">{{$profile.name|escape}}</div>
+               <div class="fn label p-name">{{$profile.name}}</div>
                {{if $profile.edit}}
                        <div class="action">
                                <a class="icon s16 edit ttright" href="{{$profile.edit.0}}" title="{{$profile.edit.3}}"><span>{{$profile.edit.1}}</span></a>
                {{/if}}
        </div>
 
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr}}</div>{{/if}}
 
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 
        {{if $profile.picdate}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></a></div>
        {{else}}
-               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name|escape}}"></a></div>
+               <div id="profile-photo-wrapper"><a href="{{$profile.url}}"><img class="photo u-photo" src="{{$profile.photo}}" alt="{{$profile.name}}"></a></div>
        {{/if}}
 
        {{if $account_type}}<div class="account-type">{{$account_type}}</div>{{/if}}
index c274ca3e38f3ee37419f2dc7b9191686e0b67965..c1383ba4346151f092b252ffeff909cb59f09b4f 100644 (file)
@@ -1,9 +1,9 @@
 
 
 <div class="wall-item-decor">
-       {{if $item.star}}<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred|escape}}">{{$item.star.starred|escape}}</span>{{/if}}
-       {{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}">{{$item.lock|escape}}</span>{{/if}}
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+       {{if $item.star}}<span class="icon star {{$item.isstarred}}" id="starred-{{$item.id}}" title="{{$item.star.starred}}">{{$item.star.starred}}</span>{{/if}}
+       {{if $item.lock}}<span class="icon lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 
 <div class="wall-item-container {{$item.indent}} {{$item.shiny}} ">
@@ -12,8 +12,8 @@
                        <div class="contact-photo-wrapper">
                                <!-- onmouseover="if (typeof t{{$item.id}} != 'undefined') clearTimeout(t{{$item.id}}); openMenu('wall-item-photo-menu-button-{{$item.id}}')"
                                onmouseout="t{{$item.id}}=setTimeout('closeMenu(\'wall-item-photo-menu-button-{{$item.id}}\'); closeMenu(\'wall-item-photo-menu-{{$item.id}}\');',200)"> -->
-                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <!-- <a rel="#wall-item-photo-menu-{{$item.id}}" class="contact-photo-menu-button icon s16 menu" id="wall-item-photo-menu-button-{{$item.id}}">menu</a> -->
                                <ul role="menu" aria-haspopup="true" class="wall-item-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
                                {{$item.item_photo_menu}}
@@ -22,9 +22,9 @@
                        </div>
                </div>
                <div class="wall-item-actions-author">
-                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a>
+                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
                        <span class="wall-item-ago">
-                               {{if $item.plink}}<a class="link" title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
+                               {{if $item.plink}}<a class="link" title="{{$item.plink.title}}" href="{{$item.plink.href}}" style="color: #999">{{$item.ago}}</a>{{else}} {{$item.ago}} {{/if}}
                                {{if $item.lock}}<span class="fakelink" style="color: #999" onclick="lockview(event,{{$item.id}});">{{$item.lock}}</span> {{/if}}
                        </span>
                </div>
@@ -46,8 +46,8 @@
        </div>
        <div class="wall-item-bottom">
                <div class="">
-                       <!-- {{if $item.plink}}<a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
-                       {{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title|escape}}'><i class="icon-link icon-large"></i></a>{{/if}}
+                       <!-- {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}"><i class="icon-link icon-large"></i></a>{{/if}} -->
+                       {{if $item.conv}}<a href='{{$item.conv.href}}' id='context-{{$item.id}}' title='{{$item.conv.title}}'><i class="icon-link icon-large"></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
 
 
                        <div class="wall-item-actions-social">
                        {{if $item.star}}
-                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do|escape}}">{{$item.star.do}}</a>
-                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo|escape}}">{{$item.star.undo}}</a>
-                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger|escape}}">{{$item.star.tagger}}</a>
+                               <a href="#" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}"  title="{{$item.star.do}}">{{$item.star.do}}</a>
+                               <a href="#" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}">{{$item.star.undo}}</a>
+                               <a href="#" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.star.classtagger}}" title="{{$item.star.tagger}}">{{$item.star.tagger}}</a>
                        {{/if}}
 
                        {{if $item.vote}}
-                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0|escape}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
-                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0|escape}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
+                               <a href="#" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false">{{$item.vote.like.1}}</a>
+                               <a href="#" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false">{{$item.vote.dislike.1}}</a>
                        {{/if}}
 
                        {{if $item.vote.share}}
-                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
+                               <a href="#" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false">{{$item.vote.share.1}}</a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete|escape}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                                {{if $item.edpost}}
-                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}"></a>
+                                       <a class="icon edit s16" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"></a>
                                {{/if}}
                        </div>
 
index 2c02036a0ef4e40706290beb52a40c7d2b6718de..be6b143b9f5feb8a55f7364ebe7373f54a22c8f6 100644 (file)
@@ -27,8 +27,8 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper">
-                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <!-- <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo{{$item.sparkle}}" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
                                {{$item.item_photo_menu}}
                                </ul>
                </div>
                        <div class="wall-item-tools">
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete|escape}}">{{$item.drop.delete}}</a>
+                                       <a href="item/drop/{{$item.id}}" onclick="return confirmDelete();" class="icon delete s16" title="{{$item.drop.delete}}">{{$item.drop.delete}}</a>
                                {{/if}}
                        </div>
        </div>
index d99061798accb1ed11d58e9d0b2f703ac2fc40b8..bcef48c62e112bcb0b0526aaee5f2c4e04312e0d 100644 (file)
@@ -19,7 +19,7 @@
 {{if $item.thread_level!=1}}<div class="children u-comment h-cite">{{/if}}
 
 <div aria-hidden="true" class="wall-item-decor">
-       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait|escape}}" title="{{$item.wait|escape}}" style="display: none;" />
+       <img id="like-rotator-{{$item.id}}" class="like-rotator" src="images/rotator.gif" alt="{{$item.wait}}" title="{{$item.wait}}" style="display: none;" />
 </div>
 
 {{if $item.thread_level<7}}
@@ -36,8 +36,8 @@
        <div class="wall-item-item">
                <div class="wall-item-info">
                        <div class="contact-photo-wrapper mframe{{if $item.owner_url}} wwfrom{{/if}} p-author h-card">
-                               <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
-                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name|escape}}" />
+                               <!-- <a aria-hidden="true" href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="contact-photo-link u-url" id="wall-item-photo-link-{{$item.id}}"></a> -->
+                                       <img src="{{$item.thumb}}" class="contact-photo {{$item.sparkle}} p-name u-photo" id="wall-item-photo-{{$item.id}}" alt="{{$item.name}}" />
                                <ul role="menu" aria-haspopup="true" class="contact-menu menu-popup" id="wall-item-photo-menu-{{$item.id}}">
                                {{$item.item_photo_menu}}
                                </ul>
                        </div>
                        {{if $item.owner_url}}
                        <div aria-hidden="true" class="contact-photo-wrapper mframe wwto" id="wall-item-ownerphoto-wrapper-{{$item.id}}" >
-                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="contact-photo-link u-url" id="wall-item-ownerphoto-link-{{$item.id}}">
-                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}} p-name u-photo" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name|escape}}" />
+                               <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="contact-photo-link u-url" id="wall-item-ownerphoto-link-{{$item.id}}">
+                                       <img src="{{$item.owner_photo}}" class="contact-photo {{$item.osparkle}} p-name u-photo" id="wall-item-ownerphoto-{{$item.id}}" alt="{{$item.owner_name}}" />
                                </a>
                        </div>
                        {{/if}}
                </div>
                <div role="heading" aria-level="{{$item.thread_level}}" class="wall-item-actions-author">
-                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name|escape}}</span></a>
-                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle|escape}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name|escape}}</span></a>{{/if}}
+                       <a href="{{$item.profile_url}}" target="redir" title="{{$item.linktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.sparkle}}">{{$item.name}}</span></a>
+                       {{if $item.owner_url}}{{$item.via}} <a href="{{$item.owner_url}}" target="redir" title="{{$item.olinktitle}}" class="wall-item-name-link"><span class="wall-item-name{{$item.osparkle}}" id="wall-item-ownername-{{$item.id}}">{{$item.owner_name}}</span></a>{{/if}}
                        <span class="wall-item-ago">
-                               {{if $item.plink}}<a title="{{$item.plink.title|escape}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
+                               {{if $item.plink}}<a title="{{$item.plink.title}}" href="{{$item.plink.href}}" class="u-url" style="color: #999"><time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time></a>{{else}} <time class="dt-published" datetime="{{$item.localtime}}">{{$item.created}}</time> {{/if}}
                        </span>
-                       {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock|escape}}">{{$item.lock}}</span>{{/if}}
-                       <span class="wall-item-network" title="{{$item.app|escape}}">
+                       {{if $item.lock}}<span class="icon s10 lock fakelink" onclick="lockview(event,{{$item.id}});" title="{{$item.lock}}">{{$item.lock}}</span>{{/if}}
+                       <span class="wall-item-network" title="{{$item.app}}">
                                {{$item.network_name}}
                        </span>
                        <div class="wall-item-network-end"></div>
                </div>
 
                <div itemprop="description" class="wall-item-content">
-                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title|escape}}</a></h2>{{/if}}
                        <span class="wall-item-body e-content {{if !$item.title}}p-name{{/if}}">{{$item.body}}</span>
+                       {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}
                </div>
        </div>
        <div class="wall-item-bottom">
                        {{/foreach}}
                {{/if}}
                        {{foreach $item.folders as $cat}}
-                               <span class="folder p-category">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="folder p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                        {{foreach $item.categories as $cat}}
-                               <span class="category p-category">{{$cat.name|escape}}</a>{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove|escape}}">x</a>) {{/if}} </span>
+                               <span class="category p-category">{{$cat.name}}{{if $cat.removeurl}} (<a href="{{$cat.removeurl}}" title="{{$remove}}">x</a>) {{/if}} </span>
                        {{/foreach}}
                </div>
        </div>
        <div class="wall-item-bottom">
                <div class="wall-item-links">
-                       {{if $item.plink}}<a role="button" title="{{$item.plink.orig_title|escape}}" href="{{$item.plink.orig}}"><i class="icon-link icon-large"><span class="sr-only">{{$item.plink.orig_title|escape}}</span></i></a>{{/if}}
+                       {{if $item.plink}}<a role="button" title="{{$item.plink.orig_title}}" href="{{$item.plink.orig}}"><i class="icon-link icon-large"><span class="sr-only">{{$item.plink.orig_title}}</span></i></a>{{/if}}
                </div>
                <div class="wall-item-actions">
                        <div class="wall-item-actions-social">
                        {{if $item.threaded}}
                        {{/if}}
                        {{if $item.comment}}
-                               <a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment|escape}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
+                               <a role="button" id="comment-{{$item.id}}" class="fakelink togglecomment" onclick="openClose('item-comments-{{$item.id}}'); commentExpand({{$item.id}});" title="{{$item.switchcomment}}"><i class="icon-commenting"><span class="sr-only">{{$item.switchcomment}}</span></i></a>
                        {{/if}}
 
                        {{if $item.isevent}}
-                               <a role="button" id="attendyes-{{$item.id}}"{{if $item.responses.attendyes.self}} class="active"{{/if}} title="{{$item.attend.0|escape}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="icon-ok icon-large"><span class="sr-only">{{$item.attend.0}}</span></i></a>
-                               <a role="button" id="attendno-{{$item.id}}"{{if $item.responses.attendno.self}} class="active"{{/if}} title="{{$item.attend.1|escape}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"><span class="sr-only">{{$item.attend.1}}</span></i></a>
-                               <a role="button" id="attendmaybe-{{$item.id}}"{{if $item.responses.attendmaybe.self}} class="active"{{/if}} title="{{$item.attend.2|escape}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"><span class="sr-only">{{$item.attend.2}}</span></i></a>
+                               <a role="button" id="attendyes-{{$item.id}}"{{if $item.responses.attendyes.self}} class="active"{{/if}} title="{{$item.attend.0}}" onclick="dolike({{$item.id}},'attendyes'); return false;"><i class="icon-ok icon-large"><span class="sr-only">{{$item.attend.0}}</span></i></a>
+                               <a role="button" id="attendno-{{$item.id}}"{{if $item.responses.attendno.self}} class="active"{{/if}} title="{{$item.attend.1}}" onclick="dolike({{$item.id}},'attendno'); return false;"><i class="icon-remove icon-large"><span class="sr-only">{{$item.attend.1}}</span></i></a>
+                               <a role="button" id="attendmaybe-{{$item.id}}"{{if $item.responses.attendmaybe.self}} class="active"{{/if}} title="{{$item.attend.2}}" onclick="dolike({{$item.id}},'attendmaybe'); return false;"><i class="icon-question icon-large"><span class="sr-only">{{$item.attend.2}}</span></i></a>
                        {{/if}}
 
                        {{if $item.vote}}
                                {{if $item.vote.like}}
-                               <a role="button" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0|escape}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"><span class="sr-only">{{$item.vote.like.0}}</span></i></a>
+                               <a role="button" id="like-{{$item.id}}"{{if $item.responses.like.self}} class="active"{{/if}} title="{{$item.vote.like.0}}" onclick="dolike({{$item.id}},'like'); return false"><i class="icon-thumbs-up icon-large"><span class="sr-only">{{$item.vote.like.0}}</span></i></a>
                                {{/if}}{{if $item.vote.dislike}}
-                               <a role="button" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0|escape}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"><span class="sr-only">{{$item.vote.dislike.0}}</span></i></a>
+                               <a role="button" id="dislike-{{$item.id}}"{{if $item.responses.dislike.self}} class="active"{{/if}} title="{{$item.vote.dislike.0}}" onclick="dolike({{$item.id}},'dislike'); return false"><i class="icon-thumbs-down icon-large"><span class="sr-only">{{$item.vote.dislike.0}}</span></i></a>
                                {{/if}}
                            {{if $item.vote.share}}
-                                   <a role="button" id="share-{{$item.id}}" title="{{$item.vote.share.0|escape}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"><span class="sr-only">{{$item.vote.share.0}}</span></i></a>
+                                   <a role="button" id="share-{{$item.id}}" title="{{$item.vote.share.0}}" onclick="jotShare({{$item.id}}); return false"><i class="icon-retweet icon-large"><span class="sr-only">{{$item.vote.share.0}}</span></i></a>
                            {{/if}}
                        {{/if}}
 
                        {{if $item.star}}
-                               <a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}" title="{{$item.star.do|escape}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
-                               <a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo|escape}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>
+                               <a role="button" id="star-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classdo}}" title="{{$item.star.do}}"><i class="icon-star icon-large"><span class="sr-only">{{$item.star.do}}</span></i></a>
+                               <a role="button" id="unstar-{{$item.id}}" onclick="dostar({{$item.id}}); return false;"  class="{{$item.star.classundo}}"  title="{{$item.star.undo}}"><i class="icon-star-empty icon-large"><span class="sr-only">{{$item.star.undo}}</span></i></a>
                        {{/if}}
                        {{if $item.ignore}}
-                               <a role="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classdo}}"  title="{{$item.ignore.do|escape}}"><i class="icon-bell-slash icon-large"><span class="sr-only">{{$item.ignore.do}}</span></i></a>
-                               <a role="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo|escape}}"><i class="icon-bell-slash-o icon-large"><span class="sr-only">{{$item.ignore.undo}}</span></i></a>
+                               <a role="button" id="ignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classdo}}"  title="{{$item.ignore.do}}"><i class="icon-bell-slash icon-large"><span class="sr-only">{{$item.ignore.do}}</span></i></a>
+                               <a role="button" id="unignore-{{$item.id}}" onclick="doignore({{$item.id}}); return false;"  class="{{$item.ignore.classundo}}"  title="{{$item.ignore.undo}}"><i class="icon-bell-slash-o icon-large"><span class="sr-only">{{$item.ignore.undo}}</span></i></a>
                        {{/if}}
                        {{if $item.tagger}}
-                               <a role="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add|escape}}"><i class="icon-tags icon-large"><span class="sr-only">{{$item.tagger.add}}</span></i></a>
+                               <a role="button" id="tagger-{{$item.id}}" onclick="itemTag({{$item.id}}); return false;" class="{{$item.tagger.class}}" title="{{$item.tagger.add}}"><i class="icon-tags icon-large"><span class="sr-only">{{$item.tagger.add}}</span></i></a>
                        {{/if}}
                        {{if $item.filer}}
-                                <a role="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer|escape}}"><i class="icon-folder-close icon-large"><span class="sr-only">{{$item.filer}}</span></i></a>
+                                <a role="button" id="filer-{{$item.id}}" onclick="itemFiler({{$item.id}}); return false;" class="filer-item filer-icon" title="{{$item.filer}}"><i class="icon-folder-close icon-large"><span class="sr-only">{{$item.filer}}</span></i></a>
                        {{/if}}
                        </div>
 
                        <div class="wall-item-actions-tools">
 
                                {{if $item.drop.pagedrop}}
-                                       <input type="checkbox" title="{{$item.drop.select|escape}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
+                                       <input type="checkbox" title="{{$item.drop.select}}" name="itemselected[]" class="item-select" value="{{$item.id}}" />
                                {{/if}}
                                {{if $item.drop.dropping}}
-                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete|escape}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
+                                       <a role="button" href="item/drop/{{$item.id}}/{{$item.return}}" onclick="return confirmDelete();" title="{{$item.drop.delete}}"><i class="icon-trash icon-large"><span class="sr-only">{{$item.drop.delete}}</span></i></a>
                                {{/if}}
                                {{if $item.edpost}}
-                                       <a role="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1|escape}}"><i class="icon-edit icon-large"><span class="sr-only">{{$item.edpost.1}}</span></i></a>
+                                       <a role="button" href="{{$item.edpost.0}}" title="{{$item.edpost.1}}"><i class="icon-edit icon-large"><span class="sr-only">{{$item.edpost.1}}</span></i></a>
                                {{/if}}
                        </div>
 
index 8b2700e01bd59ef6b0e9e9473455522b0cf0261f..fe72ffcaf6b7009abb3264f2cbbae099daeae724 100644 (file)
@@ -21,20 +21,20 @@ function showHideForumlist() {
                {{if $forum.id <= $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-{{$forum.id}}" role="menuitem">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
        
                {{if $forum.id > $visible_forums}}
                <li class="forum-widget-entry forum-{{$forum.cid}}" id="forum-widget-entry-extended-{{$forum.id}}" role="menuitem" style="display: none;">
                        <span class="notify badge pull-right"></span>
-                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc|escape}}" class="label sparkle" target="_blank">
-                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc|escape}}" />
+                       <a href="{{$forum.external_url}}" title="{{$forum.link_desc}}" class="label sparkle" target="_blank">
+                               <img class="forumlist-img" src="{{$forum.micro}}" alt="{{$forum.link_desc}}" />
                        </a>
-                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name|escape}}</a>
+                       <a class="forum-widget-link {{if $forum.selected}}forum-selected{{/if}}" id="forum-widget-link-{{$forum.id}}" href="{{$forum.url}}" >{{$forum.name}}</a>
                </li>
                {{/if}}
                {{/foreach}}