diff --git a/chrome/content/zotero/xpcom/translation/translate.js b/chrome/content/zotero/xpcom/translation/translate.js index 4dfa3b8ce7..5b588936b3 100644 --- a/chrome/content/zotero/xpcom/translation/translate.js +++ b/chrome/content/zotero/xpcom/translation/translate.js @@ -631,6 +631,13 @@ Zotero.Translate.Sandbox = { for(var i=0; i"; + Zotero.debug(e, 2); + attachmentCallback(attachment, false, e); + return false; + } else if (!attachment.url && asUrl) { + Zotero.debug("Translate: attachment path looks like a URI: " + attachment.path); + attachment.url = asUrl; + delete attachment.path; + } + } else { + if (attachment.url) { + attachment.linkMode = "imported_url"; + var myID = Zotero.Attachments.importSnapshotFromFile(file, + attachment.url, attachment.title, attachment.mimeType, attachment.charset, + parentID); + } + else { + attachment.linkMode = "imported_file"; + var myID = Zotero.Attachments.importFromFile(file, parentID); + } + attachmentCallback(attachment, 100); + done = true; + } + } + + if(!done) { let url = Zotero.Attachments.cleanAttachmentURI(attachment.url); if (!url) { - let e = "Translate: Invalid attachment URL specified <" + attachment.url + ">"; + let e = "Translate: Invalid attachment.url specified <" + attachment.url + ">"; Zotero.debug(e, 2); attachmentCallback(attachment, false, e); return false; } + attachment.url = url; url = Components.classes["@mozilla.org/network/io-service;1"] .getService(Components.interfaces.nsIIOService) @@ -241,17 +273,17 @@ Zotero.Translate.ItemSaver.prototype = { // see if this is actually a file URL if(url.scheme == "file") { - attachment.path = attachment.url; - attachment.url = false; + let e = "Translate: Local file attachments cannot be specified in attachment.url"; + Zotero.debug(e, 2); + attachmentCallback(attachment, false, e); + return false; } else if(url.scheme != "http" && url.scheme != "https") { let e = "Translate: " + url.scheme + " protocol is not allowed for attachments from translators."; Zotero.debug(e, 2); attachmentCallback(attachment, false, e); return false; } - } - - if(!attachment.path) { + // At this point, must be a valid HTTP/HTTPS url attachment.linkMode = "linked_file"; try { @@ -265,22 +297,6 @@ Zotero.Translate.ItemSaver.prototype = { } Zotero.debug("Translate: Created attachment; id is "+myID, 4); attachmentCallback(attachment, 100); - var newItem = Zotero.Items.get(myID); - } else { - var file = this._parsePath(attachment.path); - if(!file) return; - - if (attachment.url) { - attachment.linkMode = "imported_url"; - var myID = Zotero.Attachments.importSnapshotFromFile(file, - attachment.url, attachment.title, attachment.mimeType, attachment.charset, - parentID); - } - else { - attachment.linkMode = "imported_file"; - var myID = Zotero.Attachments.importFromFile(file, parentID); - } - attachmentCallback(attachment, 100); } var newItem = Zotero.Items.get(myID);