phpffcms / ffcms

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

Apps/Controller/Console/Main.php

Spacing +37 added lines, -37 removed lines

@@ -27,20 +27,20 @@ 
      */
     public function actionHelp()
     {
-        $text = "You are using FFCMS console application." . PHP_EOL;
-        $text .= "This application support next basic commands:" . PHP_EOL;
-        $text .= "\t main/info - show info about CMS" . PHP_EOL;
-        $text .= "\t main/install - install FFCMS from console line." . PHP_EOL;
-        $text .= "\t main/update - update package to current minor version if available." . PHP_EOL;
-        $text .= "\t main/chmod - update chmod for ffcms special folders. Can be used after project deployment." . PHP_EOL;
-        $text .= "\t main/buildperms - build and update permissions map for applications." . PHP_EOL;
-        $text .= "\t create/model workground/modelName - create model carcase default." . PHP_EOL;
-        $text .= "\t create/ar activeRecordName - create active record table and model." . PHP_EOL;
-        $text .= "\t create/controller workground/controllerName - create default controller carcase." . PHP_EOL;
-        $text .= "\t create/widget workground/widgetName/widgetName - create default widget carcase." . PHP_EOL;
-        $text .= "\t db/import activeRecordName - import to database single schema from ar model." . PHP_EOL;
-        $text .= "\t db/importAll - import all active record tables to database." . PHP_EOL;
-        $text .= "\t db/adduser - add new user into database." . PHP_EOL;
+        $text = "You are using FFCMS console application.".PHP_EOL;
+        $text .= "This application support next basic commands:".PHP_EOL;
+        $text .= "\t main/info - show info about CMS".PHP_EOL;
+        $text .= "\t main/install - install FFCMS from console line.".PHP_EOL;
+        $text .= "\t main/update - update package to current minor version if available.".PHP_EOL;
+        $text .= "\t main/chmod - update chmod for ffcms special folders. Can be used after project deployment.".PHP_EOL;
+        $text .= "\t main/buildperms - build and update permissions map for applications.".PHP_EOL;
+        $text .= "\t create/model workground/modelName - create model carcase default.".PHP_EOL;
+        $text .= "\t create/ar activeRecordName - create active record table and model.".PHP_EOL;
+        $text .= "\t create/controller workground/controllerName - create default controller carcase.".PHP_EOL;
+        $text .= "\t create/widget workground/widgetName/widgetName - create default widget carcase.".PHP_EOL;
+        $text .= "\t db/import activeRecordName - import to database single schema from ar model.".PHP_EOL;
+        $text .= "\t db/importAll - import all active record tables to database.".PHP_EOL;
+        $text .= "\t db/adduser - add new user into database.".PHP_EOL;
         return $text;
     }
 
@@ -50,17 +50,17 @@ 
      */
     public function actionInfo()
     {
-        $text = "Information about FFCMS package and environment:" . PHP_EOL;
-        $text .= "\t PHP version: " . phpversion() . PHP_EOL;
-        $text .= "\t Dist path: " . root . PHP_EOL;
-        $text .= "\t Used version: " . Version::VERSION . ' [build: ' . Version::DATE . ']' . PHP_EOL;
-        $text .= "Information about FFCMS cmf packages:" . PHP_EOL;
+        $text = "Information about FFCMS package and environment:".PHP_EOL;
+        $text .= "\t PHP version: ".phpversion().PHP_EOL;
+        $text .= "\t Dist path: ".root.PHP_EOL;
+        $text .= "\t Used version: ".Version::VERSION.' [build: '.Version::DATE.']'.PHP_EOL;
+        $text .= "Information about FFCMS cmf packages:".PHP_EOL;
 
         $composerInfo = File::read('/composer.lock');
         if (false !== $composerInfo) {
             $jsonInfo = json_decode($composerInfo);
             foreach ($jsonInfo->packages as $item) {
-                $text .= "\t Package: " . $item->name . ' => ' . $item->version . PHP_EOL;
+                $text .= "\t Package: ".$item->name.' => '.$item->version.PHP_EOL;
             }
         } else {
             $text .= "\t Composer is never be used - no information available.";
@@ -96,16 +96,16 @@ 
             preg_match_all('/public function action(\w*?)\(/', $byte, $matches); // matches[0] contains all methods ;)
             if (Obj::isArray($matches[1]) && count($matches[1]) > 0) {
                 foreach ($matches[1] as $perm) {
-                    $permissions[] = 'Admin/' . $className . '/' . $perm;
+                    $permissions[] = 'Admin/'.$className.'/'.$perm;
                 }
             }
         }
 
         // prepare save string
-        $stringSave = "<?php \n\nreturn " . var_export($permissions, true) . ';';
+        $stringSave = "<?php \n\nreturn ".var_export($permissions, true).';';
         File::write('/Private/Config/Permissions.php', $stringSave);
 
-        return 'Permissions configuration is successful updated! Founded permissions: ' . count($permissions);
+        return 'Permissions configuration is successful updated! Founded permissions: '.count($permissions);
     }
 
     /**
@@ -119,9 +119,9 @@ 
             if (Directory::exist($obj)) {
                 Directory::recursiveChmod($obj, 0777);
             } elseif (File::exist($obj)) {
-                chmod(root . $obj, 0777);
+                chmod(root.$obj, 0777);
             } else {
-                $errors .= Console::$Output->write('Filesystem object is not founded: ' . $obj);
+                $errors .= Console::$Output->write('Filesystem object is not founded: '.$obj);
             }
         }
 
@@ -140,7 +140,7 @@ 
         }
 
         echo Console::$Output->writeHeader('License start');
-        echo File::read('/LICENSE') . PHP_EOL;
+        echo File::read('/LICENSE').PHP_EOL;
         echo Console::$Output->writeHeader('License end');
 
         $config = Console::$Properties->get('database');
@@ -159,38 +159,38 @@ 
 
         // database config from input
         echo Console::$Output->writeHeader('Database connection configuration');
-        echo 'Driver(default:' . $config['driver'] . '):';
+        echo 'Driver(default:'.$config['driver'].'):';
         $dbDriver = Console::$Input->read();
         if (Arr::in($dbDriver, ['mysql', 'pgsql', 'sqlite'])) {
             $newConfig['driver'] = $dbDriver;
         }
 
         // for sqlite its would be a path
-        echo 'Host(default:' . $config['host'] . '):';
+        echo 'Host(default:'.$config['host'].'):';
         $dbHost = Console::$Input->read();
         if (!Str::likeEmpty($dbHost)) {
             $newConfig['host'] = $dbHost;
         }
 
-        echo 'Database name(default:' . $config['database'] . '):';
+        echo 'Database name(default:'.$config['database'].'):';
         $dbName = Console::$Input->read();
         if (!Str::likeEmpty($dbName)) {
             $newConfig['database'] = $dbName;
         }
 
-        echo 'User(default:' . $config['username'] . '):';
+        echo 'User(default:'.$config['username'].'):';
         $dbUser = Console::$Input->read();
         if (!Str::likeEmpty($dbUser)) {
             $newConfig['username'] = $dbUser;
         }
 
-        echo 'Password(default:' . $config['password'] . '):';
+        echo 'Password(default:'.$config['password'].'):';
         $dbPwd = Console::$Input->read();
         if (!Str::likeEmpty($dbPwd)) {
             $newConfig['password'] = $dbPwd;
         }
 
-        echo 'Table prefix(default:' . $config['prefix'] . '):';
+        echo 'Table prefix(default:'.$config['prefix'].'):';
         $dbPrefix = Console::$Input->read();
         if (!Str::likeEmpty($dbPrefix)) {
             $newConfig['prefix'] = $dbPrefix;
@@ -203,11 +203,11 @@ 
         try {
             Console::$Database->connection('install')->getDatabaseName();
         } catch (\Exception $e) {
-            return 'Testing database connection is failed! Run installer again and pass tested connection data! Log: ' . $e->getMessage();
+            return 'Testing database connection is failed! Run installer again and pass tested connection data! Log: '.$e->getMessage();
         }
 
         // autoload isn't work here
-        include(root . '/Apps/Controller/Console/Db.php');
+        include(root.'/Apps/Controller/Console/Db.php');
 
         // import db data
         $dbController = new DbController();
@@ -215,7 +215,7 @@ 
 
         // set website send from email from input
         $emailConfig = Console::$Properties->get('adminEmail');
-        echo 'Website sendFrom email(default: ' . $emailConfig . '):';
+        echo 'Website sendFrom email(default: '.$emailConfig.'):';
         $email = Console::$Input->read();
         if (!Str::isEmail($email)) {
             $email = $emailConfig;
@@ -236,9 +236,9 @@ 
         $allCfg['adminEmail'] = $email;
         $allCfg['baseDomain'] = $baseDomain;
         echo Console::$Output->write('Generate password salt for BLOWFISH crypt');
-        $allCfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
+        $allCfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
         echo Console::$Output->write('Generate security cookies for debug panel');
-        $allCfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(8, 32));
+        $allCfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(8, 32));
         $allCfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128));
 
         // write config data

Apps/Controller/Admin/Main.php

Spacing +10 added lines, -10 removed lines

@@ -47,21 +47,21 @@ 
         // cache some data
         $rootSize = App::$Cache->get('root.size');
         if ($rootSize === null) {
-            $rootSize = round(Directory::getSize('/') / (1024*1000), 2) . ' mb';
+            $rootSize = round(Directory::getSize('/') / (1024 * 1000), 2).' mb';
             App::$Cache->set('root.size', $rootSize, 86400); // 24 hours caching = 60 * 60 * 24
         }
         $loadAvg = App::$Cache->get('load.average');
         if ($loadAvg === null) {
             $loadAvg = Environment::loadAverage();
-            App::$Cache->set('load.average', $loadAvg, 60*5); // 5 min cache
+            App::$Cache->set('load.average', $loadAvg, 60 * 5); // 5 min cache
         }
 
         // 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,
             'load_avg' => $loadAvg
         ];
@@ -113,7 +113,7 @@ 
     public function actionFiles()
     {
         return $this->view->render('files', [
-            'connector' => App::$Alias->scriptUrl . '/api/main/files?lang=' . $this->request->getLanguage()
+            'connector' => App::$Alias->scriptUrl.'/api/main/files?lang='.$this->request->getLanguage()
         ]);
     }
 
@@ -186,9 +186,9 @@ 
      */
     public function actionDeleteroute()
     {
-        $type = (string)$this->request->query->get('type');
-        $loader = (string)$this->request->query->get('loader');
-        $source = Str::lowerCase((string)$this->request->query->get('path'));
+        $type = (string) $this->request->query->get('type');
+        $loader = (string) $this->request->query->get('loader');
+        $source = Str::lowerCase((string) $this->request->query->get('path'));
 
         $model = new EntityDeleteRoute($type, $loader, $source);
         if ($model->send() && $model->validate()) {
@@ -211,7 +211,7 @@ 
     {
         $stats = App::$Cache->stats();
         // get size in mb from cache stats
-        $size = round((int)$stats['size'] / (1024*1024), 2);
+        $size = round((int) $stats['size'] / (1024 * 1024), 2);
 
         // check if submited
         if ($this->request->request->get('clearcache', false)) {

Apps/Controller/Api/Api.php

Spacing +1 added lines, -1 removed lines

@@ -38,7 +38,7 @@
                 $data[] = [
                     'title' => App::$Translate->getLocaleText($item['title']),
                     'date' => Date::humanize($item['created_at']),
-                    'url' => 'https://ffcms.org/' . $this->request->getLanguage() . '/content/read/' . $item['cpath'] . '/' . $item['path'],
+                    'url' => 'https://ffcms.org/'.$this->request->getLanguage().'/content/read/'.$item['cpath'].'/'.$item['path'],
                     'snippet' => Text::snippet(App::$Translate->getLocaleText($item['text'], $this->request->getLanguage()))
                 ];
             }

Private/Database/install.php

Spacing +26 added lines, -26 removed lines

@@ -5,31 +5,31 @@
 }
 
 // require all tables
-require_once(root . '/Private/Database/Tables/App.php');
-require_once(root . '/Private/Database/Tables/Blacklist.php');
-require_once(root . '/Private/Database/Tables/CommentAnswer.php');
-require_once(root . '/Private/Database/Tables/CommentPost.php');
-require_once(root . '/Private/Database/Tables/Content.php');
-require_once(root . '/Private/Database/Tables/ContentCategory.php');
-require_once(root . '/Private/Database/Tables/ContentRating.php');
-require_once(root . '/Private/Database/Tables/ContentTag.php');
-require_once(root . '/Private/Database/Tables/FeedbackAnswer.php');
-require_once(root . '/Private/Database/Tables/FeedbackPost.php');
-require_once(root . '/Private/Database/Tables/Invite.php');
-require_once(root . '/Private/Database/Tables/Message.php');
-require_once(root . '/Private/Database/Tables/Profile.php');
-require_once(root . '/Private/Database/Tables/ProfileField.php');
-require_once(root . '/Private/Database/Tables/ProfileRating.php');
-require_once(root . '/Private/Database/Tables/Role.php');
-require_once(root . '/Private/Database/Tables/Session.php');
-require_once(root . '/Private/Database/Tables/System.php');
-require_once(root . '/Private/Database/Tables/User.php');
-require_once(root . '/Private/Database/Tables/UserLog.php');
-require_once(root . '/Private/Database/Tables/UserNotification.php');
-require_once(root . '/Private/Database/Tables/UserProvider.php');
-require_once(root . '/Private/Database/Tables/UserRecovery.php');
-require_once(root . '/Private/Database/Tables/WallPost.php');
-require_once(root . '/Private/Database/Tables/WallAnswer.php');
+require_once(root.'/Private/Database/Tables/App.php');
+require_once(root.'/Private/Database/Tables/Blacklist.php');
+require_once(root.'/Private/Database/Tables/CommentAnswer.php');
+require_once(root.'/Private/Database/Tables/CommentPost.php');
+require_once(root.'/Private/Database/Tables/Content.php');
+require_once(root.'/Private/Database/Tables/ContentCategory.php');
+require_once(root.'/Private/Database/Tables/ContentRating.php');
+require_once(root.'/Private/Database/Tables/ContentTag.php');
+require_once(root.'/Private/Database/Tables/FeedbackAnswer.php');
+require_once(root.'/Private/Database/Tables/FeedbackPost.php');
+require_once(root.'/Private/Database/Tables/Invite.php');
+require_once(root.'/Private/Database/Tables/Message.php');
+require_once(root.'/Private/Database/Tables/Profile.php');
+require_once(root.'/Private/Database/Tables/ProfileField.php');
+require_once(root.'/Private/Database/Tables/ProfileRating.php');
+require_once(root.'/Private/Database/Tables/Role.php');
+require_once(root.'/Private/Database/Tables/Session.php');
+require_once(root.'/Private/Database/Tables/System.php');
+require_once(root.'/Private/Database/Tables/User.php');
+require_once(root.'/Private/Database/Tables/UserLog.php');
+require_once(root.'/Private/Database/Tables/UserNotification.php');
+require_once(root.'/Private/Database/Tables/UserProvider.php');
+require_once(root.'/Private/Database/Tables/UserRecovery.php');
+require_once(root.'/Private/Database/Tables/WallPost.php');
+require_once(root.'/Private/Database/Tables/WallAnswer.php');
 
 // use default preset (for none or other presets)
-require_once (root . '/Private/Database/Other/PresetDefault.php');
\ No newline at end of file
+require_once (root.'/Private/Database/Other/PresetDefault.php');
\ No newline at end of file