Test Failed
Push — master ( 25822b...b91d24 )
by Mihail
06:04
created
Apps/Model/Admin/User/FormUserClear.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -70,12 +70,12 @@  discard block
 block discarded – undo
70 70
      */
71 71
     public function make()
72 72
     {
73
-        if ((bool)$this->comments) {
73
+        if ((bool) $this->comments) {
74 74
             CommentPost::where('user_id', $this->_user->id)->delete();
75 75
             CommentAnswer::where('user_id', $this->_user->id)->delete();
76 76
         }
77 77
 
78
-        if ((bool)$this->content) {
78
+        if ((bool) $this->content) {
79 79
             $contents = Content::where('author_id', $this->_user->id);
80 80
             $ids = $contents->pluck('id')->toArray();
81 81
             if ($ids && count($ids) > 0) {
@@ -85,12 +85,12 @@  discard block
 block discarded – undo
85 85
             }
86 86
         }
87 87
 
88
-        if ((bool)$this->feedback) {
88
+        if ((bool) $this->feedback) {
89 89
             FeedbackPost::where('user_id', $this->_user->id)
90 90
                 ->update(['readed' => true, 'closed' => true]);
91 91
         }
92 92
 
93
-        if ((bool)$this->wall) {
93
+        if ((bool) $this->wall) {
94 94
             WallPost::where('sender_id', $this->_user->id)->delete();
95 95
             WallAnswer::where('user_id', $this->_user->id)->delete();
96 96
         }
Please login to merge, or discard this patch.
Apps/Model/Admin/User/FormUserDelete.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -79,7 +79,7 @@  discard block
 block discarded – undo
79 79
         foreach ($this->users as $user) {
80 80
             $uid = $user->id;
81 81
             // delete whole website info for this user
82
-            if ((bool)$this->delete) {
82
+            if ((bool) $this->delete) {
83 83
                 $model = new FormUserClear($user);
84 84
                 $model->comments = true;
85 85
                 $model->content = true;
@@ -89,10 +89,10 @@  discard block
 block discarded – undo
89 89
             }
90 90
 
91 91
             // delete avatars
92
-            File::remove('/upload/user/avatar/big/' . $uid . '.jpg');
93
-            File::remove('/upload/user/avatar/medium/' . $uid . '.jpg');
94
-            File::remove('/upload/user/avatar/small/' . $uid . '.jpg');
95
-            File::remove('/upload/user/avatar/original/' . $uid . '.jpg');
92
+            File::remove('/upload/user/avatar/big/'.$uid.'.jpg');
93
+            File::remove('/upload/user/avatar/medium/'.$uid.'.jpg');
94
+            File::remove('/upload/user/avatar/small/'.$uid.'.jpg');
95
+            File::remove('/upload/user/avatar/original/'.$uid.'.jpg');
96 96
             // delete user profile and auth data
97 97
             $user->profile()->delete();
98 98
             // delete user provider data
Please login to merge, or discard this patch.
Apps/Model/Admin/Content/FormContentUpdate.php 1 patch
Spacing   +14 added lines, -14 removed lines patch added patch discarded remove patch
@@ -66,7 +66,7 @@  discard block
 block discarded – undo
66 66
         if (!$this->_content->id) {
67 67
             $this->_new = true;
68 68
             if (!$this->galleryFreeId) {
69
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
69
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
70 70
             }
71 71
 
72 72
             if (!$this->authorId) {
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
77 77
                 $this->categoryId = 1;
78 78
             }
79 79
             if (!$this->path) {
80
-                $this->path = Integer::random(8) . '-' . date('d-m-Y');
80
+                $this->path = Integer::random(8).'-'.date('d-m-Y');
81 81
             }
82 82
 
83 83
             if ($this->cloneId > 0) {
@@ -115,8 +115,8 @@  discard block
 block discarded – undo
115 115
     public function rules(): array
116 116
     {
117 117
         $res = [
118
-            ['title.' . App::$Request->getLanguage(), 'required'],
119
-            ['text.' . App::$Request->getLanguage(), 'required'],
118
+            ['title.'.App::$Request->getLanguage(), 'required'],
119
+            ['text.'.App::$Request->getLanguage(), 'required'],
120 120
             ['text', 'used'],
121 121
             ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'],
122 122
             [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title', 'important'], 'required'],
@@ -129,9 +129,9 @@  discard block
 block discarded – undo
129 129
         ];
130 130
 
131 131
         foreach (App::$Properties->get('languages') as $lang) {
132
-            $res[] = ['title.' . $lang, 'length_max', 120, null, true, true];
133
-            $res[] = ['keywords.' . $lang, 'length_max', 150];
134
-            $res[] = ['description.' . $lang, 'length_max', 250];
132
+            $res[] = ['title.'.$lang, 'length_max', 120, null, true, true];
133
+            $res[] = ['keywords.'.$lang, 'length_max', 150];
134
+            $res[] = ['description.'.$lang, 'length_max', 250];
135 135
         }
136 136
 
137 137
         return $res;
@@ -187,10 +187,10 @@  discard block
 block discarded – undo
187 187
         $this->_content->meta_keywords = $this->metaKeywords;
188 188
         $this->_content->meta_description = $this->metaDescription;
189 189
         $this->_content->source = $this->source;
190
-        $this->_content->important = (int)$this->important;
190
+        $this->_content->important = (int) $this->important;
191 191
         // check if rating is changed
192
-        if ((int)$this->addRating !== 0) {
193
-            $this->_content->rating += (int)$this->addRating;
192
+        if ((int) $this->addRating !== 0) {
193
+            $this->_content->rating += (int) $this->addRating;
194 194
         }
195 195
 
196 196
         // check if date is updated
@@ -199,7 +199,7 @@  discard block
 block discarded – undo
199 199
         }
200 200
 
201 201
         // save poster data
202
-        $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster;
202
+        $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster;
203 203
         if (File::exist($posterPath)) {
204 204
             $this->_content->poster = $this->poster;
205 205
         }
@@ -234,7 +234,7 @@  discard block
 block discarded – undo
234 234
 
235 235
         // move files
236 236
         if ($tmpGalleryId !== $this->_content->id) {
237
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
237
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
238 238
         }
239 239
     }
240 240
 
@@ -273,9 +273,9 @@  discard block
 block discarded – undo
273 273
     public function getUserIdName(): ?array
274 274
     {
275 275
         $users = [];
276
-        User::with('profile')->get()->each(function ($user) use (&$users) {
276
+        User::with('profile')->get()->each(function($user) use (&$users) {
277 277
             /** @var User $user */
278
-            $users[$user->id] = ($user->profile->nick ?? 'id' . $user->id) . ' (' . $user->email . ')';
278
+            $users[$user->id] = ($user->profile->nick ?? 'id'.$user->id).' ('.$user->email.')';
279 279
         });
280 280
 
281 281
         return $users;
Please login to merge, or discard this patch.
Apps/Model/Front/Content/FormNarrowContentUpdate.php 1 patch
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -57,13 +57,13 @@  discard block
 block discarded – undo
57 57
         // set current user id
58 58
         $this->authorId = App::$User->identity()->getId();
59 59
         // set true if it is a new content item
60
-        if ($this->_record->id === null || (int)$this->_record->id < 1) {
60
+        if ($this->_record->id === null || (int) $this->_record->id < 1) {
61 61
             $this->_new = true;
62 62
         }
63 63
 
64 64
         // set random path slug if not defined
65 65
         if ($this->path === null || Str::likeEmpty($this->path)) {
66
-            $randPath = date('d-m-Y') . '-' . Str::randomLatin(mt_rand(8, 12));
66
+            $randPath = date('d-m-Y').'-'.Str::randomLatin(mt_rand(8, 12));
67 67
             $this->path = Str::lowerCase($randPath);
68 68
         }
69 69
     }
@@ -107,21 +107,21 @@  discard block
 block discarded – undo
107 107
     {
108 108
         $r = [
109 109
             [['path', 'categoryId'], 'required'],
110
-            ['title.' . App::$Request->getLanguage(), 'required'],
111
-            ['text.' . App::$Request->getLanguage(), 'required', null, true, true],
110
+            ['title.'.App::$Request->getLanguage(), 'required'],
111
+            ['text.'.App::$Request->getLanguage(), 'required', null, true, true],
112 112
             ['text', 'used', null, true, true],
113 113
             ['path', 'direct_match', '/^[a-zA-Z0-9\-]+$/'],
114 114
             ['categoryId', 'in', $this->categoryIds()],
115 115
             ['path', 'Apps\Model\Front\Content\FormNarrowContentUpdate::validatePath'],
116 116
             ['poster', 'used'],
117 117
             ['poster', 'isFile', ['jpg', 'png', 'gif', 'jpeg']],
118
-            ['poster', 'sizeFile', (int)$this->_configs['gallerySize'] * 1024] // in bytes
118
+            ['poster', 'sizeFile', (int) $this->_configs['gallerySize'] * 1024] // in bytes
119 119
         ];
120 120
 
121 121
         foreach (App::$Properties->get('languages') as $lang) {
122
-            $r[] = ['title.' . $lang, 'length_max', 120, null, true, true];
123
-            $r[] = ['keywords.' . $lang, 'length_max', 150];
124
-            $r[] = ['description.' . $lang, 'length_max', 250];
122
+            $r[] = ['title.'.$lang, 'length_max', 120, null, true, true];
123
+            $r[] = ['keywords.'.$lang, 'length_max', 150];
124
+            $r[] = ['description.'.$lang, 'length_max', 250];
125 125
         }
126 126
 
127 127
         return $r;
@@ -147,16 +147,16 @@  discard block
 block discarded – undo
147 147
         $this->_record->title = $this->title;
148 148
         $this->_record->text = $this->text;
149 149
         $this->_record->path = $this->path;
150
-        $this->_record->category_id = (int)$this->categoryId;
150
+        $this->_record->category_id = (int) $this->categoryId;
151 151
         $this->_record->display = 0; // set to premoderation
152
-        $this->_record->author_id = (int)$this->authorId;
152
+        $this->_record->author_id = (int) $this->authorId;
153 153
         $this->_record->save();
154 154
 
155 155
         // work with poster data
156 156
         if ($this->poster !== null) {
157 157
             // lets move poster from tmp to gallery
158
-            $originDir = '/upload/gallery/' . $this->_record->id . '/orig/';
159
-            $thumbDir = '/upload/gallery/' . $this->_record->id . '/thumb/';
158
+            $originDir = '/upload/gallery/'.$this->_record->id.'/orig/';
159
+            $thumbDir = '/upload/gallery/'.$this->_record->id.'/thumb/';
160 160
             if (!Directory::exist($originDir)) {
161 161
                 Directory::create($originDir);
162 162
             }
@@ -165,17 +165,17 @@  discard block
 block discarded – undo
165 165
                 Directory::create($thumbDir);
166 166
             }
167 167
 
168
-            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName() . $this->poster->getSize());
169
-            $newFullName = $fileName . '.' . $this->poster->guessExtension();
168
+            $fileName = App::$Security->simpleHash($this->poster->getClientOriginalName().$this->poster->getSize());
169
+            $newFullName = $fileName.'.'.$this->poster->guessExtension();
170 170
             // move poster to upload gallery directory
171 171
             $this->poster->move(Normalize::diskFullPath($originDir), $newFullName);
172 172
             // initialize image resizer
173 173
             $thumb = new Image();
174
-            $thumb->setCacheDir(root . '/Private/Cache/images');
174
+            $thumb->setCacheDir(root.'/Private/Cache/images');
175 175
 
176 176
             // open original file, resize it and save
177
-            $thumbSaveName = Normalize::diskFullPath($thumbDir) . '/' . $fileName . '.jpg';
178
-            $thumb->open(Normalize::diskFullPath($originDir) . DIRECTORY_SEPARATOR . $newFullName)
177
+            $thumbSaveName = Normalize::diskFullPath($thumbDir).'/'.$fileName.'.jpg';
178
+            $thumb->open(Normalize::diskFullPath($originDir).DIRECTORY_SEPARATOR.$newFullName)
179 179
                 ->cropResize($this->_configs['galleryResize'])
180 180
                 ->save($thumbSaveName, 'jpg', 90);
181 181
             $thumb = null;
Please login to merge, or discard this patch.
Apps/Controller/Admin/Content/ActionUpdate.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -31,7 +31,7 @@
 block discarded – undo
31 31
             ->withTrashed()
32 32
             ->findOrNew($id);
33 33
         $isNew = $record->id === null;
34
-        $cloneId = (int)$this->request->query->get('from', 0);
34
+        $cloneId = (int) $this->request->query->get('from', 0);
35 35
 
36 36
         // init model
37 37
         $model = new FormContentUpdate($record, $cloneId);
Please login to merge, or discard this patch.
Private/Migrations/Updates/update_cms_310-2017-07-29-11-00-00.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@  discard block
 block discarded – undo
17 17
     public function up()
18 18
     {
19 19
         // set nullable varchar type for token column
20
-        $this->getSchema()->table('users', function($table){
20
+        $this->getSchema()->table('users', function($table) {
21 21
             $table->string('approve_token', 128)->nullable()->default(null)->change();
22 22
         });
23 23
         // set approve_token = null where it like '0' str or ''
@@ -31,7 +31,7 @@  discard block
 block discarded – undo
31 31
             });
32 32
         }
33 33
         if (!$this->getSchema()->hasColumn('comment_answers', 'app_relation_id')) {
34
-            $this->getSchema()->table('comment_answers', function ($table){
34
+            $this->getSchema()->table('comment_answers', function($table) {
35 35
                 $table->integer('app_relation_id')->unsigned()->default(0)->after('app_name');
36 36
             });
37 37
         }
@@ -41,13 +41,13 @@  discard block
 block discarded – undo
41 41
 
42 42
         // @todo: add algo to find app_name & app_id for oldest comments
43 43
         if ($this->getSchema()->hasColumn('comment_posts', 'pathway')) {
44
-            $this->getSchema()->table('comment_posts', function ($table){
44
+            $this->getSchema()->table('comment_posts', function($table) {
45 45
                 $table->dropColumn('pathway');
46 46
             });
47 47
         }
48 48
         // remove comment_hash column from content
49 49
         if ($this->getSchema()->hasColumn('contents', 'comment_hash')) {
50
-            $this->getSchema()->table('contents', function ($table){
50
+            $this->getSchema()->table('contents', function($table) {
51 51
                 $table->dropColumn('comment_hash');
52 52
             });
53 53
         }
Please login to merge, or discard this patch.
Apps/View/Front/default/_layouts/default.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
     <?php if (\App::$Debug): ?>
31 31
         <?= \App::$Debug->renderHead() ?>
32 32
     <?php endif; ?>
33
-    <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
33
+    <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
34 34
 </head>
35 35
 <body class="bg-light">
36 36
 
@@ -45,23 +45,23 @@  discard block
 block discarded – undo
45 45
 if (\App::$Properties->get('multiLanguage') && count(\App::$Properties->get('languages')) > 1) {
46 46
     foreach (\App::$Properties->get('languages') as $lang) {
47 47
         $navbar->menu('left', [
48
-            'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-' . $lang . '" alt="' . $lang . '">',
49
-            'link' => App::$Alias->baseUrlNoLang . '/' . $lang . App::$Request->getPathInfo(),
48
+            'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-'.$lang.'" alt="'.$lang.'">',
49
+            'link' => App::$Alias->baseUrlNoLang.'/'.$lang.App::$Request->getPathInfo(),
50 50
             'html' => true
51 51
         ]);
52 52
     }
53 53
 }
54 54
 if (\App::$User->isAuth()) {
55 55
     $userId = \App::$User->identity()->getId();
56
-    $navbar->menu('right', ['text' => __('Account') . ' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
56
+    $navbar->menu('right', ['text' => __('Account').' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
57 57
         ['text' => __('My profile'), 'link' => ['profile/show', [$userId]]],
58
-        ['text' => __('Messages') . ' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
58
+        ['text' => __('Messages').' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
59 59
         ['text' => __('Feed'), 'link' => ['profile/feed'], 'class' => 'dropdown-item'],
60
-        ['text' => __('Notifications') . ' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
60
+        ['text' => __('Notifications').' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
61 61
         ['text' => __('Settings'), 'link' => ['profile/settings'], 'class' => 'dropdown-item'],
62 62
     ], 'properties' => ['html' => true]]);
63 63
     if (\App::$User->identity()->role->can('Admin/Main/Index')) {
64
-        $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl . '/admin']);
64
+        $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl.'/admin']);
65 65
     }
66 66
     $navbar->menu('right', ['text' => __('Logout'), 'link' => ['user/logout']]);
67 67
 } else {
Please login to merge, or discard this patch.
Apps/View/Admin/default/_layouts/default.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -178,7 +178,7 @@  discard block
 block discarded – undo
178 178
                                         <div class="media-left">
179 179
                                             <a href="<?= ($comment->user ? Url::link(['user/update', [$comment->user->id]]) : '#') ?>">
180 180
                                                 <?php
181
-                                                $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
181
+                                                $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg';
182 182
                                                 if ($comment->user && $comment->user->id > 0) {
183 183
                                                     $commentAva = $comment->user->profile->getAvatarUrl('small');
184 184
                                                 }
@@ -222,8 +222,8 @@  discard block
 block discarded – undo
222 222
                             $list = $this->listing('ul', ['class' => 'list-inline']);
223 223
                             foreach (\App::$Properties->get('languages') as $lang) {
224 224
                                 $list->li([
225
-                                    'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-' . $lang . '" alt="' . $lang . '">',
226
-                                    'link' => App::$Alias->baseUrlNoLang . '/' . $lang . App::$Request->getPathInfo(),
225
+                                    'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-'.$lang.'" alt="'.$lang.'">',
226
+                                    'link' => App::$Alias->baseUrlNoLang.'/'.$lang.App::$Request->getPathInfo(),
227 227
                                     'html' => true
228 228
                                 ], ['class' => 'list-inline-item']);
229 229
                             }
@@ -266,7 +266,7 @@  discard block
 block discarded – undo
266 266
                         </li>
267 267
                         <li class="nav-item<?= (\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? ' active' : null ?>">
268 268
                             <?= Url::a(['#system-dropdown'],
269
-                                '<i class="fa fa-fire"></i> <span class="nav-text">' . __('System') . '</span>',
269
+                                '<i class="fa fa-fire"></i> <span class="nav-text">'.__('System').'</span>',
270 270
                                 [
271 271
                                     'class' => 'nav-container',
272 272
                                     'data-toggle' => 'collapse',
@@ -274,12 +274,12 @@  discard block
 block discarded – undo
274 274
                                 ])
275 275
                             ?>
276 276
 
277
-                            <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown'])
278
-                                ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true])
279
-                                ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true])
280
-                                ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true])
281
-                                ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true])
282
-                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true])
277
+                            <?= $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? 'in show' : null), 'id' => 'system-dropdown'])
278
+                                ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true])
279
+                                ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true])
280
+                                ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true])
281
+                                ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true])
282
+                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true])
283 283
                                 ->display();
284 284
                             ?>
285 285
                         </li>
@@ -297,7 +297,7 @@  discard block
 block discarded – undo
297 297
                         ?>
298 298
                         <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? ' active' : null ?>">
299 299
                             <?= Url::a(['#apps-dropdown'],
300
-                                '<i class="fa fa-plug"></i> <span class="nav-text">' . __('Applications') . '</span>',
300
+                                '<i class="fa fa-plug"></i> <span class="nav-text">'.__('Applications').'</span>',
301 301
                                 [
302 302
                                     'class' => 'nav-container',
303 303
                                     'data-toggle' => 'collapse',
@@ -306,18 +306,18 @@  discard block
 block discarded – undo
306 306
                             ?>
307 307
 
308 308
                             <?php
309
-                            $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? 'in show' : null), 'id' => 'apps-dropdown']);
309
+                            $appMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? 'in show' : null), 'id' => 'apps-dropdown']);
310 310
                             foreach ($apps as $app) {
311 311
                                 /** @var \Apps\ActiveRecord\App $app */
312
-                                $appMenu->menu(['link' => [Str::lowerCase($app->sys_name) . '/index'], 'text' => $app->getLocaleName()]);
312
+                                $appMenu->menu(['link' => [Str::lowerCase($app->sys_name).'/index'], 'text' => $app->getLocaleName()]);
313 313
                             }
314
-                            $appMenu->menu(['link' => 'application/index', 'text' => __('All apps') . '...']);
314
+                            $appMenu->menu(['link' => 'application/index', 'text' => __('All apps').'...']);
315 315
                             echo $appMenu->display();
316 316
                             ?>
317 317
                         </li>
318 318
                         <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? ' active' : null ?>">
319 319
                             <?= Url::a(['#widgets-dropdown'],
320
-                                '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">' . __('Widgets') . '</span>',
320
+                                '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">'.__('Widgets').'</span>',
321 321
                                 [
322 322
                                     'class' => 'nav-container',
323 323
                                     'data-toggle' => 'collapse',
@@ -326,12 +326,12 @@  discard block
 block discarded – undo
326 326
                             ?>
327 327
 
328 328
                             <?php
329
-                            $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse' . ((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? 'in show' : null), 'id' => 'widgets-dropdown']);
329
+                            $widgetMenu = $this->bootstrap()->nav('ul', ['class' => 'nav nav-pills nav-stacked collapse'.((array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? 'in show' : null), 'id' => 'widgets-dropdown']);
330 330
                             foreach ($widgets as $widget) {
331 331
                                 /** @var \Apps\ActiveRecord\App $widget */
332
-                                $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name) . '/index'], 'text' => $widget->getLocaleName()]);
332
+                                $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name).'/index'], 'text' => $widget->getLocaleName()]);
333 333
                             }
334
-                            $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets') . '...']);
334
+                            $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets').'...']);
335 335
                             echo $widgetMenu->display();
336 336
                             ?>
337 337
                         </li>
Please login to merge, or discard this patch.
Apps/View/Install/default/_layouts/default.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
         var script_lang = '<?= \App::$Request->getLanguage() ?>';
28 28
         var site_url = '<?= \App::$Alias->baseUrl ?>';
29 29
     </script>
30
-    <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
30
+    <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
31 31
 </head>
32 32
 
33 33
 <body>
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
                 $list = $this->listing('ul', ['class' => 'list-inline']);
45 45
                 foreach (\App::$Properties->get('languages') as $lang) {
46 46
                     $list->li([
47
-                        'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-' . $lang . '" alt="' . $lang . '">',
48
-                        'link' => App::$Alias->baseUrlNoLang . '/' . $lang . App::$Request->getPathInfo(),
47
+                        'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-'.$lang.'" alt="'.$lang.'">',
48
+                        'link' => App::$Alias->baseUrlNoLang.'/'.$lang.App::$Request->getPathInfo(),
49 49
                         'html' => true
50 50
                     ], ['class' => 'list-inline-item']);
51 51
                 }
Please login to merge, or discard this patch.