cleanup ssl_policy implementation

diff --git a/boot.php b/boot.php
index 83ceaac280c319c026025fda9634170322929778..c4afa07b0c561c1270b571711bcd21a067cb8a28 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -17,7 +17,7 @@ define ( 'DOWN_ARROW',             '⇩'       );
 
 define ( 'SSL_POLICY_NONE',         0 );
 define ( 'SSL_POLICY_FULL',         1 );
-define ( 'SSL_POLICY_SELFSIGN'      2 );
+define ( 'SSL_POLICY_SELFSIGN',      2 );
 
 
 /**
@@ -280,8 +280,8 @@ class App {
        }
 
        function get_baseurl($ssl = false) {
-               if(strlen($this->baseurl))
-                       return $this->baseurl;
+//             if(strlen($this->baseurl))
+//                     return $this->baseurl;
 
                $scheme = $this->scheme;
 
@@ -290,7 +290,7 @@ class App {
                if(($a->config['ssl_policy'] == SSL_POLICY_SELFSIGN) && (local_user() || x($_POST,'auth-params')))
                        $scheme = 'https';
 
-               $this->baseurl = ( $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
+               $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
                return $this->baseurl;
        }