kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 02:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 244243 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r244243 | tilghman | 2010-02-01 17:16:12 -0600 (Mon, 01 Feb 2010) | 18 lines
  
  Merged revisions 244242 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r244242 | tilghman | 2010-02-01 17:13:44 -0600 (Mon, 01 Feb 2010) | 11 lines
    
    Backup and restore original textfile, for prosthesis (gerund of prepend).
    
    Also, fix menuselect such that changing voicemail build options correctly
    causes rebuild.
    
    (closes issue #16415)
     Reported by: tomo1657
     Patches: 
           prepention.patch uploaded by tomo1657 (license 484)
           (with modifications by me to backport to 1.4)
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@244307 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2010-02-01 23:31:04 +00:00
parent 8fef380860
commit 5cc28284e4
1 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
apps/app_voicemail.c
View File

@@ -6172,7 +6172,7 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
#endif
int cmd = 0;
int retries = 0, prepend_duration = 0, already_recorded = 0;
char msgfile[PATH_MAX], backup[PATH_MAX];
char msgfile[PATH_MAX], backup[PATH_MAX], backup_textfile[PATH_MAX];
char textfile[PATH_MAX];
struct ast_config *msg_cfg;
struct ast_flags config_flags = { CONFIG_FLAG_NOCACHE };
@@ -6185,8 +6185,10 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
make_file(msgfile, sizeof(msgfile), curdir, curmsg);
strcpy(textfile, msgfile);
strcpy(backup, msgfile);
strcpy(backup_textfile, msgfile);
strncat(textfile, ".txt", sizeof(textfile) - strlen(textfile) - 1);
strncat(backup, "-bak", sizeof(backup) - strlen(backup) - 1);
strncat(backup_textfile, "-bak.txt", sizeof(backup_textfile) - strlen(backup_textfile) - 1);
if ((msg_cfg = ast_config_load(textfile, config_flags)) && (duration_str = ast_variable_retrieve(msg_cfg, "message", "duration"))) {
*duration = atoi(duration_str);
@@ -6223,11 +6225,15 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
break;
}
/* Back up the original file, so we can retry the prepend */
if (already_recorded)
/* Back up the original file, so we can retry the prepend and restore it after forward. */
if (already_recorded) {
ast_filecopy(backup, msgfile, NULL);
else
copy(backup_textfile, textfile);
}
else {
ast_filecopy(msgfile, backup, NULL);
copy(textfile,backup_textfile);
}
already_recorded = 1;
if (record_gain)
@@ -6283,11 +6289,15 @@ static int vm_forwardoptions(struct ast_channel *chan, struct ast_vm_user *vmu,
if (msg_cfg)
ast_config_destroy(msg_cfg);
if (already_recorded)
ast_filedelete(backup, NULL);
if (prepend_duration)
*duration = prepend_duration;
if (already_recorded && cmd == -1) {
/* restore original message if prepention cancelled */
ast_filerename(backup, msgfile, NULL);
rename(backup_textfile, textfile);
}
if (cmd == 't' || cmd == 'S')
cmd = 0;
return cmd;
@@ -6449,7 +6459,9 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
int curmsg;
char urgent_str[7] = "";
char tmptxtfile[PATH_MAX];
#ifndef IMAP_STORAGE
char msgfile[PATH_MAX], textfile[PATH_MAX], backup[PATH_MAX], backup_textfile[PATH_MAX];
#endif
if (ast_test_flag((&globalflags), VM_FWDURGAUTO)) {
ast_copy_string(urgent_str, urgent ? "Urgent" : "", sizeof(urgent_str));
}
@@ -6658,6 +6670,20 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
#endif
res = ast_play_and_wait(chan, "vm-msgsaved");
}
#ifndef IMAP_STORAGE
/* Restore original message without prepended message if backup exists */
make_file(msgfile, sizeof(msgfile), dir, curmsg);
strcpy(textfile, msgfile);
strcpy(backup, msgfile);
strcpy(backup_textfile, msgfile);
strncat(textfile, ".txt", sizeof(textfile) - strlen(textfile) - 1);
strncat(backup, "-bak", sizeof(backup) - strlen(backup) - 1);
strncat(backup_textfile, "-bak.txt", sizeof(backup_textfile) - strlen(backup_textfile) - 1);
if (ast_fileexists(backup, NULL, NULL) > 0) {
ast_filerename(backup, msgfile, NULL);
rename(backup_textfile, textfile);
}
#endif
}
DISPOSE(dir, curmsg);
}