Added labels for LDAP search

thomascube

2006-01-13 be2380fb47b05a222ec5b22deff36d5156a8c943

 program/steps/mail/func.inc

@@ -21,8 +21,6 @@

require_once('lib/html2text.inc');
require_once('lib/enriched.inc');
require_once('lib/utf8.inc');
require_once('lib/utf7.inc');


$EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i';
@@ -148,7 +146,7 @@
  if (!isset($arrFolders[$currentFolder]))
    {
    $arrFolders[$currentFolder] = array('id' => $path,
                                        'name' => $currentFolder,
                                        'name' => rcube_charset_convert($currentFolder, 'UTF-7'),
                                        'folders' => array());
    }

@@ -160,7 +158,7 @@
// return html for a structured list <ul> for the mailbox tree
function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
  {
  global $JS_OBJECT_NAME, $IMAP, $CONFIG;
  global $JS_OBJECT_NAME, $IMAP, $CONFIG, $OUTPUT;

  $idx = 0;
  $out = '';
@@ -174,7 +172,7 @@
      $foldername = rcube_label($folder_lc);
    else
      {
      $foldername = UTF7DecodeString($folder['name']);
      $foldername = $folder['name'];

      // shorten the folder name to a given length
      if ($maxlength && $maxlength>1)
@@ -231,7 +229,7 @@
// return html for a flat list <select> for the mailbox tree
function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox, $maxlength, $nestLevel=0)
  {
  global $IMAP;
  global $IMAP, $OUTPUT;

  $idx = 0;
  $out = '';
@@ -242,7 +240,7 @@
      $foldername = rcube_label($folder_lc);
    else
      {
      $foldername = UTF7DecodeString($folder['name']);
      $foldername = $folder['name'];
      
      // shorten the folder name to a given length
      if ($maxlength && $maxlength>1)