@@ -1,6 +1,6 @@
class MephistoController < ApplicationController
layout nil
- session :new_session => false
+ session :off
caches_page_with_references :dispatch
cache_sweeper :comment_sweeper
@@ -95,7 +95,7 @@ class MephistoController < ApplicationController
render_liquid_template_for(:search, 'articles' => @articles,
'previous_page' => paged_search_url_for(@article_pages.current.previous),
'next_page' => paged_search_url_for(@article_pages.current.next),
- 'search_string' => params[:q],
+ 'search_string' => CGI::escapeHTML(params[:q]),
'search_count' => search_count,
'section' => @section)
@skip_caching = true
app/controllers/mephisto_controller.rb
@@ -6,7 +6,7 @@ class UserMailer < ActionMailer::Base
def forgot_password(user)
setup_email(user)
@subject += 'Request to change your password'
- @body[:url] = url_for :controller => :account, :action => :activate, :id => user.token
+ @body[:url] = url_for :controller => 'account', :action => 'activate', :id => user.token
end
protected
app/models/user_mailer.rb
@@ -1,5 +1,5 @@
<div class="little-box">
-<% form_tag({:controller=>:account, :action=>:login}, { :id => 'login_form' }) do -%>
+<% form_tag({:controller=>'account', :action=>'account'}, { :id => 'login_form' }) do -%>
<dl>
<dt><%= label_tag 'login', 'Login' %></dt>
<dd><%= text_field_tag 'login', params[:login], :class => 'big' %></dd>
app/views/account/login.rhtml
@@ -22,7 +22,7 @@
<div id="optgroup" style="display: none">
<ul id="options">
<% unless @article.new_record? -%>
- <li><%= link_to 'Edit this article', :action => :edit, :id => @article, :version => nil %></li>
+ <li><%= link_to 'Edit this article', :action => 'edit', :id => @article, :version => nil %></li>
<% end -%>
<% if @article.comments.any? && controller.action_name != 'comments' -%>
<li><%= link_to "View comments", :controller => 'articles', :action => 'comments', :id => @article %></li>
app/views/admin/articles/_page_nav.rhtml
@@ -58,7 +58,7 @@
<!-- begin pagination -->
<div id="pagination">
<% if @article_pages.page_count > 1 -%>
-Pages: <strong><%= pagination_links @article_pages, :params => { :action => :index } %></strong>
+Pages: <strong><%= pagination_links @article_pages, :params => { :action => 'index' } %></strong>
<% end -%>
</div>
<!-- /end pagination -->
app/views/admin/articles/index.rhtml
@@ -29,6 +29,6 @@
<% if @asset_pages.page_count > 1 %>
<div id="pagination">
- Pages: <strong><%= pagination_remote_links @asset_pages, :params => { :action => :index } %></strong>
+ Pages: <strong><%= pagination_remote_links @asset_pages, :params => { :action => 'index' } %></strong>
</div>
<% end %>
\ No newline at end of file
app/views/admin/assets/_assets.rhtml
@@ -2,7 +2,7 @@
<!-- begin cached pages list -->
<div class="pages">
<% if @cached_page_pages.page_count > 1 %>
-Pages: <strong><%= pagination_remote_links @cached_page_pages, :params => { :action => :index } %></strong>
+Pages: <strong><%= pagination_remote_links @cached_page_pages, :params => { :action => 'index' } %></strong>
<% end %>
</div>
<h2>Cached Pages</h2><br/>
@@ -28,7 +28,7 @@ Pages: <strong><%= pagination_remote_links @cached_page_pages, :params => { :act
<!-- begin pagination -->
<div id="pagination">
<% if @cached_page_pages.page_count > 1 %>
-Pages: <strong><%= pagination_links @cached_page_pages, :params => { :action => :index } %></strong>
+Pages: <strong><%= pagination_links @cached_page_pages, :params => { :action => 'index' } %></strong>
<% end %>
</div>
<!-- /end pagination -->
\ No newline at end of file
app/views/admin/cached_pages/pages.rhtml
@@ -16,7 +16,7 @@
<ul class="pagelist commentlist">
<% @comments.reverse.each_with_index do |comment, i| -%>
<li class="event-comment<%= " shade" if (i % 2 > 0) %>" id="comment-<%= comment.id %>">
- <h3><a name="comment-<%= comment.id %>"></a> <%= link_to comment.article.title, :controller => 'articles', :action => :edit, :id => comment.article %></h3>
+ <h3><a name="comment-<%= comment.id %>"></a> <%= link_to comment.article.title, :controller => 'articles', :action => 'edit', :id => comment.article %></h3>
<blockquote><p>"<%= truncate strip_tags(comment.body), 255 %>"</p></blockquote>
<span class="meta">
<cite>— <%= author_link_for comment %><%= %( (#{comment.author_email})) unless comment.author_email.blank? %></cite>
app/views/admin/comments/index.rhtml
@@ -1,7 +1,7 @@
<tr class="published" >
<td class="published">
<% if plugin.configurable? -%>
- <%= link_to plugin.path, :action => :show, :id => plugin.path %>
+ <%= link_to plugin.path, :action => 'show', :id => plugin.path %>
<% else -%>
<%=h plugin.path %>
<% end -%>
app/views/admin/plugins/_plugin.rhtml
@@ -23,17 +23,17 @@
<div id="page-nav">
<ul id="act-nav" class="clear">
<li>
- <%= link_to 'Restore Defaults', :action => :destroy, :id => @plugin.plugin_name %>
+ <%= link_to 'Restore Defaults', :action => 'destroy', :id => @plugin.plugin_name %>
</li>
<li>
- <%= link_to 'Index', :action => :index %>
+ <%= link_to 'Index', :action => 'index' %>
</li>
</ul>
</div>
<% end %>
<% content_for :form do -%>
- <%= form_tag({:action => :update, :id => @plugin.plugin_name}, {:id => 'plugin-config-form'}) %>
+ <%= form_tag({:action => 'update', :id => @plugin.plugin_name}, {:id => 'plugin-config-form'}) %>
<% end -%>
<% if @plugin.default_options.any? -%>
app/views/admin/plugins/show.rhtml
@@ -23,7 +23,7 @@ class UserMailerTest < Test::Unit::TestCase
user = users(:quentin)
response = UserMailer.deliver_forgot_password(user)
assert_equal user.email, response.to[0]
- assert_match /#{url_for :controller => :account, :action => :activate, :id => user.token}/, response.body
+ assert_match /#{url_for :controller => 'account', :action => 'activate', :id => user.token}/, response.body
end
private
test/unit/user_mailer_test.rb
15fdd8615cec1aeca1b42d70baf83a4306c2f230
technoweenie
technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78
http://github.com/francois/mephisto/commit/128718e5c318b2aa0fab360996feab80ad799a40
128718e5c318b2aa0fab360996feab80ad799a40
2007-03-10T23:48:46-08:00
2007-03-10T23:48:46-08:00
fix url_for calls with symbolized controllers/actions.
git-svn-id: http://svn.techno-weenie.net/projects/mephisto/trunk@2797 567b1171-46fb-0310-a4c9-b4bef9110e78
8e996df7947f5e2a31dfc650821dfe51691f7400
technoweenie
technoweenie@567b1171-46fb-0310-a4c9-b4bef9110e78