[Pkg-voip-commits] r3489 - in freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian: . patches

[Diego Iastrubni]

Author: elcuco-guest
Date: 2007-04-26 11:54:48 +0000 (Thu, 26 Apr 2007)
New Revision: 3489

Added:
   freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/00list
   freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/fix-ticket-1783.dpatch
Modified:
   freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/changelog
   freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/sqlite3-support.dpatch
Log:
fixing upstread ticket 1783
for some reason, sqlite3 is STILL NOT WORKING, funny since the same sql statments work when i execute them directly in sqlite3 shell


Modified: freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/changelog
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/changelog	2007-04-26 07:02:02 UTC (rev 3488)
+++ freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/changelog	2007-04-26 11:54:48 UTC (rev 3489)
@@ -1,3 +1,9 @@
+freepbx-module-inventorydb (2.2-1.0.3-2.1) unstable; urgency=low
+
+  * Vairous fixes for upstream ticket 1783
+
+ -- Diego Iastrubni <diego.iastrubni at xorcom.com>  Thu, 26 Apr 2007 13:56:08 +0300
+
 freepbx-module-inventorydb (2.2-1.0.3-2) unstable; urgency=low
 
   * SQLite3 support. Fixes upstream

Added: freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/00list
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/00list	2007-04-26 07:02:02 UTC (rev 3488)
+++ freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/00list	2007-04-26 11:54:48 UTC (rev 3489)
@@ -0,0 +1,3 @@
+fix-ticket-1783
+sqlite3-support
+

Added: freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/fix-ticket-1783.dpatch
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/fix-ticket-1783.dpatch	2007-04-26 07:02:02 UTC (rev 3488)
+++ freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/fix-ticket-1783.dpatch	2007-04-26 11:54:48 UTC (rev 3489)
@@ -0,0 +1,44 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-ticket-1783.dpatch by Diego Iastrubni <diego.iastrubni at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad freepbx-module-inventorydb~/page.inventorydb.php freepbx-module-inventorydb/page.inventorydb.php
+--- freepbx-module-inventorydb~/page.inventorydb.php	2006-12-02 08:31:04.000000000 +0200
++++ freepbx-module-inventorydb/page.inventorydb.php	2007-04-26 14:26:47.000000000 +0300
+@@ -16,7 +16,7 @@
+ 
+ $display = isset($_REQUEST['display'])?$_REQUEST['display']:'inventorydb';
+ $extdisplay = isset($_REQUEST['extdisplay'])?$_REQUEST['extdisplay']:'';
+-$type = isset($_REQUEST['type'])?$_REQUEST['type']:'setup';
++$type = isset($_REQUEST['type'])?$_REQUEST['type']:'tool';
+ $action = isset($_REQUEST['action'])?$_REQUEST['action']:'';
+ $empnum = isset($_REQUEST['empnum'])?$_REQUEST['empnum']:'';
+ $empname = isset($_REQUEST['empname'])?$_REQUEST['empname']:'';
+@@ -145,6 +145,7 @@
+ echo ($action=="" ? "add" : $action);
+ echo "\">\n";
+ echo "<input type=hidden name=display value=\"inventorydb\">";
++echo "<input type=hidden name=type value='tool' >"; 
+ 
+ echo "<table>";
+ 
+@@ -176,7 +177,7 @@
+ echo "<a href=\"#\" class=\"info\">Building Located\n";
+ echo "<span>Building where the phone is located</span></a>\n";
+ echo "</td><td>\n";
+-echo "<input name=\"building\" value=\"$building\"\n";
++echo "<input name=\"building\" value=\"$building\">\n";
+ echo "</td></tr>\n";
+ 
+ //floor
+@@ -303,7 +304,6 @@
+ ?>
+ <tr><td></td><td><input type=submit Value="Submit Changes"></td></tr></table>
+ 
+-</script>
+ 
+ 
+ 


Property changes on: freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/fix-ticket-1783.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/sqlite3-support.dpatch
===================================================================
--- freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/sqlite3-support.dpatch	2007-04-26 07:02:02 UTC (rev 3488)
+++ freepbx/modules-2.2/modules/freepbx-module-inventorydb/debian/patches/sqlite3-support.dpatch	2007-04-26 11:54:48 UTC (rev 3489)
@@ -4,9 +4,32 @@
 ## DP: SQLite3 support. Fixes upstream http://www.freepbx.org/trac/ticket/1777
 
 @DPATCH@
+diff -urNad freepbx-module-inventorydb~/functions.inc.php freepbx-module-inventorydb/functions.inc.php
+--- freepbx-module-inventorydb~/functions.inc.php	2006-09-17 07:35:27.000000000 +0300
++++ freepbx-module-inventorydb/functions.inc.php	2007-04-26 14:33:15.000000000 +0300
+@@ -19,8 +19,8 @@
+ function inventorydb_add($empnum, $empname, $building, $floor, $room, $section, $cubicle, $desk, $exten, $phusername, $phpassword, $mac, $serial, $device, $distdate, $ip, $pbxbox, $extrainfo){
+ 	$sql  = "INSERT INTO inventorydb(empnum, empname, building, floor, room, section,";
+ 	$sql .= "cubicle, desk, exten, phusername, phpassword, mac, serial, device,";
+-	$sql .= "distdate, ip, pbxbox, extrainfo)"; 
+-		
++	$sql .= "distdate, ip, pbxbox, extrainfo) "; 
++	
+ 	$sql .= "VALUES ('$empnum', '$empname', '$building', '$floor', '$room', '$section',";
+ 	$sql .= "'$cubicle', '$desk', '$exten', '$phusername', '$phpassword', '$mac', '$serial',";
+ 	$sql .= "'$device', '$distdate', '$ip', '$pbxbox', '$extrainfo')";
+@@ -28,7 +28,7 @@
+ }
+ 
+ function inventorydb_del($extdisplay){
+-	$sql="DELETE FROM inventorydb where id=$extdisplay";
++	$sql="DELETE FROM inventorydb WHERE id=$extdisplay";
+ 	sql($sql);
+ }
+ 
 diff -urNad freepbx-module-inventorydb~/install.php freepbx-module-inventorydb/install.php
 --- freepbx-module-inventorydb~/install.php	1970-01-01 02:00:00.000000000 +0200
-+++ freepbx-module-inventorydb/install.php	2007-02-15 12:53:49.000000000 +0200
++++ freepbx-module-inventorydb/install.php	2007-04-26 14:32:43.000000000 +0300
 @@ -0,0 +1,35 @@
 +<?php
 +