Index: /modules/branches/2.4/vmblast/install.sql
===================================================================
--- /modules/branches/2.4/vmblast/install.sql (revision 5372)
+++ /modules/branches/2.4/vmblast/install.sql (revision 5372)
@@ -0,0 +1,15 @@
+CREATE TABLE IF NOT EXISTS `vmblast` 
+( 
+	`grpnum` INT( 11 ) NOT NULL , 
+	`description` VARCHAR( 35 ) NOT NULL , 
+	`audio_label` INT( 11 ) NOT NULL DEFAULT -1 , 
+	`password` VARCHAR( 20 ) NOT NULL , 
+	PRIMARY KEY  (`grpnum`) 
+); 
+
+CREATE TABLE IF NOT EXISTS vmblast_groups 
+(
+	grpnum  VARCHAR(50), 
+	ext VARCHAR(25),
+	PRIMARY KEY (grpnum , ext)
+);
Index: /modules/branches/2.4/vmblast/module.xml
===================================================================
--- /modules/branches/2.4/vmblast/module.xml (revision 5389)
+++ /modules/branches/2.4/vmblast/module.xml (revision 5389)
@@ -0,0 +1,26 @@
+<module>
+	<rawname>vmblast</rawname>
+	<name>VoiceMail Blasting</name>
+	<version>1.2.0</version>
+	<type>setup</type>
+	<category>Internal Options &amp; Configuration</category>
+	<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.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)
+		*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
+	</changelog>
+	<menuitems>
+		<vmblast>VoiceMail Blasting</vmblast>
+	</menuitems>
+	<depends>
+		<version>2.4.0beta1</version>
+	</depends>
+	<location>release/vmblast-1.1.2.tgz</location>
+	<md5sum>919369eabe392cd215ef9f3505ce2d35</md5sum>
+</module>
Index: /modules/branches/2.4/vmblast/functions.inc.php
===================================================================
--- /modules/branches/2.4/vmblast/functions.inc.php (revision 5389)
+++ /modules/branches/2.4/vmblast/functions.inc.php (revision 5389)
@@ -0,0 +1,307 @@
+<?php /* $Id: functions.inc.php 3396 2006-12-21 02:40:16Z p_lindheimer $ */
+
+// The destinations this module provides
+// returns a associative arrays with keys 'destination' and 'description'
+function vmblast_destinations() {
+	//get the list of vmblast
+	$results = vmblast_list();
+	
+	// return an associative array with destination and description
+	if (isset($results)) {
+		foreach($results as $result){
+				$thisgrp = vmblast_get(ltrim($result['0']));
+				$extens[] = array('destination' => 'vmblast-grp,'.ltrim($result['0']).',1', 'description' => $thisgrp['description'].' <'.ltrim($result['0']).'>');
+		}
+	}
+	
+	if (isset($extens)) 
+		return $extens;
+	else
+		return null;
+}
+
+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?
+	switch($engine) {
+		case "asterisk":
+			$ext->addInclude('from-internal-additional','vmblast-grp');
+			$contextname = 'vmblast-grp';
+			$vmlist = vmblast_list();
+
+			if (function_exists('recordings_list')) { 
+				$recordings_installed = true;
+				$got_recordings = false;
+			} else {
+				$recordings_installed = false;
+			}
+
+			if (is_array($vmlist)) {
+				foreach($vmlist as $item) {
+					$grpnum = ltrim($item['0']);
+					$grp = vmblast_get($grpnum);
+					$grplist = $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) {
+						$ext->add($contextname, $grpnum, '', new ext_macro('get-vmcontext',$exten));
+						$ext->add($contextname, $grpnum, '', new ext_setvar('GRPLIST','${GRPLIST}&'.$exten.'@${VMCONTEXT}'));
+					}
+
+					// Add a message and confirmation so they know what group they are in
+					//
+					if ($grp['audio_label'] == -1 || !$recordings_installed) {
+						$ext->add($contextname, $grpnum, '', new ext_setvar('DIGITS',$grpnum));
+						$ext->add($contextname, $grpnum, '', new ext_goto('digits','vmblast','app-vmblast'));
+					} else {
+						if (!$got_recordings) {
+							$recordings = recordings_list();
+							$got_recordings = true;
+							$recording_hash = array();
+							foreach ($recordings as $recording) {
+								$recording_hash[$recording[0]] = $recording[2];
+							}
+						}
+						if (isset($recording_hash[$grp['audio_label']])) {
+							$ext->add($contextname, $grpnum, '', new ext_setvar('MSG',$recording_hash[$grp['audio_label']]));
+							$ext->add($contextname, $grpnum, '', new ext_goto('msg','vmblast','app-vmblast'));
+						} else {
+							$ext->add($contextname, $grpnum, '', new ext_setvar('DIGITS',$grpnum));
+							$ext->add($contextname, $grpnum, '', new ext_goto('digits','vmblast','app-vmblast'));
+						}
+					}
+				}
+				$contextname = 'app-vmblast';
+				$ext->add($contextname, 'vmblast', 'digits', new ext_execif('$["${DIGITS}" != ""]','SayDigits','${DIGITS}'));
+				$ext->add($contextname, 'vmblast', 'msg', new ext_execif('$["${MSG}" != ""]','Background','${MSG}'));
+				$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;
+	}
+}
+
+function vmblast_check_extensions($exten=true) {
+	$extenlist = array();
+	if (is_array($exten) && empty($exten)) {
+		return $extenlist;
+	}
+	$sql = "SELECT grpnum ,description FROM vmblast ";
+	if (is_array($exten)) {
+		$sql .= "WHERE grpnum in ('".implode("','",$exten)."')";
+	}
+	$results = sql($sql,"getAll",DB_FETCHMODE_ASSOC);
+
+	foreach ($results as $result) {
+		$thisexten = $result['grpnum'];
+		$extenlist[$thisexten]['description'] = _("Voicemail Group: ").$result['description'];
+		$extenlist[$thisexten]['status'] = 'INUSE';
+		$extenlist[$thisexten]['edit_url'] = 'config.php?display=vmblast&extdisplay=GRP-'.urlencode($thisexten);
+	}
+	return $extenlist;
+}
+
+function vmblast_add($grpnum,$grplist,$description,$audio_label= -1, $password = '', $default_group=0) {
+	global $db;
+
+	if (is_array($grplist)) {
+		$xtns = $grplist;
+	} else {
+		$xtns = explode("\n",$grplist);
+	}
+
+	foreach ($xtns as $key => $value) {
+		$xtns[$key] = addslashes(trim($value));
+	}
+		// Sanity check input.
+
+	$compiled = $db->prepare("INSERT INTO vmblast_groups (grpnum, ext) values ('$grpnum',?)");
+	$result   = $db->executeMultiple($compiled,$xtns);
+	if(DB::IsError($result)) {
+		die_freepbx($result->getDebugInfo()."<br><br>".'error adding to vmblast_groups table');	
+	}
+	$sql = "INSERT INTO vmblast (grpnum, description, audio_label, password) VALUES (".$grpnum.", '".str_replace("'", "''", $description)."', '$audio_label', '".str_replace("'","''", $password)."')";
+	$results = sql($sql);
+
+	if ($default_group) {
+		sql("DELETE FROM `admin` WHERE variable = 'default_vmblast_grp'");
+		sql("INSERT INTO `admin` (variable, value) VALUES ('default_vmblast_grp', '$grpnum')");
+	} else {
+		sql("DELETE FROM `admin` WHERE variable = 'default_vmblast_grp' AND value = '$grpnum'");
+	}
+}
+
+function vmblast_del($grpnum) {
+	$results = sql("DELETE FROM vmblast WHERE grpnum = '$grpnum'","query");
+	$results = sql("DELETE FROM vmblast_groups WHERE grpnum = '$grpnum'","query");
+	sql("DELETE FROM `admin` WHERE variable = 'default_vmblast_grp' AND value = '$grpnum'");
+}
+
+function vmblast_list() {
+	$results = sql("SELECT grpnum, description FROM vmblast ORDER BY grpnum","getAll",DB_FETCHMODE_ASSOC);
+	foreach ($results as $result) {
+		if (isset($result['grpnum']) && checkRange($result['grpnum'])) {
+			$grps[] = array($result['grpnum'], $result['description']);
+		}
+	}
+	if (isset($grps))
+		return $grps;
+	else
+		return null;
+}
+
+function vmblast_get($grpnum) {
+	global $db;
+
+	$results = sql("SELECT grpnum, description, audio_label, password FROM vmblast WHERE grpnum = '$grpnum'","getRow",DB_FETCHMODE_ASSOC);
+	$grplist = $db->getCol("SELECT ext FROM vmblast_groups WHERE grpnum = '$grpnum'");
+	if(DB::IsError($grplist)) {
+		die_freepbx($grplist->getDebugInfo()."<br><br>".'selecting from vmblast_groups table');	
+	}
+	$results['grplist'] = $grplist;
+
+	$sql = "SELECT * FROM admin WHERE variable='default_vmblast_grp' AND value='$grpnum'";
+	$default_group = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+	if(DB::IsError($default_group)) {
+		$results['default_group'] = 0;
+	} else {
+		$results['default_group'] = empty($default_group) ? 0 : $default_group['value'];
+	}
+	
+	return $results;
+}
+
+function vmblast_check_default($extension) {
+	$sql = "SELECT ext FROM vmblast_groups WHERE ext = '$extension' AND grpnum = (SELECT value FROM admin WHERE variable = 'default_vmblast_grp' limit 1)";
+	$results = sql($sql,"getAll");
+	return (count($results) ? 1 : 0);
+}
+
+function vmblast_set_default($extension, $value) {
+	$default_group = sql("SELECT value FROM `admin` WHERE variable = 'default_vmblast_grp' limit 1", "getOne");
+	if ($default_group == '') {
+		return false;
+	}
+	sql("DELETE FROM vmblast_groups WHERE ext = '$extension' AND grpnum = '$default_group'");
+	if ($value == 1) {
+		sql("INSERT INTO vmblast_groups (grpnum, ext) VALUES ('$default_group', '$extension')");
+	}
+}
+
+function vmblast_configpageinit($pagename) {
+	global $currentcomponent;
+
+	$action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+	$extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:null;
+	$extension = isset($_REQUEST['extension'])?$_REQUEST['extension']:null;
+	$tech_hardware = isset($_REQUEST['tech_hardware'])?$_REQUEST['tech_hardware']:null;
+
+	// We only want to hook 'users' or 'extensions' pages.
+	if ($pagename != 'users' && $pagename != 'extensions') {
+		return true;
+	}
+
+	if ($tech_hardware != null || $pagename == 'users') {
+		vmblast_applyhooks();
+		$currentcomponent->addprocessfunc('vmblast_configprocess', 8);
+	} elseif ($action=="add") {
+		// We don't need to display anything on an 'add', but we do need to handle returned data.
+		$currentcomponent->addprocessfunc('vmblast_configprocess', 8);
+	} elseif ($extdisplay != '') {
+		// We're now viewing an extension, so we need to display _and_ process.
+		vmblast_applyhooks();
+		$currentcomponent->addprocessfunc('vmblast_configprocess', 8);
+	}
+}
+
+function vmblast_applyhooks() {
+	global $currentcomponent;
+
+	// Add the 'process' function - this gets called when the page is loaded, to hook into 
+	// displaying stuff on the page.
+	$currentcomponent->addoptlistitem('vmblast_group', '0', _("Exclude"));
+	$currentcomponent->addoptlistitem('vmblast_group', '1', _("Include"));
+	$currentcomponent->setoptlistopts('vmblast_group', 'sort', false);
+
+	$currentcomponent->addguifunc('vmblast_configpageload');
+}
+
+// This is called before the page is actually displayed, so we can use addguielem().
+function vmblast_configpageload() {
+	global $currentcomponent;
+
+	// Init vars from $_REQUEST[]
+	$action = isset($_REQUEST['action']) ? $_REQUEST['action']:null;
+	$extdisplay = isset($_REQUEST['extdisplay']) ? $_REQUEST['extdisplay']:null;
+	
+	// Don't display this stuff it it's on a 'This xtn has been deleted' page.
+	if ($action != 'del') {
+
+		$default_group = sql("SELECT value FROM `admin` WHERE variable = 'default_vmblast_grp'", "getOne");
+		$section = _("Default Group Inclusion");
+		if ($default_group != "") {
+			$in_default_vmblast_grp = vmblast_check_default($extdisplay);
+			$currentcomponent->addguielem($section, new gui_selectbox('in_default_vmblast_grp', $currentcomponent->getoptlist('vmblast_group'), $in_default_vmblast_grp, _('Default VMblast Group'), _('You can include or exclude this extension/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.'), false));
+		} 
+	}
+}
+
+function vmblast_configprocess() {
+	global $db;
+
+	//create vars from the request
+	//
+	$action = isset($_REQUEST['action'])?$_REQUEST['action']:null;
+	$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;
+	
+	if (($action == "add" || $action == "edit") && $vm_enabled) {
+		if (!isset($GLOBALS['abort']) || $GLOBALS['abort'] !== true) {
+			if ($in_default_vmblast_grp !== false) {
+				vmblast_set_default($extdisplay, $in_default_vmblast_grp);
+			}
+		}
+	} elseif ($extdisplay != '' && ($action == "del" || ($action == "edit" && !$vm_enabled))) {
+		$sql = "DELETE FROM vmblast_groups WHERE ext = '$extdisplay'";
+		sql($sql);
+	}
+}
+?>
Index: /modules/branches/2.4/vmblast/uninstall.sql
===================================================================
--- /modules/branches/2.4/vmblast/uninstall.sql (revision 5372)
+++ /modules/branches/2.4/vmblast/uninstall.sql (revision 5372)
@@ -0,0 +1,3 @@
+
+DROP TABLE IF EXISTS vmblast;
+DROP TABLE IF EXISTS vmblast_groups;
Index: /modules/branches/2.4/vmblast/page.vmblast.php
===================================================================
--- /modules/branches/2.4/vmblast/page.vmblast.php (revision 5389)
+++ /modules/branches/2.4/vmblast/page.vmblast.php (revision 5389)
@@ -0,0 +1,268 @@
+<?php 
+//This program is free software; you can redistribute it and/or
+//modify it under the terms of the GNU General Public License
+//as published by the Free Software Foundation; either version 2
+//of the License, or (at your option) any later version.
+//
+//This program is distributed in the hope that it will be useful,
+//but WITHOUT ANY WARRANTY; without even the implied warranty of
+//MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//GNU General Public License for more details.
+
+$dispnum = 'vmblast'; //used for switch on config.php
+
+$action      = isset($_REQUEST['action'])      ? $action      : '';
+
+//the extension we are currently displaying
+$extdisplay  = isset($_REQUEST['extdisplay'])  ? $extdisplay  : '';
+$account     = isset($_REQUEST['account'])     ? $account     : '';
+$description = isset($_REQUEST['description']) ? $description : '';
+$audio_label = isset($_REQUEST['audio_label']) ? $audio_label : -1;
+$password    = isset($_REQUEST['password'])    ? $password    : '';
+$default_group  = isset($_REQUEST['default_group']) ? $default_group : '0';
+$vmblast_list   = isset($_REQUEST['vmblast_list'])  ? $vmblast_list  : '';
+
+// do if we are submitting a form
+if(isset($_POST['action'])){
+	//check if the extension is within range for this user
+	if (isset($account) && !checkRange($account)){
+		echo "<script>javascript:alert('". _("Warning! Extension")." ".$account." "._("is not allowed for your account").".');</script>";
+	} else {
+		//add group
+		if ($action == 'addGRP') {
+
+			$conflict_url = array();
+			$usage_arr = framework_check_extension_usage($account);
+			if (!empty($usage_arr)) {
+				$conflict_url = framework_display_extension_usage_alert($usage_arr);
+
+			} else if (vmblast_add($account,$vmblast_list,$description)) {
+				needreload();
+				redirect_standard();
+			}
+		}
+		
+		//del group
+		if ($action == 'delGRP') {
+			vmblast_del($account);
+			needreload();
+			redirect_standard();
+		}
+		
+		//edit group - just delete and then re-add the extension
+		if ($action == 'editGRP') {
+			vmblast_del($account);	
+			vmblast_add($account,$vmblast_list,$description,$audio_label,$password,$default_group);
+			needreload();
+			redirect_standard('extdisplay');
+		}
+	}
+}
+?>
+</div>
+
+<div class="rnav"><ul>
+    <li><a id="<?php  echo ($extdisplay=='' ? 'current':'') ?>" href="config.php?display=<?php echo urlencode($dispnum)?>"><?php echo _("Add VMBlast Group")?></a></li> <?php 
+//get unique ring groups
+$gresults = vmblast_list();
+
+if (isset($gresults)) {
+	foreach ($gresults as $gresult) {
+		echo "<li><a id=\"".($extdisplay=='GRP-'.$gresult[0] ? 'current':'')."\" href=\"config.php?display=".urlencode($dispnum)."&extdisplay=".urlencode("GRP-".$gresult[0])."\">".$gresult[1]." ({$gresult[0]})</a></li>";
+	}
+}
+?>
+</ul></div>
+
+<div class="content">
+<?php 
+if ($action == 'delGRP') {
+	echo '<br><h3>'._("VMBlast Group").' '.$account.' '._("deleted").'!</h3><br><br><br><br><br><br><br><br>';
+} else {
+	if ($extdisplay) {
+		// We need to populate grplist with the existing extension list.
+		$thisgrp = vmblast_get(ltrim($extdisplay,'GRP-'));
+		$grplist     = $thisgrp['grplist'];
+		$description = $thisgrp['description'];
+		$audio_label = $thisgrp['audio_label'];
+		$password    = $thisgrp['password'];
+		$default_group = $thisgrp['default_group'];
+		unset($thisgrp);
+		
+		$delButton = "
+			<form name=delete action=\"{$_SERVER['PHP_SELF']}\" method=POST>
+				<input type=\"hidden\" name=\"display\" value=\"{$dispnum}\">
+				<input type=\"hidden\" name=\"account\" value=\"".ltrim($extdisplay,'GRP-')."\">
+				<input type=\"hidden\" name=\"action\" value=\"delGRP\">
+				<input type=submit value=\""._("Delete Group")."\">
+			</form>";
+			
+		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 = array();
+		$strategy = '';
+		$ringing = '';
+
+		if (!empty($conflict_url)) {
+			echo "<h5>"._("Conflicting Extensions")."</h5>";
+			echo implode('<br .>',$conflict_url);
+		}
+		echo "<h2>"._("Add VMBlast Group")."</h2>";
+	}
+	?>
+			<form name="editGRP" action="<?php  $_SERVER['PHP_SELF'] ?>" method="post" onsubmit="return checkGRP(editGRP);">
+			<input type="hidden" name="display" value="<?php echo $dispnum?>">
+			<input type="hidden" name="action" value="<?php echo ($extdisplay ? 'editGRP' : 'addGRP'); ?>">
+			<table>
+			<tr>
+				<td colspan="2"><h5><?php  echo ($extdisplay ? _("Edit VMBlast Group") : _("Add VMBlast Group")) ?><hr></h5>
+				</td>
+			</tr>
+			<tr>
+<?php
+				if ($extdisplay) { 
+
+?>
+				<input size="5" type="hidden" name="account" value="<?php  echo ltrim($extdisplay,'GRP-'); ?>">
+<?php 	} else { ?>
+				<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="-1">'._("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 played to the caller so they can confirm they have dialed the proper 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 _("Voicemail Box List:")."<span><br>"._("Select voice mail boxes to add to this group. Use Ctrl key to select multiple..") ?> 
+	<br><br></span></a>
+				</td>
+				<td valign="top"> 
+					<select multiple="multiple" name="vmblast_list[]" id="xtnlist" >
+						<?php 
+						$results = core_users_list();
+						if (!is_array($results)) $results = array();
+						foreach ($results as $result) {
+							if ($result[2] != 'novm') {
+								echo '<option value="'.$result[0].'" ';
+								if (array_search($result[0], $grplist) !== false) echo ' selected="selected" ';
+								echo '>'.$result[0].' ('.$result[1].')</option>';
+							}
+						}
+						?>
+					</select>
+				<br>
+				</td>
+			</tr>
+
+			<tr>
+				<td>
+					<a href='#' class='info'><?php echo _("Default VMBlast Group") ?> 
+						<span> <?php echo _("Each PBX system can have a single Default Voicemail Blast Group. If specified, extensions can be automatically added (or removed) from this default group in the Extensions (or Users) tab.<br />Making this group the default will uncheck the option from the current default group if specified.") ?> </span>
+					</a>
+				</td>
+				<td>
+					<input type='checkbox' name='default_group' id="default_group" value='1' <?php if ($default_group) { echo 'CHECKED'; } ?>>
+				</td>
+
+			<tr>
+			<td colspan="2"><br><h6><input name="Submit" type="submit" value="<?php echo _("Submit Changes")?>"></h6></td>		
+			
+			</tr>
+			</table>
+			</form>
+<?php 		
+		} //end if action == delGRP
+		
+
+?>
+<script language="javascript">
+<!--
+
+function checkGRP(theForm) {
+	var msgInvalidGrpNum = "<?php echo _('Invalid Group Number specified'); ?>";
+	var msgInvalidGrpNumStartWithZero = "<?php echo _('Group numbers with more than one digit cannot begin with 0'); ?>";
+	var msgInvalidExtList = "<?php echo _('Please enter an extension list.'); ?>";
+	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
+	defaultEmptyOK = false;
+	if (!isInteger(theForm.account.value)) {
+		return warnInvalid(theForm.account, msgInvalidGrpNum);
+	} else if (theForm.account.value.indexOf('0') == 0 && theForm.account.value.length > 1) {
+		return warnInvalid(theForm.account, msgInvalidGrpNumStartWithZero);
+	}
+
+	defaultEmptyOK = true;
+	if (!isInteger(theForm.password.value))
+		return warnInvalid(theForm.password, msgInvalidPassword);
+	
+	defaultEmptyOK = false;	
+	if (!isAlphanumeric(theForm.description.value))
+		return warnInvalid(theForm.description, msgInvalidDescription);
+	
+	var selected = 0;
+	for (var i=0; i < theForm.xtnlist.options.length; i++) {
+		if (theForm.xtnlist.options[i].selected) selected += 1;
+	}
+	if (selected < 1) {
+    theForm.xtnlist.focus();
+		alert(msgInvalidExtList);
+		return false;
+	}
+
+	return true;		
+}
+
+//-->
+</script>
+
Index: /modules/branches/2.4/vmblast/install.php
===================================================================
--- /modules/branches/2.4/vmblast/install.php (revision 5372)
+++ /modules/branches/2.4/vmblast/install.php (revision 5372)
@@ -0,0 +1,69 @@
+<?php
+
+// TODO:
+// TODO: MOVE TABLE CREATIONS INTO HERE
+// TODO:
+
+global $db;
+
+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 />";
+}
+
+// Drop grplist field but first pull it's data and put in new table
+//
+echo "Dropping grplist..";
+$sql = 'SELECT grpnum, grplist FROM vmblast';
+$confs = $db->getAll($sql, DB_FETCHMODE_ASSOC);
+if (!DB::IsError($confs)) { 
+	$list = array();
+	foreach ($confs as $group) {
+		$grplist = explode('&',$group['grplist']);
+		foreach ($grplist as $exten) {
+			$list[] = array($group['grpnum'],addslashes(trim($exten)));
+		}
+	}
+	$compiled = $db->prepare("INSERT INTO vmblast_groups (grpnum, ext) values (?,?)");
+	$result   = $db->executeMultiple($compiled, $list);
+	if(DB::IsError($result)) {
+		echo "error populating vmblast_groups table<br />";	
+		return false;
+	} else {
+		echo "populated new table<br />Dropping old grplist field";
+		$sql = "ALTER TABLE `vmblast` DROP `grplist`";
+		$results = $db->query($sql);
+		if(DB::IsError($results)) {
+			echo "failed to drop field<br />";
+		} else {
+			echo "OK<br />";
+		}
+	}
+} else {
+	echo "Not Needed<br />";
+}
+
+?>