From cbe3386da6059a0edc833b40311b7d153ef48439 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Sat, 5 Oct 2024 23:40:25 -0400
Subject: [PATCH] email fix

---
 wrenchboard/email/JOB/job_duereminder.mailfile |  3 ++-
 www-api/app/Controllers/BaseController.php     | 13 +++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/wrenchboard/email/JOB/job_duereminder.mailfile b/wrenchboard/email/JOB/job_duereminder.mailfile
index e8e1fa39..a405403c 100644
--- a/wrenchboard/email/JOB/job_duereminder.mailfile
+++ b/wrenchboard/email/JOB/job_duereminder.mailfile
@@ -74,6 +74,7 @@ img {height: auto;}
                   <tr>
                     <td class="bodycopy">
                     The task at <a href="{{server_name}}/">{{site_name}}</a> shown below is fast approaching deadline.
+					    <br>
 		                <br>
 						<span class="expire">Due Date : {{due_date}}.</span>
 						<br>
@@ -141,7 +142,7 @@ img {height: auto;}
 
 		<tr>
 		<td class="innerpadding bodycopy">
-		 This task will be due very soon. After the due date, the task will be past due, and only the owner can extend it is for a short time before the task is closed permanently.
+		Your task is approaching its deadline. After the due date, it will be marked as pastdue, and only the task owner can extend it for a limited time before it is permanently closed.
 		</td>
 		</tr>
 		      <tr>
diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php
index 2c36ea28..86ad9a92 100644
--- a/www-api/app/Controllers/BaseController.php
+++ b/www-api/app/Controllers/BaseController.php
@@ -40,6 +40,8 @@ abstract class BaseController extends Controller
      */
     protected $helpers = [];
     private $cache_tag='NONE';
+
+    private $cache_server;
     //private $cache_server='10.0.0.32';
     public  $current_env=0;
     public  $primary_image_sever='';
@@ -67,9 +69,10 @@ abstract class BaseController extends Controller
         $this->micro_service_net1 =  $this->getSiteConfigurations("system.micro_service_net1"); //"10.10.1
         $this->user_server_name =  $this->getSiteConfigurations("system.server_name"); // 'https://dev-users.wrenchboard.com';
 
-        $appConfig = config('Cache');
-        $appConfig->redis['host'] = $this->getSiteConfigurations("system.cache_host");
-        cache()->initialize($appConfig);
+//        $appConfig = config('Cache');
+//        $appConfig->redis['host'] = $this->getSiteConfigurations("system.cache_host");
+//        $this->cache_server =  cache()->initialize($appConfig);
+//
 
        // var_dump($appConfig->redis['host']);
        // exit();
@@ -86,7 +89,6 @@ abstract class BaseController extends Controller
 //        //$this->load->driver('cache', $redis);
 
     }
-
     public function getIpData(){
         //$ip_loc="0.0.0.0";
         if (!empty($_SERVER['HTTP_CLIENT_IP'])) {
@@ -98,6 +100,9 @@ abstract class BaseController extends Controller
         }
         return $ip_loc;
     }
+
+
+
     public function saveCache($cacheKey,$data,$timeLine=5000){
         $cacheKey = $this->cache_tag."-".$cacheKey;
         // $cache = \Config\Services::cache();