← Back to branch summary

~ubuntu-branches/ubuntu/quantal/squirrelmail/quantal

« back to all changes in this revision

Viewing changes to plugins/filters/filters.php

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2008-09-28 16:33:48 UTC
  • mfrom: (11.1.7 intrepid)
  • Revision ID: james.westby@ubuntu.com-20080928163348-hgxf8au2d4zspabg
Tags: 2:1.4.15-3
http://bugs.debian.org/499942
Cookies sent over HTTPS will now be confined to HTTPS only
(cookie secure flag) and more support for the HTTPOnly cookie
attribute. Patch taken from upstream release.
(CVE-2008-3663, closes: #499942)

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.18 2006/07/29 08:46:57 tokul Exp $
 
21
 * @version $Id: filters.php 12330 2007-03-10 04:03:46Z jangliss $
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
194
194
 
195
195
        $AllowSpamFilters = false;
196
196
        foreach($spamfilters as $filterkey=>$value) {
197
 
            if ($value['enabled'] == 'yes') {
 
197
            if ($value['enabled'] == SMPREF_ON) {
198
198
                $AllowSpamFilters = true;
199
199
                break;
200
200
            }
501
501
    foreach ($filters as $key => $value) {
502
502
        if ($filters[$key]['enabled']) {
503
503
            if ($filters[$key]['dns']) {
 
504
                
 
505
                /**
 
506
                 *  RFC allows . on end of hostname to ensure search domain
 
507
                 *  isn't used if no hostname is found
 
508
                 */
504
509
                $filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' .
505
 
                                $filters[$key]['dns'];
 
510
                                $filters[$key]['dns'] . '.';
506
511
 
507
512
                if(!isset($SpamFilters_DNScache[$filter_revip]['L']))
508
513
                        $SpamFilters_DNScache[$filter_revip]['L'] = '';
516
521
                    $SpamFilters_DNScache[$filter_revip]['T'] =
517
522
                                       time() + $SpamFilters_CacheTTL;
518
523
                }
519
 
                if ($SpamFilters_DNScache[$filter_revip]['L'] ==
520
 
                    $filters[$key]['result']) {
 
524
                
 
525
                /**
 
526
                 *  gethostbyname returns ip if resolved, or returns original host
 
527
                 *  supplied to function if there is no resolution
 
528
                 */
 
529
                if ($SpamFilters_DNScache[$filter_revip]['L'] != $filter_revip) {
521
530
                    return 1;
522
531
                }
523
532
            }
600
609
            _("COMMERCIAL - RBL+ Dial-up entries.");
601
610
    }
602
611
 
603
 
    $filters['ORDB']['prefname'] = 'filters_spam_ordb';
604
 
    $filters['ORDB']['name'] = 'Open Relay Database List';
605
 
    $filters['ORDB']['link'] = 'http://www.ordb.org/';
606
 
    $filters['ORDB']['dns'] = 'relays.ordb.org';
607
 
    $filters['ORDB']['result'] = '127.0.0.2';
608
 
    $filters['ORDB']['comment'] =
609
 
        _("FREE - ORDB was born when ORBS went off the air. It seems to have fewer false positives than ORBS did though.");
610
 
 
611
612
    $filters['FiveTen Direct']['prefname'] = 'filters_spam_fiveten_src';
612
613
    $filters['FiveTen Direct']['name'] = 'Five-Ten-sg.com Direct SPAM Sources';
613
614
    $filters['FiveTen Direct']['link'] = 'http://www.five-ten-sg.com/blackhole.php';
817
818
        _("FREE - Distributed Sender Boycott List - UN-Confirmed Relays");
818
819
 
819
820
    foreach ($filters as $Key => $Value) {
820
 
        $filters[$Key]['enabled'] = getPref($data_dir, $username,
821
 
            $filters[$Key]['prefname']);
 
821
        $filters[$Key]['enabled'] = (bool)getPref($data_dir, $username, $filters[$Key]['prefname']);
822
822
    }
823
823
 
824
824
    return $filters;
900
900
    echo $string;
901
901
    echo "</font></p>\n";
902
902
}
903
 
?>
 
 
b'\\ No newline at end of file'
 
903
?>