Merge branch 'Event_Task_DateFormat' into 'master'

Fixes #1471 Date format with update task has been addressed

See merge request !722

modules/Settings/Workflows/actions/TaskAjax.php

@@ -116,10 +116,13 @@ class Settings_Workflows_TaskAjax_Action extends Settings_Vtiger_IndexAjax_View
 							$result->emit();
 							return;
 						}
-					}
+					}else if($mappingInfo['valuetype'] == 'rawtext' && Vtiger_Functions::isDateValue($mappingInfo['value'])) {
+                                            $mappingInfo['value'] = DateTimeField::convertToDBFormat($mappingInfo['value']);
+                                            $fieldMapping[$key] = $mappingInfo;
+                                        }
 				}
 			}
-
+                        $taskObject->field_value_mapping = Zend_Json::encode($fieldMapping);
 			$taskType = get_class($taskObject);
 			if ($taskType === 'VTCreateEventTask' || $taskType === 'VTCreateTodoTask') {
 				if($taskType === 'VTCreateEventTask') {

vtlib/Vtiger/Functions.php

@@ -1243,17 +1243,27 @@ class Vtiger_Functions {
 	 * @return boolean Returns true if $value is date else returns false
 	 */
 	static function isDateValue($value) {
-		$valueParts = explode('-', $value);
-		if (count($valueParts) == 3 && (strlen($valueParts[0]) == 4 || strlen($valueParts[1]) == 4 || strlen($valueParts[2]) == 4)) {
-			$time = strtotime($value);
-			if ($time && $time > 0) {
-				return true;
-			} else {
-				return false;
-			}
-		} else {
-			return false;
-		}
+            $value = trim($value);
+            $delim = array('/','.');
+            foreach ($delim as $delimiter){
+                    $x = strpos($value, $delimiter);
+                    if($x === false) continue;
+                    else{
+                            $value=str_replace($delimiter, '-', $value);
+                            break;
+                    }
+            }
+            $valueParts = explode('-', $value);
+            if (count($valueParts) == 3 && (strlen($valueParts[0]) == 4 || strlen($valueParts[1]) == 4 || strlen($valueParts[2]) == 4)) {
+                    $time = strtotime($value);
+                    if ($time && $time > 0) {
+                            return true;
+                    } else {
+                            return false;
+                    }
+            } else {
+                    return false;
+            }
 	}
 
 	/**