[asterisk-commits] oej: branch oej/minivoicemail r58434 - /team/oej/minivoicemail/apps/app_minivm.c

[asterisk-commits at lists.digium.com]

Author: oej
Date: Thu Mar  8 11:54:27 2007
New Revision: 58434

URL: http://svn.digium.com/view/asterisk?view=rev&rev=58434
Log:
Bug fixing

Modified:
    team/oej/minivoicemail/apps/app_minivm.c

Modified: team/oej/minivoicemail/apps/app_minivm.c
URL: http://svn.digium.com/view/asterisk/team/oej/minivoicemail/apps/app_minivm.c?view=diff&rev=58434&r1=58433&r2=58434
==============================================================================
--- team/oej/minivoicemail/apps/app_minivm.c (original)
+++ team/oej/minivoicemail/apps/app_minivm.c Thu Mar  8 11:54:27 2007
@@ -990,10 +990,14 @@
 	/* Find email address to use */
 	/* If there's a server e-mail adress in the account, user that, othterwise template */
 	fromemail = ast_strlen_zero(vmu->serveremail) ?  template->serveremail : vmu->serveremail;
+
 	/* Find name to user for server e-mail */
 	fromaddress = ast_strlen_zero(template->fromaddress) ? "" : template->fromaddress;
 
 	/* If needed, add hostname as domain */
+	if (ast_strlen_zero(fromemail))
+		fromemail = "asterisk";
+
 	if (strchr(fromemail, '@'))
 		ast_copy_string(who, fromemail, sizeof(who));
 	else  {
@@ -1023,7 +1027,7 @@
 		}
 	} 
 	if (option_debug > 3)
-		ast_log(LOG_DEBUG, "-_-_- Fromstring now: %s\n", passdata);
+		ast_log(LOG_DEBUG, "-_-_- Fromstring now: %s\n", ast_strlen_zero(passdata) ? "-default-" : passdata);
 
 	len_passdata = strlen(vmu->fullname) * 2 + 3;
 	passdata2 = alloca(len_passdata);
@@ -1049,6 +1053,8 @@
 	}
 
 
+	if (option_debug > 2)
+		fprintf(p, "X-Asterisk-debug: template %s user account %s@%s\n", template->name, vmu->username, vmu->domain);
 	fprintf(p, "Message-ID: <Asterisk-%d-%s-%d-%s>\n", (unsigned int)rand(), vmu->username, getpid(), who);
 	fprintf(p, "MIME-Version: 1.0\n");