Selaa lähdekoodia

Change o_redirect_delay

Visman 3 vuotta sitten
vanhempi
commit
55620c81c2

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

@@ -1206,7 +1206,7 @@ class Install extends Admin
             'o_default_timezone'      => 0,
             'i_timeout_visit'         => 3600,
             'i_timeout_online'        => 900,
-            'o_redirect_delay'        => 1,
+            'i_redirect_delay'        => 1,
             'o_show_user_info'        => 1,
             'o_show_post_count'       => 1,
             'o_smilies'               => 1,

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

@@ -45,7 +45,7 @@ class Options extends Admin
                     'o_default_style'         => 'required|string:trim|in:' . \implode(',', $this->c->Func->getStyles()),
                     'i_timeout_visit'         => 'required|integer|min:0|max:99999',
                     'i_timeout_online'        => 'required|integer|min:0|max:99999|check_timeout',
-                    'o_redirect_delay'        => 'required|integer|min:0|max:99999',
+                    'i_redirect_delay'        => 'required|integer|min:0|max:99999',
                     'o_show_user_info'        => 'required|integer|in:0,1',
                     'o_show_post_count'       => 'required|integer|in:0,1',
                     'i_topic_review'          => 'required|integer|min:0|max:50',
@@ -312,11 +312,11 @@ class Options extends Admin
                     'caption' => 'Online timeout label',
                     'help'    => 'Online timeout help',
                 ],
-                'o_redirect_delay' => [
+                'i_redirect_delay' => [
                     'type'    => 'number',
                     'min'     => '0',
                     'max'     => '99999',
-                    'value'   => $config->o_redirect_delay,
+                    'value'   => $config->i_redirect_delay,
                     'caption' => 'Redirect time label',
                     'help'    => 'Redirect time help',
                 ],

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

@@ -500,9 +500,11 @@ class Update extends Admin
     {
         $this->c->config->i_timeout_visit = $this->c->config->o_timeout_visit ?? 3600;
         $this->c->config->i_timeout_online = $this->c->config->o_timeout_online ?? 900;
+        $this->c->config->i_redirect_delay = $this->c->config->o_redirect_delay ?? 1;
 
         unset($this->c->config->o_timeout_visit);
         unset($this->c->config->o_timeout_online);
+        unset($this->c->config->o_redirect_delay);
 
         $this->c->config->save();
 

+ 3 - 3
app/Models/Pages/Redirect.php

@@ -49,14 +49,14 @@ class Redirect extends Page
     public function message(/* string|array */ $message): Page
     {
         // переадресация без вывода сообщения
-        if ('0' == $this->c->config->o_redirect_delay) {
+        if (0 == $this->c->config->i_redirect_delay) {
             return $this;
         }
 
         $this->nameTpl = 'layouts/redirect';
         $this->robots  = 'noindex';
         $this->message = $message;
-        $this->timeout = (int) $this->c->config->o_redirect_delay;  //???? перенести в заголовки?
+        $this->timeout = $this->c->config->i_redirect_delay;  //???? перенести в заголовки?
 
         return $this;
     }
@@ -68,7 +68,7 @@ class Redirect extends Page
     protected function getHttpHeaders(): array
     {
         if (
-            '0' == $this->c->config->o_redirect_delay
+            0 == $this->c->config->i_redirect_delay
             || null === $this->nameTpl
         ) {
             $this->httpStatus = 302;

+ 1 - 1
app/config/install.php

@@ -43,7 +43,7 @@ return [
     'forConfig' => [
         'o_default_lang'   => 'en',
         'o_default_style'  => 'ForkBB',
-        'o_redirect_delay' => 0,
+        'i_redirect_delay' => 0,
         'o_maintenance'    => 0,
         'o_smtp_host'      => '',
         'o_smtp_user'      => '',