X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/9129a21b28c88064edfcfc8a8fa23a640f29819c..b6c33d42dd37f1fb10db479c5d6b7fb4c660beb9:/app/models/user.rb diff --git a/app/models/user.rb b/app/models/user.rb index 0b4b3b3..1358840 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,19 +2,8 @@ # Copyright (C) 2007, 2008 Benjamin Mako Hill # Copyright (C) 2007 Massachusetts Institute of Technology # -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as -# published by the Free Software Foundation, either version 3 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 -# Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public -# License along with this program. If not, see -# . +# This program is free software. Please see the COPYING file for +# details. require 'digest/sha1' class User < ActiveRecord::Base @@ -36,6 +25,10 @@ class User < ActiveRecord::Base def name [ firstname, lastname].join(" ") end + + def email=(new_email) + self[:email] = new_email + end # Authenticates a user by their login name and unencrypted password. Returns the user or nil. def self.authenticate(login, password) @@ -93,4 +86,5 @@ class User < ActiveRecord::Base errors.add(:login, "should not begin or end with spaces") if login and login.strip! errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/ end + end