[Pkg-voip-commits] r3501 - in
freepbx/modules-2.2/modules/freepbx-module-ivr: . debian
debian/patches
Diego Iastrubni
elcuco-guest at alioth.debian.org
Sun Apr 29 15:02:40 UTC 2007
Author: elcuco-guest
Date: 2007-04-29 15:02:39 +0000 (Sun, 29 Apr 2007)
New Revision: 3501
Modified:
freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog
freepbx/modules-2.2/modules/freepbx-module-ivr/debian/patches/sqlite3-support.dpatch
freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php
freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml
Log:
* new upstream release
* fix the sqlite3 patch for the ivr
Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog 2007-04-28 19:18:10 UTC (rev 3500)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/debian/changelog 2007-04-29 15:02:39 UTC (rev 3501)
@@ -1,3 +1,10 @@
+freepbx-module-ivr (2.2-2.5.13.1-0) unstable; urgency=low
+
+ * New upstream release
+ * Fixed the SQLite3 support script to work with current version
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com> Sun, 29 Apr 2007 17:40:28 +0300
+
freepbx-module-ivr (2.2-2.5.13-1) unstable; urgency=low
* New upstream release
Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/debian/patches/sqlite3-support.dpatch
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/debian/patches/sqlite3-support.dpatch 2007-04-28 19:18:10 UTC (rev 3500)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/debian/patches/sqlite3-support.dpatch 2007-04-29 15:02:39 UTC (rev 3501)
@@ -5,8 +5,8 @@
@DPATCH@
diff -urNad freepbx-module-ivr~/install.php freepbx-module-ivr/install.php
---- freepbx-module-ivr~/install.php 2007-02-10 00:34:16.000000000 +0200
-+++ freepbx-module-ivr/install.php 2007-02-18 12:11:38.000000000 +0200
+--- freepbx-module-ivr~/install.php 2007-04-02 11:21:38.000000000 +0300
++++ freepbx-module-ivr/install.php 2007-04-29 15:59:06.000000000 +0300
@@ -1,9 +1,37 @@
<?php
-sql('CREATE TABLE IF NOT EXISTS ivr ( ivr_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, displayname VARCHAR(50), deptname VARCHAR(50), enable_directory VARCHAR(8), enable_directdial VARCHAR(8), timeout INT, announcement VARCHAR(255), dircontext VARCHAR ( 50 ) DEFAULT "default" )');
@@ -18,7 +18,7 @@
+$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
+
+$sql = "CREATE TABLE IF NOT EXISTS ivr (
-+ ivr_id INTEGER NOT NULL $autoincrement PRIMARY KEY,
++ ivr_id INTEGER NOT NULL PRIMARY KEY $autoincrement,
+ displayname VARCHAR(50),
+ deptname VARCHAR(50),
+ enable_directory VARCHAR(8),
@@ -57,8 +57,17 @@
// Add the col
$sql = "SELECT dircontext FROM ivr";
$check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
+@@ -25,7 +51,7 @@
+ }
+ }
+
+-if (version_compare($ivr_modcurrentvers, "2.2", "<")) {
++if ( ($ivr_modcurrentvers != "") && (version_compare($ivr_modcurrentvers, "2.2", "<")) ) {
+ //echo "<p>Start 2.2 upgrade</p>";
+ $sql = "ALTER TABLE ivr CHANGE COLUMN announcement announcement VARCHAR ( 255 )";
+ $result = $db->query($sql);
diff -urNad freepbx-module-ivr~/install.sql freepbx-module-ivr/install.sql
---- freepbx-module-ivr~/install.sql 2007-02-10 00:34:16.000000000 +0200
+--- freepbx-module-ivr~/install.sql 2007-04-02 11:21:38.000000000 +0300
+++ freepbx-module-ivr/install.sql 1970-01-01 02:00:00.000000000 +0200
@@ -1,2 +0,0 @@
-CREATE TABLE IF NOT EXISTS ivr ( ivr_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY, displayname VARCHAR(50), deptname VARCHAR(50), enable_directory VARCHAR(8), enable_directdial VARCHAR(8), timeout INT, announcement VARCHAR(255), dircontext VARCHAR ( 50 ) DEFAULT "default" );
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-28 19:18:10 UTC (rev 3500)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/functions.inc.php 2007-04-29 15:02:39 UTC (rev 3501)
@@ -1,5 +1,5 @@
<?php
- /* $Id: functions.inc.php 3887 2007-03-28 20:17:56Z p_lindheimer $ */
+ /* $Id: functions.inc.php 3943 2007-04-27 16:21:42Z p_lindheimer $ */
function ivr_init() {
@@ -164,6 +164,9 @@
// Actually add the IVR commands now.
$dests = ivr_get_dests($item['ivr_id']);
+ $timeout=false;
+ $invalid=false;
+ $addloop=false;
if (!empty($dests)) {
foreach($dests as $dest) {
if ($dest['selection'] == 't') $timeout=true;
@@ -186,16 +189,16 @@
}
}
// Apply invalid if required
- if (!isset($invalid) || !$invalid) {
+ if (!$invalid) {
$ext->add($id, 'i', '', new ext_playback('invalid'));
$ext->add($id, 'i', '', new ext_goto('loop,1'));
$addloop=true;
}
- if (!isset($timeout) || !$timeout) {
+ if (!$timeout) {
$ext->add($id, 't', '', new ext_goto('loop,1'));
$addloop=true;
}
- if (isset($addloop) && $addloop) {
+ if ($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'));
Modified: freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml 2007-04-28 19:18:10 UTC (rev 3500)
+++ freepbx/modules-2.2/modules/freepbx-module-ivr/module.xml 2007-04-29 15:02:39 UTC (rev 3501)
@@ -1,13 +1,14 @@
<module>
<rawname>ivr</rawname>
<name>IVR</name>
- <version>2.5.13</version>
+ <version>2.5.13.1</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.1* make sure t ext getting put in (for some reason it wasn't always, this shoudl fix it)
*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
@@ -26,7 +27,7 @@
<menuitems>
<ivr>IVR</ivr>
</menuitems>
- <location>release/2.2/ivr-2.5.12.tgz</location>
+ <location>release/2.2/ivr-2.5.13.tgz</location>
<info>http://aussievoip.com.au/wiki/freePBX-IVR</info>
- <md5sum>4430b969ee0478b5874ec5655f079471</md5sum>
+ <md5sum>82c7a9e136c6230a4a6bfb773c93cd8b</md5sum>
</module>
More information about the Pkg-voip-commits
mailing list