From dd88f4e20ef8d6925296a9cf583cbc269ce42be2 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 16 Feb 2010 04:29:39 +0100 Subject: rebranded for pad.spline.inf.fu-berlin.de --- etherpad/src/etherpad/billing/team_billing.js | 6 ++--- etherpad/src/etherpad/control/aboutcontrol.js | 4 ++-- etherpad/src/etherpad/control/historycontrol.js | 2 +- .../control/pro/admin/pro_admin_control.js | 2 +- .../control/pro/admin/team_billing_control.js | 8 +++---- etherpad/src/etherpad/control/pro_beta_control.js | 2 +- etherpad/src/etherpad/control/statscontrol.js | 6 ++--- .../control/store/eepnet_checkout_control.js | 8 +++---- etherpad/src/etherpad/legacy_urls.js | 2 +- etherpad/src/etherpad/licensing.js | 2 +- etherpad/src/etherpad/metrics/metrics.js | 4 ++-- etherpad/src/etherpad/pad/pad_migrations.js | 2 +- etherpad/src/etherpad/pad/padutils.js | 2 +- etherpad/src/etherpad/pne/pne_utils.js | 2 +- etherpad/src/etherpad/pro/pro_accounts.js | 2 +- etherpad/src/etherpad/quotas.js | 4 ++-- etherpad/src/etherpad/store/checkout.js | 2 +- etherpad/src/etherpad/store/eepnet_checkout.js | 4 ++-- etherpad/src/etherpad/store/eepnet_trial.js | 6 ++--- etherpad/src/main.js | 8 +++---- etherpad/src/static/js/pad_modals.js | 4 ++-- etherpad/src/static/js/pro/guest-knock-client.js | 2 +- etherpad/src/static/js/store.js | 2 +- etherpad/src/templates/500_body.ejs | 2 +- .../src/templates/email/eepnet_license_info.ejs | 2 +- etherpad/src/templates/email/padinvite.ejs | 2 +- etherpad/src/templates/pad/pad_body2.ejs | 26 ---------------------- etherpad/src/templates/pad/padfull_body.ejs | 2 +- .../pro/account/account-welcome-email.ejs | 2 +- .../src/templates/pro/admin/manage-billing.ejs | 2 +- .../templates/pro/admin/pne-license-manager.ejs | 8 +++---- infrastructure/com.etherpad/licensing.scala | 2 +- 32 files changed, 53 insertions(+), 81 deletions(-) diff --git a/etherpad/src/etherpad/billing/team_billing.js b/etherpad/src/etherpad/billing/team_billing.js index 54fd62a..ae8ae8a 100644 --- a/etherpad/src/etherpad/billing/team_billing.js +++ b/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, "sales@pad.spline.inf.fu-berlin.de", "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+".pad.spline.inf.fu-berlin.de/ep/admin/billing/" }); var address = paymentInfo.email; - checkout.salesEmail(address, "sales@etherpad.com", "EtherPad: Payment Failure for "+paymentInfo.fullname, + checkout.salesEmail(address, "sales@pad.spline.inf.fu-berlin.de", "EtherPad: Payment Failure for "+paymentInfo.fullname, {}, emailText); } \ No newline at end of file diff --git a/etherpad/src/etherpad/control/aboutcontrol.js b/etherpad/src/etherpad/control/aboutcontrol.js index 12265cf..9d77142 100644 --- a/etherpad/src/etherpad/control/aboutcontrol.js +++ b/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 = 'sales@pad.spline.inf.fu-berlin.de'; if (isTestEmail(data.email)) { toAddr = 'blackhole@appjet.com'; } - sendEmail(toAddr, 'sales@etherpad.com', subject, {}, body); + sendEmail(toAddr, 'sales@pad.spline.inf.fu-berlin.de', subject, {}, body); // all done! response.write("OK"); diff --git a/etherpad/src/etherpad/control/historycontrol.js b/etherpad/src/etherpad/control/historycontrol.js index 56fcb8e..a78cfad 100644 --- a/etherpad/src/etherpad/control/historycontrol.js +++ b/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:\/\/pad.spline.inf.fu-berlin.de\/)(\w+)/g, function(url, u1, u2) { return u1 + u2.replace(/\w/g, '-'); }); } diff --git a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js index b42378f..f9ce179 100644 --- a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js +++ b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js @@ -267,7 +267,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 http://pad.spline.inf.fu-berlin.de/foobar,', ' then the pad ID is "foobar" (without the quotes).')) } diff --git a/etherpad/src/etherpad/control/pro/admin/team_billing_control.js b/etherpad/src/etherpad/control/pro/admin/team_billing_control.js index 9c5b4d0..5be6a0e 100644 --- a/etherpad/src/etherpad/control/pro/admin/team_billing_control.js +++ b/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('support@pad.spline.inf.fu-berlin.de', 'urgent@pad.spline.inf.fu-berlin.de', '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. \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('sales@pad.spline.inf.fu-berlin.de', 'sales@pad.spline.inf.fu-berlin.de', "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 = (globals.isProduction() ? 'sales@pad.spline.inf.fu-berlin.de' : 'jd@appjet.com'); sendEmail( recipient, - 'sales@etherpad.com', + 'sales@pad.spline.inf.fu-berlin.de', 'Invoice payment request - '+pro_utils.getProRequestSubdomain(), {}, "Hi there,\n\nA pro user tried to pay by invoice. Their information follows."+ diff --git a/etherpad/src/etherpad/control/pro_beta_control.js b/etherpad/src/etherpad/control/pro_beta_control.js index 518e710..ec99b43 100644 --- a/etherpad/src/etherpad/control/pro_beta_control.js +++ b/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 ", + sendEmail(record.email, "EtherPad ", "Your EtherPad Professional Beta Account", {}, body); }); diff --git a/etherpad/src/etherpad/control/statscontrol.js b/etherpad/src/etherpad/control/statscontrol.js index 435b7ac..3659107 100644 --- a/etherpad/src/etherpad/control/statscontrol.js +++ b/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 pad.spline.inf.fu-berlin.de 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 pad.spline.inf.fu-berlin.de 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 pad.spline.inf.fu-berlin.de users over the last 30 days", type: "compare", options: { hideLive: true, latestUseHistorical: true}, stats: [ {stat: "active_user_ids_30days", diff --git a/etherpad/src/etherpad/control/store/eepnet_checkout_control.js b/etherpad/src/etherpad/control/store/eepnet_checkout_control.js index eb18381..ddd4973 100644 --- a/etherpad/src/etherpad/control/store/eepnet_checkout_control.js +++ b/etherpad/src/etherpad/control/store/eepnet_checkout_control.js @@ -671,7 +671,7 @@ 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('support@pad.spline.inf.fu-berlin.de', 'urgent@pad.spline.inf.fu-berlin.de', '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 "+ @@ -679,8 +679,8 @@ function _performCreditCardPurchase() { "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 "+ - "sales@etherpad.com.)"); + "within 24 hours, please email "+ + "sales@pad.spline.inf.fu-berlin.de.)"); } 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 +690,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('support@pad.spline.inf.fu-berlin.de', 'urgent@pad.spline.inf.fu-berlin.de', '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. \n\n"+ fastJSON.stringify(cart)); diff --git a/etherpad/src/etherpad/legacy_urls.js b/etherpad/src/etherpad/legacy_urls.js index 458f3b6..80f6f77 100644 --- a/etherpad/src/etherpad/legacy_urls.js +++ b/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 pad.spline.inf.fu-berlin.de site. (not Pro or PNE). */ var _legacyURLs = { '/ep/beta-signup': '/', diff --git a/etherpad/src/etherpad/licensing.js b/etherpad/src/etherpad/licensing.js index d57fa4c..2337456 100644 --- a/etherpad/src/etherpad/licensing.js +++ b/etherpad/src/etherpad/licensing.js @@ -17,7 +17,7 @@ /* * This file used to control access restrictions for various sites like - * etherpad.com or on-prem installations of etherpad, or evaluation + * pad.spline.inf.fu-berlin.de or on-prem installations of etherpad, or evaluation * editions. For the open-source effort, I have gutted out the * restrictions. --aiba */ diff --git a/etherpad/src/etherpad/metrics/metrics.js b/etherpad/src/etherpad/metrics/metrics.js index 1bc8666..435a5be 100644 --- a/etherpad/src/etherpad/metrics/metrics.js +++ b/etherpad/src/etherpad/metrics/metrics.js @@ -329,8 +329,8 @@ function getOrigins(startDate, endDate, useReferer, shouldAggregatePads) { }); 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, "http://pad.spline.inf.fu-berlin.de"); }); + sessionKeyFirsts = sessionKeyFirsts.filter(function(x) { return ! startsWith(x, "http://pad.spline.inf.fu-berlin.de"); }); } return { diff --git a/etherpad/src/etherpad/pad/pad_migrations.js b/etherpad/src/etherpad/pad/pad_migrations.js index f502bdf..e81cf63 100644 --- a/etherpad/src/etherpad/pad/pad_migrations.js +++ b/etherpad/src/etherpad/pad/pad_migrations.js @@ -31,7 +31,7 @@ function onStartup() { appjet.cache.pad_migrations = {}; } - // this part can be removed when all pads are migrated on etherpad.com + // this part can be removed when all pads are migrated on pad.spline.inf.fu-berlin.de //if (! pne_utils.isPNE()) { // System.out.println("Building cache for live migrations..."); // initLiveMigration(); diff --git a/etherpad/src/etherpad/pad/padutils.js b/etherpad/src/etherpad/pad/padutils.js index 2fdf579..3ffe70c 100644 --- a/etherpad/src/etherpad/pad/padutils.js +++ b/etherpad/src/etherpad/pad/padutils.js @@ -97,7 +97,7 @@ function getGlobalPadId(localPadId) { if (pro_utils.isProDomainRequest()) { return makeGlobalId(domains.getRequestDomainId(), localPadId); } else { - // etherpad.com pads + // pad.spline.inf.fu-berlin.de pads return localPadId; } } diff --git a/etherpad/src/etherpad/pne/pne_utils.js b/etherpad/src/etherpad/pne/pne_utils.js index 3169407..74e0598 100644 --- a/etherpad/src/etherpad/pne/pne_utils.js +++ b/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://pad.spline.inf.fu-berlin.de/ep/tpne/t?"; if (key) { imgurl += ("k="+key+"&"); } diff --git a/etherpad/src/etherpad/pro/pro_accounts.js b/etherpad/src/etherpad/pro/pro_accounts.js index dff4846..2024970 100644 --- a/etherpad/src/etherpad/pro/pro_accounts.js +++ b/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: "support@pad.spline.inf.fu-berlin.de", domainId: domains.getRequestDomainId(), isDeleted: false }; diff --git a/etherpad/src/etherpad/quotas.js b/etherpad/src/etherpad/quotas.js index 99ce205..7e939ec 100644 --- a/etherpad/src/etherpad/quotas.js +++ b/etherpad/src/etherpad/quotas.js @@ -29,7 +29,7 @@ function getMaxSimultaneousPadEditors(globalPadId) { return 1e6; } } else { - // etherpad.com public pads + // pad.spline.inf.fu-berlin.de public pads if (globalPadId && stringutils.startsWith(globalPadId, "conf-")) { return 64; } else { @@ -43,7 +43,7 @@ function getMaxSavedRevisionsPerPad() { if (isProDomainRequest()) { return 1e3; } else { - // free public etherpad.com + // free public pad.spline.inf.fu-berlin.de return 100; } } diff --git a/etherpad/src/etherpad/store/checkout.js b/etherpad/src/etherpad/store/checkout.js index 7b8e224..2a4d7e7 100644 --- a/etherpad/src/etherpad/store/checkout.js +++ b/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("sales@pad.spline.inf.fu-berlin.de", from, subject, headers, body); } } \ No newline at end of file diff --git a/etherpad/src/etherpad/store/eepnet_checkout.js b/etherpad/src/etherpad/store/eepnet_checkout.js index cdf32a1..62137d3 100644 --- a/etherpad/src/etherpad/store/eepnet_checkout.js +++ b/etherpad/src/etherpad/store/eepnet_checkout.js @@ -87,7 +87,7 @@ function licenseEmailText(userName, licenseKey) { function sendReceiptEmail(cart) { var receipt = cart.receiptEmail || receiptEmailText(cart); - salesEmail(cart.email, "sales@etherpad.com", + salesEmail(cart.email, "sales@pad.spline.inf.fu-berlin.de", "EtherPad: Receipt for "+cart.ownerName+" ("+cart.orgName+")", {}, receipt); } @@ -95,7 +95,7 @@ function sendReceiptEmail(cart) { function sendLicenseEmail(cart) { var licenseEmail = licenseEmailText(cart.ownerName, cart.licenseKey); - salesEmail(cart.email, "sales@etherpad.com", + salesEmail(cart.email, "sales@pad.spline.inf.fu-berlin.de", "EtherPad: License Key for "+cart.ownerName+" ("+cart.orgName+")", {}, licenseEmail); } \ No newline at end of file diff --git a/etherpad/src/etherpad/store/eepnet_trial.js b/etherpad/src/etherpad/store/eepnet_trial.js index 20fccdc..570d351 100644 --- a/etherpad/src/etherpad/store/eepnet_trial.js +++ b/etherpad/src/etherpad/store/eepnet_trial.js @@ -52,7 +52,7 @@ function mailLicense(data, licenseKey, expiresDate) { sendEmail( toAddr, - 'sales@etherpad.com', + 'sales@pad.spline.inf.fu-berlin.de', subject, {}, emailBody @@ -188,13 +188,13 @@ function _sendSalesNotification(data, ip, ref) { "" ].join("\n"); - var toAddr = 'sales@etherpad.com'; + var toAddr = 'sales@pad.spline.inf.fu-berlin.de'; if (isTestEmail(data.email)) { toAddr = 'blackhole@appjet.com'; } sendEmail( toAddr, - 'sales@etherpad.com', + 'sales@pad.spline.inf.fu-berlin.de', subject, {'Reply-To': data.email}, body diff --git a/etherpad/src/main.js b/etherpad/src/main.js index 2cddbac..503bf9d 100644 --- a/etherpad/src/main.js +++ b/etherpad/src/main.js @@ -267,7 +267,7 @@ function checkHost() { return; } - // redirect to etherpad.com + // redirect to pad.spline.inf.fu-berlin.de var newurl = "http://pad.spline.inf.fu-berlin.de/"+request.path; if (request.query) { newurl += "?"+request.query; } response.redirect(newurl); @@ -282,7 +282,7 @@ 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 + * we disabled HTTPS because we didn't want to ship the pad.spline.inf.fu-berlin.de * private crypto keys. --aiba */ return; @@ -306,8 +306,6 @@ function checkHTTPS() { var _requiredHttpsPrefixes = [ '/ep/admin', // pro and etherpad '/ep/account', // pro only - '/ep/store', // etherpad.com only - '/ep/pro-account' // etherpad.com only ]; var httpsRequired = false; @@ -393,7 +391,7 @@ function handlePath() { ]); // dispatching logic: first try common, then dispatch to - // etherpad.com or pro. + // pad.spline.inf.fu-berlin.de or pro. if (commonDispatcher.dispatch()) { return; diff --git a/etherpad/src/static/js/pad_modals.js b/etherpad/src/static/js/pad_modals.js index 35a1155..c9f48b5 100644 --- a/etherpad/src/static/js/pad_modals.js +++ b/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')+"@pad.spline.inf.fu-berlin.de"); }); }, 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"+"@"+"pad.spline.inf.fu-berlin.de instead.").get(0).className = 'badresponse'; $("#feedbackbox-response").show(); } },*/ diff --git a/etherpad/src/static/js/pro/guest-knock-client.js b/etherpad/src/static/js/pro/guest-knock-client.js index 16424d9..bace225 100644 --- a/etherpad/src/static/js/pro/guest-knock-client.js +++ b/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@pad.spline.inf.fu-berlin.de."); } $(document).ready(function() { diff --git a/etherpad/src/static/js/store.js b/etherpad/src/static/js/store.js index 96a6487..549e52d 100644 --- a/etherpad/src/static/js/store.js +++ b/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 pad.spline.inf.fu-berlin.de... var data = {}; $(".signupData").each(function() { data[$(this).attr("id")] = $(this).val(); diff --git a/etherpad/src/templates/500_body.ejs b/etherpad/src/templates/500_body.ejs index 291e0fd..34549ed 100644 --- a/etherpad/src/templates/500_body.ejs +++ b/etherpad/src/templates/500_body.ejs @@ -19,7 +19,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad Internal S

Oops! A server error occured. It's been logged.

-

Please email <support@etherpad.com> if this persists.

+

Please email <support@pad.spline.inf.fu-berlin.de> if this persists.

<% } %> diff --git a/etherpad/src/templates/email/eepnet_license_info.ejs b/etherpad/src/templates/email/eepnet_license_info.ejs index ea431de..85556c7 100644 --- a/etherpad/src/templates/email/eepnet_license_info.ejs +++ b/etherpad/src/templates/email/eepnet_license_info.ejs @@ -61,7 +61,7 @@ DOWNLOAD LINK: <% if (isEvaluation) { %> -- -This email was sent automatically from etherpad.com because you signed +This email was sent automatically from pad.spline.inf.fu-berlin.de because you signed up for EtherPad PNE. If you did not sign up for this, then you can safely just ignore this email. diff --git a/etherpad/src/templates/email/padinvite.ejs b/etherpad/src/templates/email/padinvite.ejs index c6467b8..0f729e3 100644 --- a/etherpad/src/templates/email/padinvite.ejs +++ b/etherpad/src/templates/email/padinvite.ejs @@ -15,4 +15,4 @@ 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 +Report abuse to: support@pad.spline.inf.fu-berlin.de diff --git a/etherpad/src/templates/pad/pad_body2.ejs b/etherpad/src/templates/pad/pad_body2.ejs index 5e3ea97..23b7adb 100644 --- a/etherpad/src/templates/pad/pad_body2.ejs +++ b/etherpad/src/templates/pad/pad_body2.ejs @@ -424,32 +424,6 @@ limitations under the License. */ %>
-
-
-
-
-
-
-<%/* - - -
*/%> -
-
-

Great, we love feedback! What kind?

- -

These links will open UserVoice in a new window.

-

You can also send email to feedback, support, or bugs at etherpad.com.

-
-
- -
diff --git a/etherpad/src/templates/pad/padfull_body.ejs b/etherpad/src/templates/pad/padfull_body.ejs index 41a100c..5f85b4e 100644 --- a/etherpad/src/templates/pad/padfull_body.ejs +++ b/etherpad/src/templates/pad/padfull_body.ejs @@ -23,7 +23,7 @@ limitations under the License. */ %>

Sorry, only <%= maxUsersPerPad %> people are allowed to edit a single pad at the same time in the free version of EtherPad.

-

Please see our pricing plans for +

Please see our pricing plans for information about having more than <%= maxUsersPerPad %> collaborators.

diff --git a/etherpad/src/templates/pro/account/account-welcome-email.ejs b/etherpad/src/templates/pro/account/account-welcome-email.ejs index 25af6f8..33e1ac5 100644 --- a/etherpad/src/templates/pro/account/account-welcome-email.ejs +++ b/etherpad/src/templates/pro/account/account-welcome-email.ejs @@ -22,7 +22,7 @@ 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@pad.spline.inf.fu-berlin.de. -- This email was sent to <%= toEmail %> from an EtherPad user. diff --git a/etherpad/src/templates/pro/admin/manage-billing.ejs b/etherpad/src/templates/pro/admin/manage-billing.ejs index 8a7bd51..514d943 100644 --- a/etherpad/src/templates/pro/admin/manage-billing.ejs +++ b/etherpad/src/templates/pro/admin/manage-billing.ejs @@ -32,4 +32,4 @@ function plural(amt) {

Payment Information

EtherPad Professional will be discontinued on <%= helpers.rafterTerminationDate() %>. No further payments will be collected.

-

Read more.

+

Read more.

diff --git a/etherpad/src/templates/pro/admin/pne-license-manager.ejs b/etherpad/src/templates/pro/admin/pne-license-manager.ejs index f160be0..42594b8 100644 --- a/etherpad/src/templates/pro/admin/pne-license-manager.ejs +++ b/etherpad/src/templates/pro/admin/pne-license-manager.ejs @@ -21,7 +21,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens

Your evaluation license has expired!

Please contact <%= helpers.oemail("sales") %> or visit the pricing page on etherpad.com + href="http://pad.spline.inf.fu-berlin.de/ep/about/pricing-eepnet">pricing page on pad.spline.inf.fu-berlin.de to purchase a license key.

@@ -32,8 +32,8 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens

The version of EtherPad you are running (<%= runningVersionString %>) is too old. Please update to version <%= licenseVersionString %> or newer by downloading the latest version on - etherpad.com.

+ href="http://pad.spline.inf.fu-berlin.de/ep/store/eepnet-download">downloading the latest version on + pad.spline.inf.fu-berlin.de.

<% } %> @@ -99,7 +99,7 @@ limitations under the License. */ %><% helpers.setHtmlTitle("EtherPad PNE Licens

Before you can use this copy of EtherPad Private Network Edition, you must first enter a valid license. Free trial licenses can be obtained obtained here. + href="https://pad.spline.inf.fu-berlin.de/ep/store/eepnet-eval-signup">obtained here.

<% } %> diff --git a/infrastructure/com.etherpad/licensing.scala b/infrastructure/com.etherpad/licensing.scala index 9318f78..620738f 100644 --- a/infrastructure/com.etherpad/licensing.scala +++ b/infrastructure/com.etherpad/licensing.scala @@ -134,7 +134,7 @@ object Licensing { println("Done."); } case "genmainkey" => { - println("Generating key for etherpad.com..."); + println("Generating key for pad.spline.inf.fu-berlin.de..."); config.values("licenseGeneratorKey") = args(1); val out = new PrintWriter(new FileOutputStream(args(2))); out.print(generateKey("etherpad", "AppJet", -1, 0, -1, 0, 0, 0)) -- cgit v1.2.3-1-g7c22