phpffcms / ffcms

Apps/Model/Front/Search/EntitySearchMain.php

Spacing +2 added lines, -2 removed lines

@@ -60,7 +60,7 @@ 
             /** @var AbstractSearchResult $item */
             // build unique relevance. Problem: returned relevance from query is integer
             // and can be duplicated. So, we add random complex float value and make it string to sort in feature
-            $uniqueRelevance = (string)($item->getRelevance() + (mt_rand(0, 999) / 10000));
+            $uniqueRelevance = (string) ($item->getRelevance() + (mt_rand(0, 999) / 10000));
             // build response
             $result[$uniqueRelevance] = $item;
         }
@@ -84,7 +84,7 @@ 
         $queries = explode(' ', $this->query);
         $dom = new Dom();
         foreach ($queries as $query) {
-            $highlight = $dom->{$tag}(function () use ($query) {
+            $highlight = $dom->{$tag}(function() use ($query) {
                 return $query;
             }, $properties);
             $text = Str::ireplace($query, $highlight, $text);

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

Spacing +1 added lines, -1 removed lines

@@ -40,7 +40,7 @@
 
 <?php if ($model->appid && !\Ffcms\Core\Helper\Type\Any::isEmpty($model->appid)): ?>
     <?= $this->bootstrap()->button('a', __('Get Yandex.Metrika token'), [
-        'href' => 'https://oauth.yandex.ru/authorize?response_type=token&client_id=' . $model->appid . '&redirect_uri=' . Url::to('main/yandextoken'),
+        'href' => 'https://oauth.yandex.ru/authorize?response_type=token&client_id='.$model->appid.'&redirect_uri='.Url::to('main/yandextoken'),
         'class' => 'btn-success'
     ]) ?>
 <?php else: ?>

Braces +5 added lines, -2 removed lines

@@ -43,9 +43,12 @@
         'href' => 'https://oauth.yandex.ru/authorize?response_type=token&client_id=' . $model->appid . '&redirect_uri=' . Url::to('main/yandextoken'),
         'class' => 'btn-success'
     ]) ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <?= $this->bootstrap()->alert('warning', __('Create oauth application before get token')) ?>
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 <?= $form->stop() ?>
 

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

Spacing +3 added lines, -3 removed lines

@@ -56,7 +56,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 />
@@ -134,7 +134,7 @@ 
     var visitChart = new Chart(visitElement, {
         type: 'line',
         data: {
-            labels: [<?php foreach ($dates as $date){ echo '"' . $date . '", '; } ?>],
+            labels: [<?php foreach ($dates as $date) { echo '"'.$date.'", '; } ?>],
             datasets: [{
                 yAxisID: 'units',
                 label: '<?= __('Views') ?>',
@@ -181,7 +181,7 @@ 
     var sourceChart = new Chart(sourcesElement, {
         type: 'pie',
         data: {
-            labels: [<?php foreach ($sourceTypes as $type){ echo '"' . $type . '", '; } ?>],
+            labels: [<?php foreach ($sourceTypes as $type) { echo '"'.$type.'", '; } ?>],
             datasets: [{
                 data: [<?= implode(',', $sourceUsers) ?>],
                 label: 'Users',

Braces +5 added lines, -2 removed lines

@@ -82,7 +82,8 @@ 
                 'href' => Url::to('main/yandexconnect'),
                 'class' => 'btn-danger'
             ]) ?>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <div class="row">
                 <div class="col-md-8">
                     <canvas id="visitChart" width="100%" height="50"></canvas>
@@ -91,7 +92,9 @@ 
                     <canvas id="sourcesChart" width="100%" height="90"></canvas>
                 </div>
             </div>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
     </div>
 </div>
 

Apps/View/Front/default/profile/feed.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
     <div class="row object-lightborder ml-1" id="wall-post-<?= $post->id ?>">
         <div class="col-xs-4 col-md-2">
             <div class="text-center">
-                <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?>
+                <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?>
                 <img class="img-fluid img-rounded" alt="Avatar of <?= $post->senderUser->profile->getNickname() ?>" src="<?= $post->senderUser->profile->getAvatarUrl('small') ?>" />
                 <div class="text-muted"><?= Date::humanize($post->updated_at); ?></div>
             </div>

Apps/Model/Admin/Main/FormYandexToken.php

Spacing +1 added lines, -1 removed lines

@@ -58,7 +58,7 @@
         $cfg = $this->_cfg;
 
         $cfg['oauth']['token'] = $this->token;
-        $cfg['oauth']['expires'] = time() + (int)$this->expires;
+        $cfg['oauth']['expires'] = time() + (int) $this->expires;
 
         App::$Properties->writeConfig('Yandex', $cfg);
     }

Apps/Model/Admin/Main/FormYandexCounter.php

Spacing +1 added lines, -1 removed lines

@@ -44,7 +44,7 @@
     public function make()
     {
         $cfg = App::$Properties->getAll('Yandex');
-        $cfg['metrika']['id'] = (int)$this->counter;
+        $cfg['metrika']['id'] = (int) $this->counter;
 
         App::$Properties->writeConfig('Yandex', $cfg);
     }

Private/Config/Yandex.php

Indentation +8 added lines, -8 removed lines

@@ -1,10 +1,10 @@
 <?php return [
-	'oauth' => [
-		'app_id' => null,
-		'token' => null,
-		'expires' => null
-	],
-	'metrika' => [
-		'id' => null
-	]
+    'oauth' => [
+        'app_id' => null,
+        'token' => null,
+        'expires' => null
+    ],
+    'metrika' => [
+        'id' => null
+    ]
 ];
\ No newline at end of file

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

Spacing +27 added lines, -27 removed lines

@@ -27,49 +27,49 @@
 
 <?= $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' => 'selectize-select', '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' => 'selectize-select', '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'));
     }, 'tabActive' => true])
     ->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()->boolean('mail.enable', ['options' => [0 => 'Disabled', 1 => 'Enabled'], 'optionsKey' => true], __('Is mailing features enabled?')) .
-            $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()->boolean('mail.enable', ['options' => [0 => 'Disabled', 1 => 'Enabled'], 'optionsKey' => true], __('Is mailing features enabled?')).
+            $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){

Apps/Model/Install/Main/FormInstall.php

Spacing +3 added lines, -3 removed lines

@@ -107,13 +107,13 @@
         $cfg['baseDomain'] = $this->baseDomain;
         $cfg['database'] = $this->db;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Crypt::randomString(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $cfg['debug']['cookie']['key'] = 'fdebug_'.Crypt::randomString(mt_rand(4, 16));
         $cfg['debug']['cookie']['value'] = Crypt::randomString(mt_rand(32, 128));
         $cfg['mail'] = $this->mail;
 
         // initialize migrations table
-        App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function ($table) {
+        App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function($table) {
             $table->increments('id');
             $table->string('migration', 128)->unique();
             $table->timestamps();