phpffcms / ffcms

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

Spacing +10 added lines, -10 removed lines

@@ -20,10 +20,10 @@ 
 $name = $user->profile === null ? __('Unknown') : $user->profile->getNickname();
 
 $this->layout('_layouts/default', [
-    'title' => __('Profile') . ': ' . $name,
+    'title' => __('Profile').': '.$name,
     'breadcrumbs' => [
         Url::to('/') => __('Home'),
-        __('Profile') . ': ' . $name
+        __('Profile').': '.$name
     ]
 ]);
 
@@ -43,7 +43,7 @@ 
         <img src="<?= $user->profile->getAvatarUrl('big') ?>" class="img-fluid img-thumbnail" />
         <?php if ($ratingOn):
             $rateClass = 'btn-secondary';
-            $rateValue = (int)$user->profile->rating;
+            $rateValue = (int) $user->profile->rating;
             if ($user->profile->rating > 0) {
                 $rateClass = 'btn-info';
             } elseif ($user->profile->rating < 0) {
@@ -80,11 +80,11 @@ 
         <?php
         $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);
         if ($isSelf) {
-            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> ' . __('Feed'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true]);
-            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]);
-        } else if(\App::$User->isAuth()) {
+            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> '.__('Feed'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true]);
+            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]);
+        } else if (\App::$User->isAuth()) {
             $userMenu->menu(['link' => ['profile/messages', null, ['newdialog' => $user->id]], 'text' => __('Write message')]);
             $userMenu->menu(['link' => ['profile/ignore', null, ['id' => $user->id]], 'text' => __('Block')]);
         }
@@ -160,7 +160,7 @@ 
                             foreach ($hobbyArray as $item) {
                                 $item = \App::$Security->strip_tags($item);
                                 if (!Str::likeEmpty($item)) {
-                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']) . ' ';
+                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']).' ';
                                 }
                             }
                             ?>
@@ -213,7 +213,7 @@ 
                     <div class="col-xs-8 col-md-10">
                         <div class="h5" style="margin-top: 0;margin-bottom: 5px;">
                             <i class="glyphicon glyphicon-user"></i>
-                            <?= 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]) ?>
                             <small class="float-right"><?= Date::humanize($post->updated_at); ?></small>
                         </div>
                         <div class="object-text">

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/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/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/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');
         }
 

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

Spacing +17 added lines, -17 removed lines

@@ -173,7 +173,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');
                                                 }
@@ -250,7 +250,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',
@@ -258,13 +258,13 @@ 
                                 ])
                             ?>
 
-                            <?= $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/backup'], 'text' => '<i class="fa fa-hdd-o"></i> ' . __('Backup'), '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/backup'], 'text' => '<i class="fa fa-hdd-o"></i> '.__('Backup'), 'html' => true])
+                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true])
                                 ->display();
                             ?>
                         </li>
@@ -282,7 +282,7 @@ 
                         ?>
                         <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? ' 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',
@@ -291,18 +291,18 @@ 
                             ?>
 
                             <?php
-                            $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? '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) || \App::$Request->getController() === 'Application') ? '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) || \App::$Request->getController() === 'Widget') ? ' 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',
@@ -311,12 +311,12 @@ 
                             ?>
 
                             <?php
-                            $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? '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) || \App::$Request->getController() === 'Widget') ? '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>