Make the "dialplan remove include" CLI command actually work. Also, tweak

some formatting, and make the success message a little bit more clear.
(closes AST-52)

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

diff --git a/pbx/pbx_config.c b/pbx/pbx_config.c
index 8083fda661d40b972c235720e537b5b4538bff7f..3d4a08c29ee16e3da55ae99a47dee0b7ac588c09 100644 (file)
--- a/pbx/pbx_config.c
+++ b/pbx/pbx_config.c
@@ -135,20 +135,23 @@ static int handle_context_dont_include_deprecated(int fd, int argc, char *argv[]
 
 static int handle_context_remove_include(int fd, int argc, char *argv[])
 {
-       if (argc != 6)
+       if (argc != 6) {
                return RESULT_SHOWUSAGE;
+       }
 
-       if (strcmp(argv[4], "into"))
+       if (strcmp(argv[4], "from")) {
                return RESULT_SHOWUSAGE;
+       }
 
        if (!ast_context_remove_include(argv[5], argv[3], registrar)) {
-               ast_cli(fd, "We are not including '%s' into '%s' now\n",
+               ast_cli(fd, "The dialplan no longer includes '%s' into '%s'\n",
                        argv[3], argv[5]);
                return RESULT_SUCCESS;
        }
 
        ast_cli(fd, "Failed to remove '%s' include from '%s' context\n",
                argv[3], argv[5]);
+
        return RESULT_FAILURE;
 }