phpffcms / ffcms

Apps/View/Front/default/widgets/newcomment/default.php

Spacing +2 added lines, -2 removed lines

@@ -14,7 +14,7 @@ 
     <div class="row mb-1">
         <div class="col-md-6">
             <i class="fa fa-user"></i>
-            <?php if ((int)$comment['user']['id'] > 0): ?>
+            <?php if ((int) $comment['user']['id'] > 0): ?>
                 <?= Url::a(['profile/show', [$comment['user']['id']]], $comment['user']['name'], ['style' => 'color: #595959']) ?>
             <?php else: ?>
                 <?= $comment['user']['name'] ?>
@@ -29,7 +29,7 @@ 
 
     <div class="row">
         <div class="col widget-comment-text">
-            <a href="<?= \App::$Alias->baseUrl . '/' . $comment['app_name'] . '/comments/' . $comment['app_id'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.'/'.$comment['app_name'].'/comments/'.$comment['app_id'] ?>">
                 <?= Text::cut(\App::$Security->strip_tags($comment['text']), 0, $snippet) ?>
             </a>
         </div>

Braces +5 added lines, -2 removed lines

@@ -16,9 +16,12 @@
             <i class="fa fa-user"></i>
             <?php if ((int)$comment['user']['id'] > 0): ?>
                 <?= Url::a(['profile/show', [$comment['user']['id']]], $comment['user']['name'], ['style' => 'color: #595959']) ?>
-            <?php else: ?>
+            <?php else {
+    : ?>
                 <?= $comment['user']['name'] ?>
-            <?php endif; ?>
+            <?php endif;
+}
+?>
         </div>
         <div class="col-md-6 pull-right">
             <small class="text-secondary pull-right">

Apps/Model/Api/Comments/CommentPostAdd.php

Spacing +6 added lines, -6 removed lines

@@ -57,17 +57,17 @@ 
     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'));
         }
 
         // check if target app_name or id is empty
-        if (Str::likeEmpty($this->appName) || Str::likeEmpty($this->appId) || (int)$this->appId < 0) {
+        if (Str::likeEmpty($this->appName) || Str::likeEmpty($this->appId) || (int) $this->appId < 0) {
             throw new JsonException(__('Wrong target name or id'));
         }
 
         // 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'],
@@ -76,7 +76,7 @@ 
         }
 
         // 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'));
@@ -110,13 +110,13 @@ 
     {
         $record = new CommentPost();
         $record->app_name = $this->appName;
-        $record->app_relation_id = (int)$this->appId;
+        $record->app_relation_id = (int) $this->appId;
         $record->user_id = $this->_userId;
         $record->guest_name = $this->guestName;
         $record->message = $this->message;
         $record->lang = App::$Request->getLanguage();
         // check if pre moderation is enabled and user is guest
-        if ((int)$this->_configs['guestModerate'] === 1 && $this->_userId < 1) {
+        if ((int) $this->_configs['guestModerate'] === 1 && $this->_userId < 1) {
             $record->moderate = 1;
         }
         $record->save();

Apps/Controller/Api/Comments/ActionAdd.php

Spacing +4 added lines, -4 removed lines

@@ -31,7 +31,7 @@ 
         $this->setJsonHeader();
         $configs = AppRecord::getConfigs('widget', 'Comments');
 
-        $replayTo = (int)$this->request->request->get('replay-to');
+        $replayTo = (int) $this->request->request->get('replay-to');
         $model = null;
         // check if its a answer (comment answer type)
         if ($replayTo > 0) {
@@ -40,15 +40,15 @@ 
         } else { // sounds like new comment row
             $model = new CommentPostAdd($configs);
             $model->appName = App::$Security->strip_tags($this->request->request->get('app_name'));
-            $model->appId = (int)$this->request->request->get('app_id');
+            $model->appId = (int) $this->request->request->get('app_id');
         }
 
         // pass general comment params to model
-        $model->message = App::$Security->secureHtml((string)$this->request->request->get('message'));
+        $model->message = App::$Security->secureHtml((string) $this->request->request->get('message'));
         $model->guestName = App::$Security->strip_tags($this->request->request->get('guest-name'));
 
         // check model conditions before add new row
-        if (!$model|| !$model->check()) {
+        if (!$model || !$model->check()) {
             throw new NativeException('Unknown error');
         }
 

Apps/Controller/Api/Comments/ActionCount.php

Spacing +3 added lines, -3 removed lines

@@ -40,14 +40,14 @@
         // for each item in path array calculate comments count
         foreach ($ids as $id) {
             $query = CommentPost::where('app_name', $appName)
-                ->where('app_relation_id', (int)$id)
+                ->where('app_relation_id', (int) $id)
                 ->where('moderate', '=', 0);
             // check if comments is depend of language locale
-            if ((bool)$configs['onlyLocale']) {
+            if ((bool) $configs['onlyLocale']) {
                 $query = $query->where('lang', '=', $this->request->getLanguage());
             }
             // set itemId => count
-            $count[(int)$id] = $query->count();
+            $count[(int) $id] = $query->count();
         }
         // render json response
         return json_encode(['status' => 1, 'count' => $count]);

Private/Config/Default.php

Indentation +47 added lines, -47 removed lines

@@ -1,49 +1,49 @@
 <?php return [
-	'baseProto' => 'http',
-	'baseDomain' => 'ffcms3.test',
-	'basePath' => '/',
-	'passwordSalt' => '$2a$07$GEc5J9C48A0Aom5ph53Al13aa$',
-	'timezone' => 'Europe/Moscow',
-	'adminEmail' => false,
-	'debug' => [
-		'all' => false,
-		'cookie' => [
-			'key' => 'fdebug_ebcfb0',
-			'value' => 'e377c1648b7f1f6364c081bd339a93c101881f77da9b815a4ed605822ed33dee9debee99611afe0001be2c8e7e07705833901954543'
-		]
-	],
-	'userCron' => false,
-	'testSuite' => 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'
-	],
-	'mail' => [
-		'host' => 'localhost',
-		'port' => '23',
-		'user' => 'root@localhost.ltd',
-		'encrypt' => 'tls',
-		'password' => '1234'
-	],
-	'baseLanguage' => 'en',
-	'multiLanguage' => true,
-	'singleLanguage' => 'en',
-	'languages' => [
-		'en',
-		'ru'
-	],
-	'languageDomainAlias' => false,
-	'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com',
-	'gaTrackId' => false,
-	'trustedProxy' => false
+    'baseProto' => 'http',
+    'baseDomain' => 'ffcms3.test',
+    'basePath' => '/',
+    'passwordSalt' => '$2a$07$GEc5J9C48A0Aom5ph53Al13aa$',
+    'timezone' => 'Europe/Moscow',
+    'adminEmail' => false,
+    'debug' => [
+        'all' => false,
+        'cookie' => [
+            'key' => 'fdebug_ebcfb0',
+            'value' => 'e377c1648b7f1f6364c081bd339a93c101881f77da9b815a4ed605822ed33dee9debee99611afe0001be2c8e7e07705833901954543'
+        ]
+    ],
+    'userCron' => false,
+    'testSuite' => 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'
+    ],
+    'mail' => [
+        'host' => 'localhost',
+        'port' => '23',
+        'user' => 'root@localhost.ltd',
+        'encrypt' => 'tls',
+        'password' => '1234'
+    ],
+    'baseLanguage' => 'en',
+    'multiLanguage' => true,
+    'singleLanguage' => 'en',
+    'languages' => [
+        'en',
+        'ru'
+    ],
+    'languageDomainAlias' => false,
+    'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com',
+    'gaTrackId' => false,
+    'trustedProxy' => false
 ];
\ No newline at end of file

Private/Config/Routing.php

Indentation +6 added lines, -6 removed lines

@@ -1,8 +1,8 @@
 <?php return [
-	'Alias' => [
-		'Front' => [
-			'/' => '/content/list/news',
-			'/about' => '/content/read/page/about-page'
-		]
-	]
+    'Alias' => [
+        'Front' => [
+            '/' => '/content/list/news',
+            '/about' => '/content/read/page/about-page'
+        ]
+    ]
 ];
\ No newline at end of file

Widgets/Front/Comments/Comments.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
     public function init(): void
     {
         if (App::$Request->getLanguage() !== 'en') {
-            App::$Translate->append('/i18n/Front/' . App::$Request->getLanguage() . '/CommentWidget.php');
+            App::$Translate->append('/i18n/Front/'.App::$Request->getLanguage().'/CommentWidget.php');
         }
     }
 
@@ -30,14 +30,14 @@ 
      */
     public function display(): ?string
     {
-        if (!$this->name || (int)$this->id < 1) {
+        if (!$this->name || (int) $this->id < 1) {
             return null;
         }
 
         return App::$View->render('widgets/comments/show', [
             'configs' => $this->getConfigs(),
-            'name' => (string)$this->name,
-            'id' => (int)$this->id,
+            'name' => (string) $this->name,
+            'id' => (int) $this->id,
         ]);
     }
 }

Loader/Autoload.php

Spacing +3 added lines, -3 removed lines

@@ -11,12 +11,12 @@
 mb_internal_encoding('UTF-8');
 
 // load composer packages
-$loader = require root . '/vendor/autoload.php';
+$loader = require root.'/vendor/autoload.php';
 // enable autoload for general namespaces user apps
 $loader->add('Apps\\', root);
 $loader->add('Extend\\', root);
 $loader->add('Widgets\\', root);
 
 // tmp @todo
-$loader->add('Widgets\\', root . '/vendor/phpffcms/ffcms-tinymce/src');
-$loader->add('Apps\\', root . '/vendor/phpffcms/ffcms-tinymce/src');
\ No newline at end of file
+$loader->add('Widgets\\', root.'/vendor/phpffcms/ffcms-tinymce/src');
+$loader->add('Apps\\', root.'/vendor/phpffcms/ffcms-tinymce/src');
\ No newline at end of file

Apps/ActiveRecord/Profile.php

Spacing +9 added lines, -9 removed lines

@@ -61,8 +61,8 @@ 
         }
 
         // check in cache
-        if (MainApp::$Memory->get('profile.object.cache.' . $userId) !== null) {
-            return MainApp::$Memory->get('profile.object.cache.' . $userId);
+        if (MainApp::$Memory->get('profile.object.cache.'.$userId) !== null) {
+            return MainApp::$Memory->get('profile.object.cache.'.$userId);
         }
 
         // find row
@@ -74,7 +74,7 @@ 
         }
 
         $object = $profile->first();
-        MainApp::$Memory->set('profile.object.cache.' . $userId, $object);
+        MainApp::$Memory->set('profile.object.cache.'.$userId, $object);
 
         return $object;
     }
@@ -86,17 +86,17 @@ 
      */
     public function getAvatarUrl($type = 'small')
     {
-        $default = '/upload/user/avatar/' . $type . '/default.jpg';
+        $default = '/upload/user/avatar/'.$type.'/default.jpg';
         if (!Arr::in($type, ['small', 'big', 'medium'])) {
-            return MainApp::$Alias->scriptUrl . $default;
+            return MainApp::$Alias->scriptUrl.$default;
         }
 
-        $route = '/upload/user/avatar/' . $type . '/' . $this->user_id . '.jpg';
+        $route = '/upload/user/avatar/'.$type.'/'.$this->user_id.'.jpg';
         if (File::exist($route)) {
-            return MainApp::$Alias->scriptUrl . $route . '?mtime=' . File::mTime($route);
+            return MainApp::$Alias->scriptUrl.$route.'?mtime='.File::mTime($route);
         }
 
-        return MainApp::$Alias->scriptUrl . $default;
+        return MainApp::$Alias->scriptUrl.$default;
     }
 
     /**
@@ -107,7 +107,7 @@ 
     {
         $userNick = $this->nick;
         if (!$userNick || Str::likeEmpty($userNick)) {
-            $userNick = 'id' . $this->id;
+            $userNick = 'id'.$this->id;
         }
 
         return $userNick;