phpffcms / ffcms

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>

Apps/View/Front/default/content/read.php

Spacing +23 added lines, -23 removed lines

@@ -30,7 +30,7 @@ 
 }
 // don't use breadcrumbs on injected pathway rule
 $breadcrumbs = null;
-if (!\App::$Request->isPathInjected() && (bool)$model->getCategory()->getProperty('showCategory')) {
+if (!\App::$Request->isPathInjected() && (bool) $model->getCategory()->getProperty('showCategory')) {
     $breadcrumbs = [
         Url::to('/') => __('Home')
     ];
@@ -42,7 +42,7 @@ 
                 $breadcrumbs[Url::to('content/list', [$cat['path']])] = $cat['name'];
             }
         }
-        $breadcrumbs[] = __('Content') . ': ' . Str::sub($title, 0, 40);
+        $breadcrumbs[] = __('Content').': '.Str::sub($title, 0, 40);
     }
 }
 
@@ -55,39 +55,39 @@ 
 ]);
 
 $properties = [
-    'date' => (bool)$model->getCategory()->getProperty('showDate'),
-    'author' => (bool)$model->getCategory()->getProperty('showAuthor'),
-    'views' => (bool)$model->getCategory()->getProperty('showViews'),
-    'category' => (bool)$model->getCategory()->getProperty('showCategory'),
-    'rating' => (bool)$model->getCategory()->getProperty('showRating'),
-    'tags' => (bool)$model->getCategory()->getProperty('showTags')
+    'date' => (bool) $model->getCategory()->getProperty('showDate'),
+    'author' => (bool) $model->getCategory()->getProperty('showAuthor'),
+    'views' => (bool) $model->getCategory()->getProperty('showViews'),
+    'category' => (bool) $model->getCategory()->getProperty('showCategory'),
+    'rating' => (bool) $model->getCategory()->getProperty('showRating'),
+    'tags' => (bool) $model->getCategory()->getProperty('showTags')
 ];
-$showComments = (bool)$model->getCategory()->getProperty('showComments');
-$showPoster = (bool)$model->getCategory()->getProperty('showPoster');
+$showComments = (bool) $model->getCategory()->getProperty('showComments');
+$showPoster = (bool) $model->getCategory()->getProperty('showPoster');
 ?>
 <?php $this->start('body') ?>
     <article class="article-item article-border" itemscope="itemscope" itemtype="https://schema.org/NewsArticle">
         <h1><?= $model->title ?></h1>
         <?php if (Arr::in(true, $properties)): ?>
             <div class="meta">
-                <?php if ((bool)$properties['category']): ?>
+                <?php if ((bool) $properties['category']): ?>
                     <span class="spaced"><i class="fa fa-list"></i> <?= Url::a(['content/list', [$model->catPath]], $model->catName, ['itemprop' => 'genre']) ?></span>
                 <?php endif; ?>
-                <?php if ((bool)$properties['date']): ?>
+                <?php if ((bool) $properties['date']): ?>
                     <span class="spaced"><i class="fa fa-calendar"></i> <time datetime="<?= date('c', Date::convertToTimestamp($model->getRecord()->created_at)) ?> itemprop="datePublished"><?= $model->createDate ?></time></span>
                 <?php endif; ?>
-                <?php if ((bool)$properties['author']): ?>
+                <?php if ((bool) $properties['author']): ?>
                     <?php if ($model->authorId && $model->authorId > 0): ?>
                         <span class="spaced"><i class="fa fa-user"></i> <?= Url::a(['profile/show', [$model->authorId]], $model->authorName, ['itemprop' => 'author']) ?></span>
                     <?php else: ?>
                         <span class="spaced"><i class="fa fa-user"></i> <s><?= $model->authorName ?></s></span>
                     <?php endif; ?>
                 <?php endif; ?>
-                <?php if ((bool)$properties['views']): ?>
+                <?php if ((bool) $properties['views']): ?>
                     <span class="spaced"><i class="fa fa-eye"></i> <?= $model->views ?></span>
                 <?php endif ?>
                 <?php if (\App::$User->isAuth() && \App::$User->identity()->role->can('Admin/Content/Update')): ?>
-                    <span class="float-right"><a href="<?= \App::$Alias->scriptUrl . '/admin/content/update/' . $model->id ?>" target="_blank"><i class="fa fa-pencil" style="color: #ff0000;"></i></a></span>
+                    <span class="float-right"><a href="<?= \App::$Alias->scriptUrl.'/admin/content/update/'.$model->id ?>" target="_blank"><i class="fa fa-pencil" style="color: #ff0000;"></i></a></span>
                 <?php endif; ?>
             </div>
         <?php else: ?>
@@ -102,7 +102,7 @@ 
         <div id="content-text">
             <?php if ($showPoster === true && $model->posterFull !== null && $model->posterThumb !== null): ?>
                 <a href="#showPoster" data-toggle="modal" data-target="#showPoster">
-                    <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase($model->title) ?>" src="<?= \App::$Alias->scriptUrl . $model->posterThumb ?>" class="image_poster img-thumbnail" />
+                    <img alt="<?= __('Poster for') ?>: <?= Str::lowerCase($model->title) ?>" src="<?= \App::$Alias->scriptUrl.$model->posterThumb ?>" class="image_poster img-thumbnail" />
                 </a>
                 <!-- Modal poster pop-up -->
                 <div class="modal fade" id="showPoster" tabindex="-1" role="dialog" aria-labelledby="showPosterModal">
@@ -113,12 +113,12 @@ 
                                 <h4 class="modal-title" id="myModalLabel"><?= __('View poster') ?></h4>
                             </div>
                             <div class="modal-body">
-                                <img class="img-fluid" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" />
+                                <img class="img-fluid" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Poster image') ?>" style="margin: 0 auto;" />
                             </div>
                         </div>
                     </div>
                 </div>
-            <?php endif ;?>
+            <?php endif; ?>
             <?= $model->text ?>
         </div>
         <?php if ($model->galleryItems !== null && Any::isArray($model->galleryItems)): ?>
@@ -126,8 +126,8 @@ 
                 <?php $i = 1; ?>
                 <?php foreach ($model->galleryItems as $thumbPic => $fullPic): ?>
                     <div class="col-md-2 well">
-                        <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl . $fullPic ?>" id="gallery-<?= $i ?>">
-                            <img src="<?= \App::$Alias->scriptUrl . $thumbPic ?>" class="img-fluid image-item" />
+                        <a href="#showGallery" class="modalGallery" content="<?= \App::$Alias->scriptUrl.$fullPic ?>" id="gallery-<?= $i ?>">
+                            <img src="<?= \App::$Alias->scriptUrl.$thumbPic ?>" class="img-fluid image-item" />
                         </a>
                     </div>
                     <?php $i++ ?>
@@ -141,7 +141,7 @@ 
                             <h4 class="modal-title" id="showModalLabel"><?= __('View picture') ?></h4>
                         </div>
                         <div class="modal-body" id="modal-gallery-body">
-                            <img class="img-fluid" src="<?= \App::$Alias->scriptUrl . $model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" />
+                            <img class="img-fluid" src="<?= \App::$Alias->scriptUrl.$model->posterFull ?>" alt="<?= __('Gallery picture') ?>" style="margin: 0 auto;" />
                         </div>
                     </div>
                 </div>
@@ -162,7 +162,7 @@ 
                         </div>
                         <div id="similar<?= $idx ?>" class="panel-collapse collapse">
                             <div class="panel-body">
-                                <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+                                <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                                     <?= $item['snippet'] ?>
                                 </a>
                             </div>
@@ -192,7 +192,7 @@ 
                                 echo '<i class="fa fa-tags"></i> ';
                                 foreach ($model->metaKeywords as $tag) {
                                     $tag = trim($tag);
-                                    echo Url::a(['content/tag', [urlencode($tag)]], $tag, ['class' => 'badge badge-secondary']) . "&nbsp;";
+                                    echo Url::a(['content/tag', [urlencode($tag)]], $tag, ['class' => 'badge badge-secondary'])."&nbsp;";
                                 }
                             }
                             ?>

Apps/View/Front/default/content/list.php

Spacing +7 added lines, -7 removed lines

@@ -14,7 +14,7 @@ 
 
 $catConfigs = [];
 foreach ($model->category['configs'] as $key=>$value) {
-    $catConfigs[$key] = (bool)$value;
+    $catConfigs[$key] = (bool) $value;
 }
 $catMeta = [
     'date' => $catConfigs['showDate'],
@@ -74,7 +74,7 @@ 
             <?php if ($item['important']): ?>
                 <i class="fa fa-fire" style="color: #a50000"></i>
             <?php endif; ?>
-            <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                 <?= $item['title'] ?>
             </a>
         </h2>
@@ -101,7 +101,7 @@ 
                         <?php
                         $ownerNick = $item['author']->profile === null ? __('Unknown') : $item['author']->profile->getNickname();
                         if ($item['author']->getId() < 1) {
-                            echo '<s>' . $ownerNick . '</s>';
+                            echo '<s>'.$ownerNick.'</s>';
                         } else {
                             echo Url::a(['profile/show', [$item['author']->getId()]], $ownerNick, ['itemprop' => 'author']);
                         }
@@ -118,7 +118,7 @@ 
         <div class="row">
             <div class="col-md-12">
                 <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?>
-                    <img src="<?= \App::$Alias->scriptUrl . $item['thumb'] ?>" class="image_poster img-thumbnail d-none d-sm-block" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
+                    <img src="<?= \App::$Alias->scriptUrl.$item['thumb'] ?>" class="image_poster img-thumbnail d-none d-sm-block" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
                 <?php endif; ?>
                 <div itemprop="text articleBody">
                     <?= $item['text'] ?>
@@ -135,15 +135,15 @@ 
             }*/ ?>
 
             <span class="spaced"><i class="fa fa-comment-o"></i>
-                <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
+                <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
             </span>
             <span class="float-right">
-            <?php if ((int)$catConfigs['showTags'] === 1 && $item['tags'] !== null && Any::isArray($item['tags'])): ?>
+            <?php if ((int) $catConfigs['showTags'] === 1 && $item['tags'] !== null && Any::isArray($item['tags'])): ?>
                 <span class="spaced"><i class="fa fa-tags"></i>
                     <?php
                     foreach ($item['tags'] as $tag) {
                         $tag = trim($tag);
-                        echo Url::a(['content/tag', [urlencode($tag)]], $tag, ['class' => 'badge badge-secondary']) . "&nbsp;";
+                        echo Url::a(['content/tag', [urlencode($tag)]], $tag, ['class' => 'badge badge-secondary'])."&nbsp;";
                     }
                     ?>
                 </span>

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());
         }
 

Apps/Controller/Api/Comments/ActionList.php

Spacing +3 added lines, -3 removed lines

@@ -34,9 +34,9 @@ 
         // get configs
         $configs = AppRecord::getConfigs('widget', 'Comments');
         // items per page
-        $perPage = (int)$configs['perPage'];
+        $perPage = (int) $configs['perPage'];
         // offset can be only integer
-        $index = (int)$this->request->query->get('offset', 0);
+        $index = (int) $this->request->query->get('offset', 0);
         $offset = $perPage * $index;
 
         // select comments from db and check it
@@ -45,7 +45,7 @@ 
             ->where('moderate', false);
 
         // check if comments is depend of language locale
-        if ((bool)$configs['onlyLocale']) {
+        if ((bool) $configs['onlyLocale']) {
             $query = $query->where('lang', '=', $this->request->getLanguage());
         }
 

Apps/Controller/Api/Comments/ActionCount.php

Spacing +3 added lines, -3 removed lines

@@ -40,14 +40,14 @@
         // for each item in path array calculate comments count
         foreach ($ids as $id) {
             $query = CommentPost::where('app_name', $appName)
-                ->where('app_relation_id', (int)$id)
+                ->where('app_relation_id', (int) $id)
                 ->where('moderate', '=', 0);
             // check if comments is depend of language locale
-            if ((bool)$configs['onlyLocale']) {
+            if ((bool) $configs['onlyLocale']) {
                 $query = $query->where('lang', '=', $this->request->getLanguage());
             }
             // set itemId => count
-            $count[(int)$id] = $query->count();
+            $count[(int) $id] = $query->count();
         }
         // render json response
         return json_encode(['status' => 1, 'count' => $count]);

Private/Migrations/Updates/update_cms_310-2017-07-29-11-00-00.php

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
     public function up()
     {
         // set nullable varchar type for token column
-        $this->getSchema()->table('users', function($table){
+        $this->getSchema()->table('users', function($table) {
             $table->string('approve_token', 128)->nullable()->default(null)->change();
         });
         // set approve_token = null where it like '0' str or ''
@@ -29,13 +29,13 @@ 
             });
         }
         if (!$this->getSchema()->hasColumn('comment_answers', 'app_relation_id')) {
-            $this->getSchema()->table('comment_answers', function ($table){
+            $this->getSchema()->table('comment_answers', function($table) {
                 $table->integer('app_relation_id')->unsigned()->default(0)->after('app_name');
             });
         }
         // @todo: add algo to find app_name & app_id for oldest comments
         if ($this->getSchema()->hasColumn('comment_posts', 'pathway')) {
-            $this->getSchema()->table('comment_posts', function ($table){
+            $this->getSchema()->table('comment_posts', function($table) {
                 $table->dropColumn('pathway');
             });
         }