sugoi-mail 0.1.0 → 0.1.5

data/app/models/message.rb

@@ -44,11 +44,11 @@ class Message < ActiveRecord::Base
                     match(/(\<[^>]+\>)/)
                 if referenced then
                     referenced=referenced[1]
-                else
-                    if mess.headers["References"] then
-                        referenced=mess.headers["References"][0].contents.
-                            split.last
-                    end
+                end
+            else
+                if mess.headers["References"] then
+                    referenced=mess.headers["References"][0].contents.
+                        split.last
                 end
             end
             Message.find_by_messageid referenced
@@ -79,7 +79,13 @@ class Message < ActiveRecord::Base
                 message.body          = mess.body.to_s
                 message.parent        = find_parent mess
                 message.envelope_from = mess.from
-                message.envelope_to   = mess.to.map { |t| t.contents }
+                message.envelope_to   = mess.to.map do |t| 
+                    if Gurgitate::Header === t
+                        t.contents
+                    else
+                        t
+                    end
+                end
 
                 message.address.save if message.address.new_record?
 
@@ -92,7 +98,7 @@ class Message < ActiveRecord::Base
                 return message
 
             elsif String === mess then
-                from_message Gurgitate::Mailmessage.new(mess),recipient,sender
+                from_message Gurgitate::Mailmessage.new(mess,recipient,sender)
             end
         end
 
@@ -208,29 +214,18 @@ class Message < ActiveRecord::Base
     # "deliver" message.  This might have headers rewritten to reflect
     # mail aliases.
     def messagetext(smtpdetails={})
-        if smtpdetails.length == 1 and smtpdetails[0].has_key? :custom_message
-            smtpdetails[0][:custom_message]
+        if smtpdetails.has_key? :custom_message
+            return smtpdetails[:custom_message]
         end
 
-        if mailinglist.canonical_address? or mailinglist.closed? then
+        if mailinglist and 
+            ( mailinglist.canonical_address? or mailinglist.closed? ) then
             proxify_addresses
         else
             to_s
         end
     end
 
-    def proxy_deliver(from_address, to_address)
-        text = proxify_addresses
-
-        smtpserver  = "localhost"
-        smtpport    = 25
-
-        Net::SMTP.start(smtpserver, smtpport, "localhost") do |smtp|
-            smtp.send_message text, from_address, to_address
-        end
-    end
-        
-
     # Delivers a message with the optional parameter hash +smtpdetails+.
     #
     # 
@@ -256,19 +251,10 @@ class Message < ActiveRecord::Base
             addresses = mailinglist.expand_addresses.map { |a| a.address }
         end
 
-
-        # Hm, not sure why this is *here* instead of somewhere
-        # else.  Fix later.
-        #
-        # (This should actually be in the database somewhere, I'm thinking.)
         smtpserver = SysConfig.smtpserver
         smtpport   = SysConfig.smtpport
         mysmtpname = SysConfig.mysmtpname
 
-        # smtpserver = "localhost"      # XXX MAGIC CONSTANT XXX
-        # smtpport   = 25               # XXX MAGIC CONSTANT XXX
-        # mysmtpname = "localhost"      # XXX MAGIC CONSTNAT XXX
-
         if smtpdetails.has_key? :smtpserver then
             smtpserver = smtpdetails[:smtpserver] 
         end
@@ -278,12 +264,8 @@ class Message < ActiveRecord::Base
 
         fromaddress = mailinglist.name + SysConfig.address_separator +
             SysConfig.bounce_suffix + "@" + mailinglist.user.domain.name
-        # XXX MAGIC CONSTANT XXX
-        # fromaddress = "#{mailinglist.name}-bounces@#{mailinglist.user.domain.name}"
         Net::SMTP.start(smtpserver, smtpport, mysmtpname) do |smtp|
-            # puts "Will send email to #{addresses.inspect}"
-            # puts "Message id is #{id}"
-            smtp.send_message messagetext, fromaddress, addresses
+            smtp.send_message messagetext(smtpdetails), fromaddress, addresses
         end
     end
 

data/app/models/proxy_link.rb

@@ -13,12 +13,20 @@ class ProxyLink < ActiveRecord::Base
         if matches
             mlname, proxyid, domainname = matches[1..3]
             domain=Domain.find_by_name domainname
-            ml=Mailinglist.find_all_by_name(mlname).find do |m|
-                m.domain == domain
-            end
-            pl=self.find(proxyid.to_i)
-            if pl.mailinglist_id == ml.id then
-                return pl.address.address
+            if domain
+                ml=Mailinglist.find_all_by_name(mlname).find do |m|
+                    m.domain.id == domain.id
+                end
+                if ml
+                    # find_by_id instead of find so that it returns
+                    # nil if not found rather than raising an exception
+                    pl=self.find_by_id proxyid.to_i
+                    if pl
+                        if pl.mailinglist_id == ml.id then
+                            return pl.address.address
+                        end
+                    end
+                end
             end
         end
     end

data/app/views/account/login.rhtml

@@ -1,21 +1,23 @@
-<%= start_form_tag :action=> "login" %>
 
-<div title="Account login" id="loginform" class="form">
-    <h3>Please login</h3>
-    
-    <% if @flash['notice'] %>
-      <div id="message"><%= @flash['notice'] %></div>
-    <% end %>
+<h3>Please login</h3>
 
-    <label for="user_login">Login:</label><br/>
-    <input type="text" name="user_login" id="user_login" size="30" value=""/><br/>
 
-    <label for="user_password">Password:</label><br/>
+<%= start_form_tag :action=> "login" %>
+<div title="Account login" id="loginform" class="form">
+    <br/>
+    <br/>
+    <label for="user_login">Login:</label>
+    <input type="text" name="user_login" id="user_login" class="loginInput" size="30" value=""/><br/>
+    <br/>
+    <label for="user_password">Password:</label>
     <input type="password" name="user_password" id="user_password" size="30"/>
 
-    <br/>
+    <br/><br/><br/>
     <input type="submit" name="login" value="Login &#187;" class="primary" />
-
+    <br/><br/><br/>
+    <% if @flash['notice'] %>
+          <div id="message"><%= @flash['notice'] %></div>
+    <% end %>
 </div>
 
 <%= end_form_tag %>

data/app/views/account/logout.rhtml

@@ -1,10 +1,6 @@
 
-<div class="memo">
-    <h3>Logoff</h3>
-
-    <p>You are now logged out of the system...</p>
-      
-    <%= link_to "&#171; login", :action=>"login"%>  
-      
-</div>
+    <p>You are now logged out of the system...</p>      
+
+<%= render :partial => 'navigation/nav_module' %>
+
 

data/app/views/account/welcome.rhtml

@@ -1,13 +1,3 @@
-
-<div class="memo">
-    <h3>Welcome</h3>
-
-    <p>You are now logged into the system...</p>
-    <p>
-    Since you are here it's safe to assume the application never called store_location, otherwise
-    you would have been redirected somewhere else after a successful login.
-    </p>
-      
-    <%= link_to "&#171; logout", :action=>"logout"%>  
-      
-</div>
+<%= render :file => "mailinglist/list", :use_full_path => true %>
+<%= render :file => "root_admin/list_users", :use_full_path => true %>
+<%= render :file => "mailinglist/list_mailinglist_classes", :use_full_path => true %>

data/app/views/base_user/add_address.rhtml

@@ -0,0 +1,3 @@
+Adding an address to the user's forwardin glist.
+
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/base_user/edit_address.rhtml

@@ -0,0 +1,3 @@
+Where the user edits an address he/she has already added.
+
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/base_user/edit_user_list.rhtml

@@ -0,0 +1,21 @@
+This is where the base user would change their forwarding addresses.
+<br>
+<table>
+<tr>
+  <% for column in Mailinglist.content_columns %>
+    <th><%= column.human_name %></th>
+  <% end %>
+  </tr>
+  
+<% for mailinglist in @mailinglists %>
+  <tr>
+  <% for column in Mailinglist.content_columns %>
+    <td><%=h mailinglist.send(column.name) %></td>
+  <% end %>
+<br>
+    <% end %>
+</tr>
+</table>
+<%= link_to 'Destroy', { :action => 'destroy', :id => mailinglist }, :post => true, :confirm => 'Are you sure you want to destroy this mailinglist?' %>
+<%= link_to 'Edit', :controller => 'mailinglist', :action => 'edit', :id => mailinglist %>
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/base_user/list_mailinglists.rhtml

@@ -0,0 +1,3 @@
+This is where the base user would see a list of all the mailing lists they are subscribed to, and have the option to unsubscribe by sending an email to the list moderator/owner.
+
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/base_user/remove_address.rhtml

@@ -0,0 +1,3 @@
+This should never show, just a popup saying "Are you sure?"
+
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/base_user/unsubscribe_self.rhtml

@@ -0,0 +1,3 @@
+This page should never actually show, except maybe to let the user add a personal message to the email to the list owner. I doubt that, though.
+
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/layouts/application.rhtml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+<head>
+<title>Sugoi Mail</title>
+<%= stylesheet_link_tag 'global' %>
+</head>
+<body>
+<div id="windowCenter" align="center">
+
+	<div id="windowConstrain" align="center">
+
+<!-- Title bar -->
+
+		<div id="titlebar">
+			<!-- <h1 class="sugoiTitle">SUGOI-MAIL</h1> -->
+		</div>
+
+<!-- End Title Bar -->
+
+<!-- Main Content Panel -->
+
+<div id="content">
+    <%= flash[:notice] %>
+    <%= @content_for_layout %>
+</div>
+
+<!-- End Main Content Panel -->
+
+<!-- Navigation Panel -->
+
+<%= render :partial => 'navigation/nav_module' %>
+<%= yield :navbar %>
+
+<!-- End Navigation Panel -->
+
+<!-- Signature -->
+
+		<!-- <div id="signature">
+			Copyright &copy; 2007 Invio Corporation
+		</div> -->
+<!-- End Signature -->
+	</div>
+</div>
+</body>
+</html>

data/app/views/layouts/login.rhtml

@@ -0,0 +1,34 @@
+<html>
+<head>
+<title>Sugoi Mail</title>
+<%= stylesheet_link_tag 'global' %>
+</head>
+<body>
+<div id="windowCenter" align="center">
+
+	<div id="windowConstrain" align="center">
+
+<!-- Title bar -->
+
+		<div id="titlebar">
+			<!-- <h1 class="sugoiTitle">SUGOI-MAIL</h1> -->
+		</div>
+
+<!-- End Title Bar -->
+
+<!-- Content here -->
+
+            <%= @content_for_layout %>
+            
+<!-- End Content -->
+
+<!-- Signature -->
+
+		<!-- <div id="signature">
+			Copyright &copy; 2007 Invio Corporation
+		</div> -->
+<!-- End Signature -->
+	</div>
+</div>
+</body>
+</html>

data/app/views/layouts/sugoi_admin.rhtml

@@ -0,0 +1 @@
+<%= @content_for_layout -%>

data/app/views/mail_admin/_form.rhtml

@@ -0,0 +1,11 @@
+<%= error_messages_for 'adminmessage' %>
+
+<!--[form:admin_message]-->
+<p>
+    <label for="_name">Message:</label>
+   
+    <%= text_area 'adminmessage', 'message'  %>
+</p>
+
+
+<!--[eoform:mailinglist]-->

data/app/views/mail_admin/edit_admin_message.rhtml

@@ -0,0 +1,12 @@
+<h1>Editing Admin Message: <%= @adminmessage.id %></h1>
+
+<%= start_form_tag :action => 'edit_admin_message', :id => @adminmessage %>
+  <%= render :partial => 'form' %>
+  <br/>
+<%= submit_tag 'Save Changes' %>
+<%= end_form_tag %>
+
+<br/><br/>
+<%= button_to 'Delete This Admin Message', { :action => 'remove_admin_message', :id => @adminmessage }, :confirm => 'Are you sure you want to remove this admin message? It will cause problems!' %>
+
+<br>

data/app/views/mail_admin/list_admin_messages.rhtml

@@ -0,0 +1,20 @@
+
+<h3>Admin Messages</h3>
+These are the messages sent out upon (un)subscription, and confirmation.
+<table class="mainTable" cellspacing="0" cellpadding="4">
+  <tr>
+    <th>Message</th>
+  </tr>
+  
+<% for adminmessage in @adminmessages %> <!--set @adminmessages!-->
+  <tr>
+  <% for column in AdminMessage.content_columns %>
+	<% if column.human_name == "Message" %>
+    	<td><%= adminmessage.send(column.name) %></td>
+   <% end %>
+   <td><%= link_to 'Edit', :controller => "mail_admin", :action => 'edit_admin_message', :id => {@mailinglist, adminmessage} %></td>
+   <td><%= link_to_image "remove.gif", { :controller => "mail_admin", :action => 'remove_admin_message', :id => adminmessage }, :post => true, :confirm => 'Are you sure you want to remove this message? It could cause serious problems.' %>
+  </tr>
+<% end %>
+<% end %>
+</table>

data/app/views/mailinglist/_address_form.rhtml

@@ -0,0 +1,23 @@
+<%= error_messages_for 'mailinglist' %>
+<p>
+<% if @mailinglist.addresses != nil %>
+    <b><%= "Addresses" %>:</b>
+    <ul>
+        <% @mailinglist.addresses.each do |address| %>
+            <li>
+                <% if false %><%= check_box "mailinglist_address", address.id, {}, "T", "F" %><% end %>
+                <%= address.address %>
+            </li>
+        <% end %>
+    </ul>
+<% end %>
+</p>
+
+<!--[form:mailinglist]-->
+<p>
+    <label for="mailinglist_address">Add Address</label>
+    <br/>
+    <%= text_field 'address', 'address'  %>
+</p>
+
+<!--[eoform:mailinglist]-->

data/app/views/mailinglist/_form.rhtml

@@ -2,27 +2,23 @@
 
 <!--[form:mailinglist]-->
 <p>
-    <label for="mailinglist_name">Mailinglist</label>
+    <label for="mailinglist_name">Name:</label>
     <br/>
     <%= text_field 'mailinglist', 'name'  %>
 </p>
 <p>
+  <label for="mailinglist_class_id">Class:</label><br />
+  <select name="mailinglist_class_id" style="width:250px;">
+  <% if @mailinglist_classes %>
+  <%= options_from_collection_for_select(@mailinglist_classes, "id", "name", selected_value=@mailinglist.mailinglist_class_id) %>
+  <% end %>
+  </select>
+</p>
+<!-- <p>
     <label for="mailinglist_openposting">Open to the public?</label>
     <br/>
     <%= check_box "mailinglist", 'openposting', {}, "T", "F" %>
-</p>
-<p>
-    <b><%= "Addresses" %>:</b>
-    <ul>
-        <% @mailinglist.addresses.each do |address| %>
-            <li>
-                <%= check_box "mailinglist_address", address.id, {}, "T", "F" %>
-                <%= address.address %>
-            </li>
-        <% end %>
-    </ul>
-</p>
-
+</p>-->
 
 
 <!--[eoform:mailinglist]-->

data/app/views/mailinglist/_new_class_form.rhtml

@@ -0,0 +1,16 @@
+<%= error_messages_for 'mailinglist_class' %>
+
+<!--[form:mailinglist]-->
+<p>
+    <label for="mailinglist_class_name">Mailinglist Class Name</label>
+    <br/>
+    <%= text_field 'mailinglist_class', 'name'  %>
+</p>
+
+    <label for="mailinglist_class_description">Description:</label>
+	<br />
+    <%= text_field 'mailinglist_class', 'description' %>
+</p>
+<br/>
+<br/>
+<!--[eoform:mailinglist]-->

data/app/views/mailinglist/_new_form.rhtml

@@ -0,0 +1,30 @@
+<%= error_messages_for 'mailinglist' %>
+
+<!--[form:mailinglist]-->
+<p>
+    <label for="mailinglist_name">Mailinglist Name</label>
+    <br/>
+    <%= text_field 'mailinglist', 'name'  %>
+</p>
+<p>
+  <label for="mailinglist_user">Select User:</label><br />
+  <select name="user" style="width:250px;">
+  <% if @users %>
+  <%= options_from_collection_for_select(@users, "login", "login", @selected) %>
+  <% end %>
+  </select>
+</p>
+<p>
+  <label for="mailinglist_mailinglist_class_id">Class:</label><br />
+  <select name="mailinglist_class_id" style="width:250px;">
+  <% if @mailinglist_classes %>
+  <%= options_from_collection_for_select(@mailinglist_classes, "id", "name", @selected) %>
+  <% end %>
+  </select>
+</p>
+<p>
+    <label for="mailinglist_description">Description:</label<br />
+    <%= text_field 'mailinglist', 'description' %>
+</p>
+
+<!--[eoform:mailinglist]-->

data/app/views/mailinglist/edit.rhtml

@@ -1,10 +1,16 @@
-<h1>Editing mailinglist</h1>
+<h1>Editing Mailing List: <%= @mailinglist.name %></h1>
 
 <%= start_form_tag :action => 'edit', :id => @mailinglist %>
   <%= render :partial => 'form' %>
-  <%= submit_tag 'Save' %>
+  <br/>
+<%= submit_tag 'Save Changes' %>
 <%= end_form_tag %>
-<%= button_to 'Destroy', { :action => 'destroy', :id => @mailinglist }, :confirm => 'Are you sure you want to destroy this mailinglist?' %>
 
-<%= link_to 'Show', :action => 'show', :id => @mailinglist %> |
-<%= link_to 'Back to list', :action => 'list' %>
+<%= start_form_tag :action => 'add_address', :id => @mailinglist %>
+      <%= render :partial => 'address_form' %>
+      <%= submit_tag 'Add' %>
+<%= end_form_tag %>
+<br/><br/>
+<%= button_to 'Delete This Mailing List', { :action => 'remove', :id => @mailinglist }, :confirm => 'Are you sure you want to destroy this mailinglist?' %>
+
+<br>

data/app/views/mailinglist/list.rhtml

@@ -1,27 +1,27 @@
-<h1>Listing mailinglists</h1>
 
-<table>
+<h3>Mailing Lists</h3>
+
+<table class="mainTable" cellspacing="0" cellpadding="4">
   <tr>
+
   <% for column in Mailinglist.content_columns %>
     <th><%= column.human_name %></th>
   <% end %>
+	<th>Class</th>
   </tr>
   
 <% for mailinglist in @mailinglists %>
   <tr>
   <% for column in Mailinglist.content_columns %>
-    <td><%=h mailinglist.send(column.name) %></td>
-  <% end %>
-    <td><%= link_to 'Show', :action => 'show', :id => mailinglist %></td>
-    <td><%= link_to 'Edit', :action => 'edit', :id => mailinglist %></td>
-    <td><%= link_to 'Destroy', { :action => 'destroy', :id => mailinglist }, :post => true, :confirm => 'Are you sure you want to destroy this mailinglist?' %>
+	<% if column.human_name == "Name" %>
+    	<td><%= link_to mailinglist.send(column.name), :controller => "mailinglist", :action => 'show', :id => mailinglist %></td>
+   <% else %>
+		<td><%=h mailinglist.send(column.name) %></td>
+	<% end %>
+	<% end %>
+	<td><%= mailinglist.mailinglist_class.name %></td>
+   <td><%= link_to 'Edit', :controller => "mailinglist", :action => 'edit', :id => mailinglist %></td>
+   <td><%= link_to_image "remove.gif", { :controller => "mailinglist", :action => 'remove', :id => mailinglist }, :post => true, :confirm => 'Are you sure you want to remove this mailinglist?' %>
   </tr>
 <% end %>
-</table>
-
-<%= link_to 'Previous page', { :page => @mailinglist_pages.current.previous } if @mailinglist_pages.current.previous %>
-<%= link_to 'Next page', { :page => @mailinglist_pages.current.next } if @mailinglist_pages.current.next %> 
-
-<br />
-
-<%= link_to 'New mailinglist', :action => 'new' %>
+</table>

data/app/views/mailinglist/list_mailinglist_classes.rhtml

@@ -0,0 +1,18 @@
+
+<h3>Mailing List Classes</h3>
+
+<table class="mainTable" cellspacing="0" cellpadding="4">
+  <tr>
+   <th>Name</th>
+	<th>Description</th>
+  </tr>
+  
+<% for mailinglist_class in @mailinglist_classes %>
+  <tr>
+   <td><%= link_to mailinglist_class.name, :controller => "mailinglist", :action => 'show', :id => mailinglist_class %></td>
+	<td><%=h mailinglist_class.description %></td>
+   <td><%= link_to 'Edit', :controller => "mailinglist", :action => 'edit', :id => mailinglist_class %></td>
+   <td><%= link_to_image "remove.gif", { :controller => "mailinglist", :action => 'remove', :id => mailinglist_class }, :post => true, :confirm => 'Are you sure you want to remove this mailinglist?' %>
+  </tr>
+<% end %>
+</table>

data/app/views/mailinglist/new.rhtml

@@ -1,8 +1,8 @@
-<h1>New mailing list</h1>
+<h3>New mailing list</h3>
 
 <%= start_form_tag :action => 'new' %>
-  <%= render :partial => 'form' %>
-  <%= submit_tag 'Save' %>
-<%= end_form_tag %>
 
-<%= link_to 'Back to list', :action => 'list' %>
+<%= render :partial => 'new_form' %>
+
+  <%= submit_tag 'Save' %>
+<%= end_form_tag %>

data/app/views/mailinglist/new_address.rhtml

@@ -0,0 +1,10 @@
+<h3>Add Address to Mailing List</h3>
+
+<%= start_form_tag :action => 'add_address' %>
+
+<%= render :partial => 'address_form' %>
+
+  <%= submit_tag 'Save' %>
+<%= end_form_tag %>
+
+<%= render :partial => 'navigation/nav_module' %>

data/app/views/mailinglist/new_mailinglist_class.rhtml

@@ -0,0 +1,8 @@
+<h3>New Mailing List Class</h3>
+
+<%= start_form_tag :action => 'new_class' %>
+
+<%= render :partial => 'new_class_form' %>
+
+  <%= submit_tag 'Save' %>
+<%= end_form_tag %>