Index: asterisk/apps/app_macro.c
===================================================================
--- asterisk/apps/app_macro.c	(revision 18090)
+++ asterisk/apps/app_macro.c	(working copy)
@@ -70,6 +70,20 @@
 "(otherwise <macroname_b> if provided)\n"
 "Arguments and return values as in application macro()\n";
 
+static char *iftime_descrip =
+"  MacroIfTime(<time range>|<days of week>|<days of month>|<months>?<macroname>[|<arg1>[|...]])\n"
+"Conditional Macro Execution depending on current time.\n"
+"Executes a macro using the context\n"
+"'macro-<macroname>', jumping to the 's' extension of that context and\n"
+"executing each step, then returning when the steps end. \n"
+"The calling extension, context, and priority are stored in ${MACRO_EXTEN}, \n"
+"${MACRO_CONTEXT} and ${MACRO_PRIORITY} respectively.  Arguments become\n"
+"${ARG1}, ${ARG2}, etc in the macro context.\n"
+"If you Goto out of the Macro context, the Macro will terminate and control\n"
+"will be returned at the location of the Goto.\n"
+"If ${MACRO_OFFSET} is set at termination, Macro will attempt to continue\n"
+"at priority MACRO_OFFSET + N + 1 if such a step exists, and N + 1 otherwise.\n";
+
 static char *exit_descrip =
 "  MacroExit():\n"
 "Causes the currently running macro to exit as if it had\n"
@@ -79,10 +93,12 @@
 
 static char *app = "Macro";
 static char *if_app = "MacroIf";
+static char *iftime_app = "MacroIfTime";
 static char *exit_app = "MacroExit";
 
 static char *synopsis = "Macro Implementation";
 static char *if_synopsis = "Conditional Macro Implementation";
+static char *iftime_synopsis = "Condition Macro Implementation depending on current Time";
 static char *exit_synopsis = "Exit From Macro";
 
 LOCAL_USER_DECL;
@@ -337,6 +353,30 @@
 
 	return res;
 }
+
+static int macroiftime_exec(struct ast_channel *chan, void *data) 
+{
+	int res=0;
+	char *s, *ts;
+	struct ast_timing timing;
+
+	if (ast_strlen_zero(data)) {
+		ast_log(LOG_WARNING, "MacroIfTime requires an argument:\n  <time range>|<days of week>|<days of month>|<months>?[[context|]extension|]priority\n");
+		return -1;
+	}
+
+	if ((s = ast_strdupa(data))) {
+		ts = s;
+
+		/* Separate the Macro path */
+		strsep(&ts,"?");
+
+		/* struct ast_include include contained garbage here, fixed by zeroing it on get_timerange */
+		if (ast_build_timing(&timing, s) && ast_check_timing(&timing))
+			res = macro_exec(chan, (void *)ts);
+	}
+	return res;
+}
 			
 static int macro_exit_exec(struct ast_channel *chan, void *data)
 {
@@ -350,6 +390,7 @@
 	res = ast_unregister_application(if_app);
 	res |= ast_unregister_application(exit_app);
 	res |= ast_unregister_application(app);
+	res |= ast_unregister_application(iftime_app);
 
 	STANDARD_HANGUP_LOCALUSERS;
 
@@ -363,6 +404,7 @@
 	res = ast_register_application(exit_app, macro_exit_exec, exit_synopsis, exit_descrip);
 	res |= ast_register_application(if_app, macroif_exec, if_synopsis, if_descrip);
 	res |= ast_register_application(app, macro_exec, synopsis, descrip);
+	res |= ast_register_application(iftime_app, macroiftime_exec, iftime_synopsis, iftime_descrip);
 
 	return res;
 }