typo 5.0.2 → 5.0.3.98

data/app/views/notification_mailer/_mail_footer.html.erb

@@ -1,7 +1,7 @@
 </div>
 
 <p><em>This is being sent to <%=h @user.name %> because you asked to be notified via email whenever
-new content is posted to  <a href="<%= @blog.base_url%>"><%= @blog_name %></a>
+new content is posted to  <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>
 To unsubscribe, go to
 <a href="<%= @link_url = @blog.url_for(:controller => '/admin/users', :action => 'edit', :id => @user.id) %>"><%=h @link_url%></a>
 and change your user settings.</p>

data/app/views/notification_mailer/article.html.erb

@@ -1,4 +1,4 @@
-<p>A new article has been posted on <%=h @blog_name %>:</p>
+<p>A new article has been posted on <%=h @blog.blog_name %>:</p>
 
 <%= render :partial => 'mail_header' %>
 <h2><%=h @article.title %></h2>

data/app/views/notification_mailer/comment.html.erb

@@ -1,5 +1,5 @@
 <p>A new comment has been posted on
-    <a href="<%= @blog.base_url%>"><%= @blog_name %></a>, responding to
+    <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a>, responding to
     <a href="<%= @comment.article.permalink_url %>"><%=h(@comment.article.title) %></a>.</p>
 
 <%= render :partial => 'mail_header' %>

data/app/views/notification_mailer/notif_user.html.erb

@@ -0,0 +1,12 @@
+<p>You account is create on <a href="<%= @blog.base_url%>"><%= @blog.blog_name %></a></p>
+
+<%= render :partial => 'mail_header' %>
+
+<p>All information about your account are :</p>
+
+<ul>
+  <li>Login : <%= h @user.login %></li>
+  <li>Password : <%= h @user.password %></li>
+</ul>
+
+<%= render :partial => 'mail_footer' %>

data/app/views/xml/_googlesitemap_item_category.googlesitemap.builder

@@ -1,4 +1,4 @@
-xm.item do
+xm.url do
   xm.loc item.permalink_url
   xm.lastmod collection_lastmod(item)
 end

data/config/environment.rb

@@ -31,7 +31,6 @@ Rails::Initializer.run do |config|
     vendor/syntax/lib
     vendor/sparklines/lib
     vendor/uuidtools/lib
-    vendor/jabber4r/lib
     vendor/mocha/lib
     vendor/memcache-client/lib
     vendor/cached_model/lib

data/config/environments/development.rb

@@ -12,3 +12,8 @@ config.action_controller.perform_caching             = false
 
 # Don't care if the mailer can't send
 config.action_mailer.raise_delivery_errors = false
+
+def log_to(stream)
+  ActiveRecord::Base.logger = Logger.new(stream)
+  ActiveRecord::Base.clear_active_connections!
+end

data/config/initializers/access_rules.rb

@@ -0,0 +1,110 @@
+# LisiaSoft::AccessControl, permit to manage, backend, and frontend access.
+# Based on the LoginSystem of Lipisadmin
+# You can define on the fly, roles access, for example:
+# 
+#   Typo::AccessControl.map :require => [ :administrator, :manager, :customer ]  do |map|
+#     # Shared Permission
+#     map.permission "backend/base"
+#     # Module Permission
+#     map.project_module :accounts, "backend/accounts" do |project|
+#       project.menu :list, { :action => :index }, :class => "icon-no-group"
+#       project.menu :new,  { :action => :new }, :class => "icon-new"
+#     end
+# 
+#   end
+# 
+#   Typo::AccessControl.map :require => :customer do |map|
+#     # Shared Permission
+#     map.permission "frontend/cart"
+#     # Module Permission
+#     map.project_module :store, "frontend/store" do |map|
+#       map.menu :add, { :cart => :add }, :class => "icon-no-group"
+#       map.menu :list,  { :cart => :list }, :class => "icon-no-group"
+#     end  
+#   end                                                                    
+# 
+# So the when you do:
+#
+#   Typo::AccessControl.roles
+#   # => [:administrator, :manager, :customer]
+#   
+#   Typo::AccessControl.project_modules(:customer)
+#   # => [#<Typo::AccessControl::ProjectModule:0x254a9c8 @controller="backend/accounts", @name=:accounts, @menus=[#<Typo::AccessControl::Menu:0x254a928 @url={:action=>:index}, @name=:list, @options={:class=>"icon-no-group"}>, #<Typo::AccessControl::Menu:0x254a8d8 @url={:action=>:new}, @name=:new, @options={:class=>"icon-new"}>]>, #<Typo::AccessControl::ProjectModule:0x254a84c @controller="frontend/store", @name=:store, @menus=[#<Typo::AccessControl::Menu:0x254a7d4 @url={:cart=>:add}, @name=:add, @options={}>, #<Typo::AccessControl::Menu:0x254a798 @url={:cart=>:list}, @name=:list, @options={}>]>]
+#
+#   Typo::AccessControl.allowed_controllers(:customer)
+#   => ["backend/base", "backend/accounts", "frontend/cart", "frontend/store"]
+#  
+# If in your controller there is *login_required* our Authenticated System verify the allowed_controllers for the account role (Ex: :customer),
+# if not satisfed you will be redirected to login page.
+#
+# An account have two columns, role, that is a string, and project_modules, that is an array (with serialize)
+# 
+# For example, whe can decide that an Account with role :customers can see only, the module project :store.
+
+AccessControl.map :require => [ :admin, :publisher ]  do |map|
+  map.permission "admin/base"
+
+  map.project_module :dashboard, "admin/dashboard" do |project|
+    project.menu    _("Typo"),               { :action => :index }
+    project.submenu _("Typo documentation"), "http://typosphere.org/main_page"
+  end
+  
+  map.project_module :write, nil do |project|
+    project.menu    _("Write"),                 { :controller => "admin/content",    :action => "new" }
+    project.submenu _("Write a posts"),         { :controller => "admin/content",    :action => "new" }
+	  project.submenu _("Write a page"),         { :controller => "admin/pages",       :action => "new" }
+  end
+
+  map.project_module :content, nil do |project|
+    project.menu    _("Manage"),                { :controller => "admin/content",    :action => "index" }
+    project.submenu _("Manage posts"),          { :controller => "admin/content",    :action => "index" }
+	  project.submenu _("Manage pages"),          { :controller => "admin/pages",       :action => "index" }
+	  project.submenu _("Manage categories"),     { :controller => "admin/categories", :action => "index" }
+	  project.submenu _("Manage uploads"),        { :controller => "admin/resources",  :action => "index" }
+	  project.submenu _("Manage tags"),           { :controller => "admin/tags",       :action => "index" }
+  end
+
+  map.project_module :feedback, nil do |project|
+    project.menu    _("Feedback"),              { :controller => "admin/feedback",  :action     => "index" }
+    project.submenu _("Unapproved comments"),   { :controller => "admin/feedback",  :action     => "index" }    
+    project.submenu _("Limit to spam"),         { :controller => "admin/feedback",  :published  => "f" }
+    project.submenu _("Blacklist"),             { :controller => "admin/blacklist", :action => "index" }
+    project.submenu _(""),                      { :controller => "admin/comments", :action => "show" }
+    project.submenu _(""),                      { :controller => "admin/comments", :action => "new" }
+    project.submenu _(""),                      { :controller => "admin/comments", :action => "edit" }
+    project.submenu _(""),                      { :controller => "admin/comments", :action => "destroy" }
+    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "show" }
+    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "new" }
+    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "edit" }
+    project.submenu _(""),             { :controller => "admin/trackbacks", :action => "destroy" }
+
+  end
+
+  map.project_module :themes, "admin/themes" do |project|
+    project.menu    _("Themes"),                { :action     => "index"  }
+    project.submenu _("Choose theme"),          { :action     => "index"  }
+    project.submenu _("Theme editor"),          { :action     => "editor" }
+  end
+  
+  map.project_module :sidebar, "admin/sidebar" do |project|
+    project.menu    _("Sidebar"),               { :action     => "index" }
+    project.submenu _("Text Filters"),          { :controller => "textfilters", :action => "index" }
+  end  
+  
+  map.project_module :users, "admin/users" do |project|
+    project.menu    _("Users"),                 { :action => "index" }
+    project.submenu _("Users"),                 { :action => "index" }
+  end  
+  
+  map.project_module :settings, nil do |project|
+    project.menu    _("Settings"),              { :controller => "admin/settings", :action => "index" }
+    project.submenu _("General settings"),      { :controller => "admin/settings", :action => "index" }
+    project.submenu _("Read"),                  { :controller => "admin/settings", :action => "read" }
+    project.submenu _("Write"),                 { :controller => "admin/settings", :action => "write" }
+    project.submenu _("Feedback"),              { :controller => "admin/settings", :action => "feedback" }			
+    project.submenu _("Spam"),                  { :controller => "admin/settings", :action => "spam" }
+    project.submenu _("Podcasts"),              { :controller => "admin/settings", :action => "podcast" }
+    project.submenu _("Empty Fragment Cache"),  { :controller => "admin/cache",    :action => "sweep" }
+    project.submenu _("Rebuild cached HTML"),   { :controller => "admin/cache",    :action => "sweep_html" }
+  end  
+end

data/config/initializers/active_record_hacks.rb

@@ -0,0 +1,17 @@
+ActiveRecord.module_eval do
+  class Base
+    private
+    def attributes_with_quotes(include_primary_key = true, include_readonly_attributes = true)
+      quoted = {}
+      @attributes.each_key do |name|
+        if column = column_for_attribute(name)
+          unless (!include_primary_key && column.primary) ||
+            (!include_readonly_attributes && self.class.readonly_attributes && self.class.readonly_attributes.include?(name.gsub(/\(.+/,"")))
+            quoted[name] = quote_value(read_attribute(name), column)
+          end
+        end
+      end
+      quoted
+    end
+  end
+end

data/config/initializers/benchmark_hacks.rb

@@ -0,0 +1,9 @@
+Benchmark.module_eval do
+  def realtime
+    r0 = Time.now
+    yield
+    r1 = Time.now
+    r1.to_f - r0.to_f
+  end
+  module_function :realtime
+end

data/config/routes.rb

@@ -54,6 +54,11 @@ ActionController::Routing::Routes.draw do |map|
   # make rss feed urls pretty and let them end in .xml
   # this improves caches_page because now apache and webrick will send out the
   # cached feeds with the correct xml mime type.
+
+  map.xml 'articles.rss', 
+  :controller => 'articles', :action => 'index', :format => 'rss'
+  map.xml 'articles.atom', 
+  :controller => 'articles', :action => 'index', :format => 'atom'
   map.xml 'xml/itunes/feed.xml', :controller => 'xml', :action => 'itunes'
   map.xml 'xml/articlerss/:id/feed.xml', :controller => 'xml', :action => 'articlerss'
   map.xml 'xml/commentrss/feed.xml', :controller => 'xml', :action => 'commentrss'
@@ -78,35 +83,51 @@ ActionController::Routing::Routes.draw do |map|
                             }) do |dated|
     dated.resources :comments, :new => { :preview => :any }
     dated.resources :trackbacks
-    dated.connect 'trackback', :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}
+    dated.connect 'trackbacks', :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}
   end
-
-  map.inflected_resource(:categories, :path_prefix => '/articles')
-  map.inflected_resource(:authors, :path_prefix => '/articles')
-  map.inflected_resource(:tags, :path_prefix => '/articles')
+  
+  map.connect "trackbacks/:id/:day/:month/:year",
+    :controller => 'trackbacks', :action => 'create', :conditions => {:method => :post}
+
+  # Redirects from old permalinks
+  map.connect "articles/:controler/:name",
+    :controller => 'redirect', :action => 'redirect'
+    map.connect "articles/:controler",
+      :controller => 'redirect', :action => 'redirect'
+
+  map.inflected_resource(:categories, :path_prefix => '')
+  map.connect '/category/:id/page/:page',
+  :controller => 'categories', :action => 'show'
+  
+  map.inflected_resource(:authors, :path_prefix => '')
+  
+  map.inflected_resource(:tags, :path_prefix => '')
+  map.connect '/tag/:id/page/:page',
+  :controller => 'tags', :action => 'show'
+  
   map.resources(:feedback)
 
   # allow neat perma urls
-  map.connect 'articles/page/:page',
+  map.connect 'page/:page',
     :controller => 'articles', :action => 'index',
     :page => /\d+/
 
   date_options = { :year => /\d{4}/, :month => /(?:0?[1-9]|1[12])/, :day => /(?:0[1-9]|[12]\d|3[01])/ }
 
-#   map.with_options(date_options) do |dated|
-#     dated.resources(:comments, :path_prefix => '/articles/:year/:month/:day/:title',
-#                     :members => { :preview => :get })
-#     dated.resources(:trackbacks, :path_prefix => '/articles/:year/:month/:day/:title')
-#   end
-
   map.with_options(:conditions => {:method => :get}) do |get|
     get.with_options(date_options.merge(:controller => 'articles')) do |dated|
       dated.with_options(:action => 'index') do |finder|
-        finder.connect 'articles/:year/page/:page',
+        # new URL
+        finder.connect ':year/page/:page',
           :month => nil, :day => nil, :page => /\d+/
-        finder.connect 'articles/:year/:month/page/:page',
+        finder.connect ':year/:month/page/:page',
           :day => nil, :page => /\d+/
-        finder.connect 'articles/:year/:month/:day/page/:page', :page => /\d+/
+        finder.connect ':year/:month/:day/page/:page', :page => /\d+/
+        finder.connect ':year',
+          :month => nil, :day => nil
+          finder.connect ':year/:month',
+            :day => nil
+          finder.connect ':year/:month/:day', :page => nil
       end
     end
 

data/db/converters/README

@@ -7,8 +7,8 @@ converting, and please file bugs at http://www.typosphere.org/trac.
 Available converters:
 
 * mt3.rb: Converts from Movable Type 3.x
-* wordpress.rb: Converts from Wordpress
 * s9y.rb: Converts from Serendipity (aka s9y)
 * textpattern.rb: Converts from TextPattern
 * feed.rb: Converts from any RSS or Atom feed.  Requires the 'feed_tools' gem.
-* rss.rb: Converts from RSS feeds.
+
+For Wordpress and Dotclear 1.2 and Dotclear 2 conversion, please use the converters in vendors/plugins

data/db/migrate/004_add_sidebars.rb

@@ -30,15 +30,14 @@ class AddSidebars < ActiveRecord::Migration
       Bare4Sidebar.create(:active_position=>3, :controller=>'static', :active_config=>'--- !map:HashWithIndifferentAccess 
       title: Links
       body: |+
-        <ul>
-          <li><a href="http://www.typosphere.org" title="Typo">Typo</a></li>
-          <li><a href="http://blog.typosphere.org" title="Typo official blog">Typo official blog</a></li>
-          <li><a href="http://scottstuff.net" title="Scottstuff">Scott Laird</a></li>
-          <li><a href="http://www.bofh.org.uk" title="Just a Summary">Piers Cawley</a></li>
-          <li><a href="http://kevin.sb.org/">Kevin Ballard</a></li>
-          <li><a href="http://fredericdevillamil.com">Frédéric de Villamil</a></li>
-          <li><a href="http://typoforums.org" title="Typo Forums">Typo Forums</a></li>
-        </ul>')
+      <ul>
+        <li><a href="http://www.typosphere.org" title="Typo">Typosphere</a></li>
+        <li><a href="http://typogarden.org">Typogarden</a></li>
+        <li><a href="http://www.bofh.org.uk" title="Just a Summary">Just A Summary</a></li>
+        <li><a href="http://fredericdevillamil.com" title="Frédéric de Villamil">Ergonomie, Rails et bonnes pratiques du web</a></li>
+        <li><a href="/admin">Admin</a></li>
+      </ul>'
+      )
       Bare4Sidebar.create(:active_position=>4, :controller=>'xml', :active_config=>'--- !map:HashWithIndifferentAccess 
       format: rss20
       trackbacks: true

data/db/migrate/067_remove_blog_ids.rb

@@ -0,0 +1,22 @@
+class RemoveBlogIds < ActiveRecord::Migration
+  def self.up
+    remove_index :contents, :blog_id rescue nil
+    remove_column :contents, :blog_id 
+    remove_column :sidebars, :blog_id 
+    remove_column :feedback, :blog_id 
+  end
+
+  def self.down
+    add_column :contents, :blog_id, :integer
+    add_column :sidebars, :blog_id, :integer
+    add_column :feedback, :blog_id, :integer
+
+    default_blog_id = Blog.find(:first, :order => 'id').id
+
+    Content.update_all("blog_id = #{default_blog_id}")
+    Feedback.update_all("blog_id = #{default_blog_id}")
+    Sidebar.update_all("blog_id = #{default_blog_id}")
+
+    change_column :sidebars, :blog_id, :integer, :null => false
+  end
+end

data/db/migrate/068_fix_grants.rb

@@ -0,0 +1,113 @@
+class FixGrants < ActiveRecord::Migration
+  class Right < ActiveRecord::Base
+    include BareMigration
+
+    # there's technically no need for these serialize declaration because in
+    # this script active_config and staged_config will always be NULL anyway.
+    serialize :active_config
+    serialize :staged_config
+  end
+
+  class ProfilesRight < ActiveRecord::Base
+    include BareMigration
+
+    # there's technically no need for these serialize declaration because in
+    # this script active_config and staged_config will always be NULL anyway.
+    serialize :active_config
+    serialize :staged_config
+  end
+
+  def self.up
+    STDERR.puts "Creating users rights"
+    drop_table :profiles_to_rights
+
+    create_table :profiles_rights, :force => true do |t|
+      t.column :profile_id, :int
+      t.column :right_id, :int
+    end
+
+    Right.transaction do
+      admin = Profile.find_by_label('admin')
+      publisher = Profile.find_by_label('publisher')
+      contributor = Profile.find_by_label('contributor')
+
+      # Global admin rights
+      right = Right.find_by_name('admin')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+
+      # Article rights
+      right = Right.find_by_name('content_create')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      right = Right.find_by_name('content_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      right = Right.find_by_name('content_delete')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+
+      # Categories rights
+      right = Right.find_by_name('category_create')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      right = Right.find_by_name('category_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      right = Right.find_by_name('category_delete')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+
+      # Page rights
+      right = Right.find_by_name('page_create')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      right = Right.find_by_name('page_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      right = Right.find_by_name('page_delete')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+
+      # Feedback
+      right = Right.find_by_name('feedback_create')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => contributor.id, :right_id => right.id)
+      right = Right.find_by_name('feedback_self_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => contributor.id, :right_id => right.id)
+      right = Right.find_by_name('feedback_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => contributor.id, :right_id => right.id)
+      right = Right.find_by_name('feedback_self_delete')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => contributor.id, :right_id => right.id)
+      right = Right.find_by_name('feedback_delete')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => contributor.id, :right_id => right.id)
+
+      # Users
+      right = Right.find_by_name('user_create')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      right = Right.find_by_name('user_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      right = Right.find_by_name('user_self_edit')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => publisher.id, :right_id => right.id)
+      ProfilesRight.create(:profile_id => contributor.id, :right_id => right.id)
+      right = Right.find_by_name('user_delete')
+      ProfilesRight.create(:profile_id => admin.id, :right_id => right.id)
+    end
+  end
+
+  def self.down
+    drop_table :rights
+    drop_table :profiles_rights
+  end
+end
+
+