From 9be6f493a3796ba077c6c6c6dba3b7dbfc1d6c83 Mon Sep 17 00:00:00 2001
From: Wojciech Todryk <wojciech@todryk.pl>
Date: Fri, 2 Mar 2012 20:28:25 +0100
Subject: [PATCH] fix in selecting messages from current folder

---
 app/controllers/messages_controller.rb     | 6 +++---
 app/controllers/messages_ops_controller.rb | 8 ++++----
 themes/olive/views/internal/about.html.erb | 7 ++++---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index e2f7e8a..88d2892 100755
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -90,7 +90,7 @@ class MessagesController < ApplicationController
         @text_part = nil
         @html_part = nil
 
-        @message = @current_user.messages.find_by_uid(params[:id])
+        @message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:id]).first
         @message.update_attributes(:unseen => false)
         imap_message = @mailbox.fetch_body(@message.uid)
 
@@ -145,7 +145,7 @@ class MessagesController < ApplicationController
     end
 
     def html_body
-        message = @current_user.messages.find(params[:id])
+		message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:id]).first
         mail = Mail.new(@mailbox.fetch_body(message.uid))
         if mail.multipart?
             @body = mail.html_part.decoded_and_charseted
@@ -170,7 +170,7 @@ class MessagesController < ApplicationController
 
     def attachment
         attachments = []
-        message = @current_user.messages.find(params[:id])
+        message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:id]).first
         mail = Mail.new(@mailbox.fetch_body(message.uid))
         if mail.multipart? == true
             attachments = mail.attachments
diff --git a/app/controllers/messages_ops_controller.rb b/app/controllers/messages_ops_controller.rb
index 25b0513..731a431 100755
--- a/app/controllers/messages_ops_controller.rb
+++ b/app/controllers/messages_ops_controller.rb
@@ -67,14 +67,14 @@ class MessagesOpsController < ApplicationController
     def set_unread
         params["uids"].each do |uid|
             @mailbox.set_unread(uid)
-            @current_user.messages.find_by_uid(uid).update_attributes(:unseen => 1)
+            @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,uid).first.update_attributes(:unseen => 1)
         end
     end
 
     def set_read
         params["uids"].each do |uid|
             @mailbox.set_read(uid)
-            @current_user.messages.find_by_uid(uid).update_attributes(:unseen => 0)
+            @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,uid).first.update_attributes(:unseen => 0)
         end
     end
 
@@ -260,7 +260,7 @@ class MessagesOpsController < ApplicationController
 
     #FIXME edit does not support attachments
     def edit
-        old_message = @current_user.messages.find(params[:id])
+		old_message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:uids].first).first
         @message = Message.new
         @message.to_addr = old_message.to_addr
         @message.subject = old_message.subject
@@ -279,7 +279,7 @@ class MessagesOpsController < ApplicationController
 	end
 
     def reply
-        old_message = @current_user.messages.find(params[:uids].first)
+        old_message = @current_user.messages.where('folder_id = ? and uid = ?',@current_folder,params[:uids].first).first
         @message = Message.new
         @message.to_addr = old_message.from_addr
         @message.subject = old_message.subject
diff --git a/themes/olive/views/internal/about.html.erb b/themes/olive/views/internal/about.html.erb
index d6562ba..4698b30 100755
--- a/themes/olive/views/internal/about.html.erb
+++ b/themes/olive/views/internal/about.html.erb
@@ -10,11 +10,11 @@
 <div class="navigation-tabs clearfix">
 <%= raw single_navigation(:about,:internal) %>
 </div>
-<div class="content clearfix">
+<div class="content">
 
-<div class="header_info">
+<h4>
 <%= t(:current_version,:scope=>:internal) + ": " + $defaults["version"] %>
-</div>
+</h4>
 
 <div class="md">
 <%= raw BlueCloth::new(render :file => 'README.markdown').to_html %>
@@ -28,5 +28,6 @@
 <%= raw BlueCloth::new(render :file => 'TODO').to_html %>
 </div>
 
+
 </div>