phpffcms / ffcms

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

Spacing +15 added lines, -15 removed lines

@@ -29,9 +29,9 @@ 
     <div class="col-md-6">
         <?php
         if ($type === 'trash') {
-            echo Url::a(['content/clear'], '<i class="fa fa-minus"></i> ' . __('Remove all'), ['class' => 'btn btn-danger', 'html' => true]);
+            echo Url::a(['content/clear'], '<i class="fa fa-minus"></i> '.__('Remove all'), ['class' => 'btn btn-danger', 'html' => true]);
         } else {
-            echo Url::a(['content/update'], '<i class="fa fa-plus"></i> ' . __('Add content'), ['class' => 'btn btn-primary', 'html' => true]);
+            echo Url::a(['content/update'], '<i class="fa fa-plus"></i> '.__('Add content'), ['class' => 'btn btn-primary', 'html' => true]);
         }
         ?>
     </div>
@@ -54,9 +54,9 @@ 
                     <i class="fa fa-filter"></i> <?= __('Filters') ?>
                 </button>
                 <div class="dropdown-menu" aria-labelledby="btnCategories">
-                    <?= Url::a(['content/index', null, ['type' => 'all']], '<i class="fa fa-list"></i> ' . __('All'), ['class' => 'dropdown-item', 'html' => true]) ?>
-                    <?= Url::a(['content/index', null, ['type' => 'moderate']], '<i class="fa fa-exclamation"></i> ' . __('Moderate'), ['class' => 'dropdown-item', 'html' => true]) ?>
-                    <?= Url::a(['content/index', null, ['type' => 'trash']], '<i class="fa fa-trash"></i> ' . __('Trash'), ['class' => 'dropdown-item', 'html' => true]) ?>
+                    <?= Url::a(['content/index', null, ['type' => 'all']], '<i class="fa fa-list"></i> '.__('All'), ['class' => 'dropdown-item', 'html' => true]) ?>
+                    <?= Url::a(['content/index', null, ['type' => 'moderate']], '<i class="fa fa-exclamation"></i> '.__('Moderate'), ['class' => 'dropdown-item', 'html' => true]) ?>
+                    <?= Url::a(['content/index', null, ['type' => 'trash']], '<i class="fa fa-trash"></i> '.__('Trash'), ['class' => 'dropdown-item', 'html' => true]) ?>
                 </div>
             </div>
         </div>
@@ -86,16 +86,16 @@ 
     if (!$content->category) {
         continue;
     }
-    $frontLink = \App::$Alias->scriptUrl . '/content/read';
+    $frontLink = \App::$Alias->scriptUrl.'/content/read';
     $frontPath = null;
     if (!Str::likeEmpty($content->category->path)) {
-        $frontLink .= '/' . $content->category->path;
-        $frontPath .= '/' . $content->category->path;
+        $frontLink .= '/'.$content->category->path;
+        $frontPath .= '/'.$content->category->path;
     }
-    $frontLink .= '/' . $content->path;
-    $frontPath .= '/' . $content->path;
+    $frontLink .= '/'.$content->path;
+    $frontPath .= '/'.$content->path;
     $frontPath = Str::sub($frontPath, 0, 30);
-    $actionIcons = '<a href="' . $frontLink . '" target="_blank"><i class="fa fa-eye fa-lg"></i></a> ';
+    $actionIcons = '<a href="'.$frontLink.'" target="_blank"><i class="fa fa-eye fa-lg"></i></a> ';
     $actionIcons .= Url::a(['content/update', [$content->id]], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]);
     if ($type === 'trash') {
         $actionIcons .= Url::a(['content/restore', [$content->id]], '<i class="fa fa-refresh fa-lg"></i>', ['html' => true]);
@@ -111,12 +111,12 @@ 
     $table->row([
         'properties' => ['class' => (!$content->display ? ' alert-warning' : null)],
         ['text' => $content->id, 'html' => true, '!secure' => true],
-        ['text' => (!$content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null) .
-            Url::a(['content/update', [$content->id]], $content->getLocaled('title')) .
-            ((bool)$content->important ? ' <i class="glyphicon glyphicon-fire"></i>' : null),
+        ['text' => (!$content->display ? '<i class="fa fa-exclamation text-warning"></i> ' : null).
+            Url::a(['content/update', [$content->id]], $content->getLocaled('title')).
+            ((bool) $content->important ? ' <i class="glyphicon glyphicon-fire"></i>' : null),
             'html' => true],
         ['text' => $content->category->getLocaled('title')],
-        ['text' => '<a href="' . $frontLink . '" target="_blank">' . $frontPath . '</a>', 'html' => true],
+        ['text' => '<a href="'.$frontLink.'" target="_blank">'.$frontPath.'</a>', 'html' => true],
         ['text' => Date::convertToDatetime($content->updated_at, Date::FORMAT_TO_SECONDS)],
         ['text' => $actionIcons, 'html' => true, 'properties' => ['class' => 'text-center']]
     ]);

Apps/View/Api/default/_core/javascript/submit_selectize_table.php

Spacing +1 added lines, -1 removed lines

@@ -7,7 +7,7 @@
 /** @var array $url */
 /** @var array $properties */
 
-$rndId = 'btn_selectize_submit_' . mt_rand(999, 999999);
+$rndId = 'btn_selectize_submit_'.mt_rand(999, 999999);
 $properties['id'] = $rndId;
 
 echo (new \Ffcms\Templex\Helper\Html\Dom())->button(function() use ($text) {

Apps/View/Api/default/_core/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

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

Spacing +13 added lines, -13 removed lines

@@ -48,9 +48,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()
             ]);
@@ -69,9 +69,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, null, __('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, null, __('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()
             ]);
@@ -89,16 +89,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) {
-        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()->text('authorId', null, __('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()->text('authorId', null, __('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'));
     }]);
 echo $menu->display();
@@ -193,7 +193,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

Widgets/Front/Comments/Comments.php

Spacing +1 added lines, -1 removed lines

@@ -19,7 +19,7 @@
     public function init(): void
     {
         if (App::$Request->getLanguage() !== 'en') {
-            App::$Translate->append('/i18n/Front/' . App::$Request->getLanguage() . '/CommentWidget.php');
+            App::$Translate->append('/i18n/Front/'.App::$Request->getLanguage().'/CommentWidget.php');
         }
 
         if (!$this->pathway) {

Apps/View/Front/default/widgets/newcomment/default.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     <div class="row mb-1">
         <div class="col-md-6">
             <i class="fa fa-user"></i>
-            <?php if ((int)$comment['user']['id'] > 0): ?>
+            <?php if ((int) $comment['user']['id'] > 0): ?>
                 <?= Url::a(['profile/show', [$comment['user']['id']]], $comment['user']['name']) ?>
             <?php else: ?>
                 <?= $comment['user']['name'] ?>
@@ -29,7 +29,7 @@ 
 
     <div class="row">
         <div class="col">
-            <a href="<?= \App::$Alias->baseUrl . $comment['pathway'] . '#comment-list' ?>">
+            <a href="<?= \App::$Alias->baseUrl.$comment['pathway'].'#comment-list' ?>">
                 <?= Text::cut(\App::$Security->strip_tags($comment['text']), 0, $snippet) ?>
             </a>
         </div>

Braces +5 added lines, -2 removed lines

@@ -16,9 +16,12 @@
             <i class="fa fa-user"></i>
             <?php if ((int)$comment['user']['id'] > 0): ?>
                 <?= Url::a(['profile/show', [$comment['user']['id']]], $comment['user']['name']) ?>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <?= $comment['user']['name'] ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </div>
         <div class="col-md-6 pull-right">
             <small class="text-secondary pull-right">

Apps/View/Front/default/widgets/comments/show.php

Spacing +4 added lines, -4 removed lines

@@ -3,7 +3,7 @@ 
 /** @var \Ffcms\Templex\Template\Template $this */
 ?>
 
-<?php if ((bool)$configs['guestAdd'] && (bool)$configs['guestModerate'] && !\App::$User->isAuth()): ?>
+<?php if ((bool) $configs['guestAdd'] && (bool) $configs['guestModerate'] && !\App::$User->isAuth()): ?>
     <p class="alert alert-warning"><?= $this->bootstrap()->alert('warning', __('All guest comments will be moderated before display')) ?></p>
 <?php endif; ?>
 
@@ -35,7 +35,7 @@ 
                 </a>
             </i>
         </div>
-        <div id="comment-text" class="comment-text"><?= __('Loading') . ' ...' ?></div>
+        <div id="comment-text" class="comment-text"><?= __('Loading').' ...' ?></div>
     </div>
     <div id="comment-answers-0" class="d-none"></div>
     <div class="row d-none" id="add-replay-to">
@@ -58,12 +58,12 @@ 
                 <span id="answer-date">00.00.00 00-00-00</span>
                 <span id="answer-user-name"><?= __('Unknown') ?></span>:
             </div>
-            <div id="answer-text" class="comment-text"><?= __('Loading') . ' ...' ?></div>
+            <div id="answer-text" class="comment-text"><?= __('Loading').' ...' ?></div>
         </div>
     </li>
 </ul>
 
-<?php if ((bool)$configs['guestAdd'] || \App::$User->isAuth()): ?>
+<?php if ((bool) $configs['guestAdd'] || \App::$User->isAuth()): ?>
     <!-- comment form -->
     <form name="comment-add-form" action="" method="post" style="padding-top: 15px;" class="form-horizontal">
         <input type="hidden" name="replay-to" value="0" />

Braces +5 added lines, -2 removed lines

@@ -77,7 +77,8 @@ 
             </div>
             <?php if (\App::$Captcha->isFull()): ?>
                 <div class="col-md-offset-3 col-md-9"><?= \App::$Captcha->get() ?></div>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <div class="form-group">
                     <label for="guest-captcha" class="col-sm-3 control-label"><?= __('Captcha') ?>:</label>
                     <div class="col-sm-9">
@@ -85,7 +86,9 @@ 
                         <input id="guest-captcha" type="text" name="captcha" class="form-control" required>
                     </div>
                 </div>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         <?php endif; ?>
         <textarea class="form-control wysiwyg" name="message"></textarea>
     </form>

Apps/Model/Admin/Content/FormCategoryUpdate.php

Spacing +5 added lines, -5 removed lines

@@ -36,7 +36,7 @@ 
     public function __construct(ContentCategory $record, $dependId = null)
     {
         $this->_record = $record;
-        $this->_tmpDependId = (int)$dependId;
+        $this->_tmpDependId = (int) $dependId;
         parent::__construct();
     }
 
@@ -113,7 +113,7 @@ 
         ];
 
         // general category
-        if ($this->_new === false && (int)$this->_record->id === 1) {
+        if ($this->_new === false && (int) $this->_record->id === 1) {
             $rules[] = ['path', 'used'];
         } else {
             $rules[] = ['path', 'required'];
@@ -122,7 +122,7 @@ 
             $rules[] = ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'];
         }
 
-        $rules[] = ['title.' . App::$Request->getLanguage(), 'required'];
+        $rules[] = ['title.'.App::$Request->getLanguage(), 'required'];
 
 
         return $rules;
@@ -135,7 +135,7 @@ 
     {
         $this->_record->title = $this->title;
         $this->_record->description = $this->description;
-        $savePath = trim($this->_pathNested . '/' . $this->path, '/');
+        $savePath = trim($this->_pathNested.'/'.$this->path, '/');
         $this->_record->path = $savePath;
         $this->_record->configs = $this->configs;
         $this->_record->save();
@@ -170,7 +170,7 @@ 
         // build path with owner category
         $this->_pathNested = $owner->path;
         if (Str::length($this->_pathNested) > 0) {
-            $path = $this->_pathNested . '/' . $path;
+            $path = $this->_pathNested.'/'.$path;
         }
 
         // make select for check

Apps/Model/Admin/Content/FormContentUpdate.php

Spacing +11 added lines, -11 removed lines

@@ -60,7 +60,7 @@ 
         if (!$this->_content->id) {
             $this->_new = true;
             if (!$this->galleryFreeId) {
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
             }
 
             if (!$this->authorId) {
@@ -95,8 +95,8 @@ 
     public function rules(): array
     {
         $res = [
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required'],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required'],
             ['text', 'used'],
             ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'],
             [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title', 'important'], 'required'],
@@ -109,9 +109,9 @@ 
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $res[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $res[] = ['keywords.' . $lang, 'length_max', 150];
-            $res[] = ['description.' . $lang, 'length_max', 250];
+            $res[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $res[] = ['keywords.'.$lang, 'length_max', 150];
+            $res[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $res;
@@ -167,10 +167,10 @@ 
         $this->_content->meta_keywords = $this->metaKeywords;
         $this->_content->meta_description = $this->metaDescription;
         $this->_content->source = $this->source;
-        $this->_content->important = (int)$this->important;
+        $this->_content->important = (int) $this->important;
         // check if rating is changed
-        if ((int)$this->addRating !== 0) {
-            $this->_content->rating += (int)$this->addRating;
+        if ((int) $this->addRating !== 0) {
+            $this->_content->rating += (int) $this->addRating;
         }
         // check if special comment hash is exist
         if ($this->_new || Str::length($this->_content->comment_hash) < 32) {
@@ -183,7 +183,7 @@ 
         }
 
         // save poster data
-        $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster;
+        $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster;
         if (File::exist($posterPath)) {
             $this->_content->poster = $this->poster;
         }
@@ -218,7 +218,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }