phpffcms / ffcms

Apps/Controller/Admin/Main/ActionIndex.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         $rootSize = App::$Cache->getItem('root.size');
         $loadAvg = App::$Cache->getItem('load.avarage');
         if (!$rootSize->isHit()) {
-            $calcSize = round(Directory::size('/') / (1024*1000), 2) . ' mb';
+            $calcSize = round(Directory::size('/') / (1024 * 1000), 2).' mb';
             $rootSize->set($calcSize);
             $rootSize->expiresAfter(86400);
             App::$Cache->save($rootSize);
@@ -44,10 +44,10 @@ 
 
         // prepare system statistic
         $stats = [
-            'ff_version' => Version::VERSION . ' (' . Version::DATE . ')',
-            'php_version' => Environment::phpVersion() . ' (' . Environment::phpSAPI() . ')',
+            'ff_version' => Version::VERSION.' ('.Version::DATE.')',
+            'php_version' => Environment::phpVersion().' ('.Environment::phpSAPI().')',
             'os_name' => Environment::osName(),
-            'database_name' => App::$Database->connection()->getDatabaseName() . ' (' . App::$Database->connection()->getDriverName() . ')',
+            'database_name' => App::$Database->connection()->getDatabaseName().' ('.App::$Database->connection()->getDriverName().')',
             'file_size' => $rootSize->get(),
             'load_avg' => $loadAvg->get()
         ];

Apps/Controller/Api/Content.php

Spacing +4 added lines, -4 removed lines

@@ -41,12 +41,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'];
         }
     }
 }

Apps/Controller/Api/Content/ActionGalleryUpload.php

Spacing +13 added lines, -13 removed lines

@@ -46,8 +46,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
@@ -59,7 +59,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' => (int)($this->maxSize/1024)]));
+            throw new ForbiddenException(__('File size is too big. Max size: %size%kb', ['size' => (int) ($this->maxSize / 1024)]));
         }
 
         // check file extension
@@ -68,40 +68,40 @@ 
         }
 
         // 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->getClientOriginalName() . $file->getSize());
-        $fileNewName = $fileName . '.' . $file->guessExtension();
+        $fileName = App::$Security->simpleHash($file->getClientOriginalName().$file->getSize());
+        $fileNewName = $fileName.'.'.$file->guessExtension();
         // check if image is already loaded
-        if (File::exist($originPath . $fileNewName)) {
+        if (File::exist($originPath.$fileNewName)) {
             throw new ForbiddenException(__('File is always exists!'));
         }
         // 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;
 
         return json_encode(['status' => 1, 'file' => [
-            '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
         ]]);
     }

Apps/Controller/Api/Content/ActionGalleryDelete.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     {
         $this->setJsonHeader();
         if (!$file || Any::isEmpty($file)) {
-            $file = (string)$this->request->query->get('file', null);
+            $file = (string) $this->request->query->get('file', null);
         }
 
         // check passed data
@@ -48,8 +48,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/Controller/Api/Content/ActionGalleryList.php

Spacing +4 added lines, -4 removed lines

@@ -38,7 +38,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');
         }
@@ -53,10 +53,10 @@ 
             $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,
-                'size' => File::size('/upload/gallery/' . $id . '/orig/' . $file)
+                'size' => File::size('/upload/gallery/'.$id.'/orig/'.$file)
             ];
         }
 

Apps/Model/Front/Content/EntityContentRead.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     /**
      * Prepare model attributes from passed objects
      * @throws ForbiddenException
-    */
+     */
     public function before()
     {
         // set class attributes from ActiveRecord objects

Spacing +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
         $this->id = $this->_content->id;
         $this->title = $this->_content->getLocaled('title');
         $this->text = $this->_content->getLocaled('text');
-        $this->display = (bool)$this->_content->display;
+        $this->display = (bool) $this->_content->display;
 
         $this->metaTitle = $this->_content->getLocaled('meta_title');
         $this->metaDescription = $this->_content->getLocaled('meta_description');
@@ -107,7 +107,7 @@ 
         }
 
         $this->source = $this->_content->source;
-        $this->views = $this->_content->views+1;
+        $this->views = $this->_content->views + 1;
         $this->rating = $this->_content->rating;
 
         // update views count
@@ -133,7 +133,7 @@ 
 
         $ignoredRate = App::$Session->get('content.rate.ignore');
         $this->canRate = true;
-        if (Any::isArray($ignoredRate) && Arr::in((string)$this->id, $ignoredRate)) {
+        if (Any::isArray($ignoredRate) && Arr::in((string) $this->id, $ignoredRate)) {
             $this->canRate = false;
         }
         if (!App::$User->isAuth()) {
@@ -149,15 +149,15 @@ 
     private function prepareGallery()
     {
         // 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;
                 }
@@ -166,7 +166,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;
                 }
@@ -182,9 +182,9 @@ 
                     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;
                 }
             }
         }

Apps/View/Front/default/profile/show.php

Braces +5 added lines, -2 removed lines

@@ -58,7 +58,8 @@ 
                     </button>
                 </div>
             </div>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <div class="row">
                     <div class="col-md-8" style="padding-right: 0;">
                         <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>">
@@ -75,7 +76,9 @@ 
                         <button class="btn btn-block btn-danger" id="reduceRating">-</button>
                     </div>
                 </div>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         <?php endif; ?>
         <?php
         $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);

Spacing +9 added lines, -9 removed lines

@@ -21,10 +21,10 @@ 
 $name = $user->profile === null ? __('Unknown') : $user->profile->getNickname();
 
 $this->layout('_layouts/default', [
-    'title' => __('Profile') . ': ' . $name,
+    'title' => __('Profile').': '.$name,
     'breadcrumbs' => [
         Url::to('/') => __('Home'),
-        __('Profile') . ': ' . $name
+        __('Profile').': '.$name
     ]
 ]);
 
@@ -44,7 +44,7 @@ 
         <img src="<?= $user->profile->getAvatarUrl('big') ?>" class="img-fluid img-thumbnail" />
         <?php if ($ratingOn):
             $rateClass = 'btn-secondary';
-            $rateValue = (int)$user->profile->rating;
+            $rateValue = (int) $user->profile->rating;
             if ($user->profile->rating > 0) {
                 $rateClass = 'btn-info';
             } elseif ($user->profile->rating < 0) {
@@ -81,10 +81,10 @@ 
         <?php
         $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);
         if ($isSelf) {
-            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> ' . __('Feed'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true]);
-            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> '.__('Feed'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true]);
+            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]);
         } elseif (\App::$User->isAuth()) {
             $userMenu->menu(['link' => ['profile/messages', null, ['newdialog' => $user->id]], 'text' => __('Write message')]);
             $userMenu->menu(['link' => ['profile/ignore', null, ['id' => $user->id]], 'text' => __('Block')]);
@@ -161,7 +161,7 @@ 
                             foreach ($hobbyArray as $item) {
                                 $item = \App::$Security->strip_tags($item);
                                 if (!Str::likeEmpty($item)) {
-                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']) . ' ';
+                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']).' ';
                                 }
                             }
                             ?>
@@ -214,7 +214,7 @@ 
                     <div class="col-xs-8 col-md-10">
                         <div class="h5" style="margin-top: 0;margin-bottom: 5px;">
                             <i class="glyphicon glyphicon-user"></i>
-                            <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?>
+                            <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?>
                             <small class="float-right"><?= Date::humanize($post->updated_at); ?></small>
                         </div>
                         <div class="object-text">

Apps/Controller/Front/Profile/ActionShow.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
     public function show(string $userId): ?string
     {
         $cfg = $this->application->configs;
-        if (!(bool)$cfg['guestView'] && !App::$User->isAuth()) {
+        if (!(bool) $cfg['guestView'] && !App::$User->isAuth()) {
             throw new ForbiddenException(__('You must login to view other profile'));
         }
 
@@ -55,7 +55,7 @@ 
                     App::$Session->getFlashBag()->add('error', __('This user are in your black list or you are in blacklist!'));
                 } else {
                     // check if message added
-                    if ($wallModel->makePost($targetPersone, $viewerPersone, (int)$cfg['delayBetweenPost'])) {
+                    if ($wallModel->makePost($targetPersone, $viewerPersone, (int) $cfg['delayBetweenPost'])) {
                         App::$Session->getFlashBag()->add('success', __('The message was successful posted!'));
                     } else {
                         App::$Session->getFlashBag()->add('warning', __('Posting message was failed! Please, wait few seconds'));
@@ -68,8 +68,8 @@ 
         $wallQuery = WallPost::where('target_id', $targetPersone->getId());
 
         // pagination and query params
-        $wallPage = (int)$this->request->query->get('page');
-        $wallStep = (int)$cfg['wallPostOnPage'];
+        $wallPage = (int) $this->request->query->get('page');
+        $wallStep = (int) $cfg['wallPostOnPage'];
         $wallOffset = $wallPage * $wallStep;
         $wallTotalCount = $wallQuery->count();
 
@@ -93,7 +93,7 @@ 
                 'total' => $wallTotalCount,
                 'page' => $wallPage
             ],
-            'ratingOn' => (int)$cfg['rating'] === 1
+            'ratingOn' => (int) $cfg['rating'] === 1
         ]);
     }
 }

index.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 // check if SAPI client == cli (php built-in dev server)
 if (php_sapi_name() === 'cli-server') {
     $clearPath = strtok($uriRequest, '?'); // fix file.css?version=1.2.3 or ?time marks
-    $path = root . DIRECTORY_SEPARATOR . ltrim($clearPath, '/');
+    $path = root.DIRECTORY_SEPARATOR.ltrim($clearPath, '/');
     // if static file exist
     if (is_file($path)) {
         // check if it looks like standalone php script
@@ -28,7 +28,7 @@ 
 
 
 // get configs to prepare posible route to switch environment
-$configs = require(root . '/Private/Config/Default.php');
+$configs = require(root.'/Private/Config/Default.php');
 // remove base path
 $uriRequest = substr($uriRequest, strlen($configs['basePath']));
 $uriArray = explode('/', $uriRequest);
@@ -39,8 +39,8 @@ 
 $uriLoader = ucfirst(strtolower(str_replace('.', '', $uriLoader)));
 
 // if loader of interface is available - require it
-if (in_array($uriLoader, $loaderList, true) && file_exists(root . '/Loader/' . $uriLoader . '/index.php')) {
-    require_once (root . '/Loader/' . $uriLoader . '/index.php');
+if (in_array($uriLoader, $loaderList, true) && file_exists(root.'/Loader/'.$uriLoader.'/index.php')) {
+    require_once (root.'/Loader/'.$uriLoader.'/index.php');
 } else { // else - try to load default interface
-    require_once (root . '/Loader/Front/index.php');
+    require_once (root.'/Loader/Front/index.php');
 }
\ No newline at end of file