reduce indentation a couple of levels

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36753 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Russell Bryant 20 years ago
parent b391c098eb
commit a4c7a1c97c

@ -2504,132 +2504,138 @@ static int admin_exec(struct ast_channel *chan, void *data) {
AST_APP_ARG(command); AST_APP_ARG(command);
AST_APP_ARG(user); AST_APP_ARG(user);
); );
if (ast_strlen_zero(data)) {
ast_log(LOG_WARNING, "MeetMeAdmin requires an argument!\n");
return -1;
}
LOCAL_USER_ADD(u); LOCAL_USER_ADD(u);
AST_LIST_LOCK(&confs); AST_LIST_LOCK(&confs);
/* The param has the conference number the user and the command to execute */
if (!ast_strlen_zero(data)) { params = ast_strdupa(data);
params = ast_strdupa((char *) data); AST_STANDARD_APP_ARGS(args, params);
AST_STANDARD_APP_ARGS(args, params); if (!args.command) {
ast_log(LOG_WARNING, "MeetmeAdmin requires a command!\n");
AST_LIST_UNLOCK(&confs);
LOCAL_USER_REMOVE(u);
return -1;
}
AST_LIST_TRAVERSE(&confs, cnf, list) {
if (!strcmp(cnf->confno, args.confno))
break;
}
if (!args.command) { if (!cnf) {
ast_log(LOG_WARNING, "MeetmeAdmin requires a command!\n"); ast_log(LOG_WARNING, "Conference number '%s' not found!\n", args.confno);
AST_LIST_UNLOCK(&confs); LOCAL_USER_REMOVE(u);
LOCAL_USER_REMOVE(u); AST_LIST_UNLOCK(&confs);
return -1; return 0;
} }
AST_LIST_TRAVERSE(&confs, cnf, list) {
if (!strcmp(cnf->confno, args.confno)) if (args.user)
break; user = find_user(cnf, args.user);
}
switch (*args.command) {
if (args.user) case 76: /* L: Lock */
user = find_user(cnf, args.user); cnf->locked = 1;
break;
if (cnf) { case 108: /* l: Unlock */
switch((int) (*args.command)) { cnf->locked = 0;
case 76: /* L: Lock */ break;
cnf->locked = 1; case 75: /* K: kick all users */
break; AST_LIST_TRAVERSE(&cnf->userlist, user, list)
case 108: /* l: Unlock */ user->adminflags |= ADMINFLAG_KICKME;
cnf->locked = 0; break;
break; case 101: /* e: Eject last user*/
case 75: /* K: kick all users */ user = AST_LIST_LAST(&cnf->userlist);
AST_LIST_TRAVERSE(&cnf->userlist, user, list) if (!(user->userflags & CONFFLAG_ADMIN))
user->adminflags |= ADMINFLAG_KICKME; user->adminflags |= ADMINFLAG_KICKME;
break; else
case 101: /* e: Eject last user*/ ast_log(LOG_NOTICE, "Not kicking last user, is an Admin!\n");
user = AST_LIST_LAST(&cnf->userlist); break;
if (!(user->userflags & CONFFLAG_ADMIN)) case 77: /* M: Mute */
user->adminflags |= ADMINFLAG_KICKME; if (user) {
else user->adminflags |= ADMINFLAG_MUTED;
ast_log(LOG_NOTICE, "Not kicking last user, is an Admin!\n"); } else
break; ast_log(LOG_NOTICE, "Specified User not found!\n");
case 77: /* M: Mute */ break;
if (user) { case 78: /* N: Mute all (non-admin) users */
user->adminflags |= ADMINFLAG_MUTED; AST_LIST_TRAVERSE(&cnf->userlist, user, list) {
} else if (!(user->userflags & CONFFLAG_ADMIN))
ast_log(LOG_NOTICE, "Specified User not found!\n"); user->adminflags |= ADMINFLAG_MUTED;
break;
case 78: /* N: Mute all (non-admin) users */
AST_LIST_TRAVERSE(&cnf->userlist, user, list) {
if (!(user->userflags & CONFFLAG_ADMIN))
user->adminflags |= ADMINFLAG_MUTED;
}
break;
case 109: /* m: Unmute */
if (user) {
user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
} else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 110: /* n: Unmute all users */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
break;
case 107: /* k: Kick user */
if (user)
user->adminflags |= ADMINFLAG_KICKME;
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 118: /* v: Lower all users listen volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_listen_volume(user, VOL_DOWN);
break;
case 86: /* V: Raise all users listen volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_listen_volume(user, VOL_UP);
break;
case 115: /* s: Lower all users speaking volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_talk_volume(user, VOL_DOWN);
break;
case 83: /* S: Raise all users speaking volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_talk_volume(user, VOL_UP);
break;
case 82: /* R: Reset all volume levels */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
reset_volumes(user);
break;
case 114: /* r: Reset user's volume level */
if (user)
reset_volumes(user);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 85: /* U: Raise user's listen volume */
if (user)
tweak_listen_volume(user, VOL_UP);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 117: /* u: Lower user's listen volume */
if (user)
tweak_listen_volume(user, VOL_DOWN);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 84: /* T: Raise user's talk volume */
if (user)
tweak_talk_volume(user, VOL_UP);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 116: /* t: Lower user's talk volume */
if (user)
tweak_talk_volume(user, VOL_DOWN);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
}
} else {
ast_log(LOG_NOTICE, "Conference Number not found\n");
} }
break;
case 109: /* m: Unmute */
if (user) {
user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
} else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 110: /* n: Unmute all users */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
user->adminflags &= ~(ADMINFLAG_MUTED | ADMINFLAG_SELFMUTED);
break;
case 107: /* k: Kick user */
if (user)
user->adminflags |= ADMINFLAG_KICKME;
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 118: /* v: Lower all users listen volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_listen_volume(user, VOL_DOWN);
break;
case 86: /* V: Raise all users listen volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_listen_volume(user, VOL_UP);
break;
case 115: /* s: Lower all users speaking volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_talk_volume(user, VOL_DOWN);
break;
case 83: /* S: Raise all users speaking volume */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
tweak_talk_volume(user, VOL_UP);
break;
case 82: /* R: Reset all volume levels */
AST_LIST_TRAVERSE(&cnf->userlist, user, list)
reset_volumes(user);
break;
case 114: /* r: Reset user's volume level */
if (user)
reset_volumes(user);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 85: /* U: Raise user's listen volume */
if (user)
tweak_listen_volume(user, VOL_UP);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 117: /* u: Lower user's listen volume */
if (user)
tweak_listen_volume(user, VOL_DOWN);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 84: /* T: Raise user's talk volume */
if (user)
tweak_talk_volume(user, VOL_UP);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
case 116: /* t: Lower user's talk volume */
if (user)
tweak_talk_volume(user, VOL_DOWN);
else
ast_log(LOG_NOTICE, "Specified User not found!\n");
break;
} }
AST_LIST_UNLOCK(&confs); AST_LIST_UNLOCK(&confs);
LOCAL_USER_REMOVE(u); LOCAL_USER_REMOVE(u);

Loading…
Cancel
Save