فهرست منبع

Change o_default_dst

Visman 3 سال پیش
والد
کامیت
32349ef56f

+ 1 - 1
app/Models/Pages/Admin/Install.php

@@ -1251,7 +1251,7 @@ class Install extends Admin
             'o_rules_message'         => __('Rules '),
             'b_maintenance'           => 0,
             'o_maintenance_message'   => __('Maintenance message '),
-            'o_default_dst'           => 0,
+            'b_default_dst'           => 0,
             'i_feed_type'             => 2,
             'i_feed_ttl'              => 0,
             'p_message_bbcode'        => 1,

+ 3 - 3
app/Models/Pages/Admin/Options.php

@@ -40,7 +40,7 @@ class Options extends Admin
                     'o_board_title'           => 'required|string:trim|max:255',
                     'o_board_desc'            => 'string:trim|max:65000 bytes|html',
                     'o_default_timezone'      => 'required|string:trim|in:-12,-11,-10,-9.5,-9,-8.5,-8,-7,-6,-5,-4,-3.5,-3,-2,-1,0,1,2,3,3.5,4,4.5,5,5.5,5.75,6,6.5,7,8,8.75,9,9.5,10,10.5,11,11.5,12,12.75,13,14',
-                    'o_default_dst'           => 'required|integer|in:0,1',
+                    'b_default_dst'           => 'required|integer|in:0,1',
                     'o_default_lang'          => 'required|string:trim|in:' . \implode(',', $this->c->Func->getLangs()),
                     'o_default_style'         => 'required|string:trim|in:' . \implode(',', $this->c->Func->getStyles()),
                     'i_timeout_visit'         => 'required|integer|min:0|max:99999',
@@ -265,9 +265,9 @@ class Options extends Admin
                     'caption' => 'Timezone label',
                     'help'    => 'Timezone help',
                 ],
-                'o_default_dst' => [
+                'b_default_dst' => [
                     'type'    => 'radio',
-                    'value'   => $config->o_default_dst,
+                    'value'   => $config->b_default_dst,
                     'values'  => $yn,
                     'caption' => 'DST label',
                     'help'    => 'DST help',

+ 2 - 0
app/Models/Pages/Admin/Update.php

@@ -522,7 +522,9 @@ class Update extends Admin
         $config->b_announcement        = '1' == $config->o_announcement ? 1 : 0;
         $config->b_rules               = '1' == $config->o_rules ? 1 : 0;
         $config->b_maintenance         = '1' == $config->o_maintenance ? 1 : 0;
+        $config->b_default_dst         = '1' == $config->o_default_dst ? 1 : 0;
 
+        unset($config->o_default_dst);
         unset($config->o_maintenance);
         unset($config->o_rules);
         unset($config->o_announcement);

+ 1 - 1
app/Models/Pages/Admin/Users/NewUser.php

@@ -56,7 +56,7 @@ class NewUser extends Users
                     $user->u_mark_all_read = \time();
                     $user->email_setting   = $this->c->config->i_default_email_setting;
                     $user->timezone        = $this->c->config->o_default_timezone;
-                    $user->dst             = $this->c->config->o_default_dst;
+                    $user->dst             = $this->c->config->b_default_dst;
                     $user->language        = $this->c->config->o_default_lang;
                     $user->style           = $this->c->config->o_default_style;
                     $user->registered      = \time();

+ 1 - 1
app/Models/Pages/Register.php

@@ -168,7 +168,7 @@ class Register extends Page
         $user->u_mark_all_read = \time();
         $user->email_setting   = $this->c->config->i_default_email_setting;
         $user->timezone        = $this->c->config->o_default_timezone;
-        $user->dst             = $this->c->config->o_default_dst;
+        $user->dst             = $this->c->config->b_default_dst;
         $user->language        = $this->user->language;
         $user->style           = $this->user->style;
         $user->registered      = \time();

+ 1 - 1
app/Models/User/Current.php

@@ -46,7 +46,7 @@ class Current extends Action
         if ($user->isGuest) {
             $user->__isBot    = $this->isBot($user->userAgent);
             $user->__timezone = $this->c->config->o_default_timezone;
-            $user->__dst      = $this->c->config->o_default_dst;
+            $user->__dst      = $this->c->config->b_default_dst;
             $user->__language = $this->getLangFromHTTP();
         } else {
             $user->__isBot = false;