Browse Source

Change templates

Display all links via htmlspecialchars() in templates.
Visman 4 years ago
parent
commit
14b578d25a

+ 4 - 4
app/templates/admin/bans_result.forkbb.php

@@ -3,17 +3,17 @@
         <nav class="f-pages">
         @foreach ($p->pagination as $cur)
             @if ($cur[2])
-          <a class="f-page active" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page active" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
             @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
             @elseif ('prev' === $cur[1])
-          <a rel="prev" class="f-page f-pprev" href="{!! $cur[0] !!}">{!! __('Previous') !!}</a>
+          <a rel="prev" class="f-page f-pprev" href="{{ $cur[0] }}">{!! __('Previous') !!}</a>
             @elseif ('next' === $cur[1])
-          <a rel="next" class="f-page f-pnext" href="{!! $cur[0] !!}">{!! __('Next') !!}</a>
+          <a rel="next" class="f-page f-pnext" href="{{ $cur[0] }}">{!! __('Next') !!}</a>
             @else
-          <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @endif
         @endforeach
         </nav>

+ 2 - 2
app/templates/admin/groups.forkbb.php

@@ -7,9 +7,9 @@
             <ol>
 @foreach ($p->groupsList as $cur)
               <li>
-                <a href="{!! $cur[1] !!}">{{ $cur[0] }}</a>
+                <a href="{{ $cur[1] }}">{{ $cur[0] }}</a>
     @if ($cur[2])
-                <a class="f-btn" href="{!! $cur[2] !!}" title="{!! __('Delete link') !!}">{!! __('Delete link') !!}</a>
+                <a class="f-btn" href="{{ $cur[2] }}" title="{!! __('Delete link') !!}">{!! __('Delete link') !!}</a>
     @endif
               </li>
 @endforeach

+ 1 - 1
app/templates/admin/index.forkbb.php

@@ -28,7 +28,7 @@
             </dl>
             <dl>
               <dt>{!! __('Server statistics label') !!}</dt>
-              <dd><a href="{!! $p->linkStat !!}">{!! __('View server statistics') !!}</a></dd>
+              <dd><a href="{{ $p->linkStat }}">{!! __('View server statistics') !!}</a></dd>
             </dl>
             <dl>
               <dt>{!! __('Support label') !!}</dt>

+ 2 - 2
app/templates/admin/statistics.forkbb.php

@@ -12,9 +12,9 @@
               <dt>{!! __('Environment label') !!}</dt>
               <dd>
                 {!! __('Environment data OS', PHP_OS) !!}<br>
-                {!! __('Environment data version', PHP_VERSION) !!} - <a href="{!! $p->linkInfo !!}">{!! __('Show info') !!}</a><br>
+                {!! __('Environment data version', PHP_VERSION) !!} - <a href="{{ $p->linkInfo }}">{!! __('Show info') !!}</a><br>
     @if ($p->linkAcc)
-                {!! __('Environment data acc') !!} <a href="{!! $p->linkAcc !!}">{{ $p->accelerator }}</a>
+                {!! __('Environment data acc') !!} <a href="{{ $p->linkAcc }}">{{ $p->accelerator }}</a>
     @else
                 {!! __('Environment data acc') !!} {{ $p->accelerator }}
     @endif

+ 4 - 4
app/templates/admin/users_result.forkbb.php

@@ -3,17 +3,17 @@
         <nav class="f-pages">
         @foreach ($p->pagination as $cur)
             @if ($cur[2])
-          <a class="f-page active" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page active" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
             @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
             @elseif ('prev' === $cur[1])
-          <a rel="prev" class="f-page f-pprev" href="{!! $cur[0] !!}">{!! __('Previous') !!}</a>
+          <a rel="prev" class="f-page f-pprev" href="{{ $cur[0] }}">{!! __('Previous') !!}</a>
             @elseif ('next' === $cur[1])
-          <a rel="next" class="f-page f-pnext" href="{!! $cur[0] !!}">{!! __('Next') !!}</a>
+          <a rel="next" class="f-page f-pnext" href="{{ $cur[0] }}">{!! __('Next') !!}</a>
             @else
-          <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @endif
         @endforeach
         </nav>

+ 3 - 3
app/templates/feed_atom.forkbb.php

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <title type="text">{{ $p->feed['title'] }}</title>
-  <link rel="self" type="application/atom+xml" href="{!! $p->feed['id'] !!}" />
-  <link rel="alternate" type="text/html" href="{!! $p->feed['link'] !!}" />
+  <link rel="self" type="application/atom+xml" href="{{ $p->feed['id'] }}" />
+  <link rel="alternate" type="text/html" href="{{ $p->feed['link'] }}" />
   <updated>{{ \gmdate('c', $p->feed['updated']) }}</updated>
   <generator>ForkBB</generator>
   <id>{{ $p->feed['id'] }}</id>
 @foreach($p->feed['items'] as $item)
   <entry>
     <title>{{ $item['title'] }}</title>
-    <link rel="alternate" type="text/html" href="{!! $item['link'] !!}" />
+    <link rel="alternate" type="text/html" href="{{ $item['link'] }}" />
     <id>{{ $item['id'] }}</id>
     <updated>{{ \gmdate('c', $item['updated']) }}</updated>
     <published>{{ \gmdate('c', $item['published']) }}</published>

+ 1 - 1
app/templates/feed_rss.forkbb.php

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
-    <atom:link href="{!! $p->feed['id'] !!}" rel="self" type="application/rss+xml" />
+    <atom:link href="{{ $p->feed['id'] }}" rel="self" type="application/rss+xml" />
     <title>{{ $p->feed['title'] }}</title>
     <link>{{ $p->feed['link'] }}</link>
     <description>{{ $p->feed['description'] }}</description>

+ 15 - 15
app/templates/forum.forkbb.php

@@ -4,17 +4,17 @@
         <nav class="f-pages">
         @foreach ($p->model->pagination as $cur)
             @if ($cur[2])
-          <a class="f-page active" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page active" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
             @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
             @elseif ('prev' === $cur[1])
-          <a rel="prev" class="f-page f-pprev" href="{!! $cur[0] !!}">{!! __('Previous') !!}</a>
+          <a rel="prev" class="f-page f-pprev" href="{{ $cur[0] }}">{!! __('Previous') !!}</a>
             @elseif ('next' === $cur[1])
-          <a rel="next" class="f-page f-pnext" href="{!! $cur[0] !!}">{!! __('Next') !!}</a>
+          <a rel="next" class="f-page f-pnext" href="{{ $cur[0] }}">{!! __('Next') !!}</a>
             @else
-          <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @endif
         @endforeach
         </nav>
@@ -48,7 +48,7 @@
     @yield ('pagination')
     @if ($p->model->canCreateTopic)
         <div class="f-actions-links">
-          <a class="f-btn f-btn-create-topic" title="{!! __('Post topic') !!}" href="{!! $p->model->linkCreateTopic !!}"><span>{!! __('Post topic') !!}</span></a>
+          <a class="f-btn f-btn-create-topic" title="{!! __('Post topic') !!}" href="{{ $p->model->linkCreateTopic }}"><span>{!! __('Post topic') !!}</span></a>
         </div>
     @endif
       </div>
@@ -79,7 +79,7 @@
               <div class="f-ficon"></div>
             @endif
               <div class="f-finfo">
-                <h3><span class="f-tmoved" title="{!! __('Moved') !!}"><span class="f-movedtxt">{!! __('Moved') !!}</span></span> <a class="f-ftname" href="{!! $topic->link !!}">{{ $topic->censorSubject }}</a></h3>
+                <h3><span class="f-tmoved" title="{!! __('Moved') !!}"><span class="f-movedtxt">{!! __('Moved') !!}</span></span> <a class="f-ftname" href="{{ $topic->link }}">{{ $topic->censorSubject }}</a></h3>
               </div>
             </div>
           </li>
@@ -106,29 +106,29 @@
             @if ($topic->poll_type > 0)
                   <span class="f-tpoll" title="{!! __('Poll') !!}"><span class="f-polltxt">{!! __('Poll') !!}</span></span>
             @endif
-                  <a class="f-ftname" href="{!! $topic->link !!}">{{ $topic->censorSubject }}</a>
+                  <a class="f-ftname" href="{{ $topic->link }}">{{ $topic->censorSubject }}</a>
             @if ($topic->pagination)
                   <span class="f-tpages">
                 @foreach ($topic->pagination as $cur)
                     @if ('space' === $cur[1])
                     <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
                     @else
-                    <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+                    <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
                     @endif
                 @endforeach
                   </span>
             @endif
             @if (false !== $topic->hasUnread)
-                  <small class="f-tunread"><a href="{!! $topic->linkUnread !!}" title="{!! __('Unread posts info') !!}"><span class="f-unreadtxt">{!! __('Unread posts') !!}</span></a></small>
+                  <small class="f-tunread"><a href="{{ $topic->linkUnread }}" title="{!! __('Unread posts info') !!}"><span class="f-unreadtxt">{!! __('Unread posts') !!}</span></a></small>
             @endif
             @if (false !== $topic->hasNew)
-                  <small class="f-tnew"><a href="{!! $topic->linkNew !!}" title="{!! __('New posts info') !!}"><span class="f-newtxt">{!! __('New posts') !!}</span></a></small>
+                  <small class="f-tnew"><a href="{{ $topic->linkNew }}" title="{!! __('New posts info') !!}"><span class="f-newtxt">{!! __('New posts') !!}</span></a></small>
             @endif
                 </h3>
                 <p><!-- inline -->
                   <span class="f-cmposter">{!! __('by %s', $topic->poster) !!}</span>
             @if ($p->searchMode)
-                  <span class="f-cmforum"><a href="{!! $topic->parent->link !!}">{{ $topic->parent->forum_name }}</a></span>
+                  <span class="f-cmforum"><a href="{{ $topic->parent->link }}">{{ $topic->parent->forum_name }}</a></span>
             @endif
 <!-- endinline --></p>
               </div>
@@ -155,17 +155,17 @@
         @if ($p->model->canCreateTopic || $p->model->canMarkRead || $p->model->canSubscription)
         <div class="f-actions-links">
             @if ($p->model->canMarkRead)
-          <a class="f-btn f-btn-markread f-opacity" title="{!! __('Mark forum read') !!}" href="{!! $p->model->linkMarkRead !!}"><span>{!! __('All is read') !!}</span></a>
+          <a class="f-btn f-btn-markread f-opacity" title="{!! __('Mark forum read') !!}" href="{{ $p->model->linkMarkRead }}"><span>{!! __('All is read') !!}</span></a>
             @endif
             @if ($p->model->canSubscription)
                 @if ($p->model->is_subscribed)
-          <a class="f-btn f-btn-unsubscribe f-opacity" title="{!! __('Unsubscribe forum') !!}" href="{!! $p->model->linkUnsubscribe !!}"><span>{!! __('Unsubscribe') !!}</span></a>
+          <a class="f-btn f-btn-unsubscribe f-opacity" title="{!! __('Unsubscribe forum') !!}" href="{{ $p->model->linkUnsubscribe }}"><span>{!! __('Unsubscribe') !!}</span></a>
                 @else
-          <a class="f-btn f-btn-subscribe f-opacity" title="{!! __('Subscribe forum') !!}" href="{!! $p->model->linkSubscribe !!}"><span>{!! __('Subscribe') !!}</span></a>
+          <a class="f-btn f-btn-subscribe f-opacity" title="{!! __('Subscribe forum') !!}" href="{{ $p->model->linkSubscribe }}"><span>{!! __('Subscribe') !!}</span></a>
                 @endif
             @endif
             @if ($p->model->canCreateTopic)
-          <a class="f-btn f-btn-create-topic" title="{!! __('Post topic') !!}" href="{!! $p->model->linkCreateTopic !!}"><span>{!! __('Post topic') !!}</span></a>
+          <a class="f-btn f-btn-create-topic" title="{!! __('Post topic') !!}" href="{{ $p->model->linkCreateTopic }}"><span>{!! __('Post topic') !!}</span></a>
             @endif
         </div>
         @endif

+ 1 - 1
app/templates/index.forkbb.php

@@ -21,7 +21,7 @@
     <div class="f-nav-links">
       <div class="f-nlinks">
         <div class="f-actions-links">
-          <a class="f-btn f-btn-markread f-opacity" title="{!! __('Mark all as read') !!}" href="{!! $p->linkMarkRead !!}"><span>{!! __('All is read') !!}</span></a>
+          <a class="f-btn f-btn-markread f-opacity" title="{!! __('Mark all as read') !!}" href="{{ $p->linkMarkRead }}"><span>{!! __('All is read') !!}</span></a>
         </div>
       </div>
     </div>

+ 1 - 1
app/templates/layouts/admin.forkbb.php

@@ -11,7 +11,7 @@
           <label id="id-an-label" class="f-menu-toggle" for="id-an-checkbox"></label>
           <ul class="f-menu-items">
     @foreach ($p->aNavigation as $key => $val)
-            <li id="id-anav-{{ $key }}" class="f-menu-item"><a class="f-menu-a @if ($key == $p->aIndex) active @endif" href="{!! $val[0] !!}"><span class="f-menu-span">{!! $val[1] !!}</span></a></li>
+            <li id="id-anav-{{ $key }}" class="f-menu-item"><a class="f-menu-a @if ($key == $p->aIndex) active @endif" href="{{ $val[0] }}"><span class="f-menu-span">{!! $val[1] !!}</span></a></li>
     @endforeach
           </ul>
         </nav>

+ 2 - 2
app/templates/layouts/crumbs.forkbb.php

@@ -3,12 +3,12 @@
     @foreach ($p->crumbs as $cur)
         @if (\is_object($cur[0]))
         <li class="f-crumb @if ($cur[0]->is_subscribed) f-subscribed @endif"><!-- inline -->
-          <a href="{!! $cur[0]->link !!}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
+          <a href="{{ $cur[0]->link }}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
         </li><!-- endinline -->
         @else
         <li class="f-crumb"><!-- inline -->
             @if ($cur[0])
-          <a href="{!! $cur[0] !!}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
+          <a href="{{ $cur[0] }}" @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</a>
             @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
             @endif

+ 3 - 3
app/templates/layouts/form.forkbb.php

@@ -40,7 +40,7 @@
                     @if ($cur['bb'])
                 <ul class="f-child5">
                         @foreach ($cur['bb'] as $val)
-                  <li><span><a href="{!! $val[0] !!}">{!! $val[1] !!}</a> {!! $val[2] !!}</span></li>
+                  <li><span><a href="{{ $val[0] }}">{!! $val[1] !!}</a> {!! $val[2] !!}</span></li>
                         @endforeach
                 </ul>
                     @endif
@@ -97,7 +97,7 @@
                 @elseif ('password' === $cur['type'])
                 <input @if ($cur['required']) required @endif @if ($cur['disabled']) disabled @endif @if ($cur['autofocus']) autofocus @endif class="f-ctrl" id="id-{{ $key }}" name="{{ $key }}" type="password" @if ($cur['maxlength']) maxlength="{{ $cur['maxlength'] }}" @endif @if ($cur['pattern']) pattern="{{ $cur['pattern'] }}" @endif @if (isset($cur['value'])) value="{{ $cur['value'] }}" @endif>
                 @elseif ('btn' === $cur['type'])
-                <a class="f-btn @if ($cur['disabled']) f-disabled @endif" href="{!! $cur['link'] !!}" title="{{ $cur['title'] or '' }}" @if ($cur['disabled']) tabindex="-1" @endif>{{ $cur['value'] }}</a>
+                <a class="f-btn @if ($cur['disabled']) f-disabled @endif" href="{{ $cur['link'] }}" title="{{ $cur['title'] or '' }}" @if ($cur['disabled']) tabindex="-1" @endif>{{ $cur['value'] }}</a>
                 @elseif ('str' === $cur['type'])
                 <p class="f-str" id="id-{{ $key }}"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
                 @elseif ('link' === $cur['type'])
@@ -123,7 +123,7 @@
         @if ('submit' === $cur['type'])
             <button class="f-btn @if($cur['class']) {{ $cur['class'] }} @endif" name="{{ $key }}" value="{{ $cur['value'] }}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></button>
         @elseif ('btn'=== $cur['type'])
-            <a class="f-btn @if($cur['class']) {{ $cur['class'] }} @endif" data-name="{{ $key }}" href="{!! $cur['link'] !!}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></a>
+            <a class="f-btn @if($cur['class']) {{ $cur['class'] }} @endif" data-name="{{ $key }}" href="{{ $cur['link'] }}" @if (isset($cur['accesskey'])) accesskey="{{ $cur['accesskey'] }}" @endif title="{{ $cur['value'] }}"><span>{{ $cur['value'] }}</span></a>
         @endif
     @endforeach
           </p>

+ 1 - 1
app/templates/layouts/main.forkbb.php

@@ -16,7 +16,7 @@
   <div id="fork">
     <header id="fork-header">
       <div id="id-fhtitle">
-        <h1 id="id-fhth1"><a id="id-fhtha" href="{!! $p->fRootLink !!}">{{ $p->fTitle }}</a></h1>
+        <h1 id="id-fhth1"><a id="id-fhtha" href="{{ $p->fRootLink }}">{{ $p->fTitle }}</a></h1>
 @if ('' != $p->fDescription)
         <p id="id-fhtdesc">{!! $p->fDescription !!}</p>
 @endif

+ 2 - 2
app/templates/layouts/stats.forkbb.php

@@ -14,7 +14,7 @@
     @if (\is_string($p->stats->userLast))
         <dd>{!! __('Newest user')  !!} {{ $p->stats->userLast }}</dd>
     @else
-        <dd>{!! __('Newest user')  !!} <a href="{!! $p->stats->userLast[0] !!}">{{ $p->stats->userLast[1] }}</a></dd>
+        <dd>{!! __('Newest user')  !!} <a href="{{ $p->stats->userLast[0] }}">{{ $p->stats->userLast[1] }}</a></dd>
     @endif
 @endif
 @if ($p->online)
@@ -31,7 +31,7 @@
         @if (\is_string($cur))
         <dd>{{ $cur }}</dd>
         @else
-        <dd><a href="{!! $cur[0] !!}">{{ $cur[1] }}</a></dd>
+        <dd><a href="{{ $cur[0] }}">{{ $cur[1] }}</a></dd>
         @endif
     @endforeach
       </dl><!-- endinline -->

+ 5 - 5
app/templates/layouts/subforums.forkbb.php

@@ -4,7 +4,7 @@
               <div class="f-cell f-cmain">
                 <div class="f-ficon"></div>
                 <div class="f-finfo">
-                  <h3><span class="f-fredirtext">{!! __('Link to') !!}</span> <a class="f-ftname" href="{!! $cur->redirect_url !!}">{{ $cur->forum_name }}</a></h3>
+                  <h3><span class="f-fredirtext">{!! __('Link to') !!}</span> <a class="f-ftname" href="{{ $cur->redirect_url }}">{{ $cur->forum_name }}</a></h3>
         @if ('' != $cur->forum_desc)
                   <p class="f-fdesc">{!! $cur->forum_desc !!}</p>
         @endif
@@ -17,16 +17,16 @@
                 <div class="f-ficon"></div>
                 <div class="f-finfo">
                   <h3>
-                    <a class="f-ftname" href="{!! $cur->link !!}">{{ $cur->forum_name }}</a>
+                    <a class="f-ftname" href="{{ $cur->link }}">{{ $cur->forum_name }}</a>
         @if ($cur->tree->newMessages)
-                    <small class="f-fnew"><a href="{!! $cur->linkNew !!}" title="{!! __('New posts') !!}"><span class="f-newtxt">{!! __('New posts') !!}</span></a></small>
+                    <small class="f-fnew"><a href="{{ $cur->linkNew }}" title="{!! __('New posts') !!}"><span class="f-newtxt">{!! __('New posts') !!}</span></a></small>
         @endif
                   </h3>
         @if ($cur->subforums)
                   <dl class="f-inline f-fsub"><!-- inline -->
                     <dt>{!! __('Sub forum', \count($cur->subforums)) !!}</dt>
             @foreach ($cur->subforums as $sub)
-                    <dd><a href="{!! $sub->link !!}">{{ $sub->forum_name }}</a></dd>
+                    <dd><a href="{{ $sub->link }}">{{ $sub->forum_name }}</a></dd>
             @endforeach
                   </dl><!-- endinline -->
         @endif
@@ -40,7 +40,7 @@
                 @if (\is_string($mod))
                     <dd>{{ $mod }}</dd>
                 @else
-                    <dd><a href="{!! $mod[0] !!}">{{ $mod[1] }}</a></dd>
+                    <dd><a href="{{ $mod[0] }}">{{ $mod[1] }}</a></dd>
                 @endif
             @endforeach
                   </dl><!-- endinline -->

+ 1 - 1
app/templates/login.forkbb.php

@@ -8,7 +8,7 @@
       </div>
 @if ($p->regLink)
       <div class="f-fdiv f-lrdiv">
-        <p class="f-child3"><a href="{!! $p->regLink !!}" tabindex="6">{!! __('Not registered') !!}</a></p>
+        <p class="f-child3"><a href="{{ $p->regLink }}" tabindex="6">{!! __('Not registered') !!}</a></p>
       </div>
 @endif
     </section>

+ 1 - 1
app/templates/message.forkbb.php

@@ -1,6 +1,6 @@
 @extends ('layouts/main')
 @if ($p->back)
     <div class="f-backlink">
-      <p><a href="{!! $p->fRootLink !!}" onclick="window.history.back(); return false;">{!! __('Go back') !!}</a></p>
+      <p><a href="{{ $p->fRootLink }}" onclick="window.history.back(); return false;">{!! __('Go back') !!}</a></p>
     </div>
 @endif

+ 1 - 1
app/templates/post.forkbb.php

@@ -32,7 +32,7 @@
       <article id="p{!! $post->id !!}" class="f-post">
         <header class="f-post-header">
           <span class="f-post-posted"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></span>
-          <span class="f-post-number"><a href="{!! $post->link !!}" rel="bookmark">#{!! $post->postNumber !!}</a></span>
+          <span class="f-post-number"><a href="{{ $post->link }}" rel="bookmark">#{!! $post->postNumber !!}</a></span>
         </header>
         <address class="f-post-user">
           <ul class="f-user-info-first">

+ 2 - 2
app/templates/profile.forkbb.php

@@ -1,5 +1,5 @@
 @include ('layouts/crumbs')
-@section ('avatar')<img class="f-avatar-img" src="{!! $p->curUser->avatar !!}" alt="{{ $p->curUser->username }}"> @endsection
+@section ('avatar')<img class="f-avatar-img" src="{{ $p->curUser->avatar }}" alt="{{ $p->curUser->username }}"> @endsection
 @section ('signature') @if ($p->signatureSection){!! $p->curUser->htmlSign !!} @endif @endsection
 @extends ('layouts/main')
     <div class="f-nav-links">
@@ -8,7 +8,7 @@
       <div class="f-nlinks-b">
         <div class="f-actions-links">
     @foreach ($p->actionBtns as $key => $cur)
-          <a class="f-btn f-btn-{{ $key }}" href="{!! $cur[0] !!}" title="{{ $cur[1] }}"><span>{{ $cur[1] }}</span></a>
+          <a class="f-btn f-btn-{{ $key }}" href="{{ $cur[0] }}" title="{{ $cur[1] }}"><span>{{ $cur[1] }}</span></a>
     @endforeach
         </div>
       </div>

+ 17 - 17
app/templates/topic.forkbb.php

@@ -4,17 +4,17 @@
         <nav class="f-pages">
         @foreach ($p->model->pagination as $cur)
             @if ($cur[2])
-          <a class="f-page active" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page active" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
             @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
             @elseif ('prev' === $cur[1])
-          <a rel="prev" class="f-page f-pprev" href="{!! $cur[0] !!}">{!! __('Previous') !!}</a>
+          <a rel="prev" class="f-page f-pprev" href="{{ $cur[0] }}">{!! __('Previous') !!}</a>
             @elseif ('next' === $cur[1])
-          <a rel="next" class="f-page f-pnext" href="{!! $cur[0] !!}">{!! __('Next') !!}</a>
+          <a rel="next" class="f-page f-pnext" href="{{ $cur[0] }}">{!! __('Next') !!}</a>
             @else
-          <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @endif
         @endforeach
         </nav>
@@ -32,7 +32,7 @@
           <a class="f-btn f-btn-topic-closed" title="{!! __('Topic closed') !!}"><span>{!! __('Topic closed') !!}</span></a>
         @endif
         @if ($p->model->canReply)
-          <a class="f-btn f-btn-post-reply" title="{!! __('Post reply') !!}" href="{!! $p->model->linkReply !!}"><span>{!! __('Post reply') !!}</span></a>
+          <a class="f-btn f-btn-post-reply" title="{!! __('Post reply') !!}" href="{{ $p->model->linkReply }}"><span>{!! __('Post reply') !!}</span></a>
         @endif
         </div>
     @endif
@@ -59,24 +59,24 @@
         @if ($post->edited)
           <span class="f-post-edited" title="{!! __('Last edit', $post->editor, dt($post->edited)) !!}">{!! __('Edited') !!}</span>
         @endif
-          <span class="f-post-number"><a href="{!! $post->link !!}" rel="bookmark">#{!! $post->postNumber !!}</a></span>
+          <span class="f-post-number"><a href="{{ $post->link }}" rel="bookmark">#{!! $post->postNumber !!}</a></span>
         </header>
         <address class="f-post-user">
           <ul class="f-user-info-first">
         @if ($p->user->viewUsers && $post->user->link)
-            <li class="f-username"><a href="{!! $post->user->link !!}">{{ $post->user->username }}</a></li>
+            <li class="f-username"><a href="{{ $post->user->link }}">{{ $post->user->username }}</a></li>
         @else
             <li class="f-username">{{ $post->user->username }}</li>
         @endif
           </ul>
         @if ($p->user->showAvatar && $post->user->avatar)
           <p class="f-avatar">
-            <img alt="{{ $post->user->username }}" src="{!! $post->user->avatar !!}" loading="lazy">
+            <img alt="{{ $post->user->username }}" src="{{ $post->user->avatar }}" loading="lazy">
           </p>
         @endif
           <ul class="f-user-info">
         @if ($p->user->viewUsers && $post->user->link)
-            <li class="f-username"><a href="{!! $post->user->link !!}">{{ $post->user->username }}</a></li>
+            <li class="f-username"><a href="{{ $post->user->link }}">{{ $post->user->username }}</a></li>
         @else
             <li class="f-username">{{ $post->user->username }}</li>
         @endif
@@ -85,7 +85,7 @@
             <li class="f-postcount">{!! __('%s post', $post->user->num_posts, num($post->user->num_posts)) !!}</li>
         @endif
         @if ($linkPromote = $p->user->linkPromote($post))
-            <li class="f-promoteuser"><a href="{!! $linkPromote !!}">{!! __('Promote user') !!}</a></li>
+            <li class="f-promoteuser"><a href="{{ $linkPromote }}">{!! __('Promote user') !!}</a></li>
         @endif
           </ul>
         @if (! $post->user->isGuest && $p->user->showUserInfo)
@@ -124,16 +124,16 @@
           <div class="f-post-btns">
             <ul>
             @if ($post->canReport)
-              <li class="f-postreport"><a class="f-btn f-minor" title="{!! __('Report') !!}" href="{!! $post->linkReport !!}"><span>{!! __('Report') !!}</span></a></li>
+              <li class="f-postreport"><a class="f-btn f-minor" title="{!! __('Report') !!}" href="{{ $post->linkReport }}"><span>{!! __('Report') !!}</span></a></li>
             @endif
             @if ($post->canDelete)
-              <li class="f-postdelete"><a class="f-btn" title="{!! __('Delete') !!}" href="{!! $post->linkDelete !!}"><span>{!! __('Delete') !!}</span></a></li>
+              <li class="f-postdelete"><a class="f-btn" title="{!! __('Delete') !!}" href="{{ $post->linkDelete }}"><span>{!! __('Delete') !!}</span></a></li>
             @endif
             @if ($post->canEdit)
-              <li class="f-postedit"><a class="f-btn" title="{!! __('Edit') !!}" href="{!! $post->linkEdit !!}"><span>{!! __('Edit') !!}</span></a></li>
+              <li class="f-postedit"><a class="f-btn" title="{!! __('Edit') !!}" href="{{ $post->linkEdit }}"><span>{!! __('Edit') !!}</span></a></li>
             @endif
             @if ($post->canQuote)
-              <li class="f-postquote"><a class="f-btn" title="{!! __('Quote') !!}" href="{!! $post->linkQuote !!}"><span>{!! __('Quote') !!}</span></a></li>
+              <li class="f-postquote"><a class="f-btn" title="{!! __('Quote') !!}" href="{{ $post->linkQuote }}"><span>{!! __('Quote') !!}</span></a></li>
             @endif
             </ul>
           </div>
@@ -150,13 +150,13 @@
         <div class="f-actions-links">
         @if ($p->model->canSubscription)
             @if ($p->model->is_subscribed)
-          <a class="f-btn f-btn-unsubscribe f-opacity" title="{!! __('Unsubscribe topic') !!}" href="{!! $p->model->linkUnsubscribe !!}"><span>{!! __('Unsubscribe') !!}</span></a>
+          <a class="f-btn f-btn-unsubscribe f-opacity" title="{!! __('Unsubscribe topic') !!}" href="{{ $p->model->linkUnsubscribe }}"><span>{!! __('Unsubscribe') !!}</span></a>
             @else
-          <a class="f-btn f-btn-subscribe f-opacity" title="{!! __('Subscribe topic') !!}" href="{!! $p->model->linkSubscribe !!}"><span>{!! __('Subscribe') !!}</span></a>
+          <a class="f-btn f-btn-subscribe f-opacity" title="{!! __('Subscribe topic') !!}" href="{{ $p->model->linkSubscribe }}"><span>{!! __('Subscribe') !!}</span></a>
             @endif
         @endif
         @if ($p->model->canReply)
-          <a class="f-btn f-btn-post-reply" title="{!! __('Post reply') !!}" href="{!! $p->model->linkReply !!}"><span>{!! __('Post reply') !!}</span></a>
+          <a class="f-btn f-btn-post-reply" title="{!! __('Post reply') !!}" href="{{ $p->model->linkReply }}"><span>{!! __('Post reply') !!}</span></a>
         @endif
         </div>
     @endif

+ 13 - 13
app/templates/topic_in_search.forkbb.php

@@ -4,17 +4,17 @@
         <nav class="f-pages">
         @foreach ($p->model->pagination as $cur)
             @if ($cur[2])
-          <a class="f-page active" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page active" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
             @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
             @elseif ('prev' === $cur[1])
-          <a rel="prev" class="f-page f-pprev" href="{!! $cur[0] !!}">{!! __('Previous') !!}</a>
+          <a rel="prev" class="f-page f-pprev" href="{{ $cur[0] }}">{!! __('Previous') !!}</a>
             @elseif ('next' === $cur[1])
-          <a rel="next" class="f-page f-pnext" href="{!! $cur[0] !!}">{!! __('Next') !!}</a>
+          <a rel="next" class="f-page f-pnext" href="{{ $cur[0] }}">{!! __('Next') !!}</a>
             @else
-          <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @endif
         @endforeach
         </nav>
@@ -38,31 +38,31 @@
       <article id="p{!! $post->id !!}" class="f-post f-post-search @if (1 == $post->user->gender) f-user-male @elseif (2 == $post->user->gender) f-user-female @endif @if ($post->user->online) f-user-online @endif">
         <header class="f-post-header">
           <h3>
-            <span class="f-psh-forum"><a href="{!! $post->parent->parent->link !!}" title="{!! __('Go to forum') !!}">{{ $post->parent->parent->forum_name }}</a></span>
-            <span class="f-psh-topic"><a href="{!! $post->parent->link !!}" title="{!! __('Go to topic') !!}">@if ($post->id !== $post->parent->first_post_id) {!! __('Re') !!} @endif {{ $post->parent->censorSubject }}</a></span>
-            <span class="f-post-posted"><a href="{!! $post->link !!}" title="{!! __('Go to post') !!}" rel="bookmark"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></a></span>
+            <span class="f-psh-forum"><a href="{{ $post->parent->parent->link }}" title="{!! __('Go to forum') !!}">{{ $post->parent->parent->forum_name }}</a></span>
+            <span class="f-psh-topic"><a href="{{ $post->parent->link }}" title="{!! __('Go to topic') !!}">@if ($post->id !== $post->parent->first_post_id) {!! __('Re') !!} @endif {{ $post->parent->censorSubject }}</a></span>
+            <span class="f-post-posted"><a href="{{ $post->link }}" title="{!! __('Go to post') !!}" rel="bookmark"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></a></span>
           </h3>
           <span class="f-post-number">#{!! $post->postNumber !!}</span>
         </header>
         <address class="f-post-user">
           <ul class="f-user-info-first">
         @if ($p->user->viewUsers && $post->user->link)
-            <li class="f-username"><a href="{!! $post->user->link !!}">{{ $post->user->username }}</a></li>
+            <li class="f-username"><a href="{{ $post->user->link }}">{{ $post->user->username }}</a></li>
         @else
             <li class="f-username">{{ $post->user->username }}</li>
         @endif
           </ul>
           <ul class="f-user-info">
         @if ($p->user->viewUsers && $post->user->link)
-            <li class="f-username"><a href="{!! $post->user->link !!}">{{ $post->user->username }}</a></li>
+            <li class="f-username"><a href="{{ $post->user->link }}">{{ $post->user->username }}</a></li>
         @else
             <li class="f-username">{{ $post->user->username }}</li>
         @endif
             <li class="f-usertitle">{{ $post->user->title() }}</li>
           </ul>
           <ul class="f-post-search-info">
-            <li class="f-psi-forum">{!! __('Forum') !!}: <a href="{!! $post->parent->parent->link !!}">{{ $post->parent->parent->forum_name }}</a></li>
-            <li class="f-psi-topic">{!! __('Topic') !!}: <a href="{!! $post->parent->link !!}">{{ $post->parent->censorSubject }}</a></li>
+            <li class="f-psi-forum">{!! __('Forum') !!}: <a href="{{ $post->parent->parent->link }}">{{ $post->parent->parent->forum_name }}</a></li>
+            <li class="f-psi-topic">{!! __('Topic') !!}: <a href="{{ $post->parent->link }}">{{ $post->parent->censorSubject }}</a></li>
             <li class="f-psi-reply">{!! __('%s Reply', $post->parent->num_replies, num($post->parent->num_replies)) !!}</li>
         @if ($post->parent->showViews)
             <li class="f-psi-view">{!! __('%s View', $post->parent->num_views, num($post->parent->num_views)) !!}</li>
@@ -80,8 +80,8 @@
           </div>
           <div class="f-post-btns">
             <ul>
-              <li class="f-posttotopic"><a class="f-btn" href="{!! $post->parent->link !!}">{!! __('Go to topic') !!}</a></li>
-              <li class="f-posttopost"><a class="f-btn" href="{!! $post->link !!}">{!! __('Go to post') !!}</a></li>
+              <li class="f-posttotopic"><a class="f-btn" href="{{ $post->parent->link }}">{!! __('Go to topic') !!}</a></li>
+              <li class="f-posttopost"><a class="f-btn" href="{{ $post->link }}">{!! __('Go to post') !!}</a></li>
             </ul>
           </div>
         </footer>

+ 11 - 11
app/templates/userlist.forkbb.php

@@ -4,17 +4,17 @@
         <nav class="f-pages">
         @foreach ($p->pagination as $cur)
             @if ($cur[2])
-          <a class="f-page active" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page active" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
             @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
             @elseif ('prev' === $cur[1])
-          <a rel="prev" class="f-page f-pprev" href="{!! $cur[0] !!}">{!! __('Previous') !!}</a>
+          <a rel="prev" class="f-page f-pprev" href="{{ $cur[0] }}">{!! __('Previous') !!}</a>
             @elseif ('next' === $cur[1])
-          <a rel="next" class="f-page f-pnext" href="{!! $cur[0] !!}">{!! __('Next') !!}</a>
+          <a rel="next" class="f-page f-pnext" href="{{ $cur[0] }}">{!! __('Next') !!}</a>
             @else
-          <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
+          <a class="f-page" href="{{ $cur[0] }}">{{ $cur[1] }}</a>
             @endif
         @endforeach
         </nav>
@@ -45,9 +45,9 @@
           <li class="f-row f-thead" value="{{ $p->startNum }}">
             <span class="f-hcell f-cusername">
               <span class="f-hc-table">
-                <span class="f-hc-tasc"><a @if (0 === $p->activeLink) class="active" @endif href="{!! $p->links[0] !!}">▲</a></span>
+                <span class="f-hc-tasc"><a @if (0 === $p->activeLink) class="active" @endif href="{{ $p->links[0] }}">▲</a></span>
                 <span class="f-hc-tname">{!! __('Username') !!}</span>
-                <span class="f-hc-tdesc"><a @if (1 === $p->activeLink) class="active" @endif href="{!! $p->links[1] !!}">▼</a></span>
+                <span class="f-hc-tdesc"><a @if (1 === $p->activeLink) class="active" @endif href="{{ $p->links[1] }}">▼</a></span>
               </span>
             </span>
             <span class="f-hcell f-ctitle">
@@ -58,25 +58,25 @@
     @if ($p->user->showPostCount)
             <span class="f-hcell f-cnumposts">
               <span class="f-hc-table">
-                <span class="f-hc-tasc"><a @if (2 === $p->activeLink) class="active" @endif href="{!! $p->links[2] !!}">▲</a></span>
+                <span class="f-hc-tasc"><a @if (2 === $p->activeLink) class="active" @endif href="{{ $p->links[2] }}">▲</a></span>
                 <span class="f-hc-tname">{!! __('Posts') !!}</span>
-                <span class="f-hc-tdesc"><a @if (3 === $p->activeLink) class="active" @endif href="{!! $p->links[3] !!}">▼</a></span>
+                <span class="f-hc-tdesc"><a @if (3 === $p->activeLink) class="active" @endif href="{{ $p->links[3] }}">▼</a></span>
               </span>
               <small>,</small>
             </span>
     @endif
             <span class="f-hcell f-cdatereg">
               <span class="f-hc-table">
-                <span class="f-hc-tasc"><a @if (4 === $p->activeLink) class="active" @endif href="{!! $p->links[4] !!}">▲</a></span>
+                <span class="f-hc-tasc"><a @if (4 === $p->activeLink) class="active" @endif href="{{ $p->links[4] }}">▲</a></span>
                 <span class="f-hc-tname">{!! __('Registered') !!}</span>
-                <span class="f-hc-tdesc"><a @if (5 === $p->activeLink) class="active" @endif href="{!! $p->links[5] !!}">▼</a></span>
+                <span class="f-hc-tdesc"><a @if (5 === $p->activeLink) class="active" @endif href="{{ $p->links[5] }}">▼</a></span>
               </span>
             </span>
           </li>
     @foreach ($p->userList as $user)
           <li class="f-row">
         @if ($p->user->viewUsers && $user->link)
-            <span class="f-cell f-cusername"><a href="{!! $user->link !!}">{{ $user->username }}</a></span>
+            <span class="f-cell f-cusername"><a href="{{ $user->link }}">{{ $user->username }}</a></span>
         @else
             <span class="f-cell f-cusername">{{ $user->username }}</span>
         @endif