typo 4.1.1 → 5.0

data/app/apis/meta_weblog_service.rb

@@ -98,18 +98,17 @@ class MetaWeblogService < TypoWebService
     article.keywords       = struct['mt_keywords'] || ''
     article.text_filter    = TextFilter.find_by_name(struct['mt_convert_breaks'] || this_blog.text_filter)
 
+    if !article.save
+      raise article.errors.full_messages * ", "
+    end
+
     if struct['categories']
-      article.categories.clear
       Category.find(:all).each do |c|
         article.categories << c if struct['categories'].include?(c.name)
       end
     end
 
-    if article.save
-      article.id.to_s
-    else
-      raise article.errors.full_messages * ", "
-    end
+    article.id.to_s
   end
 
   def deletePost(appkey, postid, username, password, publish)
@@ -135,7 +134,7 @@ class MetaWeblogService < TypoWebService
     article.text_filter    = TextFilter.find_by_name(struct['mt_convert_breaks'] || this_blog.text_filter)
 
     if struct['categories']
-      article.categories.clear
+      article.categorizations.clear
       Category.find(:all).each do |c|
         article.categories << c if struct['categories'].include?(c.name)
       end
@@ -168,13 +167,7 @@ class MetaWeblogService < TypoWebService
       :mt_allow_pings    => article.allow_pings? ? 1 : 0,
       :mt_convert_breaks => (article.text_filter.name.to_s rescue ''),
       :mt_tb_ping_urls   => article.pings.collect { |p| p.url },
-      :dateCreated       => (article.published_at.to_formatted_s(:db) rescue "")
+      :dateCreated       => (article.published_at.getutc.to_formatted_s(:db) rescue "")
       )
   end
-
-  protected
-
-  def pub_date(time)
-    time.strftime "%a, %e %b %Y %H:%M:%S %Z"
-  end
 end

data/app/apis/movable_type_service.rb

@@ -108,7 +108,7 @@ class MovableTypeService < TypoWebService
 
     for c in categories
       category = Category.find(c['categoryId'])
-      article.categories.push_with_attributes(category, :is_primary => c['isPrimary'] || 0)
+      article.add_category(category, c['isPrimary'])
     end
     article.save
   end
@@ -141,10 +141,4 @@ class MovableTypeService < TypoWebService
     article.published = true
     article.save
   end
-
-  private
-
-  def pub_date(time)
-    time.strftime "%a, %e %b %Y %H:%M:%S %Z"
-  end
 end

data/app/controllers/accounts_controller.rb

@@ -5,11 +5,12 @@ class AccountsController < ApplicationController
   def login
     case request.method
       when :post
-      if session[:user] = User.authenticate(params[:user_login], params[:user_password])
+      if user = User.authenticate(params[:user_login], params[:user_password])
+        session[:user_id] = user.id
 
         flash[:notice]  = "Login successful"
         cookies[:is_admin] = "yes"
-        redirect_back_or_default :controller => "admin/content", :action => "index"
+        redirect_back_or_default :controller => "admin/dashboard", :action => "index"
       else
         flash.now[:notice]  = "Login unsuccessful"
 
@@ -27,7 +28,7 @@ class AccountsController < ApplicationController
     @user = User.new(params[:user])
 
     if request.post? and @user.save
-      session[:user] = User.authenticate(@user.login, params[:user][:password])
+      session[:user_id] = @user.id
       flash[:notice]  = "Signup successful"
       redirect_to :controller => "admin/general", :action => "index"
       return
@@ -35,7 +36,7 @@ class AccountsController < ApplicationController
   end
 
   def logout
-    session[:user] = nil
+    session[:user_id] = nil
     cookies.delete :is_admin
   end
 

data/app/controllers/admin/advanced_controller.rb

@@ -0,0 +1,20 @@
+class Admin::AdvancedController < Admin::BaseController
+  def index
+    if this_blog.base_url.blank?
+      this_blog.base_url = blog_base_url
+    end
+  end
+
+  def update
+    if request.post?
+      Blog.transaction do
+        params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
+        this_blog.save
+        flash[:notice] = _('config updated.')
+      end
+      redirect_to :action => 'index'
+    end
+  end
+
+  private
+end

data/app/controllers/admin/base_controller.rb

@@ -8,32 +8,42 @@ class Admin::BaseController < ApplicationController
         :theme_advanced_toolbar_location => "top",
         :theme_advanced_toolbar_align => "left",
         :theme_advanced_resizing => true,
+        :nonbreaking_force_tab => true,
+        :extended_valid_elements => %w{typo:code[lang]img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name|obj|param|embed]},      
         :theme_advanced_resize_horizontal => false,
         :paste_auto_cleanup_on_paste => true,
         :theme_advanced_buttons1 => %w{formatselect bold italic underline strikethrough
                                        separator justifyleft justifycenter justifyright
                                        separator bullist numlist forecolor backcolor
-                                       separator link unlink image},
+                                       separator link unlink image media separator emotions nonbreaking },
         :theme_advanced_buttons2 => [],
         :theme_advanced_buttons3 => [],
-        :plugins => %w{contextmenu paste}},
+        :plugins => %w{contextmenu paste media advimage safari emotions advlink autosave nonbreaking }},
       :only => [:new, :edit])
   end
 
   layout 'administration'
   before_filter :login_required, :except => [ :login, :signup ]
   before_filter :look_for_needed_db_updates, :except => [:login, :signup, :update_database, :migrate]
-
+  before_filter :deprecation_warning
   cache_sweeper :blog_sweeper
 
   private
 
+  # Deprecation warning for plugins removal
+  def deprecation_warning
+    if this_blog.deprecation_warning != 42
+      Blog.transaction do
+        this_blog.deprecation_warning = 42
+        this_blog.save
+      end
+      flash[:error] = "Deprecation warning: please, notice that most plugins have been  removed from the main engine in this new version. To download them, run <code>script/plugins install myplugin</code>, where myplugin is one of them at http://svn.typosphere.org/typo/plugins/"
+    end
+  end
+  
   def look_for_needed_db_updates
     if Migrator.offer_migration_when_available
       redirect_to :controller => '/admin/general', :action => 'update_database' if Migrator.current_schema_version != Migrator.max_schema_version
     end
   end
-
-  include_protected ActionView::Helpers::TagHelper, ActionView::Helpers::TextHelper
-
 end

data/app/controllers/admin/blacklist_controller.rb

@@ -1,7 +1,7 @@
 class Admin::BlacklistController < Admin::BaseController
   def index
     list
-    render_action 'list'
+    render :action => 'list'
   end
 
   def list

data/app/controllers/admin/cache_controller.rb

@@ -2,25 +2,26 @@ class Admin::CacheController < Admin::BaseController
 
   def index
     list
-    render_action 'list'
+    render :action => 'list'
   end
 
   def list
-    @page_cache_size = PageCache.count
+    @page_cache_size = -1
   end
 
   def sweep
     PageCache.sweep_all
     expire_fragment(/.*/)
 
-    flash[:notice] = 'Cache was cleared'
+    flash[:notice] = _('Cache was cleared')
     redirect_to :controller => '/admin/general'
   end
 
   def sweep_html
+    PageCache.sweep_all
     expire_fragment(/^contents_html.*/)
 
-    flash[:notice] = 'HTML was cleared'
+    flash[:notice] = _('HTML was cleared')
     redirect_to :controller => '/admin/general'
   end
 

data/app/controllers/admin/categories_controller.rb

@@ -2,7 +2,7 @@ class Admin::CategoriesController < Admin::BaseController
 
   def index
     list
-    render_action 'list'
+    render :action => 'list'
   end
 
   def list
@@ -17,9 +17,9 @@ class Admin::CategoriesController < Admin::BaseController
     @category = Category.new(params[:category])
 
     if request.post? and @category.save
-      flash[:notice] = 'Category was successfully created.'
+      flash[:notice] = _('Category was successfully created.')
     else
-      flash[:error] = 'Category could not be created.'
+      flash[:error] = _('Category could not be created.')
     end
 
     redirect_to :action => 'list'
@@ -29,7 +29,7 @@ class Admin::CategoriesController < Admin::BaseController
     @category = Category.find(params[:id])
     @category.attributes = params[:category]
     if request.post? and @category.save
-      flash[:notice] = 'Category was successfully updated.'
+      flash[:notice] = _('Category was successfully updated.')
       redirect_to :action => 'list'
     end
   end

data/app/controllers/admin/comments_controller.rb

@@ -4,11 +4,11 @@ class Admin::CommentsController < Admin::BaseController
 
   def index
     list
-    render_action 'list'
+    render :action => 'list'
   end
 
   def list
-    @comments = @article.comments.find(:all, :order => "id DESC")
+    @comments = @article.comments.find(:all, :order => "id ASC")
   end
 
   def show
@@ -22,7 +22,7 @@ class Admin::CommentsController < Admin::BaseController
       # We should probably wave a spam filter over this, but for now, just mark it as published.
       @comment.mark_as_ham!
       flash[:notice] = 'Comment was successfully created.'
-      redirect_to :action => 'show', :id => @comment.id
+      redirect_to :controller => '/admin/comments', :article_id => @article.id, :action => 'list'
     end
   end
 

data/app/controllers/admin/content_controller.rb

@@ -3,14 +3,24 @@ require 'base64'
 class Admin::ContentController < Admin::BaseController
   def index
     list
-    render_action 'list'
+    render :action => 'list'
   end
 
   def list
+    if params[:order] and params[:order] =~ /title|created_at|author|state/
+      if params[:sense] and params[:sense] == 'desc'
+        order = params[:order] + " asc"
+      else
+        order = params[:order] + " desc"        
+      end
+    else
+      order = 'id DESC'
+    end
+
     now = Time.now
-    count = this_blog.articles.count
+    count = this_blog.articles.size
     @articles_pages = Paginator.new(self, count, 15, params[:id])
-    @articles = this_blog.articles.find(:all, :limit => 15, :order => 'id DESC',
+    @articles = this_blog.articles.find(:all, :limit => 15, :order => order,
                                         :offset => @articles_pages.current.offset)
     setup_categories
     @article = this_blog.articles.build(params[:article])
@@ -48,7 +58,7 @@ class Admin::ContentController < Admin::BaseController
 
   def preview
     headers["Content-Type"] = "text/html; charset=utf-8"
-    @article = this_blog.articles.build 
+    @article = this_blog.articles.build
     @article.attributes = params[:article]
     set_article_author
     data = render_to_string(:layout => "minimal")
@@ -96,6 +106,7 @@ class Admin::ContentController < Admin::BaseController
   def new_or_edit
     get_or_build_article
     params[:article] ||= {}
+    params[:bookmarklet_link] && post_from_bookmarklet
 
     @article.attributes = params[:article]
     setup_categories
@@ -111,6 +122,14 @@ class Admin::ContentController < Admin::BaseController
     end
   end
 
+  def post_from_bookmarklet
+    params[:article][:title] = params[:bookmarklet_title]
+    params[:article][:body] = '<a href="' + params[:bookmarklet_link] + \
+      ' title="' + params[:bookmarklet_title] + '">' + \
+      params[:bookmarklet_title] + '</a>'
+    params[:article][:body] += ("\n\n" + params[:bookmarklet_text]) if params[:bookmarklet_text]
+  end
+
   def set_the_flash
     case params[:action]
     when 'new'
@@ -124,8 +143,8 @@ class Admin::ContentController < Admin::BaseController
 
   def set_article_author
     return if @article.author
-    @article.author = session[:user].login
-    @article.user   = session[:user]
+    @article.author = current_user.login
+    @article.user   = current_user
   end
 
   def save_attachments

data/app/controllers/admin/dashboard_controller.rb

@@ -0,0 +1,33 @@
+class Admin::DashboardController < Admin::BaseController
+  def index
+    comments
+    lastposts
+    popular
+  end
+  
+  private
+  
+  def comments
+    @comments ||=
+      Comment.find(:all,
+                   :limit => 10,
+                   :conditions => ['published = ?', true],
+                   :order => 'created_at DESC')
+  end
+  
+  def lastposts
+    @recent_posts = Article.find(:all, 
+                                 :conditions => ["published = ?", true], 
+                                 :order => 'published_at DESC', 
+                                 :limit => 10)
+  end
+  
+  def popular
+    @bestof = Article.find(:all,
+                           :select => 'contents.*, comment_counts.count AS comment_count',
+                           :from => "contents, (SELECT feedback.article_id AS article_id, COUNT(feedback.id) as count FROM feedback GROUP BY feedback.article_id ORDER BY count DESC LIMIT 9) AS comment_counts",
+                           :conditions => ['comment_counts.article_id = contents.id AND published = ?', true],
+                           :order => 'comment_counts.count DESC',
+                           :limit => 9) 
+  end
+end

data/app/controllers/admin/feedback_controller.rb

@@ -26,7 +26,7 @@ class Admin::FeedbackController < Admin::BaseController
       :conditions => conditions,
       :per_page => 40)
 
-    render_action 'list'
+    render :action => 'list'
   end
 
   def delete
@@ -43,6 +43,8 @@ class Admin::FeedbackController < Admin::BaseController
 
   def bulkops
     ids = (params[:feedback_check]||{}).keys.map(&:to_i)
+    items = Feedback.find(ids)
+    @unexpired = true
 
     case params[:commit]
     when 'Delete Checked Items'
@@ -52,30 +54,40 @@ class Admin::FeedbackController < Admin::BaseController
       end
       flash[:notice] = "Deleted #{count} item(s)"
 
-      # Sweep cache
-      PageCache.sweep_all
-      expire_fragment(/.*/)
-    when 'Mark Checked Items as Ham'
-      ids.each do |id|
-        feedback = Feedback.find(id)
-        feedback.mark_as_ham!
+      items.each do |i|
+        i.invalidates_cache? or next
+        flush_cache
+        return
       end
+    when 'Mark Checked Items as Ham'
+      update_feedback(items, :mark_as_ham!)
       flash[:notice]= "Marked #{ids.size} item(s) as Ham"
     when 'Mark Checked Items as Spam'
-      ids.each do |id|
-        feedback = Feedback.find(id)
-        feedback.mark_as_spam!
-      end
+      update_feedback(items, :mark_as_spam!)
       flash[:notice]= "Marked #{ids.size} item(s) as Spam"
     when 'Confirm Classification of Checked Items'
-      ids.each do |id|
-        Feedback.find(id).confirm_classification!
-      end
+      update_feedback(items, :confirm_classification!)
       flash[:notice] = "Confirmed classification of #{ids.size} item(s)"
     else
       flash[:notice] = "Not implemented"
     end
 
-    redirect_to :action => 'index', :page => params[:page], :search => params[:search]
+    redirect_to :action => 'index', :page => params[:page], :search => params[:search], :confirmed => params[:confirmed], :published => params[:published]
+  end
+
+  protected
+
+  def update_feedback(items, method)
+    items.each do |value|
+      value.send(method)
+      @unexpired && value.invalidates_cache? or next
+      flush_cache
+    end
+  end
+
+  def flush_cache
+    @unexpired = false
+    PageCache.sweep_all
+    expire_fragment(/.*/)
   end
 end

data/app/controllers/admin/general_controller.rb

@@ -1,12 +1,9 @@
 class Admin::GeneralController < Admin::BaseController
-  # Deprecation warning for plugins removal
-  before_filter :deprecation_warning
-  
+
   def index
     if this_blog.base_url.blank?
       this_blog.base_url = blog_base_url
     end
-    @page_cache_size = PageCache.count
   end
 
   def redirect
@@ -35,22 +32,11 @@ class Admin::GeneralController < Admin::BaseController
       Blog.transaction do
         params[:setting].each { |k,v| this_blog.send("#{k.to_s}=", v) }
         this_blog.save
-        flash[:notice] = 'config updated.'
+        flash[:notice] = _('config updated.')
       end
       redirect_to :action => 'index'
     end
   end
 
-  # Deprecation warning for plugins removal
-  def deprecation_warning
-    if this_blog.deprecation_warning == 1
-      Blog.transaction do
-        this_blog.deprecation_warning = 0
-        this_blog.save
-      end
-      flash[:notice] = "Deprecation warning: please, notice that most plugins are going to be removed from the main engine in the next version. <a href='http://blog.typosphere.org/articles/2007/04/15/the-futur-of-typo-sidebar-plugins'>Read more on the official Typo blog</a>"
-    end
-  end
-
   private
 end