--- a/mail/components/cloudfile/cloudFileComponents.manifest
+++ b/mail/components/cloudfile/cloudFileComponents.manifest
@@ -1,11 +1,11 @@
-component {32fd439f-9eb6-4907-ac0b-2c88eb14d98d} nsYouSendIt.js
-contract @mozilla.org/mail/yousendit;1 {32fd439f-9eb6-4907-ac0b-2c88eb14d98d}
-category cloud-files YouSendIt @mozilla.org/mail/yousendit;1
+component {dd2bce44-ca71-42ce-b806-6fa4e073919c} nsHightail.js
+contract @mozilla.org/mail/hightail;1 {dd2bce44-ca71-42ce-b806-6fa4e073919c}
+category cloud-files Hightail @mozilla.org/mail/hightail;1
component {9a44742b-a7b1-4f44-919e-6f3b28902c1a} nsUbuntuOne.js
contract @mozilla.org/mail/ubuntuone;1 {9a44742b-a7b1-4f44-919e-6f3b28902c1a}
category cloud-files UbuntuOne @mozilla.org/mail/ubuntuone;1
component {c06a8707-7463-416c-8b39-e85044a4ff6e} nsBox.js
contract @mozilla.org/mail/box;1 {c06a8707-7463-416c-8b39-e85044a4ff6e}
category cloud-files Box @mozilla.org/mail/box;1
rename from mail/components/cloudfile/content/YouSendIt/fileExceeds2GB.xul
rename to mail/components/cloudfile/content/Hightail/fileExceeds2GB.xul
--- a/mail/components/cloudfile/content/YouSendIt/fileExceeds2GB.xul
+++ b/mail/components/cloudfile/content/Hightail/fileExceeds2GB.xul
@@ -1,13 +1,13 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
-<!ENTITY % fileExceeds2GBDTD SYSTEM "chrome://messenger/locale/cloudfile/YouSendIt/fileExceeds2GB.dtd" >
+<!ENTITY % fileExceeds2GBDTD SYSTEM "chrome://messenger/locale/cloudfile/Hightail/fileExceeds2GB.dtd" >
%fileExceeds2GBDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css" type="text/css"?>
rename from mail/components/cloudfile/content/YouSendIt/fileExceedsLimit.js
rename to mail/components/cloudfile/content/Hightail/fileExceedsLimit.js
--- a/mail/components/cloudfile/content/YouSendIt/fileExceedsLimit.js
+++ b/mail/components/cloudfile/content/Hightail/fileExceedsLimit.js
@@ -7,16 +7,16 @@ const Ci = Components.interfaces;
const Cu = Components.utils;
const Cr = Components.results;
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
let fileExceedsLimit = {
onOK: function AAD_onOK() {
- let href = "https://www.yousendit.com/prosignup?p_code=pro&s=4001636&cid=pm-4001636";
+ let href = "https://www.hightail.com/prosignup?p_code=pro&s=4001636&cid=pm-4001636";
gProtocolService.loadUrl(Services.io.newURI(href, "UTF-8", null));
},
}
XPCOMUtils.defineLazyServiceGetter(this, "gProtocolService",
"@mozilla.org/uriloader/external-protocol-service;1",
"nsIExternalProtocolService");
rename from mail/components/cloudfile/content/YouSendIt/fileExceedsLimit.xul
rename to mail/components/cloudfile/content/Hightail/fileExceedsLimit.xul
--- a/mail/components/cloudfile/content/YouSendIt/fileExceedsLimit.xul
+++ b/mail/components/cloudfile/content/Hightail/fileExceedsLimit.xul
@@ -1,39 +1,39 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
-<!ENTITY % fileExceedsLimitDTD SYSTEM "chrome://messenger/locale/cloudfile/YouSendIt/fileExceedsLimit.dtd" >
+<!ENTITY % fileExceedsLimitDTD SYSTEM "chrome://messenger/locale/cloudfile/Hightail/fileExceedsLimit.dtd" >
%fileExceedsLimitDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/cloudfile/YouSendIt/fileExceedsLimit.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/cloudfile/Hightail/fileExceedsLimit.css" type="text/css"?>
<dialog id="fileExceedsLimit"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept,cancel"
buttonlabelaccept="&fileExceedsLimit.accept;"
buttonlabelcancel="&fileExceedsLimit.cancel;"
ondialogaccept="return fileExceedsLimit.onOK();"
title="&fileExceedsLimit.title;">
<script type="text/javascript;version=1.8"
- src="chrome://messenger/content/cloudfile/YouSendIt/fileExceedsLimit.js"/>
+ src="chrome://messenger/content/cloudfile/Hightail/fileExceedsLimit.js"/>
<description id="title">&fileExceedsLimit.thatsBigFile;</description>
<description id="title2">&fileExceedsLimit.thatsBigFile2;</description>
<description id="proIncludes">&fileExceedsLimit.proIncludes;</description>
<description>
- <image src="chrome://messenger/skin/cloudfile/YouSendIt/check.png"/><label>&fileExceedsLimit.pros1;</label>
+ <image src="chrome://messenger/skin/cloudfile/Hightail/check.png"/><label>&fileExceedsLimit.pros1;</label>
</description>
<description>
- <image src="chrome://messenger/skin/cloudfile/YouSendIt/check.png"/><label>&fileExceedsLimit.pros2;</label>
+ <image src="chrome://messenger/skin/cloudfile/Hightail/check.png"/><label>&fileExceedsLimit.pros2;</label>
</description>
<description>
- <image src="chrome://messenger/skin/cloudfile/YouSendIt/check.png"/><label>&fileExceedsLimit.pros3;</label>
+ <image src="chrome://messenger/skin/cloudfile/Hightail/check.png"/><label>&fileExceedsLimit.pros3;</label>
</description>
</dialog>
rename from mail/components/cloudfile/content/YouSendIt/fileExceedsQuota.js
rename to mail/components/cloudfile/content/Hightail/fileExceedsQuota.js
--- a/mail/components/cloudfile/content/YouSendIt/fileExceedsQuota.js
+++ b/mail/components/cloudfile/content/Hightail/fileExceedsQuota.js
@@ -16,16 +16,16 @@ document.addEventListener("DOMContentLoa
storage = (storage / 1024 / 1024 / 1024).toFixed(2);
let currentStorage = document.getElementById('currentStorage');
currentStorage.textContent = currentStorage.textContent.replace('#XXX', storage);
}
});
let fileExceedsQuota = {
onOK: function AAD_onOK() {
- let href = "https://www.yousendit.com/prosignup?p_code=pro&s=4001637&cid=pm-4001637";
+ let href = "https://www.hightail.com/prosignup?p_code=pro&s=4001637&cid=pm-4001637";
gProtocolService.loadUrl(Services.io.newURI(href, "UTF-8", null));
},
}
XPCOMUtils.defineLazyServiceGetter(this, "gProtocolService",
"@mozilla.org/uriloader/external-protocol-service;1",
"nsIExternalProtocolService");
rename from mail/components/cloudfile/content/YouSendIt/fileExceedsQuota.xul
rename to mail/components/cloudfile/content/Hightail/fileExceedsQuota.xul
--- a/mail/components/cloudfile/content/YouSendIt/fileExceedsQuota.xul
+++ b/mail/components/cloudfile/content/Hightail/fileExceedsQuota.xul
@@ -1,31 +1,31 @@
<?xml version="1.0"?>
<!DOCTYPE overlay [
<!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
%brandDTD;
-<!ENTITY % fileExceedsQuotaDTD SYSTEM "chrome://messenger/locale/cloudfile/YouSendIt/fileExceedsQuota.dtd" >
+<!ENTITY % fileExceedsQuotaDTD SYSTEM "chrome://messenger/locale/cloudfile/Hightail/fileExceedsQuota.dtd" >
%fileExceedsQuotaDTD;
]>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
<?xml-stylesheet href="chrome://global/skin/"?>
<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/cloudfile/YouSendIt/fileExceedsLimit.css" type="text/css"?>
+<?xml-stylesheet href="chrome://messenger/skin/cloudfile/Hightail/fileExceedsLimit.css" type="text/css"?>
<dialog id="fileExceedsQuota"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept,cancel"
buttonlabelaccept="&fileExceedsQuota.accept;"
buttonlabelcancel="&fileExceedsQuota.cancel;"
ondialogaccept="return fileExceedsQuota.onOK();"
title="&fileExceedsQuota.title;">
<script type="text/javascript;version=1.8"
- src="chrome://messenger/content/cloudfile/YouSendIt/fileExceedsQuota.js"/>
+ src="chrome://messenger/content/cloudfile/Hightail/fileExceedsQuota.js"/>
<description id="title">&fileExceedsQuota.storageLimitReached;</description>
<description id="currentStorage">&fileExceedsQuota.description;</description>
<description>&fileExceedsQuota.description2;</description>
<description>&fileExceedsQuota.description3;</description>
</dialog>
rename from mail/components/cloudfile/content/YouSendIt/management.js
rename to mail/components/cloudfile/content/Hightail/management.js
rename from mail/components/cloudfile/content/YouSendIt/management.xhtml
rename to mail/components/cloudfile/content/Hightail/management.xhtml
--- a/mail/components/cloudfile/content/YouSendIt/management.xhtml
+++ b/mail/components/cloudfile/content/Hightail/management.xhtml
@@ -1,50 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<!DOCTYPE html [
<!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
<!ENTITY % managementDTD SYSTEM "chrome://messenger/locale/cloudfile/management.dtd"> %managementDTD;
- <!ENTITY % ysiDTD SYSTEM "chrome://messenger/locale/cloudfile/YouSendIt/management.dtd"> %ysiDTD;
+ <!ENTITY % hightailDTD SYSTEM "chrome://messenger/locale/cloudfile/Hightail/management.dtd"> %hightailDTD;
]>
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script type="application/javascript;version=1.8"
src="chrome://messenger/content/protovis-r2.6-modded.js"/>
<script type="text/javascript;version=1.8"
- src="chrome://messenger/content/cloudfile/YouSendIt/management.js"/>
+ src="chrome://messenger/content/cloudfile/Hightail/management.js"/>
<link rel="stylesheet"
type="text/css"
href="chrome://messenger/skin/preferences/preferences.css" />
</head>
<body id="provider-management">
<div id="provider-header">
<div id="provider-terms">
- <a href="http://www.yousendit.com/aboutus/legal/privacy">&cloudfileMgmt.privacyPolicy;</a>
- <a href="http://www.yousendit.com/aboutus/legal/terms-of-service">&cloudfileMgmt.termsOfService;</a>
+ <a href="http://www.hightail.com/aboutus/legal/privacy">&cloudfileMgmt.privacyPolicy;</a>
+ <a href="http://www.hightail.com/aboutus/legal/terms-of-service">&cloudfileMgmt.termsOfService;</a>
</div>
<div id="provider-name">
- <h1>YouSendIt</h1>
+ <h1>Hightail</h1>
</div>
</div>
<div id="provider-spacebox">
<div id="provider-space-visuals"></div>
<div id="provider-space">
<div>
<label>&cloudfileMgmt.usedSpace;</label>
<span id="file-space-used"/>
<span id="file-space-used-swatch" class="space-swatch"/>
</div>
<div>
<label>&cloudfileMgmt.unusedSpace;</label>
<span id="remaining-file-space"/>
<span id="remaining-file-space-swatch" class="space-swatch"/>
</div>
- <div id="upgrade"><a href="https://www.yousendit.com/compareaccounts">&cloudfileMgmt.upgradeOffer;</a></div>
+ <div id="upgrade"><a href="https://www.hightail.com/compare-plans">&cloudfileMgmt.upgradeOffer;</a></div>
</div>
</div>
- <div id="provider-account-settings"><a href="https://www.yousendit.com/myaccount">&youSendItMgmt.viewSettings;</a></div>
+ <div id="provider-account-settings"><a href="https://www.hightail.com/myaccount">&hightailMgmt.viewSettings;</a></div>
</body>
</html>
rename from mail/components/cloudfile/content/YouSendIt/settings.js
rename to mail/components/cloudfile/content/Hightail/settings.js
deleted file mode 100644
--- a/mail/components/cloudfile/content/YouSendIt/settings.xhtml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- This Source Code Form is subject to the terms of the Mozilla Public
- - License, v. 2.0. If a copy of the MPL was not distributed with this file,
- - You can obtain one at http://mozilla.org/MPL/2.0/. -->
-
-<!DOCTYPE html [
- <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd"> %htmlDTD;
- <!ENTITY % ysiDTD SYSTEM "chrome://messenger/locale/cloudfile/YouSendIt/settings.dtd"> %ysiDTD;
-]>
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <script type="application/javascript"
- src="chrome://messenger/content/cloudfile/YouSendIt/settings.js"/>
- <link rel="stylesheet"
- type="text/css"
- href="chrome://messenger/skin/cloudfile/addAccountDialog.css" />
- </head>
- <body id="provider-settings">
- <form id="provider-form" onsubmit="return false;">
- <label for="username">&youSendItSettings.username;</label>
- <input id="username" type="text" required="true"/>
- <div id="learn-more" class="float-right">
- <a href="https://www.yousendit.com/thunderbird-about-yousendit?s=4001583&cid=pm-4001583">&youSendItSettings.learnMore;</a>
- </div>
- <div>
- <a href="https://www.yousendit.com/litesignup?s=4001583&cid=pm-4001583">&youSendItSettings.needAnAccount;</a>
- </div>
- </form>
- </body>
-</html>
--- a/mail/components/cloudfile/jar.mn
+++ b/mail/components/cloudfile/jar.mn
@@ -11,17 +11,17 @@ messenger.jar:
content/messenger/cloudfile/Box/management.xhtml (content/Box/management.xhtml)
content/messenger/cloudfile/Box/management.js (content/Box/management.js)
content/messenger/cloudfile/Box/auth.xul (content/Box/auth.xul)
content/messenger/cloudfile/Box/auth.js (content/Box/auth.js)
content/messenger/cloudfile/UbuntuOne/management.js (content/UbuntuOne/management.js)
content/messenger/cloudfile/UbuntuOne/management.xhtml (content/UbuntuOne/management.xhtml)
content/messenger/cloudfile/UbuntuOne/settings.js (content/UbuntuOne/settings.js)
content/messenger/cloudfile/UbuntuOne/settings.xhtml (content/UbuntuOne/settings.xhtml)
- content/messenger/cloudfile/YouSendIt/management.xhtml (content/YouSendIt/management.xhtml)
- content/messenger/cloudfile/YouSendIt/management.js (content/YouSendIt/management.js)
- content/messenger/cloudfile/YouSendIt/settings.js (content/YouSendIt/settings.js)
- content/messenger/cloudfile/YouSendIt/settings.xhtml (content/YouSendIt/settings.xhtml)
- content/messenger/cloudfile/YouSendIt/fileExceedsLimit.xul (content/YouSendIt/fileExceedsLimit.xul)
- content/messenger/cloudfile/YouSendIt/fileExceedsLimit.js (content/YouSendIt/fileExceedsLimit.js)
- content/messenger/cloudfile/YouSendIt/fileExceedsQuota.xul (content/YouSendIt/fileExceedsQuota.xul)
- content/messenger/cloudfile/YouSendIt/fileExceedsQuota.js (content/YouSendIt/fileExceedsQuota.js)
- content/messenger/cloudfile/YouSendIt/fileExceeds2GB.xul (content/YouSendIt/fileExceeds2GB.xul)
+ content/messenger/cloudfile/Hightail/management.xhtml (content/Hightail/management.xhtml)
+ content/messenger/cloudfile/Hightail/management.js (content/Hightail/management.js)
+ content/messenger/cloudfile/Hightail/settings.js (content/Hightail/settings.js)
+ content/messenger/cloudfile/Hightail/settings.xhtml (content/Hightail/settings.xhtml)
+ content/messenger/cloudfile/Hightail/fileExceedsLimit.xul (content/Hightail/fileExceedsLimit.xul)
+ content/messenger/cloudfile/Hightail/fileExceedsLimit.js (content/Hightail/fileExceedsLimit.js)
+ content/messenger/cloudfile/Hightail/fileExceedsQuota.xul (content/Hightail/fileExceedsQuota.xul)
+ content/messenger/cloudfile/Hightail/fileExceedsQuota.js (content/Hightail/fileExceedsQuota.js)
+ content/messenger/cloudfile/Hightail/fileExceeds2GB.xul (content/Hightail/fileExceeds2GB.xul)
--- a/mail/components/cloudfile/moz.build
+++ b/mail/components/cloudfile/moz.build
@@ -7,17 +7,17 @@ XPIDL_SOURCES += [
'nsIMsgCloudFileProvider.idl',
]
XPIDL_MODULE = 'cloudfile'
EXTRA_COMPONENTS += [
'cloudFileComponents.manifest',
'nsBox.js',
+ 'nsHightail.js',
'nsUbuntuOne.js',
- 'nsYouSendIt.js',
]
EXTRA_JS_MODULES += [
'cloudFileAccounts.js',
]
JAR_MANIFESTS += ['jar.mn']
rename from mail/components/cloudfile/nsYouSendIt.js
rename to mail/components/cloudfile/nsHightail.js
--- a/mail/components/cloudfile/nsYouSendIt.js
+++ b/mail/components/cloudfile/nsHightail.js
@@ -1,15 +1,15 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/* This file implements the nsIMsgCloudFileProvider interface.
*
- * This component handles the YouSendIt implementation of the
+ * This component handles the Hightail implementation of the
* nsIMsgCloudFileProvider interface.
*/
const {classes: Cc, interfaces: Ci, utils: Cu, results: Cr} = Components;
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
Cu.import("resource:///modules/gloda/log4moz.js");
@@ -22,34 +22,34 @@ const kApiKey = "7spvjdt7m4kycr7jyhywrdn
const kAuthPath = "/dpi/v1/auth";
const kUserInfoPath = "/dpi/v2/user";
const kFolderPath = "/dpi/v1/folder/";
const kFolderFilePath = "/dpi/v1/folder/file/";
const kFolderInitUploadPath = kFolderPath + "file/initUpload";
const kFolderCommitUploadPath = kFolderPath + "file/commitUpload";
const kUrlTail = "s=4001583&cid=pm-4001583";
-function nsYouSendIt() {
- this.log = Log4Moz.getConfiguredLogger("YouSendIt");
+function nsHightail() {
+ this.log = Log4Moz.getConfiguredLogger("Hightail");
}
-nsYouSendIt.prototype = {
+nsHightail.prototype = {
/* nsISupports */
QueryInterface: XPCOMUtils.generateQI([Ci.nsIMsgCloudFileProvider]),
- classID: Components.ID("{32fd439f-9eb6-4907-ac0b-2c88eb14d98d}"),
+ classID: Components.ID("{dd2bce44-ca71-42ce-b806-6fa4e073919c}"),
- get type() "YouSendIt",
- get displayName() "YouSendIt",
- get serviceURL() "https://www.yousendit.com",
- get iconClass() "chrome://messenger/skin/icons/yousendit.png",
+ get type() "Hightail",
+ get displayName() "Hightail",
+ get serviceURL() "https://www.hightail.com",
+ get iconClass() "chrome://messenger/skin/icons/hightail.png",
get accountKey() this._accountKey,
get lastError() this._lastErrorText,
- get settingsURL() "chrome://messenger/content/cloudfile/YouSendIt/settings.xhtml",
- get managementURL() "chrome://messenger/content/cloudfile/YouSendIt/management.xhtml",
+ get settingsURL() "chrome://messenger/content/cloudfile/Hightail/settings.xhtml",
+ get managementURL() "chrome://messenger/content/cloudfile/Hightail/management.xhtml",
_accountKey: false,
_prefBranch: null,
_userName: "",
_password: "",
_loggedIn: false,
_userInfo: null,
_file : null,
@@ -68,42 +68,42 @@ nsYouSendIt.prototype = {
_urlsForFiles : {},
_uploadInfo : {},
_uploads: [],
/**
* Used by our testing framework to override the URLs that this component
* communicates to.
*/
- overrideUrls: function nsYouSendIt_overrideUrls(aNumUrls, aUrls) {
+ overrideUrls: function nsHightail_overrideUrls(aNumUrls, aUrls) {
gServerUrl = aUrls[0];
},
/**
* Initializes an instance of this nsIMsgCloudFileProvider for an account
* with key aAccountKey.
*
* @param aAccountKey the account key to initialize this
* nsIMsgCloudFileProvider with.
*/
- init: function nsYouSendIt_init(aAccountKey) {
+ init: function nsHightail_init(aAccountKey) {
this._accountKey = aAccountKey;
this._prefBranch = Services.prefs.getBranch("mail.cloud_files.accounts." +
aAccountKey + ".");
this._userName = this._prefBranch.getCharPref("username");
this._loggedIn = this._cachedAuthToken != "";
},
/**
* Private function for retrieving or creating folder
- * on YouSendIt website for uploading file.
+ * on Hightail website for uploading file.
*
* @param aCallback called if folder is ready.
*/
- _initFolder: function nsYouSendIt__initFolder(aCallback) {
+ _initFolder: function nsHightail__initFolder(aCallback) {
this.log.info('_initFolder');
let saveFolderId = function(aFolderId) {
this.log.info('saveFolderId');
this._folderId = aFolderId;
if (aCallback)
aCallback();
}.bind(this);
@@ -128,23 +128,23 @@ nsYouSendIt.prototype = {
if (this._folderId == "")
findAppsFolder();
else
this._checkFolderExist(this._folderId, aCallback, findAppsFolder);
},
/**
* Private callback function passed to, and called from
- * nsYouSendItFileUploader.
+ * nsHightailFileUploader.
*
* @param aRequestObserver a request observer for monitoring the start and
* stop states of a request.
* @param aStatus the status of the request.
*/
- _uploaderCallback: function nsYouSendIt__uploaderCallback(aRequestObserver,
+ _uploaderCallback: function nsHightail__uploaderCallback(aRequestObserver,
aStatus) {
aRequestObserver.onStopRequest(null, null, aStatus);
this._uploadingFile = null;
this._uploads.shift();
if (this._uploads.length > 0) {
let nextUpload = this._uploads[0];
this.log.info("chaining upload, file = " + nextUpload.file.leafName);
@@ -158,32 +158,32 @@ nsYouSendIt.prototype = {
nextUpload.callback(nextUpload.requestObserver, Cr.NS_ERROR_FAILURE);
}
}
else
this._uploader = null;
},
/**
- * Attempt to upload a file to YouSendIt's servers.
+ * Attempt to upload a file to Hightail's servers.
*
* @param aFile an nsILocalFile for uploading.
* @param aCallback an nsIRequestObserver for monitoring the start and
* stop states of the upload procedure.
*/
- uploadFile: function nsYouSendIt_uploadFile(aFile, aCallback) {
+ uploadFile: function nsHightail_uploadFile(aFile, aCallback) {
if (Services.io.offline)
throw Ci.nsIMsgCloudFileProvider.offlineErr;
this.log.info("Preparing to upload a file");
// if we're uploading a file, queue this request.
if (this._uploadingFile && this._uploadingFile != aFile) {
this.log.info("Adding file to queue");
- let uploader = new nsYouSendItFileUploader(this, aFile,
+ let uploader = new nsHightailFileUploader(this, aFile,
this._uploaderCallback
.bind(this),
aCallback);
this._uploads.push(uploader);
return;
}
this._uploadingFile = aFile;
@@ -222,65 +222,65 @@ nsYouSendIt.prototype = {
* A private function called when we're almost ready to kick off the upload
* for a file. First, ensures that the file size is not too large, and that
* we won't exceed our storage quota, and then kicks off the upload.
*
* @param aFile the nsILocalFile to upload
* @param aCallback the nsIRequestObserver for monitoring the start and stop
* states of the upload procedure.
*/
- _finishUpload: function nsYouSendIt__finishUpload(aFile, aCallback) {
+ _finishUpload: function nsHightail__finishUpload(aFile, aCallback) {
if (aFile.fileSize > 2147483648)
return this._fileExceedsLimit(aCallback, '2GB', 0);
if (aFile.fileSize > this._maxFileSize)
return this._fileExceedsLimit(aCallback, 'Limit', 0);
if (aFile.fileSize > this._availableStorage)
return this._fileExceedsLimit(aCallback, 'Quota',
aFile.fileSize + this._fileSpaceUsed);
delete this._userInfo; // force us to update userInfo on every upload.
if (!this._uploader) {
- this._uploader = new nsYouSendItFileUploader(this, aFile,
+ this._uploader = new nsHightailFileUploader(this, aFile,
this._uploaderCallback
.bind(this),
aCallback);
this._uploads.unshift(this._uploader);
}
this._uploadingFile = aFile;
this._uploader.startUpload();
},
/**
* A private function called when upload exceeds file limit.
*
* @param aCallback the nsIRequestObserver for monitoring the start and stop
* states of the upload procedure.
*/
- _fileExceedsLimit: function nsYouSendIt__fileExceedsLimit(aCallback, aType, aStorageSize) {
+ _fileExceedsLimit: function nsHightail__fileExceedsLimit(aCallback, aType, aStorageSize) {
let cancel = Ci.nsIMsgCloudFileProvider.uploadCanceled;
let args = {storage: aStorageSize};
args.wrappedJSObject = args;
Services.ww.openWindow(null,
- "chrome://messenger/content/cloudfile/YouSendIt/"
+ "chrome://messenger/content/cloudfile/Hightail/"
+ "fileExceeds" + aType + ".xul",
- "YouSendIt", "chrome,centerscreen,dialog,modal,resizable=yes",
+ "Hightail", "chrome,centerscreen,dialog,modal,resizable=yes",
args).focus();
return aCallback.onStopRequest(null, null, cancel);
},
/**
* Cancels an in-progress file upload.
*
* @param aFile the nsILocalFile being uploaded.
*/
- cancelFileUpload: function nsYouSendIt_cancelFileUpload(aFile) {
+ cancelFileUpload: function nsHightail_cancelFileUpload(aFile) {
this.log.info("in cancel upload");
if (this._uploadingFile != null && this._uploader != null &&
this._uploadingFile.equals(aFile)) {
this._uploader.cancel();
}
else {
for (let i = 0; i < this._uploads.length; i++)
if (this._uploads[i].file.equals(aFile)) {
@@ -294,17 +294,17 @@ nsYouSendIt.prototype = {
/**
* A private function for dealing with stale tokens. Attempts to refresh
* the token without prompting for the password.
*
* @param aSuccessCallback called if token refresh is successful.
* @param aFailureCallback called if token refresh fails.
*/
- _handleStaleToken: function nsYouSendIt__handleStaleToken(aSuccessCallback,
+ _handleStaleToken: function nsHightail__handleStaleToken(aSuccessCallback,
aFailureCallback) {
this.log.info("Handling a stale token.");
this._loggedIn = false;
this._cachedAuthToken = "";
if (this.getPassword(this._userName, true) != "") {
this.log.info("Attempting to reauth with saved password");
// We had a stored password - let's try logging in with that now.
this.logon(aSuccessCallback, aFailureCallback,
@@ -318,17 +318,17 @@ nsYouSendIt.prototype = {
/**
* A private function for retrieving profile information about a user.
*
* @param successCallback a callback fired if retrieving profile information
* is successful.
* @param failureCallback a callback fired if retrieving profile information
* fails.
*/
- _getUserInfo: function nsYouSendIt_userInfo(successCallback, failureCallback) {
+ _getUserInfo: function nsHightail_userInfo(successCallback, failureCallback) {
this.log.info("getting user info");
let args = "?email=" + this._userName + "&";
let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Ci.nsIXMLHttpRequest);
req.open("GET", gServerUrl + kUserInfoPath + args + kUrlTail, true);
req.onload = function() {
@@ -387,30 +387,30 @@ nsYouSendIt.prototype = {
req.send();
},
/**
* Returns the sharing URL for some uploaded file.
*
* @param aFile the nsILocalFile to get the URL for.
*/
- urlForFile: function nsYouSendIt_urlForFile(aFile) {
+ urlForFile: function nsHightail_urlForFile(aFile) {
return this._urlsForFiles[aFile.path];
},
/**
* Attempts to refresh cached profile information for the account associated
* with this instance's account key.
*
* @param aWithUI a boolean for whether or not we should prompt the user for
* a password if we don't have a proper token.
* @param aListener an nsIRequestObserver for monitoring the start and stop
* states of fetching profile information.
*/
- refreshUserInfo: function nsYouSendIt_refreshUserInfo(aWithUI, aListener) {
+ refreshUserInfo: function nsHightail_refreshUserInfo(aWithUI, aListener) {
if (Services.io.offline)
throw Ci.nsIMsgCloudFileProvider.offlineErr;
aListener.onStartRequest(null, null);
// Let's define some reusable callback functions...
let onGetUserInfoSuccess = function() {
aListener.onStopRequest(null, null, Cr.NS_OK);
@@ -437,17 +437,17 @@ nsYouSendIt.prototype = {
return this._getUserInfo(onGetUserInfoSuccess, onAuthFailure);
},
/**
* Creates an account for a user. Note that, currently, this function is
* not being used by the UI.
*/
- createNewAccount: function nsYouSendIt_createNewAccount(aEmailAddress, aPassword,
+ createNewAccount: function nsHightail_createNewAccount(aEmailAddress, aPassword,
aFirstName, aLastName,
aRequestObserver) {
if (Services.io.offline)
throw Ci.nsIMsgCloudFileProvider.offlineErr;
let args = "?email=" + aEmailAddress + "&password=" + aPassword + "&firstname="
+ aFirstName + "&lastname=" + aLastName + "&";
@@ -480,24 +480,24 @@ nsYouSendIt.prototype = {
// in the log, and crashes if there aren't two spaces.
req.setRequestHeader("X-Auth-Token", this._cachedAuthToken + " ");
req.setRequestHeader("X-Api-Key", kApiKey);
req.setRequestHeader("Accept", "application/json");
req.send();
},
/**
- * Attempt to find folder by name on YSI website.
+ * Attempt to find folder by name on Hightail website.
*
* @param aFolderName name of folder
* @param aParentFolderId id of folder where we are looking
* @param aNotFoundCallback called if folder is not found
* @param aFoundCallback called if folder is found
*/
- _findFolder: function nsYouSendIt__findFolder(aFolderName,
+ _findFolder: function nsHightail__findFolder(aFolderName,
aParentFolderId,
aNotFoundCallback,
aFoundCallback) {
this.log.info("Find folder: " + aFolderName);
let checkChildFolders = function(folders) {
this.log.info("Looking for a child folder");
@@ -516,23 +516,23 @@ nsYouSendIt.prototype = {
if (folderId && aFoundCallback)
aFoundCallback(folderId);
}.bind(this);
this._checkFolderExist(aParentFolderId, checkChildFolders);
},
/**
- * Attempt to find folder by id on YSI website.
+ * Attempt to find folder by id on Hightail website.
*
* @param aFolderId id of folder
* @param aNotFoundCallback called if folder is not found
* @param aFoundCallback called if folder is found
*/
- _checkFolderExist: function nsYouSendIt__checkFolderExist(aFolderId,
+ _checkFolderExist: function nsHightail__checkFolderExist(aFolderId,
aFoundCallback,
aNotFoundCallback) {
this.log.info('checkFolderExist');
if (Services.io.offline)
throw Ci.nsIMsgCloudFileProvider.offlineErr;
let args = "?includeFiles=false&includeFolders=true&";
@@ -568,23 +568,23 @@ nsYouSendIt.prototype = {
// in the log, and crashes if there aren't two spaces.
req.setRequestHeader("X-Auth-Token", this._cachedAuthToken + " ");
req.setRequestHeader("X-Api-Key", kApiKey);
req.setRequestHeader("Accept", "application/json");
req.send();
},
/**
- * Private function for creating folder on YSI website.
+ * Private function for creating folder on Hightail website.
*
* @param aName name of folder
* @param aParent id of parent folder
* @param aSuccessCallback called when folder is created
*/
- _createFolder: function nsYouSendIt__createFolder(aName,
+ _createFolder: function nsHightail__createFolder(aName,
aParent,
aSuccessCallback) {
this.log.info("Create folder: " + aName);
if (Services.io.offline)
throw Ci.nsIMsgCloudFileProvider.offlineErr;
let args = "?name=" + aName + "&parentId=" + aParent + "&";
@@ -622,17 +622,17 @@ nsYouSendIt.prototype = {
/**
* If a the user associated with this account key already has an account,
* allows them to log in.
*
* @param aRequestObserver an nsIRequestObserver for monitoring the start and
* stop states of the login procedure.
*/
- createExistingAccount: function nsYouSendIt_createExistingAccount(aRequestObserver) {
+ createExistingAccount: function nsHightail_createExistingAccount(aRequestObserver) {
// XXX: replace this with a better function
let successCb = function(aResponseText, aRequest) {
aRequestObserver.onStopRequest(null, this, Cr.NS_OK);
}.bind(this);
let failureCb = function(aResponseText, aRequest) {
aRequestObserver.onStopRequest(null, this,
Ci.nsIMsgCloudFileProvider.authErr);
@@ -642,19 +642,19 @@ nsYouSendIt.prototype = {
},
/**
* Returns an appropriate provider-specific URL for dealing with a particular
* error type.
*
* @param aError an error to get the URL for.
*/
- providerUrlForError: function nsYouSendIt_providerUrlForError(aError) {
+ providerUrlForError: function nsHightail_providerUrlForError(aError) {
if (aError == Ci.nsIMsgCloudFileProvider.uploadExceedsFileLimit)
- return "http://www.yousendit.com";
+ return "http://www.hightail.com";
return "";
},
/**
* If the provider doesn't have an API for creating an account, perhaps
* there's a url we can load in a content tab that will allow the user
* to create an account.
*/
@@ -671,17 +671,17 @@ nsYouSendIt.prototype = {
/**
* Attempts to delete an uploaded file.
*
* @param aFile the nsILocalFile to delete.
* @param aCallback an nsIRequestObserver for monitoring the start and stop
* states of the delete procedure.
*/
- deleteFile: function nsYouSendIt_deleteFile(aFile, aCallback) {
+ deleteFile: function nsHightail_deleteFile(aFile, aCallback) {
this.log.info("Deleting a file");
if (Services.io.offline) {
this.log.error("We're offline - we can't delete the file.");
throw Ci.nsIMsgCloudFileProvider.offlineErr;
}
let uploadInfo = this._uploadInfo[aFile.path];
@@ -754,17 +754,17 @@ nsYouSendIt.prototype = {
* Returns the saved password for this account if one exists, or prompts
* the user for a password. Returns the empty string on failure.
*
* @param aUsername the username associated with the account / password.
* @param aNoPrompt a boolean for whether or not we should suppress
* the password prompt if no password exists. If so,
* returns the empty string if no password exists.
*/
- getPassword: function nsYouSendIt_getPassword(aUsername, aNoPrompt) {
+ getPassword: function nsHightail_getPassword(aUsername, aNoPrompt) {
this.log.info("Getting password for user: " + aUsername);
if (aNoPrompt)
this.log.info("Suppressing password prompt");
let passwordURI = gServerUrl;
let logins = Services.logins.findLogins({}, passwordURI, null, passwordURI);
for each (let loginInfo in logins) {
@@ -795,34 +795,34 @@ nsYouSendIt.prototype = {
authPrompter.SAVE_PASSWORD_PERMANENTLY,
password))
return password.value;
return "";
},
/**
- * Clears any saved YouSendIt passwords for this instance's account.
+ * Clears any saved Hightail passwords for this instance's account.
*/
- clearPassword: function nsYouSendIt_clearPassword() {
+ clearPassword: function nsHightail_clearPassword() {
let logins = Services.logins.findLogins({}, gServerUrl, null, gServerUrl);
for each (let loginInfo in logins)
if (loginInfo.username == this._userName)
Services.logins.removeLogin(loginInfo);
},
/**
- * Attempt to log on and get the auth token for this YouSendIt account.
+ * Attempt to log on and get the auth token for this Hightail account.
*
* @param successCallback the callback to be fired if logging on is successful
* @param failureCallback the callback to be fired if loggong on fails
* @aparam aWithUI a boolean for whether or not we should prompt for a password
* if no auth token is currently stored.
*/
- logon: function nsYouSendIt_login(successCallback, failureCallback, aWithUI) {
+ logon: function nsHightail_login(successCallback, failureCallback, aWithUI) {
this.log.info("Logging in, aWithUI = " + aWithUI);
if (this._password == undefined || !this._password)
this._password = this.getPassword(this._userName, !aWithUI);
let args = "?email=" + this._userName + "&password=" + this._password + "&";
this.log.info("Sending login information...");
let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Ci.nsIXMLHttpRequest);
let curDate = Date.now().toString();
@@ -879,101 +879,101 @@ nsYouSendIt.prototype = {
aVal = "";
cloudFileAccounts.setSecretValue(this.accountKey,
cloudFileAccounts.kTokenRealm,
aVal);
},
};
-function nsYouSendItFileUploader(aYouSendIt, aFile, aCallback,
+function nsHightailFileUploader(aHightail, aFile, aCallback,
aRequestObserver) {
- this.youSendIt = aYouSendIt;
- this.log = this.youSendIt.log;
- this.log.info("new nsYouSendItFileUploader file = " + aFile.leafName);
+ this.hightail = aHightail;
+ this.log = this.hightail.log;
+ this.log.info("new nsHightailFileUploader file = " + aFile.leafName);
this.file = aFile;
this.callback = aCallback;
this.requestObserver = aRequestObserver;
}
-nsYouSendItFileUploader.prototype = {
- youSendIt : null,
+nsHightailFileUploader.prototype = {
+ hightail : null,
file : null,
callback : null,
_request : null,
/**
* Kicks off the upload procedure for this uploader.
*/
- startUpload: function nsYSIFU_startUpload() {
+ startUpload: function nsHightailFU_startUpload() {
let curDate = Date.now().toString();
this.requestObserver.onStartRequest(null, null);
let onSuccess = function() {
this._uploadFile();
}.bind(this);
let onFailure = function() {
this.callback(this.requestObserver, Ci.nsIMsgCloudFileProvider.uploadErr);
}.bind(this);
return this._prepareToSend(onSuccess, onFailure);
},
/**
- * Communicates with YSI to get the URL that we will send the upload
+ * Communicates with Hightail to get the URL that we will send the upload
* request to.
*
* @param successCallback the callback fired if getting the URL is successful
* @param failureCallback the callback fired if getting the URL fails
*/
- _prepareToSend: function nsYSIFU__prepareToSend(successCallback,
+ _prepareToSend: function nsHightailFU__prepareToSend(successCallback,
failureCallback) {
let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Ci.nsIXMLHttpRequest);
req.open("POST", gServerUrl + kFolderInitUploadPath + "?" + kUrlTail, true);
req.onerror = failureCallback;
req.onload = function() {
let response = req.responseText;
if (req.status >= 200 && req.status < 400) {
this._urlInfo = JSON.parse(response);
- this.youSendIt._uploadInfo[this.file.path] = this._urlInfo;
+ this.hightail._uploadInfo[this.file.path] = this._urlInfo;
this.log.info("in prepare to send response = " + response);
this.log.info("file id = " + this._urlInfo.fileId);
this.log.info("upload url = " + this._urlInfo.uploadUrl[0]);
successCallback();
}
else {
this.log.error("Preparing to send failed!");
this.log.error("Response was: " + response);
- this.youSendIt._lastErrorText = req.responseText;
- this.youSendIt._lastErrorStatus = req.status;
+ this.hightail._lastErrorText = req.responseText;
+ this.hightail._lastErrorStatus = req.status;
failureCallback();
}
}.bind(this);
// Add a space at the end because http logging looks for two
// spaces in the X-Auth-Token header to avoid putting passwords
// in the log, and crashes if there aren't two spaces.
- req.setRequestHeader("X-Auth-Token", this.youSendIt._cachedAuthToken + " ");
+ req.setRequestHeader("X-Auth-Token", this.hightail._cachedAuthToken + " ");
req.setRequestHeader("X-Api-Key", kApiKey);
req.setRequestHeader("Accept", "application/json");
req.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
req.send();
},
/**
* Once we've got the URL to upload the file to, this function actually does
- * the upload of the file to YouSendIt.
+ * the upload of the file to Hightail.
*/
- _uploadFile: function nsYSIFU__uploadFile() {
+ _uploadFile: function nsHightailFU__uploadFile() {
let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Ci.nsIXMLHttpRequest);
let curDate = Date.now().toString();
this.log.info("upload url = " + this._urlInfo.uploadUrl[0]);
this.request = req;
req.open("POST", this._urlInfo.uploadUrl[0] + "?" + kUrlTail, true);
req.onload = function() {
@@ -1068,17 +1068,17 @@ nsYouSendItFileUploader.prototype = {
this.log.error(ex);
throw ex;
}
},
/**
* Cancels the upload request for the file associated with this Uploader.
*/
- cancel: function nsYSIFU_cancel() {
+ cancel: function nsHightailFU_cancel() {
this.log.info("in uploader cancel");
this.callback(this.requestObserver, Ci.nsIMsgCloudFileProvider.uploadCanceled);
delete this.callback;
if (this.request) {
this.log.info("cancelling upload request");
let req = this.request;
if (req.channel) {
this.log.info("cancelling upload channel");
@@ -1086,23 +1086,23 @@ nsYouSendItFileUploader.prototype = {
}
this.request = null;
}
},
/**
* Once the file is uploaded, if we want to get a sharing URL back, we have
* to send a "commit" request - which this function does.
*/
- _commitSend: function nsYSIFU__commitSend() {
+ _commitSend: function nsHightailFU__commitSend() {
this.log.info("commit sending file " + this._urlInfo.fileId);
let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Ci.nsIXMLHttpRequest);
let args = "?name=" + this.file.leafName +
"&fileId=" + this._urlInfo.fileId +
- "&parentId=" + this.youSendIt._folderId + "&";
+ "&parentId=" + this.hightail._folderId + "&";
req.open("POST", gServerUrl + kFolderCommitUploadPath + args + kUrlTail, true);
req.onerror = function() {
this.log.info("error in commit send");
this.callback(this.requestObserver,
Ci.nsIMsgCloudFileProvider.uploadErr);
}.bind(this);
@@ -1119,43 +1119,43 @@ nsYouSendItFileUploader.prototype = {
let failed = function() {
this.callback(this.requestObserver, this.file.leafName.length > 120
? Ci.nsIMsgCloudFileProvider.uploadExceedsFileNameLimit
: Ci.nsIMsgCloudFileProvider.uploadErr);
}.bind(this);
if (uploadInfo.errorStatus) {
- this.youSendIt._lastErrorText = uploadInfo.errorStatus.message;
- this.youSendIt._lastErrorStatus = uploadInfo.errorStatus.code;
+ this.hightail._lastErrorText = uploadInfo.errorStatus.message;
+ this.hightail._lastErrorStatus = uploadInfo.errorStatus.code;
failed();
}
else if (uploadInfo.clickableDownloadUrl) {
- // We need a kludge here because YSI is returning URLs without the scheme...
+ // We need a kludge here because Hightail is returning URLs without the scheme...
let url = this._ensureScheme(uploadInfo.clickableDownloadUrl);
- this.youSendIt._urlsForFiles[this.file.path] = url;
+ this.hightail._urlsForFiles[this.file.path] = url;
succeed();
}
else
this._findDownloadUrl(uploadInfo.id, succeed, failed);
}.bind(this);
- req.setRequestHeader("X-Auth-Token", this.youSendIt._cachedAuthToken + " ");
+ req.setRequestHeader("X-Auth-Token", this.hightail._cachedAuthToken + " ");
req.setRequestHeader("X-Api-Key", kApiKey);
req.setRequestHeader("Accept", "application/json");
req.send();
},
/**
* If there's no scheme prefix for a URL, attaches an https:// prefix
* and returns the new result.
*
* @param aURL to ensure a scheme with
*/
- _ensureScheme: function nsYSIFU__ensureScheme(aURL) {
+ _ensureScheme: function nsHightailFU__ensureScheme(aURL) {
try {
let scheme = Services.io.extractScheme(aURL);
return aURL;
} catch(e) {
// If we got NS_ERROR_MALFORMED_URI back, there's no scheme here.
if (e.result == Cr.NS_ERROR_MALFORMED_URI)
return "https://" + aURL;
// Otherwise, we hit something different, and should throw.
@@ -1165,17 +1165,17 @@ nsYouSendItFileUploader.prototype = {
/**
* Attempt to find download url for file.
*
* @param aFileId id of file
* @param aSuccessCallback called if url is found
* @param aFailureCallback called if url is not found
*/
- _findDownloadUrl: function nsYSIFU__findDownloadUrl(aFileId, aSuccessCallback, aFailureCallback) {
+ _findDownloadUrl: function nsHightailFU__findDownloadUrl(aFileId, aSuccessCallback, aFailureCallback) {
let req = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"]
.createInstance(Ci.nsIXMLHttpRequest);
req.open("GET", gServerUrl + kFolderFilePath + aFileId, true);
req.onerror = function() {
this.log.info("error in findDownloadUrl");
aFailureCallback();
@@ -1184,47 +1184,47 @@ nsYouSendItFileUploader.prototype = {
req.onload = function() {
let response = req.responseText;
this.log.info("findDownloadUrl response = " + response);
let fileInfo = JSON.parse(response);
if (fileInfo.errorStatus)
aFailureCallback();
else {
- // We need a kludge here because YSI is returning URLs without the scheme...
+ // We need a kludge here because Hightail is returning URLs without the scheme...
let url = this._ensureScheme(fileInfo.clickableDownloadUrl);
- this.youSendIt._urlsForFiles[this.file.path] = url;
+ this.hightail._urlsForFiles[this.file.path] = url;
aSuccessCallback();
}
}.bind(this);
- req.setRequestHeader("X-Auth-Token", this.youSendIt._cachedAuthToken + " ");
+ req.setRequestHeader("X-Auth-Token", this.hightail._cachedAuthToken + " ");
req.setRequestHeader("X-Api-Key", kApiKey);
req.setRequestHeader("Accept", "application/json");
req.send();
},
/**
* Creates and returns a temporary file on the local file system.
*/
- getTempFile: function nsYSIFU_getTempFile(leafName) {
+ getTempFile: function nsHightailFU_getTempFile(leafName) {
let tempfile = Services.dirsvc.get("TmpD", Ci.nsIFile);
tempfile.append(leafName)
tempfile.createUnique(Components.interfaces.nsIFile.NORMAL_FILE_TYPE, parseInt("0666", 8));
// do whatever you need to the created file
return tempfile.clone()
},
/**
- * Cleans up any temporary files that this nsYouSendItFileUploader may have
+ * Cleans up any temporary files that this nsHightailFileUploader may have
* created.
*/
- cleanupTempFile: function nsYSIFU_cleanupTempFile() {
+ cleanupTempFile: function nsHightailFU_cleanupTempFile() {
if (this._bufStream)
this._bufStream.close();
if (this._fstream)
this._fstream.close();
if (this._tempFile)
this._tempFile.remove(false);
},
};
-const NSGetFactory = XPCOMUtils.generateNSGetFactory([nsYouSendIt]);
+const NSGetFactory = XPCOMUtils.generateNSGetFactory([nsHightail]);
--- a/mail/installer/package-manifest.in
+++ b/mail/installer/package-manifest.in
@@ -179,17 +179,17 @@
@BINPATH@/components/mailcompsbase.xpt
@BINPATH@/components/mailview.xpt
@BINPATH@/components/mailprofilemigration.xpt
@BINPATH@/components/messageWakeupService.js
@BINPATH@/components/messageWakeupService.manifest
@BINPATH@/components/nsActivity.js
@BINPATH@/components/nsActivityManager.js
@BINPATH@/components/nsActivityManagerUI.js
-@BINPATH@/components/nsYouSendIt.js
+@BINPATH@/components/nsHightail.js
@BINPATH@/components/nsUbuntuOne.js
@BINPATH@/components/nsBox.js
@BINPATH@/components/nsAddrbook.manifest
@BINPATH@/components/nsMailNewsCommandLineHandler.js
@BINPATH@/components/nsNewsAutoCompleteSearch.js
@BINPATH@/components/nsNewsAutoCompleteSearch.manifest
@BINPATH@/components/services-crypto-component.xpt
@BINPATH@/components/shellservice.xpt
rename from mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd
rename to mail/locales/en-US/chrome/messenger/cloudfile/Hightail/fileExceeds2GB.dtd
--- a/mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd
+++ b/mail/locales/en-US/chrome/messenger/cloudfile/Hightail/fileExceeds2GB.dtd
@@ -1,6 +1,6 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY fileExceeds2GB.title "YouSendIt">
+<!ENTITY fileExceeds2GB.title "Hightail">
<!ENTITY fileExceeds2GB.cancel "OK">
<!ENTITY fileExceeds2GB.description "Sending files over 2GB is not supported.">
rename from mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd
rename to mail/locales/en-US/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd
--- a/mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd
+++ b/mail/locales/en-US/chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd
@@ -1,12 +1,12 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY fileExceedsLimit.title "YouSendIt">
+<!ENTITY fileExceedsLimit.title "Hightail">
<!ENTITY fileExceedsLimit.thatsBigFile "Sending files larger than 50 MB">
<!ENTITY fileExceedsLimit.thatsBigFile2 "is a premium feature.">
<!ENTITY fileExceedsLimit.accept "Upgrade">
<!ENTITY fileExceedsLimit.cancel "Cancel">
<!ENTITY fileExceedsLimit.style "width: 40em; min-height: 20em;">
<!ENTITY fileExceedsLimit.proIncludes "Upgrade now to send this file plus:">
<!ENTITY fileExceedsLimit.pros1 "Send files and folders up to 2GB">
<!ENTITY fileExceedsLimit.pros2 "Store unlimited files online">
rename from mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd
rename to mail/locales/en-US/chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd
--- a/mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd
+++ b/mail/locales/en-US/chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd
@@ -1,11 +1,11 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY fileExceedsQuota.title "YouSendIt">
+<!ENTITY fileExceedsQuota.title "Hightail">
<!ENTITY fileExceedsQuota.storageLimitReached "Storage limit reached">
<!ENTITY fileExceedsQuota.accept "Upgrade">
<!ENTITY fileExceedsQuota.cancel "Cancel">
<!ENTITY fileExceedsQuota.description "You have reached your account storage limit of 2GB.">
<!ENTITY fileExceedsQuota.description1 "Your current storage usage is #XXX GB.">
<!ENTITY fileExceedsQuota.description2 "Upgrade today to Pro Plus account and get more storage.">
<!ENTITY fileExceedsQuota.description3 "You can also choose to delete files in your account to create more space.">
rename from mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/management.dtd
rename to mail/locales/en-US/chrome/messenger/cloudfile/Hightail/management.dtd
--- a/mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/management.dtd
+++ b/mail/locales/en-US/chrome/messenger/cloudfile/Hightail/management.dtd
@@ -1,4 +1,4 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY youSendItMgmt.viewSettings "View my account settings on yousendit.com">
+<!ENTITY hightailMgmt.viewSettings "View my account settings on hightail.com">
rename from mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/settings.dtd
rename to mail/locales/en-US/chrome/messenger/cloudfile/Hightail/settings.dtd
--- a/mail/locales/en-US/chrome/messenger/cloudfile/YouSendIt/settings.dtd
+++ b/mail/locales/en-US/chrome/messenger/cloudfile/Hightail/settings.dtd
@@ -1,6 +1,6 @@
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this file,
- You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<!ENTITY youSendItSettings.username "Username:">
-<!ENTITY youSendItSettings.needAnAccount "Need an account?">
-<!ENTITY youSendItSettings.learnMore "Learn more…">
+<!ENTITY hightailSettings.username "Username:">
+<!ENTITY hightailSettings.needAnAccount "Need an account?">
+<!ENTITY hightailSettings.learnMore "Learn more…">
--- a/mail/locales/jar.mn
+++ b/mail/locales/jar.mn
@@ -127,21 +127,21 @@
locale/@AB_CD@/messenger/addressbook/ldapAutoCompErrs.properties (%chrome/messenger/addressbook/ldapAutoCompErrs.properties)
locale/@AB_CD@/messenger/addressbook/pref-directory.dtd (%chrome/messenger/addressbook/pref-directory.dtd)
locale/@AB_CD@/messenger/addressbook/pref-directory-add.dtd (%chrome/messenger/addressbook/pref-directory-add.dtd)
locale/@AB_CD@/messenger/addressbook/replicationProgress.properties (%chrome/messenger/addressbook/replicationProgress.properties)
locale/@AB_CD@/messenger/cloudfile/addAccountDialog.dtd (%chrome/messenger/cloudfile/addAccountDialog.dtd)
locale/@AB_CD@/messenger/cloudfile/management.dtd (%chrome/messenger/cloudfile/management.dtd)
locale/@AB_CD@/messenger/cloudfile/UbuntuOne/management.dtd (%chrome/messenger/cloudfile/UbuntuOne/management.dtd)
locale/@AB_CD@/messenger/cloudfile/UbuntuOne/settings.dtd (%chrome/messenger/cloudfile/UbuntuOne/settings.dtd)
- locale/@AB_CD@/messenger/cloudfile/YouSendIt/management.dtd (%chrome/messenger/cloudfile/YouSendIt/management.dtd)
- locale/@AB_CD@/messenger/cloudfile/YouSendIt/settings.dtd (%chrome/messenger/cloudfile/YouSendIt/settings.dtd)
- locale/@AB_CD@/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd (%chrome/messenger/cloudfile/YouSendIt/fileExceedsLimit.dtd)
- locale/@AB_CD@/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd (%chrome/messenger/cloudfile/YouSendIt/fileExceedsQuota.dtd)
- locale/@AB_CD@/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd (%chrome/messenger/cloudfile/YouSendIt/fileExceeds2GB.dtd)
+ locale/@AB_CD@/messenger/cloudfile/Hightail/management.dtd (%chrome/messenger/cloudfile/Hightail/management.dtd)
+ locale/@AB_CD@/messenger/cloudfile/Hightail/settings.dtd (%chrome/messenger/cloudfile/Hightail/settings.dtd)
+ locale/@AB_CD@/messenger/cloudfile/Hightail/fileExceedsLimit.dtd (%chrome/messenger/cloudfile/Hightail/fileExceedsLimit.dtd)
+ locale/@AB_CD@/messenger/cloudfile/Hightail/fileExceedsQuota.dtd (%chrome/messenger/cloudfile/Hightail/fileExceedsQuota.dtd)
+ locale/@AB_CD@/messenger/cloudfile/Hightail/fileExceeds2GB.dtd (%chrome/messenger/cloudfile/Hightail/fileExceeds2GB.dtd)
locale/@AB_CD@/messenger/cloudfile/Box/settings.dtd (%chrome/messenger/cloudfile/Box/settings.dtd)
locale/@AB_CD@/messenger/cloudfile/Box/management.dtd (%chrome/messenger/cloudfile/Box/management.dtd)
locale/@AB_CD@/messenger/cloudfile/Box/auth.dtd (%chrome/messenger/cloudfile/Box/auth.dtd)
locale/@AB_CD@/messenger/messengercompose/messengercompose.dtd (%chrome/messenger/messengercompose/messengercompose.dtd)
locale/@AB_CD@/messenger/messengercompose/addressingWidgetOverlay.dtd (%chrome/messenger/messengercompose/addressingWidgetOverlay.dtd)
locale/@AB_CD@/messenger/messengercompose/askSendFormat.dtd (%chrome/messenger/messengercompose/askSendFormat.dtd)
locale/@AB_CD@/messenger/messengercompose/askSendFormat.properties (%chrome/messenger/messengercompose/askSendFormat.properties)
locale/@AB_CD@/messenger/messengercompose/sendProgress.dtd (%chrome/messenger/messengercompose/sendProgress.dtd)
rename from mail/test/mozmill/cloudfile/test-cloudfile-backend-yousendit.js
rename to mail/test/mozmill/cloudfile/test-cloudfile-backend-hightail.js
--- a/mail/test/mozmill/cloudfile/test-cloudfile-backend-yousendit.js
+++ b/mail/test/mozmill/cloudfile/test-cloudfile-backend-hightail.js
@@ -1,26 +1,26 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
/**
- * Tests the YouSendIt Bigfile backend.
+ * Tests the Hightail Bigfile backend.
*/
let Cu = Components.utils;
let Cc = Components.classes;
let Ci = Components.interfaces;
-const MODULE_NAME = 'test-cloudfile-backend-yousendit';
+const MODULE_NAME = 'test-cloudfile-backend-hightail';
const RELATIVE_ROOT = '../shared-modules';
const MODULE_REQUIRES = ['folder-display-helpers',
'compose-helpers',
- 'cloudfile-yousendit-helpers',
+ 'cloudfile-hightail-helpers',
'observer-helpers',
'prompt-helpers',];
Cu.import('resource://gre/modules/Services.jsm');
var gServer, gObsManager;
function setupModule(module) {
@@ -31,37 +31,37 @@ function setupModule(module) {
ch.installInto(module);
let cfh = collector.getModule('cloudfile-helpers');
cfh.installInto(module);
let cbh = collector.getModule('cloudfile-backend-helpers');
cbh.installInto(module);
- let cyh = collector.getModule('cloudfile-yousendit-helpers');
+ let cyh = collector.getModule('cloudfile-hightail-helpers');
cyh.installInto(module);
let oh = collector.getModule('observer-helpers');
oh.installInto(module);
let ph = collector.getModule('prompt-helpers');
ph.installInto(module);
gObsManager = new cbh.SimpleRequestObserverManager();
// Enable logging for this group of tests.
- Services.prefs.setCharPref("YouSendIt.logging.dump", "All");
+ Services.prefs.setCharPref("Hightail.logging.dump", "All");
};
function teardownModule(module) {
- Services.prefs.clearUserPref("YouSendIt.logging.dump");
+ Services.prefs.clearUserPref("Hightail.logging.dump");
}
function setupTest() {
- gServer = new MockYouSendItServer();
+ gServer = new MockHightailServer();
gServer.init();
gServer.start();
}
function teardownTest() {
Services.prefs.QueryInterface(Ci.nsIPrefBranch)
.deleteBranch("mail.cloud_files.accounts");
gObsManager.check();
@@ -237,35 +237,35 @@ function test_create_existing_account()
mc.waitFor(function() done);
gMockAuthPromptReg.unregister();
}
function test_delete_refreshes_stale_token() {
const kFilename = "testFile1";
const kUserEmail = "test@example.com";
- // Stop the default YSI mock server, and create our own.
+ // Stop the default Hightail mock server, and create our own.
gServer.stop(mc);
- gServer = new MockYouSendItServer();
+ gServer = new MockHightailServer();
// Replace the auth component with one that counts auth
// requests.
- gServer.auth = new MockYouSendItAuthCounter(gServer);
+ gServer.auth = new MockHightailAuthCounter(gServer);
// Replace the deleter component with one that returns the
// stale token error.
- gServer.deleter = new MockYouSendItDeleterStaleToken(gServer);
+ gServer.deleter = new MockHightailDeleterStaleToken(gServer);
// Fire up the server.
gServer.init();
gServer.start();
gServer.setupUser({email: kUserEmail});
// We're testing to make sure that we refresh on stale tokens
// iff a password has been remembered for the user, so make
// sure we remember a password...
- remember_ysi_credentials(kUserEmail, "somePassword");
+ remember_hightail_credentials(kUserEmail, "somePassword");
// Get a prepared provider...
let provider = gServer.getPreparedBackend("someAccountKey");
let file = getFile("./data/" + kFilename, __file__);
gServer.planForUploadFile(kFilename);
let requestObserver = gObsManager.create("test_delete_refreshes_stale_token - upload 1");
provider.uploadFile(file, requestObserver);
mc.waitFor(function() requestObserver.success);
@@ -283,17 +283,17 @@ function test_delete_refreshes_stale_tok
// Now, since the token was stale, we should see us hit authentication
// again.
mc.waitFor(function() gServer.auth.count > 0,
"Timed out waiting for authorization attempt");
}
/**
- * Test for bug 771132 - if YouSendIt returns malformed URLs, prefix with
+ * Test for bug 771132 - if Hightail returns malformed URLs, prefix with
* https://.
*/
function test_bug771132_fix_no_scheme() {
const kMalformedUrl = "www.example.com/download/abcd1234";
const kExpectedUrl = "https://" + kMalformedUrl;
const kTopics = [kUploadFile, kGetFileURL];
rename from mail/test/mozmill/shared-modules/test-cloudfile-yousendit-helpers.js
rename to mail/test/mozmill/shared-modules/test-cloudfile-hightail-helpers.js
--- a/mail/test/mozmill/shared-modules/test-cloudfile-yousendit-helpers.js
+++ b/mail/test/mozmill/shared-modules/test-cloudfile-hightail-helpers.js
@@ -1,13 +1,13 @@
/* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
* You can obtain one at http://mozilla.org/MPL/2.0/. */
-const MODULE_NAME = "cloudfile-yousendit-helpers";
+const MODULE_NAME = "cloudfile-hightail-helpers";
Cu.import('resource://mozmill/stdlib/httpd.js');
Cu.import('resource://gre/modules/Services.jsm');
Cu.import('resource:///modules/cloudFileAccounts.js');
const kDefaultServerPort = 4444;
const kServerRoot = "http://localhost:" + kDefaultServerPort;
const kServerPath = "";
@@ -79,50 +79,50 @@ const kDefaultFilePrepare = {
}
const kDefaultCommitReturn = {
clickableDownloadUrl: "",
errorStatus: null,
}
function installInto(module) {
- module.MockYouSendItServer = MockYouSendItServer;
- module.MockYouSendItAuthCounter = MockYouSendItAuthCounter;
- module.MockYouSendItDeleterStaleToken = MockYouSendItDeleterStaleToken;
- module.remember_ysi_credentials = remember_ysi_credentials;
+ module.MockHightailServer = MockHightailServer;
+ module.MockHightailAuthCounter = MockHightailAuthCounter;
+ module.MockHightailDeleterStaleToken = MockHightailDeleterStaleToken;
+ module.remember_hightail_credentials = remember_hightail_credentials;
}
-function MockYouSendItServer() {
- this.auth = new MockYouSendItAuthSimple(this);
- this.userInfo = new MockYouSendItUserInfoSimple(this);
- this.registry = new MockYouSendItItemIdRegistry(this);
- this.committer = new MockYouSendItCommitterSimple(this);
- this.receiver = new MockYouSendItReceiverSimple(this);
- this.deleter = new MockYouSendItDeleterSimple(this);
- this.preparer = new MockYouSendItPrepareSimple(this);
+function MockHightailServer() {
+ this.auth = new MockHightailAuthSimple(this);
+ this.userInfo = new MockHightailUserInfoSimple(this);
+ this.registry = new MockHightailItemIdRegistry(this);
+ this.committer = new MockHightailCommitterSimple(this);
+ this.receiver = new MockHightailReceiverSimple(this);
+ this.deleter = new MockHightailDeleterSimple(this);
+ this.preparer = new MockHightailPrepareSimple(this);
}
-MockYouSendItServer.prototype = {
+MockHightailServer.prototype = {
_server: null,
getPreparedBackend: function MDBS_getPreparedBackend(aAccountKey) {
let username = this.userInfo.username;
Services.prefs.setCharPref("mail.cloud_files.accounts." + aAccountKey
+ ".username", username);
cloudFileAccounts.setSecretValue(aAccountKey, cloudFileAccounts.kTokenRealm, "someAuthToken");
- let yousendit = Cc["@mozilla.org/mail/yousendit;1"]
+ let hightail = Cc["@mozilla.org/mail/hightail;1"]
.createInstance(Ci.nsIMsgCloudFileProvider);
let urls = [kServerURL];
- yousendit.overrideUrls(urls.length, urls);
- yousendit.init(aAccountKey);
+ hightail.overrideUrls(urls.length, urls);
+ hightail.init(aAccountKey);
- return yousendit;
+ return hightail;
},
init: function MDBS_init(aConfig) {
this._config = overrideDefault(kDefaultConfig, aConfig);
this._server = new HttpServer();
this.auth.init(this._server);
@@ -149,17 +149,17 @@ MockYouSendItServer.prototype = {
this.deleter.shutdown();
this.committer.shutdown();
let allDone = false;
this._server.stop(function() {
allDone = true;
});
aController.waitFor(function () allDone,
- "Timed out waiting for YouSendIt server to stop!",
+ "Timed out waiting for Hightail server to stop!",
10000);
},
setupUser: function MDBS_wireUser(aData) {
this.userInfo.shutdown();
this.userInfo.init(this._server);
this.userInfo.setupUser(aData);
},
@@ -187,43 +187,43 @@ MockYouSendItServer.prototype = {
},
}
/**
* A simple authentication handler, regardless of input, returns
* an authorization token, and fires the cloudfile:auth observable
* topic.
*/
-function MockYouSendItAuthSimple(aYouSendIt) {
+function MockHightailAuthSimple(aHightail) {
this._server = null;
this._auth = null;
}
-MockYouSendItAuthSimple.prototype = {
+MockHightailAuthSimple.prototype = {
init: function(aServer) {
this._server = aServer;
this._auth = generateObservableRequestHandler(
"cloudfile:auth", "", JSON.stringify(kAuthResult));
this._server.registerPathHandler(kAuthPath, this._auth);
},
shutdown: function() {
this._server.registerPathHandler(kAuthPath, null);
this._server = null;
this._auth = null;
},
}
-function MockYouSendItUserInfoSimple(aYouSendIt) {
+function MockHightailUserInfoSimple(aHightail) {
this._server = null;
this._userInfo = null;
}
-MockYouSendItUserInfoSimple.prototype = {
+MockHightailUserInfoSimple.prototype = {
init: function(aServer) {
this._server = aServer;
},
setupUser: function(aData) {
aData = overrideDefault(kDefaultUser, aData);
this._userInfo = generateObservableRequestHandler(
@@ -236,22 +236,22 @@ MockYouSendItUserInfoSimple.prototype =
this._server = null;
},
get username() {
return kDefaultUser.email;
},
};
-function MockYouSendItItemIdRegistry(aYouSendIt) {
+function MockHightailItemIdRegistry(aHightail) {
this._itemIdMap = {};
this._itemIds = [];
}
-MockYouSendItItemIdRegistry.prototype = {
+MockHightailItemIdRegistry.prototype = {
init: function(aServer) {
this._itemIdMap = {};
this._itemIds = [];
},
shutdown: function() {
},
@@ -285,35 +285,35 @@ MockYouSendItItemIdRegistry.prototype =
if (this._itemIdMap[itemId] == aFilename)
return itemId;
}
return null;
},
}
/**
- * A simple preparation handler for a YouSendIt mock server. Allows
+ * A simple preparation handler for a Hightail mock server. Allows
* a client to query for a unique URL to upload to. Redirects the actual
* uploads to the passed receiver
*/
-function MockYouSendItPrepareSimple(aYouSendIt) {
+function MockHightailPrepareSimple(aHightail) {
this._server = null;
- this._ysi = aYouSendIt;
+ this._hightail = aHightail;
}
-MockYouSendItPrepareSimple.prototype = {
+MockHightailPrepareSimple.prototype = {
init: function(aServer) {
this._server = aServer;
this._server.registerPathHandler(kFolderInitUploadPath,
this._prepare.bind(this));
this._foldersId = {
root: 0,
- Apps: this._ysi.registry.createItemId(),
- "Mozilla Thunderbird" : this._ysi.registry.createItemId()
+ Apps: this._hightail.registry.createItemId(),
+ "Mozilla Thunderbird" : this._hightail.registry.createItemId()
};
// Set up folders info
for (let i in this._foldersId) {
this._server.registerPathHandler(kFolderPath + this._foldersId[i],
this._getFolderInfo.bind(this));
}
},
@@ -339,56 +339,56 @@ MockYouSendItPrepareSimple.prototype = {
status: 200
}
aResponse.setStatusLine(null, 200, "OK");
aResponse.setHeader("Content-Type", "application/json");
aResponse.write(JSON.stringify(response));
},
_prepare: function(aRequest, aResponse) {
- let fileId = this._ysi.registry.createItemId();
+ let fileId = this._hightail.registry.createItemId();
let uploadPath = kDefaultFileUploadPath + "/" + fileId;
let injectedData = {
fileId: fileId,
uploadUrl: [
kServerURL + uploadPath,
]
}
// Set up the path that will accept an uploaded file
this._server.registerPathHandler(uploadPath,
- this._ysi.receiver.receiveUpload
- .bind(this._ysi.receiver));
+ this._hightail.receiver.receiveUpload
+ .bind(this._hightail.receiver));
// Set up the path that will accept file deletion
let deletePath = kDeletePath + "/" + fileId;
this._server.registerPathHandler(deletePath,
- this._ysi.deleter.receiveDelete
- .bind(this._ysi.deleter));
+ this._hightail.deleter.receiveDelete
+ .bind(this._hightail.deleter));
let data = overrideDefault(kDefaultFilePrepare, injectedData);
aResponse.setStatusLine(null, 200, "OK");
aResponse.setHeader("Content-Type", "application/json");
aResponse.write(JSON.stringify(data));
},
};
-function MockYouSendItReceiverSimple(aYouSendIt) {
+function MockHightailReceiverSimple(aHightail) {
this._server = null;
- this._ysi = aYouSendIt;
+ this._hightail = aHightail;
this._expectedFiles = [];
this._mSeconds = {};
this._timers = [];
}
-MockYouSendItReceiverSimple.prototype = {
+MockHightailReceiverSimple.prototype = {
init: function(aServer) {
this._server = aServer;
},
shutdown: function() {
this._server = null;
this._expectedFiles = [];
},
@@ -416,17 +416,17 @@ MockYouSendItReceiverSimple.prototype =
Services.obs.notifyObservers(null, "cloudfile:uploadFile",
filename);
this._expectedFiles.splice(filenameIndex, 1);
let itemId = formData['bid'];
// Tell the committer how to map the uuid to the filename
- this._ysi.registry.setMapping(itemId, filename);
+ this._hightail.registry.setMapping(itemId, filename);
// De-register this URL...
this._server.registerPathHandler(aRequest.path, null);
if (filename in this._mSeconds) {
let timer = Cc["@mozilla.org/timer;1"].createInstance(Ci.nsITimer);
let timerEvent = {
notify: function(aTimer) {
@@ -449,24 +449,24 @@ MockYouSendItReceiverSimple.prototype =
this._mSeconds[aFilename] = aMSeconds;
},
get expecting() {
return this._expectedFiles;
}
};
-function MockYouSendItCommitterSimple(aYouSendIt) {
+function MockHightailCommitterSimple(aHightail) {
this._server = null;
- this._ysi = aYouSendIt;
+ this._hightail = aHightail;
this._itemIdMap = {};
this._filenameURLMap = {};
}
-MockYouSendItCommitterSimple.prototype = {
+MockHightailCommitterSimple.prototype = {
init: function(aServer) {
this._server = aServer;
// Since fileId is in query, we need to register path only once.
this._server.registerPathHandler(kFolderCommitUploadPath,
this.commit.bind(this));
},
shutdown: function() {
@@ -481,24 +481,24 @@ MockYouSendItCommitterSimple.prototype =
this._filenameURLMap[aFilename] = aURL;
},
commit: function(aRequest, aResponse) {
let fileId = aRequest.queryString;
fileId = fileId.substring(fileId.indexOf("fileId=") + 7);
fileId = fileId.substring(0, fileId.indexOf("&"));
- if (!this._ysi.registry.hasItemId(fileId)) {
+ if (!this._hightail.registry.hasItemId(fileId)) {
aResponse.setStatusLine(null, 500, "Bad request");
aResponse.write("The item ID " + fileId + " did not map to an item we "
+ "were prepared for committing");
return;
}
- let filename = this._ysi.registry.lookupFilename(fileId);
+ let filename = this._hightail.registry.lookupFilename(fileId);
let url;
if (filename in this._filenameURLMap)
url = this._filenameURLMap[filename];
else
url = kDownloadURLPrefix + "/" + filename;
let injectedData = {
@@ -510,46 +510,46 @@ MockYouSendItCommitterSimple.prototype =
aResponse.setStatusLine(null, 200, "OK");
aResponse.setHeader("Content-Type", "application/json");
aResponse.write(JSON.stringify(data));
Services.obs.notifyObservers(null, "cloudfile:getFileURL", filename);
},
};
-function MockYouSendItDeleterSimple(aYouSendIt) {
+function MockHightailDeleterSimple(aHightail) {
this._server = null;
- this._ysi = aYouSendIt;
+ this._hightail = aHightail;
this._expectDelete = [];
}
-MockYouSendItDeleterSimple.prototype = {
+MockHightailDeleterSimple.prototype = {
init: function(aServer) {
this._server = aServer;
},
shutdown: function() {},
receiveDelete: function(aRequest, aResponse) {
if (aRequest.method != "DELETE") {
aResponse.setStatusLine(null, 500, "Bad request");
aResponse.write("Expected a DELETE for deleting.");
return;
}
let fileId = aRequest.path.substring(kDeletePath.length + 1);
- if (!this._ysi.registry.hasItemId(fileId)) {
+ if (!this._hightail.registry.hasItemId(fileId)) {
aResponse.setStatusLine(null, 500, "Bad request");
aResponse.write("The item ID " + fileId + " did not map to an item "
+ "we were prepared for deleting");
return;
}
- let filename = this._ysi.registry.lookupFilename(fileId);
+ let filename = this._hightail.registry.lookupFilename(fileId);
let itemIndex = this._expectDelete.indexOf(filename);
if (itemIndex == -1) {
aResponse.setStatusLine(null, 500, "Bad request");
aResponse.write("Not prepared to delete file with filename: "
+ filename);
return;
}
@@ -563,22 +563,22 @@ MockYouSendItDeleterSimple.prototype = {
Services.obs.notifyObservers(null, "cloudfile:deleteFile", filename);
this._server.registerPathHandler(aRequest.path, null);
},
prepareForDelete: function(aFilename) {
this._expectDelete.push(aFilename);
},
};
-function MockYouSendItDeleterStaleToken(aYouSendIt) {
+function MockHightailDeleterStaleToken(aHightail) {
this._server = null;
- this._ysi = aYouSendIt;
+ this._hightail = aHightail;
}
-MockYouSendItDeleterStaleToken.prototype = {
+MockHightailDeleterStaleToken.prototype = {
init: function(aServer) {
this._server = aServer;
},
shutdown: function() {},
receiveDelete: function(aRequest, aResponse) {
let data = { errorStatus: { code: 401, message: "Invalid auth token" } };
@@ -586,23 +586,23 @@ MockYouSendItDeleterStaleToken.prototype
aResponse.setStatusLine(null, 401, "Invalid auth token");
aResponse.setHeader("Content-Type", "application/json");
aResponse.write(JSON.stringify(data));
},
prepareForDelete: function(aFilename) {},
};
-function MockYouSendItAuthCounter(aYouSendIt) {
+function MockHightailAuthCounter(aHightail) {
this._server = null;
- this._ysi = aYouSendIt;
+ this._hightail = aHightail;
this.count = 0;
}
-MockYouSendItAuthCounter.prototype = {
+MockHightailAuthCounter.prototype = {
init: function(aServer) {
this._server = aServer;
this._server.registerPathHandler(kAuthPath, this._auth.bind(this));
},
_auth: function(aRequest, aResponse) {
this.count += 1;
@@ -615,23 +615,23 @@ MockYouSendItAuthCounter.prototype = {
this._server.registerPathHandler(kAuthPath, null);
this._server = null;
this._auth = null;
},
}
/**
* Adds a username and password pair to nsILoginManager
- * for the YouSendIt provider instance to retrieve. This may
+ * for the Hightail provider instance to retrieve. This may
* fail if a password already exists for aUserrname.
*
* @param aUsername the username to save the password for
* @param aPassword the password to save
*/
-function remember_ysi_credentials(aUsername, aPassword) {
+function remember_hightail_credentials(aUsername, aPassword) {
let loginInfo = Cc["@mozilla.org/login-manager/loginInfo;1"]
.createInstance(Ci.nsILoginInfo);
loginInfo.init(kServerURL, null, kServerURL, aUsername,
aPassword, "", "");
Services.logins.addLogin(loginInfo);
}
--- a/mail/themes/linux/jar.mn
+++ b/mail/themes/linux/jar.mn
@@ -87,19 +87,19 @@ classic.jar:
skin/classic/messenger/addressbook/icons/contact-generic-tiny.png (mail/addrbook/contact-generic-tiny.png)
skin/classic/messenger/addressbook/icons/addressbook-toolbar.png (mail/addrbook/addressbook-toolbar.png)
skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png (mail/addrbook/addressbook-toolbar-small.png)
skin/classic/messenger/addressbook/icons/abcard-large.png (mail/addrbook/abcard-large.png)
skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
skin/classic/messenger/addressbook/icons/remote-addrbook-error.png (mail/addrbook/remote-addrbook-error.png)
skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png (mail/addrbook/secure-remote-addrbook.png)
skin/classic/messenger/cloudfile/addAccountDialog.css (mail/cloudfile/addAccountDialog.css)
- skin/classic/messenger/cloudfile/YouSendIt/settings.css (mail/cloudfile/YouSendIt/settings.css)
- skin/classic/messenger/cloudfile/YouSendIt/fileExceedsLimit.css (mail/cloudfile/YouSendIt/fileExceedsLimit.css)
- skin/classic/messenger/cloudfile/YouSendIt/check.png (mail/cloudfile/YouSendIt/check.png)
+ skin/classic/messenger/cloudfile/Hightail/settings.css (mail/cloudfile/Hightail/settings.css)
+ skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css (mail/cloudfile/Hightail/fileExceedsLimit.css)
+ skin/classic/messenger/cloudfile/Hightail/check.png (mail/cloudfile/Hightail/check.png)
skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
skin/classic/messenger/messengercompose/editorOverlay.css (mail/compose/editorOverlay.css)
skin/classic/messenger/messengercompose/compose-toolbar.png (mail/compose/compose-toolbar.png)
skin/classic/messenger/messengercompose/compose-toolbar-small.png (mail/compose/compose-toolbar-small.png)
skin/classic/messenger/messengercompose/format-buttons.png (mail/compose/format-buttons.png)
skin/classic/messenger/messengercompose/linux-noise.png (mail/compose/linux-noise.png)
% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
skin/classic/messenger-newsblog/feed-subscriptions.css (mail/newsblog/feed-subscriptions.css)
@@ -261,11 +261,11 @@ classic.jar:
skin/classic/messenger/newmailaccount/search.gif (mail/newmailaccount/search.gif)
skin/classic/messenger/newmailaccount/spinner.gif (mail/newmailaccount/spinner.gif)
skin/classic/messenger/newmailaccount/success-addons.png (mail/newmailaccount/success-addons.png)
skin/classic/messenger/newmailaccount/success-border.png (mail/newmailaccount/success-border.png)
skin/classic/messenger/newmailaccount/success-compose.png (mail/newmailaccount/success-compose.png)
skin/classic/messenger/newmailaccount/success-signature.png (mail/newmailaccount/success-signature.png)
skin/classic/messenger/newmailaccount/search.png (mail/newmailaccount/search.png)
skin/classic/messenger/icons/ubuntuone.png (mail/icons/ubuntuone.png)
- skin/classic/messenger/icons/yousendit.png (mail/icons/yousendit.png)
+ skin/classic/messenger/icons/hightail.png (mail/icons/hightail.png)
skin/classic/messenger/sanitizeDialog.css (mail/sanitizeDialog.css)
skin/classic/messenger/icons/box-logo.png (mail/icons/box-logo.png)
rename from mail/themes/linux/mail/cloudfile/YouSendIt/check.png
rename to mail/themes/linux/mail/cloudfile/Hightail/check.png
rename from mail/themes/linux/mail/cloudfile/YouSendIt/fileExceedsLimit.css
rename to mail/themes/linux/mail/cloudfile/Hightail/fileExceedsLimit.css
rename from mail/themes/linux/mail/cloudfile/YouSendIt/settings.css
rename to mail/themes/linux/mail/cloudfile/Hightail/settings.css
rename from mail/themes/linux/mail/icons/yousendit.png
rename to mail/themes/linux/mail/icons/hightail.png
--- a/mail/themes/osx/jar.mn
+++ b/mail/themes/osx/jar.mn
@@ -84,19 +84,19 @@ classic.jar:
skin/classic/messenger/addressbook/icons/addressbook@2x.png (mail/addrbook/addressbook@2x.png)
skin/classic/messenger/addressbook/icons/abcard.png (mail/addrbook/abcard.png)
skin/classic/messenger/addressbook/icons/ablist.png (mail/addrbook/ablist.png)
skin/classic/messenger/addressbook/icons/addrbook.png (mail/addrbook/addrbook.png)
skin/classic/messenger/addressbook/icons/remote-addrbook-error.png (mail/addrbook/remote-addrbook-error.png)
skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png (mail/addrbook/secure-remote-addrbook.png)
skin/classic/messenger/cloudfile/addAccountDialog.css (mail/cloudfile/addAccountDialog.css)
- skin/classic/messenger/cloudfile/YouSendIt/settings.css (mail/cloudfile/YouSendIt/settings.css)
- skin/classic/messenger/cloudfile/YouSendIt/fileExceedsLimit.css (mail/cloudfile/YouSendIt/fileExceedsLimit.css)
- skin/classic/messenger/cloudfile/YouSendIt/check.png (mail/cloudfile/YouSendIt/check.png)
+ skin/classic/messenger/cloudfile/Hightail/settings.css (mail/cloudfile/Hightail/settings.css)
+ skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css (mail/cloudfile/Hightail/fileExceedsLimit.css)
+ skin/classic/messenger/cloudfile/Hightail/check.png (mail/cloudfile/Hightail/check.png)
skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
skin/classic/messenger/messengercompose/attachmentnotification.png (mail/compose/attachmentnotification.png)
skin/classic/messenger/messengercompose/compose-toolbar.png (mail/compose/compose-toolbar.png)
skin/classic/messenger/messengercompose/compose-toolbar@2x.png (mail/compose/compose-toolbar@2x.png)
skin/classic/messenger/messengercompose/emoticon_cool.png (mail/compose/emoticon_cool.png)
skin/classic/messenger/messengercompose/emoticon_cry.png (mail/compose/emoticon_cry.png)
skin/classic/messenger/messengercompose/emoticon_embarrassed.png (mail/compose/emoticon_embarrassed.png)
skin/classic/messenger/messengercompose/emoticon_foot_in_mouth.png (mail/compose/emoticon_foot_in_mouth.png)
@@ -334,15 +334,15 @@ classic.jar:
skin/classic/messenger/newmailaccount/search.gif (mail/newmailaccount/search.gif)
skin/classic/messenger/newmailaccount/spinner.gif (mail/newmailaccount/spinner.gif)
skin/classic/messenger/newmailaccount/success-addons.png (mail/newmailaccount/success-addons.png)
skin/classic/messenger/newmailaccount/success-border.png (mail/newmailaccount/success-border.png)
skin/classic/messenger/newmailaccount/success-compose.png (mail/newmailaccount/success-compose.png)
skin/classic/messenger/newmailaccount/success-signature.png (mail/newmailaccount/success-signature.png)
skin/classic/messenger/newmailaccount/search.png (mail/newmailaccount/search.png)
skin/classic/messenger/icons/ubuntuone.png (mail/icons/ubuntuone.png)
- skin/classic/messenger/icons/yousendit.png (mail/icons/yousendit.png)
+ skin/classic/messenger/icons/hightail.png (mail/icons/hightail.png)
skin/classic/messenger/icons/expander-closed.png (mail/icons/expander-closed.png)
skin/classic/messenger/icons/expander-closed-active.png (mail/icons/expander-closed-active.png)
skin/classic/messenger/icons/expander-open.png (mail/icons/expander-open.png)
skin/classic/messenger/icons/expander-open-active.png (mail/icons/expander-open-active.png)
skin/classic/messenger/sanitizeDialog.css (mail/sanitizeDialog.css)
skin/classic/messenger/icons/box-logo.png (mail/icons/box-logo.png)
rename from mail/themes/osx/mail/cloudfile/YouSendIt/check.png
rename to mail/themes/osx/mail/cloudfile/Hightail/check.png
rename from mail/themes/osx/mail/cloudfile/YouSendIt/fileExceedsLimit.css
rename to mail/themes/osx/mail/cloudfile/Hightail/fileExceedsLimit.css
rename from mail/themes/osx/mail/cloudfile/YouSendIt/settings.css
rename to mail/themes/osx/mail/cloudfile/Hightail/settings.css
rename from mail/themes/osx/mail/icons/yousendit.png
rename to mail/themes/osx/mail/icons/hightail.png
--- a/mail/themes/windows/jar.mn
+++ b/mail/themes/windows/jar.mn
@@ -119,19 +119,19 @@ classic.jar:
skin/classic/messenger/addressbook/icons/contact-generic-tiny.png (mail/addrbook/contact-generic-tiny.png)
skin/classic/messenger/addressbook/icons/addressbook-toolbar.png (mail/addrbook/addressbook-toolbar.png)
skin/classic/messenger/addressbook/icons/addressbook-toolbar-small.png (mail/addrbook/addressbook-toolbar-small.png)
skin/classic/messenger/addressbook/icons/abcard-large.png (mail/addrbook/abcard-large.png)
skin/classic/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook.png)
skin/classic/messenger/addressbook/icons/remote-addrbook-error.png (mail/addrbook/remote-addrbook-error.png)
skin/classic/messenger/addressbook/icons/secure-remote-addrbook.png (mail/addrbook/secure-remote-addrbook.png)
skin/classic/messenger/cloudfile/addAccountDialog.css (mail/cloudfile/addAccountDialog.css)
- skin/classic/messenger/cloudfile/YouSendIt/settings.css (mail/cloudfile/YouSendIt/settings.css)
- skin/classic/messenger/cloudfile/YouSendIt/fileExceedsLimit.css (mail/cloudfile/YouSendIt/fileExceedsLimit.css)
- skin/classic/messenger/cloudfile/YouSendIt/check.png (mail/cloudfile/YouSendIt/check.png)
+ skin/classic/messenger/cloudfile/Hightail/settings.css (mail/cloudfile/Hightail/settings.css)
+ skin/classic/messenger/cloudfile/Hightail/fileExceedsLimit.css (mail/cloudfile/Hightail/fileExceedsLimit.css)
+ skin/classic/messenger/cloudfile/Hightail/check.png (mail/cloudfile/Hightail/check.png)
skin/classic/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose.css)
skin/classic/messenger/messengercompose/compose-toolbar.png (mail/compose/compose-toolbar.png)
skin/classic/messenger/messengercompose/compose-toolbar-small.png (mail/compose/compose-toolbar-small.png)
skin/classic/messenger/messengercompose/noise.png (mail/compose/noise.png)
skin/classic/messenger/messengercompose/format-buttons.png (mail/compose/format-buttons.png)
skin/classic/messenger/preferences/alwaysAsk.png (mail/preferences/alwaysAsk.png)
skin/classic/messenger/preferences/application.png (mail/preferences/application.png)
skin/classic/messenger/preferences/preferences.css (mail/preferences/preferences.css)
@@ -273,17 +273,17 @@ classic.jar:
skin/classic/messenger/newmailaccount/spinner.gif (mail/newmailaccount/spinner.gif)
skin/classic/messenger/newmailaccount/success-addons.png (mail/newmailaccount/success-addons.png)
skin/classic/messenger/newmailaccount/success-border.png (mail/newmailaccount/success-border.png)
skin/classic/messenger/newmailaccount/success-compose.png (mail/newmailaccount/success-compose.png)
skin/classic/messenger/newmailaccount/success-signature.png (mail/newmailaccount/success-signature.png)
skin/classic/messenger/newmailaccount/search.png (mail/newmailaccount/search.png)
skin/classic/messenger/sanitizeDialog.css (mail/sanitizeDialog.css)
skin/classic/messenger/icons/ubuntuone.png (mail/icons/ubuntuone.png)
- skin/classic/messenger/icons/yousendit.png (mail/icons/yousendit.png)
+ skin/classic/messenger/icons/hightail.png (mail/icons/hightail.png)
skin/classic/messenger/icons/box-logo.png (mail/icons/box-logo.png)
#ifdef XP_WIN
% skin communicator classic/1.0 %skin/classic/aero/communicator/ os=WINNT osversion>=6
skin/classic/aero/communicator/communicator.css (mail/communicator.css)
skin/classic/aero/communicator/smileys.css (mail/smileys.css)
skin/classic/aero/communicator/icons/smileys/smiley-smile.png (mail/icons/smiley-smile-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-frown.png (mail/icons/smiley-frown-aero.png)
skin/classic/aero/communicator/icons/smileys/smiley-wink.png (mail/icons/smiley-wink-aero.png)
@@ -383,19 +383,19 @@ classic.jar:
skin/classic/aero/messenger/addressbook/icons/contact-generic-tiny.png (mail/addrbook/contact-generic-tiny.png)
skin/classic/aero/messenger/addressbook/icons/addressbook-toolbar.png (mail/addrbook/addressbook-toolbar-aero.png)
skin/classic/aero/messenger/addressbook/icons/addressbook-toolbar-inverted.png (mail/addrbook/addressbook-toolbar-aero-inverted.png)
skin/classic/aero/messenger/addressbook/icons/abcard-large.png (mail/addrbook/abcard-large.png)
skin/classic/aero/messenger/addressbook/icons/remote-addrbook.png (mail/addrbook/remote-addrbook-aero.png)
skin/classic/aero/messenger/addressbook/icons/remote-addrbook-error.png (mail/addrbook/remote-addrbook-error.png)
skin/classic/aero/messenger/addressbook/icons/secure-remote-addrbook.png (mail/addrbook/secure-remote-addrbook-aero.png)
* skin/classic/aero/messenger/cloudfile/addAccountDialog.css (mail/cloudfile/addAccountDialog-aero.css)
- skin/classic/aero/messenger/cloudfile/YouSendIt/settings.css (mail/cloudfile/YouSendIt/settings.css)
- skin/classic/aero/messenger/cloudfile/YouSendIt/fileExceedsLimit.css (mail/cloudfile/YouSendIt/fileExceedsLimit.css)
- skin/classic/aero/messenger/cloudfile/YouSendIt/check.png (mail/cloudfile/YouSendIt/check.png)
+ skin/classic/aero/messenger/cloudfile/Hightail/settings.css (mail/cloudfile/Hightail/settings.css)
+ skin/classic/aero/messenger/cloudfile/Hightail/fileExceedsLimit.css (mail/cloudfile/Hightail/fileExceedsLimit.css)
+ skin/classic/aero/messenger/cloudfile/Hightail/check.png (mail/cloudfile/Hightail/check.png)
skin/classic/aero/messenger/messengercompose/messengercompose.css (mail/compose/messengercompose-aero.css)
skin/classic/aero/messenger/messengercompose/compose-toolbar.png (mail/compose/compose-toolbar-aero.png)
skin/classic/aero/messenger/messengercompose/compose-toolbar-inverted.png (mail/compose/compose-toolbar-aero-inverted.png)
skin/classic/aero/messenger/messengercompose/noise.png (mail/compose/noise.png)
skin/classic/aero/messenger/messengercompose/format-buttons.png (mail/compose/format-buttons-aero.png)
skin/classic/aero/messenger/preferences/alwaysAsk.png (mail/preferences/alwaysAsk.png)
skin/classic/aero/messenger/preferences/application.png (mail/preferences/application.png)
* skin/classic/aero/messenger/preferences/preferences.css (mail/preferences/preferences-aero.css)
@@ -539,12 +539,12 @@ classic.jar:
skin/classic/aero/messenger/newmailaccount/search.gif (mail/newmailaccount/search.gif)
skin/classic/aero/messenger/newmailaccount/spinner.gif (mail/newmailaccount/spinner.gif)
skin/classic/aero/messenger/newmailaccount/success-addons.png (mail/newmailaccount/success-addons.png)
skin/classic/aero/messenger/newmailaccount/success-border.png (mail/newmailaccount/success-border.png)
skin/classic/aero/messenger/newmailaccount/success-compose.png (mail/newmailaccount/success-compose.png)
skin/classic/aero/messenger/newmailaccount/success-signature.png (mail/newmailaccount/success-signature.png)
skin/classic/aero/messenger/newmailaccount/search.png (mail/newmailaccount/search.png)
skin/classic/aero/messenger/icons/ubuntuone.png (mail/icons/ubuntuone.png)
- skin/classic/aero/messenger/icons/yousendit.png (mail/icons/yousendit.png)
+ skin/classic/aero/messenger/icons/hightail.png (mail/icons/hightail.png)
skin/classic/aero/messenger/sanitizeDialog.css (mail/sanitizeDialog.css)
skin/classic/aero/messenger/icons/box-logo.png (mail/icons/box-logo.png)
#endif
rename from mail/themes/windows/mail/cloudfile/YouSendIt/check.png
rename to mail/themes/windows/mail/cloudfile/Hightail/check.png
rename from mail/themes/windows/mail/cloudfile/YouSendIt/fileExceedsLimit.css
rename to mail/themes/windows/mail/cloudfile/Hightail/fileExceedsLimit.css
rename from mail/themes/windows/mail/cloudfile/YouSendIt/settings.css
rename to mail/themes/windows/mail/cloudfile/Hightail/settings.css
rename from mail/themes/windows/mail/icons/yousendit.png
rename to mail/themes/windows/mail/icons/hightail.png
