v0.1.0.1-alpha. Fix install & timezone

Flute-CMS · Mar 30, 2024 · 5b4ab2c · 5b4ab2c
1 parent 616c5a4
commit 5b4ab2c
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 9 deletions.
diff --git a/app/Core/App.php b/app/Core/App.php
@@ -47,7 +47,7 @@ final class App
      * 
      * @var string
      */
-    public const VERSION = '0.1.0-alpha';
+    public const VERSION = '0.1.0.1-alpha';
 
     /**
      * Set the base path of the application

diff --git a/app/Core/Http/Views/Installer/steps/2.blade.php b/app/Core/Http/Views/Installer/steps/2.blade.php
@@ -62,7 +62,7 @@ class="col-md-12 ext @if ($reqs['php_version']['current'] < 8) {{ $reqs['php_ver
                                 @endif
                             </div>
                             <div class="ext_name">
-                                <span class="status-label">{{ $reqs['opcache_enabled']['required'] ? __('install.2.all_good') : __('install.2.may_installed') }}</span>
+                                <span class="status-label">{{ $reqs['opcache_enabled']['required'] ? __('install.2.all_good') : __('install.2.may_unstable') }}</span>
                                 <p>OPCache: {{ $reqs['opcache_enabled']['current'] ? __('install.on') : __('install.off') }}</p>
                             </div>
                         </div>

diff --git a/app/Core/Installer/Steps/DatabaseStep.php b/app/Core/Installer/Steps/DatabaseStep.php
@@ -76,7 +76,7 @@ protected function checkConnection(APIInstallerController $installController, ar
             } catch (DatabaseException $e) {
                 // Возвращаем сообщение об ошибке, если подключение не удалось
                 return $installController->error($installController->trans('db_error', [
-                    "%error%" => mb_convert_encoding($e->getTraceAsString(), 'UTF-8'),
+                    "%error%" => mb_convert_encoding($e->getMessage(), 'UTF-8'),
                 ]));
             }
         } else {

diff --git a/app/Core/Installer/Steps/LangStep.php b/app/Core/Installer/Steps/LangStep.php
@@ -17,7 +17,7 @@ class LangStep extends AbstractStep
     public function install(\Flute\Core\Support\FluteRequest $request, APIInstallerController $installController) : Response
     {
         $lang = (string) $request->input('lang');
-        $timezone = (string) $request->input('timezone');
+        $timezone = (string) $this->checkTimezone($request->input('timezone'));
 
         if (!in_array($lang, config('lang.available'))) {
             return $installController->error($installController->trans('Несуществующий язык'));
@@ -31,4 +31,14 @@ public function install(\Flute\Core\Support\FluteRequest $request, APIInstallerC
 
         return $installController->success();
     }
+
+    protected function checkTimezone( string $timezone ) : string
+    {
+        switch ($timezone) {
+            case 'Europe/Kyiv':
+                return 'Europe/Kiev';
+            default:
+                return $timezone;
+        }
+    }
 }
diff --git a/app/Core/ServiceProviders/ConfigurationServiceProvider.php b/app/Core/ServiceProviders/ConfigurationServiceProvider.php
@@ -26,6 +26,8 @@ public function boot(\DI\Container $container) : void
 
         app()->debug($configs['app']['debug']);
         app()->setLang($configs['lang']['locale']);
+
+        date_default_timezone_set($configs['app']['timezone']);
     }
 
     private function registerConfigServices(array $configs, \DI\Container $container, string $prefix = ''): void

diff --git a/app/Core/Services/UserService.php b/app/Core/Services/UserService.php
@@ -128,7 +128,7 @@ protected function sessionExpired()
      *
      * @return User
      */
-    public function getCurrentUser(): User
+    public function getCurrentUser(): ?User
     {
         if (!$this->currentUser) {
             $this->authSession();

diff --git a/config/app.php b/config/app.php
@@ -11,7 +11,7 @@
   'logo' => 'assets/img/logo.svg',
   'key' => '',
   'tips' => true,
-  'timezone' => 'Asia/Yekaterinburg',
+  'timezone' => '',
   'notifications' => 'all',
   'mode' => 'default',
   'share' => false,

diff --git a/config/tips_complete.php b/config/tips_complete.php
@@ -4,16 +4,16 @@
   'editor' => 
   array (
     'permission' => 'admin.pages',
-    'completed' => true,
+    'completed' => false,
   ),
   'admin_stats' => 
   array (
     'permission' => 'admin.stats',
-    'completed' => true,
+    'completed' => false,
   ),
   'admin_settings' => 
   array (
     'permission' => 'admin.system',
-    'completed' => true,
+    'completed' => false,
   ),
 );