phpffcms / ffcms

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

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>

Spacing +4 added lines, -4 removed lines

@@ -5,7 +5,7 @@ 
 /** @var int $id */
 ?>
 
-<?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; ?>
 
@@ -37,7 +37,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">
@@ -60,12 +60,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" />

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/View/Admin/default/content/category_list.php

Spacing +3 added lines, -3 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,8 +56,8 @@ 
             <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>
                             <span class="badge badge-secondary">/<?= $row->path ?></span>

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

Spacing +2 added lines, -2 removed lines

@@ -32,8 +32,8 @@
     $menu->menu([
         'text' => Str::upperCase($lang),
         'tab' => function() use ($form, $lang) {
-            return $form->fieldset()->text('title.' . $lang, null, __('Enter category title, visible for users')) .
-                $form->fieldset()->text('description.' . $lang, null, __('Enter category description'));
+            return $form->fieldset()->text('title.'.$lang, null, __('Enter category title, visible for users')).
+                $form->fieldset()->text('description.'.$lang, null, __('Enter category description'));
         },
         'tabActive' => $lang === \App::$Request->getLanguage()
     ]);

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'], ['style' => 'color: #595959']) ?>
             <?php else: ?>
                 <?= $comment['user']['name'] ?>
@@ -29,7 +29,7 @@ 
 
     <div class="row">
         <div class="col widget-comment-text">
-            <a href="<?= \App::$Alias->baseUrl . '/' . $comment['app_name'] . '/comments/' . $comment['app_id'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.'/'.$comment['app_name'].'/comments/'.$comment['app_id'] ?>">
                 <?= 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'], ['style' => 'color: #595959']) ?>
-            <?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/Model/Admin/Content/FormContentUpdate.php

Spacing +12 added lines, -12 removed lines

@@ -61,7 +61,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) {
@@ -72,7 +72,7 @@ 
                 $this->categoryId = 1;
             }
             if (!$this->path) {
-                $this->path = Integer::random(8) . '-' . date('d-m-Y');
+                $this->path = Integer::random(8).'-'.date('d-m-Y');
             }
         } else { // is edit of exist item? define available data
             $this->title = $this->_content->title;
@@ -99,8 +99,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'],
@@ -113,9 +113,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;
@@ -171,10 +171,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) {
@@ -187,7 +187,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;
         }
@@ -222,7 +222,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }
 

Apps/Model/Api/Comments/CommentPostAdd.php

Spacing +6 added lines, -6 removed lines

@@ -57,17 +57,17 @@ 
     public function check()
     {
         // check if user is auth'd or guest name is defined
-        if (!App::$User->isAuth() && ((int)$this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) {
+        if (!App::$User->isAuth() && ((int) $this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) {
             throw new JsonException(__('Guest name is not defined'));
         }
 
         // check if target app_name or id is empty
-        if (Str::likeEmpty($this->appName) || Str::likeEmpty($this->appId) || (int)$this->appId < 0) {
+        if (Str::likeEmpty($this->appName) || Str::likeEmpty($this->appId) || (int) $this->appId < 0) {
             throw new JsonException(__('Wrong target name or id'));
         }
 
         // check if message length is correct
-        if (Str::length($this->message) < (int)$this->_configs['minLength'] || Str::length($this->message) > (int)$this->_configs['maxLength']) {
+        if (Str::length($this->message) < (int) $this->_configs['minLength'] || Str::length($this->message) > (int) $this->_configs['maxLength']) {
             throw new JsonException(__('Message length is incorrect. Current: %cur%, min - %min%, max - %max%', [
                 'cur' => Str::length($this->message),
                 'min' => $this->_configs['minLength'],
@@ -76,7 +76,7 @@ 
         }
 
         // guest moderation
-        if (!App::$User->isAuth() && (bool)$this->_configs['guestModerate']) {
+        if (!App::$User->isAuth() && (bool) $this->_configs['guestModerate']) {
             $captcha = App::$Request->request->get('captcha');
             if (!App::$Captcha->validate($captcha)) {
                 throw new JsonException(__('Captcha is incorrect! Click on image to refresh and try again'));
@@ -110,13 +110,13 @@ 
     {
         $record = new CommentPost();
         $record->app_name = $this->appName;
-        $record->app_relation_id = (int)$this->appId;
+        $record->app_relation_id = (int) $this->appId;
         $record->user_id = $this->_userId;
         $record->guest_name = $this->guestName;
         $record->message = $this->message;
         $record->lang = App::$Request->getLanguage();
         // check if pre moderation is enabled and user is guest
-        if ((int)$this->_configs['guestModerate'] === 1 && $this->_userId < 1) {
+        if ((int) $this->_configs['guestModerate'] === 1 && $this->_userId < 1) {
             $record->moderate = 1;
         }
         $record->save();

Apps/Controller/Api/Comments/ActionAdd.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         $this->setJsonHeader();
         $configs = AppRecord::getConfigs('widget', 'Comments');
 
-        $replayTo = (int)$this->request->request->get('replay-to');
+        $replayTo = (int) $this->request->request->get('replay-to');
         $model = null;
         // check if its a answer (comment answer type)
         if ($replayTo > 0) {
@@ -40,15 +40,15 @@ 
         } else { // sounds like new comment row
             $model = new CommentPostAdd($configs);
             $model->appName = App::$Security->strip_tags($this->request->request->get('app_name'));
-            $model->appId = (int)$this->request->request->get('app_id');
+            $model->appId = (int) $this->request->request->get('app_id');
         }
 
         // pass general comment params to model
-        $model->message = App::$Security->secureHtml((string)$this->request->request->get('message'));
+        $model->message = App::$Security->secureHtml((string) $this->request->request->get('message'));
         $model->guestName = App::$Security->strip_tags($this->request->request->get('guest-name'));
 
         // check model conditions before add new row
-        if (!$model|| !$model->check()) {
+        if (!$model || !$model->check()) {
             throw new NativeException('Unknown error');
         }
 

Apps/Controller/Api/Comments/ActionShowAnswer.php

Spacing +1 added lines, -1 removed lines

@@ -43,7 +43,7 @@
         $records = CommentAnswer::with(['user', 'user.profile', 'user.role'])
             ->where('comment_id', $commentId)
             ->where('moderate', false);
-        if ((bool)$configs['onlyLocale']) {
+        if ((bool) $configs['onlyLocale']) {
             $records = $records->where('lang', '=', $this->request->getLanguage());
         }