Merge pull request #159 from 7tonin/7tonin-patch-2

osm_get_js $httpx comment again, Coding Guidelines

Author: xbgmsharp

include/functions_map.php

@@ -305,8 +305,8 @@ function osm_get_js($conf, $local_conf, $js_data)
         ? $local_conf['autocenter']
         : 0;
 
-    // When gallery is SSL and when switching baselayerURL to https is possible
-    $httpx = (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) !== 'off')?'https':'http';
+    // When gallery is SSL and when switching to SSL baselayerURL is possible, use $httpx
+    $httpx = ((!empty($_SERVER['HTTPS'])) and (strtolower($_SERVER['HTTPS']) !== 'off')) ? 'https' : 'http';
 
     // Load baselayerURL
     if     ($baselayer == 'mapnik')     $baselayerurl = $httpx.'://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';