[Hastymail-cvs] SF.net SVN: hastymail: [374] trunk/hastymail2

[<sai...@us...>]

Revision: 374
          http://hastymail.svn.sourceforge.net/hastymail/?rev=374&view=rev
Author:   sailfrog
Date:     2008-04-25 06:21:13 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
misc fixes and more work on being able to auto-save in process messages

Modified Paths:
--------------
    trunk/hastymail2/index.php
    trunk/hastymail2/lib/misc_functions.php
    trunk/hastymail2/lib/post_action_class.php
    trunk/hastymail2/lib/site_page_class.php
    trunk/hastymail2/lib/smtp_class.php
    trunk/hastymail2/lib/url_action_class.php
    trunk/hastymail2/themes/default/css/mailbox.css
    trunk/hastymail2/themes/default/css/message.css
    trunk/hastymail2/themes/default/css/search.css

Modified: trunk/hastymail2/index.php
===================================================================
--- trunk/hastymail2/index.php	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/index.php	2008-04-25 13:21:13 UTC (rev 374)
@@ -93,7 +93,7 @@
     'table',    'tr',   'td',       'th',       'ul',
     'ol',       'li',   'hr',       'em',       'u',
     'font',     'br',   'strong',   'span',     'a',
-    'p',        'img',  'blockquote'
+    'p',        'img',  'blockquote', 'div',
 );
 /* mbstring available charsets */
 $mb_charset_codes = array(

Modified: trunk/hastymail2/lib/misc_functions.php
===================================================================
--- trunk/hastymail2/lib/misc_functions.php	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/lib/misc_functions.php	2008-04-25 13:21:13 UTC (rev 374)
@@ -204,9 +204,7 @@
             $output .= $i;
         }
         elseif ($i != $current) {
-            $output .= '<a style="';
-            if ($i == $pages) { $output .= 'border: none;'; }
-            $output .= '" href="'.$url_base.'&amp;mailbox_page='.$i.'">'.$i.'</a> ';
+            $output .= '<a href="'.$url_base.'&amp;mailbox_page='.$i.'">'.$i.'</a> ';
         }
         else {
             $output .= '<a class="current_page_link" href="'.$url_base.'&amp;mailbox_page='.$i.'">'.$i.'</a> ';
@@ -544,7 +542,7 @@
         $new_page = str_replace(array("<$tag_name-$page_id>", "</$tag_name-$page_id>"), '', $string);
     }
     if (isset($conf['html_squish']) && $conf['html_squish']) {
-        return str_replace("\n", '', preg_replace("/>\s+</", '><', $new_page));
+        return str_replace("\n", '', preg_replace("/>\s{2,}</", '> <', $new_page));
     }
     else {
         return ltrim($new_page);

Modified: trunk/hastymail2/lib/post_action_class.php
===================================================================
--- trunk/hastymail2/lib/post_action_class.php	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/lib/post_action_class.php	2008-04-25 13:21:13 UTC (rev 374)
@@ -694,6 +694,9 @@
         if (isset($post['compose_in_reply_to'])) {
             $message->in_reply_to = $post['compose_in_reply_to'];
         }
+        if (isset($post['message_id'])) {
+            $message->message_id = $post['message_id'];
+        }
         if (isset($post['compose_from'])) {
             if (isset($_SESSION['user_settings']['profiles'][$post['compose_from']])) {
                 $from_atts = $_SESSION['user_settings']['profiles'][$post['compose_from']];
@@ -1024,6 +1027,9 @@
         if (isset($post['compose_in_reply_to'])) {
             $message->in_reply_to = $post['compose_in_reply_to'];
         }
+        if (isset($post['message_id'])) {
+            $message->message_id = $post['message_id'];
+        }
         if (isset($post['compose_from'])) {
             if (isset($_SESSION['user_settings']['profiles'][$post['compose_from']])) {
                 $from_atts = $_SESSION['user_settings']['profiles'][$post['compose_from']];

Modified: trunk/hastymail2/lib/site_page_class.php
===================================================================
--- trunk/hastymail2/lib/site_page_class.php	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/lib/site_page_class.php	2008-04-25 13:21:13 UTC (rev 374)
@@ -340,8 +340,9 @@
         $data = $this->print_contact_detail(true);
     }
     else {
-        $data .= prep_text_part($this->pd['message_data'], $this->pd['charset']).'</div>';
+        $data .= prep_text_part($this->pd['message_data'], $this->pd['charset']);
     }
+    $data .= '</div>';
     return $data;
 }
 function print_message_html() {
@@ -1087,7 +1088,15 @@
                     if ($indicators) {
                         $indicators = '<span class="indicators">'.$indicators.'</span>';
                     }
-                    $data .= '<tr><td class="'.$class_prefix.'indicators"><input type="checkbox" ';
+                    $data .= '<tr><td class="'.$class_prefix.'indicators">';
+                    if (isset($this->pd['last_message_read'][$i]) &&
+                        $this->pd['last_message_read'][$i] == $vals['uid']) {
+                        $data .= '<span class="last_read">&gt;</span>';
+                    }
+                    else {
+                        $data .= '<span class="last_read_hidden">&gt;</span>';
+                    }
+                    $data .= '<input type="checkbox" ';
                     if ($this->pd['toggle_all']) { $data .= 'checked="checked" '; }
                     $data .= 'id="message_'.$n.'" name="uids[]" value="'.$vals['uid'].'" /><input type="hidden" name="mailboxes['.$vals['uid'].']" value="'.
                              $this->user->htmlsafe($i, false, false, true).'" />'.$indicators.'</td><td class="'.$class_prefix.'subject"><a href="?page=message&amp;uid='.

Modified: trunk/hastymail2/lib/smtp_class.php
===================================================================
--- trunk/hastymail2/lib/smtp_class.php	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/lib/smtp_class.php	2008-04-25 13:21:13 UTC (rev 374)
@@ -458,7 +458,6 @@
     var $from;
     var $from_address;
     var $reply_to;
-    var $messsage_id;
     var $in_reply_to;
     var $date;
     var $references;
@@ -489,7 +488,6 @@
         $this->from = '';
         $this->from_address = '';
         $this->reply_to = '';
-        $this->message_id = '';
         $this->in_reply_to = '';
         $this->boundry = '--=='.md5(uniqid(rand(),1));
         $this->recipients = array();
@@ -523,6 +521,9 @@
         if (!$this->message_id) {
             $this->set_header('message_id', '<'.md5(uniqid(rand(),1)).'@'.$conf['host_name'].'>');
         }
+        else {
+            $this->set_header('message_id', $this->message_id);
+        }
     }
     function encode_header_fld($input) {
         global $user;

Modified: trunk/hastymail2/lib/url_action_class.php
===================================================================
--- trunk/hastymail2/lib/url_action_class.php	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/lib/url_action_class.php	2008-04-25 13:21:13 UTC (rev 374)
@@ -1281,7 +1281,7 @@
         $mailbox = false;
         $type = '';
         $uid = 0;
-        $message_id = false;
+        $message_id = '<'.md5(uniqid(rand(),1)).'@'.$conf['host_name'].'>';
         $part = 0;
         $pre = '';
         $in_reply_to = '';
@@ -1397,9 +1397,6 @@
                             if (isset($all_headers['to'])) {
                                 $to = $all_headers['to'];
                             }
-                            if (isset($all_headers['message-id'])) {
-                                $message_id = $all_headers['message-id'];
-                            }
                             $struct = $imap->get_message_structure($uid);
                             $fparts = array();
                             foreach ($struct as $id => $vals) {

Modified: trunk/hastymail2/themes/default/css/mailbox.css
===================================================================
--- trunk/hastymail2/themes/default/css/mailbox.css	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/themes/default/css/mailbox.css	2008-04-25 13:21:13 UTC (rev 374)
@@ -122,6 +122,7 @@
 }
 #page_links img{
     vertical-align: -40%;
+    padding-right: 3px;
 }
 #page_links b{
     padding: 3px;
@@ -129,12 +130,11 @@
 }
 #page_links{
     margin-top: 25px;
-    font-weight: bold;
     text-align: center;
 }
 #page_links a{
     font-weight: normal;
-    padding-right: 6px;
+    padding-right: 3px;
 }
 .search_res {
     background-color: #faf6eb;
@@ -162,3 +162,6 @@
     font-weight: bold;
     padding-right: 10px;
 }
+.current_page_link{
+    font-weight: bold;
+}

Modified: trunk/hastymail2/themes/default/css/message.css
===================================================================
--- trunk/hastymail2/themes/default/css/message.css	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/themes/default/css/message.css	2008-04-25 13:21:13 UTC (rev 374)
@@ -283,6 +283,7 @@
 }
 #page_links img{
     vertical-align: -40%;
+    padding-right: 3px;
 }
 #page_links b{
     padding: 3px;
@@ -290,7 +291,6 @@
 }
 #page_links{
     margin-top: 25px;
-    font-weight: bold;
     text-align: center;
 }
 #page_links a{
@@ -347,3 +347,6 @@
     padding-right: 10px;
     font-weight: bold;
 }
+.current_page_link{
+    font-weight: bold;
+}

Modified: trunk/hastymail2/themes/default/css/search.css
===================================================================
--- trunk/hastymail2/themes/default/css/search.css	2008-04-23 12:47:14 UTC (rev 373)
+++ trunk/hastymail2/themes/default/css/search.css	2008-04-25 13:21:13 UTC (rev 374)
@@ -167,3 +167,12 @@
     padding-left: 20px;
     font-size: 90%;
 }
+.last_read_hidden{
+    visibility: hidden;
+    padding-right: 3px;
+}
+.last_read{
+    font-size: 90%;
+    vertical-align: 20%;
+    padding-right: 3px;
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.