phpffcms / ffcms

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

Spacing +4 added lines, -4 removed lines

@@ -2,7 +2,7 @@ 
 /** @var array $configs */
 ?>
 
-<?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"><?= __('All guest comments will be moderated before display') ?></p>
 <?php endif; ?>
 
@@ -34,7 +34,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="hidden"></div>
     <div class="row hidden" id="add-replay-to">
@@ -57,12 +57,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 ((int)$configs['guestAdd'] === 1 || \App::$User->isAuth()): ?>
+<?php if ((int) $configs['guestAdd'] === 1 || \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" />

Braces +5 added lines, -2 removed lines

@@ -71,9 +71,12 @@
         <span><i class="fa fa-eye"></i><?= $model->views ?></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-o"></i> <?= __('This content is placed in trash') ?></p>
     <?php endif; ?>

Apps/ActiveRecord/CommentPost.php

Spacing +3 added lines, -3 removed lines

@@ -45,15 +45,15 @@
     public function getAnswerCount()
     {
         // check if count is cached
-        if (MainApp::$Memory->get('commentpost.answer.count.' . $this->id) !== null) {
-            return MainApp::$Memory->get('commentpost.answer.count.' . $this->id);
+        if (MainApp::$Memory->get('commentpost.answer.count.'.$this->id) !== null) {
+            return MainApp::$Memory->get('commentpost.answer.count.'.$this->id);
         }
         // get count from db
         $count = CommentAnswer::where('comment_id', '=', $this->id)
             ->where('moderate', '=', 0)
             ->count();
         // save in cache
-        MainApp::$Memory->set('commentpost.answer.count.' . $this->id, $count);
+        MainApp::$Memory->set('commentpost.answer.count.'.$this->id, $count);
         return $count;
     }
 

Apps/Model/Api/Comments/CommentPostAdd.php

Spacing +4 added lines, -4 removed lines

@@ -57,7 +57,7 @@ 
     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'));
         }
 
@@ -67,7 +67,7 @@ 
         }
 
         // 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'));
@@ -114,7 +114,7 @@ 
         $record->message = $this->message;
         $record->lang = App::$Request->getLanguage();
         // check if premoderation 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/View/Admin/default/comments/answer_list.php

Spacing +8 added lines, -8 removed lines

@@ -27,7 +27,7 @@ 
 
 <?php
 if ($records === null || $records->count() < 1) {
-    echo '<p class="alert alert-warning">' . __('Answers is not founded') . '</p>';
+    echo '<p class="alert alert-warning">'.__('Answers is not founded').'</p>';
     return;
 }
 $items = [];
@@ -36,21 +36,21 @@ 
     $commentObject = $item->getCommentPost();
     $message = Text::cut(\App::$Security->strip_tags($item->message), 0, 75);
 
-    $moderate = (bool)$item->moderate;
+    $moderate = (bool) $item->moderate;
     if ($moderate) {
         $moderateIsFound = true;
     }
 
     $items[] = [
         1 => ['text' => $item->id],
-        2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . Url::link(['comments/read', $commentObject->id, null, ['#' => '#answer-' . $item->id]], $message), 'html' => true],
-        3 => ['text' => Simplify::parseUserLink((int)$item->user_id, $item->guest_name, 'user/update'), 'html' => true],
-        4 => ['text' => '<a href="' . App::$Alias->scriptUrl . $commentObject->pathway . '" target="_blank">' . Str::sub($commentObject->pathway, 0, 20) . '...</a>', 'html' => true],
+        2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['comments/read', $commentObject->id, null, ['#' => '#answer-'.$item->id]], $message), 'html' => true],
+        3 => ['text' => Simplify::parseUserLink((int) $item->user_id, $item->guest_name, 'user/update'), 'html' => true],
+        4 => ['text' => '<a href="'.App::$Alias->scriptUrl.$commentObject->pathway.'" target="_blank">'.Str::sub($commentObject->pathway, 0, 20).'...</a>', 'html' => true],
         5 => ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)],
-        6 => ['text' => Url::link(['comments/read', $commentObject->id], '<i class="fa fa-list fa-lg"></i>') .
-            ' ' . Url::link(['comments/delete', 'answer', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'),
+        6 => ['text' => Url::link(['comments/read', $commentObject->id], '<i class="fa fa-list fa-lg"></i>').
+            ' '.Url::link(['comments/delete', 'answer', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'),
             'html' => true, 'property' => ['class' => 'text-center']],
-        'property' => ['class' => 'checkbox-row' . ($moderate !== false ? ' alert-warning' : null)]
+        'property' => ['class' => 'checkbox-row'.($moderate !== false ? ' alert-warning' : null)]
     ];
 }
 

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

Spacing +8 added lines, -8 removed lines

@@ -26,7 +26,7 @@ 
 
 <?php
 if ($records === null || $records->count() < 1) {
-    echo '<p class="alert alert-warning">' . __('Comments is not founded') . '</p>';
+    echo '<p class="alert alert-warning">'.__('Comments is not founded').'</p>';
     return;
 }
 $items = [];
@@ -34,7 +34,7 @@ 
 foreach ($records as $item) {
     $message = Text::cut(\App::$Security->strip_tags($item->message), 0, 75);
 
-    $moderate = (bool)$item->moderate;
+    $moderate = (bool) $item->moderate;
     // if even one moderate item is found - change global flag to true
     if ($moderate) {
         $moderateIsFound = true;
@@ -42,16 +42,16 @@ 
 
     $items[] = [
         1 => ['text' => $item->id],
-        2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null) . Url::link(['comments/read', $item->id], $message), 'html' => true],
+        2 => ['text' => ($moderate ? '<i class="fa fa-exclamation text-warning"></i> ' : null).Url::link(['comments/read', $item->id], $message), 'html' => true],
         3 => ['text' => $item->getAnswerCount()],
-        4 => ['text' => Simplify::parseUserLink((int)$item->user_id, $item->guest_name, 'user/update'), 'html' => true],
-        5 => ['text' => '<a href="' . App::$Alias->scriptUrl . $item->pathway . '" target="_blank">' . Str::sub($item->pathway, 0, 20) . '...</a>', 'html' => true],
+        4 => ['text' => Simplify::parseUserLink((int) $item->user_id, $item->guest_name, 'user/update'), 'html' => true],
+        5 => ['text' => '<a href="'.App::$Alias->scriptUrl.$item->pathway.'" target="_blank">'.Str::sub($item->pathway, 0, 20).'...</a>', 'html' => true],
         6 => ['text' => Date::convertToDatetime($item->created_at, Date::FORMAT_TO_HOUR)],
-        7 => ['text' => Url::link(['comments/read', $item->id], '<i class="fa fa-list fa-lg"></i>') .
-            ' ' . Url::link(['comments/delete', 'comment', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'),
+        7 => ['text' => Url::link(['comments/read', $item->id], '<i class="fa fa-list fa-lg"></i>').
+            ' '.Url::link(['comments/delete', 'comment', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'),
             'html' => true, 'property' => ['class' => 'text-center']],
         'property' => [
-            'class' => 'checkbox-row' . ($moderate !== false ? ' alert-warning' : null)
+            'class' => 'checkbox-row'.($moderate !== false ? ' alert-warning' : null)
         ]
     ];
 }

Apps/View/Admin/default/comments/comment_read.php

Spacing +6 added lines, -6 removed lines

@@ -29,16 +29,16 @@ 
             $author = Url::link(['user/update', $record->user_id], $author);
         }
         ?>
-        <?= $author . ', ' . Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR)  ?>
+        <?= $author.', '.Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR)  ?>
         <div class="pull-right">
-        	<?php if ((bool)$record->moderate):?>
+        	<?php if ((bool) $record->moderate):?>
         		<?= Url::link(['comments/publish', 'comment', $record->id], __('Publish'), ['class' => 'label label-warning']) ?>
         	<?php endif; ?>
             <?= Url::link(['comments/edit', 'comment', $record->id], __('Edit'), ['class' => 'label label-primary']) ?>
             <?= Url::link(['comments/delete', 'comment', $record->id], __('Delete'), ['class' => 'label label-danger']) ?>
         </div>
     </div>
-    <div class="panel-body<?= ((bool)$record->moderate ? ' text-warning' : null)?>">
+    <div class="panel-body<?= ((bool) $record->moderate ? ' text-warning' : null)?>">
         <?= $record->message ?>
     </div>
 </div>
@@ -59,16 +59,16 @@ 
         <?php
         $answerAuthor = Simplify::parseUserLink($answer->user_id, $answer->guest_name, 'user/update');
         ?>
-        <?= $answerAuthor . ', ' . Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?>
+        <?= $answerAuthor.', '.Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?>
         <div class="pull-right">
-            <?php if ((bool)$answer->moderate):?>
+            <?php if ((bool) $answer->moderate):?>
         		<?= Url::link(['comments/publish', 'answer', $answer->id], __('Publish'), ['class' => 'label label-warning']) ?>
         	<?php endif; ?>
             <?= Url::link(['comments/edit', 'answer', $answer->id], __('Edit'), ['class' => 'label label-primary']) ?>
             <?= Url::link(['comments/delete', 'answer', $answer->id], __('Delete'), ['class' => 'label label-danger']) ?>
         </div>
     </div>
-    <div class="panel-body<?= ((bool)$answer->moderate ? ' text-warning' : null)?>">
+    <div class="panel-body<?= ((bool) $answer->moderate ? ' text-warning' : null)?>">
         <?= $answer->message ?>
     </div>
 </div>

Widgets/Front/Newcomment/Newcomment.php

Doc Comments +1 added lines, -1 removed lines

@@ -78,7 +78,7 @@
     
     /**
      * Make query to database
-     * @return object
+     * @return string
      */
     private function makeQuery()
     {

Spacing +2 added lines, -2 removed lines

@@ -39,7 +39,7 @@ 
     	    $this->cache = $cfg['cache'];
     	}
 
-        $this->_cacheName = 'widget.newcomment.' . $this->createStringClassSnapshotHash();
+        $this->_cacheName = 'widget.newcomment.'.$this->createStringClassSnapshotHash();
     }
 
     /**
@@ -53,7 +53,7 @@ 
     {
         // work with cache and make query
         $records = null;
-        if ((int)$this->cache > 0) {
+        if ((int) $this->cache > 0) {
             if (App::$Cache->get($this->_cacheName) !== null) {
                 $records = App::$Cache->get($this->_cacheName);
             } else {

Indentation +19 added lines, -19 removed lines

@@ -22,23 +22,23 @@ 
 
     private $_cacheName;
 
-	/**
-	 * Set default configs if not passed
-	 * {@inheritDoc}
-	 * @see \Ffcms\Core\Arch\Widget::init()
-	 */
+    /**
+     * Set default configs if not passed
+     * {@inheritDoc}
+     * @see \Ffcms\Core\Arch\Widget::init()
+     */
     public function init()
     {
-    	$cfg = $this->getConfigs();
-    	if ($this->snippet === null) {
-    	    $this->snippet = $cfg['snippet'];
-    	}
-    	if ($this->count === null) {
-    	    $this->count = $cfg['count'];
-    	}
-    	if ($this->cache === null) {
-    	    $this->cache = $cfg['cache'];
-    	}
+        $cfg = $this->getConfigs();
+        if ($this->snippet === null) {
+            $this->snippet = $cfg['snippet'];
+        }
+        if ($this->count === null) {
+            $this->count = $cfg['count'];
+        }
+        if ($this->cache === null) {
+            $this->cache = $cfg['cache'];
+        }
         if ($this->lang === null) {
             $this->lang = App::$Request->getLanguage();
         }
@@ -74,10 +74,10 @@ 
         }
 
         // render view
-    	return App::$View->render('widgets/newcomment/default', [
-    	    'records' => $records,
-    	    'snippet' => $this->snippet
-    	]);
+        return App::$View->render('widgets/newcomment/default', [
+            'records' => $records,
+            'snippet' => $this->snippet
+        ]);
     }
 
     /**

Apps/Model/Api/Comments/EntityCommentData.php

Spacing +3 added lines, -3 removed lines

@@ -30,7 +30,7 @@ 
     public function __construct($record, $calcAnswers = true)
     {
         $this->_record = $record;
-        $this->_calcAnswers = (bool)$calcAnswers;
+        $this->_calcAnswers = (bool) $calcAnswers;
         if ($this->_record instanceof CommentPost) {
             $this->_type = 'post';
         } elseif ($this->_record instanceof CommentAnswer) {
@@ -53,7 +53,7 @@ 
 
         // build user data
         $userName = __('Unknown');
-        $userAvatar = App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
+        $userAvatar = App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg';
         $userObject = $this->_record->getUser();
         if ($userObject !== null) {
             $userName = $userObject->getProfile()->getNickname();
@@ -71,7 +71,7 @@ 
             'text' => $this->_record->message,
             'date' => Date::convertToDatetime($this->_record->created_at, Date::FORMAT_TO_HOUR),
             'pathway' => $this->_record->pathway,
-            'moderate' => (int)$this->_record->moderate,
+            'moderate' => (int) $this->_record->moderate,
             'user' => [
                 'id' => $this->_record->user_id,
                 'name' => $userName,

Apps/Model/Front/Content/FormNarrowContentUpdate.php

Indentation +8 added lines, -8 removed lines

@@ -44,8 +44,8 @@ 
     }
 
     /**
-    * Set default values from database record
-    */
+     * Set default values from database record
+     */
     public function before()
     {
         // set data from db record
@@ -85,9 +85,9 @@ 
     }
 
     /**
-    * Form labels
-    * @return array
-    */
+     * Form labels
+     * @return array
+     */
     public function labels()
     {
         return [
@@ -100,9 +100,9 @@ 
     }
 
     /**
-    * Content update form validation rules
-    * @return array
-    */
+     * Content update form validation rules
+     * @return array
+     */
     public function rules()
     {
         $r = [

Spacing +18 added lines, -18 removed lines

@@ -57,13 +57,13 @@ 
         // set current user id
         $this->authorId = App::$User->identity()->getId();
         // set true if it is a new content item
-        if ($this->_record->id === null || (int)$this->_record->id < 1) {
+        if ($this->_record->id === null || (int) $this->_record->id < 1) {
             $this->_new = true;
         }
 
         // set random path slug if not defined
         if ($this->path === null || Str::likeEmpty($this->path)) {
-            $randPath = date('d-m-Y') . '-' . Str::randomLatin(mt_rand(8,12));
+            $randPath = date('d-m-Y').'-'.Str::randomLatin(mt_rand(8, 12));
             $this->path = Str::lowerCase($randPath);
         }
     }
@@ -107,21 +107,21 @@ 
     {
         $r = [
             [['path', 'categoryId'], 'required'],
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required', null, true, true],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required', null, true, true],
             ['text', 'used', null, true, true],
             ['path', 'direct_match', '/^[a-zA-Z0-9\-]+$/'],
             ['categoryId', 'in', $this->categoryIds()],
             ['path', 'Apps\Model\Front\Content\FormNarrowContentUpdate::validatePath'],
             ['poster', 'used'],
             ['poster', 'isFile', ['jpg', 'png', 'gif', 'jpeg']],
-            ['poster', 'sizeFile', (int)$this->_configs['gallerySize'] * 1024] // in bytes
+            ['poster', 'sizeFile', (int) $this->_configs['gallerySize'] * 1024] // in bytes
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $r[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $r[] = ['keywords.' . $lang, 'length_max', 150];
-            $r[] = ['description.' . $lang, 'length_max', 250];
+            $r[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $r[] = ['keywords.'.$lang, 'length_max', 150];
+            $r[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $r;
@@ -136,9 +136,9 @@ 
         $this->_record->title = Serialize::encode(App::$Security->strip_tags($this->title));
         $this->_record->text = Serialize::encode(App::$Security->secureHtml($this->text));
         $this->_record->path = $this->path;
-        $this->_record->category_id = (int)$this->categoryId;
+        $this->_record->category_id = (int) $this->categoryId;
         $this->_record->display = 0; // set to premoderation
-        $this->_record->author_id = (int)$this->authorId;
+        $this->_record->author_id = (int) $this->authorId;
         if ($this->_new === true) {
             $this->_record->comment_hash = $this->generateCommentHash();
         }
@@ -148,8 +148,8 @@ 
         // work with poster data
         if ($this->poster !== null) {
             // lets move poster from tmp to gallery
-            $originDir = '/upload/gallery/' . $this->_record->id . '/orig/';
-            $thumbDir = '/upload/gallery/' . $this->_record->id . '/thumb/';
+            $originDir = '/upload/gallery/'.$this->_record->id.'/orig/';
+            $thumbDir = '/upload/gallery/'.$this->_record->id.'/thumb/';
             if (!Directory::exist($originDir)) {
                 Directory::create($originDir);
             }
@@ -157,17 +157,17 @@ 
                 Directory::create($thumbDir);
             }
 
-            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName() . $this->poster->getSize());
-            $newFullName = $fileName . '.' . $this->poster->guessExtension();
+            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName().$this->poster->getSize());
+            $newFullName = $fileName.'.'.$this->poster->guessExtension();
             // move poster to upload gallery directory
             $this->poster->move(Normalize::diskFullPath($originDir), $newFullName);
             // initialize image resizer
             $thumb = new Image();
-            $thumb->setCacheDir(root . '/Private/Cache/images');
+            $thumb->setCacheDir(root.'/Private/Cache/images');
 
             // open original file, resize it and save
-            $thumbSaveName = Normalize::diskFullPath($thumbDir) . '/' . $fileName . '.jpg';
-            $thumb->open(Normalize::diskFullPath($originDir) . DIRECTORY_SEPARATOR . $newFullName)
+            $thumbSaveName = Normalize::diskFullPath($thumbDir).'/'.$fileName.'.jpg';
+            $thumb->open(Normalize::diskFullPath($originDir).DIRECTORY_SEPARATOR.$newFullName)
                 ->cropResize($this->_configs['galleryResize'])
                 ->save($thumbSaveName, 'jpg', 90);
             $thumb = null;
@@ -187,7 +187,7 @@ 
         $data = ContentCategory::getSortedCategories();
         $response = [];
         foreach ($data as $key=>$val) {
-            $response[] = (string)$key;
+            $response[] = (string) $key;
         }
         return $response;
     }