diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json index 7644960602..48b6c0ccab 100644 --- a/public/language/en_GB/error.json +++ b/public/language/en_GB/error.json @@ -47,7 +47,6 @@ "topic-locked": "Topic Locked", "post-edit-duration-expired": "You are only allowed to edit posts for %1 second(s) after posting", - "still-uploading": "Please wait for uploads to complete.", "content-too-short": "Please enter a longer post. Posts should contain at least %1 character(s).", "content-too-long": "Please enter a shorter post. Posts can't be longer than %1 character(s).", "title-too-short": "Please enter a longer title. Titles should contain at least %1 character(s).", @@ -60,7 +59,9 @@ "not-enough-tags": "Not enough tags. Topics must have at least %1 tag(s)", "too-many-tags": "Too many tags. Topics can't have more than %1 tag(s)", + "still-uploading": "Please wait for uploads to complete.", "file-too-big": "Maximum allowed file size is %1 kB - please upload a smaller file", + "guest-upload-disabled": "Guest uploading has been disabled", "already-favourited": "You have already favourited this post", "already-unfavourited": "You have already unfavourited this post", diff --git a/src/controllers/uploads.js b/src/controllers/uploads.js index dd269b7a85..4bc4f33eb4 100644 --- a/src/controllers/uploads.js +++ b/src/controllers/uploads.js @@ -17,9 +17,9 @@ var uploadsController = {}; uploadsController.upload = function(req, res, filesIterator, next) { var files = req.files.files; - if (!req.user) { + if (!req.user && meta.config.allowGuestUploads !== '1') { deleteTempFiles(files); - return res.status(403).json('not allowed'); + return res.status(403).json('[[error:guest-upload-disabled]]'); } if (!Array.isArray(files)) { @@ -51,10 +51,10 @@ uploadsController.uploadPost = function(req, res, next) { return next(err); } - uploadImage(req.user.uid, uploadedFile, next); + uploadImage(req.user ? req.user.uid : 0, uploadedFile, next); }); } else { - uploadFile(req.user.uid, uploadedFile, next); + uploadFile(req.user ? req.user.uid : 0, uploadedFile, next); } }, next); }; @@ -82,7 +82,7 @@ uploadsController.uploadThumb = function(req, res, next) { if (err) { return next(err); } - uploadImage(req.user.uid, uploadedFile, next); + uploadImage(req.user ? req.user.uid : 0, uploadedFile, next); }); } else { next(new Error('[[error:invalid-file]]')); diff --git a/src/views/admin/partials/menu.tpl b/src/views/admin/partials/menu.tpl index 183adbb3e3..c69d7a3a5f 100644 --- a/src/views/admin/partials/menu.tpl +++ b/src/views/admin/partials/menu.tpl @@ -31,6 +31,7 @@
  • User
  • Group
  • Guests
    • +
  • Uploads
  • Post
  • Chat
  • Pagination
    • @@ -181,6 +182,7 @@
  • User
  • Group
  • Guests
    • +
  • Uploads
  • Post
  • Chat
  • Pagination
    • diff --git a/src/views/admin/settings/post.tpl b/src/views/admin/settings/post.tpl index dbb13f2714..ee7653d3ae 100644 --- a/src/views/admin/settings/post.tpl +++ b/src/views/admin/settings/post.tpl @@ -122,53 +122,6 @@ -
    -
    Upload Settings
    -
    -
    -
    - -
    - -
    - -
    - -
    - - -
    - -
    - -
    - -
    - - -
    - -
    - - -

    - Enter comma-separated list of file extensions here (e.g. pdf,xls,doc). - An empty list means all extensions are allowed. -

    -
    -
    -
    -
    -
    Composer Settings
    diff --git a/src/views/admin/settings/uploads.tpl b/src/views/admin/settings/uploads.tpl new file mode 100644 index 0000000000..76b053332b --- /dev/null +++ b/src/views/admin/settings/uploads.tpl @@ -0,0 +1,122 @@ + + +
    +
    + Posts +
    +
    +
    +
    + +
    + +
    + +
    + +
    + +
    + +
    + + +
    + +
    + +
    + +
    + + +
    + +
    + + +

    + Enter comma-separated list of file extensions here (e.g. pdf,xls,doc). + An empty list means all extensions are allowed. +

    +
    +
    +
    +
    + + + +
    +
    + Profile Avatars +
    +
    +
    +
    + +
    + +
    + +
    + +
    + +
    + + + + +
    +
    + +
    + + +
    + +
    + + +
    + +
    + + +
    +
    +
    +
    + +
    +
    Profile Covers
    +
    +
    + +

    + Add comma-separated default cover images for accounts that don't have an uploaded cover image +

    + +
    +
    +
    + + \ No newline at end of file diff --git a/src/views/admin/settings/user.tpl b/src/views/admin/settings/user.tpl index b02fe3f982..9852b133e2 100644 --- a/src/views/admin/settings/user.tpl +++ b/src/views/admin/settings/user.tpl @@ -88,65 +88,6 @@
    -
    -
    Avatars
    -
    -
    -
    - -
    - -
    - -
    - -
    - -
    - - - - -
    -
    - -
    - - -
    - -
    - - -
    - -
    - - -
    -
    -
    -
    - -
    -
    Profile Cover Image
    -
    -
    - -

    - Add comma-separated default cover images for accounts that don't have an uploaded cover image -

    - -
    -
    -
    -
    Themes