Changeset 5250

Timestamp:

11/18/07 20:02:26 (1 year ago)

Author:

p_lindheimer

Message:

- fixed hints for adhoc devices to check astdb settings
- added core_check_extensions() for extension registry
- added core_check_destiantions() for destination registry
- added checks for conflicts on overlapping extensions through registry

Files:

• modules/branches/2.4/core/functions.inc.php (modified) (14 diffs)

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

@@ -395 +395 @@
-                                                
-                                        $hint = core_hint_get($exten['extension']);
-
+ {
-                                                $ext->addHint('ext-local', $exten['extension'], $hint);
+                                        }
-                                        if ($exten['sipname']) {
-                                                $ext->add('ext-local', $exten['sipname'], '', new ext_goto('1',$item[0],'from-internal'));
@@ -504 +505 @@
-                                                        // Then do one call to user-callerid and record-enable instead of each time as in the past
-                                                        //
+                                                        $ext->add($outrt['application'], $exten['extension'], '', new ext_macro('user-callerid,SKIPTTL'));
-                                                        $ext->add($outrt['application'], $exten['extension'], '', new ext_setvar("_NODEST",""));
-                                                        $ext->add($outrt['application'], $exten['extension'], '', new ext_macro('user-callerid,SKIPTTL'));
-                                                        $ext->add($outrt['application'], $exten['extension'], '', new ext_macro('record-enable,${AMPUSER},OUT'));
-                                                        $lastexten = $exten['extension'];
@@ -819 +820 @@
-                $astman->database_put("DEVICE",$id."/type",$devicetype);
-                $astman->database_put("DEVICE",$id."/default_user",$user);
-!empty($emergency_cid)
+$emergency_cid != ''
-                        $astman->database_put("DEVICE",$id."/emergency_cid","\"".$emergency_cid."\"");
-                }
@@ -959 +960 @@
-                        $astman->database_put("DEVICE",$id."/type",$devicetype);
-                        $astman->database_put("DEVICE",$id."/user",$user);              
+                        $astman->database_put("DEVICE",$id."/default_user",$user);
+                        if(trim($emergency_cid) != '') {
+                                $astman->database_put("DEVICE",$id."/emergency_cid","\"".$emergency_cid."\"");
+                        }
-                        // If a user is selected, add this device to the user
-                        if ($user != "none") {
@@ -1261 +1266 @@
-
-function core_hint_get($account){
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-        //print_r($results);
-        
-        //create an array of strings
@@ -1311 +1326 @@
-}
-
+function core_check_extensions($exten=true) {
+        global $amp_conf;
+
+        $extenlist = array();
+        if (is_array($exten) && empty($exten)) {
+                return $extenlist;
+        }
+        $sql = "SELECT extension, name FROM users ";
+        if (is_array($exten)) {
+                $sql .= "WHERE extension in ('".implode("','",$exten)."')";
+        }
+        $sql .= " ORDER BY extension";
+        $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
+
+        foreach ($results as $result) {
+                $thisexten = $result['extension'];
+                $extenlist[$thisexten]['description'] = _("User Extension: ").$result['name'];
+                $extenlist[$thisexten]['status'] = 'INUSE';
+                $display = ($amp_conf['AMPEXTENSIONS'] == "deviceanduser")?'users':'extensions';
+                $extenlist[$thisexten]['edit_url'] = "config.php?type=setup&display=$display&extdisplay=".urlencode($thisexten)."&skip=0";
+        }
+        return $extenlist;
+}
+
+function core_check_destinations($dest=true) {
+        global $active_modules;
+
+        $destlist = array();
+        if (is_array($dest) && empty($dest)) {
+                return $destlist;
+        }
+        $sql = "SELECT extension, cidnum, channel, description, destination FROM incoming ";
+        if ($dest !== true) {
+                $sql .= "WHERE destination in ('".implode("','",$dest)."')";
+        }
+        $sql .= "ORDER BY extension, cidnum, channel";
+        $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
+
+        //$type = isset($active_modules['announcement']['type'])?$active_modules['announcement']['type']:'setup';
+
+        foreach ($results as $result) {
+                $thisdest = $result['destination'];
+                $thisid   = $result['extension'].'/'.$result['cidnum'].'/'.$result['channel'];
+                $destlist[] = array(
+                        'dest' => $thisdest,
+                        'description' => 'Inbound Route: '.$result['description'].' ('.$thisid.')',
+                        'edit_url' => 'config.php?display=did&extdisplay='.urlencode($thisid),
+                );
+        }
+        return $destlist;
+}
+
-function core_sipname_check($sipname, $extension) {
-        global $db;
@@ -1328 +1395 @@
-}
-
-
+, $editmode=false
-        extract($vars);
-        
@@ -1455 +1522 @@
-                $astman->database_put("AMPUSER",$extension."/cidnum",$cid_masquerade);
-                $astman->database_put("AMPUSER",$extension."/voicemail","\"".isset($voicemail)?$voicemail:''."\"");
-
+
+
+
-
-                if (trim($callwaiting) == 'enabled') {
@@ -1546 +1615 @@
-}
-
-
+, $editmode=false
-        global $db;
-        global $amp_conf;
@@ -1559 +1628 @@
-
-        //delete details to astdb
-
+ && !$editmode
-                $astman->database_del("AMPUSER",$extension."/password");
-                $astman->database_del("AMPUSER",$extension."/ringtimer");
@@ -1569 +1638 @@
-                $astman->database_del("AMPUSER",$extension."/voicemail");
-                $astman->database_del("AMPUSER",$extension."/device");
-        } else {
-                fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
-        }
-}
@@ -1634 +1701 @@
-        //delete and re-add
-        if (core_sipname_check($vars['sipname'],$extension)) {
-
-
+, true
+, true
-        }
-        return true;
@@ -2826 +2893 @@
-                        if ( $display == 'extensions' ) {
-                                $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Extension").": $extdisplay", false), 0);
-
+
+
+
-                        } else {
-                                $currentcomponent->addguielem('_top', new gui_pageheading('title', _("User").": $extdisplay", false), 0);
-
+
+
+
-                        }
-
@@ -2928 +2999 @@
-                switch ($action) {
-                        case "add":
-
+
+
+
+
+
+
+
+
+
+
+
-                                        needreload();
-                                        redirect_standard_continue();