mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-01 11:35:55 +01:00
closes #675
This commit is contained in:
@@ -91,12 +91,14 @@
|
||||
<br/>
|
||||
|
||||
<hr/>
|
||||
<!-- IF !disableSignatures -->
|
||||
<!-- IF signature -->
|
||||
<span class="account-bio-label">[[user:signature]]</span>
|
||||
<div class="post-signature">
|
||||
<span id='signature'>{signature}</span>
|
||||
</div>
|
||||
<!-- ENDIF signature -->
|
||||
<!-- ENDIF !disableSignatures -->
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -83,12 +83,14 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- IF !disableSignatures -->
|
||||
<div class="control-group">
|
||||
<label class="control-label" for="inputSignature">[[user:signature]]</label> <small><label id="signatureCharCountLeft"></label></small>
|
||||
<div class="controls">
|
||||
<textarea class="form-control" id="inputSignature" rows="5">{signature}</textarea>
|
||||
</div>
|
||||
</div>
|
||||
<!-- ENDIF !disableSignatures -->
|
||||
|
||||
<input type="hidden" id="inputUID" value="{uid}"><br />
|
||||
|
||||
|
||||
@@ -82,6 +82,11 @@
|
||||
<input type="checkbox" data-field="allowRegistration" checked> <strong>Allow registration</strong>
|
||||
</label>
|
||||
</div>
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" data-field="disableSignatures"> <strong>Disable signatures</strong>
|
||||
</label>
|
||||
</div>
|
||||
<strong>Minimum Username Length</strong><br />
|
||||
<input type="text" class="form-control" value="2" data-field="minimumUsernameLength"><br />
|
||||
<strong>Maximum Username Length</strong><br />
|
||||
|
||||
@@ -213,7 +213,10 @@ var db = require('./database'),
|
||||
post.user_postcount = userData.postcount || 0;
|
||||
post.user_banned = parseInt(userData.banned, 10) === 1;
|
||||
post.picture = userData.picture || gravatar.url('', {}, https = nconf.get('https'));
|
||||
post.signature = signature;
|
||||
|
||||
if(meta.config.disableSignatures === undefined || parseInt(meta.config.disableSignatures, 10) === 0) {
|
||||
post.signature = signature;
|
||||
}
|
||||
|
||||
for (var info in customUserInfo) {
|
||||
if (customUserInfo.hasOwnProperty(info)) {
|
||||
|
||||
@@ -548,6 +548,8 @@ var fs = require('fs'),
|
||||
data.yourid = callerUID;
|
||||
data.theirid = uid;
|
||||
|
||||
data.disableSignatures = meta.config.disableSignatures !== undefined && parseInt(meta.config.disableSignatures, 10) === 1;
|
||||
|
||||
user.getFollowingCount(uid, function (followingCount) {
|
||||
user.getFollowerCount(uid, function (followerCount) {
|
||||
data.followingCount = followingCount;
|
||||
|
||||
Reference in New Issue
Block a user