migrate mailr 2.2.2 to 2.3.2
This commit is contained in:
yuzai chen
parent
56039cc595
commit
ae789b1d84
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -4,3 +4,4 @@ config/database.yml
|
|||
config/site.rb
|
||||
tmp
|
||||
mail_temp
|
||||
config/site.rb
|
||||
|
|
|
|||
2
README
2
README
|
|
@ -3,7 +3,7 @@ Installation Guide
|
|||
Requirements
|
||||
|
||||
* Ruby 1.8.7
|
||||
* Rails 2.2.2
|
||||
* Rails 2.3.2
|
||||
|
||||
Installation
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +0,0 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @htmllang %>" lang="<%= @htmllang %>">
|
||||
<head>
|
||||
<title><%=@title%></title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<%= @charset %>" />
|
||||
<script type="text/javascript" src="/javascripts/global.js"></script>
|
||||
<link rel="stylesheet" href="/stylesheets/admin.css" type="text/css" media="screen" />
|
||||
<link rel="stylesheet" href="/stylesheets/tabs.css" type="text/css" media="screen" />
|
||||
<link rel="stylesheet" href="/stylesheets/mailr.css" type="text/css" media="screen" />
|
||||
<%=@additional_scripts%>
|
||||
</head>
|
||||
<body id="bodyID" onload="<%=@onload_function%>">
|
||||
<%= @content_for_layout %>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
|
||||
|
|
@ -1,26 +0,0 @@
|
|||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<%= @htmllang %>" lang="<%= @htmllang %>">
|
||||
<head>
|
||||
<title><%=_('Mailr')%></title>
|
||||
<meta http-equiv="content-type" content="text/html; charset=<%= @charset %>" />
|
||||
<link rel="stylesheet" href="/stylesheets/admin.css" type="text/css" media="screen" />
|
||||
<link rel="stylesheet" href="/stylesheets/tabs.css" type="text/css" media="screen" />
|
||||
<link rel="stylesheet" href="/stylesheets/mailr.css" type="text/css" media="screen" />
|
||||
<script type="text/javascript" src="/javascripts/global.js"></script>
|
||||
<script type="text/javascript" src="/javascripts/prototype.js"></script>
|
||||
<%=(@content_for_scripts ? @content_for_scripts : @additional_scripts )%>
|
||||
</head>
|
||||
<body id="bodyID" onload="<%=@onload_function%>">
|
||||
<div id="wholepage">
|
||||
<div id="container">
|
||||
<div id="logout"><%= link_to _('[Logout]'), :controller=>'/login', :action=>'logout' %></div>
|
||||
<div id="sidebar_outer">
|
||||
<div id="sidebar"><%= @content_for_sidebar %></div>
|
||||
</div>
|
||||
<div id="content"><%= @content_for_layout %></div>
|
||||
<br class="clear"/>
|
||||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -4,7 +4,7 @@
|
|||
# (Use only when you can't set environment variables through your web/app server)
|
||||
# ENV['RAILS_ENV'] = 'production'
|
||||
|
||||
RAILS_GEM_VERSION = '2.2.2' unless defined? RAILS_GEM_VERSION
|
||||
RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
|
||||
|
||||
# Bootstrap the Rails environment, frameworks, and default configuration
|
||||
require File.join(File.dirname(__FILE__), 'boot')
|
||||
|
|
@ -15,7 +15,7 @@ Rails::Initializer.run do |config|
|
|||
|
||||
# Add additional load paths for your own custom dirs
|
||||
config.load_paths += %W( #{RAILS_ROOT}/vendor/ezcrypto-0.1.1/lib )
|
||||
|
||||
config.load_paths += %W( #{RAILS_ROOT}/lib/webmail )
|
||||
# Force all environments to use the same logger level
|
||||
# (by default production uses :info, the others :debug)
|
||||
# config.log_level = :debug
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ class IMAPMailbox
|
|||
def disconnect
|
||||
if @connected
|
||||
@imap.logout
|
||||
@imap.disconnect
|
||||
#@imap.disconnect
|
||||
@imap = nil
|
||||
@connected = false
|
||||
end
|
||||
Loading…
Reference in a new issue