Changeset 211 in subversion for trunk/roundcubemail/program/steps/mail/func.inc

Timestamp:

May 1, 2006 12:22:09 PM (7 years ago)

Author:

cmcnulty

Message:

Added undelete functionalist and support for delete toggle icon

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (3 diffs)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -391 +391 @@
 
     // set messag attributes to javascript array
+    if ($header->deleted)
+      $js_row_arr['deleted'] = true;
     if (!$header->seen)
       $js_row_arr['unread'] = true;
     if ($header->answered)
       $js_row_arr['replied'] = true;
-
-        // set message icon    
-    if ($attrib['unreadicon'] && !$header->seen)
+    // set message icon  
+    if ($attrib['deletedicon'] && $header->deleted)
+      $message_icon = $attrib['deletedicon'];
+    else if ($attrib['unreadicon'] && !$header->seen)
       $message_icon = $attrib['unreadicon'];
     else if ($attrib['repliedicon'] && $header->answered)
@@ -457 +460 @@
   if ($attrib['messageicon'])
     $javascript .= sprintf("%s.set_env('messageicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['messageicon']);
+  if ($attrib['deletedicon'])
+    $javascript .= sprintf("%s.set_env('deletedicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['deletedicon']);
   if ($attrib['unreadicon'])
     $javascript .= sprintf("%s.set_env('unreadicon', '%s%s');\n", $JS_OBJECT_NAME, $skin_path, $attrib['unreadicon']);
@@ -511 +516 @@
       }
 
+    $a_msg_flags['deleted'] = $header->deleted ? 1 : 0;
     $a_msg_flags['unread'] = $header->seen ? 0 : 1;
     $a_msg_flags['replied'] = $header->answered ? 1 : 0;
-    
-    if ($header->deleted)
-      $a_msg_flags['deleted'] = 1;
-  
     $commands .= sprintf("this.add_message_row(%s, %s, %s, %b, %b);\n",
                          $header->uid,