[Pkg-voip-commits] r3354 - in freepbx/modules-2.2: .
modules/freepbx-module-announcement
modules/freepbx-module-announcement/debian
modules/freepbx-module-findmefollow
modules/freepbx-module-findmefollow/debian
modules/freepbx-module-ivr modules/freepbx-module-ivr/debian
Diego Iastrubni
elcuco-guest at alioth.debian.org
Mon Apr 2 08:01:15 UTC 2007
Author: elcuco-guest
Date: 2007-04-02 08:01:15 +0000 (Mon, 02 Apr 2007)
New Revision: 3354
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-findmefollow/debian/changelog
freepbx/modules-2.2/modules/freepbx-module-findmefollow/functions.inc.php
freepbx/modules-2.2/modules/freepbx-module-findmefollow/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
Log:
upgraded modules, by using: ../trunk/debian/contrib/fpx-modules up
all modules still build.
Modified: freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-announcement/debian/changelog 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,3 +1,9 @@
+freepbx-module-announcement (2.2-0.8.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Mon, 2 Apr 2007 10:57:48 +0300
+
freepbx-module-announcement (2.2-0.8.0-1) unstable; urgency=low
* New upstream release
Modified: freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-announcement/functions.inc.php 2007-04-02 08:01:15 UTC (rev 3354)
@@ -13,15 +13,16 @@
switch ($engine) {
case 'asterisk':
foreach (announcement_list() as $row) {
- $ext->add('app-announcement-'.$row[0], 's', '', new ext_noop('Playing announcement '.$row[1]));
if (! $row[6]) {
+ $ext->add('app-announcement-'.$row[0], 's', '', new ext_gotoif('$["${CDR(disposition)}" = "ANSWERED"]','begin'));
$ext->add('app-announcement-'.$row[0], 's', '', new ext_answer(''));
$ext->add('app-announcement-'.$row[0], 's', '', new ext_wait('1'));
}
+ $ext->add('app-announcement-'.$row[0], 's', 'begin', new ext_noop('Playing announcement '.$row[1]));
if ($row[3] || $row[7]) {
// allow skip
if ($row[7]) {
- $ext->add('app-announcement-'.$row[0], 's', '', new ext_responsetimeout(10));
+ $ext->add('app-announcement-'.$row[0], 's', '', new ext_responsetimeout(3));
}
$ext->add('app-announcement-'.$row[0], 's', 'play', new ext_background($row[2].'|nm'));
Modified: freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-announcement/module.xml 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,8 +1,10 @@
<module>
<rawname>announcement</rawname>
<name>Announcements</name>
- <version>0.8.0</version>
+ <version>0.8.2</version>
<changelog>
+ *0.8.2* skip the answer/wait(1) if channel is already answered
+ *0.8.1* changed response timeout from 10 to 3 seconds (when used at all)
*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
@@ -20,7 +22,7 @@
<menuitems>
<announcement>Announcements</announcement>
</menuitems>
- <location>release/2.2/announcement-0.7.0.tgz</location>
+ <location>release/2.2/announcement-0.8.1.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-Announcement</info>
- <md5sum>1991ecf118b229206a4e48886ba452f5</md5sum>
+ <md5sum>46d91d3631249fc50c6f1f9954c4e645</md5sum>
</module>
Modified: freepbx/modules-2.2/modules/freepbx-module-findmefollow/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-findmefollow/debian/changelog 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-findmefollow/debian/changelog 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,3 +1,9 @@
+freepbx-module-findmefollow (2.2-2.4.9.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Mon, 2 Apr 2007 10:57:46 +0300
+
freepbx-module-findmefollow (2.2-2.4.9-2) unstable; urgency=low
* SQLite3 support. Fixes upstream
Modified: freepbx/modules-2.2/modules/freepbx-module-findmefollow/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-findmefollow/functions.inc.php 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-findmefollow/functions.inc.php 2007-04-02 08:01:15 UTC (rev 3354)
@@ -91,7 +91,7 @@
// Add Alert Info if set but don't override and already set value (could be from ringgroup, directdid, etc.)
//
if ((isset($dring) ? $dring : '') != '') {
- $ext->add($contextname, $grpnum, '', new ext_setvar("__ALERT_INFO", '${IF($["x${ALERT_INFO}"="x"]?"'.str_replace(';', '\;', $dring).'":"")}'));
+ $ext->add($contextname, $grpnum, '', new ext_setvar("__ALERT_INFO", '${IF($["x${ALERT_INFO}"="x"]?'.str_replace(';', '\;', $dring).':${ALERT_INFO})}'));
}
// If pre_ring is set, then ring this number of seconds prior to moving on
$ext->add($contextname, $grpnum, '', new ext_gotoif('$[$[ "${DB(AMPUSER/'.$grpnum.'/followme/prering)}" = "0" ] | $[ "${DB(AMPUSER/'.$grpnum.'/followme/prering)}" = "" ]] ', 'skipsimple'));
Modified: freepbx/modules-2.2/modules/freepbx-module-findmefollow/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-findmefollow/module.xml 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-findmefollow/module.xml 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,8 +1,9 @@
<module>
<rawname>findmefollow</rawname>
<name>Follow Me</name>
- <version>2.4.9</version>
+ <version>2.4.9.1</version>
<changelog>
+ *2.4.9.1* Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it
*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
@@ -32,7 +33,7 @@
<menuitems>
<findmefollow>Follow Me</findmefollow>
</menuitems>
- <location>release/2.2/findmefollow-2.4.8.tgz</location>
+ <location>release/2.2/findmefollow-2.4.9.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-FollowMe</info>
- <md5sum>782a49d8c87c7a5b13fc697edb2be017</md5sum>
+ <md5sum>631de942afd4ba33f36630322d8bf625</md5sum>
</module>
Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,3 +1,9 @@
+freepbx-module-ivr (2.2-2.5.13-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Mon, 2 Apr 2007 10:57:49 +0300
+
freepbx-module-ivr (2.2-2.5.11-1) unstable; urgency=low
* New upstream release
Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,5 +1,5 @@
<?php
- /* $Id: functions.inc.php 3789 2007-02-16 18:48:34Z p_lindheimer $ */
+ /* $Id: functions.inc.php 3887 2007-03-28 20:17:56Z p_lindheimer $ */
function ivr_init() {
@@ -150,6 +150,7 @@
$ext->add($id, 's', '', new ext_setvar('__DIR-CONTEXT', $details['dircontext']));
$ext->add($id, 's', '', new ext_setvar('_IVR_CONTEXT_${CONTEXT}', '${IVR_CONTEXT}'));
$ext->add($id, 's', '', new ext_setvar('_IVR_CONTEXT', '${CONTEXT}'));
+ $ext->add($id, 's', '', new ext_gotoif('$["${CDR(disposition)}" = "ANSWERED"]','begin'));
$ext->add($id, 's', '', new ext_answer(''));
$ext->add($id, 's', '', new ext_wait('1'));
$ext->add($id, 's', 'begin', new ext_digittimeout(3));
@@ -185,16 +186,16 @@
}
}
// Apply invalid if required
- if (!isset($invalid)) {
+ if (!isset($invalid) || !$invalid) {
$ext->add($id, 'i', '', new ext_playback('invalid'));
$ext->add($id, 'i', '', new ext_goto('loop,1'));
$addloop=true;
}
- if (!isset($timeout)) {
+ if (!isset($timeout) || !$timeout) {
$ext->add($id, 't', '', new ext_goto('loop,1'));
$addloop=true;
}
- if (isset($addloop)) {
+ if (isset($addloop) && $addloop) {
$ext->add($id, 'loop', '', new ext_setvar('LOOPCOUNT','$[${LOOPCOUNT} + 1]'));
$ext->add($id, 'loop', '', new ext_gotoif('$[${LOOPCOUNT} > 2]','hang,1'));
$ext->add($id, 'loop', '', new ext_goto($id.',s,begin'));
@@ -206,10 +207,10 @@
$ext->add($id, 'return', '', new ext_goto($id.',s,begin'));
}
$ext->add($id, 'fax', '', new ext_goto('ext-fax,in_fax,1'));
- }
- }
- break;
- }
+ }
+ }
+ break;
+ }
}
Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml 2007-04-02 08:01:15 UTC (rev 3354)
@@ -1,13 +1,15 @@
<module>
<rawname>ivr</rawname>
<name>IVR</name>
- <version>2.5.11</version>
+ <version>2.5.13</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.13* #1871 't' extension not being created by default fixed
+ *2.5.12* skip the answer/wait(1) if channel is already answered
*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
@@ -24,7 +26,7 @@
<menuitems>
<ivr>IVR</ivr>
</menuitems>
- <location>release/2.2/ivr-2.5.10.tgz</location>
+ <location>release/2.2/ivr-2.5.12.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-IVR</info>
- <md5sum>e1c1da78c7aa36a75b128fb4c42381bc</md5sum>
+ <md5sum>4430b969ee0478b5874ec5655f079471</md5sum>
</module>
Modified: freepbx/modules-2.2/modules-2.2.xml
===================================================================
--- freepbx/modules-2.2/modules-2.2.xml 2007-04-01 14:47:02 UTC (rev 3353)
+++ freepbx/modules-2.2/modules-2.2.xml 2007-04-02 08:01:15 UTC (rev 3354)
@@ -121,8 +121,9 @@
<module>
<rawname>findmefollow</rawname>
<name>Follow Me</name>
- <version>2.4.9</version>
+ <version>2.4.9.1</version>
<changelog>
+ *2.4.9.1* Fixed ALERT_INFO bug, if previously set it should not set - it was clearing it
*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
@@ -152,9 +153,9 @@
<menuitems>
<findmefollow>Follow Me</findmefollow>
</menuitems>
- <location>release/2.2/findmefollow-2.4.9.tgz</location>
+ <location>release/2.2/findmefollow-2.4.9.1.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-FollowMe</info>
- <md5sum>631de942afd4ba33f36630322d8bf625</md5sum>
+ <md5sum>1126375f1297576ecb61e23720410ea2</md5sum>
</module>
<module>
<rawname>manager</rawname>
@@ -189,8 +190,10 @@
<module>
<rawname>announcement</rawname>
<name>Announcements</name>
- <version>0.8.0</version>
+ <version>0.8.2</version>
<changelog>
+ *0.8.2* skip the answer/wait(1) if channel is already answered
+ *0.8.1* changed response timeout from 10 to 3 seconds (when used at all)
*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
@@ -208,9 +211,9 @@
<menuitems>
<announcement>Announcements</announcement>
</menuitems>
- <location>release/2.2/announcement-0.8.0.tgz</location>
+ <location>release/2.2/announcement-0.8.2.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-Announcement</info>
- <md5sum>8e268087f93750d488350846b9c5da71</md5sum>
+ <md5sum>f3eca44e6c9d1eb33110c84cd7d4b07d</md5sum>
</module>
<module>
<rawname>ringgroups</rawname>
@@ -269,13 +272,15 @@
<module>
<rawname>ivr</rawname>
<name>IVR</name>
- <version>2.5.11</version>
+ <version>2.5.13</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.13* #1871 't' extension not being created by default fixed
+ *2.5.12* skip the answer/wait(1) if channel is already answered
*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
@@ -292,9 +297,9 @@
<menuitems>
<ivr>IVR</ivr>
</menuitems>
- <location>release/2.2/ivr-2.5.11.tgz</location>
+ <location>release/2.2/ivr-2.5.13.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-IVR</info>
- <md5sum>d37e7c2d90605fc9f0700330de81472e</md5sum>
+ <md5sum>82c7a9e136c6230a4a6bfb773c93cd8b</md5sum>
</module>
<module>
<rawname>phpagiconf</rawname>
More information about the Pkg-voip-commits
mailing list