Remove unneeded parts of the configuration block, since no need to check licensing.

3 files changed, 3 insertions, 46 deletions

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 6d482ce..1364176 100644
--- a/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
+++ b/etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
@@ -48,17 +48,11 @@ function _getLeftnavItems() {
     _PRO, [
       [_PRO, null, "Admin"],
       [_PNE_ONLY, "pne-dashboard", "Server Dashboard"],
-      [_PNE_ONLY, "pne-license-manager/", "Manage License"],
       [_PRO, "account-manager/", "Manage Accounts"],
       [_PRO, "recover-padtext", "Recover Pad Text"],
       [_PRO, null, "Configuration"],
       [_PRO, [[_PNE_ONLY, "pne-config", "Private Server Configuration"],
               [_PRO, "pro-config", "Application Configuration"]]],
-      [_PNE_ONLY, null, "Documentation"],
-      [_PNE_ONLY, "/ep/pne-manual/", "Administrator's Manual"],
-      [_ONDEMAND_ONLY, null, "Billing"],
-      [_ONDEMAND_ONLY, "billing/", "Payment Information"],
-      [_ONDEMAND_ONLY, "billing/invoices", "Past Invoices"],
     ]
   ];
   return nav;
diff --git a/etherpad/src/etherpad/pne/pne_utils.js b/etherpad/src/etherpad/pne/pne_utils.js
index bc105bd..073ad2a 100644
--- a/etherpad/src/etherpad/pne/pne_utils.js
+++ b/etherpad/src/etherpad/pne/pne_utils.js
@@ -117,6 +117,7 @@ function saveDbVersion() {
 
 var _eepneAllowedConfigVars = [
   'configFile',
+  'etherpad.soffice',
   'etherpad.useMySQL',
   'etherpad.SQL_JDBC_DRIVER',
   'etherpad.SQL_JDBC_URL',
@@ -134,54 +135,14 @@ var _eepneAllowedConfigVars = [
 ];
 
 function isServerLicensed() {
-  var licenseInfo = licensing.getLicense();
-  if (!licenseInfo) {
-    return false;
-  }
-  if (licensing.isVersionTooOld()) {
-    return false;
-  }
-  if (licensing.isExpired()) {
-    return false;
-  }
   return true;
 }
 
 function enableTrackingAgain() {
-  delete appjet.cache.noMorePneTracking;
 }
 
 function pneTrackerHtml() {
-  if (!isPNE()) {
-    return "";
-  }
-  if (appjet.cache.noMorePneTracking) {
-    return "";
-  }
-
-  var div = DIV({style: "height: 1px; width: 1px; overflow: hidden;"});
-
-  var licenseInfo = licensing.getLicense();
-  var key = null;
-  if (licenseInfo) {
-    key = md5(licenseInfo.key).substr(0, 16);
-  }
-
-  function trackData(name, value) {
-    var imgurl = "http://etherpad.com/ep/tpne/t?";
-    if (key) {
-      imgurl += ("k="+key+"&");
-    }
-    imgurl += (encodeURIComponent(name) + "=" + encodeURIComponent(value));
-    div.push(IMG({src: imgurl}));
-  }
-
-  trackData("ping", "1");
-  trackData("dbdriver", appjet.config['etherpad.SQL_JDBC_DRIVER']);
-  trackData("request.url", request.url);
-
   appjet.cache.noMorePneTracking = true;
-  return div;
 }
 
 
diff --git a/etherpad/src/templates/pro/admin/admin-template.ejs b/etherpad/src/templates/pro/admin/admin-template.ejs
index 0964e33..e1a7736 100644
--- a/etherpad/src/templates/pro/admin/admin-template.ejs
+++ b/etherpad/src/templates/pro/admin/admin-template.ejs
@@ -16,9 +16,11 @@ 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="99%" id="admin-right">
         <%= getAdminContent() %>
       </td>