← Back to branch summary

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

« back to all changes in this revision

Viewing changes to plugins/filters/filters.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:
plugins/filters/filters.php
18
18
 *
19
19
 * Also view plugins/README.plugins for more information.
20
20
 *
21
 
 * @version $Id: filters.php,v 1.45.2.17 2006/02/03 22:27:52 jervfors Exp $
 
21
 * @version $Id: filters.php,v 1.45.2.18 2006/07/29 08:46:57 tokul Exp $
22
22
 * @copyright (c) 1999-2006 The SquirrelMail Project Team
23
23
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License
24
24
 * @package plugins
333
333
    if ($response == 'OK') {
334
334
        $ids = explode(' ', $read[$r]);
335
335
        if (sqimap_mailbox_exists($imap, $where_to)) {
 
336
            /*
 
337
             * why we do n calls instead of just one. It is safer to copy 
 
338
             * messages one by one, but code does not call expunge after 
 
339
             * message is copied and quota limits are not resolved.
 
340
             */
336
341
            for ($j=2, $num = count($ids); $j < $num; $j++) {
337
342
                $id = trim($ids[$j]);
338
 
                $del_id[] = $id;
339
 
                sqimap_messages_copy ($imap, $id, $id, $where_to);
340
 
                sqimap_messages_flag ($imap, $id, $id, 'Deleted',false);
 
343
                if (sqimap_messages_copy ($imap, $id, $id, $where_to, false)) {
 
344
                    $del_id[] = $id;
 
345
                    sqimap_messages_flag ($imap, $id, $id, 'Deleted', false);
 
346
                }
341
347
            }
342
348
        }
343
349
    }
463
469
        // Lookie!  It's spam!  Yum!
464
470
        if ($IsSpam) {
465
471
            if (sqimap_mailbox_exists($imap_stream, $filters_spam_folder)) {
466
 
                sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,
467
 
                                    $filters_spam_folder);
468
 
                sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,
469
 
                                    'Deleted', false);
 
472
                // check if message copy was successful
 
473
                if (sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum,
 
474
                                          $filters_spam_folder, false)) {
 
475
                    sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum,
 
476
                                          'Deleted', false);
 
477
                }
470
478
            }
471
479
        } else {
472
480
        }