Removeable attachments, Auto-default folder creation, bug fixes

svncommit

2006-06-29 a894ba5029a09fb9d0453b5cf9c944ce313f8a48

 program/js/app.js

@@ -13,7 +13,6 @@
 
  $Id$
*/

// Constants
var CONTROL_KEY = 1;
var SHIFT_KEY = 2;
@@ -29,6 +28,8 @@
  this.gui_objects = new Object();
  this.commands = new Object();
  this.selection = new Array();
  this.last_selected = 0;
  this.in_message_list = false;

  // create public reference to myself
  rcube_webmail_client = this;
@@ -118,11 +119,11 @@
          {
          msg_list_frame.onmousedown = function(e){return rcube_webmail_client.click_on_list(e);};
          this.init_messagelist(msg_list);
          this.enable_command('markread', true);
          this.enable_command('toggle_status', true);
          }

        // enable mail commands
        this.enable_command('list', 'compose', 'add-contact', 'search', 'reset-search', true);
        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', true);
        
        if (this.env.action=='show')
          {
@@ -141,7 +142,13 @@
          }  

        if (this.env.action=='compose')
          this.enable_command('add-attachment', 'send-attachment', 'send', true);
          {
          this.enable_command('add-attachment', 'send-attachment', 'remove-attachment', 'send', true);
          if (this.env.spellcheck)
            this.enable_command('spellcheck', true);
     if (this.env.drafts_mailbox)
       this.enable_command('savedraft', true);
          }
          
        if (this.env.messagecount)
          this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
@@ -204,7 +211,7 @@
          this.enable_command('save', true);
          
        if (this.env.action=='folders')
          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'delete-folder', true);
          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
          
        var identities_list = this.gui_objects.identitieslist;
        if (identities_list)
@@ -236,7 +243,7 @@

    // load body click event
    document.onmousedown = function(){ return rcube_webmail_client.reset_click(); };
    document.onkeydown   = function(e){ return rcube_webmail_client.use_arrow_keys(e, msg_list_frame); };
    document.onkeydown   = function(e){ return rcube_webmail_client.key_pressed(e, msg_list_frame); };

    
    // flag object as complete
@@ -254,57 +261,81 @@
    };

  // reset last clicked if user clicks on anything other than the message table
  this.reset_click = function()
    {
   this.in_message_list = false;
   };
  this.reset_click = function() {
    this.in_message_list = false;
   for (var n=0; n<this.selection.length; n++) {
      id = this.selection[n];
      if (this.list_rows[id].obj) {
        this.set_classname(this.list_rows[id].obj, 'selected', false);
      this.set_classname(this.list_rows[id].obj, 'unfocused', true);
     }
    }
  };
   
  this.click_on_list = function(e)
    {
    if (!e)
      e = window.event;

    for (var n=0; n<this.selection.length; n++) {
      id = this.selection[n];
      if (this.list_rows[id].obj) {
        this.set_classname(this.list_rows[id].obj, 'selected', true);
      this.set_classname(this.list_rows[id].obj, 'unfocused', false);
     }
    }

    this.in_message_list = true;
    e.cancelBubble = true;
    };

  // reset last clicked if user clicks on anything other than the message table
  this.use_arrow_keys = function(e, msg_list_frame) {
  this.key_pressed = function(e, msg_list_frame) {
    if (this.in_message_list != true) 
      return true;

    var keyCode = document.layers ? e.which : document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
    var mod_key = this.get_modifier(e);
    var scroll_to = 0;
    
    var last_selected_row = this.list_rows[this.last_selected];
    switch (keyCode) {
      case 13:
        this.command('show','',this);
        break;
      case 40:
      case 38: 
        return this.use_arrow_key(keyCode, mod_key, msg_list_frame);
        break;
      case 46:
        return this.use_delete_key(keyCode, mod_key, msg_list_frame);
        break;
      default:
        return true;
    }
    return true;
  }

  this.use_arrow_key = function(keyCode, mod_key, msg_list_frame) {
    var scroll_to = 0;
    if (keyCode == 40) { // down arrow key pressed
      var new_row = last_selected_row.obj.nextSibling;
      while (new_row && new_row.nodeType != 1) {
        new_row = new_row.nextSibling;
      }
      new_row = this.get_next_row();
      if (!new_row) return false;
      scroll_to = (Number(new_row.offsetTop) + Number(new_row.offsetHeight)) - Number(msg_list_frame.offsetHeight);
    } else if (keyCode == 38) { // up arrow key pressed
      var new_row = last_selected_row.obj.previousSibling;
      while (new_row && new_row.nodeType != 1) {
        new_row = new_row.previousSibling;
      }
      new_row = this.get_prev_row();
      if (!new_row) return false;
      scroll_to = new_row.offsetTop;
    } else {return true;}
   
   if (mod_key != CONTROL_KEY)
     this.select_row(new_row.uid,mod_key);
    this.select_row(new_row.uid,mod_key,true);

    if (((Number(new_row.offsetTop)) < (Number(msg_list_frame.scrollTop))) || 
       ((Number(new_row.offsetTop) + Number(new_row.offsetHeight)) > (Number(msg_list_frame.scrollTop) + Number(msg_list_frame.offsetHeight)))) {
      msg_list_frame.scrollTop = scroll_to;
    }

    return false;
  };
  
  this.use_delete_key = function(keyCode, mod_key, msg_list_frame){
    this.command('delete','',this);
    return false;
  }

  // get all message rows from HTML table and init each row
  this.init_messagelist = function(msg_list)
@@ -318,8 +349,12 @@
      for(var r=0; r<msg_list.tBodies[0].childNodes.length; r++)
        {
        row = msg_list.tBodies[0].childNodes[r];
        while (row && (row.nodeType != 1 || row.style.display == 'none')) {
          row = row.nextSibling;
          r++;
        }
        //row = msg_list.tBodies[0].rows[r];
        this.init_message_row(row);
        if (row) this.init_message_row(row);
        }
      }
      
@@ -340,6 +375,7 @@
              
      this.message_rows[uid] = {id:row.id, obj:row,
                                classname:row.className,
                                deleted:this.env.messages[uid] ? this.env.messages[uid].deleted : null,
                                unread:this.env.messages[uid] ? this.env.messages[uid].unread : null,
                                replied:this.env.messages[uid] ? this.env.messages[uid].replied : null};
              
@@ -355,7 +391,7 @@
        {                
        msg_icon.id = 'msgicn_'+uid;
        msg_icon._row = row;
        msg_icon.onmousedown = function(e) { rcube_webmail_client.command('markread', this); };
        msg_icon.onmousedown = function(e) { rcube_webmail_client.command('toggle_status', this); };
                
        // get message icon and save original icon src
        this.message_rows[uid].icon = msg_icon;
@@ -577,11 +613,17 @@
          {
          if (this.env.search_request<0 || (this.env.search_request && props != this.env.mailbox))
            this.reset_qsearch();

     // Reset message list header, unless returning from compose/read/etc
     if (this.env.mailbox != props && this.message_rows)
       this.clear_message_list_header();

          this.list_mailbox(props);
          }
        else if (this.task=='addressbook')
          this.list_contacts();
        break;


      case 'sort':
        // get the type of sorting
@@ -642,7 +684,17 @@
          {
          var uid = this.get_single_uid();
          if (uid && (!this.env.uid || uid != this.env.uid))
            this.show_message(uid);
       {
            if (this.env.mailbox==this.env.drafts_mailbox)
              {
              this.set_busy(true);
              location.href = this.env.comm_path+'&_action=compose&_draft_uid='+uid+'&_mbox='+escape(this.env.mailbox);
              }
            else
              {
              this.show_message(uid);
         }
       }
          }
        else if (this.task=='addressbook')
          {
@@ -716,9 +768,7 @@

      case 'delete':
        // mail task
        if (this.task=='mail' && this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
          this.move_messages(this.env.trash_mailbox);
        else if (this.task=='mail')
        if (this.task=='mail')
          this.delete_messages();
        // addressbook task
        else if (this.task=='addressbook')
@@ -735,7 +785,7 @@
        this.move_messages(props);
        break;
        
      case 'markread':
      case 'toggle_status':
        if (props && !props._row)
          break;
        
@@ -746,9 +796,10 @@
          {
          uid = props._row.uid;
          this.dont_select = true;
          
          // toggle read/unread
          if (!this.message_rows[uid].unread)
          if (this.message_rows[uid].deleted) {
             flag = 'undelete';
          } else if (!this.message_rows[uid].unread)
            flag = 'unread';
          }
          
@@ -797,12 +848,20 @@
          //location.href = this.env.comm_path+'&_action=show&_uid='+this.env.prev_uid+'&_mbox='+this.env.mailbox;
        break;
      
      case 'checkmail':
        this.check_for_recent();
        break;
      
      case 'compose':
        var url = this.env.comm_path+'&_action=compose';
        
       
        if (this.task=='mail' && this.env.mailbox==this.env.drafts_mailbox)
          {
          var uid = this.get_single_uid();
          url += '&_draft_uid='+uid+'&_mbox='+escape(this.env.mailbox);
          } 
        // modify url if we're in addressbook
        if (this.task=='addressbook')
        else if (this.task=='addressbook')
          {
          url = this.get_task_url('mail', url);            
          var a_cids = new Array();
@@ -835,15 +894,36 @@
          }
        else if (props)
           url += '&_to='+props;
        

        // don't know if this is necessary...
        url = url.replace(/&_framed=1/, "");

        this.set_busy(true);

        // need parent in case we are coming from the contact frame
        parent.window.location.href = url;
        break;    
        if (this.env.framed)
          parent.location.href = url;
        else
          location.href = url;
        break;
        
      case 'spellcheck':
        if (this.env.spellcheck && this.env.spellcheck.spellCheck)
          this.env.spellcheck.spellCheck(this.env.spellcheck.check_link);
        break;

      case 'savedraft':
        if (!this.gui_objects.messageform)
          break;
        
   // if saving Drafts is disabled in main.inc.php
   if (!this.env.drafts_mailbox)
     break;
 
        this.set_busy(true, 'savingmessage');
        var form = this.gui_objects.messageform;
        form.submit();
        break;

      case 'send':
        if (!this.gui_objects.messageform)
@@ -855,6 +935,7 @@
        // all checks passed, send message
        this.set_busy(true, 'sendingmessage');
        var form = this.gui_objects.messageform;
   form._draft.value='';
        form.submit();
        break;

@@ -863,6 +944,10 @@
        
      case 'send-attachment':
        this.upload_file(props)      
        break;
      
      case 'remove-attachment':
        this.remove_attachment(props);
        break;

      case 'reply-all':
@@ -962,6 +1047,10 @@
        this.create_folder(props);
        break;

      case 'rename-folder':
        this.rename_folder(props);
        break;

      case 'delete-folder':
        if (confirm(this.get_label('deletefolderconfirm')))
          this.delete_folder(props);
@@ -976,7 +1065,7 @@
  // set command enabled or disabled
  this.enable_command = function()
    {
    var args = this.enable_command.arguments;
    var args = arguments;
    if(!args.length) return -1;

    var command;
@@ -988,6 +1077,7 @@
      this.commands[command] = enable;
      this.set_button(command, (enable ? 'act' : 'pas'));
      }
      return true;
    };


@@ -1090,10 +1180,10 @@
      return false;

    // selects currently unselected row
    if (!this.in_selection_before)
    if (!this.in_selection_before && !this.list_rows[id].clicked)
    {
     var mod_key = this.get_modifier(e);
     this.select_row(id,mod_key);
     this.select_row(id,mod_key,false);
    }
    
    if (this.selection.length)
@@ -1120,16 +1210,24 @@
      }
    
    // unselects currently selected row    
    if (!this.drag_active && this.in_selection_before==id)
      this.select_row(id,mod_key);
    if (!this.drag_active && this.in_selection_before==id && !this.list_rows[id].clicked)
      this.select_row(id,mod_key,false);

    this.drag_start = false;
    this.in_selection_before = false;
        
    // row was double clicked
    if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !mod_key)
    if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && this.in_selection(id))
      {
      this.show_message(id);
      if (this.env.mailbox==this.env.drafts_mailbox)
        {
        this.set_busy(true);
        location.href = this.env.comm_path+'&_action=compose&_draft_uid='+id+'&_mbox='+escape(this.env.mailbox);
        }
      else
        {
        this.show_message(id);
        }
      return false;
      }
    else if (this.task=='addressbook')
@@ -1195,6 +1293,27 @@
  /*********     (message) list functionality      *********/
  /*********************************************************/

  // get next and previous rows that are not hidden
  this.get_next_row = function(){
     if (!this.list_rows) return false;
    var last_selected_row = this.list_rows[this.last_selected];
    var new_row = last_selected_row.obj.nextSibling;
    while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
      new_row = new_row.nextSibling;
    }
    return new_row;
  }
  
  this.get_prev_row = function(){
    if (!this.list_rows) return false;
    var last_selected_row = this.list_rows[this.last_selected];
    var new_row = last_selected_row.obj.previousSibling;
    while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
      new_row = new_row.previousSibling;
    }
    return new_row;
  }
  
  // highlight/unhighlight a row
  this.highlight_row = function(id, multiple)
    {
@@ -1213,7 +1332,7 @@
      if (!this.in_selection(id))  // select row
        {
        this.selection[this.selection.length] = id;
        this.set_classname(this.list_rows[id].obj, 'selected', true);        
        this.set_classname(this.list_rows[id].obj, 'selected', true);
        }
      else  // unselect row
        {
@@ -1222,6 +1341,7 @@
        var a_post = this.selection.slice(p+1, this.selection.length);
        this.selection = a_pre.concat(a_post);
        this.set_classname(this.list_rows[id].obj, 'selected', false);
        this.set_classname(this.list_rows[id].obj, 'unfocused', false);
        }
      selected = (this.selection.length==1);
      }
@@ -1229,8 +1349,16 @@
    // enable/disable commands for message
    if (this.task=='mail')
      {
      this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
      this.enable_command('delete', 'moveto', this.selection.length>0 ? true : false);
      if (this.env.mailbox==this.env.drafts_mailbox)
   {
   this.enable_command('show', selected);
   this.enable_command('delete', this.selection.length>0 ? true : false);
        }
      else
        {
        this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
        this.enable_command('delete', 'moveto', this.selection.length>0 ? true : false);
        }
      }
    else if (this.task=='addressbook')
      {
@@ -1241,7 +1369,7 @@


// selects or unselects the proper row depending on the modifier key pressed
  this.select_row = function(id,mod_key)  { 
  this.select_row = function(id,mod_key,with_mouse)  { 
     if (!mod_key) {
      this.shift_start = id;
       this.highlight_row(id, false);
@@ -1252,7 +1380,8 @@
          break; }
        case CONTROL_KEY: { 
          this.shift_start = id;
          this.highlight_row(id, true); 
          if (!with_mouse)
            this.highlight_row(id, true); 
          break; 
          }
        case CONTROL_SHIFT_KEY: { 
@@ -1265,7 +1394,9 @@
          }
      }
   }
   this.last_selected = id;
   if (this.last_selected != 0) { this.set_classname(this.list_rows[this.last_selected].obj, 'focused', false);}
    this.last_selected = id;
    this.set_classname(this.list_rows[id].obj, 'focused', true);        
  };

  this.shift_select = function(id, control) {
@@ -1291,9 +1422,10 @@
  this.clear_selection = function()
    {
    for(var n=0; n<this.selection.length; n++)
      if (this.list_rows[this.selection[n]])
      if (this.list_rows[this.selection[n]]) {
        this.set_classname(this.list_rows[this.selection[n]].obj, 'selected', false);

        this.set_classname(this.list_rows[this.selection[n]].obj, 'unfocused', false);
     }
    this.selection = new Array();    
    };

@@ -1318,9 +1450,11 @@
    // reset selection first
    this.clear_selection();
    
    for (var n in this.list_rows)
    for (var n in this.list_rows) {
      if (!filter || this.list_rows[n][filter]==true)
      this.highlight_row(n, true);
        this.highlight_row(n, true);
    }
    return true;  
    };
    

@@ -1370,6 +1504,7 @@
  // list messages of a specific mailbox
  this.list_mailbox = function(mbox, page, sort)
    {
    this.last_selected = 0;
    var add_url = '';
    var target = window;

@@ -1434,6 +1569,7 @@
  this.clear_message_list = function()
    {
    var table = this.gui_objects.messagelist;
   
    var tbody = document.createElement('TBODY');
    table.insertBefore(tbody, table.tBodies[0]);
    table.removeChild(table.tBodies[1]);
@@ -1443,6 +1579,18 @@
    
    };

  this.clear_message_list_header = function()
    {
    var table = this.gui_objects.messagelist;

    var colgroup = document.createElement('COLGROUP');
    table.removeChild(table.colgroup);
    table.insertBefore(colgroup, table.thead);

    var thead = document.createElement('THEAD');
    table.removeChild(table.thead);
    table.insertBefore(thead, table.tBodies[0]);
    };

  this.expunge_mailbox = function(mbox)
    {
@@ -1482,6 +1630,7 @@
    // send request to server
    var url = '_mbox='+escape(mbox);
    this.http_request('purge', url+add_url, lock);
    return true;
    };
    

@@ -1508,6 +1657,10 @@
        if (this.message_rows[id].obj)
          this.message_rows[id].obj.style.display = 'none';
        }
      next_row = this.get_next_row();
      prev_row = this.get_prev_row();
      new_row = (next_row) ? next_row : prev_row;
      if (new_row) this.select_row(new_row.uid,false,false);
      }
      
    var lock = false;
@@ -1518,15 +1671,11 @@
      lock = true;
      this.set_busy(true, 'movingmessage');
      }

    // send request to server
    this.http_request('moveto', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_target_mbox='+escape(mbox)+'&_from='+(this.env.action ? this.env.action : ''), lock);
    };


  // delete selected messages from the current mailbox
  this.delete_messages = function()
    {
  this.permanently_remove_messages = function() {
    // exit if no mailbox specified or if selection is empty
    if (!(this.selection.length || this.env.uid))
      return;
@@ -1548,10 +1697,46 @@
          this.message_rows[id].obj.style.display = 'none';
        }
      }
      next_row = this.get_next_row();
      prev_row = this.get_prev_row();
      new_row = (next_row) ? next_row : prev_row;
      if (new_row) this.select_row(new_row.uid,false,false);

    // send request to server
    this.http_request('delete', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_from='+(this.env.action ? this.env.action : ''));
    };
  }
    
    
  // delete selected messages from the current mailbox
  this.delete_messages = function()
    {
    // exit if no mailbox specified or if selection is empty
    if (!(this.selection.length || this.env.uid))
      return;
    // if there is a trash mailbox defined and we're not currently in it:
    if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
      this.move_messages(this.env.trash_mailbox);
    // if there is a trash mailbox defined but we *are* in it:
    else if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase() == String(this.env.trash_mailbox).toLowerCase())
      this.permanently_remove_messages();
    // if there isn't a defined trash mailbox and the config is set to flag for deletion
    else if (!this.env.trash_mailbox && this.env.flag_for_deletion) {
      flag = 'delete';
      this.mark_message(flag);
      if(this.env.action=="show"){
        this.command('nextmessage','',this);
      } else if (this.selection.length == 1) {
        next_row = this.get_next_row();
        prev_row = this.get_prev_row();
        new_row = (next_row) ? next_row : prev_row;
        if (new_row) this.select_row(new_row.uid,false,false);
      }
    // if there isn't a defined trash mailbox and the config is set NOT to flag for deletion
    }else if (!this.env.trash_mailbox && !this.env.flag_for_deletion) {
      this.permanently_remove_messages();
    }
    return;
  };


  // set a specific flag to one or more messages
@@ -1570,13 +1755,22 @@
        {
        id = this.selection[n];
        a_uids[a_uids.length] = id;
      
        // 'remove' message row from list (just hide it)
        if (this.message_rows[id].obj)
          this.message_rows[id].obj.style.display = 'none';
        }
      }
      switch (flag) {
        case 'read':
        case 'unread':
          this.toggle_read_status(flag,a_uids);
          break;
        case 'delete':
        case 'undelete':
          this.toggle_delete_status(a_uids);
          break;
      }
    };

  // set class to read/unread
  this.toggle_read_status = function(flag, a_uids) {
    // mark all message rows as read/unread
    var icn_src;
    for (var i=0; i<a_uids.length; i++)
@@ -1609,12 +1803,98 @@
          this.message_rows[uid].icon.src = icn_src;
        }
      }
      this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
  }
  
  // mark all message rows as deleted/undeleted
  this.toggle_delete_status = function(a_uids) {
    if (this.env.read_when_deleted) {
      this.toggle_read_status('read',a_uids);
    }
    // if deleting message from "view message" don't bother with delete icon
    if (this.env.action == "show")
      return false;

    // send request to server
    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
    };
    if (a_uids.length==1){
      if(this.message_rows[a_uids[0]].classname.indexOf('deleted') < 0 ){
         this.flag_as_deleted(a_uids)
      } else {
         this.flag_as_undeleted(a_uids)
      }
      return true;
    }
    
    var all_deleted = true;
    
    for (var i=0; i<a_uids.length; i++) {
      uid = a_uids[i];
      if (this.message_rows[uid]) {
        if (this.message_rows[uid].classname.indexOf('deleted')<0) {
          all_deleted = false;
          break;
        }
      }
    }
    
    if (all_deleted)
      this.flag_as_undeleted(a_uids);
    else
      this.flag_as_deleted(a_uids);
    
    return true;
  }

  this.flag_as_undeleted = function(a_uids){
    // if deleting message from "view message" don't bother with delete icon
    if (this.env.action == "show")
      return false;

    var icn_src;
      
    for (var i=0; i<a_uids.length; i++) {
      uid = a_uids[i];
      if (this.message_rows[uid]) {
        this.message_rows[uid].deleted = false;
        
        if (this.message_rows[uid].classname.indexOf('deleted') > 0) {
          this.message_rows[uid].classname = this.message_rows[uid].classname.replace(/\s*deleted/, '');
          this.set_classname(this.message_rows[uid].obj, 'deleted', false);
        }
        if (this.message_rows[uid].unread && this.env.unreadicon)
          icn_src = this.env.unreadicon;
        else if (this.message_rows[uid].replied && this.env.repliedicon)
          icn_src = this.env.repliedicon;
        else if (this.env.messageicon)
          icn_src = this.env.messageicon;
        if (this.message_rows[uid].icon && icn_src)
          this.message_rows[uid].icon.src = icn_src;
      }
    }
    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
    return true;
  }
  
  this.flag_as_deleted = function(a_uids) {
    // if deleting message from "view message" don't bother with delete icon
    if (this.env.action == "show")
      return false;

    for (var i=0; i<a_uids.length; i++) {
      uid = a_uids[i];
      if (this.message_rows[uid]) {
        this.message_rows[uid].deleted = true;
        
        if (this.message_rows[uid].classname.indexOf('deleted')<0) {
          this.message_rows[uid].classname += ' deleted';
          this.set_classname(this.message_rows[uid].obj, 'deleted', true);
        }
        if (this.message_rows[uid].icon && this.env.deletedicon)
          this.message_rows[uid].icon.src = this.env.deletedicon;
      }
    }
    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
    return true;  
  }

  /*********************************************************/
  /*********        message compose methods        *********/
@@ -1703,12 +1983,15 @@
    var message = input_message ? input_message.value : '';
    var sig, p;

    if (!this.env.identity)
      this.env.identity = id

    // remove the 'old' signature
    if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
      {
      sig = this.env.signatures[this.env.identity];
      if (sig.indexOf('-- ')!=0)
        sig = '-- \n'+sig;
      if (sig.indexOf('--')!=0)
        sig = '--\n'+sig;

      p = message.lastIndexOf(sig);
      if (p>=0)
@@ -1719,8 +2002,8 @@
    if (this.env.signatures && this.env.signatures[id])
      {
      sig = this.env.signatures[id];
      if (sig.indexOf('-- ')!=0)
        sig = '-- \n'+sig;
      if (sig.indexOf('--')!=0)
        sig = '--\n'+sig;
      message += '\n'+sig;
      }

@@ -1728,6 +2011,7 @@
      input_message.value = message;
      
    this.env.identity = id;
    return true;
    };


@@ -1755,6 +2039,8 @@
    // clear upload form
    if (!a && this.gui_objects.attachmentform && this.gui_objects.attachmentform!=this.gui_objects.messageform)
      this.gui_objects.attachmentform.reset();
    
    return true;  
    };


@@ -1804,27 +2090,50 @@
    
    // set reference to the form object
    this.gui_objects.attachmentform = form;
    return true;
    };


  // add file name to attachment list
  // called from upload page
  this.add2attachment_list = function(name)
  this.add2attachment_list = function(name,content)
    {
    if (!this.gui_objects.attachmentlist)
      return false;
      
    var li = document.createElement('LI');
    li.innerHTML = name;
    li.id = name;
    li.innerHTML = content;
    this.gui_objects.attachmentlist.appendChild(li);
    return true;
    };

  this.remove_from_attachment_list = function(name)
    {
    if (!this.gui_objects.attachmentlist)
      return false;

    var list = this.gui_objects.attachmentlist.getElementsByTagName("li");
    for (i=0;i<list.length;i++)
      if (list[i].id == name)
   this.gui_objects.attachmentlist.removeChild(list[i]);
    }

  this.remove_attachment = function(name)
    {
    if (name)
      this.http_request('remove-attachment', '_filename='+escape(name));

    return true;
    }

  // send remote request to add a new contact
  this.add_contact = function(value)
    {
    if (value)
      this.http_request('addcontact', '_address='+value);
    
    return true;
    };

  // send remote request to search mail
@@ -1836,6 +2145,7 @@
      this.set_busy(true, 'searching');
      this.http_request('search', '_search='+value+'&_mbox='+mbox, true);
      }
    return true;
    };

  // reset quick-search form
@@ -1845,6 +2155,7 @@
      this.gui_objects.qsearchbox.value = '';
      
    this.env.search_request = null;
    return true;
    };
    

@@ -1887,6 +2198,7 @@
          highlight.removeAttribute('id');
          //highlight.removeAttribute('class');
          this.set_classname(highlight, 'selected', false);
          this.set_classname(highlight, 'unfocused', false);
          }

        if (next)
@@ -2146,6 +2458,7 @@
      this.set_busy(true);
      target.location.href = this.env.comm_path+'&_action='+action+'&_cid='+cid+add_url;
      }
    return true;
    };


@@ -2182,6 +2495,7 @@

    // send request to server
    this.http_request('delete', '_cid='+a_cids.join(',')+'&_from='+(this.env.action ? this.env.action : ''));
    return true;
    };


@@ -2192,10 +2506,11 @@
      return false;
      
    var row = this.contact_rows[cid].obj;
    for (var c=0; c<cols_arr.length; c++)
    for (var c=0; c<cols_arr.length; c++){
      if (row.cells[c])
        row.cells[c].innerHTML = cols_arr[c];

    }
    return true;
    };
  
  
@@ -2216,6 +2531,8 @@

    if (action == 'ldappublicsearch')
      target.location.href = this.env.comm_path+'&_action='+action+add_url;
      
    return true;
    };
 
  // add ldap contacts to address book
@@ -2253,7 +2570,7 @@
  this.load_identity = function(id, action)
    {
    if (action=='edit-identity' && (!id || id==this.env.iid))
      return;
      return false;

    var add_url = '';
    var target = window;
@@ -2269,6 +2586,7 @@
      this.set_busy(true);
      target.location.href = this.env.comm_path+'&_action='+action+'&_iid='+id+add_url;
      }
    return true;
    };


@@ -2293,9 +2611,10 @@

    // if (this.env.framed && id)
      this.set_busy(true);
      location.href = this.env.comm_path+'&_action=delete-identity&_iid='+id;
      location.href = this.env.comm_path+'&_action=delete-identity&_iid='+id;     
    // else if (id)
    //  this.http_request('delete-identity', '_iid='+id);
    return true;
    };


@@ -2309,6 +2628,20 @@
      this.http_request('create-folder', '_name='+escape(name), true);
    else if (form.elements['_folder_name'])
      form.elements['_folder_name'].focus();
    };

  this.rename_folder = function(props)
    {
    var form;
    if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'] && form.elements['_folder_newname'])
      {	
      oldname = form.elements['_folder_oldname'].value;
      newname = form.elements['_folder_newname'].value;
      }

    if (oldname && newname)
      this.http_request('rename-folder', '_folder_oldname='+escape(oldname)+'&_folder_newname='+escape(newname));

    };


@@ -2330,6 +2663,21 @@
    var row;
    if (id && (row = document.getElementById(id)))
      row.style.display = 'none';    

    // remove folder from rename-folder list
    var form;
    if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'])
      {
      for (var i=0;i<form.elements['_folder_oldname'].options.length;i++)
        {
        if (form.elements['_folder_oldname'].options[i].value == folder) 
     {
          form.elements['_folder_oldname'].options[i] = null;
     break;
          }
        }
      }
      form.elements['_folder_newname'].value='';
    };


@@ -2393,16 +2741,25 @@
   // add a new folder to the subscription list by cloning a folder row
   this.add_folder_row = function(name)
     {
     name = name.replace('\\',"");
     if (!this.gui_objects.subscriptionlist)
       return false;

     var tbody = this.gui_objects.subscriptionlist.tBodies[0];
     var id = tbody.childNodes.length+1;
     
     // clone a table row
     var row = this.clone_table_row(tbody.rows[0]);
     row.id = 'rcmrow'+id;
     tbody.appendChild(row);
   
     if (!tbody.rows[0]) 
       {
       // Refresh to create the first table row
       location.href = this.env.comm_path+'&_action=folders';
       }
     else
       {
       // clone a table row if there are existing rows
       var row = this.clone_table_row(tbody.rows[0]);
       row.id = 'rcmrow'+id;
       tbody.appendChild(row);
       }

     // add to folder/row-ID map
     this.env.subscriptionrows[row.id] = name;
@@ -2415,11 +2772,15 @@
       row.cells[1].firstChild.checked = true;
       }
     if (row.cells[2].firstChild.tagName=='A')
       row.cells[2].firstChild.onclick = new Function(this.ref+".command('delete-folder','"+name+"')");
       row.cells[2].firstChild.onclick = new Function(this.ref+".command('delete-folder','"+name.replace('\'','\\\'')+"')");

    var form;
    if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
      form.elements['_folder_name'].value = '';
     var form;
     if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
       form.elements['_folder_name'].value = '';
 
     // add new folder to rename-folder list
     form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);

     };


@@ -2522,6 +2883,26 @@
      }
    };

  // mouse down on button
  this.button_sel = function(command, id)
    {
    var a_buttons = this.buttons[command];
    var button, img;

    if(!a_buttons || !a_buttons.length)
      return;

    for(var n=0; n<a_buttons.length; n++)
      {
      button = a_buttons[n];
      if(button.id==id && button.status=='act')
        {
        img = document.getElementById(button.id);
        if (img && button.sel)
          img.src = button.sel;
        }
      }
    };

  // mouse out of button
  this.button_out = function(command, id)
@@ -2618,8 +2999,10 @@
      var current_li = document.getElementById('rcmbx'+s_current);
      var mbox_li = document.getElementById('rcmbx'+s_mbox);
      
      if (current_li)
      if (current_li) {
        this.set_classname(current_li, 'selected', false);
        this.set_classname(current_li, 'unfocused', false);
        }
      if (mbox_li)
        this.set_classname(mbox_li, 'selected', true);
      }
@@ -2638,7 +3021,8 @@
    var rowcount = tbody.rows.length;
    var even = rowcount%2;
    
    this.env.messages[uid] = {replied:flags.replied?1:0,
    this.env.messages[uid] = {deleted:flags.deleted?1:0,
                              replied:flags.replied?1:0,
                              unread:flags.unread?1:0};
    
    var row = document.createElement('TR');
@@ -2648,8 +3032,9 @@
    if (this.in_selection(uid))
      row.className += ' selected';

    var icon = flags.unread && this.env.unreadicon ? this.env.unreadicon :
               (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon);
    var icon = flags.deleted && this.env.deletedicon ? this.env.deletedicon:
               (flags.unread && this.env.unreadicon ? this.env.unreadicon :
               (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon));

    var col = document.createElement('TD');
    col.className = 'icon';
@@ -2898,11 +3283,13 @@
  this.http_response = function(request_obj)
    {
    var ctype = request_obj.get_header('Content-Type');
    if (ctype)
    if (ctype){
      ctype = String(ctype).toLowerCase();
      var ctype_array=ctype.split(";");
      ctype = ctype_array[0];
    }

    if (request_obj.__lock)
      this.set_busy(false);
    this.set_busy(false);

  console(request_obj.get_text());

@@ -2956,6 +3343,7 @@
  // send periodic request to check for recent messages
  this.check_for_recent = function()
    {
    this.set_busy(true, 'checkingmail');
    var d = new Date();
    this.http_request('check-recent', '_t='+d.getTime());
    };