Removing evaluates

Removed the use of the Evaluate function and replaced it with the dynamic function call and created the function resolveDateTime to retrieve the required part of a dateTime object without using the evaluate function

Author: zainforbjs

vendor/wheels/view/formsdate.cfc

@@ -142,13 +142,28 @@ component {
 						arguments.value = TimeFormat(local.value, 'tt');
 					}
 				} else {
-					arguments.value = Evaluate("#local.item#(local.value)");
+					arguments.value = resolveDateTime(local.item, local.value);
 				}
 			}
 			if (local.firstDone) {
 				local.rv &= arguments.separator;
 			}
-			local.rv &= Evaluate("$#local.item#SelectTag(argumentCollection=arguments)");
+			local.functionMap = {
+				year: $yearSelectTag,
+				month: $monthSelectTag,
+				day: $daySelectTag,
+				hour: $hourSelectTag,
+				minute: $minuteSelectTag,
+				second: $secondSelectTag,
+				yearMonthHourMinuteSecond: $yearMonthHourMinuteSecondSelectTag,
+				ampm: $ampmSelectTag
+			};
+
+			if (structKeyExists(functionMap, local.item)) {
+				local.rv &= local.functionMap[local.item](argumentCollection=arguments);
+			} else {
+				throw("Invalid item value: " & local.item);
+			}
 			local.firstDone = true;
 		}
 		return local.rv;
@@ -186,7 +201,7 @@ component {
 			if (arguments.twelveHour && arguments.$type IS "hour") {
 				arguments.value = TimeFormat(arguments.$now, 'h');
 			} else {
-				arguments.value = Evaluate("#arguments.$type#(arguments.$now)");
+				arguments.value = resolveDateTime(arguments.$type, arguments.$now);
 			}
 		}
 
@@ -312,4 +327,23 @@ component {
 			encode = local.encode
 		);
 	}
+
+	public numeric function resolveDateTime(required string dateTimeString, required date dateTimeValue){
+		switch(arguments.dateTimeString) {
+			case "year":
+				return Year(arguments.dateTimeValue);
+			case "month":
+				return Month(arguments.dateTimeValue);
+			case "day":
+				return Day(arguments.dateTimeValue);
+			case "hour":
+				return Hour(arguments.dateTimeValue);
+			case "minute":
+				return Minute(arguments.dateTimeValue);
+			case "second":
+				return Second(arguments.dateTimeValue);
+			default:
+				throw("Invalid type specified: " & arguments.dateTimeString);
+		}
+	}
 }