Changeset 5366

Timestamp:

12/07/07 20:37:01 (10 months ago)

Author:

p_lindheimer

Message:

add audio label, password protect, fix bug for javascript validation to work, add extension/dest registry support and a little more cleanup

Files:

• contributed_modules/modules/vmblast/functions.inc.php (modified) (6 diffs)
• contributed_modules/modules/vmblast/install.php (modified) (1 diff)
• contributed_modules/modules/vmblast/install.sql (modified) (1 diff)
• contributed_modules/modules/vmblast/module.xml (modified) (2 diffs)
• contributed_modules/modules/vmblast/page.vmblast.php (modified) (11 diffs)

contributed_modules/modules/vmblast/functions.inc.php

@@ -21 +21 @@
-}
-
+function vmblast_getdest($exten) {
+        return array("vmblast-grp,$exten,1");
+}
+
+function vmblast_getdestinfo($dest) {
+        if (substr(trim($dest),0,12) == 'vmblast-grp,') {
+                $grp = explode(',',$dest);
+                $grp = $grp[1];
+                $thisgrp = vmblast_get($grp);
+                if (empty($thisgrp)) {
+                        return array();
+                } else {
+                        return array('description' => 'Voicemail Group '.$grp.': '.$thisgrp['description'],
+                                     'edit_url' => 'config.php?display=vmblast&extdisplay=GRP-'.urlencode($grp),
+                                                                  );
+                }
+        } else {
+                return false;
+        }
+}
+
+
-/*      Generates dialplan for vmblast We call this with retrieve_conf
-*/
-
-function vmblast_get_config($engine) {
-        global $ext;  // is this the best way to pass this?
@@ -31 +52 @@
-                        $contextname = 'vmblast-grp';
-                        $ringlist = vmblast_list();
+
+                        if (function_exists('recordings_list')) { 
+                                $recordings_installed = true;
+                                $got_recordings = false;
+                        } else {
+                                $recordings_installed = false;
+                        }
+
-                        if (is_array($ringlist)) {
-                                foreach($ringlist as $item) {
@@ -37 +66 @@
-                                        $grplist = explode('&',$grp['grplist']);
-                                        $ext->add($contextname, $grpnum, '', new ext_macro('user-callerid'));
+                                        $ext->add($contextname, $grpnum, '', new ext_answer(''));
+                                        $ext->add($contextname, $grpnum, '', new ext_wait('1'));
+
+                                        if (isset($grp['password']) && trim($grp['password']) != "" && ctype_digit(trim($grp['password']))) {
+                                                $ext->add($contextname, $grpnum, '', new ext_authenticate($grp['password']));
+                                        }
+
-                                        $ext->add($contextname, $grpnum, '', new ext_setvar('GRPLIST',''));
-                                        foreach ($grplist as $exten) {
@@ -42 +78 @@
-                                                $ext->add($contextname, $grpnum, '', new ext_setvar('GRPLIST','${GRPLIST}&'.$exten.'@${VMCONTEXT}'));
-                                        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
+                                $contextname = 'app-vmblast';
+                                $ext->add($contextname, 'vmblast', '', new ext_background('if-correct-press&digits/1'));
+                                $ext->add($contextname, 'vmblast', '', new ext_waitexten('20'));
+                                $ext->add($contextname, 'vmblast', '', new ext_playback('sorry-youre-having-problems&goodbye'));
+                                $ext->add($contextname, 'vmblast', '', new ext_hangup(''));
+
+                                $ext->add($contextname, '1', '', new ext_vm('${GRPLIST:1},s'));
+                                $ext->add($contextname, '1', '', new ext_hangup(''));
-                        }
-                break;
@@ -50 +113 @@
-}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        $results = sql($sql);
-}
@@ -73 +157 @@
-
-function vmblast_get($grpnum) {
-
+, audio_label, password
-        return $results;
-}

contributed_modules/modules/vmblast/install.php

@@ -9 +9 @@
-}
-
+echo "Upgrading vmblast to add audio_label field..";
+$sql = "SELECT audio_label FROM vmblast";
+$confs = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if (!DB::IsError($confs)) { // no error... Already done
+        echo "Not Required<br />";
+} else {
+        $sql = "ALTER TABLE vmblast ADD audio_label INT ( 11 ) NOT NULL DEFAULT -1";
+        $results = $db->query($sql);
+        if(DB::IsError($results)) {
+                die($results->getMessage());
+        }
+        echo "Done<br />";
+}
+
+echo "Upgrading vmblast to add password field..";
+$sql = "SELECT password FROM vmblast";
+$confs = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+if (!DB::IsError($confs)) { // no error... Already done
+        echo "Not Required<br />";
+} else {
+        $sql = "ALTER TABLE vmblast ADD password VARCHAR ( 20 ) NOT NULL";
+        $results = $db->query($sql);
+        if(DB::IsError($results)) {
+                die($results->getMessage());
+        }
+        echo "Done<br />";
+}
+
+echo "Converting grplist from varchar 255 to blob to handle large groups..";
+$sql = "ALTER TABLE `vmblast` CHANGE `grplist` `grplist` BLOB NOT NULL";
+$results = $db->query($sql);
+if(DB::IsError($results)) {
+        echo "ERROR: failed to convert field<br />";
+} else {
+        echo "OK<br />";
+}
+
-?>

contributed_modules/modules/vmblast/install.sql

@@ -1 @@
-
+
+
+
+
+
+
+
+
+

contributed_modules/modules/vmblast/module.xml

@@ -2 +2 @@
-        <rawname>vmblast</rawname>
-        <name>VoiceMail Blasting</name>
-0.2
+1.0
-        <type>setup</type>
-bound Call Control
+ternal Options &amp; Configuration
-        <description>
-                Creates a group of extensions that Calls a group of voicemail boxes and allows you to leave a Msg for them all at once. 
-        </description>
-        <changelog>
+                *1.1.0* add audio label, password protect, fix bug for javascript validation to work, add extension/dest registry support
-                *1.0.2* increase grouplist field to varchar(255) to increase the vmblast list
-                *1.0.l* fix: context, redisplay of groups, get proper vm contexts, beep before leaving msg
@@ -15 +16 @@
-                <vmblast>VoiceMail Blasting</vmblast>
-        </menuitems>
-
+
+
+
-        <location>release/vmblast-1.0.2.tgz</location>
-        <md5sum>936bf3071733255cc89e278204615540</md5sum>

contributed_modules/modules/vmblast/page.vmblast.php

@@ -12 +12 @@
-$dispnum = 'vmblast'; //used for switch on config.php
-
-
+
+
-//the extension we are currently displaying
-
-
-
+
+
+
+
+
-
-if (isset($_REQUEST["grplist"])) {
@@ -51 +54 @@
-                //add group
-                if ($action == 'addGRP') {
-
-
-
+
+
+
+
+
+
+
+
+
+
-                }
-                
@@ -66 +76 @@
-                if ($action == 'editGRP') {
-                        vmblast_del($account);  
-
+,$audio_label,$password
-                        needreload();
-                        redirect_standard('extdisplay');
@@ -99 +109 @@
-                $grplist = explode("&", $grpliststr);
-                $description = $thisgrp['description'];
+                $audio_label = $thisgrp['audio_label'];
+                $password    = $thisgrp['password'];
-                unset($grpliststr);
-                unset($thisgrp);
@@ -112 +124 @@
-                echo "<h2>"._("VMBlast Group").": ".ltrim($extdisplay,'GRP-')."</h2>";
-                echo "<p>".$delButton."</p>";
+
+                $usage_list = framework_display_destination_usage(vmblast_getdest(ltrim($extdisplay,'GRP-')));
+                if (!empty($usage_list)) {
+                ?>
+                        <a href="#" class="info"><?php echo $usage_list['text']?>:<span><?php echo $usage_list['tooltip']?></span></a>
+                <?php
+                }
+
-        } else {
-                $grplist = explode("-", '');;
@@ -117 +137 @@
-                $ringing = '';
-
+                if (!empty($conflict_url)) {
+                        echo "<h5>"._("Conflicting Extensions")."</h5>";
+                        echo implode('<br .>',$conflict_url);
+                }
-                echo "<h2>"._("Add VMBlast Group")."</h2>";
-        }
@@ -124 +148 @@
-                        <input type="hidden" name="action" value="<?php echo ($extdisplay ? 'editGRP' : 'addGRP'); ?>">
-                        <table>
-
+
+
+
+
-                        <tr>
-<?php
-
+                       
-
-?>
-                                <input size="5" type="hidden" name="account" value="<?php  echo ltrim($extdisplay,'GRP-'); ?>">
-       
+
-                                <td><a href="#" class="info"><?php echo _("VMBlast Number")?>:<span><?php echo _("The number users will dial to voicemail boxes in this VMBlast group")?></span></a></td>
-                                <td><input size="5" type="text" name="account" value="<?php  if ($gresult[0]==0) { echo "500"; } else { echo $gresult[0] + 1; } ?>"></td>
-<?php           } ?>
-                        </tr>
+
-                        <tr>
-                                <td> <a href="#" class="info"><?php echo _("Group Description:")?>:<span><?php echo _("Provide a descriptive title for this VMBlast Group.")?></span></a></td>
-                                <td><input size="20" maxlength="35" type="text" name="description" value="<?php echo htmlspecialchars($description); ?>"></td>
-                        </tr>
+
+<?php if(function_exists('recordings_list')) { //only include if recordings is enabled?>
+                        <tr>
+                                <td><a href="#" class="info"><?php echo _("Audio Label:")?><span><?php echo _("Play this message to the caller so they can confirm they have dialed the proper voice mail group number, or have the system simply read the group number.")?></span></a></td>
+                                <td>
+                                        <select name="audio_label"/>
+                                        <?php
+                                                $tresults = recordings_list();
+                                                $default = (isset($audio_label) ? $audio_label : -1);
+                                                echo '<option value="">'._("Read Group Number")."</option>";
+                                                if (isset($tresults[0])) {
+                                                        foreach ($tresults as $tresult) {
+                                                                echo '<option value="'.$tresult[0].'"'.($tresult[0] == $default ? ' SELECTED' : '').'>'.$tresult[1]."</option>\n";
+                                                        }
+                                                }
+                                        ?>              
+                                        </select>               
+                                </td>
+                        </tr>
+<?php } else { ?>
+                        <tr>
+                                <td><a href="#" class="info"><?php echo _("Audio Label:")?><span><?php echo _("The group number will be payed to the caller so they can confirm they have dialed the prooper voice mail group number.<br><br>You must install and enable the \"Systems Recordings\" Module to edit this option and choose from recordings.")?></span></a></td>
+                                <td>
+                                        <?php
+                                                $default = (isset($audio_label) ? $audio_label : -1);
+                                        ?>
+                                        <input type="hidden" name="audio_label" value="<?php echo $default; ?>"><?php echo ($default != -1 ? $default : _('Read Group Number')); ?>
+                                </td>
+                        </tr>
+<?php } 
+?>
+                        <tr>
+                                <td><a href="#" class="info"><?php echo _("Optional Password")?>:<span><?php echo _('You can optionally include a password to authenticate before providing access to this group voicemail list.')?></span></a></td>
+                                <td><input size="12" type="text" name="password" value="<?php  echo $password ?>">
+                                </td>
+                        </tr>
+
-                        <tr>
-                                <td valign="top"><a href="#" class="info"><?php echo _("Extension list")?>:<span><br><?php echo _("List Voicemail boxes to mass send to. One per line.")?><br></span></a></td>
-                                <td valign="top">
-<?php
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                        <tr>
-                        <td colspan="2"><br><h6><input name="Submit" type="submit" value="<?php echo _("Submit Changes")?>"></h6></td>          
@@ -165 +252 @@
-<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) {
@@ -171 +273 @@
-        var msgInvalidExtList = "<?php echo _('Please enter an extension list.'); ?>";
-        var msgInvalidDescription = "<?php echo _('Please enter a valid Group Description'); ?>";
-
-
-
+
-
-        // form validation
@@ -182 +282 @@
-                return warnInvalid(theForm.account, msgInvalidGrpNumStartWithZero);
-        }
+
+        defaultEmptyOK = true;
+        if (!isInteger(theForm.password.value))
+                return warnInvalid(theForm.password, msgInvalidPassword);
-        
-        defaultEmptyOK = false; 
@@ -190 +294 @@
-                return warnInvalid(theForm.grplist, msgInvalidExtList);
-
-        if (!validateDestinations(theForm, 1, true))
-                return false;
-
-        return true;            
-}