Changeset 3874

Timestamp:

03/25/07 15:22:08 (6 years ago)

Author:

p_lindheimer

Message:

added ability to masquerade an internal callerid number as a different extension, ringgroup, etc. - also fixed bug in vmx when user created with no voicemail, astdb vmx structure was being created although no effect since they had no voicemail

Files:

• freepbx/trunk/amp_conf/astetc/extensions.conf (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (8 diffs)

freepbx/trunk/amp_conf/astetc/extensions.conf

@@ -926 +926 @@
-exten => s,n,Set(AMPUSERCIDNAME=${DB(AMPUSER/${AMPUSER}/cidname)})
-exten => s,n,GotoIf($["x${AMPUSERCIDNAME:1:2}" = "x"]?report) 
-
+
+
+
+
+
+
+
-exten => s,n,Set(REALCALLERIDNUM=${DB(DEVICE/${REALCALLERIDNUM}/user)})
-exten => s,n(report),Noop(TTL: ${TTL} ARG1: ${ARG1})

freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php

@@ -1194 +1194 @@
-  //write to astdb
-  if ($astman) {
+    $cid_masquerade = (isset($cid_masquerade) && trim($cid_masquerade) != "")?trim($cid_masquerade):$extension;
-    $astman->database_put("AMPUSER",$extension."/password",isset($password)?$password:'');
-    $astman->database_put("AMPUSER",$extension."/ringtimer",isset($ringtimer)?$ringtimer:'');
@@ -1200 +1201 @@
-    $astman->database_put("AMPUSER",$extension."/outboundcid",isset($outboundcid)?"\"".$outboundcid."\"":'');
-    $astman->database_put("AMPUSER",$extension."/cidname",isset($name)?"\"".$name."\"":'');
+    $astman->database_put("AMPUSER",$extension."/cidnum",$cid_masquerade);
-    $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-    $astman->database_put("AMPUSER",$extension."/device","\"".isset($device)?$device:''."\"");
@@ -1206 +1208 @@
-    }
-
-
+ && $voicemail != "novm"
-
-      $unavail_mode="enabled";
@@ -1276 +1278 @@
-  if ($astman) {
-    $results['vmx_state']=$astman->database_get("AMPUSER",$extension."/vmx/unavail/state");
+    $cid_masquerade=$astman->database_get("AMPUSER",$extension."/cidnum");
+    $results['cid_masquerade'] = (trim($cid_masquerade) != "")?$cid_masquerade:$extension;
-  } else {
-    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
@@ -1303 +1307 @@
-    $astman->database_del("AMPUSER",$extension."/outboundcid");
-    $astman->database_del("AMPUSER",$extension."/cidname");
+    $astman->database_del("AMPUSER",$extension."/cidnum");
-    $astman->database_del("AMPUSER",$extension."/voicemail");
-    $astman->database_del("AMPUSER",$extension."/device");
@@ -2443 +2448 @@
-  // Ensure variables possibly extracted later exist
-  $name = $directdid = $didalert = $outboundcid = $answer = null;
-
+$cid_masquerade = 
-
-  // Init vars from $_REQUEST[]
@@ -2486 +2491 @@
-    
-    $msgInvalidExtNum = 'Please enter a valid extension number.';
+    $msgInvalidCidNum = 'Please enter a valid CID Num Alias (must be a valid number).';
-    $msgInvalidExtPwd = 'Please enter valid User Password using numbers only';
-    $msgInvalidDispName = 'Please enter a valid Display Name';
@@ -2511 +2517 @@
-    }
-    $currentcomponent->addguielem($section, new gui_textbox('name', $name, 'Display Name', 'The caller id name for calls from this user will be set to this name. Only enter the name, NOT the number.', '!isCallerID()', $msgInvalidDispName, false));
+    $cid_masquerade = (trim($cid_masquerade) == $extdisplay)?"":$cid_masquerade;
+    $currentcomponent->addguielem($section, new gui_textbox('cid_masquerade', $cid_masquerade, 'CID Num Alias', 'The CID Number to user for internal calls, if different then the extension number. This is used to masquerade as a different user. A common example is a team support persons who would like their internal callerid to display the general support number (a ringgroup or queue). There will be no efffect on external calls.', '!isWhitespace() && !isInteger()', $msgInvalidCidNum, false));
-    $currentcomponent->addguielem($section, new gui_textbox('sipname', $sipname, 'SIP Alias', "If you want to support direct sip dialing of users internally or through anonymous sip calls, you can supply a friendly name that can be used in addition to the users extension to call them."));
-