Ticket #1671: patchfile

Index: modules/branches/2.3/findmefollow/page.findmefollow.php
===================================================================
--- modules/branches/2.3/findmefollow/page.findmefollow.php (revision 3566)
+++ modules/branches/2.3/findmefollow/page.findmefollow.php (working copy)
@@ -209,13 +209,14 @@
          <b><?php echo _("hunt")?></b>: <?php echo _("take turns ringing each available extension")?><br>
          <b><?php echo _("memoryhunt")?></b>: <?php echo _("ring first extension in the list, then ring the 1st and 2nd extension, then ring 1st 2nd and 3rd extension in the list.... etc.")?><br>
                                         <b><?php echo _("*-prim")?></b>:  <?php echo _("these modes act as described above. However, if the primary extension (first in list) is occupied, the other extensions will not be rung. If the primary is freepbx DND, it won't be run. If the primary is freepbx CF unconditional, then all will be rung")?><br>
+                                        <b><?php echo _("firstavailable")?></b>:  <?php echo _("ring only the first  available channel")?><br>
        </span>
        </a></td>
        <td>
          &nbsp;&nbsp;<select name="strategy"/>
          <?php
            $default = (isset($strategy) ? $strategy : 'ringall');
-                                                $items = array('ringallv2','ringallv2-prim','ringall','ringall-prim','hunt','hunt-prim','memoryhunt','memoryhunt-prim');
+                                                $items = array('ringallv2','ringallv2-prim','ringall','ringall-prim','hunt','hunt-prim','memoryhunt','memoryhunt-prim','firstavailable');
            foreach ($items as $item) {
              echo '<option value="'.$item.'" '.($default == $item ? 'SELECTED' : '').'>'._($item);
            }
Index: modules/branches/2.3/ringgroups/page.ringgroups.php
===================================================================
--- modules/branches/2.3/ringgroups/page.ringgroups.php (revision 3566)
+++ modules/branches/2.3/ringgroups/page.ringgroups.php (working copy)
@@ -184,13 +184,14 @@
          <b><?php echo _("hunt")?></b>: <?php echo _("Take turns ringing each available extension")?><br>
          <b><?php echo _("memoryhunt")?></b>: <?php echo _("Ring first extension in the list, then ring the 1st and 2nd extension, then ring 1st 2nd and 3rd extension in the list.... etc.")?><br>
                                         <b><?php echo _("*-prim")?></b>:  <?php echo _("These modes act as described above. However, if the primary extension (first in list) is occupied, the other extensions will not be rung. If the primary is freePBX DND, it won't be rung. If the primary is freePBX CF unconditional, then all will be rung")?><br>
+                                        <b><?php echo _("firstavailable")?></b>:  <?php echo _("ring only the first available channel")?><br>
        </span>
        </a></td>
        <td>
          <select name="strategy"/>
          <?php
            $default = (isset($strategy) ? $strategy : 'ringall');
-                                                $items = array('ringall','ringall-prim','hunt','hunt-prim','memoryhunt','memoryhunt-prim');
+                                                $items = array('ringall','ringall-prim','hunt','hunt-prim','memoryhunt','memoryhunt-prim','firstavailable');
            foreach ($items as $item) {
              echo '<option value="'.$item.'" '.($default == $item ? 'SELECTED' : '').'>'._($item);
            }
Index: freepbx/trunk/amp_conf/astetc/extensions.conf
===================================================================
--- freepbx/trunk/amp_conf/astetc/extensions.conf (revision 3566)
+++ freepbx/trunk/amp_conf/astetc/extensions.conf (working copy)
@@ -76,12 +76,16 @@
 exten => s,41,Goto(s,37)
         
 exten => s,42,Dial(${${HuntMember}}${ds} ) ; dialparties will set the priority to 20 if $ds is not null and its a hunt group
-exten => s,43,Set(HuntLoop=$[1 + ${HuntLoop}])
-exten => s,44,Set(HuntMembers=$[${HuntMembers} - 1])
-exten => s,45,Goto(s,22)
+exten => s,43,GotoIf($["${RingGroupMethod}" != "firstavailable" ]?45)
+exten => s,44,Set(HuntMembers=0)
+exten => s,45,Set(HuntLoop=$[1 + ${HuntLoop}])
+exten => s,46,Set(HuntMembers=$[${HuntMembers} - 1])
+exten => s,47,Goto(s,22)
 exten => s,50,DBdel(CALLTRACE/${CT_EXTEN})
 exten => s,51,Goto(s,42)
 
+exten => s,143,Goto(s,45)
+
 ; make sure hungup calls go here so that proper cleanup occurs from call confirmed calls and the like
 ;
 exten => h,1,Macro(hangupcall)
Index: freepbx/trunk/amp_conf/agi-bin/dialparties.agi
===================================================================
--- freepbx/trunk/amp_conf/agi-bin/dialparties.agi  (revision 3566)
+++ freepbx/trunk/amp_conf/agi-bin/dialparties.agi  (working copy)
@@ -400,7 +400,7 @@
        if (strlen($extds)) $ds .= $extds . '&';
    
      // Update Caller ID for calltrace application
-     if ((strpos($k,"#")==0) && (($rgmethod != "hunt") && ($rgmethod != "memoryhunt")) )
+     if ((strpos($k,"#")==0) && (($rgmethod != "hunt") && ($rgmethod != "memoryhunt") && ($rgmethod != "firstavailable")) )
      {
        if ( isset($cidnum) && is_numeric($cidnum) )
        {
@@ -433,7 +433,7 @@
 $loops   = 0;
 $myhuntmember  = "";
 
-if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt"))
+if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt") || ($rgmethod == "firstavailable"))
 {
  if ($cidnum)
    $AGI->set_variable(CALLTRACE_HUNT,$cidnum);
@@ -445,7 +445,7 @@
    {
      //If the original array is included in the extension hash then set variables
      $myhuntmember="HuntMember"."$loops";
-     if ($rgmethod == "hunt")
+     if (($rgmethod == "hunt") || ($rgmethod == "firstavailable"))
        $AGI->set_variable($myhuntmember,$ext_hunt[$k]);
      elseif ($rgmethod == "memoryhunt") 
      {
@@ -549,7 +549,7 @@
 
  $AGI->noop('');
 } else {
- if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt"))
+ if (($rgmethod == "hunt") || ($rgmethod == "memoryhunt") || ($rgmethod == "firstavailable"))
  {
    $ds = '|';
    if ($timer)