phpffcms / ffcms

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

Braces +5 added lines, -2 removed lines

@@ -24,9 +24,12 @@
 			<li><i class="fa fa-user"></i>
 			<?php if ((int)$data['user']['id'] > 0): ?>
 				<?= Url::link(['profile/show', $data['user']['id']], $data['user']['name']) ?>
-			<?php else: ?>
+			<?php else {
+    : ?>
 				<?= $data['user']['name'] ?>
-			<?php endif; ?>
+			<?php endif;
+}
+?>
 			</li>
 		</ul>
 	</li>

Spacing +2 added lines, -2 removed lines

@@ -22,7 +22,7 @@ 
 		<ul class="list-inline list-info">
 			<li><i class="fa fa-calendar"></i> <?= $data['date'] ?></li>
 			<li><i class="fa fa-user"></i>
-			<?php if ((int)$data['user']['id'] > 0): ?>
+			<?php if ((int) $data['user']['id'] > 0): ?>
 				<?= Url::link(['profile/show', $data['user']['id']], $data['user']['name']) ?>
 			<?php else: ?>
 				<?= $data['user']['name'] ?>
@@ -35,7 +35,7 @@ 
 			<img class="media-object img-responsive" src="<?= $data['user']['avatar']?>" style="width: 64px; height: 64px;" alt="Picture of user <?= $data['user']['name'] ?>">
 		</span>
 		<div class="media-body">
-			<a href="<?= \App::$Alias->baseUrl . $data['pathway'] . '#comment-list' ?>">
+			<a href="<?= \App::$Alias->baseUrl.$data['pathway'].'#comment-list' ?>">
 				<?= \App::$Security->strip_tags($data['text']) ?>
 			</a>
 		</div>

Unused Use Statements -1 removed lines

@@ -1,6 +1,5 @@
 <?php
 use Ffcms\Core\Helper\Date;
-use Ffcms\Core\Helper\Text;
 use Ffcms\Core\Helper\Url;
 use Apps\Model\Api\Comments\EntityCommentData;
 

Apps/ActiveRecord/User.php

Doc Comments +2 added lines, -2 removed lines

@@ -160,7 +160,7 @@ 
     /**
      * Get user person like a object via email
      * @param string $email
-     * @return null|static
+     * @return null|ActiveModel
      */
     public static function getIdentityViaEmail($email)
     {
@@ -209,7 +209,7 @@ 
 
     /**
      * Get user logs
-     * @return \Apps\ActiveRecord\UserLog
+     * @return \Illuminate\Database\Eloquent\Relations\HasMany
      */
     public function getLogs()
     {

Spacing +10 added lines, -10 removed lines

@@ -35,15 +35,15 @@ 
         }
 
         // convert id to real integer
-        $user_id = (int)$user_id;
+        $user_id = (int) $user_id;
 
         if (!Obj::isInt($user_id) || $user_id < 1) {
             return null;
         }
 
         // check in memory cache object
-        if (MainApp::$Memory->get('user.object.cache.' . $user_id) !== null) {
-            return MainApp::$Memory->get('user.object.cache.' . $user_id);
+        if (MainApp::$Memory->get('user.object.cache.'.$user_id) !== null) {
+            return MainApp::$Memory->get('user.object.cache.'.$user_id);
         }
         // not founded in memory? lets make query
         $user = self::find($user_id);
@@ -53,7 +53,7 @@ 
         }
 
         // store cache and return object
-        MainApp::$Memory->set('user.object.cache.' . $user->id, $user);
+        MainApp::$Memory->set('user.object.cache.'.$user->id, $user);
         return $user;
     }
 
@@ -63,7 +63,7 @@ 
      */
     public function getId()
     {
-        return (int)$this->id;
+        return (int) $this->id;
     }
 
     /**
@@ -84,7 +84,7 @@ 
     public static function isAuth()
     {
         // get data from session
-        $sessionUserId = (int)MainApp::$Session->get('ff_user_id', 0);
+        $sessionUserId = (int) MainApp::$Session->get('ff_user_id', 0);
 
         // check if session contains user id data
         if ($sessionUserId < 1) {
@@ -103,7 +103,7 @@ 
             return false;
         }
 
-        return ((int)$identity->id > 0 && (int)$identity->id === $sessionUserId);
+        return ((int) $identity->id > 0 && (int) $identity->id === $sessionUserId);
     }
 
     /**
@@ -118,12 +118,12 @@ 
         }
 
         // convert id to real integer
-        $id = (int)$id;
+        $id = (int) $id;
 
-        $find = MainApp::$Memory->get('user.counter.cache.' . $id);
+        $find = MainApp::$Memory->get('user.counter.cache.'.$id);
         if ($find === null) {
             $find = self::where('id', '=', $id)->count();
-            MainApp::$Memory->set('user.counter.cache.' . $id, $find);
+            MainApp::$Memory->set('user.counter.cache.'.$id, $find);
         }
 
         return $find === 1;

Apps/Controller/Front/User.php

Unused Use Statements -1 removed lines

@@ -14,7 +14,6 @@
 use Ffcms\Core\Exception\NotFoundException;
 use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
-use Apps\ActiveRecord\UserLog;
 
 /**
  * Class User - standard user controller: login/signup/logout/etc

Indentation +3 added lines, -3 removed lines

@@ -54,7 +54,7 @@ 
             App::$Session->getFlashBag()->add('error', __('User is never exist or password is incorrect!'));
             // initialize fail event
             App::$Event->run(static::EVENT_USER_LOGIN_FAIL, [
-               'model' => $loginForm
+                'model' => $loginForm
             ]);
         }
 
@@ -114,14 +114,14 @@ 
             if ($registerForm->tryRegister($configs['registrationType'] === 1)) {
                 // initialize succes signup event
                 App::$Event->run(static::EVENT_USER_REGISTER_SUCCESS, [
-                   'model' => $registerForm
+                    'model' => $registerForm
                 ]);
                 // send notification of successful registering
                 App::$Session->getFlashBag()->add('success', __('Your account is registered. You must confirm account via email'));
             } else {
                 // init fail signup event
                 App::$Event->run(static::EVENT_USER_REGISTER_FAIL, [
-                   'model' => $registerForm
+                    'model' => $registerForm
                 ]);
                 App::$Session->getFlashBag()->add('error', __('Login or email is always used on website'));
             }

Widgets/Front/Contenttag/Contenttag.php

Doc Comments +1 added lines, -1 removed lines

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

Indentation +31 added lines, -31 removed lines

@@ -10,18 +10,18 @@ 
 
 class Contenttag extends AbstractWidget
 {
-	use OopTools;
+    use OopTools;
 
-	public $count;
-	public $cache;
+    public $count;
+    public $cache;
 
-	public $tpl = 'widgets/contenttag/default';
+    public $tpl = 'widgets/contenttag/default';
 
-	/**
-	 * Set default configurations if not defined
-	 * {@inheritDoc}
-	 * @see \Ffcms\Core\Arch\Widget::init()
-	 */
+    /**
+     * Set default configurations if not defined
+     * {@inheritDoc}
+     * @see \Ffcms\Core\Arch\Widget::init()
+     */
     public function init()
     {
         $cfg = $this->getConfigs();
@@ -43,29 +43,29 @@ 
     public function display()
     {
         // get special properties hash
-    	$classHash = $this->createStringClassSnapshotHash();
+        $classHash = $this->createStringClassSnapshotHash();
 
-    	// get records rows from cache or directly from db
-    	$records = null;
-    	if ($this->cache === 0) {
-    	    $records = $this->makeQuery();
-    	} else {
-    	    $records = App::$Cache->get('widget.contenttag.' . $classHash);
-    	    if ($records === null) {
-    	        $records = $this->makeQuery();
-    	        App::$Cache->set('widget.contenttag' . $classHash, $records, $this->cache);
-    	    }
-    	}
+        // get records rows from cache or directly from db
+        $records = null;
+        if ($this->cache === 0) {
+            $records = $this->makeQuery();
+        } else {
+            $records = App::$Cache->get('widget.contenttag.' . $classHash);
+            if ($records === null) {
+                $records = $this->makeQuery();
+                App::$Cache->set('widget.contenttag' . $classHash, $records, $this->cache);
+            }
+        }
 
-    	// check if result is not empty
+        // check if result is not empty
         if ($records === null || $records->count() < 1) {
             return __('Content tags is not found');
         }
 
         // render view
-    	return App::$View->render($this->tpl, [
-    	    'records' => $records
-    	]);
+        return App::$View->render($this->tpl, [
+            'records' => $records
+        ]);
     }
 
     /**
@@ -75,11 +75,11 @@ 
     private function makeQuery()
     {
         return TagRecord::select([
-    	    App::$Database->getConnection()->raw('SQL_CALC_FOUND_ROWS tag'),
-    	    App::$Database->getConnection()->raw('COUNT(*) AS count')
-    	])->groupBy('tag')
-        	->orderBy('count', 'DESC')
-        	->take($this->count)
-        	->get();
+            App::$Database->getConnection()->raw('SQL_CALC_FOUND_ROWS tag'),
+            App::$Database->getConnection()->raw('COUNT(*) AS count')
+        ])->groupBy('tag')
+            ->orderBy('count', 'DESC')
+            ->take($this->count)
+            ->get();
     }
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -27,11 +27,11 @@ 
         $cfg = $this->getConfigs();
         // check cache is defined
         if ($this->cache === null || !Obj::isLikeInt($this->cache)) {
-            $this->cache = (int)$cfg['cache'];
+            $this->cache = (int) $cfg['cache'];
         }
         // check tag count is defined
         if ($this->count === null || !Obj::isLikeInt($this->count)) {
-            $this->count = (int)$cfg['count'];
+            $this->count = (int) $cfg['count'];
         }
     }
 
@@ -50,10 +50,10 @@ 
     	if ($this->cache === 0) {
     	    $records = $this->makeQuery();
     	} else {
-    	    $records = App::$Cache->get('widget.contenttag.' . $classHash);
+    	    $records = App::$Cache->get('widget.contenttag.'.$classHash);
     	    if ($records === null) {
     	        $records = $this->makeQuery();
-    	        App::$Cache->set('widget.contenttag' . $classHash, $records, $this->cache);
+    	        App::$Cache->set('widget.contenttag'.$classHash, $records, $this->cache);
     	    }
     	}
 

Widgets/Front/Newcomment/Newcomment.php

Indentation +22 added lines, -22 removed lines

@@ -14,27 +14,27 @@ 
 {
     use OopTools;
 
-	public $snippet;
-	public $count;
-	public $cache;
+    public $snippet;
+    public $count;
+    public $cache;
 
-	/**
-	 * 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'];
+        }
     }
 
     /**
@@ -63,10 +63,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
+        ]);
     }
 
     /**

Doc Comments +1 added lines, -1 removed lines

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

Spacing +4 added lines, -4 removed lines

@@ -50,12 +50,12 @@
 
         // work with cache and make query
         $records = null;
-        if ((int)$this->cache > 0) {
-            if (App::$Cache->get('widget.newcomment.' . $classHash) !== null) {
-                $records = App::$Cache->get('widget.newcomment.' . $classHash);
+        if ((int) $this->cache > 0) {
+            if (App::$Cache->get('widget.newcomment.'.$classHash) !== null) {
+                $records = App::$Cache->get('widget.newcomment.'.$classHash);
             } else {
                 $records = $this->makeQuery();
-                App::$Cache->set('widget.newcomment.' . $classHash, $records, $this->cache);
+                App::$Cache->set('widget.newcomment.'.$classHash, $records, $this->cache);
             }
         } else {
             $records = $this->makeQuery();

Apps/Model/Api/Comments/CommentPostAdd.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Ffcms\Core\Exception\JsonException;
 use Ffcms\Core\Helper\Date;
 use Ffcms\Core\Helper\Type\Str;
-use Ffcms\Core\Exception\ForbiddenException;
 
 /**
  * Class CommentPostAdd. Model to parse and insert input comment post data.

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/feedback/index.php

Spacing +5 added lines, -6 removed lines

@@ -23,7 +23,7 @@ 
 <h1><?= __('Feedback list') ?></h1>
 <hr />
 <?php if ($records === null || $records->count() < 1) {
-    echo '<p class="alert alert-warning">' . __('Feedback requests is empty now!') . '</p>';
+    echo '<p class="alert alert-warning">'.__('Feedback requests is empty now!').'</p>';
     return;
 }
 
@@ -31,17 +31,16 @@ 
 foreach ($records as $item) {
     /** @var \Apps\ActiveRecord\FeedbackPost $item*/
     $items[] = [
-        ['text' => $item->id . ((int)$item->readed !== 1 ? ' <i class="fa fa-bell alert-info"></i>'  : null), 'html' => true],
+        ['text' => $item->id.((int) $item->readed !== 1 ? ' <i class="fa fa-bell alert-info"></i>' : null), 'html' => true],
         ['text' => Url::link(['feedback/read', $item->id], Text::snippet($item->message, 40, false)), 'html' => true],
         ['text' => $item->getAnswers()->count()],
         ['text' => $item->email],
         ['text' =>
-            (int)$item->closed === 1 ?
-                '<span class="label label-danger">' . __('Closed') . '</span>' :
-                '<span class="label label-success">' . __('Opened') . '</span>',
+            (int) $item->closed === 1 ?
+                '<span class="label label-danger">'.__('Closed').'</span>' : '<span class="label label-success">'.__('Opened').'</span>',
             'html' => true, '!secure' => true],
         ['text' => Date::convertToDatetime($item->updated_at, Date::FORMAT_TO_HOUR)],
-        ['text' => Url::link(['feedback/read', $item->id], '<i class="fa fa-list fa-lg"></i> ') .
+        ['text' => Url::link(['feedback/read', $item->id], '<i class="fa fa-list fa-lg"></i> ').
             Url::link(['feedback/delete', 'post', $item->id], '<i class="fa fa-trash-o fa-lg"></i>'),
             'html' => true, 'property' => ['class' => 'text-center']]
     ];

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