Merge pull request #1230 from ZogStriP/add-newuser-max-attachments-setting

add newuser-max-attachments setting

app/models/post.rb

@@ -1,5 +1,7 @@
 require_dependency 'jobs'
 require_dependency 'pretty_text'
+require_dependency 'local_store'
+require_dependency 's3_store'
 require_dependency 'rate_limiter'
 require_dependency 'post_revisor'
 require_dependency 'enum'
@@ -89,7 +91,7 @@ class Post < ActiveRecord::Base
     @post_analyzer = PostAnalyzer.new(raw, topic_id)
   end
 
-  %w{raw_mentions linked_hosts image_count link_count raw_links}.each do |attr|
+  %w{raw_mentions linked_hosts image_count attachment_count link_count raw_links}.each do |attr|
     define_method(attr) do
       PostAnalyzer.new(raw, topic_id).send(attr)
     end

app/models/post_analyzer.rb

@@ -39,6 +39,18 @@ class PostAnalyzer
     end.count
   end
 
+  # How many attachments are present in the post
+  def attachment_count
+    return 0 unless @raw.present?
+
+    if SiteSetting.enable_s3_uploads?
+      cooked_document.css("a.attachment[href^=\"#{S3Store.base_url}\"]")
+    else
+      cooked_document.css("a.attachment[href^=\"#{LocalStore.directory}\"]") +
+      cooked_document.css("a.attachment[href^=\"#{LocalStore.base_url}\"]")
+    end.count
+  end
+
   def raw_mentions
     return [] if @raw.blank?
 

app/models/site_setting.rb

@@ -212,6 +212,7 @@ class SiteSetting < ActiveRecord::Base
 
   setting(:newuser_max_links, 2)
   client_setting(:newuser_max_images, 0)
+  client_setting(:newuser_max_attachments, 0)
 
   setting(:newuser_spam_host_threshold, 3)