phpffcms / ffcms

Apps/Model/Front/Feedback/FormAnswerAdd.php

Spacing +2 added lines, -2 removed lines

@@ -99,9 +99,9 @@
 
         // add notification msg
         $targetId = $this->_post->user_id;
-        if ($targetId !== null && (int)$targetId > 0 && $targetId !== $this->_userId) {
+        if ($targetId !== null && (int) $targetId > 0 && $targetId !== $this->_userId) {
             $notify = new EntityAddNotification($targetId);
-            $uri = '/feedback/read/' . $this->_post->id . '/' . $this->_post->hash . '#feedback-answer-' . $record->id;
+            $uri = '/feedback/read/'.$this->_post->id.'/'.$this->_post->hash.'#feedback-answer-'.$record->id;
             $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [
                 'snippet' => Text::snippet($this->message, 50),
                 'post' => Text::snippet($this->_post->message, 50)

Apps/View/Front/default/feedback/create.php

Braces +5 added lines, -2 removed lines

@@ -18,9 +18,12 @@
 <h1><?= __('Feedback') ?></h1>
 <?php if (\App::$User->isAuth()): ?>
     <?= $this->insert('feedback/_authTabs') ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <hr />
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 <?php $form = $this->form($model) ?>
 <?= $form->start() ?>

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

Spacing +2 added lines, -3 removed lines

@@ -46,9 +46,8 @@
         ['text' => $item->id],
         ['text' => Url::a(['feedback/read', [$item->id, $item->hash]], Text::cut($item->message, 0, 40)), 'html' => true],
         ['text' =>
-            (int)$item->closed === 1 ?
-                '<span class="badge badge-danger">' . __('Closed') . '</span>' :
-                '<span class="badge badge-success">' . __('Opened') . '</span>',
+            (int) $item->closed === 1 ?
+                '<span class="badge badge-danger">'.__('Closed').'</span>' : '<span class="badge badge-success">'.__('Opened').'</span>',
             'html' => true, '!secure' => true],
         ['text' => $item->answers()->count()],
         ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)],

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

Indentation +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 if (!(bool)$post->closed && \App::$User->isAuth()) {
     $user = App::$User->identity();
     if ((int)$user->getId() === (int)$post->user_id) {
-       echo Url::a(['feedback/close', [$post->id, $post->hash]], __('Close request'), ['class' => 'btn btn-danger']);
+        echo Url::a(['feedback/close', [$post->id, $post->hash]], __('Close request'), ['class' => 'btn btn-danger']);
     }
 }
 ?>

Spacing +5 added lines, -5 removed lines

@@ -27,9 +27,9 @@ 
 <?php endif; ?>
 
 <?php
-if (!(bool)$post->closed && \App::$User->isAuth()) {
+if (!(bool) $post->closed && \App::$User->isAuth()) {
     $user = App::$User->identity();
-    if ((int)$user->getId() === (int)$post->user_id) {
+    if ((int) $user->getId() === (int) $post->user_id) {
        echo Url::a(['feedback/close', [$post->id, $post->hash]], __('Close request'), ['class' => 'btn btn-danger']);
     }
 }
@@ -50,7 +50,7 @@ 
 </div>
 <h3><?= __('Answers') ?></h3>
 <hr />
-<?php if (!(bool)$post->readed && (!$answers || $answers->count() < 1)): ?>
+<?php if (!(bool) $post->readed && (!$answers || $answers->count() < 1)): ?>
     <?= $this->bootstrap()->alert('warning', __('This message is not properly readed by website administrators')) ?>
 <?php endif; ?>
 
@@ -59,7 +59,7 @@ 
         <div class="row" id="feedback-answer-<?= $answer->id ?>">
             <div class="col-md-12">
                 <div class="card">
-                    <div class="card-header<?= (bool)$answer->is_admin ? ' bg-success' : null ?>">
+                    <div class="card-header<?= (bool) $answer->is_admin ? ' bg-success' : null ?>">
                         <strong><?= $answer->name ?> (<?= $answer->email ?>)</strong>,
                         <?= Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?>
                     </div>
@@ -73,7 +73,7 @@ 
 <?php endif; ?>
 
 <br />
-<?php if (!(bool)$post->closed && $model): ?>
+<?php if (!(bool) $post->closed && $model): ?>
     <h3><?= __('Add answer') ?></h3>
     <?php $form = $this->form($model) ?>
     <?= $form->start() ?>

Braces +10 added lines, -4 removed lines

@@ -22,9 +22,12 @@ 
 <h1><?= __('Feedback message #%id%', ['id' => $post->id]) ?></h1>
 <?php if (\App::$User->isAuth()): ?>
     <?= $this->insert('feedback/_authTabs') ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <hr />
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 <?php
 if (!(bool)$post->closed && \App::$User->isAuth()) {
@@ -85,8 +88,11 @@ 
     <?= $form->button()->submit(__('Add'), ['class' => 'btn btn-primary']) ?>
 
     <?= $form->stop() ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <?= $this->bootstrap()->alert('danger', __('This request is closed! No answers is allowed')) ?>
-<?php endif; ?>
+<?php endif;
+}
+?>
 
 <?php $this->stop() ?>

Apps/View/Front/default/feedback/_mail/created.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
                 <tbody>
                 <tr>
                     <td align="left" style="font-family:Helvetica Neue,Arial,Helvetica,sans-serif;padding-left:9px;font-size:14px;">
-                        <a href="<?= \App::$Alias->scriptUrl ?>/feedback/read/<?= $record->id . '/' . $record->hash ?>">
+                        <a href="<?= \App::$Alias->scriptUrl ?>/feedback/read/<?= $record->id.'/'.$record->hash ?>">
                             <?= __('View request') ?>
                         </a>
                     </td>

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'],
@@ -71,7 +71,7 @@ 
 <?php foreach ($model->items as $item): ?>
     <article class="article-item" itemscope="itemscope" itemtype="https://schema.org/NewsArticle">
         <h2 itemprop="name">
-            <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                 <?= $item['title'] ?>
             </a>
             <?php if ($item['important']): ?>
@@ -101,7 +101,7 @@ 
                         <?php
                         $ownerNick = $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

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" 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/profile/show.php

Spacing +10 added lines, -10 removed lines

@@ -20,10 +20,10 @@ 
 $name = $user->profile->getNickname();
 
 $this->layout('_layouts/default', [
-    'title' => __('Profile') . ': ' . $name,
+    'title' => __('Profile').': '.$name,
     'breadcrumbs' => [
         Url::to('/') => __('Home'),
-        __('Profile') . ': ' . $name
+        __('Profile').': '.$name
     ]
 ]);
 
@@ -43,7 +43,7 @@ 
         <img src="<?= $user->profile->getAvatarUrl('big') ?>" class="img-fluid img-thumbnail" />
         <?php if ($ratingOn):
             $rateClass = 'btn-secondary';
-            $rateValue = (int)$user->profile->rating;
+            $rateValue = (int) $user->profile->rating;
             if ($user->profile->rating > 0) {
                 $rateClass = 'btn-info';
             } elseif ($user->profile->rating < 0) {
@@ -80,11 +80,11 @@ 
         <?php
         $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);
         if ($isSelf) {
-            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> ' . __('Feed'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true]);
-            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]);
-        } else if(\App::$User->isAuth()) {
+            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> '.__('Feed'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true]);
+            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]);
+        } else if (\App::$User->isAuth()) {
             $userMenu->menu(['link' => ['profile/messages', null, ['newdialog' => $user->id]], 'text' => __('Write message')]);
             $userMenu->menu(['link' => ['profile/ignore', null, ['id' => $user->id]], 'text' => __('Block')]);
         }
@@ -160,7 +160,7 @@ 
                             foreach ($hobbyArray as $item) {
                                 $item = \App::$Security->strip_tags($item);
                                 if (!Str::likeEmpty($item)) {
-                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']) . ' ';
+                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']).' ';
                                 }
                             }
                             ?>
@@ -213,7 +213,7 @@ 
                     <div class="col-xs-8 col-md-10">
                         <div class="h5" style="margin-top: 0;margin-bottom: 5px;">
                             <i class="glyphicon glyphicon-user"></i>
-                            <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?>
+                            <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?>
                             <small class="float-right"><?= Date::humanize($post->updated_at); ?></small>
                         </div>
                         <div class="object-text">

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

Spacing +1 added lines, -1 removed lines

@@ -7,5 +7,5 @@
 ?>
 
 <?php foreach ($records as $row) {
-    echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']) . ' ';
+    echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']).' ';
 }
\ No newline at end of file