phpffcms / ffcms

Apps/View/Admin/default/user/user_update.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
             <div class="text-right"><strong><?= __('Profile preview') ?></strong></div>
         </div>
         <div class="col-md-9">
-            <a href="<?= \App::$Alias->scriptUrl . '/profile/show/' . $model->_user->id ?>" target="_blank"><?= __('View profile on website') ?></a>
+            <a href="<?= \App::$Alias->scriptUrl.'/profile/show/'.$model->_user->id ?>" target="_blank"><?= __('View profile on website') ?></a>
         </div>
     </div>
     <div class="row mt-3 mb-3">

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

Braces +13 added lines, -5 removed lines

@@ -134,7 +134,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">
@@ -145,7 +146,9 @@ 
                                             <span class="text-sm"><?= Text::snippet($feed->message, 100) ?></span>
                                         </div>
                                     </div>
-                                <?php endforeach; ?>
+                                <?php endforeach;
+}
+?>
                             <?php endif; ?>
                         </div>
 
@@ -167,7 +170,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">
@@ -175,6 +179,7 @@ 
                                             <a href="<?= ($comment->user ? Url::link(['user/update', [$comment->user->id]]) : '#') ?>">
                                                 <?php
                                                 $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
+}
                                                 if ($comment->user && $comment->user->id > 0) {
                                                     $commentAva = $comment->user->profile->getAvatarUrl('small');
                                                 }
@@ -220,9 +225,12 @@ 
                             <?php foreach ($breadcrumbs as $url => $text): ?>
                                 <?php if (\Ffcms\Core\Helper\Type\Any::isInt($url)): ?>
                                     <?= $text ?>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     <a href="<?= $url ?>"><?= $text ?></a> /
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             <?php endforeach; ?>
                         <?php endif; ?>
                         </h2>

Spacing +18 added lines, -18 removed lines

@@ -178,7 +178,7 @@ 
                                         <div class="media-left">
                                             <a href="<?= ($comment->user ? Url::link(['user/update', [$comment->user->id]]) : '#') ?>">
                                                 <?php
-                                                $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
+                                                $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg';
                                                 if ($comment->user && $comment->user->id > 0) {
                                                     $commentAva = $comment->user->profile->getAvatarUrl('small');
                                                 }
@@ -222,8 +222,8 @@ 
                             $list = $this->listing('ul', ['class' => 'list-inline']);
                             foreach (\App::$Properties->get('languages') as $lang) {
                                 $list->li([
-                                    'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-' . $lang . '" alt="' . $lang . '">',
-                                    'link' => App::$Alias->baseUrlNoLang . '/' . $lang . App::$Request->getPathInfo(),
+                                    'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-'.$lang.'" alt="'.$lang.'">',
+                                    'link' => App::$Alias->baseUrlNoLang.'/'.$lang.App::$Request->getPathInfo(),
                                     'html' => true
                                 ], ['class' => 'list-inline-item']);
                             }
@@ -266,7 +266,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',
@@ -274,12 +274,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>
@@ -297,7 +297,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',
@@ -306,18 +306,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',
@@ -326,12 +326,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>

Apps/Model/Front/Content/EntityContentSearch.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 
         $index = implode('-', $this->_skip);
         // try to get this slow query from cache
-        $cache = App::$Cache->getItem('entity.content.search.index.' . $index);
+        $cache = App::$Cache->getItem('entity.content.search.index.'.$index);
         if (!$cache->isHit()) {
             $cache->set($this->makeSearch());
             $cache->expiresAfter(static::CACHE_TIME);
@@ -95,7 +95,7 @@ 
                 'id' => $item->id,
                 'title' => $item->getLocaled('title'),
                 'snippet' => Text::snippet($text),
-                'uri' => '/content/read/' . $item->getPath(),
+                'uri' => '/content/read/'.$item->getPath(),
                 'thumb' => $item->getPosterThumbUri()
             ];
         }

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

Spacing +2 added lines, -2 removed lines

@@ -55,7 +55,7 @@ 
     ]);
 
 foreach ($records as $user) {
-    $roleHtml = $user->role->color ? '<span class="badge badge-light" style="color: ' . $user->role->color . '">' . $user->role->name . '</span>' : $user->role->name;
+    $roleHtml = $user->role->color ? '<span class="badge badge-light" style="color: '.$user->role->color.'">'.$user->role->name.'</span>' : $user->role->name;
 
     $table->row([
         ['text' => $user->id],
@@ -69,7 +69,7 @@ 
             ->add('<i class="fa fa-trash-o"></i>', ['user/delete', [$user->id]], ['class' => 'btn btn-danger', 'html' => true])
             ->display(),
             'properties' => ['class' => 'text-center'], 'html' => true],
-        'properties' => ['class' => 'checkbox-row' . ($user->approve_token !== null ? ' bg-warning' : null)]
+        'properties' => ['class' => 'checkbox-row'.($user->approve_token !== null ? ' bg-warning' : null)]
 
     ]);
 }

Apps/View/Admin/default/user/user_clear.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             ['text' => $model->getUser()->id],
             ['text' => $model->getUser()->email],
             ['text' => $model->getUser()->login],
-            ['text' => $model->getUser()->profile->nick ?? 'id' . $model->getUser()->id],
+            ['text' => $model->getUser()->profile->nick ?? 'id'.$model->getUser()->id],
             ['text' => Date::convertToDatetime($model->getUser()->created_at, Date::FORMAT_TO_HOUR)],
         ])->display() ?>
 </div>

Apps/View/Admin/default/content/content_update.php

Spacing +15 added lines, -15 removed lines

@@ -51,9 +51,9 @@ 
             $langMenu->menu([
                 'text' => Str::upperCase($lang),
                 'tab' => function() use ($form, $lang) {
-                    return $form->fieldset()->text('title.' . $lang, null, __('Fill the title of the content for current language locale')) .
-                        '<strong>' . __('Content text') . '</strong><br />' .
-                        $form->field()->textarea('text.' . $lang, ['class' => 'form-control wysiwyg', 'rows' => 7]);
+                    return $form->fieldset()->text('title.'.$lang, null, __('Fill the title of the content for current language locale')).
+                        '<strong>'.__('Content text').'</strong><br />'.
+                        $form->field()->textarea('text.'.$lang, ['class' => 'form-control wysiwyg', 'rows' => 7]);
                 },
                 'tabActive' => $lang === \App::$Request->getLanguage()
             ]);
@@ -72,9 +72,9 @@ 
             $langMenu->menu([
                 'text' => Str::upperCase($lang),
                 'tab' => function() use ($form, $lang) {
-                    return $form->fieldset()->text('metaTitle.' . $lang, null, __('Set meta title for content page (displayed in browser head). Recommended length: 50-70 chars')).
-                        $form->fieldset()->text('metaKeywords.' . $lang, ['class' => 'tag-selectize'], __('Set meta keywords for this content (for search engine crawlers) separated by comma')).
-                        $form->fieldset()->text('metaTitle.' . $lang, null, __('Set meta description for this content (for search engine crawlers). Recommended length: 200-250 chars'));
+                    return $form->fieldset()->text('metaTitle.'.$lang, null, __('Set meta title for content page (displayed in browser head). Recommended length: 50-70 chars')).
+                        $form->fieldset()->text('metaKeywords.'.$lang, ['class' => 'tag-selectize'], __('Set meta keywords for this content (for search engine crawlers) separated by comma')).
+                        $form->fieldset()->text('metaTitle.'.$lang, null, __('Set meta description for this content (for search engine crawlers). Recommended length: 200-250 chars'));
                 },
                 'tabActive' => $lang === \App::$Request->getLanguage()
             ]);
@@ -92,16 +92,16 @@ 
             <div class="dropzone dropzone-previews" id="ffcms-dropzone"></div>
         </div>
         <div class="col-md-4">
-        ' . $form->fieldset()->select('poster', ['options' => [__('Not selected...')]], __("Select image from gallery as a poster for this content")) . '
+        ' . $form->fieldset()->select('poster', ['options' => [__('Not selected...')]], __("Select image from gallery as a poster for this content")).'
         </div>
     </div><br/><br/>';
     }])
     ->menu(['text' => __('Other'), 'tab' => function() use ($form, $model) {
-        return $form->fieldset()->boolean('display', null, __('Can users view this content or only available for administrators?')) .
-            $form->fieldset()->boolean('important', null, __('Make this material important and stack it on top of all news?')) .
-            $form->fieldset()->text('createdAt', ['class' => 'form-control datepick'], __('Set the date of creation or leave empty for current date')) .
-            $form->fieldset()->select('authorId', ['options' => $model->getUserIdName(), 'optionsKey' => true, 'class' => 'selectize-option'], __('Enter author user_id or leave empty to set current user as author')) .
-            $form->fieldset()->text('source', null, __('Set source URL if this content is copied from another website')) .
+        return $form->fieldset()->boolean('display', null, __('Can users view this content or only available for administrators?')).
+            $form->fieldset()->boolean('important', null, __('Make this material important and stack it on top of all news?')).
+            $form->fieldset()->text('createdAt', ['class' => 'form-control datepick'], __('Set the date of creation or leave empty for current date')).
+            $form->fieldset()->select('authorId', ['options' => $model->getUserIdName(), 'optionsKey' => true, 'class' => 'selectize-option'], __('Enter author user_id or leave empty to set current user as author')).
+            $form->fieldset()->text('source', null, __('Set source URL if this content is copied from another website')).
             $form->fieldset()->text('addRating', null, __('Add or reduce this content rating. Example: 5 gives +5 to total rating, -5 gives -5 to total'));
     }]);
 
@@ -128,11 +128,11 @@ 
                 ['text' => $comment->id],
                 ['text' => Text::snippet(\App::$Security->strip_tags($comment->message), 100)],
                 ['text' => $comment->getAnswerCount()],
-                ['text' => Url::a(['user/update', [$comment->user_id]], ($comment->user->profile->nick ?? 'id' . $comment->user->id)), 'html' => true],
+                ['text' => Url::a(['user/update', [$comment->user_id]], ($comment->user->profile->nick ?? 'id'.$comment->user->id)), 'html' => true],
                 ['text' => $this->bootstrap()->btngroup(['class' => 'btn-group btn-group-sm'])
                     ->add('<i class="fa fa-pencil"></i>', ['comments/read', [$comment->id]], ['html' => true, 'class' => 'btn btn-primary', 'target' => '_blank'])
                     ->add('<i class="fa fa-trash-o"></i>', ['comments/delete', ['comment', $comment->id]], ['html' => true, 'class' => 'btn btn-danger', 'target' => '_blank'])
-                    ->display(),'properties' => ['class' => 'text-center'], 'html' => true
+                    ->display(), 'properties' => ['class' => 'text-center'], 'html' => true
                 ]
             ]);
         }
@@ -238,7 +238,7 @@ 
     var DropzoneFiles = [];
     $('#ffcms-dropzone').dropzone({
         url: script_url + '/api/content/galleryupload/<?= $model->galleryFreeId ?>?lang=' + script_lang,
-        dictDefaultMessage: '<?= __('Drop files here to upload in gallery') . '<br />' . __('(or click here)') ?>',
+        dictDefaultMessage: '<?= __('Drop files here to upload in gallery').'<br />'.__('(or click here)') ?>',
         acceptedFiles: ".jpeg,.jpg,.png,.gif,.webp",
         addRemoveLinks: true,
         removedfile: function (file) { // file remove click, lets try to remove file from server & make visual changes

Apps/View/Admin/default/content/category_list.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 <h1><?= __('Category list') ?></h1>
 <div class="row">
     <div class="col-md-12">
-        <?= Url::a(['content/categoryupdate'], '<i class="fa fa-plus"></i> ' . __('Add category'), ['class' => 'btn btn-primary', 'html' => true]) ?>
+        <?= Url::a(['content/categoryupdate'], '<i class="fa fa-plus"></i> '.__('Add category'), ['class' => 'btn btn-primary', 'html' => true]) ?>
     </div>
 </div>
 <div class="table-responsive">
@@ -56,17 +56,17 @@ 
             <tr>
                 <td>
                     <div class="row">
-                        <div class="d-none d-md-block col-md-<?= $offset ?> col-xs-<?= $offset+2 ?> " style="border-bottom: 2px solid #8a8a8a;height: 1px;padding-top: 10px;"></div>
-                        <div class="col-md-<?= $set ?> col-xs-<?= $set-2 ?>">
+                        <div class="d-none d-md-block col-md-<?= $offset ?> col-xs-<?= $offset + 2 ?> " style="border-bottom: 2px solid #8a8a8a;height: 1px;padding-top: 10px;"></div>
+                        <div class="col-md-<?= $set ?> col-xs-<?= $set - 2 ?>">
                             <?= $row->getLocaled('title') ?>
                             <sup>id: <?= $row->id ?></sup>
-                            <a href="<?= \App::$Alias->scriptUrl . '/content/list/' . $row->path ?>" target="_blank" class="badge badge-secondary">/<?= $row->path ?></a>
+                            <a href="<?= \App::$Alias->scriptUrl.'/content/list/'.$row->path ?>" target="_blank" class="badge badge-secondary">/<?= $row->path ?></a>
                         </div>
                     </div>
                 </td>
                 <td class="text-center">
                     <?php $btn = $this->bootstrap()->btngroup(['class' => 'btn-group btn-group-sm', 'dropdown' => ['class' => 'btn-group btn-group-sm'], 'role' => 'group'], 4)
-                        ->add('<i class="fa fa-eye"></i>', [\App::$Alias->scriptUrl . '/content/list/' . $row->path], ['html' => true, 'target' => '_blank'])
+                        ->add('<i class="fa fa-eye"></i>', [\App::$Alias->scriptUrl.'/content/list/'.$row->path], ['html' => true, 'target' => '_blank'])
                         ->add('<i class="fa fa-plus"></i>', ['content/categoryupdate', null, ['parent' => $row->id]], ['class' => 'btn btn-success', 'data-toggle' => 'tooltip', 'title' => __('Add subcategory'), 'html' => true])
                         ->add('<i class="fa fa-cog"></i>', ['content/categoryupdate', [$row->id]], ['class' => 'btn btn-primary', 'data-toggle' => 'tooltip', 'title' => __('Category configurations'), 'html' => true]);
                     if ($row->id > 1) {

Apps/Model/Admin/User/FormUserClear.php

Spacing +4 added lines, -4 removed lines

@@ -70,12 +70,12 @@ 
      */
     public function make()
     {
-        if ((bool)$this->comments) {
+        if ((bool) $this->comments) {
             CommentPost::where('user_id', $this->_user->id)->delete();
             CommentAnswer::where('user_id', $this->_user->id)->delete();
         }
 
-        if ((bool)$this->content) {
+        if ((bool) $this->content) {
             $contents = Content::where('author_id', $this->_user->id);
             $ids = $contents->pluck('id')->toArray();
             if ($ids && count($ids) > 0) {
@@ -85,12 +85,12 @@ 
             }
         }
 
-        if ((bool)$this->feedback) {
+        if ((bool) $this->feedback) {
             FeedbackPost::where('user_id', $this->_user->id)
                 ->update(['readed' => true, 'closed' => true]);
         }
 
-        if ((bool)$this->wall) {
+        if ((bool) $this->wall) {
             WallPost::where('sender_id', $this->_user->id)->delete();
             WallAnswer::where('user_id', $this->_user->id)->delete();
         }

Apps/Model/Admin/User/FormUserDelete.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
         foreach ($this->users as $user) {
             $uid = $user->id;
             // delete whole website info for this user
-            if ((bool)$this->delete) {
+            if ((bool) $this->delete) {
                 $model = new FormUserClear($user);
                 $model->comments = true;
                 $model->content = true;
@@ -89,10 +89,10 @@ 
             }
 
             // delete avatars
-            File::remove('/upload/user/avatar/big/' . $uid . '.jpg');
-            File::remove('/upload/user/avatar/medium/' . $uid . '.jpg');
-            File::remove('/upload/user/avatar/small/' . $uid . '.jpg');
-            File::remove('/upload/user/avatar/original/' . $uid . '.jpg');
+            File::remove('/upload/user/avatar/big/'.$uid.'.jpg');
+            File::remove('/upload/user/avatar/medium/'.$uid.'.jpg');
+            File::remove('/upload/user/avatar/small/'.$uid.'.jpg');
+            File::remove('/upload/user/avatar/original/'.$uid.'.jpg');
             // delete user profile and auth data
             $user->profile()->delete();
             // delete user provider data