From cd5ba504d3b54533dece7f51809f2aeb2d94dcf4 Mon Sep 17 00:00:00 2001 From: "vincent@cubedesigners.com" Date: Fri, 19 Aug 2016 17:32:11 +0000 Subject: [PATCH] done #608 @1.5 --- .htaccess | 4 ++++ framework/application/Bootstrap.php | 2 +- framework/application/views/helpers/ExemplePublication.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.htaccess b/.htaccess index a130dfb..57e4523 100644 --- a/.htaccess +++ b/.htaccess @@ -23,6 +23,10 @@ Options +FollowSymlinks RewriteEngine on RewriteBase / + + RewriteCond %{HTTPS} off + RewriteRule .* https://%{HTTP_HOST}%{REQUEST_URI} [L,R=301] + # Redirection to www. subdomain RewriteCond %{HTTP_HOST} ^example.com$ RewriteRule ^(.*)$ http://www.example.com/$1 [R=301,L] diff --git a/framework/application/Bootstrap.php b/framework/application/Bootstrap.php index 083e889..2dd37b8 100644 --- a/framework/application/Bootstrap.php +++ b/framework/application/Bootstrap.php @@ -95,7 +95,7 @@ class Bootstrap extends CubeIT_Bootstrap { return $page->getHref(); } } else { - $url = 'http://' . $domain . '/'; + $url = SITE_PROTOCOL . $domain . '/'; } if (isset($url)) { diff --git a/framework/application/views/helpers/ExemplePublication.php b/framework/application/views/helpers/ExemplePublication.php index 22252d4..6b62767 100644 --- a/framework/application/views/helpers/ExemplePublication.php +++ b/framework/application/views/helpers/ExemplePublication.php @@ -72,7 +72,7 @@ class Fluidbook_View_Helper_ExemplePublication extends CubeIT_View_Helper_Abstra $url = '/files/' . $path . $page . '.jpg'; $file = $dir . $page . '.jpg'; if (!file_exists($file) || !filesize($file)) { - $wsurl = 'http://workshop.fluidbook.com/services/getFluidbookPage/' . $fluidbook_id . '/' . $page; + $wsurl = 'https://workshop.fluidbook.com/services/getFluidbookPage/' . $fluidbook_id . '/' . $page; file_put_contents($file, file_get_contents($wsurl)); } $size = CubeIT_Image::getDimensions($file, $width, $height); -- 2.39.5