phpffcms / ffcms

Apps/Controller/Admin/Comments.php

Spacing +6 added lines, -6 removed lines

@@ -40,7 +40,7 @@ 
     public function actionIndex()
     {
         // set current page and offset
-        $page = (int)$this->request->query->get('page');
+        $page = (int) $this->request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // initialize active record model
@@ -140,7 +140,7 @@ 
     public function actionDelete($type, $id = 0)
     {
         // sounds like a multiply delete definition
-        if ($id === 0 || (int)$id < 1) {
+        if ($id === 0 || (int) $id < 1) {
             $ids = $this->request->query->get('selected');
             if (Obj::isArray($ids) && Arr::onlyNumericValues($ids)) {
                 $id = $ids;
@@ -174,7 +174,7 @@ 
         if ($model->send() && $model->validate()) {
             $model->make();
             App::$Session->getFlashBag()->add('success', __('Comments or answers are successful deleted!'));
-            $this->response->redirect('comments/' . ($type === 'answer' ? 'answerlist' : 'index'));
+            $this->response->redirect('comments/'.($type === 'answer' ? 'answerlist' : 'index'));
         }
 
         // render view
@@ -195,7 +195,7 @@ 
     public function actionPublish($type, $id = 0)
     {
         // check if it multiple accept ids
-        if ($id === 0 || (int)$id < 1) {
+        if ($id === 0 || (int) $id < 1) {
             $ids = $this->request->query->get('selected');
             if (Obj::isArray($ids) && Arr::onlyNumericValues($ids)) {
                 $id = $ids;
@@ -229,7 +229,7 @@ 
         if ($model->send()) {
             $model->make();
             App::$Session->getFlashBag()->add('success', __('Comments or answers are successful published'));
-            $this->response->redirect('comments/' . ($type === 'answer' ? 'answerlist' : 'index'));
+            $this->response->redirect('comments/'.($type === 'answer' ? 'answerlist' : 'index'));
         }
 
         return $this->view->render('publish', [
@@ -246,7 +246,7 @@ 
     public function actionAnswerlist()
     {
         // set current page and offset
-        $page = (int)$this->request->query->get('page');
+        $page = (int) $this->request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // initialize ar answers model

Loader/Cron/index.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
 /** set default locale */
 $_GET['lang'] = 'en';
 
-require_once(root . '/Loader/Autoload.php');
+require_once(root.'/Loader/Autoload.php');
 
 // make fast-access alias \App::$Object
 // class_alias('Ffcms\Core\App', 'App');
@@ -42,7 +42,7 @@ 
     $logs = $cronManager->run();
     if (PHP_SAPI === 'cli') {
         if ($logs !== null && \Ffcms\Core\Helper\Type\Obj::isArray($logs) && count($logs) > 0) {
-            echo 'Run cron tasks: ' . PHP_EOL . implode(PHP_EOL, $logs);
+            echo 'Run cron tasks: '.PHP_EOL.implode(PHP_EOL, $logs);
         } else {
             echo 'No tasks runned';
         }

Extend/Core/Arch/FrontWidget.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         }
 
         // if widget is disabled - lets return nothing
-        return !(bool)$wData->disabled;
+        return !(bool) $wData->disabled;
     }
 
 }
\ No newline at end of file

Apps/View/Front/default/content/list.php

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 
 $catConfigs = [];
 foreach ($model->category['configs'] as $key=>$value) {
-    $catConfigs[$key] = (int)$value === 1;
+    $catConfigs[$key] = (int) $value === 1;
 }
 
 $catMeta = [
@@ -68,7 +68,7 @@ 
 <?php foreach ($model->items as $item): ?>
     <article class="article-item" itemscope="itemscope" itemtype="https://schema.org/NewsArticle">
         <h2 itemprop="name">
-            <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                 <?= $item['title'] ?>
             </a>
         </h2>
@@ -95,7 +95,7 @@ 
                 <?php
                 $ownerNick = $item['author']->getProfile()->getNickname();
                 if ($item['author']->getId() < 1) {
-                    echo '<s>' . $ownerNick . '</s>';
+                    echo '<s>'.$ownerNick.'</s>';
                 } else {
                     echo Url::link(['profile/show', $item['author']->getId()], $ownerNick, ['itemprop' => 'author']);
                 }
@@ -112,7 +112,7 @@ 
         <div class="row">
             <div class="col-md-12">
                 <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?>
-                <img src="<?= \App::$Alias->scriptUrl . $item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
+                <img src="<?= \App::$Alias->scriptUrl.$item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
                 <?php endif; ?>
                 <div itemprop="text articleBody">
                     <?= $item['text'] ?>
@@ -120,7 +120,7 @@ 
             </div>
         </div>
         <div class="meta">
-        	<?php if ((int)$catConfigs['showRating'] === 1) {
+        	<?php if ((int) $catConfigs['showRating'] === 1) {
         	    echo \App::$View->render('content/_rate', [
         	        'id' => $item['id'],
         	        'canRate' => $item['canRate'],
@@ -129,15 +129,15 @@ 
         	} ?>
 
         	<span class="spaced hidden-xs"><i class="fa fa-comments"></i>
-                <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
+                <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
             </span>
             <span class="pull-right">
-            <?php if ((int)$catConfigs['showTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?>
+            <?php if ((int) $catConfigs['showTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?>
                 <span class="spaced"><i class="fa fa-tags hidden-xs"></i>
                 <?php
                     foreach ($item['tags'] as $tag) {
                         $tag = \App::$Security->strip_tags(trim($tag));
-                        echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . "&nbsp;";
+                        echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])."&nbsp;";
                     }
                 ?>
                 </span>

Apps/Controller/Front/Content.php

Spacing +16 added lines, -16 removed lines

@@ -55,9 +55,9 @@ 
     {
         $path = $this->request->getPathWithoutControllerAction();
         $configs = $this->getConfigs();
-        $page = (int)$this->request->query->get('page', 0);
-        $sort = (string)$this->request->query->get('sort', 'newest');
-        $itemCount = (int)$configs['itemPerCategory'];
+        $page = (int) $this->request->query->get('page', 0);
+        $sort = (string) $this->request->query->get('sort', 'newest');
+        $itemCount = (int) $configs['itemPerCategory'];
 
         // build special model with content list and category list information
         $model = new EntityCategoryList($path, $configs, $page, $sort);
@@ -137,7 +137,7 @@ 
         $model = new EntityContentRead($categoryRecord, $contentRecord->first());
         $search = null;
         // check if similar search is enabled for item category
-        if ((int)$model->getCategory()->getProperty('showSimilar') === 1 && $trash === false) {
+        if ((int) $model->getCategory()->getProperty('showSimilar') === 1 && $trash === false) {
             $search = new EntityContentSearch($model->title, $model->id);
         }
 
@@ -174,7 +174,7 @@ 
         }
 
         // get equal rows order by creation date
-        $records = ContentEntity::where('meta_keywords', 'like', '%' . $tagName . '%')->orderBy('created_at', 'DESC')->take(self::TAG_PER_PAGE);
+        $records = ContentEntity::where('meta_keywords', 'like', '%'.$tagName.'%')->orderBy('created_at', 'DESC')->take(self::TAG_PER_PAGE);
         // check if result is not empty
         if ($records->count() < 1) {
             throw new NotFoundException(__('Nothing founded'));
@@ -208,7 +208,7 @@ 
         $this->layout = null;
 
         // check if rss display allowed for this category
-        if ((int)$model->category['configs']['showRss'] !== 1) {
+        if ((int) $model->category['configs']['showRss'] !== 1) {
             throw new ForbiddenException(__('Rss feed is disabled for this category'));
         }
 
@@ -219,7 +219,7 @@ 
         // set channel data
         $channel->title($model->category['title'])
             ->description($model->category['description'])
-            ->url(App::$Alias->baseUrl . '/content/list/' . $model->category['path'])
+            ->url(App::$Alias->baseUrl.'/content/list/'.$model->category['path'])
             ->appendTo($feed);
 
         // add content data
@@ -229,10 +229,10 @@ 
                 // add title, short text, url
                 $item->title($row['title'])
                     ->description($row['text'])
-                    ->url(App::$Alias->baseUrl . $row['uri']);
+                    ->url(App::$Alias->baseUrl.$row['uri']);
                 // add poster
                 if ($row['thumb'] !== null) {
-                    $item->enclosure(App::$Alias->scriptUrl . $row['thumb'], $row['thumbSize'], 'image/jpeg');
+                    $item->enclosure(App::$Alias->scriptUrl.$row['thumb'], $row['thumbSize'], 'image/jpeg');
                 }
 
                 // append response to channel
@@ -267,12 +267,12 @@ 
 
         // check if user add enabled
         $configs = $this->getConfigs();
-        if (!(bool)$configs['userAdd']) {
+        if (!(bool) $configs['userAdd']) {
             throw new NotFoundException(__('User add is disabled'));
         }
 
         // prepare query
-        $page = (int)$this->request->query->get('page', 0);
+        $page = (int) $this->request->query->get('page', 0);
         $offset = $page * 10;
         $query = ContentRecord::where('author_id', '=', App::$User->identity()->getId());
 
@@ -312,7 +312,7 @@ 
 
         // check if user add enabled
         $configs = $this->getConfigs();
-        if (!(bool)$configs['userAdd']) {
+        if (!(bool) $configs['userAdd']) {
             throw new NotFoundException(__('User add is disabled'));
         }
 
@@ -321,7 +321,7 @@ 
         $new = $record->id === null;
 
         // reject edit published items and items from other authors
-        if (($new === false && (int)$record->author_id !== App::$User->identity()->getId()) || (int)$record->display === 1) {
+        if (($new === false && (int) $record->author_id !== App::$User->identity()->getId()) || (int) $record->display === 1) {
             throw new ForbiddenException(__('You have no permissions to edit this content'));
         }
 
@@ -370,7 +370,7 @@ 
             $category = $content->getCategory();
             $uri = '/content/read/';
             if (!Str::likeEmpty($category->path)) {
-                $uri .= $category->path . '/';
+                $uri .= $category->path.'/';
             }
             $uri .= $content->path;
             $sitemap->add($uri, $content->created_at, 'weekly', 0.7);
@@ -378,8 +378,8 @@ 
         // add categories
         $categories = ContentCategory::getAll();
         foreach ($categories as $item) {
-            if ((bool)$item->getProperty('showCategory')) {
-                $uri = '/content/list/' . $item->path;
+            if ((bool) $item->getProperty('showCategory')) {
+                $uri = '/content/list/'.$item->path;
                 $sitemap->add($uri, date('c'), 'daily', 0.9);
             }
         }

Apps/View/Admin/default/content/content_update.php

Spacing +16 added lines, -16 removed lines

@@ -42,9 +42,9 @@ 
 foreach (\App::$Properties->get('languages') as $lang) {
     $generalItems[] = [
         'type' => 'tab',
-        'text' => __('Lang') . ': ' . Str::upperCase($lang),
-        'content' => $form->field('title.' . $lang, 'text', ['class' => 'form-control'], __('Please, enter the title of your material for current language locale'), 'content/form/tab_content_update') .
-            $form->field('text.' . $lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true], null, 'content/form/tab_content_update'),
+        'text' => __('Lang').': '.Str::upperCase($lang),
+        'content' => $form->field('title.'.$lang, 'text', ['class' => 'form-control'], __('Please, enter the title of your material for current language locale'), 'content/form/tab_content_update').
+            $form->field('text.'.$lang, 'textarea', ['class' => 'form-control wysiwyg', 'rows' => 7, 'html' => true], null, 'content/form/tab_content_update'),
         'html' => true,
         'active' => $lang === \App::$Request->getLanguage(),
         '!secure' => true
@@ -52,10 +52,10 @@ 
 
     $propertiesItems[] = [
         'type' => 'tab',
-        'text' => __('Lang') . ': ' . Str::upperCase($lang),
-        'content' => $form->field('metaTitle.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param title for page title. Recoomended: 50-70 characters')) .
-            $form->field('metaKeywords.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param keywords for this content, separated by comma. Example: home, door, dog')) .
-            $form->field('metaDescription.' . $lang, 'text', ['class' => 'form-control'], __('Enter meta param description for this content. Recommended is 100-150 characters')),
+        'text' => __('Lang').': '.Str::upperCase($lang),
+        'content' => $form->field('metaTitle.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param title for page title. Recoomended: 50-70 characters')).
+            $form->field('metaKeywords.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param keywords for this content, separated by comma. Example: home, door, dog')).
+            $form->field('metaDescription.'.$lang, 'text', ['class' => 'form-control'], __('Enter meta param description for this content. Recommended is 100-150 characters')),
         'html' => true,
         '!secure' => true,
         'active' => $lang === \App::$Request->getLanguage()
@@ -90,7 +90,7 @@ 
     <div class="dropzone dropzone-previews" id="ffcms-dropzone"></div>
 </div>
 <div class="col-md-4">
-    ' . $form->field('poster', 'select', ['options' => [__('Not selected...')], 'class' => 'form-control'], __('Select image from gallery as a poster for this content')) . '
+    ' . $form->field('poster', 'select', ['options' => [__('Not selected...')], 'class' => 'form-control'], __('Select image from gallery as a poster for this content')).'
 </div>
 </div><br/><br/>';
 ?>
@@ -103,7 +103,7 @@ 
         ['type' => 'tab', 'text' => __('Gallery'), 'content' => $galleryTab, 'html' => true, '!secure' => true],
         ['type' => 'tab', 'text' => __('Other'), 'content' => $otherTab, 'html' => true, '!secure' => true]
     ]
-]);?>
+]); ?>
 
 <?= $form->field('galleryFreeId', 'hidden') ?>
 <?= $form->submitButton(__('Save'), ['class' => 'btn btn-primary']) ?>&nbsp;
@@ -112,14 +112,14 @@ 
 
 <?php
 // load max length display plugin
-\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl . '/assets/js/plugins/maxlength.js');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl.'/assets/js/plugins/maxlength.js');
 // load datapicker plugin
-\App::$Alias->setCustomLibrary('css', \App::$Alias->currentViewUrl . '/assets/css/plugins/datapick/datapick.css');
-\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl . '/assets/js/plugins/datapick.js');
+\App::$Alias->setCustomLibrary('css', \App::$Alias->currentViewUrl.'/assets/css/plugins/datapick/datapick.css');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->currentViewUrl.'/assets/js/plugins/datapick.js');
 // load jquery-upload plugin
-\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl . '/vendor/bower/dropzone/dist/min/dropzone.min.css');
-\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl . '/vendor/bower/dropzone/dist/min/basic.min.css');
-\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl . '/vendor/bower/dropzone/dist/min/dropzone.min.js');
+\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl.'/vendor/bower/dropzone/dist/min/dropzone.min.css');
+\App::$Alias->setCustomLibrary('css', \App::$Alias->scriptUrl.'/vendor/bower/dropzone/dist/min/basic.min.css');
+\App::$Alias->setCustomLibrary('js', \App::$Alias->scriptUrl.'/vendor/bower/dropzone/dist/min/dropzone.min.js');
 ?>
 
 <script>
@@ -216,7 +216,7 @@ 
             var DropzoneFiles = [];
             $('#ffcms-dropzone').dropzone({
                 url: script_url+'/api/content/galleryupload/<?= $model->galleryFreeId ?>?lang='+script_lang,
-                dictDefaultMessage: '<?= __('Drop files here to upload in gallery') . '<br />' . __('(or click here)') ?>',
+                dictDefaultMessage: '<?= __('Drop files here to upload in gallery').'<br />'.__('(or click here)') ?>',
                 acceptedFiles: ".jpeg,.jpg,.png,.gif,.webp",
                 addRemoveLinks: true,
                 removedfile: function (file) { // file remove click, lets try to remove file from server & make visual changes

Apps/Controller/Api/Content.php

Spacing +23 added lines, -23 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)
             ];
         }
 
@@ -246,8 +246,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/Console/Main.php

Spacing +37 added lines, -37 removed lines

@@ -28,20 +28,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;
     }
 
@@ -51,17 +51,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.";
@@ -97,16 +97,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);
     }
 
     /**
@@ -120,9 +120,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);
             }
         }
 
@@ -141,7 +141,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');
@@ -160,38 +160,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;
@@ -204,11 +204,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();
@@ -216,7 +216,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;
@@ -237,9 +237,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/ActiveRecord/Role.php

Spacing +3 added lines, -3 removed lines

@@ -26,7 +26,7 @@ 
      */
     public static function all($columns = ['*'])
     {
-        $cacheName = 'activerecords.role.all.' . implode('.', $columns);
+        $cacheName = 'activerecords.role.all.'.implode('.', $columns);
         $records = MemoryObject::instance()->get($cacheName);
         if ($records === null) {
             $records = parent::all($columns);
@@ -43,12 +43,12 @@ 
      */
     public static function get($role_id)
     {
-        $role = MainApp::$Memory->get('user.role.cache.' . $role_id);
+        $role = MainApp::$Memory->get('user.role.cache.'.$role_id);
 
         // not founded in cache
         if ($role === null) {
             $role = self::find($role_id);
-            MainApp::$Memory->set('user.role.cache.' . $role_id, $role);
+            MainApp::$Memory->set('user.role.cache.'.$role_id, $role);
         }
         return $role;
     }