Some correction

diff --git a/view/templates/admin/contactblock.tpl b/view/templates/admin/contactblock.tpl
index e3dfb52a123cfed4c6773c621134f30457688c30..3afeb5355c99f20da8c58ce1c19f03f234cb3441 100644 (file)
--- a/view/templates/admin/contactblock.tpl
+++ b/view/templates/admin/contactblock.tpl
@@ -33,8 +33,8 @@
                                <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|escaped}}</td>
-                                       <td class="addr">{{$contact.addr|escaped}}</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>
                                </tr>
                                {{/foreach}}

diff --git a/view/templates/hovercard.tpl b/view/templates/hovercard.tpl
index 5487a4cd0524489276f5fe145e3b9113968a0980..ec87591b9fa03b864dc92fb2fdeeda9a832c398f 100644 (file)
--- a/view/templates/hovercard.tpl
+++ b/view/templates/hovercard.tpl
@@ -11,7 +11,7 @@
                                        <h4 class="left-align1"><a href="{{$profile.url}}">{{$profile.name|escape}}</a></h4>{{if $profile.account_type}}<span>{{$profile.account_type}}</span>{{/if}}
                                </div>
                                <div class="profile-details">
-                                       <span class="profile-addr">{{$profile.addr|escaped}}</span>
+                                       <span class="profile-addr">{{$profile.addr|escape}}</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}}*}}

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index fb7875641559c0bc1c7f2df58bd2d3dbcc6a2f78..14e1a03736dffca63725199882c630bf3a2caea0 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
        <div class="fn label p-name">{{$profile.name|escape}}</div>
        
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escaped}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
        
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}
 

diff --git a/view/templates/remote_friends_common.tpl b/view/templates/remote_friends_common.tpl
index f018727c06747655f6da050102f73233bbcf098c..f5f43360a71a6e51c44ecfdee6050e8299a01df0 100644 (file)
--- a/view/templates/remote_friends_common.tpl
+++ b/view/templates/remote_friends_common.tpl
@@ -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|escaped}}" title="{{$item.name|escaped}}" />
+                               <img src="{{$item.photo}}" width="80" height="80" alt="{{$item.name|escape}}" title="{{$item.name|escape}}" />
                        </a>
                </div>
                <div class="profile-match-break"></div>
                <div class="profile-match-name">
-                       <a href="{{$item.url}}" title="{{$item.name|escaped}}">{{$item.name|escaped}}</a>
+                       <a href="{{$item.url}}" title="{{$item.name|escape}}">{{$item.name|escape}}</a>
                </div>
                <div class="profile-match-end"></div>
        </div>

diff --git a/view/templates/search_item.tpl b/view/templates/search_item.tpl
index c004fe74c4abed5cbb94e423f4a4b6070c07421c..a97574b7b4f5e93d8f3f52f23a39a17d0e3d703b 100644 (file)
--- a/view/templates/search_item.tpl
+++ b/view/templates/search_item.tpl
@@ -7,7 +7,7 @@
                                 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|escaped}}" /></a>
+                               <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>
                                <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>
@@ -23,7 +23,7 @@
                        </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|escaped}}</span></a>
+                               <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>
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}" title="{{$item.localtime}}">{{$item.ago}}</div>
                                
                </div>                  

diff --git a/view/templates/wall_thread.tpl b/view/templates/wall_thread.tpl
index 6108b80c60887dc363d707605aa6761342af6d17..6f54d024da47ad0354976fd262d9300b5f51e8c2 100644 (file)
--- a/view/templates/wall_thread.tpl
+++ b/view/templates/wall_thread.tpl
@@ -44,7 +44,7 @@
                        </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|escaped}}</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|escaped}}</span></a> {{$item.vwall}}{{/if}}<br />
+                               <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>
                </div>
                <div class="wall-item-content" id="wall-item-content-{{$item.id}}" >

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index 311132b8159c4b81b98a9c9e71d1c6fd80250cb8..31afc71fea646d9c34ac0e96eee766384a201a57 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -3,7 +3,7 @@
 
        <div class="fn label p-name">{{$profile.name|escape}}</div>
        
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escaped}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</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>

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index e62da464d91bce25f74588a6fedaae124a89fccf..a316f58aa52787f7f19ea256172da6263e1991d0 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -26,7 +26,7 @@
                {{/if}}
        </div>
 
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escaped}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</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>

diff --git a/view/theme/smoothly/templates/search_item.tpl b/view/theme/smoothly/templates/search_item.tpl
index 46cbff6928a165fc84531a4300953997d8e37659..2c9e621935f254fbfa725ff2ecf17634f1aeca3b 100644 (file)
--- a/view/theme/smoothly/templates/search_item.tpl
+++ b/view/theme/smoothly/templates/search_item.tpl
@@ -6,7 +6,7 @@
                                 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|escaped}}" /></a>
+                               <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>
                                <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>
@@ -34,7 +34,7 @@
                        <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|escaped}}</span></a>
+                               <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>
                                <div class="wall-item-ago"  id="wall-item-ago-{{$item.id}}">{{$item.ago}}</div>
                                
                </div>                  

diff --git a/view/theme/smoothly/templates/wall_thread.tpl b/view/theme/smoothly/templates/wall_thread.tpl
index b62b077e28a1931e9c2dee269288a00bf7abc6be..616c20f4dc9b03a528401fbacf93297beb421284 100644 (file)
--- a/view/theme/smoothly/templates/wall_thread.tpl
+++ b/view/theme/smoothly/templates/wall_thread.tpl
@@ -15,7 +15,7 @@
                        {{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|escaped}}" /></a>
+                               <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>
                        </div>
                        <div class="wall-item-arrowphoto-wrapper" ><img src="view/theme/smoothly/images/larrow.gif" alt="{{$item.wall}}" /></div>
                        {{/if}}
@@ -23,7 +23,7 @@
                                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|escaped}}" /></a>
+                               <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>
                                <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>
@@ -47,7 +47,7 @@
                <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|escaped}}</span>
+                       <span class="wall-item-name{{$item.sparkle}}" id="wall-item-name-{{$item.id}}" >{{$item.name|escape}}</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>

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index 1733969aa885b89d41664fac8dc23f731805c58e..a464416959b9971c9e00286435bb55f0b2d2789b 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -13,7 +13,7 @@
                {{/if}}
        </div>
 
-       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escaped}}</div>{{/if}}
+       {{if $profile.addr}}<div class="p-addr">{{$profile.addr|escape}}</div>{{/if}}
 
        {{if $profile.pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}}