aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Web
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-04-11 13:04:17 -0700
committerredmatrix <git@macgirvin.com>2016-04-11 13:04:17 -0700
commit5ab1d509d28d4e3fe80fb1d18d1255e402b1120f (patch)
treedd1647188e0e28052bb80f22f6bba1e95fa9074d /Zotlabs/Web
parent1b83d88fe66b8d0185b748874e3f15b763778c99 (diff)
parent482962648fa2f3219e979586abcfbc5c90fcb97f (diff)
downloadvolse-hubzilla-5ab1d509d28d4e3fe80fb1d18d1255e402b1120f.tar.gz
volse-hubzilla-5ab1d509d28d4e3fe80fb1d18d1255e402b1120f.tar.bz2
volse-hubzilla-5ab1d509d28d4e3fe80fb1d18d1255e402b1120f.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs/Web')
-rw-r--r--Zotlabs/Web/Session.php20
1 files changed, 10 insertions, 10 deletions
diff --git a/Zotlabs/Web/Session.php b/Zotlabs/Web/Session.php
index e5fe47386..68af74521 100644
--- a/Zotlabs/Web/Session.php
+++ b/Zotlabs/Web/Session.php
@@ -37,16 +37,16 @@ class Session {
// Force cookies to be secure (https only) if this site is SSL enabled.
// Must be done before session_start().
- if(intval(\App::$config['system']['ssl_cookie_protection'])) {
- $arr = session_get_cookie_params();
- session_set_cookie_params(
- ((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
- ((isset($arr['path'])) ? $arr['path'] : '/'),
- ((isset($arr['domain'])) ? $arr['domain'] : App::get_hostname()),
- ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
- ((isset($arr['httponly'])) ? $arr['httponly'] : true)
+ if(intval(\App::$config['system']['ssl_cookie_protection'])) {
+ $arr = session_get_cookie_params();
+ session_set_cookie_params(
+ ((isset($arr['lifetime'])) ? $arr['lifetime'] : 0),
+ ((isset($arr['path'])) ? $arr['path'] : '/'),
+ ((isset($arr['domain'])) ? $arr['domain'] : App::get_hostname()),
+ ((isset($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) == 'on') ? true : false),
+ ((isset($arr['httponly'])) ? $arr['httponly'] : true)
);
- }
+ }
}
function start() {
@@ -150,4 +150,4 @@ class Session {
return true;
}
-} \ No newline at end of file
+}