Option forceSsl added

Author: karsasmus

app/source/classes/Controller/APIController.php

@@ -1133,7 +1133,8 @@ public function updateSettings($request, $response, $args) {
             'hbs_cache' => $params['hbs-cache'] === 'on' ? 'on' : 'off',
             'mailer' => $params['mailer'],
             'showDashboard' => $params['showDashboard'] === 'on' ? 'on' : 'off',
-            'amp' => $params['amp'] === 'on' ? 'on' : 'off'
+            'amp' => $params['amp'] === 'on' ? 'on' : 'off',
+            'forceSsl' => $params['forceSsl'] === 'on' ? 'on' : 'off',
         ];
 
         // Update settings

app/source/classes/Leafpub.php

@@ -308,6 +308,9 @@ public static function isProtectedSlug($slug) {
     *
     **/
     public static function isSsl() {
+        if (Setting::getOne('forceSsl') == 'on'){
+            return true;
+        }
         // Some servers (e.g. Cloud9) don't populate $_SERVER[HTTPS], so we have to check the value
         // of $_SERVER[REQUEST_SCHEME] instead.
         if($_SERVER['REQUEST_SCHEME'] === 'https') return true;

app/source/installer/install.php

@@ -230,6 +230,7 @@
 Models\Setting::create(['name' => 'mailer', 'value' => 'default']);
 Models\Setting::create(['name' => 'schemeVersion', 'value' => LEAFPUB_SCHEME_VERSION]);
 Models\Setting::create(['name' => 'updateTime', 'value' => '03:00:00']);
+Models\Setting::create(['name' => 'forceSsl', 'value' => 'off']);
 
 // Insert owner
 try {

app/source/languages/en-us.php

@@ -81,6 +81,7 @@
     'feed' => 'Feed',
     'file_edited_successfully' => 'File edited successfully',
     'file_deleted_successfully' => 'File deleted successfully',
+    'forceSsl' => 'Deliver Leafpub with https',
     'full_name' => 'Full Name',
     'general' => 'General',
     'generator_enabled' => 'Show some love and add generator meta to head',

app/source/templates/settings.hbs

@@ -238,6 +238,7 @@
                                 </label>
                             </div>
                         </div>
+                        {{!-- showDashboard --}}
                         <div class="form-group">
                             <div class="checkbox">
                                 <label>
@@ -246,6 +247,7 @@
                                 </label>
                             </div>
                         </div>
+                        {{!-- AMP --}}
                         <div class="form-group">
                             <div class="checkbox">
                                 <label>
@@ -254,6 +256,15 @@
                                 </label>
                             </div>
                         </div>
+                        {{!-- forceSSL --}}
+                        <div class="form-group">
+                            <div class="checkbox">
+                                <label>
+                                    <input type="checkbox" name="forceSsl" value="on"{{#is @settings.forceSsl 'on'}} checked{{/is}}>
+                                    {{L 'forceSsl'}}<br>
+                                </label>
+                            </div>
+                        </div>
                         {{!-- Mail --}}
                         <h3 class="m-t-3">{{L 'mail'}}</h3>
                         {{!-- Mailers --}}