phpffcms / ffcms

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

Spacing +27 added lines, -27 removed lines

@@ -27,49 +27,49 @@
 
 <?= $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' => 'selectize-select', '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' => 'selectize-select', '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()->boolean('mail.enable', ['options' => [0 => 'Disabled', 1 => 'Enabled'], 'optionsKey' => true], __('Is mailing features enabled?')) .
-            $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()->boolean('mail.enable', ['options' => [0 => 'Disabled', 1 => 'Enabled'], 'optionsKey' => true], __('Is mailing features enabled?')).
+            $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){

Apps/Model/Install/Main/FormInstall.php

Spacing +3 added lines, -3 removed lines

@@ -107,13 +107,13 @@
         $cfg['baseDomain'] = $this->baseDomain;
         $cfg['database'] = $this->db;
         $cfg['singleLanguage'] = $this->singleLanguage;
-        $cfg['multiLanguage'] = (bool)$this->multiLanguage;
-        $cfg['debug']['cookie']['key'] = 'fdebug_' . Crypt::randomString(mt_rand(4, 16));
+        $cfg['multiLanguage'] = (bool) $this->multiLanguage;
+        $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();

Apps/Model/Admin/Main/FormSettings.php

Indentation +2 added lines, -2 removed lines

@@ -46,8 +46,8 @@
     public $_name = 'formAdminConfig';
 
     /**
-    * Set property values from configurations
-    */
+     * Set property values from configurations
+     */
     public function before()
     {
         $properties = App::$Properties->getAll();

Private/Config/Object.php

Spacing +10 added lines, -10 removed lines

@@ -12,7 +12,7 @@ 
 date_default_timezone_set(App::$Properties->get('timezone'));
 
 return [
-    'Database' => function () {
+    'Database' => function() {
         $capsule = new Capsule;
         if (env_name !== 'Install') {
             try {
@@ -39,7 +39,7 @@ 
             try {
                 $capsule->connection()->getPdo();
             } catch (\Exception $e) {
-                $instUri = \App::$Alias->scriptUrl . '/install';
+                $instUri = \App::$Alias->scriptUrl.'/install';
                 \App::$Response->redirect($instUri, true);
             }
         }
@@ -51,10 +51,10 @@ 
         try {
             $pdo = \App::$Database->connection()->getPdo();
             $handler = new PdoSessionHandler($pdo, [
-                'db_table' => App::$Properties->get('database')['prefix'] . 'sessions'
+                'db_table' => App::$Properties->get('database')['prefix'].'sessions'
             ]);
         } catch (Exception $e) {
-            $handler = new NativeFileSessionHandler(root . '/Private/Sessions');
+            $handler = new NativeFileSessionHandler(root.'/Private/Sessions');
         }
 
         $storage = new NativeSessionStorage([
@@ -65,12 +65,12 @@ 
 
         return new Session($storage);
     },
-    'User' => function () {
+    'User' => function() {
         return new Apps\ActiveRecord\User();
     },
-    'Mailer' => function () {
+    'Mailer' => function() {
         $mCfg = App::$Properties->get('mail');
-        if (!(bool)$mCfg['enable']) {
+        if (!(bool) $mCfg['enable']) {
             return false;
         }
         // initialize swiftmailer transporter
@@ -89,12 +89,12 @@ 
         $swift = (new Swift_Mailer($transport));
         return \Ffcms\Core\Helper\Mailer::factory($swift, $mCfg['user']);
     },
-    'Captcha' => function () {
+    'Captcha' => function() {
         return new Extend\Core\Captcha\Gregwar();
     },
-    'Cache' => function () {
+    'Cache' => function() {
         // initialize symfony cache manager
-        $cache = new \Symfony\Component\Cache\Adapter\FilesystemAdapter('web', 3600, root . '/Private/Cache');
+        $cache = new \Symfony\Component\Cache\Adapter\FilesystemAdapter('web', 3600, root.'/Private/Cache');
         return $cache;
     },
     '_hybridauth' => function() {

Private/Config/Default.php

Indentation +45 added lines, -45 removed lines

@@ -1,47 +1,47 @@
 <?php return [
-	'baseProto' => 'http',
-	'baseDomain' => 'ffcms.test',
-	'basePath' => '/',
-	'timezone' => 'Europe/Moscow',
-	'adminEmail' => false,
-	'debug' => [
-		'all' => false,
-		'cookie' => [
-			'key' => 'fdebug_51cc',
-			'value' => '58928ebf3097fad30db28d34bfc52619efa0c5f191638563aca9f6dbcebec5b6936f89aeaea9ae7e0d6aa000455b114938b79c35d7'
-		]
-	],
-	'userCron' => false,
-	'testSuite' => false,
-	'theme' => [
-		'Front' => 'default',
-		'Admin' => 'default'
-	],
-	'database' => [
-		'driver' => 'mysql',
-		'host' => '127.0.0.1',
-		'username' => 'mysql',
-		'password' => 'mysql',
-		'database' => 'ffcms',
-		'prefix' => 'ffcms_',
-		'charset' => 'utf8',
-		'collation' => 'utf8_unicode_ci'
-	],
-	'mail' => [
-		'enable' => '0',
-		'host' => '',
-		'port' => '',
-		'user' => '',
-		'password' => '',
-		'encrypt' => ''
-	],
-	'baseLanguage' => 'en',
-	'multiLanguage' => true,
-	'singleLanguage' => 'en',
-	'languages' => [
-		'en',
-		'ru'
-	],
-	'languageDomainAlias' => false,
-	'trustedProxy' => false
+    'baseProto' => 'http',
+    'baseDomain' => 'ffcms.test',
+    'basePath' => '/',
+    'timezone' => 'Europe/Moscow',
+    'adminEmail' => false,
+    'debug' => [
+        'all' => false,
+        'cookie' => [
+            'key' => 'fdebug_51cc',
+            'value' => '58928ebf3097fad30db28d34bfc52619efa0c5f191638563aca9f6dbcebec5b6936f89aeaea9ae7e0d6aa000455b114938b79c35d7'
+        ]
+    ],
+    'userCron' => false,
+    'testSuite' => false,
+    'theme' => [
+        'Front' => 'default',
+        'Admin' => 'default'
+    ],
+    'database' => [
+        'driver' => 'mysql',
+        'host' => '127.0.0.1',
+        'username' => 'mysql',
+        'password' => 'mysql',
+        'database' => 'ffcms',
+        'prefix' => 'ffcms_',
+        'charset' => 'utf8',
+        'collation' => 'utf8_unicode_ci'
+    ],
+    'mail' => [
+        'enable' => '0',
+        'host' => '',
+        'port' => '',
+        'user' => '',
+        'password' => '',
+        'encrypt' => ''
+    ],
+    'baseLanguage' => 'en',
+    'multiLanguage' => true,
+    'singleLanguage' => 'en',
+    'languages' => [
+        'en',
+        'ru'
+    ],
+    'languageDomainAlias' => false,
+    'trustedProxy' => false
 ];
\ No newline at end of file