Merge remote-tracking branch 'upstream/master' into social-master

[quix0rs-gnu-social.git] / plugins / StrictTransportSecurity / StrictTransportSecurityPlugin.php

diff --git a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
index f94abb9b2010a151e7088ddbf6fe929835755ea5..3d7788c71163b37eab5ce33071cd9fe5219bac36 100644 (file)
--- a/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
+++ b/plugins/StrictTransportSecurity/StrictTransportSecurityPlugin.php
@@ -27,14 +27,13 @@
  * @link      http://status.net/
  */
 
-if (!defined('STATUSNET') && !defined('LACONICA')) {
-    exit(1);
-}
+if (!defined('GNUSOCIAL')) { exit(1); }
 
 class StrictTransportSecurityPlugin extends Plugin
 {
     public $max_age = 15552000;
     public $includeSubDomains = false;
+    public $preloadToken = false;
 
     function __construct()
     {
@@ -45,7 +44,9 @@ class StrictTransportSecurityPlugin extends Plugin
     {
         $path = common_config('site', 'path');
         if(common_config('site', 'ssl') == 'always' && ($path == '/' || ! $path )) {
-            header('Strict-Transport-Security: max-age=' . $this->max_age . + ($this->includeSubDomains ? '; includeSubDomains' : ''));
+            header('Strict-Transport-Security: max-age=' . $this->max_age
+                    . ($this->includeSubDomains ? '; includeSubDomains' : '')
+                    . ($this->preloadToken ? '; preload' : ''));
         }
     }