merge changes from MODLANG-30 and MODLANG-31. changed to use switch_cut_path instead...

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@5292 d0543943-73ff-0310-b7d9-9358b9ac24b2

diff --git a/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c b/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
index 7b47c9d28532432191a3bafa483d70ba414ec5a6..a250099fa3b37956cc8ba7379dd53fdd0999a4ad 100644 (file)
--- a/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
+++ b/src/mod/languages/mod_spidermonkey_etpan/mod_spidermonkey_etpan.c
@@ -128,7 +128,7 @@ static JSBool js_email(JSContext * cx, JSObject * obj, uintN argc, jsval * argv,
                        if (file) {
                                snprintf(buf, B64BUFFLEN, "\n\n--%s\nContent-Type: application/octet-stream\n"
                                                 "Content-Transfer-Encoding: base64\n"
-                                                "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n", bound, file);
+                                                "Content-Description: Sound attachment.\n" "Content-Disposition: attachment; filename=\"%s\"\n\n", bound, (argc > 5) ? JS_GetStringBytes(JS_ValueToString(cx,argv[5])) : switch_cut_path(file));
                                if (!write_buf(fd, buf))
                                        return JS_FALSE;