AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Windows path bugs

Browse Source
This commit is contained in:
Frédéric Guillot
2015-04-22 21:08:03 -04:00
parent b5163c483c
commit 81841c73c2
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Core/Helper.php
View File

@@ -513,10 +513,12 @@ class Helper
*/ */
public function getCurrentBaseUrl() public function getCurrentBaseUrl()
{ {
$self = str_replace('\\', '/', dirname($_SERVER['PHP_SELF']));
$url = Request::isHTTPS() ? 'https://' : 'http://'; $url = Request::isHTTPS() ? 'https://' : 'http://';
$url .= $_SERVER['SERVER_NAME']; $url .= $_SERVER['SERVER_NAME'];
$url .= $_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443 ? '' : ':'.$_SERVER['SERVER_PORT']; $url .= $_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443 ? '' : ':'.$_SERVER['SERVER_PORT'];
$url .= dirname($_SERVER['PHP_SELF']) !== '/' ? dirname($_SERVER['PHP_SELF']).'/' : '/'; $url .= $self !== '/' ? $self.'/' : '/';
return $url; return $url;
} }

2
app/Core/Session.php
View File

@@ -41,6 +41,8 @@ class Session implements ArrayAccess
*/ */
public function open($base_path = '/') public function open($base_path = '/')
{ {
$base_path = str_replace('\\', '/', $base_path);
// HttpOnly and secure flags for session cookie // HttpOnly and secure flags for session cookie
session_set_cookie_params( session_set_cookie_params(
self::SESSION_LIFETIME, self::SESSION_LIFETIME,