nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #1206 from annando/1410-refresh-to-ssl

Browse source 
Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled)
This commit is contained in:
fabrixxm 2014-10-24 10:56:19 +02:00
parent 4c66a3486a 68e75b4623
commit 53f3b8ab53
2 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
boot.php
View file

@ -616,6 +616,10 @@ if(! class_exists('App')) {
return($basepath); return($basepath);
} }
function get_scheme() {
return($this->scheme);
}
function get_baseurl($ssl = false) { function get_baseurl($ssl = false) {
$scheme = $this->scheme; $scheme = $this->scheme;

7
index.php
View file

@ -53,6 +53,13 @@ if(!$install) {
load_config('config'); load_config('config');
load_config('system'); load_config('system');
if ((intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
($a->get_scheme() == "http") AND
(substr($a->get_baseurl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily");
header("location: ".$a->get_baseurl()."/".$a->query_string);
}
require_once("include/session.php"); require_once("include/session.php");
load_hooks(); load_hooks();
call_hooks('init_1'); call_hooks('init_1');