Applied patch for requesting receipts by Salvatore Ansani

thomascube

2006-05-01 6204390af16bcf50f82da61a1aefc2ad0c0adf94

Applied patch for requesting receipts by Salvatore Ansani

 program/include/main.inc

@@ -189,10 +189,10 @@
  global $CONFIG, $IMAP;

  // set root dir from config
  if (strlen($CONFIG['imap_root']))
  if (!empty($CONFIG['imap_root']))
    $IMAP->set_rootdir($CONFIG['imap_root']);

  if (strlen($_SESSION['mbox']))
  if (!empty($_SESSION['mbox']))
    $IMAP->set_mailbox($_SESSION['mbox']);
    
  if (isset($_SESSION['page']))
@@ -1149,6 +1149,7 @@
        'priorityselector' => 'rcmail_priority_selector',
        'charsetselector' => 'rcmail_charset_selector',
        'searchform' => 'rcmail_search_form',
        'receiptcheckbox' => 'rcmail_receipt_checkbox',
        
        // ADDRESS BOOK
        'addresslist' => 'rcmail_contacts_list',

 program/localization/de_CH/labels.inc

@@ -123,6 +123,7 @@
$labels['sendmessage']  = 'Nachricht jetzt senden';
$labels['addattachment']  = 'Datei anfügen';
$labels['charset']  = 'Zeichensatz';
$labels['returnreceipt'] = 'Empfangsbestätigung';

$labels['attachments'] = 'Anhänge';
$labels['upload'] = 'Hochladen';

 program/localization/de_DE/labels.inc

@@ -124,6 +124,7 @@
$labels['sendmessage']  = 'Nachricht jetzt senden';
$labels['addattachment']  = 'Datei anfügen';
$labels['charset']  = 'Zeichensatz';
$labels['returnreceipt'] = 'Empfangsbestätigung';

$labels['attachments'] = 'Anhänge';
$labels['upload'] = 'Hochladen';

 program/localization/en_US/labels.inc

@@ -123,6 +123,7 @@
$labels['sendmessage']  = 'Send the message now';
$labels['addattachment']  = 'Attach a file';
$labels['charset']  = 'Charset';
$labels['returnreceipt'] = 'Return receipt';

$labels['attachments'] = 'Attachments';
$labels['upload'] = 'Upload';

 program/steps/mail/compose.inc

@@ -567,6 +567,22 @@
  }


function rcmail_receipt_checkbox($attrib)
  {
  list($form_start, $form_end) = get_form_tags($attrib);
  unset($attrib['form']);

  $attrib['name'] = '_receipt';
  $checkbox = new checkbox(array('name' => '_receipt', 'id' => 'receipt', 'value' => 1));

  $out = $form_start ? "$form_start\n" : '';
  $out .= $checkbox->show(0);
  $out .= $form_end ? "\n$form_end" : '';

  return $out;
  }


function get_form_tags($attrib)
  {
  global $CONFIG, $OUTPUT, $JS_OBJECT_NAME, $MESSAGE_FORM, $SESS_HIDDEN_FIELD;  

 program/steps/mail/sendmail.inc

@@ -136,6 +136,11 @@
    $headers['X-Priority'] = sprintf("%d (%s)", $priority, ucfirst($str_priority));
  }

if (!empty($_POST['_receipt']))
  {
  $headers['Return-Receipt-To'] = $identity_arr['string'];
  $headers['Disposition-Notification-To'] = $identity_arr['string'];
  }

// additional headers
$headers['Message-ID'] = $message_id;

 skins/default/mail.css

@@ -642,7 +642,14 @@
#priority-selector
{
  position: absolute;
  left: 200px;
  left: 180px;
  top: 10px;
}

#receipt-selector
{
  position: absolute;
  left: 350px;
  top: 10px;
}


 skins/default/templates/compose.html

@@ -39,6 +39,10 @@
<roundcube:label name="priority" />:&nbsp;<roundcube:object name="prioritySelector" form="form" />
</div>

<div id="receipt-selector">
<roundcube:object name="receiptCheckBox" form="form" />&nbsp;<roundcube:label name="returnreceipt" />
</div>

</div>

<div id="compose-container">