Passed
Push — master ( 02a4a5...734a7e )
by Mihail
05:36
created
Apps/Controller/Admin/Sitemap.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace Apps\Model\Front\Profile;
4 4
 
5 5
 use Apps\ActiveRecord\Blacklist;
6
-use Ffcms\Core\App;
7 6
 use Ffcms\Core\Arch\Model;
8 7
 use Ffcms\Core\Interfaces\iUser;
9 8
 
Please login to merge, or discard this patch.
Apps/Controller/Front/Main.php 1 patch
Unused Use Statements   -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,6 @@
 block discarded – undo
3 3
 namespace Apps\Controller\Front;
4 4
 
5 5
 use Extend\Core\Arch\Controller;
6
-use Apps\Model\Front\User;
7
-use Ffcms\Core\App;
8 6
 
9 7
 
10 8
 class Main extends Controller
Please login to merge, or discard this patch.
Apps/Controller/Install/Main.php 1 patch
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,6 @@
 block discarded – undo
3 3
 namespace Apps\Model\Front\Profile;
4 4
 
5 5
 use Apps\ActiveRecord\Blacklist;
6
-use Ffcms\Core\App;
7 6
 use Ffcms\Core\Arch\Model;
8 7
 use Ffcms\Core\Interfaces\iUser;
9 8
 
Please login to merge, or discard this patch.
Private/Config/Default.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -1,41 +1,41 @@
 block discarded – undo
1 1
 <?php return [
2
-	'baseProto' => 'http',
3
-	'baseDomain' => 'ffcms.app',
4
-	'basePath' => '/',
5
-	'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$',
6
-	'timezone' => 'Europe/Moscow',
7
-	'adminEmail' => '[email protected]',
8
-	'debug' => [
9
-		'all' => false,
10
-		'cookie' => [
11
-			'key' => 'fdebug_jepP2',
12
-			'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA'
13
-		]
14
-	],
15
-	'userCron' => false,
16
-	'theme' => [
17
-		'Front' => 'default',
18
-		'Admin' => 'default'
19
-	],
20
-	'database' => [
21
-		'driver' => 'mysql',
22
-		'host' => '127.0.0.1',
23
-		'username' => 'mysql',
24
-		'password' => 'mysql',
25
-		'database' => 'ffcms',
26
-		'prefix' => 'ffcms_',
27
-		'charset' => 'utf8',
28
-		'collation' => 'utf8_unicode_ci'
29
-	],
30
-	'baseLanguage' => 'en',
31
-	'multiLanguage' => true,
32
-	'singleLanguage' => 'en',
33
-	'languages' => [
34
-		'en',
35
-		'ru'
36
-	],
37
-	'languageDomainAlias' => false,
38
-	'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com',
39
-	'gaTrackId' => false,
40
-	'trustedProxy' => false
2
+    'baseProto' => 'http',
3
+    'baseDomain' => 'ffcms.app',
4
+    'basePath' => '/',
5
+    'passwordSalt' => '$2a$07$2NJgci5A7NI9m2J9Ii92a1I3DiH6$',
6
+    'timezone' => 'Europe/Moscow',
7
+    'adminEmail' => '[email protected]',
8
+    'debug' => [
9
+        'all' => false,
10
+        'cookie' => [
11
+            'key' => 'fdebug_jepP2',
12
+            'value' => 'pOH1Kj18fHN7mk9a81F32eJbl9d3AeDjLC1g7poPGE22Ii6pI68P5B6O5hKMofnLPB0lFdpo2a2o78NhedjGA'
13
+        ]
14
+    ],
15
+    'userCron' => false,
16
+    'theme' => [
17
+        'Front' => 'default',
18
+        'Admin' => 'default'
19
+    ],
20
+    'database' => [
21
+        'driver' => 'mysql',
22
+        'host' => '127.0.0.1',
23
+        'username' => 'mysql',
24
+        'password' => 'mysql',
25
+        'database' => 'ffcms',
26
+        'prefix' => 'ffcms_',
27
+        'charset' => 'utf8',
28
+        'collation' => 'utf8_unicode_ci'
29
+    ],
30
+    'baseLanguage' => 'en',
31
+    'multiLanguage' => true,
32
+    'singleLanguage' => 'en',
33
+    'languages' => [
34
+        'en',
35
+        'ru'
36
+    ],
37
+    'languageDomainAlias' => false,
38
+    'gaClientId' => '570934480862-son8fr180fr6u6tlt9iqpjpoesngro0o.apps.googleusercontent.com',
39
+    'gaTrackId' => false,
40
+    'trustedProxy' => false
41 41
 ];
42 42
\ No newline at end of file
Please login to merge, or discard this patch.
Apps/View/Admin/default/feedback/read.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -28,38 +28,38 @@  discard block
 block discarded – undo
28 28
         <div class="panel panel-info">
29 29
             <div class="panel-heading">
30 30
                 <?php
31
-                if ((int)$record->readed !== 1) {
31
+                if ((int) $record->readed !== 1) {
32 32
                     echo '<i class="fa fa-bell"></i> ';
33 33
                 }
34 34
                 ?>
35 35
                 <?= __('Message sent') ?>: <?= Date::convertToDatetime($record->created_at, Date::FORMAT_TO_HOUR) ?>.
36 36
                 <?php
37
-                if ((int)$record->closed !== 1) {
38
-                    echo '<span class="label label-success">' . __('Opened') . '</span>';
37
+                if ((int) $record->closed !== 1) {
38
+                    echo '<span class="label label-success">'.__('Opened').'</span>';
39 39
                 } else {
40
-                    echo '<span class="label label-danger">' . __('Closed') . '</span>';
40
+                    echo '<span class="label label-danger">'.__('Closed').'</span>';
41 41
                 }
42 42
                 ?>
43 43
             </div>
44 44
             <div class="panel-body">
45 45
                 <?php
46
-                if ((int)$record->closed !== 0) {
47
-                    echo '<p class="alert alert-warning">' . __('The feedback request is closed! Thread in only-read mode') . '.</p>';
46
+                if ((int) $record->closed !== 0) {
47
+                    echo '<p class="alert alert-warning">'.__('The feedback request is closed! Thread in only-read mode').'.</p>';
48 48
                 }
49 49
                 ?>
50 50
                 <p><?= Str::replace("\n", "<br />", $record->message) ?></p>
51 51
                 <hr />
52 52
                 <?php
53 53
                 // show "mark as read" button if message is not readed
54
-                if ((int)$record->readed !== 1) {
55
-                    echo Url::link(['feedback/turn', 'read', $record->id], __('Mark as read'), ['class' => 'label label-success']) . ' ';
54
+                if ((int) $record->readed !== 1) {
55
+                    echo Url::link(['feedback/turn', 'read', $record->id], __('Mark as read'), ['class' => 'label label-success']).' ';
56 56
                 }
57 57
 
58 58
                 // show close/open button depend of current status
59
-                if ((int)$record->closed === 0) {
60
-                    echo Url::link(['feedback/turn', 'close', $record->id], __('Close'), ['class' => 'label label-warning']) . ' ';
59
+                if ((int) $record->closed === 0) {
60
+                    echo Url::link(['feedback/turn', 'close', $record->id], __('Close'), ['class' => 'label label-warning']).' ';
61 61
                 } else {
62
-                    echo Url::link(['feedback/turn', 'open', $record->id], __('Open'), ['class' => 'label label-info']) . ' ';
62
+                    echo Url::link(['feedback/turn', 'open', $record->id], __('Open'), ['class' => 'label label-info']).' ';
63 63
                 }
64 64
 
65 65
                 ?>
@@ -76,7 +76,7 @@  discard block
 block discarded – undo
76 76
             <div class="panel-body">
77 77
                 <?php
78 78
                 $uInfo = 'no';
79
-                if ((int)$record->user_id > 0) {
79
+                if ((int) $record->user_id > 0) {
80 80
                     $user = \App::$User->identity($record->user_id);
81 81
                     if ($user !== null && $user->getId() > 0) {
82 82
                         $uInfo = Url::link(['user/update', $user->getId()], $user->getProfile()->getNickname());
@@ -101,9 +101,9 @@  discard block
 block discarded – undo
101 101
 
102 102
 <?php if ($record->getAnswers()->count() > 0): ?>
103 103
     <?php foreach ($record->getAnswers()->get() as $answer): ?>
104
-        <div class="panel <?= (int)$answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>">
104
+        <div class="panel <?= (int) $answer->is_admin === 1 ? 'panel-success' : 'panel-default' ?>">
105 105
             <div class="panel-heading">
106
-                <?= __('From') ?>: <?= $answer->name . '(' . $answer->email . ')' . ((int)$answer->user_id > 0 ? Url::link(['user/update', $answer->user_id], '[id' . $answer->user_id . ']') : null) ?>,
106
+                <?= __('From') ?>: <?= $answer->name.'('.$answer->email.')'.((int) $answer->user_id > 0 ? Url::link(['user/update', $answer->user_id], '[id'.$answer->user_id.']') : null) ?>,
107 107
                 <?= Date::convertToDatetime($answer->created_at, Date::FORMAT_TO_HOUR) ?>
108 108
                 <span class="pull-right">
109 109
                     <?= Url::link(['feedback/update', 'answer', $answer->id], __('Edit'), ['class' => 'label label-primary']) ?>
Please login to merge, or discard this patch.
Apps/View/Admin/default/user/user_delete.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -57,7 +57,7 @@
 block discarded – undo
57 57
 <?php
58 58
     $form = new Form($model, ['class' => 'form-horizontal', 'method' => 'post', 'action' => '']);
59 59
     echo $form->start();
60
-    echo $form->submitButton(__('Delete'), ['class' => 'btn btn-danger']) . "&nbsp;";
60
+    echo $form->submitButton(__('Delete'), ['class' => 'btn btn-danger'])."&nbsp;";
61 61
     echo Url::link(['user/index'], __('Cancel'), ['class' => 'btn btn-default']);
62 62
     echo $form->finish();
63 63
 ?>
64 64
\ No newline at end of file
Please login to merge, or discard this patch.
Apps/Model/Admin/Feedback/FormAnswerAdd.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -34,10 +34,10 @@
 block discarded – undo
34 34
         $record->save();
35 35
 
36 36
         // add user notification
37
-        if ((int)$this->_post->user_id > 0 && $this->_userId !== (int)$this->_post->user_id) {
38
-            $notify = new EntityAddNotification((int)$this->_post->user_id);
39
-            $uri = '/feedback/read/' . $this->_post->id . '/' . $this->_post->hash . '#feedback-answer-' . $record->id;
40
-            $notify->add($uri,  EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [
37
+        if ((int) $this->_post->user_id > 0 && $this->_userId !== (int) $this->_post->user_id) {
38
+            $notify = new EntityAddNotification((int) $this->_post->user_id);
39
+            $uri = '/feedback/read/'.$this->_post->id.'/'.$this->_post->hash.'#feedback-answer-'.$record->id;
40
+            $notify->add($uri, EntityAddNotification::MSG_ADD_FEEDBACKANSWER, [
41 41
                 'snippet' => Text::snippet(App::$Security->strip_tags($this->message), 50),
42 42
                 'post' => Text::snippet(App::$Security->strip_tags($this->_post->message), 50)
43 43
             ]);
Please login to merge, or discard this patch.
Apps/Controller/Front/Content.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -55,9 +55,9 @@  discard block
 block discarded – undo
55 55
     {
56 56
         $path = $this->request->getPathWithoutControllerAction();
57 57
         $configs = $this->getConfigs();
58
-        $page = (int)$this->request->query->get('page', 0);
59
-        $sort = (string)$this->request->query->get('sort', 'newest');
60
-        $itemCount = (int)$configs['itemPerCategory'];
58
+        $page = (int) $this->request->query->get('page', 0);
59
+        $sort = (string) $this->request->query->get('sort', 'newest');
60
+        $itemCount = (int) $configs['itemPerCategory'];
61 61
 
62 62
         // build special model with content list and category list information
63 63
         $model = new EntityCategoryList($path, $configs, $page, $sort);
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
         $model = new EntityContentRead($categoryRecord, $contentRecord->first());
138 138
         $search = null;
139 139
         // check if similar search is enabled for item category
140
-        if ((int)$model->getCategory()->getProperty('showSimilar') === 1 && $trash === false) {
140
+        if ((int) $model->getCategory()->getProperty('showSimilar') === 1 && $trash === false) {
141 141
             $search = new EntityContentSearch($model->title, $model->id);
142 142
         }
143 143
 
@@ -167,7 +167,7 @@  discard block
 block discarded – undo
167 167
     {
168 168
         $configs = $this->getConfigs();
169 169
         // check if tags is enabled
170
-        if ((int)$configs['keywordsAsTags'] !== 1) {
170
+        if ((int) $configs['keywordsAsTags'] !== 1) {
171 171
             throw new NotFoundException(__('Tag system is disabled'));
172 172
         }
173 173
 
@@ -180,7 +180,7 @@  discard block
 block discarded – undo
180 180
         }
181 181
 
182 182
         // get equal rows order by creation date
183
-        $records = ContentEntity::where('meta_keywords', 'like', '%' . $tagName . '%')->orderBy('created_at', 'DESC')->take(self::TAG_PER_PAGE);
183
+        $records = ContentEntity::where('meta_keywords', 'like', '%'.$tagName.'%')->orderBy('created_at', 'DESC')->take(self::TAG_PER_PAGE);
184 184
         // check if result is not empty
185 185
         if ($records->count() < 1) {
186 186
             throw new NotFoundException(__('Nothing founded'));
@@ -214,7 +214,7 @@  discard block
 block discarded – undo
214 214
         $this->layout = null;
215 215
 
216 216
         // check if rss display allowed for this category
217
-        if ((int)$model->category['configs']['showRss'] !== 1) {
217
+        if ((int) $model->category['configs']['showRss'] !== 1) {
218 218
             throw new ForbiddenException(__('Rss feed is disabled for this category'));
219 219
         }
220 220
 
@@ -225,7 +225,7 @@  discard block
 block discarded – undo
225 225
         // set channel data
226 226
         $channel->title($model->category['title'])
227 227
             ->description($model->category['description'])
228
-            ->url(App::$Alias->baseUrl . '/content/list/' . $model->category['path'])
228
+            ->url(App::$Alias->baseUrl.'/content/list/'.$model->category['path'])
229 229
             ->appendTo($feed);
230 230
 
231 231
         // add content data
@@ -235,10 +235,10 @@  discard block
 block discarded – undo
235 235
                 // add title, short text, url
236 236
                 $item->title($row['title'])
237 237
                     ->description($row['text'])
238
-                    ->url(App::$Alias->baseUrl . $row['uri']);
238
+                    ->url(App::$Alias->baseUrl.$row['uri']);
239 239
                 // add poster
240 240
                 if ($row['thumb'] !== null) {
241
-                    $item->enclosure(App::$Alias->scriptUrl . $row['thumb'], $row['thumbSize'], 'image/jpeg');
241
+                    $item->enclosure(App::$Alias->scriptUrl.$row['thumb'], $row['thumbSize'], 'image/jpeg');
242 242
                 }
243 243
 
244 244
                 // append response to channel
@@ -273,12 +273,12 @@  discard block
 block discarded – undo
273 273
 
274 274
         // check if user add enabled
275 275
         $configs = $this->getConfigs();
276
-        if (!(bool)$configs['userAdd']) {
276
+        if (!(bool) $configs['userAdd']) {
277 277
             throw new NotFoundException(__('User add is disabled'));
278 278
         }
279 279
 
280 280
         // prepare query
281
-        $page = (int)$this->request->query->get('page', 0);
281
+        $page = (int) $this->request->query->get('page', 0);
282 282
         $offset = $page * 10;
283 283
         $query = ContentRecord::where('author_id', '=', App::$User->identity()->getId());
284 284
 
@@ -318,7 +318,7 @@  discard block
 block discarded – undo
318 318
 
319 319
         // check if user add enabled
320 320
         $configs = $this->getConfigs();
321
-        if (!(bool)$configs['userAdd']) {
321
+        if (!(bool) $configs['userAdd']) {
322 322
             throw new NotFoundException(__('User add is disabled'));
323 323
         }
324 324
 
@@ -327,7 +327,7 @@  discard block
 block discarded – undo
327 327
         $new = $record->id === null;
328 328
 
329 329
         // reject edit published items and items from other authors
330
-        if (($new === false && (int)$record->author_id !== App::$User->identity()->getId()) || (int)$record->display === 1) {
330
+        if (($new === false && (int) $record->author_id !== App::$User->identity()->getId()) || (int) $record->display === 1) {
331 331
             throw new ForbiddenException(__('You have no permissions to edit this content'));
332 332
         }
333 333
 
@@ -376,7 +376,7 @@  discard block
 block discarded – undo
376 376
             $category = $content->getCategory();
377 377
             $uri = '/content/read/';
378 378
             if (!Str::likeEmpty($category->path)) {
379
-                $uri .= $category->path . '/';
379
+                $uri .= $category->path.'/';
380 380
             }
381 381
             $uri .= $content->path;
382 382
             $sitemap->add($uri, $content->created_at, 'weekly', 0.7);
@@ -384,8 +384,8 @@  discard block
 block discarded – undo
384 384
         // add categories
385 385
         $categories = ContentCategory::getAll();
386 386
         foreach ($categories as $item) {
387
-            if ((bool)$item->getProperty('showCategory')) {
388
-                $uri = '/content/list/' . $item->path;
387
+            if ((bool) $item->getProperty('showCategory')) {
388
+                $uri = '/content/list/'.$item->path;
389 389
                 $sitemap->add($uri, date('c'), 'daily', 0.9);
390 390
             }
391 391
         }
Please login to merge, or discard this patch.
Apps/Controller/Front/Feedback.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -41,18 +41,18 @@  discard block
 block discarded – undo
41 41
     {
42 42
         // get configs
43 43
         $configs = $this->getConfigs();
44
-        if (!App::$User->isAuth() && (int)$configs['guestAdd'] !== 1) {
44
+        if (!App::$User->isAuth() && (int) $configs['guestAdd'] !== 1) {
45 45
             throw new ForbiddenException(__('Feedback available only for authorized users'));
46 46
         }
47 47
 
48 48
         // initialize model
49
-        $model = new FormFeedbackAdd((int)$configs['useCaptcha'] === 1);
49
+        $model = new FormFeedbackAdd((int) $configs['useCaptcha'] === 1);
50 50
         if ($model->send()) {
51 51
             if ($model->validate()) {
52 52
                 // if validation is passed save data to db and get row
53 53
                 $record = $model->make();
54 54
                 App::$Session->getFlashBag()->add('success', __('Your message was added successful'));
55
-                $this->response->redirect('feedback/read/' . $record->id . '/' . $record->hash);
55
+                $this->response->redirect('feedback/read/'.$record->id.'/'.$record->hash);
56 56
             } else {
57 57
                 App::$Session->getFlashBag()->add('error', __('Message is not sended! Please, fix issues in form below'));
58 58
             }
@@ -61,7 +61,7 @@  discard block
 block discarded – undo
61 61
         // render output view
62 62
         return $this->view->render('create', [
63 63
             'model' => $model->filter(),
64
-            'useCaptcha' => (int)$configs['useCaptcha'] === 1
64
+            'useCaptcha' => (int) $configs['useCaptcha'] === 1
65 65
         ]);
66 66
     }
67 67
 
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
         $userId = App::$User->isAuth() ? App::$User->identity()->getId() : 0;
94 94
         $model = null;
95 95
         // check if feedback post is not closed for answers
96
-        if ((int)$recordPost->closed === 0) {
96
+        if ((int) $recordPost->closed === 0) {
97 97
             // init new answer add model
98 98
             $model = new FormAnswerAdd($recordPost, $userId);
99 99
             // if answer is sender lets try to make it model
@@ -138,10 +138,10 @@  discard block
 block discarded – undo
138 138
         // check if action is submited
139 139
         if ($this->request->request->get('closeRequest', false)) {
140 140
             // if created by authorized user
141
-            if ((int)$record->user_id !== 0) {
141
+            if ((int) $record->user_id !== 0) {
142 142
                 $user = App::$User->identity();
143 143
                 // button is pressed not by request creator
144
-                if ($user === null || $user->getId() !== (int)$record->user_id) {
144
+                if ($user === null || $user->getId() !== (int) $record->user_id) {
145 145
                     throw new ForbiddenException(__('This feedback request was created by another user'));
146 146
                 }
147 147
             }
@@ -152,7 +152,7 @@  discard block
 block discarded – undo
152 152
 
153 153
             // add notification and redirect
154 154
             App::$Session->getFlashBag()->add('warning', __('Feedback request now is closed!'));
155
-            $this->response->redirect('feedback/read/' . $id . '/' . $hash);
155
+            $this->response->redirect('feedback/read/'.$id.'/'.$hash);
156 156
         }
157 157
 
158 158
         return $this->view->render('close');
@@ -168,7 +168,7 @@  discard block
 block discarded – undo
168 168
     public function actionList()
169 169
     {
170 170
         // set current page and offset
171
-        $page = (int)$this->request->query->get('page');
171
+        $page = (int) $this->request->query->get('page');
172 172
         $offset = $page * self::ITEM_PER_PAGE;
173 173
 
174 174
         // check if user is authorized or throw exception
Please login to merge, or discard this patch.