X-Git-Url: https://projects.mako.cc/source/selectricity-live/blobdiff_plain/fdc554930ae758e5a1ffaefe25fa2663fcdf8ac1..1e7167aa6d0c20b8e7b54969577c53abe50461c5:/app/controllers/account_controller.rb?ds=sidebyside diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index 2bda7ea..4b7fea9 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.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. class AccountController < ApplicationController layout 'main' @@ -71,7 +60,26 @@ class AccountController < ApplicationController #The following methods are for selectricity specific uses def summary + #@user = User.find(params[:id]) + + #constrain the find command such that it only returns the user if it's the currently + #logged in user, otherwise, redirect to the front page + id = params[:id] + user_id = session[:user][:id] + @user = User.find(id, :conditions => ["id = ?", user_id]) + + rescue + redirect_to :controller =>'front' + + end + + def change_contact @user = User.find(params[:id]) + return unless request.post? + @user.email=params[:email] + @user.save! + flash[:notice] = "Email successfully updated" + render :action => 'summary' end