[asterisk-commits] kmoore: trunk r412729 - in /trunk: ./ apps/app_confbridge.c

[SVN commits to the Asterisk project]

Author: kmoore
Date: Mon Apr 21 09:47:37 2014
New Revision: 412729

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=412729
Log:
Confbridge: Add references for kick all option

After the ability to kick all attendees from a conference was added, a
rework removed the comment about that feature from the CLI
documentation. This adds that documentation and adds "all" to the
participant tab completion list for the confbridge kick command.

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

Merged revisions 412728 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=412729&r1=412728&r2=412729
==============================================================================
--- trunk/apps/app_confbridge.c (original)
+++ trunk/apps/app_confbridge.c Mon Apr 21 09:47:37 2014
@@ -2253,6 +2253,11 @@
 		return NULL;
 	}
 
+	if (!state) {
+		return ast_strdup("all");
+	}
+	state--;
+
 	{
 		SCOPED_AO2LOCK(bridge_lock, conference);
 		AST_LIST_TRAVERSE(&conference->active_list, user, list) {
@@ -2281,7 +2286,7 @@
 		e->command = "confbridge kick";
 		e->usage =
 			"Usage: confbridge kick <conference> <channel>\n"
-			"       Kicks a channel out of the conference bridge.\n";
+			"       Kicks a channel out of the conference bridge (all to kick everyone).\n";
 		return NULL;
 	case CLI_GENERATE:
 		if (a->pos == 2) {