Changeset 267 in subversion

Timestamp:

Jun 27, 2006 5:56:44 PM (7 years ago)

Author:

richs

Message:

Renameable folders, mail-checking changes, other fixes (richs)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• config/main.inc.php.dist (modified) (1 diff)
• index.php (modified) (1 diff)
• program/include/main.inc (modified) (7 diffs)
• program/include/rcube_imap.inc (modified) (1 diff)
• program/js/app.js (modified) (15 diffs)
• program/localization/cn/labels.inc (modified) (1 diff)
• program/localization/cn/messages.inc (modified) (1 diff)
• program/localization/de_CH/labels.inc (modified) (1 diff)
• program/localization/de_CH/messages.inc (modified) (1 diff)
• program/localization/de_DE/labels.inc (modified) (1 diff)
• program/localization/de_DE/messages.inc (modified) (1 diff)
• program/localization/el/labels.inc (modified) (1 diff)
• program/localization/el/messages.inc (modified) (1 diff)
• program/localization/en_GB/labels.inc (modified) (1 diff)
• program/localization/en_GB/messages.inc (modified) (1 diff)
• program/localization/en_US/labels.inc (modified) (2 diffs)
• program/localization/en_US/messages.inc (modified) (1 diff)
• program/localization/es/labels.inc (modified) (1 diff)
• program/localization/es/messages.inc (modified) (1 diff)
• program/localization/fr/labels.inc (modified) (1 diff)
• program/localization/fr/messages.inc (modified) (1 diff)
• program/localization/it/labels.inc (modified) (1 diff)
• program/localization/it/messages.inc (modified) (1 diff)
• program/localization/ja/labels.inc (modified) (1 diff)
• program/localization/ja/messages.inc (modified) (1 diff)
• program/localization/pt_BR/labels.inc (modified) (1 diff)
• program/localization/pt_BR/messages.inc (modified) (1 diff)
• program/localization/pt_PT/labels.inc (modified) (1 diff)
• program/localization/pt_PT/messages.inc (modified) (1 diff)
• program/localization/ru/labels.inc (modified) (1 diff)
• program/localization/ru/messages.inc (modified) (1 diff)
• program/steps/mail/check_recent.inc (added)
• program/steps/mail/func.inc (modified) (1 diff)
• program/steps/settings/manage_folders.inc (modified) (4 diffs)
• skins/default/common.css (modified) (1 diff)
• skins/default/images/buttons/add_contact_sel.png (added)
• skins/default/images/buttons/add_sel.png (added)
• skins/default/images/buttons/attach_sel.png (added)
• skins/default/images/buttons/back_sel.png (added)
• skins/default/images/buttons/compose_sel.png (added)
• skins/default/images/buttons/contacts_sel.png (added)
• skins/default/images/buttons/delete_sel.png (added)
• skins/default/images/buttons/download_sel.png (added)
• skins/default/images/buttons/drafts_sel.png (added)
• skins/default/images/buttons/edit_contact_sel.png (added)
• skins/default/images/buttons/forward_sel.png (added)
• skins/default/images/buttons/inbox_sel.png (added)
• skins/default/images/buttons/next_sel.png (added)
• skins/default/images/buttons/previous_sel.png (added)
• skins/default/images/buttons/print_sel.png (added)
• skins/default/images/buttons/reply_sel.png (added)
• skins/default/images/buttons/replyall_sel.png (added)
• skins/default/images/buttons/send_sel.png (added)
• skins/default/images/buttons/source_sel.png (added)
• skins/default/images/buttons/spellcheck_sel.png (added)
• skins/default/templates/addressbook.html (modified) (1 diff)
• skins/default/templates/compose.html (modified) (2 diffs)
• skins/default/templates/mail.html (modified) (2 diffs)
• skins/default/templates/managefolders.html (modified) (1 diff)
• skins/default/templates/message.html (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -1 +1 @@
 CHANGELOG RoundCube Webmail
 ---------------------------
+
+2006/06/26 (richs)
+----------
+- Added button to immediately check for new messages 
+- New message checking now displays status "Checking for new messages..."
+- New message checking now looks for unread messages in all mailboxes (Feature #1326401)
+- Task buttons now respond to clicks by darkening (as in other applications)
+- Fixed "Sender" column changing to "Recipient" for "Sent" and "Drafts" message lists
+- Added ability to sort messages by "Size"
+- Added ability to rename folders (Feature #1326396)
+- Added 'protect_default_folders' option to main.inc.php to prevent renames/deletes/unsubscribes of default folders
+- Corrected 5 typos of "INSTLL" to "INSTALL" in program/include/main.inc
+
 
 2006/06/25

trunk/roundcubemail/config/main.inc.php.dist

@@ -132 +132 @@
 // display these folders separately in the mailbox list
 $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash');
+
+// protect the default folders from renames, deletes, and subscription changes
+$rcmail_config['protect_default_folders'] = TRUE;
 
 // Set TRUE if deleted messages should not be displayed

trunk/roundcubemail/index.php

@@ -341 +341 @@
     include('program/steps/settings/save_prefs.inc');  
 
-  if ($_action=='folders' || $_action=='subscribe' || $_action=='unsubscribe' || $_action=='create-folder' || $_action=='delete-folder')
+  if ($_action=='folders' || $_action=='subscribe' || $_action=='unsubscribe' || $_action=='create-folder' || $_action=='rename-folder' || $_action=='delete-folder')
     include('program/steps/settings/manage_folders.inc');
 

trunk/roundcubemail/program/include/main.inc

@@ -290 +290 @@
 function rcube_language_prop($lang, $prop='lang')
   {
-  global $INSTLL_PATH;
+  global $INSTALL_PATH;
   static $rcube_languages, $rcube_language_aliases, $rcube_charsets;
 
   if (empty($rcube_languages))
-    @include($INSTLL_PATH.'program/localization/index.inc');
+    @include($INSTALL_PATH.'program/localization/index.inc');
     
   // check if we have an alias for that language
@@ -358 +358 @@
 
   // add some basic label to client
-  rcube_add_label('loading');
+  rcube_add_label('loading','checkingmail');
   }
 
@@ -765 +765 @@
   if (!sizeof($sa_languages))
     {
-    @include($INSTLL_PATH.'program/localization/index.inc');
-
-    if ($dh = @opendir($INSTLL_PATH.'program/localization'))
+    @include($INSTALL_PATH.'program/localization/index.inc');
+
+    if ($dh = @opendir($INSTALL_PATH.'program/localization'))
       {
       while (($name = readdir($dh)) !== false)
         {
-        if ($name{0}=='.' || !is_dir($INSTLL_PATH.'program/localization/'.$name))
+        if ($name{0}=='.' || !is_dir($INSTALL_PATH.'program/localization/'.$name))
           continue;
 
@@ -1193 +1193 @@
         'foldersubscription' => 'rcube_subscription_form',
         'createfolder' => 'rcube_create_folder_form',
+        'renamefolder' => 'rcube_rename_folder_form',
         'composebody' => 'rcmail_compose_body'
       );
@@ -1318 +1319 @@
                                 $attrib['type'],
                                 $attrib['imageact'] ? $skin_path.$attrib['imageact'] : $attrib['classact'],
-                                $attirb['imagesel'] ? $skin_path.$attirb['imagesel'] : $attrib['classsel'],
+                                $attrib['imagesel'] ? $skin_path.$attrib['imagesel'] : $attrib['classsel'],
                                 $attrib['imageover'] ? $skin_path.$attrib['imageover'] : ''));
 
@@ -1339 +1340 @@
     }
 
+  if ($command && $attrib['imagesel'])
+    {
+    $attrib['onmousedown'] = sprintf("return %s.button_sel('%s','%s')", $JS_OBJECT_NAME, $command, $attrib['id']);
+    $attrib['onmouseup'] = sprintf("return %s.button_out('%s','%s')", $JS_OBJECT_NAME, $command, $attrib['id']);
+    }
 
   $out = '';
@@ -1351 +1357 @@
       $btn_content .= ' '.$attrib['label'];
     
-    $link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'title');
+    $link_attrib = array('href', 'onclick', 'onmouseover', 'onmouseout', 'onmousedown', 'onmouseup', 'title');
     }
   else if ($attrib['type']=='link')

trunk/roundcubemail/program/include/rcube_imap.inc

@@ -1263 +1263 @@
 
   // set a new name to an existing mailbox
-  function rename_mailbox($mbox_name, $new_name)
-    {
-    // not implemented yet
+  function rename_mailbox($mbox_name, $new_name, $subscribe=TRUE)
+    {
+    $result = FALSE;
+
+    // replace backslashes
+    $name = preg_replace('/[\\\]+/', '-', $new_name);
+
+    $name_enc = UTF7EncodeString($new_name);
+
+    // reduce mailbox name to 100 chars
+    $name_enc = substr($name_enc, 0, 100);
+
+    $abs_name = $this->_mod_mailbox($name_enc);
+    $a_mailbox_cache = $this->get_cache('mailboxes');
+
+    if (strlen($abs_name) && (!is_array($a_mailbox_cache) || !in_array($abs_name, $a_mailbox_cache)))
+      $result = iil_C_RenameFolder($this->conn, $mbox_name, $abs_name);
+
+    // update mailboxlist cache
+    if ($result && $subscribe)
+      $this->unsubscribe($mbox_name);
+      $this->subscribe($name_enc);
+
+    return $result ? $name : FALSE;
     }
 

trunk/roundcubemail/program/js/app.js

@@ -124 +124 @@
 
         // 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')
@@ -212 +212 @@
           
         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;
@@ -614 +614 @@
           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);
           }
@@ -619 +624 @@
           this.list_contacts();
         break;
+
 
       case 'sort':
@@ -843 +849 @@
         break;
       
+      case 'checkmail':
+        this.check_for_recent();
+        break;
       
       case 'compose':
@@ -1035 +1044 @@
         break;
 
+      case 'rename-folder':
+        this.rename_folder(props);
+        break;
+
       case 'delete-folder':
         if (confirm(this.get_label('deletefolderconfirm')))
@@ -1555 +1568 @@
     {
     var table = this.gui_objects.messagelist;
+   
     var tbody = document.createElement('TBODY');
     table.insertBefore(tbody, table.tBodies[0]);
@@ -1564 +1578 @@
     };
 
+  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)
@@ -2585 +2611 @@
     };
 
+  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));
+    else if (form.elements['_folder_newname'])
+      form.elements['_folder_newname'].focus();
+    };
+
 
   this.delete_folder = function(folder)
@@ -2604 +2645 @@
     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;
+          }
+        }
+      }
     };
 
@@ -2672 +2727 @@
      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]);
@@ -2691 +2746 @@
        row.cells[2].firstChild.onclick = new Function(this.ref+".command('delete-folder','"+name+"')");
 
-    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
+     if (form.elements['_folder_oldname'])
+       form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);
+
      };
 
@@ -2796 +2856 @@
     };
 
+  // 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
@@ -3182 +3262 @@
     }
 
-    if (request_obj.__lock)
-      this.set_busy(false);
+    this.set_busy(false);
 
   console(request_obj.get_text());
@@ -3237 +3316 @@
   this.check_for_recent = function()
     {
+    this.set_busy(true, 'checkingmail');
     var d = new Date();
     this.http_request('check-recent', '_t='+d.getTime());

trunk/roundcubemail/program/localization/cn/labels.inc

@@ -95 +95 @@
 
 // toolbar buttons
+$labels['checkmail']        = '检查新消息';
 $labels['writenewmessage']  = '写新邮件';
 $labels['replytomessage']   = '回倍邮件';

trunk/roundcubemail/program/localization/cn/messages.inc

@@ -40 +40 @@
 
 $messages['loadingdata'] = '读取数据...';
+
+$messages['checkingmail'] = '检查新消息...';
 
 $messages['sendingmessage'] = '正圚发送邮件...';

trunk/roundcubemail/program/localization/de_CH/labels.inc

@@ -92 +92 @@
 
 // toolbar buttons // Symbolleisten-Tipps
+$labels['checkmail']        = 'ÜberprÃŒfung auf neue Anzeigen';
 $labels['writenewmessage']  = 'Neue Nachricht schreiben';
 $labels['replytomessage']   = 'Antwort verfassen';

trunk/roundcubemail/program/localization/de_CH/messages.inc

@@ -34 +34 @@
 
 $messages['loading'] = $messages['loadingdata'] = 'Daten werden geladen...';
+
+$messages['checkingmail'] = 'ÜberprÃŒfung auf neue Anzeigen...';
 
 $messages['sendingmessage'] = 'Nachricht wird gesendet...';

trunk/roundcubemail/program/localization/de_DE/labels.inc

@@ -93 +93 @@
 
 // toolbar buttons // Symbolleisten-Tipps
+$labels['checkmail']        = 'ÜberprÃŒfung auf neue Anzeigen';
 $labels['writenewmessage']  = 'Neue Nachricht schreiben';
 $labels['replytomessage']   = 'Antwort verfassen';

trunk/roundcubemail/program/localization/de_DE/messages.inc

@@ -36 +36 @@
 
 $messages['loading'] = $messages['loadingdata'] = 'Daten werden geladen...';
+
+$messages['checkingmail'] = 'ÜberprÃŒfung auf neue Anzeigen...';
 
 $messages['sendingmessage'] = 'Nachricht wird gesendet...';

trunk/roundcubemail/program/localization/el/labels.inc

@@ -115 +115 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Έλεγχος για τα Μέα ΌηΜύΌατα';
 $labels['writenewmessage']  = 'ΔηΌιοÏ
 ργία ΜέοÏ

trunk/roundcubemail/program/localization/el/messages.inc

@@ -46 +46 @@
 
 $messages['loadingdata'] = 'Ίόρτωση ΎεΎοΌέΜωΜ...';
+
+$messages['checkingmail'] = 'Έλεγχος για τα Μέα ΌηΜύΌατα...';
 
 $messages['sendingmessage'] = 'Αποστολή ΌηΜύΌατος...';

trunk/roundcubemail/program/localization/en_GB/labels.inc

@@ -92 +92 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Check for new messages';
 $labels['writenewmessage']  = 'Create a new message';
 $labels['replytomessage']   = 'Reply to the message';

trunk/roundcubemail/program/localization/en_GB/messages.inc

@@ -36 +36 @@
 
 $messages['loadingdata'] = 'Loading data...';
+
+$messages['checkingmail'] = 'Checking for new messages...';
 
 $messages['messagesent'] = 'Message sent successfully';

trunk/roundcubemail/program/localization/en_US/labels.inc

@@ -91 +91 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Check for new messages';
 $labels['writenewmessage']  = 'Create a new message';
 $labels['replytomessage']   = 'Reply to the message';
@@ -209 +210 @@
 $labels['create']  = 'Create';
 $labels['createfolder']  = 'Create new folder';
+$labels['rename'] = 'Rename';
+$labels['renamefolder'] = 'Rename existing folder';
 $labels['deletefolder']  = 'Delete folder';
 $labels['managefolders']  = 'Manage folders';

trunk/roundcubemail/program/localization/en_US/messages.inc

@@ -36 +36 @@
 
 $messages['loadingdata'] = 'Loading data...';
+
+$messages['checkingmail'] = 'Checking for new messages...';
 
 $messages['sendingmessage'] = 'Sending message...';

trunk/roundcubemail/program/localization/es/labels.inc

@@ -95 +95 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Comprobación para saber si hay nuevos mensajes';
 $labels['writenewmessage']  = 'Crear nuevo mensaje';
 $labels['replytomessage']   = 'Responder al mensaje';

trunk/roundcubemail/program/localization/es/messages.inc

@@ -43 +43 @@
 
 $messages['loadingdata'] = 'Cargando datos...';
+
+$messages['checkingmail'] = 'Comprobación para saber si hay nuevos mensajes...';
 
 $messages['sendingmessage'] = 'Enviando mensaje...';

trunk/roundcubemail/program/localization/fr/labels.inc

@@ -92 +92 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Vérification les nouveaux messages';
 $labels['writenewmessage']  = 'Créer un nouveau message';
 $labels['replytomessage']   = 'Répondre au message';

trunk/roundcubemail/program/localization/fr/messages.inc

@@ -36 +36 @@
 
 $messages['loadingdata'] = 'Chargement des données en cours...';
+
+$messages['checkingmail'] = 'Vérification les nouveaux messages...';
 
 $messages['sendingmessage'] = 'Message en cours d\'envoi...';

trunk/roundcubemail/program/localization/it/labels.inc

@@ -92 +92 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Controllando per vedere se c'Ú nuovi messaggi';
 $labels['writenewmessage']  = 'Scrivi un nuovo messaggio';
 $labels['replytomessage']   = 'Rispondi al messaggio';

trunk/roundcubemail/program/localization/it/messages.inc

@@ -36 +36 @@
 
 $messages['loadingdata'] = 'Caricamento dati...';
+
+$messages['checkingmail'] = 'Controllando per vedere se c'Ú nuovi messaggi...';
 
 $messages['sendingmessage'] = 'Invio messaggio in corso...';

trunk/roundcubemail/program/localization/ja/labels.inc

@@ -98 +98 @@
 
 // toolbar buttons
+$labels['checkmail']        = '新しいメッセヌゞがあるように確認';
 $labels['writenewmessage']  = '新芏メッセヌゞを䜜成する';
 $labels['replytomessage']   = 'メッセヌゞを返信する';

trunk/roundcubemail/program/localization/ja/messages.inc

@@ -36 +36 @@
 
 $messages['loadingdata'] = 'デヌタを読み蟌み䞭です...';
+
+$messages['checkingmail'] = '新しいメッセヌゞがあるように確認...';
 
 $messages['sendingmessage'] = 'メッセヌゞの送信䞭です...';

trunk/roundcubemail/program/localization/pt_BR/labels.inc

@@ -91 +91 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Verificar para ver se há mensagens novas';
 $labels['writenewmessage']  = 'Criar nova mensagem';
 $labels['replytomessage']   = 'Responder';

trunk/roundcubemail/program/localization/pt_BR/messages.inc

@@ -34 +34 @@
 
 $messages['loadingdata'] = 'Carregando informações...';
+
+$messages['checkingmail'] = 'Verificar para ver se há mensagens novas...';
 
 $messages['messagesent'] = 'Mensagem enviada';

trunk/roundcubemail/program/localization/pt_PT/labels.inc

@@ -90 +90 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'Verificar para ver se há mensagens novas';
 $labels['writenewmessage']  = 'Criar nova mensagem';
 $labels['replytomessage']   = 'Responder';

trunk/roundcubemail/program/localization/pt_PT/messages.inc

@@ -35 +35 @@
 
 $messages['loadingdata'] = 'Carregando Informações...';
+
+$messages['checkingmail'] = 'Verificar para ver se há mensagens novas...';
 
 $messages['sendingmessage'] = 'A enviar mensagem...';

trunk/roundcubemail/program/localization/ru/labels.inc

@@ -94 +94 @@
 
 // toolbar buttons
+$labels['checkmail']        = 'ПрПверять Ўля МПвыÑ
+ сППбщеМОй';
 $labels['writenewmessage']  = 'НПвПе сППбщеМОе';
 $labels['replytomessage']   = 'ОтветОть';

trunk/roundcubemail/program/localization/ru/messages.inc

@@ -38 +38 @@
 $messages['loadingdata'] = 'Загрузка ЎаММыÑ
 ...';
+
+$messages['checkingmail'] = 'ПрПверять Ўля МПвыÑ
+ сППбщеМОй...';
 
 $messages['sendingmessage'] = 'Отправка сППбщеМОя...';

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

@@ -305 +305 @@
   // define list of cols to be displayed
   $a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
-  $a_sort_cols = array('subject', 'date', 'from', 'to');
+  $a_sort_cols = array('subject', 'date', 'from', 'to', 'size');
   
   // show 'to' instead of from in sent messages
-  if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))
+  if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox']) && ($f = array_search('from', $a_show_cols))
       && !array_search('to', $a_show_cols))
     $a_show_cols[$f] = 'to';

trunk/roundcubemail/program/steps/settings/manage_folders.inc

@@ -20 +20 @@
 */
 
-// init IAMP connection
+// init IMAP connection
 rcmail_imap_init(TRUE);
 
@@ -61 +61 @@
     }
   else if (!$create)
+    show_message('errorsaving', 'error');
+  }
+
+// rename a mailbox
+else if ($_action=='rename-folder')
+  {
+  if (!empty($_GET['_folder_oldname']) && !empty($_GET['_folder_newname']))
+    $rename = $IMAP->rename_mailbox(get_input_value('_folder_oldname', RCUBE_INPUT_GET), trim(get_input_value('_folder_newname', RCUBE_INPUT_GET)), TRUE);
+
+  if ($rename && $REMOTE_REQUEST)
+    {
+    $commands = sprintf("this.add_folder_row('%s');", rep_specialchars_output($rename, 'js')); 
+    $commands .= sprintf("this.remove_folder_row('%s')", rep_specialchars_output($_GET['_folder_oldname'], 'js'));
+    rcube_remote_response($commands);
+    }
+  else if (!$rename && $REMOTE_REQUEST)
+    {
+    $commands = show_message('errorsaving', 'error');
+    rcube_remote_response($commands);
+    }
+  else if (!$rename)
     show_message('errorsaving', 'error');
   }
@@ -121 +142 @@
   foreach ($a_unsubscribed as $i => $folder)
     {
+    if ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders']))
+      continue;
+
     $zebra_class = $i%2 ? 'even' : 'odd';
     $folder_js = rep_specialchars_output($folder, 'js');
@@ -177 +201 @@
   }
 
+function rcube_rename_folder_form($attrib)
+  {
+  global $CONFIG, $IMAP, $JS_OBJECT_NAME;
+
+  list($form_start, $form_end) = get_form_tags($attrib, 'rename-folder');
+  unset($attrib['form']);
+
+  // return the complete edit form as table
+  $out = "$form_start\n";
+
+  $a_unsubscribed = $IMAP->list_unsubscribed();
+  $select_folder = new select(array('name' => '_folder_oldname', 'id' => 'rcmfd_oldfolder'));
+
+  foreach ($a_unsubscribed as $i => $folder)
+    {
+    if ($CONFIG['protect_default_folders'] == TRUE && in_array($folder,$CONFIG['default_imap_folders'])) 
+      continue;
+
+    $select_folder->add($folder);
+    }
+
+  $out .= $select_folder->show();
+
+  $out .= " to ";
+  $inputtwo = new textfield(array('name' => '_folder_newname'));
+  $out .= $inputtwo->show();
+
+  if (get_boolean($attrib['button']))
+    {
+    $button = new input_field(array('type' => 'button',
+                                    'value' => rcube_label('rename'),
+                                    'onclick' => "$JS_OBJECT_NAME.command('rename-folder',this.form)"));
+    $out .= $button->show();
+    }
+
+  $out .= "\n$form_end";
+
+  return $out;
+  }
+
 
 // add some labels to client

trunk/roundcubemail/skins/default/common.css

@@ -40 +40 @@
 {
   color: #000000;
+  outline: none;
 }
 

trunk/roundcubemail/skins/default/templates/addressbook.html

@@ -12 +12 @@
 
 <div id="abooktoolbar">
-<roundcube:button command="add" imageAct="/images/buttons/add_contact_act.png" imagePas="/images/buttons/add_contact_pas.png" width="32" height="32" title="newcontact" />
-<roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletecontact" />
-<roundcube:button command="compose" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="composeto" />
-<roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="print" />
-<roundcube:button command="export" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="export" />
-<roundcube:button command="ldappublicsearch" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="ldapsearch" />
+<roundcube:button command="add" imageSel="/images/buttons/add_contact_sel.png" imageAct="/images/buttons/add_contact_act.png" imagePas="/images/buttons/add_contact_pas.png" width="32" height="32" title="newcontact" />
+<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletecontact" />
+<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="composeto" />
+<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="print" />
+<roundcube:button command="export" imageSel="/images/buttons/download_sel.png" imageAct="/images/buttons/download_act.png" imagePas="/images/buttons/download_pas.png" width="32" height="32" title="export" />
+<roundcube:button command="ldappublicsearch" imageSel="/images/buttons/contacts_sel.png" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="ldapsearch" />
 </div>
 
 <div id="abookcountbar">
-<roundcube:button command="previouspage" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
+<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previouspage" />
 &nbsp;<roundcube:object name="recordsCountDisplay" />&nbsp;
-<roundcube:button command="nextpage" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
+<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextpage" />
 </div>
 

trunk/roundcubemail/skins/default/templates/compose.html

@@ -39 +39 @@
 
 <div id="messagetoolbar">
-<roundcube:button command="list" image="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
-<roundcube:button command="send" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" />
-<!--<roundcube:button command="contacts" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="addressbook" />-->
-<roundcube:button command="spellcheck" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" />
-<roundcube:button command="add-attachment" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" />
-<roundcube:button command="savedraft" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" />
+<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
+<roundcube:button command="send" imageSel="/images/buttons/send_sel.png" imageAct="/images/buttons/send_act.png" imagePas="/images/buttons/send_pas.png" width="32" height="32" title="sendmessage" />
+<!--<roundcube:button command="contacts" imageSel="/images/buttons/contacts_sel.png" imageAct="/images/buttons/contacts_act.png" imagePas="/images/buttons/contacts_pas.png" width="32" height="32" title="addressbook" />-->
+<roundcube:button command="spellcheck" imageSel="/images/buttons/spellcheck_sel.png" imageAct="/images/buttons/spellcheck_act.png" imagePas="/images/buttons/spellcheck_pas.png" width="32" height="32" title="checkspelling" />
+<roundcube:button command="add-attachment" imageSel="/images/buttons/attach_sel.png" imageAct="/images/buttons/attach_act.png" imagePas="/images/buttons/attach_pas.png" width="32" height="32" title="addattachment" />
+<roundcube:button command="savedraft" imageSel="/images/buttons/drafts_sel.png" imageAct="/images/buttons/drafts_act.png" imagePas="/images/buttons/drafts_pas.png" width="32" height="32" title="savemessage" />
 
 <div id="priority-selector">
@@ -114 +114 @@
 <div><roundcube:label name="attachments" /></div>
 <roundcube:object name="composeAttachmentList" />
-<p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" />
+<p><roundcube:button command="add-attachment" imagePas="/images/buttons/add_pas.png" imageSel="/images/buttons/add_sel.png" imageAct="/images/buttons/add_act.png" width="23" height="18" title="addattachment" />
 </div>
 

trunk/roundcubemail/skins/default/templates/mail.html

@@ -12 +12 @@
 
 <div id="messagetoolbar">
-<roundcube:button command="compose" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
-<roundcube:button command="reply" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
-<roundcube:button command="reply-all" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
-<roundcube:button command="forward" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
-<roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
-<roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
+<roundcube:button command="checkmail" imageSel="/images/buttons/inbox_sel.png" imageAct="/images/buttons/inbox_act.png" imagePas="/images/buttons/inbox_pas.png" width="32" height="32" title="checkmail" />
+<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
+<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
+<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
+<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
+<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
+<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
 </div>
 
@@ -25 +26 @@
 
 <div id="messagecountbar">
-<roundcube:button command="previouspage" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
+<roundcube:button command="previouspage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
-<roundcube:button command="nextpage" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
+<roundcube:button command="nextpage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
 </div>
 

trunk/roundcubemail/skins/default/templates/managefolders.html

@@ -29 +29 @@
 </div>
 </div>
+
+<div class="settingsbox">
+<div class="boxtitle"><roundcube:label name="renamefolder" /></div>
+
+<div class="settingspart">
+<roundcube:label name="foldername" />:&nbsp;
+<roundcube:object name="renamefolder" form="subscriptionform" />
+<roundcube:button command="rename-folder" type="input" class="button" label="rename" />
+</div>
+</div>
+
 </div>
 

trunk/roundcubemail/skins/default/templates/message.html

@@ -12 +12 @@
 
 <div id="messagecountbar">
-<roundcube:button command="previousmessage" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
+<roundcube:button command="previousmessage" imageSel="/images/buttons/previous_sel.png" imageAct="/images/buttons/previous_act.png" imagePas="/images/buttons/previous_pas.png" width="11" height="11" title="previousmessages" />
 &nbsp;<roundcube:object name="messageCountDisplay" />&nbsp;
-<roundcube:button command="nextmessage" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
+<roundcube:button command="nextmessage" imageSel="/images/buttons/next_sel.png" imageAct="/images/buttons/next_act.png" imagePas="/images/buttons/next_pas.png" width="11" height="11" title="nextmessages" />
 </div>
 
 <div id="messagetoolbar">
-<roundcube:button command="list" image="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
-<roundcube:button command="compose" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
-<roundcube:button command="reply" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
-<roundcube:button command="reply-all" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
-<roundcube:button command="forward" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
-<roundcube:button command="delete" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
-<roundcube:button command="print" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
-<roundcube:button command="viewsource" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
+<roundcube:button command="list" image="/images/buttons/back_act.png" imageSel="/images/buttons/back_sel.png" imageAct="/images/buttons/back_act.png" width="32" height="32" title="backtolist" />
+<roundcube:button command="compose" imageSel="/images/buttons/compose_sel.png" imageAct="/images/buttons/compose_act.png" imagePas="/images/buttons/compose_pas.png" width="32" height="32" title="writenewmessage" />
+<roundcube:button command="reply" imageSel="/images/buttons/reply_sel.png" imageAct="/images/buttons/reply_act.png" imagePas="/images/buttons/reply_pas.png" width="32" height="32" title="replytomessage" />
+<roundcube:button command="reply-all" imageSel="/images/buttons/replyall_sel.png" imageAct="/images/buttons/replyall_act.png" imagePas="/images/buttons/replyall_pas.png" width="32" height="32" title="replytoallmessage" />
+<roundcube:button command="forward" imageSel="/images/buttons/forward_sel.png" imageAct="/images/buttons/forward_act.png" imagePas="/images/buttons/forward_pas.png" width="32" height="32" title="forwardmessage" />
+<roundcube:button command="delete" imageSel="/images/buttons/delete_sel.png" imageAct="/images/buttons/delete_act.png" imagePas="/images/buttons/delete_pas.png" width="32" height="32" title="deletemessage" />
+<roundcube:button command="print" imageSel="/images/buttons/print_sel.png" imageAct="/images/buttons/print_act.png" imagePas="/images/buttons/print_pas.png" width="32" height="32" title="printmessage" />
+<roundcube:button command="viewsource" imageSel="/images/buttons/source_sel.png" imageAct="/images/buttons/source_act.png" imagePas="/images/buttons/source_pas.png" width="32" height="32" title="viewsource" />
 <roundcube:object name="mailboxlist" type="select" noSelection="moveto" maxlength="25" onchange="rcmail.command('moveto', this.options[this.selectedIndex].value)" class="mboxlist" />
 </div>