Changeset 6049

Timestamp:

07/18/08 12:53:52 (5 years ago)

Author:

p_lindheimer

Message:

#2923 add back the Call Screening option that were lost when the directdid + inbound routes were merged

Files:

• modules/branches/2.5/core/agi-bin/dialparties.agi (modified) (1 diff)
• modules/branches/2.5/core/functions.inc.php (modified) (7 diffs)
• modules/branches/2.5/core/page.did.php (modified) (1 diff)

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

@@ -216 +216 @@
-}
-$already_screened = get_var( $AGI, "SCREEN" ); // If this is the second pass through dialparties.agi, we don't want to double-screen the caller
+$from_outside     = get_var( $AGI, "FROM_DID" );
+$astvarlibdir     = get_var( $AGI, "ASTVARLIBDIR" );
-// If this isn't a ring group, check to see if the user has call screening on
-$count = 0;
-foreach ($ext as $k) {
-  // Only screen calls if the primary extension is called, or it's follow-me is called, not ring groups
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-        }
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    }
-  }

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

@@ -2085 +2085 @@
-      $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;
@@ -2582 +2572 @@
-    $astman->database_put("AMPUSER",$extension."/cidnum",$cid_masquerade);
-    $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -2703 +2699 @@
-    $cid_masquerade=$astman->database_get("AMPUSER",$extension."/cidnum");
-    $results['cid_masquerade'] = (trim($cid_masquerade) != "")?$cid_masquerade:$extension;
+
+    $call_screen=$astman->database_get("AMPUSER",$extension."/screen");
+    $results['call_screen'] = (trim($call_screen) != "")?$call_screen:'0';
-  } else {
-    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
@@ -2727 +2726 @@
-  }
-  if ($astman && !$editmode) {
+    // TODO just change this to delete everything
-    $astman->database_del("AMPUSER",$extension."/password");
-    $astman->database_del("AMPUSER",$extension."/ringtimer");
@@ -2736 +2736 @@
-    $astman->database_del("AMPUSER",$extension."/voicemail");
-    $astman->database_del("AMPUSER",$extension."/device");
+    $astman->database_del("AMPUSER",$extension."/screen");
-  }
-}
@@ -3989 +3990 @@
-    $currentcomponent->setoptlistopts('callwaiting', 'sort', false);
-
+    $currentcomponent->addoptlistitem('call_screen', '0', _("Disable"));
+    $currentcomponent->addoptlistitem('call_screen', 'nomemory', _("Screen Caller: No Memory"));
+    $currentcomponent->addoptlistitem('call_screen', 'memory', _("Screen Caller: Memory"));
+    $currentcomponent->setoptlistopts('call_screen', 'sort', false);
+
-    $currentcomponent->addoptlistitem('ringtime', '0', 'Default');
-    for ($i=1; $i <= 120; $i++) {
@@ -4152 +4158 @@
-      }
-    }
-'Call Waiting'
-
+_("Call Waiting")
+
-
-    $section = _("Assigned DID/CID");
-    $currentcomponent->addguielem($section, new gui_textbox('newdid_name', $newdid_name, 'DID Description', _("A description for this DID, such as \"Fax\"")), 4);
-'Add Inbound DID'
-'Add Inbound CID'
+_("Add Inbound DID")
+_("Add Inbound CID")
-
-    $dids = core_did_list('extension');

modules/branches/2.5/core/page.did.php

@@ -239 +239 @@
-    <tr><td colspan="2"><h5><?php echo _("Privacy")?><hr></h5></td></tr>
-    <tr>
-
+ The number of digits and attempts can be defined in privacy.conf. If a user has Call Screening enabled, the incoming caller will be asked to enter their CallerId here if enabled, and then to say their name once determined that the called user requires it.
-      <td>
-        <select name="privacyman" tabindex="<?php echo ++$tabindex;?>">