phpffcms / ffcms

Apps/Controller/Api/Profile/ActionMessageList.php

Spacing +10 added lines, -10 removed lines

@@ -43,7 +43,7 @@ 
 
         // get special types for this action
         $queryType = $this->request->get('type');
-        $queryId = (int)$this->request->get('id');
+        $queryId = (int) $this->request->get('id');
         // get current user object
         $user = App::$User->identity();
 
@@ -59,11 +59,11 @@ 
         switch ($queryType) {
             case 'after':
                 $messages = Message::where('id', '>', $queryId)
-                    ->where(function ($query) use ($corId, $user) {
-                        $query->where(function ($q) use ($corId, $user) {
+                    ->where(function($query) use ($corId, $user) {
+                        $query->where(function($q) use ($corId, $user) {
                             $q->where('target_id', '=', $user->getId())
                                 ->where('sender_id', '=', $corId);
-                        })->orWhere(function ($q) use ($corId, $user) {
+                        })->orWhere(function($q) use ($corId, $user) {
                             $q->where('target_id', '=', $corId)
                                 ->where('sender_id', '=', $user->getId());
                         });
@@ -71,21 +71,21 @@ 
                 break;
             case 'before':
                 $messages = Message::where('id', '<', $queryId)
-                    ->where(function ($query) use ($corId, $user) {
-                        $query->where(function ($q) use ($corId, $user) {
+                    ->where(function($query) use ($corId, $user) {
+                        $query->where(function($q) use ($corId, $user) {
                             $q->where('target_id', '=', $user->getId())
                                 ->where('sender_id', '=', $corId);
-                        })->orWhere(function ($q) use ($corId, $user) {
+                        })->orWhere(function($q) use ($corId, $user) {
                             $q->where('target_id', '=', $corId)
                                 ->where('sender_id', '=', $user->getId());
                         });
                     });
                 break;
             default:
-                $messages = Message::where(function ($query) use ($corId, $user) {
+                $messages = Message::where(function($query) use ($corId, $user) {
                     $query->where('target_id', '=', $user->getId())
                         ->where('sender_id', '=', $corId);
-                })->orWhere(function ($query) use ($corId, $user) {
+                })->orWhere(function($query) use ($corId, $user) {
                     $query->where('target_id', '=', $corId)
                         ->where('sender_id', '=', $user->getId());
                 });
@@ -116,7 +116,7 @@ 
             ];
 
             // update status to readed
-            if ((bool)$msg->readed !== true && $msg->sender_id !== $user->id) {
+            if ((bool) $msg->readed !== true && $msg->sender_id !== $user->id) {
                 $msg->readed = true;
                 $msg->save();
             }

Apps/View/Front/default/profile/index.php

Spacing +7 added lines, -7 removed lines

@@ -13,13 +13,13 @@ 
 
 $title = __('User list');
 if ($id === 'all') {
-    $title .= ': ' . __('All');
+    $title .= ': '.__('All');
 } elseif ($id === 'rating') {
-    $title .= ': ' . __('Rating');
+    $title .= ': '.__('Rating');
 } elseif ($id === 'city') {
-    $title .= ': ' . __('City') . ' ' . $this->e(urldecode($add));
+    $title .= ': '.__('City').' '.$this->e(urldecode($add));
 } elseif ($id === 'hobby') {
-    $title .= ': ' . __('Hobby') . ' ' . $this->e(urldecode($add));
+    $title .= ': '.__('Hobby').' '.$this->e(urldecode($add));
 }
 
 $this->layout('_layouts/default', [
@@ -53,13 +53,13 @@ 
             <h3>
                 <?= Url::a(
                     ['profile/show', [$profile->user_id]],
-                    (Str::likeEmpty($profile->nick) ? __('No name') . '(id' . $profile->user_id . ')' : $profile->nick),
-                    ['style' => 'color: ' . $profile->user->role->color]
+                    (Str::likeEmpty($profile->nick) ? __('No name').'(id'.$profile->user_id.')' : $profile->nick),
+                    ['style' => 'color: '.$profile->user->role->color]
                 ) ?>
             </h3>
             <p><?= __('Registered') ?>: <?= Date::convertToDatetime($profile->created_at, Date::FORMAT_TO_DAY) ?></p>
             <?php if (\App::$User->identity() !== null && $profile->user_id !== \App::$User->identity()->getId()): ?>
-                <?= Url::a(['profile/messages', null, ['newdialog' => $profile->user_id]], '<i class="fa fa-envelope"></i> '  . __('New message'), ['class' => 'btn btn-info', 'html' => true]) ?>
+                <?= Url::a(['profile/messages', null, ['newdialog' => $profile->user_id]], '<i class="fa fa-envelope"></i> '.__('New message'), ['class' => 'btn btn-info', 'html' => true]) ?>
             <?php endif; ?>
         </div>
         <div class="col-md-2">

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

Braces +5 added lines, -2 removed lines

@@ -112,9 +112,12 @@
                     <span class="spaced"><i class="fa fa-eye"></i> <?= $item['views'] ?></span>
                 <?php endif; ?>
             </div>
-        <?php else: ?>
+        <?php else {
+    : ?>
             <hr />
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         <div class="row">
             <div class="col-md-12">
                 <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?>

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/View/Front/default/content/read.php

Braces +10 added lines, -4 removed lines

@@ -79,9 +79,12 @@ 
                 <?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: ?>
+                    <?php else {
+    : ?>
                         <span class="spaced"><i class="fa fa-user"></i> <s><?= $model->authorName ?></s></span>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                 <?php endif; ?>
                 <?php if ((bool)$properties['views']): ?>
                     <span class="spaced"><i class="fa fa-eye"></i> <?= $model->views ?></span>
@@ -90,9 +93,12 @@ 
                     <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: ?>
+        <?php else {
+    : ?>
             <hr />
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         <?php if ($trash): ?>
             <p class="alert alert-danger"><i class="fa fa-trash"></i> <?= __('This content is placed in trash') ?></p>
         <?php endif; ?>

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/tag.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 $listing = $this->listing('ul');
 
 foreach ($records as $item) {
-    $listing->li(['text' => $item->getLocaled('title'), 'link' => \App::$Alias->baseUrl . '/content/read/' . $item->getPath()]);
+    $listing->li(['text' => $item->getLocaled('title'), 'link' => \App::$Alias->baseUrl.'/content/read/'.$item->getPath()]);
 }
 echo $listing->display();
 ?>

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

Spacing +3 added lines, -3 removed lines

@@ -40,10 +40,10 @@
     ]);
 
 foreach ($records as $record) {
-    $moderate = !(bool)$record->display;
+    $moderate = !(bool) $record->display;
     $title = $record->getLocaled('title');
-    if (!(bool)$record->display) {
-        $title = Url::a(['content/update', [$record->id]], $title) . ' <i class="fa fa-pencil"></i>';
+    if (!(bool) $record->display) {
+        $title = Url::a(['content/update', [$record->id]], $title).' <i class="fa fa-pencil"></i>';
     }
 
     $table->row([

Apps/Controller/Front/Content/ActionMy.php

Spacing +1 added lines, -1 removed lines

@@ -41,7 +41,7 @@
         }*/
 
         // prepare query
-        $page = (int)$this->request->query->get('page', 0);
+        $page = (int) $this->request->query->get('page', 0);
         $offset = $page * 10;
         $query = ContentRecord::where('author_id', App::$User->identity()->getId());
 

Apps/Controller/Front/Content/ActionRead.php

Spacing +1 added lines, -1 removed lines

@@ -69,7 +69,7 @@
         $model = new EntityContentRead($categoryRecord, $contentRecord->first());
         $search = null;
         // check if similar search is enabled for item category
-        if ((bool)$model->getCategory()->getProperty('showSimilar') && !$trash) {
+        if ((bool) $model->getCategory()->getProperty('showSimilar') && !$trash) {
             $search = new EntityContentSearch($model->title, $model->id, $model->getCategory()->id);
         }
 

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

Spacing +7 added lines, -7 removed lines

@@ -11,15 +11,15 @@
     }
     $title = Text::snippet($title, 50);
     $date = Date::humanize($record->created_at);
-    $categoryUrl = \App::$Alias->baseUrl . '/content/list/' . $record->cpath;
-    $categoryLink = '<a href="' . $categoryUrl . '">' . \App::$Translate->getLocaleText($record->ctitle) . '</a>';
-    $newsLink = \App::$Alias->baseUrl . '/content/read/' . $record->cpath;
-    $newsLink = rtrim($newsLink, '/') . '/' . $record->path;
+    $categoryUrl = \App::$Alias->baseUrl.'/content/list/'.$record->cpath;
+    $categoryLink = '<a href="'.$categoryUrl.'">'.\App::$Translate->getLocaleText($record->ctitle).'</a>';
+    $newsLink = \App::$Alias->baseUrl.'/content/read/'.$record->cpath;
+    $newsLink = rtrim($newsLink, '/').'/'.$record->path;
 
     echo '<div class="row"><div class="col-md-12">';
-    echo '<a href="' . $newsLink . '">&rarr; ' . $title . '</a><br />';
-    echo '<small class="float-left">' . $categoryLink . '</small>';
-    echo '<small class="float-right text-secondary">' . $date . '</small>';
+    echo '<a href="'.$newsLink.'">&rarr; '.$title.'</a><br />';
+    echo '<small class="float-left">'.$categoryLink.'</small>';
+    echo '<small class="float-right text-secondary">'.$date.'</small>';
     echo '</div></div>';
     echo '<hr class="pretty" />';
 }