@ -643,7 +643,7 @@ static AST_LIST_HEAD_STATIC(vmstates, vmstate);
# define VM_FORCENAME (1 << 7) /*!< Have new users record their name */
# define VM_FORCEGREET (1 << 8) /*!< Have new users record their greetings */
# define VM_PBXSKIP (1 << 9) /*!< Skip the [PBX] preamble in the Subject line of emails */
# define VM_DIREC FORWARD (1 << 10) /*!< Permit caller to use the Directory app for selecting to which mailbox to forward a VM */
# define VM_DIREC T FORWARD (1 << 10) /*!< Permit caller to use the Directory app for selecting to which mailbox to forward a VM */
# define VM_ATTACH (1 << 11) /*!< Attach message to voicemail notifications? */
# define VM_DELETE (1 << 12) /*!< Delete message after sending notification */
# define VM_ALLOCED (1 << 13) /*!< Structure was malloc'ed, instead of placed in a return (usually static) buffer */
@ -3129,7 +3129,7 @@ static int init_mailstream(struct vm_state *vms, int box)
ast_mutex_lock ( & vms - > lock ) ;
ast_mutex_lock ( & mail_open_lock ) ;
vms - > mailstream = mail_open ( stream , tmp , debug ? OP_DEBUG : NIL ) ;
/* Create the folder if it do sn't exist */
/* Create the folder if it do e sn't exist */
if ( vms - > mailstream & & ! mail_status ( vms - > mailstream , tmp , SA_UIDNEXT ) ) {
mail_create ( vms - > mailstream , tmp ) ;
}
@ -5192,7 +5192,7 @@ static const char *ast_str_encode_mime(struct ast_str **end, ssize_t maxlen, con
* \ param imap if = = 1 , indicates the target folder for the email notification to be sent to will be an IMAP mailstore . This causes additional mailbox headers to be set , which would facilitate searching for the email in the destination IMAP folder .
* \ param flag , msg_id
*
* The email body , and base 64 encoded attach e ment ( if any ) are stored to the file identified by * p . This method does not actually send the email . That is done by invoking the configure ' mailcmd ' and piping this generated file into it , or with the sendemail ( ) function .
* The email body , and base 64 encoded attach ment ( if any ) are stored to the file identified by * p . This method does not actually send the email . That is done by invoking the configure ' mailcmd ' and piping this generated file into it , or with the sendemail ( ) function .
*/
static void make_email_file ( FILE * p ,
char * srcemail ,
@ -7358,7 +7358,7 @@ static int save_to_folder(struct ast_vm_user *vmu, struct vm_state *vms, int msg
/* get the current mailbox so that we can point the mailstream back to it later */
curr_mbox = get_folder_by_name ( vms - > curbox ) ;
/* Create the folder if it do sn't exist */
/* Create the folder if it do e sn't exist */
imap_mailbox_name ( mailbox , sizeof ( mailbox ) , vms , box , 1 ) ; /* Get the full mailbox name */
if ( vms - > mailstream & & ! mail_status ( vms - > mailstream , mailbox , SA_UIDNEXT ) ) {
if ( mail_create ( vms - > mailstream , mailbox ) ! = NIL ) {
@ -7477,7 +7477,7 @@ static int adsi_load_vmail(struct ast_channel *chan, int *useadsi)
bytes = 0 ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 0 , " Listen " , " Listen " , " 1 " , 1 ) ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 1 , " Folder " , " Folder " , " 2 " , 1 ) ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 2 , " Advanced " , " Adv nced" , " 3 " , 1 ) ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 2 , " Advanced " , " Adv a nced" , " 3 " , 1 ) ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 3 , " Options " , " Options " , " 0 " , 1 ) ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 4 , " Help " , " Help " , " * " , 1 ) ;
bytes + = ast_adsi_load_soft_key ( buf + bytes , ADSI_KEY_APPS + 5 , " Exit " , " Exit " , " # " , 1 ) ;
@ -8419,7 +8419,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
ast_test_suite_event_notify ( " FORWARD " , " Message: entering forward message menu " ) ;
while ( ! res & & ! valid_extensions ) {
int use_directory = 0 ;
if ( ast_test_flag ( ( & globalflags ) , VM_DIREC FORWARD) ) {
if ( ast_test_flag ( ( & globalflags ) , VM_DIREC T FORWARD) ) {
int done = 0 ;
int retries = 0 ;
cmd = 0 ;
@ -8488,7 +8488,7 @@ static int forward_message(struct ast_channel *chan, char *context, struct vm_st
ast_channel_priority_set ( chan , old_priority ) ;
} else {
ast_log ( AST_LOG_WARNING , " Could not find the Directory application, disabling directory_forward \n " ) ;
ast_clear_flag ( ( & globalflags ) , VM_DIREC FORWARD) ;
ast_clear_flag ( ( & globalflags ) , VM_DIREC T FORWARD) ;
}
} else {
/* Ask for an extension */
@ -8812,7 +8812,7 @@ static int play_message_datetime(struct ast_channel *chan, struct ast_vm_user *v
res = ast_say_date_with_format ( chan , t , AST_DIGIT_ANY , ast_channel_language ( chan ) , " 'vm-received' Q 'digits/at' HM " , NULL ) ;
} else if ( ! strncasecmp ( ast_channel_language ( chan ) , " pl " , 2 ) ) { /* POLISH syntax */
res = ast_say_date_with_format ( chan , t , AST_DIGIT_ANY , ast_channel_language ( chan ) , " 'vm-received' Q HM " , NULL ) ;
} else if ( ! strncasecmp ( ast_channel_language ( chan ) , " pt_BR " , 5 ) ) { /* Brazil l ian PORTUGUESE syntax */
} else if ( ! strncasecmp ( ast_channel_language ( chan ) , " pt_BR " , 5 ) ) { /* Brazil ian PORTUGUESE syntax */
res = ast_say_date_with_format ( chan , t , AST_DIGIT_ANY , ast_channel_language ( chan ) , " 'vm-received' Ad 'digits/pt-de' B 'digits/pt-de' Y 'digits/pt-as' HM " , NULL ) ;
} else if ( ! strncasecmp ( ast_channel_language ( chan ) , " se " , 2 ) ) { /* SWEDISH syntax */
res = ast_say_date_with_format ( chan , t , AST_DIGIT_ANY , ast_channel_language ( chan ) , " 'vm-received' dB 'digits/at' k 'and' M " , NULL ) ;
@ -9552,9 +9552,9 @@ static int vm_intro_gr(struct ast_channel *chan, struct vm_state *vms)
* on vm - message .
* 3 ) Call ast_say_counted_adjective ( ) to put the proper gender and number
* prefix on vm - new and vm - old ( none for English ) .
* 4 ) Pass the gender of the language ' s word for " message " as an a gument to
* 4 ) Pass the gender of the language ' s word for " message " as an a r gument to
* this function which is can in turn pass on to the functions which
* say numbers and put endings on noun d s and adjectives .
* say numbers and put endings on noun s and adjectives .
*
* All languages require these messages :
* vm - youhave " You have... "
@ -12645,7 +12645,7 @@ AST_TEST_DEFINE(test_voicemail_vmuser)
res = 1 ;
}
if ( strcasecmp ( vmu - > attachfmt , " wav49 " ) ) {
ast_test_status_update ( test , " Parse failure for attachf t m option\n " ) ;
ast_test_status_update ( test , " Parse failure for attachf mt option\n " ) ;
res = 1 ;
}
if ( strcasecmp ( vmu - > fromstring , " Voicemail System " ) ) {
@ -14480,7 +14480,7 @@ static int actual_load_config(int reload, struct ast_config *cfg, struct ast_con
if ( ! ( val = ast_variable_retrieve ( cfg , " general " , " usedirectory " ) ) )
val = " no " ;
ast_set2_flag ( ( & globalflags ) , ast_true ( val ) , VM_DIREC FORWARD) ;
ast_set2_flag ( ( & globalflags ) , ast_true ( val ) , VM_DIREC T FORWARD) ;
if ( ! ( val = ast_variable_retrieve ( cfg , " general " , " passwordlocation " ) ) ) {
val = " voicemail.conf " ;
@ -15986,7 +15986,7 @@ static int play_record_review(struct ast_channel *chan, char *playfile, char *re
}
return cmd ;
default :
/* If the caller is an ou side caller and the review option is enabled or it's forward intro
/* If the caller is an ou t side caller and the review option is enabled or it's forward intro
allow them to review the message , but let the owner of the box review
their OGM ' s */
if ( outsidecaller & & ! ast_test_flag ( vmu , VM_REVIEW ) & & ! forwardintro )
Josh Soref
4 years ago
committed by
Joshua Colp