[svn-commits] kmoore: trunk r412731 - in /trunk: ./ apps/app_confbridge.c

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Apr 21 09:58:12 2014
New Revision: 412731

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412731
Log:
Confbridge: Fix ConfbridgeKick AMI documentation

This adds documentation for the "all" channel option for the
ConfbridgeKick AMI action and adjusts AMI responses accordingly.

(issue ASTERISK-23282)
Reported by: Dorian Logan
........

Merged revisions 412730 from http://svn.asterisk.org/svn/asterisk/branches/12

Modified:
    trunk/   (props changed)
    trunk/apps/app_confbridge.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-12-merged' - no diff available.

Modified: trunk/apps/app_confbridge.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_confbridge.c?view=diff&rev=412731&r1=412730&r2=412731
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Mon Apr 21 09:58:12 2014
@@ -236,7 +236,10 @@
 		<syntax>
 			<xi:include xpointer="xpointer(/docs/manager[@name='Login']/syntax/parameter[@name='ActionID'])" />
 			<parameter name="Conference" required="true" />
-			<parameter name="Channel" required="true" />
+			<parameter name="Channel" required="true" >
+				<para>If this parameter is not a complete channel name, the first channel with this prefix will be used.</para>
+				<para>If this parameter is "all", all channels will be kicked from the conference.</para>
+			</parameter>
 		</syntax>
 		<description>
 		</description>
@@ -2966,7 +2969,7 @@
 	ao2_ref(conference, -1);
 
 	if (found) {
-		astman_send_ack(s, m, "User kicked");
+		astman_send_ack(s, m, !strcmp("all", channel) ? "All participants kicked" : "User kicked");
 	} else {
 		astman_send_error(s, m, "No Channel by that name found in Conference.");
 	}