Changeset 1224

Show
Ignore:
Timestamp:
08/17/08 00:04:41 (3 months ago)
Author:
piyawat
Message:

change 'password' back to 'md5_passphrase'

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/app/models/user.rb

    r1223 r1224  
    7474  validates_length_of :passphrase, :minimum => $PASSPHRASE_MINIMUM_LENGTH || 8, :if => :do_validate_passphrase, :too_short => _("A password must be at least 8 characters long.") 
    7575 
    76   validates_presence_of :password, :on => :update, :message => _("Authorization error. Please try again later.") 
     76  validates_presence_of :md5_passphrase, :on => :update, :message => _("Authorization error. Please try again later.") 
    7777 
    7878  # email 
    …… 
    8888  validates_presence_of :lastname, :message => _("Please enter your last name.") 
    8989 
    90   attr_protected :password 
     90  attr_protected :md5_passphrase 
    9191  attr_accessor :passphrase, :passphrase_confirmation 
    9292 
    …… 
    112112 
    113113  def before_create 
    114     self.password = User.make_password(self.passphrase) 
     114    self.md5_passphrase = User.make_md5_passphrase(self.passphrase) 
    115115  end 
    116116 
    117117  def before_update 
    118118    if @passphrase != nil 
    119       self.password = User.make_password(@passphrase)  
     119      self.md5_passphrase = User.make_md5_passphrase(@passphrase)  
    120120      self.ticket = nil 
    121121    end 
    …… 
    184184   
    185185  def do_validate_passphrase 
    186     new_record? || self.password.blank? || !self.passphrase.blank? || !self.passphrase_confirmation.blank? ? true : false 
     186    new_record? || self.md5_passphrase.blank? || !self.passphrase.blank? || !self.passphrase_confirmation.blank? ? true : false 
    187187  end 
    188188 
    …… 
    232232      end 
    233233    else 
    234       password = User.make_password(passphrase) 
    235       u = find(:first, :conditions => ["username = ? and password = ?", username.downcase, password]) 
     234      md5_passphrase = User.make_md5_passphrase(passphrase) 
     235      u = find(:first, :conditions => ["username = ? and md5_passphrase = ?", username.downcase, md5_passphrase]) 
    236236    end 
    237237    if !u.nil? && !u.disabled? 
    …… 
    267267  end 
    268268 
    269   def self.make_password(pharse) 
     269  def self.make_md5_passphrase(pharse) 
    270270    Digest::MD5.hexdigest(pharse) 
    271271  end 
    …… 
    281281      num = rand(9999999) 
    282282    end 
    283     User.make_password(num.to_s) 
     283    User.make_md5_passphrase(num.to_s) 
    284284  end 
    285285 
    …… 
    414414  # 
    415415  def valid_passphrase?(passphrase) 
    416     !self.password.blank? && (self.password == User.make_password(passphrase)) ? true : false 
     416    !self.md5_passphrase.blank? && (self.md5_passphrase == User.make_md5_passphrase(passphrase)) ? true : false 
    417417  end 
    418418