Changeset 1894

Timestamp:

05/11/06 02:01:26 (7 years ago)

Author:

qldrob

Message:

Add support for enabling call waiting by default when creating an extension

Files:

• freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (2 diffs)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.extensions.php (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.users.php (modified) (1 diff)

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

@@ -982 +982 @@
-    $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-    $astman->database_put("AMPUSER",$extension."/device","\"".isset($device)?$device:''."\"");
+    if (isset($amp_conf['ENABLECW']) && $amp_conf['ENABLECW'] == "yes") {
+      $astman->database_put("CW",$extension,"\"ENABLED\"");
+    }
-    $astman->disconnect();
-  } else {
@@ -1087 +1090 @@
-  /*//delete hint
-  core_hint_del($extension);*/
+}
+
+function core_users_cleanastdb($extension) {
+  // This is called to remove any ASTDB traces of the user after a deletion. Otherwise,
+  // call forwarding, call waiting settings could hang around and bite someone if they
+  // recycle an extension. Is called from page.xtns and page.users.
+  global $amp_conf;
+
+  $astman = new AGI_AsteriskManager();
+  if ($res = $astman->connect("127.0.0.1", $amp_conf["AMPMGRUSER"] , $amp_conf["AMPMGRPASS"])) {  
+    $astman->database_del("CW",$extension);
+    $astman->database_del("CF",$extension);
+    $astman->database_del("CFB",$extension);
+    $astman->database_del("CFU",$extension);
+  } else {
+    fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
+  }
-}
-

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.extensions.php

@@ -98 +98 @@
-      core_devices_del($extdisplay);
-      core_users_del($extdisplay,$incontext,$uservm);
+      core_users_cleanastdb($extdisplay);
-      needreload();
-    break;

freepbx/trunk/amp_conf/htdocs/admin/modules/core/page.users.php

@@ -73 +73 @@
-    case "del":
-      core_users_del($extdisplay,$incontext,$uservm);
+      core_users_cleanastdb($extdisplay) 
-      needreload();
-    break;