phpffcms / ffcms

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

Spacing +14 added lines, -14 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>
@@ -85,14 +85,14 @@ 
     if (!$content->category) {
         continue;
     }
-    $frontLink = \App::$Alias->scriptUrl . '/content/read';
+    $frontLink = \App::$Alias->scriptUrl.'/content/read';
     if (!Str::likeEmpty($content->category->path)) {
-        $frontLink .= '/' . $content->category->path;
+        $frontLink .= '/'.$content->category->path;
     }
-    $frontLink .= '/' . $content->path;
+    $frontLink .= '/'.$content->path;
 
     $controlGroup = '<div class="btn-group btn-group-sm" role="group" aria-label="Control buttons">';
-    if (!(bool)$content->display) {
+    if (!(bool) $content->display) {
         $controlGroup .= Url::a(['content/display', [$content->id], ['status' => 1]], '<i class="fa fa-eye-slash" style="color: #ff0000;"></i>', [
             'html' => true,
             'class' => 'btn btn-light',
@@ -108,7 +108,7 @@ 
         ]);
     }
 
-    if (!(bool)$content->important) {
+    if (!(bool) $content->important) {
         $controlGroup .= Url::a(['content/important', [$content->id], ['status' => 1]], '<i class="fa fa-star-o"></i>', [
             'html' => true,
             'class' => 'btn btn-light',
@@ -125,10 +125,10 @@ 
     }
 
     $dropdownControl = '<div class="btn-group btn-group-sm" role="group">';
-    $dropdownControl .= '<button id="btn-dropdown-' . $content->id . '" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"> </button>';
-    $dropdownControl .= '<div class="dropdown-menu" area-lebeledby="btn-dropdown-' . $content->id . '">';
+    $dropdownControl .= '<button id="btn-dropdown-'.$content->id.'" class="btn btn-secondary dropdown-toggle" data-toggle="dropdown"> </button>';
+    $dropdownControl .= '<div class="dropdown-menu" area-lebeledby="btn-dropdown-'.$content->id.'">';
     $dropdownControl .= Url::a(['content/update', [$content->id]], __('Edit'), ['class' => 'dropdown-item']);
-    $dropdownControl .= '<a href="' . $frontLink . '" target="_blank" class="dropdown-item">' . __('See as user') . '</a>';
+    $dropdownControl .= '<a href="'.$frontLink.'" target="_blank" class="dropdown-item">'.__('See as user').'</a>';
     if ($type === 'trash') {
         $dropdownControl .= Url::a(['content/restore', [$content->id]], __('Restore'), ['class' => 'dropdown-item']);
     } else {
@@ -144,7 +144,7 @@ 
         $hiddenExist = true;
     }
 
-    $contentInfo = '<div>' . Url::a(['content/update', [$content->id]], $content->getLocaled('title')) . '</div>';
+    $contentInfo = '<div>'.Url::a(['content/update', [$content->id]], $content->getLocaled('title')).'</div>';
     $contentInfo .= '<div class="small">';
     $contentInfo .= __('Category: <a href="%url%">%name%</a>', ['name' => $content->category->getLocaled('title'), 'url' => Url::to('content/categoryupdate', [$content->category_id])]);
     $contentInfo .= '</div>';

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

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