phpffcms / ffcms

Apps/Controller/Api/Main.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
         $connector = new \elFinderConnector(new \elFinder([
             'locale' => '',
             'roots' => [
-                ['driver' => 'LocalFileSystem', 'path' => root . '/upload/', 'URL' => App::$Alias->scriptUrl . '/upload/']
+                ['driver' => 'LocalFileSystem', 'path' => root.'/upload/', 'URL' => App::$Alias->scriptUrl.'/upload/']
             ]
         ]));
 

Apps/Controller/Api/Content.php

Spacing +21 added lines, -21 removed lines

@@ -33,12 +33,12 @@ 
         parent::before();
         $configs = AppRecord::getConfigs('app', 'Content');
         // prevent null-type config data
-        if ((int)$configs['gallerySize'] > 0) {
-            $this->maxSize = (int)$configs['gallerySize'] * 1024;
+        if ((int) $configs['gallerySize'] > 0) {
+            $this->maxSize = (int) $configs['gallerySize'] * 1024;
         }
 
-        if ((int)$configs['galleryResize'] > 0) {
-            $this->maxResize = (int)$configs['galleryResize'];
+        if ((int) $configs['galleryResize'] > 0) {
+            $this->maxResize = (int) $configs['galleryResize'];
         }
     }
     
@@ -116,8 +116,8 @@ 
         }
 
         // check if directory exist
-        if (!Directory::exist('/upload/gallery/' . $id)) {
-            Directory::create('/upload/gallery/' . $id);
+        if (!Directory::exist('/upload/gallery/'.$id)) {
+            Directory::create('/upload/gallery/'.$id);
         }
 
         // get file object
@@ -129,7 +129,7 @@ 
 
         // check file size
         if ($file->getSize() < 1 || $file->getSize() > $this->maxSize) {
-            throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => intval($this->maxSize/1024)]));
+            throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => intval($this->maxSize / 1024)]));
         }
 
         // check file extension
@@ -138,37 +138,37 @@ 
         }
 
         // create origin directory
-        $originPath = '/upload/gallery/' . $id . '/orig/';
+        $originPath = '/upload/gallery/'.$id.'/orig/';
         if (!Directory::exist($originPath)) {
             Directory::create($originPath);
         }
 
         // lets make a new file name
-        $fileName = App::$Security->simpleHash($file->getFilename() . $file->getSize());
-        $fileNewName = $fileName . '.' . $file->guessExtension();
+        $fileName = App::$Security->simpleHash($file->getFilename().$file->getSize());
+        $fileNewName = $fileName.'.'.$file->guessExtension();
         // save file from tmp to gallery origin directory
         $file->move(Normalize::diskFullPath($originPath), $fileNewName);
 
         // lets resize preview image for it
-        $thumbPath = '/upload/gallery/' . $id . '/thumb/';
+        $thumbPath = '/upload/gallery/'.$id.'/thumb/';
         if (!Directory::exist($thumbPath)) {
             Directory::create($thumbPath);
         }
 
         $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($thumbPath) . '/' . $fileName . '.jpg';
-        $thumb->open(Normalize::diskFullPath($originPath) . DIRECTORY_SEPARATOR . $fileNewName)
+        $thumbSaveName = Normalize::diskFullPath($thumbPath).'/'.$fileName.'.jpg';
+        $thumb->open(Normalize::diskFullPath($originPath).DIRECTORY_SEPARATOR.$fileNewName)
             ->cropResize($this->maxResize)
             ->save($thumbSaveName, 'jpg', 90);
         $thumb = null;
 
         // dont ask me why there is 2nd lvl array (can contains multiply items to frontend response)
         $output = [
-            'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg',
-            'url' => '/upload/gallery/' . $id . '/orig/' . $fileNewName,
+            'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg',
+            'url' => '/upload/gallery/'.$id.'/orig/'.$fileNewName,
             'name' => $fileNewName
         ];
 
@@ -197,7 +197,7 @@ 
             throw new NativeException('Permission denied');
         }
 
-        $thumbDir = Normalize::diskFullPath('/upload/gallery/' . $id . '/orig/');
+        $thumbDir = Normalize::diskFullPath('/upload/gallery/'.$id.'/orig/');
         if (!Directory::exist($thumbDir)) {
             throw new NotFoundException('Nothing found');
         }
@@ -212,8 +212,8 @@ 
             $fileExt = Str::lastIn($file, '.');
             $fileName = Str::sub($file, 0, -Str::length($fileExt));
             $output[] = [
-                'thumbnailUrl' => '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg',
-                'url' => '/upload/gallery/' . $id . '/orig/' . $file,
+                'thumbnailUrl' => '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg',
+                'url' => '/upload/gallery/'.$id.'/orig/'.$file,
                 'name' => $file
             ];
         }
@@ -245,8 +245,8 @@ 
         }
 
         // generate path
-        $thumb = '/upload/gallery/' . $id . '/thumb/' . $fileName . '.jpg';
-        $full = '/upload/gallery/' . $id . '/orig/' . $file;
+        $thumb = '/upload/gallery/'.$id.'/thumb/'.$fileName.'.jpg';
+        $full = '/upload/gallery/'.$id.'/orig/'.$file;
 
         // check if file exists and remove
         if (File::exist($thumb) || File::exist($full)) {

Apps/ActiveRecord/Role.php

Spacing +2 added lines, -2 removed lines

@@ -26,12 +26,12 @@
      */
     public static function get($role_id)
     {
-        $role = MainApp::$Memory->get('user.role.cache.' . $role_id);
+        $role = MainApp::$Memory->get('user.role.cache.'.$role_id);
 
         // not founded in cache
         if ($role === null) {
             $role = self::find($role_id);
-            MainApp::$Memory->set('user.role.cache.' . $role_id, $role);
+            MainApp::$Memory->set('user.role.cache.'.$role_id, $role);
         }
         return $role;
     }

Apps/ActiveRecord/User.php

Spacing +9 added lines, -9 removed lines

@@ -37,15 +37,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);
@@ -55,7 +55,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;
     }
 
@@ -65,7 +65,7 @@ 
      */
     public function getId()
     {
-        return (int)$this->id;
+        return (int) $this->id;
     }
 
     /**
@@ -87,7 +87,7 @@ 
     {
         // get data from session
         $session_token = MainApp::$Session->get('ff_user_token', null);
-        $session_id = (int)MainApp::$Session->get('ff_user_id', 0);
+        $session_id = (int) MainApp::$Session->get('ff_user_id', 0);
 
         // validate session data
         if (null === $session_token || $session_id < 1 || Str::length($session_token) < 64) {
@@ -121,12 +121,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/ActiveRecord/Profile.php

Spacing +9 added lines, -9 removed lines

@@ -46,8 +46,8 @@ 
         }
 
         // check in cache
-        if (MainApp::$Memory->get('profile.object.cache.' . $user_id) !== null) {
-            return MainApp::$Memory->get('profile.object.cache.' . $user_id);
+        if (MainApp::$Memory->get('profile.object.cache.'.$user_id) !== null) {
+            return MainApp::$Memory->get('profile.object.cache.'.$user_id);
         }
 
         // find row
@@ -60,7 +60,7 @@ 
 
         $object = $profile->first();
 
-        MainApp::$Memory->set('profile.object.cache.' . $user_id, $object);
+        MainApp::$Memory->set('profile.object.cache.'.$user_id, $object);
         return $object;
     }
 
@@ -71,17 +71,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;
     }
 
     /**
@@ -92,7 +92,7 @@ 
     {
         $userNick = $this->nick;
         if ($userNick === null || Str::likeEmpty($userNick)) {
-            $userNick = 'id' . $this->id;
+            $userNick = 'id'.$this->id;
         }
 
         return $userNick;

Apps/ActiveRecord/ContentCategory.php

Spacing +8 added lines, -8 removed lines

@@ -27,12 +27,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;
     }
 
@@ -43,12 +43,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;
     }
 
@@ -82,12 +82,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 .= ' ' . Serialize::getDecodeLocale($data->title);
+            $title .= ' '.Serialize::getDecodeLocale($data->title);
             // set response as array [id => title, ... ]
             $response[$data->id] = $title;
         }

Apps/ActiveRecord/App.php

Spacing +4 added lines, -4 removed lines

@@ -148,7 +148,7 @@ 
 
         $scriptVersion = $this->getScriptVersion();
 
-        return $scriptVersion === (float)$this->version;
+        return $scriptVersion === (float) $this->version;
     }
 
     /**
@@ -157,16 +157,16 @@ 
      */
     public function getScriptVersion()
     {
-        $class = 'Apps\Controller\Admin\\' . $this->sys_name;
+        $class = 'Apps\Controller\Admin\\'.$this->sys_name;
         if (!class_exists($class)) {
             return false;
         }
 
-        if (!defined($class . '::VERSION')) {
+        if (!defined($class.'::VERSION')) {
             return false;
         }
 
-        return (float)constant($class . '::VERSION');
+        return (float) constant($class.'::VERSION');
     }
 
 }
\ No newline at end of file

Apps/ActiveRecord/Content.php

Spacing +2 added lines, -2 removed lines

@@ -95,7 +95,7 @@ 
         }
 
         // build path and check is file exists on disk
-        $path = '/upload/gallery/' . $this->id . '/orig/' . $pName;
+        $path = '/upload/gallery/'.$this->id.'/orig/'.$pName;
         if (!File::exist($path)) {
             return null;
         }
@@ -116,7 +116,7 @@ 
 
         // remove extension, thumbs always in jpeg ;D
         $pName = Str::cleanExtension($pName);
-        $path = '/upload/gallery/' . $this->id . '/thumb/' . $pName . '.jpg';
+        $path = '/upload/gallery/'.$this->id.'/thumb/'.$pName.'.jpg';
 
         if (!File::exist($path)) {
             return null;

Widgets/Front/Newcontent/Newcontent.php

Spacing +4 added lines, -4 removed lines

@@ -32,11 +32,11 @@ 
         }
         // check cache is defined
         if ($this->cache === null || !Obj::isLikeInt($this->cache)) {
-            $this->cache = (int)$cfg['cache'];
+            $this->cache = (int) $cfg['cache'];
         }
         // check item count is defined
         if ($this->count === null || !Obj::isLikeInt($this->count)) {
-            $this->count = (int)$cfg['count'];
+            $this->count = (int) $cfg['count'];
         }
     }
     
@@ -56,12 +56,12 @@ 
             $query = $this->makeQuery();
         } else {
             // try get query result from cache
-            $query = App::$Cache->get('widget.newcontent.' . $cacheHash);
+            $query = App::$Cache->get('widget.newcontent.'.$cacheHash);
             if ($query === null) {
                 // if query is not cached make it
                 $query = $this->makeQuery();
                 // and save result to cache
-                App::$Cache->set('widget.newcontent.' . $cacheHash, $query, $this->cache);
+                App::$Cache->set('widget.newcontent.'.$cacheHash, $query, $this->cache);
             }
         }