Changeset 10684

Timestamp:

12/09/10 17:38:47 (2 years ago)

Author:

mbrevda

Message:

re #4566 - merge forward

Files:

• modules/branches/bootstrap-2.9 (modified) (1 prop)
• modules/branches/bootstrap-2.9/checklog.sh (copied) (copied from modules/branches/2.9/checklog.sh)
• modules/branches/bootstrap-2.9/cidlookup/functions.inc.php (modified) (1 diff)
• modules/branches/bootstrap-2.9/conferences/module.xml (modified) (1 diff)
• modules/branches/bootstrap-2.9/core/functions.inc.php (modified) (8 diffs)
• modules/branches/bootstrap-2.9/queues/functions.inc.php (modified) (1 diff)
• modules/branches/bootstrap-2.9/queues/module.xml (modified) (3 diffs)
• modules/branches/bootstrap-2.9/ringgroups/functions.inc.php (modified) (1 diff)
• modules/branches/bootstrap-2.9/ringgroups/module.xml (modified) (3 diffs)

modules/branches/bootstrap-2.9/cidlookup/functions.inc.php

@@ -146 +146 @@
-            case "http":
-              if (!empty($item['http_username']) && !empty($item['http_password']))
-$item['http_password']
+urlencode($item['http_password'])
-              else
-                $auth = '';

modules/branches/bootstrap-2.9/conferences/module.xml

@@ -45 +45 @@
-    <conferences>Conferences</conferences>
-  </menuitems>
-1
-6c7385cf933992501776e541f8d381a6
+2
+261cf9c7f621998ad99759af1b001722
-</module>

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

@@ -1298 +1298 @@
-          $vm = ((($exten['voicemail'] == "novm") || ($exten['voicemail'] == "disabled") || ($exten['voicemail'] == "")) ? "novm" : $exten['extension']);
-
-
-
+
-          
-          $dest_args = ','.($exten['noanswer_dest']==''?'0':'1').','.($exten['busy_dest']==''?'0':'1').','.($exten['chanunavail_dest']==''?'0':'1');
@@ -2931 +2930 @@
-      $ext->add($mcontext,$exten,'', new ext_macro('user-callerid'));
-      $ext->add($mcontext,$exten,'', new ext_set("RingGroupMethod", 'none'));
-      $ext->add($mcontext,$exten,'', new ext_set("VMBOX", '${ARG1}'));
-      $ext->add($mcontext,$exten,'', new ext_set("__EXTTOCALL", '${ARG2}'));
-
-
-
+
-      $ext->add($mcontext,$exten,'checkrecord', new ext_macro('record-enable','${EXTTOCALL},IN'));
-
@@ -2974 +2970 @@
-        $ext->add($mcontext,$exten,$macrodial, new ext_macro('dial','${RT},${DIAL_OPTIONS},${EXTTOCALL}'));
-      }
-VMBOX
+ARG1
-      $ext->add($mcontext,$exten,'', new ext_set("SV_DIALSTATUS", '${DIALSTATUS}'));
-
-
+
+
+
-      $ext->add($mcontext,$exten,'', new ext_set("DIALSTATUS", '${SV_DIALSTATUS}'));
-
-      $ext->add($mcontext,$exten,'', new ext_execif('$[("${DIALSTATUS}"="NOANSWER"&${ARG3})|("${DIALSTATUS}"="BUSY"&${ARG4})|("${DIALSTATUS}"="CHANUNAVAIL"&${ARG5})]','MacroExit'));
-
-VMBOX
-VMBOX
+ARG1
+ARG1
-      $ext->add($mcontext,$exten,'', new ext_noop('Sending to Voicemail box ${EXTTOCALL}'));
-VMBOX
+ARG1
-
-      $exten = 'docfu';
-VMBOX
+ARG1
-      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', 'unavailable'));
-CFUEXT
+DB(CFU/${EXTTOCALL})
-      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', ''));
-      $ext->add($mcontext,$exten,'', new ext_return(''));
-
-
-VMBOX
+$exten = 'docfb';
+ARG1
-      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', 'user-busy'));
-CFBEXT
+DB(CFB/${EXTTOCALL})
-      if ($amp_conf['DIVERSIONHEADER']) $ext->add($mcontext,$exten,'', new ext_set('__DIVERSION_REASON', ''));
-      $ext->add($mcontext,$exten,'', new ext_return(''));
@@ -4255 +4252 @@
-  $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
-
+  $display = ($amp_conf['AMPEXTENSIONS'] == "deviceanduser")?'users':'extensions';
-  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";
-  }
@@ -4267 +4264 @@
-function core_check_destinations($dest=true) {
-  global $active_modules;
+  global $amp_conf;
-
-  $destlist = array();
@@ -4272 +4270 @@
-    return $destlist;
-  }
+  // Check Inbound Routes
+  //
-  $sql = "SELECT extension, cidnum, description, destination FROM incoming ";
-  if ($dest !== true) {
@@ -4290 +4290 @@
-    );
-  }
+
+  // Check Extension/User Destinations
+  //
+  $sql = "SELECT extension, name, busy_dest, noanswer_dest, chanunavail_dest FROM users ";
+  if ($dest !== true) {
+    $sql .= "WHERE (busy_dest in ('".implode("','",$dest)."')) OR (noanswer_dest in ('".implode("','",$dest)."')) OR (chanunavail_dest in ('".implode("','",$dest)."'))";
+  }
+  $results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
+
+  $display = ($amp_conf['AMPEXTENSIONS'] == "deviceanduser")?'users':'extensions';
+  $label   = ($amp_conf['AMPEXTENSIONS'] == "deviceanduser")?'User':'Exten';
+  foreach ($results as $result) {
+    $thisdest    = $result['busy_dest'];
+    $thisid      = $result['extension'];
+    $description = sprintf(_("%s: %s (%s)"),$label,$result['name'],$thisid);
+    $thisurl     = 'config.php?display='.$display.'&extdisplay='.urlencode($thisid);
+    if (($dest === true && $thisdest != '') || $dest = $thisdest) {
+      $destlist[] = array(
+        'dest' => $thisdest,
+        'description' => $description,
+        'edit_url' => $thisurl,
+      );
+    }
+    $thisdest = $result['noanswer_dest'];
+    if (($dest === true && $thisdest != '') || $dest = $thisdest) {
+      $destlist[] = array(
+        'dest' => $thisdest,
+        'description' => $description,
+        'edit_url' => $thisurl,
+      );
+    }
+    $thisdest = $result['chanunavail_dest'];
+    if (($dest === true && $thisdest != '') || $dest = $thisdest) {
+      $destlist[] = array(
+        'dest' => $thisdest,
+        'description' => $description,
+        'edit_url' => $thisurl,
+      );
+    }
+  }
+
-  return $destlist;
-}
@@ -4528 +4569 @@
-    $pinless=$astman->database_get("AMPUSER",$extension."/pinless");
-    $results['pinless'] = (trim($pinless) == 'NOPASSWD') ? 'enabled' : 'disabled';
+
+    $results['ringtimer'] = (int) $astman->database_get("AMPUSER",$extension."/ringtimer");
-  } else {
-    die_freepbx("Cannot connect to Asterisk Manager with ".$amp_conf["AMPMGRUSER"]."/".$amp_conf["AMPMGRPASS"]);

modules/branches/bootstrap-2.9/queues/functions.inc.php

@@ -502 +502 @@
-        }
-      }
+      // We need to have a hangup here, if call is ended by the caller during Playback it will end in the
+      // h context and do a proper hangup and clean the BLKVM, see #4671
+      $ext->add('ext-queues', 'h', '', new ext_macro('hangupcall'));      
-      // NODEST will be the queue that this came from, so we will vector though an entry to determine the context the
-      // agent should be delivered to. All queue calls come here, this decides if the should go direct to from-internal

modules/branches/bootstrap-2.9/queues/module.xml

@@ -2 +2 @@
-  <rawname>queues</rawname>
-  <name>Queues</name>
-3
+4
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.8.0.4* #4671
-    *2.8.0.3* localization updates
-    *2.8.0.2* #4327
@@ -65 +66 @@
-    <queues needsenginedb="yes">Queues</queues>
-  </menuitems>
-3
-28f889b3a8cc68050509038dc5190d31
+4
+9219bd5a354a33cf1442a26f0e73d748
-</module>

modules/branches/bootstrap-2.9/ringgroups/functions.inc.php

@@ -197 +197 @@
-          $ext->add($contextname, $grpnum, 'nodest', new ext_noop('SKIPPING DEST, CALL CAME FROM Q/RG: ${RRNODEST}'));
-        }
+        // We need to have a hangup here, if call is ended by the caller during Playback it will end in the
+        // h context and do a proper hangup and clean the BLKVM, see #4671
+        $ext->add($contextname, 'h', '', new ext_macro('hangupcall'));
-        /*
-          ASTDB Settings:

modules/branches/bootstrap-2.9/ringgroups/module.xml

@@ -2 +2 @@
-  <rawname>ringgroups</rawname>
-  <name>Ring Groups</name>
-2
+3
-  <publisher>FreePBX</publisher>
-  <license>GPLv2+</license>
@@ -11 +11 @@
-  </description>
-  <changelog>
+    *2.8.0.3* #4671
-    *2.8.0.2* #4484
-    *2.8.0.1* #4422
@@ -43 +44 @@
-    <ringgroups>Ring Groups</ringgroups>
-  </menuitems>
-2
-283f79fa6c8810d38282dbb3477f6a86
+3
+a4d209b370c71b47728ad50c9e29707b
-</module>