X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=42767845c267b0089dcde159f91716ea8e78dabf;hb=cb3704ab436c8e3d0b43e101e54465d9ff3f5a44;hp=99229972ebc11f32e1ef183833c8e9f7e1a178de;hpb=f59b21d4a8010847f05cc1ca0ded1b6940e26429;p=friendica.git

diff --git a/boot.php b/boot.php
index 99229972eb..42767845c2 100644
--- a/boot.php
+++ b/boot.php
@@ -38,7 +38,7 @@ define ( 'FRIENDICA_PLATFORM',     'Friendica');
 define ( 'FRIENDICA_CODENAME',     'Asparagus');
 define ( 'FRIENDICA_VERSION',      '3.5-dev' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1196      );
+define ( 'DB_UPDATE_VERSION',      1198      );
 
 /**
  * @brief Constant with a HTML line break.
@@ -587,10 +587,15 @@ class App {
 
 
 		$this->scheme = 'http';
-		if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
-			$this->scheme = 'https';
-		elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
+		if((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
+		   (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
+		   (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
+		   (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
+		   (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
+		   (x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+		   ) {
 			$this->scheme = 'https';
+		   }
 
 		if(x($_SERVER,'SERVER_NAME')) {
 			$this->hostname = $_SERVER['SERVER_NAME'];
@@ -1523,20 +1528,20 @@ function login($register = false, $hiddens=false) {
 
 	$o .= replace_macros($tpl, array(
 
-		'$dest_url'     => $dest_url,
-		'$logout'       => t('Logout'),
-		'$login'        => t('Login'),
+		'$dest_url'	=> $dest_url,
+		'$logout'	=> t('Logout'),
+		'$login'	=> t('Login'),
 
-		'$lname'	 	=> array('username', t('Nickname or Email address: ') , '', ''),
+		'$lname'	=> array('username', t('Nickname or Email: ') , '', ''),
 		'$lpassword' 	=> array('password', t('Password: '), '', ''),
 		'$lremember'	=> array('remember', t('Remember me'), 0,  ''),
 
-		'$openid'		=> !$noid,
-		'$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
+		'$openid'	=> !$noid,
+		'$lopenid'	=> array('openid_url', t('Or login using OpenID: '),'',''),
 
-		'$hiddens'      => $hiddens,
+		'$hiddens'	=> $hiddens,
 
-		'$register'     => $reg,
+		'$register'	=> $reg,
 
 		'$lostpass'     => t('Forgot your password?'),
 		'$lostlink'     => t('Password Reset'),