[svn-commits] file: trunk r44218 - in /trunk: ./ apps/ configs/ doc/

[svn-commits at lists.digium.com]

Author: file
Date: Mon Oct  2 15:58:48 2006
New Revision: 44218

URL: http://svn.digium.com/view/asterisk?rev=44218&view=rev
Log:
Expand setinterfacevar option to also set a variable, MEMBERNAME, which contains the member's name. (issue #8046 reported by jmls)

Modified:
    trunk/CHANGES
    trunk/apps/app_queue.c
    trunk/configs/queues.conf.sample
    trunk/doc/channelvariables.txt

Modified: trunk/CHANGES
URL: http://svn.digium.com/view/asterisk/trunk/CHANGES?rev=44218&r1=44217&r2=44218&view=diff
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Mon Oct  2 15:58:48 2006
@@ -23,3 +23,5 @@
      the time to name the logger files instead of sequence number.
   * The output of CallerID in Manager events is now more consistent.
      CallerIDNum is used for number and CallerIDName for name.
+  * setinterfacevar option in queues.conf also now sets a variable
+     called MEMBERNAME which contains the member's name.

Modified: trunk/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_queue.c?rev=44218&r1=44217&r2=44218&view=diff
==============================================================================
--- trunk/apps/app_queue.c (original)
+++ trunk/apps/app_queue.c Mon Oct  2 15:58:48 2006
@@ -2580,8 +2580,10 @@
 				ast_log(LOG_DEBUG, "app_queue: sendurl=%s.\n", url);
 			ast_channel_sendurl(peer, url);
 		}
-		if (qe->parent->setinterfacevar)
+		if (qe->parent->setinterfacevar) {
 				pbx_builtin_setvar_helper(qe->chan, "MEMBERINTERFACE", member->interface);
+				pbx_builtin_setvar_helper(qe->chan, "MEMBERNAME", member->membername);
+		}
 		if (!ast_strlen_zero(agi)) {
 			if (option_debug)
 				ast_log(LOG_DEBUG, "app_queue: agi=%s.\n", agi);

Modified: trunk/configs/queues.conf.sample
URL: http://svn.digium.com/view/asterisk/trunk/configs/queues.conf.sample?rev=44218&r1=44217&r2=44218&view=diff
==============================================================================
--- trunk/configs/queues.conf.sample (original)
+++ trunk/configs/queues.conf.sample Mon Oct  2 15:58:48 2006
@@ -129,6 +129,7 @@
 ;
 ; If set to yes, just prior to the caller being bridged with a queue member 
 ; the MEMBERINTERFACE variable will be set with the interface name (eg. Agent/1234)
+; and the MEMBERNAME variable will be set with the member name (eg. Joe Soap)
 ; of the queue member that was chosen and is now connected to be bridged with
 ; the caller
 ;

Modified: trunk/doc/channelvariables.txt
URL: http://svn.digium.com/view/asterisk/trunk/doc/channelvariables.txt?rev=44218&r1=44217&r2=44218&view=diff
==============================================================================
--- trunk/doc/channelvariables.txt (original)
+++ trunk/doc/channelvariables.txt Mon Oct  2 15:58:48 2006
@@ -591,6 +591,8 @@
 ${INVALID_EXTEN} 	The invalid called extension (used in the "i" extension)
 ${LANGUAGE}	 	* Current language (Deprecated; use ${LANGUAGE()})
 ${LEN(VAR)}	 	* String length of VAR (integer)
+${MEMBERINTERFACE}	* The interface name of the queuemember that was chosen
+${MEMBERNAME}		* The member name of the queuemember that was chosen
 ${PRIORITY}	 	* Current priority in the dialplan
 ${PRIREDIRECTREASON} 	Reason for redirect on PRI, if a call was directed
 ${RDNIS}         	* Redirected Dial Number ID Service (Deprecated; use ${CALLERID(rdnis)})