summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorTilghman Lesher <tilghman@meg.abyt.es>2009-12-03 22:13:56 +0000
committerTilghman Lesher <tilghman@meg.abyt.es>2009-12-03 22:13:56 +0000
commit8599628e0be2734372e042b4db6307ab24967501 (patch)
treeb14dc1803b8cf32f2d23eccd84b610467428cb60 /apps
parentd75ebf8afcb9312749dc379d4188fcabefbb88a8 (diff)
Add pagerdateformat, to allow shorter dates for SMS messages.
(closes issue #16263) Reported by: andrew Patches: pagerdate.patch uploaded by andrew (license 240) (with a slight modification by me) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@232916 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'apps')
-rw-r--r--apps/app_voicemail.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index fa1da49be..eb3769d7b 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -833,6 +833,7 @@ static unsigned char adsifdn[4] = "\x00\x00\x00\x0F";
static unsigned char adsisec[4] = "\x9B\xDB\xF7\xAC";
static int adsiver = 1;
static char emaildateformat[32] = "%A, %B %d, %Y at %r";
+static char pagerdateformat[32] = "%A, %B %d, %Y at %r";
/* Forward declarations - generic */
static int open_mailbox(struct vm_state *vms, struct ast_vm_user *vmu, int box);
@@ -4565,6 +4566,9 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
ast_strftime(date, sizeof(date), "%a, %d %b %Y %H:%M:%S %z", vmu_tm(vmu, &tm));
fprintf(p, "Date: %s\n", date);
+ /* Reformat for custom pager format */
+ ast_strftime(date, sizeof(date), pagerdateformat, vmu_tm(vmu, &tm));
+
if (!ast_strlen_zero(pagerfromstring)) {
struct ast_channel *ast;
if ((ast = ast_dummy_channel_alloc())) {
@@ -4642,7 +4646,6 @@ static int sendpage(char *srcemail, char *pager, int msgnum, char *context, char
}
}
- ast_strftime(date, sizeof(date), "%A, %B %d, %Y at %r", &tm);
if (pagerbody) {
struct ast_channel *ast;
if ((ast = ast_dummy_channel_alloc())) {
@@ -10783,6 +10786,11 @@ static int load_config(int reload)
ast_copy_string(emaildateformat, val, sizeof(emaildateformat));
}
+ /* Load date format config for voicemail pager mail */
+ if ((val = ast_variable_retrieve(cfg, "general", "pagerdateformat"))) {
+ ast_copy_string(pagerdateformat, val, sizeof(pagerdateformat));
+ }
+
/* External password changing command */
if ((val = ast_variable_retrieve(cfg, "general", "externpass"))) {
ast_copy_string(ext_pass_cmd, val, sizeof(ext_pass_cmd));