From 93c46ee5a895077baa6ff8164fafbf5fcd3d25fc Mon Sep 17 00:00:00 2001
From: David Anderson <davea@ssl.berkeley.edu>
Date: Sun, 12 Feb 2017 01:03:16 -0800
Subject: [PATCH] web: user secure URL base if available

---
 html/inc/bootstrap.inc | 6 +++---
 html/inc/notify.inc    | 2 +-
 html/inc/util.inc      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/html/inc/bootstrap.inc b/html/inc/bootstrap.inc
index 9b97f6b8a2..63a2fe2a53 100644
--- a/html/inc/bootstrap.inc
+++ b/html/inc/bootstrap.inc
@@ -81,17 +81,17 @@ function navbar_right($user) {
         if ($user) {
             echo sprintf('
                 <li><a href=%shome.php>'.$user->name.'</a></li>
-                ', URL_BASE
+                ', url_base()
             );
             $url_tokens = url_tokens($user->authenticator);
             echo sprintf('<li><a href="%slogout.php?%s">Log out</a></li>',
-                URL_BASE, $url_tokens
+                url_base(), $url_tokens
             );
         } else {
             echo sprintf('
                 <li><a href="%screate_account_form.php">Sign Up</a></li>
                 <li><a href="%slogin_form.php">Login</a></li>
-                ', URL_BASE, URL_BASE
+                ', url_base(), url_base()
             );
         }
     }
diff --git a/html/inc/notify.inc b/html/inc/notify.inc
index dd64c30882..8c1d1790f5 100644
--- a/html/inc/notify.inc
+++ b/html/inc/notify.inc
@@ -49,7 +49,7 @@ function show_notify_rss_item($notify) {
     $news_date=gmdate('D, d M Y H:i:s',$notify->create_time) . ' GMT';
     echo "<item>
         <title><![CDATA[$title]]></title>
-        <guid>".URL_BASE."_notify_$notify->id</guid>
+        <guid>".url_base()."_notify_$notify->id</guid>
         <link>".htmlentities($url)."</link>
         <description><![CDATA[$msg]]></description>
         <pubDate>$news_date</pubDate>
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 4fd217e174..c8f0cb2a52 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -158,7 +158,7 @@ function get_logged_in_user($must_be_logged_in=true) {
             }
         }
         $next_url = urlencode($next_url);
-        Header("Location: ".URL_BASE."login_form.php?next_url=$next_url");
+        Header("Location: ".url_base()."login_form.php?next_url=$next_url");
         exit;
     }
     $got_logged_in_user = true;