merged more fixes from devel

[selectricity-live] / app / models / user.rb

diff --git a/app/models/user.rb b/app/models/user.rb
index eca592dee17ef7082a09e21b6db191d38c8341f3..0b4b3b3cb0c3807f74825ef35828b47153ea9f43 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,3 +1,21 @@
+# Selectricity: Voting Machinery for the Masses
+# Copyright (C) 2007, 2008 Benjamin Mako Hill <mako@atdot.cc>
+# 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
+# <http://www.gnu.org/licenses/>.
+

 require 'digest/sha1'
 class User < ActiveRecord::Base
   has_many :elections
 require 'digest/sha1'
 class User < ActiveRecord::Base
   has_many :elections


@@ -72,7 +90,7 @@ class User < ActiveRecord::Base
       # Stolen from http://www.regular-expressions.info/email.html
       errors.add(:email, "is not valid") unless email  =~
                   /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i
       # Stolen from http://www.regular-expressions.info/email.html
       errors.add(:email, "is not valid") unless email  =~
                   /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,4}$/i

-      errors.add(:login, "should not begin or end with spaces") if login.strip!
+      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
       errors.add(:login, "should contain only letters, numbers, and spaces") unless login =~ /^[A-Za-z0-9 ]*$/
     end
 end