October 2007 - Freeswitch-svn - FreeSWITCH Mailing Lists

[commit] r5956 - in freeswitch/trunk: conf src/mod/endpoints/mod_sofia
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Wed Oct 17 21:02:01 2007 New Revision: 5956 Modified: freeswitch/trunk/conf/sofia.conf.xml freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Log: experimental multiple registrations in sofia conf <param name="multiple-registrations" value="true"/> in dialplan <action application="bridge" data="$sofia_contact(mysofia_profile_name/user(a)regtodomain.com)"/> or <action application="bridge" data="$sofia_contact(mysofia_profile_name_same_as_regto_domain.com/user)"/> or <action application="bridge" data="$sofia_contact(user(a)mysofia_profile_name_same_as_regto_domain.com)"/> Modified: freeswitch/trunk/conf/sofia.conf.xml ============================================================================== --- freeswitch/trunk/conf/sofia.conf.xml (original) +++ freeswitch/trunk/conf/sofia.conf.xml Wed Oct 17 21:02:01 2007 @@ -54,6 +54,7 @@ <param name="sip-ip" value="$${local_ip_v4}"/>  <param name="manage-presence" value="true"/> +   <param name="inbound-codec-negotiation" value="generous"/>  Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c Wed Oct 17 21:02:01 2007 @@ -1248,6 +1248,96 @@ return SWITCH_STATUS_SUCCESS; } +static int contact_callback(void *pArg, int argc, char **argv, char **columnNames) +{ + struct cb_helper *cb = (struct cb_helper *) pArg; + char *contact; + + if (!switch_strlen_zero(argv[0]) && (contact = sofia_glue_get_url_from_contact(argv[0], 1))) { + cb->stream->write_function(cb->stream, "sofia/%s/%s,", cb->profile->name, contact + 4); + free(contact); + } + + return 0; +} + +SWITCH_STANDARD_API(sofia_contact_function) +{ + char *data; + char *user = NULL; + char *domain = NULL; + char *profile_name = NULL; + char *p; + + if (!cmd) { + stream->write_function(stream, "%s", ""); + return SWITCH_STATUS_SUCCESS; + } + + data = strdup(cmd); + assert(data); + + if ((p = strchr(data, '/'))) { + profile_name = data; + *p++ = '\0'; + user = p; + } else { + user = data; + } + + if ((domain = strchr(user, '@'))) { + *domain++ = '\0'; + } + + if (!profile_name && domain) { + profile_name = domain; + } + + if (user && profile_name) { + char *sql; + sofia_profile_t *profile; + + if (!(profile = sofia_glue_find_profile(profile_name))) { + profile_name = domain; + domain = NULL; + } + + if (!profile && profile_name) { + profile = sofia_glue_find_profile(profile_name); + } + + if (profile) { + struct cb_helper cb; + switch_stream_handle_t mystream = { 0 }; + if (!domain || !strchr(domain, '.')) { + domain = profile->name; + } + + SWITCH_STANDARD_STREAM(mystream); + cb.profile = profile; + cb.stream = &mystream; + + sql = switch_mprintf("select contact from sip_registrations where user='%q' and host='%q'", user, domain); + assert(sql); + sofia_glue_execute_sql_callback(profile, SWITCH_FALSE, profile->ireg_mutex, sql, contact_callback, &cb); + switch_safe_free(sql); + if (mystream.data) { + char *str = mystream.data; + *(str + (strlen(str) - 1)) = '\0'; + } + stream->write_function(stream, "%s", mystream.data); + switch_safe_free(mystream.data); + goto end; + } + } + + stream->write_function(stream, "%s", ""); + end: + + switch_safe_free(data); + return SWITCH_STATUS_SUCCESS; +} + SWITCH_STANDARD_API(sofia_function) { char *argv[1024] = { 0 }; @@ -1589,6 +1679,7 @@ management_interface->management_function = sofia_manage; SWITCH_ADD_API(api_interface, "sofia", "Sofia Controls", sofia_function, "<cmd> <args>"); + SWITCH_ADD_API(api_interface, "sofia_contact", "Sofia Contacts", sofia_contact_function, "[profile/]<user>@<domain>"); SWITCH_ADD_CHAT(chat_interface, SOFIA_CHAT_PROTO, sofia_presence_chat_send); /* indicate that the module should continue to be loaded */ Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.h Wed Oct 17 21:02:01 2007 @@ -112,7 +112,8 @@ PFLAG_REWRITE_TIMESTAMPS = (1 << 7), PFLAG_RUNNING = (1 << 8), PFLAG_RESPAWN = (1 << 9), - PFLAG_GREEDY = (1 << 10) + PFLAG_GREEDY = (1 << 10), + PFLAG_MULTIREG = (1 << 11) } PFLAGS; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c Wed Oct 17 21:02:01 2007 @@ -260,7 +260,8 @@ long expires = (long) time(NULL) + atol(exp_str); char *profile_name = switch_event_get_header(event, "orig-profile-name"); sofia_profile_t *profile = NULL; - char buf[512]; + char *icontact = NULL, *p; + if (!rpid) { rpid = "unknown"; @@ -270,26 +271,33 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile\n"); return; } - - - if (!sofia_reg_find_reg_url(profile, from_user, from_host, buf, sizeof(buf))) { - sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','Regestered', '%q', %ld)", - from_user, from_host, contact_str, rpid, expires); + if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { + icontact = sofia_glue_get_url_from_contact(contact_str, 1); + + if ((p = strchr(icontact, ';'))) { + *p = '\0'; + } + sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q' and contact like '%%%q%%'", from_user, from_host, icontact); + switch_safe_free(icontact); } else { - sql = - switch_mprintf - ("update sip_registrations set contact='%q', rpid='%q', expires=%ld where user='%q' and host='%q'", - contact_str, rpid, expires, from_user, from_host); - + sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", from_user, from_host); } + switch_mutex_lock(profile->ireg_mutex); + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); + switch_safe_free(sql); + + sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','Regestered', '%q', %ld)", + from_user, from_host, contact_str, rpid, expires); + if (sql) { - sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); switch_safe_free(sql); sql = NULL; switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Propagating registration for %s@%s->%s\n", from_user, from_host, contact_str); - } + switch_mutex_unlock(profile->ireg_mutex); + if (profile) { sofia_glue_release_profile(profile); @@ -844,6 +852,10 @@ if (switch_true(val)) { profile->pflags |= PFLAG_PRESENCE; } + } else if (!strcasecmp(var, "multiple-registrations")) { + if (switch_true(val)) { + profile->pflags |= PFLAG_MULTIREG; + } } else if (!strcasecmp(var, "NDLB-to-in-200-contact")) { if (switch_true(val)) { profile->ndlb |= PFLAG_NDLB_TO_IN_200_CONTACT; Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c ============================================================================== --- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (original) +++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c Wed Oct 17 21:02:01 2007 @@ -329,7 +329,7 @@ const char *to_user = NULL; const char *to_host = NULL; char contact_str[1024] = ""; - char buf[512]; + //char buf[512]; uint8_t stale = 0, forbidden = 0; auth_res_t auth_res; long exptime = 60; @@ -461,16 +461,32 @@ } if (exptime) { - if (!sofia_reg_find_reg_url(profile, to_user, to_host, buf, sizeof(buf))) { - sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','%q', '%q', %ld)", - to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", rpid, (long) time(NULL) + (long) exptime * 2); + + if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { + char *icontact, *p; + icontact = sofia_glue_get_url_from_contact(contact_str, 1); + if ((p = strchr(icontact, ';'))) { + *p = '\0'; + } + + sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact); + switch_safe_free(icontact); } else { - sql = - switch_mprintf - ("update sip_registrations set contact='%q', expires=%ld, rpid='%q' where user='%q' and host='%q'", - contact_str, (long) time(NULL) + (long) exptime * 2, rpid, to_user, to_host); + sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", to_user, to_host); + } + switch_mutex_lock(profile->ireg_mutex); + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); + switch_safe_free(sql); + sql = switch_mprintf("insert into sip_registrations values ('%q','%q','%q','%q', '%q', %ld)", + to_user, to_host, contact_str, cd ? "Registered(NATHACK)" : "Registered", rpid, (long) time(NULL) + (long) exptime * 2); + + if (sql) { + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, NULL); + switch_safe_free(sql); + sql = NULL; } + switch_mutex_unlock(profile->ireg_mutex); if (switch_event_create_subclass(&s_event, SWITCH_EVENT_CUSTOM, MY_EVENT_REGISTER) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(s_event, SWITCH_STACK_BOTTOM, "profile-name", "%s", profile->name); @@ -482,11 +498,7 @@ switch_event_fire(&s_event); } - if (sql) { - sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); - switch_safe_free(sql); - sql = NULL; - } + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Register:\nFrom: [%s@%s]\nContact: [%s]\nExpires: [%ld]\n", to_user, to_host, contact_str, (long) exptime); @@ -503,15 +515,36 @@ switch_event_fire(&event); } } else { - if ((sql = switch_mprintf("delete from sip_subscriptions where user='%q' and host='%q'", to_user, to_host))) { - sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); - switch_safe_free(sql); - sql = NULL; - } - if ((sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", to_user, to_host))) { - sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); - switch_safe_free(sql); - sql = NULL; + if (sofia_test_pflag(profile, PFLAG_MULTIREG)) { + char *icontact, *p; + icontact = sofia_glue_get_url_from_contact(contact_str, 1); + if ((p = strchr(icontact, ';'))) { + *p = '\0'; + } + if ((sql = switch_mprintf("delete from sip_subscriptions where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact))) { + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + switch_safe_free(sql); + sql = NULL; + } + + if ((sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q' and contact like '%%%q%%'", to_user, to_host, icontact))) { + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + switch_safe_free(sql); + sql = NULL; + } + switch_safe_free(icontact); + } else { + if ((sql = switch_mprintf("delete from sip_subscriptions where user='%q' and host='%q'", to_user, to_host))) { + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + switch_safe_free(sql); + sql = NULL; + } + + if ((sql = switch_mprintf("delete from sip_registrations where user='%q' and host='%q'", to_user, to_host))) { + sofia_glue_execute_sql(profile, SWITCH_FALSE, sql, profile->ireg_mutex); + switch_safe_free(sql); + sql = NULL; + } } if (switch_event_create(&event, SWITCH_EVENT_PRESENCE_OUT) == SWITCH_STATUS_SUCCESS) { switch_event_add_header(event, SWITCH_STACK_BOTTOM, "proto", "sip");

1 0

[commit] r5955 - freeswitch/trunk/src
by Freeswitch SVN 18 Oct '07

18 Oct '07

Author: anthm Date: Wed Oct 17 20:10:48 2007 New Revision: 5955 Modified: freeswitch/trunk/src/switch_odbc.c Log: umm, duh Modified: freeswitch/trunk/src/switch_odbc.c ============================================================================== --- freeswitch/trunk/src/switch_odbc.c (original) +++ freeswitch/trunk/src/switch_odbc.c Wed Oct 17 20:10:48 2007 @@ -305,7 +305,7 @@ { SQLHSTMT stmt = NULL; SQLSMALLINT c = 0, x = 0; - SQLINTEGER m = 0; + SQLINTEGER m = 0, t = 0; int result; assert(callback != NULL); @@ -333,43 +333,47 @@ SQLRowCount(stmt, &m); if (m > 0) { - int name_len = 256; - char **names; - char **vals; - int y = 0; + for (t = 0; t < m; t++) { + int name_len = 256; + char **names; + char **vals; + int y = 0; - if (!(result = SQLFetch(stmt)) == SQL_SUCCESS) { - goto error; - } - - names = calloc(c, sizeof(*names)); - vals = calloc(c, sizeof(*names)); + if (!(result = SQLFetch(stmt)) == SQL_SUCCESS) { + goto error; + } - assert(names && vals); + names = calloc(c, sizeof(*names)); + vals = calloc(c, sizeof(*vals)); - for (x = 1; x <= c; x++) { - SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; - SQLUINTEGER ColumnSize; - names[y] = malloc(name_len); - memset(names[y], 0, name_len); - - SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT)name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); - ColumnSize++; - - vals[y] = malloc(ColumnSize); - memset(vals[y], 0, ColumnSize); - SQLGetData(stmt, x, SQL_C_CHAR, (SQLCHAR *) vals[y], ColumnSize, NULL); - y++; - } - - callback(pdata, y, vals, names); + assert(names && vals); - for (x = 0; x < y; x++) { - free(names[x]); - free(vals[x]); + for (x = 1; x <= c; x++) { + SQLSMALLINT NameLength, DataType, DecimalDigits, Nullable; + SQLUINTEGER ColumnSize; + names[y] = malloc(name_len); + memset(names[y], 0, name_len); + + SQLDescribeCol(stmt, x, (SQLCHAR *) names[y], (SQLSMALLINT)name_len, &NameLength, &DataType, &ColumnSize, &DecimalDigits, &Nullable); + ColumnSize++; + + vals[y] = malloc(ColumnSize); + memset(vals[y], 0, ColumnSize); + SQLGetData(stmt, x, SQL_C_CHAR, (SQLCHAR *) vals[y], ColumnSize, NULL); + y++; + } + + if (callback(pdata, y, vals, names)) { + break; + } + + for (x = 0; x < y; x++) { + free(names[x]); + free(vals[x]); + } + free(names); + free(vals); } - free(names); - free(vals); } SQLFreeHandle(SQL_HANDLE_STMT, stmt);

1 0

[commit] r5954 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 18:37:11 2007 New Revision: 5954 Modified: freeswitch/trunk/docs/phrase/phrase_de.xml Log: pesky utf-8 thanks juanjoc Modified: freeswitch/trunk/docs/phrase/phrase_de.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_de.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_de.xml Wed Oct 17 18:37:11 2007 @@ -38,7 +38,7 @@ <prompt phrase="Punkt" filename="46.wav"/> <prompt phrase="Anton" filename="97.wav"/> <prompt phrase="Berta" filename="98.wav"/> - <prompt phrase="C�sar" filename="99.wav"/> + <prompt phrase="Cäsar" filename="99.wav"/> <prompt phrase="Dora" filename="100.wav"/> <prompt phrase="Emil" filename="101.wav"/> <prompt phrase="Friedrich" filename="102.wav"/> @@ -63,9 +63,9 @@ <prompt phrase="Ypsilon" filename="121.wav"/> <prompt phrase="Zacharias" filename="122.wav"/>  - <prompt phrase="�rger" filename="200.wav"/> - <prompt phrase="�konom" filename="201.wav"/> - <prompt phrase="�bermut" filename="202.wav"/> + <prompt phrase="Ärger" filename="200.wav"/> + <prompt phrase="Ökonom" filename="201.wav"/> + <prompt phrase="Übermut" filename="202.wav"/> <prompt phrase="Eszet" filename="203.wav"/> </phonetic-ascii> <digits> @@ -74,17 +74,17 @@ <prompt phrase="Zwei" filename="2.wav"/> <prompt phrase="Drei" filename="3.wav"/> <prompt phrase="Vier" filename="4.wav"/> - <prompt phrase="F�nf" filename="5.wav"/> + <prompt phrase="Fünf" filename="5.wav"/> <prompt phrase="Sechs" filename="6.wav"/> <prompt phrase="Sieben" filename="7.wav"/> <prompt phrase="Acht" filename="8.wav"/> <prompt phrase="Neun" filename="9.wav"/> <prompt phrase="Zehn" filename="10.wav"/> <prompt phrase="Elf" filename="11.wav"/> - <prompt phrase="Zw�lf" filename="12.wav"/> + <prompt phrase="Zwölf" filename="12.wav"/> <prompt phrase="Dreizehn" filename="13.wav"/> <prompt phrase="Vierzehn" filename="14.wav"/> - <prompt phrase="F�nfzehn" filename="15.wav"/> + <prompt phrase="Fünfzehn" filename="15.wav"/> <prompt phrase="Sechzehn" filename="16.wav"/> <prompt phrase="Siebzehn" filename="17.wav"/> <prompt phrase="Achtzehn" filename="18.wav"/> @@ -92,7 +92,7 @@ <prompt phrase="Zwanzig" filename="20.wav"/> <prompt phrase="Dreissig" filename="30.wav"/> <prompt phrase="Vierzig" filename="40.wav"/> - <prompt phrase="F�nfzig" filename="50.wav"/> + <prompt phrase="Fünfzig" filename="50.wav"/> <prompt phrase="Sechzig" filename="60.wav"/> <prompt phrase="Siebzig" filename="70.wav"/> <prompt phrase="Achtzig" filename="80.wav"/> @@ -102,17 +102,17 @@ <prompt phrase="Zweites" filename="h-2.wav"/> <prompt phrase="Drittes" filename="h-3.wav"/> <prompt phrase="Viertes" filename="h-4.wav"/> - <prompt phrase="F�nftes" filename="h-5.wav"/> + <prompt phrase="Fünftes" filename="h-5.wav"/> <prompt phrase="Sechstes" filename="h-6.wav"/> <prompt phrase="Siebtes" filename="h-7.wav"/> <prompt phrase="Achtes" filename="h-8.wav"/> <prompt phrase="Neuntes" filename="h-9.wav"/> <prompt phrase="Zehntes" filename="h-10.wav"/> <prompt phrase="Elftes" filename="h-11.wav"/> - <prompt phrase="Zw�lftes" filename="h-12.wav"/> + <prompt phrase="Zwölftes" filename="h-12.wav"/> <prompt phrase="Dreizehntes" filename="h-13.wav"/> <prompt phrase="Vierzehntes" filename="h-14.wav"/> - <prompt phrase="F�nfzehntes" filename="h-15.wav"/> + <prompt phrase="Fünfzehntes" filename="h-15.wav"/> <prompt phrase="Sechzehntes" filename="h-16.wav"/> <prompt phrase="Siebzehntes" filename="h-17.wav"/> <prompt phrase="Achtzehntes" filename="h-18.wav"/> @@ -155,7 +155,7 @@ <prompt phrase="Minuten" filename="minutes.wav"/> <prompt phrase="Januar" filename="mon-0.wav"/> <prompt phrase="Febuar" filename="mon-1.wav"/> - <prompt phrase="M�rz" filename="mon-2.wav"/> + <prompt phrase="März" filename="mon-2.wav"/> <prompt phrase="April" filename="mon-3.wav"/> <prompt phrase="Mai" filename="mon-4.wav"/> <prompt phrase="Juni" filename="mon-5.wav"/> @@ -181,41 +181,41 @@ <prompt phrase="Benutzerdaten falsch" filename="vm-fail_auth.wav"/> <prompt phrase="Willkommen in Ihrem Postfach" filename="vm-hello.wav"/> <prompt phrase="Auf Wiedersehen" filename="vm-goodbye.wav"/> - <prompt phrase="Sagen Sie Ihren Namen nach dem Ton, dr�cken Sie eine beliebige Taste oder h�ren Sie auf zu sprechen um die Aufnahme zu beenden." filename="vm-record_name1.wav"/> - <prompt phrase="W�hlen Sie eine Ansage zwischen 1 und 3" filename="vm-choose_greeting.wav"/> - <prompt phrase="Ung�ltige Eingabe" filename="vm-choose_greeting_fail.wav"/> + <prompt phrase="Sagen Sie Ihren Namen nach dem Ton, drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden." filename="vm-record_name1.wav"/> + <prompt phrase="Wählen Sie eine Ansage zwischen 1 und 3" filename="vm-choose_greeting.wav"/> + <prompt phrase="Ungültige Eingabe" filename="vm-choose_greeting_fail.wav"/> <prompt phrase="Zu viele Fehlversuche" filename="vm-abort.wav"/> - <prompt phrase="Sprechen Sie nach dem Ton. Dr�cken Sie eine beliebige Taste oder h�ren Sie auf zu sprechen um die Aufnahme zu beenden" filename="vm-record_greeting.wav"/> - <prompt phrase="Sprechen Sie nach dem Ton. Dr�cken Sie eine beliebige Taste oder h�ren Sie auf zu sprechen um die Aufnahme zu beenden" filename="vm-record_message.wav"/> - <prompt phrase="ist nicht verf�gbar" filename="vm-play_greeting.wav"/> + <prompt phrase="Sprechen Sie nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden" filename="vm-record_greeting.wav"/> + <prompt phrase="Sprechen Sie nach dem Ton. Drücken Sie eine beliebige Taste oder hören Sie auf zu sprechen um die Aufnahme zu beenden" filename="vm-record_message.wav"/> + <prompt phrase="ist nicht verfügbar" filename="vm-play_greeting.wav"/> <prompt phrase="dringend, neu" filename="vm-urgent-new.wav"/> <prompt phrase="neu" filename="vm-new.wav"/> <prompt phrase="dringend, gespeichert" filename="vm-urgent-saved.wav"/> <prompt phrase="gespeichert" filename="vm-saved.wav"/> <prompt phrase="Nachricht" filename="vm-message.wav"/> <prompt phrase="Nachrichten" filename="vm-messages.wav"/> - <prompt phrase="dr�cken Sie" filename="vm-press.wav"/> - <prompt phrase="zum anh�ren neuer Nachrichten" filename="vm-listen_new.wav"/> - <prompt phrase="zum anh�ren gespeicherter Nachrichten" filename="vm-listen_saved.wav"/> - <prompt phrase="f�r erweiterte Optionen" filename="vm-advanced.wav"/> + <prompt phrase="drücken Sie" filename="vm-press.wav"/> + <prompt phrase="zum anhören neuer Nachrichten" filename="vm-listen_new.wav"/> + <prompt phrase="zum anhören gespeicherter Nachrichten" filename="vm-listen_saved.wav"/> + <prompt phrase="für erweiterte Optionen" filename="vm-advanced.wav"/> <prompt phrase="zum verlassen" filename="vm-to_exit.wav"/> <prompt phrase="zum aufnehmen einer Ansage" filename="vm-record_greeting.wav"/> - <prompt phrase="zum ausw�hlen einer Ansage" filename="vm-choose_greeting.wav"/> + <prompt phrase="zum auswählen einer Ansage" filename="vm-choose_greeting.wav"/> <prompt phrase="zum aufnehmen Ihres Namens" filename="vm-record_name2.wav"/> - <prompt phrase="f�r das Hauptmen�" filename="vm-main_menu.wav"/> - <prompt phrase="zum anh�ren dieser Nachricht" filename="vm-listen_to_recording.wav"/> + <prompt phrase="für das Hauptmenü" filename="vm-main_menu.wav"/> + <prompt phrase="zum anhören dieser Nachricht" filename="vm-listen_to_recording.wav"/> <prompt phrase="zum speichern der Nachricht" filename="vm-save_recording.wav"/> <prompt phrase="zum erneuten Aufnehmen" filename="vm-rerecord.wav"/> <prompt phrase="um diese Nachricht als dringen zu markieren" filename="vm-mark_urgent.wav"/> <prompt phrase="zum Fortfahren" filename="vm-continue.wav"/> - <prompt phrase="zum erneuten anh�ren dieser Nachricht" filename="vm-listen_to_recording_again.wav"/> - <prompt phrase="zum l�schen dieser Nachricht" filename="vm-delete_recording.wav"/> + <prompt phrase="zum erneuten anhören dieser Nachricht" filename="vm-listen_to_recording_again.wav"/> + <prompt phrase="zum löschen dieser Nachricht" filename="vm-delete_recording.wav"/> <prompt phrase="um diese Nachricht an Ihre EMailadresse weiter zu leiten" filename="vm-forward_to_email.wav"/> <prompt phrase="Ansage" filename="vm-greeting.wav"/> - <prompt phrase="ausgew�hlt" filename="vm-selected.wav"/> - <prompt phrase="ist nicht verf�gbar" filename="vm-not_avaliable.wav"/> + <prompt phrase="ausgewählt" filename="vm-selected.wav"/> + <prompt phrase="ist nicht verfügbar" filename="vm-not_avaliable.wav"/> <prompt phrase="Nachricht nummer" filename="vm-message_number.wav"/> - <prompt phrase="gel�scht" filename="vm-deleted.wav"/> + <prompt phrase="gelöscht" filename="vm-deleted.wav"/> </voicemail> </de> </language>

1 0

[commit] r5953 - freeswitch/trunk/docs/phrase
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 18:30:02 2007 New Revision: 5953 Modified: freeswitch/trunk/docs/phrase/phrase_fr.xml Log: pesky utf-8 thanks juanjoc Modified: freeswitch/trunk/docs/phrase/phrase_fr.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_fr.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_fr.xml Wed Oct 17 18:30:02 2007 @@ -94,30 +94,30 @@ <prompt phrase="Point" filename="dot.wav"/> <prompt phrase="Premier" filename="h-1.wav"/> <prompt phrase="Second" filename="h-2.wav"/> - <prompt phrase="Troisi�me" filename="h-3.wav"/> - <prompt phrase="Quatri�me" filename="h-4.wav"/> - <prompt phrase="Cinqui�me" filename="h-5.wav"/> - <prompt phrase="Sixi�me" filename="h-6.wav"/> - <prompt phrase="Septi�me" filename="h-7.wav"/> - <prompt phrase="Huiti�me" filename="h-8.wav"/> - <prompt phrase="Neuvi�me" filename="h-9.wav"/> - <prompt phrase="Dixi�me" filename="h-10.wav"/> - <prompt phrase="Onzi�me" filename="h-11.wav"/> - <prompt phrase="Douxi�me" filename="h-12.wav"/> - <prompt phrase="Treizi�me" filename="h-13.wav"/> - <prompt phrase="Quatorzi�me" filename="h-14.wav"/> - <prompt phrase="Quinzi�me" filename="h-15.wav"/> - <prompt phrase="Seizi�me" filename="h-16.wav"/> - <prompt phrase="Dix Sepi�me" filename="h-17.wav"/> - <prompt phrase="Dix Huiti�me" filename="h-18.wav"/> - <prompt phrase="Dix Neuvi�me" filename="h-19.wav"/> - <prompt phrase="Vingti�me" filename="h-20.wav"/> - <prompt phrase="Trenti�me" filename="h-30.wav"/> - <prompt phrase="Quaranti�me" filename="hundred.wav"/> + <prompt phrase="Troisième" filename="h-3.wav"/> + <prompt phrase="Quatrième" filename="h-4.wav"/> + <prompt phrase="Cinquième" filename="h-5.wav"/> + <prompt phrase="Sixième" filename="h-6.wav"/> + <prompt phrase="Septième" filename="h-7.wav"/> + <prompt phrase="Huitième" filename="h-8.wav"/> + <prompt phrase="Neuvième" filename="h-9.wav"/> + <prompt phrase="Dixième" filename="h-10.wav"/> + <prompt phrase="Onzième" filename="h-11.wav"/> + <prompt phrase="Douxième" filename="h-12.wav"/> + <prompt phrase="Treizième" filename="h-13.wav"/> + <prompt phrase="Quatorzième" filename="h-14.wav"/> + <prompt phrase="Quinzième" filename="h-15.wav"/> + <prompt phrase="Seizième" filename="h-16.wav"/> + <prompt phrase="Dix Sepième" filename="h-17.wav"/> + <prompt phrase="Dix Huitième" filename="h-18.wav"/> + <prompt phrase="Dix Neuvième" filename="h-19.wav"/> + <prompt phrase="Vingtième" filename="h-20.wav"/> + <prompt phrase="Trentième" filename="h-30.wav"/> + <prompt phrase="Quarantième" filename="hundred.wav"/> <prompt phrase="Million" filename="million.wav"/> <prompt phrase="Point Final" filename="period.wav"/> <prompt phrase="Point" filename="point.wav"/> - <prompt phrase="Di�ze" filename="pound.wav"/> + <prompt phrase="Dièze" filename="pound.wav"/> <prompt phrase="Etoile" filename="star.wav"/> <prompt phrase="Cent" filename="thousand.wav"/> </digits> @@ -173,7 +173,7 @@ <prompt phrase="Identification incorrecte" filename="vm-fail_auth.wav"/> <prompt phrase="Bienvenue dans votre boite aux lettres" filename="vm-hello.wav"/> <prompt phrase="Aurevoir" filename="vm-goodbye.wav"/> - <prompt phrase="Trops de tentatives �chou�es" filename="vm-abort.wav"/> + <prompt phrase="Trops de tentatives échouées" filename="vm-abort.wav"/> <prompt phrase="au bip, enregistrez votre nom, puis appuyez sur une touche ou arretez de parler jusqu'a la fin de l'enregistrement." filename="vm-record_name1.wav"/> <prompt phrase="Choisissez un message d'accueil entre 1 et 3" filename="vm-choose_greeting.wav"/> <prompt phrase="Valeur incorrecte" filename="vm-choose_greeting_fail.wav"/> @@ -183,30 +183,30 @@ <prompt phrase="Nouvelle importante" filename="vm-urgent-new.wav"/> <prompt phrase="Nouveau" filename="vm-new.wav"/> <prompt phrase="Enregistrement Urgent" filename="vm-urgent-saved.wav"/> - <prompt phrase="Enregistr�" filename="vm-saved.wav"/> + <prompt phrase="Enregistré" filename="vm-saved.wav"/> <prompt phrase="message" filename="vm-message.wav"/> <prompt phrase="messages" filename="vm-messages.wav"/> <prompt phrase="Appuyez" filename="vm-press.wav"/> - <prompt phrase="Pour �couter les nouveaux messages" filename="vm-listen_new.wav"/> - <prompt phrase="Pour �couter les messages enregistr�s" filename="vm-listen_saved.wav"/> - <prompt phrase="Pour les options avanc�es" filename="vm-advanced.wav"/> + <prompt phrase="Pour écouter les nouveaux messages" filename="vm-listen_new.wav"/> + <prompt phrase="Pour écouter les messages enregistrés" filename="vm-listen_saved.wav"/> + <prompt phrase="Pour les options avancées" filename="vm-advanced.wav"/> <prompt phrase="Pour terminer" filename="vm-to_exit.wav"/> <prompt phrase="Pour enregistrer un message d'accueil" filename="vm-record_greeting.wav"/> <prompt phrase="Pour choisir un message d'acceuil" filename="vm-choose_greeting.wav"/> <prompt phrase="Pour enregistrer votre nom" filename="vm-record_name2.wav"/> <prompt phrase="Pour le menu principale" filename="vm-main_menu.wav"/> - <prompt phrase="Pour �couter l'enregistrement" filename="vm-listen_to_recording.wav"/> + <prompt phrase="Pour écouter l'enregistrement" filename="vm-listen_to_recording.wav"/> <prompt phrase="Pour sauvegarder votre enregistrement" filename="vm-save_recording.wav"/> - <prompt phrase="Pour r�enregistrer" filename="vm-rerecord.wav"/> + <prompt phrase="Pour réenregistrer" filename="vm-rerecord.wav"/> <prompt phrase="Pour signaler ce message en tant qu'urgent ou" filename="vm-mark_urgent.wav"/> <prompt phrase="pour continuer" filename="vm-continue.wav"/> - <prompt phrase="pour r��couter l'enregistrement de nouveau" filename="vm-listen_to_recording_again.wav"/> + <prompt phrase="pour réÂécouter l'enregistrement de nouveau" filename="vm-listen_to_recording_again.wav"/> <prompt phrase="pour effacer l'enregistrement" filename="vm-delete_recording.wav"/> - <prompt phrase="Pour transf�rer l'enregistrement vers votre boite mail" filename="vm-forward_to_email.wav"/> + <prompt phrase="Pour transférer l'enregistrement vers votre boite mail" filename="vm-forward_to_email.wav"/> <prompt phrase="Message d'accueil" filename="vm-greeting.wav"/> <prompt phrase="Choisissez" filename="vm-selected.wav"/> <prompt phrase="N'est pas disponible" filename="vm-not_avaliable.wav"/> - <prompt phrase="message num�ro" filename="vm-message_number.wav"/> + <prompt phrase="message numéro" filename="vm-message_number.wav"/> </voicemail> </fr> </language> \ No newline at end of file

1 0

[commit] r5952 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 18:24:29 2007 New Revision: 5952 Modified: freeswitch/trunk/conf/ivr.conf.xml Log: update for new default configs Modified: freeswitch/trunk/conf/ivr.conf.xml ============================================================================== --- freeswitch/trunk/conf/ivr.conf.xml (original) +++ freeswitch/trunk/conf/ivr.conf.xml Wed Oct 17 18:24:29 2007 @@ -1,39 +1,40 @@ <configuration name="ivr.conf" description="IVR menus"> <menus> - <menu name="main" - greet-long="/soundfiles/greet-long.wav" - greet-short="/soundfiles/greet-short.wav" - invalid-sound="/soundfiles/invalid.wav" - exit-sound="/soundfiles/exit.wav" timeout ="15" max-failures="3"> + <menu name="demo" + greet-long="soundfiles/ivr/demo/greet-long.wav" + greet-short="soundfiles/ivr/demo/greet-short.wav" + invalid-sound="soundfiles/ivr/invalid.wav" + exit-sound="soundfiles/ivr/exit.wav" timeout ="15" + max-failures="3"> <entry action="menu-exit" digits="*"/> - <entry action="menu-sub" digits="2" param="menu2"/> - <entry action="menu-exec-api" digits="3" param="api arg"/> - <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/> - <entry action="menu-back" digits="5"/> - <entry action="menu-call-transfer" digits="7" param="888"/> + <entry action="menu-play-sound" digits="1" params="soundfiles/features.wav"/> + <entry action="menu-sub" digits="2" param="demo2"/> + <entry action="menu-exec-api" digits="3" param="bridge sofia/$${domain}/888(a)conference.freeswtich.org"/> + <entry action="menu-call-transfer" digits="4" param="888"/> <entry action="menu-sub" digits="8" param="menu8"/> </menu> - <menu name="menu8" - greet-long="/soundfiles/greet-long.wav" - greet-short="/soundfiles/greet-short.wav" - invalid-sound="/soundfiles/invalid.wav" - exit-sound="/soundfiles/exit.wav" - timeout ="15" - max-failures="3"> + + <menu name="demo2" + greet-long="soundfiles/ivr/demo2/greet-long.wav" + greet-short="soundfiles/ivr/demo2/greet-short.wav" + invalid-sound="soundfiles/ivr/invalid.wav" + exit-sound="soundfiles/ivr/exit.wav" + timeout ="15" + max-failures="3"> <entry action="menu-back" digits="#"/> - <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/> <entry action="menu-top" digits="*"/> </menu> - <menu name="menu2" - greet-long="/soundfiles/greet-long.wav" - greet-short="/soundfiles/greet-short.wav" - invalid-sound="/soundfiles/invalid.wav" - exit-sound="/soundfiles/exit.wav" - timeout ="15" - max-failures="3"> + + <menu name="menu8" + greet-long="/soundfiles/ivr/menu8/greet-long.wav" + greet-short="/soundfiles/ivr/menu8/greet-short.wav" + invalid-sound="/soundfiles/ivr/menu8/invalid.wav" + exit-sound="/soundfiles/ivr/menu8/exit.wav" + timeout ="15" + max-failures="3"> <entry action="menu-back" digits="#"/> - <entry action="menu-play-sound" digits="4" param="/soundfiles/4.wav"/> + <entry action="menu-play-sound" digits="4" param="soundfiles/4.wav"/> <entry action="menu-top" digits="*"/> </menu> </menus> -</configuration> +</configuration>

1 0

[commit] r5951 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 18:22:58 2007 New Revision: 5951 Added: freeswitch/trunk/conf/default_context.xml freeswitch/trunk/conf/default_context_old.xml - copied unchanged from r5947, /freeswitch/trunk/conf/default_context.xml Log: move new config in and old one for backup Added: freeswitch/trunk/conf/default_context.xml ============================================================================== --- (empty file) +++ freeswitch/trunk/conf/default_context.xml Wed Oct 17 18:22:58 2007 @@ -0,0 +1,91 @@ +<context name="default"> +  + <extension name="Local_Extension"> + <condition field="destination_number" expression="^(10[01][0-9])$" continue="on-true"> + <action application="set" data="dialed_ext=$1"/> + </condition> + <condition field="destination_number" expression="^${caller_id_number}$"> + <action application="set" data="voicemail_authorized=${sip_authorized}"/> + <action application="voicemail" data="check default $${domain} ${dialed_ext}"/> + <anti-action application="set" data="call_timeout=30000"/> + <anti-action application="set" data="hangup_after_bridge=true"/> + <anti-actino application="set" data="continue_on_fail=true"/> + <anti-action application="bridge" data="sofia/$${domain}/${dialed_ext}"/> + <anti-action application="voicemail" data="default $${domain} ${dialed_ext}"/> + </condition> + </extension> + +  + <extension name="Conferences"> + <condition field="destination_number" expression="^(3\d{3})$"> + <action application="conference" data="$1@default"/> + </condition> + </extension> + +  + <extension name="FS_Conf_IAX"> + <condition field="destination_number" expression="^888$"> + <action application="bridge" data="iax/guest(a)conference.freeswitch.org/888"/> + </condition> + </extension> + +  + <extension name="FWD"> + <condition field="destination_number" expression="^\*393([\*\d]+)$"> +  + <action application="export" data="rtp_disable_vad_out=true"/> + <action application="export" data="absolute_codec_string=PCMU@20i,PCMA@20i"/> + <action application="bridge" data="sofia/gateway/fwd/$1"/> + </condition> + </extension> + +  + <extension name="IVR_Demo"> + <condition field="destination_number" expression="5000"> + <action application="ivr" data="demo"/> + </condition> + </extension> + + +  + <extension name="park"> + <condition field="destination_number" expression="^5900$"> + <action application="fifo" data="default in undef soundfiles/swimp.raw"/> + </condition> + </extension> + + <extension name="unpark"> + <condition field="destination_number" expression="^5901$"> + <action application="answer"/> + <action application="fifo" data="default out nowait"/> + </condition> + </extension> + +  +  +</context>

1 0

[commit] r5950 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 18:01:23 2007 New Revision: 5950 Modified: freeswitch/trunk/conf/voicemail_de_tts.xml Log: update, thanks stkn Modified: freeswitch/trunk/conf/voicemail_de_tts.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_de_tts.xml (original) +++ freeswitch/trunk/conf/voicemail_de_tts.xml Wed Oct 17 18:01:23 2007 @@ -48,14 +48,13 @@ </macro> <macro name="voicemail_message_count"> - <input pattern="^([^:]+):([^:]+):{0,1}(.*)"> + <input pattern="^1:(.*)$"> + <match> + <action function="speak-text" data="Sie haben 1 $2 Nachricht im Ordner ${voicemail_current_folder}."/> + </match> + </input> + <input pattern="^([0,2-9]+):(.*)$"> <match> - <action function="speak-text" data="Sie haben $1 $2 Nachrichten im Ordner ${voicemail_current_folder}."/> </match> </input>

1 0

[commit] r5949 - in freeswitch/trunk: conf docs/phrase
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 17:38:00 2007 New Revision: 5949 Modified: freeswitch/trunk/conf/voicemail_en.xml freeswitch/trunk/docs/phrase/phrase_en.xml Log: tweak Modified: freeswitch/trunk/conf/voicemail_en.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en.xml (original) +++ freeswitch/trunk/conf/voicemail_en.xml Wed Oct 17 17:38:00 2007 @@ -56,6 +56,7 @@ <action function="say" data="1" method="pronounced" type="items"/> <action function="play-file" data="voicemail/vm-$1.wav"/> <action function="play-file" data="voicemail/vm-message.wav"/> + <action function="play-file" data="voicemail/vm-in_folder.wav"/> </match> </input> <input pattern="^([0,2-9]+):(.*)$"> @@ -64,6 +65,7 @@ <action function="say" data="$1" method="pronounced" type="items"/> <action function="play-file" data="voicemail/vm-$1.wav"/> <action function="play-file" data="voicemail/vm-messages.wav"/> + <action function="play-file" data="voicemail/vm-in_folder.wav"/> </match> </input> </macro> Modified: freeswitch/trunk/docs/phrase/phrase_en.xml ============================================================================== --- freeswitch/trunk/docs/phrase/phrase_en.xml (original) +++ freeswitch/trunk/docs/phrase/phrase_en.xml Wed Oct 17 17:38:00 2007 @@ -209,6 +209,7 @@ <prompt phrase="is not available" filename="vm-not_avaliable.wav"/> <prompt phrase="message number" filename="vm-message_number.wav"/> <prompt phrase="deleted" filename="vm-deleted.wav"/> + <prompt phrase="in folder inbox" filename="vm-in_folder.wav"/> </voicemail> </en> </language>

1 0

[commit] r5948 - freeswitch/trunk/conf
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: brian Date: Wed Oct 17 17:36:51 2007 New Revision: 5948 Modified: freeswitch/trunk/conf/voicemail_en.xml Log: update message_count macro for new method Modified: freeswitch/trunk/conf/voicemail_en.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en.xml (original) +++ freeswitch/trunk/conf/voicemail_en.xml Wed Oct 17 17:36:51 2007 @@ -50,12 +50,20 @@ </macro> <macro name="voicemail_message_count"> - <input pattern="^([^:]+):([^:]+):{0,1}(.*)"> + <input pattern="^1:(.*)$"> + <match> + <action function="play-file" data="voicemail/vm-you_have.wav"/> + <action function="say" data="1" method="pronounced" type="items"/> + <action function="play-file" data="voicemail/vm-$1.wav"/> + <action function="play-file" data="voicemail/vm-message.wav"/> + </match> + </input> + <input pattern="^([0,2-9]+):(.*)$"> <match> <action function="play-file" data="voicemail/vm-you_have.wav"/> <action function="say" data="$1" method="pronounced" type="items"/> - <action function="play-file" data="voicemail/vm-$2.wav"/>  - <action function="play-file" data="voicemail/vm-message$3.wav"/>  + <action function="play-file" data="voicemail/vm-$1.wav"/> + <action function="play-file" data="voicemail/vm-messages.wav"/> </match> </input> </macro>

1 0

[commit] r5947 - in freeswitch/trunk: conf src/mod/applications/mod_voicemail
by Freeswitch SVN 17 Oct '07

17 Oct '07

Author: anthm Date: Wed Oct 17 17:26:33 2007 New Revision: 5947 Modified: freeswitch/trunk/conf/voicemail_en_tts.xml freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Log: update Modified: freeswitch/trunk/conf/voicemail_en_tts.xml ============================================================================== --- freeswitch/trunk/conf/voicemail_en_tts.xml (original) +++ freeswitch/trunk/conf/voicemail_en_tts.xml Wed Oct 17 17:26:33 2007 @@ -48,9 +48,14 @@ </macro> <macro name="voicemail_message_count"> - <input pattern="^([^:]+):([^:]+):{0,1}(.*)"> + <input pattern="^1:(.*)$"> <match> - <action function="speak-text" data="you have $1 $2 message$3 in folder ${voicemail_current_folder}."/> + <action function="speak-text" data="you have 1 $1 message in folder ${voicemail_current_folder}."/> + </match> + </input> + <input pattern="^([0,2-9]+):(.*)$"> + <match> + <action function="speak-text" data="you have $1 $2 messages in folder ${voicemail_current_folder}."/> </match> </input> </macro> Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Wed Oct 17 17:26:33 2007 @@ -1038,17 +1038,17 @@ &total_new_urgent_messages, &total_saved_urgent_messages); if (total_new_urgent_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:urgent-new:%s", total_new_urgent_messages, total_new_urgent_messages == 1 ? "" : "s"); + snprintf(msg_count, sizeof(msg_count), "%d:urgent-new", total_new_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } - if (total_new_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:new:%s", total_new_messages, total_new_messages == 1 ? "" : "s"); + if (total_new_messages > 0 && total_new_messages != total_new_urgent_messages) { + snprintf(msg_count, sizeof(msg_count), "%d:new", total_new_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } - if (!heard_auto_new && total_new_messages > 0) { + if (!heard_auto_new && total_new_messages + total_new_urgent_messages> 0) { heard_auto_new = 1; play_msg_type = MSG_NEW; vm_check_state = VM_CHECK_PLAY_MESSAGES; @@ -1056,18 +1056,18 @@ } if (total_saved_urgent_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved:%s", total_saved_urgent_messages, total_saved_urgent_messages == 1 ? "" : "s"); + snprintf(msg_count, sizeof(msg_count), "%d:urgent-saved", total_saved_urgent_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } - if (total_saved_messages > 0) { - snprintf(msg_count, sizeof(msg_count), "%d:saved:%s", total_saved_messages, total_saved_messages == 1 ? "" : "s"); + if (total_saved_messages > 0 && total_saved_messages != total_saved_urgent_messages) { + snprintf(msg_count, sizeof(msg_count), "%d:saved", total_saved_messages); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } - if (!heard_auto_saved && total_saved_messages > 0) { + if (!heard_auto_saved && total_saved_messages + total_saved_urgent_messages> 0) { heard_auto_saved = 1; play_msg_type = MSG_SAVED; vm_check_state = VM_CHECK_PLAY_MESSAGES; @@ -1075,7 +1075,7 @@ } if (!informed) { - snprintf(msg_count, sizeof(msg_count), "0:new:s"); + snprintf(msg_count, sizeof(msg_count), "0:new"); TRY_CODE(switch_ivr_phrase_macro(session, VM_MESSAGE_COUNT_MACRO, msg_count, NULL, NULL)); informed++; } @@ -1599,7 +1599,7 @@ SWITCH_STANDARD_APP(voicemail_function) { int argc = 0; - char *argv[4] = { 0 }; + char *argv[6] = { 0 }; char *mydata = NULL; char *profile_name = NULL; char *domain_name = NULL; @@ -1621,14 +1621,16 @@ argc = switch_separate_string(mydata, ' ', argv, (sizeof(argv) / sizeof(argv[0]))); } - if (argv[x] && !strcasecmp(argv[x], "check")) { - check++; - x++; - } - - if (argv[x] && !strcasecmp(argv[x], "auth")) { - auth++; - x++; + for (;;) { + if (argv[x] && !strcasecmp(argv[x], "check")) { + check++; + x++; + } else if (argv[x] && !strcasecmp(argv[x], "auth")) { + auth++; + x++; + } else { + break; + } } if (argv[x]) {

1 0