typo 5.0.3.98.1 → 5.1

data/CHANGES-5.1

@@ -0,0 +1,54 @@
+Typo 5.1 "Cartier-Bresson" was released on sunday July the 20th at around 1AM and can be considered as a major Typo Version.
+
+It contains :
+
+
+** Multiple users and roles. 
+
+This point actually makes Typo 5.1 a major version. This release introduces 3 roles, coming along with various privileges :
+– Administrator, who owns full administrative and publishing power.
+– Publisher, who owns full publishing power on his own contents.
+– Contributors, who only have the right to login and edit their profile.
+
+There is now an option to allow new users to register by themselves or not. If not, the administrator will just have to add them himself in the admin.
+
+
+** Improved admin
+
+The admin has been heavily refactored to be lighter, easier to use, and offer more capabilities. 
+– You can now save your posts as drafts. Drafts now appear in a separate area of your administration to separarte them from offline posts.
+– New editing interface.
+– Tag autocompletion.
+– A new dashboard that makes daily administration easier.
+– Save as draft capabilities
+– Autosave capabilities (only with simple visual editor)
+– Revamped UI
+– Many more...
+
+
+** New default theme
+
+After leaving the too much long used Azure theme for some templates found on open source design websites, we realized Typo needed a new default theme. We asked O2Source a French web Agency involved in many free and open source templates, and they came up with Typographic. 
+
+We wanted something new, far from the classic white and blue fixed width wordpressish thing, something with its own personnality, that would take the whole screen and adapt many resolutions, and we've been quite delighted with what Hélène produced.
+
+
+** Come back of the gem and the installer
+
+After fixing numerous bugs happening with Typo installed through our installer, we were able to provide the gem again, making Typo installation easier than ever.
+
+MySQL is now the default database and SQLITE dependency has been removed.
+
+** Lots of code improvement and refactoring
+
+The code have been improved and refactored, maing Typo lighter than ever. This is a guarantee of less errors.
+
+** New migrators
+
+We've included new migrators, allowing easy import from Wordpress and Dotclear 1.2 and 2. Typepad and Textpattern may follow soon.
+
+** New site with up to date documentation
+
+The bugtracker has been moved from Trac to Redmine, so has the documentation, which has been rewriten in many ways. Access to the doc has also been made easier by merging redmine.typosphere.org with trac.typosphere.org.
+
+Lots of bugfixes, too much to say here.

data/app/apis/meta_weblog_service.rb

@@ -91,12 +91,12 @@ class MetaWeblogService < TypoWebService
     article.user        = @user
 
     # Movable Type API support
-    article.allow_comments = struct['mt_allow_comments'] || this_blog.default_allow_comments
-    article.allow_pings    = struct['mt_allow_pings'] || this_blog.default_allow_pings
-    article.extended       = struct['mt_text_more'] || ''
-    article.excerpt        = struct['mt_excerpt'] || ''
-    article.keywords       = struct['mt_keywords'] || ''
+    article.allow_comments = struct['mt_allow_comments']  || this_blog.default_allow_comments
+    article.allow_pings    = struct['mt_allow_pings']     || this_blog.default_allow_pings
+    article.extended       = struct['mt_text_more']       || ''
+    article.excerpt        = struct['mt_excerpt']         || ''
     article.text_filter    = TextFilter.find_by_name(struct['mt_convert_breaks'] || this_blog.text_filter)
+    article.keywords       = struct['mt_keywords']        || ''
 
     if !article.save
       raise article.errors.full_messages * ", "
@@ -138,6 +138,7 @@ class MetaWeblogService < TypoWebService
         article.categories << c if struct['categories'].include?(c.name)
       end
     end
+    
     RAILS_DEFAULT_LOGGER.info(struct['mt_tb_ping_urls'])
     article.save
     true
@@ -161,7 +162,7 @@ class MetaWeblogService < TypoWebService
       :categories        => article.categories.collect { |c| c.name },
       :mt_text_more      => article.extended.to_s,
       :mt_excerpt        => article.excerpt.to_s,
-      :mt_keywords       => article.keywords.to_s,
+      :mt_keywords       => article.tags.collect { |p| p.name }.join(', '),
       :mt_allow_comments => article.allow_comments? ? 1 : 0,
       :mt_allow_pings    => article.allow_pings? ? 1 : 0,
       :mt_convert_breaks => (article.text_filter.name.to_s rescue ''),

data/app/controllers/accounts_controller.rb

@@ -20,7 +20,7 @@ class AccountsController < ApplicationController
   end
   
   def signup
-    unless User.count.zero?
+    unless User.count.zero? or this_blog.allow_signup == 1
       redirect_to :action => 'login'
       return
     end
@@ -28,6 +28,7 @@ class AccountsController < ApplicationController
     @user = User.new(params[:user])
 
     if request.post? and @user.save
+      self.current_user = @user
       session[:user_id] = @user.id
       flash[:notice]  = _("Signup successful")
       redirect_to :controller => "admin/settings", :action => "index"

data/app/controllers/admin/content_controller.rb

@@ -1,7 +1,7 @@
 require 'base64'
 module Admin; end
 class Admin::ContentController < Admin::BaseController
-  layout "administration", :except => 'show'
+  layout "administration", :except => [:show, :autosave]
 
   def auto_complete_for_article_keywords
     @items = Tag.find_with_char params[:article][:keywords].strip
@@ -15,7 +15,8 @@ class Admin::ContentController < Admin::BaseController
 
   def index
     # Filtering articles
-    conditions = "contents.id > 0"
+    @drafts = Article.find(:all, :conditions => "state='draft'")
+    conditions = "state in('published', 'withdrawn')"
     if params[:search]
       @search = params[:search]
 
@@ -52,10 +53,24 @@ class Admin::ContentController < Admin::BaseController
   end
 
   def new; new_or_edit; end
-  def edit; new_or_edit; end
+  def edit
+    @drafts = Article.find(:all, :conditions => "state='draft'")
+    article = Article.find(params[:id])
+    if current_user.profile.label != 'admin' and article.user_id != current_user.id 
+      redirect_to :action => 'list'
+      flash[:error] = _("Error, you are not allowed to perform this action")
+    end
+    new_or_edit 
+  end
 
   def destroy
     @article = Article.find(params[:id])
+    
+    if current_user.profile.label != 'admin' and @article.user_id != current_user.id 
+      redirect_to :action => 'list'
+      flash[:error] = _("Error, you are not allowed to perform this action")
+    end
+    
     if request.post?
       @article.destroy
       redirect_to :action => 'list'
@@ -86,6 +101,30 @@ class Admin::ContentController < Admin::BaseController
     end
   end
 
+  def autosave
+    if params[:id]
+      @article = Article.find(params[:id])
+    else
+      @article = Article.new
+    end
+
+    unless @article.published
+      params[:article] ||= {}
+      @article.attributes = params[:article]
+
+      setup_categories
+      @selected = @article.categories.collect { |c| c.id }
+      set_article_author
+      save_attachments
+      @article.state = "draft" unless @article.state == "withdrawn"
+      if @article.save
+        set_article_categories
+        render :text => _("Article was successfully saved at ") + Time.now.to_s
+        return true
+      end
+    end
+    render :text => nil
+  end
   protected
 
   attr_accessor :resources, :categories, :resource, :category
@@ -103,17 +142,20 @@ class Admin::ContentController < Admin::BaseController
   def real_action_for(action); { 'add' => :<<, 'remove' => :delete}[action]; end
 
   def new_or_edit
+    @drafts = Article.find(:all, :conditions => "state='draft'")
     get_or_build_article
     params[:article] ||= {}
     params[:bookmarklet_link] && post_from_bookmarklet
 
     @resources = Resource.find(:all, :order => 'created_at DESC')
     @article.attributes = params[:article]
+
     setup_categories
     @selected = @article.categories.collect { |c| c.id }
     if request.post?
       set_article_author
       save_attachments
+      @article.state = "draft" if @article.draft
       if @article.save
         set_article_categories
         set_the_flash

data/app/controllers/admin/pages_controller.rb

@@ -75,7 +75,7 @@ class Admin::PagesController < Admin::BaseController
     @page.attributes = params[:page]
     if request.post? and @page.save
       flash[:notice] = 'Page was successfully updated.'
-      redirect_to :action => 'show', :id => @page.id
+      redirect_to :action => 'index'
     end
   end
 

data/app/controllers/admin/textfilters_controller.rb

@@ -1,10 +1,10 @@
 class Admin::TextfiltersController < Admin::BaseController
-  def index
-    list
-    render :action => 'list'
+  def list
+    index
+    render :action => 'index'
   end
 
-  def list
+  def index
     @textfilters = TextFilter.find(:all, :order => "id DESC")
     @textfilter_map = TextFilter.filters_map
     @macros = TextFilter.available_filters.select { |filter| TextFilterPlugin::Macro > filter }

data/app/controllers/admin/users_controller.rb

@@ -6,7 +6,11 @@ class Admin::UsersController < Admin::BaseController
   end
 
   def index
-    @users = User.find :all
+    if current_user.profile.label == 'admin'
+      @users = User.find :all
+    else
+      redirect_to :action => 'edit'
+    end
   end
 
   def new
@@ -19,7 +23,15 @@ class Admin::UsersController < Admin::BaseController
   end
 
   def edit
-    @user = User.find_by_id(params[:id])
+    if current_user.profile.label == 'admin'
+      @user = User.find_by_id(params[:id])
+    else
+      if params[:id] and params[:id] != current_user[:id]
+        flash[:error] = _("Error, you are not allowed to perform this action")
+        redirect_to :action => 'index'
+      end
+      @user = User.find_by_id(current_user.id)
+    end
     setup_profiles
     @user.attributes = params[:user]
     if request.post? and @user.save

data/app/controllers/application.rb

@@ -2,7 +2,7 @@
 # Likewise will all the methods added be available for all controllers.
 class ApplicationController < ActionController::Base
   include ::LoginSystem
-  protect_from_forgery :secret => '1c8b953667056f1a3c324d6b369f6158', :except => [:search, :preview]
+  protect_from_forgery :secret => '1c8b953667056f1a3c324d6b369f6158', :only => [:create, :edit, :update]
   before_filter :reset_local_cache, :fire_triggers, :load_lang
   after_filter :reset_local_cache
 
@@ -35,6 +35,9 @@ class ApplicationController < ActionController::Base
   end
 
   def reset_local_cache
+    if !session
+      session :session => new
+    end
     CachedModel.cache_reset
     @current_user = nil
   end

data/app/controllers/articles_controller.rb

@@ -14,8 +14,6 @@ class ArticlesController < ContentController
     caches_page *cached_pages
   end
 
-  session :new_session => true
-
   helper :'admin/base'
 
   def index
@@ -85,7 +83,7 @@ class ArticlesController < ContentController
   end
 
   def view_page
-    if(@page = Page.find_by_name(params[:name])) && @page.published?
+    if(@page = Page.find_by_name(params[:name].map { |c| c }.join("/"))) && @page.published?
       @page_title = @page.title
     else
       render :nothing => true, :status => 404

data/app/controllers/backend_controller.rb

@@ -1,4 +1,6 @@
 class BackendController < ContentController
+  skip_before_filter :verify_authenticity_token
+  
   cache_sweeper :blog_sweeper
   session :off
 

data/app/controllers/comments_controller.rb

@@ -14,6 +14,12 @@ class CommentsController < FeedbackController
       else
         redirect_to article_path(@article)
       end
+    else
+      if request.xhr?
+        render :partial => '/articles/comment_failed', :object => @comment
+      else
+        redirect_to article_path(@article)
+      end      
     end
   end
 

data/app/helpers/admin/base_helper.rb

@@ -76,12 +76,34 @@ module Admin::BaseHelper
     link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
       :controller => controller, :action => 'edit', :id => record.id
   end
+  
+  def link_to_edit_with_profiles(record, controller = @controller.controller_name)
+    if current_user.profile.label == 'admin'
+    link_to image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
+      :controller => controller, :action => 'edit', :id => record.id
+    else
+      link_to(image_tag('admin/edit.png', :alt => "edit", :title => "Edit content"),
+        :controller => controller, :action => 'edit', :id => record.id) if current_user.id == record.user_id
+    end
+  end
 
   def link_to_destroy(record, controller = @controller.controller_name)
     link_to image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"),
       :controller => controller, :action => 'destroy', :id => record.id
   end
 
+  def link_to_destroy_with_profiles(record, controller = @controller.controller_name)
+    if current_user.profile.label == 'admin'
+      link_to(image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"), 
+      { :controller => controller, :action => 'destroy', :id => record.id, :search => params[:search], 
+        :page => params[:page] },  :confirm => "Are you sure?", :method => :post)
+    else
+      link_to(image_tag('admin/delete.png', :alt => "delete", :title => "Delete content"), 
+      { :controller => controller, :action => 'destroy', :id => record.id, :search => params[:search], 
+        :page => params[:page] },  :confirm => "Are you sure?", :method => :post) if current_user.id == record.user_id
+    end
+  end
+
   def text_filter_options
     TextFilter.find(:all).collect do |filter|
       [ filter.description, filter ]
@@ -100,34 +122,10 @@ module Admin::BaseHelper
     link_to_function(title, toggle_effect('quick-post', 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
   end
 
-  def task_quicknav(title)
-    content_tag :li, link_to_function(title, toggle_effect('quick-navigate', 'Effect.BlindUp', "duration:0.4", "Effect.BlindDown", "duration:0.4"))
-  end
-
   def task_overview
     task(_('Back to overview'), 'index')
   end
 
-  def task_new(title)
-    task(title, 'new')
-  end
-
-  def task_destroy(title, id)
-    task(title, 'destroy', id)
-  end
-
-  def task_edit(title, id)
-    task(title, 'edit', id)
-  end
-
-  def task_show(title, id)
-    task(title, 'show', id)
-  end
-
-  def task_help(title, id)
-    task(title, 'show_help', id)
-  end
-
   def task(title, action, id = nil)
     content_tag :li, link_to(title, :action => action, :id => id)
   end
@@ -185,7 +183,7 @@ module Admin::BaseHelper
   end
 
   def class_sidebar
-    if controller.controller_name  =~ /sidebar|textfilter/
+    if controller.controller_name  =~ /sidebar/
     "current"
     end
   end
@@ -203,7 +201,7 @@ module Admin::BaseHelper
   end    
 
   def class_settings
-    if controller.controller_name  =~ /settings/
+    if controller.controller_name  =~ /settings|textfilter/
     "current"
     end
   end

data/app/helpers/admin/feedback_helper.rb

@@ -3,26 +3,6 @@ module Admin::FeedbackHelper
     link_to truncate(article.title, 60), :controller => '/admin/content', :action => 'edit', :id => article.id
   end
 
-  def task_showmod(title, action, current=nil)
-    content_tag :li,
-      link_to(title, {:published => (action =~ /spam/ ? 'f' : ''),
-                     :confirmed => (action =~ /unconfirmed/ ? 'f' : ''),
-                     :search => params[:search]},
-             :class => current)
-  end
-  
-  def count_spam
-    _('Limit to spam') + " (" + Feedback.count(:all, :conditions => "state = 'spam'").to_s + ")"
-  end
-  
-  def count_unconfirmed
-    _("Limit to unconfirmed") + " (" + Feedback.count(:all, :conditions => "state in ('presumed_ham', 'presumed_spam')").to_s + ")"
-  end
-  
-  def count_unconfirmed_spam 
-    _('Limit to unconfirmed spam') + " (" + Feedback.count(:all, :conditions => "state = 'presumed_spam'").to_s + ")"
-  end
-
   # Define if all_feedback is the current
   def all_feedback
     if params[:confirmed] != 'f' and params[:published] != 'f'

data/app/helpers/application_helper.rb

@@ -201,6 +201,7 @@ module ApplicationHelper
   #{ stylesheet_link_tag 'user-styles.css', :media => 'all' }
   #{ javascript_include_tag "lang/" + Localization.lang.to_s }
   #{ javascript_include_tag "cookies" }
+  #{javascript_tag "window._token = '#{form_authenticity_token}'"}
   #{ javascript_include_tag "prototype" }
   #{ javascript_include_tag "effects" }
   #{ javascript_include_tag "typo" }

data/app/models/article.rb

@@ -36,6 +36,8 @@ class Article < Content
   has_many :triggers, :as => :pending_item
   after_save :post_trigger
 
+  attr_accessor :draft
+
   has_state(:state,
             :valid_states  => [:new, :draft,
                                :publication_pending, :just_published, :published,