phpffcms / ffcms

Private/Database/Tables/App.php

Spacing +1 added lines, -1 removed lines

@@ -56,7 +56,7 @@
 ]);
 
 $configs->newcontent = serialize([
-    'categories' => ['2','3'],
+    'categories' => ['2', '3'],
     'count' => '5',
     'cache' => '60'
 ]);

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/Controller/Api/Content.php

Spacing +24 added lines, -24 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'];
         }
     }
     
@@ -117,8 +117,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
@@ -130,7 +130,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
@@ -139,41 +139,41 @@ 
         }
 
         // 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;
 
         $this->setJsonHeader();
         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
         ]]);
     }
@@ -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,10 +212,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)
             ];
         }
 
@@ -234,7 +234,7 @@ 
     public function actionGallerydelete($id, $file = null)
     {
         if ($file === null || Str::likeEmpty($file)) {
-            $file = (string)$this->request->query->get('file', null);
+            $file = (string) $this->request->query->get('file', null);
         }
         // check passed data
         if (Str::likeEmpty($file) || !Obj::isLikeInt($id)) {
@@ -249,8 +249,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/Model/Admin/Content/FormContentPublish.php

Doc Comments +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 
     /**
      * FormContentPublish constructor. Pass records inside
-     * @param Content[]|Collection $records
+     * @param \Ffcms\Core\Arch\ActiveModel $records
      */
     public function __construct($records)
     {

Extend/Core/Arch/ApiController.php

Unused Use Statements -1 removed lines

@@ -3,7 +3,6 @@
 namespace Apps\Model\Front\Profile;
 
 use Apps\ActiveRecord\Blacklist;
-use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
 use Ffcms\Core\Interfaces\iUser;
 

Apps/Controller/Api/Main.php

Spacing +2 added lines, -2 removed lines

@@ -37,7 +37,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/']
             ]
         ]));
 
@@ -105,7 +105,7 @@ 
         if (App::$Cache->get('download.ffcms.api.news.'.$this->lang) !== null) {
             $news = App::$Cache->get('download.ffcms.api.news.'.$this->lang);
         } else {
-            $news = Url::download('https://ffcms.org/api/api/news?lang=' . $this->lang);
+            $news = Url::download('https://ffcms.org/api/api/news?lang='.$this->lang);
             if ($news !== null && !Str::likeEmpty($news)) {
                 App::$Cache->set('download.ffcms.api.news.'.$this->lang, $news, 3600 * 12);
             }

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

Braces +5 added lines, -2 removed lines

@@ -56,7 +56,10 @@
 
 <?php if($model->checkAll()): ?>
     <?= \Ffcms\Core\Helper\Url::link('main/install', __('Start install'), ['class' => 'btn btn-success btn-block']) ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <?= \Ffcms\Core\Helper\Url::link('main/index', __('Check again'), ['class' => 'btn btn-warning btn-block']) ?>
-<?php endif; ?>
+<?php endif;
+}
+?>
 

Apps/Model/Admin/Main/FormUpdateDatabase.php

Spacing +3 added lines, -3 removed lines

@@ -40,9 +40,9 @@ 
         foreach ($all as $file) {
             $file = Str::cleanExtension(basename($file));
             // $file="3.0.0-3.0.1" become to $start = 3.0.0,$end=3.0.1
-            list($start,$end) = explode('-', $file);
+            list($start, $end) = explode('-', $file);
             // true: start <= db & script >= $end
-            if (version_compare($this->dbVersion, $start) !== 1 &&  version_compare($this->scriptVersion, $end) !== -1) {
+            if (version_compare($this->dbVersion, $start) !== 1 && version_compare($this->scriptVersion, $end) !== -1) {
                 $this->updateQueries[] = $file;
             }
         }
@@ -56,7 +56,7 @@ 
     {
         // run update queries from included files
         foreach ($this->updateQueries as $file) {
-            @include root . '/Private/Database/Updates/' . $file . '.php';
+            @include root.'/Private/Database/Updates/'.$file.'.php';
         }
         // update version in db table
         $row = System::getVar('version');

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