phpffcms / ffcms

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

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
             ['text' => $model->getUser()->id],
             ['text' => $model->getUser()->email],
             ['text' => $model->getUser()->login],
-            ['text' => $model->getUser()->profile->nick ?? 'id' . $model->getUser()->id],
+            ['text' => $model->getUser()->profile->nick ?? 'id'.$model->getUser()->id],
             ['text' => Date::convertToDatetime($model->getUser()->created_at, Date::FORMAT_TO_HOUR)],
         ])->display() ?>
 </div>

Apps/View/Admin/default/content/content_update.php

Spacing +15 added lines, -15 removed lines

@@ -51,9 +51,9 @@ 
             $langMenu->menu([
                 'text' => Str::upperCase($lang),
                 'tab' => function() use ($form, $lang) {
-                    return $form->fieldset()->text('title.' . $lang, null, __('Fill the title of the content for current language locale')) .
-                        '<strong>' . __('Content text') . '</strong><br />' .
-                        $form->field()->textarea('text.' . $lang, ['class' => 'form-control wysiwyg', 'rows' => 7]);
+                    return $form->fieldset()->text('title.'.$lang, null, __('Fill the title of the content for current language locale')).
+                        '<strong>'.__('Content text').'</strong><br />'.
+                        $form->field()->textarea('text.'.$lang, ['class' => 'form-control wysiwyg', 'rows' => 7]);
                 },
                 'tabActive' => $lang === \App::$Request->getLanguage()
             ]);
@@ -72,9 +72,9 @@ 
             $langMenu->menu([
                 'text' => Str::upperCase($lang),
                 'tab' => function() use ($form, $lang) {
-                    return $form->fieldset()->text('metaTitle.' . $lang, null, __('Set meta title for content page (displayed in browser head). Recommended length: 50-70 chars')).
-                        $form->fieldset()->text('metaKeywords.' . $lang, ['class' => 'tag-selectize'], __('Set meta keywords for this content (for search engine crawlers) separated by comma')).
-                        $form->fieldset()->text('metaTitle.' . $lang, null, __('Set meta description for this content (for search engine crawlers). Recommended length: 200-250 chars'));
+                    return $form->fieldset()->text('metaTitle.'.$lang, null, __('Set meta title for content page (displayed in browser head). Recommended length: 50-70 chars')).
+                        $form->fieldset()->text('metaKeywords.'.$lang, ['class' => 'tag-selectize'], __('Set meta keywords for this content (for search engine crawlers) separated by comma')).
+                        $form->fieldset()->text('metaTitle.'.$lang, null, __('Set meta description for this content (for search engine crawlers). Recommended length: 200-250 chars'));
                 },
                 'tabActive' => $lang === \App::$Request->getLanguage()
             ]);
@@ -92,16 +92,16 @@ 
             <div class="dropzone dropzone-previews" id="ffcms-dropzone"></div>
         </div>
         <div class="col-md-4">
-        ' . $form->fieldset()->select('poster', ['options' => [__('Not selected...')]], __("Select image from gallery as a poster for this content")) . '
+        ' . $form->fieldset()->select('poster', ['options' => [__('Not selected...')]], __("Select image from gallery as a poster for this content")).'
         </div>
     </div><br/><br/>';
     }])
     ->menu(['text' => __('Other'), 'tab' => function() use ($form, $model) {
-        return $form->fieldset()->boolean('display', null, __('Can users view this content or only available for administrators?')) .
-            $form->fieldset()->boolean('important', null, __('Make this material important and stack it on top of all news?')) .
-            $form->fieldset()->text('createdAt', ['class' => 'form-control datepick'], __('Set the date of creation or leave empty for current date')) .
-            $form->fieldset()->select('authorId', ['options' => $model->getUserIdName(), 'optionsKey' => true, 'class' => 'selectize-option'], __('Enter author user_id or leave empty to set current user as author')) .
-            $form->fieldset()->text('source', null, __('Set source URL if this content is copied from another website')) .
+        return $form->fieldset()->boolean('display', null, __('Can users view this content or only available for administrators?')).
+            $form->fieldset()->boolean('important', null, __('Make this material important and stack it on top of all news?')).
+            $form->fieldset()->text('createdAt', ['class' => 'form-control datepick'], __('Set the date of creation or leave empty for current date')).
+            $form->fieldset()->select('authorId', ['options' => $model->getUserIdName(), 'optionsKey' => true, 'class' => 'selectize-option'], __('Enter author user_id or leave empty to set current user as author')).
+            $form->fieldset()->text('source', null, __('Set source URL if this content is copied from another website')).
             $form->fieldset()->text('addRating', null, __('Add or reduce this content rating. Example: 5 gives +5 to total rating, -5 gives -5 to total'));
     }]);
 
@@ -128,11 +128,11 @@ 
                 ['text' => $comment->id],
                 ['text' => Text::snippet(\App::$Security->strip_tags($comment->message), 100)],
                 ['text' => $comment->getAnswerCount()],
-                ['text' => Url::a(['user/update', [$comment->user_id]], ($comment->user->profile->nick ?? 'id' . $comment->user->id)), 'html' => true],
+                ['text' => Url::a(['user/update', [$comment->user_id]], ($comment->user->profile->nick ?? 'id'.$comment->user->id)), 'html' => true],
                 ['text' => $this->bootstrap()->btngroup(['class' => 'btn-group btn-group-sm'])
                     ->add('<i class="fa fa-pencil"></i>', ['comments/read', [$comment->id]], ['html' => true, 'class' => 'btn btn-primary', 'target' => '_blank'])
                     ->add('<i class="fa fa-trash-o"></i>', ['comments/delete', ['comment', $comment->id]], ['html' => true, 'class' => 'btn btn-danger', 'target' => '_blank'])
-                    ->display(),'properties' => ['class' => 'text-center'], 'html' => true
+                    ->display(), 'properties' => ['class' => 'text-center'], 'html' => true
                 ]
             ]);
         }
@@ -238,7 +238,7 @@ 
     var DropzoneFiles = [];
     $('#ffcms-dropzone').dropzone({
         url: script_url + '/api/content/galleryupload/<?= $model->galleryFreeId ?>?lang=' + script_lang,
-        dictDefaultMessage: '<?= __('Drop files here to upload in gallery') . '<br />' . __('(or click here)') ?>',
+        dictDefaultMessage: '<?= __('Drop files here to upload in gallery').'<br />'.__('(or click here)') ?>',
         acceptedFiles: ".jpeg,.jpg,.png,.gif,.webp",
         addRemoveLinks: true,
         removedfile: function (file) { // file remove click, lets try to remove file from server & make visual changes

Apps/View/Admin/default/content/category_list.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 <h1><?= __('Category list') ?></h1>
 <div class="row">
     <div class="col-md-12">
-        <?= Url::a(['content/categoryupdate'], '<i class="fa fa-plus"></i> ' . __('Add category'), ['class' => 'btn btn-primary', 'html' => true]) ?>
+        <?= Url::a(['content/categoryupdate'], '<i class="fa fa-plus"></i> '.__('Add category'), ['class' => 'btn btn-primary', 'html' => true]) ?>
     </div>
 </div>
 <div class="table-responsive">
@@ -56,17 +56,17 @@ 
             <tr>
                 <td>
                     <div class="row">
-                        <div class="d-none d-md-block col-md-<?= $offset ?> col-xs-<?= $offset+2 ?> " style="border-bottom: 2px solid #8a8a8a;height: 1px;padding-top: 10px;"></div>
-                        <div class="col-md-<?= $set ?> col-xs-<?= $set-2 ?>">
+                        <div class="d-none d-md-block col-md-<?= $offset ?> col-xs-<?= $offset + 2 ?> " style="border-bottom: 2px solid #8a8a8a;height: 1px;padding-top: 10px;"></div>
+                        <div class="col-md-<?= $set ?> col-xs-<?= $set - 2 ?>">
                             <?= $row->getLocaled('title') ?>
                             <sup>id: <?= $row->id ?></sup>
-                            <a href="<?= \App::$Alias->scriptUrl . '/content/list/' . $row->path ?>" target="_blank" class="badge badge-secondary">/<?= $row->path ?></a>
+                            <a href="<?= \App::$Alias->scriptUrl.'/content/list/'.$row->path ?>" target="_blank" class="badge badge-secondary">/<?= $row->path ?></a>
                         </div>
                     </div>
                 </td>
                 <td class="text-center">
                     <?php $btn = $this->bootstrap()->btngroup(['class' => 'btn-group btn-group-sm', 'dropdown' => ['class' => 'btn-group btn-group-sm'], 'role' => 'group'], 4)
-                        ->add('<i class="fa fa-eye"></i>', [\App::$Alias->scriptUrl . '/content/list/' . $row->path], ['html' => true, 'target' => '_blank'])
+                        ->add('<i class="fa fa-eye"></i>', [\App::$Alias->scriptUrl.'/content/list/'.$row->path], ['html' => true, 'target' => '_blank'])
                         ->add('<i class="fa fa-plus"></i>', ['content/categoryupdate', null, ['parent' => $row->id]], ['class' => 'btn btn-success', 'data-toggle' => 'tooltip', 'title' => __('Add subcategory'), 'html' => true])
                         ->add('<i class="fa fa-cog"></i>', ['content/categoryupdate', [$row->id]], ['class' => 'btn btn-primary', 'data-toggle' => 'tooltip', 'title' => __('Category configurations'), 'html' => true]);
                     if ($row->id > 1) {

Apps/Model/Admin/User/FormUserClear.php

Spacing +4 added lines, -4 removed lines

@@ -70,12 +70,12 @@ 
      */
     public function make()
     {
-        if ((bool)$this->comments) {
+        if ((bool) $this->comments) {
             CommentPost::where('user_id', $this->_user->id)->delete();
             CommentAnswer::where('user_id', $this->_user->id)->delete();
         }
 
-        if ((bool)$this->content) {
+        if ((bool) $this->content) {
             $contents = Content::where('author_id', $this->_user->id);
             $ids = $contents->pluck('id')->toArray();
             if ($ids && count($ids) > 0) {
@@ -85,12 +85,12 @@ 
             }
         }
 
-        if ((bool)$this->feedback) {
+        if ((bool) $this->feedback) {
             FeedbackPost::where('user_id', $this->_user->id)
                 ->update(['readed' => true, 'closed' => true]);
         }
 
-        if ((bool)$this->wall) {
+        if ((bool) $this->wall) {
             WallPost::where('sender_id', $this->_user->id)->delete();
             WallAnswer::where('user_id', $this->_user->id)->delete();
         }

Apps/Model/Admin/User/FormUserDelete.php

Spacing +5 added lines, -5 removed lines

@@ -79,7 +79,7 @@ 
         foreach ($this->users as $user) {
             $uid = $user->id;
             // delete whole website info for this user
-            if ((bool)$this->delete) {
+            if ((bool) $this->delete) {
                 $model = new FormUserClear($user);
                 $model->comments = true;
                 $model->content = true;
@@ -89,10 +89,10 @@ 
             }
 
             // delete avatars
-            File::remove('/upload/user/avatar/big/' . $uid . '.jpg');
-            File::remove('/upload/user/avatar/medium/' . $uid . '.jpg');
-            File::remove('/upload/user/avatar/small/' . $uid . '.jpg');
-            File::remove('/upload/user/avatar/original/' . $uid . '.jpg');
+            File::remove('/upload/user/avatar/big/'.$uid.'.jpg');
+            File::remove('/upload/user/avatar/medium/'.$uid.'.jpg');
+            File::remove('/upload/user/avatar/small/'.$uid.'.jpg');
+            File::remove('/upload/user/avatar/original/'.$uid.'.jpg');
             // delete user profile and auth data
             $user->profile()->delete();
             // delete user provider data

Apps/Model/Admin/Content/FormContentUpdate.php

Spacing +14 added lines, -14 removed lines

@@ -66,7 +66,7 @@ 
         if (!$this->_content->id) {
             $this->_new = true;
             if (!$this->galleryFreeId) {
-                $this->galleryFreeId = '_tmp_' . Str::randomLatin(mt_rand(16, 32));
+                $this->galleryFreeId = '_tmp_'.Str::randomLatin(mt_rand(16, 32));
             }
 
             if (!$this->authorId) {
@@ -77,7 +77,7 @@ 
                 $this->categoryId = 1;
             }
             if (!$this->path) {
-                $this->path = Integer::random(8) . '-' . date('d-m-Y');
+                $this->path = Integer::random(8).'-'.date('d-m-Y');
             }
 
             if ($this->cloneId > 0) {
@@ -115,8 +115,8 @@ 
     public function rules(): array
     {
         $res = [
-            ['title.' . App::$Request->getLanguage(), 'required'],
-            ['text.' . App::$Request->getLanguage(), 'required'],
+            ['title.'.App::$Request->getLanguage(), 'required'],
+            ['text.'.App::$Request->getLanguage(), 'required'],
             ['text', 'used'],
             ['path', 'reverse_match', '/[\/\'~`\!@#\$%\^&\*\(\)+=\{\}\[\]\|;:"\<\>,\?\\\]/'],
             [['path', 'categoryId', 'authorId', 'display', 'galleryFreeId', 'title', 'important'], 'required'],
@@ -129,9 +129,9 @@ 
         ];
 
         foreach (App::$Properties->get('languages') as $lang) {
-            $res[] = ['title.' . $lang, 'length_max', 120, null, true, true];
-            $res[] = ['keywords.' . $lang, 'length_max', 150];
-            $res[] = ['description.' . $lang, 'length_max', 250];
+            $res[] = ['title.'.$lang, 'length_max', 120, null, true, true];
+            $res[] = ['keywords.'.$lang, 'length_max', 150];
+            $res[] = ['description.'.$lang, 'length_max', 250];
         }
 
         return $res;
@@ -187,10 +187,10 @@ 
         $this->_content->meta_keywords = $this->metaKeywords;
         $this->_content->meta_description = $this->metaDescription;
         $this->_content->source = $this->source;
-        $this->_content->important = (int)$this->important;
+        $this->_content->important = (int) $this->important;
         // check if rating is changed
-        if ((int)$this->addRating !== 0) {
-            $this->_content->rating += (int)$this->addRating;
+        if ((int) $this->addRating !== 0) {
+            $this->_content->rating += (int) $this->addRating;
         }
 
         // check if date is updated
@@ -199,7 +199,7 @@ 
         }
 
         // save poster data
-        $posterPath = '/upload/gallery/' . $this->galleryFreeId . '/orig/' . $this->poster;
+        $posterPath = '/upload/gallery/'.$this->galleryFreeId.'/orig/'.$this->poster;
         if (File::exist($posterPath)) {
             $this->_content->poster = $this->poster;
         }
@@ -234,7 +234,7 @@ 
 
         // move files
         if ($tmpGalleryId !== $this->_content->id) {
-            Directory::rename('/upload/gallery/' . $tmpGalleryId, $this->_content->id);
+            Directory::rename('/upload/gallery/'.$tmpGalleryId, $this->_content->id);
         }
     }
 
@@ -273,9 +273,9 @@ 
     public function getUserIdName(): ?array
     {
         $users = [];
-        User::with('profile')->get()->each(function ($user) use (&$users) {
+        User::with('profile')->get()->each(function($user) use (&$users) {
             /** @var User $user */
-            $users[$user->id] = ($user->profile->nick ?? 'id' . $user->id) . ' (' . $user->email . ')';
+            $users[$user->id] = ($user->profile->nick ?? 'id'.$user->id).' ('.$user->email.')';
         });
 
         return $users;

Apps/Controller/Admin/Content/ActionUpdate.php

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
             ->withTrashed()
             ->findOrNew($id);
         $isNew = $record->id === null;
-        $cloneId = (int)$this->request->query->get('from', 0);
+        $cloneId = (int) $this->request->query->get('from', 0);
 
         // init model
         $model = new FormContentUpdate($record, $cloneId);

Private/Migrations/Updates/update_cms_310-2017-07-29-11-00-00.php

Spacing +4 added lines, -4 removed lines

@@ -17,7 +17,7 @@ 
     public function up()
     {
         // set nullable varchar type for token column
-        $this->getSchema()->table('users', function($table){
+        $this->getSchema()->table('users', function($table) {
             $table->string('approve_token', 128)->nullable()->default(null)->change();
         });
         // set approve_token = null where it like '0' str or ''
@@ -31,7 +31,7 @@ 
             });
         }
         if (!$this->getSchema()->hasColumn('comment_answers', 'app_relation_id')) {
-            $this->getSchema()->table('comment_answers', function ($table){
+            $this->getSchema()->table('comment_answers', function($table) {
                 $table->integer('app_relation_id')->unsigned()->default(0)->after('app_name');
             });
         }
@@ -41,13 +41,13 @@ 
 
         // @todo: add algo to find app_name & app_id for oldest comments
         if ($this->getSchema()->hasColumn('comment_posts', 'pathway')) {
-            $this->getSchema()->table('comment_posts', function ($table){
+            $this->getSchema()->table('comment_posts', function($table) {
                 $table->dropColumn('pathway');
             });
         }
         // remove comment_hash column from content
         if ($this->getSchema()->hasColumn('contents', 'comment_hash')) {
-            $this->getSchema()->table('contents', function ($table){
+            $this->getSchema()->table('contents', function($table) {
                 $table->dropColumn('comment_hash');
             });
         }

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

Spacing +7 added lines, -7 removed lines

@@ -30,7 +30,7 @@ 
     <?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">
 
@@ -45,23 +45,23 @@ 
 if (\App::$Properties->get('multiLanguage') && count(\App::$Properties->get('languages')) > 1) {
     foreach (\App::$Properties->get('languages') as $lang) {
         $navbar->menu('left', [
-            'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-' . $lang . '" alt="' . $lang . '">',
-            'link' => App::$Alias->baseUrlNoLang . '/' . $lang . App::$Request->getPathInfo(),
+            'text' => '<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7" class="flag flag-'.$lang.'" alt="'.$lang.'">',
+            'link' => App::$Alias->baseUrlNoLang.'/'.$lang.App::$Request->getPathInfo(),
             'html' => true
         ]);
     }
 }
 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 {