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

Timestamp:

Oct 5, 2008 3:18:15 AM (5 years ago)

Author:

alec

Message:

• removed deprecated rcube_add_label() and all uses
• code for 'show' action added in r1937 moved to show.inc

File:

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

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

@@ -70 +70 @@
 
   if (!$OUTPUT->ajax_call)
-    rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
+    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
 
   $OUTPUT->set_pagetitle(rcmail_localize_foldername($IMAP->get_mailbox_name()));
-  }
-else if ($RCMAIL->action == 'show')
-  {
-  // set current mailbox in client environment
-  $OUTPUT->set_env('mailbox', $IMAP->get_mailbox_name());
-  if ($CONFIG['trash_mbox'])
-    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
-  if (!$OUTPUT->ajax_call)
-    rcube_add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
   }
 
@@ -100 +91 @@
   
   // add some labels to client
-  rcube_add_label('from', 'to');
+  $OUTPUT->add_label('from', 'to');
 
   // get message headers