Changeset 962 in subversion

Timestamp:

Jan 28, 2008 9:28:08 AM (5 years ago)

Author:

till

Message:

• comitted part of the patch
• fixed a lot of CS
• fixed some bugs I "saw"

Location:

branches/devel-vnext/program

Files:

• include/rcube/rcmail_compose.php (modified) (15 diffs)
• steps/addressbook/copy.inc (modified) (2 diffs)
• steps/addressbook/func.inc (modified) (5 diffs)
• steps/addressbook/mailto.inc (modified) (3 diffs)
• steps/addressbook/save.inc (modified) (4 diffs)
• steps/error.inc (modified) (1 diff)
• steps/mail/addcontact.inc (modified) (1 diff)
• steps/mail/check_recent.inc (modified) (5 diffs)
• steps/mail/compose.inc (modified) (5 diffs)
• steps/mail/folders.inc (modified) (3 diffs)
• steps/mail/func.inc (modified) (51 diffs)
• steps/mail/get.inc (modified) (7 diffs)
• steps/mail/getunread.inc (modified) (1 diff)
• steps/mail/list.inc (modified) (3 diffs)
• steps/mail/move_del.inc (modified) (6 diffs)
• steps/mail/quotadisplay.inc (modified) (1 diff)
• steps/mail/rss.inc (modified) (6 diffs)
• steps/mail/search.inc (modified) (2 diffs)
• steps/mail/sendmail.inc (modified) (14 diffs)
• steps/mail/sendmdn.inc (added)
• steps/mail/show.inc (modified) (4 diffs)
• steps/mail/spell.inc (modified) (1 diff)
• steps/mail/upload.inc (modified) (1 diff)
• steps/mail/viewsource.inc (modified) (1 diff)
• steps/settings/delete_identity.inc (modified) (2 diffs)
• steps/settings/edit_identity.inc (modified) (9 diffs)
• steps/settings/func.inc (modified) (4 diffs)
• steps/settings/manage_folders.inc (modified) (9 diffs)
• steps/settings/save_identity.inc (modified) (6 diffs)
• steps/settings/save_prefs.inc (modified) (2 diffs)

branches/devel-vnext/program/include/rcube/rcmail_compose.php

@@ -11 +11 @@
     $MESSAGE       = $registry->get('MESSAGE', 'core');
     $DB            = $registry->get('DB', 'core');
+    $USER          = $registry->get('USER', 'core');
     $compose_mode  = $registry->get('compose_mode', 'core');
     $sa_recipients = $registry->get('sa_recipients', 'core');
@@ -24 +25 @@
 
     switch ($part) {
-        case 'from':
-            return rcmail_compose_header_from($attrib);
-
-        case 'to':
-            $fname = '_to';
-            $header = 'to';
-
-            // we have a set of recipients stored is session
-            if (
-                ($mailto_id = rcube::get_input_value('_mailto', rcube::INPUT_GET))
-                && $_SESSION['mailto'][$mailto_id]
-            ) {
-                $fvalue = $_SESSION['mailto'][$mailto_id];
-            }
-            elseif (!empty($_GET['_to'])) {
-                $fvalue = rcube::get_input_value('_to', rcube::INPUT_GET);
-            }
-
-        case 'cc':
-            if (!$fname) {
-                $fname = '_cc';
-                $header = 'cc';
-            }
-        case 'bcc':
-            if (!$fname) {
-                $fname = '_bcc';
-                $header = 'bcc';
-            }
-            $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'wrap', 'tabindex');
-            $field_type = 'html_textarea';
-            break;
-
-        case 'replyto':
-        case 'reply-to':
-            $fname = '_replyto';
-            $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
-            $field_type = 'html_inputfield';
-            break;
+    case 'from':
+        return rcmail_compose_header_from($attrib);
+
+    case 'to':
+        $fname = '_to';
+        $header = 'to';
+
+        // we have a set of recipients stored is session
+        if (
+            ($mailto_id = rcube::get_input_value('_mailto', rcube::INPUT_GET))
+            && $_SESSION['mailto'][$mailto_id]
+        ) {
+            $fvalue = $_SESSION['mailto'][$mailto_id];
+        }
+        elseif (!empty($_GET['_to'])) {
+            $fvalue = rcube::get_input_value('_to', rcube::INPUT_GET);
+        }
+
+    case 'cc':
+        if (!$fname) {
+            $fname = '_cc';
+            $header = 'cc';
+        }
+    case 'bcc':
+        if (!$fname) {
+            $fname = '_bcc';
+            $header = 'bcc';
+        }
+        $allow_attrib = array('id', 'class', 'style', 'cols', 'rows', 'wrap', 'tabindex');
+        $field_type = 'html_textarea';
+        break;
+
+    case 'replyto':
+    case 'reply-to':
+        $fname = '_replyto';
+        $allow_attrib = array('id', 'class', 'style', 'size', 'tabindex');
+        $field_type = 'html_inputfield';
+        break;
     }
 
@@ -76 +77 @@
     if ($fname && !empty($_POST[$fname])) {
         $fvalue = rcube::get_input_value($fname, rcube::INPUT_POST, TRUE);
-    }
-    else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY) {
+    } else if ($header && $compose_mode == RCUBE_COMPOSE_REPLY) {
         // get recipent address(es) out of the message headers
         if ($header=='to' && !empty($reply_to)) {
             $fvalue = $reply_to;
-        }
-        else if ($header=='to' && !empty($from)) {
+        } else if ($header=='to' && !empty($from)) {
             $fvalue = $from;
         }
@@ -158 +157 @@
     $MESSAGE       = $registry->get('MESSAGE', 'core');
     $DB            = $registry->get('DB', 'core');
+    $USER          = $registry->get('USER', 'core');
     $compose_mode  = $registry->get('compose_mode', 'core');
     $OUTPUT        = $registry->get('OUTPUT', 'core');
@@ -190 +190 @@
     }
 
-    // get this user's identities
-    $_query = "SELECT identity_id, name, email, signature, html_signature";
-    $_query.= " FROM " . rcube::get_table_name('identities');
-    $_query.= " WHERE user_id=?";
-    $_query.= " AND del<>1";
-    $_query.= " ORDER BY " . $DB->quoteIdentifier('standard')." DESC, name ASC";
-
-    //rcube::tfk_debug($_query);
-
-    $sql_result = $DB->query($_query, $_SESSION['user_id']);
-
-
+    $sql_result = $USER->list_identities();
     if ($DB->num_rows($sql_result) == 0) {
         $input_from = new html_inputfield($field_attrib);
@@ -239 +228 @@
             }
         }
-
+        
         // set identity if it's one of the reply-message recipients
         if (in_array($sql_arr['email'], $a_recipients)) {
             $from_id = $sql_arr['identity_id'];
         }
+        
         if ($compose_mode == RCUBE_COMPOSE_REPLY && is_array($MESSAGE['FROM'])) {
             $MESSAGE['FROM'][] = $sql_arr['email'];
         }
+        
         if ($compose_mode == RCUBE_COMPOSE_DRAFT && strstr($MESSAGE['headers']->from, $sql_arr['email'])) {
             $from_id = $sql_arr['identity_id'];
@@ -286 +277 @@
     if ($CONFIG['htmleditor']) {
         $isHtml = true;
-    }
-    else {
+    } else {
         $isHtml = false;
     }
@@ -295 +285 @@
     if (!empty($_POST['_message'])) {
         $body = rcube::get_input_value('_message', rcube::INPUT_POST, TRUE);
-    }
-    // compose reply-body
-    elseif ($compose_mode == RCUBE_COMPOSE_REPLY) {
+    } elseif ($compose_mode == RCUBE_COMPOSE_REPLY) {
+        // compose reply-body
         $hasHtml = rcmail_has_html_part($MESSAGE['parts']);
         if ($hasHtml && $CONFIG['htmleditor']) {
             $body = rcmail_first_html_part($MESSAGE);
             $isHtml = true;
-        }
-        else {
+        } else {
             $body = rcmail_first_text_part($MESSAGE);
             $isHtml = false;
         }
         $body = rcmail_create_reply_body($body, $isHtml);
-    }
-    // forward message body inline
-    elseif ($compose_mode == RCUBE_COMPOSE_FORWARD) {
+    } elseif ($compose_mode == RCUBE_COMPOSE_FORWARD) {
+        // forward message body inline
         $hasHtml = rcmail_has_html_part($MESSAGE['parts']);
         if ($hasHtml && $CONFIG['htmleditor']) {
             $body = rcmail_first_html_part($MESSAGE);
             $isHtml = true;
-        }
-        else {
+        } else {
             $body = rcmail_first_text_part($MESSAGE);
             $isHtml = false;
         }
         $body = rcmail_create_forward_body($body, $isHtml);
-    }
-    elseif ($compose_mode == RCUBE_COMPOSE_DRAFT) {
+    } elseif ($compose_mode == RCUBE_COMPOSE_DRAFT) {
         $hasHtml = rcmail_has_html_part($MESSAGE['parts']);
         if ($hasHtml && $CONFIG['htmleditor']) {
             $body = rcmail_first_html_part($MESSAGE);
             $isHtml = true;
-        }
-        else {
-           $body = rcmail_first_text_part($MESSAGE);
+        } else {
+            $body = rcmail_first_text_part($MESSAGE);
             $isHtml = false;
         }
         $body = rcmail_create_draft_body($body, $isHtml);
     }
+    
+    $OUTPUT->include_script('tiny_mce/tiny_mce.js');
+    $OUTPUT->include_script("editor.js");
+    $OUTPUT->add_script('rcmail_editor_init("$__skin_path");');
+    
     $out = $form_start ? "$form_start\n" : '';
 
-    //tfk_debug($MESSAGE['headers']);
-
     $saveid = new html_hiddenfield(
-                    array(
-                        'name' => '_draft_saveid',
-                        'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'),
-                        "",
-                        $MESSAGE['headers']->messageID) : ''
-                    )
-    );
+        array(
+            'name' => '_draft_saveid',
+            'value' => $compose_mode==RCUBE_COMPOSE_DRAFT ? str_replace(array('<','>'),
+            "",
+            $MESSAGE['headers']->messageID) : ''
+        ));
     $out .= $saveid->show();
 
@@ -370 +356 @@
         $OUTPUT->include_script('googiespell.js');
         $OUTPUT->add_script(
-                    sprintf(
-                      "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
-                      "googie.lang_chck_spell = \"%s\";\n".
-                      "googie.lang_rsm_edt = \"%s\";\n".
-                      "googie.lang_close = \"%s\";\n".
-                      "googie.lang_revert = \"%s\";\n".
-                      "googie.lang_no_error_found = \"%s\";\n%s".
-                      "googie.setCurrentLanguage('%s');\n".
-                      "googie.decorateTextarea('%s');\n".
-                      "%s.set_env('spellcheck', googie);",
-                      $COMM_PATH,
-                      JQ(Q(rcube::gettext('checkspelling'))),
-                      JQ(Q(rcube::gettext('resumeediting'))),
-                      JQ(Q(rcube::gettext('close'))),
-                      JQ(Q(rcube::gettext('revertto'))),
-                      JQ(Q(rcube::gettext('nospellerrors'))),
-                      $lang_set,
-                      substr($_SESSION['user_lang'], 0, 2),
-                      $attrib['id'],
-                      JS_OBJECT_NAME), 'foot'
-        );
+            sprintf(
+                "var googie = new GoogieSpell('\$__skin_path/images/googiespell/','%s&_action=spell&lang=');\n".
+                "googie.lang_chck_spell = \"%s\";\n".
+                "googie.lang_rsm_edt = \"%s\";\n".
+                "googie.lang_close = \"%s\";\n".
+                "googie.lang_revert = \"%s\";\n".
+                "googie.lang_no_error_found = \"%s\";\n%s".
+                "googie.setCurrentLanguage('%s');\n".
+                "googie.decorateTextarea('%s');\n".
+                "%s.set_env('spellcheck', googie);",
+                $COMM_PATH,
+                JQ(Q(rcube::gettext('checkspelling'))),
+                JQ(Q(rcube::gettext('resumeediting'))),
+                JQ(Q(rcube::gettext('close'))),
+                JQ(Q(rcube::gettext('revertto'))),
+                JQ(Q(rcube::gettext('nospellerrors'))),
+                $lang_set,
+                substr($_SESSION['user_lang'], 0, 2),
+                $attrib['id'],
+                JS_OBJECT_NAME), 'foot');
         $OUTPUT->add_label('checking');
     }
@@ -428 +413 @@
             if (strpos($a_lines[$n], '>')===0) {
                 $a_lines[$n] = '>'.$a_lines[$n];
-            }
-            else {
+            } else {
                 $a_lines[$n] = '> '.$a_lines[$n];
             }
@@ -438 +422 @@
         // add title line
         $prefix = sprintf(
-                        "\n\n\nOn %s, %s wrote:\n",
-                        $_date,
-                        $_from
+            "\n\n\nOn %s, %s wrote:\n",
+            $_date,
+            $_from
         );
 
@@ -450 +434 @@
         }
         $suffix = '';
-    }
-    else {
+    } else {
         $_msg = "<br><br>On %s, %s wrote:<br><blockquote type=\"cite\" ";
         $_msg.= "style=\"padding-left: 5px; border-left: #1010ff 2px solid; ";
         $_msg.= "margin-left: 5px; width: 100%%\">";
         $prefix = sprintf(
-                        $_msg,
-                        $_date,
-                        $_from
+            $_msg,
+            $_date,
+            $_from
         );
         $suffix = "</blockquote>";
@@ -478 +461 @@
     $_to      = $MESSAGE['headers']->to;
 
+    $prefix = '';
+    $suffix = '';
     if (! $bodyIsHtml) {
         // soft-wrap message first
         $body = wordwrap($body, 80);
 
-        $prefix = sprintf(
-                    "\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
-                    $_subject,
-                    $_date,
-                    $IMAP->decode_header($_from),
-                    $IMAP->decode_header($_to)
-        );
-    }
-    else {
-        $prefix = sprintf(
-                "<br><br>-------- Original Message --------" .
-                "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\"><tbody>" .
-                "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Subject: </th><td>%s</td></tr>" .
-                "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">Date: </th><td>%s</td></tr>" .
-                "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">From: </th><td>%s</td></tr>" .
-                "<tr><th align=\"right\" nowrap=\"nowrap\" valign=\"baseline\">To: </th><td>%s</td></tr>" .
-                "</tbody></table><br>",
-                Q($_subject),
-                Q($_date),
-                Q($IMAP->decode_header($_from)),
-                Q($IMAP->decode_header($_to))
-        );
+        $prefix .= sprintf(
+            "\n\n\n-------- Original Message --------\nSubject: %s\nDate: %s\nFrom: %s\nTo: %s\n\n",
+            $_subject,
+            $_date,
+            $IMAP->decode_header($_from),
+            $IMAP->decode_header($_to));
+    } else {
+        $prefix .= sprintf(
+            "<br><br>On %s, %s wrote:<br><blockquote type=\"cite\" " .
+            "style=\"padding-left: 5px; border-left: #1010ff 2px solid; " .
+            "margin-left: 5px; width: 100%%\">",
+            $MESSAGE['headers']->date,
+            $IMAP->decode_header($MESSAGE['headers']->from));
+        $suffix .= "</blockquote>";
     }
 
@@ -510 +487 @@
         rcmail_write_compose_attachments($MESSAGE);
     }
-    return $prefix.$body;
-}
-
+    return $prefix.$body.$suffix;
+}
 
 function rcmail_create_draft_body($body, $bodyIsHtml)
@@ -530 +506 @@
     return $body;
 }
-
 
 function rcmail_write_compose_attachments(&$message)

branches/devel-vnext/program/steps/addressbook/copy.inc

@@ -27 +27 @@
 $target = rcube::get_input_value('_to', rcube::INPUT_POST);
 if (
-    $cid
-    && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid)
-    && strlen($target)
-    && $target != $source
+    $cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid)
+    && strlen($target) && $target != $source
 ) {
     if ($target != '0') {
         $TARGET = new rcube_ldap($CONFIG['ldap_public'][$target]);
-    }
-    else {
+    } else {
         $TARGET = new rcube_contacts($DB, $_SESSION['user_id']);
     }
@@ -46 +43 @@
     if (empty($success)) {
         $OUTPUT->show_message('copyerror', 'error');
-    }
-    else {
+    } else {
         $OUTPUT->show_message('copysuccess', 'notice', array('nr' => count($success)));
     }
+    
+    // close connection to second address directory
+        $TARGET->close();
 }
 

branches/devel-vnext/program/steps/addressbook/func.inc

@@ -37 +37 @@
 ) {
     $CONTACTS = new rcube_ldap($CONFIG['ldap_public'][$source]);
-}
-else {
+} else {
     /**
      * @todo resolve conditional include (maybe autoload)
      */
-    if (
-        isset($CONFIG['addressbook_plugin'])
-        && empty($CONFIG['addressbook_plugin']) === FALSE
-    ) {
+    if (isset($CONFIG['addressbook_plugin']) && !empty($CONFIG['addressbook_plugin'])) {
         require_once 'plugins/addressbook/rcube_contacts_' . $CONFIG['addressbook_plugin'] . '.inc';
         $abook_class = 'rcube_contacts_' . $CONFIG['addressbook_plugin'];
@@ -63 +59 @@
 // set list properties and session vars
 if (!empty($_GET['_page'])) {
-    $CONTACTS->set_page(intval($_GET['_page']));
-    $_SESSION['page'] = $_GET['_page'];
-}
-else {
+    $CONTACTS->set_page(($_SESSION['page'] = intval($_GET['_page'])));
+} else {
     $CONTACTS->set_page(isset($_SESSION['page']) ?$_SESSION['page'] : 1);
 }
@@ -75 +69 @@
     $CONTACTS->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
 }
+
 // set data source env
 $OUTPUT->set_env('source', $source ? $source : '0');
@@ -85 +80 @@
 }
 $OUTPUT->set_env('address_sources', $js_list);
-
 
 function rcmail_directory_list($attrib)
@@ -155 +149 @@
 }
 
-
 /**
  * return the message list as HTML table

branches/devel-vnext/program/steps/addressbook/mailto.inc

@@ -16 +16 @@
  +-----------------------------------------------------------------------+
 
- $Id: copy.inc 471 2007-02-09 21:25:50Z thomasb $
+ $Id: mailto.inc 471 2007-02-09 21:25:50Z thomasb $
 
 */
@@ -28 +28 @@
 $mailto     = array();
 
-if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid) && $CONTACTS->ready) {
+if ($cid && preg_match('/^[a-z0-9\-_=]+(,[a-z0-9\-_=]+)*$/i', $cid)
+        && $CONTACTS->ready) {
     $recipients = $CONTACTS->search($CONTACTS->primary_key, $cid);
 
@@ -38 +39 @@
 if (!empty($mailto)) {
     $mailto_str = join(', ', $mailto);
-    $mailto_id = substr(md5($mailto_str), 0, 16);
+    $mailto_id  = substr(md5($mailto_str), 0, 16);
+    
     $_SESSION['mailto'][$mailto_id] = $mailto_str;
-    $OUTPUT->command('redirect', rcube::url('compose', array('_mailto' => $mailto_id), 'mail'));
-}
-else {
+    $OUTPUT->command('redirect',
+        rcube::url('compose',
+                array('_mailto' => $mailto_id),
+                'mail'));
+} else {
     $OUTPUT->show_message('nocontactsfound', 'warning');
 }

branches/devel-vnext/program/steps/addressbook/save.inc

@@ -32 +32 @@
 
 // check input
-if (
-    (
-        !rcube::get_input_value('_name', rcube::INPUT_POST)
-        || !rcube::get_input_value('_email', rcube::INPUT_POST)
-    )
-    && $_framed
-) {
+if ((
+        !rcube::get_input_value('_name', rcube::INPUT_POST)
+    || !rcube::get_input_value('_email', rcube::INPUT_POST)
+    ) && $_framed) {
     $OUTPUT->show_message('formincomplete', 'warning');
     rcube::override_action(empty($_POST['_cid']) ? 'add' : 'show');
@@ -77 +74 @@
         $OUTPUT->show_message('successfullysaved', 'confirmation');    
         rcube::override_action('show');
-    }
-    else {
+    } else {
         // show error message
         $OUTPUT->show_message('errorsaving', 'error');
         rcube::override_action('show');
     }
-}
-// insert a new contact
-else {
+} else { // insert a new contact
     // check for existing contacts
-    $existing = $CONTACTS->search('email', $a_record['email'], false);
+    $existing = $CONTACTS->search('email',
+        $a_record['email'],
+        true,
+        false);
   
     // show warning message
@@ -115 +112 @@
         rcube::override_action('show');
         $_GET['_cid'] = $insert_id;
-    }
-    else {
+    } else {
         // show error message
         $OUTPUT->show_message('errorsaving', 'error');
@@ -122 +118 @@
     }
 }
-?>

branches/devel-vnext/program/steps/error.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/steps/mail/addcontact.inc

@@ -71 +71 @@
 
         // check for existing contacts
-        $existing = $CONTACTS->search('email', $contact['email'], false);
+        $existing = $CONTACTS->search('email', $contact['email'], true, false);
         if ($done = $existing->count) {
             $OUTPUT->show_message('contactexists', 'warning');

branches/devel-vnext/program/steps/mail/check_recent.inc

@@ -5 +5 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -32 +32 @@
     if ($mbox_name == $IMAP->get_mailbox_name()) {
         if ($recent_count = $IMAP->messagecount(NULL, 'RECENT', TRUE)) {
-
-            $count        = $IMAP->messagecount(NULL, 'ALL', TRUE);
+            
+            // refresh saved search set
+            $search_request = rcube::get_input_value('_search', rcube::INPUT_GPC);
+            if ($search_request && $IMAP->search_set) {
+                $_SESSION['search'][$search_request] = $IMAP->refresh_search();
+            }
+            $count_all    = $IMAP->messagecount(NULL, 'ALL', TRUE);
             $unread_count = $IMAP->messagecount(NULL, 'UNSEEN', TRUE);
 
-            $OUTPUT->set_env('messagecount', $count);
-            $OUTPUT->command('set_unread_count', $mbox_name, $unread_count);
+            $OUTPUT->set_env('messagecount', $IMAP->messagecount());
+            $OUTPUT->command('set_unread_count', $mbox_name, $unread_count, true);
             $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text());
             $OUTPUT->command('set_quota', $IMAP->get_quota());
@@ -43 +48 @@
             // add new message headers to list
             $a_headers = array();
-            for ($i=$recent_count, $id=$count-$recent_count+1; $i>0; $i--, $id++) {
+            for ($i=$recent_count, $id=$count_all-$recent_count+1; $i>0; $i--, $id++) {
+                
+                // skip message if it does not match the current search
+                if (!$IMAP->in_searchset($id)) {
+                    continue;
+                }
+                
                 $header = $IMAP->get_headers($id, NULL, FALSE);
                 if ($header->recent) {
@@ -51 +62 @@
             rcmail_js_message_list($a_headers, TRUE);
         }
-    }
-    else {
+    } else {
         if ($IMAP->messagecount($mbox_name, 'RECENT')) {
             $OUTPUT->command(
@@ -63 +73 @@
 }
 $OUTPUT->send();
-?>

branches/devel-vnext/program/steps/mail/compose.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -46 +46 @@
 }
 
-// this version does not support HTML mails
-$CONFIG['htmleditor'] = false;
-$CONFIG = $registry->set('CONFIG', $CONFIG, 'core');
-
+if ($_action=='display-attachment' && preg_match('/^rcmfile([0-9]+)$/', $_GET['_file'], $regs)) {
+    $id = $regs[1];
+    if (is_array($_SESSION['compose']['attachments'][$id])) {
+        $apath = $_SESSION['compose']['attachments'][$id]['path'];
+        header('Content-Type: ' . $_SESSION['compose']['attachments'][$id]['mimetype']);
+        header('Content-Length: ' . filesize($apath));
+        readfile($apath);
+    }
+    exit;
+}
 
 $MESSAGE_FORM = $registry->set('MESSAGE_FORM', NULL, 'core');
@@ -117 +123 @@
         $_SESSION['compose']['reply_uid']   = $msg_uid;
         $_SESSION['compose']['reply_msgid'] = $MESSAGE['headers']->messageID;
-        $_SESSION['compose']['references']  = $MESSAGE['headers']->reference;
-        $_SESSION['compose']['references'] .= !empty($MESSAGE['headers']->reference) ? ' ' : '';
-        $_SESSION['compose']['references'] .= $MESSAGE['headers']->messageID;
+        $_SESSION['compose']['references']  = trim($MESSAGE['headers']->references . " " . $MESSAGE['headers']->messageID);
 
         if (!empty($_GET['_all'])) {
@@ -141 +145 @@
 // register UI objects
 $OUTPUT->add_handlers(
-            array(
-                'composeheaders'        => 'rcmail_compose_headers',
-                'composesubject'        => 'rcmail_compose_subject',
-                'composebody'           => 'rcmail_compose_body',
-                'composeattachmentlist' => 'rcmail_compose_attachment_list',
-                'composeattachmentform' => 'rcmail_compose_attachment_form',
-                'composeattachment'     => 'rcmail_compose_attachment_field',
-                'priorityselector'      => 'rcmail_priority_selector',
-                'receiptcheckbox'       => 'rcmail_receipt_checkbox',
-            )
+    array(
+        'composeheaders'        => 'rcmail_compose_headers',
+        'composesubject'        => 'rcmail_compose_subject',
+        'composebody'           => 'rcmail_compose_body',
+        'composeattachmentlist' => 'rcmail_compose_attachment_list',
+        'composeattachmentform' => 'rcmail_compose_attachment_form',
+        'composeattachment'     => 'rcmail_compose_attachment_field',
+        'priorityselector'      => 'rcmail_priority_selector',
+        'editorselector'        => 'rcmail_editor_selector',
+        'receiptcheckbox'       => 'rcmail_receipt_checkbox',
+    )
 );
 
@@ -160 +165 @@
     $abook_class = 'rcube_contacts_' . $CONFIG['addressbook_plugin'];
     $CONTACTS = new $abook_class (
-                        $_SESSION['username'],
-                        $_SESSION['password']
+        $_SESSION['username'],
+        $_SESSION['password']
     );
-}
-else {
+} else {
     $DB = $registry->get('DB', 'core');
 
-    $CONTACTS = new rcube_contacts($DB, $_SESSION['user_id']);
+    $CONTACTS = new rcube_contacts($DB, $USER->ID);
     $CONTACTS->set_pagesize(1000);
 }

branches/devel-vnext/program/steps/mail/folders.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -42 +42 @@
 
         return;
-    }
-    else {
+    } else {
         $commands = "// expunged: $success\n";
     }
-}
-// clear mailbox
-elseif ($_action=='purge' && ($mbox = rcube::get_input_value('_mbox', rcube::INPUT_POST))) {
+} elseif ($_action=='purge' && ($mbox = rcube::get_input_value('_mbox', rcube::INPUT_POST))) {
+    // clear mailbox
     $success = $IMAP->clear_mailbox($mbox);
 
@@ -57 +55 @@
         $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text());
         $OUTPUT->command('set_unread_count', $mbox_name, 0);
-    }
-    else {
+    } else {
         $commands = "// purged: $success";
     }

branches/devel-vnext/program/steps/mail/func.inc

@@ -22 +22 @@
 require_once 'lib/html2text.inc';
 require_once 'lib/enriched.inc';
-
+require_once 'include/rcube_smtp.inc';
 
 $EMAIL_ADDRESS_PATTERN = '/([a-z0-9][a-z0-9\-\.\+\_]*@[a-z0-9]([a-z0-9\-][.]?)*[a-z0-9]\\.[a-z]{2,5})/i';
@@ -36 +36 @@
 // set imap properties and session vars
 if ($mbox = rcube::get_input_value('_mbox', rcube::INPUT_GPC)) {
-    $IMAP->set_mailbox($mbox);
-    $_SESSION['mbox'] = $mbox;
+    $IMAP->set_mailbox(($_SESSION['mbox'] = $mbox));
 }
 
 if (!empty($_GET['_page'])) {
-    $IMAP->set_page((int)$_GET['_page']);
-    $_SESSION['page'] = (int)$_GET['_page'];
+    $IMAP->set_page(($_SESSION['page'] = intval($_GET['_page'])));
 }
 
@@ -57 +55 @@
 }
 // set message set for search result
-if (
-    !empty($_REQUEST['_search'])
-    && isset($_SESSION['search'][$_REQUEST['_search']])
-) {
+if (!empty($_REQUEST['_search']) && isset($_SESSION['search'][$_REQUEST['_search']])) {
     $IMAP->set_search_set($_SESSION['search'][$_REQUEST['_search']]);
 }
@@ -90 +85 @@
 }
 if (!$OUTPUT->ajax_call) {
-    $OUTPUT->add_label('checkingmail');
-}
-
-// return the mailboxlist in HTML
-function rcmail_mailbox_list($attrib)
-{
-    $registry  = rcube_registry::get_instance();
-    $IMAP      = $registry->get('IMAP', 'core');
-    $CONFIG    = $registry->get_all('config');
-    $OUTPUT    = $registry->get('OUTPUT', 'core');
-    $COMM_PATH = $registry->get('COMM_PATH', 'core');
-
-    $s_added_script = $registry->get('s_added_script', 'core');
-    if (is_null($s_added_script)) {
-        $s_added_script = FALSE;
-        $registry->get('s_added_script', $s_added_script);
-    }
-    $a_mailboxes = $registry->get('a_mailboxes', 'core');
-
-    // add some labels to client
-    $OUTPUT->add_label('purgefolderconfirm');
-    $OUTPUT->add_label('deletemessagesconfirm');
-
-    // $mboxlist_start = rcube_timer();
-
-    $type = $attrib['type'] ? $attrib['type'] : 'ul';
-    $add_attrib = $type=='select' ? array('style', 'class', 'id', 'name', 'onchange') :
-                                  array('style', 'class', 'id');
-
-    if ($type=='ul' && !$attrib['id']) {
-        $attrib['id'] = 'rcmboxlist';
-    }
-    // allow the following attributes to be added to the <ul> tag
-    $attrib_str = rcube::create_attrib_string($attrib, $add_attrib);
-
-    $out = '<' . $type . $attrib_str . ">\n";
-
-    // add no-selection option
-    if ($type=='select' && $attrib['noselection']) {
-        $out .= sprintf(
-                    '<option value="0">%s</option>'."\n",
-                    rcube::gettext($attrib['noselection'])
-        );
-    }
-    // get mailbox list
-    $mbox_name = $IMAP->get_mailbox_name();
-
-    // for these mailboxes we have localized labels
-    $special_mailboxes = array('inbox', 'sent', 'drafts', 'trash', 'junk');
-
-
-    // build the folders tree
-    if (empty($a_mailboxes)) {
-        // get mailbox list
-        $a_folders = $IMAP->list_mailboxes();
-        $delimiter = $IMAP->get_hierarchy_delimiter();
-        $a_mailboxes = array();
-
-        // rcube_print_time($mboxlist_start, 'list_mailboxes()');
-
-        foreach ($a_folders as $folder) {
-            rcmail_build_folder_tree($a_mailboxes, $folder, $delimiter);
-        }
-    }
-
-    //var_dump($a_mailboxes);
-
-    if ($type=='select') {
-        $out .= rcmail_render_folder_tree_select(
-                    $a_mailboxes,
-                    $special_mailboxes,
-                    $mbox_name,
-                    $attrib['maxlength']
-        );
-    }
-    else {
-        $out .= rcmail_render_folder_tree_html(
-                    $a_mailboxes,
-                    $special_mailboxes,
-                    $mbox_name,
-                    $attrib['maxlength']
-        );
-    }
-    $registry->set('a_mailboxes', $a_mailboxes);
-    // rcube_print_time($mboxlist_start, 'render_folder_tree()');
-
-
-    if ($type=='ul') {
-        $OUTPUT->add_gui_object('mailboxlist', $attrib['id']);
-    }
-    return $out . "</$type>";
-}
-
-
-
-
-// create a hierarchical array of the mailbox list
-function rcmail_build_folder_tree(&$arrFolders, $folder, $delm='/', $path='')
-{
-    $pos = strpos($folder, $delm);
-    if ($pos !== false) {
-        $subFolders = substr($folder, $pos+1);
-        $currentFolder = substr($folder, 0, $pos);
-    }
-    else {
-        $subFolders = false;
-        $currentFolder = $folder;
-    }
-
-    $path .= $currentFolder;
-
-    if (!isset($arrFolders[$currentFolder])) {
-        $arrFolders[$currentFolder] = array(
-                                        'id'      => $path,
-                                        'name'    => rcube::charset_convert($currentFolder, 'UTF-7'),
-                                        'folders' => array()
-        );
-    }
-
-    if (!empty($subFolders)) {
-        rcmail_build_folder_tree(
-                $arrFolders[$currentFolder]['folders'],
-                $subFolders,
-                $delm,
-                $path.$delm
-        );
-    }
-}
-
-
-/**
- * return html for a structured list <ul> for the mailbox tree
- */
-function rcmail_render_folder_tree_html(&$arrFolders, &$special, &$mbox_name, $maxlength, $nestLevel=0)
-{
-    $registry  = rcube_registry::get_instance();
-    $IMAP      = $registry->get('IMAP', 'core');
-    $CONFIG    = $registry->get_all('config');
-    $OUTPUT    = $registry->get('OUTPUT', 'core');
-    $COMM_PATH = $registry->get('COMM_PATH', 'core');
-
-    $idx = 0;
-    $out = '';
-    foreach ($arrFolders as $key => $folder)
-    {
-        $zebra_class = ($nestLevel*$idx)%2 ? 'even' : 'odd';
-        $title = '';
-
-        $folder_lc = strtolower($folder['id']);
-        if (in_array($folder_lc, $special))
-            $foldername = rcube::gettext($folder_lc);
-        else {
-            $foldername = $folder['name'];
-
-            // shorten the folder name to a given length
-            if ($maxlength && $maxlength>1) {
-                $fname = abbrevate_string($foldername, $maxlength);
-                if ($fname != $foldername)
-                    $title = ' title="'.Q($foldername).'"';
-                $foldername = $fname;
-            }
-        }
-
-        // add unread message count display
-        if ($unread_count = $IMAP->messagecount($folder['id'], 'RECENT', ($folder['id']==$mbox_name)))
-            $foldername .= sprintf(' (%d)', $unread_count);
-
-        // make folder name safe for ids and class names
-        $folder_id  = preg_replace('/[^A-Za-z0-9\-_]/', '', $folder['id']);
-        $class_name = preg_replace('/[^a-z0-9\-_]/', '', $folder_lc);
-
-        // set special class for Sent, Drafts, Trash and Junk
-        if ($folder['id']==$CONFIG['sent_mbox']) {
-            $class_name = 'sent';
-        }
-        else if ($folder['id']==$CONFIG['drafts_mbox']) {
-            $class_name = 'drafts';
-        }
-        else if ($folder['id']==$CONFIG['trash_mbox']) {
-            $class_name = 'trash';
-        }
-        else if ($folder['id']==$CONFIG['junk_mbox']) {
-            $class_name = 'junk';
-        }
-
-        $js_name = htmlspecialchars(JQ($folder['id']));
-
-        $_string_out = '<li id="rcmli%s" class="mailbox %s %s%s%s"><a href="%s"';
-        $_string_out.= ' onclick="return %s.command(\'list\',\'%s\',this)"';
-        $_string_out.= ' onmouseover="return %s.focus_folder(\'%s\')"';
-        $_string_out.= ' onmouseout="return %s.unfocus_folder(\'%s\')"';
-        $_string_out.= ' onmouseup="return %s.folder_mouse_up(\'%s\')"%s>%s</a>';
-
-        $out .= sprintf(
-                    $_string_out,
-                    $folder_id,
-                    $class_name,
-                    $zebra_class,
-                    $unread_count ? ' unread' : '',
-                    $folder['id']==$mbox_name ? ' selected' : '',
-                    Q(rcube::url('', array('_mbox' => $folder['id']))),
-                    JS_OBJECT_NAME,
-                    $js_name,
-                    JS_OBJECT_NAME,
-                    $js_name,
-                    JS_OBJECT_NAME,
-                    $js_name,
-                    JS_OBJECT_NAME,
-                    $js_name,
-                    $title,
-                    Q($foldername)
-        );
-        /**
-         * Close <li> Element.
-         */
-        $out .= "</li>\n";
-
-        /**
-         * Append a new list if it has subfolders.
-         *
-         * Work with a seperate list-entry (<li>) to combat giant
-         * onmouseover fuckups.
-         *
-         * @ignore
-         */
-        if (!empty($folder['folders'])) {
-            $out .= '<li class="mailboxsub">' . "\n<ul>\n";
-            $out .= rcmail_render_folder_tree_html($folder['folders'], $special, $mbox_name, $maxlength, $nestLevel+1);
-            $out .= "</ul>\n";
-            $out .= '</li>' . "\n";
-        }
-
-        $idx++;
-    }
-
-    return $out;
-}
-
-
-// return html for a flat list <select> for the mailbox tree
-function rcmail_render_folder_tree_select(&$arrFolders, &$special, &$mbox_name, $maxlength, $nestLevel=0)
-{
-    $registry  = rcube_registry::get_instance();
-    $IMAP      = $registry->get('IMAP', 'core');
-    $OUTPUT    = $registry->get('OUTPUT', 'core');
-
-    $idx = 0;
-    $out = '';
-    foreach ($arrFolders as $key=>$folder) {
-        $folder_lc = strtolower($folder['id']);
-        if (in_array($folder_lc, $special))
-            $foldername = rcube::gettext($folder_lc);
-        else {
-            $foldername = $folder['name'];
-
-            // shorten the folder name to a given length
-            if ($maxlength && $maxlength>1)
-                $foldername = abbrevate_string($foldername, $maxlength);
-        }
-
-        $out .= sprintf(
-                    '<option value="%s">%s%s</option>'."\n",
-                    htmlspecialchars($folder['id']),
-                    str_repeat('&nbsp;', $nestLevel*4),
-                    Q($foldername));
-
-    if (!empty($folder['folders']))
-      $out .= rcmail_render_folder_tree_select($folder['folders'], $special, $mbox_name, $maxlength, $nestLevel+1);
-
-    $idx++;
-    }
-
-  return $out;
-  }
-
+    $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash');
+}
+
+// set page title
+if (empty($_action) || $_action == 'list') {
+    $OUTPUT->set_pagetitle(
+        rcube::charset_convert($IMAP->get_mailbox_name(), 'UTF-7'));
+}
 
 /**
@@ -404 +132 @@
     // allow the following attributes to be added to the <table> tag
     $attrib_str = rcube::create_attrib_string(
-                        $attrib,
-                        array(
-                            'style', 'class', 'id',
-                            'cellpadding', 'cellspacing',
-                            'border', 'summary'
-                        )
+        $attrib,
+        array(
+            'style', 'class', 'id',
+            'cellpadding', 'cellspacing',
+            'border', 'summary'
+        )
     );
 
@@ -422 +150 @@
 
     // show 'to' instead of from in sent messages
-    if (
-        ($mbox==$CONFIG['sent_mbox'] || $mbox==$CONFIG['drafts_mbox'])
+    if (($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox'])
         && ($f = array_search('from', $a_show_cols))
         && !array_search('to', $a_show_cols)
@@ -454 +181 @@
         if ($IMAP->get_capability('sort') && in_array($col, $a_sort_cols)) {
             // have buttons configured
-            if (
-                !empty($attrib['sortdescbutton'])
-                || !empty($attrib['sortascbutton'])
-            ) {
+            if (!empty($attrib['sortdescbutton']) || !empty($attrib['sortascbutton'])) {
                 $sort = '&nbsp;&nbsp;';
 
@@ -463 +187 @@
                 if (!empty($attrib['sortascbutton'])) {
                     $sort .= $OUTPUT->button(
-                                array(
-                                    'command' => 'sort',
-                                    'prop' => $col.'_ASC',
-                                    'image' => $attrib['sortascbutton'],
-                                    'align' => 'absmiddle',
-                                    'title' => 'sortasc'
-                                )
-                    );
+                        array(
+                            'command' => 'sort',
+                            'prop' => $col.'_ASC',
+                            'image' => $attrib['sortascbutton'],
+                            'align' => 'absmiddle',
+                            'title' => 'sortasc'));
                 }
 
@@ -476 +198 @@
                 if (!empty($attrib['sortdescbutton'])) {
                     $sort .= $OUTPUT->button(array(
-                            'command' => 'sort',
-                            'prop' => $col.'_DESC',
-                            'image' => $attrib['sortdescbutton'],
-                            'align' => 'absmiddle',
-                            'title' => 'sortdesc'));
+                        'command' => 'sort',
+                        'prop' => $col.'_DESC',
+                        'image' => $attrib['sortdescbutton'],
+                        'align' => 'absmiddle',
+                        'title' => 'sortdesc'));
                 }
-            }
-            // just add a link tag to the header
-            else {
+            } else { // just add a link tag to the header
                 $col_name = sprintf(
-                            '<a href="./#sort" onclick="return %s.command(\'sort\',\'%s\',this)" title="%s">%s</a>',
-                            JS_OBJECT_NAME,
-                            $col,
-                            rcube::gettext('sortby'),
-                            $col_name
+                    '<a href="./#sort" onclick="return %s.command(\'sort\',\'%s\',this)" title="%s">%s</a>',
+                    JS_OBJECT_NAME,
+                    $col,
+                    rcube::gettext('sortby'),
+                    $col_name
                 );
             }
@@ -507 +227 @@
 
     // no messages in this mailbox
-    if (!sizeof($a_headers)) {
-        $out .= sprintf(
-                    '<tr><td colspan="%d">%s</td></tr>',
-                    sizeof($a_show_cols)+2,
-                    Q(rcube::gettext('nomessagesfound')));
-    }
-
+    if (count($a_headers) == 0) {
+        $OUTPUT->show_message('nomessagesfound', 'notice');
+    }
 
     $a_js_message_arr = array();
@@ -733 +449 @@
 
     // loop through message headers
-    for ($n=0; $a_headers[$n]; $n++) {
-        $header = $a_headers[$n];
+    foreach ($a_headers as $n => $header) {
+
         $a_msg_cols = array();
         $a_msg_flags = array();
+
+        if (empty($header)) {
+            continue;
+        }
 
         // format each col; similar as in rcmail_message_list()
@@ -742 +462 @@
             if ($col=='from' || $col=='to') {
                 $cont = Q(rcmail_address_string($header->$col, 3), 'show');
-            }
-            elseif ($col=='subject') {
+            } elseif ($col == 'subject') {
                 $action    = $mbox==$CONFIG['drafts_mbox'] ? 'compose' : 'show';
                 $uid_param = $mbox==$CONFIG['drafts_mbox'] ? '_draf_uid' : '_uid';
@@ -751 +470 @@
                 }
                 $cont = sprintf(
-                            '<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>',
-                            Q(rcube::url(
-                                $action,
-                                array($uid_param=>$header->uid, '_mbox'=>$mbox)
-                            )),
-                            $cont
+                    '<a href="%s" onclick="return rcube_event.cancel(event)">%s</a>',
+                    Q(rcube::url(
+                        $action,
+                        array($uid_param=>$header->uid, '_mbox'=>$mbox)
+                    )),
+                    $cont
                 );
-            }
-            elseif ($col=='size') {
+            } elseif ($col=='size') {
                 $cont = show_bytes($header->$col);
-            }
-            elseif ($col=='date') {
+            } elseif ($col=='date') {
                 $cont = rcube::format_date($header->date);
-            }
-            else {
+            } else {
                 $cont = Q($header->$col);
             }
@@ -775 +491 @@
         $a_msg_flags['replied'] = $header->answered ? 1 : 0;
         $OUTPUT->command(
-                    'add_message_row',
-                    $header->uid,
-                    $a_msg_cols,
-                    $a_msg_flags,
-                    preg_match("/multipart\/m/i", $header->ctype),
-                    $insert_top
+            'add_message_row',
+            $header->uid,
+            $a_msg_cols,
+            $a_msg_flags,
+            preg_match("/multipart\/m/i", $header->ctype),
+            $insert_top
         );
     }
 }
-
 
 // return an HTML iframe for loading mail content
@@ -792 +507 @@
     $OUTPUT   = $registry->get('OUTPUT', 'core');
 
-    if (empty($attrib['id']))
+    if (empty($attrib['id'])) {
         $attrib['id'] = 'rcmailcontentwindow';
-
+    }
+    
     // allow the following attributes to be added to the <iframe> tag
     $attrib_str = rcube::create_attrib_string(
-                    $attrib,
-                    array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder')
+        $attrib,
+        array('id', 'class', 'style', 'src', 'width', 'height', 'frameborder')
     );
     $framename = $attrib['id'];
 
     $out = sprintf(
-                '<iframe name="%s"%s></iframe>'."\n",
-                $framename,
-                $attrib_str
+        '<iframe name="%s"%s></iframe>'."\n",
+        $framename,
+        $attrib_str
     );
 
@@ -821 +537 @@
     $OUTPUT   = $registry->get('OUTPUT', 'core');
 
-    if (!$attrib['id'])
+    if (!$attrib['id']) {
         $attrib['id'] = 'rcmcountdisplay';
-
+    }
+    
     $OUTPUT->add_gui_object('countdisplay', $attrib['id']);
 
     // allow the following attributes to be added to the <span> tag
     $attrib_str = rcube::create_attrib_string($attrib, array('style', 'class', 'id'));
-
 
     $out = '<span' . $attrib_str . '>';
@@ -843 +559 @@
     $OUTPUT    = $registry->get('OUTPUT', 'core');
 
-    if (!$attrib['id'])
+    if (!$attrib['id']) {
         $attrib['id'] = 'rcmquotadisplay';
-
+    }
+    
     $OUTPUT->add_gui_object('quotadisplay', $attrib['id']);
 
@@ -857 +574 @@
 }
 
-
 function rcmail_quota_content($display)
 {
@@ -866 +582 @@
     if (!$IMAP->get_capability('QUOTA')) {
         $quota_text = rcube::gettext('unknown');
-    }
-    elseif ($quota = $IMAP->get_quota()) {
+    } elseif ($quota = $IMAP->get_quota()) {
         $quota_text = sprintf(
-                            "%s / %s (%.0f%%)",
-                            show_bytes($quota["used"] * 1024),
-                            show_bytes($quota["total"] * 1024),
-                            $quota["percent"]
+            "%s / %s (%.0f%%)",
+            show_bytes($quota["used"] * 1024),
+            show_bytes($quota["total"] * 1024),
+            $quota["percent"]
         );
 
@@ -879 +594 @@
             $attrib = array('width' => 100, 'height' => 14);
             $quota_text = sprintf(
-                            '<img src="./bin/quotaimg.php?u=%s&amp;q=%d&amp;w=%d&amp;h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
-                            $quota['used'], $quota['total'],
-                            $attrib['width'], $attrib['height'],
-                            $attrib['width'], $attrib['height'],
-                            $quota_text,
-                            show_bytes($quota["used"] * 1024),
-                            show_bytes($quota["total"] * 1024));
-        }
-    }
-    else {
+                '<img src="./bin/quotaimg.php?u=%s&amp;q=%d&amp;w=%d&amp;h=%d" width="%d" height="%d" alt="%s" title="%s / %s" />',
+                $quota['used'], $quota['total'],
+                $attrib['width'], $attrib['height'],
+                $attrib['width'], $attrib['height'],
+                $quota_text,
+                show_bytes($quota["used"] * 1024),
+                show_bytes($quota["total"] * 1024));
+        }
+    } else {
         $quota_text = rcube::gettext('unlimited');
     }
     return $quota_text;
 }
-
 
 function rcmail_get_messagecount_text($count=NULL, $page=NULL)
@@ -903 +616 @@
     if (isset($MESSAGE['index'])) {
         return rcube::gettext(
-                    array(
-                        'name' => 'messagenrof',
-                        'vars' => array(
-                                    'nr'  => $MESSAGE['index']+1,
-                                    'count' => $count!==NULL ? $count : $IMAP->messagecount()
-                        )
-                    )
+            array(
+                'name' => 'messagenrof',
+                'vars' => array(
+                    'nr'  => $MESSAGE['index']+1,
+                    'count' => $count!==NULL ? $count : $IMAP->messagecount()
+                )
+            )
         );
     }
 
-    if ($page===NULL) {
+    if ($page === NULL) {
         $page = $IMAP->list_page;
     }
     $start_msg = ($page-1) * $IMAP->page_size + 1;
-    $max = $count!==NULL ? $count : $IMAP->messagecount();
+    $max       = $count!==NULL ? $count : $IMAP->messagecount();
 
     if ($max==0) {
         $out = rcube::gettext('mailboxempty');
-    }
-    else {
+    } else {
         $out = rcube::gettext(array('name' => 'messagesfromto',
-                              'vars' => array('from'  => $start_msg,
-                                              'to'    => min($max, $start_msg + $IMAP->page_size - 1),
-                                              'count' => $max)));
+            'vars' => array('from'  => $start_msg,
+                'to'    => min($max, $start_msg + $IMAP->page_size - 1),
+                'count' => $max)));
     }
     return Q($out);
 }
-
 
 function rcmail_print_body($part, $safe=FALSE, $plain=FALSE)
@@ -957 +668 @@
         // remove remote images and scripts
         $remote_patterns = array(
-                            '/<img\s+(.*)src=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
-                            '/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
-                            '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
-                            '/(<link.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
-                            '/url\s*\(["\']?([hftps]{3,5}:\/{2}[^"\'\s]+)["\']?\)/i',
-                            '/url\s*\(["\']?([\.\/]+[^"\'\s]+)["\']?\)/i',
-                            '/<script.+<\/script>/Umis'
+            '/<img\s+(.*)src=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
+            '/(src|background)=(["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)(\2|\s|>)/Ui',
+            '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
+            '/(<link.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i',
+            '/url\s*\(["\']?([hftps]{3,5}:\/{2}[^"\'\s]+)["\']?\)/i',
+            '/url\s*\(["\']?([\.\/]+[^"\'\s]+)["\']?\)/i',
+            '/<script.+<\/script>/Umis'
         );
 
         $remote_replaces = array(
-                            '<img \\1src=\\2./program/blocked.gif\\4',
-                            '',
-                            '',
-                            '',
-                            'none',
-                            'none',
-                            '');
+            '<img \\1src=\\2./program/blocked.gif\\4',
+            '',
+            '',
+            '',
+            'none',
+            'none',
+            '');
 
         // set flag if message containes remote obejcts that where blocked
@@ -980 +691 @@
                 $REMOTE_OBJECTS = TRUE;
                 $registry->set(
-                        'REMOTE_OBJECTS',
-                        $REMOTE_OBJECTS,
-                        'core'
+                    'REMOTE_OBJECTS',
+                    $REMOTE_OBJECTS,
+                    'core'
                 );
                 break;
@@ -1014 +725 @@
     if ($part->ctype_parameters['format'] != 'flowed') {
         $body = wordwrap(trim($body), 80);
-    }
-    else {
+    } else {
         /**
          * @author Till Klampaeckel <till@php.net>
@@ -1055 +765 @@
     // insert the links for urls and mailtos
     $body = preg_replace(
-                "/##string_replacement\{([0-9]+)\}##/e",
-                "\$replace_strings[\\1]",
-                join("\n", $a_lines)
+        "/##string_replacement\{([0-9]+)\}##/e",
+        "\$replace_strings[\\1]",
+        join("\n", $a_lines)
     );
     return '<div class="pre">' . $body . "\n</div>";
@@ -1123 +833 @@
         $structure->type = 'content';
         $a_return_parts[] = &$structure;
-    }
-
-    // message contains alternative parts
-    else if (
+    } else if ( // message contains alternative parts
         $message_ctype_primary=='multipart'
         && $message_ctype_secondary=='alternative'
@@ -1135 +842 @@
 
         foreach ($structure->parts as $p => $sub_part) {
-            $sub_ctype_primary = strtolower($sub_part->ctype_primary);
+            $rel_parts           = $attachmnts = null;
+            $sub_ctype_primary   = strtolower($sub_part->ctype_primary);
             $sub_ctype_secondary = strtolower($sub_part->ctype_secondary);
 
             // check if sub part is
-            if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='plain')
+            if ($sub_ctype_primary == 'text' && $sub_ctype_secondary=='plain') {
                 $plain_part = $p;
-            else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='html')
+            } else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='html') {
                 $html_part = $p;
-            else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched')
+            } else if ($sub_ctype_primary=='text' && $sub_ctype_secondary=='enriched') {
                 $enriched_part = $p;
-            else if ($sub_ctype_primary=='multipart' && $sub_ctype_secondary=='related')
+            } else if ($sub_ctype_primary=='multipart' && ($sub_ctype_secondary=='related' || $sub_ctype_secondary=='mixed')) {
                 $related_part = $p;
+            }
         }
 
         // parse related part (alternative part could be in here)
-        if (is_null($related_part) === FALSE && $prefer_html) {
-            list($parts, $attachmnts) = rcmail_parse_message($structure->parts[$related_part], $arg, TRUE);
-            $a_return_parts = array_merge($a_return_parts, $parts);
+        if ($related_part !== NULL) {
+            list($rel_parts, $attachmnts) = rcmail_parse_message($structure->parts[$related_part], $arg, TRUE);
             $a_attachments = array_merge($a_attachments, $attachmnts);
-        }
-        // print html/plain part
-        else if (is_null($html_part) !== TRUE && $prefer_html) {
+        } 
+        
+        // merge related parts if any
+        if ($rel_parts && $prefer_html && !$html_part) {
+            $a_return_parts = array_merge($a_return_parts, $rel_parts);
+        } else if ($html_part !== null && $prefer_html) {
+            // choose html/plain part to print
             $print_part = &$structure->parts[$html_part];
-        }
-        else if (is_null($enriched_part) !== TRUE) {
+        } else if ($enriched_part !== null) {
             $print_part = &$structure->parts[$enriched_part];
-        }
-        else if (is_null($plain_part) !== TRUE) {
+        } else if ($plain_part !== null) {
             $print_part = &$structure->parts[$plain_part];
         }
+        
         // show message body
         if (is_object($print_part)) {
+            
             $print_part->type = 'content';
             $a_return_parts[] = $print_part;
-        }
-        // show plaintext warning
-        else if ($html_part!==NULL) {
+            
+        } else if ($html_part!== NULL && $prefer_html) {
+            
+            // show plaintext warning
             $c = new stdClass;
             $c->type = 'content';
@@ -1206 +919 @@
             // part text/[plain|html] OR message/delivery-status
             else if (
-                (
-                    $primary_type=='text'
-                    && ($secondary_type=='plain' || $secondary_type=='html')
-                    && $mail_part->disposition!='attachment'
-                )
+                ($primary_type=='text' && ($secondary_type=='plain' || $secondary_type=='html')
+                && $mail_part->disposition!='attachment')
                 ||
-                ($primary_type=='message' && $secondary_type=='delivery-status')
+                ($primary_type=='message'
+                && ($secondary_type=='delivery-status' || $secondary_type=='disposition-notification'))
             ) {
                 $mail_part->type  = 'content';
@@ -1248 +959 @@
                     );
                     $sa_inline_objects[] = $mail_part;
-                }
-                // is regular attachment
-                else {
+                } else {
+                    // is regular attachment
                     if (!$mail_part->filename) {
-                        $mail_part->filename = 'file_' . $mail_part->mime_id;
+                        $mail_part->filename = 'Part ' . $mail_part->mime_id;
                     }
                     $a_attachments[] = $mail_part;
@@ -1260 +970 @@
 
         // if this was a related part try to resolve references
-        if ($message_ctype_secondary=='related' && sizeof($sa_inline_objects)) {
+        if ($message_ctype_secondary=='related' && count($sa_inline_objects) > 0) {
             $a_replaces = array();
 
             foreach ($sa_inline_objects as $inline_object) {
                 $a_replaces['cid:'.$inline_object->content_id] = htmlspecialchars(
-                                                                    sprintf(
-                                                                        $get_url,
-                                                                        $inline_object->mime_id
-                                                                    )
-                );
+                    sprintf(
+                        $get_url,
+                        $inline_object->mime_id
+                    ));
             }
             // add replace array to each content part
@@ -1338 +1047 @@
         if ($hkey=='date' && empty($headers[$hkey]) === false) {
             $header_value = rcube::format_date(strtotime($headers[$hkey]));
-        }
-        elseif(in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to'))) {
+        } elseif(in_array($hkey, array('from', 'to', 'cc', 'bcc', 'reply-to'))) {
+            $header_value = Q(rcmail_address_string(
+                $headers[$hkey],
+                NULL,
+                $attrib['addicon']
+                ), 'show');
+        } else {
             $header_value = Q(
-                                rcmail_address_string(
-                                    $headers[$hkey],
-                                    NULL,
-                                    $attrib['addicon']
-                                ),
-                                'show'
-            );
-        }
-        else {
-            $header_value = Q(
-                                rcube_imap::decode_mime_string(
-                                    $headers[$hkey],
-                                    $headers['charset']
-                                )
+                rcube_imap::decode_mime_string(
+                    $headers[$hkey],
+                    $headers['charset']
+                )
             );
         }
@@ -1395 +1099 @@
         $attrib['id'] = 'rcmailMsgBody';
     }
-    $safe_mode = (bool)$_GET['_safe'];
+    $safe_mode  = intval($_GET['_safe']);
     $attrib_str = rcube::create_attrib_string($attrib, array('style', 'class', 'id'));
-    $out = '<div '. $attrib_str . ">\n";
+    $out        = '<div '. $attrib_str . ">\n";
 
     $header_attrib = array();
@@ -1408 +1112 @@
     // this is an ecrypted message
     // -> create a plaintext body with the according message
-    if (!sizeof($MESSAGE['parts']) && $MESSAGE['headers']->ctype=='multipart/encrypted') {
+    if (count($MESSAGE['parts']) == 0 && $MESSAGE['headers']->ctype=='multipart/encrypted') {
         $p = new stdClass;
         $p->type = 'content';
@@ -1445 +1149 @@
             }
         }
-    }
-    else {
+    } else {
         $out .= $MESSAGE['body'];
     }
@@ -1454 +1157 @@
 
     // list images after mail body
-    if (
-        get_boolean($attrib['showimages'])
+    if (get_boolean($attrib['showimages'])
         && $ctype_primary=='multipart'
-        && $ctype_secondary=='mixed'
-        && sizeof($MESSAGE['attachments'])
+        && !empty($MESSAGE['attachments'])
         && !strstr($message_body, '<html')
-        && strlen($GET_URL)
-    ) {
+        && strlen($GET_URL)) {
         foreach ($MESSAGE['attachments'] as $attach_prop) {
             if (strpos($attach_prop->mimetype, 'image/')===0) {
@@ -1492 +1192 @@
     $body = preg_replace('/\x00/', '', $body);
 
+    $base_url       = '';
     $last_style_pos = 0;
-    $body_lc = strtolower($body);
+    $body_lc        = strtolower($body);
+
+    // check for <base href>
+    $base_reg = '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i';
+        if (preg_match($base_reg, $body, $base_regs)) {
+        $base_url = $base_regs[2];
+    }
 
     // find STYLE tags
@@ -1501 +1208 @@
 
         // replace all css definitions with #container [def]
-        $styles = rcmail_mod_css_styles(substr($body, $pos, $pos2-$pos), $container_id);
+        $styles = rcmail_mod_css_styles(
+            substr($body, $pos, $pos2-$pos),
+            $container_id,
+            $base_url);
 
         $body = substr($body, 0, $pos) . $styles . substr($body, $pos2);
@@ -1511 +1221 @@
     // remove SCRIPT tags
     foreach (array('script', 'applet', 'object', 'embed', 'iframe') as $tag) {
-        while (($pos = strpos($body_lc, '<'.$tag)) && ($pos2 = strpos($body_lc, '</'.$tag.'>', $pos)))
+        while (($pos = strpos($body_lc, '<'.$tag)) && (($pos2 = strpos($body_lc, '</'.$tag.'>', $pos)) || ($pos3 = strpos($body_lc, '>', $pos))))
         {
-            $pos2 += strlen('</'.$tag.'>');
-            $body = substr($body, 0, $pos) . substr($body, $pos2, strlen($body)-$pos2);
+            $end  = $pos2 ? $pos2 + strlen('</'.$tag.'>') : $pos3 + 1;
+            $body = substr($body, 0, $pos) . substr($body, $end, strlen($body)-$end);
+            
             $body_lc = strtolower($body);
         }
@@ -1527 +1238 @@
 
     // resolve <base href>
-    $base_reg = '/(<base.*href=["\']?)([hftps]{3,5}:\/{2}[^"\'\s]+)([^<]*>)/i';
-    if (preg_match($base_reg, $body, $regs)) {
-        $base_url = $regs[2];
+    if ($base_url) {
         $body = preg_replace('/(src|background|href)=(["\']?)([\.\/]+[^"\'\s]+)(\2|\s|>)/Uie', "'\\1=\"'.make_absolute_url('\\3', '$base_url').'\"'", $body);
         $body = preg_replace('/(url\s*\()(["\']?)([\.\/]+[^"\'\)\s]+)(\2)\)/Uie', "'\\1\''.make_absolute_url('\\3', '$base_url').'\')'", $body);
@@ -1536 +1245 @@
 
     // modify HTML links to open a new window if clicked
-    $body = preg_replace('/<a\s+([^>]+)>/Uie', "rcmail_alter_html_link('\\1');", $body);
+    $body = preg_replace('/<(a|link)\s+([^>]+)>/Uie',
+        "rcmail_alter_html_link('\\1','\\2','$container_id');",
+        $body);
 
     // add comments arround html and other tags
@@ -1550 +1261 @@
 
     $out = preg_replace(
-            array(
-                '/<body([^>]*)>/i',
-                '/<\/body>/i'
-            ),
-            array(
-                '<div class="rcmBody"\\1>',
-                '</div>'
-            ),
-            $out
-    );
+        array('/<body([^>]*)>/i','/<\/body>/i'),
+        array('<div class="rcmBody"\\1>','</div>'),
+        $out);
 
     // quote <? of php and xml files that are specified as text/html
@@ -1567 +1271 @@
 }
 
-
 // parse link attributes and set correct target
-function rcmail_alter_html_link($in)
-{
-    $in = preg_replace('/=([^("|\'|\s)]+)(\s|$)/', '="\1"', $in);
-    $attrib = rcube::parse_attrib_string($in);
-
-    if (stristr((string)$attrib['href'], 'mailto:')) {
+function rcmail_alter_html_link($tag, $attrs, $container_id)
+{
+    //$in = preg_replace('/=([^("|\'|\s)]+)(\s|$)/', '="\1"', $in);
+    $attrib = rcube::parse_attrib_string($attrs);
+
+    if ($tag == 'link' && preg_match('/^https?:\/\//i', $attrib['href'])) {
+        $attrib['href']  = "./bin/modcss.php?u=" . urlencode($attrib['href']);
+        $attrib['href'] .= "&amp;c=" . urlencode($container_id);
+    } else if (stristr((string)$attrib['href'], 'mailto:')) {
         $attrib['onclick'] = sprintf(
-                                    "return %s.command('compose','%s',this)",
-                                    JS_OBJECT_NAME,
-                                    JQ(substr($attrib['href'], 7))
-        );
-    }
-    else if (!empty($attrib['href']) && $attrib['href']{0}!='#') {
+            "return %s.command('compose','%s',this)",
+            JS_OBJECT_NAME,
+            JQ(substr($attrib['href'], 7)));
+    } else if (!empty($attrib['href']) && $attrib['href']{0}!='#') {
         $attrib['target'] = '_blank';
     }
-    $resp = '<a';
-    $resp.= rcube::create_attrib_string(
-                    $attrib,
-                    array(
-                        'href', 'name', 'target', 'onclick', 'id', 'class', 'style', 'title'
-                    )
-    );
-    $resp .= '>';
-    return $resp;
-}
-
-
-// replace all css definitions with #container [def]
-function rcmail_mod_css_styles($source, $container_id)
-{
-    $a_css_values = array();
-    $last_pos = 0;
-
-    // cut out all contents between { and }
-    while (($pos = strpos($source, '{', $last_pos)) && ($pos2 = strpos($source, '}', $pos)))
-    {
-        $key = sizeof($a_css_values);
-        $a_css_values[$key] = substr($source, $pos+1, $pos2-($pos+1));
-        $source = substr($source, 0, $pos+1);
-        $source.= "<<str_replacement[$key]>>";
-        $source.= substr($source, $pos2, strlen($source)-$pos2);
-        $last_pos = $pos+2;
-    }
-
-    // remove html commends and add #container to each tag selector.
-    // also replace body definition because we also stripped off the <body> tag
-    $styles = preg_replace(
-                array(
-                    '/(^\s*<!--)|(-->\s*$)/',
-                    '/(^\s*|,\s*|\}\s*)([a-z0-9\._][a-z0-9\.\-_]*)/im',
-                    '/<<str_replacement\[([0-9]+)\]>>/e',
-                    "/$container_id\s+body/i"
-                ),
-                array(
-                    '',
-                    "\\1#$container_id \\2",
-                    "\$a_css_values[\\1]",
-                    "$container_id div.rcmBody"
-                ),
-                $source
-    );
-    return $styles;
-}
-
+
+    $ret  = "<$tag" . rcube::create_attrib_string($attrib,
+        array('href','name','target','onclick','id','class',
+            'style','title','rel','type','media'));
+    $ret .= ' />';
+    return $ret;
+}
 
 function rcmail_has_html_part($message_parts)
@@ -1640 +1302 @@
    }
    // check all message parts
-   foreach ($message_parts as $pid => $part)
-   {
+   foreach ($message_parts as $pid => $part) {
       $mimetype = strtolower($part->ctype_primary.'/'.$part->ctype_secondary);
-      if ($mimetype=='text/html')
-      {
+      if ($mimetype == 'text/html') {
          return TRUE;
       }
    }
-
    return FALSE;
 }
@@ -1697 +1356 @@
         if ($mimetype=='text/plain') {
             return $IMAP->get_message_part($message_struct['UID'], $pid, $part);
-        }
-        else if ($mimetype=='text/html') {
+        } else if ($mimetype=='text/html') {
             $html_part = $IMAP->get_message_part($message_struct['UID'], $pid, $part);
 
@@ -1712 +1370 @@
     return FALSE;
 }
-
 
 // decode address string and re-format it as HTML links
@@ -1738 +1395 @@
         if ($PRINT_MODE) {
             $out .= sprintf('%s &lt;%s&gt;', Q($part['name']), $part['mailto']);
-        }
-        elseif (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto'])) {
+        } elseif (preg_match($EMAIL_ADDRESS_PATTERN, $part['mailto'])) {
             $out .= sprintf(
-                        '<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>',
-                        Q($part['mailto']),
-                        JS_OBJECT_NAME,
-                        JQ($part['mailto']),
-                        Q($part['mailto']),
-                        Q($part['name']));
+                '<a href="mailto:%s" onclick="return %s.command(\'compose\',\'%s\',this)" class="rcmContactAddress" title="%s">%s</a>',
+                Q($part['mailto']),
+                JS_OBJECT_NAME,
+                JQ($part['mailto']),
+                Q($part['mailto']),
+                Q($part['name']));
             if ($addicon) {
                 $out .= sprintf(
-                            '&nbsp;<a href="#add" onclick="return %s.command(\'add-contact\',\'%s\',this)" title="%s"><img src="%s%s" alt="add" border="0" /></a>',
-                            JS_OBJECT_NAME,
-                            urlencode($part['string']),
-                            rcube::gettext('addtoaddressbook'),
-                            $CONFIG['skin_path'],
-                            $addicon
+                    '&nbsp;<a href="#add" onclick="return %s.command(\'add-contact\',\'%s\',this)" title="%s"><img src="%s%s" alt="add" border="0" /></a>',
+                    JS_OBJECT_NAME,
+                    urlencode($part['string']),
+                    rcube::gettext('addtoaddressbook'),
+                    $CONFIG['skin_path'],
+                    $addicon
                 );
             }
-        }
-        else {
+        } else {
             if ($part['name']) {
                 $out .= Q($part['name']);
@@ -1778 +1433 @@
     return $out;
 }
-
 
 function rcmail_message_part_controls()
@@ -1787 +1441 @@
     $MESSAGE  = $registry->get('MESSAGE', 'core');
 
-    if (
-        !is_array($MESSAGE)
-        || !is_array($MESSAGE['parts'])
+    $part = asciiwords(get_input_value('_part', RCUBE_INPUT_GPC));
+    if (!is_array($MESSAGE) || !is_array($MESSAGE['parts'])
         || !($_GET['_uid'] && $_GET['_part'])
-        || !$MESSAGE['parts'][$_GET['_part']]
-    ) {
+        || !$MESSAGE['parts'][$part]) {
         return '';
     }
-    $part = &$MESSAGE['parts'][$_GET['_part']];
+    
+    $part = &$MESSAGE['parts'][$part];
 
     $attrib_str = rcube::create_attrib_string(
-                        $attrib,
-                        array(
-                            'id',
-                            'class',
-                            'style',
-                            'cellspacing',
-                            'cellpadding',
-                            'border',
-                            'summary'
-                        )
-    );
+        $attrib,
+        array(
+            'id',
+            'class',
+            'style',
+            'cellspacing',
+            'cellpadding',
+            'border',
+            'summary'
+        ));
     $out = '<table '. $attrib_str . ">\n";
 
     if ($filename) {
         $out .= sprintf(
-                    '<tr><td class="title">%s</td><td>%s</td><td>[<a href="./?%s">%s</a>]</tr>'."\n",
-                    Q(rcube::gettext('filename')),
-                    Q($part->filename),
-                    str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']),
-                    Q(rcube::gettext('download')));
+            '<tr><td class="title">%s</td><td>%s</td><td>[<a href="./?%s">%s</a>]</tr>'."\n",
+            Q(rcube::gettext('filename')),
+            Q($part->filename),
+            str_replace('_frame=', '_download=', $_SERVER['QUERY_STRING']),
+            Q(rcube::gettext('download')));
     }
 
     if ($part->size) {
         $out .= sprintf(
-                    '<tr><td class="title">%s</td><td>%s</td></tr>' . "\n",
-                    Q(rcube::gettext('filesize')),
-                    show_bytes($part->size)
+            '<tr><td class="title">%s</td><td>%s</td></tr>' . "\n",
+            Q(rcube::gettext('filesize')),
+            show_bytes($part->size)
         );
     }
@@ -1830 +1482 @@
 
     return $out;
-  }
-
-
+}
 
 function rcmail_message_part_frame($attrib)
@@ -1839 +1489 @@
     $MESSGAGE = $registry->get('MESSAGE', 'core');
 
-    $part = $MESSAGE['parts'][$_GET['_part']];
+    $part = $MESSAGE['parts'][asciiwords(get_input_value('_part', RCUBE_INPUT_GPC))];
+    
     $ctype_primary = strtolower($part->ctype_primary);
 
-    $attrib['src'] = './?';
-    $attrib['src'].= str_replace(
-                        '_frame=',
-                        ($ctype_primary=='text' ? '_show=' : '_preload='),
-                        $_SERVER['QUERY_STRING']
-    );
+    $attrib['src'] = Q('./?'.str_replace('_frame=', ($ctype_primary=='text' ? '_show=' : '_preload='), $_SERVER['QUERY_STRING']));
+    
     $attrib_str = rcube::create_attrib_string($attrib, array('id', 'class', 'style', 'src', 'width', 'height'));
     $out = '<iframe '. $attrib_str . "></iframe>";
 
-  return $out;
-  }
-
+    return $out;
+}
+
+/**
+ * Send the given message compose object using the configured method
+ */
+function rcmail_deliver_message(&$message, $from, $mailto)
+{
+    $registry = rcube_registry::get_instance();
+    $CONFIG   = $registry->get('CONFIG', 'core');
+ 
+    $headers  = $message->headers();
+    $msg_body = $message->get();
+  
+    // send thru SMTP server using custom SMTP library
+    if ($CONFIG['smtp_server']) {
+        // generate list of recipients
+        $a_recipients = array($mailto);
+  
+        if (strlen($headers['Cc'])) {
+            $a_recipients[] = $headers['Cc'];
+        }
+        if (strlen($headers['Bcc'])) {
+            $a_recipients[] = $headers['Bcc'];
+        }
+        // clean Bcc from header for recipients
+        $send_headers = $headers;
+        unset($send_headers['Bcc']);
+
+        // send message
+        $smtp_response = array();
+        
+        $sent = smtp_mail($from, $a_recipients, ($foo = $message->txtHeaders($send_headers)), $msg_body, $smtp_response);
+
+        // log error
+        if (!$sent) {
+            raise_error(array('code' => 800, 'type' => 'smtp', 'line' => __LINE__, 'file' => __FILE__,
+                'message' => "SMTP error: ".join("\n", $smtp_response)), TRUE, FALSE);
+        }
+        return $sent;
+    }
+    
+    // unset some headers because they will be added by the mail() function
+    $headers_enc = $message->headers($headers);
+    $headers_php = $message->_headers;
+    unset($headers_php['To'], $headers_php['Subject']);
+    
+    // reset stored headers and overwrite
+    $message->_headers = array();
+    $header_str = $message->txtHeaders($headers_php);
+  
+    if (ini_get('safe_mode')) {
+        $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str);
+    } else {
+        $sent = mail($headers_enc['To'], $headers_enc['Subject'], $msg_body, $header_str, "-f$from");
+    }
+
+    $message->_headers = array();
+    $message->headers($headers);
+
+    return $sent;
+}
 
 // clear message composing settings
@@ -1871 +1577 @@
 }
 
-
 // register UI objects
 $OUTPUT->add_handlers(array(
-  'mailboxlist' => 'rcmail_mailbox_list',
-  'messages' => 'rcmail_message_list',
-  'messagecountdisplay' => 'rcmail_messagecount_display',
-  'quotadisplay' => 'rcmail_quota_display',
-  'messageheaders' => 'rcmail_message_headers',
-  'messagebody' => 'rcmail_message_body',
-  'messagecontentframe' => 'rcmail_messagecontent_frame',
-  'messagepartframe' => 'rcmail_message_part_frame',
-  'messagepartcontrols' => 'rcmail_message_part_controls',
-  'searchform' => array($OUTPUT, 'search_form')
-));
-
-?>
+    'mailboxlist'         => 'rcmail_mailbox_list',
+    'messages'            => 'rcmail_message_list',
+    'messagecountdisplay' => 'rcmail_messagecount_display',
+    'quotadisplay'        => 'rcmail_quota_display',
+    'messageheaders'      => 'rcmail_message_headers',
+    'messagebody'         => 'rcmail_message_body',
+    'messagecontentframe' => 'rcmail_messagecontent_frame',
+    'messagepartframe'    => 'rcmail_message_part_frame',
+    'messagepartcontrols' => 'rcmail_message_part_controls',
+    'searchform'          => array($OUTPUT, 'search_form')));

branches/devel-vnext/program/steps/mail/get.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -28 +28 @@
 
     echo "<html>\n<head>\n";
-    echo '<meta http-equiv="refresh" content="0; url=' . htmlspecialchars($url).'">';
+    echo '<meta http-equiv="refresh" content="0; url=' . Q($url).'">';
     echo "\n</head>\n<body>";
     echo $message;
@@ -49 +49 @@
     rcube::parse_template('messagepart');
     exit;
-}
-else if ($pid = rcube::get_input_value('_part', rcube::INPUT_GET)) {
+} else if ($pid = rcube::get_input_value('_part', rcube::INPUT_GET)) {
     if ($part = $MESSAGE['parts'][$pid]) {
         $ctype_primary = strtolower($part->ctype_primary);
@@ -65 +64 @@
             header("Cache-Control: private", false);
             header("Content-Type: application/octet-stream");
-        }
-        else {
+        } else {
             header("Content-Type: $mimetype");
         }
@@ -100 +98 @@
             }
             $OUTPUT = new rcube_html_page();
-            $OUTPUT->write(rcmail_print_body($part, (bool)$_GET['_safe']));
-        }
-        else {
+            $OUTPUT->write(rcmail_print_body($part, intval($_GET['_safe'])));
+        } else {
             header(
                 sprintf(
                     'Content-Disposition: %s; filename="%s";',
-                    $part->disposition ? $part->disposition : 'attachment',
+                    $_GET['_download'] ? 'attachment' : 'inline',
                     $part->filename ? $part->filename : "roundcube.$ctype_secondary"
                 )
@@ -112 +109 @@
 
             // turn off output buffering and print part content
-            $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part->encoding, true);
+            $IMAP->get_message_part($MESSAGE['UID'], $part->mime_id, $part, true);
         }
         exit;
     }
-}
-// print message
-else {
+} else { // print message
     $ctype_primary = strtolower($MESSAGE['structure']->ctype_primary);
     $ctype_secondary = strtolower($MESSAGE['structure']->ctype_secondary);
@@ -128 +123 @@
     $cont = '';
     list($MESSAGE['parts']) = rcmail_parse_message(
-                                    $MESSAGE['structure'],
-                                    array(
-                                        'safe' => (bool)$_GET['_safe'],
-                                        'get_url' => $GET_URL.'&_part=%s'
-                                    )
+        $MESSAGE['structure'],
+        array(
+            'safe' => intval($_GET['_safe']),
+            'get_url' => $GET_URL.'&_part=%s'
+        )
     );
 

branches/devel-vnext/program/steps/mail/getunread.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/steps/mail/list.inc

@@ -5 +5 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -45 +45 @@
 
 // fetch message headers
-if ($count = $IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh']))) {
+if ($IMAP->messagecount($mbox_name, 'ALL', !empty($_REQUEST['_refresh']))) {
     $a_headers = $IMAP->list_headers($mbox_name, NULL, $sort_col, $sort_order);
 }
+$count  = $IMAP->messagecount($mbox_name);
 $unseen = $IMAP->messagecount($mbox_name, 'UNSEEN', !empty($_REQUEST['_refresh']));
 
@@ -62 +63 @@
 if (isset($a_headers) && count($a_headers)) {
     rcmail_js_message_list($a_headers);
+} else {
+    $OUTPUT->show_message('nomessagesfound', 'notice');
 }
-
 // send response
 $OUTPUT->send();
-?>

branches/devel-vnext/program/steps/mail/move_del.inc

@@ -5 +5 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -23 +23 @@
 $OUTPUT   = $registry->get('OUTPUT', 'core');
 
+// count messages before changing anything
+$old_count = $IMAP->messagecount();
+$old_pages = ceil($old_count / $IMAP->page_size);
+
 // move messages
 if ($_action=='moveto' && !empty($_POST['_uid']) && !empty($_POST['_target_mbox'])) {
@@ -38 +42 @@
         exit;
     }
-}
-// delete messages
-else if ($_action=='delete' && !empty($_POST['_uid'])) {
+} else if ($_action=='delete' && !empty($_POST['_uid'])) { // delete messages
     $count = sizeof(explode(',', ($uids = rcube::get_input_value('_uid', rcube::INPUT_POST))));
     $del   = $IMAP->delete_message($uids, rcube::get_input_value('_mbox', rcube::INPUT_POST));
@@ -51 +53 @@
         exit;
     }
-}
-// unknown action or missing query param
-else {
+} else { // unknown action or missing query param
     //rcube::tfk_debug('/ unknown action');
     exit;
 }
 
-// refresh saved seach set after moving some messages
+// refresh saved seacrh set after moving some messages
 if (
     ($search_request = rcube::get_input_value('_search', rcube::INPUT_GPC))
-    && $IMAP->search_set
-) {
+    && $IMAP->search_set) {
     $_SESSION['search'][$search_request] = $IMAP->refresh_search();
 }
 
+$msg_count      = $IMAP->messagecount();
+$pages          = ceil($msg_count / $IMAP->page_size);
+$nextpage_count = $old_count - $IMAP->page_size * $IMAP->list_page;
+$remaining      = $msg_count - $IMAP->page_size * ($IMAP->list_page - 1);
+
+// jump back one page (user removed the whole last page)
+if ($IMAP->list_page > 1 && $nextpage_count <= 0 && $remaining == 0) {
+    $IMAP->set_page($IMAP->list_page-1);
+    $_SESSION['page'] = $IMAP->list_page;
+    $jump_back = true;
+}
+
 // update message count display
-$msg_count = $IMAP->messagecount();
-$pages     = ceil($msg_count / $IMAP->page_size);
 $OUTPUT->set_env('pagecount', $pages);
+$OUTPUT->set_env('current_page', $IMAP->list_page);
 $OUTPUT->command('set_rowcount', rcmail_get_messagecount_text($msg_count));
-
 
 // update mailboxlist
@@ -83 +92 @@
 
 // add new rows from next page (if any)
-if ($_POST['_from'] != 'show' && $pages > 1 && $IMAP->list_page < $pages) {
+if ($_POST['_from'] != 'show' && ($jump_back || $nextpage_count > 0)) {
     $sort_col   = isset($_SESSION['sort_col'])   ? $_SESSION['sort_col']   : $CONFIG['message_sort_col'];
     $sort_order = isset($_SESSION['sort_order']) ? $_SESSION['sort_order'] : $CONFIG['message_sort_order'];
 
     $a_headers = $IMAP->list_headers($mbox, NULL, $sort_col, $sort_order);
-    $a_headers = array_slice($a_headers, -$count, $count);
+    if (!$jump_back) {
+        $a_headers = array_slice($a_headers, -$count, $count);
+    }
 
     rcmail_js_message_list($a_headers);
@@ -95 +106 @@
 // send response
 $OUTPUT->send();
-?>

branches/devel-vnext/program/steps/mail/quotadisplay.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/steps/mail/rss.inc

@@ -5 +5 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                      |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -36 +36 @@
 
 $REMOTE_REQUEST = TRUE;
-$OUTPUT_TYPE = 'rss';
+$OUTPUT_TYPE    = 'rss';
 
 $registry = rcube_registry::get_instance();
@@ -46 +46 @@
   $webmail_url .= 's';
 }
+
 $webmail_url .= '://'.$_SERVER['SERVER_NAME'];
-if ($_SERVER['SERVER_PORT'] != '80') {
+if ($_SERVER['SERVER_PORT'] != '80') {
         $webmail_url .= ':'.$_SERVER['SERVER_PORT'];
 }
+
 $webmail_url .= '/';
 if (dirname($_SERVER['SCRIPT_NAME']) != '/') {
@@ -64 +66 @@
 // Send global XML output
 header('Content-type: text/xml');
-echo '<?xml version="1.0" encoding="UTF-8"?>
-        <rss version="2.0"
+echo '<?xml version="1.0" encoding="UTF-8"?>';
+echo '<rss version="2.0"
          xmlns:dc="http://purl.org/dc/elements/1.1/"
          xmlns:sy="http://purl.org/rss/1.0/modules/syndication/"
@@ -91 +93 @@
 // Check if the user wants to override the default sortingmethode
 if (isset($_GET['_sort'])) {
-    list($sort_col, $sort_order) = explode('_', $_GET['_sort']);
+    list($sort_col, $sort_order) = explode('_',
+        rcube::get_input_value('_sort', rcube::INPUT_GET));
 }
 
@@ -97 +100 @@
 if ($messagecount > 0) {
     $items = $IMAP->list_headers('INBOX', null, $sort_col, $sort_order);
-    foreach ($items as $item)
-    {
+    foreach ($items as $item) {
 
         // Convert '"name" <email>' to 'email (name)'

branches/devel-vnext/program/steps/mail/search.inc

@@ -34 +34 @@
 if (preg_match("/^from:/i", $str)) {
     list(,$srch) = explode(":", $str);
-    $subject =  "HEADER FROM";
-    $search = trim($srch);
-}
-else if (preg_match("/^to:/i", $str)) {
+    $subject     = "HEADER FROM";
+    $search      = trim($srch);
+} else if (preg_match("/^to:/i", $str)) {
     list(,$srch) = explode(":", $str);
-    $subject = "HEADER TO";
-    $search = trim($srch);
-}
-else if (preg_match("/^cc:/i", $str)) {
+    $subject     = "HEADER TO";
+    $search      = trim($srch);
+} else if (preg_match("/^cc:/i", $str)) {
     list(,$srch) = explode(":", $str);
-    $subject = "HEADER CC";
-    $search = trim($srch);
-}
-else if (preg_match("/^subject:/i", $str)) {
+    $subject     = "HEADER CC";
+    $search      = trim($srch);
+} else if (preg_match("/^subject:/i", $str)) {
     list(,$srch) = explode(":", $str);
-    $subject = "HEADER SUBJECT";
-    $search = trim($srch);
-}
-else if (preg_match("/^body:/i", $str)) {
+    $subject     = "HEADER SUBJECT";
+    $search      = trim($srch);
+} else if (preg_match("/^body:/i", $str)) {
     list(,$srch) = explode(":", $str);
-    $subject = "TEXT";
-    $search = trim($srch);
-}
-// search in subject and sender by default
-else {
-    $subject = array("HEADER SUBJECT", "HEADER FROM");
-    $search = trim($str);
+    $subject     = "TEXT";
+    $search      = trim($srch);
+} else {
+    // search in subject and sender by default
+    $from    = ($mbox == $CONFIG['sent_mbox'] || $mbox == $CONFIG['drafts_mbox']) ? "TO" : "FROM";
+    $subject = array("HEADER SUBJECT", "HEADER $from");
+    $search  = trim($str);
 }
 
@@ -72 +68 @@
     // Get the headers
     $result_h = $IMAP->list_header_set($mbox, $result, 1, $_SESSION['sort_col'], $_SESSION['sort_order']);
-    $count = count($result_h);
+    $count    = $IMAP->messagecount();
 
     // save search results in session

branches/devel-vnext/program/steps/mail/sendmail.inc

@@ -30 +30 @@
 $IMAP     = $registry->get('IMAP', 'core');
 
-//require_once('lib/smtp.inc');
-require_once 'include/rcube_smtp.php';
 require_once 'lib/html2text.inc';
-
 
 if (!isset($_SESSION['compose']['id'])) {
@@ -51 +48 @@
 }
 $message_id = sprintf(
-                '<%s@%s>',
-                md5(uniqid('rcmail' . rand(),true)),
-                rcube::mail_domain($_SESSION['imap_host'])
+    '<%s@%s>',
+    md5(uniqid('rcmail' . rand(),true)),
+    rcube::mail_domain($_SESSION['imap_host'])
 );
 $savedraft = ((empty($_POST['_draft']) === false) ? TRUE : FALSE);
@@ -76 +73 @@
 
 // set default charset
-$input_charset = $OUTPUT->get_charset();
+$input_charset   = $OUTPUT->get_charset();
 $message_charset = isset($_POST['_charset']) ? $_POST['_charset'] : $input_charset;
 
-$mailto_regexp = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/');
+$mailto_regexp  = array('/[,;]\s*[\r\n]+/', '/[\r\n]+/', '/[,;]\s*$/m', '/;/');
 $mailto_replace = array(', ', ', ', '', ',');
 
 // replace new lines and strip ending ', '
 $mailto = preg_replace(
-            $mailto_regexp,
-            $mailto_replace,
-            rcube::get_input_value('_to', rcube::INPUT_POST, TRUE, $message_charset)
+    $mailto_regexp,
+    $mailto_replace,
+    rcube::get_input_value('_to', rcube::INPUT_POST, TRUE, $message_charset)
 );
 
@@ -104 +101 @@
 //rcube::tfk_debug('We got identity.');
 
-$from = $identity_arr['mailto'];
+$from     = $identity_arr['mailto'];
 $first_to = is_array($to_address_arr[0]) ? $to_address_arr[0]['mailto'] : $mailto;
 
@@ -112 +109 @@
 // compose headers array
 $headers = array(
-            'Date' => date('D, j M Y H:i:s O'),
-            'From' => rcube::charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset),
-            'To'   => $mailto
+    'Date' => date('D, j M Y H:i:s O'),
+    'From' => rcube::charset_convert($identity_arr['string'], RCMAIL_CHARSET, $message_charset),
+    'To'   => $mailto
 );
 
@@ -120 +117 @@
 if (!empty($_POST['_cc'])) {
     $headers['Cc'] = preg_replace(
-                        $mailto_regexp,
-                        $mailto_replace,
-                        rcube::get_input_value(
-                            '_cc',
-                            rcube::INPUT_POST,
-                            TRUE, $message_charset
-                        )
+        $mailto_regexp,
+        $mailto_replace,
+        rcube::get_input_value(
+            '_cc',
+            rcube::INPUT_POST,
+            TRUE, $message_charset
+        )
     );
 }
 if (!empty($_POST['_bcc'])) {
     $headers['Bcc'] = preg_replace(
-                        $mailto_regexp, $mailto_replace,
-                        rcube::get_input_value('_bcc', rcube::INPUT_POST, TRUE, $message_charset)
+        $mailto_regexp, $mailto_replace,
+        rcube::get_input_value('_bcc', rcube::INPUT_POST, TRUE, $message_charset)
     );
 }
 if (empty($identity_arr['bcc']) === false) {
-     $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
+    $headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
 }
 // add subject
 $headers['Subject'] = trim(
-                        rcube::get_input_value(
-                            '_subject',
-                            rcube::INPUT_POST,
-                            FALSE,
-                            $message_charset
-                        )
+    rcube::get_input_value(
+        '_subject',
+        rcube::INPUT_POST,
+        FALSE,
+        $message_charset
+    )
 );
 
@@ -251 +248 @@
         return;
     }
-}
-else {
+} else {
     $message_body = wordwrap($message_body, 75, "\r\n");
     $message_body = wordwrap($message_body, 998, "\r\n", true);
@@ -269 +265 @@
         }
         $status = $MAIL_MIME->addAttachment(
-                        $attachment['path'],
-                        $attachment['mimetype'],
-                        $attachment['name'],
-                        true,
-                        'base64',
-                        'attachment',
-                        $message_charset
+            $attachment['path'],
+            $attachment['mimetype'],
+            $attachment['name'],
+            true,
+            'base64',
+            'attachment',
+            $message_charset
         );
         if (PEAR::isError($status)) {
@@ -289 +285 @@
     foreach ($_FILES['_attachments']['tmp_name'] as $i => $filepath) {
         $status = $MAIL_MIME->addAttachment(
-                        $filepath,
-                        $files['type'][$i],
-                        $files['name'][$i],
-                        true,
-                        'base64',
-                        'attachment',
-                        $message_charset
+            $filepath,
+            $files['type'][$i],
+            $files['name'][$i],
+            true,
+            'base64',
+            'attachment',
+            $message_charset
         );
         if (PEAR::isError($status)) {
@@ -404 +400 @@
             );
         }
-    }
-    else { // send mail using PHP's mail() function
+    } else { // send mail using PHP's mail() function
 
         //rcube::tfk_debug('We try to send using mail().');
@@ -428 +423 @@
                         $header_str
             );
-        }
-        else {
+        } else {
             $sent = mail(
                         $headers_enc['To'],
@@ -454 +448 @@
 if ($savedraft) {
     $store_target = 'drafts_mbox';
-}
-else {
+} else {
   $store_target = 'sent_mbox';
 }
@@ -466 +459 @@
     if (!in_array_nocase($CONFIG[$store_target], $IMAP->list_mailboxes())) {
         $store_folder = $IMAP->create_mailbox($CONFIG[$store_target], TRUE);
-    }
-    else {
+    } else {
         $store_folder = TRUE;
     }
@@ -533 +525 @@
 
     $OUTPUT->send('iframe');
-}
-else {
+} else {
     if ($CONFIG['smtp_log'] === true) {
         $log_entry = sprintf(
-                        "[%s] User: %d on %s; Message for %s; %s\n",
-                        date("d-M-Y H:i:s O", mktime()),
-                        $_SESSION['user_id'],
-                        $_SERVER['REMOTE_ADDR'],
-                        $mailto,
-                        !empty($smtp_response) ? join('; ', $smtp_response) : ''
+            "[%s] User: %d on %s; Message for %s; %s\n",
+            date("d-M-Y H:i:s O", mktime()),
+            $_SESSION['user_id'],
+            $_SERVER['REMOTE_ADDR'],
+            $mailto,
+            !empty($smtp_response) ? join('; ', $smtp_response) : ''
         );
 

branches/devel-vnext/program/steps/mail/show.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
@@ -52 +52 @@
 
     // calculate Etag for this request
-    $etag = md5($MESSAGE['UID'] . $IMAP->get_mailbox_name() . session_id(). ($PRINT_MODE?1:0));
+    $etag  = $MESSAGE['UID'] . $IMAP->get_mailbox_name() . session_id();
+    $etag .= intval($MESSAGE['headers']->mdn_sent) . intval($PRINT_MODE);
+    $etag  = md5($etag);
 
     // allow caching, unless remote images are present
     if ((bool)rcube::get_input_value('_safe', rcube::INPUT_GET)) {
         send_nocacheing_headers();
-    }
-    else {
+    } else if (empty($CONFIG['devel_mode'])) {
         send_modified_header($_SESSION['login_time'], $etag);
     }
 
     $MESSAGE['subject'] = rcube_imap::decode_mime_string(
-                                $MESSAGE['headers']->subject,
-                                $MESSAGE['headers']->charset
+        $MESSAGE['headers']->subject,
+        $MESSAGE['headers']->charset
     );
     $registry->set('MESSAGE', $MESSAGE, 'core');
@@ -71 +72 @@
     if ($MESSAGE['structure'] = $IMAP->get_structure($MESSAGE['UID'])) {
         $_message_parts = rcmail_parse_message(
-                                  $MESSAGE['structure'],
-                                  array(
-                                        'safe'        => (bool)$_GET['_safe'],
-                                        'prefer_html' => $CONFIG['prefer_html'],
-                                        'get_url'     => $GET_URL.'&_part=%s'
-                                  )
+            $MESSAGE['structure'],
+            array(
+                'safe'        => intval($_GET['_safe']),
+                'prefer_html' => $CONFIG['prefer_html'],
+                'get_url'     => $GET_URL.'&_part=%s'
+            )
         );
         list($MESSAGE['parts'], $MESSAGE['attachments']) = $_message_parts;
-    }
-    else {
+    } else {
         $MESSAGE['body'] = $IMAP->get_body($MESSAGE['UID']);
     }
@@ -91 +91 @@
     // give message uid to the client
     $OUTPUT->set_env('uid', $MESSAGE['UID']);
-    $OUTPUT->set_env('safemode', (bool)$_GET['_safe']);
+    $OUTPUT->set_env('safemode', intval($_GET['_safe']));
+    // check for unset disposition notification
+    if ($MESSAGE['headers']->mdn_to && !$MESSAGE['headers']->mdn_sent) {
+        rcube::gettext('mdnrequest');
+        $OUTPUT->set_env('mdn_request', true);
+    }
 
     $next = $prev = -1;

branches/devel-vnext/program/steps/mail/spell.inc

@@ -5 +5 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/steps/mail/upload.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/steps/mail/viewsource.inc

@@ -6 +6 @@
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev. - Switzerland                      |
+ | Copyright (C) 2005-2008, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |

branches/devel-vnext/program/steps/settings/delete_identity.inc

@@ -20 +20 @@
 */
 
-if (
-    ($ids = rcube::get_input_value('_iid', rcube::INPUT_GET))
-    && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids)
-) {
-    $_query = "UPDATE " . rcube::get_table_name('identities');
-    $_query.= " SET del=1";
-    $_query.= " WHERE user_id=?";
-    $_query.= " AND identity_id IN (" . $ids . ")";
-    $DB->query($_query, $_SESSION['user_id']);
+$ids = rcube::get_input_value('_iid', rcube::INPUT_GET);
 
-    $count = $DB->affected_rows();
-    if ($count) {
+if ($ids && preg_match('/^[0-9]+(,[0-9]+)*$/', $ids)) {
+    if ($USER->delete_identity($ids)) {
         $OUTPUT->show_message('deletedsuccessfully', 'confirmation');
     }
@@ -45 +37 @@
 // go to identities page
 rcube::override_action('identities');
-?>

branches/devel-vnext/program/steps/settings/edit_identity.inc

@@ -20 +20 @@
 
 if (($_GET['_iid'] || $_POST['_iid']) && $_action=='edit-identity') {
-    $_query = "SELECT * FROM " . rcube::get_table_name('identities');
-    $_query.= " WHERE identity_id=?";
-    $_query.= " AND user_id=?";
-    $_query.= " AND del<>1";
-    $DB->query(
-            $_query,
-            rcube::get_input_value('_iid', rcube::INPUT_GPC),
-            $_SESSION['user_id']
-    );
-
-    $IDENTITY_RECORD = $DB->fetch_assoc();
+    $IDENTITY_RECORD = $USER->get_identity(
+        rcube::get_input_value('_iid', rcube::INPUT_GPC));
     $registry->set('IDENTITY_RECORD', $IDENTITY_RECORD, 'core');
     if (is_array($IDENTITY_RECORD)) {
@@ -36 +27 @@
     }
     $OUTPUT->set_pagetitle(rcube::gettext('edititem'));
-}
-else {
-  $OUTPUT->set_pagetitle(rcube::gettext('newitem'));
+} else {
+    $OUTPUT->set_pagetitle(rcube::gettext('newitem'));
 }
 $OUTPUT->include_script('list.js');
@@ -47 +37 @@
     $IDENTITY_RECORD = $registry->get('IDENTITY_RECORD', 'core');
     $OUTPUT          = $registry->get('OUTPUT', 'core');
-/*
-  $OUTPUT->include_script('tiny_mce/tiny_mce_src.js');
-  $OUTPUT->add_script("tinyMCE.init({ mode : 'specific_textareas'," .
-                                    "apply_source_formatting : true," .
-                                    "content_css : '\$__skin_path' + '/editor_content.css'," .
-                                    "popups_css : '\$__skin_path' + '/editor_popups.css'," .
-                                    "editor_css : '\$__skin_path' + '/editor_ui.css'," .
-                                    "theme : 'advanced'," .
-                                    "theme_advanced_toolbar_location : 'top'," .
-                                    "theme_advanced_toolbar_align : 'left'," .
-                                    "theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr'," .
-                                    "theme_advanced_buttons2 : 'link,unlink,code,forecolor,fontselect,fontsizeselect'," .
-                                    "theme_advanced_buttons3 : '' });");
-*/
+    
+    $OUTPUT->include_script('tiny_mce/tiny_mce_src.js');
+    $OUTPUT->add_script("tinyMCE.init({ mode : 'specific_textareas'," .
+        "apply_source_formatting : true," .
+        "content_css : '\$__skin_path' + '/editor_content.css'," .
+        "editor_css : '\$__skin_path' + '/editor_ui.css'," .
+        "theme : 'advanced'," .
+        "theme_advanced_toolbar_location : 'top'," .
+        "theme_advanced_toolbar_align : 'left'," .
+        "theme_advanced_buttons1 : 'bold,italic,underline,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,separator,outdent,indent,charmap,hr'," .
+        "theme_advanced_buttons2 : 'link,unlink,code,forecolor,fontselect,fontsizeselect'," .
+        "theme_advanced_buttons3 : '' });");
+
     if (!$IDENTITY_RECORD && $GLOBALS['_action']!='add-identity') {
         return rcube::gettext('notfound');
@@ -70 +59 @@
     unset($attrib['form']);
 
-
     // list of available cols
     $a_show_cols = array(
-                        'name'         => array('type' => 'text'),
-                        'email'        => array('type' => 'text'),
-                        'organization' => array('type' => 'text'),
-                        'reply-to'     => array('type' => 'text', 'label' => 'replyto'),
-                        'bcc'          => array('type' => 'text'),
-                        'signature'       => array('type' => 'textarea', 'size' => "40", 'rows' => "4"),
-                   //   'html_signature'=>array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'_signature\');'),
-                        'standard'     => array('type' => 'checkbox', 'label' => 'setdefault'));
+        'name'           => array('type' => 'text'),
+        'email'          => array('type' => 'text'),
+        'organization'   => array('type' => 'text'),
+        'reply-to'       => array('type' => 'text', 'label' => 'replyto'),
+        'bcc'            => array('type' => 'text'),
+        'signature'          => array('type' => 'textarea', 'size' => "40", 'rows' => "6"),
+        'html_signature' => array('type' => 'checkbox', 'label' => 'htmlsignature', 'onclick' => 'return rcmail.toggle_editor(this, \'_signature\');'),
+        'standard'       => array('type' => 'checkbox', 'label' => 'setdefault'));
 
 
@@ -92 +80 @@
                         $IDENTITY_RECORD[$attrib['part']],
                         $attrib,
-                        $colprop['type']
-            );
+                        $colprop['type']);
             return $out;
         }
-        else {
-            return '';
-        }
+        return '';
     }
-
 
     // return the complete edit form as table
@@ -106 +90 @@
 
     foreach ($a_show_cols as $col => $colprop) {
-        $attrib['id'] = 'rcmfd_'.$col;
+        $attrib['id'] = 'rcmfd_' . $col;
 
         if (strlen($colprop['onclick'])) {
             $attrib['onclick'] = $colprop['onclick'];
-        }
-        else {
+        } else {
             unset($attrib['onclick']);
         }
@@ -119 +102 @@
             $attrib['rows'] = $colprop['rows'];
             $attrib['mce_editable'] = $IDENTITY_RECORD['html_signature'] ? "true" : "false";
-        }
-        else {
+        } else {
             unset($attrib['size']);
             unset($attrib['rows']);
@@ -128 +110 @@
         $label = strlen($colprop['label']) ? $colprop['label'] : $col;
         $value = rcube::get_edit_field(
-                        $col,
-                        $IDENTITY_RECORD[$col],
-                        $attrib,
-                        $colprop['type']
-        );
+            $col,
+            $IDENTITY_RECORD[$col],
+            $attrib,
+            $colprop['type']);
 
         $out .= sprintf(
-                    "<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
-                    $attrib['id'],
-                    Q(rcube::gettext($label)),
-                    $value);
+            "<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+            $attrib['id'],
+            Q(rcube::gettext($label)),
+            $value);
     }
     $out .= "\n</table>$form_end";
@@ -151 +132 @@
 }
 rcube::parse_template('editidentity');
-?>

branches/devel-vnext/program/steps/settings/func.inc

@@ -20 +20 @@
 */
 
-
-// get user record
-$_query = "SELECT username, mail_host FROM " . rcube::get_table_name('users');
-$_query.= " WHERE user_id=?";
-$sql_result = $DB->query($_query, $_SESSION['user_id']);
-
-if ($USER_DATA = $DB->fetch_assoc($sql_result)) {
-    $OUTPUT->set_pagetitle(
-                sprintf(
-                    '%s %s@%s',
-                    rcube::gettext('settingsfor'),
-                    $USER_DATA['username'],
-                    $USER_DATA['mail_host']
-                )
-    );
+if ($USER->ID) {
+        $OUTPUT->set_pagetitle(
+                rcube::gettext('settingsfor') . ' ' . $USER->get_username());
 }
-
 
 function rcmail_user_prefs_form($attrib)
@@ -176 +163 @@
 
     // Show checkbox for HTML Editor
-    if (false && !isset($no_override['htmleditor'])) {
+    if (!isset($no_override['htmleditor'])) {
         $field_id = 'rcmfd_htmleditor';
         $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
@@ -188 +175 @@
 
     // show config parameter for preview pane
-    if (false && !isset($no_override['preview_pane'])) {
-    $field_id = 'rcmfd_preview';
-    $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
-    $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
+    if (!isset($no_override['preview_pane'])) {
+        $field_id       = 'rcmfd_preview';
+            $input_preview  = new html_checkbox(
+                array(
+                        'name'  => '_preview_pane',
+                        'id'    => $field_id,
+                        'value' => 1));
+                        
+        $out .= sprintf(
+                                "<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n",
                     $field_id,
                     Q(rcube::gettext('previewpane')),
@@ -233 +226 @@
     $CONFIG   = $registry->get_all('config');
     $OUTPUT   = $registry->get('OUTPUT', 'core');
-
+        $USER     = $registry->get('USER', 'core');
 
     // get contacts from DB
-    $_query = "SELECT * FROM " . rcube::get_table_name('identities');
-    $_query.= " WHERE del<>1";
-    $_query.= " AND user_id=?";
-    $_query.= " ORDER BY standard DESC, name ASC";
+    $_query         = "SELECT * FROM " . rcube::get_table_name('identities');
+    $_query        .= " WHERE del<>1";
+    $_query        .= " AND user_id=?";
+    $_query        .= " ORDER BY standard DESC, name ASC";
     $sql_result = $DB->query($_query, $_SESSION['user_id']);
 
     $identities_data = array();
-    /**
-     * macbay hack
-     */
     while ($sql_result && ($sql_arr = $DB->fetch_assoc($sql_result))) {
         $sql_arr['edit'] = '';
-        //$sql_arr['edit'].= '<img scr="/webmail/img/pencil.gif" alt="Bearbeiten" />';
-        //$sql_arr['edit'].= '<img src="/webmail/skins/macbay/img/delete.gif" alt="L&ouml;schen" />';
         $sql_arr['edit'].= '<roundcube:button id="identities_edit_' . $sql_arr['identity_id'] . '" command="edit" type="image" image="/img/pencil.gif" title="edit" />';
-        //$sql_arr['edit'].= '<roundcube:button id="identities_delete_' . $sql_arr['identity_id'] . '" command="delete" type="image" style="padding-left:10px;" image="/img/delete.gif" title="delete" />';
 
         array_push($identities_data, $sql_arr);
-        //echo '<pre>'; var_dump($sql_arr); echo '</pre>';
-    }
-    //exit;
+    }
 
     // add id to message list table if not specified

branches/devel-vnext/program/steps/settings/manage_folders.inc

@@ -27 +27 @@
 $IMAP     = $registry->get('IMAP', 'core');
 
-//rcube::tfk_debug('DEBUG: ' . $_action);
-//rcube::tfk_debug('MAILBOX: ' . $_POST['_mboxes']);
-//rcube::tfk_debug('AJAX?: ' . $OUTPUT->ajax_call);
+$OUTPUT->include_script('list.js');
 
 // subscribe to one or more mailboxes
 if ($_action=='subscribe') {
     if ($mboxes = rcube::get_input_value('_mboxes', rcube::INPUT_POST)) {
-        $status = $IMAP->subscribe(array($mboxes));
-        //rcube::tfk_debug('Status: ' . $status);
+        $status = $IMAP->subscribe($mboxes);
     }
     if ($OUTPUT->ajax_call) {
@@ -45 +42 @@
 else if ($_action=='unsubscribe') {
     if ($mboxes = rcube::get_input_value('_mboxes', rcube::INPUT_POST)) {
-        $status = $IMAP->unsubscribe(array($mboxes));
-        //rcube::tfk_debug('Status: ' . $status);
+        $status = $IMAP->unsubscribe($mboxes);
     }
     if ($OUTPUT->ajax_call) {
         $OUTPUT->remote_response('// unsubscribed');
     }
-}
-
-// create a new mailbox
-else if ($_action=='create-folder') {
+} else if ($_action=='create-folder') { // create a new mailbox
     if (!empty($_POST['_name'])) {
         $create = $IMAP->create_mailbox(
-                    trim(
-                        rcube::get_input_value('_name', rcube::INPUT_POST, FALSE, 'UTF-7')
-                    ),
-                    TRUE
+            trim(rcube::get_input_value('_name', rcube::INPUT_POST, FALSE, 'UTF-7')),
+            TRUE
         );
     }
     if ($create && $OUTPUT->ajax_call) {
-        $OUTPUT->command(
-            'add_folder_row',
-            $create,
-            rcube::charset_convert($create, 'UTF-7')
-        );
+        $delimiter   = $IMAP->get_hierarchy_delimiter();
+        $foldersplit = explode($delimiter, $create);
+        
+        $_str  = substr_count($create, $delimiter));
+        $_str .= rcube::charset_convert($foldersplit[count($foldersplit)-1], 'UTF-7');
+        
+        $display_create = str_repeat('    ', $str);
+        
+                $OUTPUT->command('add_folder_row', $create, $display_create);
         $OUTPUT->send();
-    }
-    else if (!$create && $OUTPUT->ajax_call) {
+    } else if (!$create && $OUTPUT->ajax_call) {
         $OUTPUT->show_message('errorsaving', 'error');
         $OUTPUT->remote_response();
@@ -78 +72 @@
         $OUTPUT->show_message('errorsaving', 'error');
     }
-}
-
-// rename a mailbox
-else if ($_action=='rename-folder') {
+} else if ($_action=='rename-folder') { // rename a mailbox
     if (!empty($_POST['_folder_oldname']) && !empty($_POST['_folder_newname'])) {
+    
+        $a_mboxes  = array_unique(array_merge(
+                $IMAP->list_mailboxes(),
+                $IMAP->list_unsubscribed()));
+                $delimiter = $IMAP->get_hierarchy_delimiter();
 
         $oldname         = rcube::get_input_value('_folder_oldname', rcube::INPUT_POST);
@@ -93 +89 @@
     }
     if ($rename && $OUTPUT->ajax_call) {
-        $OUTPUT->command(
-                    'replace_folder_row',
-                    $oldname,
-                    $rename,
-                    rcube::charset_convert($rename, 'UTF-7')
-        );
+                $delimiter      = $IMAP->get_hierarchy_delimiter();
+                $foldersplit    = explode($delimiter, $rename);
+                $level          = count($foldersplit) - 1;
+                $display_rename = str_repeat('    ', $level) . rcube::charset_convert($foldersplit[$level], 'UTF-7');
+                
+                $OUTPUT->command('replace_folder_row', $oldname, $rename, $display_rename);
+                
+                foreach ($a_mboxes as $mbox) {
+                        if (preg_match('/^'.preg_quote($oldname.$delimiter).'/', $mbox)) {
+                                $c_rename       = preg_replace('/^'.preg_quote($oldname).'/', $rename, $mbox);
+                                $foldersplit    = explode($delimiter, $c_rename);
+                                $level          = count($foldersplit) - 1;
+                                $display_rename = str_repeat('    ', $level) . rcube::charset_convert($foldersplit[$level], 'UTF-7');
+                                
+                                $OUTPUT->command('replace_folder_row', $mbox, $c_rename, $display_rename);
+                        }
+                }
         $OUTPUT->command('reset_folder_rename');
         $OUTPUT->send();
-    }
-    elseif (!$rename && $OUTPUT->ajax_call) {
+    } elseif (!$rename && $OUTPUT->ajax_call) {
         $OUTPUT->command('reset_folder_rename');
         $OUTPUT->show_message('errorsaving', 'error');
@@ -110 +116 @@
         $OUTPUT->show_message('errorsaving', 'error');
     }
-}
-
-// delete an existing IMAP mailbox
-elseif ($_action=='delete-folder') {
+} elseif ($_action=='delete-folder') { // delete an existing IMAP mailbox
+        $a_mboxes  = array_merge($IMAP->list_mailboxes(), $IMAP->list_unsubscribed());
+        $delimiter = $IMAP->get_hierarchy_delimiter();
+
     if ($mboxes = rcube::get_input_value('_mboxes', rcube::INPUT_POST)) {
         $deleted = $IMAP->delete_mailbox(array($mboxes));
@@ -120 +126 @@
     if ($OUTPUT->ajax_call && $deleted) {
         $OUTPUT->command('remove_folder_row', rcube::get_input_value('_mboxes', rcube::INPUT_POST));
+        foreach ($a_mboxes as $mbox) {
+                $regex = preg_quote(rcube::get_input_value(
+                        '_mboxes',
+                        rcube::INPUT_POST) . $delimiter);
+                        
+            if (preg_match('/^'. $regex .'/', $mbox)) {
+                $OUTPUT->command('remove_folder_row', $mbox);
+            }
+        }
+        
         $OUTPUT->show_message('folderdeleted', 'confirmation');
         $OUTPUT->send();
@@ -187 +203 @@
     $a_unsubscribed = $IMAP->list_unsubscribed();
     $a_subscribed   = $IMAP->list_mailboxes();
+    $delimiter      = $IMAP->get_hierarchy_delimiter();
     $a_js_folders   = array();
  
@@ -226 +243 @@
         $folder_js   = JQ($folder);
         $folder_html = '';
-        if (
-            $CONFIG['protect_default_folders']
-            && in_array($folder, $CONFIG['default_imap_folders'])
-        ) {
-            $folder_html.= rcube::gettext(strtolower($folder));
-        }
-        else {
-            $folder_html.= rcube::charset_convert($folder, 'UTF-7');
+        
+        $foldersplit     = explode($delimiter, $folder);
+                $level           = count($foldersplit) - 1;
+                $display_folder  = str_repeat('    ', $level);
+                $display_folder .= rcube::charset_convert($foldersplit[$level], 'UTF-7');
+        
+        if ($CONFIG['protect_default_folders'] && in_array($folder, $CONFIG['default_imap_folders'])) {
+            $folder_html .= rcube::gettext(strtolower($folder));
+        } else {
+            $folder_html .= $display_folder;
         }
         if (strlen($folder_html) > 40) {
@@ -283 +302 @@
     $OUTPUT->add_gui_object('subscriptionlist', $attrib['id']);
     $OUTPUT->set_env('subscriptionrows', $a_js_folders);
-
+        $OUTPUT->set_env('defaultfolders', $CONFIG['default_imap_folders']);
+        $OUTPUT->set_env('delimiter', $delimiter);
+        
     return $out;  
 }

branches/devel-vnext/program/steps/settings/save_identity.inc

@@ -23 +23 @@
     exit;
 }
-$a_save_cols    = array(
-                    'name', 'email', 'organization',
-                    'reply-to', 'bcc', 'standard',
-                    'signature', 'html_signature'
-);
+$a_save_cols = array(
+        'name', 'email', 'organization',
+        'reply-to', 'bcc', 'standard',
+        'signature', 'html_signature');
+        
 $a_html_cols    = array('signature');
 $a_boolean_cols = array('standard', 'html_signature');
@@ -39 +39 @@
 }
 
+$save_data = array();
+foreach ($a_save_cols as $col) {
+        $fname = '_'.$col;
+        if (isset($_POST[$fname])) {
+                $save_data[$col] = rcube::get_input_value($fname,
+                        rcube::INPUT_POST, in_array($col, $a_html_cols));
+    }
+}
 
-// update an existing contact
+// set "off" values for checkboxes that were not checked, and therefore
+// not included in the POST body.
+foreach ($a_boolean_cols as $col) {
+        $fname = '_' . $col;
+        if (!isset($_POST[$fname])) {
+                $save_data[$col] = 0;
+        }
+}
+
 if ($_POST['_iid']) {
-    $a_write_sql = array();
-
-    foreach ($a_save_cols as $col) {
-        $fname = '_'.$col;
-        if (isset($_POST[$fname])) {
-            $a_write_sql[] = sprintf(
-                                "%s=%s",
-                                $DB->quoteIdentifier($col),
-                                $DB->quote(
-                                    rcube::get_input_value(
-                                        $fname,
-                                        rcube::INPUT_POST,
-                                        in_array($col, $a_html_cols)
-                                    )
-                                )
-            );
-        }
-    }
-
-    // set "off" values for checkboxes that were not checked, and therefore
-    // not included in the POST body.
-    foreach ($a_boolean_cols as $col) {
-        $fname = '_' . $col;
-        if (!isset($_POST[$fname])) {
-            $a_write_sql[] = sprintf("%s=0", $DB->quoteIdentifier($col));
-        }
-    }
-
-    if (sizeof($a_write_sql)) {
-        $_query = "UPDATE " . rcube::get_table_name('identities');
-        $_query.= " SET " . join(', ', $a_write_sql);
-        $_query.= " WHERE identity_id=?";
-        $_query.= " AND user_id=?";
-        $_query.= " AND del<>1";
-        $DB->query(
-                $_query,
-                rcube::get_input_value('_iid', rcube::INPUT_POST),
-                $_SESSION['user_id']
-        );
-
-        $updated = $DB->affected_rows();
-    }
-
-    if ($updated) {
+        $updated = $USER->update_identity(
+                rcube::get_input_value('_iid', rcube::INPUT_POST),
+                $save_data);
+                
+        if ($updated) {
         $OUTPUT->show_message('successfullysaved', 'confirmation');
 
@@ -95 +72 @@
             // ...
         }
-    }
-    else if ($DB->is_error()) {
+    } else if ($DB->is_error()) {
         // show error message
         $OUTPUT->show_message('errorsaving', 'error');
@@ -102 +78 @@
         return;
     }
-}
-// insert a new contact
-else {
-    $a_insert_cols = $a_insert_values = array();
-
-    foreach ($a_save_cols as $col) {
-        $fname = '_'.$col;
-        if (!isset($_POST[$fname])) {
-            continue;
-        }
-        $a_insert_cols[]   = $DB->quoteIdentifier($col);
-        $a_insert_values[] = $DB->quote(
-                                rcube::get_input_value(
-                                    $fname,
-                                    rcube::INPUT_POST,
-                                    in_array($col, $a_html_cols)
-                                )
-        );
-    }
-    if (sizeof($a_insert_cols)) {
-        $_query = "INSERT INTO " . rcube::get_table_name('identities');
-        $_query.= " (user_id, " . join(', ', $a_insert_cols).")";
-        $_query.= " VALUES (?, " . join(', ', $a_insert_values).")";
-        $DB->query($_query, $_SESSION['user_id']);
-
-        $insert_id = $DB->insert_id(rcube::get_sequence_name('identities'));
-    }
-
-    if ($insert_id) {
+} else { // insert a new contact
+        if ($insert_id = $USER->insert_identity($save_data)) {
         $_GET['_iid'] = $insert_id;
 
@@ -140 +89 @@
             // ....
         }
-    }
-    else {
+    } else {
         // show error message
         $OUTPUT->show_message('errorsaving', 'error');
@@ -149 +97 @@
 }
 
-
 // mark all other identities as 'not-default'
 if ($default_id) {
-    $_query = "UPDATE " . rcube::get_table_name('identities');
-    $_query.= " SET " . $DB->quoteIdentifier('standard') . "='0'";
-    $_query.= " WHERE user_id=?";
-    $_query.= " AND identity_id<>?";
-    $_query.= " AND del<>1";
-    $DB->query($_query, $_SESSION['user_id'], $default_id);
+        $USER->set_default($default_id);
 }
 // go to next step

branches/devel-vnext/program/steps/settings/save_prefs.inc

@@ -43 +43 @@
     $a_user_prefs['pagesize'] = 10;
 }
-rcube::tfk_debug($a_user_prefs['pagesize']);
-rcube::tfk_debug($CONFIG['max_pagesize']);
+
 if (isset($CONFIG['max_pagesize']) && empty($CONFIG['max_pagesize']) !== TRUE) {
     if ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize']) {
@@ -57 +56 @@
 }
 
-if (rcube::save_user_prefs($a_user_prefs)) {
+// force min size
+if ($a_user_prefs['pagesize'] < 1) {
+        $a_user_prefs['pagesize'] = 10;
+}
+if (isset($CONFIG['max_pagesize'])
+        && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize'])) {
+        $a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize'];
+}
+
+if ($USER->save_prefs($a_user_prefs)) {
     $OUTPUT->show_message('successfullysaved', 'confirmation');
 }