Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change for set cookie secure.

Browse Source
This commit is contained in:
wangyidong
2021-04-07 17:44:25 +08:00
parent c5cb1aa479
commit 0dc863da3a
22 changed files with 113 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files
framework/base/helper.class.php
+14
View File
@@ -868,3 +868,17 @@ function zget($var, $key, $valueWhenNone = false, $valueWhenExists = false)
if($valueWhenNone !== false) return $valueWhenNone;
return $key;
}
/**
* Is https.
*
* @access public
* @return bool
*/
function isHttps()
{
if(!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off') return true;
if(isset($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https') return true;
if(!empty($_SERVER['HTTP_FRONT_END_HTTPS']) && strtolower($_SERVER['HTTP_FRONT_END_HTTPS']) !== 'off') return true;
return false;
}
framework/base/router.class.php
+17 -4
View File
@@ -376,6 +376,7 @@ class baseRouter
$this->loadClass('dao', $static = true);
$this->loadClass('mobile', $static = true);
$this->setCookieSecure();
$this->setSuperVars();
$this->setDebug();
$this->setErrorHandler();
@@ -617,6 +618,18 @@ class baseRouter
$_COOKIE = validater::filterSuper($_COOKIE);
}
/**
* Set cookieSecure config.
*
* @access public
* @return void
*/
public function setCookieSecure()
{
$this->config->cookieSecure = false;
if($this->config->framework->setCookieSecure and isHttps()) $this->config->cookieSecure = true;
}
/**
* 设置Debug模式。
* set Debug.
@@ -839,7 +852,7 @@ class baseRouter
{
$sessionName = $this->config->sessionVar;
session_name($sessionName);
session_set_cookie_params(0, $this->config->webRoot);
session_set_cookie_params(0, $this->config->webRoot, '', $this->config->cookieSecure, true);
if($this->config->customSession) session_save_path($this->getTmpRoot() . 'session');
session_start();
@@ -916,7 +929,7 @@ class baseRouter
$this->clientLang = $this->config->default->lang;
}
setcookie('lang', $this->clientLang, $this->config->cookieLife, $this->config->webRoot, '', false, false);
setcookie('lang', $this->clientLang, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
if(!isset($_COOKIE['lang'])) $_COOKIE['lang'] = $this->clientLang;
return true;
@@ -970,7 +983,7 @@ class baseRouter
$this->clientTheme = $this->config->default->theme;
}
setcookie('theme', $this->clientTheme, $this->config->cookieLife, $this->config->webRoot, '', false, false);
setcookie('theme', $this->clientTheme, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, false);
if(!isset($_COOKIE['theme'])) $_COOKIE['theme'] = $this->clientTheme;
return true;
@@ -996,7 +1009,7 @@ class baseRouter
$this->clientDevice = ($mobile->isMobile() and !$mobile->isTablet()) ? 'mobile' : 'desktop';
}
setcookie('device', $this->clientDevice, $this->config->cookieLife, $this->config->webRoot, '', false, true);
setcookie('device', $this->clientDevice, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
if(!isset($_COOKIE['device'])) $_COOKIE['device'] = $this->clientDevice;
return $this->clientDevice;