From 0d5b98a338dc6bf2087801820e49ed4d9a35dfc6 Mon Sep 17 00:00:00 2001
From: mluto <m@luto.at>
Date: Thu, 7 Feb 2013 14:30:09 +0100
Subject: [PATCH] Removed isProPad, since all pads are public except for
 group-pads

---
 src/node/handler/PadMessageHandler.js | 1 -
 src/static/js/pad.js                  | 6 +-----
 src/static/js/pad_cookie.js           | 2 +-
 src/static/js/pad_userlist.js         | 5 -----
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js
index 69bb568db..80c79ada8 100644
--- a/src/node/handler/PadMessageHandler.js
+++ b/src/node/handler/PadMessageHandler.js
@@ -958,7 +958,6 @@ function handleClientReady(client, message)
           // used to request the latest 100 chat-messages later (GET_CHAT_MESSAGES)
           "chatHead": pad.chatHead,
           "numConnectedUsers": roomClients.length,
-          "isProPad": false,
           "readOnlyId": padIds.readOnlyPadId,
           "readonly": padIds.readonly,
           "serverTimestamp": new Date().getTime(),
diff --git a/src/static/js/pad.js b/src/static/js/pad.js
index 8b8d16be7..81ae1f85d 100644
--- a/src/static/js/pad.js
+++ b/src/static/js/pad.js
@@ -390,10 +390,6 @@ var pad = {
   {
     return clientVars.clientIp;
   },
-  getIsProPad: function()
-  {
-    return clientVars.isProPad;
-  },
   getColorPalette: function()
   {
     return clientVars.colorPalette;
@@ -599,7 +595,7 @@ var pad = {
   },
   isPadPublic: function()
   {
-    return (!pad.getIsProPad()) || (pad.getPadOptions().guestPolicy == 'allow');
+    return pad.getPadOptions().guestPolicy == 'allow';
   },
   suggestUserName: function(userId, name)
   {
diff --git a/src/static/js/pad_cookie.js b/src/static/js/pad_cookie.js
index 1bb5700ad..9866dbfdd 100644
--- a/src/static/js/pad_cookie.js
+++ b/src/static/js/pad_cookie.js
@@ -73,7 +73,7 @@ var padcookie = (function()
     }
     setRawCookie(stringifyCookie(cookieData));
 
-    if (pad.getIsProPad() && (!getRawCookie()) && (!alreadyWarnedAboutNoCookies))
+    if ((!getRawCookie()) && (!alreadyWarnedAboutNoCookies))
     {
       alert("Warning: it appears that your browser does not have cookies enabled." + " EtherPad uses cookies to keep track of unique users for the purpose" + " of putting a quota on the number of active users.  Using EtherPad without " + " cookies may fill up your server's user quota faster than expected.");
       alreadyWarnedAboutNoCookies = true;
diff --git a/src/static/js/pad_userlist.js b/src/static/js/pad_userlist.js
index d051182b9..962595d2b 100644
--- a/src/static/js/pad_userlist.js
+++ b/src/static/js/pad_userlist.js
@@ -107,14 +107,9 @@ var paduserlist = (function()
     function getUserRowHtml(height, data)
     {
       var nameHtml;
-      var isGuest = (data.id.charAt(0) != 'p');
       if (data.name)
       {
         nameHtml = padutils.escapeHtml(data.name);
-        if (isGuest && pad.getIsProPad())
-        {
-          nameHtml += ' ('+_(pad.userlist.guest)+')';
-        }
       }
       else
       {