[Pkg-voip-commits] r5627 - in /freepbx-modules/trunk/debian: TODO.Debian changelog install patches/fix_dashboard_warning patches/series patches/sqlite_autoincrement
tzafrir-guest at alioth.debian.org
tzafrir-guest at alioth.debian.org
Sun Apr 27 19:47:14 UTC 2008
Author: tzafrir-guest
Date: Sun Apr 27 19:47:14 2008
New Revision: 5627
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5627
Log:
* More sqlite problems fixed. Just about anything that can be fixed by
editing install script.
* Patch fix_dashboard_warning: fix an annoying typo in the dashboard.
* Install AGI scripts to the proper place and allow calls to get
through.
Added:
freepbx-modules/trunk/debian/patches/fix_dashboard_warning
Modified:
freepbx-modules/trunk/debian/TODO.Debian
freepbx-modules/trunk/debian/changelog
freepbx-modules/trunk/debian/install
freepbx-modules/trunk/debian/patches/series
freepbx-modules/trunk/debian/patches/sqlite_autoincrement
Modified: freepbx-modules/trunk/debian/TODO.Debian
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/TODO.Debian?rev=5627&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/TODO.Debian (original)
+++ freepbx-modules/trunk/debian/TODO.Debian Sun Apr 27 19:47:14 2008
@@ -1,21 +1,22 @@
* Copyright / license inspection.
* Don't just dump config files from the core modules to /etc/asterisk/ .
+* Fix some #include-s of non-existing files (fixed upstream?)
* FreePBX doesn't like installing modules when Asterisk is not running.
* Installation / removal is painfully slow.
* Still impossible to install separate modules.
- The install part is partially done.
* ARI runs in a separate window and is not functional.
-* Other PHP errors:
- - FreePBX System Status:
- Notice: Undefined offset: 2 in
- /usr/share/freepbx/modules/core/functions.inc.php on line 1868
+* Does FreePBX come with a newer ARI?
* A copy of phpsysinfo under modules/dashboard/
* Web server shows as "Timeout" in the dashboard.
* Why doesn't debconf-updatepo like our templates file?
* The prerm module will disable all modules, even those not installed
through this package (zapauto).
-* Backup module fails to install with sqlite3?
* Backup module fails to work with mysql?
-* Two other install script failures.
+ - Seems to fail to set the scheduler job.
+* Warning: opendir(/var/lib/asterisk/mohmp3) [function.opendir]: failed
+ to open dir: No such file or directory in
+ /usr/share/freepbx/modules/music/page.music.php on line 133
+* findmefollowme fails with sqlite3: primary key is a varchar.
And what about pgsql?
Modified: freepbx-modules/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/changelog?rev=5627&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/changelog (original)
+++ freepbx-modules/trunk/debian/changelog Sun Apr 27 19:47:14 2008
@@ -16,5 +16,6 @@
* Patch checkperms_indications: check the status of fopen.
* Dump config files from the core modules to /etc/asterisk/ .
* Patch logfile_messages: show /var/log/messages .
+ * Patch fix_dashboard_warning: fix an annoying typo(?) in the dashboard.
-- Tzafrir Cohen <tzafrir.cohen at xorcom.com> Wed, 09 Apr 2008 12:57:32 +0300
Modified: freepbx-modules/trunk/debian/install
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/install?rev=5627&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/install (original)
+++ freepbx-modules/trunk/debian/install Sun Apr 27 19:47:14 2008
@@ -1,2 +1,3 @@
modules/*/etc/* etc/asterisk/
+modules/*/agi-bin/* usr/share/asterisk/agi-bin/
modules/* usr/share/freepbx/modules/
Added: freepbx-modules/trunk/debian/patches/fix_dashboard_warning
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/fix_dashboard_warning?rev=5627&op=file
==============================================================================
--- freepbx-modules/trunk/debian/patches/fix_dashboard_warning (added)
+++ freepbx-modules/trunk/debian/patches/fix_dashboard_warning Sun Apr 27 19:47:14 2008
@@ -1,0 +1,13 @@
+An aparant typo in the dashboard module causes a PHP error at the
+"FreePBX Connections" block.
+
+--- freepbx-modules-2.3.1.orig/modules/core/functions.inc.php
++++ freepbx-modules-2.3.1/modules/core/functions.inc.php
+@@ -1850,7 +1850,6 @@ function core_trunks_list($assoc = false
+ 'name' => $name,
+ 'tech' => $tech,
+ 'globalvar' => $trunk[0], // ick
+- 'value' => $trunk[2], // ?? no idea what this is.
+ );
+ }
+ return $trunkinfo;
Modified: freepbx-modules/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/series?rev=5627&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/series (original)
+++ freepbx-modules/trunk/debian/patches/series Sun Apr 27 19:47:14 2008
@@ -2,4 +2,5 @@
checkperms_indications
logfile_messages
sqlite_no_change
+fix_dashboard_warning
sqlite_autoincrement
Modified: freepbx-modules/trunk/debian/patches/sqlite_autoincrement
URL: http://svn.debian.org/wsvn/pkg-voip/freepbx-modules/trunk/debian/patches/sqlite_autoincrement?rev=5627&op=diff
==============================================================================
--- freepbx-modules/trunk/debian/patches/sqlite_autoincrement (original)
+++ freepbx-modules/trunk/debian/patches/sqlite_autoincrement Sun Apr 27 19:47:14 2008
@@ -34,15 +34,15 @@
<?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" )');
+$autoincrement = ($amp_conf["AMPDBENGINE"] == "sqlite3") ? "AUTOINCREMENT":"AUTO_INCREMENT";
-+sql('CREATE TABLE IF NOT EXISTS ivr (
-+ ivr_id INTEGER NOT NULL PRIMARY KEY '.$autoincrement.',
-+ displayname VARCHAR(50),
-+ deptname VARCHAR(50),
-+ enable_directory VARCHAR(8),
-+ enable_directdial VARCHAR(8),
++sql('CREATE TABLE IF NOT EXISTS ivr (
++ ivr_id INTEGER NOT NULL PRIMARY KEY '.$autoincrement.',
++ displayname VARCHAR(50),
++ deptname VARCHAR(50),
++ enable_directory VARCHAR(8),
++ enable_directdial VARCHAR(8),
+ timeout INTEGER,
-+ announcement VARCHAR(255),
-+ dircontext VARCHAR ( 50 ) DEFAULT "default"
++ announcement VARCHAR(255),
++ dircontext VARCHAR ( 50 ) DEFAULT "default"
+)');
sql('CREATE TABLE IF NOT EXISTS ivr_dests ( ivr_id INT NOT NULL, selection VARCHAR(10), dest VARCHAR(50))');
@@ -109,15 +109,15 @@
+ $autoincrement = "AUTOINCREMENT";
+}
+$sql = "
-+CREATE TABLE IF NOT EXISTS disa (
-+ disa_id INTEGER NOT NULL PRIMARY KEY $autoincrement,
-+ displayname VARCHAR( 50 ),
-+ pin VARCHAR ( 50 ),
-+ cid VARCHAR ( 50 ),
-+ context VARCHAR ( 50 ),
-+ digittimeout INT,
-+ resptimeout INT,
-+ needconf VARCHAR( 10 )
++CREATE TABLE IF NOT EXISTS disa (
++ disa_id INTEGER NOT NULL PRIMARY KEY $autoincrement,
++ displayname VARCHAR( 50 ),
++ pin VARCHAR ( 50 ),
++ cid VARCHAR ( 50 ),
++ context VARCHAR ( 50 ),
++ digittimeout INT,
++ resptimeout INT,
++ needconf VARCHAR( 10 )
+);";
+$result = $db->query($sql);
+if(DB::IsError($result)) {
@@ -131,21 +131,93 @@
+++ /dev/null
@@ -1 +0,0 @@
-CREATE TABLE IF NOT EXISTS disa ( disa_id INT NOT NULL AUTO_INCREMENT PRIMARY KEY , displayname VARCHAR( 50 ), pin VARCHAR ( 50 ), cid VARCHAR ( 50 ), context VARCHAR ( 50 ), digittimeout INT, resptimeout INT, needconf VARCHAR( 10 ) );
---- freepbx-modules-2.3.1.orig/modules/findmefollow/install.php
-+++ freepbx-modules-2.3.1/modules/findmefollow/install.php
-@@ -2,6 +2,10 @@
-
- global $db;
-
-+
-+CREATE TABLE IF NOT EXISTS `findmefollow` ( `grpnum` VARCHAR( 20 ) NOT NULL , `strategy` VARCHAR( 50 ) NOT NULL , `grptime` SMALLINT NOT NULL , `grppre` VARCHAR( 100 ) NULL , `grplist` VARCHAR( 255 ) NOT NULL , `annmsg` VARCHAR( 255 ) NULL , `postdest` VARCHAR( 255 ) NULL , `dring` VARCHAR ( 255 ) NULL , remotealert VARCHAR ( 80 ), needsconf VARCHAR ( 10 ), toolate VARCHAR ( 80 ), pre_ring SMALLINT NOT NULL DEFAULT 0, PRIMARY KEY (`grpnum`) ) TYPE = MYISAM ;
-+
-+
- // Adding support for a pre_ring before follow-me group
- $sql = "SELECT pre_ring FROM findmefollow";
- $check = $db->getRow($sql, DB_FETCHMODE_ASSOC);
--- freepbx-modules-2.3.1.orig/modules/ivr/install.sql
+++ /dev/null
@@ -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" );
-CREATE TABLE IF NOT EXISTS ivr_dests ( ivr_id INT NOT NULL, selection VARCHAR(10), dest VARCHAR(50), ivr_ret TINYINT(1) NOT NULL DEFAULT 0);
+--- /dev/null
++++ freepbx-modules-2.3.1/modules/customerdb/install.php
+@@ -0,0 +1,31 @@
++<?php
++
++global $db;
++global $amp_conf;
++
++$autoincrement = (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) ? "AUTOINCREMENT":"AUTO_INCREMENT";
++$sql = "
++CREATE TABLE IF NOT EXISTS customerdb (
++ id INTEGER PRIMARY KEY $autoincrement,
++ name varchar(45) NOT NULL,
++ addr1 varchar(150) NOT NULL,
++ addr2 varchar(150) NULL,
++ city varchar(50) NOT NULL,
++ state varchar(5) NOT NULL,
++ zip varchar(12) NULL,
++ sip varchar(20) NULL,
++ did varchar(45) NULL,
++ device varchar(50) NULL,
++ ip varchar(20) NULL,
++ serial varchar(50) NULL,
++ account varchar(6) NULL,
++ email varchar(150) NULL,
++ username varchar(25) NULL,
++ password varchar(25) NULL
++);";
++$check = $db->query($sql);
++if(DB::IsError($check)) {
++ die_freepbx("Can not create customerdb table: $sql");
++}
++
++?>
+--- freepbx-modules-2.3.1.orig/modules/customerdb/install.sql
++++ /dev/null
+@@ -1 +0,0 @@
+-CREATE TABLE IF NOT EXISTS customerdb (id int UNIQUE AUTO_INCREMENT, name varchar(45) not null, addr1 varchar(150) not null, addr2 varchar(150) null, city varchar(50) not null, state varchar(5) not null, zip varchar(12) null, sip varchar(20) null, did varchar(45) null, device varchar(50) null, ip varchar(20) null, serial varchar(50) null, account varchar(6) null, email varchar(150) null, username varchar(25) null, password varchar(25) null);
+--- /dev/null
++++ freepbx-modules-2.3.1/modules/phpagiconf/install.php
+@@ -0,0 +1,39 @@
++<?php
++
++global $db;
++global $amp_conf;
++
++$autoincrement = "AUTO_INCREMENT";
++$bool = 'BOOL';
++$type_str = " TYPE = MYISAM";
++
++if (($amp_conf["AMPDBENGINE"] == "sqlite") || ($amp_conf["AMPDBENGINE"] == "sqlite3")) {
++ $autoincrement = "AUTOINCREMENT";
++ $bool = "INTEGER";
++ $type_str = '';
++}
++$sql = "
++CREATE TABLE IF NOT EXISTS `phpagiconf` (
++ `phpagiid` INTEGER NOT NULL PRIMARY KEY $autoincrement,
++ `debug` $bool,
++ `error_handler` $bool,
++ `err_email` VARCHAR( 50 ),
++ `hostname` VARCHAR( 255 ),
++ `tempdir` VARCHAR( 255 ),
++ `festival_text2wave` VARCHAR( 255 ),
++ `asman_server` VARCHAR( 255 ),
++ `asman_port` INT NOT NULL,
++ `asman_user` VARCHAR( 50 ),
++ `asman_secret` VARCHAR( 255 ),
++ `cepstral_swift` VARCHAR( 255 ),
++ `cepstral_voice` VARCHAR( 50 ),
++ `setuid` $bool,
++ `basedir` VARCHAR( 255 )
++) $type_str;
++
++$check = $db->query($sql);
++if(DB::IsError($check)) {
++ die_freepbx("Can not create phpagiconf table: $sql");
++}
++
++?>
+--- freepbx-modules-2.3.1.orig/modules/phpagiconf/install.sql
++++ /dev/null
+@@ -1,2 +0,0 @@
+-CREATE TABLE IF NOT EXISTS `phpagiconf` ( `phpagiid` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , `debug` BOOL , `error_handler` BOOL , `err_email` VARCHAR( 50 ) , `hostname` VARCHAR( 255 ) , `tempdir` VARCHAR( 255 ) , `festival_text2wave` VARCHAR( 255 ) , `asman_server` VARCHAR( 255 ) , `asman_port` INT NOT NULL , `asman_user` VARCHAR( 50 ) , `asman_secret` VARCHAR( 255 ) , `cepstral_swift` VARCHAR( 255 ) , `cepstral_voice` VARCHAR( 50 ) , `setuid` BOOL , `basedir` VARCHAR( 255 ) ) TYPE = MYISAM ;
+-
More information about the Pkg-voip-commits
mailing list