phpffcms / ffcms

Apps/Model/Front/Content/EntityContentRead.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
     /**
      * Prepare model attributes from passed objects
      * @throws ForbiddenException
-    */
+     */
     public function before()
     {
         // set class attributes from ActiveRecord objects

Spacing +9 added lines, -9 removed lines

@@ -88,7 +88,7 @@ 
         $this->id = $this->_content->id;
         $this->title = $this->_content->getLocaled('title');
         $this->text = $this->_content->getLocaled('text');
-        $this->display = (bool)$this->_content->display;
+        $this->display = (bool) $this->_content->display;
 
         $this->metaTitle = $this->_content->getLocaled('meta_title');
         $this->metaDescription = $this->_content->getLocaled('meta_description');
@@ -107,7 +107,7 @@ 
         }
 
         $this->source = $this->_content->source;
-        $this->views = $this->_content->views+1;
+        $this->views = $this->_content->views + 1;
         $this->rating = $this->_content->rating;
 
         // update views count
@@ -133,7 +133,7 @@ 
 
         $ignoredRate = App::$Session->get('content.rate.ignore');
         $this->canRate = true;
-        if (Any::isArray($ignoredRate) && Arr::in((string)$this->id, $ignoredRate)) {
+        if (Any::isArray($ignoredRate) && Arr::in((string) $this->id, $ignoredRate)) {
             $this->canRate = false;
         }
         if (!App::$User->isAuth()) {
@@ -149,15 +149,15 @@ 
     private function prepareGallery()
     {
         // get gallery images and poster data
-        $galleryPath = '/upload/gallery/' . $this->_content->id;
+        $galleryPath = '/upload/gallery/'.$this->_content->id;
         // check if gallery folder is exist
         if (Directory::exist($galleryPath)) {
-            $originImages = File::listFiles($galleryPath . '/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
+            $originImages = File::listFiles($galleryPath.'/orig/', ['.jpg', '.png', '.gif', '.jpeg', '.bmp', '.webp'], true);
             // generate poster data
             if (Arr::in($this->_content->poster, $originImages)) {
                 // original poster
                 $posterName = $this->_content->poster;
-                $this->posterFull = $galleryPath . '/orig/' . $posterName;
+                $this->posterFull = $galleryPath.'/orig/'.$posterName;
                 if (!File::exist($this->posterFull)) {
                     $this->posterFull = null;
                 }
@@ -166,7 +166,7 @@ 
                 $posterSplit = explode('.', $posterName);
                 array_pop($posterSplit);
                 $posterCleanName = implode('.', $posterSplit);
-                $this->posterThumb = $galleryPath . '/thumb/' . $posterCleanName . '.jpg';
+                $this->posterThumb = $galleryPath.'/thumb/'.$posterCleanName.'.jpg';
                 if (!File::exist($this->posterThumb)) {
                     $this->posterThumb = null;
                 }
@@ -182,9 +182,9 @@ 
                     continue;
                 }
 
-                $thumbPath = $galleryPath . '/thumb/' . $imageClearName . '.jpg';
+                $thumbPath = $galleryPath.'/thumb/'.$imageClearName.'.jpg';
                 if (File::exist($thumbPath)) {
-                    $this->galleryItems[$thumbPath] = $galleryPath . '/orig/' . $image;
+                    $this->galleryItems[$thumbPath] = $galleryPath.'/orig/'.$image;
                 }
             }
         }

Apps/Controller/Admin/User/ActionIndex.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
         $record = new UserRecord();
 
         // set current page num and offset
-        $page = (int)$this->request->query->get('page', 0);
+        $page = (int) $this->request->query->get('page', 0);
         $offset = $page * self::ITEM_PER_PAGE;
 
         // build pagination object

Private/Config/Default.php

Indentation +45 added lines, -45 removed lines

@@ -1,48 +1,48 @@
 <?php return [
-	'baseProto' => 'http',
-	'baseDomain' => 'ffcms.app',
-	'basePath' => '/',
-	'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$',
-	'timezone' => 'Europe/Moscow',
-	'mail' => [
-        	'host' => 'localhost',
-        	'port' => 21,
-        	'user' => 'root@localhost.ltd',
-        	'password' => 'sEcur3pwd',
-        	'encrypt' => 'tls'
-    	],
-	'debug' => [
-		'all' => false,
-		'cookie' => [
-			'key' => 'fdebug_jepP2',
-			'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA'
-		]
-	],
-	'userCron' => false,
-	'theme' => [
-		'Front' => 'default',
-		'Admin' => 'default'
-	],
-	'database' => [
-		'driver' => 'mysql',
-		'host' => '127.0.0.1',
-		'username' => 'mysql',
-		'password' => 'mysql',
-		'database' => 'ffcms',
-		'prefix' => 'ffcms_',
-		'charset' => 'utf8',
-		'collation' => 'utf8_unicode_ci'
-	],
+    'baseProto' => 'http',
+    'baseDomain' => 'ffcms.app',
+    'basePath' => '/',
+    'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$',
+    'timezone' => 'Europe/Moscow',
+    'mail' => [
+            'host' => 'localhost',
+            'port' => 21,
+            'user' => 'root@localhost.ltd',
+            'password' => 'sEcur3pwd',
+            'encrypt' => 'tls'
+        ],
+    'debug' => [
+        'all' => false,
+        'cookie' => [
+            'key' => 'fdebug_jepP2',
+            'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA'
+        ]
+    ],
+    'userCron' => false,
+    'theme' => [
+        'Front' => 'default',
+        'Admin' => 'default'
+    ],
+    'database' => [
+        'driver' => 'mysql',
+        'host' => '127.0.0.1',
+        'username' => 'mysql',
+        'password' => 'mysql',
+        'database' => 'ffcms',
+        'prefix' => 'ffcms_',
+        'charset' => 'utf8',
+        'collation' => 'utf8_unicode_ci'
+    ],
     'testSuite' => false,
-	'baseLanguage' => 'en',
-	'multiLanguage' => true,
-	'singleLanguage' => 'en',
-	'languages' => [
-		'en',
-		'ru'
-	],
-	'languageDomainAlias' => false,
-	'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com',
-	'gaTrackId' => false,
-	'trustedProxy' => false
+    'baseLanguage' => 'en',
+    'multiLanguage' => true,
+    'singleLanguage' => 'en',
+    'languages' => [
+        'en',
+        'ru'
+    ],
+    'languageDomainAlias' => false,
+    'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com',
+    'gaTrackId' => false,
+    'trustedProxy' => false
 ];

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

Braces +5 added lines, -2 removed lines

@@ -58,7 +58,8 @@ 
                     </button>
                 </div>
             </div>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <div class="row">
                     <div class="col-md-8" style="padding-right: 0;">
                         <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>">
@@ -75,7 +76,9 @@ 
                         <button class="btn btn-block btn-danger" id="reduceRating">-</button>
                     </div>
                 </div>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         <?php endif; ?>
         <?php
         $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);

Spacing +10 added lines, -10 removed lines

@@ -20,10 +20,10 @@ 
 $name = $user->profile->getNickname();
 
 $this->layout('_layouts/default', [
-    'title' => __('Profile') . ': ' . $name,
+    'title' => __('Profile').': '.$name,
     'breadcrumbs' => [
         Url::to('/') => __('Home'),
-        __('Profile') . ': ' . $name
+        __('Profile').': '.$name
     ]
 ]);
 
@@ -43,7 +43,7 @@ 
         <img src="<?= $user->profile->getAvatarUrl('big') ?>" class="img-fluid img-thumbnail" />
         <?php if ($ratingOn):
             $rateClass = 'btn-secondary';
-            $rateValue = (int)$user->profile->rating;
+            $rateValue = (int) $user->profile->rating;
             if ($user->profile->rating > 0) {
                 $rateClass = 'btn-info';
             } elseif ($user->profile->rating < 0) {
@@ -80,11 +80,11 @@ 
         <?php
         $userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);
         if ($isSelf) {
-            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> ' . __('Feed'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true]);
-            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true]);
-            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]);
-        } else if(\App::$User->isAuth()) {
+            $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> '.__('Feed'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true]);
+            $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true]);
+            $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]);
+        } else if (\App::$User->isAuth()) {
             $userMenu->menu(['link' => ['profile/messages', null, ['newdialog' => $user->id]], 'text' => __('Write message')]);
             $userMenu->menu(['link' => ['profile/ignore', null, ['id' => $user->id]], 'text' => __('Block')]);
         }
@@ -160,7 +160,7 @@ 
                             foreach ($hobbyArray as $item) {
                                 $item = \App::$Security->strip_tags($item);
                                 if (!Str::likeEmpty($item)) {
-                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'label label-success']) . ' ';
+                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'label label-success']).' ';
                                 }
                             }
                             ?>
@@ -213,7 +213,7 @@ 
                     <div class="col-xs-8 col-md-10">
                         <div class="h5" style="margin-top: 0;margin-bottom: 5px;">
                             <i class="glyphicon glyphicon-user"></i>
-                            <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?>
+                            <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?>
                             <small class="pull-right"><?= Date::humanize($post->updated_at); ?></small>
                         </div>
                         <div class="object-text">

Apps/Controller/Front/Profile/ActionShow.php

Spacing +5 added lines, -5 removed lines

@@ -32,7 +32,7 @@ 
     public function show(string $userId): ?string
     {
         $cfg = $this->application->configs;
-        if (!(bool)$cfg['guestView'] && !App::$User->isAuth()) {
+        if (!(bool) $cfg['guestView'] && !App::$User->isAuth()) {
             throw new ForbiddenException(__('You must login to view other profile'));
         }
 
@@ -55,7 +55,7 @@ 
                     App::$Session->getFlashBag()->add('error', __('This user are in your black list or you are in blacklist!'));
                 } else {
                     // check if message added
-                    if ($wallModel->makePost($targetPersone, $viewerPersone, (int)$cfg['delayBetweenPost'])) {
+                    if ($wallModel->makePost($targetPersone, $viewerPersone, (int) $cfg['delayBetweenPost'])) {
                         App::$Session->getFlashBag()->add('success', __('The message was successful posted!'));
                     } else {
                         App::$Session->getFlashBag()->add('warning', __('Posting message was failed! Please, wait few seconds'));
@@ -68,8 +68,8 @@ 
         $wallQuery = WallPost::where('target_id', $targetPersone->getId());
 
         // pagination and query params
-        $wallPage = (int)$this->request->query->get('page');
-        $wallStep = (int)$cfg['wallPostOnPage'];
+        $wallPage = (int) $this->request->query->get('page');
+        $wallStep = (int) $cfg['wallPostOnPage'];
         $wallOffset = $wallPage * $wallStep;
         $wallTotalCount = $wallQuery->count();
 
@@ -93,7 +93,7 @@ 
                 'total' => $wallTotalCount,
                 'page' => $wallPage
             ],
-            'ratingOn' => (int)$cfg['rating'] === 1
+            'ratingOn' => (int) $cfg['rating'] === 1
         ]);
     }
 }

index.php

Spacing +5 added lines, -5 removed lines

@@ -14,7 +14,7 @@ 
 // check if SAPI client == cli (php built-in dev server)
 if (php_sapi_name() === 'cli-server') {
     $clearPath = strtok($uriRequest, '?'); // fix file.css?version=1.2.3 or ?time marks
-    $path = root . DIRECTORY_SEPARATOR . ltrim($clearPath, '/');
+    $path = root.DIRECTORY_SEPARATOR.ltrim($clearPath, '/');
     // if static file exist
     if (is_file($path)) {
         // check if it looks like standalone php script
@@ -28,7 +28,7 @@ 
 
 
 // get configs to prepare posible route to switch environment
-$configs = require(root . '/Private/Config/Default.php');
+$configs = require(root.'/Private/Config/Default.php');
 // remove base path
 $uriRequest = substr($uriRequest, strlen($configs['basePath']));
 $uriArray = explode('/', $uriRequest);
@@ -39,8 +39,8 @@ 
 $uriLoader = ucfirst(strtolower(str_replace('.', '', $uriLoader)));
 
 // if loader of interface is available - require it
-if (in_array($uriLoader, $loaderList, true) && file_exists(root . '/Loader/' . $uriLoader . '/index.php')) {
-    require_once (root . '/Loader/' . $uriLoader . '/index.php');
+if (in_array($uriLoader, $loaderList, true) && file_exists(root.'/Loader/'.$uriLoader.'/index.php')) {
+    require_once (root.'/Loader/'.$uriLoader.'/index.php');
 } else { // else - try to load default interface
-    require_once (root . '/Loader/Front/index.php');
+    require_once (root.'/Loader/Front/index.php');
 }
\ No newline at end of file

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

Spacing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
 
 <?php
 foreach (ProfileField::all() as $custom) {
-    echo $form->fieldset()->text('custom_data.' . $custom->id);
+    echo $form->fieldset()->text('custom_data.'.$custom->id);
 }
 ?>
 

Apps/View/Front/default/form/fieldset/captcha.php

Braces +5 added lines, -2 removed lines

@@ -13,11 +13,14 @@
 
 <?php if (App::$Captcha->isFull()): ?>
     <div class="col-md-9 offset-md-3"><?= $html ?></div>
-<?php else: ?>
+<?php else {
+    : ?>
     <div class="row">
         <div class="col-md-9 offset-md-3">
             <img src="<?= $html ?>" alt="captcha" onClick="this.src='<?=$html?>&rnd='+Math.random()" />
         </div>
     </div>
     <?= $form->fieldset()->text($name, null, __('Enter data from security image to prove that you are human. If you can\'t read symbols - click on image to reload')) ?>
-<?php endif; ?>
\ No newline at end of file
+<?php endif;
+}
+?>
\ No newline at end of file

Apps/Controller/Api/Captcha.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
         // set header. Class response->header->set is not working here (content output directly before)
         header('Content-type: image/jpeg');
         $builder = new CaptchaBuilder();
-        $builder->build(mt_rand(200, 250), mt_rand(70,80)); // build and set random width/height
+        $builder->build(mt_rand(200, 250), mt_rand(70, 80)); // build and set random width/height
         // set captcha value to session
         App::$Session->set('captcha', $builder->getPhrase());