SinergiaTIC · AlbertoSTIC · Nov 20, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git a/include/SugarObjects/LanguageManager.php b/include/SugarObjects/LanguageManager.php
@@ -243,9 +243,13 @@ public static function refreshLanguage($module, $lang, $loaded_mod_strings = arr
 
         //great! now that we have loaded all of our vardefs.
         //let's go save them to the cache file.
-        if (!empty($loaded_mod_strings)) {
-            LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
-        }
+        // STIC Custom 20240926 EPS - Unnecessary Language regeneration
+        // We save the cache contents although it is empty, otherwise language will be regenerated on every login if the module is active
+        // if (!empty($loaded_mod_strings)) {
+        //     LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+        // }
+        LanguageManager::saveCache($module, $lang, $loaded_mod_strings);
+        // END STIC Custom
     }
 
     public static function loadModuleLanguage($module, $lang, $refresh=false)

diff --git a/modules/ResourceCalendar/language/ca_ES.lang.php b/modules/ResourceCalendar/language/ca_ES.lang.php
@@ -43,5 +43,4 @@
 }
 
 $mod_strings = array(
-    'LBL_ID' => 'ID',
 );
diff --git a/modules/ResourceCalendar/language/en_us.lang.php b/modules/ResourceCalendar/language/en_us.lang.php
@@ -43,5 +43,4 @@
 }
 
 $mod_strings = array(
-    'LBL_ID' => 'ID',
 );
diff --git a/modules/ResourceCalendar/language/es_ES.lang.php b/modules/ResourceCalendar/language/es_ES.lang.php
@@ -43,5 +43,4 @@
 }
 
 $mod_strings = array(
-    'LBL_ID' => 'ID',
 );
diff --git a/modules/ResourceCalendar/language/gl_ES.lang.php b/modules/ResourceCalendar/language/gl_ES.lang.php
@@ -43,5 +43,4 @@
 }
 
 $mod_strings = array(
-    'LBL_ID' => 'ID',
 );
diff --git a/modules/stic_MessagesMan/Menu.php b/modules/stic_MessagesMan/Menu.php
@@ -0,0 +1,9 @@
+<?php
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
+
+
+
+
+$module_menu=array();
diff --git a/modules/stic_MessagesMan/vardefs.php b/modules/stic_MessagesMan/vardefs.php
@@ -0,0 +1,170 @@
+<?php
+if (!defined('sugarEntry') || !sugarEntry) {
+    die('Not A Valid Entry Point');
+}
+
+$dictionary['stic_MessagesMan'] =
+array( 'table' => 'stic_messagesman', 'comment' => 'Messages campaign queue', 'fields' => array(
+    'date_entered' => array(
+        'name' => 'date_entered',
+        'vname' => 'LBL_DATE_ENTERED',
+        'type' => 'datetime',
+        'comment' => 'Date record created',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
+    ),
+    'date_modified' => array(
+        'name' => 'date_modified',
+        'vname' => 'LBL_DATE_MODIFIED',
+        'type' => 'datetime',
+        'comment' => 'Date record last modified',
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
+    ),
+    'user_id' => array(
+        'name' => 'user_id',
+        'vname' => 'LBL_USER_ID',
+        'type' => 'id','len' => '36',
+        'reportable' =>false,
+        'comment' => 'User ID representing assigned-to user',
+    ),
+    'id' =>
+    array(
+        'name' => 'id',
+        'vname' => 'LBL_ID',
+        'type' => 'int',
+        'len' => '11',
+        'auto_increment'=>true,
+        'comment' => 'Unique identifier',
+    ),
+    'campaign_id' => array(
+        'name' => 'campaign_id',
+        'vname' => 'LBL_CAMPAIGN_ID',
+        'type' => 'id',
+        'reportable' =>false,
+        'comment' => 'ID of related campaign',
+    ),
+    'marketing_id' => array(
+        'name' => 'marketing_id',
+        'vname' => 'LBL_MARKETING_ID',
+        'type' => 'id',
+        'reportable' =>false,
+        'comment' => '',
+    ),
+    'list_id' => array(
+        'name' => 'list_id',
+        'vname' => 'LBL_LIST_ID',
+        'type' => 'id',
+        'reportable' =>false,
+        'len' => '36',
+        'comment' => 'Associated list',
+    ),
+    'send_date_time' => array(
+        'name' => 'send_date_time' ,
+        'vname' => 'LBL_SEND_DATE_TIME',
+        'type' => 'datetime',
+        // STIC-Custom 20220928 MHP - Add search properties
+        // STIC#873        
+        'enable_range_search' => true,
+        'options' => 'date_range_search_dom',
+        // END STIC-Custom
+    ),
+    'modified_user_id' => array(
+        'name' => 'modified_user_id',
+        'vname' => 'LBL_MODIFIED_USER_ID',
+        'type' => 'id',
+        'reportable' =>false,
+        'len' => '36',
+        'comment' => 'User ID who last modified record',
+    ),
+    'in_queue' => array(
+        'name' => 'in_queue',
+        'vname' => 'LBL_IN_QUEUE',
+        'type' => 'bool',
+        'default' => '0',
+        'comment' => 'Flag indicating if item still in queue',
+    ),
+    'in_queue_date' => array(
+        'name' => 'in_queue_date',
+        'vname' => 'LBL_IN_QUEUE_DATE',
+        'type' => 'datetime',
+        'comment' => 'Datetime in which item entered queue',
+    ),
+    'send_attempts' => array(
+        'name' => 'send_attempts',
+        'vname' => 'LBL_SEND_ATTEMPTS',
+        'type' => 'int',
+        'default' => '0',
+        'comment' => 'Number of attempts made to send this item',
+    ),
+    'deleted' => array(
+        'name' => 'deleted',
+        'vname' => 'LBL_DELETED',
+        'type' => 'bool',
+        'reportable' =>false,
+        'comment' => 'Record deletion indicator',
+                'default' => '0',
+    ),
+    'related_id' => array(
+        'name' => 'related_id',
+        'vname' => 'LBL_RELATED_ID',
+        'type' => 'id',
+        'reportable' =>false,
+        'comment' => 'ID of Sugar object to which this item is related',
+    ),
+    'related_type' => array(
+        'name' => 'related_type' ,
+        'vname' => 'LBL_RELATED_TYPE',
+        'type' => 'varchar',
+        'len' => '100',
+        'comment' => 'Descriptor of the Sugar object indicated by related_id',
+    ),
+
+                'related_confirm_opt_in' => array(
+                    'name' => 'related_confirm_opt_in',
+                    'vname' => 'LBL_RELATED_CONFIRM_OPT_IN',
+                    'type' => 'bool',
+                    'default' => 0,
+                    'reportable' => false,
+                    'comment' => '',
+                ),
+
+                'recipient_name' => array(
+        'name' => 'recipient_name',
+        'type' => 'varchar',
+        'len' => '255',
+        'source'=>'non-db',
+    ),
+    // 'recipient_email' => array(
+    //     'name' => 'recipient_email',
+    //     'type' => 'varchar',
+    //     'len' => '255',
+    //     'source'=>'non-db',
+    // ),
+    'recipient_phone' => array(
+        'name' => 'recipient_phone',
+        'type' => 'varchar',
+        'len' => '55',
+        'source'=>'non-db',
+    ),
+    'message_name' => array(
+        'name' => 'message_name',
+        'type' => 'varchar',
+        'len' => '255',
+        'source'=>'non-db',
+    ),
+    'campaign_name' => array(
+        'name' => 'campaign_name',
+        'vname' => 'LBL_LIST_CAMPAIGN',
+        'type' => 'varchar',
+        'len' => '50',
+        'source'=>'non-db',
+    ),
+
+), 'indices' => array(
+                    array('name' => 'stic_messagesmanpk', 'type' => 'primary', 'fields' => array('id')),
+                    array('name' => 'idx_mman_list', 'type' => 'index', 'fields' => array('list_id','user_id','deleted')),
+                    array('name' => 'idx_mman_campaign_id', 'type' => 'index', 'fields' => array('campaign_id')),
+                    array('name' => 'idx_mman_relid_reltype_id', 'type' => 'index', 'fields'=> array('related_id', 'related_type', 'campaign_id')),
+                    )
+);
diff --git a/modules/stic_Web_Forms/Catcher/WebFormDataBO.php b/modules/stic_Web_Forms/Catcher/WebFormDataBO.php
@@ -98,7 +98,7 @@ private function loadLanguage()
         }
 
         $this->app_strings = return_application_language($this->lang); // Load application tags
-        $this->mod_strings[$this->defaultModule] = return_module_language($this->lang, $this->defaultModule, true); // Load the module labels by default
+        $this->mod_strings[$this->defaultModule] = return_module_language($this->lang, $this->defaultModule, false); // Load the module labels by default
     }
 
     /**

diff --git a/modules/stic_Web_Forms/Catcher/WebFormDataController.php b/modules/stic_Web_Forms/Catcher/WebFormDataController.php
@@ -106,7 +106,7 @@ private function loadLanguage()
         }
 
         $this->app_strings = return_application_language($this->lang); // Load application labels
-        $this->mod_strings[$this->defaultModule] = return_module_language($this->lang, $this->defaultModule, true); // Load the module labels by default
+        $this->mod_strings[$this->defaultModule] = return_module_language($this->lang, $this->defaultModule, false); // Load the module labels by default
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,5 +43,4 @@ @@
     }
     $mod_strings = array(
-        'LBL_ID' => 'ID',
     );