Fixed issue #9089: Mixed content in statistics

LimeSurvey · Jun 17, 2014 · 585da43 · 585da43
1 parent acb8f3e
commit 585da43
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/application/helpers/admin/statistics_helper.php b/application/helpers/admin/statistics_helper.php
@@ -3198,7 +3198,11 @@ public function generate_statistics($surveyid, $allfields, $q2show='all', $usegr
                 {
                     $sGoogleMapsAPIKey='&key='.$sGoogleMapsAPIKey;
                 }
-                $statisticsoutput .= "<script type=\"text/javascript\" src=\"http://maps.googleapis.com/maps/api/js?sensor=false$sGoogleMapsAPIKey\"></script>\n"
+                $sSSL='';
+                if (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] != "off"){
+                    $sSSL='s';
+                }
+                $statisticsoutput .= "<script type=\"text/javascript\" src=\"http{$sSSL}://maps.googleapis.com/maps/api/js?sensor=false$sGoogleMapsAPIKey\"></script>\n"
                 ."<script type=\"text/javascript\">var site_url='".Yii::app()->baseUrl."';var temppath='$tempurl';var imgpath='".Yii::app()->getConfig('adminimageurl')."';var aGMapData=".ls_json_encode($agmapdata)	.";var aStatData=".ls_json_encode($astatdata)."</script>";
                 return $statisticsoutput;