diff options
-rw-r--r-- | etherpad/src/etherpad/control/global_pro_account_control.js | 2 | ||||
-rw-r--r-- | etherpad/src/etherpad/control/pad/pad_control.js | 6 | ||||
-rw-r--r-- | etherpad/src/etherpad/control/pro/pro_main_control.js | 1 | ||||
-rw-r--r-- | etherpad/src/etherpad/globals.js | 5 | ||||
-rw-r--r-- | etherpad/src/etherpad/pro/pro_utils.js | 2 | ||||
-rw-r--r-- | etherpad/src/main.js | 2 | ||||
-rw-r--r-- | etherpad/src/static/crossdomain.xml | 10 | ||||
-rw-r--r-- | etherpad/src/templates/framed/framedheader-pro.ejs | 6 | ||||
-rw-r--r-- | etherpad/src/templates/pro/admin/admin-template.ejs | 8 |
9 files changed, 20 insertions, 22 deletions
diff --git a/etherpad/src/etherpad/control/global_pro_account_control.js b/etherpad/src/etherpad/control/global_pro_account_control.js index abc2994..65d2124 100644 --- a/etherpad/src/etherpad/control/global_pro_account_control.js +++ b/etherpad/src/etherpad/control/global_pro_account_control.js @@ -125,7 +125,7 @@ function render_recover_post() { response.redirect(_recoverLink(accountList[0], domainList[0])); } if (accountList.length > 1) { - var fromAddr = '"EtherPad Support" <support@etherpad.com>'; + var fromAddr = '"EtherPad" <noreply@pad.spline.inf.fu-berlin.de>'; var subj = "EtherPad: account information"; var body = renderTemplateAsString( 'pro/account/global-multi-domain-recover-email.ejs', { diff --git a/etherpad/src/etherpad/control/pad/pad_control.js b/etherpad/src/etherpad/control/pad/pad_control.js index 3d32355..3c32202 100644 --- a/etherpad/src/etherpad/control/pad/pad_control.js +++ b/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', + 'feedback@pad.spline.inf.fu-berlin.de', + 'feedback@pad.spline.inf.fu-berlin.de', subject, {}, feedback @@ -661,7 +661,7 @@ function render_emailinvite_post() { {toEmails: toEmails, padId: padId, username: username, subject: subject, message: message}); - var fromAddr = '"EtherPad" <noreply@etherpad.com>'; + var fromAddr = '"EtherPad" <noreply@pad.spline.inf.fu-berlin.de>'; // client enforces non-empty subject and message var subj = '[EtherPad] '+subject; var body = renderTemplateAsString('email/padinvite.ejs', diff --git a/etherpad/src/etherpad/control/pro/pro_main_control.js b/etherpad/src/etherpad/control/pro/pro_main_control.js index 6a04655..b4e3bc4 100644 --- a/etherpad/src/etherpad/control/pro/pro_main_control.js +++ b/etherpad/src/etherpad/control/pro/pro_main_control.js @@ -70,7 +70,6 @@ function render_main() { renderFramed('pro/pro_home.ejs', { isEvaluation: licensing.isEvaluation(), - evalExpDate: licensing.getLicense().expiresDate, account: getSessionProAccount(), isPNE: pne_utils.isPNE(), pneVersion: pne_utils.getVersionString(), diff --git a/etherpad/src/etherpad/globals.js b/etherpad/src/etherpad/globals.js index 3475b88..e279e1a 100644 --- a/etherpad/src/etherpad/globals.js +++ b/etherpad/src/etherpad/globals.js @@ -27,9 +27,10 @@ function isProduction() { } var SUPERDOMAINS = { - 'localbox.info': true, 'localhost': true, - 'etherpad.com': true + 'spline.inf.fu-berlin.de': true, + 'spline.de': true, + 'spline.nomad': true }; var PNE_RELEASE_VERSION = "1.1.3"; diff --git a/etherpad/src/etherpad/pro/pro_utils.js b/etherpad/src/etherpad/pro/pro_utils.js index 787f424..39a9193 100644 --- a/etherpad/src/etherpad/pro/pro_utils.js +++ b/etherpad/src/etherpad/pro/pro_utils.js @@ -145,7 +145,7 @@ function getFullSuperdomainHost() { } function getEmailFromAddr() { - var fromDomain = 'etherpad.com'; + var fromDomain = 'pad.spline.inf.fu-berlin.de'; if (pne_utils.isPNE()) { fromDomain = getFullProDomain(); } diff --git a/etherpad/src/main.js b/etherpad/src/main.js index 9cc1db2..ff46fb1 100644 --- a/etherpad/src/main.js +++ b/etherpad/src/main.js @@ -269,7 +269,7 @@ function checkHost() { } // redirect to etherpad.com - var newurl = "http://etherpad.com"+request.path; + var newurl = "http://pad.spline.inf.fu-berlin.de"+request.path; if (request.query) { newurl += "?"+request.query; } response.redirect(newurl); } diff --git a/etherpad/src/static/crossdomain.xml b/etherpad/src/static/crossdomain.xml index 1074b2a..9e76390 100644 --- a/etherpad/src/static/crossdomain.xml +++ b/etherpad/src/static/crossdomain.xml @@ -3,8 +3,10 @@ xsi:noNamespaceSchemaLocation="http://www.adobe.com/xml/schemas/PolicyFile.xsd"> <site-control permitted-cross-domain-policies="all"/> <allow-http-request-headers-from domain="*" headers="*"/> -<allow-access-from domain="*.tokbox.com" to-ports="*"/> -<allow-access-from domain="tokbox.com" to-ports="*"/> -<allow-access-from domain="*.etherpad.com" to-ports="*"/> -<allow-access-from domain="etherpad.com" to-ports="*"/> +<allow-access-from domain="*.pad.spline.de" to-ports="*"/> +<allow-access-from domain="pad.spline.de" to-ports="*"/> +<allow-access-from domain="*.pad.spline.inf.fu-berlin.de" to-ports="*"/> +<allow-access-from domain="pad.spline.inf.fu-berlin.de" to-ports="*"/> +<allow-access-from domain="*.pad.spline.nomad" to-ports="*"/> +<allow-access-from domain="pad.spline.nomad" to-ports="*"/> </cross-domain-policy> diff --git a/etherpad/src/templates/framed/framedheader-pro.ejs b/etherpad/src/templates/framed/framedheader-pro.ejs index 857fa3e..0265b6d 100644 --- a/etherpad/src/templates/framed/framedheader-pro.ejs +++ b/etherpad/src/templates/framed/framedheader-pro.ejs @@ -64,10 +64,8 @@ limitations under the License. */ %><% helpers.addBodyClass("pro-withtopbar"); % <div id="pro-topnav"> <div id="pro-topnav-inner"> - <% if (validLicense && account) { %> - <%= renderProTopNav() %> - <%= helpers.clearFloats() %> - <% } %> + <%= renderProTopNav() %> + <%= helpers.clearFloats() %> </div> </div> diff --git a/etherpad/src/templates/pro/admin/admin-template.ejs b/etherpad/src/templates/pro/admin/admin-template.ejs index e1a7736..a54964f 100644 --- a/etherpad/src/templates/pro/admin/admin-template.ejs +++ b/etherpad/src/templates/pro/admin/admin-template.ejs @@ -16,11 +16,9 @@ limitations under the License. */ %><% helpers.setHtmlTitle("Etherpad Administra <div class="fpcontent"> <table id="admin-layout-table"> <tr> - <% if (validLicense) { %> - <td width="1%" id="admin-leftnav"> - <%= renderAdminLeftNav() %> - </td> - <% } %> + <td width="1%" id="admin-leftnav"> + <%= renderAdminLeftNav() %> + </td> <td width="99%" id="admin-right"> <%= getAdminContent() %> </td> |