franzz/databap
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix https login

Browse Source
This commit is contained in:
Franzz
2016-03-19 13:09:26 +01:00
parent 76265e78e1
commit ddd2968d23
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
inc/toolbox.php Normal file → Executable file
View File

@@ -40,8 +40,9 @@ class ToolBox
$_REQUEST = array_merge($_GET, $_REQUEST); $_REQUEST = array_merge($_GET, $_REQUEST);
//Add Server Name //Add Server Name
//FIXME http/https value
$sServerName = array_key_exists('SERVER_NAME', $_SERVER)?$_SERVER['SERVER_NAME']:$_SERVER['PWD']; $sServerName = array_key_exists('SERVER_NAME', $_SERVER)?$_SERVER['SERVER_NAME']:$_SERVER['PWD'];
$sAppPath = 'http://'.str_replace('http://', '', $sServerName.dirname($_SERVER['SCRIPT_NAME'])); $sAppPath = 'http://'.str_replace(array('http://', 'https://'), '', $sServerName.dirname($_SERVER['SCRIPT_NAME']));
$_GET['serv_name'] = $sAppPath.(mb_substr($sAppPath, -1)!='/'?'/':''); $_GET['serv_name'] = $sAppPath.(mb_substr($sAppPath, -1)!='/'?'/':'');
} }

5
jquery/common.js vendored Normal file → Executable file
View File

@@ -490,8 +490,9 @@ function debug(text, bQuery)
function getLoginToken(sPass) function getLoginToken(sPass)
{ {
if(!window.location.origin) window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: ''); //if(!window.location.origin) window.location.origin = window.location.protocol + "//" + window.location.hostname + (window.location.port ? ':' + window.location.port: '');
return md5(sPass+window.location.origin+window.location.pathname); var sLocation = (!window.location.origin)?"http://"+window.location.hostname+(window.location.port?':'+window.location.port:''):window.location.origin.replace('https://', 'http://');
return md5(sPass+sLocation+window.location.pathname);
} }
function md5(str) function md5(str)