Changeset 266 in subversion


Ignore:
Timestamp:
Jun 26, 2006 2:38:03 PM (7 years ago)
Author:
thomasb
Message:

Typos, Optimizations, Updates

Location:
trunk/roundcubemail
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r261 r266  
    22--------------------------- 
    33 
     42006/06/25 
     5---------- 
     6- Changed behavior to include host-specific configuration (Bug #1483849) 
     7- Assume ISO-8859-1 encoding of mail messages by default (Patch #1483839) 
     8- Fixed spell checker to work with the new URL at google.com 
     9- Some memory and security optimizations sendmail.inc 
     10- Updated UGRADING description 
     11 
     12 
    4132006/06/19 
    514---------- 
    615- Added Drafts support (Feature #1326839) (richs) 
     16 
    717 
    8182006/06/02 

  • trunk/roundcubemail/UPGRADING

    r168 r266  
    7272  $rcmail_config['temp_dir'] = 'temp/'; 
    7373  $rcmail_config['message_cache_lifetime'] = '10d'; 
     74  $rcmail_config['drafts_mbox'] = 'Drafts'; 
     75  $rcmail_config['product_name'] = 'RoundCube Webmail'; 
     76  $rcmail_config['read_when_deleted'] = TRUE; 
     77  $rcmail_config['enable_spellcheck'] = TRUE; 
    7478- add these lines to /config/db.inc.php 
    7579  $rcmail_config['db_max_length'] = 512000;   
    … …  
    7983  $rcmail_config['db_sequence_cache_ids'] = 'cache_ids'; 
    8084  $rcmail_config['db_sequence_message_ids'] = 'message_ids';   
    81  
     85  $rcmail_config['db_persistent'] = TRUE; 
    8286 
    8387from version 0.1-20051021 
    … …  
    9498  $rcmail_config['temp_dir'] = 'temp/'; 
    9599  $rcmail_config['message_cache_lifetime'] = '10d'; 
     100  $rcmail_config['drafts_mbox'] = 'Drafts'; 
     101  $rcmail_config['product_name'] = 'RoundCube Webmail'; 
     102  $rcmail_config['read_when_deleted'] = TRUE; 
     103  $rcmail_config['enable_spellcheck'] = TRUE; 
    96104- add these lines to /config/db.inc.php 
    97105  $rcmail_config['db_max_length'] = 512000; 
    … …  
    101109  $rcmail_config['db_sequence_cache_ids'] = 'cache_ids'; 
    102110  $rcmail_config['db_sequence_message_ids'] = 'message_ids'; 
     111  $rcmail_config['db_persistent'] = TRUE; 
    103112   
    104113   
    … …  
    110119- add these lines to /config/db.inc.php 
    111120  $rcmail_config['db_persistent'] = TRUE; 
    112  
     121- add these lines to /config/main.inc.php 
     122  $rcmail_config['drafts_mbox'] = 'Drafts'; 
     123  $rcmail_config['product_name'] = 'RoundCube Webmail'; 
     124  $rcmail_config['read_when_deleted'] = TRUE; 
     125  $rcmail_config['enable_spellcheck'] = TRUE; 
     126- replace the following line from /config/main.inc.php 
     127   @include($_SERVER['HTTP_HOST'].'.inc.php'); 
     128  with  
     129   $rcmail_config['include_host_config'] = TRUE; 
    113130   
     131   

  • trunk/roundcubemail/program/include/main.inc

    r263 r266  
    4545   
    4646  // load host-specific configuration 
    47   rcmail_load_host_config(&$CONFIG); 
     47  rcmail_load_host_config($CONFIG); 
    4848   
    4949  $CONFIG['skin_path'] = $CONFIG['skin_path'] ? preg_replace('/\/$/', '', $CONFIG['skin_path']) : 'skins/default'; 

  • trunk/roundcubemail/program/include/rcube_imap.inc

    r264 r266  
    991991 
    992992  // append a mail message (source) to a specific mailbox 
    993   function save_message($mbox_name, $message) 
     993  function save_message($mbox_name, &$message) 
    994994    { 
    995995    $mailbox = $this->_mod_mailbox($mbox_name); 

  • trunk/roundcubemail/program/include/rcube_smtp.inc

    r158 r266  
    5050 * @access public 
    5151 */ 
    52 function smtp_mail($from, $recipients, $headers, &$body) 
     52function smtp_mail($from, $recipients, &$headers, &$body) 
    5353  { 
    5454  global $SMTP_CONN, $CONFIG, $SMTP_ERROR; 

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

    r261 r266  
    3838$labels['sent']   = 'Gesendet'; 
    3939$labels['trash']  = 'Gelöscht'; 
    40 $labels['drafts'] = 'Vorlagen'; 
    4140$labels['junk']   = 'Junk'; 
    4241 
    … …  
    122121// message compose // Nachrichten erstellen 
    123122$labels['compose']  = 'Neue Nachricht verfassen'; 
    124 $labels['savemessage']  = 'Außer diesem Entwurf'; 
     123$labels['savemessage']  = 'Nachricht speichern'; 
    125124$labels['sendmessage']  = 'Nachricht jetzt senden'; 
    126125$labels['addattachment']  = 'Datei anfÃŒgen'; 

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

    r261 r266  
    3939$messages['messagesent'] = 'Nachricht erfolgreich gesendet'; 
    4040 
    41 $messages['savingmessage'] = 'Einsparunganzeige...'; 
     41$messages['savingmessage'] = 'Nachricht wird gespeichert...'; 
    4242 
    43 $messages['messagesaved'] = 'Anzeige gespeichert zu den EntwÃŒrfen'; 
     43$messages['messagesaved'] = 'Nachricht als Entwurf gespeichert'; 
    4444 
    4545$messages['successfullysaved'] = 'Erfolgreich gespeichert'; 

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

    r261 r266  
    3939$labels['sent']   = 'Gesendet'; 
    4040$labels['trash']  = 'Gelöscht'; 
    41 $labels['drafts'] = 'EntwÃŒrfe'; 
    4241$labels['junk']   = 'Spam'; 
    4342 
    … …  
    123122// message compose // Nachrichten erstellen 
    124123$labels['compose']  = 'Neue Nachricht verfassen'; 
    125 $labels['savemessage']  = 'Außer diesem Entwurf'; 
     124$labels['savemessage']  = 'Nachricht speichern'; 
    126125$labels['sendmessage']  = 'Nachricht jetzt senden'; 
    127126$labels['addattachment']  = 'Datei anfÃŒgen'; 

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

    r261 r266  
    4141$messages['messagesent'] = 'Nachricht erfolgreich gesendet'; 
    4242 
    43 $messages['savingmessage'] = 'Einsparunganzeige...'; 
     43$messages['savingmessage'] = 'Nachricht wird gespeichert...'; 
    4444 
    45 $messages['messagesaved'] = 'Anzeige gespeichert zu den EntwÃŒrfen'; 
     45$messages['messagesaved'] = 'Nachricht als Entwurf gespeichert'; 
    4646 
    4747$messages['successfullysaved'] = 'Erfolgreich gespeichert'; 

  • trunk/roundcubemail/program/steps/mail/sendmail.inc

    r261 r266  
    6363  } 
    6464 
    65 if (strlen($_POST['_draft_saveid']) > 3) { 
    66   $olddraftmessageid = $_POST['_draft_saveid']; 
    67 } 
    68 if (strlen($_POST['_draft_newsaveid']) > 3) { 
    69   $newdraftmessageid = $_POST['_draft_newsaveid']; 
    70 } 
    71 if ($_POST['_draft']) { 
    72   $savedraft = 1; 
    73 } 
     65if (strlen($_POST['_draft_saveid']) > 3) 
     66  $olddraftmessageid = get_input_value('_draft_saveid', RCUBE_INPUT_POST); 
     67 
     68if (strlen($_POST['_draft_newsaveid']) > 3) 
     69  $newdraftmessageid = get_input_value('_draft_newsaveid', RCUBE_INPUT_POST); 
     70 
     71$savedraft = !empty($_POST['_draft']) ? TRUE : FALSE; 
     72 
    7473  
    7574/****** check submission and compose message ********/ 
    … …  
    9695// decode address strings 
    9796$to_address_arr = $IMAP->decode_address_list($mailto); 
    98 $identity_arr = rcmail_get_identity($_POST['_from']); 
     97$identity_arr = rcmail_get_identity(get_input_value('_from', RCUBE_INPUT_POST)); 
    9998 
    10099 
    … …  
    104103 
    105104// try the message-id submitted by the compose form 
    106 if ($newdraftmessageid) { 
     105if ($newdraftmessageid) 
    107106  $message_id = sprintf('<%s>',$newdraftmessageid); 
    108 } else { 
     107else 
    109108  $message_id = sprintf('<%s@%s>', md5(uniqid('rcmail'.rand(),true)), $_SESSION['imap_host']); 
    110 } 
     109   
     110if (empty($identity_arr['string'])) 
     111  $identity_arr['string'] = $from; 
    111112 
    112113 
    … …  
    114115$headers = array('Date' => date('D, j M Y G:i:s O'), 
    115116                 'From' => $identity_arr['string'], 
    116                  'To'   => rcube_charset_convert($mailto, $input_charset, $message_charset)); 
     117                 'To'   => $mailto); 
    117118 
    118119// additional recipients 
    … …  
    219220 
    220221// compose message body and get headers 
    221 $msg_body = $MAIL_MIME->get($message_param); 
     222$msg_body = &$MAIL_MIME->get($message_param); 
    222223 
    223224$msg_subject = $headers['Subject']; 
    … …  
    296297 
    297298// Determine which folder to save message 
    298 if ($savedraft) { 
    299         $store_target = 'drafts_mbox'; 
    300 } else { 
    301         $store_target = 'sent_mbox'; 
    302 } 
     299if ($savedraft) 
     300  $store_target = 'drafts_mbox'; 
     301else 
     302  $store_target = 'sent_mbox'; 
    303303 
    304304if ($CONFIG[$store_target]) 
    … …  
    312312  else 
    313313    $store_folder = TRUE; 
     314   
     315  // add headers to message body 
     316  $msg_body = $header_str."\r\n".$msg_body; 
    314317 
    315318  // append message to sent box 
    316319  if ($store_folder) 
    317     $saved = $IMAP->save_message($CONFIG[$store_target], $header_str."\r\n".$msg_body); 
     320    $saved = $IMAP->save_message($CONFIG[$store_target], $msg_body); 
    318321 
    319322  // raise error if saving failed 
    … …  
    324327                      'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE); 
    325328 
    326   if ($olddraftmessageid) { 
     329  if ($olddraftmessageid) 
     330    { 
    327331    // delete previous saved draft 
    328332    $a_deleteid = $IMAP->search($CONFIG['drafts_mbox'],'HEADER Message-ID',$olddraftmessageid); 
Note: See TracChangeset for help on using the changeset viewer.