Index: cli.c
===================================================================
RCS file: /usr/cvsroot/asterisk/cli.c,v
retrieving revision 1.69
diff -u -r1.69 cli.c
--- cli.c	6 Jan 2005 08:11:43 -0000	1.69
+++ cli.c	8 Jan 2005 09:48:55 -0000
@@ -814,7 +814,7 @@
 		if (match)
 			return &builtins[x];
 	}
-	for (e=helpers;e;e=e->next) {
+	for (e=helpers; e; e=e->next) {
 		match = 1;
 		for (y=0;match && cmds[y]; y++) {
 			if (!e->cmda[y] && !exact)
@@ -830,6 +830,7 @@
 	return e;
 }
 
+/* join: Join words with space between words */
 static void join(char *dest, size_t destsize, char *w[])
 {
 	int x;
@@ -838,13 +839,14 @@
 		return;
 	}
 	dest[0] = '\0';
-	for (x=0;w[x];x++) {
+	for (x=0; w[x]; x++) {
 		if (x)
 			strncat(dest, " ", destsize - strlen(dest) - 1);
 		strncat(dest, w[x], destsize - strlen(dest) - 1);
 	}
 }
 
+/* join2: Join words with no space between words */
 static void join2(char *dest, size_t destsize, char *w[])
 {
 	int x;
@@ -853,7 +855,7 @@
 		return;
 	}
 	dest[0] = '\0';
-	for (x=0;w[x];x++) {
+	for (x=0; w[x]; x++) {
 		strncat(dest, w[x], destsize - strlen(dest) - 1);
 	}
 }
@@ -864,9 +866,9 @@
 	int x;
 	/* See how close we get, then print the  */
 	char *myargv[AST_MAX_CMD_LEN];
-	for (x=0;x<AST_MAX_CMD_LEN;x++)
+	for (x=0; x<AST_MAX_CMD_LEN; x++)
 		myargv[x]=NULL;
-	for (x=0;argv[x];x++) {
+	for (x=0; argv[x]; x++) {
 		myargv[x] = argv[x];
 		if (!find_cli(myargv, -1))
 			break;
@@ -875,6 +877,8 @@
 	return cmdline;
 }
 
+/* ast_cli_unregister: Unregister CLI command. Used by modules that
+	are unloaded to clean up */
 int ast_cli_unregister(struct ast_cli_entry *e)
 {
 	struct ast_cli_entry *cur, *l=NULL;
@@ -901,18 +905,23 @@
 	return 0;
 }
 
+/* ast_cli_register: Dynamically register CLI application */
+/* 	The hidden variable is cleared here, so you need to change
+	it after registration to hide a command from listings */
 int ast_cli_register(struct ast_cli_entry *e)
 {
 	struct ast_cli_entry *cur, *l=NULL;
 	char fulle[80] ="", fulltst[80] ="";
 	static int len;
+
 	ast_mutex_lock(&clilock);
 	join2(fulle, sizeof(fulle), e->cmda);
 	if (find_cli(e->cmda, -1)) {
 		ast_mutex_unlock(&clilock);
-		ast_log(LOG_WARNING, "Command '%s' already registered (or something close enough)\n", fulle);
+		ast_log(LOG_ERROR, "Command '%s' already registered (or something close enough)\n", fulle);
 		return -1;
 	}
+	e->hidden = 0;
 	cur = helpers;
 	while(cur) {
 		join2(fulltst, sizeof(fulltst), cur->cmda);
@@ -972,8 +981,8 @@
 			fullcmd = fullcmd1;
 			e1++;
 		}
-		/* Hide commands that start with '_' */
-		if (fullcmd[0] == '_')
+		/* Hide commands that start with '_' or is hidden */
+		if (fullcmd[0] == '_' || e->hidden)
 			continue;
 		if (match) {
 			if (strncasecmp(matchstr, fullcmd, strlen(matchstr))) {
@@ -1077,7 +1086,7 @@
 	return dup;
 }
 
-/* This returns the number of unique matches for the generator */
+/* ast_cli_generatornummatches: returns the number of unique matches for the generator */
 int ast_cli_generatornummatches(char *text, char *word)
 {
 	int matches = 0, i = 0;
Index: include/asterisk/cli.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/cli.h,v
retrieving revision 1.6
diff -u -r1.6 cli.h
--- include/asterisk/cli.h	6 Apr 2004 07:42:01 -0000	1.6
+++ include/asterisk/cli.h	8 Jan 2005 09:48:55 -0000
@@ -3,9 +3,9 @@
  *
  * Standard Command Line Interface
  * 
- * Copyright (C) 1999, Mark Spencer
+ * Copyright (C) 1999-2005, Digium, inc.
  *
- * Mark Spencer <markster@linux-support.net>
+ * Mark Spencer <markster@digium.com>
  *
  * This program is free software, distributed under the terms of
  * the GNU General Public License
@@ -49,6 +49,8 @@
 	struct ast_cli_entry *next;
 	/*! For keeping track of usage */
 	int inuse;
+	/*! If this is an alias entry, keep it hidden from listings */
+	int hidden;
 };
 
 //! Interprets a command
Index: apps/app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.192
diff -u -r1.192 app_voicemail.c
--- apps/app_voicemail.c	3 Jan 2005 02:01:58 -0000	1.192
+++ apps/app_voicemail.c	8 Jan 2005 09:48:57 -0000
@@ -220,21 +220,22 @@
 "Leave a voicemail message";
 
 static char *descrip_vm =
-"  VoiceMail([s|u|b]extension[@context][&extension[@context]][...]):  Leaves"
-"voicemail for a given extension (must be configured in voicemail.conf).\n"
-" If the extension is preceded by \n"
-"* 's' then instructions for leaving the message will be skipped.\n"
-"* 'u' then the \"unavailable\" message will be played.\n"
-"  (/var/lib/asterisk/sounds/vm/<exten>/unavail) if it exists.\n"
-"* 'b' then the the busy message will be played (that is, busy instead of unavail).\n"
-"If the caller presses '0' (zero) during the prompt, the call jumps to\n"
-"extension 'o' in the current context.\n"
-"If the caller presses '*' during the prompt, the call jumps to\n"
-"extension 'a' in the current context.\n"
-"If the requested mailbox does not exist, and there exists a priority\n"
-"n + 101, then that priority will be taken next.\n"
+"  VoiceMail([s|u|b]mailbox[@context][&mailbox[@context]][...])\n"
+"Leaves voicemail for a given voicemailbox in a given extension\n"
+"(must be configured in voicemail.conf). If the mailbox is preceded by \n"
+"  s   then instructions for leaving the message will be skipped.\n"
+"  u   then the \"unavailable\" message will be played.\n"
+"      (/var/lib/asterisk/sounds/vm/<mailbox>/unavail) if it exists.\n"
+"  b   then the the busy message will be played (that is, 'busy' file\n"
+"      instead of unavail).\n"
 "When multiple mailboxes are specified, the unavailable or busy message\n"
 "will be taken from the first mailbox specified.\n"
+"The caller has the option to press one of the following keys during the prompt:\n"
+" '0' (Zero)  the call jumps to extension 'o' in the current dial plan context.\n"
+"             This is often used for operator exits.\n"
+" '*'         the call jumps to extension 'a' in the current dial plan context.\n"
+"If the requested mailbox does not exist, and there exists a priority\n"
+"n + 101, then that priority will be taken next.\n"
 "Returns -1 on error or mailbox not found, or if the user hangs up.\n"
 "Otherwise, it returns 0.\n";
 
@@ -242,7 +243,7 @@
 "Enter voicemail system";
 
 static char *descrip_vmain =
-"  VoiceMailMain([[s]mailbox][@context]): Enters the main voicemail system\n"
+"  VoiceMailMain([[s][p]mailbox][@context]): Enters the main voicemail system\n"
 "for the checking of voicemail.  The mailbox can be passed as the option,\n"
 "which will stop the voicemail system from prompting the user for the mailbox.\n"
 "If the mailbox is preceded by 's' then the password check will be skipped.  If\n"
@@ -253,7 +254,7 @@
 "Returns -1 if the user hangs up or 0 otherwise.\n";
 
 static char *synopsis_vm_box_exists =
-"Check if vmbox exists";
+"Check if voica mailbox exists";
 
 static char *descrip_vm_box_exists =
 "  MailboxExists(mailbox[@context]): Conditionally branches to priority n+101\n"
@@ -268,7 +269,7 @@
 "voicemail.conf.\n"
 "  If the mailbox is specified, only that mailbox's password will be considered\n"
 "valid. If the mailbox is not specified, the channel variable AUTH_MAILBOX will\n"
-"be set with the authenticated mailbox.\n";
+"be set with the authenticated mailbox and AUTH_CONTEXT with the context.\n";
 
 /* Leave a message */
 static char *app = "VoiceMail";
@@ -1279,6 +1280,7 @@
 {
 	char stxt[256];
 	char dtxt[256];
+
 	ast_filerename(sfn,dfn,NULL);
 	snprintf(stxt, sizeof(stxt), "%s.txt", sfn);
 	snprintf(dtxt, sizeof(dtxt), "%s.txt", dfn);
@@ -1338,6 +1340,7 @@
 static void copy_file(char *frompath, char *topath)
 {
 	char frompath2[256],topath2[256];
+
 	ast_filecopy(frompath, topath, NULL);
 	snprintf(frompath2, sizeof(frompath2), "%s.txt", frompath);
 	snprintf(topath2, sizeof(topath2), "%s.txt", topath);
@@ -1373,8 +1376,7 @@
 
 
 #endif
-static int
-inbuf(struct baseio *bio, FILE *fi)
+static int inbuf(struct baseio *bio, FILE *fi)
 {
 	int l;
 
@@ -1395,35 +1397,31 @@
 	return 1;
 }
 
-static int 
-inchar(struct baseio *bio, FILE *fi)
+static int inchar(struct baseio *bio, FILE *fi)
 {
-	if (bio->iocp>=bio->iolen) {
+	if (bio->iocp >= bio->iolen) {
 		if (!inbuf(bio, fi))
 			return EOF;
 	}
-
 	return bio->iobuf[bio->iocp++];
 }
 
-static int
-ochar(struct baseio *bio, int c, FILE *so)
+static int ochar(struct baseio *bio, int c, FILE *so)
 {
-	if (bio->linelength>=BASELINELEN) {
-		if (fputs(eol,so)==EOF)
+	if (bio->linelength >= BASELINELEN) {
+		if (fputs(eol,so) == EOF)
 			return -1;
 
 		bio->linelength= 0;
 	}
-
-	if (putc(((unsigned char)c),so)==EOF)
+	if (putc(((unsigned char)c),so) == EOF)
 		return -1;
 
 	bio->linelength++;
-
 	return 1;
 }
 
+/*--- base_encode: Encode voicemail message to base64 MIME email message attachment ---*/
 static int base_encode(char *filename, FILE *so)
 {
 	unsigned char dtable[BASEMAXINLINE];
@@ -1435,33 +1433,33 @@
 	bio.iocp = BASEMAXINLINE;
 
 	if (!(fi = fopen(filename, "rb"))) {
-		ast_log(LOG_WARNING, "Failed to open log file: %s: %s\n", filename, strerror(errno));
+		ast_log(LOG_WARNING, "Failed to open voicemail message file: %s: %s\n", filename, strerror(errno));
 		return -1;
 	}
 
-	for (i= 0;i<9;i++) {
+	for (i= 0; i<9; i++) {
 		dtable[i]= 'A'+i;
 		dtable[i+9]= 'J'+i;
 		dtable[26+i]= 'a'+i;
 		dtable[26+i+9]= 'j'+i;
 	}
-	for (i= 0;i<8;i++) {
+	for (i= 0; i<8; i++) {
 		dtable[i+18]= 'S'+i;
 		dtable[26+i+18]= 's'+i;
 	}
-	for (i= 0;i<10;i++) {
+	for (i= 0; i<10; i++) {
 		dtable[52+i]= '0'+i;
 	}
 	dtable[62]= '+';
 	dtable[63]= '/';
 
-	while (!hiteof){
+	while (!hiteof) {
 		unsigned char igroup[3],ogroup[4];
 		int c,n;
 
 		igroup[0]= igroup[1]= igroup[2]= 0;
 
-		for (n= 0;n<3;n++) {
+		for (n= 0; n<3; n++) {
 			if ((c = inchar(&bio, fi)) == EOF) {
 				hiteof= 1;
 				break;
@@ -1483,12 +1481,12 @@
 					ogroup[2]= '=';
 			}
 
-			for (i= 0;i<4;i++)
+			for (i = 0; i<4 ;i++)
 				ochar(&bio, ogroup[i], so);
 		}
 	}
 
-	if (fputs(eol,so)==EOF)
+	if (fputs(eol,so) == EOF)
 		return 0;
 
 	fclose(fi);
@@ -1499,6 +1497,7 @@
 static void prep_email_sub_vars(struct ast_channel *ast, struct ast_vm_user *vmu, int msgnum, char *mailbox, char *cidnum, char *cidname, char *dur, char *date, char *passdata, size_t passdatasize)
 {
 	char callerid[256];
+
 	/* Prepare variables for substition in email body and subject */
 	pbx_builtin_setvar_helper(ast, "VM_NAME", vmu->fullname);
 	pbx_builtin_setvar_helper(ast, "VM_DUR", dur);
@@ -1526,6 +1525,7 @@
 	time_t t;
 	struct tm tm;
 	struct vm_zone *the_zone = NULL;
+
 	if (vmu && ast_strlen_zero(vmu->email)) {
 		ast_log(LOG_WARNING, "E-mail address missing for mailbox [%s].  E-mail will not be sent.\n", vmu->mailbox);
 		return(0);
@@ -1568,9 +1568,9 @@
 		}
 
 		if (the_zone)
-			ast_localtime(&t,&tm,the_zone->timezone);
+			ast_localtime(&t, &tm, the_zone->timezone);
 		else
-			ast_localtime(&t,&tm,NULL);
+			ast_localtime(&t, &tm, NULL);
 		strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", &tm);
 		fprintf(p, "Date: %s\n", date);
 
@@ -1579,14 +1579,17 @@
 			if (ast) {
 				char *passdata;
 				int vmlen = strlen(fromstring)*3 + 200;
+
 				if ((passdata = alloca(vmlen))) {
 					memset(passdata, 0, vmlen);
-					prep_email_sub_vars(ast,vmu,msgnum + 1,mailbox,cidnum, cidname,dur,date,passdata, vmlen);
-					pbx_substitute_variables_helper(ast,fromstring,passdata,vmlen);
-					fprintf(p, "From: %s <%s>\n",passdata,who);
-				} else ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
+					prep_email_sub_vars(ast, vmu, msgnum + 1, mailbox, cidnum, cidname, dur, date, passdata, vmlen);
+					pbx_substitute_variables_helper(ast, fromstring, passdata, vmlen);
+					fprintf(p, "From: %s <%s>\n", passdata, who);
+				} else 
+					ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
 				ast_channel_free(ast);
-			} else ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
+			} else 
+				ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
 		} else
 			fprintf(p, "From: Asterisk PBX <%s>\n", who);
 		fprintf(p, "To: %s <%s>\n", vmu->fullname, vmu->email);
@@ -1598,14 +1601,15 @@
 				int vmlen = strlen(emailsubject)*3 + 200;
 				if ((passdata = alloca(vmlen))) {
 					memset(passdata, 0, vmlen);
-					prep_email_sub_vars(ast,vmu,msgnum + 1,mailbox,cidnum, cidname,dur,date,passdata, vmlen);
-					pbx_substitute_variables_helper(ast,emailsubject,passdata,vmlen);
-					fprintf(p, "Subject: %s\n",passdata);
-				} else ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
+					prep_email_sub_vars(ast,vmu,msgnum + 1, mailbox, cidnum, cidname, dur, date, passdata, vmlen);
+					pbx_substitute_variables_helper(ast, emailsubject, passdata, vmlen);
+					fprintf(p, "Subject: %s\n", passdata);
+				} else 
+					ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
 				ast_channel_free(ast);
-			} else ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
-		} else
-		if (*emailtitle) {
+			} else 
+				ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
+		} else if (*emailtitle) {
 			fprintf(p, emailtitle, msgnum + 1, mailbox) ;
 			fprintf(p,"\n") ;
 		} else if (ast_test_flag((&globalflags), VM_PBXSKIP))
@@ -1631,12 +1635,14 @@
 				int vmlen = strlen(emailbody)*3 + 200;
 				if ((passdata = alloca(vmlen))) {
 					memset(passdata, 0, vmlen);
-					prep_email_sub_vars(ast,vmu,msgnum + 1,mailbox,cidnum, cidname,dur,date,passdata, vmlen);
+					prep_email_sub_vars(ast, vmu, msgnum + 1, mailbox, cidnum, cidname, dur, date, passdata, vmlen);
 					pbx_substitute_variables_helper(ast,emailbody,passdata,vmlen);
 					fprintf(p, "%s\n",passdata);
-				} else ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
+				} else 
+					ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
 				ast_channel_free(ast);
-			} else ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
+			} else 
+				ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
 		} else {
 			fprintf(p, "Dear %s:\n\n\tJust wanted to let you know you were just left a %s long message (number %d)\n"
 
@@ -1728,13 +1734,14 @@
 				int vmlen = strlen(fromstring)*3 + 200;
 				if ((passdata = alloca(vmlen))) {
 					memset(passdata, 0, vmlen);
-					prep_email_sub_vars(ast,vmu,msgnum + 1,mailbox,cidnum, cidname,dur,date,passdata, vmlen);
-					pbx_substitute_variables_helper(ast,pagerfromstring,passdata,vmlen);
-					fprintf(p, "From: %s <%s>\n",passdata,who);
+					prep_email_sub_vars(ast,vmu,msgnum + 1, mailbox, cidnum, cidname, dur, date, passdata, vmlen);
+					pbx_substitute_variables_helper(ast, pagerfromstring, passdata, vmlen);
+					fprintf(p, "From: %s <%s>\n", passdata, who);
 				} else 
 					ast_log(LOG_WARNING, "Cannot allocate workspace for variable substitution\n");
 				ast_channel_free(ast);
-			} else ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
+			} else 
+				ast_log(LOG_WARNING, "Cannot allocate the channel for variables substitution\n");
 		} else
 			fprintf(p, "From: Asterisk PBX <%s>\n", who);
 		fprintf(p, "To: %s\n", pager);
@@ -2200,29 +2207,29 @@
 				if (txt) {
 					get_date(date, sizeof(date));
 					fprintf(txt, 
-";\n"
-"; Message Information file\n"
-";\n"
-"[message]\n"
-"origmailbox=%s\n"
-"context=%s\n"
-"macrocontext=%s\n"
-"exten=%s\n"
-"priority=%d\n"
-"callerchan=%s\n"
-"callerid=%s\n"
-"origdate=%s\n"
-"origtime=%ld\n"
-"category=%s\n",
-	ext,
-	chan->context,
-	chan->macrocontext, 
-	chan->exten,
-	chan->priority,
-	chan->name,
-	ast_callerid_merge(callerid, sizeof(callerid), chan->cid.cid_name, chan->cid.cid_num, "Unknown"),
-	date, (long)time(NULL),
-	category ? category : "");
+						";\n"
+						"; Message Information file\n"
+						";\n"
+						"[message]\n"
+						"origmailbox=%s\n"
+						"context=%s\n"
+						"macrocontext=%s\n"
+						"exten=%s\n"
+						"priority=%d\n"
+						"callerchan=%s\n"
+						"callerid=%s\n"
+						"origdate=%s\n"
+						"origtime=%ld\n"
+						"category=%s\n",
+						ext,
+						chan->context,
+						chan->macrocontext, 
+						chan->exten,
+						chan->priority,
+						chan->name,
+						ast_callerid_merge(callerid, sizeof(callerid), chan->cid.cid_name, chan->cid.cid_num, "Unknown"),
+						date, (long)time(NULL),
+						category ? category : "");
 					fclose(txt);
 				} else
 					ast_log(LOG_WARNING, "Error opening text file for output\n");
@@ -2272,7 +2279,7 @@
 				res = ast_streamfile(chan, "vm-mailboxfull", chan->language);
 				if (!res)
 					res = ast_waitstream(chan, "");
-				ast_log(LOG_WARNING, "No more messages possible\n");
+				ast_log(LOG_WARNING, "No more messages possible\n for voice mailbox %s", ext);
 			}
 		} else
 			ast_log(LOG_WARNING, "No format for saving voicemail?\n");
@@ -2280,7 +2287,7 @@
 		free_user(vmu);
 	} else {
 		ast_log(LOG_WARNING, "No entry in voicemail config file for '%s'\n", ext);
-		/*Send the call to n+101 priority, where n is the current priority*/
+		/* Send the call to n+101 priority, where n is the current priority */
 		if (ast_exists_extension(chan, chan->context, chan->exten, chan->priority + 101, chan->cid.cid_num))
 			chan->priority+=100;
 	}
@@ -2314,9 +2321,7 @@
 
 static int say_and_wait(struct ast_channel *chan, int num, char *language)
 {
-	int d;
-	d = ast_say_number(chan, num, AST_DIGIT_ANY, language, (char *) NULL);
-	return d;
+	return ast_say_number(chan, num, AST_DIGIT_ANY, language, (char *) NULL);
 }
 
 static int save_to_folder(char *dir, int msg, char *context, char *username, int box)
@@ -2326,10 +2331,11 @@
 	char ddir[256];
 	char *dbox = mbox(box);
 	int x;
+
 	make_file(sfn, sizeof(sfn), dir, msg);
 	make_dir(ddir, sizeof(ddir), context, username, dbox);
 	mkdir(ddir, 0700);
-	for (x=0;x<MAXMSG;x++) {
+	for (x=0; x<MAXMSG; x++) {
 		make_file(dfn, sizeof(dfn), ddir, x);
 		if (!EXISTS(ddir, x, dfn, NULL))
 			break;
@@ -2345,8 +2351,9 @@
 static int adsi_logo(unsigned char *buf)
 {
 	int bytes = 0;
+
 	bytes += adsi_display(buf + bytes, ADSI_COMM_PAGE, 1, ADSI_JUST_CENT, 0, "Comedian Mail", "");
-	bytes += adsi_display(buf + bytes, ADSI_COMM_PAGE, 2, ADSI_JUST_CENT, 0, "(C)2002 LSS, Inc.", "");
+	bytes += adsi_display(buf + bytes, ADSI_COMM_PAGE, 2, ADSI_JUST_CENT, 0, "(C)2002-2004 Digium, Inc.", "");
 	return bytes;
 }
 
@@ -2428,7 +2435,7 @@
 #endif
 
 	bytes = 0;
-	for (x=0;x<5;x++) {
+	for (x=0; x<5; x++) {
 		snprintf(num, sizeof(num), "%d", x);
 		bytes += adsi_load_soft_key(buf + bytes, ADSI_KEY_APPS + 12 + x, mbox(x), mbox(x), num, 1);
 	}
@@ -2505,7 +2512,7 @@
 	if (!adsi_available(chan))
 		return;
 
-	for (x=0;x<8;x++)
+	for (x=0; x<8; x++)
 		keys[x] = 0;
 	/* Set one key for next */
 	keys[3] = ADSI_KEY_APPS + 3;
@@ -2531,7 +2538,7 @@
 	if (!adsi_available(chan))
 		return;
 
-	for (x=0;x<8;x++)
+	for (x=0; x<8; x++)
 		keys[x] = 0;
 	/* Set one key for next */
 	keys[3] = ADSI_KEY_APPS + 3;
@@ -2614,7 +2621,7 @@
 		fclose(f);
 	}
 	/* New meaning for keys */
-	for (x=0;x<5;x++)
+	for (x=0; x<5; x++)
 		keys[x] = ADSI_KEY_SKT | (ADSI_KEY_APPS + 6 + x);
 	keys[6] = 0x0;
 	keys[7] = 0x0;
@@ -2677,7 +2684,7 @@
 		return;
 
 	/* New meaning for keys */
-	for (x=0;x<5;x++)
+	for (x=0; x<5; x++)
 		keys[x] = ADSI_KEY_SKT | (ADSI_KEY_APPS + 6 + x);
 
 	keys[6] = 0x0;
@@ -2741,7 +2748,7 @@
 	bytes += adsi_display(buf + bytes, ADSI_COMM_PAGE, 2, ADSI_JUST_LEFT, 0, buf2, "");
 	bytes += adsi_set_line(buf + bytes, ADSI_COMM_PAGE, 1);
 
-	for (x=0;x<6;x++)
+	for (x=0; x<6; x++)
 		keys[x] = ADSI_KEY_SKT | (ADSI_KEY_APPS + x);
 	keys[6] = 0;
 	keys[7] = 0;
@@ -2797,7 +2804,7 @@
 	
 }
 
-/*
+/* disabled function
 static void adsi_clear(struct ast_channel *chan)
 {
 	char buf[256];
@@ -3094,9 +3101,9 @@
 	if (!extensions || !valid_extensions)
 		return res;
 	vmtmp = extensions;
-	if (flag==1) {
+	if (flag == 1) {
 		/* Send VoiceMail */
-		cmd=leave_voicemail(chan,username,0,0,0);
+		cmd = leave_voicemail(chan, username, 0, 0, 0);
 	} else {
 		/* Forward VoiceMail */
 		cmd = vm_forwardoptions(chan, sender, dir, curmsg, vmfmts, context);
@@ -3129,7 +3136,7 @@
 	
 				/* load the information on the source message so we can send an e-mail like a new message */
 				snprintf(miffile, sizeof(miffile), "%s/msg%04d.txt", dir, curmsg);
-				if ((mif=ast_load(miffile))) {
+				if ((mif = ast_load(miffile))) {
 	
 					/* set callerid and duration variables */
 					snprintf(callerid, sizeof(callerid), "FWD from: %s from %s", sender->fullname, ast_variable_retrieve(mif, NULL, "callerid"));
@@ -3418,7 +3425,6 @@
 	if (!res) {
 		make_file(vms->fn, sizeof(vms->fn), vms->curdir, vms->curmsg);
 		vms->heard[vms->curmsg] = 1;
-		printf("yay!\n");
 		res = wait_file(chan, vms, vms->fn);
 	}
 	DISPOSE(vms->curdir, vms->curmsg);
@@ -3453,7 +3459,7 @@
 	if (vms->lastmsg > -1) { 
 		/* Get the deleted messages fixed */ 
 		vms->curmsg = -1; 
-		for (x=0;x < MAXMSG;x++) { 
+		for (x=0; x < MAXMSG; x++) { 
 			if (!vms->deleted[x] && (strcasecmp(vms->curbox, "INBOX") || !vms->heard[x])) { 
 				/* Save this message.  It's not in INBOX or hasn't been heard */ 
 				make_file(vms->fn, sizeof(vms->fn), vms->curdir, x); 
@@ -4160,22 +4166,22 @@
 		if (cmd)
 			retries = 0;
 		switch (cmd) {
-		case '1':
+		case '1':	/* Record unavailable message */
 			snprintf(prefile,sizeof(prefile),"voicemail/%s/%s/unavail",vmu->context, vms->username);
 			cmd = play_record_review(chan,"vm-rec-unv",prefile, maxgreet, fmtc, 0, vmu, &duration);
 			break;
-		case '2': 
+		case '2': 	/* Record busy message */
 			snprintf(prefile,sizeof(prefile),"voicemail/%s/%s/busy",vmu->context, vms->username);
 			cmd = play_record_review(chan,"vm-rec-busy",prefile, maxgreet, fmtc, 0, vmu, &duration);
 			break;
-		case '3': 
+		case '3': 	/* Record name for dictionnary */
 			snprintf(prefile,sizeof(prefile),"voicemail/%s/%s/greet",vmu->context, vms->username);
 			cmd = play_record_review(chan,"vm-rec-name",prefile, maxgreet, fmtc, 0, vmu, &duration);
 			break;
-		case '4': 
+		case '4': 	/* Record temporary greeting */
 			cmd = vm_tempgreeting(chan, vmu, vms, fmtc);
 			break;
-		case '5':
+		case '5':	/* Change password */
 			if (vmu->password[0] == '-') {
 				cmd = ast_play_and_wait(chan, "vm-no");
 				break;
@@ -4215,7 +4221,7 @@
 			ast_log(LOG_DEBUG,"User %s set password to %s of length %i\n",vms->username,newpassword,(int)strlen(newpassword));
 			cmd = ast_play_and_wait(chan,"vm-passchanged");
 			break;
-		case '*': 
+		case '*': 	/* Exit */
 			cmd = 't';
 			break;
 		default: 
@@ -4233,6 +4239,7 @@
 	return cmd;
 }
 
+
 static int vm_tempgreeting(struct ast_channel *chan, struct ast_vm_user *vmu, struct vm_state *vms, char *fmtc)
 {
 	int cmd = 0;
@@ -4257,15 +4264,15 @@
 			retries = 0;
 		if (ast_fileexists(prefile, NULL, NULL) > 0) {
 			switch (cmd) {
-			case '1':
+			case '1':	/* Record temporary greeting */
 				cmd = play_record_review(chan,"vm-rec-temp",prefile, maxgreet, fmtc, 0, vmu, &duration);
 				break;
-			case '2':
+			case '2':	/* Remove temporary greeting */
 				ast_filedelete(prefile, NULL);
 				ast_play_and_wait(chan,"vm-tempremoved");
 				cmd = 't';	
 				break;
-			case '*': 
+			case '*': 	/* Exit */
 				cmd = 't';
 				break;
 			default:
@@ -4538,13 +4545,11 @@
 		ext = tmp;
 
 		switch (*ext) {
-			case 's':
-		 /* We should skip the user's password */
+			case 's': /* We should skip the user's password */
 				valid++;
 				ext++;
 				break;
-			case 'p':
-		 /* We should prefix the mailbox with the supplied data */
+			case 'p': /* We should prefix the mailbox with the supplied data */
 				prefix++;
 				ext++;
 				break;
@@ -5022,21 +5027,33 @@
 	}
 }
 
+static char voicemail_show_users_help[] =
+"Usage: voicemail show users [for <context>]\n"
+"       Lists all mailboxes currently set up\n";
+
+static char voicemail_show_zones_help[] =
+"Usage: voicemail show zones\n"
+"       Lists configured time zone message formats\n";
+
 static char show_voicemail_users_help[] =
 "Usage: show voicemail users [for <context>]\n"
-"       Lists all mailboxes currently set up\n";
+"       Lists all mailboxes currently set up\n"
+"       This command is replaced by \"voicemail show users\"\n";
 
 static char show_voicemail_zones_help[] =
 "Usage: show voicemail zones\n"
-"       Lists zone message formats\n";
+"       Lists configured time zone message formats\n"
+"       This command is replaced by \"voicemail show zones\"\n";
 
 static int handle_show_voicemail_users(int fd, int argc, char *argv[])
 {
 	struct ast_vm_user *vmu = users;
 	char *output_format = "%-10s %-5s %-25s %-10s %6s\n";
 
-	if ((argc < 3) || (argc > 5) || (argc == 4)) return RESULT_SHOWUSAGE;
-	else if ((argc == 5) && strcmp(argv[3],"for")) return RESULT_SHOWUSAGE;
+	if ((argc < 3) || (argc > 5) || (argc == 4)) 
+		return RESULT_SHOWUSAGE;
+	else if ((argc == 5) && strcmp(argv[3],"for")) 
+		return RESULT_SHOWUSAGE;
 
 	if (vmu) {
 		if (argc == 3)
@@ -5134,15 +5151,28 @@
 }
 
 static struct ast_cli_entry show_voicemail_users_cli =
-	{ { "show", "voicemail", "users", NULL },
+	{ { "voicemail", "show", "users", NULL },
 	handle_show_voicemail_users, "List defined voicemail boxes",
-	show_voicemail_users_help, complete_show_voicemail_users };
+	voicemail_show_users_help, complete_show_voicemail_users };
 
 static struct ast_cli_entry show_voicemail_zones_cli =
-	{ { "show", "voicemail", "zones", NULL },
+	{ { "voicemail", "show", "zones", NULL },
 	handle_show_voicemail_zones, "List zone message formats",
+	voicemail_show_zones_help, NULL };
+
+/* The old form, to be deleted in coming versions */
+static struct ast_cli_entry old_show_voicemail_users_cli =
+	{ { "show", "voicemail", "users", NULL },
+	handle_show_voicemail_users, "Old command syntax. See \"voicemail show users\"",
+	show_voicemail_users_help, complete_show_voicemail_users };
+
+/* The old form, to be deleted in coming versions */
+static struct ast_cli_entry old_show_voicemail_zones_cli =
+	{ { "show", "voicemail", "zones", NULL },
+	handle_show_voicemail_zones, "Old command syntax. See \"voicemail show zones\"",
 	show_voicemail_zones_help, NULL };
 
+/*--- load_config: Load voicemail configuration (voicemail.conf) */
 static int load_config(void)
 {
 	struct ast_vm_user *cur, *l;
@@ -5535,6 +5565,8 @@
 	res |= ast_unregister_application(app4);
 	ast_cli_unregister(&show_voicemail_users_cli);
 	ast_cli_unregister(&show_voicemail_zones_cli);
+	ast_cli_unregister(&old_show_voicemail_users_cli);
+	ast_cli_unregister(&old_show_voicemail_zones_cli);
 	ast_uninstall_vm_functions();
 	return res;
 }
@@ -5549,12 +5581,18 @@
 	if (res)
 		return(res);
 
-	if ((res=load_config())) {
+	if ((res = load_config())) {
 		return(res);
 	}
 
 	ast_cli_register(&show_voicemail_users_cli);
 	ast_cli_register(&show_voicemail_zones_cli);
+	ast_cli_register(&old_show_voicemail_users_cli);
+	ast_cli_register(&old_show_voicemail_zones_cli);
+	/* Hide the old version of the commands from the
+	   help listings in the CLI */
+	old_show_voicemail_users_cli.hidden = 1;
+	old_show_voicemail_zones_cli.hidden = 1;
 
 	ast_install_vm_functions(has_voicemail, messagecount);
 
@@ -5573,7 +5611,8 @@
 	int retries = 0;
 
 	if (!num) {
-		ast_verbose( VERBOSE_PREFIX_3 "Destination number will be entered manually\n");
+		if (option_verbose > 2)
+			ast_verbose( VERBOSE_PREFIX_3 "Destination number will be entered manually\n");
 		while (retries < 3 && cmd != 't') {
 			destination[1] = '\0';
 			destination[0] = cmd = ast_play_and_wait(chan,"vm-enter-num-to-call");
@@ -5607,14 +5646,16 @@
 		}
 		
 	} else {
-		ast_verbose( VERBOSE_PREFIX_3 "Destination number is CID number '%s'\n", num);
+		if (option_verbose > 2)
+			ast_verbose( VERBOSE_PREFIX_3 "Destination number is CID number '%s'\n", num);
 		strncpy(destination, num, sizeof(destination) -1);
 	}
 
 	if (!ast_strlen_zero(destination)) {
 		if (destination[strlen(destination) -1 ] == '*')
 			return 0; 
-		ast_verbose( VERBOSE_PREFIX_3 "Placing outgoing call to extension '%s' in context '%s' from context '%s'\n", destination, outgoing_context, chan->context);
+		if (option_verbose > 2)
+			ast_verbose( VERBOSE_PREFIX_3 "Placing outgoing call to extension '%s' in context '%s' from context '%s'\n", destination, outgoing_context, chan->context);
 		strncpy(chan->exten, destination, sizeof(chan->exten) - 1);
 		strncpy(chan->context, outgoing_context, sizeof(chan->context) - 1);
 		chan->priority = 0;
@@ -5649,7 +5690,7 @@
 	cid = ast_variable_retrieve(msg_cfg, "message", "callerid");
 
 	context = ast_variable_retrieve(msg_cfg, "message", "context");
-	if (!strncasecmp("macro",context,5)) /* Macro names in contexts are useless for our needs */
+	if (!strncasecmp("macro", context, 5)) /* Macro names in contexts are useless for our needs */
 		context = ast_variable_retrieve(msg_cfg, "message","macrocontext");
 
 	if (option == 3) {
@@ -5731,33 +5772,35 @@
 							res = 't';
 							break; 
 
-						}
+					}
 					if (res == 't')
 						res = 0;
 					else if (res == '*')
 						res = -1;
-				}
-			}
+			}	/* End switch */
+		}
 
-	}
-	else if (option == 1) { /* Reply */
+	} else if (option == 1) { /* Reply */
 		/* Send reply directly to sender */
 		if (!ast_strlen_zero(cid)) {
 			ast_callerid_parse(cid, &name, &num);
 			if (!num) {
-				ast_verbose(VERBOSE_PREFIX_3 "No CID number available, no reply sent\n");
+				if (option_verbose > 2)
+					ast_verbose(VERBOSE_PREFIX_3 "No CID number available, no reply sent\n");
 				if (!res)
 					res = ast_play_and_wait(chan, "vm-nonumber");
 				return res;
 			} else {
 				if (find_user(NULL, vmu->context, num)) {
-					ast_verbose(VERBOSE_PREFIX_3 "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context);
+					if (option_verbose > 2)
+						ast_verbose(VERBOSE_PREFIX_3 "Leaving voicemail for '%s' in context '%s'\n", num, vmu->context);
 					leave_voicemail(chan, num, 1, 0, 1);
 					res = 't';
 					return res;
 				} else {
 					/* Sender has no mailbox, can't reply */
-					ast_verbose( VERBOSE_PREFIX_3 "No mailbox number '%s' in context '%s', no reply sent\n", num, vmu->context);
+					if (option_verbose > 2)
+						ast_verbose( VERBOSE_PREFIX_3 "No mailbox number '%s' in context '%s', no reply sent\n", num, vmu->context);
 					ast_play_and_wait(chan, "vm-nobox");
 					res = 't';
 					return res;
@@ -5784,9 +5827,9 @@
 
  
  
+/*--- play_record_review: Record message & let caller review or re-record it, or set options if applicable */
 static int play_record_review(struct ast_channel *chan, char *playfile, char *recordfile, int maxtime, char *fmt, int outsidecaller, struct ast_vm_user *vmu, int *duration)
 {
-	/* Record message & let caller review or re-record it, or set options if applicable */
  	int res = 0;
  	int cmd = 0;
  	int max_attempts = 3;
@@ -5812,7 +5855,8 @@
  				break;
  			} else {
  				/* Otherwise 1 is to save the existing message */
- 				ast_verbose(VERBOSE_PREFIX_3 "Saving message as is\n");
+				if (option_verbose > 2)
+ 					ast_verbose(VERBOSE_PREFIX_3 "Saving message as is\n");
  				ast_streamfile(chan, "vm-msgsaved", chan->language);
  				ast_waitstream(chan, "");
 				STORE(recordfile, -1);
@@ -5822,17 +5866,20 @@
  			}
  		case '2':
  			/* Review */
- 			ast_verbose(VERBOSE_PREFIX_3 "Reviewing the message\n");
+			if (option_verbose > 2)
+ 				ast_verbose(VERBOSE_PREFIX_3 "Reviewing the message\n");
  			ast_streamfile(chan, recordfile, chan->language);
  			cmd = ast_waitstream(chan, AST_DIGIT_ANY);
  			break;
  		case '3':
  			message_exists = 0;
  			/* Record */
- 			if (recorded == 1)
-				ast_verbose(VERBOSE_PREFIX_3 "Re-recording the message\n");
- 			else	
-				ast_verbose(VERBOSE_PREFIX_3 "Recording the message\n");
+			if (option_verbose > 2) {
+ 				if (recorded == 1)
+					ast_verbose(VERBOSE_PREFIX_3 "Re-recording the message\n");
+ 				else	
+					ast_verbose(VERBOSE_PREFIX_3 "Recording the message\n");
+			}
 			if (recorded && outsidecaller) {
  				cmd = ast_play_and_wait(chan, INTRO);
  				cmd = ast_play_and_wait(chan, "beep");
@@ -5852,14 +5899,16 @@
 #if 0			
  			else if (vmu->review && (*duration < 5)) {
  				/* Message is too short */
- 				ast_verbose(VERBOSE_PREFIX_3 "Message too short\n");
+				if (option_verbose > 2) {
+ 					ast_verbose(VERBOSE_PREFIX_3 "Message too short\n");
 				cmd = ast_play_and_wait(chan, "vm-tooshort");
  				cmd = vm_delete(recordfile);
  				break;
  			}
  			else if (vmu->review && (cmd == 2 && *duration < (maxsilence + 3))) {
  				/* Message is all silence */
- 				ast_verbose(VERBOSE_PREFIX_3 "Nothing recorded\n");
+				if (option_verbose > 2) {
+ 					ast_verbose(VERBOSE_PREFIX_3 "Nothing recorded\n");
  				cmd = vm_delete(recordfile);
 				cmd = ast_play_and_wait(chan, "vm-nothingrecorded");
 				if (!cmd)