added svn:eol-style native property on /app files

git-svn-id: http://redmine.rubyforge.org/svn/trunk@333 e93f8b46-1217-0410-a6f0-8f06a7374b81

1 files changed, 140 insertions, 140 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index bf2930a0f..3a315239c 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,142 +1,142 @@
-# redMine - project management software

-# Copyright (C) 2006-2007  Jean-Philippe Lang

-#

-# This program is free software; you can redistribute it and/or

-# modify it under the terms of the GNU General Public License

-# as published by the Free Software Foundation; either version 2

-# of the License, or (at your option) any later version.

-# 

-# This program is distributed in the hope that it will be useful,

-# but WITHOUT ANY WARRANTY; without even the implied warranty of

-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-# GNU General Public License for more details.

-# 

-# You should have received a copy of the GNU General Public License

-# along with this program; if not, write to the Free Software

-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

-

-require "digest/sha1"

-

-class User < ActiveRecord::Base

-  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => :delete_all

-  has_many :projects, :through => :memberships

-  has_many :custom_values, :dependent => :delete_all, :as => :customized

-  has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'

-  belongs_to :auth_source

-  

-  attr_accessor :password, :password_confirmation

-  attr_accessor :last_before_login_on

-  # Prevents unauthorized assignments

-  attr_protected :login, :admin, :password, :password_confirmation, :hashed_password

-	

-  validates_presence_of :login, :firstname, :lastname, :mail

-  validates_uniqueness_of :login, :mail	

-  # Login must contain lettres, numbers, underscores only

-  validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i

-  validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i

-  validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i

-  # Password length between 4 and 12

-  validates_length_of :password, :in => 4..12, :allow_nil => true

-  validates_confirmation_of :password, :allow_nil => true

-  validates_associated :custom_values, :on => :update

-

-  # Account statuses

-  STATUS_ACTIVE     = 1

-  STATUS_REGISTERED = 2

-  STATUS_LOCKED     = 3

-

-  def before_save

-    # update hashed_password if password was set

-    self.hashed_password = User.hash_password(self.password) if self.password

-  end

-

-  def self.active

-    with_scope :find => { :conditions => [ "status = ?", STATUS_ACTIVE ] } do 

-      yield 

-    end 

-  end

-  

-  def self.find_active(*args)

-    active do

-      find(*args)

-    end

-  end

-  

-  # Returns the user that matches provided login and password, or nil

-  def self.try_to_login(login, password)

-    user = find(:first, :conditions => ["login=?", login])

-    if user

-      # user is already in local database

-      return nil if !user.active?

-      if user.auth_source

-        # user has an external authentication method

-        return nil unless user.auth_source.authenticate(login, password)

-      else

-        # authentication with local password

-        return nil unless User.hash_password(password) == user.hashed_password        

-      end

-    else

-      # user is not yet registered, try to authenticate with available sources

-      attrs = AuthSource.authenticate(login, password)

-      if attrs

-        onthefly = new(*attrs)

-        onthefly.login = login

-        onthefly.language = Setting.default_language

-        if onthefly.save

-          user = find(:first, :conditions => ["login=?", login])

-          logger.info("User '#{user.login}' created on the fly.") if logger

-        end

-      end

-    end    

-    user.update_attribute(:last_login_on, Time.now) if user

-    user

-    

-    rescue => text

-      raise text

-  end

-	

-  # Return user's full name for display

-  def display_name

-    firstname + " " + lastname

-  end

-  

-  def name

-    display_name

-  end

-  

-  def active?

-    self.status == STATUS_ACTIVE

-  end

-

-  def registered?

-    self.status == STATUS_REGISTERED

-  end

-    

-  def locked?

-    self.status == STATUS_LOCKED

-  end

-

-  def check_password?(clear_password)

-    User.hash_password(clear_password) == self.hashed_password

-  end

-  

-  def role_for_project(project_id)

-    @role_for_projects ||=

-      begin

-        roles = {}

-        self.memberships.each { |m| roles.store m.project_id, m.role_id }

-        roles

-      end

-    @role_for_projects[project_id]

-  end

-  

-  def pref

-    self.preference ||= UserPreference.new(:user => self)

-  end

-	

-private

-  # Return password digest

-  def self.hash_password(clear_password)

-    Digest::SHA1.hexdigest(clear_password || "")

+# redMine - project management software
+# Copyright (C) 2006-2007  Jean-Philippe Lang
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+require "digest/sha1"
+
+class User < ActiveRecord::Base
+  has_many :memberships, :class_name => 'Member', :include => [ :project, :role ], :dependent => :delete_all
+  has_many :projects, :through => :memberships
+  has_many :custom_values, :dependent => :delete_all, :as => :customized
+  has_one :preference, :dependent => :destroy, :class_name => 'UserPreference'
+  belongs_to :auth_source
+  
+  attr_accessor :password, :password_confirmation
+  attr_accessor :last_before_login_on
+  # Prevents unauthorized assignments
+  attr_protected :login, :admin, :password, :password_confirmation, :hashed_password
+	
+  validates_presence_of :login, :firstname, :lastname, :mail
+  validates_uniqueness_of :login, :mail	
+  # Login must contain lettres, numbers, underscores only
+  validates_format_of :firstname, :lastname, :with => /^[\w\s\'\-]*$/i
+  validates_format_of :login, :with => /^[a-z0-9_\-@\.]+$/i
+  validates_format_of :mail, :with => /^([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})$/i
+  # Password length between 4 and 12
+  validates_length_of :password, :in => 4..12, :allow_nil => true
+  validates_confirmation_of :password, :allow_nil => true
+  validates_associated :custom_values, :on => :update
+
+  # Account statuses
+  STATUS_ACTIVE     = 1
+  STATUS_REGISTERED = 2
+  STATUS_LOCKED     = 3
+
+  def before_save
+    # update hashed_password if password was set
+    self.hashed_password = User.hash_password(self.password) if self.password
+  end
+
+  def self.active
+    with_scope :find => { :conditions => [ "status = ?", STATUS_ACTIVE ] } do 
+      yield 
+    end 
+  end
+  
+  def self.find_active(*args)
+    active do
+      find(*args)
+    end
+  end
+  
+  # Returns the user that matches provided login and password, or nil
+  def self.try_to_login(login, password)
+    user = find(:first, :conditions => ["login=?", login])
+    if user
+      # user is already in local database
+      return nil if !user.active?
+      if user.auth_source
+        # user has an external authentication method
+        return nil unless user.auth_source.authenticate(login, password)
+      else
+        # authentication with local password
+        return nil unless User.hash_password(password) == user.hashed_password        
+      end
+    else
+      # user is not yet registered, try to authenticate with available sources
+      attrs = AuthSource.authenticate(login, password)
+      if attrs
+        onthefly = new(*attrs)
+        onthefly.login = login
+        onthefly.language = Setting.default_language
+        if onthefly.save
+          user = find(:first, :conditions => ["login=?", login])
+          logger.info("User '#{user.login}' created on the fly.") if logger
+        end
+      end
+    end    
+    user.update_attribute(:last_login_on, Time.now) if user
+    user
+    
+    rescue => text
+      raise text
+  end
+	
+  # Return user's full name for display
+  def display_name
+    firstname + " " + lastname
+  end
+  
+  def name
+    display_name
+  end
+  
+  def active?
+    self.status == STATUS_ACTIVE
+  end
+
+  def registered?
+    self.status == STATUS_REGISTERED
+  end
+    
+  def locked?
+    self.status == STATUS_LOCKED
+  end
+
+  def check_password?(clear_password)
+    User.hash_password(clear_password) == self.hashed_password
+  end
+  
+  def role_for_project(project_id)
+    @role_for_projects ||=
+      begin
+        roles = {}
+        self.memberships.each { |m| roles.store m.project_id, m.role_id }
+        roles
+      end
+    @role_for_projects[project_id]
+  end
+  
+  def pref
+    self.preference ||= UserPreference.new(:user => self)
+  end
+	
+private
+  # Return password digest
+  def self.hash_password(clear_password)
+    Digest::SHA1.hexdigest(clear_password || "")
   end
 end