Style consistency.

paragonie · Jan 3, 2016 · 6d5aaa6 · 6d5aaa6
1 parent 2223d9e
commit 6d5aaa6
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/src/CSPBuilder.php b/src/CSPBuilder.php
@@ -415,16 +415,16 @@ protected function compileSubgroup($directive, $policies = null)
                 $url = \filter_var($url, FILTER_SANITIZE_URL);
                 if ($url !== false) {
                     if ($this->supportOldBrowsers) {
-                        if (strpos($url, '://') === false) {
-                            if (self::isHTTPSconnection() || !empty($this->policies['upgrade-insecure-requests'])) {
+                        if (\strpos($url, '://') === false) {
+                            if ($this->isHTTPSconnection() || !empty($this->policies['upgrade-insecure-requests'])) {
                                 // We only want HTTPS connections here.
                                 $ret .= 'https://'.$url.' ';
                             } else {
                                 $ret .= 'https://'.$url.' http://'.$url.' ';
                             }
                         }
                     }
-                    if (self::isHTTPSconnection() || !empty($this->policies['upgrade-insecure-requests'])) {
+                    if ($this->isHTTPSconnection() || !empty($this->policies['upgrade-insecure-requests'])) {
                         $ret .= \str_replace('http://', 'https://', $url).' ';
                     } else {
                         $ret .= $url.' ';
@@ -480,11 +480,14 @@ protected function compileSubgroup($directive, $policies = null)
      */
     protected function getHeaderKeys($legacy = true)
     {
+        // We always want this
         $return = [
             $this->reportOnly 
                 ? 'Content-Security-Policy-Report-Only'
                 : 'Content-Security-Policy'
         ];
+
+        // If we're supporting legacy devices, include these too:
         if ($legacy) {
             $return []= $this->reportOnly 
                 ? 'X-Content-Security-Policy-Report-Only'