From 26e33dddecfc52130815e5c8c35d64b2b9df2e48 Mon Sep 17 00:00:00 2001
From: FrancescoUK <francesco.lodolo.uk@gmail.com>
Date: Sat, 25 Aug 2018 16:03:07 +0100
Subject: [PATCH] Check FORCE_HTTPS env to be true, upgrade MariaDB vs in
 docker-compose

---
 application/config/config.php        | 2 +-
 application/views/partial/header.php | 2 +-
 docker-compose.yml                   | 2 +-
 public/license/LICENSE               | 1 +
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/application/config/config.php b/application/config/config.php
index 3a345c88d..bd72045ef 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -65,7 +65,7 @@ $config['db_log_enabled'] = FALSE;
 | a PHP script and you can easily do that on your own.
 |
 */
-$config['base_url'] = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || isset($_ENV['FORCE_HTTPS'])) ? 'https' : 'http';
+$config['base_url'] = ((isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') || (isset($_ENV['FORCE_HTTPS']) && $_ENV['FORCE_HTTPS'] == 'true')) ? 'https' : 'http';
 $config['base_url'] .= '://' . $_SERVER['HTTP_HOST'];
 $config['base_url'] .= str_replace(basename($_SERVER['SCRIPT_NAME']), '', $_SERVER['SCRIPT_NAME']);
 
diff --git a/application/views/partial/header.php b/application/views/partial/header.php
index dd8be8928..58fa5e7d2 100644
--- a/application/views/partial/header.php
+++ b/application/views/partial/header.php
@@ -75,7 +75,7 @@
 		<link rel="stylesheet" type="text/css" href="dist/opensourcepos.min.css?rel=84371241b2"/>
 		<!-- end mincss template tags -->
 		<!-- start minjs template tags -->
-		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=c206fd4a9f"></script>
+		<script type="text/javascript" src="dist/opensourcepos.min.js?rel=5facd00267"></script>
 		<!-- end minjs template tags -->
 	<?php endif; ?>
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 8ebe12f8c..80421a0f6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -28,7 +28,7 @@ services:
             - MYSQL_HOST_NAME=mysql
 
     mysql:
-        image: mariadb:10.1.21
+        image: mariadb:10.3.9
         environment:
             - MYSQL_ROOT_PASSWORD=pointofsale
             - MYSQL_DATABASE=ospos
diff --git a/public/license/LICENSE b/public/license/LICENSE
index 882aae407..dcea0bfc2 100644
--- a/public/license/LICENSE
+++ b/public/license/LICENSE
@@ -18,6 +18,7 @@ Copyright (c) 2017 Deep Shah (aka deepshah)
 Copyright (c) 2017 Joshua Fernandez (aka joshua1234511)
 Copyright (c) 2017 odiea
 Copyright (c) 2017 asadjaved63
+Copyright (c) 2018 WebShells/Shady Sh
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in