modified user.rb's

this is user.rb files for controller and models