Changeset 11425

Timestamp:

02/16/11 00:28:45 (2 years ago)

Author:

p_lindheimer

Message:

adds several of the new settings from 1.8 (and some of them are in 1.6.2 also) re #4224, no multiple lots though, minimally tested so far

Files:

• modules/branches/2.9/parking/functions.inc.php (modified) (8 diffs)
• modules/branches/2.9/parking/page.parking.php (modified) (7 diffs)

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

@@ -14 +14 @@
-
-  switch($engine) {
-
+
+
+
+
+
-
-    $contextname = 'park-dial';
@@ -31 +35 @@
-    $parkcid  = isset($results['parkcid'])?$results['parkcid']:'';
-    $parkingannmsg_id   = isset($results['parkingannmsg_id'])?$results['parkingannmsg_id']:'';
-
+
+
+
-
-    $parkpos1 = $parkext + 1;
@@ -48 +54 @@
-      }
-
-      // Now generate dialplan
-      $ext->add($contextname, "t", '', new ext_noop('Parked Call Timed Out and Got Orphaned'));
-      $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_noop('Parked Call Timed Out and Got Orphaned'));
-
-      // If we have an appropriate Asterisk patch, set paraemters for Asterisk
-      //
-isset($amp_conf["PARKINGPATCH"]) && strtolower($amp_conf["PARKINGPATCH"]) == 'true'
+$amp_conf["PARKINGPATCH"] && $ast_lt_16
-        if ($parkalertinfo) {
-          $core_conf->addFeatureGeneral('parkreturnalertinfo',$parkalertinfo);
@@ -61 +63 @@
-          $core_conf->addFeatureGeneral('parkreturncidprefix',$parkcid);
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if ($parkalertinfo) {
-setvar('__ALERT_INFO',
-setvar('__ALERT_INFO',
+alertinfo(
+alertinfo(
-        }
-        if ($parkcid) {
@@ -71 +83 @@
-          $ext->add($contextname, "_[0-9a-zA-Z*#].", '', new ext_setvar('CALLERID(name)', $parkcid.'${CALLERID(name)}'));
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      // Asterisk 1.4 requires hints to be generated for parking
-      //
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    break;
+    }
-  }
-}
-
-function parking_add($parkingenabled, $parkext, $numslots, $parkingtime, $parkingcontext, $parkalertinfo, $parkcid, $parkingannmsg_id, $goto) {
+  $pargs['parkingenabled'] = $parkingenabled;
+  $pargs['parkext'] = $parkext;
+  $pargs['numslots'] = $numslots;
+  $pargs['parkingtime'] = $parkingtime;
+  $pargs['parkingcontext'] = $parkingcontext;
+  $pargs['parkalertinfo'] = $parkalertinfo;
+  $pargs['parkcid'] = $parkcid;
+  $pargs['parkingannmsg_id'] = $parkingannmsg_id;
+  $pargs['goto'] = $goto;
+  
+  return parking_update($pargs);
+}
+
+function parking_update($pargs) {
-  global $db;
+  global $amp_conf;
+
+  $ast_ge_18 = version_compare($amp_conf['ASTVERSION'],'1.8','ge');
+
+  $parkingenabled = isset($pargs['parkingenabled']) ? $pargs['parkingenabled'] : '';
+  $parkext = isset($pargs['parkext']) ? $pargs['parkext'] : '70';
+  $numslots = isset($pargs['numslots']) ? $pargs['numslots'] : '8';
+  $parkingtime = isset($pargs['parkingtime']) ? $pargs['parkingtime'] : '45';
+  $parkingcontext = isset($pargs['parkingcontext']) ? $pargs['parkingcontext'] : 'parkedcalls';
+  $parkalertinfo = isset($pargs['parkalertinfo']) ? $pargs['parkalertinfo'] : '';
+  $parkcid = isset($pargs['parkcid']) ? $pargs['parkcid'] : '';
+  $parkingannmsg_id = isset($pargs['parkingannmsg_id']) ? $pargs['parkingannmsg_id'] : '';
+  $goto = isset($pargs['goto']) ? $pargs['goto'] : '';
-
-  $parkinglot_id  = 1; // only 1 parkinglot but prepare for future
@@ -117 +197 @@
-  $numslots   = ctype_digit($numslots)    ? $numslots : 8;
-  $parkingtime  = ctype_digit($parkingtime) ? $parkingtime  : '';
-  $goto   = ($goto)       ? $goto   : 'from-pstn,s,1';
-
-  $parkfields = array(array($parkinglot_id, 'parkingenabled', "$parkingenabled"),
@@ -129 +208 @@
-      array($parkinglot_id, 'goto', "$goto"));
-
+  if ($ast_ge_18) {
+    $parkfields[] = array($parkinglot_id, 'parking_dest', isset($pargs['parking_dest'])?$pargs['parking_dest']:'device');
+    $parkfields[] = array($parkinglot_id, 'parkinghints', isset($pargs['parkinghints'])?$pargs['parkinghints']:'yes');
+    $parkfields[] = array($parkinglot_id, 'parkedplay', isset($pargs['parkedplay'])?$pargs['parkedplay']:'both');
+    $parkfields[] = array($parkinglot_id, 'parkedcalltransfers', isset($pargs['parkedcalltransfers'])?$pargs['parkedcalltransfers']:'caller');
+    $parkfields[] = array($parkinglot_id, 'parkedcallreparking', isset($pargs['parkedcallreparking'])?$pargs['parkedcallreparking']:'caller');
+    $parkfields[] = array($parkinglot_id, 'parkedcallhangup', isset($pargs['parkedcallhangup'])?$pargs['parkedcallhangup']:'no');
+    $parkfields[] = array($parkinglot_id, 'parkedcallrecording', isset($pargs['parkedcallrecording'])?$pargs['parkedcallrecording']:'no');
+    $parkfields[] = array($parkinglot_id, 'parkedmusicclass', isset($pargs['parkedmusicclass'])?$pargs['parkedmusicclass']:'default');
+    $parkfields[] = array($parkinglot_id, 'findslot', isset($pargs['findslot'])?$pargs['findslot']:'first');
+    $parkfields[] = array($parkinglot_id, 'adsipark', isset($pargs['adsipark'])?$pargs['adsipark']:'no');
+  }
+
-  $compiled = $db->prepare('INSERT INTO parkinglot (id, keyword, data) values (?,?,?)');
-
@@ -136 +228 @@
-  }
-}
-
-
-function parking_getconfig($parkinglot_id=1) {

modules/branches/2.9/parking/page.parking.php

@@ -15 +15 @@
-$tabindex = 0;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-} else {
-        $goto = '';
@@ -33 +48 @@
-
-// do if we are submitting a form
-
+ 
-
-  if ($action == 'edtPARKING') {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    needreload();
-    redirect_standard();
@@ -97 +134 @@
-    </td>
-  </tr>
+<?php
+  if ($ast_ge_18 && function_exists('music_list')) {
+?>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Parked Music Class:")?><span><?php echo _("This is the music class that will be played to a parked call while in the parking lot UNLESS the call flow prior to parking the call explicitly set a different music class, such as if the call came in through a queue or ring group.")?></span></a></td>
+    <td align="right">
+      <select name="parkedmusicclass" tabindex="<?php echo ++$tabindex;?>">
+<?php
+    $tresults = music_list();
+    $none = array_search('none',$tresults);
+    if ($none !== false) {
+      unset($tresults[$none]);
+    }
+    if (isset($tresults)) {
+      foreach ($tresults as $tresult) {
+        $searchvalue="$tresult";
+        $ttext = $tresult;
+        if($tresult == 'default') $ttext = _("default");            
+        echo '<option value="'.$tresult.'" '.($searchvalue == $parkedmusicclass ? 'SELECTED' : '').'>'.$ttext;
+      }
+    }
+?>    
+      </select>   
+    </td>
+  </tr>
+<?php
+  }
+?>
-  <tr>
-  <td><a href=# class="info"><?php echo _("Parking Lot Context:")?><span>
@@ -103 +168 @@
-  <td align=right><input type="text" size="19" name="parkingcontext" value="<?php  echo htmlspecialchars($parkingcontext)?>" tabindex="<?php echo ++$tabindex;?>"/></td>
-  </tr>
+
+  <tr>
+  <td><a href=# class="info"><?php echo _("Enable BLF Capabilities:")?><span><?php echo _("Check this box to have Asterisk 'hints' generated to use with BLF buttons.")?></span></a></td>
+  <td align=right><input type="checkbox" value="yes" name="parkinghints" <?php  echo ($parkinghints == 'yes' ? 'CHECKED' : '')?> tabindex="<?php echo ++$tabindex;?>"></td>
+  </tr>
+<?php
+  if ($ast_ge_18) {
+?>
+  <tr>
+  <td><a href=# class="info"><?php echo _("Use Next Slot:")?><span><?php echo _("Asterisk: findslot. Check this box if you want the parking lot to seek the next sequential parking slot relative to the the last parked call instead of seeking the first available slot. Normally this box is left un-checked.")?></span></a></td>
+  <td align=right><input type="checkbox" value="yes" name="findslot" <?php  echo ($findslot == 'yes' ? 'CHECKED' : '')?> tabindex="<?php echo ++$tabindex;?>"></td>
+  </tr>
+  <tr>
+  <td><a href=# class="info"><?php echo _("Enable ADSI Annoucements:")?><span><?php echo _("Check this box if you are using ADSI enabled analog phones and want to have ADSI parking annoucements sent to the phones. Other adsi.conf configurations may be neceesary for this to work.")?></span></a></td>
+  <td align=right><input type="checkbox" value="yes" name="adsipark" <?php  echo ($adsipark == 'yes' ? 'CHECKED' : '')?> tabindex="<?php echo ++$tabindex;?>"></td>
+  </tr>
+
+<tr><td colspan="2"><br><h5><?php echo _("Returned Call Behavior:")?><hr></h5></td></tr>
+
+  <tr>
+  <td><a href="#" class="info"><?php echo _("Pickup Courtesy Tone:")?><span><?php echo _("Whom to play the courtesy tone to when a parked call is retreived.")?></span></a></td>
+  <td>
+    <input type="radio" name="parkedplay" id="parkedplay-caller" value="caller" <?php echo $parkedplay == 'caller' ? "checked=\"yes\"" : ""?>/><label for="parkedplay-caller"><?php echo _("Caller") ?></label>
+    <input type="radio" name="parkedplay" id="parkedplay-parked" value="parked" <?php echo $parkedplay == 'parked' ? "checked=\"yes\"" : ""?>/><label for="parkedplay-parked"><?php echo _("Parked") ?></label>
+    <input type="radio" name="parkedplay" id="parkedplay-both" value="both" <?php echo $parkedplay == 'both' ? "checked=\"yes\"" : ""?>/><label for="parkedplay-both"><?php echo _("Both") ?></label>
+  </td>
+  </tr>       
+
+  <tr>
+  <td><a href="#" class="info"><?php echo _("Transfer Capability:")?><span><?php echo _("Asterisk: parkedcalltransfers. Enables or disables DTMF based transfers when picking up a parked call.")?></span></a></td>
+  <td>
+    <input type="radio" name="parkedcalltransfers" id="parkedcalltransfers-caller" value="caller" <?php echo $parkedcalltransfers == 'caller' ? "checked=\"yes\"" : ""?>/><label for="parkedcalltransfers-caller"><?php echo _("Caller") ?></label>
+    <input type="radio" name="parkedcalltransfers" id="parkedcalltransfers-parked" value="parked" <?php echo $parkedcalltransfers == 'parked' ? "checked=\"yes\"" : ""?>/><label for="parkedcalltransfers-parked"><?php echo _("Parked") ?></label>
+    <input type="radio" name="parkedcalltransfers" id="parkedcalltransfers-both" value="both" <?php echo $parkedcalltransfers == 'both' ? "checked=\"yes\"" : ""?>/><label for="parkedcalltransfers-both"><?php echo _("Both") ?></label>
+    <input type="radio" name="parkedcalltransfers" id="parkedcalltransfers-no" value="no" <?php echo $parkedcalltransfers == 'no' ? "checked=\"yes\"" : ""?>/><label for="parkedcalltransfers-no"><?php echo _("Neither") ?></label>
+  </td>
+  </tr>       
+
+  <tr>
+  <td><a href="#" class="info"><?php echo _("Re-Parking Capability:")?><span><?php echo _("Asterisk: parkedcallreparking. Enables or disables DTMF based parking when picking up a parked call.")?></span></a></td>
+  <td>
+    <input type="radio" name="parkedcallreparking" id="parkedcallreparking-caller" value="caller" <?php echo $parkedcallreparking == 'caller' ? "checked=\"yes\"" : ""?>/><label for="parkedcallreparking-caller"><?php echo _("Caller") ?></label>
+    <input type="radio" name="parkedcallreparking" id="parkedcallreparking-parked" value="parked" <?php echo $parkedcallreparking == 'parked' ? "checked=\"yes\"" : ""?>/><label for="parkedcallreparking-parked"><?php echo _("Parked") ?></label>
+    <input type="radio" name="parkedcallreparking" id="parkedcallreparking-both" value="both" <?php echo $parkedcallreparking == 'both' ? "checked=\"yes\"" : ""?>/><label for="parkedcallreparking-both"><?php echo _("Both") ?></label>
+    <input type="radio" name="parkedcallreparking" id="parkedcallreparking-no" value="no" <?php echo $parkedcallreparking == 'no' ? "checked=\"yes\"" : ""?>/><label for="parkedcallreparking-no"><?php echo _("Neither") ?></label>
+  </td>
+  </tr>       
+
+  <tr>
+  <td><a href="#" class="info"><?php echo _("One Touch Recording Capability:")?><span><?php echo _("Asterisk: parkedcallrecording. Enables or disables DTMF based one-touch recording when picking up a parked call.")?></span></a></td>
+  <td>
+    <input type="radio" name="parkedcallrecording" id="parkedcallrecording-caller" value="caller" <?php echo $parkedcallrecording == 'caller' ? "checked=\"yes\"" : ""?>/><label for="parkedcallrecording-caller"><?php echo _("Caller") ?></label>
+    <input type="radio" name="parkedcallrecording" id="parkedcallrecording-parked" value="parked" <?php echo $parkedcallrecording == 'parked' ? "checked=\"yes\"" : ""?>/><label for="parkedcallrecording-parked"><?php echo _("Parked") ?></label>
+    <input type="radio" name="parkedcallrecording" id="parkedcallrecording-both" value="both" <?php echo $parkedcallrecording == 'both' ? "checked=\"yes\"" : ""?>/><label for="parkedcallrecording-both"><?php echo _("Both") ?></label>
+    <input type="radio" name="parkedcallrecording" id="parkedcallrecording-no" value="no" <?php echo $parkedcallrecording == 'no' ? "checked=\"yes\"" : ""?>/><label for="parkedcallrecording-no"><?php echo _("Neither") ?></label>
+  </td>
+  </tr>       
+
+  <tr>
+  <td><a href="#" class="info"><?php echo _("DTMF Based Hangup Capability:")?><span><?php echo _("Asterisk: parkedcallhangup. Enables or disables DTMF based hangups when picking up a parked call.")?></span></a></td>
+  <td>
+    <input type="radio" name="parkedcallhangup" id="parkedcallhangup-caller" value="caller" <?php echo $parkedcallhangup == 'caller' ? "checked=\"yes\"" : ""?>/><label for="parkedcallhangup-caller"><?php echo _("Caller") ?></label>
+    <input type="radio" name="parkedcallhangup" id="parkedcallhangup-parked" value="parked" <?php echo $parkedcallhangup == 'parked' ? "checked=\"yes\"" : ""?>/><label for="parkedcallhangup-parked"><?php echo _("Parked") ?></label>
+    <input type="radio" name="parkedcallhangup" id="parkedcallhangup-both" value="both" <?php echo $parkedcallhangup == 'both' ? "checked=\"yes\"" : ""?>/><label for="parkedcallhangup-both"><?php echo _("Both") ?></label>
+    <input type="radio" name="parkedcallhangup" id="parkedcallhangup-no" value="no" <?php echo $parkedcallhangup == 'no' ? "checked=\"yes\"" : ""?>/><label for="parkedcallhangup-no"><?php echo _("Neither") ?></label>
+  </td>
+  </tr>       
+
+  <tr>
+  <td><a href="#" class="info"><?php echo _("Return Destination Behavior:")?><span><?php echo _("Where to send a parked call that has timed out. The call can be sent back to the original device that parked the call, or it can be sent back to the alternate destination. In both cases, any configured Alert-Info, Caller ID prepend, or annoucement will be applied to the call. If configured to send back to the Originator and they are not available (phone is offline), the alternate destination will be used.")?></span></a></td>
+  <td>
+    <input type="radio" name="parking_dest" id="parking_dest-device" value="device" <?php echo $parking_dest == 'device' ? "checked=\"yes\"" : ""?>/><label for="parking_dest-device"><?php echo _("Originator") ?></label>
+    <input type="radio" name="parking_dest" id="parking_dest-dest" value="dest" <?php echo $parking_dest == 'dest' ? "checked=\"yes\"" : ""?>/><label for="parking_dest-dest"><?php echo _("Alternate Destination") ?></label>
+  </td>
+  </tr>       
+<?php
+    $alert_info_tt = _("Alert-Info to add to the call prior to sending back to the Originator or to the Alternate Destination.");
+    $caller_id_tt = _("String to prepend to the current Caller ID assoicated with the parked call prior to sending back to the Originator or the Alternate Destination.");
+    $announcement_tt = _("Optional message to be played to the call prior to sending back to the Originator or the Alternate Destination.");
+    $dest_label = _("Alternate Destination");
+  } else {
+    $alert_info_tt = _("Alert-Info to put in channel before going to defined destination below. This can create distinct rings on some SIP phones and can serve to alert the recipients that the call is from an Orphaned parked call");
+    $caller_id_tt = _("String to pre-pend to the current Caller-ID associated with this call (if any), before going to defined destination below. This can serve to alert the recipients that the call is from an Orphaned parked call");
+    $announcement_tt = _("Announcement:")?><span><?php echo _("Optional message to be played to the orphaned caller prior to going on the to supplied destination below.<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left");
+    $dest_label = _("Destination for Orphaned Parked Calls");
+?>
-<tr><td colspan="2"><br><h5><?php echo _("Actions for Timed-Out Orphans")?><hr></h5></td></tr>
-
-
-
+
+
+
+
+
+
+
+
+
+
-  </span></a></td>
-
-
-
-
-
-
-
+
-  </tr>
-<?php if(function_exists('recordings_list')) { //only include if recordings is enabled?>
-  <tr>
-_("Optional message to be played to the orphaned caller prior to going on the to supplied destination below.<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left")
+$announcement_tt  
-    <td align=right>
-      <select name="parkingannmsg_id" tabindex="<?php echo ++$tabindex;?>">
@@ -130 +282 @@
-          }
-        }
-
-      ?>
-      </select>
@@ -137 +288 @@
-<?php } else { ?>
-  <tr>
-_("Optional message to be played to the orphaned caller prior to going on to the supplied destination below.<br><br>
+$announcement_tt . '<br /><br />' .  _("
-    <td align=right>
-      <?php
@@ -147 +298 @@
-<?php } ?>
-
-_("Destination for Orphaned Parked Calls")
+$dest_label
-<?php
-//draw goto selects