[Pkg-voip-commits] r3225 - in freepbx/modules-2.2: . modules/freepbx-module-announcement modules/freepbx-module-announcement/debian modules/freepbx-module-ivr modules/freepbx-module-ivr/debian modules/freepbx-module-miscdests modules/freepbx-module-miscdests/debian modules/freepbx-module-queues modules/freepbx-module-queues/debian modules/freepbx-module-recordings modules/freepbx-module-recordings/debian

Diego Iastrubni elcuco-guest at alioth.debian.org
Sun Mar 11 16:32:10 CET 2007


Author: elcuco-guest
Date: 2007-03-11 15:32:09 +0000 (Sun, 11 Mar 2007)
New Revision: 3225

Modified:
   freepbx/modules-2.2/modules-2.2.xml
   freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php
   freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml
   freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php
   freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml
   freepbx/modules-2.2/modules/freepbx-module-miscdests/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-miscdests/functions.inc.php
   freepbx/modules-2.2/modules/freepbx-module-miscdests/module.xml
   freepbx/modules-2.2/modules/freepbx-module-queues/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-queues/module.xml
   freepbx/modules-2.2/modules/freepbx-module-queues/page.queues.php
   freepbx/modules-2.2/modules/freepbx-module-recordings/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-recordings/functions.inc.php
   freepbx/modules-2.2/modules/freepbx-module-recordings/module.xml
   freepbx/modules-2.2/modules/freepbx-module-recordings/page.recordings.php
Log:
Modules upgrade for freepbx - 11-3-2007



Modified: freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,3 +1,9 @@
+freepbx-module-announcement (2.2-0.8.0-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun, 11 Mar 2007 17:26:38 +0200
+
 freepbx-module-announcement (2.2-0.7.0-2) unstable; urgency=low
 
   * Added missing install.php and uninstall.php

Modified: freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php	2007-03-11 15:32:09 UTC (rev 3225)
@@ -44,8 +44,12 @@
 				$exten = $row[7] ? 't':'s';
 				if ($row[5]) {
 					$ext->add('app-announcement-'.$row[0], $exten, '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4].':${IVR_CONTEXT},return,1'));
+					if ($row[3] || $row[7])
+						$ext->add('app-announcement-'.$row[0], 'i', '', new ext_gotoif('$["x${IVR_CONTEXT}" = "x"]', $row[4].':${IVR_CONTEXT},return,1'));
 				} else {
 					$ext->add('app-announcement-'.$row[0], $exten, '', new ext_goto($row[4]));
+					if ($row[3] || $row[7])
+						$ext->add('app-announcement-'.$row[0], 'i', '', new ext_goto($row[4]));
 				}
 				
 			}

Modified: freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,8 +1,9 @@
 <module>
 	<rawname>announcement</rawname>
 	<name>Announcements</name>
-	<version>0.7.0</version>
+	<version>0.8.0</version>
 	<changelog>
+		*0.8.0* need to add an i extension, even with m option in bacground, it fails if skip is not enabled
 		*0.7.0* more fixes to deal with sqlite and fix mysql5 (includes renaming of repeat to repeat_msg)
 		*0.6.1* Modified the install.sql to work on sqlite3
 		*0.6* added an option to choose a single digit that can be used to have the msg repeated
@@ -19,7 +20,7 @@
 	<menuitems>
 		<announcement>Announcements</announcement>
 	</menuitems>
-	<location>release/2.2/announcement-0.6.tgz</location>
+	<location>release/2.2/announcement-0.7.0.tgz</location>
 	<info>http://aussievoip.com.au/wiki/freePBX-Announcement</info>
-	<md5sum>7f75a6ff6ce6f5c6ab410e50deafd3ff</md5sum>
+	<md5sum>1991ecf118b229206a4e48886ba452f5</md5sum>
 </module>

Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,3 +1,9 @@
+freepbx-module-ivr (2.2-2.5.11-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun, 11 Mar 2007 17:26:40 +0200
+
 freepbx-module-ivr (2.2-2.5.10-2) unstable; urgency=low
 
   * SQLite3 support. Fixes upstream http://freepbx.org/trac/ticket/1776

Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,5 +1,5 @@
 <?php
- /* $Id: functions.inc.php 3716 2007-02-06 07:55:22Z p_lindheimer $ */
+ /* $Id: functions.inc.php 3789 2007-02-16 18:48:34Z p_lindheimer $ */
 
 
 function ivr_init() {
@@ -169,6 +169,14 @@
 							if ($dest['selection'] == 'i') $invalid=true;
 							$ext->add($id, $dest['selection'],'', new ext_dbdel('${BLKVM_OVERRIDE}'));
 							$ext->add($id, $dest['selection'],'', new ext_setvar('__NODEST', ''));
+
+							// if the goto goes loops back to this ivr, then don't go to the begining or it will break the return to previous ivr info
+							//
+							$dest_context = trim(strtok($dest['dest'],",|"));
+							if ($dest_context == $id) {
+								$dest['dest'] = $id.',s,begin';
+							}
+
 							if ($dest['ivr_ret']) {
 								$ext->add($id, $dest['selection'],'', new ext_gotoif('$["x${IVR_CONTEXT_${CONTEXT}}" = "x"]', $dest['dest'].':${IVR_CONTEXT_${CONTEXT}},return,1'));
 							} else {

Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,13 +1,14 @@
 <module>
 	<rawname>ivr</rawname>
 	<name>IVR</name>
-	<version>2.5.10</version>
+	<version>2.5.11</version>
 	<type>setup</type>
 	<category>Inbound Call Control</category>
 	<description>
 		Creates Digital Receptionist (aka Auto-Attendant, aka Interactive Voice Response) menus. These can be used to send callers to different locations (eg, "Press 1 for sales") and/or allow direct-dialing of extension numbers. 
 	</description>
 	<changelog>
+		*2.5.11* Allow option for IVR to loop back to itself without corrupting the return-to-ivr to the parent
 		*2.5.10* Fix bug where pressing enter in a field would delete the IVR
 		*2.5.9* some tweaks because of strange inheritance behavior, so need to reset IVR variables upon returns for some looping conditions
 		*2.5.8* insert a return extension so that annoucements and ivrs returning don't trample back over the top
@@ -23,7 +24,7 @@
 	<menuitems>
 		<ivr>IVR</ivr>
 	</menuitems>
-	<location>release/2.2/ivr-2.5.9.tgz</location>
+	<location>release/2.2/ivr-2.5.10.tgz</location>
 	<info>http://aussievoip.com.au/wiki/freePBX-IVR</info>
-	<md5sum>20b2b50a74c3150b3904be5f9e0b7359</md5sum>
+	<md5sum>e1c1da78c7aa36a75b128fb4c42381bc</md5sum>
 </module>

Modified: freepbx/modules-2.2/modules/freepbx-module-miscdests/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-miscdests/debian/changelog	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-miscdests/debian/changelog	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,3 +1,9 @@
+freepbx-module-miscdests (2.2-1.3.4-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun, 11 Mar 2007 17:26:41 +0200
+
 freepbx-module-miscdests (2.2-1.3.3-2) unstable; urgency=low
 
   * added sqlite3 support, closes upstream #1773

Modified: freepbx/modules-2.2/modules/freepbx-module-miscdests/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-miscdests/functions.inc.php	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-miscdests/functions.inc.php	2007-03-11 15:32:09 UTC (rev 3225)
@@ -40,7 +40,7 @@
 
 					// write out the dialplan details
 					$ext->add($contextname, $miscid, '', new ext_noop('MiscDest: '.$miscdescription));
-					$ext->add($contextname, $miscid, '', new ext_dial('Local/'.$miscdialdest.'@from-internal', ''));
+					$ext->add($contextname, $miscid, '', new ext_goto('from-internal,'.$miscdialdest.',1', ''));
 					
 				}
 			}
@@ -87,4 +87,4 @@
 	$fc = $fcc->getCodeActive();
 	return $fc;
 }
-?>
\ No newline at end of file
+?>

Modified: freepbx/modules-2.2/modules/freepbx-module-miscdests/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-miscdests/module.xml	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-miscdests/module.xml	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,11 +1,12 @@
 <module>
 	<rawname>miscdests</rawname>
 	<name>Misc Destinations</name>
-	<version>1.3.3</version>
+	<version>1.3.4</version>
 	<type>setup</type>
 	<category>Inbound Call Control</category>
 	<description>Allows creating destinations that dial any local number (extensions, feature codes, outside phone numbers) that can be used by other modules (eg, IVR, time conditions) as a call destination.</description>
 	<changelog>
+		*1.3.4* destination changed from Dial(Local/nnn at from-internal) to Goto(from-internal,nnn,1), no reason a new channel should be created
 		*1.3.3* Minor formatting changes
 		*1.3.2* Add he_IL translation
 		*1.3.1* Updated help text
@@ -14,7 +15,7 @@
 	<menuitems>
 		<miscdests>Misc Destinations</miscdests>
 	</menuitems>
-	<location>release/2.2/miscdests-1.3.2.tgz</location>
+	<location>release/2.2/miscdests-1.3.3.tgz</location>
 	<info>http://aussievoip.com.au/wiki/freePBX-MiscDests</info>
-	<md5sum>8aa53fdd4a9bdfc9ed31409302ff6bab</md5sum>
+	<md5sum>1e79d5c3e9490ccabbcbdcd95cc8ce19</md5sum>
 </module>

Modified: freepbx/modules-2.2/modules/freepbx-module-queues/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-queues/debian/changelog	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-queues/debian/changelog	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,3 +1,9 @@
+freepbx-module-queues (2.2-2.2.8.1-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun, 11 Mar 2007 17:26:45 +0200
+
 freepbx-module-queues (2.2-2.2.8-1) unstable; urgency=low
 
   * First release.

Modified: freepbx/modules-2.2/modules/freepbx-module-queues/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-queues/module.xml	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-queues/module.xml	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,13 +1,14 @@
 <module>
 	<rawname>queues</rawname>
 	<name>Queues</name>
-	<version>2.2.8</version>
+	<version>2.2.8.1</version>
 	<type>setup</type>
 	<category>Inbound Call Control</category>
 	<description>
 		Creates a queue where calls are placed on hold and answered on a first-in, first-out basis. Many options are available, including ring strategy for agents, caller announcements, max wait times, etc. 
 	</description>
 	<changelog>
+		*2.2.8.1* Updated tootip to warn about agents.conf (unsupported and know issues) and warn about penalties (broken in asterisk)
 		*2.2.8* Fixed typo in 2.2.7
 		*2.2.7* Fixed eventmemberstatus #1635
 		*2.2.6* Add he_IL translation
@@ -20,7 +21,7 @@
 	<menuitems>
 		<queues>Queues</queues>
 	</menuitems>
-	<location>release/2.2/queues-2.2.7.tgz</location>
+	<location>release/2.2/queues-2.2.8.tgz</location>
 	<info>http://aussievoip.com.au/wiki/freePBX-Queues</info>
-	<md5sum>1f9213f2e35bab3192132306356a0845</md5sum>
+	<md5sum>84a404faa78e8e13b7155359c686a57a</md5sum>
 </module>

Modified: freepbx/modules-2.2/modules/freepbx-module-queues/page.queues.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-queues/page.queues.php	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-queues/page.queues.php	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,4 +1,4 @@
-<?php /* $Id: page.queues.php 3692 2007-02-04 22:07:19Z naftali5 $ */
+<?php /* $Id: page.queues.php 3839 2007-03-02 18:00:48Z p_lindheimer $ */
 //Copyright (C) 2004 Coalescent Systems Inc. (info at coalescentsystems.ca)
 //
 //This program is free software; you can redistribute it and/or
@@ -180,7 +180,7 @@
 		<td><input size="4" type="text" name="prefix" value="<?php echo (isset($prefix) ? $prefix : ''); ?>"></td>
 	</tr>
 	<tr>
-		<td valign="top"><a href="#" class="info"><?php echo _("static agents") ?>:<span><br><?php echo _("Static agents are extensions that are assumed to always be on the queue.  Static agents do not need to 'log in' to the queue, and cannot 'log out' of the queue.<br><br>List extensions to ring, one per line.<br><br>You can include an extension on a remote system, or an external number (Outbound Routing must contain a valid route for external numbers).<br><br>You can also list agents defined in agents.conf by preceding the agent number with A, so agent 4002 would be listed as A4002.<br><br>In all cases, you can put a \",\" after the agent followed by a penalty value.") ?><br><br></span></a></td>
+		<td valign="top"><a href="#" class="info"><?php echo _("static agents") ?>:<span><br><?php echo _("Static agents are extensions that are assumed to always be on the queue.  Static agents do not need to 'log in' to the queue, and cannot 'log out' of the queue.<br><br>List extensions to ring, one per line.<br><br>You can include an extension on a remote system, or an external number (Outbound Routing must contain a valid route for external numbers).<br><br>You can list agents defined in agents.conf by preceding the agent number with A, so agent 4002 would be listed as A4002. This is experimental and not supported. There are known issues, such as the inability for an agents.conf agent to do subsequent transfers to voicemail<br><br>In all cases, you can put a \",\" after the agent followed by a penalty value. Use penalties at your own risk, they are very broken in asterisk.") ?><br><br></span></a></td>
 		<td valign="top">&nbsp;
 			<textarea id="members" cols="15" rows="<?php  $rows = count($member)+1; echo (($rows < 5) ? 5 : (($rows > 20) ? 20 : $rows) ); ?>" name="members"><?php foreach ($member as $mem) { $premem = ""; if (substr($mem,0,5) == "Agent") {$premem = "A";}; $mem = $premem.rtrim(ltrim(strstr($mem,"/"),"/"),"@from-internal");echo substr($mem,0,(strpos($mem,"@")!==false?strpos($mem,"@"):strpos($mem,","))).substr($mem,strrpos($mem, ","))."\n"; }?></textarea><br>
 			<input type="submit" style="font-size:10px;" value="<?php echo _("Clean & Remove duplicates") ?>" />

Modified: freepbx/modules-2.2/modules/freepbx-module-recordings/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-recordings/debian/changelog	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-recordings/debian/changelog	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,3 +1,9 @@
+freepbx-module-recordings (2.2-3.3.2-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Sun, 11 Mar 2007 17:26:42 +0200
+
 freepbx-module-recordings (2.2-3.3.1-2) unstable; urgency=low
 
   * Fix SQLite3 support. Fixes upstream

Modified: freepbx/modules-2.2/modules/freepbx-module-recordings/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-recordings/functions.inc.php	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-recordings/functions.inc.php	2007-03-11 15:32:09 UTC (rev 3225)
@@ -104,12 +104,12 @@
 
 	// Check to make sure we can actually read the file if it has an extension (if it doesn't, 
 	// it was put here by system recordings, so we know it's there.
-	if (preg_match("/\.(au|g723|g723sf|g726-\d\d|g729|gsm|h263|ilbc|ogg|pcm|[au]law|[au]l|mu|sln|raw|vox|WAV|wav|wav49)$/", $filename)) {
+	if (preg_match("/\.(au|g723|g723sf|g726-\d\d|g729|gsm|h263|ilbc|mp3|ogg|pcm|[au]law|[au]l|mu|sln|raw|vox|WAV|wav|wav49)$/", $filename)) {
 		if (!is_readable($recordings_astsnd_path.$filename)) {
 			print "<p>Unable to add ".$recordings_astsnd_path.$filename." - Can not read file!</p>";
 			return false;
 		}
-		$fname = preg_replace("/\.(au|g723|g723sf|g726-\d\d|g729|gsm|h263|ilbc|ogg|pcm|[au]law|[au]l|mu|sln|raw|vox|WAV|wav|wav49)$/", "", $filename);
+		$fname = preg_replace("/\.(au|g723|g723sf|g726-\d\d|g729|gsm|h263|ilbc|mp3|ogg|pcm|[au]law|[au]l|mu|sln|raw|vox|WAV|wav|wav49)$/", "", $filename);
 
 	} else {
 		$fname = $filename;
@@ -217,7 +217,7 @@
 		$ptr++;
 	}
 	// Strip off every possible file extension
-	$flist = preg_replace("/\.(au|g723|g723sf|g726-\d\d|g729|gsm|h263|ilbc|ogg|pcm|[au]law|[au]l|mu|sln|raw|vox|WAV|wav|wav49)$/", "", $files);
+	$flist = preg_replace("/\.(au|g723|g723sf|g726-\d\d|g729|gsm|h263|ilbc|mp3|ogg|pcm|[au]law|[au]l|mu|sln|raw|vox|WAV|wav|wav49)$/", "", $files);
 	sort($flist);
 	return array_unique($flist);
 }

Modified: freepbx/modules-2.2/modules/freepbx-module-recordings/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-recordings/module.xml	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-recordings/module.xml	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,11 +1,12 @@
 <module>
 	<rawname>recordings</rawname>
 	<name>Recordings</name>
-	<version>3.3.1</version>
+	<version>3.3.2</version>
 	<type>setup</type>
 	<category>Internal Options &amp; Configuration</category>
 	<description>Creates and manages system recordings, used by many other modules (eg, IVR).</description>
 	<changelog>
+	*3.3.2* Fix mp3 upload bug (#1764)
 	*3.3.1* Fix error where *77/*79 wasn't working.
 	*3.3* Stop assuming that files being uploaded are .wav's, also highlight the correct format for files to be uploaded in.
 	*3.2.4* Add he_IL translation
@@ -16,7 +17,7 @@
 	<menuitems>
 		<recordings>System Recordings</recordings>
 	</menuitems>
-	<location>release/2.2/recordings-3.3.tgz</location>
+	<location>release/2.2/recordings-3.3.1.tgz</location>
 	<info>http://aussievoip.com.au/wiki/freePBX-SysRec</info>
-	<md5sum>36b2f983adce45b00da66b3b345f0b90</md5sum>
+	<md5sum>1e4be3c27fde689bf898997d64ad9533</md5sum>
 </module>

Modified: freepbx/modules-2.2/modules/freepbx-module-recordings/page.recordings.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-recordings/page.recordings.php	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules/freepbx-module-recordings/page.recordings.php	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,5 +1,5 @@
 <?php 
-/* $Id: page.recordings.php 3606 2007-01-22 04:28:02Z qldrob $ */
+/* $Id: page.recordings.php 3773 2007-02-12 06:58:31Z naftali5 $ */
 //Copyright (C) 2004 Coalescent Systems Inc. (info at coalescentsystems.ca)
 //
 //Re-written by Rob Thomas <xrobau at gmail.com> 20060318.
@@ -83,7 +83,7 @@
 		$arr = recordings_get($id);
 		$filename=$arr['filename'];
 		// Check all possibilities of uploaded file types.
-		$valid = Array("au","g723","g723sf","g729","gsm","h263","ilbc","ogg","pcm","alaw","ulaw","al","ul","mu","sln","raw","vox","WAV","wav","wav49");
+		$valid = Array("au","g723","g723sf","g729","gsm","h263","ilbc","mp3","ogg","pcm","alaw","ulaw","al","ul","mu","sln","raw","vox","WAV","wav","wav49");
 		$fileexists = false;
 		if (strpos($filename, '&') === false) {
 			foreach ($valid as $xtn) {

Modified: freepbx/modules-2.2/modules-2.2.xml
===================================================================
--- freepbx/modules-2.2/modules-2.2.xml	2007-03-11 15:31:29 UTC (rev 3224)
+++ freepbx/modules-2.2/modules-2.2.xml	2007-03-11 15:32:09 UTC (rev 3225)
@@ -1,4 +1,218 @@
 <xml><module>
+	<rawname>miscapps</rawname>
+	<name>Misc Applications</name>
+	<version>0.2</version>
+	<type>setup</type>
+	<category>Internal Options &amp; Configuration</category>
+	<description>
+		Adds the ability to create feature codes that can go to any freePBX destination (such as an IVR or queue)
+	</description>
+	<changelog>
+		*0.2* Fix bug with adding new apps
+	</changelog>
+	<menuitems>
+		<miscapps>Misc Applications</miscapps>
+	</menuitems>
+	<location>release/2.2/miscapps-0.2.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-MiscApplications</info>
+	<md5sum>da5484024e5e3d31002f0989a46eae5c</md5sum>
+</module>
+<module>
+	<rawname>infoservices</rawname>
+	<name>Info Services</name>
+	<version>1.3.3</version>
+	<type>setup</type>
+	<category>Provides a Feature Code</category>
+	<description>Provides a number of applications accessable by feature codes: company directory, call trace (last call information), echo test, speaking clock, and speak current extension number.</description>
+	<changelog>
+		1.3.3: Fixed SpeakExtension - replaced depricated ${CALLERID} variable
+		1.3.2: Fixed SpeakExtension - add macro-user-callerid
+		1.3.1: Improved accuracy of speaking clock
+	</changelog>
+	<location>release/2.2/infoservices-1.3.3.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
+	<md5sum>d485ea27a601ce3ec4dd764229873194</md5sum>
+</module>
+<module>
+	<rawname>featurecodeadmin</rawname>
+	<name>Feature Code Admin</name>
+	<version>1.0.4</version>
+	<type>setup</type>
+	<category>Basic</category>
+	<menuitems>
+		<featurecodeadmin>Feature Codes</featurecodeadmin>
+	</menuitems>
+	<changelog>
+		*1.0.4* Add support for duplicate feature codes
+		*1.0.3* Add he_IL translation
+		*1.0.2* Fix minor font/display issues
+	</changelog>
+	<location>release/2.2/featurecodeadmin-1.0.4.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-FeatureCodeAdmin</info>
+	<md5sum>2ab47d6adcb43a7a2f5a6719ed97541a</md5sum>
+</module>
+<module>
+	<rawname>voicemail</rawname>
+	<name>Voicemail</name>
+	<version>1.6.1</version>
+	<changelog>
+           *1.6.1* Bump version to fix existing extensions with disabled voicemail #1697
+           *1.6* Re-Fix 1.5.2, bump version for 2.2rc2 release.
+	    *1.5.3* Fix for vm Javascript sanity checks only working in DevAndUser mode.
+	    *1.5.2* Fix vm not appearing in DeviceAndUser mode
+           *1.5.1* Fix for MWI not working
+	    *1.5* Fix issue with vm options not being saved on creation of extension
+	    *1.4.2* Change category to Basic
+	    *1.4.1* Fixed radio button defaults to 'no' from false so they work
+	    *1.4* First release for 2.2. Fix inability to create voicemail box
+	</changelog>
+	<description>This module allows you to configure Voicemail for a user or extension</description>
+	<type>setup</type>
+	<category>Basic</category>
+	<location>release/2.2/voicemail-1.6.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
+	<md5sum>68cd0c181f06fc2fef13392663321172</md5sum>
+</module>
+<module>
+	<rawname>callwaiting</rawname>
+	<name>Call Waiting</name>
+	<version>1.1.1</version>
+	<changelog>
+	*1.1.1* Fixed typo Provdes to Provides*
+	*1.1* First release for 2.2
+	</changelog>
+	<type>setup</type>
+	<category>Provides a Feature Code</category>
+	<description>Provides an option to turn on/off call waiting</description>
+	<location>release/2.2/callwaiting-1.1.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
+	<md5sum>364a316b45afb3bd26a63d0baa1720ce</md5sum>
+</module>
+<module>
+	<rawname>dictate</rawname>
+	<name>Dictation</name>
+	<version>1.1.1</version>
+	<type>setup</type>
+	<category>Provides a Feature Code</category>
+	<changelog>
+		*1.1.1* Fix for Dictation not appearing on User page when in Device and User mode.
+		*1.1* Fix changes not sticking when creating an extension, replace Rob-sounds with Allison-sounds.
+		*1.0.1* Replaced 'invalid extension' with 'feature not available on this line' when disabled
+		*1.0.0* Original Release
+	</changelog>
+	<description>This uses the app_dictate module of Asterisk to let users record dictate into their phones. When complete, the dictations can be emailed to an email address specified in the extension page.</description>
+	<location>release/2.2/dictate-1.1.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Dictation</info>
+	<md5sum>1f5c3ba0182098ccf2cfc8127ece3545</md5sum>
+</module>
+<module>
+	<rawname>speeddial</rawname>
+	<name>Speed dial functions</name>
+	<version>1.0.2</version>
+	<type>module</type>
+	<category>CID &amp; Number Management</category>
+	<depends>
+		<module>phonebook</module>
+	</depends>
+	<location>release/2.2/speeddial-1.0.2.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
+	<md5sum>5a11d1460ac6587e636308a1e8c83974</md5sum>
+</module>
+<module>
+	<rawname>findmefollow</rawname>
+	<name>Follow Me</name>
+	<version>2.4.9</version>
+	<changelog>
+		*2.4.9* Add he_IL translation
+		*2.4.8* never allow extension to include itself as nnn# and create infinite loop
+		*2.4.7* Changed to not set alertinfo value if already set from before hitting followme
+		*2.4.6* Added BLKVM DB tree to fix inability to transfer a received call to another user, and make NODEST stuff work overall
+		*2.4.5* Modified NODEST stuff to improve some cases where it was still failing, and improve '#' transfer scenarios
+		*2.4.4* Add NODEST so that destination (often vm) is not taken if called from queue or ringgroup
+		*2.4.3* Sanity check for prefing that if not set or there, it won't ring the extension forever (should not happen)
+		*2.4.2* Modified flyover help - since moh works with confirmation now
+		*2.4.1* Added sound files for default confirmation messages
+		2.4: First release for FreePBX 2.2 - Fixed compatibility issue with new UI
+		2.3.1: removed checkastman
+		2.3: First release for 2.2, fixed minor display issues
+		2.2.5: fixed so extension number is put into empty lists
+		2.2.4: moved require_once() in functions.php, was breaking other stuff
+		2.2.3: full path in require_once to keep retrieve_conf from dieing
+		2.2.2: bug fix = should be ==
+		2.2.1: Use astdb for some settings
+		2.2.0: Add Pre-Ring
+		2.1.5: Fix bug #1142
+		2.1.4: Code cleanup
+	</changelog>
+	<type>setup</type>
+	<category>Inbound Call Control</category>
+	<description>
+		Much like a ring group, but works on individual extensions. When someone calls the extension, it can be setup to ring for a number of seconds before trying to ring other extensions and/or external numbers, or to ring all at once, or in other various 'hunt' configurations. Most commonly used to ring someone's cell phone if they don't answer their extension.
+	</description>
+	<menuitems>
+		<findmefollow>Follow Me</findmefollow>
+	</menuitems>
+	<location>release/2.2/findmefollow-2.4.9.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-FollowMe</info>
+	<md5sum>631de942afd4ba33f36630322d8bf625</md5sum>
+</module>
+<module>
+	<rawname>manager</rawname>
+	<name>Asterisk API</name>
+	<version>1.2</version>
+	<type>tool</type>
+	<category>System Administration</category>
+	<menuitems>
+		<manager>Asterisk API</manager>
+	</menuitems>
+	<changelog>
+	*1.2* Fix UI issues, and 'Array' message.
+	*1.1* First 2.2 release. Added he_IL support, fixed some warnings.
+	</changelog>
+	<location>release/2.2/manager-1.2.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-ManagerAPI</info>
+	<md5sum>b0197805e6b63146c0b005da69637341</md5sum>
+</module>
+<module>
+	<rawname>logfiles</rawname>
+	<name>Asterisk Logfiles</name>
+	<version>1.0.1</version>
+	<type>tool</type>
+	<category>Support</category>
+	<menuitems>
+		<logfiles>Asterisk Logfiles</logfiles>
+	</menuitems>
+	<location>release//2.2/logfiles-1.0.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-LogFiles</info>
+	<md5sum>92063ba5483e2f53acc7e32a2ff4cf94</md5sum>
+</module>
+<module>
+	<rawname>announcement</rawname>
+	<name>Announcements</name>
+	<version>0.8.0</version>
+	<changelog>
+		*0.8.0* need to add an i extension, even with m option in bacground, it fails if skip is not enabled
+		*0.7.0* more fixes to deal with sqlite and fix mysql5 (includes renaming of repeat to repeat_msg)
+		*0.6.1* Modified the install.sql to work on sqlite3
+		*0.6* added an option to choose a single digit that can be used to have the msg repeated
+		*0.5* chaned to jump to ivr's return context
+		*0.4* Added Don't Answer option to not answer the channel (and playback early media if supported)
+		*0.3* Added support to return to calling IVR
+		*0.2* First Module Intro
+	</changelog>
+	<type>setup</type>
+	<category>Inbound Call Control</category>
+	<description>
+		Plays back one of the system recordings (optionally allowing the user to skip it) and then goes to another destination.
+	</description>
+	<menuitems>
+		<announcement>Announcements</announcement>
+	</menuitems>
+	<location>release/2.2/announcement-0.8.0.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Announcement</info>
+	<md5sum>8e268087f93750d488350846b9c5da71</md5sum>
+</module>
+<module>
 	<rawname>ringgroups</rawname>
 	<name>Ring Groups</name>
 	<version>2.2.13</version>
@@ -30,37 +244,19 @@
 	<md5sum>237a46a51715e147f6581cee9ff0181f</md5sum>
 </module>
 <module>
-	<rawname>javassh</rawname>
-	<name>Java SSH</name>
-	<version>1.0.1</version>
+	<rawname>phpinfo</rawname>
+	<name>PHP Info</name>
+	<version>1.0</version>
 	<type>tool</type>
 	<category>System Administration</category>
-	<description>Provides a Java applet to access the system shell using SSH</description>
 	<menuitems>
-		<javassh>Java SSH</javassh>
+		<phpinfo>PHP Info</phpinfo>
 	</menuitems>
-	<location>release//2.2/javassh-1.0.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-JavaSSH</info>
-	<md5sum>812e11f48bc260aedce20ceb54d18169</md5sum>
+	<location>release//2.2/phpinfo-1.0.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-phpinfo</info>
+	<md5sum>1b71e570164168090fe3f04464a549c4</md5sum>
 </module>
 <module>
-	<rawname>zoip</rawname>
-	<name>Zork</name>
-	<version>0.2.0</version>
-	<description>Zoip is a new way of playing Zork - It uses Text-to-Speech and Speech Recognition to play the classic infocom game, Zork. It appears as a destination. If you wish to play this without needing to go through an IVR, the easy way is to create a Ring Group with an invalid extension in it, and a destination of Zoip. </description>
-	<attention>
-		This is a 7 Megabyte download. It may not be able to download via this interface properly. In addition, Sphinx2 and Festival are required. 
-	
-		Please see http://aussievoip.com.au/wiki/freePBX-ZoIP before installing this module.
-	</attention>
-	<type>module</type>
-	<category>Games</category>
-	<description></description>
-	<location>release/2.2/zoip-0.2.0.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-ZoIP</info>
-	<md5sum>a0318ecc7376f33c54abf9c3efd96958</md5sum>
-</module>
-<module>
 	<rawname>donotdisturb</rawname>
 	<name>Do-Not-Disturb (DND)</name>
 	<version>1.0.1</version>
@@ -71,6 +267,65 @@
 	<md5sum>5c1128b0a2c38b0d8aaff289fa5cb1d4</md5sum>
 </module>
 <module>
+	<rawname>ivr</rawname>
+	<name>IVR</name>
+	<version>2.5.11</version>
+	<type>setup</type>
+	<category>Inbound Call Control</category>
+	<description>
+		Creates Digital Receptionist (aka Auto-Attendant, aka Interactive Voice Response) menus. These can be used to send callers to different locations (eg, "Press 1 for sales") and/or allow direct-dialing of extension numbers. 
+	</description>
+	<changelog>
+		*2.5.11* Allow option for IVR to loop back to itself without corrupting the return-to-ivr to the parent
+		*2.5.10* Fix bug where pressing enter in a field would delete the IVR
+		*2.5.9* some tweaks because of strange inheritance behavior, so need to reset IVR variables upon returns for some looping conditions
+		*2.5.8* insert a return extension so that annoucements and ivrs returning don't trample back over the top
+		*2.5.7* extended schema and added ability to have ivr options to return to calling parent ivrs if appropriate, otherwise specified destination
+		*2.5.6* Added: Set(IVR_CONTEXT=${CONTEXT}) to facilitate simple returns to calling context (e.g. from an announcement or custom app)
+		*2.5.5* Fix bug #1651 and apply patch #1664, allow voicemail as destination if ivr is entered from a queue breakout option
+		*2.5.4* Fix bug #1417
+		*2.5.3* Add he_IL translation
+		*2.5.2* Updated for freepbx 2.2.0rc2
+		*2.5.1* Changed name to IVR (from Digital Receptionist)
+		*2.5* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
+	</changelog>
+	<menuitems>
+		<ivr>IVR</ivr>
+	</menuitems>
+	<location>release/2.2/ivr-2.5.11.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-IVR</info>
+	<md5sum>d37e7c2d90605fc9f0700330de81472e</md5sum>
+</module>
+<module>
+	<rawname>phpagiconf</rawname>
+	<name>PHPAGI Config</name>
+	<version>1.1</version>
+	<type>tool</type>
+	<category>Config</category>
+	<menuitems>
+		<phpagiconf>PHPAGI Config</phpagiconf>
+	</menuitems>
+	<depends>
+		<module>manager ge1.0.4</module>
+	</depends> 
+	<changelog>*1.1* Removed old dependancy checking code, first 2.2 release</changelog>
+	<location>release/2.2/phpagiconf-1.1.tgz</location>
+	<md5sum>1dd626321578d58698ed033e7e3a688f</md5sum>
+	<info>http://freepbx.org/wiki/phpagiconf</info>
+</module>
+<module>
+	<rawname>callforward</rawname>
+	<name>Call Forward</name>
+	<version>1.1</version>
+	<changelog>*1.1* First release for 2.2
+	</changelog>
+	<type>setup</type>
+	<category>Provides a Feature Code</category>
+	<location>release/2.2/callforward-1.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
+	<md5sum>de8184265af71ab71d6a14d56080cde7</md5sum>
+</module>
+<module>
 	<rawname>irc</rawname>
 	<name>Online Support</name>
 	<version>1.1.1</version>
@@ -89,167 +344,149 @@
 	<md5sum>64143ea353cc26da431319df0019890d</md5sum>
 </module>
 <module>
-	<rawname>blacklist</rawname>
-	<name>Blacklist</name>
-	<version>1.1.1</version>
+	<rawname>miscdests</rawname>
+	<name>Misc Destinations</name>
+	<version>1.3.4</version>
 	<type>setup</type>
-	<category>CID &amp; Number Management</category>
+	<category>Inbound Call Control</category>
+	<description>Allows creating destinations that dial any local number (extensions, feature codes, outside phone numbers) that can be used by other modules (eg, IVR, time conditions) as a call destination.</description>
+	<changelog>
+		*1.3.4* destination changed from Dial(Local/nnn at from-internal) to Goto(from-internal,nnn,1), no reason a new channel should be created
+		*1.3.3* Minor formatting changes
+		*1.3.2* Add he_IL translation
+		*1.3.1* Updated help text
+		*1.3* First release for FreePBX 2.2 - Fixed GUI issues
+	</changelog>
 	<menuitems>
-		<blacklist>Blacklist</blacklist>
+		<miscdests>Misc Destinations</miscdests>
 	</menuitems>
+	<location>release/2.2/miscdests-1.3.4.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-MiscDests</info>
+	<md5sum>ada9ecba2c327cdf46ff3089c3af5549</md5sum>
+</module>
+<module>
+	<rawname>pbdirectory</rawname>
+	<name>Phonebook Directory</name>
+	<version>0.3</version>
+	<type>tool</type>
+	<category>CID &amp; Number Management</category>
+	<location>release/2.2/pbdirectory-0.3.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
+	<description>Provides a dial-by-name directory for phonebook entries</description>
+	<requirements>
+		<version>2.2</version>
+		<module>phonebook</module>
+		<module>speeddial</module>
+	</requirements>
+	<md5sum>6fdf53feade9b816c86197628e3a2d65</md5sum>
 	<changelog>
-	*1.1.1* Add he_IL translation
-	*1.1* First 2.2 release. Fix minor warnings.
 	</changelog>
-	<location>release/2.2/blacklist-1.1.1.tgz</location>
-	<info>http://freepbx.org/wiki/AsteriskBlacklist</info>
-	<md5sum>cfe46100e687174564fb8fd3c3437c6d</md5sum>
 </module>
 <module>
-	<rawname>announcement</rawname>
-	<name>Announcements</name>
-	<version>0.7.0</version>
+	<rawname>recordings</rawname>
+	<name>Recordings</name>
+	<version>3.3.2</version>
+	<type>setup</type>
+	<category>Internal Options &amp; Configuration</category>
+	<description>Creates and manages system recordings, used by many other modules (eg, IVR).</description>
 	<changelog>
-		*0.7.0* more fixes to deal with sqlite and fix mysql5 (includes renaming of repeat to repeat_msg)
-		*0.6.1* Modified the install.sql to work on sqlite3
-		*0.6* added an option to choose a single digit that can be used to have the msg repeated
-		*0.5* chaned to jump to ivr's return context
-		*0.4* Added Don't Answer option to not answer the channel (and playback early media if supported)
-		*0.3* Added support to return to calling IVR
-		*0.2* First Module Intro
-	</changelog>
-	<type>setup</type>
-	<category>Inbound Call Control</category>
-	<description>
-		Plays back one of the system recordings (optionally allowing the user to skip it) and then goes to another destination.
-	</description>
+	*3.3.2* Fix mp3 upload bug (#1764)
+	*3.3.1* Fix error where *77/*79 wasn't working.
+	*3.3* Stop assuming that files being uploaded are .wav's, also highlight the correct format for files to be uploaded in.
+	*3.2.4* Add he_IL translation
+	*3.2.3* Fix for possible wrong recording being selected
+	*3.2.2* Fix for PHP5 not picking up ast recording path
+	*3.2.1* Resolved issue with wrong recording being selected when there's more than one encoding of file (eg, foo.wav and foo.gsm)
+	*3.2* First release for FreePBX 2.2 - Fixed compatibility issue with new UI</changelog>
 	<menuitems>
-		<announcement>Announcements</announcement>
+		<recordings>System Recordings</recordings>
 	</menuitems>
-	<location>release/2.2/announcement-0.7.0.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Announcement</info>
-	<md5sum>1991ecf118b229206a4e48886ba452f5</md5sum>
+	<location>release/2.2/recordings-3.3.2.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-SysRec</info>
+	<md5sum>4222eb80428830512cd445ca9974d77f</md5sum>
 </module>
 <module>
-	<rawname>backup</rawname>
-	<name>Backup &amp; Restore</name>
-	<version>2.1.1</version>
+	<rawname>javassh</rawname>
+	<name>Java SSH</name>
+	<version>1.0.1</version>
 	<type>tool</type>
 	<category>System Administration</category>
+	<description>Provides a Java applet to access the system shell using SSH</description>
 	<menuitems>
-		<backup>Backup &amp; Restore</backup>
+		<javassh>Java SSH</javassh>
 	</menuitems>
-	<depends>
-		<module>core</module>
-	</depends>
-	<changelog>
-	*2.1.1* Remove core_users2astdb and core_devices2astdb, it isn't needed and corrupts resotred ampuser info
-	*2.1* Actually, really, restore ASTDB now. Finally. Also add redirect_standard to avoid problems with TRBoE.
-	*2.0.4* Add he_IL translation
-	*2.0.3* don't have BLKVM and FM astdb trees, which shouldn't be left around anyhow
-	*2.0.2* fixed restore ALL to get it to actually work
-	*2.0.1* supplied defaults and fixed bug is weekdays schedule_functions.php - #1279
-	*2.0* Now backs up and restores astdb, which was causing problems with phone configurations.
-	*1.2* Potential fix for restore issues, clean up some warnings
-	</changelog>
-	<location>release/2.2/backup-2.1.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-BackupRestore</info>
-	<md5sum>c0ab5c34ee81480275e356501a181eb3</md5sum>
+	<location>release//2.2/javassh-1.0.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-JavaSSH</info>
+	<md5sum>812e11f48bc260aedce20ceb54d18169</md5sum>
 </module>
 <module>
-	<rawname>timeconditions</rawname>
-	<name>Time Conditions</name>
-	<version>2.4.1</version>
+	<rawname>cidlookup</rawname>
+	<name>Caller ID Lookup</name>
+	<version>1.1.1</version>
+	<description>Allows Caller ID Lookup of incoming calls against different sources (MySQL, HTTP, ENUM, Phonebook Module)</description>
 	<type>setup</type>
-	<category>Inbound Call Control</category>
-	<description>
-		Creates a condition where calls will to one of two destinations (eg, an extension, IVR, ring group..) based on the time and/or date. This can be used for example to ring a receptionist during the day, or go directly to an IVR at night.
-	</description>
-	<changelog>
-		*2.4.1* Add he_IL translation
-		*2.4* Upgrading module version to assist with trixbox upgrades, that have 2.3.1 already, so this needs to be higher. No other changes.	
-		*2.3* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
-	</changelog>
+	<category>CID &amp; Number Management</category>
 	<menuitems>
-		<timeconditions>Time Conditions</timeconditions>
+		<cidlookup>Caller Name Lookup Sources</cidlookup>
 	</menuitems>
-	<location>release/2.2/timeconditions-2.4.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-TimeCond</info>
-	<md5sum>fbeb09433490d0fac61d5b91954f1e6a</md5sum>
-</module>
-<module>
-	<rawname>callback</rawname>
-	<name>Callback</name>
-	<version>1.3.1</version>
-	<type>setup</type>
-	<category>Remote Access</category>
-	<menuitems>
-		<callback>Callback</callback>
-	</menuitems>
+	<depends>
+		<engine>asterisk 1.2</engine>
+	</depends>
+	<location>release/2.2/cidlookup-1.1.1.tgz</location>
+	<md5sum>0f1d11eae4c12f04db9ea3bd32dc7aa5</md5sum>
+	<info>http://freepbx.org/wiki/CallerIDLookup</info>
 	<changelog>
-	*1.3.1* Add he_IL translation
-	*1.3* Fixed UI errors for new 2.2 look.
-	*1.2* First 2.2 release
+		*1.1.1* Add he_IL translation
+		*1.1* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
+		*1.0.4* Updated module.xml format
+		*1.0.3* Fixes from #999
+		*1.0.1* Added possibility to cache in astDB
+			Added lookup from cache before querying external source
+		*1.0.0* First release
 	</changelog>
-	<info>http://aussievoip.com.au/wiki/freePBX-Callback</info>
-	<location>release/2.2/callback-1.3.1.tgz</location>
-	<md5sum>8352483b25456e54fd01201b731c44e7</md5sum>
 </module>
 <module>
-	<rawname>printextensions</rawname>
-	<name>Print Extensions</name>
-	<version>1.3.1</version>
+	<rawname>gabcast</rawname>
+	<name>Gabcast</name>
+	<version>1.2.3</version>
 	<type>tool</type>
 	<category>Third Party Addon</category>
-	<description>Creates a printable list of names and extension numbers</description>
 	<menuitems>
-		<printextensions>Print Extensions</printextensions>
+		<gabcast>Gabcast</gabcast>
 	</menuitems>
 	<changelog>
-		*1.3.1* Add he_IL translation
+		*1.2.3* Add he_IL translation
+		*1.2.2* Fix issue where you were unable to add a channel 
 	</changelog>
-	<location>release/2.2/printextensions-1.3.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-PrintExtensions</info>
-	<md5sum>4e0734e0a3402bc3641ad2ccb8ac2294</md5sum>
+	<location>release/2.2/gabcast-1.2.3.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-gabcast</info>
+	<md5sum>c78065ece959a05276d3ecda7a4503ca</md5sum>
 </module>
 <module>
-	<rawname>miscapps</rawname>
-	<name>Misc Applications</name>
-	<version>0.2</version>
-	<type>setup</type>
-	<category>Internal Options &amp; Configuration</category>
-	<description>
-		Adds the ability to create feature codes that can go to any freePBX destination (such as an IVR or queue)
-	</description>
-	<changelog>
-		*0.2* Fix bug with adding new apps
-	</changelog>
-	<menuitems>
-		<miscapps>Misc Applications</miscapps>
-	</menuitems>
-	<location>release/2.2/miscapps-0.2.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-MiscApplications</info>
-	<md5sum>da5484024e5e3d31002f0989a46eae5c</md5sum>
-</module>
-<module>
-	<rawname>asterisk-cli</rawname>
-	<name>Asterisk CLI</name>
-	<version>1.0</version>
+	<rawname>backup</rawname>
+	<name>Backup &amp; Restore</name>
+	<version>2.1.1</version>
 	<type>tool</type>
 	<category>System Administration</category>
 	<menuitems>
-		<cli>Asterisk CLI</cli>
+		<backup>Backup &amp; Restore</backup>
 	</menuitems>
 	<depends>
-		<engine>asterisk</engine>
+		<module>core</module>
 	</depends>
-	<location>release/2.2/asterisk-cli-1.0.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-CLI</info>
-	<md5sum>af3c22f41599762122e075ac734b1612</md5sum>
 	<changelog>
-*1.0* Fixed security issue, first release in 2.2
-*0.001* Original Release
+	*2.1.1* Remove core_users2astdb and core_devices2astdb, it isn't needed and corrupts resotred ampuser info
+	*2.1* Actually, really, restore ASTDB now. Finally. Also add redirect_standard to avoid problems with TRBoE.
+	*2.0.4* Add he_IL translation
+	*2.0.3* don't have BLKVM and FM astdb trees, which shouldn't be left around anyhow
+	*2.0.2* fixed restore ALL to get it to actually work
+	*2.0.1* supplied defaults and fixed bug is weekdays schedule_functions.php - #1279
+	*2.0* Now backs up and restores astdb, which was causing problems with phone configurations.
+	*1.2* Potential fix for restore issues, clean up some warnings
 	</changelog>
+	<location>release/2.2/backup-2.1.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-BackupRestore</info>
+	<md5sum>c0ab5c34ee81480275e356501a181eb3</md5sum>
 </module>
 <module>
 	<rawname>paging</rawname>
@@ -277,261 +514,131 @@
 	<md5sum>f462391eebadee451e07ab28e3f87677</md5sum>
 </module>
 <module>
-	<rawname>dictate</rawname>
-	<name>Dictation</name>
-	<version>1.1.1</version>
+	<rawname>timeconditions</rawname>
+	<name>Time Conditions</name>
+	<version>2.4.1</version>
 	<type>setup</type>
-	<category>Provides a Feature Code</category>
+	<category>Inbound Call Control</category>
+	<description>
+		Creates a condition where calls will to one of two destinations (eg, an extension, IVR, ring group..) based on the time and/or date. This can be used for example to ring a receptionist during the day, or go directly to an IVR at night.
+	</description>
 	<changelog>
-		*1.1.1* Fix for Dictation not appearing on User page when in Device and User mode.
-		*1.1* Fix changes not sticking when creating an extension, replace Rob-sounds with Allison-sounds.
-		*1.0.1* Replaced 'invalid extension' with 'feature not available on this line' when disabled
-		*1.0.0* Original Release
+		*2.4.1* Add he_IL translation
+		*2.4* Upgrading module version to assist with trixbox upgrades, that have 2.3.1 already, so this needs to be higher. No other changes.	
+		*2.3* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
 	</changelog>
-	<description>This uses the app_dictate module of Asterisk to let users record dictate into their phones. When complete, the dictations can be emailed to an email address specified in the extension page.</description>
-	<location>release/2.2/dictate-1.1.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Dictation</info>
-	<md5sum>1f5c3ba0182098ccf2cfc8127ece3545</md5sum>
-</module>
-<module>
-	<rawname>conferences</rawname>
-	<name>Conferences</name>
-	<version>1.2</version>
-	<type>setup</type>
-	<category>Internal Options &amp; Configuration</category>
-	<description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description>
-	<changelog>
-		*1.2* Fixed raising asterisk error on empty dialstatus #1708
-		*1.1.2* Add he_IL translation
-		*1.1.1* Updated for 2.2.0RC1
-		*1.1* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
-	</changelog>
 	<menuitems>
-		<conferences>Conferences</conferences>
+		<timeconditions>Time Conditions</timeconditions>
 	</menuitems>
-	<location>release/2.2/conferences-1.2.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Conf</info>
-	<md5sum>fd9a9926fd7f27ef8ae9cadf036f4afe</md5sum>
+	<location>release/2.2/timeconditions-2.4.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-TimeCond</info>
+	<md5sum>fbeb09433490d0fac61d5b91954f1e6a</md5sum>
 </module>
 <module>
-	<rawname>pbdirectory</rawname>
-	<name>Phonebook Directory</name>
-	<version>0.3</version>
-	<type>tool</type>
-	<category>CID &amp; Number Management</category>
-	<location>release/2.2/pbdirectory-0.3.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
-	<description>Provides a dial-by-name directory for phonebook entries</description>
-	<requirements>
-		<version>2.2</version>
-		<module>phonebook</module>
-		<module>speeddial</module>
-	</requirements>
-	<md5sum>6fdf53feade9b816c86197628e3a2d65</md5sum>
-	<changelog>
-	</changelog>
-</module>
-<module>
-	<rawname>manager</rawname>
-	<name>Asterisk API</name>
-	<version>1.2</version>
-	<type>tool</type>
-	<category>System Administration</category>
-	<menuitems>
-		<manager>Asterisk API</manager>
-	</menuitems>
-	<changelog>
-	*1.2* Fix UI issues, and 'Array' message.
-	*1.1* First 2.2 release. Added he_IL support, fixed some warnings.
-	</changelog>
-	<location>release/2.2/manager-1.2.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-ManagerAPI</info>
-	<md5sum>b0197805e6b63146c0b005da69637341</md5sum>
-</module>
-<module>
-	<rawname>callforward</rawname>
-	<name>Call Forward</name>
-	<version>1.1</version>
-	<changelog>*1.1* First release for 2.2
-	</changelog>
+	<rawname>callback</rawname>
+	<name>Callback</name>
+	<version>1.3.1</version>
 	<type>setup</type>
-	<category>Provides a Feature Code</category>
-	<location>release/2.2/callforward-1.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
-	<md5sum>de8184265af71ab71d6a14d56080cde7</md5sum>
-</module>
-<module>
-	<rawname>callwaiting</rawname>
-	<name>Call Waiting</name>
-	<version>1.1.1</version>
-	<changelog>
-	*1.1.1* Fixed typo Provdes to Provides*
-	*1.1* First release for 2.2
-	</changelog>
-	<type>setup</type>
-	<category>Provides a Feature Code</category>
-	<description>Provides an option to turn on/off call waiting</description>
-	<location>release/2.2/callwaiting-1.1.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
-	<md5sum>364a316b45afb3bd26a63d0baa1720ce</md5sum>
-</module>
-<module>
-	<rawname>findmefollow</rawname>
-	<name>Follow Me</name>
-	<version>2.4.9</version>
-	<changelog>
-		*2.4.9* Add he_IL translation
-		*2.4.8* never allow extension to include itself as nnn# and create infinite loop
-		*2.4.7* Changed to not set alertinfo value if already set from before hitting followme
-		*2.4.6* Added BLKVM DB tree to fix inability to transfer a received call to another user, and make NODEST stuff work overall
-		*2.4.5* Modified NODEST stuff to improve some cases where it was still failing, and improve '#' transfer scenarios
-		*2.4.4* Add NODEST so that destination (often vm) is not taken if called from queue or ringgroup
-		*2.4.3* Sanity check for prefing that if not set or there, it won't ring the extension forever (should not happen)
-		*2.4.2* Modified flyover help - since moh works with confirmation now
-		*2.4.1* Added sound files for default confirmation messages
-		2.4: First release for FreePBX 2.2 - Fixed compatibility issue with new UI
-		2.3.1: removed checkastman
-		2.3: First release for 2.2, fixed minor display issues
-		2.2.5: fixed so extension number is put into empty lists
-		2.2.4: moved require_once() in functions.php, was breaking other stuff
-		2.2.3: full path in require_once to keep retrieve_conf from dieing
-		2.2.2: bug fix = should be ==
-		2.2.1: Use astdb for some settings
-		2.2.0: Add Pre-Ring
-		2.1.5: Fix bug #1142
-		2.1.4: Code cleanup
-	</changelog>
-	<type>setup</type>
-	<category>Inbound Call Control</category>
-	<description>
-		Much like a ring group, but works on individual extensions. When someone calls the extension, it can be setup to ring for a number of seconds before trying to ring other extensions and/or external numbers, or to ring all at once, or in other various 'hunt' configurations. Most commonly used to ring someone's cell phone if they don't answer their extension.
-	</description>
+	<category>Remote Access</category>
 	<menuitems>
-		<findmefollow>Follow Me</findmefollow>
+		<callback>Callback</callback>
 	</menuitems>
-	<location>release/2.2/findmefollow-2.4.9.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-FollowMe</info>
-	<md5sum>631de942afd4ba33f36630322d8bf625</md5sum>
-</module>
-<module>
-	<rawname>miscdests</rawname>
-	<name>Misc Destinations</name>
-	<version>1.3.3</version>
-	<type>setup</type>
-	<category>Inbound Call Control</category>
-	<description>Allows creating destinations that dial any local number (extensions, feature codes, outside phone numbers) that can be used by other modules (eg, IVR, time conditions) as a call destination.</description>
 	<changelog>
-		*1.3.3* Minor formatting changes
-		*1.3.2* Add he_IL translation
-		*1.3.1* Updated help text
-		*1.3* First release for FreePBX 2.2 - Fixed GUI issues
+	*1.3.1* Add he_IL translation
+	*1.3* Fixed UI errors for new 2.2 look.
+	*1.2* First 2.2 release
 	</changelog>
-	<menuitems>
-		<miscdests>Misc Destinations</miscdests>
-	</menuitems>
-	<location>release/2.2/miscdests-1.3.3.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-MiscDests</info>
-	<md5sum>1e79d5c3e9490ccabbcbdcd95cc8ce19</md5sum>
+	<info>http://aussievoip.com.au/wiki/freePBX-Callback</info>
+	<location>release/2.2/callback-1.3.1.tgz</location>
+	<md5sum>8352483b25456e54fd01201b731c44e7</md5sum>
 </module>
 <module>
-	<rawname>gabcast</rawname>
-	<name>Gabcast</name>
+	<rawname>customerdb</rawname>
+	<name>Customer DB</name>
 	<version>1.2.3</version>
 	<type>tool</type>
 	<category>Third Party Addon</category>
 	<menuitems>
-		<gabcast>Gabcast</gabcast>
+		<customerdb>Customer DB</customerdb>
 	</menuitems>
 	<changelog>
 		*1.2.3* Add he_IL translation
-		*1.2.2* Fix issue where you were unable to add a channel 
 	</changelog>
-	<location>release/2.2/gabcast-1.2.3.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-gabcast</info>
-	<md5sum>c78065ece959a05276d3ecda7a4503ca</md5sum>
+	<location>release/2.2/customerdb-1.2.3.tgz</location>
+	<md5sum>cf1fec9f1f20b688c6938d2595836710</md5sum>
+	<info>http://freepbx.org/wiki/CustomerDB</info>
 </module>
+
 <module>
-	<rawname>phpinfo</rawname>
-	<name>PHP Info</name>
-	<version>1.0</version>
+	<rawname>inventorydb</rawname>
+	<name>Inventory</name>
+	<version>1.0.3</version>
 	<type>tool</type>
-	<category>System Administration</category>
+	<category>Third Party Addon</category>
 	<menuitems>
-		<phpinfo>PHP Info</phpinfo>
+		<inventorydb>Inventory</inventorydb>
 	</menuitems>
-	<location>release//2.2/phpinfo-1.0.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-phpinfo</info>
-	<md5sum>1b71e570164168090fe3f04464a549c4</md5sum>
+	<changelog>
+		*1.0.3* Add he_IL translation
+	</changelog>
+	<location>release/2.2/inventorydb-1.0.3.tgz</location>
+	<md5sum>a575ae7e9ee4c2c52b46c91ea834b875</md5sum>
+	<info>http://freepbx.org/wiki/inventorydb</info>
 </module>
+
 <module>
-	<rawname>cidlookup</rawname>
-	<name>Caller ID Lookup</name>
+	<rawname>zoip</rawname>
+	<name>Zork</name>
+	<version>0.2.0</version>
+	<description>Zoip is a new way of playing Zork - It uses Text-to-Speech and Speech Recognition to play the classic infocom game, Zork. It appears as a destination. If you wish to play this without needing to go through an IVR, the easy way is to create a Ring Group with an invalid extension in it, and a destination of Zoip. </description>
+	<attention>
+		This is a 7 Megabyte download. It may not be able to download via this interface properly. In addition, Sphinx2 and Festival are required. 
+	
+		Please see http://aussievoip.com.au/wiki/freePBX-ZoIP before installing this module.
+	</attention>
+	<type>module</type>
+	<category>Games</category>
+	<description></description>
+	<location>release/2.2/zoip-0.2.0.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-ZoIP</info>
+	<md5sum>a0318ecc7376f33c54abf9c3efd96958</md5sum>
+</module>
+<module>
+	<rawname>blacklist</rawname>
+	<name>Blacklist</name>
 	<version>1.1.1</version>
-	<description>Allows Caller ID Lookup of incoming calls against different sources (MySQL, HTTP, ENUM, Phonebook Module)</description>
 	<type>setup</type>
 	<category>CID &amp; Number Management</category>
 	<menuitems>
-		<cidlookup>Caller Name Lookup Sources</cidlookup>
+		<blacklist>Blacklist</blacklist>
 	</menuitems>
-	<depends>
-		<engine>asterisk 1.2</engine>
-	</depends>
-	<location>release/2.2/cidlookup-1.1.1.tgz</location>
-	<md5sum>0f1d11eae4c12f04db9ea3bd32dc7aa5</md5sum>
-	<info>http://freepbx.org/wiki/CallerIDLookup</info>
 	<changelog>
-		*1.1.1* Add he_IL translation
-		*1.1* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
-		*1.0.4* Updated module.xml format
-		*1.0.3* Fixes from #999
-		*1.0.1* Added possibility to cache in astDB
-			Added lookup from cache before querying external source
-		*1.0.0* First release
+	*1.1.1* Add he_IL translation
+	*1.1* First 2.2 release. Fix minor warnings.
 	</changelog>
+	<location>release/2.2/blacklist-1.1.1.tgz</location>
+	<info>http://freepbx.org/wiki/AsteriskBlacklist</info>
+	<md5sum>cfe46100e687174564fb8fd3c3437c6d</md5sum>
 </module>
 <module>
-	<rawname>featurecodeadmin</rawname>
-	<name>Feature Code Admin</name>
-	<version>1.0.4</version>
+	<rawname>disa</rawname>
+	<name>DISA</name>
+	<version>2.2.1</version>
 	<type>setup</type>
-	<category>Basic</category>
+	<category>Remote Access</category>
 	<menuitems>
-		<featurecodeadmin>Feature Codes</featurecodeadmin>
+		<disa>DISA</disa>
 	</menuitems>
+	<description>DISA Allows you 'Direct Inward System Access'. This gives you the ability to have an option on an IVR that gives you a dial tone, and you're able to dial out from the freePBX machine as if you were connected to a standard extension. It appears as a Destination.</description>
 	<changelog>
-		*1.0.4* Add support for duplicate feature codes
-		*1.0.3* Add he_IL translation
-		*1.0.2* Fix minor font/display issues
+	*2.2.1* Add he_IL translation
+	*2.2* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
 	</changelog>
-	<location>release/2.2/featurecodeadmin-1.0.4.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-FeatureCodeAdmin</info>
-	<md5sum>2ab47d6adcb43a7a2f5a6719ed97541a</md5sum>
+	<location>release/2.2/disa-2.2.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-DISA</info>
+	<md5sum>82981330404c9787acb4e194df9212ee</md5sum>
 </module>
 <module>
-	<rawname>music</rawname>
-	<name>Music on Hold</name>
-	<version>1.5</version>
-	<type>setup</type>
-	<category>Internal Options &amp; Configuration</category>
-	<description>Uploading and management of sound files (wav, mp3) to be used for on-hold music.</description>
-	<changelog>
-	*1.5* Fixed upload bug, #1646 could not upload files
-	*1.4.2* List wav files
-	*1.4.1* Add redirect_standard() call to avoid #1616
-	*1.4* Fix an issue of a new install not having a working MOH until they visit the page.
-	*1.3.2* Add he_IL translation
-	*1.3.1* Changed name to Music on Hold (from On Hold Music) 
-	*1.3* Bumped version to assist upgraders from the 2.1 tree. No other changes.
-	*1.2* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
-	</changelog>
-	<menuitems>
-		<music>Music on Hold</music>
-	</menuitems>
-	<location>release/2.2/music-1.5.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-OHM</info>
-	<md5sum>9783dba30f352aad98b11c0d996a4a79</md5sum>
-</module>
-<module>
 	<rawname>phonebook</rawname>
 	<name>Phonebook</name>
 	<version>1.1.5</version>
@@ -568,6 +675,26 @@
 	</changelog>
 </module>
 <module>
+	<rawname>conferences</rawname>
+	<name>Conferences</name>
+	<version>1.2</version>
+	<type>setup</type>
+	<category>Internal Options &amp; Configuration</category>
+	<description>Allow creation of conference rooms (meet-me) where multiple people can talk together.</description>
+	<changelog>
+		*1.2* Fixed raising asterisk error on empty dialstatus #1708
+		*1.1.2* Add he_IL translation
+		*1.1.1* Updated for 2.2.0RC1
+		*1.1* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
+	</changelog>
+	<menuitems>
+		<conferences>Conferences</conferences>
+	</menuitems>
+	<location>release/2.2/conferences-1.2.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-Conf</info>
+	<md5sum>fd9a9926fd7f27ef8ae9cadf036f4afe</md5sum>
+</module>
+<module>
 	<rawname>pinsets</rawname>
 	<name>PIN Sets</name>
 	<version>1.1</version>
@@ -587,31 +714,36 @@
 	<md5sum>66e94db6058003d7b7f1d6dcdbbaaf2b</md5sum>
 </module>
 <module>
-	<rawname>infoservices</rawname>
-	<name>Info Services</name>
-	<version>1.3.3</version>
-	<type>setup</type>
-	<category>Provides a Feature Code</category>
-	<description>Provides a number of applications accessable by feature codes: company directory, call trace (last call information), echo test, speaking clock, and speak current extension number.</description>
+	<rawname>asterisk-cli</rawname>
+	<name>Asterisk CLI</name>
+	<version>1.0</version>
+	<type>tool</type>
+	<category>System Administration</category>
+	<menuitems>
+		<cli>Asterisk CLI</cli>
+	</menuitems>
+	<depends>
+		<engine>asterisk</engine>
+	</depends>
+	<location>release/2.2/asterisk-cli-1.0.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-CLI</info>
+	<md5sum>af3c22f41599762122e075ac734b1612</md5sum>
 	<changelog>
-		1.3.3: Fixed SpeakExtension - replaced depricated ${CALLERID} variable
-		1.3.2: Fixed SpeakExtension - add macro-user-callerid
-		1.3.1: Improved accuracy of speaking clock
+*1.0* Fixed security issue, first release in 2.2
+*0.001* Original Release
 	</changelog>
-	<location>release/2.2/infoservices-1.3.3.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
-	<md5sum>d485ea27a601ce3ec4dd764229873194</md5sum>
 </module>
 <module>
 	<rawname>queues</rawname>
 	<name>Queues</name>
-	<version>2.2.8</version>
+	<version>2.2.8.1</version>
 	<type>setup</type>
 	<category>Inbound Call Control</category>
 	<description>
 		Creates a queue where calls are placed on hold and answered on a first-in, first-out basis. Many options are available, including ring strategy for agents, caller announcements, max wait times, etc. 
 	</description>
 	<changelog>
+		*2.2.8.1* Updated tootip to warn about agents.conf (unsupported and know issues) and warn about penalties (broken in asterisk)
 		*2.2.8* Fixed typo in 2.2.7
 		*2.2.7* Fixed eventmemberstatus #1635
 		*2.2.6* Add he_IL translation
@@ -624,122 +756,52 @@
 	<menuitems>
 		<queues>Queues</queues>
 	</menuitems>
-	<location>release/2.2/queues-2.2.8.tgz</location>
+	<location>release/2.2/queues-2.2.8.1.tgz</location>
 	<info>http://aussievoip.com.au/wiki/freePBX-Queues</info>
-	<md5sum>84a404faa78e8e13b7155359c686a57a</md5sum>
+	<md5sum>9d2ec51733cfc95184912dfc3f45b795</md5sum>
 </module>
 <module>
-	<rawname>inventorydb</rawname>
-	<name>Inventory</name>
-	<version>1.0.3</version>
+	<rawname>printextensions</rawname>
+	<name>Print Extensions</name>
+	<version>1.3.1</version>
 	<type>tool</type>
 	<category>Third Party Addon</category>
+	<description>Creates a printable list of names and extension numbers</description>
 	<menuitems>
-		<inventorydb>Inventory</inventorydb>
+		<printextensions>Print Extensions</printextensions>
 	</menuitems>
 	<changelog>
-		*1.0.3* Add he_IL translation
+		*1.3.1* Add he_IL translation
 	</changelog>
-	<location>release/2.2/inventorydb-1.0.3.tgz</location>
-	<md5sum>a575ae7e9ee4c2c52b46c91ea834b875</md5sum>
-	<info>http://freepbx.org/wiki/inventorydb</info>
+	<location>release/2.2/printextensions-1.3.1.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-PrintExtensions</info>
+	<md5sum>4e0734e0a3402bc3641ad2ccb8ac2294</md5sum>
 </module>
-
 <module>
-	<rawname>voicemail</rawname>
-	<name>Voicemail</name>
-	<version>1.6.1</version>
-	<changelog>
-           *1.6.1* Bump version to fix existing extensions with disabled voicemail #1697
-           *1.6* Re-Fix 1.5.2, bump version for 2.2rc2 release.
-	    *1.5.3* Fix for vm Javascript sanity checks only working in DevAndUser mode.
-	    *1.5.2* Fix vm not appearing in DeviceAndUser mode
-           *1.5.1* Fix for MWI not working
-	    *1.5* Fix issue with vm options not being saved on creation of extension
-	    *1.4.2* Change category to Basic
-	    *1.4.1* Fixed radio button defaults to 'no' from false so they work
-	    *1.4* First release for 2.2. Fix inability to create voicemail box
-	</changelog>
-	<description>This module allows you to configure Voicemail for a user or extension</description>
+	<rawname>music</rawname>
+	<name>Music on Hold</name>
+	<version>1.5</version>
 	<type>setup</type>
-	<category>Basic</category>
-	<location>release/2.2/voicemail-1.6.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
-	<md5sum>68cd0c181f06fc2fef13392663321172</md5sum>
-</module>
-<module>
-	<rawname>ivr</rawname>
-	<name>IVR</name>
-	<version>2.5.10</version>
-	<type>setup</type>
-	<category>Inbound Call Control</category>
-	<description>
-		Creates Digital Receptionist (aka Auto-Attendant, aka Interactive Voice Response) menus. These can be used to send callers to different locations (eg, "Press 1 for sales") and/or allow direct-dialing of extension numbers. 
-	</description>
+	<category>Internal Options &amp; Configuration</category>
+	<description>Uploading and management of sound files (wav, mp3) to be used for on-hold music.</description>
 	<changelog>
-		*2.5.10* Fix bug where pressing enter in a field would delete the IVR
-		*2.5.9* some tweaks because of strange inheritance behavior, so need to reset IVR variables upon returns for some looping conditions
-		*2.5.8* insert a return extension so that annoucements and ivrs returning don't trample back over the top
-		*2.5.7* extended schema and added ability to have ivr options to return to calling parent ivrs if appropriate, otherwise specified destination
-		*2.5.6* Added: Set(IVR_CONTEXT=${CONTEXT}) to facilitate simple returns to calling context (e.g. from an announcement or custom app)
-		*2.5.5* Fix bug #1651 and apply patch #1664, allow voicemail as destination if ivr is entered from a queue breakout option
-		*2.5.4* Fix bug #1417
-		*2.5.3* Add he_IL translation
-		*2.5.2* Updated for freepbx 2.2.0rc2
-		*2.5.1* Changed name to IVR (from Digital Receptionist)
-		*2.5* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
+	*1.5* Fixed upload bug, #1646 could not upload files
+	*1.4.2* List wav files
+	*1.4.1* Add redirect_standard() call to avoid #1616
+	*1.4* Fix an issue of a new install not having a working MOH until they visit the page.
+	*1.3.2* Add he_IL translation
+	*1.3.1* Changed name to Music on Hold (from On Hold Music) 
+	*1.3* Bumped version to assist upgraders from the 2.1 tree. No other changes.
+	*1.2* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
 	</changelog>
 	<menuitems>
-		<ivr>IVR</ivr>
+		<music>Music on Hold</music>
 	</menuitems>
-	<location>release/2.2/ivr-2.5.10.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-IVR</info>
-	<md5sum>e1c1da78c7aa36a75b128fb4c42381bc</md5sum>
+	<location>release/2.2/music-1.5.tgz</location>
+	<info>http://aussievoip.com.au/wiki/freePBX-OHM</info>
+	<md5sum>9783dba30f352aad98b11c0d996a4a79</md5sum>
 </module>
 <module>
-	<rawname>customerdb</rawname>
-	<name>Customer DB</name>
-	<version>1.2.3</version>
-	<type>tool</type>
-	<category>Third Party Addon</category>
-	<menuitems>
-		<customerdb>Customer DB</customerdb>
-	</menuitems>
-	<changelog>
-		*1.2.3* Add he_IL translation
-	</changelog>
-	<location>release/2.2/customerdb-1.2.3.tgz</location>
-	<md5sum>cf1fec9f1f20b688c6938d2595836710</md5sum>
-	<info>http://freepbx.org/wiki/CustomerDB</info>
-</module>
-
-<module>
-	<rawname>logfiles</rawname>
-	<name>Asterisk Logfiles</name>
-	<version>1.0.1</version>
-	<type>tool</type>
-	<category>Support</category>
-	<menuitems>
-		<logfiles>Asterisk Logfiles</logfiles>
-	</menuitems>
-	<location>release//2.2/logfiles-1.0.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-LogFiles</info>
-	<md5sum>92063ba5483e2f53acc7e32a2ff4cf94</md5sum>
-</module>
-<module>
-	<rawname>speeddial</rawname>
-	<name>Speed dial functions</name>
-	<version>1.0.2</version>
-	<type>module</type>
-	<category>CID &amp; Number Management</category>
-	<depends>
-		<module>phonebook</module>
-	</depends>
-	<location>release/2.2/speeddial-1.0.2.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-Features</info>
-	<md5sum>5a11d1460ac6587e636308a1e8c83974</md5sum>
-</module>
-<module>
 	<rawname>parking</rawname>
 	<name>Parking Lot</name>
 	<version>2.1</version>
@@ -759,61 +821,4 @@
 	<info>http://aussievoip.com.au/wiki/freePBX-ParkingLot</info>
 	<md5sum>1c2ca325423c117580381a5ec4773d19</md5sum>
 </module>
-<module>
-	<rawname>phpagiconf</rawname>
-	<name>PHPAGI Config</name>
-	<version>1.1</version>
-	<type>tool</type>
-	<category>Config</category>
-	<menuitems>
-		<phpagiconf>PHPAGI Config</phpagiconf>
-	</menuitems>
-	<depends>
-		<module>manager ge1.0.4</module>
-	</depends> 
-	<changelog>*1.1* Removed old dependancy checking code, first 2.2 release</changelog>
-	<location>release/2.2/phpagiconf-1.1.tgz</location>
-	<md5sum>1dd626321578d58698ed033e7e3a688f</md5sum>
-	<info>http://freepbx.org/wiki/phpagiconf</info>
-</module>
-<module>
-	<rawname>recordings</rawname>
-	<name>Recordings</name>
-	<version>3.3.1</version>
-	<type>setup</type>
-	<category>Internal Options &amp; Configuration</category>
-	<description>Creates and manages system recordings, used by many other modules (eg, IVR).</description>
-	<changelog>
-	*3.3.1* Fix error where *77/*79 wasn't working.
-	*3.3* Stop assuming that files being uploaded are .wav's, also highlight the correct format for files to be uploaded in.
-	*3.2.4* Add he_IL translation
-	*3.2.3* Fix for possible wrong recording being selected
-	*3.2.2* Fix for PHP5 not picking up ast recording path
-	*3.2.1* Resolved issue with wrong recording being selected when there's more than one encoding of file (eg, foo.wav and foo.gsm)
-	*3.2* First release for FreePBX 2.2 - Fixed compatibility issue with new UI</changelog>
-	<menuitems>
-		<recordings>System Recordings</recordings>
-	</menuitems>
-	<location>release/2.2/recordings-3.3.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-SysRec</info>
-	<md5sum>1e4be3c27fde689bf898997d64ad9533</md5sum>
-</module>
-<module>
-	<rawname>disa</rawname>
-	<name>DISA</name>
-	<version>2.2.1</version>
-	<type>setup</type>
-	<category>Remote Access</category>
-	<menuitems>
-		<disa>DISA</disa>
-	</menuitems>
-	<description>DISA Allows you 'Direct Inward System Access'. This gives you the ability to have an option on an IVR that gives you a dial tone, and you're able to dial out from the freePBX machine as if you were connected to a standard extension. It appears as a Destination.</description>
-	<changelog>
-	*2.2.1* Add he_IL translation
-	*2.2* First release for FreePBX 2.2 - Fixed compatibility issue with new UI
-	</changelog>
-	<location>release/2.2/disa-2.2.1.tgz</location>
-	<info>http://aussievoip.com.au/wiki/freePBX-DISA</info>
-	<md5sum>82981330404c9787acb4e194df9212ee</md5sum>
-</module>
 </xml>




More information about the Pkg-voip-commits mailing list