Changeset 112c9133 in github

Timestamp:

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

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

6afdd69

Parents:

1bb6541

Message:

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

Location:

program

Files:

• include/main.inc (modified) (2 diffs)
• steps/addressbook/edit.inc (modified) (1 diff)
• steps/addressbook/func.inc (modified) (1 diff)
• steps/mail/compose.inc (modified) (2 diffs)
• steps/mail/func.inc (modified) (2 diffs)
• steps/mail/show.inc (modified) (2 diffs)
• steps/settings/func.inc (modified) (1 diff)

program/include/main.inc

@@ -131 +131 @@
   return $app->url((array)$p + array('_action' => $action, 'task' => $task));
 }
-
-
-/**
- * Add a localized label to the client environment
- * @deprecated
- */
-function rcube_add_label()
-  {
-  global $OUTPUT;
-  
-  $arg_list = func_get_args();
-  foreach ($arg_list as $i => $name)
-    $OUTPUT->add_label($name);
-  }
 
 
@@ -914 +900 @@
 
   // add some labels to client
-  rcube_add_label('purgefolderconfirm');
-  rcube_add_label('deletemessagesconfirm');
+  $RCMAIL->output->add_label('purgefolderconfirm', 'deletemessagesconfirm');
   
   $type = $attrib['type'] ? $attrib['type'] : 'ul';

program/steps/addressbook/edit.inc

@@ -44 +44 @@
 
   // add some labels to client
-  rcube_add_label('noemailwarning');
-  rcube_add_label('nonamewarning');
+  $OUTPUT->add_label('noemailwarning', 'nonamewarning');
 
   list($form_start, $form_end) = get_form_tags($attrib);

program/steps/addressbook/func.inc

@@ -115 +115 @@
   
   // add some labels to client
-  rcube_add_label('deletecontactconfirm');
+  $OUTPUT->add_label('deletecontactconfirm');
   
   return $out;

program/steps/mail/compose.inc

@@ -82 +82 @@
 
 // add some labels to client
-rcube_add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting');
+$OUTPUT->add_label('nosubject', 'nosenderwarning', 'norecipientwarning', 'nosubjectwarning', 'nobodywarning', 'notsentwarning', 'savingmessage', 'sendingmessage', 'messagesaved', 'converting');
 
 // add config parameter to client script
@@ -478 +478 @@
       JS_OBJECT_NAME), 'foot');
 
-    rcube_add_label('checking');
+    $OUTPUT->add_label('checking');
     $OUTPUT->set_env('spellcheck_langs', join(',', $editor_lang_set));
   }

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

program/steps/mail/show.inc

@@ -72 +72 @@
   // give message uid to the client
   $OUTPUT->set_env('uid', $MESSAGE->uid);
+  // set environement
   $OUTPUT->set_env('safemode', $MESSAGE->is_safe);
   $OUTPUT->set_env('sender', $MESSAGE->sender['string']);
   $OUTPUT->set_env('permaurl', rcmail_url('show', array('_uid' => $MESSAGE->uid, '_mbox' => $mbox_name)));
   $OUTPUT->set_env('mailbox', $mbox_name);
-  
+  if ($CONFIG['trash_mbox'])
+    $OUTPUT->set_env('trash_mailbox', $CONFIG['trash_mbox']);
+  if (!$OUTPUT->ajax_call)
+    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', 'movingmessage');
+    
   // check for unset disposition notification
   if ($MESSAGE->headers->mdn_to &&
@@ -93 +98 @@
     else if (empty($CONFIG['mdn_requests']))
     {
-      rcube_add_label('mdnrequest');
+      $OUTPUT->add_label('mdnrequest');
       $OUTPUT->set_env('mdn_request', true);
     }

program/steps/settings/func.inc

@@ -31 +31 @@
 
   // add some labels to client
-  rcube_add_label('nopagesizewarning');
+  $RCMAIL->output->add_label('nopagesizewarning');
   
   list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs');