work around parsing problem by using GotoIf() (issue #4876)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@6425 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/pbx/pbx_ael.c b/pbx/pbx_ael.c
index a56c87ba79d1708c6956c1a02a9f7deefaca3fec..e422e9b1a211317621779d89267b97de6d1b1efc 100755 (executable)
--- a/pbx/pbx_ael.c
+++ b/pbx/pbx_ael.c
@@ -642,8 +642,8 @@ static int __build_step(const char *what, const char *name, const char *filename
                        if (ast_add_extension2(con, 0, exten, ifend, *label, NULL, app, strdup(margs), FREE, registrar))
                                ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
                        *label = NULL;
-                       app = "Goto";
-                       snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", args, ifstart, elsestart);
+                       app = "GotoIf";
+                       snprintf(margs, mlen, "$[ %s ]?%d:%d", args, ifstart, elsestart);
                        if (ast_add_extension2(con, 0, exten, ifblock, iflabel, NULL, app, strdup(margs), FREE, registrar))
                                ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
                        if (ifskip) {
@@ -694,8 +694,8 @@ static int __build_step(const char *what, const char *name, const char *filename
                        if (ast_add_extension2(con, 0, exten, (*pos)++, *label, NULL, app, strdup(margs), FREE, registrar))
                                ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
                        *label = NULL;
-                       app = "Goto";
-                       snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", args, whileblock, whileend);
+                       app = "GotoIf";
+                       snprintf(margs, mlen, "$[ %s ]?%d:%d", args, whileblock, whileend);
                        if (ast_add_extension2(con, 0, exten, whilestart, whilelabel, NULL, app, strdup(margs), FREE, registrar))
                                ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
                        fillin_process(con, fillin, filename, lineno, exten, whileend, exten, whilestart);
@@ -797,8 +797,8 @@ static int __build_step(const char *what, const char *name, const char *filename
                                if (ast_add_extension2(con, 0, exten, (*pos)++, *label, NULL, app, strdup(margs), FREE, registrar))
                                        ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", *pos, what, name);
                                *label = NULL;
-                               app = "Goto";
-                               snprintf(margs, mlen, "${IF($[ %s ]?%d:%d)}", fields->next->data, forblock, forend);
+                               app = "GotoIf";
+                               snprintf(margs, mlen, "$[ %s ]?%d:%d", fields->next->data, forblock, forend);
                                if (ast_add_extension2(con, 0, exten, forstart, forlabel, NULL, app, strdup(margs), FREE, registrar))
                                        ast_log(LOG_WARNING, "Unable to add step at priority '%d' of %s '%s'\n", forstart, what, name);
                                fillin_process(con, fillin, filename, lineno, exten, forend, exten, forstart);