Changeset 6204390 in github


Ignore:
Timestamp:
May 1, 2006 10:47:27 AM (7 years ago)
Author:
thomascube <thomas@…>
Branches:
master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8
Children:
4b3af37
Parents:
a4bafb4
Message:

Applied patch for requesting receipts by Salvatore Ansani

Files:
8 edited

Legend:

Unmodified
Added
Removed

  • program/include/main.inc

    r86f1721 r6204390  
    190190 
    191191  // set root dir from config 
    192   if (strlen($CONFIG['imap_root'])) 
     192  if (!empty($CONFIG['imap_root'])) 
    193193    $IMAP->set_rootdir($CONFIG['imap_root']); 
    194194 
    195   if (strlen($_SESSION['mbox'])) 
     195  if (!empty($_SESSION['mbox'])) 
    196196    $IMAP->set_mailbox($_SESSION['mbox']); 
    197      
     197 
    198198  if (isset($_SESSION['page'])) 
    199199    $IMAP->set_page($_SESSION['page']); 
    … …  
    11501150        'charsetselector' => 'rcmail_charset_selector', 
    11511151        'searchform' => 'rcmail_search_form', 
     1152        'receiptcheckbox' => 'rcmail_receipt_checkbox', 
    11521153         
    11531154        // ADDRESS BOOK 

  • program/localization/de_CH/labels.inc

    rf3704e1 r6204390  
    124124$labels['addattachment']  = 'Datei anfÃŒgen'; 
    125125$labels['charset']  = 'Zeichensatz'; 
     126$labels['returnreceipt'] = 'EmpfangsbestÀtigung'; 
    126127 
    127128$labels['attachments'] = 'AnhÀnge'; 

  • program/localization/de_DE/labels.inc

    rf3704e1 r6204390  
    125125$labels['addattachment']  = 'Datei anfÃŒgen'; 
    126126$labels['charset']  = 'Zeichensatz'; 
     127$labels['returnreceipt'] = 'EmpfangsbestÀtigung'; 
    127128 
    128129$labels['attachments'] = 'AnhÀnge'; 

  • program/localization/en_US/labels.inc

    rf3704e1 r6204390  
    124124$labels['addattachment']  = 'Attach a file'; 
    125125$labels['charset']  = 'Charset'; 
     126$labels['returnreceipt'] = 'Return receipt'; 
    126127 
    127128$labels['attachments'] = 'Attachments'; 

  • program/steps/mail/compose.inc

    rf8d0a5c r6204390  
    568568 
    569569 
     570function rcmail_receipt_checkbox($attrib) 
     571  { 
     572  list($form_start, $form_end) = get_form_tags($attrib); 
     573  unset($attrib['form']); 
     574 
     575  $attrib['name'] = '_receipt'; 
     576  $checkbox = new checkbox(array('name' => '_receipt', 'id' => 'receipt', 'value' => 1)); 
     577 
     578  $out = $form_start ? "$form_start\n" : ''; 
     579  $out .= $checkbox->show(0); 
     580  $out .= $form_end ? "\n$form_end" : ''; 
     581 
     582  return $out; 
     583  } 
     584 
     585 
    570586function get_form_tags($attrib) 
    571587  { 

  • program/steps/mail/sendmail.inc

    r4647e1b r6204390  
    137137  } 
    138138 
     139if (!empty($_POST['_receipt'])) 
     140  { 
     141  $headers['Return-Receipt-To'] = $identity_arr['string']; 
     142  $headers['Disposition-Notification-To'] = $identity_arr['string']; 
     143  } 
    139144 
    140145// additional headers 

  • skins/default/mail.css

    r88f9e2f r6204390  
    643643{ 
    644644  position: absolute; 
    645   left: 200px; 
     645  left: 180px; 
     646  top: 10px; 
     647} 
     648 
     649#receipt-selector 
     650{ 
     651  position: absolute; 
     652  left: 350px; 
    646653  top: 10px; 
    647654} 

  • skins/default/templates/compose.html

    redf7622 r6204390  
    3838<div id="priority-selector"> 
    3939<roundcube:label name="priority" />:&nbsp;<roundcube:object name="prioritySelector" form="form" /> 
     40</div> 
     41 
     42<div id="receipt-selector"> 
     43<roundcube:object name="receiptCheckBox" form="form" />&nbsp;<roundcube:label name="returnreceipt" /> 
    4044</div> 
    4145 
Note: See TracChangeset for help on using the changeset viewer.