phpffcms / ffcms

Apps/Controller/Admin/User.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
         $query = new UserRecords();
 
         // set current page and offset
-        $page = (int)App::$Request->query->get('page');
+        $page = (int) App::$Request->query->get('page');
         $offset = $page * self::ITEM_PER_PAGE;
 
         // build pagination

Apps/Model/Admin/User/FormUserUpdate.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
                 if ($this->newpassword !== null && Str::length($this->newpassword) >= 3) {
                     $this->_user->password = App::$Security->password_hash($this->newpassword);
                 }
-            } elseif($property === 'approve_token') {
+            } elseif ($property === 'approve_token') {
                 if ($value == "1") {
                     $this->_user->approve_token = '0';
                 } else {

Apps/Model/Front/Profile/FormIgnoreAdd.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
     public function save()
     {
         // check if target is myself or always exist in block list
-        if ($this->_user->getId() === (int)$this->id || Blacklist::have($this->_user->getId(), $this->id)) {
+        if ($this->_user->getId() === (int) $this->id || Blacklist::have($this->_user->getId(), $this->id)) {
             return false;
         }
 

Apps/View/Admin/default/application/turn.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             [['text' => __('Name')], ['text' => $app->getLocaleName()]],
             [['text' => __('System name')], ['text' => $app->sys_name]],
             [['text' => __('Last update')], ['text' => Date::convertToDatetime($app->updated_at, DATE::FORMAT_TO_SECONDS)]],
-            [['text' => __('Status')], ['text' => ((int)$app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' =>  ((int)$app->disabled === 0) ? 'alert-success' : 'alert-danger']]
+            [['text' => __('Status')], ['text' => ((int) $app->disabled === 0) ? 'On' : 'Off'], 'property' => ['class' =>  ((int) $app->disabled === 0) ? 'alert-success' : 'alert-danger']]
         ]
     ]
 ]); ?>

Apps/View/Admin/default/layout/main.php

Braces +5 added lines, -2 removed lines

@@ -188,13 +188,16 @@
                             <?php foreach ($this->breadcrumbs as $bUrl => $bText): ?>
                                 <?php if (Obj::isLikeInt($bUrl)): // only text ?>
                                     <li class="active"><?= \App::$Security->strip_tags($bText) ?></li>
-                                <?php else: ?>
+                                <?php else {
+    : ?>
                                     <li>
                                         <a href="<?= \App::$Security->strip_tags($bUrl) ?>">
                                             <?= \App::$Security->strip_tags($bText) ?>
                                         </a>
                                     </li>
-                                <?php endif; ?>
+                                <?php endif;
+}
+?>
                             <?php endforeach; ?>
                         </ol>
                     <?php endif; ?>

Spacing +13 added lines, -13 removed lines

@@ -22,7 +22,7 @@ 
     <?php
     $customCssCode = \App::$View->showPlainCode('css');
     if ($customCssCode !== null) {
-        echo '<style>' . $customCssCode . '</style>';
+        echo '<style>'.$customCssCode.'</style>';
     } ?>
     <script>
         window.jQ = [];
@@ -130,11 +130,11 @@ 
                             'type' => 'ul',
                             'property' => ['class' => 'nav nav-second-level'],
                             'items' => [
-                                ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> ' . __('Files'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> ' . __('Antivirus'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> ' . __('Routing'), 'html' => true],
-                                ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> ' . __('Updates'), 'html' => true]
+                                ['type' => 'link', 'link' => ['main/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/files'], 'text' => '<i class="fa fa-file-o"></i> '.__('Files'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/antivirus'], 'text' => '<i class="fa fa-shield"></i> '.__('Antivirus'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/routing'], 'text' => '<i class="fa fa-code"></i> '.__('Routing'), 'html' => true],
+                                ['type' => 'link', 'link' => ['main/updates'], 'text' => '<i class="fa fa-gavel"></i> '.__('Updates'), 'html' => true]
                             ]
                         ]) ?>
                         <!-- /.nav-second-level -->
@@ -154,22 +154,22 @@ 
                     foreach ($extTable as $item) {
                         $menuItem = [
                             'type' => 'link',
-                            'link' => [Str::lowerCase($item->sys_name) . '/index'],
-                            'text' => $item->getLocaleName() . (!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null),
+                            'link' => [Str::lowerCase($item->sys_name).'/index'],
+                            'text' => $item->getLocaleName().(!$item->checkVersion() ? ' <i class="fa fa-wrench" style="color: #ffbd26;"></i>' : null),
                             'html' => true
                         ];
                         if ($item->type === 'app') {
                             $appControllers[] = $item->sys_name;
                             $appMenuItems[] = $menuItem;
-                        } elseif($item->type === 'widget') {
+                        } elseif ($item->type === 'widget') {
                             $widgetControllers[] = $item->sys_name;
                             $widgetMenuItems[] = $menuItem;
                         }
                     }
 
-                    $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps') . '...'];
+                    $appMenuItems[] = ['type' => 'link', 'link' => ['application/index'], 'text' => __('All apps').'...'];
                     $appControllers[] = 'Application';
-                    $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets') . '...'];
+                    $widgetMenuItems[] = ['type' => 'link', 'link' => ['widget/index'], 'text' => __('All widgets').'...'];
                     $widgetControllers[] = 'Widget';
                     ?>
                     <li<?= Arr::in(\App::$Request->getController(), $appControllers) ? ' class="active"' : null ?>>
@@ -230,7 +230,7 @@ 
                             echo $body;
                         } else {
                             \App::$Response->setStatusCode(404);
-                            echo '<p>' . __('Page is not founded!') . '</p>';
+                            echo '<p>'.__('Page is not founded!').'</p>';
                         }
                         ?>
                     </article>
@@ -261,7 +261,7 @@ 
 <?php
 $customJsCode = \App::$View->showPlainCode('js');
 if ($customJsCode !== null) {
-    echo '<script>' . $customJsCode . '</script>';
+    echo '<script>'.$customJsCode.'</script>';
 }
 ?>
 </body>

Apps/View/Admin/default/profile/field_list.php

Braces +5 added lines, -2 removed lines

@@ -66,6 +66,9 @@
     ]
 ]);
     ?>
-<?php else: ?>
+<?php else {
+    : ?>
     <p>No additional fields is added!</p>
-<?php endif; ?>
\ No newline at end of file
+<?php endif;
+}
+?>
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -23,7 +23,7 @@ 
 <hr />
     <div class="row">
         <div class="col-md-12">
-            <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> ' . __('Add field'), ['class' => 'btn btn-primary pull-right']) ?>
+            <?= Url::link(['profile/fieldupdate', 0], '<i class="fa fa-plus"></i> '.__('Add field'), ['class' => 'btn btn-primary pull-right']) ?>
         </div>
     </div>
 <?php if ($records->count() > 0):
@@ -38,10 +38,10 @@ 
         $items[] = [
             ['text' => $row->id],
             ['text' => Serialize::getDecodeLocale($row->name)],
-            ['text' => '<span class="' . $labelClass . '">' . $row->type . '</span>', 'html' => true],
-            ['text' => '<code>' . ($row->reg_cond == 0 ? '!' : null) . 'preg_match("' . $row->reg_exp . '", input)' . '</code>', 'html' => true],
+            ['text' => '<span class="'.$labelClass.'">'.$row->type.'</span>', 'html' => true],
+            ['text' => '<code>'.($row->reg_cond == 0 ? '!' : null).'preg_match("'.$row->reg_exp.'", input)'.'</code>', 'html' => true],
             [
-                'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]) .
+                'text' => Url::link(['profile/fieldupdate', $row->id], '<i class="fa fa-pencil fa-lg"></i> ', ['html' => true]).
                 Url::link(['profile/fielddelete', $row->id], '<i class="fa fa-trash-o fa-lg"></i>', ['html' => true]),
                 'html' => true,
                 'property' => ['class' => 'text-center']

Apps/View/Admin/default/user/_tabs.php

Spacing +1 added lines, -1 removed lines

@@ -9,4 +9,4 @@
         ['type' => 'link', 'text' => __('Group management'), 'link' => ['user/grouplist']],
         ['type' => 'link', 'text' => __('Settings'), 'link' => ['user/settings']]
     ]
-]);?>
\ No newline at end of file
+]); ?>
\ No newline at end of file

Apps/View/Front/default/layout/main.php

Braces +5 added lines, -2 removed lines

@@ -109,13 +109,16 @@
                 <?php foreach ($this->breadcrumbs as $bUrl => $bText): ?>
                     <?php if (Obj::isLikeInt($bUrl)): // only text ?>
                     <li class="active"><?= \App::$Security->strip_tags($bText) ?></li>
-                    <?php else: ?>
+                    <?php else {
+    : ?>
                     <li>
                         <a href="<?= \App::$Security->strip_tags($bUrl) ?>">
                             <?= \App::$Security->strip_tags($bText) ?>
                         </a>
                     </li>
-                    <?php endif; ?>
+                    <?php endif;
+}
+?>
                 <?php endforeach; ?>
             </ol>
             <?php endif; ?>

Spacing +9 added lines, -9 removed lines

@@ -18,7 +18,7 @@ 
     <?php
     $customCssCode = \App::$View->showPlainCode('css');
     if ($customCssCode !== null) {
-        echo '<style>' . $customCssCode . '</style>';
+        echo '<style>'.$customCssCode.'</style>';
     } ?>
     <script>
         window.jQ = [];
@@ -38,18 +38,18 @@ 
         if (\App::$User->isAuth()) {
             $userId = \App::$User->identity()->getId();
             $accountPanel = [
-                ['type' => 'link', 'link' => ['profile/show', $userId], 'text' => '<i class="fa fa-user"></i> ' . __('Profile'), 'html' => true, '!secure' => true],
-                ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true, '!secure' => true],
-                ['type' => 'link', 'link' => ['user/logout'], 'text' => '<i class="fa fa-user-secret"></i> ' . __('Logout'), 'html' => true, '!secure' => true]
+                ['type' => 'link', 'link' => ['profile/show', $userId], 'text' => '<i class="fa fa-user"></i> '.__('Profile'), 'html' => true, '!secure' => true],
+                ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true, '!secure' => true],
+                ['type' => 'link', 'link' => ['user/logout'], 'text' => '<i class="fa fa-user-secret"></i> '.__('Logout'), 'html' => true, '!secure' => true]
             ];
 
             if (\App::$User->identity()->getRole()->can('Admin/Main/Index')) {
-                $accountPanel[] = ['type' => 'link', 'link' => \App::$Alias->scriptUrl . '/admin/', 'text' => '<i class="fa fa-cogs"></i> Admin', 'html' => true, '!secure' => true];
+                $accountPanel[] = ['type' => 'link', 'link' => \App::$Alias->scriptUrl.'/admin/', 'text' => '<i class="fa fa-cogs"></i> Admin', 'html' => true, '!secure' => true];
             }
         } else {
             $accountPanel = [
-                ['type' => 'link', 'link' => ['user/login'], 'text' => '<i class="fa fa-sign-in"></i> ' . __('Sign in'), 'html' => true, '!secure' => true],
-                ['type' => 'link', 'link' => ['user/signup'], 'text' => '<i class="fa fa-check-square-o"></i> ' . __('Sign up'), 'html' => true, '!secure' => true]
+                ['type' => 'link', 'link' => ['user/login'], 'text' => '<i class="fa fa-sign-in"></i> '.__('Sign in'), 'html' => true, '!secure' => true],
+                ['type' => 'link', 'link' => ['user/signup'], 'text' => '<i class="fa fa-check-square-o"></i> '.__('Sign up'), 'html' => true, '!secure' => true]
             ];
         }
 
@@ -137,7 +137,7 @@ 
                 echo $body;
             } else {
                 \App::$Response->setStatusCode(404);
-                echo '<p>' . __('Page is not founded!') . '</p>';
+                echo '<p>'.__('Page is not founded!').'</p>';
             }
             ?>
         </div>
@@ -197,7 +197,7 @@ 
 <?php
 $customJsCode = \App::$View->showPlainCode('js');
 if ($customJsCode !== null) {
-    echo '<script>' . $customJsCode . '</script>';
+    echo '<script>'.$customJsCode.'</script>';
 }
 // render google analytics code here
 echo \App::$View->render('blocks/googleanalytics');

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

Braces +5 added lines, -2 removed lines

@@ -59,7 +59,8 @@ 
                 </a>
             </div>
         </div>
-        <?php else: ?>
+        <?php else {
+    : ?>
         <div class="row">
             <div class="col-md-8" style="padding-right: 0;">
                 <a href="javascript:void(0);" class="btn btn-block <?= $rateClass ?>">
@@ -76,7 +77,9 @@ 
                 <a href="javascript:void(0);" class="btn btn-block btn-danger" id="reduceRating">-</a>
             </div>
         </div>
-        <?php endif; ?>
+        <?php endif;
+}
+?>
         <?php endif; ?>
         <?php
         $userMenu = null;

Spacing +10 added lines, -11 removed lines

@@ -26,7 +26,7 @@ 
     $name = __('No name');
 }
 
-$this->title = __('Profile') . ': ' . $name;
+$this->title = __('Profile').': '.$name;
 
 $this->breadcrumbs = [
     Url::to('/') => __('Home'),
@@ -46,7 +46,7 @@ 
         <?php
         if ($ratingOn):
             $rateClass = 'btn-default';
-            $rateValue = (int)$user->getProfile()->rating;
+            $rateValue = (int) $user->getProfile()->rating;
             if ($user->getProfile()->rating > 0) {
                 $rateClass = 'btn-info';
             } elseif ($user->getProfile()->rating < 0) {
@@ -84,19 +84,19 @@ 
         $userMenu = null;
         if (true === $isSelf) {
             $userMenu = [
-                ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> ' . __('Avatar'), 'html' => true],
-                ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> ' . __('Messages') . ' <span class="badge pm-count-block">0</span>', 'html' => true],
-                ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> ' . __('Settings'), 'html' => true]
+                ['type' => 'link', 'link' => ['profile/avatar'], 'text' => '<i class="fa fa-camera"></i> '.__('Avatar'), 'html' => true],
+                ['type' => 'link', 'link' => ['profile/messages'], 'text' => '<i class="fa fa-envelope"></i> '.__('Messages').' <span class="badge pm-count-block">0</span>', 'html' => true],
+                ['type' => 'link', 'link' => ['profile/settings'], 'text' => '<i class="fa fa-cogs"></i> '.__('Settings'), 'html' => true]
             ];
         } elseif (\App::$User->isAuth()) {
             $userMenu = [
                 [
                     'type' => 'link', 'link' => Url::to('profile/messages', null, null, ['newdialog' => $user->id]),
-                    'text' => '<i class="fa fa-pencil-square-o"></i> ' . __('Write message'), 'html' => true
+                    'text' => '<i class="fa fa-pencil-square-o"></i> '.__('Write message'), 'html' => true
                 ],
                 [
                     'type' => 'link', 'link' => Url::to('profile/ignore', null, null, ['id' => $user->id]),
-                    'text' => '<i class="fa fa-user-times"></i> ' . __('Block'), 'html' => true, 'property' => ['class' => 'alert-danger']
+                    'text' => '<i class="fa fa-user-times"></i> '.__('Block'), 'html' => true, 'property' => ['class' => 'alert-danger']
                 ]
             ];
         }
@@ -172,7 +172,7 @@ 
                         foreach ($hobbyArray as $item) {
                             $item = \App::$Security->strip_tags($item);
                             if ($item !== null && Str::length($item) > 1) {
-                                echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']) . ' ';
+                                echo Url::link(['profile/index', 'hobby', trim($item, ' ')], $item, ['class' => 'label label-success']).' ';
                             }
                         }
                         ?>
@@ -218,7 +218,7 @@ 
             <?= $form->field('message', 'textarea', ['class' => 'form-control']); ?>
             <div class="text-right"><?= $form->submitButton(__('Send'), ['class' => 'btn btn-default']); ?></div>
             <?= $form->finish(); ?>
-            <?php \App::$Alias->addPlainCode('js', "$('#" . $wall->getFormName() . "').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?>
+            <?php \App::$Alias->addPlainCode('js', "$('#".$wall->getFormName()."').on('change keyup keydown paste cut', 'textarea', function () { $(this).height(0).height(this.scrollHeight);}).find('textarea').change();") ?>
         <?php endif; ?>
         <?php
         if ($wallRecords !== null):
@@ -229,8 +229,7 @@ 
                     continue;
                 }
                 $referNickname = ($referObject->getProfile()->nick == null ?
-                    __('No name') . ' <sup>id' . $referObject->getId() . '</sup>' :
-                    \App::$Security->strip_tags($referObject->getProfile()->nick));
+                    __('No name').' <sup>id'.$referObject->getId().'</sup>' : \App::$Security->strip_tags($referObject->getProfile()->nick));
                 ?>
                 <div class="row object-lightborder" id="wall-post-<?= $post->id ?>">
                     <div class="col-md-2">