[Pkg-voip-commits] r3866 - in freepbx/trunk/debian: . patches

[elcuco-guest at alioth.debian.org]

Author: elcuco-guest
Date: 2007-07-31 12:42:17 +0000 (Tue, 31 Jul 2007)
New Revision: 3866

Added:
   freepbx/trunk/debian/patches/fix-catch-all.dpatch
Modified:
   freepbx/trunk/debian/changelog
   freepbx/trunk/debian/patches/00list
Log:
Catch-all should also catch a DID of 1 digit. Patch by Tzafrir Cohen, i are stealin all yar "svn blame" lines ...



Modified: freepbx/trunk/debian/changelog
===================================================================
--- freepbx/trunk/debian/changelog	2007-07-31 09:27:37 UTC (rev 3865)
+++ freepbx/trunk/debian/changelog	2007-07-31 12:42:17 UTC (rev 3866)
@@ -7,6 +7,9 @@
     instead of /tmp/ (to be commited upstream "soon")
   * Fixed trunks page, to work properly on SQLite3
 
+  [ Tzafrir Choen ]
+  * Catch-all should also catch a DID of 1 digit (fix-catch-all.dpatch)
+
   [ Dermot Bradley ]
   * Fixed fix-agibin-dir: log path was wrong
   * Fixed op-panel configuration generation (problem in update-freepbx)

Modified: freepbx/trunk/debian/patches/00list
===================================================================
--- freepbx/trunk/debian/patches/00list	2007-07-31 09:27:37 UTC (rev 3865)
+++ freepbx/trunk/debian/patches/00list	2007-07-31 12:42:17 UTC (rev 3866)
@@ -2,6 +2,7 @@
 use-conf-defaults
 fix-mysql-real-escape-string
 fix-trunks-sqlite3
+fix-catch-all
 
 # debian/xorcom enhancements
 ast-config-dirs

Added: freepbx/trunk/debian/patches/fix-catch-all.dpatch
===================================================================
--- freepbx/trunk/debian/patches/fix-catch-all.dpatch	                        (rev 0)
+++ freepbx/trunk/debian/patches/fix-catch-all.dpatch	2007-07-31 12:42:17 UTC (rev 3866)
@@ -0,0 +1,24 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## fix-catch-all.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## DP: Catch-all should also catch a DID of 1 digit.
+
+ at DPATCH@
+diff -urNad upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php
+--- upstream~/amp_conf/htdocs/admin/modules/core/functions.inc.php	2007-06-08 03:42:50.000000000 +0300
++++ upstream/amp_conf/htdocs/admin/modules/core/functions.inc.php	2007-07-31 15:32:29.000000000 +0300
+@@ -205,6 +205,14 @@
+ 							$catchall = true;
+ 						$ext->add($catchall_context, $catchaccount, '', new ext_NoOp('Catch-All DID Match - Found ${EXTEN} - You probably want a DID for this.'));
+ 						$ext->add($catchall_context, $catchaccount, '', new ext_goto('1','s','ext-did'));
++		
++						// this is for catching a route with only one digit.
++                                                if ($catchall)
++                                                {
++							$ext->add($catchall_context, "_X", '', new ext_NoOp('Catch-All DID Match - Found ${EXTEN} - You probably want a DID for this.'));
++							$ext->add($catchall_context, "_X", '', new ext_goto('1','s','ext-did'));
++						}
++
+ 					}
+ 					
+ 					if ($item['faxexten'] != "default") {


Property changes on: freepbx/trunk/debian/patches/fix-catch-all.dpatch
___________________________________________________________________
Name: svn:executable
   + *