Update for https

Call entire site using https
update video app to use https

diff --git a/Toolkit/Videos/templates/webDecorator.html b/Toolkit/Videos/templates/webDecorator.html
index 2ff94f2..25fe184 100644 (file)
--- a/Toolkit/Videos/templates/webDecorator.html
+++ b/Toolkit/Videos/templates/webDecorator.html
@@ -1,5 +1,5 @@
-    <div class="v hBox small-6 large-3 columns" style="background: url(http://img.youtube.com/vi/{vCode}/0.jpg) no-repeat scroll center center transparent;">
-        <a href="http://www.youtube.com/embed/{vCode}?rel=0&hd=1" class="various fancybox.iframe">
+    <div class="v hBox small-6 large-3 columns" style="background: url(https://img.youtube.com/vi/{vCode}/0.jpg) no-repeat scroll center center transparent;">
+        <a href="https://www.youtube.com/embed/{vCode}?rel=0&hd=1" class="various fancybox.iframe">
 <!--            <img src="http://img.youtube.com/vi/{vCode}/0.jpg">-->
             <span class="vidoverlay"></span>
         </a>

diff --git a/setup.phtml b/setup.phtml
index cd9be3d..74d7ae1 100644 (file)
--- a/setup.phtml
+++ b/setup.phtml
@@ -47,7 +47,7 @@ if (($x = strlen($CALLED_FROM_DIR)) > 0) {
 }
 // Added to strip any trailing /'s to make sure we don't end up with many
 $base_url = preg_replace('|/*$|', '', $base_url);
-$BASE_URL = "http://$base_url";
+$BASE_URL = "https://$base_url";
 
 if (!isset($DEBUG)) {
     $DEBUG = (isset($mysecretcode) && $mysecretcode == 1234);
@@ -626,7 +626,7 @@ define('MEDIA_APP_BASE_URL', $mediaAppBaseUrl);
 define('CKEDITOR_JS', MEDIA_APP_BASE_URL . 'ckeditor/4.3.2/ckeditor.js');
 // This needs to be set to the real url ie. http://demo.gaslightmedia.com
 if ($isSecurePage) {
-    $BASE_URL = "http://$base_url";
+    $BASE_URL = "https://$base_url";
 }
 
 // Set CURRENT_BASE_URL according to whether site is secure or not.