Changeset 1621 in subversion


Ignore:
Timestamp:
Jul 31, 2008 5:08:17 PM (5 years ago)
Author:
thomasb
Message:

Save outgoing mail to selectable folder (#1324581)

Location:
trunk/roundcubemail
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/roundcubemail/CHANGELOG

    r1601 r1621  
    11CHANGELOG RoundCube Webmail 
    22--------------------------- 
     3 
     42008/07/31 (thomasb) 
     5---------- 
     6- Make default imap folders configurable for each user (#1485075) 
     7- Save outgoing mail to selectable folder (#1324581) 
    38 
    492008/07/21 (alec) 

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

    r1534 r1621  
    189189$labels['htmltoggle'] = 'HTML'; 
    190190$labels['plaintoggle'] = 'Klartext'; 
     191$labels['savesentmessagein'] = 'Nachricht speichern in'; 
     192$labels['dontsave'] = 'nicht speichern'; 
    191193 
    192194$labels['addcc'] = 'Cc hinzufÃŒgen'; 
    … …  
    281283$labels['deletefolder']  = 'Ordner löschen'; 
    282284$labels['managefolders']  = 'Ordner verwalten'; 
     285$labels['specialfolders']  = 'Spezialordner'; 
    283286 
    284287$labels['sortby'] = 'Sortieren nach'; 

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

    r1598 r1621  
    150150$labels['htmltoggle'] = 'HTML'; 
    151151$labels['plaintoggle'] = 'Nur-Text'; 
     152$labels['savesentmessagein'] = 'Nachricht speichern in'; 
     153$labels['dontsave'] = 'nicht speichern'; 
    152154$labels['addcc'] = 'Cc hinzufÃŒgen'; 
    153155$labels['addbcc'] = 'Bcc hinzufÃŒgen'; 
    … …  
    222224$labels['deletefolder'] = 'Ordner löschen'; 
    223225$labels['managefolders'] = 'Ordner verwalten'; 
     226$labels['specialfolders']  = 'Spezialordner'; 
    224227$labels['sortby'] = 'Sortieren nach'; 
    225228$labels['sortasc'] = 'Aufsteigend sortieren'; 

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

    r1583 r1621  
    191191$labels['htmltoggle'] = 'HTML'; 
    192192$labels['plaintoggle'] = 'Plain text'; 
     193$labels['savesentmessagein'] = 'Save sent message in'; 
     194$labels['dontsave'] = 'don\'t save'; 
    193195 
    194196$labels['addcc'] = 'Add Cc'; 
    … …  
    285287$labels['deletefolder']  = 'Delete folder'; 
    286288$labels['managefolders']  = 'Manage folders'; 
     289$labels['specialfolders']  = 'Special folders'; 
    287290 
    288291$labels['sortby'] = 'Sort by'; 

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

    r1610 r1621  
    777777 
    778778 
     779function rcmail_store_target_selection($attrib) 
     780{ 
     781  $attrib['name'] = '_store_target'; 
     782  $select = rcmail_mailbox_select(array('noselection' => '- '.rcube_label('dontsave').' -')); 
     783  return $select->show(rcmail::get_instance()->config->get('sent_mbox'), $attrib); 
     784} 
     785 
     786 
    779787function get_form_tags($attrib) 
    780788{ 
    … …  
    814822  'editorselector' => 'rcmail_editor_selector', 
    815823  'receiptcheckbox' => 'rcmail_receipt_checkbox', 
     824  'storetarget' => 'rcmail_store_target_selection', 
    816825)); 
    817826 

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

    r1610 r1621  
    356356// Determine which folder to save message 
    357357if ($savedraft) 
    358   $store_target = 'drafts_mbox'; 
     358  $store_target = $CONFIG['drafts_mbox']; 
    359359else 
    360   $store_target = 'sent_mbox'; 
    361  
    362 if ($CONFIG[$store_target]) 
     360  $store_target = isset($_POST['_store_target']) ? get_input_value('_store_target', RCUBE_INPUT_POST) : $CONFIG['sent_mbox']; 
     361 
     362if ($store_target) 
    363363  { 
    364364  // check if mailbox exists 
    365   if (!in_array_nocase($CONFIG[$store_target], $IMAP->list_mailboxes())) 
    366     $store_folder = $IMAP->create_mailbox($CONFIG[$store_target], TRUE); 
     365  if (!in_array_nocase($store_target, $IMAP->list_mailboxes())) 
     366    $store_folder = $IMAP->create_mailbox($store_target, TRUE); 
    367367  else 
    368368    $store_folder = TRUE; 
    … …  
    370370  // append message to sent box 
    371371  if ($store_folder) 
    372     $saved = $IMAP->save_message($CONFIG[$store_target], $MAIL_MIME->getMessage()); 
     372    $saved = $IMAP->save_message($store_target, $MAIL_MIME->getMessage()); 
    373373 
    374374  // raise error if saving failed 
    … …  
    376376    { 
    377377    raise_error(array('code' => 800, 'type' => 'imap', 'file' => __FILE__, 
    378                       'message' => "Could not save message in $CONFIG[$store_target]"), TRUE, FALSE); 
     378                      'message' => "Could not save message in $store_target"), TRUE, FALSE); 
    379379     
    380380    $OUTPUT->show_message('errorsaving', 'error'); 

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

    r1503 r1621  
    133133<table border="0" cellspacing="0" width="100%" summary=""><tbody> 
    134134<tr> 
    135 <td> 
     135<td style="white-space:nowrap"> 
    136136<roundcube:button type="input" command="send" class="button" label="sendmessage" tabindex="8" /> 
    137137<roundcube:button type="input" command="list" class="button" label="cancel" tabindex="9" /> 
    138138</td> 
    139 <td align="right"> 
     139<td style="text-align:center"> 
     140  <label><span style="white-space:nowrap"><roundcube:label name="savesentmessagein" />:</span> <roundcube:object name="storetarget" /></label> 
     141</td> 
     142<td style="text-align:right; white-space:nowrap"> 
    140143 <roundcube:label name="editortype" />:&nbsp; 
    141144 <span class="radios-left"><roundcube:object name="editorSelector" tabindex="10" /></span> 
Note: See TracChangeset for help on using the changeset viewer.