Changeset 5340

Timestamp:

12/04/07 14:10:53 (5 years ago)

Author:

p_lindheimer

Message:

add Extensions quick-pick and allow hunt calls with confirmation (which requires changes to core not yet checked in but coming shortly

Files:

• modules/branches/2.4/findmefollow/page.findmefollow.php (modified) (10 diffs)
• modules/branches/2.4/ringgroups/page.ringgroups.php (modified) (6 diffs)

modules/branches/2.4/findmefollow/page.findmefollow.php

@@ -187 +187 @@
-
-      <tr>
- as Default")?><span><?php echo _('By default (not checked) any call to this extension will go to this Follow
+")?><span><?php echo _('By default (not checked) any call to this extension will go to this Follow-
-        <td><input type="checkbox" name="ddial" value="CHECKED" <?php echo $ddial ?>  /></td>
-      </tr>
@@ -197 +197 @@
-        </td>
-        <td>
-          &nbsp;
-          <select name="pre_ring"/>
-          <?php
@@ -209 +208 @@
-      </tr>
-
-
-<tr
-td> <
+
+ <td
+
-        <span>
-          <b><?php echo _("ringallv2")?></b>:  <?php echo _("ring primary extension for initial ring time followed by all additional extensions until one answers")?><br>
@@ -221 +220 @@
-          <b><?php echo _("firstnotonphone")?></b>:  <?php echo _("ring only the first channel which is not offhook - ignore CW")?><br>
-        </span>
-
-
-
+
+
+
+
-          <?php
-            $default = (isset($strategy) ? $strategy : 'ringall');
@@ -234 +234 @@
-        </td>
-      </tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php
-    $rows = count($grplist)+1; 
@@ -290 +256 @@
-    ($rows < 5) ? 5 : (($rows > 20) ? 20 : $rows);
-?>
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      <tr>
-        <td><a href="#" class="info"><?php echo _("CID Name Prefix")?>:<span><?php echo _('You can optionally prefix the Caller ID name when ringing extensions in this group. ie: If you prefix with "Sales:", a call from John Doe would display as "Sales:John Doe" on the extensions that ring.')?></span></a></td>
@@ -300 +335 @@
-      </tr>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-<?php if(function_exists('recordings_list')) { //only include if recordings is enabled?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php } ?>
-      
@@ -372 +403 @@
-<script language="javascript">
-<!--
+
+function insertExten() {
+  exten = document.getElementById('insexten').value;
+
+  grpList=document.getElementById('grplist');
+  if (grpList.value[ grpList.value.length - 1 ] == "\n") {
+    grpList.value = grpList.value + exten;
+  } else {
+    grpList.value = grpList.value + '\n' + exten;
+  }
+
+  // reset element
+  document.getElementById('insexten').value = '';
+}
-
-function checkGRP(theForm) {
@@ -379 +424 @@
-  var msgInvalidTime = "<?php echo _('Invalid time specified'); ?>";
-  var msgInvalidGrpTimeRange = "<?php echo _('Time must be between 1 and 60 seconds'); ?>";
-You must choose ringall, ringall-prim, ringallv2 or ringallv2-prim ring strategy when using Confirm Calls
+Only ringall, ringallv2, hunt and the respective -prim versions are supported when confirmation is checked
-
-
@@ -400 +445 @@
-  }
-
-theForm.strategy.value.substring(0,7) != "ringall"
+(theForm.strategy.value.substring(0,7) != "ringall" && theForm.strategy.value.substring(0,4) != "hunt")
-    return warnInvalid(theForm.needsconf, msgInvalidRingStrategy);
-  }

modules/branches/2.4/ringgroups/page.ringgroups.php

@@ -193 +193 @@
-<?php     } ?>
-      </tr>
+
-      <tr>
-        <td> <a href="#" class="info"><?php echo _("Group Description:")?>:<span><?php echo _("Provide a descriptive title for this Ring Group.")?></span></a></td>
-        <td><input size="20" maxlength="35" type="text" name="description" value="<?php echo htmlspecialchars($description); ?>"></td>
-      </tr>
-
-
+
+
+
-        <span>
-          <b><?php echo _("ringall")?></b>:  <?php echo _("Ring all available channels until one answers (default)")?><br>
@@ -220 +222 @@
-        </td>
-      </tr>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <td valign="top">
-<?php
@@ -227 +241 @@
-    ($rows < 5) ? 5 : (($rows > 20) ? 20 : $rows);
-?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php if(function_exists('recordings_list')) { //only include if recordings is enabled?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-<?php } else { ?>
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
-<?php } if (function_exists('music_list')) { ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
+   
-<?php } ?>
-      
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-<?php } ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-      <tr><td colspan="2"><br><h5><?php echo _("Destination if no answer")?>:<hr></h5></td></tr>
-
@@ -356 +389 @@
-<script language="javascript">
-<!--
+
+function insertExten() {
+  exten = document.getElementById('insexten').value;
+
+  grpList=document.getElementById('grplist');
+  if (grpList.value[ grpList.value.length - 1 ] == "\n") {
+    grpList.value = grpList.value + exten;
+  } else {
+    grpList.value = grpList.value + '\n' + exten;
+  }
+
+  // reset element
+  document.getElementById('insexten').value = '';
+}
-
-function checkGRP(theForm) {
@@ -364 +411 @@
-  var msgInvalidGrpTimeRange = "<?php echo _('Time must be between 1 and 60 seconds'); ?>";
-  var msgInvalidDescription = "<?php echo _('Please enter a valid Group Description'); ?>";
-You must choose ringall or ringall-prim ring strategy when using Confirm Calls
+Only ringall, ringallv2, hunt and the respective -prim versions are supported when confirmation is checked
-
-  // set up the Destination stuff
@@ -395 +442 @@
-  }
-
-theForm.strategy.value.substring(0,7) != "ringall"
+(theForm.strategy.value.substring(0,7) != "ringall" && theForm.strategy.value.substring(0,4) != "hunt")
-    return warnInvalid(theForm.needsconf, msgInvalidRingStrategy);
-  }