phpffcms / ffcms

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 +9 added lines, -9 removed lines

@@ -27,7 +27,7 @@ 
     $name = __('No name');
 }
 
-$this->title = __('Profile') . ': ' . $name;
+$this->title = __('Profile').': '.$name;
 
 $this->breadcrumbs = [
     Url::to('/') => __('Home'),
@@ -47,7 +47,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) {
@@ -85,19 +85,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']
                 ]
             ];
         }
@@ -173,7 +173,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']).' ';
                             }
                         }
                         ?>
@@ -219,7 +219,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):

Private/Config/Permissions.php

Spacing +1 added lines, -1 removed lines

@@ -1,6 +1,6 @@
 <?php 
 
-return array (
+return array(
   0 => 'global/write',
   1 => 'global/modify',
   2 => 'global/file',

Indentation +65 added lines, -65 removed lines

@@ -1,69 +1,69 @@
 <?php 
 
 return array (
-  0 => 'global/write',
-  1 => 'global/modify',
-  2 => 'global/file',
-  3 => 'global/all',
-  4 => 'Admin/Application/Index',
-  5 => 'Admin/Application/Install',
-  6 => 'Admin/Application/Update',
-  7 => 'Admin/Application/Turn',
-  8 => 'Admin/Comments/Index',
-  9 => 'Admin/Comments/Read',
-  10 => 'Admin/Comments/Edit',
-  11 => 'Admin/Comments/Delete',
-  12 => 'Admin/Comments/Publish',
-  13 => 'Admin/Comments/Answerlist',
-  14 => 'Admin/Comments/Settings',
-  15 => 'Admin/Content/Index',
-  16 => 'Admin/Content/Update',
-  17 => 'Admin/Content/Delete',
-  18 => 'Admin/Content/Restore',
-  19 => 'Admin/Content/Clear',
-  20 => 'Admin/Content/Categories',
-  21 => 'Admin/Content/Categorydelete',
-  22 => 'Admin/Content/Categoryupdate',
-  23 => 'Admin/Content/Globdelete',
-  24 => 'Admin/Content/Publish',
-  25 => 'Admin/Content/Settings',
-  26 => 'Admin/Contenttag/Index',
-  27 => 'Admin/Feedback/Index',
-  28 => 'Admin/Feedback/Read',
-  29 => 'Admin/Feedback/Update',
-  30 => 'Admin/Feedback/Turn',
-  31 => 'Admin/Feedback/Delete',
-  32 => 'Admin/Feedback/Settings',
-  33 => 'Admin/Main/Index',
-  34 => 'Admin/Main/Settings',
-  35 => 'Admin/Main/Files',
-  36 => 'Admin/Main/Antivirus',
-  37 => 'Admin/Main/Debugcookie',
-  38 => 'Admin/Main/Routing',
-  39 => 'Admin/Main/Addroute',
-  40 => 'Admin/Main/Deleteroute',
-  41 => 'Admin/Main/Cache',
-  42 => 'Admin/Main/Sessions',
-  43 => 'Admin/Newcomment/Index',
-  44 => 'Admin/Newcontent/Index',
-  45 => 'Admin/Profile/Index',
-  46 => 'Admin/Profile/Delete',
-  47 => 'Admin/Profile/Update',
-  48 => 'Admin/Profile/Fieldlist',
-  49 => 'Admin/Profile/Fieldupdate',
-  50 => 'Admin/Profile/Fielddelete',
-  51 => 'Admin/Profile/Settings',
-  52 => 'Admin/Search/Index',
-  53 => 'Admin/Sitemap/Index',
-  54 => 'Admin/User/Index',
-  55 => 'Admin/User/Update',
-  56 => 'Admin/User/Delete',
-  57 => 'Admin/User/Grouplist',
-  58 => 'Admin/User/GroupUpdate',
-  59 => 'Admin/User/Settings',
-  60 => 'Admin/User/Invite',
-  61 => 'Admin/Widget/Index',
-  62 => 'Admin/Widget/Install',
-  63 => 'Admin/Widget/Update',
-  64 => 'Admin/Widget/Turn',
+    0 => 'global/write',
+    1 => 'global/modify',
+    2 => 'global/file',
+    3 => 'global/all',
+    4 => 'Admin/Application/Index',
+    5 => 'Admin/Application/Install',
+    6 => 'Admin/Application/Update',
+    7 => 'Admin/Application/Turn',
+    8 => 'Admin/Comments/Index',
+    9 => 'Admin/Comments/Read',
+    10 => 'Admin/Comments/Edit',
+    11 => 'Admin/Comments/Delete',
+    12 => 'Admin/Comments/Publish',
+    13 => 'Admin/Comments/Answerlist',
+    14 => 'Admin/Comments/Settings',
+    15 => 'Admin/Content/Index',
+    16 => 'Admin/Content/Update',
+    17 => 'Admin/Content/Delete',
+    18 => 'Admin/Content/Restore',
+    19 => 'Admin/Content/Clear',
+    20 => 'Admin/Content/Categories',
+    21 => 'Admin/Content/Categorydelete',
+    22 => 'Admin/Content/Categoryupdate',
+    23 => 'Admin/Content/Globdelete',
+    24 => 'Admin/Content/Publish',
+    25 => 'Admin/Content/Settings',
+    26 => 'Admin/Contenttag/Index',
+    27 => 'Admin/Feedback/Index',
+    28 => 'Admin/Feedback/Read',
+    29 => 'Admin/Feedback/Update',
+    30 => 'Admin/Feedback/Turn',
+    31 => 'Admin/Feedback/Delete',
+    32 => 'Admin/Feedback/Settings',
+    33 => 'Admin/Main/Index',
+    34 => 'Admin/Main/Settings',
+    35 => 'Admin/Main/Files',
+    36 => 'Admin/Main/Antivirus',
+    37 => 'Admin/Main/Debugcookie',
+    38 => 'Admin/Main/Routing',
+    39 => 'Admin/Main/Addroute',
+    40 => 'Admin/Main/Deleteroute',
+    41 => 'Admin/Main/Cache',
+    42 => 'Admin/Main/Sessions',
+    43 => 'Admin/Newcomment/Index',
+    44 => 'Admin/Newcontent/Index',
+    45 => 'Admin/Profile/Index',
+    46 => 'Admin/Profile/Delete',
+    47 => 'Admin/Profile/Update',
+    48 => 'Admin/Profile/Fieldlist',
+    49 => 'Admin/Profile/Fieldupdate',
+    50 => 'Admin/Profile/Fielddelete',
+    51 => 'Admin/Profile/Settings',
+    52 => 'Admin/Search/Index',
+    53 => 'Admin/Sitemap/Index',
+    54 => 'Admin/User/Index',
+    55 => 'Admin/User/Update',
+    56 => 'Admin/User/Delete',
+    57 => 'Admin/User/Grouplist',
+    58 => 'Admin/User/GroupUpdate',
+    59 => 'Admin/User/Settings',
+    60 => 'Admin/User/Invite',
+    61 => 'Admin/Widget/Index',
+    62 => 'Admin/Widget/Install',
+    63 => 'Admin/Widget/Update',
+    64 => 'Admin/Widget/Turn',
 );
\ No newline at end of file

Widgets/Front/Test/Widget.php

Braces +3 added lines, -2 removed lines

@@ -14,8 +14,9 @@
 
     public function init()
     {
-        if ($this->message === null)
-            $this->message = 'Hello, world';
+        if ($this->message === null) {
+                    $this->message = 'Hello, world';
+        }
     }
 
     public function display()

Apps/Model/Admin/Content/FormCategoryUpdate.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
-use Ffcms\Core\Helper\Type\Obj;
 use Ffcms\Core\Helper\Type\Str;
 use Ffcms\Core\Interfaces\iUser;
 

Spacing +4 added lines, -4 removed lines

@@ -107,7 +107,7 @@ 
         ];
 
         // general category
-        if ($this->_new === false && (int)$this->_record->id === 1) {
+        if ($this->_new === false && (int) $this->_record->id === 1) {
             $rules[] = ['path', 'used'];
         } else {
             $rules[] = ['path', 'required'];
@@ -116,7 +116,7 @@ 
             $rules[] = ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'];
         }
 
-        $rules[] = ['title.' . App::$Request->getLanguage(), 'required'];
+        $rules[] = ['title.'.App::$Request->getLanguage(), 'required'];
 
 
         return $rules;
@@ -129,7 +129,7 @@ 
     {
         $this->_record->title = Serialize::encode(App::$Security->strip_tags($this->title));
         $this->_record->description = Serialize::encode(App::$Security->strip_tags($this->description));
-        $savePath = trim($this->_pathNested . '/' . $this->path, '/');
+        $savePath = trim($this->_pathNested.'/'.$this->path, '/');
         $this->_record->path = $savePath;
         $this->_record->configs = Serialize::encode($this->configs);
         $this->_record->save();
@@ -164,7 +164,7 @@ 
         // build path with owner category
         $this->_pathNested = $owner->path;
         if (Str::length($this->_pathNested) > 0) {
-            $path = $this->_pathNested . '/' . $path;
+            $path = $this->_pathNested.'/'.$path;
         }
 
         // make select for check

Apps/Model/Front/Profile/FormUserSearch.php

Indentation +4 added lines, -4 removed lines

@@ -17,8 +17,8 @@ 
     public $captcha;
 
     /**
-    * Labels
-    */
+     * Labels
+     */
     public function labels()
     {
         return [
@@ -28,8 +28,8 @@ 
     }
 
     /**
-    * Validation rules
-    */
+     * Validation rules
+     */
     public function rules()
     {
         return [

Apps/View/Admin/default/content/_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/Admin/default/profile/_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/content/list.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;

Indentation +6 added lines, -6 removed lines

@@ -100,12 +100,12 @@
         </div>
         <div class="meta">
         	<?php if ((int)$catConfigs['showRating'] === 1) {
-        	    echo \App::$View->render('content/_rate', [
-        	        'id' => $item['id'],
-        	        'canRate' => $item['canRate'],
-        	        'rating' => $item['rating']
-        	    ]);
-        	} ?>
+                echo \App::$View->render('content/_rate', [
+                    'id' => $item['id'],
+                    'canRate' => $item['canRate'],
+                    'rating' => $item['rating']
+                ]);
+            } ?>
         	
         	<span class="spaced hidden-xs"><i class="fa fa-comments"></i>
                 <a href="#"><?= __('Comments') ?>: <span itemprop="commentCount">0</span></a>

Spacing +8 added lines, -8 removed lines

@@ -15,7 +15,7 @@ 
 
 $catConfigs = [];
 foreach ($model->category['configs'] as $key=>$value) {
-    $catConfigs[$key] = (int)$value === 1;
+    $catConfigs[$key] = (int) $value === 1;
 }
 
 $catMeta = [
@@ -68,7 +68,7 @@ 
 <?php foreach ($model->items as $item): ?>
     <article class="article-item" itemscope="itemscope" itemtype="https://schema.org/NewsArticle">
         <h2 itemprop="name">
-            <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>">
+            <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>">
                 <?= $item['title'] ?>
             </a>
         </h2>
@@ -95,7 +95,7 @@ 
                 <?php
                 $ownerNick = $item['author']->getProfile()->getNickname();
                 if ($item['author']->getId() < 1) {
-                    echo '<s>' . $ownerNick . '</s>';
+                    echo '<s>'.$ownerNick.'</s>';
                 } else {
                     echo Url::link(['profile/show', $item['author']->getId()], $ownerNick, ['itemprop' => 'author']);
                 }
@@ -112,7 +112,7 @@ 
         <div class="row">
             <div class="col-md-12">
                 <?php if ($catConfigs['showPoster'] === true && $item['thumb'] !== null): ?>
-                <img src="<?= \App::$Alias->scriptUrl . $item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
+                <img src="<?= \App::$Alias->scriptUrl.$item['thumb'] ?>" class="image_poster img-thumbnail hidden-xs" alt="<?= __('Poster for') ?>: <?= Str::lowerCase($item['title']) ?>" />
                 <?php endif; ?>
                 <div itemprop="text articleBody">
                     <?= $item['text'] ?>
@@ -120,7 +120,7 @@ 
             </div>
         </div>
         <div class="meta">
-        	<?php if ((int)$catConfigs['showRating'] === 1) {
+        	<?php if ((int) $catConfigs['showRating'] === 1) {
         	    echo \App::$View->render('content/_rate', [
         	        'id' => $item['id'],
         	        'canRate' => $item['canRate'],
@@ -129,15 +129,15 @@ 
         	} ?>
 
         	<span class="spaced hidden-xs"><i class="fa fa-comments"></i>
-                <a href="<?= \App::$Alias->baseUrl . $item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
+                <a href="<?= \App::$Alias->baseUrl.$item['uri'] ?>#comments-list"><?= __('Comments') ?>: <span itemprop="commentCount" id="comment-count-<?= $item['id'] ?>">0</span></a>
             </span>
             <span class="pull-right">
-            <?php if ((int)$catConfigs['showTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?>
+            <?php if ((int) $catConfigs['showTags'] === 1 && $item['tags'] !== null && Obj::isArray($item['tags'])): ?>
                 <span class="spaced"><i class="fa fa-tags hidden-xs"></i>
                 <?php
                     foreach ($item['tags'] as $tag) {
                         $tag = \App::$Security->strip_tags(trim($tag));
-                        echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default']) . "&nbsp;";
+                        echo Url::link(['content/tag', $tag], $tag, ['class' => 'label label-default'])."&nbsp;";
                     }
                 ?>
                 </span>

Apps/Model/Install/Main/FormInstall.php

Unused Use Statements -1 removed lines

@@ -4,7 +4,6 @@
 
 use Apps\ActiveRecord\Profile;
 use Apps\ActiveRecord\User;
-use Apps\Controller\Console\Db;
 use Ffcms\Core\App;
 use Ffcms\Core\Arch\Model;
 use Ffcms\Core\Helper\FileSystem\File;

Spacing +4 added lines, -4 removed lines

@@ -71,14 +71,14 @@
         $cfg['database'] = $this->db;
         $cfg['adminEmail'] = $this->email;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Str::randomLatinNumeric(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $cfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
+        $cfg['debug']['cookie']['key'] = 'fdebug_'.Str::randomLatinNumeric(mt_rand(4, 16));
         $cfg['debug']['cookie']['value'] = Str::randomLatinNumeric(mt_rand(32, 128));
 
         // import database tables
         $connectName = 'install';
-        include(root . '/Private/Database/install.php');
+        include(root.'/Private/Database/install.php');
 
         // insert admin user
         $user = new User();