Inspection of "Revert "Code syntax PSR-2"" - phpffcms/ffcms - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( ef8807...c1ca83 )

by Mihail

created 2018-12-26 18:59 UTC

Status

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,5 +7,5 @@
 block discarded – undo
 ?>
 
 <?php foreach ($records as $row) {
-    echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']) . ' ';
+    echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']).' ';
 }
\ No newline at end of file

Please login to merge, or discard this patch.

Apps/View/Front/default/_layouts/default.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -27,7 +27,7 @@  discard block
 block discarded – undo
     <?php if (\App::$Debug): ?>
         <?= \App::$Debug->renderHead() ?>
     <?php endif; ?>
-    <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
+    <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
 </head>
 <body class="bg-light">
 
@@ -41,15 +41,15 @@  discard block
 block discarded – undo
 
 if (\App::$User->isAuth()) {
     $userId = \App::$User->identity()->getId();
-    $navbar->menu('right', ['text' => __('Account') . ' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
+    $navbar->menu('right', ['text' => __('Account').' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
         ['text' => __('My profile'), 'link' => ['profile/show', [$userId]]],
-        ['text' => __('Messages') . ' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
+        ['text' => __('Messages').' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
         ['text' => __('Feed'), 'link' => ['profile/feed'], 'class' => 'dropdown-item'],
-        ['text' => __('Notifications') . ' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
+        ['text' => __('Notifications').' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
         ['text' => __('Settings'), 'link' => ['profile/settings'], 'class' => 'dropdown-item'],
     ], 'properties' => ['html' => true]]);
     if (\App::$User->identity()->role->can('Admin/Main/Index')) {
-        $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl . '/admin']);
+        $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl.'/admin']);
     }
     $navbar->menu('right', ['text' => __('Logout'), 'link' => ['user/logout']]);
 } else {

Please login to merge, or discard this patch.

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

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -20,10 +20,10 @@  discard block
 block discarded – undo
 $name = $user->profile === null ? __('Unknown') : $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 @@  discard block
 block discarded – undo
         <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 @@  discard block
 block discarded – undo
         <?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 @@  discard block
 block discarded – undo
                             foreach ($hobbyArray as $item) {
                                 $item = \App::$Security->strip_tags($item);
                                 if (!Str::likeEmpty($item)) {
-                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']) . ' ';
+                                    echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']).' ';
                                 }
                             }
                             ?>
@@ -213,7 +213,7 @@  discard block
 block discarded – undo
                     <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="float-right"><?= Date::humanize($post->updated_at); ?></small>
                         </div>
                         <div class="object-text">

Please login to merge, or discard this patch.

Apps/View/Admin/default/_layouts/default.php 1 patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

@@ -173,7 +173,7 @@  discard block
 block discarded – undo
                                         <div class="media-left">
                                             <a href="#">
                                                 <?php
-                                                $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
+                                                $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg';
                                                 if ($comment->user !== null && $comment->user->id > 0) {
                                                     $commentAva = $comment->user->profile->getAvatarUrl('small');
                                                 }
@@ -250,7 +250,7 @@  discard block
 block discarded – undo
                         </li>
                         <li class="nav-item<?= (\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? ' active' : null ?>">
                             <?= Url::a(['#system-dropdown'],
-                                '<i class="fa fa-fire"></i> <span class="nav-text">' . __('System') . '</span>',
+                                '<i class="fa fa-fire"></i> <span class="nav-text">'.__('System').'</span>',
                                 [
                                     'class' => 'nav-container',
                                     'data-toggle' => 'collapse',
@@ -258,13 +258,13 @@  discard block
 block discarded – undo
                                 ])
                             ?>
 
-                            <?= $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'])
-                                ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true])
-                                ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true])
-                                ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true])
-                                ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true])
-                                ->menu(['link' => ['main/backup'], 'text' => '<i class="fa fa-hdd-o"></i> ' . __('Backup'), 'html' => true])
-                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true])
+                            <?= $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'])
+                                ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true])
+                                ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true])
+                                ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true])
+                                ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true])
+                                ->menu(['link' => ['main/backup'], 'text' => '<i class="fa fa-hdd-o"></i> '.__('Backup'), 'html' => true])
+                                ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true])
                                 ->display();
                             ?>
                         </li>
@@ -282,7 +282,7 @@  discard block
 block discarded – undo
                         ?>
                         <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $apps) || \App::$Request->getController() === 'Application') ? ' active' : null ?>">
                             <?= Url::a(['#apps-dropdown'],
-                                '<i class="fa fa-plug"></i> <span class="nav-text">' . __('Applications') . '</span>',
+                                '<i class="fa fa-plug"></i> <span class="nav-text">'.__('Applications').'</span>',
                                 [
                                     'class' => 'nav-container',
                                     'data-toggle' => 'collapse',
@@ -291,18 +291,18 @@  discard block
 block discarded – undo
                             ?>
 
                             <?php
-                            $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']);
+                            $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']);
                             foreach ($apps as $app) {
                                 /** @var \Apps\ActiveRecord\App $app */
-                                $appMenu->menu(['link' => [Str::lowerCase($app->sys_name) . '/index'], 'text' => $app->getLocaleName()]);
+                                $appMenu->menu(['link' => [Str::lowerCase($app->sys_name).'/index'], 'text' => $app->getLocaleName()]);
                             }
-                            $appMenu->menu(['link' => 'application/index', 'text' => __('All apps') . '...']);
+                            $appMenu->menu(['link' => 'application/index', 'text' => __('All apps').'...']);
                             echo $appMenu->display();
                             ?>
                         </li>
                         <li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $widgets) || \App::$Request->getController() === 'Widget') ? ' active' : null ?>">
                             <?= Url::a(['#widgets-dropdown'],
-                                '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">' . __('Widgets') . '</span>',
+                                '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">'.__('Widgets').'</span>',
                                 [
                                     'class' => 'nav-container',
                                     'data-toggle' => 'collapse',
@@ -311,12 +311,12 @@  discard block
 block discarded – undo
                             ?>
 
                             <?php
-                            $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']);
+                            $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']);
                             foreach ($widgets as $widget) {
                                 /** @var \Apps\ActiveRecord\App $widget */
-                                $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name) . '/index'], 'text' => $widget->getLocaleName()]);
+                                $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name).'/index'], 'text' => $widget->getLocaleName()]);
                             }
-                            $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets') . '...']);
+                            $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets').'...']);
                             echo $widgetMenu->display();
                             ?>
                         </li>

Please login to merge, or discard this patch.

Apps/View/Admin/default/_core/javascript/submit_selectize_table.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
 /** @var array $url */
 /** @var array $properties */
 
-$rndId = 'btn_selectize_submit_' . mt_rand(999, 999999);
+$rndId = 'btn_selectize_submit_'.mt_rand(999, 999999);
 $properties['id'] = $rndId;
 
 echo (new \Ffcms\Templex\Helper\Html\Dom())->button(function() use ($text) {

Please login to merge, or discard this patch.

Apps/View/Front/default/_core/javascript/submit_selectize_table.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
 /** @var array $url */
 /** @var array $properties */
 
-$rndId = 'btn_selectize_submit_' . mt_rand(999, 999999);
+$rndId = 'btn_selectize_submit_'.mt_rand(999, 999999);
 $properties['id'] = $rndId;
 
 echo (new \Ffcms\Templex\Helper\Html\Dom())->button(function() use ($text) {

Please login to merge, or discard this patch.

Apps/View/Front/default/_core/exceptions/forbidden.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -1,6 +1,6 @@
 block discarded – undo
 <?php
 
-$this->layout('_layouts/default',[
+$this->layout('_layouts/default', [
     'title' => 'Access forbidden'
 ]);
 

Please login to merge, or discard this patch.

Apps/View/Install/default/_core/javascript/submit_selectize_table.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -7,7 +7,7 @@
 block discarded – undo
 /** @var array $url */
 /** @var array $properties */
 
-$rndId = 'btn_selectize_submit_' . mt_rand(999, 999999);
+$rndId = 'btn_selectize_submit_'.mt_rand(999, 999999);
 $properties['id'] = $rndId;
 
 echo (new \Ffcms\Templex\Helper\Html\Dom())->button(function() use ($text) {

Please login to merge, or discard this patch.

Apps/View/Install/default/main/index.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -88,7 +88,7 @@
 block discarded – undo
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.</textarea>
 <br />
-<?php if($model->checkAll()): ?>
+<?php if ($model->checkAll()): ?>
     <div class="row">
         <div class="col-3" style="padding-top: 5px;padding-left: 25px;">
             <input type="checkbox" id="agree-license" /> <label for="agree-license"><?= __('Accept license') ?></label>

Please login to merge, or discard this patch.

		@@ -173,7 +173,7 @@ discard block
		block discarded – undo
173	173	<div class="media-left">
174	174	<a href="#">
175	175	<?php
176		- $commentAva = \App::$Alias->scriptUrl . '/upload/user/avatar/small/default.jpg';
	176	+ $commentAva = \App::$Alias->scriptUrl.'/upload/user/avatar/small/default.jpg';
177	177	if ($comment->user !== null && $comment->user->id > 0) {
178	178	$commentAva = $comment->user->profile->getAvatarUrl('small');
179	179	}
		@@ -250,7 +250,7 @@ discard block
		block discarded – undo
250	250	</li>
251	251	<li class="nav-item<?= (\App::$Request->getController() === 'Main' && \App::$Request->getAction() !== 'Index') ? ' active' : null ?>">
252	252	<?= Url::a(['#system-dropdown'],
253		- '<i class="fa fa-fire"></i> <span class="nav-text">' . __('System') . '</span>',
	253	+ '<i class="fa fa-fire"></i> <span class="nav-text">'.__('System').'</span>',
254	254	[
255	255	'class' => 'nav-container',
256	256	'data-toggle' => 'collapse',
		@@ -258,13 +258,13 @@ discard block
		block discarded – undo
258	258	])
259	259	?>
260	260
261		- <?= $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'])
262		- ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true])
263		- ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true])
264		- ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true])
265		- ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true])
266		- ->menu(['link' => ['main/backup'], 'text' => '<i class="fa fa-hdd-o"></i> ' . __('Backup'), 'html' => true])
267		- ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true])
	261	+ <?= $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'])
	262	+ ->menu(['link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true])
	263	+ ->menu(['link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true])
	264	+ ->menu(['link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true])
	265	+ ->menu(['link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true])
	266	+ ->menu(['link' => ['main/backup'], 'text' => '<i class="fa fa-hdd-o"></i> '.__('Backup'), 'html' => true])
	267	+ ->menu(['link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true])
268	268	->display();
269	269	?>
270	270	</li>
		@@ -282,7 +282,7 @@ discard block
		block discarded – undo
282	282	?>
283	283	<li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $apps) \|\| \App::$Request->getController() === 'Application') ? ' active' : null ?>">
284	284	<?= Url::a(['#apps-dropdown'],
285		- '<i class="fa fa-plug"></i> <span class="nav-text">' . __('Applications') . '</span>',
	285	+ '<i class="fa fa-plug"></i> <span class="nav-text">'.__('Applications').'</span>',
286	286	[
287	287	'class' => 'nav-container',
288	288	'data-toggle' => 'collapse',
		@@ -291,18 +291,18 @@ discard block
		block discarded – undo
291	291	?>
292	292
293	293	<?php
294		- $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']);
	294	+ $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']);
295	295	foreach ($apps as $app) {
296	296	/** @var \Apps\ActiveRecord\App $app */
297		- $appMenu->menu(['link' => [Str::lowerCase($app->sys_name) . '/index'], 'text' => $app->getLocaleName()]);
	297	+ $appMenu->menu(['link' => [Str::lowerCase($app->sys_name).'/index'], 'text' => $app->getLocaleName()]);
298	298	}
299		- $appMenu->menu(['link' => 'application/index', 'text' => __('All apps') . '...']);
	299	+ $appMenu->menu(['link' => 'application/index', 'text' => __('All apps').'...']);
300	300	echo $appMenu->display();
301	301	?>
302	302	</li>
303	303	<li class="nav-item<?= (array_key_exists(\App::$Request->getController(), $widgets) \|\| \App::$Request->getController() === 'Widget') ? ' active' : null ?>">
304	304	<?= Url::a(['#widgets-dropdown'],
305		- '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">' . __('Widgets') . '</span>',
	305	+ '<i class="fa fa-puzzle-piece"></i> <span class="nav-text">'.__('Widgets').'</span>',
306	306	[
307	307	'class' => 'nav-container',
308	308	'data-toggle' => 'collapse',
		@@ -311,12 +311,12 @@ discard block
		block discarded – undo
311	311	?>
312	312
313	313	<?php
314		- $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']);
	314	+ $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']);
315	315	foreach ($widgets as $widget) {
316	316	/** @var \Apps\ActiveRecord\App $widget */
317		- $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name) . '/index'], 'text' => $widget->getLocaleName()]);
	317	+ $widgetMenu->menu(['link' => [Str::lowerCase($widget->sys_name).'/index'], 'text' => $widget->getLocaleName()]);
318	318	}
319		- $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets') . '...']);
	319	+ $widgetMenu->menu(['link' => 'widget/index', 'text' => __('All widgets').'...']);
320	320	echo $widgetMenu->display();
321	321	?>
322	322	</li>

		@@ -7,5 +7,5 @@
		block discarded – undo
7	7	?>
8	8
9	9	<?php foreach ($records as $row) {
10		- echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']) . ' ';
	10	+ echo Url::a(['content/tag', [$row['tag']]], $row['tag'], ['class' => 'badge badge-secondary']).' ';
11	11	}
12	12	\ No newline at end of file

		@@ -27,7 +27,7 @@ discard block
		block discarded – undo
27	27	<?php if (\App::$Debug): ?>
28	28	<?= \App::$Debug->renderHead() ?>
29	29	<?php endif; ?>
30		- <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
	30	+ <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
31	31	</head>
32	32	<body class="bg-light">
33	33
		@@ -41,15 +41,15 @@ discard block
		block discarded – undo
41	41
42	42	if (\App::$User->isAuth()) {
43	43	$userId = \App::$User->identity()->getId();
44		- $navbar->menu('right', ['text' => __('Account') . ' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
	44	+ $navbar->menu('right', ['text' => __('Account').' <span class="badge" id="summary-count-block">0</span>', 'dropdown' => [
45	45	['text' => __('My profile'), 'link' => ['profile/show', [$userId]]],
46		- ['text' => __('Messages') . ' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
	46	+ ['text' => __('Messages').' <span class="badge" id="pm-count-block">0</span>', 'link' => ['profile/messages'], 'class' => 'dropdown-item', 'html' => true],
47	47	['text' => __('Feed'), 'link' => ['profile/feed'], 'class' => 'dropdown-item'],
48		- ['text' => __('Notifications') . ' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
	48	+ ['text' => __('Notifications').' <span class="badge" id="notify-count-block">0</span>', 'link' => ['profile/notifications'], 'class' => 'dropdown-item', 'html' => true],
49	49	['text' => __('Settings'), 'link' => ['profile/settings'], 'class' => 'dropdown-item'],
50	50	], 'properties' => ['html' => true]]);
51	51	if (\App::$User->identity()->role->can('Admin/Main/Index')) {
52		- $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl . '/admin']);
	52	+ $navbar->menu('right', ['text' => __('Admin'), 'link' => \App::$Alias->scriptUrl.'/admin']);
53	53	}
54	54	$navbar->menu('right', ['text' => __('Logout'), 'link' => ['user/logout']]);
55	55	} else {

		@@ -20,10 +20,10 @@ discard block
		block discarded – undo
20	20	$name = $user->profile === null ? __('Unknown') : $user->profile->getNickname();
21	21
22	22	$this->layout('_layouts/default', [
23		- 'title' => __('Profile') . ': ' . $name,
	23	+ 'title' => __('Profile').': '.$name,
24	24	'breadcrumbs' => [
25	25	Url::to('/') => __('Home'),
26		- __('Profile') . ': ' . $name
	26	+ __('Profile').': '.$name
27	27	]
28	28	]);
29	29
		@@ -43,7 +43,7 @@ discard block
		block discarded – undo
43	43	<img src="<?= $user->profile->getAvatarUrl('big') ?>" class="img-fluid img-thumbnail" />
44	44	<?php if ($ratingOn):
45	45	$rateClass = 'btn-secondary';
46		- $rateValue = (int)$user->profile->rating;
	46	+ $rateValue = (int) $user->profile->rating;
47	47	if ($user->profile->rating > 0) {
48	48	$rateClass = 'btn-info';
49	49	} elseif ($user->profile->rating < 0) {
		@@ -80,11 +80,11 @@ discard block
		block discarded – undo
80	80	<?php
81	81	$userMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs flex-column']);
82	82	if ($isSelf) {
83		- $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> ' . __('Feed'), 'html' => true]);
84		- $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true]);
85		- $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true]);
86		- $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]);
87		- } else if(\App::$User->isAuth()) {
	83	+ $userMenu->menu(['link' => ['profile/feed'], 'text' => '<i class="fa fa-rss-square"></i> '.__('Feed'), 'html' => true]);
	84	+ $userMenu->menu(['link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true]);
	85	+ $userMenu->menu(['link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true]);
	86	+ $userMenu->menu(['link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]);
	87	+ } else if (\App::$User->isAuth()) {
88	88	$userMenu->menu(['link' => ['profile/messages', null, ['newdialog' => $user->id]], 'text' => __('Write message')]);
89	89	$userMenu->menu(['link' => ['profile/ignore', null, ['id' => $user->id]], 'text' => __('Block')]);
90	90	}
		@@ -160,7 +160,7 @@ discard block
		block discarded – undo
160	160	foreach ($hobbyArray as $item) {
161	161	$item = \App::$Security->strip_tags($item);
162	162	if (!Str::likeEmpty($item)) {
163		- echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']) . ' ';
	163	+ echo Url::a(['profile/index', ['hobby', trim($item, ' ')]], $item, ['class' => 'badge badge-secondary']).' ';
164	164	}
165	165	}
166	166	?>
		@@ -213,7 +213,7 @@ discard block
		block discarded – undo
213	213	<div class="col-xs-8 col-md-10">
214	214	<div class="h5" style="margin-top: 0;margin-bottom: 5px;">
215	215	<i class="glyphicon glyphicon-user"></i>
216		- <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: ' . $post->senderUser->role->color]) ?>
	216	+ <?= Url::a(['profile/show', [$post->sender_id]], $post->senderUser->profile->getNickname(), ['style' => 'color: '.$post->senderUser->role->color]) ?>
217	217	<small class="float-right"><?= Date::humanize($post->updated_at); ?></small>
218	218	</div>
219	219	<div class="object-text">

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7	/** @var array $url */
8	8	/** @var array $properties */
9	9
10		-$rndId = 'btn_selectize_submit_' . mt_rand(999, 999999);
	10	+$rndId = 'btn_selectize_submit_'.mt_rand(999, 999999);
11	11	$properties['id'] = $rndId;
12	12
13	13	echo (new \Ffcms\Templex\Helper\Html\Dom())->button(function() use ($text) {

		@@ -1,6 +1,6 @@
		block discarded – undo
1	1	<?php
2	2
3		-$this->layout('_layouts/default',[
	3	+$this->layout('_layouts/default', [
4	4	'title' => 'Access forbidden'
5	5	]);
6	6

		@@ -88,7 +88,7 @@
		block discarded – undo
88	88	OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
89	89	SOFTWARE.</textarea>
90	90	<br />
91		-<?php if($model->checkAll()): ?>
	91	+<?php if ($model->checkAll()): ?>
92	92	<div class="row">
93	93	<div class="col-3" style="padding-top: 5px;padding-left: 25px;">
94	94	<input type="checkbox" id="agree-license" /> <label for="agree-license"><?= __('Accept license') ?></label>

phpffcms / ffcms

Push — master ( ef8807...c1ca83 )

Status

Category

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +17 added lines, -17 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch