nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
Smarty escaping fixes, AlfredSK edition
This commit is contained in:
Michael Vogel 2018-12-21 06:23:21 +01:00 committed by GitHub
parent fdb41cbb71 2776b1443b
commit be6031aa1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 78 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
mod/register.php
View file

@ -213,20 +213,15 @@ function register_content(App $a)
$noid = Config::get('system', 'no_openid'); $noid = Config::get('system', 'no_openid');
if ($noid) { if ($noid) {
$oidhtml = '';
$fillwith = ''; $fillwith = '';
$fillext = ''; $fillext = '';
$oidlabel = ''; $oidlabel = '';
} else { } else {
$oidhtml = '<label for="register-openid" id="label-register-openid" >$oidlabel</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="$openid" >';
$fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'."); $fillwith = L10n::t("You may \x28optionally\x29 fill in this form via OpenID by supplying your OpenID and clicking 'Register'.");
$fillext = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.'); $fillext = L10n::t('If you are not familiar with OpenID, please leave that field blank and fill in the rest of the items.');
$oidlabel = L10n::t("Your OpenID \x28optional\x29: "); $oidlabel = L10n::t("Your OpenID \x28optional\x29: ");
} }
// I set this and got even more fake names than before...
$realpeople = ''; // L10n::t('Members of this network prefer to communicate with real people who use their real names.');
if (Config::get('system', 'publish_all')) { if (Config::get('system', 'publish_all')) {
$profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />'; $profile_publish = '<input type="hidden" name="profile_publish_reg" value="1" />';
} else { } else {
@ -244,8 +239,6 @@ function register_content(App $a)
$r = q("SELECT COUNT(*) AS `contacts` FROM `contact`"); $r = q("SELECT COUNT(*) AS `contacts` FROM `contact`");
$passwords = !$r[0]["contacts"]; $passwords = !$r[0]["contacts"];
$license = '';
$tpl = Renderer::getMarkupTemplate("register.tpl"); $tpl = Renderer::getMarkupTemplate("register.tpl");
$arr = ['template' => $tpl]; $arr = ['template' => $tpl];
@ -257,14 +250,12 @@ function register_content(App $a)
$tos = new Tos(); $tos = new Tos();
$o = Renderer::replaceMacros($tpl, [ $o = Renderer::replaceMacros($tpl, [
'$oidhtml' => $oidhtml,
'$invitations' => Config::get('system', 'invitation_only'), '$invitations' => Config::get('system', 'invitation_only'),
'$permonly' => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE, '$permonly' => intval(Config::get('config', 'register_policy')) === REGISTER_APPROVE,
'$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')], '$permonlybox' => ['permonlybox', L10n::t('Note for the admin'), '', L10n::t('Leave a message for the admin, why you want to join this node')],
'$invite_desc' => L10n::t('Membership on this site is by invitation only.'), '$invite_desc' => L10n::t('Membership on this site is by invitation only.'),
'$invite_label' => L10n::t('Your invitation code: '), '$invite_label' => L10n::t('Your invitation code: '),
'$invite_id' => $invite_id, '$invite_id' => $invite_id,
'$realpeople' => $realpeople,
'$regtitle' => L10n::t('Registration'), '$regtitle' => L10n::t('Registration'),
'$registertext' => BBCode::convert(Config::get('config', 'register_text', '')), '$registertext' => BBCode::convert(Config::get('config', 'register_text', '')),
'$fillwith' => $fillwith, '$fillwith' => $fillwith,
@ -284,7 +275,6 @@ function register_content(App $a)
'$username' => $username, '$username' => $username,
'$email' => $email, '$email' => $email,
'$nickname' => $nickname, '$nickname' => $nickname,
'$license' => $license,
'$sitename' => $a->getHostName(), '$sitename' => $a->getHostName(),
'$importh' => L10n::t('Import'), '$importh' => L10n::t('Import'),
'$importt' => L10n::t('Import your profile to this friendica instance'), '$importt' => L10n::t('Import your profile to this friendica instance'),

4
view/templates/home.tpl
View file

@ -7,8 +7,8 @@
{{if $customhome != false }} {{if $customhome != false }}
{{include file="$customhome"}} {{include file="$customhome"}}
{{else}} {{else}}
{{$defaultheader}} {{$defaultheader nofilter}}
{{/if}} {{/if}}
{{$login}} {{$login nofilter}}
{{/if}} {{/if}}

4
view/templates/install_checks.tpl
View file

@ -4,7 +4,7 @@
<form action="{{$baseurl}}/index.php?q=install" method="post"> <form action="{{$baseurl}}/index.php?q=install" method="post">
<table> <table>
{{foreach $checks as $check}} {{foreach $checks as $check}}
<tr><td>{{$check.title}} </td><td> <tr><td>{{$check.title nofilter}} </td><td>
{{if $check.status}} {{if $check.status}}
<img src="{{$baseurl}}/view/install/green.png" alt="Ok"> <img src="{{$baseurl}}/view/install/green.png" alt="Ok">
{{else}} {{else}}
@ -17,7 +17,7 @@
</td><td>{{if $check.required}}(required){{/if}}</td></tr> </td><td>{{if $check.required}}(required){{/if}}</td></tr>
{{if $check.help}} {{if $check.help}}
<tr><td class="help" colspan="3"> <tr><td class="help" colspan="3">
<blockquote>{{$check.help}}</blockquote> <blockquote>{{$check.help nofilter}}</blockquote>
{{if $check.error_msg}} {{if $check.error_msg}}
<div class="error_header"><b>{{$check.error_msg.head}}</br><a href="{{$check.error_msg.url}}">{{$check.error_msg.url}}</a></b></div> <div class="error_header"><b>{{$check.error_msg.head}}</br><a href="{{$check.error_msg.url}}">{{$check.error_msg.url}}</a></b></div>
<blockquote>{{$check.error_msg.msg}}</blockquote> <blockquote>{{$check.error_msg.msg}}</blockquote>

25
view/templates/install_db.tpl
View file

@ -1,13 +1,10 @@
<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1> <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
<h2>{{$pass}}</h2> <h2>{{$pass}}</h2>
<p> <p>
{{$info_01}}<br> {{$info_01}}<br>
{{$info_02}}<br> {{$info_02}}<br>
{{$info_03}} {{$info_03}}
</p> </p>
<table> <table>
@ -21,16 +18,14 @@
<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}}" /> <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}}
{{include file="field_input.tpl" field=$dbuser}} {{include file="field_input.tpl" field=$dbuser}}
{{include file="field_password.tpl" field=$dbpass}} {{include file="field_password.tpl" field=$dbpass}}
{{include file="field_input.tpl" field=$dbdata}} {{include file="field_input.tpl" field=$dbdata}}
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" />
</form> </form>

9
view/templates/install_finished.tpl
View file

@ -1,13 +1,10 @@
<h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1> <h1><img src="{{$baseurl}}/images/friendica-32.png"> {{$title}}</h1>
<h2>{{$pass}}</h2> <h2>{{$pass}}</h2>
{{foreach $checks as $check}} {{foreach $checks as $check}}
<img src="{{$baseurl}}/view/install/red.png" alt="Requirement not satisfied"> <img src="{{$baseurl}}/view/install/red.png" alt="Requirement not satisfied">
{{$check.title}} {{$check.title nofilter}}
<textarea rows="24" cols="80">{{$check.help}}</textarea> <textarea rows="24" cols="80">{{$check.help nofilter}}</textarea>
{{/foreach}} {{/foreach}}
{{$text}} {{$text nofilter}}

2
view/templates/install_settings.tpl
View file

@ -14,7 +14,7 @@
<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 nofilter}}
{{include file="field_select.tpl" field=$language}} {{include file="field_select.tpl" field=$language}}
<input id="install-submit" type="submit" name="submit" value="{{$submit}}" /> <input id="install-submit" type="submit" name="submit" value="{{$submit}}" />

22
view/templates/profile_advanced.tpl
View file

@ -93,28 +93,28 @@
{{if $profile.interest}} {{if $profile.interest}}
<dl id="aprofile-interest" class="aprofile"> <dl id="aprofile-interest" class="aprofile">
<dt>{{$profile.interest.0}}</dt> <dt>{{$profile.interest.0}}</dt>
<dd>{{$profile.interest.1}}</dd> <dd>{{$profile.interest.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.likes}} {{if $profile.likes}}
<dl id="aprofile-likes" class="aprofile"> <dl id="aprofile-likes" class="aprofile">
<dt>{{$profile.likes.0}}</dt> <dt>{{$profile.likes.0}}</dt>
<dd>{{$profile.likes.1}}</dd> <dd>{{$profile.likes.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.dislikes}} {{if $profile.dislikes}}
<dl id="aprofile-dislikes" class="aprofile"> <dl id="aprofile-dislikes" class="aprofile">
<dt>{{$profile.dislikes.0}}</dt> <dt>{{$profile.dislikes.0}}</dt>
<dd>{{$profile.dislikes.1}}</dd> <dd>{{$profile.dislikes.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.contact}} {{if $profile.contact}}
<dl id="aprofile-contact" class="aprofile"> <dl id="aprofile-contact" class="aprofile">
<dt>{{$profile.contact.0}}</dt> <dt>{{$profile.contact.0}}</dt>
<dd>{{$profile.contact.1}}</dd> <dd>{{$profile.contact.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -122,7 +122,7 @@
{{if $profile.music}} {{if $profile.music}}
<dl id="aprofile-music" class="aprofile"> <dl id="aprofile-music" class="aprofile">
<dt>{{$profile.music.0}}</dt> <dt>{{$profile.music.0}}</dt>
<dd>{{$profile.music.1}}</dd> <dd>{{$profile.music.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -130,7 +130,7 @@
{{if $profile.book}} {{if $profile.book}}
<dl id="aprofile-book" class="aprofile"> <dl id="aprofile-book" class="aprofile">
<dt>{{$profile.book.0}}</dt> <dt>{{$profile.book.0}}</dt>
<dd>{{$profile.book.1}}</dd> <dd>{{$profile.book.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -138,7 +138,7 @@
{{if $profile.tv}} {{if $profile.tv}}
<dl id="aprofile-tv" class="aprofile"> <dl id="aprofile-tv" class="aprofile">
<dt>{{$profile.tv.0}}</dt> <dt>{{$profile.tv.0}}</dt>
<dd>{{$profile.tv.1}}</dd> <dd>{{$profile.tv.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -146,7 +146,7 @@
{{if $profile.film}} {{if $profile.film}}
<dl id="aprofile-film" class="aprofile"> <dl id="aprofile-film" class="aprofile">
<dt>{{$profile.film.0}}</dt> <dt>{{$profile.film.0}}</dt>
<dd>{{$profile.film.1}}</dd> <dd>{{$profile.film.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -154,7 +154,7 @@
{{if $profile.romance}} {{if $profile.romance}}
<dl id="aprofile-romance" class="aprofile"> <dl id="aprofile-romance" class="aprofile">
<dt>{{$profile.romance.0}}</dt> <dt>{{$profile.romance.0}}</dt>
<dd>{{$profile.romance.1}}</dd> <dd>{{$profile.romance.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -162,14 +162,14 @@
{{if $profile.work}} {{if $profile.work}}
<dl id="aprofile-work" class="aprofile"> <dl id="aprofile-work" class="aprofile">
<dt>{{$profile.work.0}}</dt> <dt>{{$profile.work.0}}</dt>
<dd>{{$profile.work.1}}</dd> <dd>{{$profile.work.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.education}} {{if $profile.education}}
<dl id="aprofile-education" class="aprofile"> <dl id="aprofile-education" class="aprofile">
<dt>{{$profile.education.0}}</dt> <dt>{{$profile.education.0}}</dt>
<dd>{{$profile.education.1}}</dd> <dd>{{$profile.education.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}

27
view/templates/register.tpl
View file

@ -5,34 +5,29 @@
<input type="hidden" name="photo" value="{{$photo}}" /> <input type="hidden" name="photo" value="{{$photo}}" />
<input type="hidden" name="form_security_token" value="{{$form_security_token}}"> <input type="hidden" name="form_security_token" value="{{$form_security_token}}">
{{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}} {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}} </div>{{/if}}
{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}} {{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
<p id="register-realpeople">{{$realpeople}}</p>
<p id="register-fill-desc">{{$fillwith}}</p> <p id="register-fill-desc">{{$fillwith}}</p>
<p id="register-fill-ext">{{$fillext}}</p> <p id="register-fill-ext">{{$fillext}}</p>
{{if $oidlabel}} {{if $oidlabel}}
<div id="register-openid-wrapper" > <div id="register-openid-wrapper" >
<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" > <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label><input type="text" maxlength="60" size="32" name="openid_url" class="openid" id="register-openid" value="{{$openid}}" >
</div> </div>
<div id="register-openid-end" ></div> <div id="register-openid-end" ></div>
{{/if}} {{/if}}
{{if $invitations}} {{if $invitations}}
<p id="register-invite-desc">{{$invite_desc}}</p> <p id="register-invite-desc">{{$invite_desc}}</p>
<div id="register-invite-wrapper" > <div id="register-invite-wrapper" >
<label for="register-invite" id="label-register-invite" >{{$invite_label}}</label> <label for="register-invite" id="label-register-invite" >{{$invite_label}}</label>
<input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" > <input type="text" maxlength="60" size="32" name="invite_id" id="register-invite" value="{{$invite_id}}" >
</div> </div>
<div id="register-name-end" ></div> <div id="register-name-end" ></div>
{{/if}} {{/if}}
<div id="register-name-wrapper" > <div id="register-name-wrapper" >
<label for="register-name" id="label-register-name" >{{$namelabel}}</label> <label for="register-name" id="label-register-name" >{{$namelabel}}</label>
<input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" > <input type="text" maxlength="60" size="32" name="username" id="register-name" value="{{$username}}" >
@ -63,29 +58,25 @@
{{include file="field_textarea.tpl" field=$permonlybox}} {{include file="field_textarea.tpl" field=$permonlybox}}
{{/if}} {{/if}}
{{$publish}} {{$publish nofilter}}
{{if $showtoslink}} {{if $showtoslink}}
<p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p> <p><a href="{{$baseurl}}/tos">{{$tostext}}</a></p>
{{/if}} {{/if}}
{{if $showprivstatement}} {{if $showprivstatement}}
<h4>{{$privstatement.0}}</h4> <h4>{{$privstatement.0}}</h4>
{{for $i=1 to 3}} {{for $i=1 to 3}}
<p>{{$privstatement[$i]}}</p> <p>{{$privstatement[$i] nofilter}}</p>
{{/for}} {{/for}}
{{/if}} {{/if}}
<div id="register-submit-wrapper"> <div id="register-submit-wrapper">
<input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" /> <input type="submit" name="submit" id="register-submit-button" value="{{$regbutt}}" />
</div> </div>
<div id="register-submit-end" ></div> <div id="register-submit-end" ></div>
<h3>{{$importh}}</h3> <h3>{{$importh}}</h3>
<div id ="import-profile"> <div id ="import-profile">
<a href="uimport">{{$importt}}</a> <a href="uimport">{{$importt}}</a>
</div> </div>
</form> </form>
{{$license}}

2
view/templates/search_item.tpl
View file

@ -19,7 +19,7 @@
<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div> {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
{{else}}<div class="wall-item-lock"></div>{{/if}} {{else}}<div class="wall-item-lock"></div>{{/if}}
<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location nofilter}}</div>
</div> </div>
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">

2
view/templates/wall_thread.tpl
View file

@ -40,7 +40,7 @@
<div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" > <div class="wall-item-wrapper" id="wall-item-wrapper-{{$item.id}}" >
{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div> {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>
{{else}}<div class="wall-item-lock"></div>{{/if}} {{else}}<div class="wall-item-lock"></div>{{/if}}
<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location}}</div> <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{$item.location nofilter}}</div>
</div> </div>
</div> </div>
<div class="wall-item-author"> <div class="wall-item-author">

4
view/theme/frio/templates/home.tpl
View file

@ -15,11 +15,11 @@
{{if $customhome != false }} {{if $customhome != false }}
{{include file="$customhome"}} {{include file="$customhome"}}
{{else}} {{else}}
{{$defaultheader}} {{$defaultheader nofilter}}
{{/if}} {{/if}}
</div> </div>
<div class="col-md-5 col-sm-12 login-form"> <div class="col-md-5 col-sm-12 login-form">
{{$login}} {{$login nofilter}}
</div> </div>
{{/if}} {{/if}}
</div> </div>

23
view/theme/frio/templates/profile_advanced.tpl
View file

@ -133,7 +133,7 @@
<div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-interest" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.interest.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.interest.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -141,7 +141,7 @@
<div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-likes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.likes.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.likes.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -149,7 +149,7 @@
<div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-dislikes" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.dislikes.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.dislikes.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -157,16 +157,15 @@
<div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-contact" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.contact.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.contact.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
{{if $profile.music}} {{if $profile.music}}
<div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-music" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.music.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.music.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -175,7 +174,7 @@
<div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-book" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.book.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.book.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -184,7 +183,7 @@
<div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-tv" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.tv.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.tv.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -193,7 +192,7 @@
<div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-film" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.film.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.film.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -202,7 +201,7 @@
<div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-romance" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.romance.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.romance.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -211,7 +210,7 @@
<div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-work" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.work.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.work.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}
@ -219,7 +218,7 @@
<div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile"> <div id="aprofile-education" class="col-lg-12 col-md-12 col-sm-12 col-xs-12 aprofile">
<hr class="profile-separator"> <hr class="profile-separator">
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div> <div class="col-lg-4 col-md-4 col-sm-4 col-xs-12 profile-label-name text-muted">{{$profile.education.0}}</div>
<div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1}}</div> <div class="col-lg-8 col-md-8 col-sm-8 col-xs-12 profile-entry">{{$profile.education.1 nofilter}}</div>
</div> </div>
{{/if}} {{/if}}

6
view/theme/frio/templates/register.tpl
View file

@ -1,4 +1,3 @@
<div class="generic-page-wrapper"> <div class="generic-page-wrapper">
<form action="register" method="post" id="register-form"> <form action="register" method="post" id="register-form">
@ -8,11 +7,10 @@
<h3 class="heading">{{$regtitle}}</h3> <h3 class="heading">{{$regtitle}}</h3>
{{if $registertext != ""}}<div class="error-message">{{$registertext}} </div>{{/if}} {{if $registertext != ""}}<div class="error-message">{{$registertext nofilter}}</div>{{/if}}
{{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}} {{if $explicit_content}} <p id="register-explicid-content">{{$explicit_content_note}}</p> {{/if}}
{{if $oidlabel}} {{if $oidlabel}}
<div id="register-openid-wrapper" class="form-group"> <div id="register-openid-wrapper" class="form-group">
<label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label> <label for="register-openid" id="label-register-openid" >{{$oidlabel}}</label>
@ -82,6 +80,4 @@
<a href="uimport">{{$importt}}</a> <a href="uimport">{{$importt}}</a>
</div> </div>
</form> </form>
{{$license}}
</div> </div>

4
view/theme/frio/templates/search_item.tpl
View file

@ -99,7 +99,7 @@
{{if $item.location}} {{if $item.location}}
<div id="wall-item-location-{{$item.id}}" class="wall-item-location"> <div id="wall-item-location-{{$item.id}}" class="wall-item-location">
<small><span class="location">({{$item.location}})</span></small> <small><span class="location">({{$item.location nofilter}})</span></small>
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -112,7 +112,7 @@
<h5 class="media-heading"> <h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
<p class="text-muted"><small> <p class="text-muted"><small>
<span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small> <span class="wall-item-ago">{{$item.ago}}</span> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
</p> </p>
</h5> </h5>
</div> </div>

6
view/theme/frio/templates/wall_thread.tpl
View file

@ -208,7 +208,7 @@ as the value of $top_child_total (this is done at the end of this file)
{{if $item.location}} {{if $item.location}}
<div id="wall-item-location-{{$item.id}}" class="wall-item-location"> <div id="wall-item-location-{{$item.id}}" class="wall-item-location">
<small><span class="location">({{$item.location}})</span></small> <small><span class="location">({{$item.location nofilter}})</span></small>
</div> </div>
{{/if}} {{/if}}
</div> </div>
@ -220,7 +220,7 @@ as the value of $top_child_total (this is done at the end of this file)
<h5 class="media-heading"> <h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span>{{$item.name}}</span></a>
<p class="text-muted"> <p class="text-muted">
<small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small> <small><a class="time" href="{{$item.plink.orig}}"><span class="wall-item-ago">{{$item.ago}}</span></a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
</p> </p>
</h5> </h5>
</div> </div>
@ -233,7 +233,7 @@ as the value of $top_child_total (this is done at the end of this file)
<h5 class="media-heading"> <h5 class="media-heading">
<a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a> <a href="{{$item.profile_url}}" title="{{$item.linktitle}}" class="wall-item-name-link userinfo"><span class="fakelink">{{$item.name}}</span></a>
<span class="text-muted"> <span class="text-muted">
<small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location}}){{/if}}</small> <small><a class="time" href="{{$item.plink.orig}}" title="{{$item.localtime}}" data-toggle="tooltip">{{$item.ago}}</a> {{if $item.location}}&nbsp;&mdash;&nbsp;({{$item.location nofilter}}){{/if}}</small>
</span> </span>
</h5> </h5>
</div> </div>

2
view/theme/quattro/templates/search_item.tpl
View file

@ -19,7 +19,7 @@
</ul> </ul>
</div> </div>
<div class="wall-item-location">{{$item.location}}</div> <div class="wall-item-location">{{$item.location nofilter}}</div>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">
{{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}} {{if $item.title}}<h2><a href="{{$item.plink.href}}">{{$item.title}}</a></h2>{{/if}}

2
view/theme/quattro/templates/wall_item_tag.tpl
View file

@ -34,7 +34,7 @@
</ul> </ul>
</div> </div>
<div class="wall-item-location">{{$item.location}}</div> <div class="wall-item-location">{{$item.location nofilter}}</div>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">
{{$item.ago}} {{$item.body nofilter}} {{$item.ago}} {{$item.body nofilter}}

2
view/theme/quattro/templates/wall_thread.tpl
View file

@ -56,7 +56,7 @@
</a> </a>
</div> </div>
{{/if}} {{/if}}
<div class="wall-item-location">{{$item.location}}</div> <div class="wall-item-location">{{$item.location nofilter}}</div>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">
{{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}} {{if $item.title}}<h2><a href="{{$item.plink.href}}" class="{{$item.sparkle}} p-name">{{$item.title}}</a></h2>{{/if}}

2
view/theme/smoothly/templates/search_item.tpl
View file

@ -15,7 +15,7 @@
</div> </div>
</div> </div>
<div class="wall-item-photo-end"></div> <div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div> <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location nofilter}} {{/if}}</div>
</div> </div>
<div class="wall-item-lock-wrapper"> <div class="wall-item-lock-wrapper">
{{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div> {{if $item.lock}}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="{{$item.lock}}" onclick="lockview(event,{{$item.id}});" /></div>

2
view/theme/smoothly/templates/wall_thread.tpl
View file

@ -33,7 +33,7 @@
</div> </div>
<div class="wall-item-photo-end"></div> <div class="wall-item-photo-end"></div>
<div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location}} {{/if}}</div> <div class="wall-item-location" id="wall-item-location-{{$item.id}}">{{if $item.location}}<span class="icon globe"></span>{{$item.location nofilter}} {{/if}}</div>
</div> </div>
<div class="wall-item-lock-wrapper"> <div class="wall-item-lock-wrapper">
{{if $item.lock}} {{if $item.lock}}

22
view/theme/vier/templates/profile_advanced.tpl
View file

@ -98,28 +98,28 @@
{{if $profile.interest}} {{if $profile.interest}}
<dl id="aprofile-interest" class="aprofile"> <dl id="aprofile-interest" class="aprofile">
<dt>{{$profile.interest.0}}</dt> <dt>{{$profile.interest.0}}</dt>
<dd>{{$profile.interest.1}}</dd> <dd>{{$profile.interest.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.likes}} {{if $profile.likes}}
<dl id="aprofile-likes" class="aprofile"> <dl id="aprofile-likes" class="aprofile">
<dt>{{$profile.likes.0}}</dt> <dt>{{$profile.likes.0}}</dt>
<dd>{{$profile.likes.1}}</dd> <dd>{{$profile.likes.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.dislikes}} {{if $profile.dislikes}}
<dl id="aprofile-dislikes" class="aprofile"> <dl id="aprofile-dislikes" class="aprofile">
<dt>{{$profile.dislikes.0}}</dt> <dt>{{$profile.dislikes.0}}</dt>
<dd>{{$profile.dislikes.1}}</dd> <dd>{{$profile.dislikes.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.contact}} {{if $profile.contact}}
<dl id="aprofile-contact" class="aprofile"> <dl id="aprofile-contact" class="aprofile">
<dt>{{$profile.contact.0}}</dt> <dt>{{$profile.contact.0}}</dt>
<dd>{{$profile.contact.1}}</dd> <dd>{{$profile.contact.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -127,7 +127,7 @@
{{if $profile.music}} {{if $profile.music}}
<dl id="aprofile-music" class="aprofile"> <dl id="aprofile-music" class="aprofile">
<dt>{{$profile.music.0}}</dt> <dt>{{$profile.music.0}}</dt>
<dd>{{$profile.music.1}}</dd> <dd>{{$profile.music.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -135,7 +135,7 @@
{{if $profile.book}} {{if $profile.book}}
<dl id="aprofile-book" class="aprofile"> <dl id="aprofile-book" class="aprofile">
<dt>{{$profile.book.0}}</dt> <dt>{{$profile.book.0}}</dt>
<dd>{{$profile.book.1}}</dd> <dd>{{$profile.book.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -143,7 +143,7 @@
{{if $profile.tv}} {{if $profile.tv}}
<dl id="aprofile-tv" class="aprofile"> <dl id="aprofile-tv" class="aprofile">
<dt>{{$profile.tv.0}}</dt> <dt>{{$profile.tv.0}}</dt>
<dd>{{$profile.tv.1}}</dd> <dd>{{$profile.tv.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -151,7 +151,7 @@
{{if $profile.film}} {{if $profile.film}}
<dl id="aprofile-film" class="aprofile"> <dl id="aprofile-film" class="aprofile">
<dt>{{$profile.film.0}}</dt> <dt>{{$profile.film.0}}</dt>
<dd>{{$profile.film.1}}</dd> <dd>{{$profile.film.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -159,7 +159,7 @@
{{if $profile.romance}} {{if $profile.romance}}
<dl id="aprofile-romance" class="aprofile"> <dl id="aprofile-romance" class="aprofile">
<dt>{{$profile.romance.0}}</dt> <dt>{{$profile.romance.0}}</dt>
<dd>{{$profile.romance.1}}</dd> <dd>{{$profile.romance.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
@ -167,14 +167,14 @@
{{if $profile.work}} {{if $profile.work}}
<dl id="aprofile-work" class="aprofile"> <dl id="aprofile-work" class="aprofile">
<dt>{{$profile.work.0}}</dt> <dt>{{$profile.work.0}}</dt>
<dd>{{$profile.work.1}}</dd> <dd>{{$profile.work.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}
{{if $profile.education}} {{if $profile.education}}
<dl id="aprofile-education" class="aprofile"> <dl id="aprofile-education" class="aprofile">
<dt>{{$profile.education.0}}</dt> <dt>{{$profile.education.0}}</dt>
<dd>{{$profile.education.1}}</dd> <dd>{{$profile.education.1 nofilter}}</dd>
</dl> </dl>
{{/if}} {{/if}}

2
view/theme/vier/templates/search_item.tpl
View file

@ -51,7 +51,7 @@
</div> </div>
<div class="wall-item-actions"> <div class="wall-item-actions">
<div class="wall-item-location">{{$item.location}}&nbsp;</div> <div class="wall-item-location">{{$item.location nofilter}}&nbsp;</div>
<div class="wall-item-actions-social"> <div class="wall-item-actions-social">
{{if $item.star}} {{if $item.star}}

2
view/theme/vier/templates/wall_item_tag.tpl
View file

@ -34,7 +34,7 @@
</ul> </ul>
</div> </div>
<div class="wall-item-location">{{$item.location}}</div> <div class="wall-item-location">{{$item.location nofilter}}</div>
</div> </div>
<div class="wall-item-content"> <div class="wall-item-content">
{{$item.ago}} {{$item.body nofilter}} {{$item.ago}} {{$item.body nofilter}}

2
view/theme/vier/templates/wall_thread.tpl
View file

@ -134,7 +134,7 @@
{{/if}} {{/if}}
</div> </div>
<div class="wall-item-location">{{$item.location}} {{$item.postopts}}</div> <div class="wall-item-location">{{$item.location nofilter}} {{$item.postopts}}</div>
<div class="wall-item-actions-isevent"> <div class="wall-item-actions-isevent">
</div> </div>