tobias/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6262 from MrPetovan/task/6208-escape-html-true

Browse source 
Smarty: Add default HTML escaping to template variables
This commit is contained in:
Michael Vogel 2018-12-20 20:27:25 +01:00 committed by GitHub
parent 091193ad64 a01bdbbe2d
commit 0fe8b849bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
263 changed files with 1272 additions and 1280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/conversation.php
View file

@ -994,6 +994,7 @@ function builtin_activity_puller($item, &$conv_responses) {
function format_like($cnt, array $arr, $type, $id) { function format_like($cnt, array $arr, $type, $id) {
$o = ''; $o = '';
$expanded = ''; $expanded = '';
$phrase = '';
if ($cnt == 1) { if ($cnt == 1) {
$likers = $arr[0]; $likers = $arr[0];

24
src/Core/Renderer.php
View file

@ -49,28 +49,28 @@ class Renderer extends BaseObject
'smarty3' => '}}' 'smarty3' => '}}'
]; ];
/** /**
* @brief This is our template processor * @brief This is our template processor
* *
* @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty * @param string|FriendicaSmarty $s The string requiring macro substitution or an instance of FriendicaSmarty
* @param array $r key value pairs (search => replace) * @param array $vars key value pairs (search => replace)
* *
* @return string substituted string * @return string substituted string
*/ */
public static function replaceMacros($s, $r) public static function replaceMacros($s, $vars)
{ {
$stamp1 = microtime(true); $stamp1 = microtime(true);
$a = self::getApp(); $a = self::getApp();
// pass $baseurl to all templates // pass $baseurl to all templates
$r['$baseurl'] = System::baseUrl(); $vars['$baseurl'] = System::baseUrl();
$t = self::getTemplateEngine(); $t = self::getTemplateEngine();
try { try {
$output = $t->replaceMacros($s, $r); $output = $t->replaceMacros($s, $vars);
} catch (Exception $e) { } catch (Exception $e) {
echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>"; echo "<pre><b>" . __FUNCTION__ . "</b>: " . $e->getMessage() . "</pre>";
killme(); exit();
} }
$a->saveTimestamp($stamp1, "rendering"); $a->saveTimestamp($stamp1, "rendering");

2
src/Render/FriendicaSmarty.php
View file

@ -42,6 +42,8 @@ class FriendicaSmarty extends Smarty
$this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3'); $this->left_delimiter = Renderer::getTemplateLeftDelimiter('smarty3');
$this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3'); $this->right_delimiter = Renderer::getTemplateRightDelimiter('smarty3');
$this->escape_html = true;
// Don't report errors so verbosely // Don't report errors so verbosely
$this->error_reporting = E_ALL & ~E_NOTICE; $this->error_reporting = E_ALL & ~E_NOTICE;
} }

6
view/templates/acl_selector.tpl
View file

@ -17,10 +17,10 @@
{{if $networks}} {{if $networks}}
<hr style="clear:both"/> <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> <div id="profile-jot-email-end"></div>
{{if $jotnets}} {{if $jotnets}}
{{$jotnets}} {{$jotnets nofilter}}
{{/if}}{{/if}} {{/if}}{{/if}}
<script> <script>
@ -28,7 +28,7 @@ $(document).ready(function() {
if(typeof acl=="undefined"){ if(typeof acl=="undefined"){
acl = new ACL( acl = new ACL(
baseurl+"/acl", baseurl+"/acl",
[ {{$allowcid}},{{$allowgid}},{{$denycid}},{{$denygid}} ], [ {{$allowcid nofilter}},{{$allowgid nofilter}},{{$denycid nofilter}},{{$denygid nofilter}} ],
{{$features.aclautomention}}, {{$features.aclautomention}},
{{if $APP->is_mobile}}true{{else}}false{{/if}} {{if $APP->is_mobile}}true{{else}}false{{/if}}
); );

6
view/templates/admin/addon_details.tpl
View file

@ -18,20 +18,20 @@
</p> </p>
{{if $screenshot}} {{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}}
{{if $admin_form}} {{if $admin_form}}
<h3>{{$settings}}</h3> <h3>{{$settings}}</h3>
<form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$addon}}/"> <form method="post" action="{{$baseurl}}/admin/{{$function}}/{{$addon}}/">
{{$admin_form}} {{$admin_form nofilter}}
</form> </form>
{{/if}} {{/if}}
{{if $readme}} {{if $readme}}
<h3>Readme</h3> <h3>Readme</h3>
<div id="addon_readme"> <div id="addon_readme">
{{$readme}} {{$readme nofilter}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

2
view/templates/admin/addons.tpl
View file

@ -14,7 +14,7 @@
<a href='{{$baseurl}}/admin/{{$function}}/{{$p.0}}'><span class='name'>{{$p.2.name}}</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}} {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}}
<div class='desc'>{{$p.2.description}}</div> <div class='desc'>{{$p.2.description nofilter}}</div>
</li> </li>
{{/foreach}} {{/foreach}}
</ul> </ul>

18
view/templates/admin/contactblock.tpl
View file

@ -10,7 +10,7 @@
</script> </script>
<div id="adminpage"> <div id="adminpage">
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<p>{{$description}}</p> <p>{{$description nofilter}}</p>
<form action="{{$baseurl}}/admin/contactblock" method="post"> <form action="{{$baseurl}}/admin/contactblock" method="post">
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
@ -32,19 +32,19 @@
{{foreach $contacts as $contact}} {{foreach $contacts as $contact}}
<tr> <tr>
<td class="checkbox"><input type="checkbox" class="contacts_ckbx" id="id_contact_{{$contact.id}}" name="contacts[]" value="{{$contact.id}}"/></td> <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><img class="icon" src="{{$contact.micro}}" alt="{{$contact.nickname}}" title="{{$contact.nickname}}"></td>
<td class="name">{{$contact.name|escape}}</td> <td class="name">{{$contact.name}}</td>
<td class="addr">{{$contact.addr|escape}}</td> <td class="addr">{{$contact.addr}}</td>
<td class="addr"><a href="{{$contact.url}}" title="{{$contact.nickname|escape}}" >{{$contact.url}}</a></td> <td class="addr"><a href="{{$contact.url}}" title="{{$contact.nickname}}" >{{$contact.url}}</a></td>
</tr> </tr>
{{/foreach}} {{/foreach}}
</tbody> </tbody>
</table> </table>
<p><a href="#" onclick="return selectall('contacts_ckbx');">{{$select_all}}</a> | <a href="#" onclick="return selectnone('contacts_ckbx');">{{$select_none}}</a></p> <p><a href="#" onclick="return selectall('contacts_ckbx');">{{$select_all}}</a> | <a href="#" onclick="return selectnone('contacts_ckbx');">{{$select_none}}</a></p>
{{$paginate}} {{$paginate nofilter}}
<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}} {{else}}
<p>{{$no_data|escape:'html'}}</p> <p>{{$no_data}}</p>
{{/if}} {{/if}}
</form> </form>
@ -58,6 +58,6 @@
</tr> </tr>
</tbody> </tbody>
</table> </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> </form>
</div> </div>

4
view/templates/admin/logs.tpl
View file

@ -2,13 +2,13 @@
<h1>{{$title}} - {{$page}}</h1> <h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/logs" method="post"> <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_checkbox.tpl" field=$debugging}}
{{include file="field_input.tpl" field=$logfile}} {{include file="field_input.tpl" field=$logfile}}
{{include file="field_select.tpl" field=$loglevel}} {{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> </form>

2
view/templates/admin/settings_features.tpl
View file

@ -17,7 +17,7 @@
{{/foreach}} {{/foreach}}
<div class="settings-submit-wrapper" > <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>
</div> </div>
{{/foreach}} {{/foreach}}

30
view/templates/admin/site.tpl
View file

@ -39,7 +39,7 @@
}); });
</script> </script>
<div id='adminpage'> <div id='adminpage'>
<h1>{{$title|escape}} - {{$page|escape}}</h1> <h1>{{$title}} - {{$page}}</h1>
<form action="{{$baseurl}}/admin/site" method="post"> <form action="{{$baseurl}}/admin/site" method="post">
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <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}} {{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_checkbox.tpl" field=$hide_help}}
{{include file="field_select.tpl" field=$singleuser}} {{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> <h3>{{$registration}}</h3>
{{include file="field_input.tpl" field=$register_text}} {{include file="field_input.tpl" field=$register_text}}
@ -67,13 +67,13 @@
{{include file="field_checkbox.tpl" field=$no_multi_reg}} {{include file="field_checkbox.tpl" field=$no_multi_reg}}
{{include file="field_checkbox.tpl" field=$no_openid}} {{include file="field_checkbox.tpl" field=$no_openid}}
{{include file="field_checkbox.tpl" field=$no_regfullname}} {{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> <h3>{{$upload}}</h3>
{{include file="field_input.tpl" field=$maximagesize}} {{include file="field_input.tpl" field=$maximagesize}}
{{include file="field_input.tpl" field=$maximagelength}} {{include file="field_input.tpl" field=$maximagelength}}
{{include file="field_input.tpl" field=$jpegimagequality}} {{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> <h3>{{$corporate}}</h3>
{{include file="field_input.tpl" field=$allowed_sites}} {{include file="field_input.tpl" field=$allowed_sites}}
@ -99,14 +99,14 @@
{{/if}} {{/if}}
{{include file="field_checkbox.tpl" field=$dfrn_only}} {{include file="field_checkbox.tpl" field=$dfrn_only}}
{{include file="field_input.tpl" field=$global_directory}} {{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=$newuser_private}}
{{include file="field_checkbox.tpl" field=$enotify_no_content}} {{include file="field_checkbox.tpl" field=$enotify_no_content}}
{{include file="field_checkbox.tpl" field=$private_addons}} {{include file="field_checkbox.tpl" field=$private_addons}}
{{include file="field_checkbox.tpl" field=$disable_embedded}} {{include file="field_checkbox.tpl" field=$disable_embedded}}
{{include file="field_checkbox.tpl" field=$allow_users_remote_self}} {{include file="field_checkbox.tpl" field=$allow_users_remote_self}}
{{include file="field_checkbox.tpl" field=$explicit_content}} {{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> <h3>{{$advanced}}</h3>
{{include file="field_select.tpl" field=$rino}} {{include file="field_select.tpl" field=$rino}}
@ -123,7 +123,7 @@
{{include file="field_checkbox.tpl" field=$suppress_tags}} {{include file="field_checkbox.tpl" field=$suppress_tags}}
{{include file="field_checkbox.tpl" field=$nodeinfo}} {{include file="field_checkbox.tpl" field=$nodeinfo}}
{{include file="field_select.tpl" field=$check_new_version_url}} {{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> <h3>{{$portable_contacts}}</h3>
{{include file="field_checkbox.tpl" field=$poco_completion}} {{include file="field_checkbox.tpl" field=$poco_completion}}
@ -131,7 +131,7 @@
{{include file="field_select.tpl" field=$poco_discovery}} {{include file="field_select.tpl" field=$poco_discovery}}
{{include file="field_select.tpl" field=$poco_discovery_since}} {{include file="field_select.tpl" field=$poco_discovery_since}}
{{include file="field_checkbox.tpl" field=$poco_local_search}} {{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> <h3>{{$performance}}</h3>
{{include file="field_checkbox.tpl" field=$only_tag_search}} {{include file="field_checkbox.tpl" field=$only_tag_search}}
@ -143,9 +143,9 @@
{{include file="field_input.tpl" field=$dbclean_expire_days}} {{include file="field_input.tpl" field=$dbclean_expire_days}}
{{include file="field_input.tpl" field=$dbclean_unclaimed}} {{include file="field_input.tpl" field=$dbclean_unclaimed}}
{{include file="field_input.tpl" field=$dbclean_expire_conv}} {{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=$maxloadavg}}
{{include file="field_input.tpl" field=$min_memory}} {{include file="field_input.tpl" field=$min_memory}}
{{include file="field_input.tpl" field=$worker_queues}} {{include file="field_input.tpl" field=$worker_queues}}
@ -153,9 +153,9 @@
{{include file="field_checkbox.tpl" field=$worker_fastlane}} {{include file="field_checkbox.tpl" field=$worker_fastlane}}
{{include file="field_checkbox.tpl" field=$worker_frontend}} {{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_checkbox.tpl" field=$relay_subscribe}}
{{include file="field_input.tpl" field=$relay_server}} {{include file="field_input.tpl" field=$relay_server}}
{{include file="field_checkbox.tpl" field=$relay_directly}} {{include file="field_checkbox.tpl" field=$relay_directly}}
@ -163,7 +163,7 @@
{{include file="field_input.tpl" field=$relay_server_tags}} {{include file="field_input.tpl" field=$relay_server_tags}}
{{include file="field_checkbox.tpl" field=$relay_user_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> </form>
@ -173,8 +173,8 @@
<h3>{{$relocate}}</h3> <h3>{{$relocate}}</h3>
<strong>{{$relocate_warning}}</strong> <strong>{{$relocate_warning}}</strong>
{{include file="field_input.tpl" field=$relocate_url}} {{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}}">
<div class="submit"><input type="submit" name="relocate" value="{{$relocate_button|escape:'html'}}" /></div> <div class="submit"><input type="submit" name="relocate" value="{{$relocate_button}}" /></div>
</form> </form>
</div> </div>

4
view/templates/admin/tos.tpl
View file

@ -6,11 +6,11 @@
{{include file="field_checkbox.tpl" field=$displaytos}} {{include file="field_checkbox.tpl" field=$displaytos}}
{{include file="field_checkbox.tpl" field=$displayprivstatement}} {{include file="field_checkbox.tpl" field=$displayprivstatement}}
{{include file="field_textarea.tpl" field=$tostext}} {{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> </form>
<h2>{{$preview}}</h2> <h2>{{$preview}}</h2>
{{for $i=1 to 3}} {{for $i=1 to 3}}
<p>{{$privtext[$i]}}</p> <p>{{$privtext[$i] nofilter}}</p>
{{/for}} {{/for}}
</div> </div>

22
view/templates/admin/users.tpl
View file

@ -35,8 +35,8 @@
<td class="email">{{$u.email}}</td> <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="checkbox"><input type="checkbox" class="pending_ckbx" id="id_pending_{{$u.hash}}" name="pending[]" value="{{$u.hash}}" /></td>
<td class="tools"> <td class="tools">
<a href="{{$baseurl}}/regmod/allow/{{$u.hash}}" title='{{$approve|escape}}'><span class='icon like'></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|escape}}'><span class='icon dislike'></span></a> <a href="{{$baseurl}}/regmod/deny/{{$u.hash}}" title='{{$deny}}'><span class='icon dislike'></span></a>
</td> </td>
</tr> </tr>
<tr> <tr>
@ -46,7 +46,7 @@
</tbody> </tbody>
</table> </table>
<div class='selectall'><a href='#' onclick="return selectall('pending_ckbx');">{{$select_all}}</a></div> <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}} {{else}}
<p>{{$no_pending}}</p> <p>{{$no_pending}}</p>
{{/if}} {{/if}}
@ -79,8 +79,8 @@
<tbody> <tbody>
{{foreach $users as $u}} {{foreach $users as $u}}
<tr> <tr>
<td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname|escape}}" title="{{$u.nickname|escape}}"></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|escape}}" >{{$u.name}}</a></td> <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
<td class='email'>{{$u.email}}</td> <td class='email'>{{$u.email}}</td>
<td class='register_date'>{{$u.register_date}}</td> <td class='register_date'>{{$u.register_date}}</td>
<td class='login_date'>{{$u.login_date}}</td> <td class='login_date'>{{$u.login_date}}</td>
@ -94,8 +94,8 @@
{{/if}} {{/if}}
<td class="tools"> <td class="tools">
{{if $u.is_deletable}} {{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/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|escape}}' onclick="return confirm_delete('{{$u.name}}')"><span class='icon drop'></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}} {{else}}
&nbsp; &nbsp;
{{/if}} {{/if}}
@ -105,7 +105,7 @@
</tbody> </tbody>
</table> </table>
<div class='selectall'><a href='#' onclick="return selectall('users_ckbx');">{{$select_all}}</a></div> <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}} {{else}}
NO USERS?!? NO USERS?!?
{{/if}} {{/if}}
@ -122,8 +122,8 @@
<tbody> <tbody>
{{foreach $deleted as $u}} {{foreach $deleted as $u}}
<tr> <tr>
<td><img class='icon' src="{{$u.micro}}" alt="{{$u.nickname|escape}}" title="{{$u.nickname|escape}}"></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|escape}}" >{{$u.name}}</a></td> <td class='name'><a href="{{$u.url}}" title="{{$u.nickname}}" >{{$u.name}}</a></td>
<td class='email'>{{$u.email}}</td> <td class='email'>{{$u.email}}</td>
<td class='register_date'>{{$u.register_date}}</td> <td class='register_date'>{{$u.register_date}}</td>
<td class='login_date'>{{$u.login_date}}</td> <td class='login_date'>{{$u.login_date}}</td>
@ -150,6 +150,6 @@
</tr> </tr>
</tbody> </tbody>
</table> </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> </form>
</div> </div>

6
view/templates/album_edit.tpl
View file

@ -4,12 +4,12 @@
<label id="photo-album-edit-name-label" for="photo-album-edit-name" >{{$nametext}}</label> <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> <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-submit" type="submit" name="submit" value="{{$submit}}" />
<input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit|escape:'html'}}" onclick="return confirmDelete();" /> <input id="photo-album-edit-drop" type="submit" name="dropalbum" value="{{$dropsubmit}}" onclick="return confirmDelete();" />
</form> </form>
</div> </div>

2
view/templates/apps.tpl
View file

@ -3,6 +3,6 @@
<ul> <ul>
{{foreach $apps as $ap}} {{foreach $apps as $ap}}
<li>{{$ap}}</li> <li>{{$ap nofilter}}</li>
{{/foreach}} {{/foreach}}
</ul> </ul>

14
view/templates/auto_request.tpl
View file

@ -13,7 +13,7 @@
{{$invite_desc}} {{$invite_desc}}
</p> </p>
<p> <p>
{{$desc}} {{$desc nofilter}}
</p> </p>
{{/if}} {{/if}}
@ -30,18 +30,18 @@
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}} {{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}} {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
<div id="dfrn-request-url-wrapper" > <div id="dfrn-request-url-wrapper" >
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label> <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
{{if $myaddr}} {{if $myaddr}}
{{$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}} {{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}}
{{if $url}} {{if $url}}
<input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" /> <input type="hidden" name="url" id="url" value="{{$url}}" />
{{/if}} {{/if}}
<div id="dfrn-request-url-end"></div> <div id="dfrn-request-url-end"></div>
</div> </div>
@ -53,8 +53,8 @@
<div id="dfrn-request-submit-wrapper"> <div id="dfrn-request-submit-wrapper">
{{if $submit}} {{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}} {{/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> </div>
</form> </form>

4
view/templates/birthdays_reminder.tpl
View file

@ -1,10 +1,10 @@
{{if $count}} {{if $count}}
<div id="birthday-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('birthday-wrapper');">{{$event_reminders}} ({{$count}})</div> <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> <div id="birthday-title-end"></div>
{{foreach $events as $event}} {{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}} {{/foreach}}
</div> </div>
{{/if}} {{/if}}

2
view/templates/categories_widget.tpl
View file

@ -1,7 +1,7 @@
<div id="categories-sidebar" class="widget"> <div id="categories-sidebar" class="widget">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<div id="nets-desc">{{$desc}}</div> <div id="nets-desc">{{$desc nofilter}}</div>
<ul class="categories-ul"> <ul class="categories-ul">
<li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li> <li class="tool"><a href="{{$base}}" class="categories-link categories-all{{if $sel_all}} categories-selected{{/if}}">{{$all}}</a></li>

4
view/templates/comment_item.tpl
View file

@ -22,14 +22,14 @@
<select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" > <select id="qcomment-select-{{$id}}" name="qcomment-{{$id}}" class="qcomment" onchange="qCommentInsert(this,{{$id}});" >
<option value=""></option> <option value=""></option>
{{foreach $qcomment as $qc}} {{foreach $qcomment as $qc}}
<option value="{{$qc|escape:'html'}}">{{$qc}}</option> <option value="{{$qc}}">{{$qc}}</option>
{{/foreach}} {{/foreach}}
</select> </select>
{{/if}} {{/if}}
<div class="comment-edit-text-end"></div> <div class="comment-edit-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;" > <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}} {{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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div> </div>

2
view/templates/community.tpl
View file

@ -4,4 +4,4 @@
<p class="hint">{{$global_community_hint}}</p> <p class="hint">{{$global_community_hint}}</p>
{{/if}} {{/if}}
{{$content}} {{$content nofilter}}

6
view/templates/confirm.tpl
View file

@ -4,11 +4,11 @@
<h3 id="confirm-message">{{$message}}</h3> <h3 id="confirm-message">{{$message}}</h3>
{{foreach $extra_inputs as $input}} {{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}} {{/foreach}}
<input class="confirm-button" id="confirm-submit-button" type="submit" name="{{$confirm_name}}" value="{{$confirm|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|escape:'html'}}" /> <input class="confirm-button" id="confirm-cancel-button" type="submit" name="canceled" value="{{$cancel}}" />
</form> </form>
</center> </center>

2
view/templates/contact_block.tpl
View file

@ -5,7 +5,7 @@
<a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a> <a class="allcontact-link" href="viewcontacts/{{$nickname}}">{{$viewcontacts}}</a>
<div class='contact-block-content'> <div class='contact-block-content'>
{{foreach $micropro as $m}} {{foreach $micropro as $m}}
{{$m}} {{$m nofilter}}
{{/foreach}} {{/foreach}}
</div> </div>
{{/if}} {{/if}}

8
view/templates/contact_edit.tpl
View file

@ -1,7 +1,7 @@
<div id="contact-edit-wrapper" > <div id="contact-edit-wrapper" >
{{* Insert Tab-Nav *}} {{* Insert Tab-Nav *}}
{{$tab_str}} {{$tab_str nofilter}}
<div id="contact-edit-nav-wrapper" > <div id="contact-edit-nav-wrapper" >
@ -32,7 +32,7 @@
{{if $poll_enabled}} {{if $poll_enabled}}
<li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div> <li><div id="contact-edit-last-update-text">{{$lastupdtext}} <span id="contact-edit-last-updated">{{$last_update}}</span></div>
{{if $poll_interval}} {{if $poll_interval}}
<span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval}} <span id="contact-edit-poll-text">{{$updpub}}</span> {{$poll_interval nofilter}}
{{/if}} {{/if}}
</li> </li>
{{/if}} {{/if}}
@ -56,7 +56,7 @@
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}} {{if $xmpp}}<dl><dt>{{$xmpp_label}}</dt><dd>{{$xmpp}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}} {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
</div>{{* End of contact-edit-links *}} </div>{{* End of contact-edit-links *}}
<div id="contact-edit-links-end"></div> <div id="contact-edit-links-end"></div>
@ -100,7 +100,7 @@
{{/if}} {{/if}}
</div> </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}} {{/if}}
<div class="contact-edit-submit-end clearfix"></div> <div class="contact-edit-submit-end clearfix"></div>

4
view/templates/contact_template.tpl
View file

@ -5,7 +5,7 @@
onmouseover="if (typeof t{{$contact.id}} != 'undefined') clearTimeout(t{{$contact.id}}); openMenu('contact-photo-menu-button-{{$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)" > 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}} {{if $multiselect}}
<input type="checkbox" class="contact-select" name="contact_batch[]" value="{{$contact.id}}"> <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-desc">
<div class="contact-entry-name" id="contact-entry-name-{{$contact.id}}" > <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}} {{if $contact.account_type}} <span class="contact-entry-details" id="contact-entry-accounttype-{{$contact.id}}">({{$contact.account_type}})</span>{{/if}}
</div> </div>
{{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}} {{if $contact.alt_text}}<div class="contact-entry-details" id="contact-entry-rel-{{$contact.id}}" >{{$contact.alt_text}}</div>{{/if}}

12
view/templates/contacts-template.tpl
View file

@ -5,14 +5,14 @@
<div id="contacts-search-wrapper"> <div id="contacts-search-wrapper">
<form id="contacts-search-form" action="{{$cmd}}" method="get" > <form id="contacts-search-form" action="{{$cmd}}" method="get" >
<span class="contacts-search-desc">{{$desc}}</span> <span class="contacts-search-desc">{{$desc nofilter}}</span>
<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="{{$search|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|escape:'html'}}" /> <input type="submit" name="submit" id="contacts-search-submit" value="{{$submit}}" />
</form> </form>
</div> </div>
<div id="contacts-search-end"></div> <div id="contacts-search-end"></div>
{{$tabs}} {{$tabs nofilter}}
<form action="{{$baseurl}}/contact/batch/" method="POST"> <form action="{{$baseurl}}/contact/batch/" method="POST">
{{foreach $contacts as $contact}} {{foreach $contacts as $contact}}
@ -21,7 +21,7 @@
<div id="contact-edit-end"></div> <div id="contact-edit-end"></div>
<div id="contacts-actions"> <div id="contacts-actions">
{{foreach $batch_actions as $n=>$l}} {{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}} {{/foreach}}
</div> </div>
</form> </form>
@ -53,7 +53,7 @@
}); });
</script> </script>
{{$paginate}} {{$paginate nofilter}}

10
view/templates/contacts-widget-sidebar.tpl
View file

@ -1,7 +1,7 @@
{{$vcard_widget}} {{$vcard_widget nofilter}}
{{$findpeople_widget}} {{$findpeople_widget nofilter}}
{{$follow_widget}} {{$follow_widget nofilter}}
{{$groups_widget}} {{$groups_widget nofilter}}
{{$networks_widget}} {{$networks_widget nofilter}}

3
view/templates/content_wrapper.tpl
View file

@ -8,5 +8,6 @@
{{/if}} {{/if}}
{{* output the content *}} {{* output the content *}}
{{$content}} {{$content nofilter}}
</div> </div>

2
view/templates/conversation.tpl
View file

@ -1,5 +1,5 @@
{{$live_update}} {{$live_update nofilter}}
{{foreach $threads as $thread}} {{foreach $threads as $thread}}
<div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper"> <div id="tread-wrapper-{{$thread.id}}" class="tread-wrapper">

8
view/templates/crepair.tpl
View file

@ -1,10 +1,10 @@
{{include file="section_title.tpl"}} {{include file="section_title.tpl"}}
{{$tab_str}} {{$tab_str nofilter}}
<div class="crepair-error-message">{{$warning}}</div><br> <div class="crepair-error-message">{{$warning nofilter}}</div><br>
<div class="crepair-return"> <div class="crepair-return">
{{$info}}<br> {{$info nofilter}}<br>
<!-- <a href="{{$returnaddr}}">{{$return}}</a> --> <!-- <a href="{{$returnaddr}}">{{$return}}</a> -->
</div> </div>
<br /> <br />
@ -43,6 +43,6 @@
{{include file="field_select.tpl" field=$remote_self}} {{include file="field_select.tpl" field=$remote_self}}
{{/if}} {{/if}}
<input type="submit" name="submit" value="{{$lbl_submit|escape:'html'}}" /> <input type="submit" name="submit" value="{{$lbl_submit}}" />
</form> </form>

4
view/templates/cropbody.tpl
View file

@ -1,6 +1,6 @@
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<p id="cropimage-desc"> <p id="cropimage-desc">
{{$desc}} {{$desc nofilter}}
</p> </p>
<div id="cropimage-wrapper"> <div id="cropimage-wrapper">
@ -48,7 +48,7 @@
<input type="hidden" name="width" id="width" /> <input type="hidden" name="width" id="width" />
<div id="crop-image-submit-wrapper" > <div id="crop-image-submit-wrapper" >
<input type="submit" name="submit" value="{{$done|escape:'html'}}" /> <input type="submit" name="submit" value="{{$done}}" />
</div> </div>
</form> </form>

4
view/templates/delegate.tpl
View file

@ -8,14 +8,14 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_select.tpl" field=$parent_user}} {{include file="field_select.tpl" field=$parent_user}}
{{include file="field_password.tpl" field=$parent_password}} {{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> </form>
</div> </div>
{{/if}} {{/if}}
<h4>{{$delegates_header}}</h4> <h4>{{$delegates_header}}</h4>
<div id="delegate-desc" class="delegate-desc">{{$desc}}</div> <div id="delegate-desc" class="delegate-desc">{{$desc nofilter}}</div>
<h4>{{$head_delegates}}</h4> <h4>{{$head_delegates}}</h4>

2
view/templates/dfrn_req_confirm.tpl
View file

@ -17,6 +17,6 @@
<div id="dfrn-request-homecoming-submit-wrapper" > <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> </div>
</form> </form>

14
view/templates/dfrn_request.tpl
View file

@ -12,7 +12,7 @@
{{$invite_desc}} {{$invite_desc}}
</p> </p>
<p> <p>
{{$desc}} {{$desc nofilter}}
</p> </p>
{{/if}} {{/if}}
@ -29,18 +29,18 @@
{{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}} {{if $url}}<dl><dt>{{$url_label}}</dt><dd><a target="blank" href="{{$zrl}}">{{$url}}</a></dd></dl>{{/if}}
{{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}} {{if $location}}<dl><dt>{{$location_label}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} {{if $keywords}}<dl><dt>{{$keywords_label}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about}}</dd></dl>{{/if}} {{if $about}}<dl><dt>{{$about_label}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
<div id="dfrn-request-url-wrapper" > <div id="dfrn-request-url-wrapper" >
<label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label> <label id="dfrn-url-label" for="dfrn-url" >{{$your_address}}</label>
{{if $myaddr}} {{if $myaddr}}
{{$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}} {{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}}
{{if $url}} {{if $url}}
<input type="hidden" name="url" id="url" value="{{$url|escape:'html'}}" /> <input type="hidden" name="url" id="url" value="{{$url}}" />
{{/if}} {{/if}}
<div id="dfrn-request-url-end"></div> <div id="dfrn-request-url-end"></div>
</div> </div>
@ -83,8 +83,8 @@
<div id="dfrn-request-submit-wrapper"> <div id="dfrn-request-submit-wrapper">
{{if $submit}} {{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}} {{/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> </div>
</form> </form>

8
view/templates/directory_header.tpl
View file

@ -10,9 +10,9 @@
<div id="directory-search-wrapper"> <div id="directory-search-wrapper">
<form id="directory-search-form" action="directory" method="get" > <form id="directory-search-form" action="directory" method="get" >
<span class="dirsearch-desc">{{$desc}}</span> <span class="dirsearch-desc">{{$desc nofilter}}</span>
<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="{{$search|escape:'html'}}" /> <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|escape:'html'}}" class="button" /> <input type="submit" name="submit" id="directory-search-submit" value="{{$submit}}" class="button" />
</form> </form>
</div> </div>
@ -28,4 +28,4 @@
<div class="directory-end" ></div> <div class="directory-end" ></div>
{{$paginate}} {{$paginate nofilter}}

2
view/templates/event.tpl
View file

@ -3,7 +3,7 @@
<div class="event"> <div class="event">
{{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}} {{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}} {{$event.html nofilter}}
{{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.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}} {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
{{if $event.copy}}<a href="{{$event.copy.0}}" title="{{$event.copy.1}}" class="copy-event-link icon s22 copy"></a>{{/if}} {{if $event.copy}}<a href="{{$event.copy.0}}" title="{{$event.copy.1}}" class="copy-event-link icon s22 copy"></a>{{/if}}

13
view/templates/event_form.tpl
View file

@ -2,7 +2,7 @@
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<p> <p>
{{$desc}} {{$desc nofilter}}
</p> </p>
<form id="event-edit-form" action="{{$post}}" method="post" > <form id="event-edit-form" action="{{$post}}" method="post" >
@ -12,9 +12,9 @@
<input type="hidden" name="uri" value="{{$uri}}" /> <input type="hidden" name="uri" value="{{$uri}}" />
<input type="hidden" name="preview" id="event-edit-preview" value="0" /> <input type="hidden" name="preview" id="event-edit-preview" value="0" />
{{$s_dsel}} {{$s_dsel nofilter}}
{{$f_dsel}} {{$f_dsel nofilter}}
{{include file="field_checkbox.tpl" field=$nofinish}} {{include file="field_checkbox.tpl" field=$nofinish}}
@ -36,10 +36,9 @@
{{include file="field_checkbox.tpl" field=$share}} {{include file="field_checkbox.tpl" field=$share}}
{{/if}} {{/if}}
{{$acl}} {{$acl nofilter}}
<div class="clear"></div> <div class="clear"></div>
<input id="event-edit-preview" type="submit" name="preview" value="{{$preview|escape:'html'}}" onclick="doEventPreview(); return false;" /> <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|escape:'html'}}" /> <input id="event-submit" type="submit" name="submit" value="{{$submit}}" />
</form> </form>

12
view/templates/event_stream_item.tpl
View file

@ -1,30 +1,30 @@
<div class="vevent"> <div class="vevent">
<div class="summary event-summary">{{$title|escape}}</div> <div class="summary event-summary">{{$title}}</div>
<div class="event-start"> <div class="event-start">
<span class="event-label">{{$dtstart_label}}</span>&nbsp; <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> </div>
{{if $finish}} {{if $finish}}
<div class="event-end"> <div class="event-end">
<span class="event-label">{{$dtend_label}}</span>&nbsp; <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> </div>
{{/if}} {{/if}}
{{if $description}} {{if $description}}
<div class="description event-description">{{$description}}</div> <div class="description event-description">{{$description nofilter}}</div>
{{/if}} {{/if}}
{{if $location}} {{if $location}}
<div class="event-location"> <div class="event-location">
<span class="event-label">{{$location_label}}</span>&nbsp; <span class="event-label">{{$location_label}}</span>&nbsp;
{{if $location.name}} {{if $location.name}}
<span class="location">{{$location.name}}</span> <span class="location">{{$location.name nofilter}}</span>
{{/if}} {{/if}}
{{if $location.map}}{{$location.map}}{{/if}} {{if $location.map}}{{$location.map nofilter}}{{/if}}
</div> </div>
{{/if}} {{/if}}

4
view/templates/events.tpl
View file

@ -1,5 +1,5 @@
{{$tabs}} {{$tabs nofilter}}
{{include file="section_title.tpl"}} {{include file="section_title.tpl"}}
<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>
@ -16,7 +16,7 @@
<div class="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.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}}</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}} {{$event.html nofilter}}
{{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.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}} {{if $event.edit}}<a href="{{$event.edit.0}}" title="{{$event.edit.1}}" class="edit-event-link icon s22 pencil"></a>{{/if}}
</div> </div>

2
view/templates/events_js.tpl
View file

@ -1,5 +1,5 @@
{{$tabs}} {{$tabs nofilter}}
<h2>{{$title}}</h2> <h2>{{$title}}</h2>
<div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div> <div id="new-event-link"><a href="{{$new_event.0}}" >{{$new_event.1}}</a></div>

4
view/templates/events_reminder.tpl
View file

@ -1,10 +1,10 @@
{{if $count}} {{if $count}}
<div id="event-notice" class="birthday-notice fakelink {{$classtoday}}" onclick="openClose('event-wrapper');">{{$event_reminders}} ({{$count}})</div> <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> <div id="event-title-end"></div>
{{foreach $events as $event}} {{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}} {{/foreach}}
</div> </div>
{{/if}} {{/if}}

2
view/templates/failed_updates.tpl
View file

@ -2,7 +2,7 @@
<div id="adminpage"> <div id="adminpage">
<h2>{{$banner}}</h2> <h2>{{$banner}}</h2>
<div id="failed_updates_desc">{{$desc}}</div> <div id="failed_updates_desc">{{$desc nofilter}}</div>
{{if $failed}} {{if $failed}}
{{foreach $failed as $f}} {{foreach $failed as $f}}

2
view/templates/field_checkbox.tpl
View file

@ -3,6 +3,6 @@
<input type="hidden" name="{{$field.0}}" value="0"> <input type="hidden" name="{{$field.0}}" value="0">
<input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}> <input type="checkbox" name="{{$field.0}}" id="id_{{$field.0}}" aria-describedby="{{$field.0}}_tip" value="1" {{if $field.2}}checked="checked"{{/if}} {{if $field.4}}{{$field.4}}{{/if}}>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

8
view/templates/field_combobox.tpl
View file

@ -4,17 +4,17 @@
{{* html5 don't work on Chrome, Safari and IE9 {{* html5 don't work on Chrome, Safari and IE9
<input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" > <input id="id_{{$field.0}}" type="text" list="data_{{$field.0}}" >
<datalist id="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> *}} </datalist> *}}
<input id="id_{{$field.0}}" type="text" value="{{$field.2}}" aria-describedby='{{$field.0}}_tip'> <input id="id_{{$field.0}}" type="text" value="{{$field.2 nofilter}}" aria-describedby='{{$field.0}}_tip'>
<select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())"> <select id="select_{{$field.0}}" onChange="$('#id_{{$field.0}}').val($(this).val())">
<option value="">{{$field.5}}</option> <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> </select>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_custom.tpl
View file

@ -2,8 +2,8 @@
<div class='field custom'> <div class='field custom'>
<label for='{{$field.0}}'>{{$field.1}}</label> <label for='{{$field.0}}'>{{$field.1}}</label>
{{$field.2}} {{$field.2 nofilter}}
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_input.tpl
View file

@ -1,8 +1,8 @@
<div class='field input' id='wrapper_{{$field.0}}'> <div class='field input' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <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 nofilter}}"{{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}} {{if $field.3}}
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span> <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_intcheckbox.tpl
View file

@ -2,8 +2,8 @@
<div class='field checkbox'> <div class='field checkbox'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <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}} {{if $field.4}}
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4}}</span> <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.4 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_openid.tpl
View file

@ -1,8 +1,8 @@
<div class='field input openid' id='wrapper_{{$field.0}}'> <div class='field input openid' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <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 nofilter}}" aria-describedby='{{$field.0}}_tip'>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_password.tpl
View file

@ -1,8 +1,8 @@
<div class='field password' id='wrapper_{{$field.0}}'> <div class='field password' id='wrapper_{{$field.0}}'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <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 nofilter}}"{{if $field.4 eq 'required'}} required{{/if}}{{if $field.5 eq 'autofocus'}} autofocus{{/if}} aria-describedby='{{$field.0}}_tip'>
{{if $field.3}} {{if $field.3}}
<span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3}}</span> <span class='field_help' role='tooltip' id='{{$field.0}}_tip'>{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_radio.tpl
View file

@ -1,7 +1,7 @@
<div class='field radio'> <div class='field radio'>
<label for='id_{{$field.0}}_{{$field.2}}'>{{$field.1}}</label> <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}} {{if $field.3}}
<span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3}}</span> <span class='field_help' role='tooltip' id='{{$field.0}}_{{$field.2}}_tip'>{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_richtext.tpl
View file

@ -2,8 +2,8 @@
<div class='field richtext'> <div class='field richtext'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea> <textarea name='{{$field.0}}' id='id_{{$field.0}}' class="fieldRichtext" aria-describedby='{{$field.0}}_tip'>{{$field.2 nofilter}}</textarea>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_select.tpl
View file

@ -3,9 +3,9 @@
<div class='field select'> <div class='field select'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'> <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> </select>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_select_raw.tpl
View file

@ -3,9 +3,9 @@
<div class='field select'> <div class='field select'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'> <select name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>
{{$field.4}} {{$field.4 nofilter}}
</select> </select>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_textarea.tpl
View file

@ -2,8 +2,8 @@
<div class='field textarea'> <div class='field textarea'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2}}</textarea> <textarea name='{{$field.0}}' id='id_{{$field.0}}' aria-describedby='{{$field.0}}_tip'>{{$field.2 nofilter}}</textarea>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

4
view/templates/field_themeselect.tpl
View file

@ -3,10 +3,10 @@
<div class='field select'> <div class='field select'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <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'> <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> </select>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
{{if $field.5}}<div id="theme-preview"></div>{{/if}} {{if $field.5}}<div id="theme-preview"></div>{{/if}}
</div> </div>

4
view/templates/field_yesno.tpl
View file

@ -2,7 +2,7 @@
<div class='field yesno'> <div class='field yesno'>
<label for='id_{{$field.0}}'>{{$field.1}}</label> <label for='id_{{$field.0}}'>{{$field.1}}</label>
<div class='onoff' id="id_{{$field.0}}_onoff"> <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 nofilter}}" aria-describedby='{{$field.0}}_tip'>
<a href="#" class='off'> <a href="#" class='off'>
{{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}} {{if $field.4}}{{$field.4.0}}{{else}}OFF{{/if}}
</a> </a>
@ -11,6 +11,6 @@
</a> </a>
</div> </div>
{{if $field.3}} {{if $field.3}}
<span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3}}</span> <span class="field_help" role="tooltip" id="{{$field.0}}_tip">{{$field.3 nofilter}}</span>
{{/if}} {{/if}}
</div> </div>

2
view/templates/fileas_widget.tpl
View file

@ -1,7 +1,7 @@
<div id="fileas-sidebar" class="widget"> <div id="fileas-sidebar" class="widget">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<div id="nets-desc">{{$desc}}</div> <div id="nets-desc">{{$desc nofilter}}</div>
<ul class="fileas-ul"> <ul class="fileas-ul">
<li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li> <li class="tool"><a href="{{$base}}" class="fileas-link fileas-all{{if $sel_all}} fileas-selected{{/if}}">{{$all}}</a></li>

2
view/templates/filebrowser.tpl
View file

@ -40,7 +40,7 @@
</div> </div>
<div class="upload"> <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>
</div> </div>

2
view/templates/filer_dialog.tpl
View file

@ -1,5 +1,5 @@
{{include file="field_combobox.tpl"}} {{include file="field_combobox.tpl"}}
<div class="settings-submit-wrapper" > <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> </div>

2
view/templates/files.tpl
View file

@ -1,4 +1,4 @@
{{foreach $items as $item }} {{foreach $items as $item }}
<p>{{$item.title|escape}} ({{$item.mime|escape}}) ({{$item.filename|escape}})</p> <p>{{$item.title}} ({{$item.mime}}) ({{$item.filename}})</p>
{{/foreach}} {{/foreach}}
{{include "paginate.tpl"}} {{include "paginate.tpl"}}

4
view/templates/follow.tpl
View file

@ -1,9 +1,9 @@
<div id="follow-sidebar" class="widget"> <div id="follow-sidebar" class="widget">
<h3>{{$connect}}</h3> <h3>{{$connect}}</h3>
<div id="connect-desc">{{$desc}}</div> <div id="connect-desc">{{$desc nofilter}}</div>
<form action="follow" method="get" > <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> </form>
</div> </div>

2
view/templates/generic_links_widget.tpl
View file

@ -1,7 +1,7 @@
<div class="widget{{if $class}} {{$class}}{{/if}}"> <div class="widget{{if $class}} {{$class}}{{/if}}">
{{if $title}}<h3>{{$title}}</h3>{{/if}} {{if $title}}<h3>{{$title}}</h3>{{/if}}
{{if $desc}}<div class="desc">{{$desc}}</div>{{/if}} {{if $desc}}<div class="desc">{{$desc nofilter}}</div>{{/if}}
<ul role="menu"> <ul role="menu">
{{foreach $items as $item}} {{foreach $items as $item}}

6
view/templates/group_edit.tpl
View file

@ -8,9 +8,9 @@
<input type='hidden' name='form_security_token' value='{{$form_security_token}}'> <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
{{include file="field_input.tpl" field=$gname}} {{include file="field_input.tpl" field=$gname}}
{{if $drop}}{{$drop}}{{/if}} {{if $drop}}{{$drop nofilter}}{{/if}}
<div id="group-edit-submit-wrapper" > <div id="group-edit-submit-wrapper" >
<input type="submit" name="submit" value="{{$submit|escape:'html'}}" > <input type="submit" name="submit" value="{{$submit}}" >
</div> </div>
<div id="group-edit-select-end" ></div> <div id="group-edit-select-end" ></div>
</form> </form>
@ -23,4 +23,4 @@
{{include file="groupeditor.tpl"}} {{include file="groupeditor.tpl"}}
</div> </div>
{{/if}} {{/if}}
{{if $desc}}<div class="clear" id="group-edit-desc">{{$desc}}</div>{{/if}} {{if $desc}}<div class="clear" id="group-edit-desc">{{$desc nofilter}}</div>{{/if}}

2
view/templates/head.tpl
View file

@ -9,7 +9,7 @@
<link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" /> <link rel="stylesheet" href="view/asset/perfect-scrollbar/css/perfect-scrollbar.min.css" type="text/css" media="screen" />
{{foreach $stylesheets as $stylesheetUrl}} {{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}} {{/foreach}}
<link rel="shortcut icon" href="{{$shortcut_icon}}" /> <link rel="shortcut icon" href="{{$shortcut_icon}}" />

2
view/templates/home.tpl
View file

@ -1,7 +1,7 @@
{{* custom content from hook will replace everything. *}} {{* custom content from hook will replace everything. *}}
{{if $content != '' }} {{if $content != '' }}
{{$content}} {{$content nofilter}}
{{else}} {{else}}
{{if $customhome != false }} {{if $customhome != false }}

18
view/templates/hovercard.tpl
View file

@ -3,31 +3,31 @@
<div class="hover-card-header left-align"> <div class="hover-card-header left-align">
<div class="hover-card-pic left-align"> <div class="hover-card-pic left-align">
<span class="image-wrapper medium"> <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> </span>
</div> </div>
<div class="hover-card-content"> <div class="hover-card-content">
<div class="profile-entry-name"> <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>
<div class="profile-details"> <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}} {{if $profile.network}}<span class="profile-network"> ({{$profile.network}})</span>{{/if}}
</div> </div>
{{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about}}</div>{{/if}}*}} {{*{{if $profile.about}}<div class="profile-details profile-about">{{$profile.about nofilter}}</div>{{/if}}*}}
</div> </div>
<div class="hover-card-actions right-aligned"> <div class="hover-card-actions right-aligned">
{{* here are the differnt actions like privat message, poke, delete and so on *}} {{* 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 *}} {{* @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"> <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.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|escape}}"><i class="fa fa-heartbeat" 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>
<div class="hover-card-actions-connection"> <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.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|escape}}"><i class="fa fa-user" 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|escape}}"><i class="fa fa-user-plus" 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> </div>
</div> </div>

2
view/templates/http_status.tpl
View file

@ -4,6 +4,6 @@
</head> </head>
<body> <body>
<h1>{{$title}}</h1> <h1>{{$title}}</h1>
<p>{{$description}}</p> <p>{{$description nofilter}}</p>
</body> </body>
</html> </html>

6
view/templates/install_checks.tpl
View file

@ -28,14 +28,14 @@
</table> </table>
{{if $phpath}} {{if $phpath}}
<input type="hidden" name="phpath" value="{{$phpath|escape:'html'}}"> <input type="hidden" name="phpath" value="{{$phpath}}">
{{/if}} {{/if}}
{{if $passed}} {{if $passed}}
<input type="hidden" name="pass" value="2"> <input type="hidden" name="pass" value="2">
<input type="submit" value="{{$next|escape:'html'}}"> <input type="submit" value="{{$next}}">
{{else}} {{else}}
<input type="hidden" name="pass" value="1"> <input type="hidden" name="pass" value="1">
<input type="submit" value="{{$reload|escape:'html'}}"> <input type="submit" value="{{$reload}}">
{{/if}} {{/if}}
</form> </form>

4
view/templates/install_db.tpl
View file

@ -21,7 +21,7 @@
<form id="install-form" action="{{$baseurl}}/install" method="post"> <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" /> <input type="hidden" name="pass" value="3" />
{{include file="field_input.tpl" field=$dbhost}} {{include file="field_input.tpl" field=$dbhost}}
@ -30,7 +30,7 @@
{{include file="field_input.tpl" field=$dbdata}} {{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> </form>

12
view/templates/install_settings.tpl
View file

@ -6,18 +6,18 @@
<form id="install-form" action="{{$baseurl}}/install" method="post"> <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="dbhost" value="{{$dbhost|escape:'html'}}" /> <input type="hidden" name="dbhost" value="{{$dbhost}}" />
<input type="hidden" name="dbuser" value="{{$dbuser|escape:'html'}}" /> <input type="hidden" name="dbuser" value="{{$dbuser}}" />
<input type="hidden" name="dbpass" value="{{$dbpass|escape:'html'}}" /> <input type="hidden" name="dbpass" value="{{$dbpass}}" />
<input type="hidden" name="dbdata" value="{{$dbdata|escape:'html'}}" /> <input type="hidden" name="dbdata" value="{{$dbdata}}" />
<input type="hidden" name="pass" value="4" /> <input type="hidden" name="pass" value="4" />
{{include file="field_input.tpl" field=$adminmail}} {{include file="field_input.tpl" field=$adminmail}}
{{$timezone}} {{$timezone}}
{{include file="field_select.tpl" field=$language}} {{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> </form>

10
view/templates/intros.tpl
View file

@ -3,18 +3,18 @@
<div class="intro-wrapper" id="intro-{{$contact_id}}" > <div class="intro-wrapper" id="intro-{{$contact_id}}" >
<p class="intro-desc">{{$str_notifytype}} {{$notify_type}}</p> <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> <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 $location}}<dl><dt>{{$lbl_location}}</dt><dd>{{$location}}</dd></dl>{{/if}}
{{if $gender}}<dl><dt>{{$lbl_gender}}</dt><dd>{{$gender}}</dd></dl>{{/if}} {{if $gender}}<dl><dt>{{$lbl_gender}}</dt><dd>{{$gender}}</dd></dl>{{/if}}
{{if $keywords}}<dl><dt>{{$lbl_keywords}}</dt><dd>{{$keywords}}</dd></dl>{{/if}} {{if $keywords}}<dl><dt>{{$lbl_keywords}}</dt><dd>{{$keywords}}</dd></dl>{{/if}}
{{if $about}}<dl><dt>{{$lbl_about}}</dt><dd>{{$about}}</dd></dl>{{/if}} {{if $about}}<dl><dt>{{$lbl_about}}</dt><dd>{{$about nofilter}}</dd></dl>{{/if}}
<div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div> <div class="intro-knowyou">{{$lbl_knowyou}} {{$knowyou}}</div>
<div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div> <div class="intro-note" id="intro-note-{{$contact_id}}">{{$note}}</div>
<div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div> <div class="intro-wrapper-end" id="intro-wrapper-end-{{$contact_id}}"></div>
<form class="intro-form" action="notifications/{{$intro_id}}" method="post"> <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-ignore" type="submit" name="submit" value="{{$ignore}}" />
{{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard|escape:'html'}}" />{{/if}} {{if $discard}}<input class="intro-submit-discard" type="submit" name="submit" value="{{$discard}}" />{{/if}}
</form> </form>
<div class="intro-form-end"></div> <div class="intro-form-end"></div>
@ -26,7 +26,7 @@
{{$dfrn_text}} {{$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> </form>
</div> </div>
<div class="intro-end"></div> <div class="intro-end"></div>

2
view/templates/invite.tpl
View file

@ -11,7 +11,7 @@
{{include file="field_textarea.tpl" field=$message}} {{include file="field_textarea.tpl" field=$message}}
<div id="invite-submit-wrapper"> <div id="invite-submit-wrapper">
<input type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input type="submit" name="submit" value="{{$submit}}" />
</div> </div>
</div> </div>

32
view/templates/jot.tpl
View file

@ -9,8 +9,8 @@
<input type="hidden" name="wall" value="{{$wall}}" /> <input type="hidden" name="wall" value="{{$wall}}" />
<input type="hidden" name="post_type" value="{{$posttype}}" /> <input type="hidden" name="post_type" value="{{$posttype}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="return" value="{{$return_path|escape:'html'}}" /> <input type="hidden" name="return" value="{{$return_path}}" />
<input type="hidden" name="location" id="jot-location" value="{{$defloc|escape:'html'}}" /> <input type="hidden" name="location" id="jot-location" value="{{$defloc}}" />
<input type="hidden" name="coord" id="jot-coord" value="" /> <input type="hidden" name="coord" id="jot-coord" value="" />
<input type="hidden" name="post_id" value="{{$post_id}}" /> <input type="hidden" name="post_id" value="{{$post_id}}" />
<input type="hidden" name="preview" id="jot-preview" value="0" /> <input type="hidden" name="preview" id="jot-preview" value="0" />
@ -18,47 +18,47 @@
{{if $notes_cid}} {{if $notes_cid}}
<input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" /> <input type="hidden" name="contact_allow[]" value="<{{$notes_cid}}>" />
{{/if}} {{/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}} {{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}} {{/if}}
<div id="jot-text-wrap"> <div id="jot-text-wrap">
<img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" /> <img id="profile-jot-text-loading" src="images/rotator.gif" alt="{{$wait}}" title="{{$wait}}" style="display: none;" />
<textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content}}{{/if}}</textarea> <textarea rows="5" cols="64" class="profile-jot-text" id="profile-jot-text" name="body" placeholder="{{$share}}">{{if $content}}{{$content nofilter}}{{/if}}</textarea>
</div> </div>
<div id="profile-jot-submit-wrapper" class="jothidden"> <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="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>
<div id="profile-attach-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-link-wrapper" style="display: {{$visitor}};" ondragenter="linkdropper(event);" ondragover="linkdropper(event);" ondrop="linkdrop(event);" > <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> <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>
<div id="profile-video-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-audio-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-location-wrapper" style="display: {{$visitor}};" > <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>
<div id="profile-nolocation-wrapper" style="display: none;" > <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>
<div id="profile-jot-perms" class="profile-jot-perms" style="display: {{$pvisit}};" > <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> </div>
<!-- {{if $preview}}<span onclick="preview_post();" id="jot-preview-link" class="fakelink">{{$preview}}</span>{{/if}} --> <!-- {{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> <div id="profile-jot-perms-end"></div>
@ -68,14 +68,14 @@
</div> </div>
<div id="profile-rotator-wrapper" style="display: {{$visitor}};" > <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>
<div id="jot-preview-content" style="display:none;"></div> <div id="jot-preview-content" style="display:none;"></div>
<div style="display: none;"> <div style="display: none;">
<div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;"> <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">
{{$acl}} {{$acl nofilter}}
</div> </div>
</div> </div>

10
view/templates/login.tpl
View file

@ -10,7 +10,7 @@
{{include file="field_input.tpl" field=$lname}} {{include file="field_input.tpl" field=$lname}}
{{include file="field_password.tpl" field=$lpassword}} {{include file="field_password.tpl" field=$lpassword}}
<div id="login-lost-password-link"> <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>
</div> </div>
@ -21,13 +21,13 @@
{{/if}} {{/if}}
<div id="login-submit-wrapper" > <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> </div>
{{include file="field_checkbox.tpl" field=$lremember}} {{include file="field_checkbox.tpl" field=$lremember}}
{{foreach $hiddens as $k=>$v}} {{foreach $hiddens as $k=>$v}}
<input type="hidden" name="{{$k}}" value="{{$v|escape:'html'}}" /> <input type="hidden" name="{{$k}}" value="{{$v}}" />
{{/foreach}} {{/foreach}}
</div> </div>
@ -35,8 +35,8 @@
{{if $register}} {{if $register}}
<div id="login-extra-links"> <div id="login-extra-links">
<h3 id="login-head" class="sr-only">{{$register.title|escape:'html'}}</h3> <h3 id="login-head" class="sr-only">{{$register.title}}</h3>
<a href="register" title="{{$register.title|escape:'html'}}" id="register-link">{{$register.desc}}</a> <a href="register" title="{{$register.title}}" id="register-link">{{$register.desc}}</a>
</div> </div>
{{/if}} {{/if}}

2
view/templates/logout.tpl
View file

@ -2,6 +2,6 @@
<form action="{{$dest_url}}" method="post" > <form action="{{$dest_url}}" method="post" >
<div class="logout-wrapper"> <div class="logout-wrapper">
<input type="hidden" name="auth-params" value="logout" /> <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> </div>
</form> </form>

4
view/templates/lostpass.tpl
View file

@ -2,7 +2,7 @@
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<p id="lostpass-desc"> <p id="lostpass-desc">
{{$desc}} {{$desc nofilter}}
</p> </p>
<form action="lostpass" method="post" > <form action="lostpass" method="post" >
@ -12,7 +12,7 @@
</div> </div>
<div id="login-extra-end"></div> <div id="login-extra-end"></div>
<div id="login-submit-wrapper" > <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>
<div id="login-submit-end"></div> <div id="login-submit-end"></div>
</form> </form>

2
view/templates/mail_conv.tpl
View file

@ -7,7 +7,7 @@
<div class="mail-conv-sender-name" >{{$mail.from_name}}</div> <div class="mail-conv-sender-name" >{{$mail.from_name}}</div>
<div class="mail-conv-date">{{$mail.date}}</div> <div class="mail-conv-date">{{$mail.date}}</div>
<div class="mail-conv-subject">{{$mail.subject}}</div> <div class="mail-conv-subject">{{$mail.subject}}</div>
<div class="mail-conv-body">{{$mail.body}}</div> <div class="mail-conv-body">{{$mail.body nofilter}}</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-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 class="mail-conv-outside-wrapper-end"></div>
</div> </div>

2
view/templates/manage.tpl
View file

@ -1,6 +1,6 @@
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<div id="identity-manage-desc">{{$desc}}</div> <div id="identity-manage-desc">{{$desc nofilter}}</div>
<div id="identity-manage-choose">{{$choose}}</div> <div id="identity-manage-choose">{{$choose}}</div>
<div id="identity-selector-wrapper" role="menu"> <div id="identity-selector-wrapper" role="menu">

2
view/templates/message_side.tpl
View file

@ -3,7 +3,7 @@
{{if $tabs}} {{if $tabs}}
<div id="message-preview"> <div id="message-preview">
{{$tabs}} {{$tabs nofilter}}
</div> </div>
{{/if}} {{/if}}

12
view/templates/moderated_comment.tpl
View file

@ -4,27 +4,27 @@
<input type="hidden" name="type" value="{{$type}}" /> <input type="hidden" name="type" value="{{$type}}" />
<input type="hidden" name="profile_uid" value="{{$profile_uid}}" /> <input type="hidden" name="profile_uid" value="{{$profile_uid}}" />
<input type="hidden" name="parent" value="{{$parent}}" /> <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="jsreload" value="{{$jsreload}}" />
<input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" />
<div class="comment-edit-photo" id="comment-edit-photo-{{$id}}"> <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>
<div class="comment-edit-photo-end"></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-wrap-{{$id}}" class="mod-cmnt-wrap" style="display:none">
<div id="mod-cmnt-name-lbl-{{$id}}" class="mod-cmnt-name-lbl">{{$lbl_modname}}</div> <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> <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> <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> </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> <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-text-end"></div>
<div class="comment-edit-submit-wrapper" id="comment-edit-submit-wrapper-{{$id}}" style="display: none;"> <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> <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 id="comment-edit-preview-{{$id}}" class="comment-edit-preview" style="display:none;"></div>
</div> </div>

2
view/templates/nets.tpl
View file

@ -1,7 +1,7 @@
<div id="nets-sidebar" class="widget"> <div id="nets-sidebar" class="widget">
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<div id="nets-desc">{{$desc}}</div> <div id="nets-desc">{{$desc nofilter}}</div>
<a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a> <a href="{{$base}}" class="nets-link{{if $sel_all}} nets-selected{{/if}} nets-all">{{$all}}</a>
<ul role="menu" class="nets-ul"> <ul role="menu" class="nets-ul">
{{foreach $nets as $net}} {{foreach $nets as $net}}

2
view/templates/nogroup-template.tpl
View file

@ -6,7 +6,7 @@
{{/foreach}} {{/foreach}}
<div id="contact-edit-end"></div> <div id="contact-edit-end"></div>
{{$paginate}} {{$paginate nofilter}}

4
view/templates/notifications.tpl
View file

@ -11,7 +11,7 @@
{{* The notifications *}} {{* The notifications *}}
{{if $notif_content}} {{if $notif_content}}
{{foreach $notif_content as $notification}} {{foreach $notif_content as $notification}}
{{$notification}} {{$notification nofilter}}
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
@ -21,5 +21,5 @@
{{/if}} {{/if}}
{{* The pager *}} {{* The pager *}}
{{$notif_paginate}} {{$notif_paginate nofilter}}
</div> </div>

2
view/templates/notifications_attend_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notifications_comments_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notifications_dislikes_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notifications_friends_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notifications_likes_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notification"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notifications_network_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notifications_posts_item.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/notify.tpl
View file

@ -1,4 +1,4 @@
<div class="notif-item {{if !$item_seen}}unseen{{/if}}"> <div class="notif-item {{if !$item_seen}}unseen{{/if}}">
<a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text}} <span class="notif-when">{{$item_ago}}</span></a> <a href="{{$item_link}}" target="friendica-notifications"><img src="{{$item_image}}" class="notif-image">{{$item_text nofilter}} <span class="notif-when">{{$item_ago}}</span></a>
</div> </div>

2
view/templates/oauth_authorize.tpl
View file

@ -7,5 +7,5 @@
</div> </div>
<h3>{{$authorize}}</h3> <h3>{{$authorize}}</h3>
<form method="POST"> <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> </form>

2
view/templates/peoplefind.tpl
View file

@ -3,7 +3,7 @@
<h3>{{$nv.findpeople}}</h3> <h3>{{$nv.findpeople}}</h3>
<div id="peoplefind-desc">{{$nv.desc}}</div> <div id="peoplefind-desc">{{$nv.desc}}</div>
<form action="dirfind" method="get" /> <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> </form>
<div class="side-link" id="side-match-link"><a href="match" >{{$nv.similar}}</a></div> <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> <div class="side-link" id="side-suggest-link"><a href="suggest" >{{$nv.suggest}}</a></div>

6
view/templates/photo_album.tpl
View file

@ -10,12 +10,12 @@
{{foreach $photos as $photo}} {{foreach $photos as $photo}}
<div class="photo-album-image-wrapper" id="photo-album-image-wrapper-{{$photo.id}}"> <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}}"> <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|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}}" /> <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> <p class='caption'>{{$photo.desc}}</p>
</a> </a>
</div> </div>
<div class="photo-album-image-wrapper-end"></div> <div class="photo-album-image-wrapper-end"></div>
{{/foreach}} {{/foreach}}
{{$paginate}} {{$paginate nofilter}}

6
view/templates/photo_edit.tpl
View file

@ -21,14 +21,14 @@
<div style="display: none;"> <div style="display: none;">
<div id="photo-edit-perms-select" > <div id="photo-edit-perms-select" >
{{$aclselect}} {{$aclselect nofilter}}
</div> </div>
</div> </div>
</div> </div>
<div id="photo-edit-perms-end"></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-submit-button" type="submit" name="submit" value="{{$submit}}" />
<input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete|escape:'html'}}" onclick="return confirmDelete();" /> <input id="photo-edit-delete-button" type="submit" name="delete" value="{{$delete}}" onclick="return confirmDelete();" />
<div id="photo-edit-end"></div> <div id="photo-edit-end"></div>
</form> </form>

6
view/templates/photo_top.tpl
View file

@ -1,7 +1,7 @@
<div class="photo-top-image-wrapper lframe" id="photo-top-image-wrapper-{{$photo.id}}"> <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}}"> <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|escape}}" title="{{$photo.title|escape}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" /> <img src="{{$photo.src}}" alt="{{$photo.alt}}" title="{{$photo.title}}" class="photo-top-photo{{$photo.twist}}" id="photo-top-photo-{{$photo.id}}" />
</a> </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> </div>

6
view/templates/photo_view.tpl
View file

@ -12,10 +12,10 @@
</div> </div>
{{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}">{{$prevlink.1}}</a></div>{{/if}} {{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}} {{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-photo-end"></div>
<div id="photo-caption">{{$desc}}</div> <div id="photo-caption">{{$desc nofilter}}</div>
{{if $tags}} {{if $tags}}
<div id="in-this-photo-text">{{$tags.0}}</div> <div id="in-this-photo-text">{{$tags.0}}</div>
<div id="in-this-photo">{{$tags.1}}</div> <div id="in-this-photo">{{$tags.1}}</div>
@ -34,5 +34,5 @@
{{$comments}} {{$comments}}
{{$paginate}} {{$paginate nofilter}}

2
view/templates/photos_default_uploader_submit.tpl
View file

@ -1,4 +1,4 @@
<div class="photos-upload-submit-wrapper" > <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> </div>

2
view/templates/photos_recent.tpl
View file

@ -11,4 +11,4 @@
</div> </div>
<div class="photos-end"></div> <div class="photos-end"></div>
{{$paginate}} {{$paginate nofilter}}

2
view/templates/photos_upload.tpl
View file

@ -34,7 +34,7 @@
<div style="display: none;"> <div style="display: none;">
<div id="photos-upload-permissions-wrapper"> <div id="photos-upload-permissions-wrapper">
{{$aclselect}} {{$aclselect nofilter}}
</div> </div>
</div> </div>

6
view/templates/poke_content.tpl
View file

@ -1,7 +1,7 @@
<h3>{{$title}}</h3> <h3>{{$title}}</h3>
<div id="poke-desc">{{$desc}}</div> <div id="poke-desc">{{$desc nofilter}}</div>
<div id="poke-wrapper"> <div id="poke-wrapper">
@ -9,7 +9,7 @@
<div id="poke-recipient"> <div id="poke-recipient">
<div id="poke-recip-label">{{$clabel}}</div> <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-recip-complete" type="hidden" value="{{$id}}" name="cid" />
<input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" /> <input id="poke-parent" type="hidden" value="{{$parent}}" name="parent" />
</div> </div>
@ -28,7 +28,7 @@
<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" /> <input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
</div> </div>
<input type="submit" name="submit" value="{{$submit|escape:'html'}}" /> <input type="submit" name="submit" value="{{$submit}}" />
</form> </form>
</div> </div>

2
view/templates/profile-hide-wall.tpl
View file

@ -1,6 +1,6 @@
<p id="hide-wall-text"> <p id="hide-wall-text">
{{$desc}} {{$desc nofilter}}
</p> </p>
<div id="hide-wall-yes-wrapper"> <div id="hide-wall-yes-wrapper">

Some files were not shown because too many files have changed in this diff Show more