Changeset 5895

Timestamp:

07/03/08 14:00:33 (3 months ago)

Author:

ethans

Message:

Changes for CALL SCREENING in Privacy Manager

Allows a user to select two additional options in the Privacy Manager: Screen Caller - Memory and Screen Caller - No Memory

When memory call screening is selected, the first time a unique caller id calls a user through a DID, the caller must record their
name which will then be presented to the user this and subsequent calls (via memory in /var/lib/asterisk/sounds/priv-callerintros)

When no memory is selected, each time a caller calls the user, they must record their name. This is useful if a user gets calls from
a company with multiple people behind a single caller id. Choosing this option deletes the priv-callerintros file for that caller id
prior to adding the "p" option to the Dial command.

Call screening is designed to ignore extension-to-extension calls and ring groups. Follow-me is a special case and is not considered
a ring group for this exclusion since call screening would be desirable to a user on follow-me settings. Locally dialed follow-me
execution will *not* be screened, though this may be desirable is open for discussion.

Files:

• modules/branches/2.5/core/agi-bin/dialparties.agi (modified) (2 diffs)
• modules/branches/2.5/core/etc/extensions.conf (modified) (2 diffs)
• modules/branches/2.5/core/functions.inc.php (modified) (5 diffs)

modules/branches/2.5/core/agi-bin/dialparties.agi

@@ -215 +215 @@
-        debug("ringallv2 ring times: REALPRERING: $fmgrp_realprering, PRERING: $fmgrp_prering",4);
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-// IF THE FIRST EXTENSION IS CALL FORWARD ENABLED (put in logic) then we don't do master mode
-// which means we reset the flag here after detecting that and just say we are not in master
@@ -609 +636 @@
-                }
-                $ds .= $ds_seperator . $dialopts; // pound to transfer, provide ringing
+                if ($screen) {
+                        $ds .= "p";
+                }
-                if (trim($use_confirmation) != "FALSE") {
-                        $AGI->set_variable('__RG_IDX',$ringgroup_index);

modules/branches/2.5/core/etc/extensions.conf

@@ -73 +73 @@
-exten => s,n+2(normdial),Dial(${ds})                               ; dialparties will set the priority to 10 if $ds is not null
-exten => s,n,Set(DIALSTATUS=${IF($["${DIALSTATUS_CW}"!="" ]?${DIALSTATUS_CW}:${DIALSTATUS})})
+exten => s,n,GosubIf($["${SCREEN}" != ""]?${DIALSTATUS},1)
-
-exten => s,20(huntdial),NoOp(Returned from dialparties with hunt groups to dial )
@@ -107 +108 @@
-exten => s,n(a50),DBdel(CALLTRACE/${CT_EXTEN})
-exten => s,n,Goto(s,a42)
+
+; For call screening
+exten => NOANSWER,1(screen-vm),Macro(vm,${SCREEN_EXTEN},BUSY)
+exten => NOANSWER,n,Macro(hangupcall)
+exten => TORTURE,1,Goto(app-blackhole,musiconhold,1)
+exten => TORTURE,n,Macro(hangupcall)
+exten => DONTCALL,1,Answer
+exten => DONTCALL,n,Wait(1)
+exten => DONTCALL,n,Zapateller()
+exten => DONTCALL,n,Playback(ss-noservice)
+exten => DONTCALL,n,Macro(hangupcall)
-
-; make sure hungup calls go here so that proper cleanup occurs from call confirmed calls and the like

modules/branches/2.5/core/functions.inc.php

@@ -2011 +2011 @@
-                        $astman->database_put("AMPUSER",$extension."/cidname","\"".addslashes($name)."\"");
-                        $astman->database_put("AMPUSER",$extension."/voicemail","\"".$voicemail."\"");
+                        if($privacyman == "0")  {
+                                $astman->database_del("AMPUSER",$extension."/screen");
+                        }
+                        if($privacyman == "2")  {
+                                $astman->database_put("AMPUSER",$extension."/screen","\"nomemory\"");
+                        }
+                        if($privacyman == "3")  {
+                                $astman->database_put("AMPUSER",$extension."/screen","\"memory\"");
+                        }
+
-                }       
-                return true;
@@ -2522 +2532 @@
-                $astman->database_put("AMPUSER",$extension."/cidnum",$cid_masquerade);
-                $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
+                if($privacyman == "2")  {
+                        $astman->database_put("AMPUSER",$extension."/screen","\"nomemory\"");
+                }
+                if($privacyman == "3")  {
+                        $astman->database_put("AMPUSER",$extension."/screen","\"memory\"");
+                }
+
-                if (!$editmode) {
-                        $astman->database_put("AMPUSER",$extension."/device","\"".((isset($device))?$device:'')."\"");
@@ -2625 +2642 @@
-
-        //delete details to astdb
+        if($astman)  {
+                $astman->database_del("AMPUSER",$extension."/screen");
+        }
-        if ($astman && !$editmode) {
-                $astman->database_del("AMPUSER",$extension."/password");
@@ -3896 +3916 @@
-                $currentcomponent->setoptlistopts('faxdetecttype', 'sort', false);
-
-
-
-
+
+
+
+
+
-
-                $currentcomponent->addoptlistitem('callwaiting', 'enabled', _("Enable"));
@@ -4070 +4092 @@
-                $section = 'Privacy';
-                $privacyman = (isset($privacyman) ? $privacyman : '0');
-               $currentcomponent->addguielem($section, new gui_selectbox('privacyman', $currentcomponent->getoptlist('privyn'), $privacyman, 'Privacy Manager', _("If no Caller ID is sent, Privacy Manager will asks the caller to enter their 10 digit phone number. The caller is given 3 attempts
+                $currentcomponent->addguielem($section, new gui_selectbox('privacyman', $currentcomponent->getoptlist('privoptions'), $privacyman, 'Privacy Manager',_("Choose 'Require Caller ID' and If no Caller ID is sent, Privacy Manager will asks the caller to enter their 10 digit phone number. The caller is given 3 attempts.  If 'Screen Caller' is chosen, the caller must say their name, which will be played back to the user and allow the user to accept or reject the call.  Screening with memory only verifies a user for their caller-id once.  Screening without memory always requires a caller to say their name
-
-        }