typo 5.2 → 5.2.98

data/app/models/blog_sweeper.rb

@@ -60,7 +60,6 @@ class BlogSweeper < ActionController::Caching::Sweeper
 
   def sweep_all
     PageCache.sweep_all
-    expire_fragment(/.*/)
   end
 
   def sweep_theme
@@ -68,16 +67,11 @@ class BlogSweeper < ActionController::Caching::Sweeper
   end
 
   def sweep_articles
-    expire_fragment(%r{.*/articles/.*})
     PageCache.sweep_all
   end
 
   def sweep_pages
-    expire_fragment(/.*\/pages\/.*/)
-    expire_fragment(/.*\/view_page.*/)
-    unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
-      PageCache.zap_pages('pages')
-    end
+    PageCache.zap_pages('pages') unless Blog.default.nil?
   end
 
   def logger

data/app/models/cache_information.rb

@@ -0,0 +1,19 @@
+class CacheInformation < ActiveRecord::Base
+  validates_presence_of :path
+  validates_uniqueness_of :path
+
+  before_destroy :delete_path_in_page_cache_directory
+
+  def delete_path_in_page_cache_directory
+    if File.exist? path_in_page_cache_directory
+      FileUtils.rm(path_in_page_cache_directory)
+    else
+      Rails.logger.warn("path : #{path} no more exist")
+    end
+  end
+
+  def path_in_page_cache_directory
+    File.join(ActionController::Base.page_cache_directory, path)
+  end
+
+end

data/app/models/content.rb

@@ -29,8 +29,8 @@ class Content < ActiveRecord::Base
   named_scope :no_draft, {:conditions => ['state <> ?', 'draft'], :order => 'created_at DESC'}
   named_scope :searchstring, lambda {|search_string|
     tokens = search_string.split.collect {|c| "%#{c.downcase}%"}
-    {:conditions => [(['(LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)']*tokens.size).join(' AND '),
-                      *tokens.collect{ |token| [token] * 3 }.flatten]}
+    {:conditions => [(['state = ? AND (LOWER(body) LIKE ? OR LOWER(extended) LIKE ? OR LOWER(title) LIKE ?)']*tokens.size).join(' AND '),
+                        "published", *tokens.collect{ |token| [token] * 3 }.flatten]}
   }
 
   serialize :whiteboard

data/app/models/page_cache.rb

@@ -11,21 +11,13 @@ class PageCache
     ActionController::Base.page_cache_directory
   end
 
+  # Delete all file save in path_cache by page_cache system
   def self.sweep_all
     logger.debug "PageCache - sweep_all called by #{caller[1].inspect}"
-    unless Blog.default && Blog.default.cache_option == "caches_action_with_params"
-      self.zap_pages(%w{index.* articles.* pages page
-                     pages.* feedback feedback.*
-                     comments comments.*
-                     category categories.* xml
-                     *.rss *.atom
-                     tag tags.* category archives.*})
-
-      self.zap_pages((1990..2020))
-      self.zap_pages([*1990..2020].collect { |y| "#{y}.*" })
-    end
+    CacheInformation.all.each{|c| c.destroy}
   end
 
+
   def self.sweep_theme_cache
     logger.debug "PageCache - sweep_theme_cache called by #{caller[1].inspect}"
     self.zap_pages(%{images/theme stylesheets/theme javascripts/theme})
@@ -43,4 +35,28 @@ class PageCache
     FileUtils.mv(srcs, trash, :force => true)
     FileUtils.rm_rf(trash)
   end
+
+  # DEPRECATED
+  #
+  # It's now deprecated. It's use only in migration
+  # (20090311160502_create_cache_informations.rb)
+  # Doesn't use anyway. The cache is now manage by CacheInformation
+  # Method to swepp_all cache is allways self.sweep_all
+  #
+  # DEPRECATED
+  def self.old_sweep_all
+    logger.debug "PageCache - sweep_all called by #{caller[1].inspect}"
+    unless Blog.default.nil?
+      self.zap_pages(%w{index.* articles.* pages page
+                     pages.* feedback feedback.*
+                     comments comments.*
+                     category categories.* xml
+                     sitemap.xml
+                     *.rss *.atom
+                     tag tags.* category archives.*})
+
+      self.zap_pages((1990..2020))
+      self.zap_pages([*1990..2020].collect { |y| "#{y}.*" })
+    end
+  end
 end

data/app/models/ping.rb

@@ -89,13 +89,14 @@ class Ping < ActiveRecord::Base
     trackback_uri = URI.parse(trackback_url)
 
     post = "title=#{CGI.escape(article.title)}"
-    post << "&excerpt=#{CGI.escape(article.body.strip_html[0..254])}"
+    post << "&excerpt=#{CGI.escape(article.html(:body).strip_html[0..254])}"
     post << "&url=#{origin_url}"
     post << "&blog_name=#{CGI.escape(article.blog.blog_name)}"
 
-    Net::HTTP.start(trackback_uri.host, trackback_uri.port) do |http|
-      path = trackback_uri.path
-      path += "?#{trackback_uri.query}" if trackback_uri.query
+    path = trackback_uri.path
+    path += "?#{trackback_uri.query}" if trackback_uri.query
+
+    net_request = Net::HTTP.start(trackback_uri.host, trackback_uri.port) do |http|
       http.post(path, post, 'Content-type' => 'application/x-www-form-urlencoded; charset=utf-8')
     end
   end

data/app/models/user.rb

@@ -2,6 +2,7 @@ require 'digest/sha1'
 
 class User < CachedModel
   belongs_to :profile
+  belongs_to :text_filter
   has_many :notifications, :foreign_key => 'notify_user_id'
   has_many :notify_contents, :through => :notifications,
     :source => 'notify_content',
@@ -23,7 +24,7 @@ class User < CachedModel
 
   def self.authenticate(login, pass)
     find(:first,
-         :conditions => ["login = ? AND password = ?", login, sha1(pass)])
+         :conditions => ["login = ? AND password = ? AND state = ?", login, sha1(pass), 'active'])
   end
 
   # These create and unset the fields required for remembering users between browser closes

data/app/views/admin/content/_form.html.erb

@@ -1,4 +1,5 @@
 <%= error_messages_for 'article' %>
+<input type="hidden" name="current_editor" id="current_editor" value="<%= current_user.editor %>" />
 <div id="autosave"></div>
 <div id="article_keywords_auto_complete" class="auto_complete"></div>
 <ul class="admin">
@@ -26,12 +27,22 @@
       </p>
     </div>
     <div id="editor">
-      <label for="article_body_and_extended" class="block content"><%= _("Content")%></label>
-      <% unless current_user.editor == 2 -%>
+      <div id="editor-menu">
+        <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
+          <%= build_editor_link("Visual", 'insert_editor', 'fck', 'visual_editor', 'visual') %>
+        </span>
+        <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
+          <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
+        </span>
+      </div>
+      <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
         <script type="text/javascript">edToolbar('article_body_and_extended');</script>
-      <% end -%>
-      <%= t_textarea 'article', 'body_and_extended', {:height => '300', :class => 'medium'} %>
-      <%= render_macros(@macros) unless current_user.editor == 2 %>
+      </div>
+      <div id='<%= alternate_editor %>_editor'></div>
+      <div id='<%= "#{current_user.editor}_editor" %>'>
+        <%= t_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
+        <%= render_macros(@macros) if current_user.editor == 'simple' %>
+      <div>
     </div>
   </li>
   <li>
@@ -70,13 +81,18 @@
     <ul id="publishing_options" <%= "style='display: none;'" unless @article.published.blank? %>>
       <li>
         <label class="float"><%= _("Publish at")%>:</label>
-        <%= datetime_select 'article', 'published_at', :include_blank => true  %>            
+        <%= calendar_date_select 'article', 'published_at' %>
       </li>
       <li>
         <label for="article_permalink" class="float"><%= _("Permalink") %></label>
         <span id="permalink"><%= text_field 'article', 'permalink' %></span>
-      </li>     
+      </li>
+      <li>
+          <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
+          <select name="article[text_filter]" id="text_filter">
+            <%= options_for_select text_filter_options, @article.text_filter %>
+          </select>
+      </li>
     </ul>
   </li>  
 </ul>
-<%= hidden_field_tag 'text_filter', this_blog.text_filter %>

data/app/views/admin/content/_simple_editor.html.erb

@@ -0,0 +1,12 @@
+<script type="text/javascript">
+  $('quicktags').style.display = 'block';
+  $('s').className = 'active';
+  $('f').className = 'inactive';
+  html = FCKeditorAPI.GetInstance('article__body_and_extended_editor').GetHTML();
+</script>
+<%= text_area('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>
+<script type="text/javascript">
+  $('article_body_and_extended').innerHTML = html;
+  $('visual_editor').innerHTML = "";
+  html = null;
+</script>

data/app/views/admin/content/_visual_editor.html.erb

@@ -0,0 +1,10 @@
+<script type="text/javascript">
+  $('quicktags').style.display = 'none';
+  $('s').className = 'inactive';
+  $('f').className = 'active';
+  if (typeof(html2) != 'undefined') {
+    html2 = null;
+  }
+  html2 = $('article_body_and_extended').innerHTML;
+</script>
+<%= fckeditor_textarea('article', 'body_and_extended', {:height => '300', :class => 'medium'}) %>

data/app/views/admin/content/new.html.erb

@@ -1,3 +1,3 @@
 <% subtabs_for(:write) %>
 <%= render :partial => "drafts" %>
-<%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new", :id => @article.id , :class => ('autosave' if current_user.editor == 0)} } %>
+<%= render :partial => "admin/shared/edit", :locals => { :form_type => "article", :form_action => { :action => "new", :id => @article.id , :class => ('autosave')} } %>

data/app/views/admin/dashboard/_comments.html.erb

@@ -1,5 +1,5 @@
 <div class="dashboard">
-  <h3><%= _("Last Comments") %></h3>
+  <h3><%= _("Latest Comments") %></h3>
   <ul>
     <% if @comments.size == 0 %>
       <li><%= _("No comments yet") %></li>

data/app/views/admin/dashboard/_overview.html.erb

@@ -1,9 +1,9 @@
 <div class="dashboard">
-  <p> <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s , %s or %s." , 
+  <p> <%= _("This place gives you a quick overview of what happens on your Typo blog and what you can do. Maybe will you want to %s, %s or %s." , 
             link_to(_('write a post'), :controller => 'content', :action => 'new'), 
             link_to(_('write a page'), :controller => 'page', :action => 'new') , 
-            link_to(_("Update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
+            link_to(_("update your profile or change your password"), :controller => 'users', :action => 'edit', :id => session[:user_id]) ) -%>.</p>
   <p> <%= _("You can also do a bit of design, %s or %s." ,
-            link_to(_("Change your blog presentation"), :controller => 'themes') , 
+            link_to(_("change your blog presentation"), :controller => 'themes') , 
             link_to(_("enable plugins"), :controller => 'sidebar') ) -%></p>
 </div>

data/app/views/admin/dashboard/_posts.html.erb

@@ -1,5 +1,5 @@
 <div class="dashboard">
-  <h3><%= _("Last posts") %></h3>
+  <h3><%= _("Latest posts") %></h3>
   <ul>
 	<% if @recent_posts.size == 0 %>
       <li> <%= link_to _("No posts yet, why don't you start and write one"), :controller => 'content', :action => 'new' %> ?</li>

data/app/views/admin/dashboard/_typo_dev.html.erb

@@ -1,5 +1,5 @@
 <div class="dashboard">
-  <h3><%= _("Last news from Typo development blog") %></h3>
+  <h3><%= _("Latest news from the Typo development blog") %></h3>
   <% if @typo_links.nil? %>
     <%= _('You have no internet connection') %>
   <% else %>

data/app/views/admin/feedback/_item.html.erb

@@ -3,10 +3,10 @@
   <td class='<%= comment_class item.state %>'><%= item.state %></td>
   <td><%= link_to item.article.title, :controller => 'feedback', :action => 'article', :id => item.article_id %></td>
   <td>
-    <%= link_to_unless item.url.blank?, ((item.author || '(unknown)').slice(0,40)), item.url %><br />
+    <%= link_to_unless item.url.blank?, ((h(item.author) || '(unknown)').slice(0,40)), item.url %><br />
     <%=h item.email.to_s.slice(0,40) %>
   </td>
   <td id="feedback_<%=item.id%>">
-    <%=link_to_remote(simple_format(h(truncate(item.body, :length => 100))), :url => { :action => 'preview', :id => item.id })%></td>
+    <%=link_to_remote(h(truncate(item.body, :length => 100)), :url => { :action => 'preview', :id => item.id })%></td>
   <td><%=h item.ip %></td>
 </tr>

data/app/views/admin/feedback/article.html.erb

@@ -13,7 +13,7 @@
       <p><strong><%= mail_to h(comment.email), h(comment.author) %></strong> |
       <%= link_to_unless comment.url.blank?, h(comment.url), comment.url %> | 
       IP: <%=h comment.ip %></p>
-      <%= simple_format(h(comment.body)) %>
+      <%= comment.body %>
       <p>
         <%= comment.created_at.strftime("%m/%d/%Y %H:%M") %> – [ 
         <%= link_to_edit _("Edit"), comment %> | 

data/app/views/admin/pages/_form.html.erb

@@ -18,13 +18,34 @@
       </p>
     </div>
     <div id="editor">
-      <label for="page_body" class="block content"><%= _("Content")%></label>
-      <% unless current_user.editor == 2 -%>
+      <div id="editor-menu">
+        <span id="f" class="<%= 'active' if current_user.editor == 'visual' %>">
+          <%= build_editor_link("Visual", 'insert_editor', 'fck', 'simple_editor', 'visual') %>
+        </span>
+        <span id="s" class="<%= 'active' if current_user.editor == 'simple' %>">
+          <%= build_editor_link("HTML", 'insert_editor', 'simple', 'simple_editor', 'simple') %>
+        </span>
+      </div>
+      <div id='quicktags' style='<%= "display: none;" if current_user.editor == 'visual' %>'>
         <script type="text/javascript">edToolbar('page_body');</script>
-      <% end -%>
-      <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
-      <%= render_macros(@macros) unless current_user.editor == 2 %>
+      </div>
+      <div id='<%= alternate_editor %>_editor'></div>
+      <div id='<%= "#{current_user.editor}_editor" %>'>
+        <%= t_textarea 'page', 'body', {:height => '300', :class => 'large'} %> 
+        <%= render_macros(@macros) if current_user.editor == 'visual' %>
+      <div>
     </div>
     <%= hidden_field_tag 'text_filter', this_blog.text_filter %>
   </li>
+  <li class="paginate l">
+    <label class="block">
+      <%= link_to_function _("Page settings") + " (+/-)",update_page { |page| page.visual_effect(:toggle_blind, "publishing_options", :duration => 0.2) } %>
+    </label>
+    <ul id="publishing_options" <%= "style='display: none;'" unless @page.published.blank? %>>
+      <li>
+          <label class="float" for="text_filter"><%= _("Article filter")%>:</label>
+          <select name="page[text_filter]" id="text_filter">
+            <%= options_for_select text_filter_options, @page.text_filter %>
+          </select>
+      </li>  
 </ul>

data/app/views/admin/pages/_simple_editor.html.erb

@@ -0,0 +1,13 @@
+<script type="text/javascript">
+  $('quicktags').style.display = 'block';
+  $('s').className = 'active';
+  $('f').className = 'inactive';
+  html = FCKeditorAPI.GetInstance('page__body_editor').GetHTML();
+</script>
+<%= text_area('page', 'body', {:class => 'medium', :height => '300'}) %>
+
+<script type="text/javascript">
+  $('page_body').innerHTML = html;
+  $('visual_editor').innerHTML = "";
+  html = null;
+</script>

data/app/views/admin/pages/_visual_editor.html.erb

@@ -0,0 +1,12 @@
+<script type="text/javascript">
+  $('quicktags').style.display = 'none';
+  $('s').className = 'inactive';
+  $('f').className = 'active';
+  
+  if (typeof(html2) != 'undefined') {
+    html2 = null;
+  }
+  html2 = $('page_body').innerHTML;
+  
+</script>
+<%= fckeditor_textarea('page', 'body', {:height => '300', :class => 'medium'}) %>

data/app/views/admin/settings/index.html.erb

@@ -42,21 +42,8 @@
     <legend><%= _("Cache")%></legend>
     <ul>
       <li>
-        <%= _("By default, Typo generates static HTML pages for your posts. However, if you plan to publish posts in the futur, you may want to use semi dynamic caching") %>.
-      </li>
-      <li>
-        <label class="float" for="caches_page"><%= _("Choose caching methode")%>:</label>
-        <input type="radio" name="setting[cache_option]" value="caches_page" id="cache_option_0" <%= 'checked="checked"' if this_blog.cache_option == 'caches_page' %>/>
-        <label for="cache_option_0"><%= _("Use static HTML page caching ")%></label>
-        <span class="float">
-          <input type="radio" name="setting[cache_option]" value="caches_action_with_params" id="cache_option_1" <%= 'checked="checked"' if this_blog.cache_option == 'caches_action_with_params' %>/>
-          <label for="cache_option_1"><%= _("Use semi static caching (default)")%></label>
-        </span>
-      </li>
-      <li><%= _("If you experience trouble with caching, you can wipe the cache out manually") %></li>
-      <li>
-        <label class="float"><%= _("Choose caching methode")%>:</label>
-        <%= sweep_cache_link %>
+        <label class="float"><%= _("Sweep cache")%>:</label>
+        <%= link_to _("Sweep cache"), { :controller => "admin/cache",    :action => "sweep_html" } %>
       </li>
     </ul>
   </fieldset>

data/app/views/admin/settings/read.html.erb

@@ -20,6 +20,11 @@
 			    <input name="setting[show_extended_on_rss]" id="show_extended_on_rss" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.show_extended_on_rss%> />
 			    <input name="setting[show_extended_on_rss]" type="hidden" value="0" />
 			</li>
+      <li>
+        <label class="float" for="feedburner_url"><%= _("Feedburner ID")%>:</label>
+        <input name="setting[feedburner_url]" id="feedburner_url" type="text" value="<%=h this_blog.feedburner_url %>" class="medium" />
+        <span class="float">You can use your Google Feedburner account instead of Typo feed URL. To enable this, fill this form with your Feedburner ID.</span>
+      </li>
 		</ul>
 	</fieldset>
   <%= hidden_field_tag 'from', 'read' %>

data/app/views/admin/settings/seo.html.erb

@@ -1,6 +1,8 @@
 <% @page_heading = _('Search Engine Optimization') %>
 <% subtabs_for(:settings) %>
 
+<%= error_messages_for 'blog' %>
+
 <% form_tag :action => 'update' do %>
 <div class="admin">
   <fieldset>
@@ -19,6 +21,10 @@
           <label for="blog_title_prefix_0"><%= _("Don't show blog name in page title")%></label>
         </span>
       </li>
+      <li>
+          <label class="float" for="permalink_format"><%= _("Format of permalink")%></label>
+          <input type="text" name="setting[permalink_format]" id="permalink_format" size="25" value="<%=h this_blog.permalink_format %>" />
+      </li>
       <li>
           <label class="float" for="google_analytics"><%= _("Google Analytics")%></label>
           <input type="text" name="setting[google_analytics]" id="google_analytics" size="25" value="<%=h this_blog.google_analytics %>" />
@@ -37,10 +43,28 @@
        <input name="setting[rss_description]" type="hidden" value="0" />
        <span class="float"><%= "#{_('This will display')} <em>#{_('Original article writen by')} ... #{_('and published on')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a> | <a href='#{this_blog.base_url}'>#{_('direct link to this article')}</a> | #{_('If you are reading this article elsewhere than')} <a href='#{this_blog.base_url}'>#{this_blog.blog_name}</a>, #{_('it has been illegally reproduced and without proper authorization')}</em> #{_('at the bottom of each of your post in the RSS feed')}"%></span>
       </li>
-
+      <li class="checkbox">
+        <label class="float" for="index_categories"><%= _("Index categories")%>:</label>
+        <input name="setting[index_categories]" id="index_categories" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.index_categories %> />
+        <input name="setting[index_categories]" type="hidden" value="0" />
+        <span class="float"><%= _("Unchecking this box will add <code>noindex, follow</code> meta tags in every category page, removing them from search engines and preventing duplicate content issues") %></span>
+      </li>
+      <li class="checkbox">
+        <label class="float" for="index_tags"><%= _("Index tags")%>:</label>
+        <input name="setting[index_tags]" id="index_tags" type="checkbox" value="1" <%= 'checked="checked"' if this_blog.index_tags %> />
+        <input name="setting[index_tags]" type="hidden" value="0" />
+        <span class="float"><%= _("Unchecking this box will add <code>noindex, follow</code> meta tags in every tags page, removing them from search engines and preventing duplicate content issues") %></span>
+      </li>
+      <li>
+        <label class="float" for="robots"><%= _("Robots.txt")%></label>
+        <textarea name="setting[robots]" id="robots" <%= 'readonly="true"' unless robot_writable? %> rows="10" cols="50"><%=h this_blog.robots %></textarea>
+        <% unless robot_writable? -%>
+          <span class=' float mandatory'><small><%= _("You robots.txt file is not writeable. Typo won't be able to write it")%></small></span>
+        <% end -%>
+      </li>
     </ul>
   </fieldset>
-  <%= hidden_field_tag 'from', 'index' %>  
+  <%= hidden_field_tag 'from', 'seo' %>  
   <%= render :partial => 'submit' %>
 </div>
 <% end %>