Tweak embed.html attribution to match Legal FAQ recommendation.

[rails.git] / app / controllers / user_controller.rb

diff --git a/app/controllers/user_controller.rb b/app/controllers/user_controller.rb
index df6ca164c4a43c50925587b16db68d6ecfee7ef5..3a2bc7f0d333afc45626413517575cae7b4cc5dd 100644 (file)
--- a/app/controllers/user_controller.rb
+++ b/app/controllers/user_controller.rb
@@ -16,6 +16,8 @@ class UserController < ApplicationController
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 
 
   filter_parameter_logging :password, :pass_crypt, :pass_crypt_confirmation
 

+  cache_sweeper :user_sweeper, :only => [:account, :hide, :unhide, :delete]
+

   def save
     @title = t 'user.new.title'
 
   def save
     @title = t 'user.new.title'
 


@@ -45,11 +47,8 @@ class UserController < ApplicationController
     @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
 
     if params[:user] and params[:user][:display_name] and params[:user][:description]
     @tokens = @user.oauth_tokens.find :all, :conditions => 'oauth_tokens.invalidated_at is null and oauth_tokens.authorized_at is not null'
 
     if params[:user] and params[:user][:display_name] and params[:user][:description]

-      if params[:user][:email] != @user.email
-        @user.new_email = params[:user][:email]
-      end
-

       @user.display_name = params[:user][:display_name]
       @user.display_name = params[:user][:display_name]

+      @user.new_email = params[:user][:new_email]

 
       if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
         @user.pass_crypt = params[:user][:pass_crypt]
 
       if params[:user][:pass_crypt].length > 0 or params[:user][:pass_crypt_confirmation].length > 0
         @user.pass_crypt = params[:user][:pass_crypt]


@@ -64,11 +63,18 @@ class UserController < ApplicationController
       if @user.save
         set_locale
 
       if @user.save
         set_locale
 

-        if params[:user][:email] == @user.new_email
-          flash[:notice] = t 'user.account.flash update success confirm needed'
-          Notifier.deliver_email_confirm(@user, @user.tokens.create)
+        if @user.new_email.nil? or @user.new_email.empty?
+          flash.now[:notice] = t 'user.account.flash update success'

         else
         else

-          flash[:notice] = t 'user.account.flash update success'
+          flash.now[:notice] = t 'user.account.flash update success confirm needed'
+          Notifier.deliver_email_confirm(@user, @user.tokens.create)
+        end
+      end
+    else
+      if flash[:errors]
+        flash[:errors].each do |attr,msg|
+          attr = "new_email" if attr == "email"
+          @user.errors.add(attr,msg)

         end
       end
     end
         end
       end
     end


@@ -101,9 +107,9 @@ class UserController < ApplicationController
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)
       if user
         token = user.tokens.create
         Notifier.deliver_lost_password(user, token)

-        @notice = t 'user.lost_password.notice email on way'
+        flash.now[:notice] = t 'user.lost_password.notice email on way'

       else
       else

-        @notice = t 'user.lost_password.notice email cannot find'
+        flash.now[:error] = t 'user.lost_password.notice email cannot find'

       end
     end
   end
       end
     end
   end


@@ -130,7 +136,7 @@ class UserController < ApplicationController
           end
         end
       else
           end
         end
       else

-        flash[:notice] = t 'user.reset_password.flash token bad'
+        flash[:error] = t 'user.reset_password.flash token bad'

         redirect_to :action => 'lost_password'
       end
     end
         redirect_to :action => 'lost_password'
       end
     end


@@ -152,9 +158,9 @@ class UserController < ApplicationController
       if user
         session[:user] = user.id
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)
       if user
         session[:user] = user.id
       elsif User.authenticate(:username => email_or_display_name, :password => pass, :inactive => true)

-        @notice = t 'user.login.account not active'
+        flash.now[:error] = t 'user.login.account not active'

       else
       else

-        @notice = t 'user.login.auth failure'
+        flash.now[:error] = t 'user.login.auth failure'

       end
     end
 
       end
     end
 


@@ -211,7 +217,7 @@ class UserController < ApplicationController
           redirect_to :action => 'account', :display_name => @user.display_name
         end
       else
           redirect_to :action => 'account', :display_name => @user.display_name
         end
       else

-        @notice = t 'user.confirm.failure'
+        flash.now[:error] = t 'user.confirm.failure'

       end
     end
   end
       end
     end
   end


@@ -225,13 +231,16 @@ class UserController < ApplicationController
         @user.new_email = nil
         @user.active = true
         @user.email_valid = true
         @user.new_email = nil
         @user.active = true
         @user.email_valid = true

-        @user.save!
+        if @user.save
+          flash[:notice] = t 'user.confirm_email.success'
+        else
+          flash[:errors] = @user.errors
+        end

         token.destroy
         token.destroy

-        flash[:notice] = t 'user.confirm_email.success'

         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else
         session[:user] = @user.id
         redirect_to :action => 'account', :display_name => @user.display_name
       else

-        @notice = t 'user.confirm_email.failure'
+        flash.now[:error] = t 'user.confirm_email.failure'

       end
     end
   end
       end
     end
   end


@@ -284,7 +293,7 @@ class UserController < ApplicationController
           friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else
           friend.add_error(t('user.make_friend.failed', :name => name))
         end
       else

-        flash[:notice] = t 'user.make_friend.already_a_friend', :name => name
+        flash[:warning] = t 'user.make_friend.already_a_friend', :name => name

       end
 
       redirect_to :controller => 'user', :action => 'view'
       end
 
       redirect_to :controller => 'user', :action => 'view'


@@ -299,7 +308,7 @@ class UserController < ApplicationController
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
       else
         Friend.delete_all "user_id = #{@user.id} AND friend_user_id = #{friend.id}"
         flash[:notice] = t 'user.remove_friend.success', :name => friend.display_name
       else

-        flash[:notice] = t 'user.remove_friend.not_a_friend', :name => friend.display_name
+        flash[:error] = t 'user.remove_friend.not_a_friend', :name => friend.display_name

       end
 
       redirect_to :controller => 'user', :action => 'view'
       end
 
       redirect_to :controller => 'user', :action => 'view'


@@ -346,7 +355,7 @@ private
   # and return them to the user page.
   def require_administrator
     unless @user.administrator?
   # and return them to the user page.
   def require_administrator
     unless @user.administrator?

-      flash[:notice] = t('user.filter.not_an_administrator')
+      flash[:error] = t('user.filter.not_an_administrator')

       redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
     end
   end
       redirect_to :controller => 'user', :action => 'view', :display_name => params[:display_name]
     end
   end