mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-20 23:46:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

1
src/node/handler/PadMessageHandler.js
View file

@ -958,7 +958,6 @@ function handleClientReady(client, message)
// used to request the latest 100 chat-messages later (GET_CHAT_MESSAGES) // used to request the latest 100 chat-messages later (GET_CHAT_MESSAGES)
"chatHead": pad.chatHead, "chatHead": pad.chatHead,
"numConnectedUsers": roomClients.length, "numConnectedUsers": roomClients.length,
"isProPad": false,
"readOnlyId": padIds.readOnlyPadId, "readOnlyId": padIds.readOnlyPadId,
"readonly": padIds.readonly, "readonly": padIds.readonly,
"serverTimestamp": new Date().getTime(), "serverTimestamp": new Date().getTime(),

6
src/static/js/pad.js
View file

@ -390,10 +390,6 @@ var pad = {
{ {
return clientVars.clientIp; return clientVars.clientIp;
}, },
getIsProPad: function()
{
return clientVars.isProPad;
},
getColorPalette: function() getColorPalette: function()
{ {
return clientVars.colorPalette; return clientVars.colorPalette;
@ -599,7 +595,7 @@ var pad = {
}, },
isPadPublic: function() isPadPublic: function()
{ {
return (!pad.getIsProPad()) || (pad.getPadOptions().guestPolicy == 'allow'); return pad.getPadOptions().guestPolicy == 'allow';
}, },
suggestUserName: function(userId, name) suggestUserName: function(userId, name)
{ {

2
src/static/js/pad_cookie.js
View file

@ -73,7 +73,7 @@ var padcookie = (function()
} }
setRawCookie(stringifyCookie(cookieData)); 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."); 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; alreadyWarnedAboutNoCookies = true;

5
src/static/js/pad_userlist.js
View file

@ -107,14 +107,9 @@ var paduserlist = (function()
function getUserRowHtml(height, data) function getUserRowHtml(height, data)
{ {
var nameHtml; var nameHtml;
var isGuest = (data.id.charAt(0) != 'p');
if (data.name) if (data.name)
{ {
nameHtml = padutils.escapeHtml(data.name); nameHtml = padutils.escapeHtml(data.name);
if (isGuest && pad.getIsProPad())
{
nameHtml += ' ('+_(pad.userlist.guest)+')';
}
} }
else else
{ {