phpffcms / ffcms

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/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/Controller/Admin/Main.php

Spacing +4 added lines, -4 removed lines

@@ -50,7 +50,7 @@ 
     public function actionFiles(): ?string
     {
         return $this->view->render('main/files', [
-            'connector' => App::$Alias->scriptUrl . '/api/main/files?lang=' . $this->request->getLanguage()
+            'connector' => App::$Alias->scriptUrl.'/api/main/files?lang='.$this->request->getLanguage()
         ]);
     }
 
@@ -115,9 +115,9 @@ 
      */
     public function actionDeleteroute(): ?string
     {
-        $type = (string)$this->request->query->get('type');
-        $loader = (string)$this->request->query->get('loader');
-        $source = Str::lowerCase((string)$this->request->query->get('path'));
+        $type = (string) $this->request->query->get('type');
+        $loader = (string) $this->request->query->get('loader');
+        $source = Str::lowerCase((string) $this->request->query->get('path'));
 
         $model = new EntityDeleteRoute($type, $loader, $source);
         if ($model->send() && $model->validate()) {

Apps/Controller/Admin/Application.php

Spacing +2 added lines, -2 removed lines

@@ -83,7 +83,7 @@ 
         $search = \Apps\ActiveRecord\App::getItem('app', $controller);
 
         // check what we got
-        if ($search === null || (int)$search->id < 1) {
+        if ($search === null || (int) $search->id < 1) {
             throw new NotFoundException('App is not founded');
         }
 
@@ -115,7 +115,7 @@ 
         $search = \Apps\ActiveRecord\App::where('sys_name', '=', $controllerName)
             ->where('type', '=', 'app')
             ->first();
-        if (!$search || (int)$search->id < 1) {
+        if (!$search || (int) $search->id < 1) {
             throw new ForbiddenException('App is not founded');
         }
 

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

Spacing +8 added lines, -8 removed lines

@@ -37,9 +37,9 @@ 
                 if (Any::isArray($route)) {
                     foreach ($route as $source => $target) {
                         $alias->row([
-                            ['text' => '<span class="badge badge-primary">' . $source . '</span> ' .
-                                '→ ' .
-                                '<span class="badge badge-secondary">' . $target . '</span>', 'html' => true],
+                            ['text' => '<span class="badge badge-primary">'.$source.'</span> '.
+                                '→ '.
+                                '<span class="badge badge-secondary">'.$target.'</span>', 'html' => true],
                             ['text' => $env],
                             ['text' => Url::a(
                                 ['main/deleteroute', null, ['type' => 'Alias', 'loader' => $env, 'path' => $source]],
@@ -71,9 +71,9 @@ 
                 if (Any::isArray($route)) {
                     foreach ($route as $source => $target) {
                         $dynamic->row([
-                            ['text' => '<span class="badge badge-primary">' . $source . '</span> ' .
-                                '→ ' .
-                                '<span class="badge badge-secondary">' . $target . '</span>', 'html' => true],
+                            ['text' => '<span class="badge badge-primary">'.$source.'</span> '.
+                                '→ '.
+                                '<span class="badge badge-secondary">'.$target.'</span>', 'html' => true],
                             ['text' => $env],
                             ['text' => Url::a(
                                 ['main/deleteroute', null, ['type' => 'Callback', 'loader' => $env, 'path' => $source]],
@@ -92,6 +92,6 @@ 
 </div>
 <?php if (!$aliasExist && !$callbackExist): ?>
     <p class="alert alert-warning"><?= __('Custom routes is not yet found') ?></p>
-<?php endif ;?>
-<?= Url::a(['main/addroute'], '<i class="fa fa-plus"></i> ' . __('New route'), ['class' => 'btn btn-primary', 'html' => true]) ?>
+<?php endif; ?>
+<?= Url::a(['main/addroute'], '<i class="fa fa-plus"></i> '.__('New route'), ['class' => 'btn btn-primary', 'html' => true]) ?>
 <?php $this->stop() ?>

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

Braces +5 added lines, -2 removed lines

@@ -64,7 +64,10 @@
     echo $form->button()->submit(__('Download update'), ['class' => 'btn btn-primary']);
     echo $form->stop();
     ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <p class="alert alert-success"><?= __('Your system is up to date. No updates is available') ?></p>
-<?php endif; ?>
+<?php endif;
+}
+?>
 <?php $this->stop() ?>

Apps/View/Admin/default/application/_actions.php

Spacing +1 added lines, -1 removed lines

@@ -5,6 +5,6 @@
 
 ?>
 <?php if (isset($controller)): ?>
-    <a href="<?= Url::to($controller . '/index') ?>"><i class="fa fa-cogs"></i></a>&nbsp;
+    <a href="<?= Url::to($controller.'/index') ?>"><i class="fa fa-cogs"></i></a>&nbsp;
     <a href="<?= Url::to('application/turn', [$controller]) ?>"><i class="fa fa-power-off"></i></a>
 <?php endif; ?>
\ No newline at end of file

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

Spacing +5 added lines, -5 removed lines

@@ -36,11 +36,11 @@ 
         continue;
     }
     $controller = Str::lowerCase($app->sys_name);
-    $route = $controller . '/index';
+    $route = $controller.'/index';
     $icoStatus = null;
     $actions = $this->fetch('application/_actions', ['controller' => $controller]);
     // set action icons based on app status
-    if ((bool)$app->disabled) {
+    if ((bool) $app->disabled) {
         $icoStatus = ' <i class="fa fa-pause" style="color: #ff0000;"></i>';
     } elseif (!$app->checkVersion()) {
         $icoStatus = ' <i class="fa fa-exclamation-circle" style="color: #ffbd26;"></i>';
@@ -50,9 +50,9 @@ 
     }
 
     $table->row([
-        ['text' => $app->id . $icoStatus, 'html' => true],
+        ['text' => $app->id.$icoStatus, 'html' => true],
         ['text' => Url::a([$route], $app->getLocaleName()), 'html' => true],
-        ['text' => '<a target="_blank" href="' . \App::$Alias->scriptUrl . '/' . Str::lowerCase($route) . '">' . $route . '</a>', 'html' => true],
+        ['text' => '<a target="_blank" href="'.\App::$Alias->scriptUrl.'/'.Str::lowerCase($route).'">'.$route.'</a>', 'html' => true],
         ['text' => $app->version],
         ['text' => Date::convertToDatetime($app->updated_at, Date::FORMAT_TO_HOUR)],
         ['text' => $actions, 'html' => true]
@@ -63,5 +63,5 @@ 
 <div class="table-responsive">
     <?= $table->display() ?>
 </div>
-<?= Url::a(['application/install'], '<i class="fa fa-tasks"></i> ' . __('Install app'), ['class' => 'btn btn-primary', 'html' => true]) ?>
+<?= Url::a(['application/install'], '<i class="fa fa-tasks"></i> '.__('Install app'), ['class' => 'btn btn-primary', 'html' => true]) ?>
 <?php $this->stop() ?>
\ No newline at end of file

Apps/Controller/Admin/Widget.php

Spacing +2 added lines, -2 removed lines

@@ -82,7 +82,7 @@ 
         $search = \Apps\ActiveRecord\App::getItem('widget', $controller);
 
         // check what we got
-        if (!$search|| (int)$search->id < 1) {
+        if (!$search || (int) $search->id < 1) {
             throw new NotFoundException('Widget is not founded');
         }
 
@@ -117,7 +117,7 @@ 
             ->first();
 
         // check if widget admin controller exists
-        if (!$record || (int)$record->id < 1) {
+        if (!$record || (int) $record->id < 1) {
             throw new ForbiddenException('Widget is not founded');
         }