0
@@ -6,7 +6,7 @@ class Admin::OverviewController < Admin::BaseController
0
   helper Admin::ArticlesHelper
0
   
0
   def index
0
-    @users = User.find(:all)
0
+    @users = User.find(:all, :order => 'updated_at desc')
0
     @events, @todays_events, @yesterdays_events = [], [], []
0
     today, yesterday = Time.now.to_date, 1.day.ago.to_date
0
     @articles = @site.articles.find(:all, :include => :unapproved_comments, :conditions => ['unapproved_comments_contents.id is not null and unapproved_comments_contents.approved = ?', false])

0
@@ -23,11 +23,8 @@ class User < ActiveRecord::Base
0
 
0
   # Authenticates a user by their login name and unencrypted password.  Returns the user or nil.
0
   def self.authenticate(login, password)
0
-    # use this instead if you want user activation
0
-    # u = find :first, :select => 'id, salt', :conditions => ['login = ? and activated_at IS NOT NULL', login]
0
     u = find_by_login(login) # need to get the salt
0
-    return nil unless u
0
-    find :first, :conditions => ["id = ? AND crypted_password = ?", u.id, u.encrypt(password)]
0
+    u.save and return u if u && u.authenticated?(password)
0
   end
0
 
0
   # Encrypts some data with the salt.
0
@@ -44,6 +41,10 @@ class User < ActiveRecord::Base
0
     self.class.encrypt(password, salt)
0
   end
0
 
0
+  def authenticated?(password)
0
+    crypted_password == encrypt(password)
0
+  end
0
+
0
   def filters=(value)
0
     write_attribute :filters, [value].flatten.collect(&:to_sym)
0
   end