Update temlates

app/Models/Pages/Admin/Bans.php

@@ -70,7 +70,7 @@ class Bans extends Admin
     {
         $this->nameTpl        = 'admin/bans';
         $this->formBanPage    = 'AdminBansNew';
-        $this->formBanHead    = __('New ban head');
+        $this->formBanHead    = 'New ban head';
         $this->formBanSubHead = __('Add ban subhead');
 
         if ('POST' === $method) {
@@ -585,7 +585,7 @@ class Bans extends Admin
 
         $this->nameTpl        = 'admin/bans';
         $this->formBanPage    = 'AdminBansNew';
-        $this->formBanHead    = __('New ban head');
+        $this->formBanHead    = 'New ban head';
         $this->formBanSubHead = __('Add ban subhead');
 
         return $this->ban(true, $args, $method, $userList);
@@ -613,7 +613,7 @@ class Bans extends Admin
 
         $this->nameTpl        = 'admin/bans';
         $this->formBanPage    = 'AdminBansEdit';
-        $this->formBanHead    = __('Edit ban head');
+        $this->formBanHead    = 'Edit ban head';
         $this->formBanSubHead = __('Edit ban subhead');
 
         return $this->ban(false, $args, $method, $userList, $ban);

app/Models/Pages/Admin/Categories.php

@@ -60,7 +60,7 @@ class Categories extends Admin
         $this->aIndex    = 'categories';
         $this->form      = $this->formEdit();
         $this->classForm = 'editcategories';
-        $this->titleForm = __('Categories');
+        $this->titleForm = 'Categories';
 
         return $this;
     }
@@ -191,7 +191,7 @@ class Categories extends Admin
         $this->aCrumbs[] = __('"%s"', $category['cat_name']);
         $this->form      = $this->formDelete($args, $category);
         $this->classForm = 'deletecategory';
-        $this->titleForm = __('Delete category head');
+        $this->titleForm = 'Delete category head';
 
         return $this;
     }

app/Models/Pages/Admin/Censoring.php

@@ -52,7 +52,7 @@ class Censoring extends Admin
         $this->aIndex    = 'censoring';
         $this->form      = $this->formEdit();
         $this->classForm = 'editcensorship';
-        $this->titleForm = __('Censoring');
+        $this->titleForm = 'Censoring';
 
         return $this;
     }

app/Models/Pages/Admin/Forums.php

@@ -123,7 +123,7 @@ class Forums extends Admin
         $this->aIndex    = 'forums';
         $this->form      = $this->formView();
         $this->classForm = ['editforums', 'inline'];
-        $this->titleForm = __('Forums');
+        $this->titleForm = 'Forums';
 
         return $this;
     }
@@ -276,7 +276,7 @@ class Forums extends Admin
         $this->aCrumbs[] = __('"%s"', $forum->forum_name);
         $this->form      = $this->formDelete($args, $forum);
         $this->classForm = 'deleteforum';
-        $this->titleForm = __('Delete forum head');
+        $this->titleForm = 'Delete forum head';
 
         return $this;
     }
@@ -350,7 +350,7 @@ class Forums extends Admin
                 $this->c->Router->link($marker),
                 __('Add forum head'),
             ];
-            $this->titleForm = __('Add forum head');
+            $this->titleForm = 'Add forum head';
             $this->classForm = 'createforum';
         } else {
             $forum           = $this->c->forums->loadTree((int) $args['id']); //?????
@@ -360,7 +360,7 @@ class Forums extends Admin
                 __('Edit forum head'),
             ];
             $this->aCrumbs[] = __('"%s"', $forum->forum_name);
-            $this->titleForm = __('Edit forum head');
+            $this->titleForm = 'Edit forum head';
             $this->classForm = 'editforum';
         }
 

app/Models/Pages/Admin/Groups.php

@@ -212,7 +212,7 @@ class Groups extends Admin
                 __('Edit group'),
             ];
             $this->aCrumbs[] = __('"%s"', $group->g_title);
-            $this->titleForm = __('Edit group');
+            $this->titleForm = 'Edit group';
             $this->classForm = 'editgroup';
         } else {
             $marker          = 'AdminGroupsNew';
@@ -220,7 +220,7 @@ class Groups extends Admin
             $group->g_title  = '';
             $group->g_id     = null;
             $this->aCrumbs[] = __('Create new group');
-            $this->titleForm = __('Create new group');
+            $this->titleForm = 'Create new group';
             $this->classForm = 'creategroup';
         }
 
@@ -746,7 +746,7 @@ class Groups extends Admin
         ];
         $this->aCrumbs[] = __('"%s"', $group->g_title);
         $this->form      = $this->formDelete($args, $group, $count, $groups);
-        $this->titleForm = __('Group delete');
+        $this->titleForm = 'Group delete';
         $this->classForm = 'deletegroup';
 
         return $this;

app/Models/Pages/Admin/Options.php

@@ -128,7 +128,7 @@ class Options extends Admin
         $this->aIndex    = 'options';
         $this->nameTpl   = 'admin/form';
         $this->form      = $this->formEdit($config);
-        $this->titleForm = __('Options head');
+        $this->titleForm = 'Options head';
         $this->classForm = 'editoptions';
 
         return $this;

app/Models/Pages/Admin/Parser/BBCode.php

@@ -101,7 +101,7 @@ class BBCode extends Parser
             __('BBCode management'),
         ];
         $this->form      = $this->formView();
-        $this->titleForm = __('BBCode head');
+        $this->titleForm = 'BBCode head';
         $this->classForm = 'bbcode';
 
         return $this;
@@ -263,11 +263,11 @@ class BBCode extends Parser
         $this->bbTypes = $bbTypes;
 
         if ($id > 0) {
-            $title            = __('Edit bbcode head');
+            $title            = 'Edit bbcode head';
             $page             = 'AdminBBCodeEdit';
             $pageArgs         = ['id' => $id];
         } else {
-            $title            = __('Add bbcode head');
+            $title            = 'Add bbcode head';
             $page             = 'AdminBBCodeNew';
             $pageArgs         = [];
         }
@@ -345,7 +345,7 @@ class BBCode extends Parser
 
         $this->aCrumbs[] = [
             $this->formAction,
-            $title,
+            __($title),
         ];
         if ($id > 0) {
             $this->aCrumbs[] = __('"%s"', $this->c->bbcode->bbcodeTable[$id]['bb_tag']);

app/Models/Pages/Admin/Parser/Edit.php

@@ -60,7 +60,7 @@ class Edit extends Parser
 
         $this->nameTpl   = 'admin/form';
         $this->form      = $this->formEdit($config);
-        $this->titleForm = __('Parser settings head');
+        $this->titleForm = 'Parser settings head';
         $this->classForm = 'parser-settings';
 
         return $this;

app/Models/Pages/Admin/Update.php

@@ -43,7 +43,7 @@ class Update extends Admin
         $this->httpStatus = 503;
         $this->onlinePos  = null;
         $this->nameTpl    = 'admin/form';
-        $this->titleForm  = __('Update ForkBB');
+        $this->titleForm  = 'Update ForkBB';
         $this->classForm  = 'updateforkbb';
         $this->configFile = $container->DIR_APP . '/config/' . self::CONFIG_FILE;
 

app/Models/Pages/Admin/Users/Action.php

@@ -143,7 +143,7 @@ class Action extends Users
 
         $this->nameTpl    = 'admin/form';
         $this->classForm  = 'delete-users';
-        $this->titleForm  = __('Deleting users');
+        $this->titleForm  = 'Deleting users';
         $this->aCrumbs[]  = [
             $this->c->Router->link(
                 'AdminUsersAction',
@@ -308,7 +308,7 @@ class Action extends Users
 
         $this->nameTpl    = 'admin/form';
         $this->classForm  = 'change-group';
-        $this->titleForm  = __('Change user group');
+        $this->titleForm  = 'Change user group';
         $this->aCrumbs[]  = [
             $this->c->Router->link(
                 'AdminUsersAction',

app/templates/admin/bans.forkbb.php

@@ -9,7 +9,7 @@
 @endif
 @if ($form = $p->formBan)
       <section id="fork-bn" class="f-admin">
-        <h2>{!! $p->formBanHead !!}</h2>
+        <h2>{!! __($p->formBanHead) !!}</h2>
         <div class="f-fdiv">
     @include ('layouts/form')
         </div>

app/templates/admin/form.forkbb.php

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

app/templates/forum.forkbb.php

@@ -27,7 +27,7 @@
     </div>
     <section class="f-subforums">
       <ol class="f-ftlist">
-        <li id="id-subforums{!! $p->model->id !!}" class="f-category">
+        <li id="id-subforums{{ $p->model->id }}" class="f-category">
           <h2 class="f-ftch2">{{ __('Sub forum', 2) }}</h2>
           <ol class="f-table">
             <li class="f-row f-thead" value="0">
@@ -66,15 +66,15 @@
           </li>
     @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')
           </li>
         @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">
             @if ($p->enableMod)
-              <input id="checkbox-{!! $topic->id !!}" class="f-fch" type="checkbox" name="ids[{!! $topic->id !!}]" value="{!! $topic->id !!}" form="id-form-mod">
-              <label class="f-ficon" for="checkbox-{!! $topic->id !!}" title="{{ __('Select for moderation') }}"></label>
+              <input id="checkbox-{{ $topic->id }}" class="f-fch" type="checkbox" name="ids[{{ $topic->id }}]" value="{{ $topic->id }}" form="id-form-mod">
+              <label class="f-ficon" for="checkbox-{{ $topic->id }}" title="{{ __('Select for moderation') }}"></label>
             @else
               <div class="f-ficon"></div>
             @endif
@@ -84,11 +84,11 @@
             </div>
           </li>
         @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">
+          <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">
             @if ($p->enableMod)
-              <input id="checkbox-{!! $topic->id !!}" class="f-fch" type="checkbox" name="ids[{!! $topic->id !!}]" value="{!! $topic->id !!}" form="id-form-mod">
-              <label class="f-ficon" for="checkbox-{!! $topic->id !!}" title="{{ __('Select for moderation') }}"></label>
+              <input id="checkbox-{{ $topic->id }}" class="f-fch" type="checkbox" name="ids[{{ $topic->id }}]" value="{{ $topic->id }}" form="id-form-mod">
+              <label class="f-ficon" for="checkbox-{{ $topic->id }}" title="{{ __('Select for moderation') }}"></label>
             @else
               <div class="f-ficon"></div>
             @endif

app/templates/index.forkbb.php

@@ -3,7 +3,7 @@
     <section class="f-main">
       <ol class="f-ftlist">
     @foreach ($p->categoryes as $id => $forums)
-        <li id="cat-{!! $id !!}" class="f-category">
+        <li id="cat-{{ $id }}" class="f-category">
           <h2 class="f-ftch2">{{ current($forums)->cat_name }}</h2>
           <ol class="f-table">
             <li class="f-row f-thead" value="0">

app/templates/layouts/admin.forkbb.php

@@ -1,9 +1,9 @@
 @include ('layouts/crumbs')
 @extends ('layouts/main')
-    <div class="f-nav-links f-nav-admin{!! $p->mainSuffix or '' !!}-links">
+    <div class="f-nav-links f-nav-admin{{ $p->mainSuffix or '' }}-links">
 @yield ('crumbs')
     </div>
-    <div class="f-main f-main-admin{!! $p->mainSuffix or '' !!}">
+    <div class="f-main f-main-admin{{ $p->mainSuffix or '' }}">
       <div id="fork-a-menu">
 @if ($p->aNavigation)
         <nav id="fork-a-nav" class="f-menu">

app/templates/layouts/install.forkbb.php

@@ -8,7 +8,7 @@
     @if ('style' === $pageHeader['type'])
   <style>{!! $pageHeader['values'][0] !!}</style>
     @elseif ('script' !== $pageHeader['type'])
-  <{!! $pageHeader['type'] !!} @foreach ($pageHeader['values'] as $key => $val) {!! $key !!}="{{ $val }}" @endforeach>
+  <{{ $pageHeader['type'] }} @foreach ($pageHeader['values'] as $key => $val) {{ $key }}="{{ $val }}" @endforeach>
     @endif
 @endforeach
 </head>

app/templates/layouts/poll.forkbb.php

@@ -1,10 +1,10 @@
         <div class="f-post-poll">
 @if ($poll->canVote)
-          <form class="f-form" method="post" action="{!! $poll->link !!}">
+          <form class="f-form" method="post" action="{{ $poll->link }}">
             <input type="hidden" name="token" value="{{ $poll->token }}">
 @endif
 @foreach ($poll->question as $q => $question)
-            <fieldset id="id-question-{!! $q !!}" class="f-poll-q">
+            <fieldset id="id-question-{{ $q }}" class="f-poll-q">
               <legend class="f-poll-ql">{!! __('Question %s legend', $q) !!}</legend>
               <h3 class="f-poll-qt">{{ $question }}</h3>
     @if (($poll->canVote || ! $poll->tid) && $poll->type[$q] > 1)
@@ -12,13 +12,13 @@
     @endif
               <ol class="f-poll-as">
     @foreach ($poll->answer[$q] as $a => $answer)
-                <li id="id-answer-{!! $q . '-' . $a !!}" class="f-poll-a">
+                <li id="id-answer-{{ $q . '-' . $a }}" class="f-poll-a">
         @if ($poll->canVote || ! $poll->tid)
                  <label class="f-poll-al">
             @if ($poll->type[$q] > 1)
-                    <input class="f-poll-ai" type="checkbox" name="poll_vote[{!! $q !!}][{!! $a !!}]" value="1" />
+                    <input class="f-poll-ai" type="checkbox" name="poll_vote[{{ $q }}][{{ $a }}]" value="1" />
             @else
-                    <input class="f-poll-ai" type="radio" name="poll_vote[{!! $q !!}][0]" value="{!! $a !!}" />
+                    <input class="f-poll-ai" type="radio" name="poll_vote[{{ $q }}][0]" value="{{ $a }}" />
             @endif
                     <span class="f-poll-at">{{ $answer }}</span>
                   </label>

app/templates/layouts/redirect.forkbb.php

@@ -3,13 +3,13 @@
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta http-equiv="refresh" content="{!! $p->timeout !!};URL={{ $p->link }}">
+  <meta http-equiv="refresh" content="{{ $p->timeout }};URL={{ $p->link }}">
   <title>{{ $p->pageTitle }}</title>
 @foreach ($p->pageHeaders as $pageHeader)
     @if ('style' === $pageHeader['type'])
   <style>{!! $pageHeader['values'][0] !!}</style>
     @elseif ('script' !== $pageHeader['type'])
-  <{!! $pageHeader['type'] !!} @foreach ($pageHeader['values'] as $key => $val) {!! $key !!}="{{ $val }}" @endforeach>
+  <{{ $pageHeader['type'] }} @foreach ($pageHeader['values'] as $key => $val) {{ $key }}="{{ $val }}" @endforeach>
     @endif
 @endforeach
 </head>

app/templates/layouts/subforums.forkbb.php

@@ -1,6 +1,6 @@
 @foreach ($forums as $cur)
     @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-ficon"></div>
                 <div class="f-finfo">
@@ -12,7 +12,7 @@
               </div>
             </li>
     @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-ficon"></div>
                 <div class="f-finfo">
@@ -55,7 +55,7 @@
         @if ($cur->tree->last_post_id)
                 <span class="f-cltopic">{!! __('Last post in the topic "<a href="%1$s">%2$s</a>"', $cur->tree->linkLast, $cur->tree->censorLast_topic) !!}</span>
                 <span class="f-clposter">{!! __('by %s', $cur->tree->last_poster) !!}</span>
-                <span class="f-cltime">{!! dt($cur->tree->last_post) !!}</span>
+                <span class="f-cltime">{{ dt($cur->tree->last_post) }}</span>
         @else
                 <span class="f-cltopic">{!! __('Never') !!}</span>
         @endif

app/templates/post.forkbb.php

@@ -29,10 +29,10 @@
       <h2>{!! $p->postsTitle !!}</h2>
     @foreach ($p->posts as $post)
         @if ($post->id)
-      <article id="p{!! $post->id !!}" class="f-post">
+      <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">
           <div class="f-post-usticky">

app/templates/topic.forkbb.php

@@ -45,21 +45,21 @@
     @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">
+      <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">
         @if ($p->enableMod && $post->postNumber > 1)
-        <input id="checkbox-{!! $post->id !!}" class="f-post-checkbox" type="checkbox" name="ids[{!! $post->id !!}]" value="{!! $post->id !!}" form="id-form-mod">
+        <input id="checkbox-{{ $post->id }}" class="f-post-checkbox" type="checkbox" name="ids[{{ $post->id }}]" value="{{ $post->id }}" form="id-form-mod">
         @endif
         <header class="f-post-header">
           <h3>@if ($post->postNumber > 1) {!! __('Re') !!} @endif {{ $p->model->censorSubject }}</h3>
         @if ($p->enableMod && $post->postNumber > 1)
-          <label class="f-post-posted" for="checkbox-{!! $post->id !!}" title="{{ __('Select for moderation') }}"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></label>
+          <label class="f-post-posted" for="checkbox-{{ $post->id }}" title="{{ __('Select for moderation') }}"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></label>
         @else
           <span class="f-post-posted"><time datetime="{{ \gmdate('c', $post->posted) }}">{{ dt($post->posted) }}</time></span>
         @endif
         @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">
           <div class="f-post-usticky">

app/templates/topic_in_search.forkbb.php

@@ -35,14 +35,14 @@
     @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">
+      <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>
           </h3>
-          <span class="f-post-number">#{!! $post->postNumber !!}</span>
+          <span class="f-post-number">#{{ $post->postNumber }}</span>
         </header>
         <address class="f-post-user">
           <div class="f-post-usticky">