devel

app/controllers/application_controller.rb

@@ -7,12 +7,18 @@ class ApplicationController < ActionController::Base
   before_filter :user_login_filter
   before_filter :add_scripts
   #before_filter :localize
+  before_filter :current_user
 
 
   #filter_parameter_logging :password #upgrade to Rails3
 
   protected
 
+  def current_user
+    #@current_user ||=  Customer.find(logged_user)
+    #logger.debug "Current User: #{@current_user.inspect}"
+  end
+
   def theme_resolver
 	CDF::CONFIG[:theme] || CDF::CONFIG[:default_theme]
   end

app/controllers/webmail_controller.rb

@@ -43,6 +43,8 @@ class WebmailController < ApplicationController
     session["return_to"] = nil
     @search_field = params['search_field']
     @search_value = params['search_value']
+    @folder_name = params['folder_name']
+
 
     # handle sorting - tsort session field contains last reverse or no for field
     # and lsort - last sort field
@@ -98,6 +100,8 @@ class WebmailController < ApplicationController
     else
       @pages = Paginator.new self, folder.total, get_mail_prefs.wm_rows, @page
       @messages = folder.messages(@pages.current.first_item - 1, get_mail_prefs.wm_rows, sort_query + (reverse_sort ? ' desc' : ' asc'))
+      #folder.synchronize_cache(@pages.current.first_item - 1, get_mail_prefs.wm_rows)
+      @messages = ImapMessage.getAll(@current_user.email,@folder_name,sort_query + (reverse_sort ? ' desc' : ' asc'))
     end
 
   end