phpffcms / ffcms

Apps/View/Front/default/search/index.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         <div class="col-md-12">
             <div class="search-result">
                 <div class="h4">
-                    <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>"><?= $model->highlightText($item['title'], 'span', ['class' => 'search-highlight']) ?></a>
+                    <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>"><?= $model->highlightText($item['title'], 'span', ['class' => 'search-highlight']) ?></a>
                     <small class="float-right text-secondary"><?= $item['date'] ?></small>
                 </div>
                 <small><?= $model->highlightText($item['snippet'], 'span', ['class' => 'search-highlight']) ?>...</small>

Apps/Controller/Admin/Feedback/ActionRead.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
 
         // initialize model with answer add if thread is not closed
         $model = null;
-        if ((int)$record->closed !== 1) {
+        if ((int) $record->closed !== 1) {
             $model = new FormAnswerAdd($record);
             if ($model->send()) {
                 if ($model->validate()) {

Apps/Controller/Front/Feedback.php

Spacing +10 added lines, -10 removed lines

@@ -39,18 +39,18 @@ 
     {
         // get configs
         $configs = $this->getConfigs();
-        if (!App::$User->isAuth() && !(bool)$configs['guestAdd']) {
+        if (!App::$User->isAuth() && !(bool) $configs['guestAdd']) {
             throw new ForbiddenException(__('Feedback available only for authorized users'));
         }
 
         // initialize model
-        $model = new FormFeedbackAdd((bool)$configs['useCaptcha']);
+        $model = new FormFeedbackAdd((bool) $configs['useCaptcha']);
         if ($model->send()) {
             if ($model->validate()) {
                 // if validation is passed save data to db and get row
                 $record = $model->make();
                 App::$Session->getFlashBag()->add('success', __('Your message was added successful'));
-                $this->response->redirect('feedback/read/' . $record->id . '/' . $record->hash);
+                $this->response->redirect('feedback/read/'.$record->id.'/'.$record->hash);
             } else {
                 App::$Session->getFlashBag()->add('error', __('Message is not sended! Please, fix issues in form below'));
             }
@@ -59,7 +59,7 @@ 
         // render output view
         return $this->view->render('feedback/create', [
             'model' => $model,
-            'useCaptcha' => (bool)$configs['useCaptcha']
+            'useCaptcha' => (bool) $configs['useCaptcha']
         ]);
     }
 
@@ -90,7 +90,7 @@ 
 
         $model = null;
         // check if feedback post is not closed for answers
-        if (!(bool)$recordPost->closed) {
+        if (!(bool) $recordPost->closed) {
             // init new answer add model
             $model = new FormAnswerAdd($recordPost);
             // if answer is sender lets try to make it model
@@ -133,10 +133,10 @@ 
         // check if action is submited
         if ($this->request->request->get('closeRequest', false)) {
             // if created by authorized user
-            if ((int)$record->user_id > 0) {
+            if ((int) $record->user_id > 0) {
                 $user = App::$User->identity();
                 // button is pressed not by request creator
-                if (!$user || $user->getId() !== (int)$record->user_id) {
+                if (!$user || $user->getId() !== (int) $record->user_id) {
                     throw new ForbiddenException(__('This feedback request was created by another user'));
                 }
             }
@@ -147,11 +147,11 @@ 
 
             // add notification and redirect
             App::$Session->getFlashBag()->add('warning', __('Feedback request now is closed!'));
-            $this->response->redirect('feedback/read/' . $id . '/' . $hash);
+            $this->response->redirect('feedback/read/'.$id.'/'.$hash);
         }
 
         return $this->view->render('feedback/close', [
-            'id' => (int)$id,
+            'id' => (int) $id,
             'hash' => $hash
         ]);
     }
@@ -164,7 +164,7 @@ 
     public function actionList(): ?string
     {
         // set current page and offset
-        $page = (int)$this->request->query->get('page');
+        $page = (int) $this->request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // check if user is authorized or throw exception

Apps/View/Front/default/_layouts/default.php

Spacing +5 added lines, -5 removed lines

@@ -27,7 +27,7 @@ 
     <?php if (\App::$Debug): ?>
         <?= \App::$Debug->renderHead() ?>
     <?php endif; ?>
-    <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
+    <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
 </head>
 <body class="bg-light">
 
@@ -41,15 +41,15 @@ 
 
 if (\App::$User->isAuth()) {
     $userId = \App::$User->identity()->getId();
-    $navbar->menu('right', ['text' => __('Account') . ' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
+    $navbar->menu('right', ['text' => __('Account').' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
         ['text' => __('My profile'), 'link' => ['profile/show', [$userId]]],
-        ['text' => __('Messages') . ' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
+        ['text' => __('Messages').' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
         ['text' => __('Feed'), 'link' => ['profile/feed'], 'class' => 'dropdown-item'],
-        ['text' => __('Notifications') . ' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
+        ['text' => __('Notifications').' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
         ['text' => __('Settings'), 'link' => ['profile/settings'], 'class' => 'dropdown-item'],
     ], 'properties' => ['html' => true]]);
     if (\App::$User->identity()->role->can('Admin/Main/Index')) {
-        $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl . '/admin']);
+        $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl.'/admin']);
     }
     $navbar->menu('right', ['text' => __('Logout'), 'link' => ['user/logout']]);
 } else {

Apps/View/Admin/default/main/index.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         <h3><?= __('Directories and files') ?></h3>
         <?php
         foreach ($check->chmodCheck as $dir => $status) {
-            echo $this->bootstrap()->badge(($status ? 'success' : 'danger'), $dir) . "&nbsp;";
+            echo $this->bootstrap()->badge(($status ? 'success' : 'danger'), $dir)."&nbsp;";
         }
         ?>
         <hr />

Apps/Controller/Api/Main.php

Spacing +4 added lines, -4 removed lines

@@ -45,8 +45,8 @@ 
             'roots' => [
                 [
                     'driver' => 'LocalFileSystem',
-                    'path' => root . '/upload/',
-                    'URL' => App::$Alias->scriptUrl . '/upload/'
+                    'path' => root.'/upload/',
+                    'URL' => App::$Alias->scriptUrl.'/upload/'
                 ]
             ]
         ]));
@@ -111,9 +111,9 @@ 
     {
         $this->setJsonHeader();
         // get ffcms news if cache is not available
-        $cache = App::$Cache->getItem('download.ffcms.api.news.' . $this->lang);
+        $cache = App::$Cache->getItem('download.ffcms.api.news.'.$this->lang);
         if (!$cache->isHit()) {
-            $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang=' . $this->lang))
+            $cache->set(File::getFromUrl('https://ffcms.org/api/api/news?lang='.$this->lang))
                 ->expiresAfter(1440);
         }
         return $cache->get();

Apps/View/Admin/default/_layouts/default.php

Spacing +16 added lines, -16 removed lines

@@ -170,7 +170,7 @@ 
                                         <div class="media-left">
                                             <a href="#">
                                                 <?php
-                                                $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
+                                                $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg';
                                                 if ($comment->user !== null && $comment->user->id > 0) {
                                                     $commentAva = $comment->user->profile->getAvatarUrl('small');
                                                 }
@@ -237,7 +237,7 @@ 
                         </li>
                         <li class="nav-item<?= (\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? ' active' : null ?>">
                             <?= Url::a(['#system-dropdown'],
-                                '<i class="fa fa-fire"></i> <span class="nav-text">' . __('System') . '</span>',
+                                '<i class="fa fa-fire"></i> <span class="nav-text">'.__('System').'</span>',
                                 [
                                     'class' => 'nav-container',
                                     'data-toggle' => 'collapse',
@@ -245,12 +245,12 @@ 
                                 ])
                             ?>
 
-                            <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown'])
-                                ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true])
-                                ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true])
-                                ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true])
-                                ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true])
-                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true])
+                            <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown'])
+                                ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true])
+                                ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true])
+                                ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true])
+                                ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true])
+                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true])
                                 ->display();
                             ?>
                         </li>
@@ -268,7 +268,7 @@ 
                         ?>
                         <li class="nav-item<?= array_key_exists(\App::$Request->getController(), $apps) ? ' active' : null ?>">
                             <?= Url::a(['#apps-dropdown'],
-                                '<i class="fa fa-plug"></i> <span class="nav-text">' . __('Applications') . '</span>',
+                                '<i class="fa fa-plug"></i> <span class="nav-text">'.__('Applications').'</span>',
                                 [
                                     'class' => 'nav-container',
                                     'data-toggle' => 'collapse',
@@ -277,18 +277,18 @@ 
                             ?>
 
                             <?php
-                            $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . (array_key_exists(\App::$Request->getController(), $apps) ? 'in show' : null), 'id' => 'apps-dropdown']);
+                            $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.(array_key_exists(\App::$Request->getController(), $apps) ? 'in show' : null), 'id' => 'apps-dropdown']);
                             foreach ($apps as $app) {
                                 /** @var \Apps\ActiveRecord\App $app */
-                                $appMenu->menu(['link' => [Str::lowerCase($app->sys_name) . '/index'], 'text' => $app->getLocaleName()]);
+                                $appMenu->menu(['link' => [Str::lowerCase($app->sys_name).'/index'], 'text' => $app->getLocaleName()]);
                             }
-                            $appMenu->menu(['link' => 'application/index', 'text' => __('All apps') . '...']);
+                            $appMenu->menu(['link' => 'application/index', 'text' => __('All apps').'...']);
                             echo $appMenu->display();
                             ?>
                         </li>
                         <li class="nav-item<?= array_key_exists(\App::$Request->getController(), $widgets) ? ' active' : null ?>">
                             <?= Url::a(['#widgets-dropdown'],
-                                '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">' . __('Widgets') . '</span>',
+                                '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">'.__('Widgets').'</span>',
                                 [
                                     'class' => 'nav-container',
                                     'data-toggle' => 'collapse',
@@ -297,12 +297,12 @@ 
                             ?>
 
                             <?php
-                            $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . (array_key_exists(\App::$Request->getController(), $widgets) ? 'in show' : null), 'id' => 'widgets-dropdown']);
+                            $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.(array_key_exists(\App::$Request->getController(), $widgets) ? 'in show' : null), 'id' => 'widgets-dropdown']);
                             foreach ($widgets as $widget) {
                                 /** @var \Apps\ActiveRecord\App $widget */
-                                $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name) . '/index'], 'text' => $widget->getLocaleName()]);
+                                $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name).'/index'], 'text' => $widget->getLocaleName()]);
                             }
-                            $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets') . '...']);
+                            $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets').'...']);
                             echo $widgetMenu->display();
                             ?>
                         </li>

Braces +8 added lines, -3 removed lines

@@ -128,7 +128,8 @@ 
                                     <span class="text-sm">No feedback queries found</span>
                                 </div>
                             </div>
-                            <?php else: ?>
+                            <?php else {
+    : ?>
                                 <?php foreach ($features->getFeedback() as $feed): ?>
                                     <div class="media">
                                         <div class="media-left">
@@ -141,7 +142,9 @@ 
                                             <span class="text-sm"><?= Text::snippet($feed->message, 100) ?></span>
                                         </div>
                                     </div>
-                                <?php endforeach; ?>
+                                <?php endforeach;
+}
+?>
                             <?php endif; ?>
                         </div>
 
@@ -163,7 +166,8 @@ 
                                     <span class="text-sm">No comments found</span>
                                 </div>
                             </div>
-                            <?php else: ?>
+                            <?php else {
+    : ?>
                                 <?php foreach ($features->getComments() as $comment): ?>
                                 <?php /** @var \Apps\ActiveRecord\CommentPost $comment */ ?>
                                     <div class="media">
@@ -171,6 +175,7 @@ 
                                             <a href="#">
                                                 <?php
                                                 $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
+}
                                                 if ($comment->user !== null && $comment->user->id > 0) {
                                                     $commentAva = $comment->user->profile->getAvatarUrl('small');
                                                 }

Apps/View/Admin/default/main/settings.php

Spacing +29 added lines, -29 removed lines

@@ -20,54 +20,54 @@
 
 <?= $this->bootstrap()->nav('ul', ['class' => 'nav-tabs'])
     ->menu(['text' => __('Base'), 'tab' => function() use ($form) {
-        return $form->fieldset()->text('baseDomain', ['class' => 'form-control'], __('Main domain of website. Use only in console or cron tasks, if domain cannot be defined from request string')) .
-            $form->fieldset()->radio('baseProto', ['options' => ['http', 'https']], __('Main website transfer protocol. Use only if request data is not available in console or cron tasks')) .
-            $form->fieldset()->text('basePath', ['class' => 'form-control'], __('FFCMS installation sub-directory, used if installed not in root. Example: /subdir/')) .
-            $form->fieldset()->select('timezone', ['class' => 'form-control', 'options' => DateTimeZone::listIdentifiers()], __('Define website default timezone id')) .
-            $form->fieldset()->boolean('userCron', null, __('Initialize cron manager when user load website? Enable this option if you are not configured cron tasks in your operation system')) .
-            $form->fieldset()->boolean('debug.all', null, __('Enable debug bar panel for all visitors? Recommended only on development environment')) .
+        return $form->fieldset()->text('baseDomain', ['class' => 'form-control'], __('Main domain of website. Use only in console or cron tasks, if domain cannot be defined from request string')).
+            $form->fieldset()->radio('baseProto', ['options' => ['http', 'https']], __('Main website transfer protocol. Use only if request data is not available in console or cron tasks')).
+            $form->fieldset()->text('basePath', ['class' => 'form-control'], __('FFCMS installation sub-directory, used if installed not in root. Example: /subdir/')).
+            $form->fieldset()->select('timezone', ['class' => 'form-control', 'options' => DateTimeZone::listIdentifiers()], __('Define website default timezone id')).
+            $form->fieldset()->boolean('userCron', null, __('Initialize cron manager when user load website? Enable this option if you are not configured cron tasks in your operation system')).
+            $form->fieldset()->boolean('debug.all', null, __('Enable debug bar panel for all visitors? Recommended only on development environment')).
             $form->fieldset()->boolean('testSuite', null, __('Enable codeception test suite adapter? Use this option ONLY to run codeception tests! Disable this option on production'));
     }, 'linkProperties' => ['class' => 'nav-link active']])
     ->menu(['text' => __('Themes'), 'tab' => function() use ($form, $model) {
-        return $form->fieldset()->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')) .
+        return $form->fieldset()->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')).
             $form->fieldset()->select('theme.Admin', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Admin')], __('Set theme for admin panel'));
     }])
     ->menu(['text' => __('Mail'), 'tab' => function() use ($form) {
-        return '<p>' . __('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server') . '</p>' .
-            $form->fieldset()->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')) .
-            $form->fieldset()->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')) .
-            $form->fieldset()->select('mail.encrypt', ['class' => 'form-control', 'options' => ['tls', 'ssl', 'none']], __('Set encryption method for your smtp server. For remote service we are strongly recommend use tls/ssl encryption')) .
-            $form->fieldset()->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')) .
+        return '<p>'.__('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server').'</p>'.
+            $form->fieldset()->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')).
+            $form->fieldset()->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')).
+            $form->fieldset()->select('mail.encrypt', ['class' => 'form-control', 'options' => ['tls', 'ssl', 'none']], __('Set encryption method for your smtp server. For remote service we are strongly recommend use tls/ssl encryption')).
+            $form->fieldset()->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')).
             $form->fieldset()->text('mail.password', ['class' => 'form-control'], __('Set auth user password if exist'));
     }])
     ->menu(['text' => __('Localization'), 'tab' => function() use ($form) {
-        return $form->fieldset()->select('singleLanguage', ['class' => 'form-control', 'options' => \App::$Translate->getAvailableLangs()], __('Default language of website')) .
-            $form->fieldset()->boolean('multiLanguage', null, __('Must we use multi language system in site pathway')) .
-            $form->fieldset()->text('baseLanguage', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')) .
+        return $form->fieldset()->select('singleLanguage', ['class' => 'form-control', 'options' => \App::$Translate->getAvailableLangs()], __('Default language of website')).
+            $form->fieldset()->boolean('multiLanguage', null, __('Must we use multi language system in site pathway')).
+            $form->fieldset()->text('baseLanguage', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')).
             $form->fieldset()->checkboxes('languages', ['options' => App::$Translate->getAvailableLangs()], __('Website available languages'));
 
     }])
     ->menu(['text' => __('Database'), 'tab' => function() use ($form) {
-        return '<p>' . __('Do not change any information in this tab if you not sure what you do!') . '</p>' .
-            $form->fieldset()->select('database.driver', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')) .
-            $form->fieldset()->text('database.host', ['class' => 'form-control'], __('Database connection host name')) .
-            $form->fieldset()->text('database.database', ['class' => 'form-control'], __('Database name or path to sqlite created file database')) .
-            $form->fieldset()->text('database.username', ['class' => 'form-control'], __('User name for database connection')) .
-            $form->fieldset()->text('database.password', ['class' => 'form-control'], __('Password for user of database connection')) .
-            $form->fieldset()->text('database.charset', ['class' => 'form-control']) .
-            $form->fieldset()->text('database.collation', ['class' => 'form-control']) .
+        return '<p>'.__('Do not change any information in this tab if you not sure what you do!').'</p>'.
+            $form->fieldset()->select('database.driver', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')).
+            $form->fieldset()->text('database.host', ['class' => 'form-control'], __('Database connection host name')).
+            $form->fieldset()->text('database.database', ['class' => 'form-control'], __('Database name or path to sqlite created file database')).
+            $form->fieldset()->text('database.username', ['class' => 'form-control'], __('User name for database connection')).
+            $form->fieldset()->text('database.password', ['class' => 'form-control'], __('Password for user of database connection')).
+            $form->fieldset()->text('database.charset', ['class' => 'form-control']).
+            $form->fieldset()->text('database.collation', ['class' => 'form-control']).
             $form->fieldset()->text('database.prefix', ['class' => 'form-control'], __('Database tables prefix'));
     }])
     ->menu(['text' => __('Debug'), 'tab' => function() use ($form){
-        return '<p>' . __('The key-value of cookie to enable debugging on website') . '. ' . __('If user got this cookie he can see debug bar') . '. ' .
-            Url::a(['main/debugcookie'], __('Set cookie for me')) . '</p>' .
-            $form->fieldset()->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')) .
+        return '<p>'.__('The key-value of cookie to enable debugging on website').'. '.__('If user got this cookie he can see debug bar').'. '.
+            Url::a(['main/debugcookie'], __('Set cookie for me')).'</p>'.
+            $form->fieldset()->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')).
             $form->fieldset()->text('debug.cookie.value', ['class' => 'form-control'], __('Set cookie value for enable debug bar panel'));
     }])
     ->menu(['text' => __('Other'), 'tab' => function() use ($form){
-        return '<p>' . __('There you can change specified configs depends of other platforms. GA = google analytics.') . '</p>' .
-            $form->fieldset()->text('gaClientId', ['class' => 'form-control'], __('Google oAuth2 client id. This id will be used to display google.analytics info. Client ID looks like: xxxxxx.apps.googleusercontent.com')) .
-            $form->fieldset()->text('gaTrackId', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')) .
+        return '<p>'.__('There you can change specified configs depends of other platforms. GA = google analytics.').'</p>'.
+            $form->fieldset()->text('gaClientId', ['class' => 'form-control'], __('Google oAuth2 client id. This id will be used to display google.analytics info. Client ID looks like: xxxxxx.apps.googleusercontent.com')).
+            $form->fieldset()->text('gaTrackId', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')).
             $form->fieldset()->text('trustedProxy', ['class' => 'form-control'], __('Set trusted proxy list to accept X-FORWARDED data. Example: 103.21.244.15,103.22.200.0/22'));
     }])
     ->display(); ?>

Apps/View/Admin/default/_form/fieldset/captcha.php

Braces +5 added lines, -2 removed lines

@@ -13,11 +13,14 @@
 
 <?php if (App::$Captcha->isFull()): ?>
     <div class="col-md-9 offset-md-3"><?= $html ?></div>
-<?php else: ?>
+<?php else {
+    : ?>
     <div class="row">
         <div class="col-md-9 offset-md-3">
             <img src="<?= $html ?>" alt="captcha" onClick="this.src='<?=$html?>&rnd='+Math.random()" />
         </div>
     </div>
     <?= $form->fieldset()->text($name, null, __('Enter data from security image to prove that you are human. If you can\'t read symbols - click on image to reload')) ?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif;
+}
+?>
\ No newline at end of file