From f16ec8422a33ede8af558d3b92538bcdb5feae8b Mon Sep 17 00:00:00 2001
From: FreeScout <freescout.helpdesk@gmail.com>
Date: Mon, 12 Nov 2018 05:49:17 -0800
Subject: [PATCH 1/2] Do not show last commit in update script

---
 tools/upgrade.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/upgrade.sh b/tools/upgrade.sh
index 30aa7e8ef..1f7b25d6c 100755
--- a/tools/upgrade.sh
+++ b/tools/upgrade.sh
@@ -35,10 +35,10 @@ if [ -f "${TOOLS_DIR}/pre_upgrade.sh" ]; then
 	source "${TOOLS_DIR}/pre_upgrade.sh";
 fi
 
-if [ -f "${PROJECT_ROOT}/.gitcommit" ]; then
-	gitcommit=`more "${PROJECT_ROOT}/.gitcommit"`
-	echo -e "Last commit: \e[32m${gitcommit}\e[0m";
-fi
+#if [ -f "${PROJECT_ROOT}/.gitcommit" ]; then
+#	gitcommit=`more "${PROJECT_ROOT}/.gitcommit"`
+#	echo -e "Last commit: \e[32m${gitcommit}\e[0m";
+#fi
 
 # Check if git is installed
 git_installed=`command -v git`;

From 52942138f3313b4d5e035b065248abd50831e566 Mon Sep 17 00:00:00 2001
From: FreeScout <freescout.helpdesk@gmail.com>
Date: Mon, 12 Nov 2018 06:04:07 -0800
Subject: [PATCH 2/2] Enable open tracking by default

---
 app/Module.php | 4 ++--
 config/app.php | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/Module.php b/app/Module.php
index fce27b0eb..a22e064ad 100644
--- a/app/Module.php
+++ b/app/Module.php
@@ -74,7 +74,7 @@ public static function isLicenseActivated($alias, $author_url)
 
     public static function isOfficial($author_url)
     {
-        return parse_url($author_url, PHP_URL_HOST) == self::getAppUrl();
+        return parse_url($author_url, PHP_URL_HOST) == parse_url(\Config::get('app.freescout_url'), PHP_URL_HOST);
     }
 
     /**
@@ -167,6 +167,6 @@ public static function deactiveModule($alias, $clear_app_cache = true)
      */
     public static function getAppUrl()
     {
-        return parse_url(\Config::get('app.freescout_url'), PHP_URL_HOST);
+        return parse_url(\Config::get('app.url'), PHP_URL_HOST);
     }
 }
diff --git a/config/app.php b/config/app.php
index 66fe3a091..f3519fd10 100644
--- a/config/app.php
+++ b/config/app.php
@@ -201,6 +201,7 @@
         'alert_fetch'        => ['default' => false],
         'alert_fetch_period' => ['default' => 15], // min
         'email_branding'     => ['default' => true],
+        'open_tracking'      => ['default' => true],
     ],
 
     /*