Changeset 3997

Timestamp:

06/07/07 20:46:44 (6 years ago)

Author:

p_lindheimer

Message:

Merged revisions 3726-3727,3729-3732,3734-3735,3737-3738,3740-3741,3743,3745,3747,3752-3753,3756,3758-3769,3771,3773-3774,3778-3793,3797,3799-3804,3807,3809-3825,3827-3829,3831-3836,3838-3845,3847,3850,3852-3856,3859-3869,3871,3873-3882,3884-3885,3887-3890,3892-3895,3897-3902,3904,3906,3908,3910-3916,3918,3920,3922-3927,3929-3932,3934,3936-3937,3939-3946,3948-3955,3957,3959,3964,3967,3969-3970,3972,3974-3977,3979-3996 via svnmerge from
https://amportal.svn.sourceforge.net/svnroot/amportal/freepbx/branches/2.2

........

r3981 | diego_iastrubni | 2007-05-14 06:21:31 -0700 (Mon, 14 May 2007) | 2 lines

when no address defined for the web root, ask to relod the server, and don't type an empty address. the code has been taken from install_amp.

........

r3995 | p_lindheimer | 2007-06-07 17:42:50 -0700 (Thu, 07 Jun 2007) | 1 line

allow core_devices_list to filter on tech type

........

Files:

• freepbx/trunk (modified) (1 prop)
• freepbx/trunk/amp_conf/bin/retrieve_conf (modified) (1 diff)
• freepbx/trunk/amp_conf/htdocs/admin/modules/core/functions.inc.php (modified) (2 diffs)

freepbx/trunk/amp_conf/bin/retrieve_conf

@@ -455 +455 @@
-// **** Set reload flag for AMP admin
-needreload();
-
+
+
+
+
+
+
+
+
-?>

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

@@ -588 +588 @@
-
-//get the existing devices
-
+$tech="all"
-  $sql = "SELECT id,description FROM devices";
+  switch ($tech) {
+    case "iax":
+    case "IAX":
+      $sql .= " WHERE tech = 'iax2'";
+      break;
+    case "iax2":
+    case "IAX2":
+    case "sip":
+    case "SIP":
+    case "zap":
+    case "ZAP":
+      $sql .= " WHERE tech = '".strtolower($tech)."'";
+      break;
+    case "all":
+    default:
+  }
-  $results = sql($sql,"getAll");
-
@@ -2473 +2489 @@
- array ( "name" => "Greece",  "iso" => "gr", "conf" => "ringcadence = 1000,4000\ndial = 425/200,0/300,425/700,0/800\nbusy = 425/300,0/300\nring = 425/1000,0/4000\ncongestion = 425/200,0/200\ncallwaiting = 425/150,0/150,425/150,0/8000\ndialrecall = 425/650,0/25\nrecord = 1400/400,0/15000\ninfo = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0\nstutter = 425/650,0/25\n"),
- array ( "name" => "Hungary",  "iso" => "hu", "conf" => "ringcadence = 1250,3750\ndial = 425\nbusy = 425/300,0/300\nring = 425/1250,0/3750\ncongestion = 425/300,0/300\ncallwaiting = 425/40,0/1960\ndialrecall = 425+450\nrecord = 1400/400,0/15000\ninfo = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0\nstutter = 350+375+400\n"),
+ array ( "name" => "India",  "iso" => "in", "conf" => "ringcadence = 400,200,400,2000\ndial = 400*25\nbusy = 400/750,0/750\nring = 400*25/400,0/200,400*25/400,0/2000\ncongestion = 400/250,0/250\ncallwaiting = 400/200,0/100,400/200,0/7500\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/1000\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"),
- array ( "name" => "Israel",  "iso" => "il", "conf" => "ringcadence = 1000,3000\ndial = 414\nbusy = 414/500,0/500\nring = 414/1000,0/3000\ncongestion = 414/250,0/250\ncallwaiting = 414/100,0/100,414/100,0/100,414/600,0/3000 \ndialrecall = !414/100,!0/100,!414/100,!0/100,!414/100,!0/100,414\nrecord = 1400/500,0/15000\ninfo = 1000/330,1400/330,1800/330,0/1000\nstutter = !414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,!414/160,!0/160,414 \n"),
- array ( "name" => "Italy",  "iso" => "it", "conf" => "ringcadence = 1000,4000\ndial = 425/200,0/200,425/600,0/1000\nbusy = 425/500,0/500\nring = 425/1000,0/4000\ncongestion = 425/200,0/200\ncallwaiting = 425/400,0/100,425/250,0/100,425/150,0/14000\ndialrecall = 470/400,425/400\nrecord = 1400/400,0/15000\ninfo = !950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,!950/330,!1400/330,!1800/330,!0/1000,0\nstutter = 470/400,425/400\n"),