Changeset 11036

Timestamp:

01/20/11 14:17:22 (2 years ago)

Author:

p_lindheimer

Message:

closes #4752 adds outbound concurrency limit options to extensions

Files:

• freepbx/trunk/libfreepbx.install.php (modified) (1 diff)
• modules/branches/2.9/core/functions.inc.php (modified) (6 diffs)

freepbx/trunk/libfreepbx.install.php

@@ -718 +718 @@
-  $freepbx_conf->define_conf_setting('CFRINGTIMERDEFAULT',$set);
-  unset($opts);  
+ 
+  // CONCURRENCYLIMITDEFAULT
+  $opts = array();
+  for ($i=0;$i<=120;$i++) {
+      $opts[]=$i;
+  }
+  $set['value'] = '0';
+  $set['options'] = $opts;
+  $set['name'] = 'Extension Concurrency Limit';
+  $set['description'] = 'Default maximum number of outbound simultaneous calls that an extension can make. This is also very useful as a Security Protection against a system that has been compromised. It will limit the number of simultaneous calls that can be made on the compromised extension. This default is used when an extension is created. A default of 0 means no limit.';
+  $set['emptyok'] = 0;
+  $set['type'] = CONF_TYPE_SELECT;
+  $freepbx_conf->define_conf_setting('CONCURRENCYLIMITDEFAULT',$set);
+  unset($opts);  
-
-  //

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

@@ -1790 +1790 @@
-          // CID part of the dialplan will not get executed
-          if (!isset($add_extra_pri1[$fpattern['base_pattern']])) {
-SKIPTTL
+LIMIT
-            $add_extra_pri1[$fpattern['base_pattern']] = true;
-          }
-          if ($fpattern['base_pattern'] != $exten) {
-SKIPTTL
+LIMIT
-          }
-          $ext->add($context, $exten, '', new ext_noop_trace(sprintf(_('Calling Out Route: %s'),$route['name']),1)); 
@@ -2337 +2337 @@
-      $ext->add($context, $exten, '', new ext_set('AMPUSERCID', '${IF($["${DB_EXISTS(AMPUSER/${AMPUSER}/cidnum)}" = "1"]?${DB_RESULT}:${AMPUSER})}'));
-      $ext->add($context, $exten, '', new ext_set('CALLERID(all)', '"${AMPUSERCIDNAME}" <${AMPUSERCID}>'));
+
+      $ext->add($context, $exten, '', new ext_noop_trace('Current Concurrency Count for ${AMPUSER}: ${GROUP_COUNT(${AMPUSER}@concurrency_limit)}, User Limit: ${DB(AMPUSER/${AMPUSER}/concurrency_limit)}'));
+      $ext->add($context, $exten, '', new ext_gotoif('$["${ARG1}"="LIMIT" & ${LEN(${AMPUSER})} & "${DB(AMPUSER/${AMPUSER}/concurrency_limit)}">"0" & ${GROUP_COUNT(${AMPUSER}@concurrency_limit)}>=${DB(AMPUSER/${AMPUSER}/concurrency_limit)}]', 'limit'));
+      $ext->add($context, $exten, '', new ext_execif('$["${ARG1}"="LIMIT" & ${LEN(${AMPUSER})}]', 'Set', 'GROUP(concurrency_limit)=${AMPUSER}'));
-      /*
-       * This is where to splice in things like setting the language based on a user's astdb setting,
-       * or where you might set the CID account code based on a user instead of the device settings.
-       */
-
+
+
-      $ext->add($context, $exten, 'report2', new ext_set('__TTL', '${IF($["foo${TTL}" = "foo"]?64:$[ ${TTL} - 1 ])}'));
-      $ext->add($context, $exten, '', new ext_gotoif('$[ ${TTL} > 0 ]', 'continue'));
-      $ext->add($context, $exten, '', new ext_wait('${RINGTIMER}'));  // wait for a while, to give it a chance to be picked up by voicemail
-      $ext->add($context, $exten, '', new ext_answer());
-2
+1
-      $ext->add($context, $exten, '', new ext_playback('im-sorry&an-error-has-occured&with&call-forwarding'));
+      $ext->add($context, $exten, '', new ext_macro('hangupcall'));
+      $ext->add($context, $exten, 'limit', new ext_answer());
+      $ext->add($context, $exten, '', new ext_wait('1'));
+      $ext->add($context, $exten, '', new ext_playback('beep&im-sorry&your&simul-call-limit-reached&goodbye'));
-      $ext->add($context, $exten, '', new ext_macro('hangupcall'));
-      $ext->add($context, $exten, '', new ext_congestion(20));
@@ -4534 +4543 @@
-    $astman->database_put("AMPUSER",$extension."/ringtimer",isset($ringtimer)?$ringtimer:'');
-    $astman->database_put("AMPUSER",$extension."/cfringtimer",isset($cfringtimer)?$cfringtimer:0);
+    $astman->database_put("AMPUSER",$extension."/concurrency_limit",isset($concurrency_limit)?$concurrency_limit:0);
-    $astman->database_put("AMPUSER",$extension."/noanswer",isset($noanswer)?$noanswer:'');
-    $astman->database_put("AMPUSER",$extension."/recording",isset($recording)?$recording:'');
@@ -4651 +4661 @@
-  
-    $results['cfringtimer'] = (int) $astman->database_get("AMPUSER",$extension."/cfringtimer");
+    $results['concurrency_limit'] = (int) $astman->database_get("AMPUSER",$extension."/concurrency_limit");
-  } else {
-    die_freepbx("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);
@@ -5871 +5882 @@
-    $currentcomponent->addoptlistitem('cfringtime', '0', _("Default"));
-    $currentcomponent->addoptlistitem('cfringtime', '-1', _("Always"));
+    $currentcomponent->addoptlistitem('concurrency_limit', '0', _("No Limit"));
-    for ($i=1; $i <= 120; $i++) {
-      $currentcomponent->addoptlistitem('ringtime', "$i", "$i");
-      $currentcomponent->addoptlistitem('cfringtime', "$i", "$i");
+      $currentcomponent->addoptlistitem('concurrency_limit', "$i", "$i");
-    }
-    $currentcomponent->setoptlistopts('ringtime', 'sort', false);
-    $currentcomponent->setoptlistopts('cfringtime', 'sort', false);
+    $currentcomponent->setoptlistopts('concurrency_limit', 'sort', false);
-
-    // Special CID handling to deal with Private, etc.
@@ -6052 +6066 @@
-      }
-    }
+
+    $concurrency_limit = isset($concurrency_limit) ? $concurrency_limit : $amp_conf['CONCURRENCYLIMITDEFAULT'];
+    $currentcomponent->addguielem($section, new gui_selectbox('concurrency_limit', $currentcomponent->getoptlist('concurrency_limit'), $concurrency_limit, _("Outbound Councurrency Limit"), _("Maximum number of outbound simultaneous calls that an extension can make. This is also very useful as a Security Protection against a system that has been compromised. It will limit the number of simultaneous calls that can be made on the compromised extension."), false));
+
-    $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));
-    if (function_exists('paging_get_config')) {