phpffcms / ffcms

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

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
                         $class = 'label-danger';
                         $tooltip = __('Location: %loc%. Required permissions: +rw', ['loc' => $dir]);
                     }
-                    echo '<span class="label ' . $class . '" data-toggle="tooltip" title="' . $tooltip . '">' . $dir . '</span> ';
+                    echo '<span class="label '.$class.'" data-toggle="tooltip" title="'.$tooltip.'">'.$dir.'</span> ';
                 }
                 ?>
                 <hr />

Apps/Model/Front/User/FormSocialAuth.php

Spacing +5 added lines, -5 removed lines

@@ -38,7 +38,7 @@ 
      */
     public function __construct($provider, $identity)
     {
-        $this->_provider_name = (string)$provider;
+        $this->_provider_name = (string) $provider;
         $this->_identity = $identity;
         parent::__construct(false);
     }
@@ -125,7 +125,7 @@ 
             }
             // set birthday if available
             if ($this->_identity->birthDay !== null && $this->_identity->birthMonth !== null && $this->_identity->birthYear !== null) {
-                $profile->birthday = $this->_identity->birthYear . '-' . $this->_identity->birthMonth . '-' . $this->_identity->birthDay;
+                $profile->birthday = $this->_identity->birthYear.'-'.$this->_identity->birthMonth.'-'.$this->_identity->birthDay;
             }
 
             // try to parse avatar from remote service
@@ -148,7 +148,7 @@ 
     protected function parseAvatar($url, $userId)
     {
         // check if user is defined
-        if ((int)$userId < 1) {
+        if ((int) $userId < 1) {
             return;
         }
 
@@ -165,7 +165,7 @@ 
         }
 
         // write image to filesystem
-        $imagePath = '/upload/user/avatar/original/' . $userId . '.' . $imageExtension;
+        $imagePath = '/upload/user/avatar/original/'.$userId.'.'.$imageExtension;
         $write = File::write($imagePath, $imageContent);
         if ($write === false) {
             return;
@@ -173,7 +173,7 @@ 
 
         // try to write and resize file
         try {
-            $fileObject = new FileObject(root . $imagePath);
+            $fileObject = new FileObject(root.$imagePath);
             $avatarUpload = new FormAvatarUpload();
             $avatarUpload->resizeAndSave($fileObject, $userId, 'small');
             $avatarUpload->resizeAndSave($fileObject, $userId, 'medium');

Loader/Console/index.php

Spacing +2 added lines, -2 removed lines

@@ -6,7 +6,7 @@ 
     die();
 }
 
-require_once (root . '/Loader/Autoload.php');
+require_once (root.'/Loader/Autoload.php');
 
 class Console extends Ffcms\Console\Console {}
 
@@ -18,5 +18,5 @@ 
     // display output
     echo \Console::run();
 } catch (Exception $e) {
-    echo $e->getMessage() . "\n";
+    echo $e->getMessage()."\n";
 }
\ No newline at end of file

Apps/Controller/Console/Db.php

Spacing +7 added lines, -7 removed lines

@@ -24,13 +24,13 @@ 
      */
     public function actionImport($activeRecord)
     {
-        $importFile = root . '/Private/Database/Tables/' . ucfirst(strtolower($activeRecord)) . '.php';
+        $importFile = root.'/Private/Database/Tables/'.ucfirst(strtolower($activeRecord)).'.php';
         if (!File::exist($importFile)) {
-            return 'Database model table not founded: ' . $activeRecord;
+            return 'Database model table not founded: '.$activeRecord;
         }
 
         @include($importFile);
-        return 'Database table import done: ' . $activeRecord;
+        return 'Database table import done: '.$activeRecord;
     }
 
     /**
@@ -40,9 +40,9 @@ 
      */
     public function actionImportAll($connectName = 'default')
     {
-        $importFile = root . '/Private/Database/install.php';
+        $importFile = root.'/Private/Database/install.php';
         if (!File::exist($importFile)) {
-            return 'Import file is not exist: ' . $importFile;
+            return 'Import file is not exist: '.$importFile;
         }
         @include($importFile);
         return 'All database tables was imported!';
@@ -71,8 +71,8 @@ 
             throw new NativeException('Password is bad');
         }
         echo "RoleId (1 = onlyread, 2 = user, 3 = moderator, 4 = admin):";
-        $role = (int)Console::$Input->read();
-        if (!Arr::in($role, [1,2,3,4])) {
+        $role = (int) Console::$Input->read();
+        if (!Arr::in($role, [1, 2, 3, 4])) {
             $role = 2;
         }
 

Apps/Controller/Console/Main.php

Spacing +36 added lines, -36 removed lines

@@ -26,20 +26,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;
     }
 
@@ -49,17 +49,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: " . Console::$Properties->version['num'] . ' [build: ' . Console::$Properties->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: ".Console::$Properties->version['num'].' [build: '.Console::$Properties->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.";
@@ -95,16 +95,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);
     }
 
     /**
@@ -118,9 +118,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);
             }
         }
 
@@ -154,38 +154,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;
@@ -198,11 +198,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();
@@ -210,7 +210,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;
@@ -223,9 +223,9 @@ 
         $allCfg['database'] = $dbConfigs;
         $allCfg['adminEmail'] = $email;
         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/View/Front/default/profile/index.php

Spacing +7 added lines, -7 removed lines

@@ -14,13 +14,13 @@ 
 $this->title = __('User list');
 
 if ($id === 'all') {
-    $this->title .= ': ' . __('All');
+    $this->title .= ': '.__('All');
 } elseif ($id === 'rating') {
-    $this->title .= ': ' . __('Rating');
+    $this->title .= ': '.__('Rating');
 } elseif ($id === 'city') {
-    $this->title .= ': ' . __('City') . ' ' . \App::$Security->strip_tags($add);
+    $this->title .= ': '.__('City').' '.\App::$Security->strip_tags($add);
 } elseif ($id === 'hobby') {
-    $this->title .= ': ' . __('Hobby') . ' ' . \App::$Security->strip_tags($add);
+    $this->title .= ': '.__('Hobby').' '.\App::$Security->strip_tags($add);
 }
 
 $this->breadcrumbs = [
@@ -35,7 +35,7 @@ 
 
 <?php
     if ($records === null || $records->count() < 1) {
-        echo '<div class="alert alert-danger">' . __('Users are not founded!') . '</div>';
+        echo '<div class="alert alert-danger">'.__('Users are not founded!').'</div>';
         return;
     }
 ?>
@@ -48,11 +48,11 @@ 
         </div>
         <div class="col-md-8">
             <h3>
-                <?= Url::link(['profile/show', $profile->user_id], Str::likeEmpty($profile->nick) ? __('No name') . '(id' . $profile->user_id . ')' : $profile->nick) ?>
+                <?= Url::link(['profile/show', $profile->user_id], Str::likeEmpty($profile->nick) ? __('No name').'(id'.$profile->user_id.')' : $profile->nick) ?>
             </h3>
             <p><?= __('Registered') ?>: <?= Date::convertToDatetime($profile->created_at, Date::FORMAT_TO_DAY) ?></p>
             <?php if (\App::$User->identity() !== null && $profile->user_id !== \App::$User->identity()->getId()): ?>
-                <?= Url::link(['profile/messages', null, null, ['newdialog' => $profile->user_id]], '<i class="fa fa-pencil-square-o"></i> '  . __('New message'), ['class' => 'btn btn-info']) ?>
+                <?= Url::link(['profile/messages', null, null, ['newdialog' => $profile->user_id]], '<i class="fa fa-pencil-square-o"></i> '.__('New message'), ['class' => 'btn btn-info']) ?>
             <?php endif; ?>
         </div>
         <div class="col-md-2">

Private/Database/install.php

Spacing +24 added lines, -24 removed lines

@@ -5,29 +5,29 @@
 }
 
 // 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/User.php');
-require_once(root . '/Private/Database/Tables/UserLog.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/User.php');
+require_once(root.'/Private/Database/Tables/UserLog.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

Private/Config/Object.php

Spacing +9 added lines, -9 removed lines

@@ -13,7 +13,7 @@ 
 date_default_timezone_set(App::$Properties->get('timezone'));
 
 return [
-    'Database' => function () {
+    'Database' => function() {
         $capsule = new Capsule;
         if (env_name !== 'Install') {
             try {
@@ -34,7 +34,7 @@ 
             try {
                 $capsule->connection()->getPdo();
             } catch (\Exception $e) {
-                $instUri = \App::$Alias->scriptUrl . '/install';
+                $instUri = \App::$Alias->scriptUrl.'/install';
                 \App::$Response->redirect($instUri, true);
             }
         }
@@ -46,10 +46,10 @@ 
         try {
             $pdo = \App::$Database->connection()->getPdo();
             $handler = new PdoSessionHandler($pdo, [
-                'db_table' => App::$Properties->get('database')['prefix'] . 'sessions'
+                'db_table' => App::$Properties->get('database')['prefix'].'sessions'
             ]);
         } catch (Exception $e) {
-            $handler = new NativeFileSessionHandler(root . '/Private/Sessions');
+            $handler = new NativeFileSessionHandler(root.'/Private/Sessions');
         }
 
         $storage = new NativeSessionStorage([
@@ -60,21 +60,21 @@ 
 
         return new Session($storage);
     },
-    'User' => function () {
+    'User' => function() {
         return new Apps\ActiveRecord\User();
     },
-    'Mailer' => function () {
+    'Mailer' => function() {
         $swiftTransport = Swift_MailTransport::newInstance();
         return Swift_Mailer::newInstance($swiftTransport);
     },
-    'Captcha' => function () {
+    'Captcha' => function() {
         return new Extend\Core\Captcha\Gregwar();
     },
-    'Cache' => function () {
+    'Cache' => function() {
         // initialize cache manager. You can use redis, memcache or anything else. Look at: phpfastcache.com
         CacheManager::setup([
             'storage' => 'files',
-            'path' => root . '/Private/Cache'
+            'path' => root.'/Private/Cache'
         ]);
         return CacheManager::getInstance('files');
     },