feat(Email) EMail_CustomCurrentDate_Format global variable

tsolucio · Sep 8, 2017 · 44308dd · 44308dd
1 parent 99d5a65
commit 44308dd
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/build/changeSets/DefineGlobalVariables.php b/build/changeSets/DefineGlobalVariables.php
@@ -137,6 +137,7 @@ function applyChange() {
 				'EMail_OpenTrackingEnabled',
 				'Email_Attachments_Folder',
 				'EMail_Maximum_Number_Attachments',
+				'EMail_CustomCurrentDate_Format',
 				'ToolTip_MaxFieldValueLength',
 				'HelpDesk_Support_EMail',
 				'HelpDesk_Support_Name',

diff --git a/include/utils/CommonUtils.php b/include/utils/CommonUtils.php
@@ -2237,9 +2237,14 @@ function getMergedDescriptionCustomVars($fields, $description) {
 		$token_value = '';
 		switch ($columnname) {
 			case 'currentdate':
-				$mes = date('m')-1;
-				$mesi18n = $lang['MONTH_STRINGS'][$mes];
-				$token_value = $mesi18n.date(' j, Y');
+				$dtformat = GlobalVariable::getVariable('EMail_CustomCurrentDate_Format','',$currentModule);
+				if ($dtformat=='') {
+					$mes = date('m')-1;
+					$mesi18n = $lang['MONTH_STRINGS'][$mes];
+					$token_value = $mesi18n.date(' j, Y');
+				} else {
+					$token_value = date($dtformat);
+				}
 				break;
 			case 'currenttime': $token_value = date("G:i:s T");
 				break;

diff --git a/modules/GlobalVariable/language/en_us.gvdefs.php b/modules/GlobalVariable/language/en_us.gvdefs.php
@@ -840,6 +840,13 @@
 	'values' => '',
 	'definition' => 'The maximum number of attachments that can be uploaded to an email. The default is 6.',
 ),
+'EMail_CustomCurrentDate_Format' => array(
+	'status' => 'Implemented',
+	'valuetype' => 'String',
+	'category' => 'Aplicación',
+	'values' => 'valid PHP date format string',
+	'definition' => 'Format to apply to $custom-currentdate$ variable in email templates. Accepts any valid date format string from PHP. By default leave it empty to get the month in text, day and year.',
+),
 'Workflow_Send_Email_ToCCBCC' => array(
 	'status' => 'Implemented',
 	'valuetype' => 'Email CSV',

diff --git a/modules/GlobalVariable/language/es_es.gvdefs.php b/modules/GlobalVariable/language/es_es.gvdefs.php
@@ -840,6 +840,13 @@
 	'values' => '',
 	'definition' => 'El número máximo de archivos adjuntos que se pueden cargar en un correo electrónico. El valor predeterminado es 6.',
 ),
+'EMail_CustomCurrentDate_Format' => array(
+	'status' => 'Implementada',
+	'valuetype' => 'Texto',
+	'category' => 'Aplicación',
+	'values' => 'Cadena de formato de fecha PHP válida',
+	'definition' => 'Formato a aplicar a la variable $custom-currentdate$ en las plantillas de email. Acepta cualquier cadena de formato de fecha válida de PHP. Por defecto dejar vacio para obtener el mes en texto, dia y año.',
+),
 'Workflow_Send_Email_ToCCBCC' => array(
 	'status' => 'Implementada',
 	'valuetype' => 'Email CSV',