:
config/database.yml
log/placeholder
@@ -13,11 +13,16 @@ module ApplicationHelper
text.gsub!(/\[quote\](.*?)\[\/quote\]/mis) { "<div class='center'><div class='quote'>" << $1 << "</div></div>" }
text.gsub!(/\[term\](.*?)\[\/term\]/mi) { "<span class='term'>" << $1.gsub(/^\r\n/,"").gsub("<","<").gsub(">",">") << "</span>" }
text.gsub!(/\[url=["']?(.*?)["']?\](.*?)\[\/url\]/mis) { "<a href='" << $1 << "'>" << $2 << "</a>" }
- textilize(text)
+ bbcode_ext(textilize(text))
# handle with care...
end
+ # Dummy method so that people can extend bbcode method without having to alias it.
+ def bbcode_ext(text)
+ text
+ end
+
def theme_image_tag(f, html_options={})
if !theme.nil?
o = "<img src='/themes/" + theme.name + "/#{f}'"
app/helpers/application_helper.rb
@@ -7,7 +7,7 @@
<tbody>
<tr>
<td align='left'>
- <%= link_to t(:Do_not_have_a_user), signup_path %>
+ <%= link_to t(:Do_not_have_a_user_account?), signup_path %>
<% form_tag do %>
<p><label for="login"><%= t(:Login) %></label><br/>
<%= text_field_tag 'login' %></p>
app/views/users/login.html.erb
@@ -210,7 +210,7 @@
:Delete_this_topic => "Delete this topic",
:Description => "Description",
:Display_Name => "Display Name",
- :Do_not_have_a_user => "Don't have a user?",
+ :Do_not_have_a_user_account? => "Don't have a user account?",
:Edit => "Edit",
:Edit_History => "Edit History",
:Edit_Profile => "Edit Profile",
config/locales/en.rb
@@ -1,28 +1,5 @@
module AuthenticatedSystem
-
- # Filter method to enforce a login requirement.
- #
- # To require logins for all actions, use this in your controllers:
- #
- # before_filter :login_required
- #
- # To require logins for specific actions, use this in your controllers:
- #
- # before_filter :login_required, :only => [ :edit, :update ]
- #
- # To skip this in a subclassed controller:
- #
- # skip_before_filter :login_required
- #
- def login_required
- username, passwd = get_auth_data
- self.current_user ||= User.authenticate(username, passwd) || User.anonymous if username && passwd
- if !logged_in?
- flash[:notice] = t(:you_must_be_logged_in)
- redirect_to login_path
- end
- end
-
+
# We can return to this location by calling #redirect_back_or_default.
def store_location
session[:return_to] = request.request_uri
lib/authenticated_system.rb
@@ -1,16 +1,18 @@
module Rboard::Auth
+
# Store the given user in the session.
- def current_user=(new_user)
- return if new_user.nil?
- new_user.previous_login = current_user.login_time
- new_user.login_time = Time.now
- new_user.ip = request.remote_addr
- ip = Ip.find_or_create_by_ip(request.remote_addr)
- ip.users << new_user
- new_user.save
- session[:user] = new_user.id
- @current_user = new_user
- end
+ def current_user=(new_user)
+ return if new_user.nil?
+ new_user.previous_login = current_user.login_time
+ new_user.login_time = Time.now
+ new_user.ip = request.remote_addr
+ ip = Ip.find_or_create_by_ip(request.remote_addr)
+ ip.users << new_user
+ new_user.save
+ session[:user] = new_user.id
+ @current_user = new_user
+ end
+
#Per Page value for paginated sections of the forums,
def per_page
logged_in? ? current_user.per_page : PER_PAGE
lib/rboard/auth.rb
e7bb06c75c186d9284e4e2fa45fdc4b3ab43d4b7
59bec1f679b24d13ef0022e7c2fe203fba7bbb94
Ryan Bigg
radarlistener@gmail.com
http://github.com/radar/rboard/commit/86c7947422eeddac75ed06c30d858fb33e7d645d
86c7947422eeddac75ed06c30d858fb33e7d645d
2009-04-03T01:10:50-07:00
2009-04-03T01:10:50-07:00
Merge branch 'master' into permissions
* master:
Add nested_has_many_through
Add gitmodules.
Remove thinking sphinx (it is now a submodule)
Added dummy method bbcode_ext so that people can extend bbcode method without having to alias it.
Port change for auth.rb
Move current_user= into auth module since this is now custom. Thanks to Soleone.
Move online? and check for nil vaalues [Soleone]
Add ? [Soleone]
Better wording for the signup link [nice_burger]
Add log folder.
Add placeholder database.yml
Conflicts:
.gitmodules
lib/authenticated_system.rb
lib/rboard/auth.rb
00c5b15644302e17b70cbae545f0babf992b4ad1
Ryan Bigg
radarlistener@gmail.com