Removed isProPad, since all pads are public except for group-pads

This commit is contained in:
mluto 2013-02-07 14:30:09 +01:00
parent 0cbd4034b1
commit 0d5b98a338
4 changed files with 2 additions and 12 deletions

View File

@ -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(),

View File

@ -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)
{

View File

@ -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;

View File

@ -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
{