typo 3.99.3 → 3.99.4

data/app/views/admin/content/_form.rhtml

@@ -21,7 +21,7 @@
   </select>
 </p>
 <p>
-  <label for="article_keywords">Keywords:</label><br/>
+  <label for="article_keywords">Tags:</label><br/>
   <%= text_field 'article', 'keywords'  %>
 </p>
 <p>
@@ -35,7 +35,7 @@
 <a href="#" onclick="Element.toggle('advanced'); return false;">Toggle Advanced Options (+/-)</a>
 <div id="advanced" style="display:none;">
 <label for="article_allow_comments">Allow comments: </label><%= check_box 'article', 'allow_comments'  %><br />
-<label for="article_allow_pings">Allow pings: </label><%= check_box 'article', 'allow_pings'  %><br />
+<label for="article_allow_pings">Allow trackbacks: </label><%= check_box 'article', 'allow_pings'  %><br />
 <label for="article_published">Published:</label><%= check_box 'article', 'published'  %><br />
 <label for="article_text_filter">Textfilter: </label><%= select 'article', 'text_filter', text_filter_options %><br />
 <label for="article_published_at">Publish at:</label><%= datetime_select 'article', 'published_at', :include_blank => true  %><br />

data/app/views/admin/feedback/_item.rhtml

@@ -0,0 +1,15 @@
+<tr class="feedbackbody">
+  <td class="field"><input class= "feedback_check" type="checkbox" name="feedback_check[<%= item.id %>]"/></td>
+  <td class="field"><%= item.published ? "Yes" : "<strong>No</strong>" %></td>
+  <td class="field"><%=h item.class %></td>
+  <td class="field"><%= link_to_article_edit item.article %></td>
+  <td class="field">
+    <%=h (item.author || '(unknown)').slice(0,40) %><br/>
+	<a href=<%=h item.url%>><%=h truncate(item.url.to_s)%></a><br/>
+  	<%=h item.email.to_s.slice(0,40) %>
+  </td>
+  <td class="field"><%=h truncate(item.body,80)%></td>
+  <td class="field"><%=h item.ip %></td>
+  <td class="field"><%=h distance_of_time_in_words_to_now(item.created_at) %> ago</td>
+  <td class="field"><%= link_to image_tag('delete'), {:action => 'delete', :id => item.id, :search => params[:search], :page => params[:page] },  :confirm => "Are you sure?", :post => true %></td>
+</tr>  

data/app/views/admin/feedback/list.rhtml

@@ -0,0 +1,46 @@
+<% @page_heading = "Comments and Trackbacks for #{ this_blog.settings['blog_name'] }" %>
+
+<% content_for('tasks') do %>
+  <%= task_showmod 'Show only unpublished feedback' %>
+<% end %> 
+
+<div clas="search">
+  <form>
+    <label for="search">Feedback Search:</label><input type="text" id="search" name="search" value="<%=h params[:search] %>" size="15" />
+  </form>
+</div>
+
+<div class="list">	
+  <%= form_tag({:action => 'bulkops'}, :method => :post) %>
+  <br/>
+  <%= submit_tag "Delete Checked Items" %> &nbsp;
+  <%= submit_tag "Publish Checked Items" %>
+  <%= submit_tag "Unpublish Checked Items" %>
+
+  <%= hidden_field_tag "search", params[:search]%>
+  <%= hidden_field_tag "page", params[:page]%>
+
+  <table>
+  <tr>
+	<th><input class="feedback_check" type="checkbox" name="checkall" id="checkall" onclick="check_all(this);"/></th>
+	<th>Pub</th>
+	<th>Type</th>
+	<th>Article</th>
+    <th>Author</th>
+	<th>Body</th>
+    <th>IP</th>
+    <th>Posted date</th>
+    <th>Delete</th>
+  </tr>
+  <%= render :partial => 'item', :collection => @feedback %>
+  </table>
+  <%= submit_tag "Delete Checked Items" %> &nbsp;
+  <%= submit_tag "Publish Checked Items" %>
+  <%= submit_tag "Unpublish Checked Items" %>
+  </form>
+</div>
+
+<%= link_to "Previous page", { :page => @pages.current.previous, :search => params[:search] } if @pages.current.previous %>
+<%= pagination_links(@pages, :params => {:search => params[:search]}) %>
+<%= link_to "Next page", { :page => @pages.current.next, :search => params[:search] } if @pages.current.next %>
+

data/app/views/admin/general/index.rhtml

@@ -78,6 +78,22 @@
 
     <hr/>
 
+    <p>This setting allows you to disable trackbacks for every article in
+	your blog.  It won't remove existing trackbacks, but it will prevent
+	any further attempt to add a trackback anywhere on your blog.  You can
+	enable or disable trackbacks per-article using the article's extended
+	settings.  See also the 
+      <a href="#gensettings" onclick="new Effect.ScrollTo('gensettings'); return false">"Enable Trackbacks by default" setting</a> above.
+	</p>
+    <p>
+      <input name="setting[global_pings_disable]" id="global_pings_disable" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.global_pings_disable%> />
+         <input name="setting[global_pings_disable]" type="hidden" value="0"/>
+           <label for="global_pings_disable">Disable trackbacks site-wide</label>
+
+    </p>
+
+    <hr />
+
     <p>Should Typo send trackbacks to websites that you link to?  This should be disabled
        for private blogs, as it will leak non-public information to sites that you're discussing.
        For public blogs, there's no real point in disabling this.</p>
@@ -141,6 +157,16 @@
           <input name="setting[sp_global]" id="sp_global" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_global%> /><input name="setting[sp_global]" type="hidden" value="0"/>
           <label for="sp_global">Enable spam protection</label>
         </p>
+		<p>Typo can (optionally) use the <a href="http://akismet.com">Akismet</a> spam-filtering service.  You need to register with 
+		   Akismet and receive an API key before you can use their service.  If you have an Akismet key, enter it here.
+		</p>
+        <p>
+          <label for="sp_akismet_key">Akismet Key</label>
+          <input name="setting[sp_akismet_key]" id="sp_akismet_key" type="text" value="<%=h this_blog.sp_akismet_key %>"/>
+        </p>
+		<p>You can optionally disable non-Ajax comments.  Typo will always use Ajax for comment submission if Javascript is enabled,
+		   so non-Ajax comments are either from spammers or users without Javascript.
+		</p>
         <p>
           <input name="setting[sp_allow_non_ajax_comments]" id="sp_allow_non_ajax_comments" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.sp_allow_non_ajax_comments%> />
           <input name="setting[sp_allow_non_ajax_comments]" type="hidden" value="0" />

data/app/views/articles/_comment.rhtml

@@ -4,4 +4,7 @@
   <%= gravatar_tag(comment.email) if this_blog.use_gravatar and comment.email %>
   <cite><strong><%= link_to_unless(comment.url.blank?, h(comment.author), comment.url) %></strong> </cite> said <%= distance_of_time_in_words comment.article.published_at, comment.created_at %> later:<br />
   <%= comment.full_html %>
+  <% unless comment.published -%>
+    <div class="spamwarning">This comment has been flagged for moderator approval.  It won't appear on this blog until the author approves it.</div>
+  <% end -%>
 </li>

data/app/views/articles/read.rhtml

@@ -29,7 +29,7 @@
 
 <% if @article.allow_comments? or @article.comments.size > 0 -%>
   <a name="comments"></a><h4 class="blueblk">Comments</h4>
-  <% if @article.allow_comments? -%>
+  <% unless @article.comments_closed? -%>
     <p class="postmetadata alt">
       <small><a href="#respond">Leave a response</a></small>
     </p>
@@ -63,7 +63,7 @@
   </small>
 </p>
 
-<% if @article.allow_comments? -%>
+<% unless @article.comments_closed? -%>
   <%= render :partial => 'comment_box' %>
 <% else -%>
   <p>Comments are disabled</p>

data/app/views/layouts/administration.rhtml

@@ -30,6 +30,7 @@
           <ul id="tabs">
             <%= tab "Articles", :controller=>"/admin/content", :action => 'index' %>
             <%= tab "Pages", :controller=>"/admin/pages", :action => 'index' %>
+            <%= tab "Feedback", :controller=>"/admin/feedback", :action => 'index' %>
             <%= tab "Categories", :controller=>"/admin/categories", :action => 'index' %>
             <%= tab "Blacklist", :controller=>"/admin/blacklist", :action => 'index' %>
             <%= tab "Sidebar", :controller=>"/admin/sidebar", :action => 'index' %>

data/bin/typo

@@ -7,26 +7,8 @@ class TypoInstaller < RailsInstaller
   support_location 'the Typo mailing list'
   rails_version '1.1.4'
   
-  def install_sequence
-    stop
-    
-    backup_database
-    pre_migrate_database
-    copy_files
-    freeze_rails
-    create_default_config_files
-    create_directories
-    create_initial_database
-    set_initial_port_number
-    expand_template_files
-    
-    migrate
+  def install_post_hook
     sweep_cache
-    save
-    
-    run_rails_tests
-    
-    start
   end
   
   # Sweep the cache
@@ -38,13 +20,11 @@ class TypoInstaller < RailsInstaller
 end
 
 class SweepCache < RailsInstaller::Command
+  help "Sweep Typo's cache"
+  
   def self.command(installer, *args)
     installer.sweep_cache
   end
-  
-  def self.help(installer)
-    ['',"Sweep Typo's cache"]
-  end
 end
 
 # Installer program

data/components/plugins/sidebars/archives_controller.rb

@@ -11,7 +11,7 @@ class Plugins::Sidebars::ArchivesController < Sidebars::ComponentPlugin
     # across all three of our supported DBs.  So, we resort to a bit of
     # DB-specific code.
     if Content.connection.kind_of? ActiveRecord::ConnectionAdapters::SQLiteAdapter
-      date_func = "strftime('%Y') as year, strftime('%m') as month"
+      date_func = "strftime('%Y', published_at) as year, strftime('%m', published_at) as month"
     else
       date_func = "extract(year from published_at) as year,extract(month from published_at) as month"
     end

data/components/plugins/sidebars/xml_controller.rb

@@ -7,5 +7,5 @@ class Plugins::Sidebars::XmlController < Sidebars::ComponentPlugin
   setting :trackbacks, false, :input_type => :checkbox
 
   setting :format, 'rss20', :input_type => :radio,
-          :choices => [["rss20",  "RSS 2.0"], ["atom10", "Atom 1.0"], ["atom03", "Atom 0.3"]]
+          :choices => [["rss20",  "RSS 2.0"], ["atom10", "Atom 1.0"]]
 end

data/components/plugins/textfilters/flickr_controller.rb

@@ -55,7 +55,7 @@ This macro takes a number of parameters:
       imageurl    = details['source']
       imagelink   = flickrimage.url
 
-      caption   ||= sanitize(CGI.unescapeHTML(flickrimage.description))
+      caption   ||= sanitize(CGI.unescapeHTML(flickrimage.description)) unless flickrimage.description.blank?
       title     ||= flickrimage.title
       alt       ||= title
 

data/components/plugins/textfilters/sparkline_controller.rb

@@ -1,7 +1,9 @@
 require 'net/http'
 
 begin
-  Kernel.require 'sparkline'
+  Kernel.require 'sparklines'
+
+  Sparklines # this will throw an exception if the require failed.
 
   class Plugins::Textfilters::SparklineController < TextFilterPlugin::MacroPost
     plugin_public_action :plot
@@ -81,7 +83,6 @@ For other options, see the [Ruby Sparkline][] website.
       render :text => ''
     end
   end
-
 rescue LoadError
   # ignore load errors by not loading any of the library
 end

data/components/plugins/textfilters/textile_controller.rb

@@ -2,6 +2,12 @@ class Plugins::Textfilters::TextileController < TextFilterPlugin::Markup
   plugin_display_name "Textile"
   plugin_description 'Textile markup language'
 
+  def self.help_text
+    %{
+      See [_why's Textile reference](http://hobix.com/textile/).
+    }
+  end
+  
   def self.filtertext(controller,content,text,params)
     RedCloth.new(text).to_html(:textile)
   end

data/config/mongrel.conf

@@ -0,0 +1,2 @@
+blog = Mongrel::Rails.new('/blog',{})
+uri "/blog", :handler => blog

data/db/converters/wordpress2.rb

@@ -0,0 +1,291 @@
+#!/usr/bin/env ruby
+
+# WordPress 1.5x converter for typo by Patrick Lenz <patrick@lenz.sh>
+# Updated to work with WordPress 2.0.x by Phillip Toland <toland@mac.com>
+#
+# See http://fiatdev.com/wp/2006/07/10/wordpress-to-typo-conversion-script/
+# for more information.
+#
+# MAKE BACKUPS OF EVERYTHING BEFORE RUNNING THIS SCRIPT!
+# THIS SCRIPT IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND
+
+require File.dirname(__FILE__) + '/../../config/environment'
+require 'application'
+require 'optparse'
+
+class WP2Migrate
+  attr_accessor :options
+
+  def initialize
+    self.options = {}
+    self.parse_options
+
+    WP2Migrate.execute_without_timestamps do
+      self.create_blog
+      self.convert_users
+      self.convert_categories unless self.options[:tags] 
+      self.convert_entries
+    end
+  end
+
+
+  # Replaces <code></code> tags with <typo:code> and </typo:code> 
+  # Also rewrites Markdown URLs with relative paths to a new base url 
+  def replacements(str) 
+    str.gsub!('<code', '<typo:code') 
+    str.gsub!('</code>', '</typo:code>') 
+    if self.options[:base_url] 
+      str.gsub!(/\(\/([^\)]*)\)/,"(#{self.options[:base_url]}" +'\1)') 
+      str.gsub!(/\[([^\]]*)\]: \/([^$])/, '[\1]:' +"#{self.options[:base_url]}"+'\2') 
+    end 
+    str 
+  end 
+
+  def create_blog
+    puts 'Creating Blog...'
+
+    blog = Blog.new
+
+    ActiveRecord::Base.connection.select_all(%{
+      SELECT
+          (CASE option_name
+            WHEN 'blogname' THEN 'blog_name'
+  	        WHEN 'blogdescription' THEN 'blog_subtitle'
+  	        WHEN 'siteurl' THEN 'canonical_server_url'
+            WHEN 'default_comment_status' THEN 'default_allow_comments'
+            WHEN 'default_ping_status' THEN 'default_allow_pings'
+           END) AS name,
+        option_value AS value
+      FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_options`
+      WHERE option_name IN ('blogname', 'default_comment_status', 'default_ping_status', 'siteurl', 'blogdescription')
+    }).each do |pref|
+      if pref['name'] =~ /^default_allow/
+        pref['value'] = (pref['value'] == "open" ? 1 : 0)
+      end
+
+      blog[pref['name']] = pref['value']
+    end
+    
+    blog['send_outbound_pings'] = false
+    blog['text_filter'] = self.options[:text_filter]
+    blog['comment_text_filter'] = self.options[:text_filter]
+
+    blog.save
+  end
+
+  def convert_users
+    # The SQL statement below is meant to capture all of the WordPress users
+    # who have permission to post content and not the users who just signed up
+    # to post a comment. There is some confusion in WP 2.0 about the user levels
+    # and user roles. I am currently using the user levels to select the
+    # appropriate users even though that is the "old way". If that is a problem,
+    # replace the second part of the where clause with:
+    #   AND (usermeta.meta_key = 'wp_capabilities' AND INSTR(meta_value, 'subscriber') = 0)
+    # which does (mostly) the same thing using the new roles system.
+    wp_users = ActiveRecord::Base.connection.select_all(%{
+      SELECT
+        users.ID AS id,
+        user_login AS login,
+        user_email AS email,
+        display_name AS name
+      FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_users` AS users, 
+        `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_usermeta` AS usermeta
+      WHERE users.ID = usermeta.user_id 
+    	  AND (usermeta.meta_key = 'wp_user_level' AND (meta_value > 0 AND meta_value < 10))
+    })
+
+    puts "Converting #{wp_users.size} users..."
+
+    wp_users.each do |user|
+      u = User.new user
+      u.id = user['id']
+      u.password = u.password_confirmation = 'password'
+      u.save
+    end
+  end
+
+  def convert_categories
+    wp_categories = ActiveRecord::Base.connection.select_all(%{
+      SELECT cat_name AS name
+      FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_categories`
+    })
+
+    puts "Converting #{wp_categories.size} categories.."
+
+    wp_categories.each do |cat|
+      Category.create(cat) unless Category.find_by_name(cat['name'])
+    end
+  end
+
+  def convert_entries
+    wp_entries = ActiveRecord::Base.connection.select_all(%{
+      SELECT
+        `#{self.options[:wp_prefix]}_posts`.ID,
+        (CASE comment_status WHEN 'closed' THEN '0' ELSE '1' END) AS allow_comments,
+        (CASE ping_status WHEN 'closed' THEN '0' ELSE '1' END) AS allow_pings,
+        post_title AS title,
+        post_content AS body,
+        post_excerpt AS excerpt,
+        post_name AS permalink,
+        post_date AS created_at,
+        post_modified AS updated_at,
+        (CASE LENGTH(user_nicename) WHEN '0' THEN user_login ELSE user_nicename END) AS author,
+        (CASE post_status WHEN 'publish' THEN '1' ELSE '0' END) AS published,
+        post_author AS user_id,
+        post_status,
+        post_category
+      FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_posts`, `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_users`
+      WHERE `#{self.options[:wp_prefix]}_users`.ID = `#{self.options[:wp_prefix]}_posts`.post_author
+    })
+
+    puts "Converting #{wp_entries.size} entries.."
+
+    wp_entries.each do |entry|
+      if entry['post_status'] == 'static'        
+        a = Page.new
+        a.attributes = entry.reject { |k,v| k =~ /^(ID|post_category|body|post_status|permalink)/ }
+        a.name = entry['permalink']
+        a.created_at = entry['created_at']
+        a.updated_at = entry['updated_at']
+      else
+        a = Article.new
+        a.attributes = entry.reject { |k,v| k =~ /^(ID|post_category|body|post_status)/ }
+        a.created_at = entry['created_at'] 
+        a.created_at ||= DateTime.now
+        a.updated_at = entry['updated_at']
+      end
+      
+      a.text_filter = TextFilter.find(:first, :conditions => [ 'name = ?', self.options[:text_filter] ] ) 
+     	
+     	body = replacements(entry['body']) 
+     	more_index = body.index('<!--more-->') 
+     	if more_index 
+     	  a.body = body[0...more_index] 
+     	  a.extended = body[more_index + 11...body.length] 
+     	else 
+     	  a.body = body 
+     	end 
+     	a.save 
+
+     	# Assign primary category 
+     	unless entry['post_category'].to_i.zero? 
+     	  puts "Assign primary category for entry #{entry['ID']}" 
+
+     	  ActiveRecord::Base.connection.select_all(%{ 
+     	    SELECT cat_name 
+     	    FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_categories` 
+     	    WHERE cat_ID = '#{entry['post_category']}' 
+     	  }).each do |c| 
+     	    if self.options[:tags] 
+     	      a.keywords = c['cat_name'].downcase || ""; 
+     	    else 
+     	      a.categories.push_with_attributes(Category.find_by_name(c['cat_name']), :is_primary => 1) rescue nil 
+     	    end 
+     	  end 
+     	end unless a.instance_of?(Page) 
+	   
+     	# Fetch category assignments 
+     	puts "Assign remaining categories for entry #{entry['ID']}"
+      ActiveRecord::Base.connection.select_all(%{
+        SELECT cat_name
+        FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_categories`, `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_post2cat` 
+       	WHERE post_id = #{entry['ID']} 
+       	  AND `#{self.options[:wp_prefix]}_post2cat`.category_id = `#{self.options[:wp_prefix]}_categories`.cat_ID
+      }).each do |c|
+        if self.options[:tags] 
+          a.keywords ||= "" 
+          a.keywords << " " << c['cat_name'].gsub(/\s/,'-').downcase 
+        else 
+          a.categories.push_with_attributes(Category.find_by_name(c['cat_name']), :is_primary => 0) 
+        end 
+      end unless a.instance_of?(Page) 
+
+      a.save if self.options[:tags] # force tags to save 
+
+      # Fetch comments 
+      ActiveRecord::Base.connection.select_all(%{ 
+        SELECT 
+          comment_author AS author, 
+          comment_author_email AS email, 
+          comment_author_url AS url, 
+          comment_content AS body, 
+          comment_date AS created_at, 
+          comment_author_IP AS ip 
+        FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_comments` 
+        WHERE comment_post_ID = #{entry['ID']} 
+          AND comment_type != 'trackback' 
+          AND comment_approved = '1' 
+      }).each do |c| 
+        a.comments.create(c) 
+      end unless a.instance_of?(Page) 
+       
+      # Fetch trackbacks 
+      ActiveRecord::Base.connection.select_all(%{ 
+        SELECT 
+          comment_author AS blog_name, 
+          comment_author_url AS url, 
+          comment_content AS excerpt, 
+          comment_date AS created_at, 
+          comment_author_IP AS ip 
+        FROM `#{self.options[:wp_db]}`.`#{self.options[:wp_prefix]}_comments` 
+        WHERE comment_post_ID = #{entry['ID']} 
+          AND comment_type = 'trackback' 
+          AND comment_approved = '1' 
+      }).each do |c| 
+        c['title'] = c['excerpt'].match("<(strong)>(.+?)</\\1>")[2] rescue c['blog_name']                                                                        
+        a.trackbacks.create(c) 
+      end unless a.instance_of?(Page)
+
+      # Typo internally sets the published_at timestamp so we are going to go
+      # behind its back to set them to what they should be.
+      ActiveRecord::Base.connection.execute(%{
+        UPDATE contents SET published_at = created_at 
+        WHERE published_at IS NOT NULL
+      })
+    end
+  end
+
+  def parse_options
+    OptionParser.new do |opt|
+      opt.banner = "Usage: wordpress.rb [options]"
+
+      opt.on('--db DBNAME', String, 'WordPress database name.') { |d| self.options[:wp_db] = d }
+      opt.on('--prefix PREFIX', String, 'WordPress table prefix (defaults to \'wp\').') { |d| self.options[:wp_prefix] = d }
+      opt.on('--filter TEXTFILTER', String, 'Textfilter for imported articles (defaults to textile): eg \'markdown smartypants\'') { |d| self.options[:text_filter] = d } 
+     	opt.on('--tags', 'Convert categories to tags') { self.options[:tags] = true; } 
+     	opt.on('--base-url URL', String, 'Rewrite the base url for Markdown relative paths. (Trailing / required).' ) { |url| self.options[:base_url] = url }
+      opt.on_tail('-h', '--help', 'Show this message.') do
+        puts opt
+        exit
+      end
+
+      opt.parse!(ARGV)
+    end
+
+    unless self.options.include?(:wp_db)
+      puts "See wordpress.rb --help for help."
+      exit
+    end
+
+    unless self.options.include?(:wp_prefix)
+      self.options[:wp_prefix] = "wp"
+    end
+
+    unless self.options.include?(:text_filter)
+      self.options[:text_filter] = 'textile'
+    end
+  end
+
+  # This method allows to execute a block while deactivating timestamp
+  # updating.
+  def self.execute_without_timestamps
+    old_state = ActiveRecord::Base.record_timestamps
+    ActiveRecord::Base.record_timestamps = false
+
+    yield
+
+    ActiveRecord::Base.record_timestamps = old_state
+  end
+end
+
+WP2Migrate.new