Permalink
Browse files

Remove all etherpad.com references, mentions, and uses.

The etherpad repository is mostly a direct copy of their site and
infrastructure at the time of the Google acquisition.  There are
a lot of hard-coded etherpad.com references throughout the code.

This changeset removes all etherpad.com specificities in forms of:
  - URLs
  - email addresses (both To and From)
  - corporate specific data (support forum mentions, crazy javascript email
    obfuscator)

Email addresses are now configured in the property file
instead of being hard-coded throughout 40 different files.

A new config value is introduced to specifiy a global To address.
(A config value for a global From address was introduced previously, but
it wasn't used throughout the codebase until now.)

The global To address is used to send automated notices about signups, new
orders, lead gen questions, and exceptional exceptions.
  • Loading branch information...
1 parent 3427e45 commit 95ed1cffc0679b19c94ffc102b0bd4dbbc3ae322 @mattsta committed Dec 27, 2009
Showing with 86 additions and 145 deletions.
  1. +7 −2 README
  2. +3 −0 etherpad/etc/etherpad.localdev-default.properties.in
  3. +4 −4 etherpad/src/etherpad/billing/team_billing.js
  4. +3 −3 etherpad/src/etherpad/control/aboutcontrol.js
  5. +1 −1 etherpad/src/etherpad/control/historycontrol.js
  6. +2 −2 etherpad/src/etherpad/control/pad/pad_control.js
  7. +1 −1 etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
  8. +5 −5 etherpad/src/etherpad/control/pro/admin/team_billing_control.js
  9. +1 −1 etherpad/src/etherpad/control/pro_beta_control.js
  10. +3 −3 etherpad/src/etherpad/control/statscontrol.js
  11. +3 −4 etherpad/src/etherpad/control/store/eepnet_checkout_control.js
  12. +0 −5 etherpad/src/etherpad/helpers.js
  13. +1 −1 etherpad/src/etherpad/legacy_urls.js
  14. +2 −2 etherpad/src/etherpad/licensing.js
  15. +4 −3 etherpad/src/etherpad/metrics/metrics.js
  16. +0 −1 etherpad/src/etherpad/pad/pad_migrations.js
  17. +0 −1 etherpad/src/etherpad/pad/padutils.js
  18. +1 −1 etherpad/src/etherpad/pne/pne_utils.js
  19. +1 −1 etherpad/src/etherpad/pro/pro_accounts.js
  20. +3 −3 etherpad/src/etherpad/quotas.js
  21. +2 −2 etherpad/src/etherpad/store/checkout.js
  22. +3 −3 etherpad/src/etherpad/store/eepnet_checkout.js
  23. +6 −6 etherpad/src/etherpad/store/eepnet_trial.js
  24. +7 −11 etherpad/src/main.js
  25. +3 −3 etherpad/src/static/js/pad_modals.js
  26. +1 −1 etherpad/src/static/js/pro/guest-knock-client.js
  27. +1 −1 etherpad/src/static/js/store.js
  28. +1 −1 etherpad/src/templates/500_body.ejs
  29. +1 −1 etherpad/src/templates/beta/signup.ejs
  30. +2 −2 etherpad/src/templates/email/eepnet_license_info.ejs
  31. +0 −1 etherpad/src/templates/email/padinvite.ejs
  32. +0 −7 etherpad/src/templates/framed/framedheader-pro.ejs
  33. +0 −15 etherpad/src/templates/pad/pad_body2.ejs
  34. +0 −4 etherpad/src/templates/pad/padfull_body.ejs
  35. +1 −2 etherpad/src/templates/pro-help/billing.ejs
  36. +2 −6 etherpad/src/templates/pro-help/main.ejs
  37. +1 −3 etherpad/src/templates/pro/account/account-welcome-email.ejs
  38. +0 −1 etherpad/src/templates/pro/admin/manage-billing.ejs
  39. +4 −9 etherpad/src/templates/pro/admin/pne-license-manager.ejs
  40. +1 −1 etherpad/src/templates/pro/pro-payment-required.ejs
  41. +3 −10 etherpad/src/templates/pro/pro_home.ejs
  42. +1 −1 etherpad/src/templates/store/eepnet_eval_signup.ejs
  43. +0 −5 infrastructure/.hgignore
  44. +0 −2 infrastructure/ace/.hgignore
  45. +0 −3 infrastructure/ace/build/.hgignore
  46. +1 −0 setup.sh
View
9 README
@@ -9,6 +9,9 @@ This repository is EtherPad with a few goals:
* Rip out all etherpad.com specific mentions (URLs, email addresses,
support links) and cleanup unused parts (like .gitignore files being put
in a mercurial repo).
+ * Investigate corporate legacy portions (payment infrastructure, recurring
+ billing queues, lead gen) and either remove or generalize portions
+ for greater uses.
The original EtherPad repository on Google Code had a crappy directory layout
so I fixed it in the initial commit of this repository. As a consequence,
@@ -18,17 +21,19 @@ most likely dead.
Potential future goals after learning the code further:
* Add git hooks to create a branchy revisioned live-editable pasteboard.
+ * Add embeddable <textarea> and <input> zero-signup collaboration fields.
%%%----------------------------------------------------------------------
-%%% Current Status: 2009/12/25
+%%% Current Status: 2009/12/27
%%%----------------------------------------------------------------------
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Project | Status | When
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Remove MySQL Support | Complete | 2009/12/19-24
PostgreSQL Support | Complete | 2009/12/24
Simplify install procedure | Complete | 2009/12/24
-Remove etherpad.com specific parts | In-progress |
+Remove etherpad.com specific mentions | Complete | 2009/12/27
+Cleanup/generalize corporate legacy parts | Not Started |
Find missing parts of blog infrastructure | Not Started |
%%%----------------------------------------------------------------------
View
3 etherpad/etc/etherpad.localdev-default.properties.in
@@ -13,6 +13,7 @@ etherpad.SQL_USERNAME = etherpad
etherpad.SQL_PASSWORD = password
etherpad.skipHostnameCheck = true
etherpad.email.fromAddr = EMAIL_FROM_ADDR
+etherpad.email.toAddr = EMAIL_TO_ADDR
#etherpad.soffice=/opt/openoffice.org3/program/soffice.bin
#etherpad.sofficeConversionServer=localhost:8100
debugSQL = false
@@ -23,3 +24,5 @@ modulePath = ./src
transportPrefix = /comet
transportUseWildcardSubdomains = true
useVirtualFileRoot = ./src
+# Certain URLs will automatically reference https://. You can turn it off:
+disableHttps = false
View
8 etherpad/src/etherpad/billing/team_billing.js
@@ -401,7 +401,7 @@ function sendReceiptEmail(subscription, invoice) {
globals: globals
});
var address = paymentInfo.email;
- checkout.salesEmail(address, "sales@etherpad.com", "EtherPad: Receipt for "+paymentInfo.fullname,
+ checkout.salesEmail(address, appjet.config['etherpad.email.fromAddr'], "EtherPad: Receipt for "+paymentInfo.fullname,
{}, emailText);
}
@@ -414,9 +414,9 @@ function sendFailureEmail(subscription, invoice, failureMessage) {
billingError: failureMessage,
balance: "US $"+checkout.dollars(billing.centsToDollars(invoice.amt)),
suspensionDate: checkout.formatDate(new Date(subscription.paidThrough.getTime()+GRACE_PERIOD_DAYS*86400*1000)),
- billingAdminLink: "https://"+subDomain+".etherpad.com/ep/admin/billing/"
+ billingAdminLink: "https://"+subDomain+"."+appjet.config['fromDomain']+"/ep/admin/billing/"
});
var address = paymentInfo.email;
- checkout.salesEmail(address, "sales@etherpad.com", "EtherPad: Payment Failure for "+paymentInfo.fullname,
+ checkout.salesEmail(address, appjet.config['etherpad.email.fromAddr'], "EtherPad: Payment Failure for "+paymentInfo.fullname,
{}, emailText);
-}
+}
View
6 etherpad/src/etherpad/control/aboutcontrol.js
@@ -198,11 +198,11 @@ function render_eepnet_pricing_contact_post() {
"This record has automatically been added to SalesForce. See the salesforce lead page for more details.",
"", "Session Referer: "+ref, ""
].join("\n");
- var toAddr = 'sales@etherpad.com';
+ var toAddr = appjet.config['etherpad.email.toAddr'];
if (isTestEmail(data.email)) {
- toAddr = 'blackhole@appjet.com';
+ toAddr = 'blackhole';
}
- sendEmail(toAddr, 'sales@etherpad.com', subject, {}, body);
+ sendEmail(toAddr, appjet.config['etherpad.email.fromAddr'], subject, {}, body);
// all done!
response.write("OK");
View
2 etherpad/src/etherpad/control/historycontrol.js
@@ -86,7 +86,7 @@ function _do_stat(padId) {
function _censorText(text) {
// may not change length of text
- return text.replace(/(http:\/\/etherpad.com\/)(\w+)/g, function(url, u1, u2) {
+ return text.replace(/(http:\/\/.*?\/)(\w+)/g, function(url, u1, u2) {
return u1 + u2.replace(/\w/g, '-');
});
}
View
4 etherpad/src/etherpad/control/pad/pad_control.js
@@ -637,8 +637,8 @@ function render_feedback_post() {
feedback: request.params.feedback});
sendEmail(
- 'feedback@etherpad.com',
- 'feedback@etherpad.com',
+ appjet.config['etherpad.email.toAddr'],
+ appjet.config['etherpad.email.fromAddr'],
subject,
{},
feedback
View
2 etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
@@ -270,7 +270,7 @@ function render_recover_padtext_get() {
if (showPadHelp) {
d.push(P({style: "font-size: 1em; color: #555;"},
'The pad ID is the same as the URL to the pad, without the leading "/".',
- ' For example, if the pad lives at http://etherpad.com/foobar,',
+ ' For example, if the pad lives at /foobar,',
' then the pad ID is "foobar" (without the quotes).'))
}
View
10 etherpad/src/etherpad/control/pro/admin/team_billing_control.js
@@ -250,7 +250,7 @@ function _attemptAuthorization(success_f) {
_validationError('', "A temporary error has prevented processing of your payment. Please try again later.");
} else {
billing.log({'type': 'FATAL', value: "Unknown error: "+result.status+" - debug: "+result.debug});
- sendEmail('support@etherpad.com', 'urgent@etherpad.com', 'UNKNOWN ERROR WARNING!', {},
+ sendEmail(appjet.config['etherpad.email.toAddr'], appjet.config['etherpad.email.fromAddr'], 'UNKNOWN ERROR WARNING!', {},
"Hey,\n\nThis is a billing system error. Some unknown error occurred. "+
"This shouldn't ever happen. Probably good to let J.D. know. <grin>\n\n"+
fastJSON.stringify(cart));
@@ -284,7 +284,7 @@ function _processNewSubscription() {
});
if (globals.isProduction()) {
- sendEmail('sales@etherpad.com', 'sales@etherpad.com', "EtherPad: New paid pro account for "+fullName, {},
+ sendEmail(appjet.config['etherpad.email.toAddr'], appjet.config['etherpad.email.fromAddr'], "EtherPad: New paid pro account for "+fullName, {},
"This is an automatic notification.\n\n"+fullName+" ("+email+") successfully set up "+
"a billing profile for domain: "+domainName+".");
}
@@ -363,10 +363,10 @@ function _processInvoicePurchase() {
"\nEmail: ",
pro_accounts.getSessionProAccount().email
].join("\n");
- var recipient = (globals.isProduction() ? 'sales@etherpad.com' : 'jd@appjet.com');
+ var recipient = appjet.config['etherpad.email.toAddr'];
sendEmail(
recipient,
- 'sales@etherpad.com',
+ appjet.config['etherpad.email.fromAddr'],
'Invoice payment request - '+pro_utils.getProRequestSubdomain(),
{},
"Hi there,\n\nA pro user tried to pay by invoice. Their information follows."+
@@ -444,4 +444,4 @@ function render_invoices() {
centsToDollars: billing.centsToDollars
});
}
-}
+}
View
2 etherpad/src/etherpad/control/pro_beta_control.js
@@ -121,7 +121,7 @@ function sendInvite(recordId) {
signupCode: code,
activationUrl: "http://"+httpHost(request.host)+"/ep/pro-signup/?sc="+code
});
- sendEmail(record.email, "EtherPad <support@etherpad.com>",
+ sendEmail(record.email, appjet.config['etherpad.email.fromAddr'],
"Your EtherPad Professional Beta Account", {}, body);
});
View
6 etherpad/src/etherpad/control/statscontrol.js
@@ -101,7 +101,7 @@ var statDisplays = {
// free pad usage
{ name: "free pad usage, 1 day",
- description: "Free etherpad.com users, total over a %t period",
+ description: "Free etherpad users, total over a %t period",
type: "compare",
stats: [ {stat: "active_user_ids",
description: "All users",
@@ -113,7 +113,7 @@ var statDisplays = {
description: "Users returning after 30 days",
color: "FF0000"} ] },
{ name: "free pad usage, 7 day",
- description: "Free etherpad.com users over the last 7 days",
+ description: "Free etherpad users over the last 7 days",
type: "compare",
options: { hideLive: true, latestUseHistorical: true},
stats: [ {stat: "active_user_ids_7days",
@@ -126,7 +126,7 @@ var statDisplays = {
description: "Users returning after 30 days",
color: "FF0000"} ] },
{ name: "free pad usage, 30 day",
- description: "Free etherpad.com users over the last 30 days",
+ description: "Free etherpad users over the last 30 days",
type: "compare",
options: { hideLive: true, latestUseHistorical: true},
stats: [ {stat: "active_user_ids_30days",
View
7 etherpad/src/etherpad/control/store/eepnet_checkout_control.js
@@ -671,16 +671,15 @@ function _performCreditCardPurchase() {
billing.log({'type': 'FATAL', value: "Direct purchase failed on paypal.", cart: cart, paypal: paypalResult});
if (result.errorField.permanentErrors[0] == 'invoiceId') {
// repeat invoice id. damnit, this is bad.
- sendEmail('support@etherpad.com', 'urgent@etherpad.com', 'DUPLICATE INVOICE WARNING!', {},
+ sendEmail(appjet.config['etherpad.email.toAddr'], appjet.config['etherpad.email.fromAddr'], 'DUPLICATE INVOICE WARNING!', {},
"Hey,\n\nThis is a billing system error. The EEPNET checkout tried to make a "+
"purchase with PayPal and got a duplicate invoice error on invoice ID "+cart.invoiceId+
".\n\nUnless you're expecting this (or recently ran a selenium test, or have reason to "+
"believe this isn't an exceptional condition, please look into this "+
"and get back to the user ASAP!\n\n"+fastJSON.stringify(cart));
_validationError('', "Your payment was processed, but we cannot proceed. "+
"You will hear from us shortly via email. (If you don't hear from us "+
- "within 24 hours, please email <a href='mailto:sales@etherpad.com'>"+
- "sales@etherpad.com</a>.)");
+ "within 24 hours, please email " + appjet.config['etherpad.email.toAddr'] + ")");
}
checkout.validateErrorFields(function(x, y) { _validationError(x, y, 'billing-info') }, "There seems to be an error in your billing information."+
" Please verify and correct your ",
@@ -690,7 +689,7 @@ function _performCreditCardPurchase() {
_validationError('', "A temporary error has prevented processing of your payment. Please try again later.");
} else {
billing.log({'type': 'FATAL', value: "Unknown error: "+result.status+" - debug: "+result.debug});
- sendEmail('support@etherpad.com', 'urgent@etherpad.com', 'UNKNOWN ERROR WARNING!', {},
+ sendEmail(appjet.config['etherpad.email.toAddr'], appjet.config['etherpad.email.fromAddr'], 'UNKNOWN ERROR WARNING!', {},
"Hey,\n\nThis is a billing system error. Some unknown error occurred. "+
"This shouldn't ever happen. Probably good to let J.D. know. <grin>\n\n"+
fastJSON.stringify(cart));
View
5 etherpad/src/etherpad/helpers.js
@@ -193,11 +193,6 @@ function cssIncludes() {
}
}
-function oemail(username) {
- return '&lt;<a class="obfuscemail" href="mailto:'+username+'@e***rp*d.com">'+
- username+'@e***rp*d.com</a>&gt;';
-}
-
function googleAnalytics() {
// GA disabled always now.
return '';
View
2 etherpad/src/etherpad/legacy_urls.js
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-/* legacy URLs only apply to the public etherpad.com site. (not Pro or PNE). */
+/* legacy URLs only apply to the public site. (not Pro or PNE). */
var _legacyURLs = {
'/ep/beta-signup': '/',
View
4 etherpad/src/etherpad/licensing.js
@@ -16,8 +16,8 @@
/*
- * This file used to control access restrictions for various sites like
- * etherpad.com or on-prem installations of etherpad, or evaluation
+ * This file used to control access restrictions for various
+ * public sites or on-prem installations of etherpad, or evaluation
* editions. For the open-source effort, I have gutted out the
* restrictions. --aiba
*/
View
7 etherpad/src/etherpad/metrics/metrics.js
@@ -327,10 +327,11 @@ function getOrigins(startDate, endDate, useReferer, shouldAggregatePads) {
}
});
});
-
+
+ var fromBase = "http://" + appjet.config['fromDomain'];
if (useReferer) {
- flowFirsts = flowFirsts.filter(function(x) { return ! startsWith(x, "http://etherpad.com"); });
- sessionKeyFirsts = sessionKeyFirsts.filter(function(x) { return ! startsWith(x, "http://etherpad.com"); });
+ flowFirsts = flowFirsts.filter(function(x) { return ! startsWith(x, fromBase); });
+ sessionKeyFirsts = sessionKeyFirsts.filter(function(x) { return ! startsWith(x, fromBase); });
}
return {
View
1 etherpad/src/etherpad/pad/pad_migrations.js
@@ -31,7 +31,6 @@ function onStartup() {
appjet.cache.pad_migrations = {};
}
- // this part can be removed when all pads are migrated on etherpad.com
//if (! pne_utils.isPNE()) {
// System.out.println("Building cache for live migrations...");
// initLiveMigration();
View
1 etherpad/src/etherpad/pad/padutils.js
@@ -97,7 +97,6 @@ function getGlobalPadId(localPadId) {
if (pro_utils.isProDomainRequest()) {
return makeGlobalId(domains.getRequestDomainId(), localPadId);
} else {
- // etherpad.com pads
return localPadId;
}
}
View
2 etherpad/src/etherpad/pne/pne_utils.js
@@ -167,7 +167,7 @@ function pneTrackerHtml() {
}
function trackData(name, value) {
- var imgurl = "http://etherpad.com/ep/tpne/t?";
+ var imgurl = "http://" + appjet.config['fromDomain'] + "/ep/tpne/t?";
if (key) {
imgurl += ("k="+key+"&");
}
View
2 etherpad/src/etherpad/pro/pro_accounts.js
@@ -468,7 +468,7 @@ function getEtherpadAdminAccount() {
id: 0,
isAdmin: true,
fullName: "ETHERPAD ADMIN",
- email: "support@etherpad.com",
+ email: appjet.config['etherpad.email.toAddr'],
domainId: domains.getRequestDomainId(),
isDeleted: false
};
View
6 etherpad/src/etherpad/quotas.js
@@ -29,7 +29,7 @@ function getMaxSimultaneousPadEditors(globalPadId) {
return 1e6;
}
} else {
- // etherpad.com public pads
+ // public pads
if (globalPadId && stringutils.startsWith(globalPadId, "conf-")) {
return 64;
} else {
@@ -41,9 +41,9 @@ function getMaxSimultaneousPadEditors(globalPadId) {
function getMaxSavedRevisionsPerPad() {
if (isProDomainRequest()) {
- return 1e3;
+ return 1e6;
} else {
- // free public etherpad.com
+ // free public pads
return 100;
}
}
View
4 etherpad/src/etherpad/store/checkout.js
@@ -295,6 +295,6 @@ function formatDate(date) {
function salesEmail(to, from, subject, headers, body) {
sendEmail(to, from, subject, headers, body);
if (globals.isProduction()) {
- sendEmail("sales@etherpad.com", from, subject, headers, body);
+ sendEmail(appjet.config['etherpad.email.toAddr'], from, subject, headers, body);
}
-}
+}
View
6 etherpad/src/etherpad/store/eepnet_checkout.js
@@ -87,15 +87,15 @@ function licenseEmailText(userName, licenseKey) {
function sendReceiptEmail(cart) {
var receipt = cart.receiptEmail || receiptEmailText(cart);
- salesEmail(cart.email, "sales@etherpad.com",
+ salesEmail(cart.email, appjet.config['etherpad.email.fromAddr'],
"EtherPad: Receipt for "+cart.ownerName+" ("+cart.orgName+")",
{}, receipt);
}
function sendLicenseEmail(cart) {
var licenseEmail = licenseEmailText(cart.ownerName, cart.licenseKey);
- salesEmail(cart.email, "sales@etherpad.com",
+ salesEmail(cart.email, appjet.config['etherpad.email.fromAddr'],
"EtherPad: License Key for "+cart.ownerName+" ("+cart.orgName+")",
{}, licenseEmail);
-}
+}
View
12 etherpad/src/etherpad/store/eepnet_trial.js
@@ -38,7 +38,7 @@ function getTrialUserQuota() {
function mailLicense(data, licenseKey, expiresDate) {
var toAddr = data.email;
if (isTestEmail(toAddr)) {
- toAddr = "blackhole@appjet.com";
+ toAddr = "blackhole";
}
var subject = ('EtherPad: Trial License Information for '+
data.firstName+' '+data.lastName+' ('+data.orgName+')');
@@ -52,7 +52,7 @@ function mailLicense(data, licenseKey, expiresDate) {
sendEmail(
toAddr,
- 'sales@etherpad.com',
+ appjet.config['etherpad.email.fromAddr'],
subject,
{},
emailBody
@@ -157,7 +157,7 @@ function getWeb2LeadData(data, ip, ref) {
if (!isProduction()) {
// w2ldata.debug = "1";
-// w2ldata.debugEmail = "aaron@appjet.com";
+// w2ldata.debugEmail = "aaron@something.com";
}
return w2ldata;
@@ -188,13 +188,13 @@ function _sendSalesNotification(data, ip, ref) {
""
].join("\n");
- var toAddr = 'sales@etherpad.com';
+ var toAddr = appjet.config['etherpad.email.toAddr'];
if (isTestEmail(data.email)) {
- toAddr = 'blackhole@appjet.com';
+ toAddr = 'blackhole';
}
sendEmail(
toAddr,
- 'sales@etherpad.com',
+ appjet.config['etherpad.email.fromAddr'],
subject,
{'Reply-To': data.email},
body
View
18 etherpad/src/main.js
@@ -271,7 +271,7 @@ function checkHost() {
return;
}
- // redirect to etherpad.com
+ // redirect to the primary superdomain
var newurl = fromDomain+request.path;
if (request.query) { newurl += "?"+request.query; }
response.redirect(newurl);
@@ -283,13 +283,9 @@ function checkHost() {
// Check for HTTPS
function checkHTTPS() {
- /* Open-source note: this function used to check the protocol and make
- * sure that pages that needed to be secure went over HTTPS, and pages
- * that didn't go over HTTP. However, when we open-sourced the code,
- * we disabled HTTPS because we didn't want to ship the etherpad.com
- * private crypto keys. --aiba */
- return;
-
+ if (appjet.config['disableHttps'] === "true") {
+ return;
+ }
if (stringutils.startsWith(request.path, "/static/")) { return; }
@@ -310,8 +306,8 @@ function checkHTTPS() {
var _requiredHttpsPrefixes = [
'/ep/admin', // pro and etherpad
'/ep/account', // pro only
- '/ep/store', // etherpad.com only
- '/ep/pro-account' // etherpad.com only
+ '/ep/store', // etherpad main site only
+ '/ep/pro-account' // etherpad main site only
];
var httpsRequired = false;
@@ -398,7 +394,7 @@ function handlePath() {
]);
// dispatching logic: first try common, then dispatch to
- // etherpad.com or pro.
+ // main site or pro.
if (commonDispatcher.dispatch()) {
return;
View
6 etherpad/src/static/js/pad_modals.js
@@ -131,7 +131,7 @@ var padmodals = (function() {
});
$("#feedbackemails a").each(function() {
var node = $(this);
- node.attr('href', "mailto:"+node.attr('href')+"@etherpad.com");
+ node.attr('href', "mailto:"+node.attr('href')+ <= '"@' + appjet.config['fromDomain'] + '"' %>);
});
},
initShareBox: function() {
@@ -280,7 +280,7 @@ var padmodals = (function() {
}
function error(e) {
setSendingFeedback(false);
- $("#feedbackbox-response").html("Could not send feedback. Please email us at feedback"+"@"+"etherpad.com instead.").get(0).className = 'badresponse';
+ $("#feedbackbox-response").html("Could not send feedback. Please email us at feedback instead.").get(0).className = 'badresponse';
$("#feedbackbox-response").show();
}
},*/
@@ -361,4 +361,4 @@ var padmodals = (function() {
}
};
return self;
-}());
+}());
View
2 etherpad/src/static/js/pro/guest-knock-client.js
@@ -44,7 +44,7 @@ function knockReply(responseText) {
}
function knockError() {
- alert("There was an error requesting access to the pad. Kindly report this by sending email to bugs@etherpad.com.");
+ alert("There was an error requesting access to the pad. Kindly report this by sending email to bugs.");
}
$(document).ready(function() {
View
2 etherpad/src/static/js/store.js
@@ -74,7 +74,7 @@ store.eepnetTrial.submit = function() {
$('#dlsignup').hide();
$('#processingmsg').fadeIn('fast');
- // first stubmit to etherpad.com...
+ // first stubmit to the main site
var data = {};
$(".signupData").each(function() {
data[$(this).attr("id")] = $(this).val();
View
2 etherpad/src/templates/500_body.ejs
@@ -19,7 +19,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad Internal S
<div id="errorpage" class="fpcontent">
<div class="error500">
<p>Oops! A server error occured. It's been logged.</p>
- <p>Please email &lt;support@etherpad.com&gt; if this persists.</p>
+ <p>Please email support if this persists.</p>
</div>
</div>
<% } %>
View
2 etherpad/src/templates/beta/signup.ejs
@@ -44,7 +44,7 @@ limitations under the License. */ %><% helpers.includeJQuery() %>
</form>
- <p>Email <%= helpers.oemail("support") %> with questions or
+ <p>Email support with questions or
concerns.</p>
</div>
View
4 etherpad/src/templates/email/eepnet_license_info.ejs
@@ -61,12 +61,12 @@ DOWNLOAD LINK:
<% if (isEvaluation) { %>
--
-This email was sent automatically from etherpad.com because you signed
+This email was sent automatically from etherpad because you signed
up for EtherPad PNE. If you did not sign up for
this, then you can safely just ignore this email.
<% } else { %>
--
Thanks for buying EtherPad!
-<% } %>
+<% } %>
View
1 etherpad/src/templates/email/padinvite.ejs
@@ -15,4 +15,3 @@ limitations under the License. */ %><%= body %>
--
Sent by <%= request.host %> at the request of an EtherPad user.
Do not reply to this email.
-Report abuse to: support@etherpad.com
View
7 etherpad/src/templates/framed/framedheader-pro.ejs
@@ -68,10 +68,3 @@ limitations under the License. */ %><% helpers.addBodyClass("pro-withtopbar"); %
<%= helpers.clearFloats() %>
</div>
</div>
-
-<!--
-<div id="shuttingdown">
- <strong style="color:red">Note: EtherPad.com is shutting down March 31, 2010.</strong>
- <a href="http://<%= fullSuperdomain %>/ep/blog/posts/google-acquires-appjet">(more info)</a>
-</div>
--->
View
15 etherpad/src/templates/pad/pad_body2.ejs
@@ -93,12 +93,6 @@ limitations under the License. */ %>
<% } %>
<div id="specialkeyarea"><!-- --></div>
</div>
-<!--
- <div id="shuttingdown">
- <strong style="color:red">Note: EtherPad.com is shutting down March 31, 2010.</strong>
- <a href="http://<%= fullSuperdomain %>/ep/blog/posts/google-acquires-appjet">(more info)</a>
- </div>
- -->
<div id="alertbar">
<div id="servermsg">
<h3>Server Notice<span id="servermsgdate"><!-- --></span>:</h3>
@@ -436,15 +430,6 @@ limitations under the License. */ %>
<div id="feedbackbox-contents">
<div id="feedbackbox-contentsinner">
<p><strong>Great, we love feedback! What kind?</strong></p>
- <ul id="uservoicelinks">
- <li><a href="http://uservoice.etherpad.com/pages/17280-feature-requests" target="_blank">Feature Request</a></li>
- <li><a href="http://uservoice.etherpad.com/pages/17285-bugs-and-problems" target="_blank">Bug Report</a></li>
- <li><a href="http://uservoice.etherpad.com/pages/22732-how-are-you-using-etherpad-" target="_blank">How I'm Using It</a></li>
- <li><a href="http://uservoice.etherpad.com/pages/22751-general-questions" target="_blank">Other Question</a></li>
- <li><a href="http://uservoice.etherpad.com/pages/22733-general-feedback" target="_blank">Other Feedback</a></li>
- </ul>
- <p>These links will open UserVoice in a new window.</p>
- <p id="feedbackemails">You can also send email to <a href="feedback"><tt>feedback</tt></a>, <a href="support"><tt>support</tt></a>, or <a href="bugs"><tt>bugs</tt></a> at <tt>etherpad.com</tt>.</p>
</div>
</div>
<a href="javascript:void(0)" id="feedbackbox-hide"><!-- --></a>
View
4 etherpad/src/templates/pad/padfull_body.ejs
@@ -23,10 +23,6 @@ limitations under the License. */ %><div id="padfullpage" class="fpcontent">
<p>Sorry, only <%= maxUsersPerPad %> people are allowed to edit a
single pad at the same time in the free version of EtherPad.</p>
-<p>Please see our <a href="http://etherpad.com/ep/about/pricing">pricing plans</a> for
-information about having more than <%= maxUsersPerPad %>
-collaborators.</p>
-
</div>
</div>
View
3 etherpad/src/templates/pro-help/billing.ejs
@@ -15,8 +15,7 @@ limitations under the License. */ %>
<p>
EtherPad Professional Edition allows you to create accounts for members
-of your team. Account-holders may sign in at
-<tt>your-domain.etherpad.com</tt>.
+of your team. Account-holders may sign in at your custom subdomain.
</p>
<p>You may have up to <%= numFreeAccounts %> accounts for free. Once you
View
8 etherpad/src/templates/pro-help/main.ejs
@@ -15,13 +15,9 @@ limitations under the License. */ %>
<p>These pages are evolving. If you have any questions, or find
parts of EtherPad confusing, please write in to our Helpdesk by
-emailing <%= helpers.oemail("support") %>.</p>
+emailing support.</p>
-<p>Please report bugs to <%= helpers.oemail("bugs") %>.</p>
-
-<p>Also note that you can also get help from other users in the <a
-href="http://etherpad.com/ep/about/forums">UserVoice Community
-Forums</a>.</p>
+<p>Please report bugs to bugs.</p>
<h2>Help Topics:</h2>
View
4 etherpad/src/templates/pro/account/account-welcome-email.ejs
@@ -22,11 +22,9 @@ Thank you for signing up for EtherPad Professional Edition. You can sign in by
<%= signinLink %>
-For help signing in, or general support issues, please email support@etherpad.com.
+For help signing in, or general support issues, please email support.
--
This email was sent to <%= toEmail %> from an EtherPad user.
If you received it in error, you may safely ignore it.
-<%/* EtherPad's offices are located at Pier 38, The Embarcadero,
-San Francisco, CA 94107 */%>
View
1 etherpad/src/templates/pro/admin/manage-billing.ejs
@@ -32,4 +32,3 @@ function plural(amt) {
<h3 class="top">Payment Information</h3>
<p>EtherPad Professional will be discontinued on <%= helpers.rafterTerminationDate() %>. No further payments will be collected.</p>
-<p><a href="http://etherpad.com<%= helpers.rafterBlogUrl() %>">Read more</a>.</p>
View
13 etherpad/src/templates/pro/admin/pne-license-manager.ejs
@@ -20,9 +20,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens
<div class="lm-error-msg">
<p>Your evaluation license has expired!</p>
- <p>Please contact <%= helpers.oemail("sales") %> or visit the <a
- href="http://etherpad.com/ep/about/pricing-eepnet">pricing page on etherpad.com</a>
- to purchase a license key.</p>
+ <p>Please contact sales</p>
</div>
<% } %>
@@ -31,9 +29,8 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens
<div class="lm-notice-msg">
<p>The version of EtherPad you are running (<%= runningVersionString %>) is too old.
- Please update to version <%= licenseVersionString %> or newer by <a
- href="http://etherpad.com/ep/store/eepnet-download">downloading the latest version on
- etherpad.com</a>.</p>
+ Please update to version <%= licenseVersionString %> or newer.
+ </p>
</div>
<% } %>
@@ -97,9 +94,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens
<% if (isUnlicensed) { %>
<p>Before you can use this copy of EtherPad Private Network Edition, you must first
- enter a valid license. Free trial licenses can be obtained <a
- target="_blank"
- href="https://etherpad.com/ep/store/eepnet-eval-signup">obtained here</a>.
+ enter a valid license.
</p>
<% } %>
View
2 etherpad/src/templates/pro/pro-payment-required.ejs
@@ -43,7 +43,7 @@ limitations under the License. */ %><% helpers.includeJQuery() %>
<% } %>
<br/><br/>
- <p>Questions? Contact <%= helpers.oemail("support") %>.</p>
+ <p>Questions? Contact support.</p>
</div>
</div>
View
13 etherpad/src/templates/pro/pro_home.ejs
@@ -67,21 +67,14 @@ limitations under the License. */ %><% helpers.setHtmlTitle(orgName + " - EtherP
<div class="news-item">
<p>Welcome to your EtherPad Beta Account! Please report bugs by
- sending email to <%= helpers.oemail("bugs") %>. You can also give us
- feedback and feature suggestions via <a target="_blank"
- href="http://uservoice.etherpad.com/">UserVoice</a>.</p>
+ sending email to bugs.
+ </p>
<p>If you have any questions, just email <%=
- helpers.oemail("support") %> and
+ support and
we will respond to your inquiries.</p>
<p>We hope you enjoy EtherPad!</p>
-
- <p>Sincerely,</p>
-
- <p>Aaron Iba<br/>
- CEO, AppJet Inc.
- </p>
</div>
</div>
View
2 etherpad/src/templates/store/eepnet_eval_signup.ejs
@@ -85,7 +85,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("Sign up for EtherPa
<p>You can also <a href="/ep/store/eepnet-recover-license">recover a
lost license key</a>.</p>
- <p>Questions? Email <%= helpers.oemail("sales") %>.</p>
+ <p>Questions? Email sales.</p>
</div>
View
5 infrastructure/.hgignore
@@ -1,5 +0,0 @@
-syntax: blob
-appjet/
-build/
-buildjs/
-buildcache/
View
2 infrastructure/ace/.hgignore
@@ -1,2 +0,0 @@
-syntax: glob
-local
View
3 infrastructure/ace/build/.hgignore
@@ -1,3 +0,0 @@
-syntax: glob
-ace2.js
-ace2bare.js
View
1 setup.sh
@@ -39,6 +39,7 @@ for in_file in $REPLACE_ME; do
sed "s/FROM_DOMAIN/$domain/g;
s/LISTEN_AT/$listen_at/g;
s/EMAIL_FROM_ADDR/etherpad@$domain/g;
+ s/EMAIL_TO_ADDR/etherpad@$domain/g;
s/ADMIN_PASS/$admin_pass/g;" $in_file > $in_file_out
done

0 comments on commit 95ed1cf

Please sign in to comment.