phpffcms / ffcms

Apps/ActiveRecord/Blacklist.php

Spacing +2 added lines, -2 removed lines

@@ -45,10 +45,10 @@
      */
     public static function check($user1, $user2)
     {
-        $query = self::where(function ($query) use ($user1, $user2) {
+        $query = self::where(function($query) use ($user1, $user2) {
             $query->where('user_id', '=', $user1)
                 ->where('target_id', '=', $user2);
-        })->orWhere(function ($query) use ($user1, $user2) {
+        })->orWhere(function($query) use ($user1, $user2) {
             $query->where('user_id', '=', $user2)
                 ->where('target_id', '=', $user1);
         });

Apps/ActiveRecord/CommentPost.php

Spacing +3 added lines, -3 removed lines

@@ -86,15 +86,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/ActiveRecord/Profile.php

Spacing +9 added lines, -9 removed lines

@@ -61,8 +61,8 @@ 
         }
 
         // check in cache
-        if (MainApp::$Memory->get('profile.object.cache.' . $userId) !== null) {
-            return MainApp::$Memory->get('profile.object.cache.' . $userId);
+        if (MainApp::$Memory->get('profile.object.cache.'.$userId) !== null) {
+            return MainApp::$Memory->get('profile.object.cache.'.$userId);
         }
 
         // find row
@@ -75,7 +75,7 @@ 
 
         $object = $profile->first();
 
-        MainApp::$Memory->set('profile.object.cache.' . $userId, $object);
+        MainApp::$Memory->set('profile.object.cache.'.$userId, $object);
         return $object;
     }
 
@@ -86,17 +86,17 @@ 
      */
     public function getAvatarUrl($type = 'small')
     {
-        $default = '/upload/user/avatar/' . $type . '/default.jpg';
+        $default = '/upload/user/avatar/'.$type.'/default.jpg';
         if (!Arr::in($type, ['small', 'big', 'medium'])) {
-            return MainApp::$Alias->scriptUrl . $default;
+            return MainApp::$Alias->scriptUrl.$default;
         }
 
-        $route = '/upload/user/avatar/' . $type . '/' . $this->user_id . '.jpg';
+        $route = '/upload/user/avatar/'.$type.'/'.$this->user_id.'.jpg';
         if (File::exist($route)) {
-            return MainApp::$Alias->scriptUrl . $route . '?mtime=' . File::mTime($route);
+            return MainApp::$Alias->scriptUrl.$route.'?mtime='.File::mTime($route);
         }
 
-        return MainApp::$Alias->scriptUrl . $default;
+        return MainApp::$Alias->scriptUrl.$default;
     }
 
     /**
@@ -107,7 +107,7 @@ 
     {
         $userNick = $this->nick;
         if ($userNick === null || Str::likeEmpty($userNick)) {
-            $userNick = 'id' . $this->id;
+            $userNick = 'id'.$this->id;
         }
 
         return $userNick;

Apps/ActiveRecord/User.php

Spacing +9 added lines, -9 removed lines

@@ -50,13 +50,13 @@ 
         }
 
         // check if id is looks like integer
-        if (!Any::isInt($id) || (int)$id < 1) {
+        if (!Any::isInt($id) || (int) $id < 1) {
             return null;
         }
 
         // check in memory cache object
-        if (MainApp::$Memory->get('user.object.cache.' . $id) !== null) {
-            return MainApp::$Memory->get('user.object.cache.' . $id);
+        if (MainApp::$Memory->get('user.object.cache.'.$id) !== null) {
+            return MainApp::$Memory->get('user.object.cache.'.$id);
         }
 
         // not founded in memory? lets make query
@@ -64,7 +64,7 @@ 
             ->find($id);
 
         // 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;
     }
 
@@ -74,7 +74,7 @@ 
      */
     public function getId(): ?int
     {
-        return (int)$this->id;
+        return (int) $this->id;
     }
 
     /**
@@ -95,7 +95,7 @@ 
     public static function isAuth(): bool
     {
         // 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) {
@@ -128,10 +128,10 @@ 
             return false;
         }
 
-        $find = MainApp::$Memory->get('user.counter.cache.' . $id);
+        $find = MainApp::$Memory->get('user.counter.cache.'.$id);
         if (!$find) {
             $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;
@@ -231,7 +231,7 @@ 
      */
     public function inBlacklist(?string $target = null): bool
     {
-        if ($target === null || (int)$target < 1) {
+        if ($target === null || (int) $target < 1) {
             return false;
         }
 

Apps/Model/Api/Content/ContentRatingChange.php

Spacing +1 added lines, -1 removed lines

@@ -76,7 +76,7 @@
         $this->_content->save();
         
         // update content author rating
-        $authorId = (int)$this->_content->author_id;
+        $authorId = (int) $this->_content->author_id;
         if ($authorId > 0 && App::$User->isExist($authorId)) {
             $authorObject = App::$User->identity($authorId);
             if ($authorObject !== null) {

Apps/Model/Api/Comments/CommentAnswerAdd.php

Spacing +6 added lines, -6 removed lines

@@ -48,12 +48,12 @@ 
     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'));
         }
 
         // 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'));
@@ -66,7 +66,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'],
@@ -111,15 +111,15 @@ 
         $record->lang = App::$Request->getLanguage();
         $record->ip = $this->ip;
         // check if premoderation is enabled and user is guest
-        if ((bool)$this->_configs['guestModerate'] && $this->_userId < 1) {
+        if ((bool) $this->_configs['guestModerate'] && $this->_userId < 1) {
             $record->moderate = 1;
         }
         $record->save();
 
         // add notification for comment post owner
         $commentPost = $record->post;
-        if ($commentPost !== null && (int)$commentPost->user_id !== 0 && (int)$commentPost->user_id !== $this->_userId) {
-            $notify = new EntityAddNotification((int)$commentPost->user_id);
+        if ($commentPost !== null && (int) $commentPost->user_id !== 0 && (int) $commentPost->user_id !== $this->_userId) {
+            $notify = new EntityAddNotification((int) $commentPost->user_id);
             $notify->add($commentPost->pathway, EntityAddNotification::MSG_ADD_COMMENTANSWER, [
                 'snippet' => Text::snippet($this->message, 50),
                 'post' => Text::snippet($commentPost->message, 50)

Apps/Model/Front/Content/EntityCategoryList.php

Spacing +15 added lines, -15 removed lines

@@ -58,7 +58,7 @@ 
     {
         $this->_path = $path;
         $this->_configs = $configs;
-        $this->_page = (int)$offset;
+        $this->_page = (int) $offset;
         $this->_sort = $sort;
         parent::__construct();
     }
@@ -71,7 +71,7 @@ 
     public function before()
     {
         // find one or more categories where we must looking for content items
-        if ((int)$this->_configs['multiCategories'] === 1) {
+        if ((int) $this->_configs['multiCategories'] === 1) {
             $this->findCategories();
         } else {
             $this->findCategory();
@@ -90,7 +90,7 @@ 
      */
     public function setItemLimit($limit)
     {
-        $this->_customItemLimit = (int)$limit;
+        $this->_customItemLimit = (int) $limit;
     }
 
     /**
@@ -118,7 +118,7 @@ 
     private function findCategories()
     {
         // get all categories for current path and child of it
-        $query = ContentCategory::where('path', 'like', $this->_path . '%');
+        $query = ContentCategory::where('path', 'like', $this->_path.'%');
         if ($query->count() < 1) {
             throw new NotFoundException(__('Category is not founded'));
         }
@@ -151,10 +151,10 @@ 
         }
 
         // calculate selection offset
-        $itemPerPage = (int)$this->_configs['itemPerCategory'];
+        $itemPerPage = (int) $this->_configs['itemPerCategory'];
         // check if custom itemlimit defined over model api
         if ($this->_customItemLimit !== false) {
-            $itemPerPage = (int)$this->_customItemLimit;
+            $itemPerPage = (int) $this->_customItemLimit;
         }
 
         $offset = $this->_page * $itemPerPage;
@@ -197,15 +197,15 @@ 
         $catConfigs = $this->_currentCategory->configs;
         // prepare rss url link for current category if enabled
         $rssUrl = false;
-        if ((int)$this->_configs['rss'] === 1 && (int)$catConfigs['showRss'] === 1) {
-            $rssUrl = App::$Alias->baseUrl . '/content/rss/' . $this->_currentCategory->path;
+        if ((int) $this->_configs['rss'] === 1 && (int) $catConfigs['showRss'] === 1) {
+            $rssUrl = App::$Alias->baseUrl.'/content/rss/'.$this->_currentCategory->path;
             $rssUrl = rtrim($rssUrl, '/');
         }
 
         // prepare sorting urls
         $catSortParams = [];
         if (App::$Request->query->get('page')) {
-            $catSortParams['page'] = (int)App::$Request->query->get('page');
+            $catSortParams['page'] = (int) App::$Request->query->get('page');
         }
 
         $catSortUrls = [
@@ -225,7 +225,7 @@ 
         ];
 
         // check if this category is hidden
-        if (!(bool)$this->category['configs']['showCategory']) {
+        if (!(bool) $this->category['configs']['showCategory']) {
             throw new ForbiddenException(__('This category is not available to view'));
         }
 
@@ -278,7 +278,7 @@ 
             // check if current user can rate item
             $ignoredRate = App::$Session->get('content.rate.ignore');
             $canRate = true;
-            if (Any::isArray($ignoredRate) && Arr::in((string)$row->id, $ignoredRate)) {
+            if (Any::isArray($ignoredRate) && Arr::in((string) $row->id, $ignoredRate)) {
                 $canRate = false;
             }
 
@@ -299,13 +299,13 @@ 
                 'poster' => $row->getPosterUri(),
                 'thumb' => $row->getPosterThumbUri(),
                 'thumbSize' => File::size($row->getPosterThumbUri()),
-                'views' => (int)$row->views,
-                'rating' => (int)$row->rating,
+                'views' => (int) $row->views,
+                'rating' => (int) $row->rating,
                 'canRate' => $canRate,
                 'category' => $this->categories[$row->category_id],
-                'uri' => '/content/read/' . $itemPath,
+                'uri' => '/content/read/'.$itemPath,
                 'tags' => $tags,
-                'important' => (bool)$row->important
+                'important' => (bool) $row->important
             ];
         }
 

Apps/Model/Front/Content/EntityContentSearch.php

Spacing +2 added lines, -2 removed lines

@@ -61,7 +61,7 @@ 
 
         $index = implode('-', $this->_skip);
         // try to get this slow query from cache
-        $cache = App::$Cache->getItem('entity.content.search.index.' . $index);
+        $cache = App::$Cache->getItem('entity.content.search.index.'.$index);
         if (!$cache->isHit()) {
             $cache->set($this->makeSearch());
             $cache->expiresAfter(static::CACHE_TIME);
@@ -94,7 +94,7 @@ 
             $this->items[] = [
                 'title' => $item->getLocaled('title'),
                 'snippet' => Text::snippet($text),
-                'uri' => '/content/read/' . $item->getPath(),
+                'uri' => '/content/read/'.$item->getPath(),
                 'thumb' => $item->getPosterThumbUri()
             ];
         }

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(): array
     {
         return [
@@ -100,9 +100,9 @@ 
     }
 
     /**
-    * Content update form validation rules
-    * @return array
-    */
+     * Content update form validation rules
+     * @return array
+     */
     public function rules(): array
     {
         $r = [

Spacing +17 added lines, -17 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;
@@ -147,9 +147,9 @@ 
         $this->_record->title = $this->title;
         $this->_record->text = $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) {
             $this->_record->comment_hash = $this->generateCommentHash();
         }
@@ -159,8 +159,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);
             }
@@ -169,17 +169,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;