v1.18.x
barisusakli 10 years ago
parent bc1281a201
commit 348911fd2d

@ -94,5 +94,7 @@
"guests": "Guests", "guests": "Guests",
"updated.title": "Forum Updated", "updated.title": "Forum Updated",
"updated.message": "This forum has just been updated to the latest version. Click here to refresh the page." "updated.message": "This forum has just been updated to the latest version. Click here to refresh the page.",
"privacy": "Privacy"
} }

@ -52,6 +52,7 @@
"settings": "Settings", "settings": "Settings",
"show_email": "Show My Email", "show_email": "Show My Email",
"show_fullname": "Show My Fullname",
"digest_label": "Subscribe to Digest", "digest_label": "Subscribe to Digest",
"digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule", "digest_description": "Subscribe to email updates for this forum (new notifications and topics) according to a set schedule",
"digest_off": "Off", "digest_off": "Off",

@ -82,7 +82,7 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
var self = parseInt(callerUID, 10) === parseInt(userData.uid, 10); var self = parseInt(callerUID, 10) === parseInt(userData.uid, 10);
userData.joindate = utils.toISOString(userData.joindate); userData.joindate = utils.toISOString(userData.joindate);
if(userData.lastonline) { if (userData.lastonline) {
userData.lastonline = utils.toISOString(userData.lastonline); userData.lastonline = utils.toISOString(userData.lastonline);
} else { } else {
userData.lastonline = userData.joindate; userData.lastonline = userData.joindate;
@ -95,13 +95,13 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
} }
if (!(isAdmin || self || (userData.email && userSettings.showemail))) { if (!(isAdmin || self || (userData.email && userSettings.showemail))) {
userData.email = ""; userData.email = '';
} }
if (self && !userSettings.showemail) { userData.emailClass = (self && !userSettings.showemail) ? '' : 'hide';
userData.emailClass = "";
} else { if (!self && !userSettings.showfullname) {
userData.emailClass = "hide"; userData.fullname = '';
} }
if (isAdmin || self) { if (isAdmin || self) {
@ -113,8 +113,8 @@ function getUserDataByUserSlug(userslug, callerUID, callback) {
userData.uid = userData.uid; userData.uid = userData.uid;
userData.yourid = callerUID; userData.yourid = callerUID;
userData.theirid = userData.uid; userData.theirid = userData.uid;
userData.isSelf = parseInt(callerUID, 10) === parseInt(userData.uid, 10); userData.isSelf = self;
userData.showSettings = userData.isSelf || isAdmin; userData.showSettings = self || isAdmin;
userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1; userData.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10); userData['email:confirmed'] = !!parseInt(userData['email:confirmed'], 10);
userData.profile_links = results.profile_links; userData.profile_links = results.profile_links;

@ -25,6 +25,7 @@ module.exports = function(User) {
settings = data.settings; settings = data.settings;
settings.showemail = parseInt(settings.showemail, 10) === 1; settings.showemail = parseInt(settings.showemail, 10) === 1;
settings.showfullname = parseInt(settings.showfullname, 10) === 1;
settings.openOutgoingLinksInNewTab = parseInt(settings.openOutgoingLinksInNewTab, 10) === 1; settings.openOutgoingLinksInNewTab = parseInt(settings.openOutgoingLinksInNewTab, 10) === 1;
settings.dailyDigestFreq = settings.dailyDigestFreq || 'off'; settings.dailyDigestFreq = settings.dailyDigestFreq || 'off';
settings.usePagination = (settings.usePagination === null || settings.usePagination === undefined) ? parseInt(meta.config.usePagination, 10) === 1 : parseInt(settings.usePagination, 10) === 1; settings.usePagination = (settings.usePagination === null || settings.usePagination === undefined) ? parseInt(meta.config.usePagination, 10) === 1 : parseInt(settings.usePagination, 10) === 1;
@ -77,6 +78,7 @@ module.exports = function(User) {
plugins.fireHook('action:user.saveSettings', {uid: uid, settings: data}); plugins.fireHook('action:user.saveSettings', {uid: uid, settings: data});
db.setObject('user:' + uid + ':settings', { db.setObject('user:' + uid + ':settings', {
showemail: data.showemail, showemail: data.showemail,
showfullname: data.showfullname,
openOutgoingLinksInNewTab: data.openOutgoingLinksInNewTab, openOutgoingLinksInNewTab: data.openOutgoingLinksInNewTab,
dailyDigestFreq: data.dailyDigestFreq || 'off', dailyDigestFreq: data.dailyDigestFreq || 'off',
usePagination: data.usePagination, usePagination: data.usePagination,

Loading…
Cancel
Save