diff --git a/app/views/user/signup.html.erb b/app/views/user/signup.html.erb
index e5674c2..5daefe5 100644
--- a/app/views/user/signup.html.erb
+++ b/app/views/user/signup.html.erb
@@ -2,7 +2,7 @@
Criar conta
-<% form_tag :action=> "signup" do %>
+<%= form_tag :action=> "signup" do %>
<%= error_messages_for 'user' %>
diff --git a/app/views/users/dashboard.html.haml b/app/views/users/dashboard.html.haml
index 9a653ea..2f85294 100644
--- a/app/views/users/dashboard.html.haml
+++ b/app/views/users/dashboard.html.haml
@@ -19,7 +19,7 @@
%td.top.aright
= n.timestamp.strftime("%d de %B")
%td
- = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
+ = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
= link_to(h(n.title), course_news_instance_url(n.course, n))
- unless n.body.empty?
%p= truncate(h(n.body), :length => 300)
@@ -42,7 +42,7 @@
%td.top
= n.time.strftime("%H:%M")
%td.top
- = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
+ = link_to(h(n.course.full_name), course_url(n.course)) + " ›"
= link_to(h(n.title), course_event_url(n.course, n))
.box
diff --git a/app/views/users/edit.html.haml b/app/views/users/edit.html.haml
index 6add4ed..91804d4 100644
--- a/app/views/users/edit.html.haml
+++ b/app/views/users/edit.html.haml
@@ -4,7 +4,7 @@
%h1.title Editar perfil
%p
- - form_tag user_path(@user.id), :method => 'put' do
+ = form_tag user_path(@user.id), :method => 'put' do
= render :partial => 'form_profile'
= submit_tag 'Editar', :accesskey => 'e'
%button#show_preview{:type => "button", :accesskey => 'v'}
diff --git a/app/views/users/login.html.haml b/app/views/users/login.html.haml
index 22c5ad8..72a9209 100644
--- a/app/views/users/login.html.haml
+++ b/app/views/users/login.html.haml
@@ -4,7 +4,7 @@
%p
= error_messages_for :user
- - form_tag login_path do
+ = form_tag login_path do
%dl
%dt
%label{:for => 'user_login'} Login
diff --git a/app/views/users/recover_password.html.haml b/app/views/users/recover_password.html.haml
index 0efc66c..1522007 100644
--- a/app/views/users/recover_password.html.haml
+++ b/app/views/users/recover_password.html.haml
@@ -3,7 +3,7 @@
- if params[:key]
%p= error_messages_for :user
- - form_tag recover_password_with_key_path(params[:key]) do
+ = form_tag recover_password_with_key_path(params[:key]) do
%dl
%dt
%label{:for => 'user_login'} Login
@@ -27,7 +27,7 @@
%p Uma mensagem de confirmacão foi enviado para o seu email.
- else
- - form_tag recover_password_path do
+ = form_tag recover_password_path do
%dl
%dt
%label{:for => 'user_email'} Email
diff --git a/app/views/users/settings.html.haml b/app/views/users/settings.html.haml
index 3dc2df3..a27a3ab 100644
--- a/app/views/users/settings.html.haml
+++ b/app/views/users/settings.html.haml
@@ -2,6 +2,6 @@
%h1.title Editar configurações
%p
- - form_tag settings_url do
+ = form_tag settings_url do
= render :partial => 'form_settings'
= submit_tag 'Editar', :accesskey => 'e'
diff --git a/app/views/users/signup.html.haml b/app/views/users/signup.html.haml
index 228f336..3fb729c 100644
--- a/app/views/users/signup.html.haml
+++ b/app/views/users/signup.html.haml
@@ -2,6 +2,6 @@
%h1.title Nova conta
%p
- - form_tag signup_path do
+ = form_tag signup_path do
= render :partial => 'form_settings', :locals => { :signup => true }
= submit_tag 'Criar'
diff --git a/app/views/widgets/shoutbox.html.erb b/app/views/widgets/shoutbox.html.erb
index 1237103..3a8985e 100644
--- a/app/views/widgets/shoutbox.html.erb
+++ b/app/views/widgets/shoutbox.html.erb
@@ -7,7 +7,7 @@
Carregando...
<% if session[:user] %>
- <% form_tag(
+ <%= form_tag(
{:controller => 'message', :action => 'create'}, {:id => 'shoutbox_form' }) do %>
<%= text_area :message, :body %>
diff --git a/app/views/wiki/edit.html.haml b/app/views/wiki/edit.html.haml
index e9448e8..811ba89 100644
--- a/app/views/wiki/edit.html.haml
+++ b/app/views/wiki/edit.html.haml
@@ -4,7 +4,7 @@
%h1.title= "Editar #{h(@wiki_page.title)}"
%p
- - form_tag course_wiki_instance_url(@course, @wiki_page.id), :method => :put do
+ = form_tag course_wiki_instance_url(@course, @wiki_page.id), :method => :put do
= render :partial => 'form'
= submit_tag 'Salvar', :accesskey => 'e'
%button#show_preview{:type => "button", :accesskey => 'v'}
diff --git a/app/views/wiki/new.html.haml b/app/views/wiki/new.html.haml
index 87ad2a3..f2a11cf 100644
--- a/app/views/wiki/new.html.haml
+++ b/app/views/wiki/new.html.haml
@@ -4,7 +4,7 @@
%h1.title Adicionar página wiki
%p
- - form_tag course_wiki_url(@course) do
+ = form_tag course_wiki_url(@course) do
= render :partial => 'form'
= submit_tag "Criar", :accesskey => 'e'
%button#show_preview{:type => "button", :accesskey => 'v'}
diff --git a/app/views/wiki/versions.html.haml b/app/views/wiki/versions.html.haml
index 2e06877..db96f63 100644
--- a/app/views/wiki/versions.html.haml
+++ b/app/views/wiki/versions.html.haml
@@ -8,7 +8,7 @@
== radios_to = #{h(@history_to)};
== radios_from = #{h(@history_from)};
-- form_tag diff_course_wiki_instance_url(@course, @wiki_page), :method => :get do
+= form_tag diff_course_wiki_instance_url(@course, @wiki_page), :method => :get do
%button{:type => "submit"}= "Comparar as versões selecionadas"
.box
%table
diff --git a/config/application.rb b/config/application.rb
index 4243dba..4e74bf0 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -10,6 +10,9 @@ end
module WikiUFC
class Application < Rails::Application
+
+ #set :haml, { :escape_html => false }
+
config.encoding = "utf-8"
config.filter_parameters += [:password]
config.active_support.escape_html_entities_in_json = true
@@ -76,3 +79,9 @@ module WikiUFC
end
App = WikiUFC::Application.config
+
+require "haml"
+require "haml/template"
+Haml::Template.options[:escape_attrs] = false
+Haml::Template.options[:escape_html] = false
+
diff --git a/config/environment.rb b/config/environment.rb
index 8cb7b5c..ce0040c 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -3,3 +3,8 @@ require File.expand_path('../application', __FILE__)
# Initialize the rails application
WikiUFC::Application.initialize!
+#
+# Carrega as classes Message e LogEntry. O lazy loading do Rails gera
+# problemas se voce definir varias classes por arquivos.
+require "./app/models/message.rb"
+require "./app/models/log_entry.rb"
diff --git a/config/initializers/nasty_hacks.rb.rails2 b/config/initializers/nasty_hacks.rb.rails2
deleted file mode 100644
index 2edbb19..0000000
--- a/config/initializers/nasty_hacks.rb.rails2
+++ /dev/null
@@ -1,64 +0,0 @@
-class Fixnum
- def is_numeric?
- true
- end
-end
-
-class String
- def is_numeric?
- Float self rescue false
- end
-
- def html_escape
- ERB::Util::html_escape(self)
- end
-
- %w[auto_link excerpt highlight sanitize simple_format strip_tags truncate word_wrap].each do |method|
- eval "def #{method}(*args); ActionController::Base.helpers.#{method}(self, *args); end"
- end
-
- def pretty_url
- self.mb_chars.normalize(:kd).
- gsub(/[^\x00-\x7F]/n,'').
- gsub(/[^a-z._0-9 -]/i,"").
- gsub(/ +/,"_").
- downcase.to_s
- end
-end
-
-class Array
- def add_condition! (condition, conjunction = 'AND')
- if String === condition
- add_condition!([condition])
- elsif Hash === condition
- add_condition!([condition.keys.map { |attr| "#{attr}=?" }.join(' AND ')] + condition.values)
- elsif Array === condition
- self[0] = "(#{self[0]}) #{conjunction} (#{condition.shift})" unless empty?
- (self << condition).flatten!
- else
- raise "don't know how to handle this condition type"
- end
- self
- end
-end
-
-module ActiveRecord
- module Acts
- module Versioned
- module ClassMethods
- def acts_as_paranoid_versioned
- # protect the versioned model
- self.versioned_class.class_eval do
- def self.delete_all(conditions = nil); return; end
- end
- end
- end
- end
- end
-end
-
-# Carrega as classes Message e LogEntry. O lazy loading do Rails gera
-# problemas se voce definir varias classes por arquivos.
-#require "#{RAILS_ROOT}/app/models/message.rb"
-#require "#{RAILS_ROOT}/app/models/log_entry.rb"
-
diff --git a/lib/authentication.rb b/lib/authentication.rb
index 98b6483..ba37946 100644
--- a/lib/authentication.rb
+++ b/lib/authentication.rb
@@ -16,7 +16,7 @@ module AuthenticationSystem
def login_by_html
if !logged_in?
flash[:warning] = 'You must be logged in to access this section of the site'[:login_required]
- session[:return_to] = request.request_uri
+ session[:return_to] = request.fullpath
redirect_to login_url
end
end
diff --git a/lib/nasty_hacks.rb b/lib/nasty_hacks.rb
new file mode 100644
index 0000000..84407b3
--- /dev/null
+++ b/lib/nasty_hacks.rb
@@ -0,0 +1,75 @@
+class Fixnum
+ def is_numeric?
+ true
+ end
+end
+
+class String
+ def is_numeric?
+ Float self rescue false
+ end
+
+ #def html_escape
+ # ERB::Util::html_escape(self)
+ #end
+
+ #%w[auto_link excerpt highlight sanitize simple_format strip_tags truncate word_wrap].each do |method|
+ # eval "def #{method}(*args); ActionController::Base.helpers.#{method}(self, *args); end"
+ #end
+
+ def pretty_url
+ self.mb_chars.normalize(:kd).
+ gsub(/[^\x00-\x7F]/n,'').
+ gsub(/[^a-z._0-9 -]/i,"").
+ gsub(/ +/,"_").
+ downcase.to_s
+ end
+end
+
+#class Array
+# def add_condition! (condition, conjunction = 'AND')
+# if String === condition
+# add_condition!([condition])
+# elsif Hash === condition
+# add_condition!([condition.keys.map { |attr| "#{attr}=?" }.join(' AND ')] + condition.values)
+# elsif Array === condition
+# self[0] = "(#{self[0]}) #{conjunction} (#{condition.shift})" unless empty?
+# (self << condition).flatten!
+# else
+# raise "don't know how to handle this condition type"
+# end
+# self
+# end
+#end
+
+#module ActiveRecord
+# module Acts
+# module Versioned
+# module ClassMethods
+# def acts_as_paranoid_versioned
+# # protect the versioned model
+# self.versioned_class.class_eval do
+# def self.delete_all(conditions = nil); return; end
+# end
+# end
+# end
+# end
+# end
+#end
+
+# disable XSS protection
+module CustomHtmlSafe
+ def html_safe?
+ true
+ end
+end
+
+class ActionView::OutputBuffer
+ include CustomHtmlSafe
+end
+class ActionView::SafeBuffer
+ include CustomHtmlSafe
+end
+class String
+ include CustomHtmlSafe
+end