done #608 @1.5

diff --git a/.htaccess b/.htaccess
index a130dfb5894bb3ad60a14f9a5a0d3531f4394cc3..57e4523720e647b3f6e5e2fb840d681a5b8d56cc 100644 (file)
--- 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 083e8899692b0418d0c4f7f99b1d70ab07e1526b..2dd37b8fe13f1decbd1e32f36cd1ebb1315cbf7d 100644 (file)
--- 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 22252d4a9899027695dfd15bd6a86a3cdf0625f8..6b627672ecd71adcf89a875dcbd57d1c6413ace4 100644 (file)
--- 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';\r
                $file = $dir . $page . '.jpg';\r
                if (!file_exists($file) || !filesize($file)) {\r
-                       $wsurl = 'http://workshop.fluidbook.com/services/getFluidbookPage/' . $fluidbook_id . '/' . $page;\r
+                       $wsurl = 'https://workshop.fluidbook.com/services/getFluidbookPage/' . $fluidbook_id . '/' . $page;\r
                        file_put_contents($file, file_get_contents($wsurl));\r
                }\r
                $size = CubeIT_Image::getDimensions($file, $width, $height);\r