Explorar o código

* minor edits

Visman %!s(int64=6) %!d(string=hai) anos
pai
achega
b6e9b2ebef

+ 1 - 1
app/Models/User/ChangeGroup.php

@@ -45,7 +45,7 @@ class ChangeGroup extends Action
         }
         }
 
 
         if (! empty($moderators)) {
         if (! empty($moderators)) {
-            $root = $this->c->forums->get(0);
+            $root = $this->c->forums->get(0); //???? вызов от группы админов?
             if ($root instanceof Forum) {
             if ($root instanceof Forum) {
                 foreach ($this->c->forums->depthList($root, 0) as $forum) {
                 foreach ($this->c->forums->depthList($root, 0) as $forum) {
                     $forum->modDelete(...$moderators);
                     $forum->modDelete(...$moderators);

+ 1 - 1
app/Models/User/Delete.php

@@ -41,7 +41,7 @@ class Delete extends Action
         }
         }
 
 
         if (! empty($moderators)) {
         if (! empty($moderators)) {
-            $root = $this->c->forums->get(0);
+            $root = $this->c->forums->get(0); //???? вызов от группы админов?
             if ($root instanceof Forum) {
             if ($root instanceof Forum) {
                 foreach ($this->c->forums->depthList($root, 0) as $forum) {
                 foreach ($this->c->forums->depthList($root, 0) as $forum) {
                     $forum->modDelete(...$moderators);
                     $forum->modDelete(...$moderators);

+ 2 - 2
app/lang/en/common.po

@@ -138,8 +138,8 @@ msgstr "is a required field in this form."
 msgid "Last post"
 msgid "Last post"
 msgstr "Last post"
 msgstr "Last post"
 
 
-msgid "by"
-msgstr "by"
+msgid "by %s"
+msgstr "by %s"
 
 
 msgid "New posts"
 msgid "New posts"
 msgstr "New posts"
 msgstr "New posts"

+ 2 - 2
app/lang/ru/common.po

@@ -138,8 +138,8 @@ msgstr "необходимое поле в этой форме."
 msgid "Last post"
 msgid "Last post"
 msgstr "Последнее сообщение"
 msgstr "Последнее сообщение"
 
 
-msgid "by"
-msgstr "от"
+msgid "by %s"
+msgstr "от %s"
 
 
 msgid "New posts"
 msgid "New posts"
 msgstr "Новые сообщения"
 msgstr "Новые сообщения"

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

@@ -1,9 +1,9 @@
 @extends ('layouts/admin')
 @extends ('layouts/admin')
-      <section class="f-admin @if ($p->classForm) f-{!! implode('-form f-', (array) $p->classForm) !!}-form @endif">
+      <section class="f-admin @if ($p->classForm) f-{!! \implode('-form f-', (array) $p->classForm) !!}-form @endif">
         <h2>{!! $p->titleForm !!}</h2>
         <h2>{!! $p->titleForm !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
 @if ($form = $p->form)
 @if ($form = $p->form)
-  @include ('layouts/form')
+    @include ('layouts/form')
 @endif
 @endif
         </div>
         </div>
       </section>
       </section>

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

@@ -8,9 +8,9 @@
 @foreach ($p->groupsList as $cur)
 @foreach ($p->groupsList as $cur)
               <li>
               <li>
                 <a href="{!! $cur[1] !!}">{{ $cur[0] }}</a>
                 <a href="{!! $cur[1] !!}">{{ $cur[0] }}</a>
-  @if ($cur[2])
+    @if ($cur[2])
                 <a class="f-btn" href="{!! $cur[2] !!}">{!! __('Delete link') !!}</a>
                 <a class="f-btn" href="{!! $cur[2] !!}">{!! __('Delete link') !!}</a>
-  @endif
+    @endif
               </li>
               </li>
 @endforeach
 @endforeach
             </ol>
             </ol>
@@ -21,7 +21,7 @@
         <h2>{!! __('Default group subhead') !!}</h2>
         <h2>{!! __('Default group subhead') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
 @if ($form = $p->formDefault)
 @if ($form = $p->formDefault)
-  @include ('layouts/form')
+    @include ('layouts/form')
 @endif
 @endif
         </div>
         </div>
       </section>
       </section>
@@ -29,7 +29,7 @@
         <h2>{!! __('Add group subhead') !!}</h2>
         <h2>{!! __('Add group subhead') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
 @if ($form = $p->formNew)
 @if ($form = $p->formNew)
-  @include ('layouts/form')
+    @include ('layouts/form')
 @endif
 @endif
         </div>
         </div>
       </section>
       </section>

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

@@ -3,7 +3,7 @@
         <h2>{!! __('Maintenance head') !!}</h2>
         <h2>{!! __('Maintenance head') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
 @if ($form = $p->formMaintenance)
 @if ($form = $p->formMaintenance)
-  @include ('layouts/form')
+    @include ('layouts/form')
 @endif
 @endif
         </div>
         </div>
       </section>
       </section>
@@ -11,7 +11,7 @@
         <h2>{!! __('Rebuild index head') !!}</h2>
         <h2>{!! __('Rebuild index head') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
 @if ($form = $p->formRebuild)
 @if ($form = $p->formRebuild)
-  @include ('layouts/form')
+    @include ('layouts/form')
 @endif
 @endif
         </div>
         </div>
       </section>
       </section>

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

@@ -13,27 +13,27 @@
               <dd>
               <dd>
                 {!! __('Environment data OS', PHP_OS) !!}<br>
                 {!! __('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)
+    @if ($p->linkAcc)
                 {!! __('Environment data acc') !!} <a href="{!! $p->linkAcc !!}">{{ $p->accelerator }}</a>
                 {!! __('Environment data acc') !!} <a href="{!! $p->linkAcc !!}">{{ $p->accelerator }}</a>
-  @else
+    @else
                 {!! __('Environment data acc') !!} {{ $p->accelerator }}
                 {!! __('Environment data acc') !!} {{ $p->accelerator }}
-  @endif
+    @endif
               </dd>
               </dd>
             </dl>
             </dl>
             <dl>
             <dl>
               <dt>{!! __('Database label') !!}</dt>
               <dt>{!! __('Database label') !!}</dt>
               <dd>
               <dd>
                 {{ $p->dbVersion }}
                 {{ $p->dbVersion }}
-  @if ($p->tRecords && $p->tSize)
+    @if ($p->tRecords && $p->tSize)
                 <br>{!! __('Database data rows', num($p->tRecords)) !!}
                 <br>{!! __('Database data rows', num($p->tRecords)) !!}
                 <br>{!! __('Database data size', size($p->tSize)) !!}
                 <br>{!! __('Database data size', size($p->tSize)) !!}
-  @endif
-  @if ($p->tOther)
+    @endif
+    @if ($p->tOther)
                 <br><br>{!! __('Other')!!}
                 <br><br>{!! __('Other')!!}
-    @foreach ($p->tOther as $key => $value)
+        @foreach ($p->tOther as $key => $value)
                 <br>{{ $key }} = {{ $value }}
                 <br>{{ $key }} = {{ $value }}
-    @endforeach
-  @endif
+        @endforeach
+    @endif
               </dd>
               </dd>
 @endif
 @endif
             </dl>
             </dl>

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

@@ -3,7 +3,7 @@
       <section class="f-admin f-search-user-form">
       <section class="f-admin f-search-user-form">
         <h2>{!! __('User search head') !!}</h2>
         <h2>{!! __('User search head') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
         </div>
         </div>
       </section>
       </section>
 @endif
 @endif
@@ -11,7 +11,7 @@
       <section class="f-admin f-search-ip-form">
       <section class="f-admin f-search-ip-form">
         <h2>{!! __('IP search head') !!}</h2>
         <h2>{!! __('IP search head') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
         </div>
         </div>
       </section>
       </section>
 @endif
 @endif

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

@@ -1,29 +1,29 @@
 @section ('pagination')
 @section ('pagination')
-  @if ($p->pagination)
+    @if ($p->pagination)
         <nav class="f-pages">
         <nav class="f-pages">
-    @foreach ($p->pagination as $cur)
-      @if ($cur[2])
+        @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])
+            @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
           <span class="f-pinfo">{!! $cur[0] !!}</span>
-      @elseif ('space' === $cur[1])
+            @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
-      @elseif ('prev' === $cur[1])
+            @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])
+            @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
+            @else
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
-      @endif
-    @endforeach
+            @endif
+        @endforeach
         </nav>
         </nav>
-  @endif
+    @endif
 @endsection
 @endsection
 @extends ('layouts/admin')
 @extends ('layouts/admin')
 @if ($p->pagination)
 @if ($p->pagination)
       <div class="f-nav-links">
       <div class="f-nav-links">
         <div class="f-nlinks-b">
         <div class="f-nlinks-b">
-  @yield ('pagination')
+    @yield ('pagination')
         </div>
         </div>
       </div>
       </div>
 @endif
 @endif
@@ -31,14 +31,14 @@
         <h2>{!! __('Results head') !!}</h2>
         <h2>{!! __('Results head') !!}</h2>
         <div class="f-fdiv">
         <div class="f-fdiv">
 @if ($form = $p->formResult)
 @if ($form = $p->formResult)
-  @include ('layouts/form')
+    @include ('layouts/form')
 @endif
 @endif
         </div>
         </div>
       </section>
       </section>
 @if ($p->pagination)
 @if ($p->pagination)
       <div class="f-nav-links">
       <div class="f-nav-links">
         <div class="f-nlinks">
         <div class="f-nlinks">
-  @yield ('pagination')
+    @yield ('pagination')
         </div>
         </div>
       </div>
       </div>
 @endif
 @endif

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

@@ -1,41 +1,41 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @section ('pagination')
 @section ('pagination')
-  @if ($p->model->pagination)
+    @if ($p->model->pagination)
         <nav class="f-pages">
         <nav class="f-pages">
-    @foreach ($p->model->pagination as $cur)
-      @if ($cur[2])
+        @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])
+            @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
           <span class="f-pinfo">{!! $cur[0] !!}</span>
-      @elseif ('space' === $cur[1])
+            @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
-      @elseif ('prev' === $cur[1])
+            @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])
+            @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
+            @else
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
-      @endif
-    @endforeach
+            @endif
+        @endforeach
         </nav>
         </nav>
-  @endif
+    @endif
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')
 @if ($forums = $p->model->subforums)
 @if ($forums = $p->model->subforums)
     <div class="f-nav-links">
     <div class="f-nav-links">
-  @yield ('crumbs')
+    @yield ('crumbs')
     </div>
     </div>
     <section class="f-subforums">
     <section class="f-subforums">
       <ol class="f-ftlist">
       <ol class="f-ftlist">
@@ -47,7 +47,7 @@
               <div class="f-hcell f-cstats">{!! __('Stats') !!}</div>
               <div class="f-hcell f-cstats">{!! __('Stats') !!}</div>
               <div class="f-hcell f-clast">{!! __('Last post') !!}</div>
               <div class="f-hcell f-clast">{!! __('Last post') !!}</div>
             </li>
             </li>
-  @include ('layouts/subforums')
+    @include ('layouts/subforums')
           </ol>
           </ol>
         </li>
         </li>
       </ol>
       </ol>
@@ -57,12 +57,12 @@
 @yield ('crumbs')
 @yield ('crumbs')
 @if ($p->model->canCreateTopic || $p->model->pagination)
 @if ($p->model->canCreateTopic || $p->model->pagination)
       <div class="f-nlinks-b">
       <div class="f-nlinks-b">
-  @yield ('pagination')
-  @if ($p->model->canCreateTopic)
+    @yield ('pagination')
+    @if ($p->model->canCreateTopic)
         <div class="f-actions-links">
         <div class="f-actions-links">
           <a class="f-btn f-btn-create-topic" href="{!! $p->model->linkCreateTopic !!}">{!! __('Post topic') !!}</a>
           <a class="f-btn f-btn-create-topic" href="{!! $p->model->linkCreateTopic !!}">{!! __('Post topic') !!}</a>
         </div>
         </div>
-  @endif
+    @endif
       </div>
       </div>
 @endif
 @endif
     </div>
     </div>
@@ -76,12 +76,12 @@
             <div class="f-hcell f-cstats">{!! __('Stats') !!}</div>
             <div class="f-hcell f-cstats">{!! __('Stats') !!}</div>
             <div class="f-hcell f-clast">{!! __('Last post') !!}</div>
             <div class="f-hcell f-clast">{!! __('Last post') !!}</div>
           </li>
           </li>
-  @foreach ($p->topics as $id => $topic)
-    @if (empty($topic->id) && $iswev = ['e' => [__('Topic %s was not found in the database', $id)]])
+    @foreach ($p->topics as $id => $topic)
+        @if (empty($topic->id) && $iswev = ['e' => [__('Topic %s was not found in the database', $id)]])
           <li id="topic-{!! $id !!}" class="f-row">
           <li id="topic-{!! $id !!}" class="f-row">
-      @include ('layouts/iswev')
+            @include ('layouts/iswev')
           </li>
           </li>
-    @elseif ($topic->moved_to)
+        @elseif ($topic->moved_to)
           <li id="topic-{!! $topic->id !!}" class="f-row f-fredir">
           <li id="topic-{!! $topic->id !!}" class="f-row f-fredir">
             <div class="f-cell f-cmain">
             <div class="f-cell f-cmain">
               <div class="f-ficon"></div>
               <div class="f-ficon"></div>
@@ -90,82 +90,82 @@
               </div>
               </div>
             </div>
             </div>
           </li>
           </li>
-    @else
-          <li id="topic-{!! $topic->id !!}" class="f-row @if ($topic->hasNew !== false) f-fnew @endif @if ($topic->hasUnread !== false) f-funread @endif @if ($topic->sticky) f-fsticky @endif @if ($topic->closed) f-fclosed @endif @if ($topic->poll_type) f-fpoll @endif @if ($topic->dot) f-fposted @endif">
+        @else
+          <li id="topic-{!! $topic->id !!}" class="f-row @if (false !== $topic->hasNew) f-fnew @endif @if (false !== $topic->hasUnread) f-funread @endif @if ($topic->sticky) f-fsticky @endif @if ($topic->closed) f-fclosed @endif @if ($topic->poll_type) f-fpoll @endif @if ($topic->dot) f-fposted @endif">
             <div class="f-cell f-cmain">
             <div class="f-cell f-cmain">
               <div class="f-ficon"></div>
               <div class="f-ficon"></div>
               <div class="f-finfo">
               <div class="f-finfo">
                 <h3>
                 <h3>
-      @if ($topic->dot)
+            @if ($topic->dot)
                   <span class="f-tdot">·</span>
                   <span class="f-tdot">·</span>
-      @endif
-      @if ($topic->sticky)
+            @endif
+            @if ($topic->sticky)
                   <span class="f-stickytxt">{!! __('Sticky') !!}</span>
                   <span class="f-stickytxt">{!! __('Sticky') !!}</span>
-      @endif
-      @if ($topic->closed)
+            @endif
+            @if ($topic->closed)
                   <span class="f-closedtxt">{!! __('Closed') !!}</span>
                   <span class="f-closedtxt">{!! __('Closed') !!}</span>
-      @endif
-      @if ($topic->poll_type)
+            @endif
+            @if ($topic->poll_type)
                   <span class="f-polltxt">{!! __('Poll') !!}</span>
                   <span class="f-polltxt">{!! __('Poll') !!}</span>
-      @endif
+            @endif
                   <a class="f-ftname" href="{!! $topic->link !!}">{{ cens($topic->subject) }}</a>
                   <a class="f-ftname" href="{!! $topic->link !!}">{{ cens($topic->subject) }}</a>
-      @if ($topic->pagination)
+            @if ($topic->pagination)
                   <span class="f-tpages">
                   <span class="f-tpages">
-        @foreach ($topic->pagination as $cur)
-          @if ($cur[1] === 'space')
+                @foreach ($topic->pagination as $cur)
+                    @if ('space' === $cur[1])
                     <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
                     <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
-          @else
+                    @else
                     <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
                     <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
-           @endif
-        @endforeach
+                    @endif
+                @endforeach
                   </span>
                   </span>
-      @endif
-      @if ($topic->hasNew !== false)
+            @endif
+            @if (false !== $topic->hasNew)
                   <span class="f-newtxt"><a href="{!! $topic->linkNew !!}" title="{!! __('New posts info') !!}">{!! __('New posts') !!}</a></span>
                   <span class="f-newtxt"><a href="{!! $topic->linkNew !!}" title="{!! __('New posts info') !!}">{!! __('New posts') !!}</a></span>
-      @endif
+            @endif
                 </h3>
                 </h3>
-                <p class="f-cmposter">{!! __('by') !!} {{ $topic->poster }}</p>
-      @if ($p->searchMode)
+                <p class="f-cmposter">{!! __('by %s', $topic->poster) !!}</p>
+            @if ($p->searchMode)
                 <p class="f-cmforum"><a href="{!! $topic->parent->link !!}">{{ $topic->parent->forum_name }}</a></p>
                 <p class="f-cmforum"><a href="{!! $topic->parent->link !!}">{{ $topic->parent->forum_name }}</a></p>
-      @endif
+            @endif
               </div>
               </div>
             </div>
             </div>
             <div class="f-cell f-cstats">
             <div class="f-cell f-cstats">
               <ul>
               <ul>
                 <li>{!! __('%s Reply', $topic->num_replies, num($topic->num_replies)) !!}</li>
                 <li>{!! __('%s Reply', $topic->num_replies, num($topic->num_replies)) !!}</li>
-      @if ($topic->showViews)
+            @if ($topic->showViews)
                 <li>{!! __('%s View', $topic->num_views, num($topic->num_views)) !!}</li>
                 <li>{!! __('%s View', $topic->num_views, num($topic->num_views)) !!}</li>
-      @endif
+            @endif
               </ul>
               </ul>
             </div>
             </div>
             <div class="f-cell f-clast">
             <div class="f-cell f-clast">
               <ul>
               <ul>
                 <li class="f-cltopic"><a href="{!! $topic->linkLast !!}" title="&quot;{{ cens($topic->subject) }}&quot; - {!! __('Last post') !!}">{{ dt($topic->last_post) }}</a></li>
                 <li class="f-cltopic"><a href="{!! $topic->linkLast !!}" title="&quot;{{ cens($topic->subject) }}&quot; - {!! __('Last post') !!}">{{ dt($topic->last_post) }}</a></li>
-                <li class="f-clposter">{!! __('by') !!} {{ $topic->last_poster }}</li>
+                <li class="f-clposter">{!! __('by %s', $topic->last_poster) !!}</li>
               </ul>
               </ul>
             </div>
             </div>
           </li>
           </li>
-    @endif
-  @endforeach
+        @endif
+    @endforeach
         </ol>
         </ol>
       </div>
       </div>
     </section>
     </section>
     <div class="f-nav-links">
     <div class="f-nav-links">
-  @if ($p->model->canCreateTopic || $p->model->pagination || $p->model->canMarkRead)
+    @if ($p->model->canCreateTopic || $p->model->pagination || $p->model->canMarkRead)
       <div class="f-nlinks-a">
       <div class="f-nlinks-a">
-    @if ($p->model->canCreateTopic || $p->model->canMarkRead)
+        @if ($p->model->canCreateTopic || $p->model->canMarkRead)
         <div class="f-actions-links">
         <div class="f-actions-links">
-      @if ($p->model->canMarkRead)
+            @if ($p->model->canMarkRead)
           <a class="f-btn f-btn-markread" title="{!! __('Mark forum read') !!}" href="{!! $p->model->linkMarkRead !!}">{!! __('All is read') !!}</a>
           <a class="f-btn f-btn-markread" title="{!! __('Mark forum read') !!}" href="{!! $p->model->linkMarkRead !!}">{!! __('All is read') !!}</a>
-      @endif
-      @if ($p->model->canCreateTopic)
+            @endif
+            @if ($p->model->canCreateTopic)
           <a class="f-btn f-btn-create-topic" href="{!! $p->model->linkCreateTopic !!}">{!! __('Post topic') !!}</a>
           <a class="f-btn f-btn-create-topic" href="{!! $p->model->linkCreateTopic !!}">{!! __('Post topic') !!}</a>
         </div>
         </div>
-      @endif
-    @endif
-    @yield ('pagination')
+            @endif
+        @endif
+        @yield ('pagination')
       </div>
       </div>
-  @endif
-  @yield ('crumbs')
+    @endif
+    @yield ('crumbs')
     </div>
     </div>
 @endif
 @endif

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

@@ -2,7 +2,7 @@
 @if ($p->categoryes)
 @if ($p->categoryes)
     <section class="f-main">
     <section class="f-main">
       <ol class="f-ftlist">
       <ol class="f-ftlist">
-  @foreach ($p->categoryes as $id => $forums)
+    @foreach ($p->categoryes as $id => $forums)
         <li id="cat-{!! $id !!}" class="f-category">
         <li id="cat-{!! $id !!}" class="f-category">
           <h2>{{ current($forums)->cat_name }}</h2>
           <h2>{{ current($forums)->cat_name }}</h2>
           <ol class="f-table">
           <ol class="f-table">
@@ -11,13 +11,13 @@
               <div class="f-hcell f-cstats">{!! __('Stats') !!}</div>
               <div class="f-hcell f-cstats">{!! __('Stats') !!}</div>
               <div class="f-hcell f-clast">{!! __('Last post') !!}</div>
               <div class="f-hcell f-clast">{!! __('Last post') !!}</div>
             </li>
             </li>
-    @include ('layouts/subforums')
+        @include ('layouts/subforums')
           </ol>
           </ol>
         </li>
         </li>
-  @endforeach
+    @endforeach
       </ol>
       </ol>
     </section>
     </section>
-  @if ($p->linkMarkRead)
+    @if ($p->linkMarkRead)
     <div class="f-nav-links">
     <div class="f-nav-links">
       <div class="f-nlinks">
       <div class="f-nlinks">
         <div class="f-actions-links">
         <div class="f-actions-links">
@@ -25,6 +25,6 @@
         </div>
         </div>
       </div>
       </div>
     </div>
     </div>
-  @endif
+    @endif
 @endif
 @endif
 @include ('layouts/stats')
 @include ('layouts/stats')

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

@@ -1,14 +1,14 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')

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

@@ -10,12 +10,12 @@
           </tr>
           </tr>
         </thead>
         </thead>
         <tbody>
         <tbody>
-  @foreach ($p->queries as $cur)
+    @foreach ($p->queries as $cur)
           <tr>
           <tr>
             <td class="tcl">{{ num($cur[1], 3) }}</td>
             <td class="tcl">{{ num($cur[1], 3) }}</td>
             <td class="tcr">{{ $cur[0] }}</td>
             <td class="tcr">{{ $cur[0] }}</td>
           </tr>
           </tr>
-  @endforeach
+    @endforeach
           <tr>
           <tr>
             <td class="tcl">{{ num($p->total, 3) }}</td>
             <td class="tcl">{{ num($p->total, 3) }}</td>
             <td class="tcr"></td>
             <td class="tcr"></td>

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

@@ -12,7 +12,7 @@
           <p class="f-finfo"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
           <p class="f-finfo"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
         @endforeach
         @endforeach
     @elseif ($setVal['fields'])
     @elseif ($setVal['fields'])
-          <fieldset id="id-fs-{{ $setKey }}" @if ($setVal['class']) class="f-fs-{!! implode(' f-fs-', (array) $setVal['class']) !!}" @endif>
+          <fieldset id="id-fs-{{ $setKey }}" @if ($setVal['class']) class="f-fs-{!! \implode(' f-fs-', (array) $setVal['class']) !!}" @endif>
         @if ($setVal['legend'])
         @if ($setVal['legend'])
             <legend>{!! $setVal['legend'] !!}</legend>
             <legend>{!! $setVal['legend'] !!}</legend>
         @endif
         @endif
@@ -20,11 +20,11 @@
             @if ('info' === $cur['type'])
             @if ('info' === $cur['type'])
             <p id="id-{{ $cur['id'] or $key }}" class="f-child6"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
             <p id="id-{{ $cur['id'] or $key }}" class="f-child6"> @if ($cur['html']){!! $cur['value'] !!} @else{{ $cur['value'] }} @endif</p>
             @elseif ('wrap' === $cur['type'])
             @elseif ('wrap' === $cur['type'])
-            <div id="id-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-wrap-{!! implode(' f-wrap-', (array) $cur['class']) !!}" @endif>
+            <div id="id-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-wrap-{!! \implode(' f-wrap-', (array) $cur['class']) !!}" @endif>
             @elseif ('endwrap' === $cur['type'])
             @elseif ('endwrap' === $cur['type'])
             </div>
             </div>
             @else
             @else
-            <dl id="id-dl-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-field-{!! implode(' f-field-', (array) $cur['class']) !!}" @endif>
+            <dl id="id-dl-{{ $cur['id'] or $key }}" @if ($cur['class']) class="f-field-{!! \implode(' f-field-', (array) $cur['class']) !!}" @endif>
               <dt> @if ($cur['caption'])<label class="f-child1 @if ($cur['required']) f-req @endif" @if (false === \strpos('.radio.yield.str.btn.', ".{$cur['type']}.")) for="id-{{ $key }}" @endif>{!! $cur['caption'] !!}</label> @endif</dt>
               <dt> @if ($cur['caption'])<label class="f-child1 @if ($cur['required']) f-req @endif" @if (false === \strpos('.radio.yield.str.btn.', ".{$cur['type']}.")) for="id-{{ $key }}" @endif>{!! $cur['caption'] !!}</label> @endif</dt>
               <dd>
               <dd>
                 @if ('text' === $cur['type'])
                 @if ('text' === $cur['type'])
@@ -70,10 +70,10 @@
                                 @endif
                                 @endif
                 <optgroup label="{{ $option[0] }}">
                 <optgroup label="{{ $option[0] }}">
                             @else
                             @else
-                  <option value="{{ $option[0] }}" @if ((\is_array($cur['value']) && in_array($option[0], $cur['value'])) || $option[0] == $cur['value']) selected @endif @if ($option[2]) disabled @endif>{{ $option[1] }}</option>
+                  <option value="{{ $option[0] }}" @if ((\is_array($cur['value']) && \in_array($option[0], $cur['value'])) || $option[0] == $cur['value']) selected @endif @if ($option[2]) disabled @endif>{{ $option[1] }}</option>
                             @endif
                             @endif
                         @else
                         @else
-                  <option value="{{ $v }}" @if ((\is_array($cur['value']) && in_array($v, $cur['value'])) || $v == $cur['value']) selected @endif>{{ $option }}</option>
+                  <option value="{{ $v }}" @if ((\is_array($cur['value']) && \in_array($v, $cur['value'])) || $v == $cur['value']) selected @endif>{{ $option }}</option>
                         @endif
                         @endif
                     @endforeach
                     @endforeach
                     @if (null !== $count)
                     @if (null !== $count)

+ 8 - 8
app/templates/layouts/install.forkbb.php

@@ -5,11 +5,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{!! __('ForkBB Installation') !!}</title>
   <title>{!! __('ForkBB Installation') !!}</title>
 @foreach ($p->pageHeaders as $cur)
 @foreach ($p->pageHeaders as $cur)
-  @if ($cur[0] === 'style')
+    @if ('style' === $cur[0])
   <{!! $cur[0] !!}>{!! $cur[1] !!}</{!! $cur[0] !!}>
   <{!! $cur[0] !!}>{!! $cur[1] !!}</{!! $cur[0] !!}>
-  @else
+    @else
   <{!! $cur[0] !!} {!! $cur[1] !!}>
   <{!! $cur[0] !!} {!! $cur[1] !!}>
-  @endif
+    @endif
 @endforeach
 @endforeach
 </head>
 </head>
 <body>
 <body>
@@ -21,25 +21,25 @@
       </div>
       </div>
     </header>
     </header>
 @if ($iswev = $p->fIswev)
 @if ($iswev = $p->fIswev)
-  @include ('layouts/iswev')
+    @include ('layouts/iswev')
 @endif
 @endif
 @if ($form = $p->form1)
 @if ($form = $p->form1)
     <section class="f-install">
     <section class="f-install">
       <h2>{!! __('Choose install language') !!}</h2>
       <h2>{!! __('Choose install language') !!}</h2>
       <div class="f-fdiv">
       <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
       </div>
       </div>
     </section>
     </section>
 @endif
 @endif
 @if (! $p->fIswev['e'])
 @if (! $p->fIswev['e'])
-  @if ($form = $p->form2)
+    @if ($form = $p->form2)
     <section class="f-install">
     <section class="f-install">
       <h2>{!! __('Install', $p->rev) !!}</h2>
       <h2>{!! __('Install', $p->rev) !!}</h2>
       <div class="f-fdiv">
       <div class="f-fdiv">
-    @include ('layouts/form')
+        @include ('layouts/form')
       </div>
       </div>
     </section>
     </section>
-  @endif
+    @endif
 @endif
 @endif
 <!-- debuginfo -->
 <!-- debuginfo -->
   </div>
   </div>

+ 10 - 10
app/templates/layouts/iswev.forkbb.php

@@ -2,9 +2,9 @@
     <section class="f-iswev f-info">
     <section class="f-iswev f-info">
       <h2>Info message</h2>
       <h2>Info message</h2>
       <ul>
       <ul>
-  @foreach ($iswev['i'] as $cur)
+    @foreach ($iswev['i'] as $cur)
         <li class="f-icontent">{!! $cur !!}</li>
         <li class="f-icontent">{!! $cur !!}</li>
-  @endforeach
+    @endforeach
       </ul>
       </ul>
     </section>
     </section>
 @endif
 @endif
@@ -12,9 +12,9 @@
     <section class="f-iswev f-success">
     <section class="f-iswev f-success">
       <h2>Successful operation message</h2>
       <h2>Successful operation message</h2>
       <ul>
       <ul>
-  @foreach ($iswev['s'] as $cur)
+    @foreach ($iswev['s'] as $cur)
         <li class="f-scontent">{!! $cur !!}</li>
         <li class="f-scontent">{!! $cur !!}</li>
-  @endforeach
+    @endforeach
       </ul>
       </ul>
     </section>
     </section>
 @endif
 @endif
@@ -22,9 +22,9 @@
     <section class="f-iswev f-warning">
     <section class="f-iswev f-warning">
       <h2>Warning message</h2>
       <h2>Warning message</h2>
       <ul>
       <ul>
-  @foreach ($iswev['w'] as $cur)
+    @foreach ($iswev['w'] as $cur)
         <li class="f-wcontent">{!! $cur !!}</li>
         <li class="f-wcontent">{!! $cur !!}</li>
-  @endforeach
+    @endforeach
       </ul>
       </ul>
     </section>
     </section>
 @endif
 @endif
@@ -32,9 +32,9 @@
     <section class="f-iswev f-error">
     <section class="f-iswev f-error">
       <h2>Error message</h2>
       <h2>Error message</h2>
       <ul>
       <ul>
-  @foreach ($iswev['e'] as $cur)
+    @foreach ($iswev['e'] as $cur)
         <li class="f-econtent">{!! $cur !!}</li>
         <li class="f-econtent">{!! $cur !!}</li>
-  @endforeach
+    @endforeach
       </ul>
       </ul>
     </section>
     </section>
 @endif
 @endif
@@ -42,9 +42,9 @@
     <section class="f-iswev f-validation">
     <section class="f-iswev f-validation">
       <h2>Validation message</h2>
       <h2>Validation message</h2>
       <ul>
       <ul>
-  @foreach ($iswev['v'] as $cur)
+    @foreach ($iswev['v'] as $cur)
         <li class="f-vcontent">{!! $cur !!}</li>
         <li class="f-vcontent">{!! $cur !!}</li>
-  @endforeach
+    @endforeach
       </ul>
       </ul>
     </section>
     </section>
 @endif
 @endif

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

@@ -5,11 +5,11 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>{{ $p->pageTitle }}</title>
   <title>{{ $p->pageTitle }}</title>
 @foreach ($p->pageHeaders as $cur)
 @foreach ($p->pageHeaders as $cur)
-  @if ($cur[0] === 'style')
+    @if ('style' === $cur[0])
   <{!! $cur[0] !!}>{!! $cur[1] !!}</{!! $cur[0] !!}>
   <{!! $cur[0] !!}>{!! $cur[1] !!}</{!! $cur[0] !!}>
-  @else
+    @else
   <{!! $cur[0] !!} {!! $cur[1] !!}>
   <{!! $cur[0] !!} {!! $cur[1] !!}>
-  @endif
+    @endif
 @endforeach
 @endforeach
 </head>
 </head>
 <body>
 <body>
@@ -26,24 +26,24 @@
         <input id="id-mn-checkbox" class="f-menu-checkbox" type="checkbox">
         <input id="id-mn-checkbox" class="f-menu-checkbox" type="checkbox">
         <label id="id-mn-label" class="f-menu-toggle" for="id-mn-checkbox"></label>
         <label id="id-mn-label" class="f-menu-toggle" for="id-mn-checkbox"></label>
         <ul class="f-menu-items">
         <ul class="f-menu-items">
-  @foreach ($p->fNavigation as $key => $val)
+    @foreach ($p->fNavigation as $key => $val)
           <li id="id-nav-{!! $key !!}" class="f-menu-item"><!-- inline -->
           <li id="id-nav-{!! $key !!}" class="f-menu-item"><!-- inline -->
             <a class="f-menu-a @if ($key == $p->fIndex) active @endif" href="{!! __($val[0]) !!}">{!! __($val[1]) !!}</a>
             <a class="f-menu-a @if ($key == $p->fIndex) active @endif" href="{!! __($val[0]) !!}">{!! __($val[1]) !!}</a>
-    @if ($val[3])
+        @if ($val[3])
             <ul class="f-submenu-items">
             <ul class="f-submenu-items">
-      @foreach ($val[3] as $key => $val)
+            @foreach ($val[3] as $key => $val)
               <li id="id-nav-{!! $key !!}" class="f-menu-item">
               <li id="id-nav-{!! $key !!}" class="f-menu-item">
-        @if ($val[0])
+                @if ($val[0])
                 <a class="f-menu-a @if ($key == $p->fSubIndex) active @endif" href="{!! __($val[0]) !!}" title="{!! __($val[2]) !!}">{!! __($val[1]) !!}</a>
                 <a class="f-menu-a @if ($key == $p->fSubIndex) active @endif" href="{!! __($val[0]) !!}" title="{!! __($val[2]) !!}">{!! __($val[1]) !!}</a>
-        @else
+                @else
                 <span class="f-menu-span">{!! __($val[1]) !!}</span>
                 <span class="f-menu-span">{!! __($val[1]) !!}</span>
-        @endif
+                @endif
               </li>
               </li>
-      @endforeach
+            @endforeach
             </ul>
             </ul>
-    @endif
+        @endif
           </li><!-- endinline -->
           </li><!-- endinline -->
-  @endforeach
+    @endforeach
         </ul>
         </ul>
       </nav>
       </nav>
 @endif
 @endif
@@ -55,7 +55,7 @@
     </section>
     </section>
 @endif
 @endif
 @if ($iswev = $p->fIswev)
 @if ($iswev = $p->fIswev)
-  @include ('layouts/iswev')
+    @include ('layouts/iswev')
 @endif
 @endif
 @yield ('content')
 @yield ('content')
     <footer class="f-footer">
     <footer class="f-footer">

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

@@ -6,11 +6,11 @@
   <meta http-equiv="refresh" content="{!! $p->timeout !!};URL={{ $p->link }}">
   <meta http-equiv="refresh" content="{!! $p->timeout !!};URL={{ $p->link }}">
   <title>{{ $p->pageTitle }}</title>
   <title>{{ $p->pageTitle }}</title>
 @foreach ($p->pageHeaders as $cur)
 @foreach ($p->pageHeaders as $cur)
-  @if ($cur[0] === 'style')
+    @if ('style' === $cur[0])
   <{!! $cur[0] !!}>{!! $cur[1] !!}</{!! $cur[0] !!}>
   <{!! $cur[0] !!}>{!! $cur[1] !!}</{!! $cur[0] !!}>
-  @else
+    @else
   <{!! $cur[0] !!} {!! $cur[1] !!}>
   <{!! $cur[0] !!} {!! $cur[1] !!}>
-  @endif
+    @endif
 @endforeach
 @endforeach
 </head>
 </head>
 <body>
 <body>

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

@@ -11,11 +11,11 @@
       <dl class="f-stusers">
       <dl class="f-stusers">
         <dt>{!! __('User info') !!}</dt>
         <dt>{!! __('User info') !!}</dt>
 @if ($p->stats)
 @if ($p->stats)
-  @if (\is_string($p->stats->userLast))
+    @if (\is_string($p->stats->userLast))
         <dd>{!! __('Newest user')  !!} {{ $p->stats->userLast }}</dd>
         <dd>{!! __('Newest user')  !!} {{ $p->stats->userLast }}</dd>
-  @else
+    @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
 @endif
 @endif
 @if ($p->online)
 @if ($p->online)
         <dd>{!! __('Visitors online', num($p->online->numUsers), num($p->online->numGuests)) !!}</dd>
         <dd>{!! __('Visitors online', num($p->online->numUsers), num($p->online->numGuests)) !!}</dd>
@@ -27,13 +27,13 @@
 @if ($p->online && $p->online->info)
 @if ($p->online && $p->online->info)
       <dl class="f-inline f-onlinelist"><!-- inline -->
       <dl class="f-inline f-onlinelist"><!-- inline -->
         <dt>{!! __('Online users') !!}</dt>
         <dt>{!! __('Online users') !!}</dt>
-  @foreach ($p->online->info as $cur)
-    @if (\is_string($cur))
+    @foreach ($p->online->info as $cur)
+        @if (\is_string($cur))
         <dd>{{ $cur }}</dd>
         <dd>{{ $cur }}</dd>
-    @else
+        @else
         <dd><a href="{!! $cur[0] !!}">{{ $cur[1] }}</a></dd>
         <dd><a href="{!! $cur[0] !!}">{{ $cur[1] }}</a></dd>
-    @endif
-  @endforeach
+        @endif
+    @endforeach
       </dl><!-- endinline -->
       </dl><!-- endinline -->
 @endif
 @endif
     </section>
     </section>

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

@@ -1,50 +1,50 @@
 @foreach ($forums as $cur)
 @foreach ($forums as $cur)
-  @if ($cur->redirect_url)
+    @if ($cur->redirect_url)
             <li id="forum-{!! $cur->id !!}" class="f-row f-fredir">
             <li id="forum-{!! $cur->id !!}" class="f-row f-fredir">
               <div class="f-cell f-cmain">
               <div class="f-cell f-cmain">
                 <div class="f-ficon"></div>
                 <div class="f-ficon"></div>
                 <div class="f-finfo">
                 <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)
+        @if ($cur->forum_desc)
                   <p class="f-fdesc">{!! $cur->forum_desc !!}</p>
                   <p class="f-fdesc">{!! $cur->forum_desc !!}</p>
-    @endif
+        @endif
                 </div>
                 </div>
               </div>
               </div>
             </li>
             </li>
-  @else
+    @else
             <li id="forum-{!! $cur->id !!}" class="f-row @if ($cur->tree->newMessages) f-fnew @endif">
             <li id="forum-{!! $cur->id !!}" class="f-row @if ($cur->tree->newMessages) f-fnew @endif">
               <div class="f-cell f-cmain">
               <div class="f-cell f-cmain">
                 <div class="f-ficon"></div>
                 <div class="f-ficon"></div>
                 <div class="f-finfo">
                 <div class="f-finfo">
                   <h3>
                   <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)
+        @if ($cur->tree->newMessages)
                     <span class="f-newtxt"><a href="">{!! __('New posts') !!}</a></span>
                     <span class="f-newtxt"><a href="">{!! __('New posts') !!}</a></span>
-    @endif
+        @endif
                   </h3>
                   </h3>
-    @if ($cur->subforums)
+        @if ($cur->subforums)
                   <dl class="f-inline f-fsub"><!-- inline -->
                   <dl class="f-inline f-fsub"><!-- inline -->
-                    <dt>{!! __('Sub forum', count($cur->subforums)) !!}</dt>
-      @foreach ($cur->subforums as $sub)
+                    <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
+            @endforeach
                   </dl><!-- endinline -->
                   </dl><!-- endinline -->
-    @endif
-    @if ($cur->forum_desc)
+        @endif
+        @if ($cur->forum_desc)
                   <p class="f-fdesc">{!! $cur->forum_desc !!}</p>
                   <p class="f-fdesc">{!! $cur->forum_desc !!}</p>
-    @endif
-    @if ($cur->moderators)
+        @endif
+        @if ($cur->moderators)
                   <dl class="f-inline f-modlist"><!-- inline -->
                   <dl class="f-inline f-modlist"><!-- inline -->
-                    <dt>{!! __('Moderated by', count($cur->moderators)) !!}</dt>
-      @foreach ($cur->moderators as $mod)
-        @if (\is_string($mod))
+                    <dt>{!! __('Moderated by', \count($cur->moderators)) !!}</dt>
+            @foreach ($cur->moderators as $mod)
+                @if (\is_string($mod))
                     <dd>{{ $mod }}</dd>
                     <dd>{{ $mod }}</dd>
-        @else
+                @else
                     <dd><a href="{!! $mod[0] !!}">{{ $mod[1] }}</a></dd>
                     <dd><a href="{!! $mod[0] !!}">{{ $mod[1] }}</a></dd>
-        @endif
-      @endforeach
+                @endif
+            @endforeach
                   </dl><!-- endinline -->
                   </dl><!-- endinline -->
-    @endif
+        @endif
                 </div>
                 </div>
               </div>
               </div>
               <div class="f-cell f-cstats">
               <div class="f-cell f-cstats">
@@ -55,15 +55,15 @@
               </div>
               </div>
               <div class="f-cell f-clast">
               <div class="f-cell f-clast">
                 <ul>
                 <ul>
-    @if ($cur->tree->last_post_id)
+        @if ($cur->tree->last_post_id)
                   <li class="f-cltopic"><a href="{!! $cur->tree->linkLast !!}" title="&quot;{{ cens($cur->tree->last_topic) }}&quot; - {!! __('Last post') !!}">{{ cens($cur->tree->last_topic) }}</a></li>
                   <li class="f-cltopic"><a href="{!! $cur->tree->linkLast !!}" title="&quot;{{ cens($cur->tree->last_topic) }}&quot; - {!! __('Last post') !!}">{{ cens($cur->tree->last_topic) }}</a></li>
-                  <li class="f-clposter">{!! __('by') !!} {{ $cur->tree->last_poster }}</li>
+                  <li class="f-clposter">{!! __('by %s', $cur->tree->last_poster) !!}</li>
                   <li class="f-cltime">{!! dt($cur->tree->last_post) !!}</li>
                   <li class="f-cltime">{!! dt($cur->tree->last_post) !!}</li>
-    @else
+        @else
                   <li class="f-cltopic">{!! __('Never') !!}</li>
                   <li class="f-cltopic">{!! __('Never') !!}</li>
-    @endif
+        @endif
                 </ul>
                 </ul>
               </div>
               </div>
             </li>
             </li>
-  @endif
+    @endif
 @endforeach
 @endforeach

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

@@ -1,14 +1,14 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')
@@ -29,15 +29,15 @@
     <section class="f-post-form">
     <section class="f-post-form">
       <h2>{!! $p->formTitle !!}</h2>
       <h2>{!! $p->formTitle !!}</h2>
       <div class="f-fdiv">
       <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
       </div>
       </div>
     </section>
     </section>
 @endif
 @endif
 @if ($p->posts)
 @if ($p->posts)
     <section class="f-view-posts">
     <section class="f-view-posts">
       <h2>{!! $p->postsTitle !!}</h2>
       <h2>{!! $p->postsTitle !!}</h2>
-  @foreach ($p->posts as $post)
-    @if ($post->id)
+    @foreach ($p->posts as $post)
+        @if ($post->id)
       <article id="p{!! $post->id !!}" class="clearfix f-post">
       <article id="p{!! $post->id !!}" class="clearfix f-post">
         <header class="f-post-header clearfix">
         <header class="f-post-header clearfix">
           <span class="f-post-posted"><time datetime="{{ utc($post->posted) }}">{{ dt($post->posted) }}</time></span>
           <span class="f-post-posted"><time datetime="{{ utc($post->posted) }}">{{ dt($post->posted) }}</time></span>
@@ -54,7 +54,7 @@
           </div>
           </div>
         </div>
         </div>
       </article>
       </article>
-    @endif
-  @endforeach
+        @endif
+    @endforeach
     </section>
     </section>
 @endif
 @endif

+ 5 - 5
app/templates/rules.forkbb.php

@@ -1,14 +1,14 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')

+ 6 - 6
app/templates/search.forkbb.php

@@ -1,14 +1,14 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')
@@ -19,7 +19,7 @@
     <section class="f-search-form f-main">
     <section class="f-search-form f-main">
       <h2>{!! __('Search') !!}</h2>
       <h2>{!! __('Search') !!}</h2>
       <div class="f-fdiv">
       <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
       </div>
       </div>
     </section>
     </section>
 @endif
 @endif

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

@@ -1,156 +1,156 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @section ('linkpost')
 @section ('linkpost')
-  @if ($p->model->canReply || $p->model->closed)
+    @if ($p->model->canReply || $p->model->closed)
         <div class="f-actions-links">
         <div class="f-actions-links">
-    @if ($p->model->closed)
+        @if ($p->model->closed)
           {!! __('Topic closed') !!}
           {!! __('Topic closed') !!}
-    @else
+        @else
           <a class="f-btn f-btn-post-reply" href="{!! $p->model->linkReply !!}">{!! __('Post reply') !!}</a>
           <a class="f-btn f-btn-post-reply" href="{!! $p->model->linkReply !!}">{!! __('Post reply') !!}</a>
-    @endif
+        @endif
         </div>
         </div>
-  @endif
+    @endif
 @endsection
 @endsection
 @section ('pagination')
 @section ('pagination')
-  @if ($p->model->pagination)
+    @if ($p->model->pagination)
         <nav class="f-pages">
         <nav class="f-pages">
-    @foreach ($p->model->pagination as $cur)
-      @if ($cur[2])
+        @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])
+            @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
           <span class="f-pinfo">{!! $cur[0] !!}</span>
-      @elseif ('space' === $cur[1])
+            @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
-      @elseif ('prev' === $cur[1])
+            @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])
+            @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
+            @else
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
-      @endif
-    @endforeach
+            @endif
+        @endforeach
         </nav>
         </nav>
-  @endif
+    @endif
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')
     <div class="f-nav-links">
     <div class="f-nav-links">
 @yield ('crumbs')
 @yield ('crumbs')
 @if ($p->model->canReply || $p->model->closed || $p->model->pagination)
 @if ($p->model->canReply || $p->model->closed || $p->model->pagination)
       <div class="f-nlinks-b">
       <div class="f-nlinks-b">
-  @yield ('pagination')
-  @yield ('linkpost')
+    @yield ('pagination')
+    @yield ('linkpost')
       </div>
       </div>
 @endif
 @endif
     </div>
     </div>
     <section class="f-main f-topic">
     <section class="f-main f-topic">
       <h2>{{ cens($p->model->subject) }}</h2>
       <h2>{{ cens($p->model->subject) }}</h2>
 @foreach ($p->posts as $id => $post)
 @foreach ($p->posts as $id => $post)
-  @if (empty($post->id) && $iswev = ['e' => [__('Message %s was not found in the database', $id)]])
-    @include ('layouts/iswev')
-  @else
-      <article id="p{!! $post->id !!}" class="f-post @if ($post->user->gender == 1) f-user-male @elseif ($post->user->gender == 2) f-user-female @endif @if ($post->user->online) f-user-online @endif @if (1 === $post->postNumber) f-post-first @endif">
+    @if (empty($post->id) && $iswev = ['e' => [__('Message %s was not found in the database', $id)]])
+        @include ('layouts/iswev')
+    @else
+      <article id="p{!! $post->id !!}" class="f-post @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 @if (1 === $post->postNumber) f-post-first @endif">
         <header class="f-post-header clearfix">
         <header class="f-post-header clearfix">
           <h3>@if ($post->postNumber > 1) {!! __('Re') !!} @endif {{ cens($p->model->subject) }}</h3>
           <h3>@if ($post->postNumber > 1) {!! __('Re') !!} @endif {{ cens($p->model->subject) }}</h3>
           <span class="f-post-posted"><a href="{!! $post->link !!}" rel="bookmark"><time datetime="{{ utc($post->posted) }}">{{ dt($post->posted) }}</time></a></span>
           <span class="f-post-posted"><a href="{!! $post->link !!}" rel="bookmark"><time datetime="{{ utc($post->posted) }}">{{ dt($post->posted) }}</time></a></span>
-    @if ($post->edited)
+        @if ($post->edited)
           <span class="f-post-edited" title="{!! __('Last edit', $post->edited_by, dt($post->edited)) !!}">{!! __('Edited') !!}</span>
           <span class="f-post-edited" title="{!! __('Last edit', $post->edited_by, dt($post->edited)) !!}">{!! __('Edited') !!}</span>
-    @endif
+        @endif
           <span class="f-post-number">#{!! $post->postNumber !!}</span>
           <span class="f-post-number">#{!! $post->postNumber !!}</span>
         </header>
         </header>
         <div class="f-post-body clearfix">
         <div class="f-post-body clearfix">
           <address class="f-post-left">
           <address class="f-post-left">
             <ul class="f-user-info">
             <ul class="f-user-info">
-    @if ($p->user->viewUsers && $post->user->link)
+        @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
+        @else
               <li class="f-username">{{ $post->user->username }}</li>
               <li class="f-username">{{ $post->user->username }}</li>
-    @endif
-    @if ($p->user->showAvatar && $post->user->avatar)
+        @endif
+        @if ($p->user->showAvatar && $post->user->avatar)
               <li class="f-avatar">
               <li class="f-avatar">
                 <img alt="{{ $post->user->username }}" src="{!! $post->user->avatar !!}">
                 <img alt="{{ $post->user->username }}" src="{!! $post->user->avatar !!}">
               </li>
               </li>
-    @endif
+        @endif
               <li class="f-usertitle">{{ $post->user->title() }}</li>
               <li class="f-usertitle">{{ $post->user->title() }}</li>
-    @if ($p->user->showUserInfo && $p->user->showPostCount && $post->user->num_posts)
+        @if ($p->user->showUserInfo && $p->user->showPostCount && $post->user->num_posts)
               <li class="f-postcount">{!! __('%s post', $post->user->num_posts, num($post->user->num_posts)) !!}</li>
               <li class="f-postcount">{!! __('%s post', $post->user->num_posts, num($post->user->num_posts)) !!}</li>
-    @endif
+        @endif
             </ul>
             </ul>
-    @if (! $post->user->isGuest && $p->user->showUserInfo)
+        @if (! $post->user->isGuest && $p->user->showUserInfo)
             <ul class="f-user-info-add">
             <ul class="f-user-info-add">
               <li>{!! __('Registered:') !!} {{ dt($post->user->registered, true) }}</li>
               <li>{!! __('Registered:') !!} {{ dt($post->user->registered, true) }}</li>
-      @if ($post->user->location)
+            @if ($post->user->location)
               <li>{!! __('From') !!} {{ cens($post->user->location) }}</li>
               <li>{!! __('From') !!} {{ cens($post->user->location) }}</li>
-      @endif
+            @endif
             </ul>
             </ul>
-    @endif
+        @endif
           </address>
           </address>
           <div class="f-post-right f-post-main">
           <div class="f-post-right f-post-main">
             {!! $post->html() !!}
             {!! $post->html() !!}
           </div>
           </div>
-    @if ($p->user->showSignature && '' != $post->user->signature)
+        @if ($p->user->showSignature && '' != $post->user->signature)
           <div class="f-post-right f-post-signature">
           <div class="f-post-right f-post-signature">
             <hr>
             <hr>
             {!! $post->user->htmlSign !!}
             {!! $post->user->htmlSign !!}
           </div>
           </div>
-    @endif
+        @endif
         </div>
         </div>
         <footer class="f-post-footer clearfix">
         <footer class="f-post-footer clearfix">
           <div class="f-post-left">
           <div class="f-post-left">
-    @if (! $post->user->isGuest)
+        @if (! $post->user->isGuest)
             <span class="f-userstatus">{!! __($post->user->online ? 'Online' : 'Offline') !!}</span>
             <span class="f-userstatus">{!! __($post->user->online ? 'Online' : 'Offline') !!}</span>
-    @endif
+        @endif
           </div>
           </div>
-    @if ($post->canReport || $post->canDelete || $post->canEdit || $post->canQuote)
+        @if ($post->canReport || $post->canDelete || $post->canEdit || $post->canQuote)
           <div class="f-post-right">
           <div class="f-post-right">
             <ul>
             <ul>
-      @if ($post->canReport)
+            @if ($post->canReport)
               <li class="f-postreport"><a class="f-btn f-minor" href="{!! $post->linkReport !!}">{!! __('Report') !!}</a></li>
               <li class="f-postreport"><a class="f-btn f-minor" href="{!! $post->linkReport !!}">{!! __('Report') !!}</a></li>
-      @endif
-      @if ($post->canDelete)
+            @endif
+            @if ($post->canDelete)
               <li class="f-postdelete"><a class="f-btn" href="{!! $post->linkDelete !!}">{!! __('Delete') !!}</a></li>
               <li class="f-postdelete"><a class="f-btn" href="{!! $post->linkDelete !!}">{!! __('Delete') !!}</a></li>
-      @endif
-      @if ($post->canEdit)
+            @endif
+            @if ($post->canEdit)
               <li class="f-postedit"><a class="f-btn" href="{!! $post->linkEdit !!}">{!! __('Edit') !!}</a></li>
               <li class="f-postedit"><a class="f-btn" href="{!! $post->linkEdit !!}">{!! __('Edit') !!}</a></li>
-      @endif
-      @if ($post->canQuote)
+            @endif
+            @if ($post->canQuote)
               <li class="f-postquote"><a class="f-btn" href="{!! $post->linkQuote !!}">{!! __('Quote') !!}</a></li>
               <li class="f-postquote"><a class="f-btn" href="{!! $post->linkQuote !!}">{!! __('Quote') !!}</a></li>
-      @endif
+            @endif
             </ul>
             </ul>
           </div>
           </div>
-    @endif
+        @endif
         </footer>
         </footer>
       </article>
       </article>
-  @endif
+    @endif
 @endforeach
 @endforeach
     </section>
     </section>
     <div class="f-nav-links">
     <div class="f-nav-links">
 @if ($p->model->canReply || $p->model->closed || $p->model->pagination)
 @if ($p->model->canReply || $p->model->closed || $p->model->pagination)
       <div class="f-nlinks-a">
       <div class="f-nlinks-a">
-  @yield ('linkpost')
-  @yield ('pagination')
+    @yield ('linkpost')
+    @yield ('pagination')
       </div>
       </div>
 @endif
 @endif
 @yield ('crumbs')
 @yield ('crumbs')
     </div>
     </div>
 @if ($p->online)
 @if ($p->online)
-  @include ('layouts/stats')
+    @include ('layouts/stats')
 @endif
 @endif
 @if ($form = $p->form)
 @if ($form = $p->form)
     <section class="f-post-form">
     <section class="f-post-form">
       <h2>{!! __('Quick post') !!}</h2>
       <h2>{!! __('Quick post') !!}</h2>
       <div class="f-fdiv">
       <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
       </div>
       </div>
     </section>
     </section>
 @endif
 @endif

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

@@ -1,53 +1,53 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @section ('pagination')
 @section ('pagination')
-  @if ($p->model->pagination)
+    @if ($p->model->pagination)
         <nav class="f-pages">
         <nav class="f-pages">
-    @foreach ($p->model->pagination as $cur)
-      @if ($cur[2])
+        @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])
+            @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
           <span class="f-pinfo">{!! $cur[0] !!}</span>
-      @elseif ('space' === $cur[1])
+            @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
-      @elseif ('prev' === $cur[1])
+            @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])
+            @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
+            @else
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
-      @endif
-    @endforeach
+            @endif
+        @endforeach
         </nav>
         </nav>
-  @endif
+    @endif
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')
     <div class="f-nav-links">
     <div class="f-nav-links">
 @yield ('crumbs')
 @yield ('crumbs')
 @if ($p->model->pagination)
 @if ($p->model->pagination)
       <div class="f-nlinks-b">
       <div class="f-nlinks-b">
-  @yield ('pagination')
+    @yield ('pagination')
       </div>
       </div>
 @endif
 @endif
     </div>
     </div>
     <section class="f-main f-topic">
     <section class="f-main f-topic">
       <h2>{{ $p->model->name }}</h2>
       <h2>{{ $p->model->name }}</h2>
 @foreach ($p->posts as $id => $post)
 @foreach ($p->posts as $id => $post)
-  @if (empty($post->id) && $iswev = ['e' => [__('Message %s was not found in the database', $id)]])
-    @include ('layouts/iswev')
-  @else
-      <article id="p{!! $post->id !!}" class="f-post f-post-search @if ($post->user->gender == 1) f-user-male @elseif ($post->user->gender == 2) f-user-female @endif @if ($post->user->online) f-user-online @endif">
+    @if (empty($post->id) && $iswev = ['e' => [__('Message %s was not found in the database', $id)]])
+        @include ('layouts/iswev')
+    @else
+      <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 clearfix">
         <header class="f-post-header clearfix">
           <h3>
           <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-forum"><a href="{!! $post->parent->parent->link !!}" title="{!! __('Go to forum') !!}">{{ $post->parent->parent->forum_name }}</a></span>
@@ -59,20 +59,20 @@
         <div class="f-post-body clearfix">
         <div class="f-post-body clearfix">
           <address class="f-post-left">
           <address class="f-post-left">
             <ul class="f-user-info">
             <ul class="f-user-info">
-    @if ($p->user->viewUsers && $post->user->link)
+        @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
+        @else
               <li class="f-username">{{ $post->user->username }}</li>
               <li class="f-username">{{ $post->user->username }}</li>
-    @endif
+        @endif
               <li class="f-usertitle">{{ $post->user->title() }}</li>
               <li class="f-usertitle">{{ $post->user->title() }}</li>
             </ul>
             </ul>
             <ul class="f-post-search-info">
             <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-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 !!}">{{ cens($post->parent->subject) }}</a></li>
               <li class="f-psi-topic">{!! __('Topic') !!}: <a href="{!! $post->parent->link !!}">{{ cens($post->parent->subject) }}</a></li>
               <li class="f-psi-reply">{!! __('%s Reply', $post->parent->num_replies, num($post->parent->num_replies)) !!}</li>
               <li class="f-psi-reply">{!! __('%s Reply', $post->parent->num_replies, num($post->parent->num_replies)) !!}</li>
-    @if ($post->parent->showViews)
+        @if ($post->parent->showViews)
               <li class="f-psi-view">{!! __('%s View', $post->parent->num_views, num($post->parent->num_views)) !!}</li>
               <li class="f-psi-view">{!! __('%s View', $post->parent->num_views, num($post->parent->num_views)) !!}</li>
-    @endif
+        @endif
             </ul>
             </ul>
           </address>
           </address>
           <div class="f-post-right f-post-main">
           <div class="f-post-right f-post-main">
@@ -91,13 +91,13 @@
           </div>
           </div>
         </footer>
         </footer>
       </article>
       </article>
-  @endif
+    @endif
 @endforeach
 @endforeach
     </section>
     </section>
     <div class="f-nav-links">
     <div class="f-nav-links">
 @if ($p->model->pagination)
 @if ($p->model->pagination)
       <div class="f-nlinks-a">
       <div class="f-nlinks-a">
-  @yield ('pagination')
+    @yield ('pagination')
       </div>
       </div>
 @endif
 @endif
 @yield ('crumbs')
 @yield ('crumbs')

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

@@ -1,43 +1,43 @@
 @section ('crumbs')
 @section ('crumbs')
       <ul class="f-crumbs">
       <ul class="f-crumbs">
-  @foreach ($p->crumbs as $cur)
+    @foreach ($p->crumbs as $cur)
         <li class="f-crumb"><!-- inline -->
         <li class="f-crumb"><!-- inline -->
-    @if ($cur[0])
+        @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
+        @else
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
           <span @if ($cur[2]) class="active" @endif>{{ $cur[1] }}</span>
-    @endif
+        @endif
         </li><!-- endinline -->
         </li><!-- endinline -->
-  @endforeach
+    @endforeach
       </ul>
       </ul>
 @endsection
 @endsection
 @section ('pagination')
 @section ('pagination')
-  @if ($p->pagination)
+    @if ($p->pagination)
         <nav class="f-pages">
         <nav class="f-pages">
-    @foreach ($p->pagination as $cur)
-      @if ($cur[2])
+        @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])
+            @elseif ('info' === $cur[1])
           <span class="f-pinfo">{!! $cur[0] !!}</span>
           <span class="f-pinfo">{!! $cur[0] !!}</span>
-      @elseif ('space' === $cur[1])
+            @elseif ('space' === $cur[1])
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
           <span class="f-page f-pspacer">{!! __('Spacer') !!}</span>
-      @elseif ('prev' === $cur[1])
+            @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])
+            @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
+            @else
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
           <a class="f-page" href="{!! $cur[0] !!}">{{ $cur[1] }}</a>
-      @endif
-    @endforeach
+            @endif
+        @endforeach
         </nav>
         </nav>
-  @endif
+    @endif
 @endsection
 @endsection
 @extends ('layouts/main')
 @extends ('layouts/main')
     <div class="f-nav-links">
     <div class="f-nav-links">
 @yield ('crumbs')
 @yield ('crumbs')
 @if ($p->pagination)
 @if ($p->pagination)
       <div class="f-nlinks-b">
       <div class="f-nlinks-b">
-  @yield ('pagination')
+    @yield ('pagination')
       </div>
       </div>
 @endif
 @endif
     </div>
     </div>
@@ -45,7 +45,7 @@
     <section class="f-main f-userlist-form">
     <section class="f-main f-userlist-form">
       <h2>{!! __($p->user->searchUsers ? 'User search head' : 'User sort head') !!}</h2>
       <h2>{!! __($p->user->searchUsers ? 'User search head' : 'User sort head') !!}</h2>
       <div class="f-fdiv">
       <div class="f-fdiv">
-  @include ('layouts/form')
+    @include ('layouts/form')
       </div>
       </div>
     </section>
     </section>
 @endif
 @endif
@@ -85,28 +85,28 @@
               </span>
               </span>
             </span>
             </span>
           </li>
           </li>
-  @foreach ($p->userList as $user)
+    @foreach ($p->userList as $user)
           <li class="f-row">
           <li class="f-row">
-    @if ($p->user->viewUsers && $user->link)
+        @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
+        @else
             <span class="f-cell f-cusername">{{ $user->username }}</span>
             <span class="f-cell f-cusername">{{ $user->username }}</span>
-    @endif
+        @endif
             <span class="f-cell f-ctitle"><small>(</small><i>{{ $user->title() }}</i><small>),</small></span>
             <span class="f-cell f-ctitle"><small>(</small><i>{{ $user->title() }}</i><small>),</small></span>
-    @if ($p->user->showPostCount)
+        @if ($p->user->showPostCount)
             <span class="f-cell f-cnumposts">{!! __('<b>%s</b><small> post,</small>', $user->num_posts, num($user->num_posts)) !!}</span>
             <span class="f-cell f-cnumposts">{!! __('<b>%s</b><small> post,</small>', $user->num_posts, num($user->num_posts)) !!}</span>
-    @endif
+        @endif
             <span class="f-cell f-cdatereg">{!! __('<small>registered: </small><b>%s</b>', dt($user->registered, true)) !!}</span>
             <span class="f-cell f-cdatereg">{!! __('<small>registered: </small><b>%s</b>', dt($user->registered, true)) !!}</span>
           </li>
           </li>
-  @endforeach
+    @endforeach
         </ol>
         </ol>
       </div>
       </div>
     </section>
     </section>
-  @if ($p->pagination)
+    @if ($p->pagination)
     <div class="f-nav-links">
     <div class="f-nav-links">
       <div class="f-nlinks">
       <div class="f-nlinks">
-    @yield ('pagination')
+        @yield ('pagination')
       </div>
       </div>
     </div>
     </div>
-  @endif
-@endif
+    @endif
+@endif