typo 5.0.2 → 5.0.3.98

data/CHANGES-5.0.4

@@ -0,0 +1,33 @@
+Typo 5.0.3 "Don Mc Cullin" released on February 2008 the 24th is mostly a bugfix and refactoring release, going along with some improvements, everything leading slowly but surely to 5.1. 
+
+*** Less bugs, more speed ***
+
+Honnestly, Typo has never been so fast and so bugless as well. We've rewriten most of the caching engine, and it's now running flawlessly. Our effort to speed up the code has also been pursued and we can be proud of what we're releasing.
+
+*** Brand new editor ***
+
+The blog editor has been rewriten too, to be more functionnal and user friendly. We've also switched the rich text editor from TinyMCE to FCKEditor for 4 important features :
+– Fullscreen edition (kicks ass baby)
+– Spellchecking
+– Safari compatibility
+– Impressive localization
+
+*** More localisation ***
+
+We're continuing the localization effort to port Typo in your language. Default themes has been localized, and we now provide up to 8 languages :
+– English (default)
+– French
+– German
+– Italian
+– Japanese
+– Mexican Spanish
+– Polish
+– Romanian
+
+Many thanks to all the translators. Currently, only French translation is really complete.
+
+*** No gem? ***
+
+We won't provide you the habitual gem we used to. Rails app installer – formerly known as Typo installer – is brocken with Rails 2.0.2 and Typo instances installed this way just don't work. 
+
+We hope you'll enjoy Typo 5.0.3 as much as we enjoyed bringing it to you.

data/MAINTAINERS

@@ -9,18 +9,14 @@ irc:  xal
 
 Peons
 
-Scott Laird <scott@sigkill.org>
-blog: http://scottstuff.net/
-irc:  slaird
-
 Piers Cawley <pdcawley@bofh.org.uk>
 blog: http://www.bofh.org.uk/
 irc:  pdcawley
 
-Kevin Ballard <kevin@sb.org>
-blog: http://kevin.sb.org
-irc:  Eridius
-
 Frédéric de Villamil <frederic@de-villamil.com>
 blog: http://fredericdevillamil.com
 irc: neuro`
+
+Davide D'Agostino <d.dagostino@lipsiasoft.com>
+blog: http://www.lipsiasoft.com
+irc: DAddYE

data/README

@@ -12,19 +12,21 @@ Requirements
 
 Currently you need all of those things to get typo to run:
 
- * Ruby 1.8.4 or higher
- * Rails 1.2.x
+ * Ruby 1.8.6 or higher
+ * Rails 2.0.2. Typo DOES NOT support Rails 2.1 yet.
  * A database.  Typo supports MySQL, PostgreSQL, and SQLite.
  * Ruby drivers for your database.
  * For best performance, you should have a web server running either
-   Apache or Lighttpd along with FastCGI, although these aren't
-   strictly required--you can use Ruby's built-in web server for
-   low-volume testing.
+   Apache, Lighttpd or Nginx, along with FastCGI, mongrel or thin. You can use 
+   Ruby's built-in web server for low-volume testing.
+   We recommend the use of Apache + mod_rails (aka Passenger) for fast and 
+   easy deployment along with speed.
+ * rspec, rcov and ruby-debug are necessary to run the test suit.
 
 Installation
 ============
 
-See doc/Installer.text and doc/typo-4.0-release-notes.txt.
+See doc/Installer.text and doc/typo-5.0.3-release-notes.txt.
 
 Usage
 ======
@@ -34,7 +36,7 @@ http://your.domain.com/admin. You can use this to post articles and
 change Typo's configuration settings. For posting new content, you can
 either use this administrative web interface or a desktop blog editor
 like MarsEdit or Ecto. For a short list of clients which are confirmed
-to work please visit http://typosphere.org/trac/wiki/DesktopClients.
+to work please visit http://trac.typosphere.org/wiki/DesktopClients.
 
 Client setup
 ============
@@ -45,7 +47,7 @@ http://your.domain.com/backend/xmlrpc as endpoint address.
 Tell me about your blog
 =======================
 
-Add yourself to the list of typo blogs at http://typosphere.org/trac/wiki/TypoPowered
+Add yourself to the list of typo blogs at http://trac.typosphere.org/wiki/TypoPowered
 and subscribe to the typo mailing list.
 
 

data/app/apis/blogger_service.rb

@@ -43,8 +43,7 @@ class BloggerService < TypoWebService
   before_invocation :authenticate
 
   def deletePost(appkey, postid, username, password, publish)
-    article = this_blog.articles.find(postid)
-    article.destroy
+    Article.destroy(postid)
     true
   end
 
@@ -70,7 +69,7 @@ class BloggerService < TypoWebService
   def newPost(appkey, blogid, username, password, content, publish)
     title, categories, body = content.match(%r{^<title>(.+?)</title>(?:<category>(.+?)</category>)?(.+)$}mi).captures rescue nil
 
-    article = this_blog.articles.build
+    article = Article.new
     article.body           = body || content || ''
     article.title          = title || content.split.slice(0..5).join(' ') || ''
     article.published      = publish

data/app/apis/meta_weblog_service.rb

@@ -72,22 +72,22 @@ class MetaWeblogService < TypoWebService
   end
 
   def getPost(postid, username, password)
-    article = this_blog.articles.find(postid)
+    article = Article.find(postid)
 
     article_dto_from(article)
   end
 
   def getRecentPosts(blogid, username, password, numberOfPosts)
-    this_blog.articles.find(:all, :order => "created_at DESC", :limit => numberOfPosts).collect{ |c| article_dto_from(c) }
+    Article.find(:all, :order => "created_at DESC", :limit => numberOfPosts).collect{ |c| article_dto_from(c) }
   end
 
   def newPost(blogid, username, password, struct, publish)
-    article = this_blog.articles.build
+    article = Article.new
     article.body        = struct['description'] || ''
     article.title       = struct['title'] || ''
-    article.published   = publish
     article.author      = username
     article.published_at = struct['dateCreated'].to_time.getlocal rescue Time.now
+    article.published   = publish
     article.user        = @user
 
     # Movable Type API support
@@ -112,13 +112,12 @@ class MetaWeblogService < TypoWebService
   end
 
   def deletePost(appkey, postid, username, password, publish)
-    article = this_blog.articles.find(postid)
-    article.destroy
+    Article.destroy(postid)
     true
   end
 
   def editPost(postid, username, password, struct, publish)
-    article = this_blog.articles.find(postid)
+    article = Article.find(postid)
     article.body        = struct['description'] || ''
     article.title       = struct['title'] || ''
     article.published   = publish

data/app/apis/movable_type_service.rb

@@ -73,7 +73,7 @@ class MovableTypeService < TypoWebService
   before_invocation :authenticate, :except => [:getTrackbackPings, :supportedMethods, :supportedTextFilters]
 
   def getRecentPostTitles(blogid, username, password, numberOfPosts)
-    this_blog.articles.find(:all,:order => "created_at DESC", :limit => numberOfPosts).collect do |article|
+    Article.find(:all,:order => "created_at DESC", :limit => numberOfPosts).collect do |article|
       MovableTypeStructs::ArticleTitle.new(
             :dateCreated => article.created_at,
             :userid      => blogid.to_s,
@@ -93,17 +93,17 @@ class MovableTypeService < TypoWebService
   end
 
   def getPostCategories(postid, username, password)
-    this_blog.articles.find(postid).categorizations.collect do |c|
+    Article.find(postid).categorizations.collect do |c|
       MovableTypeStructs::CategoryPerPost.new(
           :categoryName => c.category.name,
           :categoryId   => c.category_id.to_i,
-          :isPrimary    => c.is_primary.to_i
+          :isPrimary    => c.is_primary
         )
     end
   end
 
   def setPostCategories(postid, username, password, categories)
-    article = this_blog.articles.find(postid)
+    article = Article.find(postid)
     article.categories.clear if categories != nil
 
     for c in categories
@@ -126,7 +126,7 @@ class MovableTypeService < TypoWebService
   end
 
   def getTrackbackPings(postid)
-    article = this_blog.articles.find(postid)
+    article = Article.find(postid)
     article.trackbacks.collect do |t|
       MovableTypeStructs::TrackBack.new(
           :pingTitle  => t.title.to_s,
@@ -137,7 +137,7 @@ class MovableTypeService < TypoWebService
   end
 
   def publishPost(postid, username, password)
-    article = this_blog.articles.find(postid)
+    article = Article.find(postid)
     article.published = true
     article.save
   end

data/app/controllers/accounts_controller.rb

@@ -5,20 +5,20 @@ class AccountsController < ApplicationController
   def login
     case request.method
       when :post
-      if user = User.authenticate(params[:user_login], params[:user_password])
-        session[:user_id] = user.id
+      self.current_user = User.authenticate(params[:user_login], params[:user_password])
+            
+      if logged_in?
+        session[:user_id] = self.current_user.id
 
-        flash[:notice]  = "Login successful"
-        cookies[:is_admin] = "yes"
+        flash[:notice]  = _("Login successful")
         redirect_back_or_default :controller => "admin/dashboard", :action => "index"
       else
-        flash.now[:notice]  = "Login unsuccessful"
-
+        flash.now[:notice]  = _("Login unsuccessful")
         @login = params[:user_login]
       end
     end
   end
-
+  
   def signup
     unless User.count.zero?
       redirect_to :action => 'login'
@@ -29,15 +29,15 @@ class AccountsController < ApplicationController
 
     if request.post? and @user.save
       session[:user_id] = @user.id
-      flash[:notice]  = "Signup successful"
+      flash[:notice]  = _("Signup successful")
       redirect_to :controller => "admin/settings", :action => "index"
       return
     end
   end
 
   def logout
+    self.current_user = nil
     session[:user_id] = nil
-    cookies.delete :is_admin
   end
 
   def welcome

data/app/controllers/admin/base_controller.rb

@@ -1,27 +1,8 @@
+module Admin
+end
 class Admin::BaseController < ApplicationController
   cattr_accessor :look_for_migrations
   @@look_for_migrations = true
-  if Blog.default && Blog.default.editor == 2
-    uses_tiny_mce(
-      :options => {
-        :theme => 'advanced',
-        :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 media separator emotions nonbreaking },
-        :theme_advanced_buttons2 => [],
-        :theme_advanced_buttons3 => [],
-        :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]
@@ -40,7 +21,7 @@ class Admin::BaseController < ApplicationController
       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

data/app/controllers/admin/blacklist_controller.rb

@@ -1,10 +1,10 @@
 class Admin::BlacklistController < Admin::BaseController
-  def index
-    list
-    render :action => 'list'
+  def list
+    index
+    render :action => 'index'
   end
 
-  def list
+  def index
     @blacklist_patterns = BlacklistPattern.find :all
   end
 

data/app/controllers/admin/cache_controller.rb

@@ -1,14 +1,5 @@
 class Admin::CacheController < Admin::BaseController
 
-  def index
-    list
-    render :action => 'list'
-  end
-
-  def list
-    @page_cache_size = -1
-  end
-
   def sweep
     PageCache.sweep_all
     expire_fragment(/.*/)

data/app/controllers/admin/categories_controller.rb

@@ -1,16 +1,12 @@
 class Admin::CategoriesController < Admin::BaseController
 
-  def index
-    list
-    render :action => 'list'
-  end
-
   def list
-    @categories = Category.find(:all, :order => :position)
+    index
+    render :action => 'index'
   end
 
-  def show
-    @category = Category.find(params[:id])
+  def index
+    @categories = Category.find(:all, :order => :position)
   end
 
   def new

data/app/controllers/admin/comments_controller.rb

@@ -2,12 +2,12 @@ class Admin::CommentsController < Admin::BaseController
 
   before_filter :get_article
 
-  def index
-    list
-    render :action => 'list'
+  def list
+    index
+    render :action => 'index'
   end
 
-  def list
+  def index
     @comments = @article.comments.find(:all, :order => "id ASC")
   end
 

data/app/controllers/admin/content_controller.rb

@@ -1,42 +1,61 @@
 require 'base64'
-
+module Admin; end
 class Admin::ContentController < Admin::BaseController
-  def index
-    list
-    render :action => 'list'
-  end
+  layout "administration", :except => 'show'
 
+  def auto_complete_for_article_keywords
+    @items = Tag.find_with_char params[:article][:keywords].strip
+    render :inline => "<%= auto_complete_result @items, 'name' %>"
+  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"        
+    index
+    render :action => 'index'
+  end
+
+  def index
+    # Filtering articles
+    conditions = "contents.id > 0"
+    if params[:search]
+      @search = params[:search]
+
+      if @search[:published_at] and %r{(\d\d\d\d)-(\d\d)} =~ @search[:published_at]
+        conditions += " AND published_at LIKE '%#{@search[:published_at]}%'"
+      end
+
+      if @search[:user_id] and @search[:user_id].to_i > 0
+        conditions += " AND user_id = #{@search[:user_id].to_i}"
+      end
+      
+      if @search[:published] and @search[:published].to_s =~ /0|1/
+        conditions += " AND published = #{@search[:published].to_i}"
       end
+      
+      if @search[:category] and @search[:category].to_i > 0
+        conditions += " AND categorizations.category_id = #{@search[:category].to_i}"
+      end
+      
     else
-      order = 'id DESC'
+      @search = { :category => nil, :user_id => nil, :published_at => nil, :published => nil }
     end
 
     now = Time.now
-    count = this_blog.articles.size
-    @articles_pages = Paginator.new(self, count, 15, params[:id])
-    @articles = this_blog.articles.find(:all, :limit => 15, :order => order,
-                                        :offset => @articles_pages.current.offset)
+    count = Article.count(:all, :include => :categorizations, :conditions => conditions)
+    @articles_pages = Paginator.new(self, count, 20, params[:id])
+    @articles = Article.find(:all, :limit => 20, :order => "contents.id DESC", :include => :categorizations, :conditions => conditions, :offset => @articles_pages.current.offset)
     setup_categories
-    @article = this_blog.articles.build(params[:article])
+    @article = Article.new(params[:article])
   end
 
   def show
-    @article = this_blog.articles.find(params[:id])
-    setup_categories
-    @resources = Resource.find(:all, :order => 'created_at DESC')
+    @article = Article.find(params[:id])
   end
 
   def new; new_or_edit; end
   def edit; new_or_edit; end
 
   def destroy
-    @article = this_blog.articles.find(params[:id])
+    @article = Article.find(params[:id])
     if request.post?
       @article.destroy
       redirect_to :action => 'list'
@@ -47,26 +66,6 @@ class Admin::ContentController < Admin::BaseController
   alias_method :resource_add,    :category_add
   alias_method :resource_remove, :category_add
 
-  def category_remove
-    @article  = this_blog.articles.find(params[:id])
-    @category = @article.categories.find(params['category_id'])
-    setup_categories
-    @article.categorizations.delete(@article.categorizations.find_by_category_id(params['category_id']))
-    @article.save
-    render :partial => 'show_categories'
-  end
-
-  def preview
-    headers["Content-Type"] = "text/html; charset=utf-8"
-    @article = this_blog.articles.build
-    @article.attributes = params[:article]
-    set_article_author
-    data = render_to_string(:layout => "minimal")
-    data = Base64.encode64(data).gsub("\n", '')
-    data = "data:text/html;charset=utf-8;base64,#{data}"
-    render :text => data
-  end
-
   def attachment_box_add
     render :update do |page|
       page["attachment_add_#{params[:id]}"].remove
@@ -93,7 +92,7 @@ class Admin::ContentController < Admin::BaseController
 
   def do_add_or_remove_fu
     attrib, action = params[:action].split('_')
-    @article = this_blog.articles.find(params[:id])
+    @article = Article.find(params[:id])
     self.send("#{attrib}=", self.class.const_get(attrib.classify).find(params["#{attrib}_id"]))
     send("setup_#{attrib.pluralize}")
     @article.send(attrib.pluralize).send(real_action_for(action), send(attrib))
@@ -108,6 +107,7 @@ class Admin::ContentController < Admin::BaseController
     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 }
@@ -117,7 +117,7 @@ class Admin::ContentController < Admin::BaseController
       if @article.save
         set_article_categories
         set_the_flash
-        redirect_to :action => 'show', :id => @article.id
+        redirect_to :action => 'list'
       end
     end
   end
@@ -168,13 +168,13 @@ class Admin::ContentController < Admin::BaseController
   def get_or_build_article
     @article = case params[:action]
                when 'new'
-                 returning(this_blog.articles.build) do |art|
+                 returning(Article.new) do |art|
                    art.allow_comments = this_blog.default_allow_comments
                    art.allow_pings    = this_blog.default_allow_pings
                    art.published      = true
                  end
                when 'edit'
-                 this_blog.articles.find(params[:id])
+                 Article.find(params[:id])
                else
                  raise "Don't know how to get article for action: #{params[:action]}"
                end