phpffcms / ffcms

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

Spacing +36 added lines, -36 removed lines

@@ -22,54 +22,54 @@
 <?= $form->start() ?>
 
 <?= $this->bootstrap()->nav('ul', ['class' => 'nav-tabs'])
-    ->menu(['text' => __('Base'), 'tab' => function () use ($form) {
-        return $form->fieldset()->text('baseDomain', ['class' => 'form-control'], __('Main domain of website. Use only in console or cron tasks, if domain cannot be defined from request string')) .
-            $form->fieldset()->radio('baseProto', ['options' => ['http', 'https']], __('Main website transfer protocol. Use only if request data is not available in console or cron tasks')) .
-            $form->fieldset()->text('basePath', ['class' => 'form-control'], __('FFCMS installation sub-directory, used if installed not in root. Example: /subdir/')) .
-            $form->fieldset()->select('timezone', ['class' => 'form-control', 'options' => DateTimeZone::listIdentifiers()], __('Define website default timezone id')) .
-            $form->fieldset()->boolean('userCron', null, __('Initialize cron manager when user load website? Enable this option if you are not configured cron tasks in your operation system')) .
-            $form->fieldset()->boolean('debug.all', null, __('Enable debug bar panel for all visitors? Recommended only on development environment')) .
+    ->menu(['text' => __('Base'), 'tab' => function() use ($form) {
+        return $form->fieldset()->text('baseDomain', ['class' => 'form-control'], __('Main domain of website. Use only in console or cron tasks, if domain cannot be defined from request string')).
+            $form->fieldset()->radio('baseProto', ['options' => ['http', 'https']], __('Main website transfer protocol. Use only if request data is not available in console or cron tasks')).
+            $form->fieldset()->text('basePath', ['class' => 'form-control'], __('FFCMS installation sub-directory, used if installed not in root. Example: /subdir/')).
+            $form->fieldset()->select('timezone', ['class' => 'form-control', 'options' => DateTimeZone::listIdentifiers()], __('Define website default timezone id')).
+            $form->fieldset()->boolean('userCron', null, __('Initialize cron manager when user load website? Enable this option if you are not configured cron tasks in your operation system')).
+            $form->fieldset()->boolean('debug.all', null, __('Enable debug bar panel for all visitors? Recommended only on development environment')).
             $form->fieldset()->boolean('testSuite', null, __('Enable codeception test suite adapter? Use this option ONLY to run codeception tests! Disable this option on production'));
     }, 'tabActive' => true])
-    ->menu(['text' => __('Themes'), 'tab' => function () use ($form, $model) {
-        return $form->fieldset()->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')) .
+    ->menu(['text' => __('Themes'), 'tab' => function() use ($form, $model) {
+        return $form->fieldset()->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')).
             $form->fieldset()->select('theme.Admin', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Admin')], __('Set theme for admin panel'));
     }])
-    ->menu(['text' => __('Mail'), 'tab' => function () use ($form) {
-        return '<p>' . __('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server') . '</p>' .
-            $form->fieldset()->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')) .
-            $form->fieldset()->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')) .
-            $form->fieldset()->select('mail.encrypt', ['class' => 'form-control', 'options' => ['tls', 'ssl', 'none']], __('Set encryption method for your smtp server. For remote service we are strongly recommend use tls/ssl encryption')) .
-            $form->fieldset()->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')) .
+    ->menu(['text' => __('Mail'), 'tab' => function() use ($form) {
+        return '<p>'.__('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server').'</p>'.
+            $form->fieldset()->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')).
+            $form->fieldset()->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')).
+            $form->fieldset()->select('mail.encrypt', ['class' => 'form-control', 'options' => ['tls', 'ssl', 'none']], __('Set encryption method for your smtp server. For remote service we are strongly recommend use tls/ssl encryption')).
+            $form->fieldset()->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')).
             $form->fieldset()->text('mail.password', ['class' => 'form-control'], __('Set auth user password if exist'));
     }])
-    ->menu(['text' => __('Localization'), 'tab' => function () use ($form) {
-        return $form->fieldset()->select('singleLanguage', ['class' => 'form-control', 'options' => \App::$Translate->getAvailableLangs()], __('Default language of website')) .
-            $form->fieldset()->boolean('multiLanguage', null, __('Must we use multi language system in site pathway')) .
-            $form->fieldset()->text('baseLanguage', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')) .
+    ->menu(['text' => __('Localization'), 'tab' => function() use ($form) {
+        return $form->fieldset()->select('singleLanguage', ['class' => 'form-control', 'options' => \App::$Translate->getAvailableLangs()], __('Default language of website')).
+            $form->fieldset()->boolean('multiLanguage', null, __('Must we use multi language system in site pathway')).
+            $form->fieldset()->text('baseLanguage', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')).
             $form->fieldset()->checkboxes('languages', ['options' => App::$Translate->getAvailableLangs()], __('Website available languages'));
     }])
-    ->menu(['text' => __('Database'), 'tab' => function () use ($form) {
-        return '<p>' . __('Do not change any information in this tab if you not sure what you do!') . '</p>' .
-            $form->fieldset()->select('database.driver', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')) .
-            $form->fieldset()->text('database.host', ['class' => 'form-control'], __('Database connection host name')) .
-            $form->fieldset()->text('database.database', ['class' => 'form-control'], __('Database name or path to sqlite created file database')) .
-            $form->fieldset()->text('database.username', ['class' => 'form-control'], __('User name for database connection')) .
-            $form->fieldset()->text('database.password', ['class' => 'form-control'], __('Password for user of database connection')) .
-            $form->fieldset()->text('database.charset', ['class' => 'form-control']) .
-            $form->fieldset()->text('database.collation', ['class' => 'form-control']) .
+    ->menu(['text' => __('Database'), 'tab' => function() use ($form) {
+        return '<p>'.__('Do not change any information in this tab if you not sure what you do!').'</p>'.
+            $form->fieldset()->select('database.driver', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')).
+            $form->fieldset()->text('database.host', ['class' => 'form-control'], __('Database connection host name')).
+            $form->fieldset()->text('database.database', ['class' => 'form-control'], __('Database name or path to sqlite created file database')).
+            $form->fieldset()->text('database.username', ['class' => 'form-control'], __('User name for database connection')).
+            $form->fieldset()->text('database.password', ['class' => 'form-control'], __('Password for user of database connection')).
+            $form->fieldset()->text('database.charset', ['class' => 'form-control']).
+            $form->fieldset()->text('database.collation', ['class' => 'form-control']).
             $form->fieldset()->text('database.prefix', ['class' => 'form-control'], __('Database tables prefix'));
     }])
-    ->menu(['text' => __('Debug'), 'tab' => function () use ($form) {
-        return '<p>' . __('The key-value of cookie to enable debugging on website') . '. ' . __('If user got this cookie he can see debug bar') . '. ' .
-            Url::a(['main/debugcookie'], __('Set cookie for me')) . '</p>' .
-            $form->fieldset()->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')) .
+    ->menu(['text' => __('Debug'), 'tab' => function() use ($form) {
+        return '<p>'.__('The key-value of cookie to enable debugging on website').'. '.__('If user got this cookie he can see debug bar').'. '.
+            Url::a(['main/debugcookie'], __('Set cookie for me')).'</p>'.
+            $form->fieldset()->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')).
             $form->fieldset()->text('debug.cookie.value', ['class' => 'form-control'], __('Set cookie value for enable debug bar panel'));
     }])
-    ->menu(['text' => __('Other'), 'tab' => function () use ($form) {
-        return '<p>' . __('There you can change specified configs depends of other platforms. GA = google analytics.') . '</p>' .
-            $form->fieldset()->text('gaClientId', ['class' => 'form-control'], __('Google oAuth2 client id. This id will be used to display google.analytics info. Client ID looks like: xxxxxx.apps.googleusercontent.com')) .
-            $form->fieldset()->text('gaTrackId', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')) .
+    ->menu(['text' => __('Other'), 'tab' => function() use ($form) {
+        return '<p>'.__('There you can change specified configs depends of other platforms. GA = google analytics.').'</p>'.
+            $form->fieldset()->text('gaClientId', ['class' => 'form-control'], __('Google oAuth2 client id. This id will be used to display google.analytics info. Client ID looks like: xxxxxx.apps.googleusercontent.com')).
+            $form->fieldset()->text('gaTrackId', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')).
             $form->fieldset()->text('trustedProxy', ['class' => 'form-control'], __('Set trusted proxy list to accept X-FORWARDED data. Example: 103.21.244.15,103.22.200.0/22'));
     }])
     ->display(); ?>

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

Spacing +20 added lines, -20 removed lines

@@ -41,25 +41,25 @@ 
 echo $form->start();
 
 $menu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs'])
-    ->menu(['text' => __('General'), 'tab' => function () use ($form) {
+    ->menu(['text' => __('General'), 'tab' => function() use ($form) {
         /** @var \Ffcms\Templex\Template\Template $this */
         $langMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs']);
         foreach (\App::$Properties->get('languages') as $lang) {
             $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]);
+                '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]);
                 },
                 'tabActive' => $lang === \App::$Request->getLanguage()
             ]);
         }
-        return (new Dom())->div(function () use ($langMenu) {
+        return (new Dom())->div(function() use ($langMenu) {
             return $langMenu->display();
         }, ['class' => 'nav-border']);
     }, 'tabActive' => true])
-    ->menu(['text' => __('Properties'), 'tab' => function () use ($form) {
+    ->menu(['text' => __('Properties'), 'tab' => function() use ($form) {
         /** @var \Ffcms\Templex\Template\Template $this */
         $langMenu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs']);
         $context = $form->fieldset()->text('path', null, __('Slug of URL pathway for this content item'))
@@ -68,10 +68,10 @@ 
         foreach (\App::$Properties->get('languages') as $lang) {
             $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, null, __('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'));
+                '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, null, __('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()
             ]);
@@ -82,23 +82,23 @@ 
 
         return $context;
     }])
-    ->menu(['text' => __('Gallery'), 'tab' => function () use ($form) {
+    ->menu(['text' => __('Gallery'), 'tab' => function() use ($form) {
         return '<div class="row" id="gallery-files"></div>
     <div class="row">
         <div class="col-md-8">
             <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) {
-        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()->text('authorId', null, __('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')) .
+    ->menu(['text' => __('Other'), 'tab' => function() use ($form) {
+        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()->text('authorId', null, __('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'));
     }]);
 echo $menu->display();
@@ -196,7 +196,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_update.php

Spacing +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 foreach (\App::$Properties->get('languages') as $lang) {
     $menu->menu([
         'text' => Str::upperCase($lang),
-        'tab' => function () use ($form, $lang) {
-            return $form->fieldset()->text('title.' . $lang, null, __('Enter category title, visible for users')) .
-                $form->fieldset()->text('description.' . $lang, null, __('Enter category description'));
+        'tab' => function() use ($form, $lang) {
+            return $form->fieldset()->text('title.'.$lang, null, __('Enter category title, visible for users')).
+                $form->fieldset()->text('description.'.$lang, null, __('Enter category description'));
         },
         'tabActive' => $lang === \App::$Request->getLanguage()
     ]);

Apps/Console/MigrationInstallCommand.php

Spacing +1 added lines, -1 removed lines

@@ -35,7 +35,7 @@
             $output->write('Migration table is always exists!');
             return;
         }
-        DatabaseManager::schema($this->dbConnection)->create('migrations', function ($table) {
+        DatabaseManager::schema($this->dbConnection)->create('migrations', function($table) {
             $table->increments('id');
             $table->string('migration', 127)->unique();
             $table->timestamps();

Apps/Console/GeneratorControllerCommand.php

Spacing +3 added lines, -3 removed lines

@@ -49,12 +49,12 @@
         }
 
         // prepare code & write
-        $template = File::read('/Private/Carcase/' . $loader . '/Controller.tphp');
+        $template = File::read('/Private/Carcase/'.$loader.'/Controller.tphp');
         $code = Str::replace(['%name%'], [$name], $template);
 
-        $savePath = '/Apps/Controller/' . $loader . '/' . $name . '.php';
+        $savePath = '/Apps/Controller/'.$loader.'/'.$name.'.php';
         File::write($savePath, $code);
 
-        $output->write('Controller are successful created: ' . $savePath);
+        $output->write('Controller are successful created: '.$savePath);
     }
 }

Apps/Console/GeneratorModelCommand.php

Spacing +3 added lines, -3 removed lines

@@ -51,11 +51,11 @@
             throw new \Exception('Wrong definition for loader. You shoud use front, admin, api');
         }
 
-        $namespace = 'Apps\Model\\' . $loader . '\\' . $controller;
+        $namespace = 'Apps\Model\\'.$loader.'\\'.$controller;
         $tpl = File::read('/Private/Carcase/Model.tphp');
         $code = Str::replace(['%namespace%', '%name%'], [$namespace, $name], $tpl);
-        $path = '/Apps/Model/' . $loader . '/' . $controller . '/' . $name . '.php';
+        $path = '/Apps/Model/'.$loader.'/'.$controller.'/'.$name.'.php';
         File::write($path, $code);
-        $output->writeln('Model are successful created: ' . $path);
+        $output->writeln('Model are successful created: '.$path);
     }
 }

Apps/Console/MigrationCreateCommand.php

Spacing +2 added lines, -2 removed lines

@@ -56,9 +56,9 @@
         // work with migration template: read & parse & save
         $tpl = File::read('/Private/Carcase/Migration.tphp');
         $classContent = Str::replace(['%class%', '%table%'], [$name, $table], $tpl);
-        $fullPath = $dir . $name . '-' . $suffix . '.php';
+        $fullPath = $dir.$name.'-'.$suffix.'.php';
         File::write($fullPath, $classContent);
         // show success msg
-        $output->write('New migration is created: ' . $fullPath);
+        $output->write('New migration is created: '.$fullPath);
     }
 }

Apps/Console/MainPermCommand.php

Spacing +4 added lines, -4 removed lines

@@ -52,16 +52,16 @@
             preg_match_all('/public function action(\w*?)\(/', $byte, $matches); // matches[0] contains all methods ;)
             if (Any::isArray($matches[1]) && count($matches[1]) > 0) {
                 foreach ($matches[1] as $perm) {
-                    $fullPerm = 'Admin/' . $className . '/' . $perm;
+                    $fullPerm = 'Admin/'.$className.'/'.$perm;
                     $permissions[] = $fullPerm;
-                    $output->writeln("\tAdd permission: " . $fullPerm);
+                    $output->writeln("\tAdd permission: ".$fullPerm);
                 }
             }
         }
         // prepare save string
-        $stringSave = "<?php \n\nreturn " . Arr::exportVar($permissions) . ';';
+        $stringSave = "<?php \n\nreturn ".Arr::exportVar($permissions).';';
         File::write('/Private/Config/Permissions.php', $stringSave);
 
-        $output->writeln('Permissions configuration is successful updated! Founded permissions: ' . count($permissions));
+        $output->writeln('Permissions configuration is successful updated! Founded permissions: '.count($permissions));
     }
 }

Apps/Console/GeneratorActiveRecordCommand.php

Spacing +2 added lines, -2 removed lines

@@ -40,8 +40,8 @@
         $tpl = File::read('/Private/Carcase/ActiveRecord.tphp');
         $code = Str::replace('%name%', $name, $tpl);
 
-        $path = '/Apps/ActiveRecord/' . $name . '.php';
+        $path = '/Apps/ActiveRecord/'.$name.'.php';
         File::write($path, $code);
-        $output->writeln('ActiveRecord are successful created: ' . $path);
+        $output->writeln('ActiveRecord are successful created: '.$path);
     }
 }