diabook: theme.php

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 86da3cd2eb02ed14510228e92a78c34c82c870d0..f976ef6368c98b26c2c874d0196bce383048320f 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,9 +9,9 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1282' );
+define ( 'FRIENDICA_VERSION',      '2.3.1289' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1132      );
+define ( 'DB_UPDATE_VERSION',      1133      );
 
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
@@ -286,7 +286,12 @@ class App {
 
                startup();
 
-               $this->scheme = ((isset($_SERVER['HTTPS']) && ($_SERVER['HTTPS']))      ?  'https' : 'http' );
+               $this->scheme = 'http';
+               if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
+                       $this->scheme = 'https';
+               elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) 
+                       $this->scheme = 'https';
+
 
                if(x($_SERVER,'SERVER_NAME')) {
                        $this->hostname = $_SERVER['SERVER_NAME'];
@@ -380,7 +385,7 @@ class App {
                $scheme = $this->scheme;
 
                if((x($this->config,'system')) && (x($this->config['system'],'ssl_policy'))) {
-                       if($this->config['system']['ssl_policy'] == SSL_POLICY_FULL) 
+                       if(intval($this->config['system']['ssl_policy']) === intval(SSL_POLICY_FULL)) 
                                $scheme = 'https';
 
 //                     We need to populate the $ssl flag across the entire program before turning this on.
@@ -708,15 +713,16 @@ function login($register = false, $hiddens=false) {
 
        $noid = get_config('system','no_openid');
        
+       $dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
+
        if(local_user()) {
                $tpl = get_markup_template("logout.tpl");
        }
        else {
                $tpl = get_markup_template("login.tpl");
-
+               $_SESSION['return_url'] = $a->query_string;
        }
 
-       $dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
 
        $o .= replace_macros($tpl,array(