From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 4 Jan 2017 16:19:11 +0000 (-0500)
Subject: Updates for ssl
X-Git-Tag: v1.5.5^2
X-Git-Url: http://cvs2.gaslightmedia.com/gitweb/?a=commitdiff_plain;h=d5bdd488c63037aebcbf506353a49b7bc29fd930;p=web%2FGaylordGolfMecca.git

Updates for ssl

To make the ssl pages secure.
---

diff --git a/Toolkit/Page.php b/Toolkit/Page.php
index b235782..f7cf0a0 100755
--- a/Toolkit/Page.php
+++ b/Toolkit/Page.php
@@ -136,6 +136,11 @@ class Toolkit_Page
 
         $this->baseURLDefined = BASE_URL;
 
+        $this->gaylordMichiganLogo
+            = ( $_SERVER['HTTPS'] == 'on' )
+            ? 'https://ws6.gaslightmedia.com/gaylordmichigan.net/assets/logo.png'
+            : 'http://www.gaylordmichigan.net/assets/logo.png';
+
         // determine the base url to use (for MEDIA_APP_BASE_URL)
         $this->glmAppBaseURL = MEDIA_APP_BASE_URL;
 
@@ -277,7 +282,7 @@ class Toolkit_Page
     private function _video()
     {
         $GLOBALS['bottomScripts'][]
-            = BASE_URL . 'Toolkit/Videos/libjs/videos.js';
+            = MEDIA_BASE_URL . 'Toolkit/Videos/libjs/videos.js';
         $dbh = Toolkit_Database::getInstance();
         $sql = "
           SELECT id
diff --git a/templates/template.html b/templates/template.html
index a4ea49e..129add6 100755
--- a/templates/template.html
+++ b/templates/template.html
@@ -196,7 +196,7 @@
                     <div id="contactInfo" class="small-12 medium-8 columns">
                         <div class="row">
                             <div class="small-12 medium-3 columns">
-                                <a href="http://www.gaylordmichigan.net/" target="_blank" style="display: inline;"><img src="http://www.gaylordmichigan.net/assets/logo.png"></a>
+                                <a href="http://www.gaylordmichigan.net/" target="_blank" style="display: inline;"><img src="{gaylordMichiganLogo:h}"></a>
                             </div>
                             <div class="small-12 medium-9 columns">
                                 <p>Gaylord Golf Mecca</p>