← Back to branch summary

~ubuntu-branches/ubuntu/karmic/squirrelmail/karmic

« back to all changes in this revision

Viewing changes to src/compose.php

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2006-08-11 13:53:20 UTC
  • mfrom: (1.1.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060811135320-a54q8uf2ncuwc5es
Tags: 2:1.4.8-1
* New upstream release
  - Includes security fix: variable overwriting in compose.php
    by logged-in user [CVE-2006-4019]
  - Does not ship SquirrelMail developer's documentation anymore.

* Remove duplicate content from README.locales.
 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/compose.php
13
13
 *
14
14
 * @copyright © 1999-2006 The SquirrelMail Project Team
15
15
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
16
 
 * @version $Id: compose.php,v 1.319.2.68 2006/04/14 22:27:08 jervfors Exp $
 
16
 * @version $Id: compose.php,v 1.319.2.70 2006/08/03 14:48:09 kink Exp $
17
17
 * @package squirrelmail
18
18
 */
19
19
 
258
258
        sqsession_unregister('session_expired_post');
259
259
        session_write_close();
260
260
    } else {
261
 
        foreach ($session_expired_post as $postvar => $val) {
262
 
            if (isset($val)) {
263
 
                $$postvar = $val;
264
 
            } else {
265
 
                $$postvar = '';
 
261
        // these are the vars that we can set from the expired composed session   
 
262
        $compo_var_list = array ( 'send_to', 'send_to_cc','body','startMessage',
 
263
            'passed_body','use_signature','signature','attachments','subject','newmail',
 
264
            'send_to_bcc', 'passed_id', 'mailbox', 'from_htmladdr_search', 'identity',
 
265
            'draft_id', 'delete_draft', 'mailprio', 'edit_as_new', 'compose_messsages',
 
266
            'composesession', 'request_mdn', 'request_dr');
 
267
 
 
268
        foreach ($compo_var_list as $var) {
 
269
            if ( isset($session_expired_post[$var]) && !isset($$var) ) {
 
270
                $$var = $session_expired_post[$var];
266
271
            }
267
272
        }
 
273
 
268
274
        $compose_messages = unserialize(urldecode($restoremessages));
269
275
        sqsession_register($compose_messages,'compose_messages');
270
276
        sqsession_register($composesession,'composesession');
1541
1547
                $smtpServerAddress, $smtpPort, $user, $pass, $authPop);
1542
1548
    } elseif (!$draft) {
1543
1549
        require_once(SM_PATH . 'class/deliver/Deliver_SendMail.class.php');
1544
 
        global $sendmail_path;
1545
 
        $deliver = new Deliver_SendMail();
 
1550
        global $sendmail_path, $sendmail_args;
 
1551
        // Check for outdated configuration
 
1552
        if (!isset($sendmail_args)) {
 
1553
            if ($sendmail_path=='/var/qmail/bin/qmail-inject') {
 
1554
                $sendmail_args = '';
 
1555
            } else {
 
1556
                $sendmail_args = '-i -t';
 
1557
            }
 
1558
        }
 
1559
        $deliver = new Deliver_SendMail(array('sendmail_args'=>$sendmail_args));
1546
1560
        $stream = $deliver->initStream($composeMessage,$sendmail_path);
1547
1561
    } elseif ($draft) {
1548
1562
        global $draft_folder;
1621
1635
    return $succes;
1622
1636
}
1623
1637
 
1624
 
?>
 
 
b'\\ No newline at end of file'
 
1638
?>