Detect secure connection to return correct url for assets.

Author: tuananhnghiem

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Change Log
 
+## Version 1.7.0 (new)
+
+1. Detect secure connection to return correct url for assets.
+
 ## Version 1.6.0
 
 1. Change README

Friendship.php

@@ -2,50 +2,48 @@
 
 namespace koolreport\laravel;
 
-
-use \koolreport\core\Utility;
 use Config;
+use \koolreport\core\Utility;
 
 trait Friendship
 {
     public function __constructFriendship()
     {
+        $isSecure = (!empty($_SERVER['HTTPS']) && $_SERVER['HTTPS'] !== 'off')
+            || $_SERVER['SERVER_PORT'] == 443;
+
         //assets folder
-        $assets = Utility::get($this->reportSettings,"assets");
-        if($assets==null)
-        {
-            $public_path = str_replace("\\","/",public_path());
-            if(!is_dir($public_path."/koolreport_assets"))
-            {
-                mkdir($public_path."/koolreport_assets",0755);
+        $assets = Utility::get($this->reportSettings, "assets");
+        if ($assets == null) {
+            $public_path = str_replace("\\", "/", public_path());
+            if (!is_dir($public_path . "/koolreport_assets")) {
+                mkdir($public_path . "/koolreport_assets", 0755);
             }
             $assets = array(
-                "url"=>url("")."/koolreport_assets",
-                "path"=>$public_path."/koolreport_assets",
+                "url" => ($isSecure ? secure_url() : url("")) . "/koolreport_assets",
+                "path" => $public_path . "/koolreport_assets",
             );
             $this->reportSettings["assets"] = $assets;
         }
 
         //DataSources
         $dbSources = array();
         $dbConfig = Config::get('database');
-        $defaultSource = Utility::get($dbConfig,"default");
-        if($defaultSource)
-        {
+        $defaultSource = Utility::get($dbConfig, "default");
+        if ($defaultSource) {
             $dbSources[$defaultSource] = array(
-                "class"=>LaravelDataSource::class,
-                "name"=>$defaultSource,
+                "class" => LaravelDataSource::class,
+                "name" => $defaultSource,
             );
         }
-        foreach($dbConfig["connections"] as $name=>$config)
-        {
+        foreach ($dbConfig["connections"] as $name => $config) {
             $dbSources[$name] = array(
-                "class"=>LaravelDataSource::class,
-                "name"=>$name,
+                "class" => LaravelDataSource::class,
+                "name" => $name,
             );
         }
-        $dataSources = Utility::get($this->reportSettings,"dataSources",array());
-        $this->reportSettings["dataSources"] = array_merge($dbSources,$dataSources);
+        $dataSources = Utility::get($this->reportSettings, "dataSources", array());
+        $this->reportSettings["dataSources"] = array_merge($dbSources, $dataSources);
 
     }
-}
+}

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "koolreport/laravel",
-    "version":"1.6.0",
+    "version":"1.7.0",
     "description": "Allow to use KoolReport seamlessly in Laravel",
     "keywords": ["PHP","Reporting Tools","Data Report","laravel","KooLReport Laravel","Laravel Report","laravel reporting","laravel reporting tool"],
     "homepage": "https://www.koolreport.com",