phpffcms / ffcms

Apps/Model/Admin/Content/FormContentUpdate.php

Unused Use Statements -1 removed lines

@@ -9,7 +9,6 @@
 use Ffcms\Core\Helper\Date;
 use Ffcms\Core\Helper\FileSystem\Directory;
 use Ffcms\Core\Helper\FileSystem\File;
-use Ffcms\Core\Helper\Type\Integer;
 use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Serialize;
 use Ffcms\Core\Helper\Type\Str;

Spacing +11 added lines, -11 removed lines

@@ -59,7 +59,7 @@ 
         if ($this->_content->id === null) {
             $this->_new = true;
             if (null === $this->galleryFreeId) {
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
             }
             if (null === $this->authorId) {
                 $this->authorId = App::$User->identity()->getId();
@@ -91,8 +91,8 @@ 
     public function rules()
     {
         $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'], 'required'],
@@ -105,9 +105,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;
@@ -163,8 +163,8 @@ 
         $this->_content->meta_description = Serialize::encode($this->metaDescription);
         $this->_content->source = $this->source;
         // 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) {
@@ -176,7 +176,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;
         }
@@ -211,7 +211,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }
 
@@ -224,7 +224,7 @@ 
         $data = ContentCategory::getSortedCategories();
         $response = [];
         foreach ($data as $key=>$val) {
-            $response[] = (string)$key;
+            $response[] = (string) $key;
         }
         return $response;
     }

Apps/Controller/Api/Profile.php

Indentation +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
         $findAnswer->delete();
 
         $this->response = json_encode([
-           'status' => 1,
+            'status' => 1,
             'message' => 'ok'
         ]);
     }

Unused Use Statements -1 removed lines

@@ -15,7 +15,6 @@
 use Ffcms\Core\Helper\Date;
 use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
-use Ffcms\Core\Interfaces\iUser;
 use Illuminate\Database\Capsule\Manager as Capsule;
 use Ffcms\Core\Exception\NativeException;
 use Ffcms\Core\Exception\ForbiddenException;

Spacing +13 added lines, -13 removed lines

@@ -160,7 +160,7 @@ 
             $answerTime = Date::convertToTimestamp($lastAnswer->created_at);
             $cfgs = \Apps\ActiveRecord\App::getConfigs('app', 'Profile');
             // hmm, maybe past less then delay required?
-            if ($now - (int)$cfgs['delayBetweenPost'] < $answerTime) {
+            if ($now - (int) $cfgs['delayBetweenPost'] < $answerTime) {
                 throw new ForbiddenException('Delay between answers not pass');
             }
         }
@@ -175,7 +175,7 @@ 
         // add notification for target user
         if ($viewer->id !== $target_id) {
             $notify = new EntityAddNotification($target_id);
-            $notify->add('/profile/show/' . $target_id . '#wall-post-' . $wallRow->id, EntityAddNotification::MSG_ADD_WALLANSWER, [
+            $notify->add('/profile/show/'.$target_id.'#wall-post-'.$wallRow->id, EntityAddNotification::MSG_ADD_WALLANSWER, [
                 'snippet' => Text::snippet($message, 50),
                 'post' => $wallRow->message
             ]);
@@ -219,7 +219,7 @@ 
         $postInfo = $findAnswer->getWallPost();
 
         // if not a target user of answer and not answer owner - lets throw exception
-        if($postInfo->target_id !== $viewer->id && $findAnswer->user_id !== $viewer->id) {
+        if ($postInfo->target_id !== $viewer->id && $findAnswer->user_id !== $viewer->id) {
             throw new ForbiddenException('Access declined!');
         }
 
@@ -280,7 +280,7 @@ 
             // sender is not myself? then i'm - target (remote user is sender user->to_me)
             if ($row->sender_id !== $user->id) {
                 $userList[] = $row->sender_id;
-                if ((int)$row->tread === 0) {
+                if ((int) $row->tread === 0) {
                     $unreadList[] = $row->sender_id;
                 }
             }
@@ -360,7 +360,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();
 
@@ -376,11 +376,11 @@ 
         switch ($queryType) {
             case 'after':
                 $messages = Message::where('id', '>', $queryId)
-                    ->where(function ($query) use ($cor_id, $user) {
-                        $query->where(function ($q) use ($cor_id, $user){
+                    ->where(function($query) use ($cor_id, $user) {
+                        $query->where(function($q) use ($cor_id, $user){
                             $q->where('target_id', '=', $user->getId())
                                 ->where('sender_id', '=', $cor_id);
-                        })->orWhere(function ($q) use ($cor_id, $user){
+                        })->orWhere(function($q) use ($cor_id, $user){
                             $q->where('target_id', '=', $cor_id)
                                 ->where('sender_id', '=', $user->getId());
                         });
@@ -388,11 +388,11 @@ 
                 break;
             case 'before':
                 $messages = Message::where('id', '<', $queryId)
-                    ->where(function ($query) use ($cor_id, $user) {
-                        $query->where(function ($q) use ($cor_id, $user){
+                    ->where(function($query) use ($cor_id, $user) {
+                        $query->where(function($q) use ($cor_id, $user){
                             $q->where('target_id', '=', $user->getId())
                                 ->where('sender_id', '=', $cor_id);
-                        })->orWhere(function ($q) use ($cor_id, $user){
+                        })->orWhere(function($q) use ($cor_id, $user){
                             $q->where('target_id', '=', $cor_id)
                                 ->where('sender_id', '=', $user->getId());
                         });
@@ -500,7 +500,7 @@ 
         $this->setJsonHeader();
 
         // get operation type and target user id
-        $target_id = (int)$this->request->get('target');
+        $target_id = (int) $this->request->get('target');
         $type = $this->request->get('type');
 
         // check type of query
@@ -515,7 +515,7 @@ 
 
         $cfg = \Apps\ActiveRecord\App::getConfigs('app', 'Profile');
         // check if rating is enabled for website
-        if ((int)$cfg['rating'] !== 1) {
+        if ((int) $cfg['rating'] !== 1) {
             throw new NativeException('Rating is disabled');
         }
 

Apps/Model/Front/Content/EntityContentRead.php

Indentation +1 added lines, -1 removed lines

@@ -57,7 +57,7 @@
     /**
      * Prepare model attributes from passed objects
      * @throws ForbiddenException
-    */
+     */
     public function before()
     {
         $this->title = Serialize::getDecodeLocale($this->_content->title);

Spacing +8 added lines, -8 removed lines

@@ -95,7 +95,7 @@ 
         }
 
         $this->source = $this->_content->source;
-        $this->views = $this->_content->views+1;
+        $this->views = $this->_content->views + 1;
         // check for dependence, add '' for general cat, ex: general/depend1/depend2/.../depend-n
         $catNestingArray = Arr::merge([0 => ''], explode('/', $this->catPath));
         if ($catNestingArray > 1) {
@@ -127,15 +127,15 @@ 
         ];
 
         // get gallery images and poster data
-        $galleryPath = '/upload/gallery/' . $this->_content->id;
+        $galleryPath = '/upload/gallery/'.$this->_content->id;
         // check if gallery folder is exist
         if (Directory::exist($galleryPath)) {
-            $originImages = File::listFiles($galleryPath . '/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
+            $originImages = File::listFiles($galleryPath.'/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
             // generate poster data
             if (Arr::in($this->_content->poster, $originImages)) {
                 // original poster
                 $posterName = $this->_content->poster;
-                $this->posterFull = $galleryPath . '/orig/' . $posterName;
+                $this->posterFull = $galleryPath.'/orig/'.$posterName;
                 if (!File::exist($this->posterFull)) {
                     $this->posterFull = null;
                 }
@@ -143,7 +143,7 @@ 
                 $posterSplit = explode('.', $posterName);
                 array_pop($posterSplit);
                 $posterCleanName = implode('.', $posterSplit);
-                $this->posterThumb = $galleryPath . '/thumb/' . $posterCleanName . '.jpg';
+                $this->posterThumb = $galleryPath.'/thumb/'.$posterCleanName.'.jpg';
                 if (!File::exist($this->posterThumb)) {
                     $this->posterThumb = null;
                 }
@@ -158,9 +158,9 @@ 
                 if (Str::startsWith($imageClearName, $this->_content->poster)) {
                     continue;
                 }
-                $thumbPath = $galleryPath . '/thumb/' . $imageClearName . '.jpg';
+                $thumbPath = $galleryPath.'/thumb/'.$imageClearName.'.jpg';
                 if (File::exist($thumbPath)) {
-                    $this->galleryItems[$thumbPath] = $galleryPath . '/orig/' . $image;
+                    $this->galleryItems[$thumbPath] = $galleryPath.'/orig/'.$image;
                 }
             }
         }
@@ -169,7 +169,7 @@ 
         $this->rating = $this->_content->rating;
         $ignoredRate = App::$Session->get('content.rate.ignore');
         $this->canRate = true;
-        if (Obj::isArray($ignoredRate) && Arr::in((string)$this->id, $ignoredRate)) {
+        if (Obj::isArray($ignoredRate) && Arr::in((string) $this->id, $ignoredRate)) {
             $this->canRate = false;
         }
         if (!App::$User->isAuth()) {

Apps/Model/Front/Profile/FormIgnoreAdd.php

Indentation +2 added lines, -2 removed lines

@@ -33,8 +33,8 @@
     }
 
     /**
-    * Validation rules
-    */
+     * Validation rules
+     */
     public function rules()
     {
         return [

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     public function save()
     {
         // check if target is myself or always exist in block list
-        if ($this->_user->getId() === (int)$this->id || Blacklist::have($this->_user->getId(), $this->id)) {
+        if ($this->_user->getId() === (int) $this->id || Blacklist::have($this->_user->getId(), $this->id)) {
             return false;
         }
 

Apps/Model/Front/Profile/FormWallPostDelete.php

Indentation +4 added lines, -4 removed lines

@@ -20,8 +20,8 @@ 
 
 
     /**
-    * Set post id based on post active record
-    */
+     * Set post id based on post active record
+     */
     public function before()
     {
         $this->id = $this->_post->id;
@@ -29,8 +29,8 @@ 
 
 
     /**
-    * Pseudo-rules, here is not required
-    */
+     * Pseudo-rules, here is not required
+     */
     public function rules()
     {
         return [];

Apps/View/Admin/default/application/turn.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             [['text' => __('Name')], ['text' => $app->getLocaleName()]],
             [['text' => __('System name')], ['text' => $app->sys_name]],
             [['text' => __('Last update')], ['text' => Date::convertToDatetime($app->updated_at, DATE::FORMAT_TO_SECONDS)]],
-            [['text' => __('Status')], ['text' => ((int)$app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' =>  ((int)$app->disabled === 0) ? 'alert-success' : 'alert-danger']]
+            [['text' => __('Status')], ['text' => ((int) $app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' =>  ((int) $app->disabled === 0) ? 'alert-success' : 'alert-danger']]
         ]
     ]
 ]); ?>

Apps/View/Admin/default/layout/main.php

Braces +5 added lines, -2 removed lines

@@ -188,13 +188,16 @@
                             <?php foreach ($this->breadcrumbs as $bUrl => $bText): ?>
                                 <?php if (Obj::isLikeInt($bUrl)): // only text ?>
                                     <li class="active"><?= \App::$Security->strip_tags($bText) ?></li>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     <li>
                                         <a href="<?= \App::$Security->strip_tags($bUrl) ?>">
                                             <?= \App::$Security->strip_tags($bText) ?>
                                         </a>
                                     </li>
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             <?php endforeach; ?>
                         </ol>
                     <?php endif; ?>

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
     <?php
     $customCssCode = \App::$View->showPlainCode('css');
     if ($customCssCode !== null) {
-        echo '<style>' . $customCssCode . '</style>';
+        echo '<style>'.$customCssCode.'</style>';
     } ?>
     <script>
         window.jQ = [];
@@ -130,11 +130,11 @@ 
                             'type' => 'ul',
                             'property' => ['class' => 'nav nav-second-level'],
                             'items' => [
-                                ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true]
+                                ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true]
                             ]
                         ]) ?>
                         <!-- /.nav-second-level -->
@@ -154,22 +154,22 @@ 
                     foreach ($extTable as $item) {
                         $menuItem = [
                             'type' => 'link',
-                            'link' => [Str::lowerCase($item->sys_name) . '/index'],
-                            'text' => $item->getLocaleName() . (!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null),
+                            'link' => [Str::lowerCase($item->sys_name).'/index'],
+                            'text' => $item->getLocaleName().(!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null),
                             'html' => true
                         ];
                         if ($item->type === 'app') {
                             $appControllers[] = $item->sys_name;
                             $appMenuItems[] = $menuItem;
-                        } elseif($item->type === 'widget') {
+                        } elseif ($item->type === 'widget') {
                             $widgetControllers[] = $item->sys_name;
                             $widgetMenuItems[] = $menuItem;
                         }
                     }
 
-                    $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps') . '...'];
+                    $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps').'...'];
                     $appControllers[] = 'Application';
-                    $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets') . '...'];
+                    $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets').'...'];
                     $widgetControllers[] = 'Widget';
                     ?>
                     <li<?= Arr::in(\App::$Request->getController(), $appControllers) ? ' class="active"' : null ?>>
@@ -230,7 +230,7 @@ 
                             echo $body;
                         } else {
                             \App::$Response->setStatusCode(404);
-                            echo '<p>' . __('Page is not founded!') . '</p>';
+                            echo '<p>'.__('Page is not founded!').'</p>';
                         }
                         ?>
                     </article>
@@ -261,7 +261,7 @@ 
 <?php
 $customJsCode = \App::$View->showPlainCode('js');
 if ($customJsCode !== null) {
-    echo '<script>' . $customJsCode . '</script>';
+    echo '<script>'.$customJsCode.'</script>';
 }
 ?>
 </body>

Apps/View/Admin/default/profile/field_list.php

Braces +5 added lines, -2 removed lines

@@ -66,6 +66,9 @@
     ]
 ]);
     ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <p>No additional fields is added!</p>
-<?php endif; ?>
\ No newline at end of file
+<?php endif;
+}
+?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 <hr />
     <div class="row">
         <div class="col-md-12">
-            <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> ' . __('Add field'), ['class' => 'btn btn-primary pull-right']) ?>
+            <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> '.__('Add field'), ['class' => 'btn btn-primary pull-right']) ?>
         </div>
     </div>
 <?php if ($records->count() > 0):
@@ -38,10 +38,10 @@ 
         $items[] = [
             ['text' => $row->id],
             ['text' => Serialize::getDecodeLocale($row->name)],
-            ['text' => '<span class="' . $labelClass . '">' . $row->type . '</span>', 'html' => true],
-            ['text' => '<code>' . ($row->reg_cond == 0 ? '!' : null) . 'preg_match("' . $row->reg_exp . '", input)' . '</code>', 'html' => true],
+            ['text' => '<span class="'.$labelClass.'">'.$row->type.'</span>', 'html' => true],
+            ['text' => '<code>'.($row->reg_cond == 0 ? '!' : null).'preg_match("'.$row->reg_exp.'", input)'.'</code>', 'html' => true],
             [
-                'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]) .
+                'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]).
                 Url::link(['profile/fielddelete', $row->id], '<i class="fa fa-trash-o fa-lg"></i>', ['html' => true]),
                 'html' => true,
                 'property' => ['class' => 'text-center']

Apps/View/Admin/default/user/_tabs.php

Spacing +1 added lines, -1 removed lines

@@ -9,4 +9,4 @@
         ['type' => 'link', 'text' => __('Group management'), 'link' => ['user/grouplist']],
         ['type' => 'link', 'text' => __('Settings'), 'link' => ['user/settings']]
     ]
-]);?>
\ No newline at end of file
+]); ?>
\ No newline at end of file