Changeset 5389

Timestamp:

12/10/07 11:01:40 (10 months ago)

Author:

p_lindheimer

Message:

add default vmblast group with auto-add from extensions/users, change to multi-select list, fix js validation allowing empty lists

Files:

• contributed_modules/modules/vmblast/functions.inc.php (modified) (7 diffs)
• contributed_modules/modules/vmblast/module.xml (modified) (2 diffs)
• contributed_modules/modules/vmblast/page.vmblast.php (modified) (9 diffs)

contributed_modules/modules/vmblast/functions.inc.php

@@ -50 +50 @@
-                        $ext->addInclude('from-internal-additional','vmblast-grp');
-                        $contextname = 'vmblast-grp';
-ring
+vm
-
-                        if (function_exists('recordings_list')) { 
@@ -59 +59 @@
-                        }
-
-ring
-ring
+vm
+vm
-                                        $grpnum = ltrim($item['0']);
-                                        $grp = vmblast_get($grpnum);
-explode('&',$grp['grplist'])
+$grp['grplist']
-                                        $ext->add($contextname, $grpnum, '', new ext_macro('user-callerid'));
-                                        $ext->add($contextname, $grpnum, '', new ext_answer(''));
@@ -139 +139 @@
-        global $db;
-
-
-
-
+
+
+
+
+
+
+
+
-        }
-                // Sanity check input.
-
-        $compiled = $db->prepare("INSERT INTO vmblast_groups (grpnum, ext) values ('$grpnum',?)");
-grplist
+xtns
-        if(DB::IsError($result)) {
-                die_freepbx($result->getDebugInfo()."<br><br>".'error adding to vmblast_groups table'); 
@@ -231 +236 @@
-        }
-
-        //if ($tech_hardware != null && ($pagename == 'extensions' || $pagename == 'users')) {
-        if ($tech_hardware != null || $pagename == 'users') {
-                vmblast_applyhooks();
@@ -272 +276 @@
-                if ($default_group != "") {
-                        $in_default_vmblast_grp = vmblast_check_default($extdisplay);
-device from being part of the default voicemail blast group when creating or editing
+user from being part of the default voicemail blast group when creating or editing. Choosing this option will be ignored if the user does not have a voicemial box
-                } 
-        }
@@ -285 +289 @@
-        $ext = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
-        $extn = isset($_REQUEST['extension'])?$_REQUEST['extension']:null;
+        $vm_enabled = isset($_REQUEST['vm']) && $_REQUEST['vm'] == 'enabled' ? true : false;
-        $in_default_vmblast_grp = isset($_REQUEST['in_default_vmblast_grp'])?$_REQUEST['in_default_vmblast_grp']:false;
-
-        $extdisplay = ($ext==='') ? $extn : $ext;
-        
-$action == "add" || $action == "edit"
+($action == "add" || $action == "edit") && $vm_enabled
-                if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) {
-                        if ($in_default_vmblast_grp !== false) {
@@ -295 +300 @@
-                        }
-                }
-action == "del"
+extdisplay != '' && ($action == "del" || ($action == "edit" && !$vm_enabled))
-                $sql = "DELETE FROM vmblast_groups WHERE ext = '$extdisplay'";
-                sql($sql);

contributed_modules/modules/vmblast/module.xml

@@ -2 +2 @@
-        <rawname>vmblast</rawname>
-        <name>VoiceMail Blasting</name>
-1.2
+2.0
-        <type>setup</type>
-        <category>Internal Options &amp; Configuration</category>
@@ -9 +9 @@
-        </description>
-        <changelog>
+                *1.2.0* change to use proper multi-select list, fix bug in js validation of empty list, add default vmblast group
-                *1.1.2* add vmblast_group table and migrate from old grplist field
-                *1.1.1* fixed a couple SQL bugs, improved dialplan so you can skip annoucement and messages immeditiately (except if saydigits used)

contributed_modules/modules/vmblast/page.vmblast.php

@@ -21 +21 @@
-$password    = isset($_REQUEST['password'])    ? $password    : '';
-$default_group  = isset($_REQUEST['default_group']) ? $default_group : '0';
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-// do if we are submitting a form
@@ -61 +37 @@
-                                $conflict_url = framework_display_extension_usage_alert($usage_arr);
-
-grp
+vmblast_
-                                needreload();
-                                redirect_standard();
@@ -77 +53 @@
-                if ($action == 'editGRP') {
-                        vmblast_del($account);  
-grp
+vmblast_
-                        needreload();
-                        redirect_standard('extdisplay');
@@ -112 +88 @@
-                $password    = $thisgrp['password'];
-                $default_group = $thisgrp['default_group'];
-                unset($grpliststr);
-                unset($thisgrp);
-                
@@ -190 +165 @@
-<?php } else { ?>
-                        <tr>
-ayed to the caller so they can confirm they have dialed the pro
+layed to the caller so they can confirm they have dialed the pr
-                                <td>
-                                        <?php
@@ -207 +182 @@
-
-                        <tr>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-                                                $results = core_users_list();
+                                                if (!is_array($results)) $results = array();
-                                                foreach ($results as $result) {
-                                                        if ($result[2] != 'novm') {
-
+
+
+
-                                                        }
-                                                }
-
+                                       
-                                        </select>
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                                        </a>
-                                </td>
@@ -263 +226 @@
-<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) {
@@ -285 +233 @@
-        var msgInvalidDescription = "<?php echo _('Please enter a valid Group Description'); ?>";
-        var msgInvalidPassword = "<?php echo _('Please enter a valid numeric password, only numbers are allowed'); ?>";
+        var msgInvalidExtList = "<?php echo _('Please select at least one extension'); ?>";
-
-        // form validation
@@ -302 +251 @@
-                return warnInvalid(theForm.description, msgInvalidDescription);
-        
-
-
+
+
+
+
+
+
+
+
+
-
-        return true;            
-}
+
-//-->
-</script>