community_engine 3.0.0 → 3.2.0

data/app/controllers/password_resets_controller.rb

@@ -1,6 +1,6 @@
 class PasswordResetsController < BaseController
-  before_filter :require_no_user
-  before_filter :load_user_using_perishable_token, :only => [ :edit, :update ]
+  before_action :require_no_user
+  before_action :load_user_using_perishable_token, :only => [ :edit, :update ]
 
   def new
   end

data/app/controllers/photo_manager_controller.rb

@@ -1,8 +1,8 @@
 class PhotoManagerController < BaseController
   include Viewable
-  before_filter :login_required
-  before_filter :find_user
-  before_filter :require_current_user
+  before_action :login_required
+  before_action :find_user
+  before_action :require_current_user
   
   def index
     @albums = current_user.albums.order('id DESC').page(params[:page_albums])

data/app/controllers/photos_controller.rb

@@ -2,15 +2,11 @@ require 'pp'
 
 class PhotosController < BaseController
   include Viewable
-  before_filter :login_required, :only => [:new, :edit, :update, :destroy, :create, :swfupload]
-  before_filter :find_user, :only => [:new, :edit, :index, :show]
-  before_filter :require_current_user, :only => [:new, :edit, :update, :destroy]
+  before_action :login_required, :only => [:new, :edit, :update, :destroy, :create, :swfupload]
+  before_action :find_user, :only => [:new, :edit, :index, :show]
+  before_action :require_current_user, :only => [:new, :edit, :update, :destroy]
 
-  skip_before_filter :verify_authenticity_token, :only => [:create] #because the TinyMCE image uploader can't provide the auth token
-
-  uses_tiny_mce do
-    {:only => [:show], :options => configatron.simple_mce_options}
-  end
+  skip_before_action :verify_authenticity_token, :only => [:create]
 
   cache_sweeper :taggable_sweeper, :only => [:create, :update, :destroy]
 
@@ -51,18 +47,51 @@ class PhotosController < BaseController
   def manage_photos
     if logged_in?
       @user = current_user
-      @photos = current_user.photos.recent.includes(:tags)
-      if params[:tag_name]
-        @photos = @photos.where('tags.name = ?', params[:tag_name])
-      end
-      @selected = params[:photo_id]
-      @photos = @photos.page(params[:page]).per(10)
+      @pictures = current_user.photos.recent.includes(:tags).page(params[:page]).per(10)
     end
     respond_to do |format|
+      format.html {
+        render :template => 'ckeditor/pictures/index', :layout => 'ckeditor/application'
+      }
       format.js
     end
   end
 
+  def create_photos
+    @photo = current_user.photos.new
+    file = params[:qqfile] ||params[:upload]
+    @photo.photo = Ckeditor::Http.normalize_param(file, request)
+    callback = ckeditor_before_create_asset(@photo)
+
+    if callback && @photo.save
+      hash = {
+        :id => @photo.id,
+        :type => 'ckeditor::picture',
+        :url_content => @photo.photo.url,
+        :url_thumb => @photo.photo.url(:thumb),
+        :filename => @photo.photo_file_name,
+        :format_created_at => @photo.created_at,
+        :size => @photo.photo_file_size
+      }
+
+      body = params[:CKEditor].blank? ? hash.to_json : %Q"<script type='text/javascript'>
+      window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, '#{config.relative_url_root}#{Ckeditor::Utils.escape_single_quotes(@photo.photo.url)}');
+    </script>"
+
+      render :text => body
+
+    else
+      if params[:CKEditor].blank?
+        render :nothing => true, :format => :json
+      else
+        render :text => %Q"<script type='text/javascript'>
+            window.parent.CKEDITOR.tools.callFunction(#{params[:CKEditorFuncNum]}, null, '#{Ckeditor::Utils.escape_single_quotes(@photo.errors.full_messages.first)}');
+          </script>"
+      end
+    end
+
+  end
+
   # GET /photos/1
   # GET /photos/1.xml
   def show

data/app/controllers/posts_controller.rb

@@ -1,23 +1,15 @@
 class PostsController < BaseController
   include Viewable
 
-  uses_tiny_mce do
-    {:only => [:new, :edit, :update, :create ], :options => configatron.default_mce_options}
-  end
-
-  uses_tiny_mce do
-    {:only => [:show], :options => configatron.simple_mce_options}
-  end
-
   cache_sweeper :post_sweeper, :only => [:create, :update, :destroy]
   cache_sweeper :taggable_sweeper, :only => [:create, :update, :destroy]
   caches_action :show, :if => Proc.new{|c| !logged_in? }
 
-  before_filter :login_required, :only => [:new, :edit, :update, :destroy, :create, :manage, :preview]
-  before_filter :find_user, :only => [:new, :edit, :index, :show, :update_views, :manage, :preview]
-  before_filter :require_ownership_or_moderator, :only => [:edit, :update, :destroy, :create, :manage, :new]
+  before_action :login_required, :only => [:new, :edit, :update, :destroy, :create, :manage, :preview]
+  before_action :find_user, :only => [:new, :edit, :index, :show, :update_views, :manage, :preview]
+  before_action :require_ownership_or_moderator, :only => [:edit, :update, :destroy, :create, :manage, :new]
 
-  skip_before_filter :verify_authenticity_token, :only => [:update_views, :send_to_friend] #called from ajax on cached pages
+  skip_before_action :verify_authenticity_token, :only => [:update_views, :send_to_friend] #called from ajax on cached pages
 
   def manage
     Post.unscoped do
@@ -58,11 +50,12 @@ class PostsController < BaseController
   # GET /posts/1
   # GET /posts/1.xml
   def show
+    @post = Post.unscoped.find(params[:id])
+    redirect_to user_posts_path(@user), :alert => :post_not_published_yet.l and return false unless @post.is_live? || @post.user.eql?(current_user) || admin? || moderator?
+
     @rss_title = "#{configatron.community_name}: #{@user.login}'s posts"
     @rss_url = user_posts_path(@user,:format => :rss)
 
-    @post = Post.unscoped.find(params[:id])
-
     @user = @post.user
     @is_current_user = @user.eql?(current_user)
     @comment = Comment.new

data/app/controllers/rsvps_controller.rb

@@ -1,8 +1,8 @@
 class RsvpsController < BaseController
 
-  before_filter :login_required, :only => [:new, :edit, :update, :destroy, :create]
-  before_filter :find_event
-  before_filter :require_ownership_or_moderator, :only => [:edit, :update, :destroy]
+  before_action :login_required, :only => [:new, :edit, :update, :destroy, :create]
+  before_action :find_event
+  before_action :require_ownership_or_moderator, :only => [:edit, :update, :destroy]
 
   def find_event
     @event = Event.find(params[:event_id])

data/app/controllers/sb_posts_controller.rb

@@ -1,20 +1,17 @@
 class SbPostsController < BaseController
-  before_filter :find_post,      :except => [:index, :monitored, :search, :new, :create]
-  before_filter :login_required, :except => [:index, :search, :show, :monitored, :create]
+  before_action :find_post,      :except => [:index, :monitored, :search, :new, :create]
+  before_action :login_required, :except => [:index, :search, :show, :monitored, :create]
 
-  before_filter :only => [:create] do |controller|
+  before_action :only => [:create] do |controller|
     login_required unless configatron.allow_anonymous_forum_posting
   end
 
-  skip_before_filter :verify_authenticity_token, :only => [:create] #remove for the create action
-  before_filter do |controller|
+  skip_before_action :verify_authenticity_token, :only => [:create] #remove for the create action
+  before_action do |controller|
     #add it back unless anonymous posting is allowed
     verify_authenticity_token if controller.action_name.eql?('create') && !configatron.allow_anonymous_forum_posting
   end
 
-  uses_tiny_mce do
-    {:only => [:edit, :update], :options => configatron.default_mce_options}
-  end
 
 
   def index
@@ -92,6 +89,8 @@ class SbPostsController < BaseController
   end
 
   def edit
+    authorize @post
+
     respond_to do |format|
       format.html
       format.js
@@ -99,10 +98,13 @@ class SbPostsController < BaseController
   end
 
   def update
-    @post.update_attributes!(sb_post_params)
-  rescue ActiveRecord::RecordInvalid
-    flash[:bad_reply] = :an_error_occurred.l
-  ensure
+    authorize @post
+    @post.update_attributes(sb_post_params)
+
+    unless @post.valid?
+      flash[:bad_reply] = :an_error_occurred.l
+    end
+
     respond_to do |format|
       format.html do
         redirect_to forum_topic_path(:forum_id => params[:forum_id], :id => params[:topic_id], :anchor => @post.dom_id, :page => params[:page] || '1')
@@ -110,9 +112,12 @@ class SbPostsController < BaseController
       format.js
       format.xml { head 200 }
     end
+    
   end
 
   def destroy
+    authorize @post
+
     @post.destroy
     flash[:notice] = :sb_post_was_deleted.l_with_args(:title => CGI::escapeHTML(@post.topic.title))
     # check for posts_count == 1 because its cached and counting the currently deleted post
@@ -127,16 +132,11 @@ class SbPostsController < BaseController
   end
 
   protected
-    #overide in your app
-    def authorized?
-      %w(create new).include?(action_name) || @post.editable_by?(current_user)
-    end
-
     def find_post
       @post = SbPost.find_by_id_and_topic_id_and_forum_id(params[:id].to_i, params[:topic_id].to_i, params[:forum_id].to_i) || raise(ActiveRecord::RecordNotFound)
     end
 
-  def sb_post_params
-    params[:sb_post].permit(:body, :author_email, :author_ip, :author_name, :author_url)
-  end
+    def sb_post_params
+      params[:sb_post].permit(:body, :author_email, :author_ip, :author_name, :author_url)
+    end
 end

data/app/controllers/sessions_controller.rb

@@ -1,7 +1,7 @@
 # This controller handles the login/logout function of the site.
 class SessionsController < BaseController
 
-  skip_before_filter :store_location, :only => [:new, :create]
+  skip_before_action :store_location, :only => [:new, :create]
 
   def index
     redirect_to :action => "new"

data/app/controllers/tags_controller.rb

@@ -1,7 +1,5 @@
 class TagsController < BaseController
-  before_filter :login_required, :only => [:manage, :edit, :update, :destroy]
-  before_filter :admin_required, :only => [:manage, :edit, :update, :destroy]
-  skip_before_filter :verify_authenticity_token, :only => [:auto_complete_for_tag_name]
+  skip_before_action :verify_authenticity_token, :only => [:auto_complete_for_tag_name]
 
   caches_action :show, :cache_path => Proc.new { |controller| controller.send(:tag_url, controller.params[:id]) }, :if => Proc.new{|c| c.cache_action? }
   def cache_action?
@@ -16,60 +14,14 @@ class TagsController < BaseController
   end
 
   def index
-    @tags = popular_tags(100).to_a
-
-    @user_tags = popular_tags(75, 'User').to_a
-
-    @post_tags = popular_tags(75, 'Post').to_a
-
-    @photo_tags = popular_tags(75, 'Photo').to_a
-
-    @clipping_tags = popular_tags(75, 'Clipping').to_a
-  end
-
-  def manage
-    @search = ActsAsTaggableOn::Tag.search(params[:q])
-    @tags = @search.result
-    @tags = @tags.order('name ASC').distinct.page(params[:page]).per(100)
-  end
-
-
-  def edit
-    @tag = ActsAsTaggableOn::Tag.find_by_name(URI::decode(params[:id]))
-  end
-
-  def update
-    @tag = ActsAsTaggableOn::Tag.find_by_name(URI::decode(params[:id]))
-
-    respond_to do |format|
-      if @tag.update_attributes(params[:tag])
-        flash[:notice] = :tag_was_successfully_updated.l
-        format.html { redirect_to admin_tags_url }
-        format.xml  { render :nothing => true }
-      else
-        format.html { render :action => "edit" }
-        format.xml  { render :xml => @tag.errors.to_xml }
-      end
-    end
+    @tags = popular_tags(100)
   end
 
-  def destroy
-    @tag = ActsAsTaggableOn::Tag.find_by_name(URI::decode(params[:id]))
-    @tag.destroy
-
-    respond_to do |format|
-      format.html {
-        flash[:notice] = :tag_was_successfully_deleted.l
-        redirect_to admin_tags_url
-      }
-      format.xml  { render :nothing => true }
-    end
-  end
 
   def show
-    tag_array = ActsAsTaggableOn::TagList.from( URI::decode(params[:id]) )
+    tag_array = ActsAsTaggableOn::DefaultParser.new( URI::decode(params[:id]) ).parse
 
-    @tags = ActsAsTaggableOn::Tag.where('name IN (?)', tag_array)
+    @tags = ActsAsTaggableOn::Tag.where('name IN (?)', tag_array )
     if @tags.nil? || @tags.empty?
       flash[:notice] = :tag_does_not_exists.l_with_args(:tag => tag_array)
       redirect_to :action => :index and return

data/app/controllers/topics_controller.rb

@@ -1,10 +1,8 @@
 class TopicsController < BaseController
-  before_filter :find_forum_and_topic, :except => :index
-  before_filter :login_required, :except => [:index, :show]
+  before_action :find_forum_and_topic, :except => :index
+  before_action :login_required, :except => [:index, :show]
+  after_action  :verify_authorized, :except => [:index, :show]
 
-  uses_tiny_mce do
-    {:only => [:show, :new, :create, :update], :options => configatron.default_mce_options}
-  end
 
   def index
     @forum = Forum.find(params[:forum_id])
@@ -20,6 +18,7 @@ class TopicsController < BaseController
   def new
     @topic = Topic.new
     @topic.sb_posts.build
+    authorize @topic
   end
 
   def show
@@ -49,6 +48,8 @@ class TopicsController < BaseController
 
   def create
     @topic = @forum.topics.new(topic_params)
+    authorize @topic
+
     assign_protected
 
     @post = @topic.sb_posts.first
@@ -76,8 +77,14 @@ class TopicsController < BaseController
     end
   end
 
+  def edit
+    authorize @topic
+  end
+
   def update
     assign_protected
+
+    authorize @topic
     @topic.tag_list = params[:tag_list] || ''
     @topic.update_attributes!(topic_params)
     respond_to do |format|
@@ -87,6 +94,8 @@ class TopicsController < BaseController
   end
 
   def destroy
+    authorize @topic
+
     @topic.destroy
     flash[:notice] = :topic_deleted.l_with_args(:topic => CGI::escapeHTML(@topic.title))
     respond_to do |format|
@@ -114,12 +123,8 @@ class TopicsController < BaseController
       @topic = @forum.topics.find(params[:id]) if params[:id]
     end
 
-    #overide in your app
-    def authorized?
-      %w(new create).include?(action_name) || @topic.editable_by?(current_user)
-    end
 
   def topic_params
-    params[:topic].permit(:title, :sticky, :locked, {:sb_posts_attributes => [:body]}, :forum_id)
+    params[:topic].permit(:tag_list, :title, :sticky, :locked, {:sb_posts_attributes => [:body]}, :forum_id)
   end
 end

data/app/controllers/users_controller.rb

@@ -2,27 +2,18 @@ class UsersController < BaseController
   include Viewable
   cache_sweeper :taggable_sweeper, :only => [:activate, :update, :destroy]
 
-  uses_tiny_mce do
-    {:only => [:new, :create, :update, :edit, :welcome_about], :options => configatron.default_mce_options}
-  end
-
-  uses_tiny_mce do
-    {:only => [:show], :options => configatron.simple_mce_options}
-  end
-
-  # Filters
-  before_filter :login_required, :only => [:edit, :edit_account, :update, :welcome_photo, :welcome_about,
+  before_action :login_required, :only => [:edit, :edit_account, :update, :welcome_photo, :welcome_about,
                                           :welcome_invite, :return_admin, :assume, :featured,
                                           :toggle_featured, :edit_pro_details, :update_pro_details, :dashboard, :deactivate,
                                           :crop_profile_photo, :upload_profile_photo]
-  before_filter :find_user, :only => [:edit, :edit_pro_details, :show, :update, :destroy, :statistics, :deactivate,
+  before_action :find_user, :only => [:edit, :edit_pro_details, :show, :update, :statistics, :deactivate,
                                       :crop_profile_photo, :upload_profile_photo ]
-  before_filter :require_current_user, :only => [:edit, :update, :update_account,
+  before_action :require_current_user, :only => [:edit, :update, :update_account,
                                                 :edit_pro_details, :update_pro_details,
                                                 :welcome_photo, :welcome_about, :welcome_invite, :deactivate,
                                                 :crop_profile_photo, :upload_profile_photo]
-  before_filter :admin_required, :only => [:assume, :destroy, :featured, :toggle_featured, :toggle_moderator]
-  before_filter :admin_or_current_user_required, :only => [:statistics]
+  before_action :admin_required, :only => [:assume, :destroy, :featured, :toggle_featured, :toggle_moderator]
+  before_action :admin_or_current_user_required, :only => [:statistics]
 
   def activate
     redirect_to signup_path and return if params[:id].blank?
@@ -140,18 +131,20 @@ class UsersController < BaseController
   end
 
   def destroy
+    @user = User.find(params[:id])
     unless @user.admin? || @user.featured_writer?
+      @user.spam! if params[:spam] && configatron.has_key?(:akismet_key)
       @user.destroy
       flash[:notice] = :the_user_was_deleted.l
     else
       flash[:error] = :you_cant_delete_that_user.l
     end
     respond_to do |format|
+      format.html { redirect_to users_url }
       format.js   {
         render :inline => flash[:error], :status => 500 if flash[:error]
-        render :nothing => true if flash[:notice]
+        render if flash[:notice]
       }
-      format.html { redirect_to users_url }
     end
   end
 

data/app/controllers/votes_controller.rb

@@ -1,6 +1,6 @@
 class VotesController < BaseController
-  before_filter :find_choice, :only => [:create]
-  before_filter :login_required
+  before_action :find_choice, :only => [:create]
+  before_action :login_required
   
   def new
     @post = Post.find(params[:post_id])