Changeset 5904

Timestamp:

07/04/08 14:30:53 (5 months ago)

Author:

p_lindheimer

Message:

#2760 added Turkey indications, more tweaks on the directdid merge, added link back to extension

Files:

• modules/branches/2.5/core/functions.inc.php (modified) (8 diffs)
• modules/branches/2.5/core/page.did.php (modified) (2 diffs)

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

@@ -757 +757 @@
-                                        $exten = $item['extension'];
-                                        $cidnum = $item['cidnum'];
+
+                                        // If the user put in just a cid number for routing, we add _. pattern to catch
+                                        // all DIDs with that CID number. Asterisk will complain about _. being dangerous
+                                        // but we don't want to limit this to just numberic as someone may be trying to
+                                        // route a non-numeric did
+                                        //
+                                        if (trim($cidnum) != '' && trim($exten) == '') {
+                                                $exten = '_.';
+                                        }
-
-                                        $exten = (empty($exten)?"s":$exten);
@@ -2361 +2370 @@
-        $newdidcid = preg_replace("/[^0-9._XxNnZz\[\]\-\+]/" ,"", trim($newdidcid));
-
-        // Asterisk does not want just CID set so if it is add _X. to the DID
-        //
-        if ($newdid == '' && $newdidcid != '') {
-                $newdid = '_X.';
-        }
-        // Well more ugliness since the javascripts are already in here
-
+ || $newdidcid != ''
-                $existing = core_did_get($newdid, $newdidcid);
-                if (! empty($existing)) {
@@ -2501 +2505 @@
-        // Now if $newdid is set we need to add the DID to the routes
-        //
-
+ || $newdidcid != ''
-                $did_dest                = 'from-did-direct,'.$extension.',1';
-                $did_vars['extension']   = $newdid;
@@ -2631 +2635 @@
-        $newdidcid = preg_replace("/[^0-9._XxNnZz\[\]\-\+]/" ,"", trim($newdidcid));
-
-        // Asterisk does not want just CID set so if it is add _X. to the DID
-        //
-        if ($newdid == '' && $newdidcid != '') {
-                $newdid = '_X.';
-        }
-        // Well more ugliness since the javascripts are already in here
-
+ || $newdidcid != ''
-                $existing = core_did_get($newdid, $newdidcid);
-                if (! empty($existing)) {
@@ -3783 +3782 @@
- array ( "name" => "South Africa",  "iso" => "za", "conf" => "ringcadence = 400,200,400,2000\ndial = 400*33\nbusy = 400/500,0/500\nring = 400*33/400,0/200,400*33/400,0/2000\ncongestion = 400/250,0/250\ncallwaiting = 400*33/250,0/250,400*33/250,0/250,400*33/250,0/250,400*33/250,0/250\ndialrecall = 350+440\nrecord = 1400/500,0/10000\ninfo = 950/330,1400/330,1800/330,0/330\nstutter =!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,!400*33/100,!0/100,400*33 \n"),
- array ( "name" => "Sweden",  "iso" => "se", "conf" => "ringcadence = 1000,5000\ndial = 425\nbusy = 425/250,0/250\nring = 425/1000,0/5000\ncongestion = 425/250,0/750\ncallwaiting = 425/200,0/500,425/200,0/9100\ndialrecall = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425\nrecord = 1400/500,0/15000\ninfo = !950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,!0/2024,!950/332,!0/24,!1400/332,!0/24,!1800/332,0\nstutter = !425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,!425/100,!0/100,425\n"),
+ array ("name" => "Turkey", "iso" => "tr", "conf" => "ringcadance = 2000,4000\ndial = 450\nbusy = 450/500,0/500\nring = 450/2000,450/4000\ncongestion = 450/200,0/200,450/200,0/200,450/200,0/200,450/600,0/200\ncallwaiting = 450/200,0/600,450/200,0/8000\ndialrecall = 450/1000,0/250\nrecord = 1400/500,0/15000\ninfo = !950/300,!1400/300,!1800/300,!0/1000,!950/300,!1400/300,!1800/300,!0/1000,!950/300,!1400/300,!1800/300,!0/1000,0\n"),
- array ( "name" => "United Kingdom",  "iso" => "uk", "conf" => "ringcadence = 400,200,400,2000\ndial = 350+440\nspecialdial = 350+440/750,440/750\nbusy = 400/375,0/375\ncongestion = 400/400,0/350,400/225,0/525\nspecialcongestion = 400/200,1004/300\nunobtainable = 400\nring = 400+450/400,0/200,400+450/400,0/2000\ncallwaiting = 400/100,0/4000\nspecialcallwaiting = 400/250,0/250,400/250,0/250,400/250,0/5000\ncreditexpired = 400/125,0/125\nconfirm = 1400\nswitching = 400/200,0/400,400/2000,0/400\ninfo = 950/330,0/15,1400/330,0/15,1800/330,0/1000\nrecord = 1400/500,0/60000\nstutter = 350+440/750,440/750\n"),
- array ( "name" => "United States / North America",  "iso" => "us", "conf" => "ringcadence = 2000,4000\ndial = 350+440\nbusy = 480+620/500,0/500\nring = 440+480/2000,0/4000\ncongestion = 480+620/250,0/250\ncallwaiting = 440/300,0/10000\ndialrecall = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440\nrecord = 1400/500,0/15000\ninfo = !950/330,!1400/330,!1800/330,0\nstutter = !350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,!350+440/100,!0/100,350+440\n"),
@@ -4002 +4002 @@
-
-                $section = _("Assigned DID/CID");
+                $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);
+
-                $dids = core_did_list('extension');
-                $did_count = 0;
@@ -4012 +4015 @@
-                                $addURL = $_SERVER['PHP_SELF'].'?type=setup&display=did&&extdisplay='.$did['extension'].'/'.$did['cidnum'];
-                                $did_icon = 'images/email_edit.png';
-
+trim($did['extension']) == '' ? ' Any DID' : 
-                                if (trim($did['cidnum']) != '') {
-                                        $did_label .= ' / '.$did['cidnum'];
@@ -4027 +4030 @@
-                        }
-                }
-                $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';

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

@@ -60 +60 @@
-
-<?php
-al
+la
-?>
-<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>
-
-Extension
-
--Assigned")?></a></li
+ DIDs
+User DID
+ DIDs
+used DIDs")?></a></li><hr
-<?php 
-//get unique incoming routes
@@ -125 +125 @@
-                <h2><?php echo _("Route")?>: <?php echo !empty($description)?$description:$extdisplay; ?></h2>
-                <a href="<?php echo $delURL ?>"><?php echo _("Delete Route")?> <?php echo !empty($description)?$description:$extdisplay ?></a>
+<?php
+        // If this is a direct did, e.g. from-did-direct,nnn,1 then make a link to the extension
+        //
+        $did_dest = split(',',$destination);
+        if (isset($did_dest[0]) && $did_dest[0] == 'from-did-direct') {
+
+                if (isset($amp_conf["AMPEXTENSIONS"]) && ($amp_conf["AMPEXTENSIONS"] == "deviceanduser")) {
+                        $editURL = $_SERVER['PHP_SELF'].'?display=users&extdisplay='.$did_dest[1];
+                        $EXTorUSER = "User";
+                }
+                else {
+                        $editURL = $_SERVER['PHP_SELF'].'?display=extensions&extdisplay='.$did_dest[1];
+                        $EXTorUSER = "Extension";
+                }
+                echo "<p><a href=".$editURL."> Edit ".$EXTorUSER." ".$did_dest[1]."</a></p>";
+        }
+?>
-<?php } else { ?>
-                <h2><?php echo _("Add Incoming Route")?></h2>