diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index 63a25a992a..a34d0df40d 100644 --- a/src/controllers/accounts/helpers.js +++ b/src/controllers/accounts/helpers.js @@ -140,7 +140,7 @@ helpers.getBaseUser = function(userslug, callerUID, callback) { results.user.showHidden = results.user.isSelf || results.isAdmin; results.user.profile_links = results.profile_links; - results['cover:url'] = results['cover:url'] || nconf.get('relative_path') + '/images/cover-default.png'; + results['cover:url'] = results['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(results.user.uid); results['cover:position'] = results['cover:position'] || '50% 50%'; next(null, results.user); diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js index e55ee0d157..40d7fe5367 100644 --- a/src/controllers/accounts/profile.js +++ b/src/controllers/accounts/profile.js @@ -72,6 +72,11 @@ profileController.get = function(req, res, callback) { userData.isFollowing = results.isFollowing; userData.breadcrumbs = helpers.buildBreadcrumbs([{text: userData.username}]); userData.title = userData.username; + + userData['cover:url'] = userData['cover:url'] || require('../../coverPhoto').getDefaultProfileCover(userData.uid); + userData['cover:position'] = userData['cover:position'] || '50% 50%'; + console.log(userData['cover:url']); + if (!userData.profileviews) { userData.profileviews = 1; } diff --git a/src/coverPhoto.js b/src/coverPhoto.js new file mode 100644 index 0000000000..d699ace785 --- /dev/null +++ b/src/coverPhoto.js @@ -0,0 +1,32 @@ +"use strict"; + +var coverPhoto = {}; +var meta = require('./meta'); +var nconf = require('nconf'); + + +coverPhoto.getDefaultGroupCover = function(groupName) { + return getCover('groups', groupName); +}; + +coverPhoto.getDefaultProfileCover = function(uid) { + return getCover('profile', parseInt(uid, 10)); +}; + +function getCover(type, id) { + if (meta.config[type + ':defaultCovers']) { + var covers = meta.config[type + ':defaultCovers'].split(/\s*?,\s*?/g); + + if (typeof id === 'string') { + id = (id.charCodeAt(0) + id.charCodeAt(1)) % covers.length; + } else { + id = id % covers.length; + } + + return covers[id]; + } + + return nconf.get('relative_path') + '/images/cover-default.png'; +} + +module.exports = coverPhoto; \ No newline at end of file diff --git a/src/groups.js b/src/groups.js index 646843bde3..194534839d 100644 --- a/src/groups.js +++ b/src/groups.js @@ -163,11 +163,8 @@ var async = require('async'), return callback(new Error('[[error:no-group]]')); } - // Default image - if (!results.base['cover:url']) { - results.base['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; - results.base['cover:position'] = '50% 50%'; - } + results.base['cover:url'] = results.base['cover:url'] || require('./coverPhoto').getDefaultGroupCover(groupName); + results.base['cover:position'] = results.base['cover:position'] || '50% 50%'; plugins.fireHook('filter:parse.raw', results.base.description, function(err, descriptionParsed) { if (err) { @@ -406,10 +403,9 @@ var async = require('async'), group.hidden = parseInt(group.hidden, 10) === 1; group.system = parseInt(group.system, 10) === 1; group.private = parseInt(group.private, 10) === 1; - if (!group['cover:url']) { - group['cover:url'] = nconf.get('relative_path') + '/images/cover-default.png'; - group['cover:position'] = '50% 50%'; - } + + group['cover:url'] = group['cover:url'] || require('./coverPhoto').getDefaultGroupCover(group.name); + group['cover:position'] = group['cover:position'] || '50% 50%'; } }); diff --git a/src/views/admin/settings/group.tpl b/src/views/admin/settings/group.tpl index fb71beda6b..17cefdf00e 100644 --- a/src/views/admin/settings/group.tpl +++ b/src/views/admin/settings/group.tpl @@ -32,4 +32,17 @@ +