Merged revisions 24097 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 2 May 2006 02:24:58 +0000 (02:24 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 2 May 2006 02:24:58 +0000 (02:24 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r24097 | tilghman | 2006-05-01 21:12:52 -0500 (Mon, 01 May 2006) | 2 lines

Prompt does not request '#' to end input, so the application should not require it

........

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

apps/app_privacy.c

index eb722e5..00af9fc 100644 (file)
@@ -189,13 +189,21 @@ static int privacy_exec (struct ast_channel *chan, void *data)
                }
                
                /*Got a number, play sounds and send them on their way*/
                }
                
                /*Got a number, play sounds and send them on their way*/
-               if ((retries < maxretries) && !res ) {
+               if ((retries < maxretries) && res >= 0 ) {
                        res = ast_streamfile(chan, "privacy-thankyou", chan->language);
                        if (!res)
                                res = ast_waitstream(chan, "");
                        res = ast_streamfile(chan, "privacy-thankyou", chan->language);
                        if (!res)
                                res = ast_waitstream(chan, "");
-                       ast_set_callerid (chan, phone, "Privacy Manager", NULL);
-                       if (option_verbose > 2)
-                               ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s\n",phone);
+
+                       ast_set_callerid (chan, phone, "Privacy Manager", NULL); 
+
+                       /* Clear the unavailable presence bit so if it came in on PRI
+                        * the caller id will now be passed out to other channels
+                        */
+                       chan->cid.cid_pres &= (AST_PRES_UNAVAILABLE ^ 0xFF);
+
+                       if (option_verbose > 2) {
+                               ast_verbose (VERBOSE_PREFIX_3 "Changed Caller*ID to %s, callerpres to %d\n",phone,chan->cid.cid_pres);
+                       }
                        pbx_builtin_setvar_helper(chan, "PRIVACYMGRSTATUS", "SUCCESS");
                } else {
                        if (priority_jump || ast_opt_priority_jumping)  
                        pbx_builtin_setvar_helper(chan, "PRIVACYMGRSTATUS", "SUCCESS");
                } else {
                        if (priority_jump || ast_opt_priority_jumping)