phpffcms / ffcms

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/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');
     },

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

Spacing +2 added lines, -2 removed lines

@@ -95,5 +95,5 @@
 </div>
 <?php if (count($staticItems) < 1 && count($dynamicItems) < 1): ?>
     <p class="alert alert-warning"><?= __('Custom routes is not yet found') ?></p>
-<?php endif ;?>
-<?= Url::link(['main/addroute'], '<i class="fa fa-plus"></i> ' . __('New route'), ['class' => 'btn btn-primary']) ?>
\ No newline at end of file
+<?php endif; ?>
+<?= Url::link(['main/addroute'], '<i class="fa fa-plus"></i> '.__('New route'), ['class' => 'btn btn-primary']) ?>
\ No newline at end of file

Apps/Model/Front/Content/EntityCategoryList.php

Spacing +14 added lines, -14 removed lines

@@ -59,7 +59,7 @@ 
     {
         $this->_path = $path;
         $this->_configs = $configs;
-        $this->_page = (int)$offset;
+        $this->_page = (int) $offset;
         $this->_sort = $sort;
         parent::__construct();
     }
@@ -72,7 +72,7 @@ 
     public function before()
     {
         // find one or more categories where we must looking for content items
-        if ((int)$this->_configs['multiCategories'] === 1) {
+        if ((int) $this->_configs['multiCategories'] === 1) {
             $this->findCategories();
         } else {
             $this->findCategory();
@@ -91,7 +91,7 @@ 
      */
     public function setItemLimit($limit)
     {
-        $this->_customItemLimit = (int)$limit;
+        $this->_customItemLimit = (int) $limit;
     }
 
     /**
@@ -119,7 +119,7 @@ 
     private function findCategories()
     {
         // get all categories for current path and child of it
-        $query = ContentCategory::where('path', 'like', $this->_path . '%');
+        $query = ContentCategory::where('path', 'like', $this->_path.'%');
         if ($query->count() < 1) {
             throw new NotFoundException(__('Category is not founded'));
         }
@@ -152,10 +152,10 @@ 
         }
 
         // calculate selection offset
-        $itemPerPage = (int)$this->_configs['itemPerCategory'];
+        $itemPerPage = (int) $this->_configs['itemPerCategory'];
         // check if custom itemlimit defined over model api
         if ($this->_customItemLimit !== false) {
-            $itemPerPage = (int)$this->_customItemLimit;
+            $itemPerPage = (int) $this->_customItemLimit;
         }
 
         $offset = $this->_page * $itemPerPage;
@@ -197,15 +197,15 @@ 
         $catConfigs = Serialize::decode($this->_currentCategory->configs);
         // prepare rss url link for current category if enabled
         $rssUrl = false;
-        if ((int)$this->_configs['rss'] === 1 && (int)$catConfigs['showRss'] === 1) {
-            $rssUrl = App::$Alias->baseUrl . '/content/rss/' . $this->_currentCategory->path;
+        if ((int) $this->_configs['rss'] === 1 && (int) $catConfigs['showRss'] === 1) {
+            $rssUrl = App::$Alias->baseUrl.'/content/rss/'.$this->_currentCategory->path;
             $rssUrl = rtrim($rssUrl, '/');
         }
 
         // prepare sorting urls
         $catSortParams = [];
         if (App::$Request->query->get('page') !== null) {
-            $catSortParams['page'] = (int)App::$Request->query->get('page');
+            $catSortParams['page'] = (int) App::$Request->query->get('page');
         }
         $catSortUrls = [
             'views' => Url::to('content/list', $this->_currentCategory->path, null, Arr::merge($catSortParams, ['sort' => 'views']), false),
@@ -224,7 +224,7 @@ 
         ];
 
         // check if this category is hidden
-        if ((int)$this->category['configs']['showCategory'] !== 1) {
+        if ((int) $this->category['configs']['showCategory'] !== 1) {
             throw new ForbiddenException(__('This category is not available to view'));
         }
 
@@ -279,7 +279,7 @@ 
             // check if current user can rate item
             $ignoredRate = App::$Session->get('content.rate.ignore');
             $canRate = true;
-            if (Obj::isArray($ignoredRate) && Arr::in((string)$row->id, $ignoredRate)) {
+            if (Obj::isArray($ignoredRate) && Arr::in((string) $row->id, $ignoredRate)) {
                 $canRate = false;
             }
             if (!App::$User->isAuth()) {
@@ -299,11 +299,11 @@ 
                 'poster' => $row->getPosterUri(),
                 'thumb' => $row->getPosterThumbUri(),
                 'thumbSize' => File::size($row->getPosterThumbUri()),
-                'views' => (int)$row->views,
-                'rating' => (int)$row->rating,
+                'views' => (int) $row->views,
+                'rating' => (int) $row->rating,
                 'canRate' => $canRate,
                 'category' => $this->categories[$row->category_id],
-                'uri' => '/content/read/' . $itemPath,
+                'uri' => '/content/read/'.$itemPath,
                 'tags' => $tags
             ];
         }

Apps/Model/Front/Sitemap/EntityBuildMap.php

Spacing +5 added lines, -5 removed lines

@@ -52,16 +52,16 @@ 
                 $this->data[$lang][] = [
                     'uri' => Url::standaloneUrl($uri, $lang),
                     'lastmod' => Date::convertToDatetime($lastmod, 'c'),
-                    'freq' => (string)$freq,
-                    'priority' => (float)$priority
+                    'freq' => (string) $freq,
+                    'priority' => (float) $priority
                 ];
             }
         } else { // only one language, multilanguage is disabled
             $this->data[App::$Properties->get('singleLanguage')][] = [
                 'uri' => Url::standaloneUrl($uri),
                 'lastmod' => Date::convertToDatetime($lastmod, 'c'),
-                'freq' => (string)$freq,
-                'priority' => (float)$priority
+                'freq' => (string) $freq,
+                'priority' => (float) $priority
             ];
         }
     }
@@ -86,7 +86,7 @@ 
                 'items' => $items
             ]);
             
-            File::write(EntityIndexList::INDEX_PATH . '/' . $uniqueName . '.' . $lang . '.xml', $xml);
+            File::write(EntityIndexList::INDEX_PATH.'/'.$uniqueName.'.'.$lang.'.xml', $xml);
         }
         return true;
     }

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

Spacing +4 added lines, -4 removed lines

@@ -15,19 +15,19 @@
 <h1><?= __('Sitemap') ?></h1>
 <hr />
 <p><?= __('Sitemap its a special application to generate sitemap as xml file over sitemap standart for search engines.') ?></p>
-<p><?= __('Sitemap main index') ?>: <a href="<?= \App::$Alias->scriptUrl . '/sitemap' ?>" target="_blank">/sitemap</a></p>
+<p><?= __('Sitemap main index') ?>: <a href="<?= \App::$Alias->scriptUrl.'/sitemap' ?>" target="_blank">/sitemap</a></p>
 <h3><?= __('Sitemap files') ?></h3>
 <?php
 $items = [];
 if ($model->files === null || count($model->files) < 1) {
-    echo '<p class="alert alert-warning">' . __('No sitemap files found! Maybe cron manager is not configured') . '</p>';
+    echo '<p class="alert alert-warning">'.__('No sitemap files found! Maybe cron manager is not configured').'</p>';
     return;
 }
 
-foreach($model->files as $file) {
+foreach ($model->files as $file) {
     $items[] = [
         'type' => 'link',
-        'link' => \App::$Alias->scriptUrl . $file,
+        'link' => \App::$Alias->scriptUrl.$file,
         'text' => $file,
         'linkProperty' => ['target' => '_blank']
     ];

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

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 <hr />
 <?php
 if ($model->items === null || count($model->items) < 1) {
-    echo '<p class="alert alert-warning">' . __('No notifications available') . '</p>';
+    echo '<p class="alert alert-warning">'.__('No notifications available').'</p>';
     return;
 }
 ?>

Apps/Model/Api/Comments/CommentAnswerAdd.php

Spacing +6 added lines, -6 removed lines

@@ -49,12 +49,12 @@ 
     public function check()
     {
         // check if user is auth'd or guest name is defined
-        if (!App::$User->isAuth() && ((int)$this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) {
+        if (!App::$User->isAuth() && ((int) $this->_configs['guestAdd'] !== 1 || Str::length($this->guestName) < 2)) {
             throw new JsonException(__('Guest name is not defined'));
         }
 
         // guest moderation
-        if (!App::$User->isAuth() && (bool)$this->_configs['guestModerate']) {
+        if (!App::$User->isAuth() && (bool) $this->_configs['guestModerate']) {
             $captcha = App::$Request->request->get('captcha');
             if (!App::$Captcha->validate($captcha)) {
                 throw new JsonException(__('Captcha is incorrect! Click on image to refresh and try again'));
@@ -67,7 +67,7 @@ 
         }
 
         // check if message length is correct
-        if (Str::length($this->message) < (int)$this->_configs['minLength'] || Str::length($this->message) > (int)$this->_configs['maxLength']) {
+        if (Str::length($this->message) < (int) $this->_configs['minLength'] || Str::length($this->message) > (int) $this->_configs['maxLength']) {
             throw new JsonException(__('Message length is incorrect. Current: %cur%, min - %min%, max - %max%', [
                 'cur' => Str::length($this->message),
                 'min' => $this->_configs['minLength'],
@@ -112,15 +112,15 @@ 
         $record->lang = App::$Request->getLanguage();
         $record->ip = $this->ip;
         // check if premoderation is enabled and user is guest
-        if ((bool)$this->_configs['guestModerate'] && $this->_userId < 1) {
+        if ((bool) $this->_configs['guestModerate'] && $this->_userId < 1) {
             $record->moderate = 1;
         }
         $record->save();
 
         // add notification for comment post owner
         $commentPost = $record->getCommentPost();
-        if ($commentPost !== null && (int)$commentPost->user_id !== 0 && (int)$commentPost->user_id !== $this->_userId) {
-            $notify = new EntityAddNotification((int)$commentPost->user_id);
+        if ($commentPost !== null && (int) $commentPost->user_id !== 0 && (int) $commentPost->user_id !== $this->_userId) {
+            $notify = new EntityAddNotification((int) $commentPost->user_id);
             $notify->add($commentPost->pathway, EntityAddNotification::MSG_ADD_COMMENTANSWER, [
                 'snippet' => Text::snippet(App::$Security->strip_tags($this->message), 50),
                 'post' => Text::snippet(App::$Security->strip_tags($commentPost->message), 50)