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

@@ -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.

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

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

@@ -25,7 +25,7 @@
 block discarded – undo
         var script_lang = '<?= \App::$Request->getLanguage() ?>';
         var site_url = '<?= \App::$Alias->baseUrl ?>';
     </script>
-    <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
+    <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
 </head>
 
 <body>

Please login to merge, or discard this patch.

Apps/Console/MainInstallCommand.php 1 patch

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

@@ -124,7 +124,7 @@  discard block
 block discarded – undo
         $allCfg['adminEmail'] = $email;
         $allCfg['baseDomain'] = $domain;
         $output->writeln('Generate security cookies for debug panel');
-        $allCfg['debug']['cookie']['key'] = 'fdebug_' . Crypt::randomString(mt_rand(8, 32));
+        $allCfg['debug']['cookie']['key'] = 'fdebug_'.Crypt::randomString(mt_rand(8, 32));
         $allCfg['debug']['cookie']['value'] = Crypt::randomString(mt_rand(32, 128));
         // write config data
         $writeCfg = Console::$Properties->writeConfig('default', $allCfg);
@@ -133,7 +133,7 @@  discard block
 block discarded – undo
             return;
         }
         File::write('/Private/Install/install.lock', 'Install is locked');
-        $output->writeln('Congratulations! FFCMS are successful installed. Used version: ' . Version::VERSION . ' since ' . Version::DATE);
+        $output->writeln('Congratulations! FFCMS are successful installed. Used version: '.Version::VERSION.' since '.Version::DATE);
         $output->writeln('');
         $output->writeln('> Please, use "php console.php main:adduser" to add admin account(set role=4) or you are unavailable to manage cms.');
     }

Please login to merge, or discard this patch.

Apps/Model/Install/Main/FormInstall.php 1 patch

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

@@ -105,14 +105,14 @@
 block discarded – undo
         $cfg['baseDomain'] = $this->baseDomain;
         $cfg['database'] = $this->db;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Crypt::randomString(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $cfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
+        $cfg['debug']['cookie']['key'] = 'fdebug_'.Crypt::randomString(mt_rand(4, 16));
         $cfg['debug']['cookie']['value'] = Crypt::randomString(mt_rand(32, 128));
         $cfg['mail'] = $this->mail;
 
         // initialize migrations table
-        App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function ($table) {
+        App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function($table) {
             $table->increments('id');
             $table->string('migration', 128)->unique();
             $table->timestamps();

Please login to merge, or discard this patch.

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

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

@@ -7,7 +7,7 @@
 block discarded – undo
 <?php
 $menu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs nav-fill'])
     ->menu(['text' => __('User list'), 'link' => ['user/index']]);
-if ((int)$configs['registrationType'] === 0) {
+if ((int) $configs['registrationType'] === 0) {
     $menu->menu(['text' => __('Invitation list'), 'link' => ['user/invitelist']]);
 }
 $menu->menu(['text' => __('Role management'), 'link' => ['user/rolelist']])

Please login to merge, or discard this patch.

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

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

@@ -23,54 +23,54 @@
 block discarded – undo
 
 <?= $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')) .
+        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')) .
+        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')) .
+        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')) .
+        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']) .
+        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')) .
+        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')) .
+        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(); ?>

Please login to merge, or discard this patch.

Apps/View/Admin/default/profile/settings.php 1 patch

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

@@ -27,7 +27,7 @@
 block discarded – undo
 
 <?= $form->fieldset()->text('usersOnPage', null, __('How many users will be displayed per one list page?')) ?>
 <?= $form->fieldset()->boolean('guestView', null, __('Allow guests view user profiles?')) ?>
-<?= $form->fieldset()->text('wallPostOnPage', null,  __('How many wall posts must be displayed in one page of profile?')) ?>
+<?= $form->fieldset()->text('wallPostOnPage', null, __('How many wall posts must be displayed in one page of profile?')) ?>
 <?= $form->fieldset()->text('wallPostOnFeed', null, __('How many wall posts must be displayed on one page of feed list?')) ?>
 <?= $form->fieldset()->text('delayBetweenPost', null, __('Delay between 2 posts on wall from one user in seconds')) ?>
 <?= $form->fieldset()->boolean('rating', null, __('Enable user rating system?')) ?>

Please login to merge, or discard this patch.

Apps/View/Admin/default/profile/field_delete.php 1 patch

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

@@ -32,7 +32,7 @@
 block discarded – undo
             ['text' => $model->type]
         ])->row([
             ['text' => $model->getLabel('reg_exp')],
-            ['text' => ($model->reg_cond == 0 ? '!' : null) . 'preg_match("'.$model->reg_exp.'", $input)']
+            ['text' => ($model->reg_cond == 0 ? '!' : null).'preg_match("'.$model->reg_exp.'", $input)']
         ])->display();
     ?>
 </div>

Please login to merge, or discard this patch.

Apps/View/Admin/default/profile/field_update.php 1 patch

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

@@ -35,7 +35,7 @@
 block discarded – undo
     $menu->menu([
         'text' => Str::upperCase($lang),
         'tab' => function() use ($form, $lang) {
-            return $form->fieldset()->text('name.' . $lang, null, __('Define field name, which be displayed for user for current language locale'));
+            return $form->fieldset()->text('name.'.$lang, null, __('Define field name, which be displayed for user for current language locale'));
         },
         'tabActive' => $lang === \App::$Request->getLanguage(),
     ]);

Please login to merge, or discard this patch.

		@@ -105,14 +105,14 @@
		block discarded – undo
105	105	$cfg['baseDomain'] = $this->baseDomain;
106	106	$cfg['database'] = $this->db;
107	107	$cfg['singleLanguage'] = $this->singleLanguage;
108		- $cfg['multiLanguage'] = (bool)$this->multiLanguage;
109		- $cfg['passwordSalt'] = '$2a$07$' . Str::randomLatinNumeric(mt_rand(21, 30)) . '$';
110		- $cfg['debug']['cookie']['key'] = 'fdebug_' . Crypt::randomString(mt_rand(4, 16));
	108	+ $cfg['multiLanguage'] = (bool) $this->multiLanguage;
	109	+ $cfg['passwordSalt'] = '$2a$07$'.Str::randomLatinNumeric(mt_rand(21, 30)).'$';
	110	+ $cfg['debug']['cookie']['key'] = 'fdebug_'.Crypt::randomString(mt_rand(4, 16));
111	111	$cfg['debug']['cookie']['value'] = Crypt::randomString(mt_rand(32, 128));
112	112	$cfg['mail'] = $this->mail;
113	113
114	114	// initialize migrations table
115		- App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function ($table) {
	115	+ App::$Database->getConnection('install')->getSchemaBuilder()->create('migrations', function($table) {
116	116	$table->increments('id');
117	117	$table->string('migration', 128)->unique();
118	118	$table->timestamps();

		@@ -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>

		@@ -25,7 +25,7 @@
		block discarded – undo
25	25	var script_lang = '<?= \App::$Request->getLanguage() ?>';
26	26	var site_url = '<?= \App::$Alias->baseUrl ?>';
27	27	</script>
28		- <?php if (!isset($fullgrid)){ $fullgrid = false; } ?>
	28	+ <?php if (!isset($fullgrid)) { $fullgrid = false; } ?>
29	29	</head>
30	30
31	31	<body>

		@@ -124,7 +124,7 @@ discard block
		block discarded – undo
124	124	$allCfg['adminEmail'] = $email;
125	125	$allCfg['baseDomain'] = $domain;
126	126	$output->writeln('Generate security cookies for debug panel');
127		- $allCfg['debug']['cookie']['key'] = 'fdebug_' . Crypt::randomString(mt_rand(8, 32));
	127	+ $allCfg['debug']['cookie']['key'] = 'fdebug_'.Crypt::randomString(mt_rand(8, 32));
128	128	$allCfg['debug']['cookie']['value'] = Crypt::randomString(mt_rand(32, 128));
129	129	// write config data
130	130	$writeCfg = Console::$Properties->writeConfig('default', $allCfg);
		@@ -133,7 +133,7 @@ discard block
		block discarded – undo
133	133	return;
134	134	}
135	135	File::write('/Private/Install/install.lock', 'Install is locked');
136		- $output->writeln('Congratulations! FFCMS are successful installed. Used version: ' . Version::VERSION . ' since ' . Version::DATE);
	136	+ $output->writeln('Congratulations! FFCMS are successful installed. Used version: '.Version::VERSION.' since '.Version::DATE);
137	137	$output->writeln('');
138	138	$output->writeln('> Please, use "php console.php main:adduser" to add admin account(set role=4) or you are unavailable to manage cms.');
139	139	}

		@@ -7,7 +7,7 @@
		block discarded – undo
7	7	<?php
8	8	$menu = $this->bootstrap()->nav('ul', ['class' => 'nav-tabs nav-fill'])
9	9	->menu(['text' => __('User list'), 'link' => ['user/index']]);
10		-if ((int)$configs['registrationType'] === 0) {
	10	+if ((int) $configs['registrationType'] === 0) {
11	11	$menu->menu(['text' => __('Invitation list'), 'link' => ['user/invitelist']]);
12	12	}
13	13	$menu->menu(['text' => __('Role management'), 'link' => ['user/rolelist']])

		@@ -23,54 +23,54 @@
		block discarded – undo
23	23
24	24	<?= $this->bootstrap()->nav('ul', ['class' => 'nav-tabs'])
25	25	->menu(['text' => __('Base'), 'tab' => function() use ($form) {
26		- 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')) .
27		- $form->fieldset()->radio('baseProto', ['options' => ['http', 'https']], __('Main website transfer protocol. Use only if request data is not available in console or cron tasks')) .
28		- $form->fieldset()->text('basePath', ['class' => 'form-control'], __('FFCMS installation sub-directory, used if installed not in root. Example: /subdir/')) .
29		- $form->fieldset()->select('timezone', ['class' => 'form-control', 'options' => DateTimeZone::listIdentifiers()], __('Define website default timezone id')) .
30		- $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')) .
31		- $form->fieldset()->boolean('debug.all', null, __('Enable debug bar panel for all visitors? Recommended only on development environment')) .
	26	+ 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')).
	27	+ $form->fieldset()->radio('baseProto', ['options' => ['http', 'https']], __('Main website transfer protocol. Use only if request data is not available in console or cron tasks')).
	28	+ $form->fieldset()->text('basePath', ['class' => 'form-control'], __('FFCMS installation sub-directory, used if installed not in root. Example: /subdir/')).
	29	+ $form->fieldset()->select('timezone', ['class' => 'form-control', 'options' => DateTimeZone::listIdentifiers()], __('Define website default timezone id')).
	30	+ $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')).
	31	+ $form->fieldset()->boolean('debug.all', null, __('Enable debug bar panel for all visitors? Recommended only on development environment')).
32	32	$form->fieldset()->boolean('testSuite', null, __('Enable codeception test suite adapter? Use this option ONLY to run codeception tests! Disable this option on production'));
33	33	}, 'tabActive' => true])
34	34	->menu(['text' => __('Themes'), 'tab' => function() use ($form, $model) {
35		- return $form->fieldset()->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')) .
	35	+ return $form->fieldset()->select('theme.Front', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Front')], __('Set theme for user part of website')).
36	36	$form->fieldset()->select('theme.Admin', ['class' => 'form-control', 'options' => $model->getAvailableThemes('Admin')], __('Set theme for admin panel'));
37	37	}])
38	38	->menu(['text' => __('Mail'), 'tab' => function() use ($form) {
39		- return '<p>' . __('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server') . '</p>' .
40		- $form->fieldset()->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')) .
41		- $form->fieldset()->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')) .
42		- $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')) .
43		- $form->fieldset()->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')) .
	39	+ return '<p>'.__('Configure sendmail over smtp server. You should set host:port and auth data for your smtp server').'</p>'.
	40	+ $form->fieldset()->text('mail.host', ['class' => 'form-control'], __('Set SMTP hostname or ip')).
	41	+ $form->fieldset()->text('mail.port', ['class' => 'form-control'], __('Set SMTP connection port')).
	42	+ $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')).
	43	+ $form->fieldset()->text('mail.user', ['class' => 'form-control'], __('Set auth user name if required')).
44	44	$form->fieldset()->text('mail.password', ['class' => 'form-control'], __('Set auth user password if exist'));
45	45	}])
46	46	->menu(['text' => __('Localization'), 'tab' => function() use ($form) {
47		- return $form->fieldset()->select('singleLanguage', ['class' => 'form-control', 'options' => \App::$Translate->getAvailableLangs()], __('Default language of website')) .
48		- $form->fieldset()->boolean('multiLanguage', null, __('Must we use multi language system in site pathway')) .
49		- $form->fieldset()->text('baseLanguage', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')) .
	47	+ return $form->fieldset()->select('singleLanguage', ['class' => 'form-control', 'options' => \App::$Translate->getAvailableLangs()], __('Default language of website')).
	48	+ $form->fieldset()->boolean('multiLanguage', null, __('Must we use multi language system in site pathway')).
	49	+ $form->fieldset()->text('baseLanguage', ['class' => 'form-control', 'disabled' => null], __('Website base script language. Do not change it')).
50	50	$form->fieldset()->checkboxes('languages', ['options' => App::$Translate->getAvailableLangs()], __('Website available languages'));
51	51
52	52	}])
53	53	->menu(['text' => __('Database'), 'tab' => function() use ($form) {
54		- return '<p>' . __('Do not change any information in this tab if you not sure what you do!') . '</p>' .
55		- $form->fieldset()->select('database.driver', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')) .
56		- $form->fieldset()->text('database.host', ['class' => 'form-control'], __('Database connection host name')) .
57		- $form->fieldset()->text('database.database', ['class' => 'form-control'], __('Database name or path to sqlite created file database')) .
58		- $form->fieldset()->text('database.username', ['class' => 'form-control'], __('User name for database connection')) .
59		- $form->fieldset()->text('database.password', ['class' => 'form-control'], __('Password for user of database connection')) .
60		- $form->fieldset()->text('database.charset', ['class' => 'form-control']) .
61		- $form->fieldset()->text('database.collation', ['class' => 'form-control']) .
	54	+ return '<p>'.__('Do not change any information in this tab if you not sure what you do!').'</p>'.
	55	+ $form->fieldset()->select('database.driver', ['class' => 'form-control', 'options' => ['mysql', 'sqlite', 'pgsql']], __('Database connection driver')).
	56	+ $form->fieldset()->text('database.host', ['class' => 'form-control'], __('Database connection host name')).
	57	+ $form->fieldset()->text('database.database', ['class' => 'form-control'], __('Database name or path to sqlite created file database')).
	58	+ $form->fieldset()->text('database.username', ['class' => 'form-control'], __('User name for database connection')).
	59	+ $form->fieldset()->text('database.password', ['class' => 'form-control'], __('Password for user of database connection')).
	60	+ $form->fieldset()->text('database.charset', ['class' => 'form-control']).
	61	+ $form->fieldset()->text('database.collation', ['class' => 'form-control']).
62	62	$form->fieldset()->text('database.prefix', ['class' => 'form-control'], __('Database tables prefix'));
63	63	}])
64	64	->menu(['text' => __('Debug'), 'tab' => function() use ($form){
65		- return '<p>' . __('The key-value of cookie to enable debugging on website') . '. ' . __('If user got this cookie he can see debug bar') . '. ' .
66		- Url::a(['main/debugcookie'], __('Set cookie for me')) . '</p>' .
67		- $form->fieldset()->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')) .
	65	+ return '<p>'.__('The key-value of cookie to enable debugging on website').'. '.__('If user got this cookie he can see debug bar').'. '.
	66	+ Url::a(['main/debugcookie'], __('Set cookie for me')).'</p>'.
	67	+ $form->fieldset()->text('debug.cookie.key', ['class' => 'form-control'], __('Set cookie name(key) for enable debug bar panel')).
68	68	$form->fieldset()->text('debug.cookie.value', ['class' => 'form-control'], __('Set cookie value for enable debug bar panel'));
69	69	}])
70	70	->menu(['text' => __('Other'), 'tab' => function() use ($form){
71		- return '<p>' . __('There you can change specified configs depends of other platforms. GA = google analytics.') . '</p>' .
72		- $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')) .
73		- $form->fieldset()->text('gaTrackId', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')) .
	71	+ return '<p>'.__('There you can change specified configs depends of other platforms. GA = google analytics.').'</p>'.
	72	+ $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')).
	73	+ $form->fieldset()->text('gaTrackId', ['class' => 'form-control'], __('Set google analytics tracking id for your website. Track id looks like: UA-XXXXXX-Y')).
74	74	$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'));
75	75	}])
76	76	->display(); ?>

		@@ -27,7 +27,7 @@
		block discarded – undo
27	27
28	28	<?= $form->fieldset()->text('usersOnPage', null, __('How many users will be displayed per one list page?')) ?>
29	29	<?= $form->fieldset()->boolean('guestView', null, __('Allow guests view user profiles?')) ?>
30		-<?= $form->fieldset()->text('wallPostOnPage', null, __('How many wall posts must be displayed in one page of profile?')) ?>
	30	+<?= $form->fieldset()->text('wallPostOnPage', null, __('How many wall posts must be displayed in one page of profile?')) ?>
31	31	<?= $form->fieldset()->text('wallPostOnFeed', null, __('How many wall posts must be displayed on one page of feed list?')) ?>
32	32	<?= $form->fieldset()->text('delayBetweenPost', null, __('Delay between 2 posts on wall from one user in seconds')) ?>
33	33	<?= $form->fieldset()->boolean('rating', null, __('Enable user rating system?')) ?>

		@@ -32,7 +32,7 @@
		block discarded – undo
32	32	['text' => $model->type]
33	33	])->row([
34	34	['text' => $model->getLabel('reg_exp')],
35		- ['text' => ($model->reg_cond == 0 ? '!' : null) . 'preg_match("'.$model->reg_exp.'", $input)']
	35	+ ['text' => ($model->reg_cond == 0 ? '!' : null).'preg_match("'.$model->reg_exp.'", $input)']
36	36	])->display();
37	37	?>
38	38	</div>

		@@ -35,7 +35,7 @@
		block discarded – undo
35	35	$menu->menu([
36	36	'text' => Str::upperCase($lang),
37	37	'tab' => function() use ($form, $lang) {
38		- return $form->fieldset()->text('name.' . $lang, null, __('Define field name, which be displayed for user for current language locale'));
	38	+ return $form->fieldset()->text('name.'.$lang, null, __('Define field name, which be displayed for user for current language locale'));
39	39	},
40	40	'tabActive' => $lang === \App::$Request->getLanguage(),
41	41	]);

phpffcms / ffcms

Push — master ( ef8807...c1ca83 )

Status

Category

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 +2 added lines, -2 removed lines patch added patch discarded remove patch

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

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

Spacing +29 added lines, -29 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