radiant-forum-extension 1.2.1 → 2.0.0

data/README.md

@@ -1,69 +1,58 @@
 # Forum
 
-This is a simple but comprehensive forum implementation that plugs into radiant. It's fairly well-featured, including:
+This is a tidy but comprehensive forum implementation that plugs into radiant and supports both discussion forums and page comments. 
+
+This new (as I write) version 2 is a complete rewrite with a lot of internal clarification in preparation for rails 3. It's in late beta at the moment: bug fixes, documentation and packaging for public release.
+
+The forum is designed to be pick-and-mixed with other radiant extensions, so it's very focused on being an excellent forum and doesn't do anything else. I hope you will find it's very good at what it does do:
 
 * forums, topics, posts etc
 * page comments
 * simple but effective forum search
 * rss feeds of pretty much anything (including search queries and individual authors)
-* textile-formatted messages with html sanitized
-* smilies :(
 * multiple message attachments and helpful image-handling
 * configurable message-editing interval during which authors can make corrections
+* minimal wysiwig message editing including smilies :(
+* ajax edit-in-place
 
-I've tried to keep it simple and tidy both inside and out. This is helped by the fact that all the user-management is in the reader extension, so you should find this one easy to adapt and extend. 
+I've tried to keep it simple and tidy both inside and out. This is helped by the fact that all the user-management is in the reader extension, so you should find this is easy to adapt and extend. The admin interface on the other hand is pretty basic: we expect most administration to happen through the public pages but there does need to be at least a dashboard to give a better overview. That will come soon.
 
-The forum was derived long ago from [Beast](http://beast.caboo.se) and the fossilised bones will still be visible here and there. It has been in use on various sites in various versions for three years, but in making it ready for publication I've pretty much refactored the whole thing and probably optimised new bugs into it. Please let me know as soon as you spot one.
+As far as I know this is the best forum software available for rails. I look forward to finding out that it's not.
 
 ## Status
 
-Mature and stable, but I'm a bit habitual with it so may have overlooked some rough edges in parts of the interface I don't visit much. It would benefit from wider use. 
-
-There's a lot going on here and plenty of places for me to hide bugs, but the tests are fairly thorough.
+This code has been surviving in the world for four or five years (and more, since some it originally came from Beast), but this version is about 75% new and you know what that means: new bugs. Github issues, please.
 
 ## Latest
 
-* Quite a lot of tidying up and trimming of the interface
-* sample javascripts and layout updated
-* Updated for 0.8.1 with gem and extension dependencies, and many small fixes to keep up with the `reader` and `group_forum` extensions.
+* Inline editing with editable-for-interval setting
+* Punymce-based wysiwig editing.
+* Page comments data structure simplified. Migration required.
+* Everything internationalized
+* Scripting all moved over to jquery (mootools was too niche, sadly)
+* Uses the new radiant configuration interface
+* Basic admin interface as well as readerland administration
+* Editable interval for messages
+
+This version is not wholly multi-site compatible at the moment, since it relies heavily on configuration items that are not yet site-scoped. They will be soon.
 
 ## Still to do
 
-* Moderators among readership
-* Reinstate message preview
-* Reinstate email-monitoring
+* Allow moderation by selected readers
 * Message-problem button
-* Admin pages that are less crappy
-* Anonymous page-comment option
+* Admin dashboard
 
 ## Requirements
 
-Radiant 0.8.1 (we're using the new config machinery) with the [reader](http://github.com/spanner/radiant-reader-extension) extension. Reader has a few requirements of its own so it's best to install that one first, make sure it's testing clean and then install the forum.
+Radiant 0.9.2 (we're using the new configuration interface) with the [reader](http://github.com/spanner/radiant-reader-extension) extension. Reader has a few requirements of its own so it's best to install that one first, make sure it's testing clean and then install the forum.
 
-We also require [will_paginate](http://github.com/mislav/will_paginate/) and [paperclip](http://github.com/thoughtbot/paperclip/) as gems. The latter is for post attachments, and if you're using [paperclipped](http://github.com/kbingman/paperclipped) (which vendors paperclip) then you can probably skip it. Otherwise:
+We also require [will_paginate](http://github.com/mislav/will_paginate/) and [paperclip](http://github.com/thoughtbot/paperclip/) as gems but you will already have those.
 
 	sudo rake gems:install
 	
 should get everything you need. 
 
-The forum is compatible with multi_site but you have to use [sites](https://github.com/spanner/radiant-sites-extension) instead if you want forums and readers site-scoped.
-
-## Installation
-
-The usual:
-
-	git submodule add git://github.com/spanner/radiant-forum-extension.git vendor/extensions/forum
-
-Check the extension loading order in environment.rb (you will need `share_layouts`, `reader` and perhaps `multi_site` to load before this one) and then:
-
-	rake radiant:extensions:forum:migrate
-	rake radiant:extensions:forum:update
-
-As well as the basic machinery this should give you:
-
-* a basic forum.css that you will want to improve upon,
-* an admin/forum.css that you can probably leave alone, 
-* a sample layout that should be enough to let you experiment
+The forum is compatible with multi_site but you should use [sites](https://github.com/spanner/radiant-sites-extension) instead if you want forums and readers site-scoped.
 	
 ## Administration
 
@@ -71,30 +60,26 @@ The forum is easy to use and almost entirely separate from your page hierarchy.
 
 ## Configuration
 
-A few config options can be set:
-
-* `forum.layout` should be the name of the layout you want to use for reader-facing forum pages. See below for more detail.
-* `forum.default_forum` is the name of the forum that will be selected by default in the new-message form
-* `forum.editable_period` is the number of minutes for which posts remain editable by their authors once they have been submitted
+There is now a configuration panel for the forum and you shouldn't have to do any console-tinkering.
 
 ## Layouts
 
-We use `share_layouts` to present your forum pages inside the radiant layout of your choice. Set the config option 'forum.layout' to the name of the layout you want to use (or see below for multi_site instructions). Your layout can work in the usual way: all we do is define page parts for you to include with `<r:content part="something" />`. These are the parts available:
+Forum pages have their own controllers but they are presented inside your normal radiant layouts. Use the configuration interface to choose the layout you want to use. Your layout can work in the usual way: all we do is define page parts for you to include with `<r:content part="something" />`. These are the parts available:
 
 * the main page content (that you get with a bare `<r:content />`) gives you the main list, object or form.
 * 'pagetitle' will be the main page heading (eg the name of the topic): `<r:content part="pagetitle" />`
 * 'breadcrumbs' is what you'd expect: usually something simple like Forum > Category name
-* 'breadhead' is an up-one-level link that you may want to include in the page header
+* 'breadhead' is a minimal breadcrumb link that you may want to include in the page header
 * 'feed' is an icon link to the RSS feed for whatever you are currently looking at (and works for most things including searches, of which more below)
 * 'mugshot' is a gravatar for the author of this topic or post
 * 'credits' is the authorship summary for this topic or post
 
-These parts are only defined where they're relevent, so you can do something like this:
+These parts are only defined where they're relevant, so you can do something like this:
 
 	<h1 class="pagetitle">
-	  <r:content part="mugshot" />
+	  <r:content part="person" />
 	  <r:content part="breadhead" />
-	  <r:content part="pagetitle" />
+	  <r:title />
 	  <r:content part="feed" />
 	</h1>
 
@@ -106,10 +91,6 @@ You probably also want to include this somewhere, as on all reader-service pages
 
 Have a look at the included sample layout for a starting point.
 
-## Multi_site
-
-The forum is fine under multi_site. If you use [our version](http://github.com/spanner/radiant-multi-site-extension) then everything will be site-scoped for you. In that case, the forum layout is chosen for each site using a dropdown on the (currently extremely scruffy) site-editing page. Everything else works in just the same way and you should be able to run several forums next to each other without problems.
-
 ## Private discussion
 
 If you install the [reader_group](http://github.com/spanner/radiant-reader_group-extension) and [group_forum](http://github.com/spanner/radiant-group_forum-extension) extensions then your forums can be made visible only to designated groups, as with pages and other groupable items.
@@ -118,7 +99,7 @@ If you install the [reader_group](http://github.com/spanner/radiant-reader_group
 
 The forum has its own simple search mechanism. It's not very bright but it has two great advantages: you can combine text search with filtering by author and category, and you can bookmark any search query as an RSS feed to be alerted when new posts match that search. There are arguments for integrating this with eg `sphinx_search` but at the moment I quite like keeping them separate: I find that searching for messages is not the same as searching for pages, but usually a different group seeking different results. Let me know if you disagree.
 
-To enable the search, you can either link to `/forum/posts/search` or put `<r:forum_search>` somewhere in your forum layout. See the tag documentation for control of the search form presentation.
+The search is implemented just by passing parameters to posts_controller#index, so you can link to addresses like `/forum/posts?q=something&reader_id=45` or put `<r:forum_search>` somewhere in your forum layout. See the tag documentation for control of the search form presentation.
 
 ## Page Comments
 
@@ -129,7 +110,7 @@ The page cache means we don't want anything personal on the page itself - no edi
 * Put `<r:comments:remote />` on the page instead and a stub will be included suitable for your scripts to grab. A simple example is included in platform/forum.js.
 * `<r:comments:all /><r:comments:link />` is more efficient but less friendly: it will give you a static list of all comments followed by a reply link. Posting a comment clears the page cache, btw.
 
-You can also use `<r:comments:each>...</r:comments:each>` and the various r:comment tags to compose page comments however you like. See the tags-available documentation for details.
+You can also use `<r:comments:each>...</r:comments:each>` and the various `r:forum:post` tags to compose page comments however you like. See the tags-available documentation for details.
 
 ## Security & Spam
 
@@ -137,19 +118,19 @@ The reader extension includes email confirmation and a simple honeytrap that sho
 
 ## Scripting the forum interface
 
-I've presented this in the simplest way possible, on the assumption that everyone will want to do their own thing with it. An unobtrusive javascript front end (based on mootools but without much fanciness) is included to make things a little bit more friendly: it includes edit-in-place for posts, a bit of code to handle bringing page comments into the page, and some generally-useful routines like notice faders. That's about it, but I hope it will provide a starting point. The 'forum_example' layout that is created on installation should bring in that javascript and enough css for you to see it all working. For local reasons it's all stored under `javascripts/platform/...`
+The forum comes with some jquery-based scripting to handle inline administration and a few other useful functions. It's entirely unobtrusive and I assume you will want to replace or extend it. You should find the page DOM is quite simple and robust.
 
 ## Smilies
 
-I've included a basic set here and a redcloth extension that catches :smile: notation alongside the textile markup. There's a javascript front end in the works for that - click on the smiley, you know - which will also soon appear here.
+Included here is a redcloth extension to handle emoticons of the type inserted by the punymce toolbar we're using. Since we have control of both ends I've customised the set to make accidental emoticons less likely. There will soon be an option to disable them completely.
 
 ## Bugs
 
-Very likely. [Github issues](http://github.com/spanner/radiant-forum-extension/issues), please, or for little things an email or github message is fine.
+In the short term, quite likely. [Github issues](http://github.com/spanner/radiant-forum-extension/issues), please, or for little things an email or github message is fine.
 
 ## Author & Copyright
 
 * William Ross, for spanner. will at spanner.org
 * Originally based on dear old Beast, currently not visible at [http://beast.caboo.se](http://beast.caboo.se)
-* Copyright 2007-9 spanner ltd
+* Copyright 2007-11 spanner ltd
 * released under the same terms as Rails and/or Radiant

data/VERSION

@@ -1 +1 @@
-1.2.1
+2.0.0

data/app/controllers/forum_base_controller.rb

@@ -0,0 +1,78 @@
+class ForumBaseController < ReaderActionController
+
+  include Radiant::Pagination::Controller
+  radiant_layout { |c| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
+  before_filter :require_login_unless_public
+  before_filter :establish_context
+  helper :forum, :reader
+
+protected
+
+  def require_login_unless_public
+    return false unless Radiant::Config['forum.public?'] || require_reader && require_activated_reader
+  end
+  
+  def establish_context
+    @reader = Reader.find(params[:reader_id]) unless params[:reader_id].blank?
+    @topic = Topic.find(params[:topic_id]) unless params[:topic_id].blank?
+    @forum = Forum.find(params[:forum_id]) unless params[:forum_id].blank?
+    @page = Page.find(params[:page_id]) unless params[:page_id].blank?
+  end
+
+  def redirect_to_post
+    
+    Rails.logger.warn "!!! redirecting to post #{@post.inspect}"
+    Rails.logger.warn "!   which will have topic #{@post.topic} and within it page #{@post.page_when_paginated}"
+    
+    if (@post.page)
+      redirect_to "#{@post.page.url}?#{WillPaginate::ViewHelpers.pagination_options[:param_name]}=#{@post.page_when_paginated}##{@post.dom_id}"
+    elsif @post.first?
+      redirect_to forum_topic_path(@post.topic.forum, @post.topic)
+    else
+      post_location = {WillPaginate::ViewHelpers.pagination_options[:param_name] => @post.page_when_paginated, :anchor => @post.dom_id}
+      redirect_to forum_topic_url(@post.topic.forum, @post.topic, post_location)
+    end
+  end
+
+  def redirect_to_topic
+    redirect_to forum_topic_path(@forum, @topic)
+  end
+  
+  def redirect_to_page_or_topic
+    if @page
+      redirect_to @page.url
+    elsif @topic
+      redirect_to forum_topic_url(@topic.forum, @topic)
+    end
+  end
+
+  def redirect_to_forum
+    respond_to do |format|
+      format.html { redirect_to forum_path(@forum) }
+    end
+  end
+
+  def render_page_or_feed(template_name = action_name)
+    respond_to do |format|
+      format.html { render :action => template_name }
+      format.rss { render :action => template_name, :layout => 'feed' }
+      format.js { render :action => template_name, :layout => false }
+    end
+  end
+  
+  def redirect_to_admin
+    redirect_to admin_forums_url
+  end
+
+  def render_locked
+    respond_to do |format|
+      format.html { 
+        flash[:error] = t('topic_locked')
+        redirect_to_page_or_topic 
+      }
+      format.js { render :partial => 'topics/locked' }
+    end
+    false
+  end
+
+end

data/app/controllers/forums_controller.rb

@@ -1,42 +1,13 @@
-class ForumsController < ReaderActionController
-  include Radiant::Pagination::Controller
-  helper :forum
+class ForumsController < ForumBaseController
   
-  before_filter :private_forum
-  before_filter :find_forum, :only => :show
-  before_filter :no_changes_here, :except => [:index, :show]
-
-  radiant_layout { |controller| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
-
   def index
-    # visible is an open scope that can be overridden in other extensions, ie group_forum
-    @forums = Forum.visible.paginate(:all, pagination_parameters.merge(:order => "position"))
+    @forums = Forum.all.paginate(pagination_parameters)
   end
 
   def show
-    respond_to do |format|
-      format.html { 
-        @topics = Topic.paginate_by_forum_id(params[:id], pagination_parameters.merge(:include => :replied_by, :order => 'sticky desc, replied_at desc'))
-      }
-      format.rss  {
-        @topics = Topic.paginate_by_forum_id(params[:id], pagination_parameters.merge(:include => :replied_by, :order => 'replied_at desc'))
-        render :layout => 'feed'
-      }
-    end
-  end
-
-  def no_changes_here
-    redirect_to admin_forums_url
-  end
-
-protected
-
-  def private_forum
-    return false unless Radiant::Config['forum.public?'] || require_reader && require_activated_reader
-  end
-
-  def find_forum
     @forum = Forum.find(params[:id])
+    @topics = @forum.topics.stickyfirst.paginate(pagination_parameters)
+    render_page_or_feed
   end
-
+  
 end

data/app/controllers/posts_controller.rb

@@ -1,220 +1,128 @@
-class PostsController < ReaderActionController
-  include Radiant::Pagination::Controller
-  helper :forum
-
-  before_filter :private_forum
-  before_filter :require_activated_reader, :except => [:index, :show, :search]
-  before_filter :find_topic_or_page, :except => [:index, :search]
+class PostsController < ForumBaseController
+  
+  before_filter :require_activated_reader, :except => [:index, :show]
+  before_filter :find_post, :only => [:show, :edit, :update, :remove, :destroy]
   before_filter :require_unlocked_topic_and_page, :only => [:new, :create]
-  before_filter :find_post, :except => [:index, :search, :new, :create]
-  before_filter :build_post, :only => [:new]
+  before_filter :build_post, :only => [:new, :create]
   before_filter :require_authority, :only => [:edit, :update, :destroy]
 
-  radiant_layout { |controller| Radiant::Config['forum.layout'] || Radiant::Config['reader.layout'] }
-
-  @@default_query_options = { 
-    :page => 1,
-    :per_page => 20,
-    :order => 'posts.created_at desc',
-    :include => [:topic, :forum, :reader]
-  }
-  
   def index
-    @posts = Post.visible.paginate(:all, @@default_query_options.merge(pagination_parameters))
-    render_page_or_feed
-  end
-
-  def search
-    conditions = []
-    @reader = Reader.find(params[:reader_id]) unless params[:reader_id].blank?
-    @topic = Topic.find(params[:topic_id]) unless params[:topic_id].blank?
-    @forum = Forum.find(params[:forum_id]) unless params[:forum_id].blank?
-
-    conditions << Post.send(:sanitize_sql, ["posts.reader_id = ?", @reader.id]) if @reader
-    conditions << Post.send(:sanitize_sql, ["posts.topic_id = ?", @topic.id]) if @topic
-    conditions << Post.send(:sanitize_sql, ["posts.forum_id = ?", @forum.id]) if @forum
-    conditions << Post.send(:sanitize_sql, ['LOWER(posts.body) LIKE ?', "%#{params[:q]}%"]) unless params[:q].blank?
-    @searching = true if conditions.any?
-    
-    @posts = Post.paginate(:all, @@default_query_options.merge(:conditions => @searching ? conditions.collect { |c| "(#{c})" }.join(' AND ') : nil, :page => params[:page], :per_page => params[:per_page]))
-
-    # for summary of the set, and onward links
-    @forums = @posts.collect(&:forum).uniq
-    @topics = @posts.collect(&:topic).uniq
-    @readers = @posts.collect(&:reader).uniq
-
+    posts = Post.scoped
+    posts = posts.from(@reader) if @reader
+    posts = posts.in_topic(@topic) if @topic
+    posts = posts.in_forum(@forum) if @forum
+    posts = posts.containing(@term) if @term = params[:q]
+    @posts = posts.paginate(pagination_parameters)
     render_page_or_feed
   end
 
   def monitored
-    @searching = true
-    options = @@query_options.merge(:conditions => ['monitorships.reader_id = ? and monitorships.active = ?', params[:reader_id], true])
-    options[:joins] += ' inner join monitorships on monitorships.topic_id = topics.id'
-    options[:page] = params[:page] || 1
-    @posts = Post.paginate(:all, options)
-    @title = "Topics you're watching"
+    @topics = current_reader.monitored_topics
+    @posts = Post.in_topics(@topics).paginate(pagination_parameters)
     render_page_or_feed
   end
 
   def show
     respond_to do |format|
-      format.html { redirect_to_page_or_topic }
+      format.html { redirect_to_post }
       format.js { render :layout => false }
     end
   end
 
-  # this is typically called by xht to bring a comment form into a page or a reply form into a topic
-  # if the reader is not logged in, reader_required should have intervened and caused the return of a login form instead
-
   def new
+    unless @post.topic || @post.page
+      @forum ||= Forum.find_by_name(Radiant::Config['forum.default_forum'])
+      @post.topic = @forum.topics.new
+    end
     respond_to do |format|
-      format.html { render :template => 'posts/new' } # we specify the template because in theory we could be reverting from a post to create 
-      format.js { render :partial => 'posts/reply' }
+      format.html { }
+      format.js { render :partial => 'posts/form', :layout => false }
     end
   end
     
   def create
-    if @topic.new_record?
-      # only happens if it's a page comment and the topic has just been built
-      @topic.reader = current_reader
-      @topic.save!
-    end
-    @post = @topic.posts.create!(params[:post])
-
-    Radiant::Cache.clear if @page
-
+    @post.save!
+    Radiant::Cache.clear if @post.page
     respond_to do |format|
-      format.html { redirect_to_page_or_topic }
-      format.js { render :action => 'show', :layout => false }
+      format.html { redirect_to_post }
+      format.js { render :partial => 'post' }
     end
-  end
-
-  def topic_locked
+  rescue ActiveRecord::RecordInvalid
+    flash[:error] = t("validation_failure")
     respond_to do |format|
-      format.html do
-        flash[:notice] = 'Topic is locked.'
-        redirect_to_page_or_topic
-      end
-      format.js { render :partial => 'topics/locked' }
+      format.html { render :action => 'new' }
+      format.js { render :partial => 'posts/form' }
     end
-    return
   end
-    
+
   def edit
     respond_to do |format| 
-      format.html { render }
-      format.js { render :layout => false }
+      format.html { }
+      format.js { render :partial => 'posts/form' }
     end
   end
   
   def update
     @post.attributes = params[:post]
     @post.save!
-    @post.save_attachments(params[:files])
-    Radiant::Cache.clear if @post.topic.page
+    Radiant::Cache.clear if @post.page
+    respond_to do |format|
+      format.html { redirect_to_post }
+      format.js { render :partial => 'post' }
+    end
   rescue ActiveRecord::RecordInvalid
-    flash[:error] = "Sorry: message can't be empty"
-  ensure
+    flash[:error] = t("validation_failure")
     respond_to do |format|
-      format.html { redirect_to_page_or_topic }
-      format.js { render :partial => 'post', :layout => false }
-      format.json { render :json => @post.as_json }
+      format.html { render :action => 'edit' }
+      format.js { render :partial => 'posts/form' }
+    end
+  end
+
+  def remove
+    respond_to do |format|
+      format.html {}
+      format.js { render :partial => 'confirm_delete' }
     end
   end
 
   def destroy
     if @post.first?
       @post.topic.destroy
-      flash[:notice] = "Topic removed"
-      respond_to do |format|
-        format.html { redirect_to_forum }
-        format.js { render :partial => 'post', :layout => false }
-      end
+      flash[:notice] = t("topic_removed")
+      redirect_to_forum
     else
       @post.destroy
-      flash[:notice] = "Post removed"
       respond_to do |format|
-        format.html { redirect_to_page_or_topic }
-        format.js { render :partial => 'post', :layout => false }
+        format.html { 
+          flash[:notice] = t("post_removed")
+          redirect_to_page_or_topic 
+        }
+        format.js { render :partial => 'post' }
       end
     end
   end
 
 protected
 
-  def private_forum
-    return false unless Radiant::Config['forum.public?'] || require_reader && require_activated_reader
+  def find_post
+    @post ||= Post.find(params[:id])
   end
 
   def require_authority
-    (current_user && current_user.admin?) || @post.editable_by?(current_reader)      # includes an editable-interval check
+    current_reader.is_admin? || @post.editable_by?(current_reader)      # includes an editable-interval check
   end
           
-  def find_topic_or_page
-    if params[:page_id]
-      @page = Page.find(params[:page_id])
-      @topic = @page.find_or_build_topic
-      @forum = @topic.forum if @topic
-    elsif params[:topic_id]
-      @topic = Topic.find(params[:topic_id], :include => :forum)
-      @forum = @topic.forum if @topic
-    end
-  end
-  
   def require_unlocked_topic_and_page
-    return page_locked if @page && @page.locked?
-    return topic_locked if @topic.locked?
+    return render_locked if @page && @page.locked?
+    return render_locked if @topic && @topic.locked?
     true
   end
 
-  def find_post
-    @post = @topic.posts.find(params[:id])
-  end
-  
   def build_post
     @post = Post.new(params[:post])
-    @post.topic = @topic if @topic
     @post.reader = current_reader
+    @post.page ||= @page
+    @post.topic ||= @topic
   end
-  
-  def redirect_to_page_or_topic   
-    if (@topic.page)
-      post_location = @post ? "##{@post.dom_id}" : ""
-      redirect_to @topic.page.url + post_location
-    else
-      post_location = @post ? {:page => @post.topic_page, :anchor => @post.dom_id} : {}
-      redirect_to forum_topic_url(@topic.forum, @topic, post_location)
-    end
-  end
-
-  def redirect_to_forum
-    redirect_to forum_url(@topic.forum)
-  end
-  
-  def page_locked
-    respond_to do |format|
-      format.html {
-        flash[:error] = 'This page is not commentable.'
-        redirect_to @page.url
-      }
-      format.js {
-        render :template => 'locked', :layout => false
-      }
-    end
-    false
-  end
-  
-  def topic_locked
-    respond_to do |format|
-      format.html {
-        flash[:error] = 'This topic is locked.'
-        redirect_to_page_or_topic
-      }
-      format.js {
-        render :partial => 'topics/locked'
-      }
-    end
-    false
-  end
-
+    
 end