Changeset 2231 for modules/branches/2.2/ringgroups

Timestamp:

08/06/06 01:13:50 (7 years ago)

Author:

p_lindheimer

Message:

oops accidentally copied 2.1 versions over 2.2 version. reverted back one rev and proper update applied

Files:

• modules/branches/2.2/ringgroups/module.xml (modified) (1 diff)
• modules/branches/2.2/ringgroups/page.ringgroups.php (modified) (9 diffs)

modules/branches/2.2/ringgroups/module.xml

@@ -2 +2 @@
-  <rawname>ringgroups</rawname>
-  <name>Ring Groups</name>
-3
+4
-  <type>setup</type>
-  <category>Basic</category>

modules/branches/2.2/ringgroups/page.ringgroups.php

@@ -24 +24 @@
-isset($_REQUEST['description'])?$description = $_REQUEST['description']:$description='';
-isset($_REQUEST['alertinfo'])?$alertinfo = $_REQUEST['alertinfo']:$alertinfo='';
+isset($_REQUEST['needsconf'])?$needsconf = $_REQUEST['needsconf']:$needsconf='';
+isset($_REQUEST['remotealert'])?$remotealert = $_REQUEST['remotealert']:$remotealert='';
+isset($_REQUEST['toolate'])?$toolate = $_REQUEST['toolate']:$toolate='';
+isset($_REQUEST['ringing'])?$ringing = $_REQUEST['ringing']:$ringing='';
-
-if (isset($_REQUEST['goto0']) && isset($_REQUEST[$_REQUEST['goto0']."0"])) {
@@ -63 +67 @@
-    if ($action == 'addGRP') {
-      //ringgroups_add($account,implode("-",$grplist),$strategy,$grptime,$grppre,$goto);
-
+,$needsconf,$remotealert,$toolate,$ringing
-      needreload();
-    }
@@ -76 +80 @@
-    if ($action == 'edtGRP') {
-      ringgroups_del($account); 
-
+,$needsconf,$remotealert,$toolate,$ringing
-      needreload();
-    }
@@ -115 +119 @@
-    $description = $thisgrp['description'];
-    $alertinfo = $thisgrp['alertinfo'];
+    $remotealert = $thisgrp['remotealert'];
+    $needsconf = $thisgrp['needsconf'];
+    $toolate = $thisgrp['toolate'];
+    $ringing = $thisgrp['ringing'];
-    unset($grpliststr);
-    unset($thisgrp);
@@ -136 +144 @@
-    $annmsg = '';
-    $alertinfo = '';
+    $remotealert = '';
+    $needsconf = '';
+    $toolate = '';
+    $ringing = '';
-
-    echo "<h2>"._("Add Ring Group")."</h2>";
@@ -166 +178 @@
-          <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>
-         
+                                        
-        </span>
-        </a></td>
-        <td>
-
+&nbsp;&nbsp;
-          <?php
-            $default = (isset($strategy) ? $strategy : 'ringall');
@@ -207 +219 @@
-    <td><a href="#" class="info"><?php echo _("announcement:")?><span><?php echo _("Message to be played to the caller before dialing this group.<br><br>To add additional recordings please use the \"System Recordings\" MENU to the left")?></span></a></td>
-    <td>
-
+&nbsp;&nbsp;
-      <?php
-        $tresults = recordings_list();
@@ -231 +243 @@
-    </td>
-  </tr>
+<?php } if (function_exists('music_list')) { ?>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Play Music On Hold?")?><span><?php echo _("If you select a Music on Hold class to play, instead of 'Ring', they will hear that instead of Ringing while they are waiting for someone to pick up. Note this DOES NOT WORK with call confirmation, due to limitations of Asterisk")?></span></a></td>
+    <td>
+      &nbsp;&nbsp;<select name="ringing"/>
+      <?php
+        $tresults = music_list("/var/lib/asterisk/mohmp3");
+        $cur = (isset($ringing) ? $ringing : 'Ring');
+        echo '<option value="Ring">'._("Ring")."</option>";
+        if (isset($tresults[0])) {
+          foreach ($tresults as $tresult) {
+            echo '<option value="'.$tresult.'"'.($tresult == $cur ? ' SELECTED' : '').'>'.$tresult."</option>\n";
+          }
+        }
+      ?>    
+      </select>   
+    </td>
+  </tr>
-<?php } ?>
-      
@@ -237 +267 @@
-    <td><input type="text" name="alertinfo" size="10" value="<?php echo ($alertinfo)?$alertinfo:'' ?>"></td>
-  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Confirm Calls")?><span><?php echo _('Enable this if you\'re calling external numbers that need confirmation - eg, a mobile phone may go to voicemail which will pick up the call. Enabling this requires the remote side push 1 on their phone before the call is put through.')?></span></a>:</td>
+    <td> <?php if (!function_exists('recordings_list')) { echo _("System Recordings not installed. Option Disabled"); } else { ?>
+      <input type="checkbox" name="needsconf" value="CHECKED" <?php echo $needsconf ?>  /></td>
+<?php } ?>
+  </tr>
+<?php if(function_exists('recordings_list')) { //only include if recordings is enabled?>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Remote Announce:")?><span><?php echo _("Message to be played to the person RECEIVING the call, if 'Confirm Calls' is enabled.<br><br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
+    <td>
+      &nbsp;&nbsp;<select name="remotealert"/>
+      <?php
+        $tresults = recordings_list();
+        $default = (isset($remotealert) ? $remotealert : '');
+        echo '<option value="">'._("None")."</option>";
+        if (isset($tresults[0])) {
+          foreach ($tresults as $tresult) {
+            echo '<option value="'.$tresult[2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1]."</option>\n";
+          }
+        }
+      ?>    
+      </select>   
+    </td>
+  </tr>
+  <tr>
+    <td><a href="#" class="info"><?php echo _("Too-Late Announce:")?><span><?php echo _("Message to be played to the person RECEIVING the call, if the call has already been accepted before they push 1.<br><br>To add additional recordings use the \"System Recordings\" MENU to the left")?></span></a></td>
+    <td>
+      &nbsp;&nbsp;<select name="toolate"/>
+      <?php
+        $tresults = recordings_list();
+        $default = (isset($toolate) ? $toolate : '');
+        echo '<option value="">'._("None")."</option>";
+        if (isset($tresults[0])) {
+          foreach ($tresults as $tresult) {
+            echo '<option value="'.$tresult[2].'"'.($tresult[2] == $default ? ' SELECTED' : '').'>'.$tresult[1]."</option>\n";
+          }
+        }
+      ?>    
+      </select>   
+    </td>
+  </tr>
+<?php } ?>
-      <tr><td colspan="2"><br><h5><?php echo _("Destination if no answer")?>:<hr></h5></td></tr>
-