phpffcms / ffcms

Apps/Model/Front/User/FormLogin.php

Spacing +1 added lines, -1 removed lines

@@ -70,7 +70,7 @@
     {
         $password = App::$Security->password_hash($this->password);
 
-        $search = App::$User->where('password', '=', $password)->where(function ($query) {
+        $search = App::$User->where('password', '=', $password)->where(function($query) {
             $query->where('login', '=', $this->login)
                 ->orWhere('email', '=', $this->login);
         });

Apps/Model/Front/Profile/FormSettings.php

Spacing +4 added lines, -4 removed lines

@@ -71,7 +71,7 @@ 
 
         // labels for custom fields
         foreach (ProfileField::all() as $custom) {
-            $labels['custom_data.' . $custom->id] = $custom->getLocaled('name');
+            $labels['custom_data.'.$custom->id] = $custom->getLocaled('name');
         }
 
         return $labels;
@@ -97,12 +97,12 @@ 
         // custom profile fields
         foreach (ProfileField::all() as $custom) {
             $rules[] = [
-                'custom_data.' . $custom->id,
+                'custom_data.'.$custom->id,
                 'used'
             ];
             $rules[] = [
-                'custom_data.' . $custom->id,
-                (int)$custom->reg_cond === 1 ? 'direct_match' : 'reverse_match',
+                'custom_data.'.$custom->id,
+                (int) $custom->reg_cond === 1 ? 'direct_match' : 'reverse_match',
                 $custom->reg_exp
             ];
         }

Apps/ActiveRecord/ContentCategory.php

Spacing +9 added lines, -9 removed lines

@@ -34,7 +34,7 @@ 
      */
     public static function all($columns = ['*'])
     {
-        $cacheName = 'activerecord.contentcategory.all.' . implode('.', $columns);
+        $cacheName = 'activerecord.contentcategory.all.'.implode('.', $columns);
         $records = MemoryObject::instance()->get($cacheName);
         if ($records === null) {
             $records = parent::all($columns);
@@ -50,12 +50,12 @@ 
      */
     public static function getByPath($path = '')
     {
-        if (MainApp::$Memory->get('cache.content.category.path.' . $path) !== null) {
-            return MainApp::$Memory->get('cache.content.category.path.' . $path);
+        if (MainApp::$Memory->get('cache.content.category.path.'.$path) !== null) {
+            return MainApp::$Memory->get('cache.content.category.path.'.$path);
         }
 
         $record = self::where('path', '=', $path)->first();
-        MainApp::$Memory->set('cache.content.category.path.' . $path, $record);
+        MainApp::$Memory->set('cache.content.category.path.'.$path, $record);
         return $record;
     }
 
@@ -66,12 +66,12 @@ 
      */
     public static function getById($id)
     {
-        if (MainApp::$Memory->get('cache.content.category.id.' . $id) !== null) {
-            return MainApp::$Memory->get('cache.content.category.id.' . $id);
+        if (MainApp::$Memory->get('cache.content.category.id.'.$id) !== null) {
+            return MainApp::$Memory->get('cache.content.category.id.'.$id);
         }
 
         $record = self::find($id);
-        MainApp::$Memory->set('cache.content.category.id.' . $id, $record);
+        MainApp::$Memory->set('cache.content.category.id.'.$id, $record);
         return $record;
     }
 
@@ -99,12 +99,12 @@ 
             } else {
                 // set level marker based on slashes count in pathway
                 $slashCount = Str::entryCount($path, '/');
-                for ($i=-1; $i <= $slashCount; $i++) {
+                for ($i = -1; $i <= $slashCount; $i++) {
                     $title .= '--';
                 }
             }
             // add canonical title from db
-            $title .= ' ' . $data->getLocaled('title');
+            $title .= ' '.$data->getLocaled('title');
             // set response as array [id => title, ... ]
             $response[$data->id] = $title;
         }

Apps/Model/Admin/Application/FormInstall.php

Spacing +5 added lines, -5 removed lines

@@ -43,7 +43,7 @@ 
     public function before()
     {
         foreach ($this->_apps as $app) {
-            $this->_definedControllers[] = (string)$app->sys_name;
+            $this->_definedControllers[] = (string) $app->sys_name;
         }
 
         parent::before();
@@ -79,14 +79,14 @@ 
     public function make()
     {
         $cName = ucfirst(Str::lowerCase($this->sysname));
-        $cPath = 'Apps\Controller\Admin\\' . $cName;
+        $cPath = 'Apps\Controller\Admin\\'.$cName;
         // if object class is not loaded - prevent install
-        if (!class_exists($cPath) || !defined($cPath . '::VERSION')) {
+        if (!class_exists($cPath) || !defined($cPath.'::VERSION')) {
             return false;
         }
 
         // get ext version
-        $cVersion = constant($cPath . '::VERSION');
+        $cVersion = constant($cPath.'::VERSION');
         if ($cVersion === null || Str::likeEmpty($cVersion)) {
             $cVersion = '1.0.0';
         }
@@ -102,7 +102,7 @@ 
 
         // callback to install method in extension
         if (method_exists($cPath, 'install')) {
-            call_user_func($cPath . '::install');
+            call_user_func($cPath.'::install');
         }
 
         return true;

Apps/Model/Admin/Main/FormUpdateDownload.php

Spacing +3 added lines, -3 removed lines

@@ -34,12 +34,12 @@
      */
     public function make()
     {
-        $archive = $this->name . '.zip';
+        $archive = $this->name.'.zip';
         // download archive
-        File::saveFromUrl($this->url, '/' . $archive);
+        File::saveFromUrl($this->url, '/'.$archive);
         // extract archive
         $zip = new \ZipArchive();
-        if ($zip->open(root . '/' . $archive) === true) {
+        if ($zip->open(root.'/'.$archive) === true) {
             $zip->extractTo(root);
             $zip->close();
             // cleanup cache

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