Changeset 5898

Timestamp:

07/04/08 00:56:12 (3 months ago)

Author:

p_lindheimer

Message:

Modified User Page (in Users Mode) to list each device that is either
a fixed device to the user or is Adhoc with the this user as default.
Each list item a link to edit the device.

Merged directdids to inbound routing and then made the following changes:
- any did that has extension as destination is listed with an edit link

under with the destination. This includes DID/CID pairs.

- you can add a did/cid pair to an extension but once added you can not

delete it. The link takes you to the inbound routes page.

- modified inbound routes to provide filters to see just directdids,

just non-directdid, or routes with no destination.

- added a "Clear Destination & Submit" button to clear a destination prior

to submiting.

- core_get_config will not create ext-did contexts for dids with no

destination.

- old core_direct_did() functions have been deprecrated and return an

empty array(), the equivalent as if there were not directdids found.

- Question to ponder - if there is an any/any route, should we send

un-assigned did's to it?

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (30 diffs)
• modules/branches/2.5/core/images (added)
• modules/branches/2.5/core/images/email_edit.png (added)
• modules/branches/2.5/core/images/telephone_edit.png (added)
• modules/branches/2.5/core/images/telephone_key.png (added)
• modules/branches/2.5/core/install.php (modified) (2 diffs)
• modules/branches/2.5/core/page.did.php (modified) (5 diffs)

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

@@ -744 +744 @@
-                                $catchall_context='ext-did-catchall';
-                                foreach($didlist as $item) {
-
-
-
+
+
+
+
+
-
-                                        $exten = (empty($exten)?"s":$exten);
@@ -827 +829 @@
-                                        //the goto destination
-                                        // destination field in 'incoming' database is backwards from what ext_goto expects
-did
+item
-                                        $goto_exten = strtok(',');
-                                        $goto_pri = strtok(',');
@@ -845 +847 @@
-                                }
-                                        
-                        }
-
-                        /* MODIFIED (PL)
-                         *
-                         * Add Direct DIDs
-                         *
-                         * This functions creates a new context, ext-did-direct, used to route an incoming DID directly to the specified user.
-                         * The purpose is to use when a user has a personal external DID. This keeps it clean and easy to administer.
-                         * Any conflict with those routes will depend on which of the two contexts are included first in the extensions.conf file.
-                         *
-                         * Calls are sent to context from-did-direct though this feature. You must create that context in extenions.conf or
-                         * in extensions_custom.conf and it should look something like:
-                         *
-                         * [from-did-direct]
-                         * include => ext-findmefollow
-                         * include => ext-local
-                         *
-                         * This is so that personal ring groups are used if they exist for the direct did and if not, then the local extension.
-                         * If the module is not implented, it will just go to the users extension.
-                         */
-
-                        $directdidlist = core_directdid_list();
-                        if(is_array($directdidlist)){
-                                $context = "ext-did";
-                                if(!is_array($didlist)){
-                                        /* if not set above, add one here */
-                                        $ext->add($context, 'fax', '', new ext_goto('1','in_fax','ext-fax'));
-                                }
-                                foreach($directdidlist as $item) {
-                                        $exten = $item['directdid'];
-                                        $ext->add($context, $exten, '', new ext_setvar('__FROM_DID','${EXTEN}'));
-                                        // always set callerID name
-                                        $ext->add($context, $exten, '', new ext_gotoif('$[ "${CALLERID(name)}" != "" ] ','cidok'));
-                                        $ext->add($context, $exten, '', new ext_setvar('CALLERID(name)','${CALLERID(num)}'));
-                                        $ext->add($context, $exten, 'cidok', new ext_noop('CallerID is ${CALLERID(all)}'));
-
-                                        if (!empty($item['mohclass']) && trim($item['mohclass']) != 'default') {
-                                                $ext->add($context, $exten, '', new ext_setmusiconhold($item['mohclass']));
-                                                $ext->add($context, $exten, '', new ext_setvar('__MOHCLASS',$item['mohclass']));
-                                        }
-                                        
-                                        if ($item['faxexten'] != "default") {
-                                                $ext->add($context, $exten, '', new ext_setvar('FAX_RX',$item['faxexten']));
-                                        }
-                                        if (!empty($item['faxemail'])) {
-                                                $ext->add($context, $exten, '', new ext_setvar('FAX_RX_EMAIL',$item['faxemail']));
-                                        }
-                                        if ($item['answer'] == "1") {
-                                                $ext->add($context, $exten, '', new ext_answer(''));
-                                                $ext->add($context, $exten, '', new ext_wait($item['wait']));
-                                        }
-                                        if ($item['answer'] == "2") { // NVFaxDetect
-                                                $ext->add($context, $exten, '', new ext_answer(''));
-                                                $ext->add($context, $exten, '', new ext_playtones('ring'));
-                                                $ext->add($context, $exten, '', new ext_nvfaxdetect($item['wait']));
-                                        }
-                                        if ($item['privacyman'] == "1") {
-                                                $ext->add($context, $exten, '', new ext_macro('privacy-mgr'));
-                                        }
-
-
-                                        if (!empty($item['didalert'])) {
-                                                $ext->add($context, $exten, '', new ext_setvar("_ALERT_INFO", str_replace(';', '\;', $item['didalert'])));
-                                        }
-                                        $goto_context = 'from-did-direct';
-                                        $goto_exten = $item['extension'];
-                                        $goto_pri = 1;
-                                        $ext->add($context, $exten, '', new ext_goto($goto_pri,$goto_exten,$goto_context));
-
-                                }
-                        }
-
@@ -1655 +1587 @@
-        if (($extension != $old_extension) || ($cidnum != $old_cidnum)) {
-                $existing=core_did_get($extension,$cidnum);
-
-
-
-
-
-
-
-
-
-
+
+
+
-                core_did_del($old_extension,$old_cidnum);
-                core_did_add($incoming);
-                return true;
-        } else {
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        foreach ($incoming as $key => $val) { ${$key} = addslashes($val); } // create variables from request
-
@@ -1684 +1605 @@
-        //
-        $existing=core_did_get($extension,$cidnum);
-
-
-
-
-
-
-
-
+
+
+
-                $sql="INSERT INTO incoming (cidnum,extension,destination,faxexten,faxemail,answer,wait,privacyman,alertinfo, ringing, mohclass, description, grppre) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$ringing', '$mohclass', '$description', '$grppre')";
-                sql($sql);
-                return true;
-        } else {
-
-
-
-
-
+
-                return false;
-        }
@@ -1708 +1620 @@
-
-
-
-
-
-
-
-/* begin page.devices.php functions */
-
-//get the existing devices
-
-
+
+
+
+
+
+
-        switch (strtoupper($tech)) {
-                case "IAX":
@@ -1731 +1642 @@
-        }
-        $sql .= ' ORDER BY id';
-
-
+
+
+
-        foreach($results as $result){
-
+
+
+
+
+
+
+
+
+
+
-                        $extens[] = array(
-                                0=>$result[0],  // for backwards compatibility
@@ -1741 +1662 @@
-                                'description'=>$result[1],
-                        );
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -2430 +2348 @@
-        }
-
-
+
+
+
+
+
+
-        //
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                        return false;
-                }
@@ -2473 +2394 @@
-        }
-
-        // MODIFICATION: (PL)
-        // Added for directdid and didalert l for Alert Info distinctive ring)
-        //
-        // cleanup any non dial pattern characters prior to inserting into the database
-        // then add directdid to the insert command.
-        //
-        // Clean replace any <> with () in display name - should have javascript stopping this but ...
-        //
@@ -2484 +2399 @@
-        
-        //insert into users table
-directdid,didalert,faxexten,faxemail,answer,wait,privacyman,mohclass
+privacyman
-        $sql.= "$extension\", \"";
-        $sql.= isset($password)?$password:'';
@@ -2500 +2415 @@
-        $sql.= isset($outboundcid)?$outboundcid:'';
-        $sql.= "\", \"";
-        $sql.= isset($directdid)?$directdid:'';
-        $sql.= "\", \"";
-        $sql.= isset($didalert)?$didalert:'';
-
-        $sql.= "\", \"";
-        $sql.= isset($faxexten)?$faxexten:'';
-        $sql.= "\", \"";
-        $sql.= isset($faxemail)?$faxemail:'';
-        $sql.= "\", \"";
-        $sql.= isset($answer)?$answer:'';
-        $sql.= "\", \"";
-        $sql.= isset($wait)?$wait:'';
-        $sql.= "\", \"";
-        $sql.= isset($privacyman)?$privacyman:'';
-        $sql.= "\", \"";
-        $sql.= isset($mohclass)?$mohclass:'';
-        $sql.= "\", \"";
-        $sql.= isset($sipname)?$sipname:'';
@@ -2588 +2488 @@
-                fatal("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
-        }
+
+        // OK - got this far, if they entered a new inbound DID/CID let's deal with it now
+        // remember - in the nice and ugly world of this old code, $vars has been extracted
+        // newdid and newdidcid
+
+        // Now if $newdid is set we need to add the DID to the routes
+        //
+        if ($newdid != '') {
+                $did_dest                = 'from-did-direct,'.$extension.',1';
+                $did_vars['extension']   = $newdid;
+                $did_vars['cidnum']      = $newdidcid;
+                $did_vars['faxexten']    = '';
+                $did_vars['faxemail']    = '';
+                $did_vars['answer']      = '0';
+                $did_vars['wait']        = '0';
+                $did_vars['privacyman']  = '';
+                $did_vars['alertinfo']   = '';
+                $did_vars['ringing']     = '';
+                $did_vars['mohclass']    = 'default';
+                $did_vars['description'] = '';
+                $did_vars['grppre']      = '';
+                core_did_add($did_vars, $did_dest);
+        }
+
-        return true;
-}
@@ -2659 +2583 @@
-
-function core_users_directdid_get($directdid=""){
-
-
-
-
-
-
+
-}
-
@@ -2699 +2618 @@
-        }
-        
-        $directdid=$vars['directdid'];
-        $directdid = preg_replace("/[^0-9._XxNnZz\[\]\-\+]/" ,"", trim($directdid));
-        // clean and check the did to make sure it is not being used by another extension or in did routing
-        //
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        return false;
-                }
@@ -2726 +2649 @@
-
-function core_directdid_list(){
-
-
-
-
-
+
+
-
-function core_zapchandids_add($description, $channel, $did) {
@@ -3965 +3885 @@
-}
-
+// Used below in usort
+function dev_grp($a, $b) {
+        if ($a['devicetype'] == $b['devicetype']) {
+                return ($a['id'] < $b['id']) ? -1 : 1;
+        } else {
+                return ($a['devicetype'] > $b['devicetype']) ? -1 : 1;
+        }
+}
+
-function core_users_configpageload() {
-        global $currentcomponent;
@@ -3970 +3899 @@
-
-        // Ensure variables possibly extracted later exist
-
-
+
-
-        // Init vars from $_REQUEST[]
@@ -3993 +3921 @@
-                if ( is_string($extdisplay) ) { 
-
-GLOBALS['abort']) || $
+_GLOBALS['abort']) || $_
-                                $extenInfo=core_users_get($extdisplay);
-                                extract($extenInfo);
@@ -4002 +3930 @@
-                        if ( $display == 'extensions' ) {
-                                $currentcomponent->addguielem('_top', new gui_pageheading('title', _("Extension").": $extdisplay", false), 0);
-GLOBALS['abort']) || $
+_GLOBALS['abort']) || $_
-                                        $currentcomponent->addguielem('_top', new gui_link('del', _("Delete Extension")." $extdisplay", $delURL, true, false), 0);
-
@@ -4012 +3940 @@
-                        } else {
-                                $currentcomponent->addguielem('_top', new gui_pageheading('title', _("User").": $extdisplay", false), 0);
-GLOBALS['abort']) || $
+_GLOBALS['abort']) || $_
-                                        $currentcomponent->addguielem('_top', new gui_link('del', _("Delete User")." $extdisplay", $delURL, true, false), 0);
-
@@ -4046 +3974 @@
-                        $section = ($extdisplay ? _("Edit User") : _("Add User"));
-                }
-$extdisplay
+trim($extdisplay) != ''
-                        $currentcomponent->addguielem($section, new gui_hidden('extension', $extdisplay), 2);
-                } else {
@@ -4060 +3988 @@
-                $currentcomponent->addguielem($section, new gui_textbox('cid_masquerade', $cid_masquerade, 'CID Num Alias', _("The CID Number to use for internal calls, if different from the extension number. This is used to masquerade as a different user. A common example is a team of support people who would like their internal callerid to display the general support number (a ringgroup or queue). There will be no effect 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.")));
+
+                // If user mode, list devices associated with this user
+                //
+                if ($display == 'users' && trim($extdisplay != '')) {
+                        $section = _("User Devices");
+                        $device_list = core_devices_list('all','full');
+
+                        usort($device_list,'dev_grp');
+
+                        $link_count = 0;
+                        foreach ($device_list as $device_item) {
+                                if ($device_item['user'] == $extdisplay) {
+                                        $addURL = $_SERVER['PHP_SELF'].'?type=setup&display=devices&skip=0&extdisplay='.$device_item['id'];
+                                        $device_icon = ($device_item['devicetype'] == 'fixed') ? 'images/telephone_key.png' : 'images/telephone_edit.png';
+                                        $device_label  = '&nbsp;';
+                                        $device_label .=  _('Edit:');
+                                        $device_label .= '&nbsp;'.$device_item['id'].'&nbsp;'.$device_item['description'];
+
+                                        $device_label = '<span>
+                                                <img width="16" height="16" border="0" title="Edit Device" alt="Edit Device" src="'.$device_icon.'"/>'.$device_label.
+                                                '</span> ';
+                                        
+                                        $currentcomponent->addguielem($section, new gui_link($link_count++, $device_label, $addURL, true, false), 2);
+                                }
+                        }
+                }
-                
-                $section = 'Extension Options';
-
-
-
-
-
-
+
-                $ringtimer = (isset($ringtimer) ? $ringtimer : '0');
-                $currentcomponent->addguielem($section, new gui_selectbox('ringtimer', $currentcomponent->getoptlist('ringtime'), $ringtimer, 'Ring Time', _("Number of seconds to ring prior to going to voicemail. Default will use the value set in the General Tab. If no voicemail is configured this will be ignored."), false));
@@ -4079 +4028 @@
-                $currentcomponent->addguielem($section, new gui_selectbox('callwaiting', $currentcomponent->getoptlist('callwaiting'), $callwaiting, 'Call Waiting', _("Set the initial/current Call Waiting state for this user's extension"), false));
-
+
+                $section = _("Assigned DID/CID");
+                $dids = core_did_list('extension');
+                $did_count = 0;
+                foreach ($dids as $did) {
+                        $did_dest = split(',',$did['destination']);
+                        if (isset($did_dest[1]) && $did_dest[1] == $extdisplay) {
+
+                                $did_title = ($did['description'] != '') ? $did['description'] : _("DID / CID");
+
+                                $addURL = $_SERVER['PHP_SELF'].'?type=setup&display=did&&extdisplay='.$did['extension'].'/'.$did['cidnum'];
+                                $did_icon = 'images/email_edit.png';
+                                $did_label = ' '.$did['extension'];
+                                if (trim($did['cidnum']) != '') {
+                                        $did_label .= ' / '.$did['cidnum'];
+                                }
+
+                                $did_label = '<span>
+                                        <img width="16" height="16" border="0" title="'.$did_title.'" alt="" src="'.$did_icon.'"/>'.$did_label.
+                                        '</span> ';
+
+                                $currentcomponent->addguielem($section, new gui_link($did_count++, $did_label, $addURL, true, false), 4);
+                        }
+                }
+                $currentcomponent->addguielem($section, new gui_textbox('newdid', $newdid, 'Add Inbound DID', _("A direct DID that is associated with this extension. The DID should be in the same format as provided by the provider (e.g. full number, 4 digits for 10x4, etc).<br><br>Format should be: <b>XXXXXXXXXX</b><br><br>.An optional CID can also be associated with this DID by setting the next box")), 4);
+                $currentcomponent->addguielem($section, new gui_textbox('newdidcid', $newdidcid, 'Add Inbound CID', _("Add a CID for more specific DID + CID routing. A CID must be specified in the above Add DID box")), 4);
+
+
-                $section = 'Recording Options';
-                $currentcomponent->addguielem($section, new gui_selectbox('record_in', $currentcomponent->getoptlist('recordoptions'), $record_in, 'Record Incoming', _("Record all inbound calls received at this extension."), false));
@@ -4112 +4089 @@
-        if (isset($extension) && !checkRange($extension)){
-                echo "<script>javascript:alert('". _("Warning! Extension")." ".$extension." "._("is not allowed for your account").".');</script>";
-
+_
-        } else {
-                //if submitting form, update database
@@ -4121 +4098 @@
-                                $usage_arr = framework_check_extension_usage($_REQUEST['extension']);
-                                if (!empty($usage_arr)) {
-
+_
-                                        $conflict_url = framework_display_extension_usage_alert($usage_arr,true);
-                                        global $currentcomponent;
@@ -4136 +4113 @@
-                                        // this like voicemail!
-                                        //
-
+_
-                                }
-                        break;
@@ -4154 +4131 @@
-                                } else {
-                                        // really bad hack - but if core_users_edit fails, want to stop core_devices_edit
-
+_
-                                }
-                        break;
@@ -4403 +4380 @@
-                case "add":
-                // really bad hack - but if core_users_add fails, want to stop core_devices_add
-GLOBALS['abort']) || $
+_GLOBALS['abort']) || $_
-                        if (core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid)) {
-                                needreload();
@@ -4419 +4396 @@
-                case "edit":  //just delete and re-add
-                        // really bad hack - but if core_users_edit fails, want to stop core_devices_edit
-GLOBALS['abort']) || $
+_GLOBALS['abort']) || $_
-                                core_devices_del($extdisplay,true);
-                                core_devices_add($deviceid,$tech,$devinfo_dial,$devicetype,$deviceuser,$description,$emergency_cid,true);

modules/branches/2.5/core/install.php

@@ -1 +1 @@
-<?php
+
+if (! function_exists("out")) {
+        function out($text) {
+                echo $text."<br />";
+        }
+}
+
+if (! function_exists("outn")) {
+        function outn($text) {
+                echo $text;
+        }
+}
+
+function did_migrate($incoming){
+        global $db;
+
+        foreach ($incoming as $key => $val) { 
+                ${$key} = addslashes($val); 
+        } 
+
+        // Check to make sure the did is not being used elsewhere
+        //
+        $sql = "SELECT * FROM incoming WHERE cidnum = '' AND extension = '$extension'";
+        $existing = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(DB::IsError($existing)) {
+                outn(sprintf(_("ERROR: trying to check if %s already in use"),$extension));
+                return false;
+        }
+        if (empty($existing)) {
+                $sql="INSERT INTO incoming (cidnum,extension,destination,faxexten,faxemail,answer,wait,privacyman,alertinfo, ringing, mohclass, description, grppre) values ('$cidnum','$extension','$destination','$faxexten','$faxemail','$answer','$wait','$privacyman','$alertinfo', '$ringing', '$mohclass', '$description', '$grppre')";
+                sql($sql);
+                return true;
+        } else {
+                return false;
+        }
+}
-
-$fcc = new featurecode('core', 'userlogon');
@@ -61 +97 @@
-unset($fcc);
-
+
+// Version 2.5 Upgrade needs to migrate directdid user info to incoming table
+//
+outn(_("Checking if directdids need migrating.."));
+$sql = "SELECT `directdid` FROM `users`";
+$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if(!DB::IsError($check)) {
+        out(_("starting migration"));
+        $errors = 0;
+        $sql = "SELECT * FROM `users` WHERE `directdid` != '' AND `directdid` IS NOT NULL";
+        $direct_dids_arr = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+        if(!DB::IsError($direct_dids_arr)) {
+                foreach ($direct_dids_arr as $direct_dids) {
+                        $did_vars['destination'] = 'from-did-direct,'.$direct_dids['extension'].',1';
+                        $did_vars['extension']   = $direct_dids['directdid'];
+                        $did_vars['cidnum']      = '';
+                        $did_vars['faxexten']    = $direct_dids['faxexten'];
+                        $did_vars['faxemail']    = $direct_dids['faxemail'];
+                        $did_vars['answer']      = $direct_dids['answer'];
+                        $did_vars['wait']        = $direct_dids['wait'];
+                        $did_vars['privacyman']  = $direct_dids['privacyman'];
+                        $did_vars['alertinfo']   = $direct_dids['didalert'];
+                        $did_vars['ringing']     = '';
+                        $did_vars['mohclass']    = $direct_dids['mohclass'];
+                        $did_vars['description'] = _("User: ").$direct_dids['extension'];
+                        $did_vars['grppre']      = '';
+                        if (!did_migrate($did_vars)) {
+                                out(sprintf(_("ERROR: failed to insert %s for user %s"),$direct_dids['directdid'],$direct_dids['extension']));
+                                $errors++;
+                        }
+                }
+                if ($errors) {
+                        out(sprintf(_("There were %s failures migrating directdids, users table not being changed"),$errors));
+                } else {
+                        $migrate_array = array('directdid', 'didalert', 'mohclass', 'faxexten', 'faxemail', 'answer', 'wait', 'privacyman');
+                        foreach ($migrate_array as $field) {
+                                outn(sprintf(_("Removing field %s from users table.."),$field));
+                                $sql = "ALTER TABLE `users` DROP `".$field."`";
+                                $results = $db->query($sql);
+                                if (DB::IsError($results)) { 
+                                        out(_("not present"));
+                                } else {
+                                        out(_("removed"));
+                                }
+                        }
+                }
+        } else {
+                out(_("ERROR: could not access user table to migrate directdids to incoming table, aborting"));
+        } 
+} else {
+        out(_("already done"));
+}
-?>

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

@@ -20 +20 @@
-$ringing = isset($_REQUEST['ringing'])?$_REQUEST['ringing']:'';
-$description = isset($_REQUEST['description'])?$_REQUEST['description']:'';
+if (isset($_REQUEST['submitclear'])) {
+        $_REQUEST[$goto0.'0'] = '';
+}
-
-if (isset($_REQUEST['extension']) && isset($_REQUEST['cidnum'])) {
-        $extdisplay = $_REQUEST['extension']."/".$_REQUEST['cidnum'];
-}
+
+$didfilter = isset($_REQUEST['didfilter'])?$_REQUEST['didfilter']:'';
-
-//update db if submiting form
@@ -54 +59 @@
-</div>
-
+<?php
+$display_link = isset($extdisplay) && $extdispaly != '' ? "&amp;extdisplay=".$extdisplay : '';
+?>
-<div class="rnav">
-<ul>
-        <li><a <?php echo ($extdisplay=='' ? 'class="current"':'') ?> href="config.php?display=<?php echo urlencode($dispnum)?>"><?php echo _("Add Incoming Route")?></a></li>
+        <li><a <?php echo ($didfilter=='' ? 'class="current"':'') ?> href="config.php?display=<?php echo urlencode($dispnum).$display_link?>"><?php echo _("View All")?></a></li>
+        <li><a <?php echo ($didfilter=='directdid' ? 'class="current"':'') ?> href="config.php?display=<?php echo urlencode($dispnum).'&amp;didfilter=directdid'.$display_link?>"><?php echo _("View Extensions")?></a></li>
+        <li><a <?php echo ($didfilter=='incoming' ? 'class="current"':'') ?> href="config.php?display=<?php echo urlencode($dispnum).'&amp;didfilter=incoming'.$display_link?>"><?php echo _("View General")?></a></li>
+        <li><a <?php echo ($didfilter=='unassigned' ? 'class="current"':'') ?> href="config.php?display=<?php echo urlencode($dispnum).'&amp;didfilter=unassigned'.$display_link?>"><?php echo _("View Un-Assigned")?></a></li>
-<?php 
-//get unique incoming routes
-$inroutes = core_did_list('description');
+switch ($didfilter) {
+        case 'directdid':
+                foreach ($inroutes as $key => $did_items) {
+                        $did_dest = split(',',$did_items['destination']);
+                        if (!isset($did_dest[0]) || $did_dest[0] != 'from-did-direct') {
+                                unset($inroutes[$key]);
+                        }
+                }
+                break;
+        case 'incoming':
+                foreach ($inroutes as $key => $did_items) {
+                        $did_dest = split(',',$did_items['destination']);
+                        if (!isset($did_dest[0]) || $did_dest[0] == 'from-did-direct') {
+                                unset($inroutes[$key]);
+                        }
+                }
+                break;
+        case 'unassigned':
+                foreach ($inroutes as $key => $did_items) {
+                        if (isset($did_items['destination']) && $did_items['destination'] != '') {
+                                unset($inroutes[$key]);
+                        }
+                }
+                break;
+        default:
+}
-if (isset($inroutes)) {
-        foreach ($inroutes as $inroute) {
@@ -65 +103 @@
-                $displaycid = ( empty($inroute['cidnum'])? _("any CID") : $inroute['cidnum'] );
-                $desc = ( empty($inroute['description'])? "" : $inroute['description']."<br />" );