X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=plugins%2Ffilters%2Ffilters.php;h=dc53c9abfb0d534ecb9c89c49fa73632233df4e0;hp=11f093321d7d63a65b38bb636173c3ac90bee0c4;hb=3ba5c6063eb9282838b862d4f206266d0034e905;hpb=d9a8ac55c4d130846a78c35806e70811e242d6ae diff --git a/plugins/filters/filters.php b/plugins/filters/filters.php index 11f09332..dc53c9ab 100644 --- a/plugins/filters/filters.php +++ b/plugins/filters/filters.php @@ -1,333 +1,577 @@ _("Message Filters"), + 'url' => SM_PATH . 'plugins/filters/options.php', + 'desc' => _("Filtering enables messages with different criteria to be automatically filtered into different folders for easier organization."), + 'js' => false + ); + + if ($AllowSpamFilters) { + $optpage_blocks[] = array( + 'name' => _("SPAM Filters"), + 'url' => SM_PATH . 'plugins/filters/spamoptions.php', + 'desc' => _("SPAM filters allow you to select from various DNS based blacklists to detect junk email in your INBOX and move it to another folder (like Trash)."), + 'js' => false + ); + } +} - if (ereg("^\\* [0-9]+ FETCH.*\\{([0-9]+)\\}", $read, $regs)) { - $size = $regs[1]; - if ($imap_general_debug) { - echo "Size is $size
\n"; - } +/* Receive the status of the folder and do something with it */ +function filters_folder_status($statusarr) { - $total_size = 0; - do { - $read = fgets($imap_stream, 9096); - if ($imap_general_debug) { - echo "$read
\n"; - flush(); - } - $data[] = $read; - $total_size += strlen($read); - } while ($total_size < $size); + global $filter_inbox_count; + if (empty($filter_inbox_count)) $filter_inbox_count=0; - $size = 0; - } - // For debugging purposes - if ($imap_general_debug) { - echo "$read
\n"; - flush(); - } - } while (true); + if ($statusarr['MAILBOX'] == 'INBOX') + { + if (!empty($statusarr['MESSAGES'])) $filter_inbox_count=$statusarr['MESSAGES']; + } +} - $response = $regs[1]; - $message = trim($regs[2]); +/** + * Saves the DNS Cache to disk + * @access private + */ +function filters_SaveCache () { + global $data_dir, $SpamFilters_DNScache; - if ($imap_general_debug) { - echo '--
'; + if (file_exists($data_dir . '/dnscache')) { + $fp = fopen($data_dir . '/dnscache', 'r'); + } else { + $fp = false; + } + if ($fp) { + flock($fp,LOCK_EX); + } else { + $fp = fopen($data_dir . '/dnscache', 'w+'); + fclose($fp); + $fp = fopen($data_dir . '/dnscache', 'r'); + flock($fp,LOCK_EX); } + $fp1 = fopen($data_dir . '/dnscache', 'w+'); - if (!$handle_errors) { - return $data; + foreach ($SpamFilters_DNScache as $Key=> $Value) { + $tstr = $Key . ',' . $Value['L'] . ',' . $Value['T'] . "\n"; + fputs ($fp1, $tstr); } + fclose($fp1); + flock($fp,LOCK_UN); + fclose($fp); +} - if ($response == 'NO') { - // ignore this error from m$ exchange, it is not fatal (aka bug) - if (strstr($message, 'command resulted in') === false) { - set_up_language($squirrelmail_language); - echo "
\n" . - _("ERROR : Could not complete request.") . - "
\n" . - _("Reason Given: ") . - $message . "
\n"; - exit; +/** + * Loads the DNS Cache from disk + * @access private + */ +function filters_LoadCache () { + global $data_dir, $SpamFilters_DNScache; + + if (file_exists($data_dir . '/dnscache')) { + $SpamFilters_DNScache = array(); + if ($fp = fopen ($data_dir . '/dnscache', 'r')) { + flock($fp,LOCK_SH); + while ($data = fgetcsv($fp,1024)) { + if ($data[2] > time()) { + $SpamFilters_DNScache[$data[0]]['L'] = $data[1]; + $SpamFilters_DNScache[$data[0]]['T'] = $data[2]; + } + } + flock($fp,LOCK_UN); } - } else if ($response == 'BAD') { - set_up_language($squirrelmail_language); - echo "
\n" . - _("ERROR : Bad or malformed request.") . - "
\n" . - _("Server responded: ") . - $message . "
\n"; - exit; } - - return $data; } +/** + * Uses the BulkQuery executable to query all the RBLs at once + * @param array $filters Array of SPAM Fitlers + * @param array $IPs Array of IP Addresses + * @access private + */ +function filters_bulkquery($filters, $IPs) { + global $attachment_dir, $username, + $SpamFilters_DNScache, $SpamFilters_BulkQuery, + $SpamFilters_CacheTTL; + + if (count($IPs) > 0) { + $rbls = array(); + foreach ($filters as $key => $value) { + if ($filters[$key]['enabled']) { + if ($filters[$key]['dns']) { + $rbls[$filters[$key]['dns']] = true; + } + } + } -function start_filters() { - global $mailbox, $username, $key, $imapServerAddress, $imapPort, $imap, - $imap_general, $filters, $imap_stream, $imapConnection, - $UseSeparateImapConnection, $AllowSpamFilters; - -# if ($mailbox == 'INBOX') { - // Detect if we have already connected to IMAP or not. - // Also check if we are forced to use a separate IMAP connection - if ((!isset($imap_stream) && !isset($imapConnection)) || - $UseSeparateImapConnection) { - $stream = sqimap_login($username, $key, $imapServerAddress, - $imapPort, 10); - $previously_connected = false; - } elseif (isset($imapConnection)) { - $stream = $imapConnection; - $previously_connected = true; - } else { - $previously_connected = true; - $stream = $imap_stream; + $bqfil = $attachment_dir . $username . '-bq.in'; + $fp = fopen($bqfil, 'w'); + fputs ($fp, $SpamFilters_CacheTTL . "\n"); + foreach ($rbls as $key => $value) { + fputs ($fp, '.' . $key . "\n"); + } + fputs ($fp, "----------\n"); + foreach ($IPs as $key => $value) { + fputs ($fp, $key . "\n"); } + fclose ($fp); + $bqout = array(); + exec ($SpamFilters_BulkQuery . ' < ' . $bqfil, $bqout); + foreach ($bqout as $value) { + $Chunks = explode(',', $value); + $SpamFilters_DNScache[$Chunks[0]]['L'] = $Chunks[1]; + $SpamFilters_DNScache[$Chunks[0]]['T'] = $Chunks[2] + time(); + } + unlink($bqfil); + } +} + +/** + * Starts the filtering process + * @param array $hook_args (since 1.5.2) do hook arguments. Is used to check + * hook name, array key = 0. + * @access private + */ +function start_filters($hook_args) { + global $imapServerAddress, $imapPort, $imap_stream, $imapConnection, + $UseSeparateImapConnection, $AllowSpamFilters, $filter_inbox_count, + $username; + + /** + * check hook that calls filtering. If filters are called by right_main_after_header, + * do filtering only when we are in INBOX folder. + */ + if ($hook_args[0]=='right_main_after_header' && + (sqgetGlobalVar('mailbox',$mailbox,SQ_FORM) && $mailbox!='INBOX')) { + return; + } + + $filters = load_filters(); - if (sqimap_get_num_messages($stream, 'INBOX') > 0) { - // Filter spam from inbox before we sort them into folders - if ($AllowSpamFilters) { - spam_filters($stream); + // No point running spam filters if there aren't any to run // + if ($AllowSpamFilters) { + $spamfilters = load_spam_filters(); + + $AllowSpamFilters = false; + foreach($spamfilters as $value) { + if ($value['enabled'] == SMPREF_ON) { + $AllowSpamFilters = true; + break; } + } + } + + if (!$AllowSpamFilters && empty($filters)) { + return; + } + + + // Detect if we have already connected to IMAP or not. + // Also check if we are forced to use a separate IMAP connection + if ((!isset($imap_stream) && !isset($imapConnection)) || + $UseSeparateImapConnection ) { + $stream = sqimap_login($username, false, $imapServerAddress, + $imapPort, 10); + $previously_connected = false; + } else if (isset($imapConnection)) { + $stream = $imapConnection; + $previously_connected = true; + } else { + $previously_connected = true; + $stream = $imap_stream; + } - // Sort into folders - user_filters($stream); + if (!isset($filter_inbox_count)) { + $aStatus = sqimap_status_messages ($stream, 'INBOX', array('MESSAGES')); + if (!empty($aStatus['MESSAGES'])) { + $filter_inbox_count=$aStatus['MESSAGES']; + } else { + $filter_inbox_count=0; } + } - if (!$previously_connected) { - sqimap_logout($stream); + if ($filter_inbox_count > 0) { + sqimap_mailbox_select($stream, 'INBOX'); + // Filter spam from inbox before we sort them into folders + if ($AllowSpamFilters) { + spam_filters($stream); } -# } -} + // Sort into folders + user_filters($stream); + } + + if (!$previously_connected) { + sqimap_logout($stream); + } +} +/** + * Does the loop through each filter + * @param stream imap_stream the stream to read from + * @access private + */ function user_filters($imap_stream) { + global $data_dir, $username; $filters = load_filters(); if (! $filters) return; + $filters_user_scan = getPref($data_dir, $username, 'filters_user_scan'); - sqimap_mailbox_select($imap_stream, 'INBOX'); - + $expunge = false; // For every rule - for ($i=0; $i < count($filters); $i++) { + for ($i=0, $num = count($filters); $i < $num; $i++) { // If it is the "combo" rule if ($filters[$i]['where'] == 'To or Cc') { /* * If it's "TO OR CC", we have to do two searches, one for TO * and the other for CC. */ - filter_search_and_delete($imap_stream, 'TO', - $filters[$i]['what'], $filters[$i]['folder']); - filter_search_and_delete($imap_stream, 'CC', - $filters[$i]['what'], $filters[$i]['folder']); + $expunge = filter_search_and_delete($imap_stream, 'TO', + $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge); + $expunge = filter_search_and_delete($imap_stream, 'CC', + $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge); + } else if ($filters[$i]['where'] == 'Header and Body') { + $expunge = filter_search_and_delete($imap_stream, 'TEXT', + $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge); + } else if ($filters[$i]['where'] == 'Message Body') { + $expunge = filter_search_and_delete($imap_stream, 'BODY', + $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge); } else { /* * If it's a normal TO, CC, SUBJECT, or FROM, then handle it * normally. */ - filter_search_and_delete($imap_stream, $filters[$i]['where'], - $filters[$i]['what'], $filters[$i]['folder']); + $expunge = filter_search_and_delete($imap_stream, $filters[$i]['where'], + $filters[$i]['what'], $filters[$i]['folder'], $filters_user_scan, $expunge); } } // Clean out the mailbox whether or not auto_expunge is on // That way it looks like it was redirected properly - sqimap_mailbox_expunge($imap_stream, 'INBOX'); + if ($expunge) { + sqimap_mailbox_expunge($imap_stream, 'INBOX'); + } } -function filter_search_and_delete($imap, $where, $what, $where_to) { - // Don't mess with the " characters on this fputs line! - fputs ($imap, 'a001 SEARCH ALL ' . $where . ' "' . addslashes($what) . - "\"\r\n"); - $read = filters_sqimap_read_data ($imap, 'a001', true, $response, $message); - - // This may have problems with EIMS due to it being goofy - - for ($r=0; $r < count($read) && - substr($read[$r], 0, 8) != '* SEARCH'; $r++) {} - if ($response == 'OK') { - $ids = explode(' ', $read[$r]); - if (sqimap_mailbox_exists($imap, $where_to)) { - for ($j=2; $j < count($ids); $j++) { - $id = trim($ids[$j]); - sqimap_messages_copy ($imap, $id, $id, $where_to); - sqimap_messages_flag ($imap, $id, $id, 'Deleted'); +/** + * Creates and runs the IMAP command to filter messages + * @param string $where Which part of the message to search (TO, CC, SUBJECT, etc...) + * @param string $what String to search for + * @param string $where_to Folder it will move to + * @param string $user_scan Whether to search all or just unseen + * @param string $should_expunge + * @param boolean $where Which part of location to search + * @access private + */ +function filter_search_and_delete($imap_stream, $where, $what, $where_to, $user_scan, + $should_expunge) { + global $languages, $squirrelmail_language, $allow_charset_search, $imap_server_type; + + //TODO: make use of new mailbox cache. See mailbox_display.phpinfo + + if (strtolower($where_to) == 'inbox') { + return array(); + } + + if ($user_scan == 'new') { + $category = 'UNSEEN'; + } else { + $category = 'ALL'; + } + $category .= ' UNDELETED'; + + if ($allow_charset_search && + isset($languages[$squirrelmail_language]['CHARSET']) && + $languages[$squirrelmail_language]['CHARSET']) { + $search_str = 'SEARCH CHARSET ' + . strtoupper($languages[$squirrelmail_language]['CHARSET']) + . ' ' . $category; + } else { + $search_str = 'SEARCH CHARSET US-ASCII ' . $category; + } + if ($where == 'Header') { + $what = explode(':', $what); + $where = strtoupper($where); + $where = trim($where . ' ' . $what[0]); + $what = addslashes(trim($what[1])); + } + + // see comments in squirrelmail sqimap_search function + if ($imap_server_type == 'macosx' || $imap_server_type == 'hmailserver') { + $search_str .= ' ' . $where . ' ' . $what; + /* read data back from IMAP */ + $read = sqimap_run_command($imap_stream, $search_str, true, $response, $message, TRUE); + } else { + $search_str .= ' ' . $where . ' {' . strlen($what) . "}"; + $sid = sqimap_session_id(true); + fputs ($imap_stream, $sid . ' ' . $search_str . "\r\n"); + $read2 = sqimap_fgets($imap_stream); + # server should respond with Ready for argument, then we will send search text + #echo "RR2 $read2
"; + fputs ($imap_stream, "$what\r\n"); + #echo "SS $what
"; + $read2 = sqimap_fgets($imap_stream); + #echo "RR2 $read2
"; + $read[]=$read2; + $read3 = sqimap_fgets($imap_stream); + #echo "RR3 $read3
"; + list($rtag,$response,$message)=explode(' ',$read3,3); +## $read2 = sqimap_retrieve_imap_response($imap_stream, $sid, true, +## $response, $message, $search_str, false, true, false); + #echo "RR2 $read2 / RESPONSE $response
"; + } + + if (isset($read[0])) { + $ids = array(); + for ($i = 0, $iCnt = count($read); $i < $iCnt; ++$i) { + if (preg_match("/^\* SEARCH (.+)$/", $read[$i], $regs)) { + $ids += explode(' ', trim($regs[1])); + } + } + if ($response == 'OK' && count($ids)) { + if (sqimap_mailbox_exists($imap_stream, $where_to)) { + $should_expunge = true; + sqimap_msgs_list_move ($imap_stream, $ids, $where_to, false); + } + } elseif ($response != 'OK') { + $query = $search_str . "\r\n".$what ."\r\n"; + if ($response == 'NO') { + if (strpos($message,'BADCHARSET') !== false || + strpos($message,'character') !== false) { + sqm_trigger_imap_error('SQM_IMAP_BADCHARSET',$query, $response, $message); + } else { + sqm_trigger_imap_error('SQM_IMAP_ERROR',$query, $response, $message); + } + } else { + sqm_trigger_imap_error('SQM_IMAP_ERROR',$query, $response, $message); } } } + return $should_expunge; } -// These are the spam filters +/** + * Loops through all the Received Headers to find IP Addresses + * @param stream imap_stream the stream to read from + * @access private + */ function spam_filters($imap_stream) { global $data_dir, $username; global $SpamFilters_YourHop; global $SpamFilters_DNScache; + global $SpamFilters_SharedCache; + global $SpamFilters_BulkQuery; + global $SpamFilters_CacheTTL; $filters_spam_scan = getPref($data_dir, $username, 'filters_spam_scan'); $filters_spam_folder = getPref($data_dir, $username, 'filters_spam_folder'); $filters = load_spam_filters(); - $run = 0; + if ($SpamFilters_SharedCache) { + filters_LoadCache(); + } + + $run = false; - foreach ($filters as $Key=> $Value) { + foreach ($filters as $Value) { if ($Value['enabled']) { - $run ++; + $run = true; + break; } } // short-circuit - if ($run == 0) { + if (!$run) { return; } - sqimap_mailbox_select($imap_stream, 'INBOX'); - // Ask for a big list of all "Received" headers in the inbox with // flags for each message. Kinda big. - fputs($imap_stream, 'A3999 FETCH 1:* (FLAGS BODY.PEEK[HEADER.FIELDS ' . - "(RECEIVED)])\r\n"); - - $read = filters_sqimap_read_data ($imap_stream, 'A3999', true, - $response, $message); - if ($response != 'OK') { + if ($filters_spam_scan == 'new') { + $search_array = array(); + $read = sqimap_run_command($imap_stream, 'SEARCH UNSEEN', true, $response, $message, TRUE); + if (isset($read[0])) { + for ($i = 0, $iCnt = count($read); $i < $iCnt; ++$i) { + if (preg_match("/^\* SEARCH (.+)$/", $read[$i], $regs)) { + $search_array = explode(' ', trim($regs[1])); + break; + } + } + } + } + if ($filters_spam_scan == 'new' && count($search_array)) { + $headers = sqimap_get_small_header_list ($imap_stream, $search_array, array('Received'),array()); + } else if ($filters_spam_scan != 'new') { + $headers = sqimap_get_small_header_list ($imap_stream, null , array('Received'),array()); + } else { return; } - - $i = 0; - while ($i < count($read)) { - // EIMS will give funky results - $Chunks = explode(' ', $read[$i]); - if ($Chunks[0] != '*') { - $i ++; - continue; - } - $MsgNum = $Chunks[1]; - - $IPs = array(); - $i ++; - $IsSpam = 0; - $Scan = 1; - - // Check for normal IMAP servers - if ($filters_spam_scan == 'new') { - if (is_int(strpos($Chunks[4], '\Seen'))) { - $Scan = 0; - } + if (!count($headers)) { + return; + } + $bulkquery = (strlen($SpamFilters_BulkQuery) > 0 ? true : false); + $IPs = array(); + $aSpamIds = array(); + foreach ($headers as $id => $aValue) { + if (isset($aValue['UID'])) { + $MsgNum = $aValue['UID']; + } else { + $MsgNum = $id; } - // Look through all of the Received headers for IP addresses - // Stop when I get ")" on a line - // Stop if I get "*" on a line (don't advance) - // and above all, stop if $i is bigger than the total # of lines - while (($i < count($read)) && - ($read[$i][0] != ')' && $read[$i][0] != '*' && - $read[$i][0] != "\n") && (! $IsSpam)) { - // Check to see if this line is the right "Received from" line - // to check - if (is_int(strpos($read[$i], $SpamFilters_YourHop))) { - - // short-circuit and skip work if we don't scan this one - if ($Scan) { - $read[$i] = ereg_replace('[^0-9\.]', ' ', $read[$i]); - $elements = explode(' ', $read[$i]); - foreach ($elements as $value) { - if ($value != '' && - ereg('[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}', - $value, $regs)) { - $Chunks = explode('.', $value); - if (filters_spam_check_site($Chunks[0], - $Chunks[1], $Chunks[2], $Chunks[3], - $filters)) { - $IsSpam ++; - break; // no sense in checking more IPs - } - // If we've checked one IP and YourHop is - // just a space - if ($SpamFilters_YourHop == ' ') { - break; // don't check any more + if (isset($aValue['RECEIVED'])) { + foreach ($aValue['RECEIVED'] as $received) { + // Check to see if this line is the right "Received from" line + // to check + + // $aValue['Received'] is an array with all the received lines. + // We should check them from bottom to top and only check the first 2. + // Currently we check only the header where $SpamFilters_YourHop in occures + + if (is_int(strpos($received, $SpamFilters_YourHop))) { + if (preg_match('/([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})\.([0-9]{1,3})/',$received,$aMatch)) { + $isspam = false; + if (filters_spam_check_site($aMatch[1],$aMatch[2],$aMatch[3],$aMatch[4],$filters)) { + $aSpamIds[] = $MsgNum; + $isspam = true; + } + if ($bulkquery) { + array_shift($aMatch); + $IP = explode('.',$aMatch); + foreach ($filters as $key => $value) { + if ($filters[$key]['enabled'] && $filters[$key]['dns']) { + if (strlen($SpamFilters_DNScache[$IP.'.'.$filters[$key]['dns']]) == 0) { + $IPs[$IP] = true; + break; + } + } } } + // If we've checked one IP and YourHop is + // just a space + if ($SpamFilters_YourHop == ' ' || $isspam) { + break; // don't check any more + } } } } - $i ++; - } - - // Lookie! It's spam! Yum! - if ($IsSpam) { - if (sqimap_mailbox_exists($imap_stream, $filters_spam_folder)) { - sqimap_messages_copy ($imap_stream, $MsgNum, $MsgNum, - $filters_spam_folder); - sqimap_messages_flag ($imap_stream, $MsgNum, $MsgNum, - 'Deleted'); - } - } else { } } + // Lookie! It's spam! Yum! + if (count($aSpamIds) && sqimap_mailbox_exists($imap_stream, $filters_spam_folder)) { + sqimap_msgs_list_move ($imap_stream, $aSpamIds, $filters_spam_folder); + sqimap_mailbox_expunge($imap_stream, 'INBOX'); + } - sqimap_mailbox_expunge($imap_stream, 'INBOX'); + if ($bulkquery && count($IPs)) { + filters_bulkquery($filters, $IPs); + } - session_register('SpamFilters_DNScache'); + if ($SpamFilters_SharedCache) { + filters_SaveCache(); + } else { + sqsession_register($SpamFilters_DNScache, 'SpamFilters_DNScache'); + } } - -// Does the loop through each enabled filter for the specified IP address. -// IP format: $a.$b.$c.$d +/** + * Does the loop through each enabled filter for the specified IP address. + * IP format: $a.$b.$c.$d + * @param int $a First subset of IP + * @param int $b Second subset of IP + * @param int $c Third subset of IP + * @param int $d Forth subset of IP + * @param array $filters The Spam Filters + * @return boolean Whether the IP is Spam + * @access private + */ function filters_spam_check_site($a, $b, $c, $d, &$filters) { - global $SpamFilters_DNScache; + global $SpamFilters_DNScache, $SpamFilters_CacheTTL; foreach ($filters as $key => $value) { if ($filters[$key]['enabled']) { if ($filters[$key]['dns']) { + /** + * RFC allows . on end of hostname to force domain lookup + * to not use search domain from resolv.conf + */ $filter_revip = $d . '.' . $c . '.' . $b . '.' . $a . '.' . - $filters[$key]['dns']; - if (strlen($SpamFilters_DNScache[$filter_revip]) == 0) { - $SpamFilters_DNScache[$filter_revip] = - gethostbyname($filter_revip); + $filters[$key]['dns'] . '.'; + + if(!isset($SpamFilters_DNScache[$filter_revip]['L'])) + $SpamFilters_DNScache[$filter_revip]['L'] = ''; + + if(!isset($SpamFilters_DNScache[$filter_revip]['T'])) + $SpamFilters_DNScache[$filter_revip]['T'] = ''; + + if (strlen($SpamFilters_DNScache[$filter_revip]['L']) == 0) { + $SpamFilters_DNScache[$filter_revip]['L'] = + gethostbyname($filter_revip); + $SpamFilters_DNScache[$filter_revip]['T'] = + time() + $SpamFilters_CacheTTL; } - if ($SpamFilters_DNScache[$filter_revip] == - $filters[$key]['result']) { + + /** + * gethostbyname returns ip if resolved, or returns original + * host query if no resolution + */ + if ($SpamFilters_DNScache[$filter_revip]['L'] != $filter_revip) { return 1; } } @@ -336,10 +580,16 @@ function filters_spam_check_site($a, $b, $c, $d, &$filters) { return 0; } +/** + * Loads the filters from the user preferences + * @return array All the user filters + * @access private + */ function load_filters() { global $data_dir, $username; + $filters = array(); - for ($i=0; $fltr = getPref($data_dir, $username, 'filter' . $i); $i++) { + for ($i = 0; $fltr = getPref($data_dir, $username, 'filter' . $i); $i++) { $ary = explode(',', $fltr); $filters[$i]['where'] = $ary[0]; $filters[$i]['what'] = $ary[1]; @@ -348,144 +598,63 @@ function load_filters() { return $filters; } +/** + * Loads the Spam Filters and checks the preferences for the enabled status + * @return array All the spam filters + * @access private + */ function load_spam_filters() { - global $data_dir, $username; - - $filters['MAPS RBL']['prefname'] = 'filters_spam_maps_rbl'; - $filters['MAPS RBL']['name'] = 'MAPS Realtime Blackhole List'; - $filters['MAPS RBL']['link'] = 'http://www.mail-abuse.org/rbl/'; - $filters['MAPS RBL']['dns'] = 'blackholes.mail-abuse.org'; - $filters['MAPS RBL']['result'] = '127.0.0.2'; - $filters['MAPS RBL']['comment'] = - _("COMMERCIAL - This list contains servers that are verified spam senders. It is a pretty reliable list to scan spam from."); - - $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss'; - $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper'; - $filters['MAPS RSS']['link'] = 'http://www.mail-abuse.org/rss/'; - $filters['MAPS RSS']['dns'] = 'relays.mail-abuse.org'; - $filters['MAPS RSS']['result'] = '127.0.0.2'; - $filters['MAPS RSS']['comment'] = - _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this. Another good one to use."); - - $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul'; - $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List'; - $filters['MAPS DUL']['link'] = 'http://www.mail-abuse.org/dul/'; - $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org'; - $filters['MAPS DUL']['result'] = '127.0.0.3'; - $filters['MAPS DUL']['comment'] = - _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail. Spammers typically get a dial-up account and send spam directly from there."); - - $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl'; - $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List'; - $filters['MAPS RBLplus-RBL']['link'] = 'http://www.mail-abuse.org/'; - $filters['MAPS RBLplus-RBL']['dns'] = 'rbl-plus.mail-abuse.org'; - $filters['MAPS RBLplus-RBL']['result'] = '127.0.0.2'; - $filters['MAPS RBLplus-RBL']['comment'] = - _("COMMERCIAL - RBL+ Blackhole entries."); - - $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss'; - $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries'; - $filters['MAPS RBLplus-RSS']['link'] = 'http://www.mail-abuse.org/'; - $filters['MAPS RBLplus-RSS']['dns'] = 'rbl-plus.mail-abuse.org'; - $filters['MAPS RBLplus-RSS']['result'] = '127.0.0.2'; - $filters['MAPS RBLplus-RSS']['comment'] = - _("COMMERCIAL - RBL+ OpenRelay entries."); - - $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul'; - $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries'; - $filters['MAPS RBLplus-DUL']['link'] = 'http://www.mail-abuse.org/'; - $filters['MAPS RBLplus-DUL']['dns'] = 'rbl-plus.mail-abuse.org'; - $filters['MAPS RBLplus-DUL']['result'] = '127.0.0.3'; - $filters['MAPS RBLplus-DUL']['comment'] = - _("COMMERCIAL - RBL+ Dial-up entries."); - - $filters['Osirusoft Relays']['prefname'] = 'filters_spam_maps_osirusoft_relay'; - $filters['Osirusoft Relays']['name'] = 'Osirusoft Relay List'; - $filters['Osirusoft Relays']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft Relays']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft Relays']['result'] = '127.0.0.2'; - $filters['Osirusoft Relays']['comment'] = - _("FREE - Osirusoft Relays - Osirusofts list of verified open relays. Seems to include servers used by abuse@uunet.net auto-replies too."); - - $filters['Osirusoft DUL']['prefname'] = 'filters_spam_maps_osirusoft_dul'; - $filters['Osirusoft DUL']['name'] = 'Osirusoft Dialup List'; - $filters['Osirusoft DUL']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft DUL']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft DUL']['result'] = '127.0.0.3'; - $filters['Osirusoft DUL']['comment'] = - _("FREE - Osirusoft Dialups - Osirusofts Dialup Spam Source list."); - - $filters['Osirusoft Spam Source']['prefname'] = 'filters_spam_maps_osirusoft_rc'; - $filters['Osirusoft Spam Source']['name'] = 'Osirusoft Confirmed Spam Source List'; - $filters['Osirusoft Spam Source']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft Spam Source']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft Spam Source']['result'] = '127.0.0.4'; - $filters['Osirusoft Spam Source']['comment'] = - _("FREE - Osirusoft Confirmed Spam Source - Sites that continually spam and have been manually added after multiple nominations. Use with caution. Seems to catch abuse auto-replies from some ISPs."); - - $filters['Osirusoft Smart Host']['prefname'] = 'filters_spam_maps_osirusoft_sh'; - $filters['Osirusoft Smart Host']['name'] = 'Osirusoft Smart Host List'; - $filters['Osirusoft Smart Host']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft Smart Host']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft Smart Host']['result'] = '127.0.0.5'; - $filters['Osirusoft Smart Host']['comment'] = - _("FREE - Osirusoft Smart Hosts - List of hosts that are secure but relay for other mail servers that are not secure."); - - $filters['Osirusoft SPAMware']['prefname'] = 'filters_spam_maps_osirusoft_ss'; - $filters['Osirusoft SPAMware']['name'] = 'Osirusoft Spamware Developers List'; - $filters['Osirusoft SPAMware']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft SPAMware']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft SPAMware']['result'] = '127.0.0.6'; - $filters['Osirusoft SPAMware']['comment'] = - _("FREE - Osirusoft Spamware Developers - It is believed that these are IP ranges of companies that are known to produce spam software. Seems to catch abuse auto-replies from some ISPs."); - - $filters['Osirusoft Unc. OptIn']['prefname'] = 'filters_spam_maps_osirusoft_sl'; - $filters['Osirusoft Unc. OptIn']['name'] = 'Osirusoft Unconfirmed OptIn Server List'; - $filters['Osirusoft Unc. OptIn']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft Unc. OptIn']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft Unc. OptIn']['result'] = '127.0.0.7'; - $filters['Osirusoft Unc. OptIn']['comment'] = - _("FREE - Osirusoft Unconfirmed OptIn Servers - List of listservers that opt users in without confirmation."); - - $filters['Osirusoft Insecure Formmail']['prefname'] = 'filters_spam_maps_osirusoft_fm'; - $filters['Osirusoft Insecure Formmail']['name'] = 'Osirusoft Insecure formmail.cvi Script List'; - $filters['Osirusoft Insecure Formmail']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft Insecure Formmail']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft Insecure Formmail']['result'] = '127.0.0.8'; - $filters['Osirusoft Insecure Formmail']['comment'] = - _("FREE - Osirusoft Insecure formmail.cgi scripts - List of insecure formmail.cgi scripts. (planned)."); - - $filters['Osirusoft Open Proxy']['prefname'] = 'filters_spam_maps_osirusoft_op'; - $filters['Osirusoft Open Proxy']['name'] = 'Osirusoft Open Proxy Server List'; - $filters['Osirusoft Open Proxy']['link'] = 'http://relays.osirusoft.com/'; - $filters['Osirusoft Open Proxy']['dns'] = 'relays.osirusoft.com'; - $filters['Osirusoft Open Proxy']['result'] = '127.0.0.9'; - $filters['Osirusoft Open Proxy']['comment'] = - _("FREE - Osirusoft Open Proxy Servers - List of Open Proxy Servers."); - - $filters['ORDB']['prefname'] = 'filters_spam_ordb'; - $filters['ORDB']['name'] = 'Open Relay Database List'; - $filters['ORDB']['link'] = 'http://www.ordb.org/'; - $filters['ORDB']['dns'] = 'relays.ordb.org'; - $filters['ORDB']['result'] = '127.0.0.2'; - $filters['ORDB']['comment'] = - _("FREE - ORDB was born when ORBS went off the air. It seems to have fewer false positives than ORBS did though."); - - $filters['ORBZ Inputs']['prefname'] = 'filters_spam_orbz'; - $filters['ORBZ Inputs']['name'] = 'ORBZ Inputs List'; - $filters['ORBZ Inputs']['link'] = 'http://www.orbz.org/'; - $filters['ORBZ Inputs']['dns'] = 'inputs.orbz.org'; - $filters['ORBZ Inputs']['result'] = '127.0.0.2'; - $filters['ORBZ Inputs']['comment'] = - _("FREE - Another ORBS replacement (just the INPUTS database used here)."); - - $filters['ORBZ Outputs']['prefname'] = 'filters_spam_orbz_outputs'; - $filters['ORBZ Outputs']['name'] = 'ORBZ Outputs List'; - $filters['ORBZ Outputs']['link'] = 'http://www.orbz.org/'; - $filters['ORBZ Outputs']['dns'] = 'outputs.orbz.org'; - $filters['ORBZ Outputs']['result'] = '127.0.0.2'; - $filters['ORBZ Outputs']['comment'] = - _("FREE - Another ORBS replacement (just the OUTPUTS database used here)."); + global $data_dir, $username, $SpamFilters_ShowCommercial; + + if ($SpamFilters_ShowCommercial) { + $filters['MAPS RBL']['prefname'] = 'filters_spam_maps_rbl'; + $filters['MAPS RBL']['name'] = 'MAPS Realtime Blackhole List'; + $filters['MAPS RBL']['link'] = 'http://www.mail-abuse.org/rbl/'; + $filters['MAPS RBL']['dns'] = 'blackholes.mail-abuse.org'; + $filters['MAPS RBL']['result'] = '127.0.0.2'; + $filters['MAPS RBL']['comment'] = + _("COMMERCIAL - This list contains servers that are verified spam senders. It is a pretty reliable list to scan spam from."); + + $filters['MAPS RSS']['prefname'] = 'filters_spam_maps_rss'; + $filters['MAPS RSS']['name'] = 'MAPS Relay Spam Stopper'; + $filters['MAPS RSS']['link'] = 'http://www.mail-abuse.org/rss/'; + $filters['MAPS RSS']['dns'] = 'relays.mail-abuse.org'; + $filters['MAPS RSS']['result'] = '127.0.0.2'; + $filters['MAPS RSS']['comment'] = + _("COMMERCIAL - Servers that are configured (or misconfigured) to allow spam to be relayed through their system will be banned with this. Another good one to use."); + + $filters['MAPS DUL']['prefname'] = 'filters_spam_maps_dul'; + $filters['MAPS DUL']['name'] = 'MAPS Dial-Up List'; + $filters['MAPS DUL']['link'] = 'http://www.mail-abuse.org/dul/'; + $filters['MAPS DUL']['dns'] = 'dialups.mail-abuse.org'; + $filters['MAPS DUL']['result'] = '127.0.0.3'; + $filters['MAPS DUL']['comment'] = + _("COMMERCIAL - Dial-up users are often filtered out since they should use their ISP's mail servers to send mail. Spammers typically get a dial-up account and send spam directly from there."); + + $filters['MAPS RBLplus-RBL']['prefname'] = 'filters_spam_maps_rblplus_rbl'; + $filters['MAPS RBLplus-RBL']['name'] = 'MAPS RBL+ RBL List'; + $filters['MAPS RBLplus-RBL']['link'] = 'http://www.mail-abuse.org/'; + $filters['MAPS RBLplus-RBL']['dns'] = 'rbl-plus.mail-abuse.org'; + $filters['MAPS RBLplus-RBL']['result'] = '127.0.0.2'; + $filters['MAPS RBLplus-RBL']['comment'] = + _("COMMERCIAL - RBL+ Blackhole entries."); + + $filters['MAPS RBLplus-RSS']['prefname'] = 'filters_spam_maps_rblplus_rss'; + $filters['MAPS RBLplus-RSS']['name'] = 'MAPS RBL+ List RSS entries'; + $filters['MAPS RBLplus-RSS']['link'] = 'http://www.mail-abuse.org/'; + $filters['MAPS RBLplus-RSS']['dns'] = 'rbl-plus.mail-abuse.org'; + $filters['MAPS RBLplus-RSS']['result'] = '127.0.0.2'; + $filters['MAPS RBLplus-RSS']['comment'] = + _("COMMERCIAL - RBL+ OpenRelay entries."); + + $filters['MAPS RBLplus-DUL']['prefname'] = 'filters_spam_maps_rblplus_dul'; + $filters['MAPS RBLplus-DUL']['name'] = 'MAPS RBL+ List DUL entries'; + $filters['MAPS RBLplus-DUL']['link'] = 'http://www.mail-abuse.org/'; + $filters['MAPS RBLplus-DUL']['dns'] = 'rbl-plus.mail-abuse.org'; + $filters['MAPS RBLplus-DUL']['result'] = '127.0.0.3'; + $filters['MAPS RBLplus-DUL']['comment'] = + _("COMMERCIAL - RBL+ Dial-up entries."); + } $filters['FiveTen Direct']['prefname'] = 'filters_spam_fiveten_src'; $filters['FiveTen Direct']['name'] = 'Five-Ten-sg.com Direct SPAM Sources'; @@ -555,7 +724,7 @@ function load_spam_filters() { $filters['SPAMhaus']['name'] = 'SPAMhaus Lists'; $filters['SPAMhaus']['link'] = 'http://www.spamhaus.org'; $filters['SPAMhaus']['dns'] = 'sbl.spamhaus.org'; - $filters['SPAMhaus']['result'] = '127.0.0.6'; + $filters['SPAMhaus']['result'] = '127.0.0.2'; $filters['SPAMhaus']['comment'] = _("FREE - SPAMhaus - A list of well-known SPAM sources."); @@ -565,7 +734,7 @@ function load_spam_filters() { $filters['SPAMcop']['dns'] = 'bl.spamcop.net'; $filters['SPAMcop']['result'] = '127.0.0.2'; $filters['SPAMcop']['comment'] = - _("FREE, for now - SPAMCOP - An interesting solution that lists servers that have a very high spam to legit email ratio (85% or more)."); + _("FREE, for now - SpamCop - An interesting solution that lists servers that have a very high spam to legit email ratio (85 percent or more)."); $filters['dev.null.dk']['prefname'] = 'filters_spam_devnull'; $filters['dev.null.dk']['name'] = 'dev.null.dk Lists'; @@ -583,29 +752,29 @@ function load_spam_filters() { $filters['visi.com']['comment'] = _("FREE - visi.com - Relay Stop List. Very conservative OpenRelay List."); - $filters['2mbit.com Open Relays']['prefname'] = 'filters_spam_2mb_or'; - $filters['2mbit.com Open Relays']['name'] = '2mbit.com Open Relays List'; - $filters['2mbit.com Open Relays']['link'] = 'http://www.2mbit.com/sbl.php'; - $filters['2mbit.com Open Relays']['dns'] = 'blackholes.2mbit.com'; - $filters['2mbit.com Open Relays']['result'] = '127.0.0.2'; - $filters['2mbit.com Open Relays']['comment'] = - _("FREE - 2mbit.com Open Relays - Another list of Open Relays."); - - $filters['2mbit.com SPAM Source']['prefname'] = 'filters_spam_2mb_ss'; - $filters['2mbit.com SPAM Source']['name'] = '2mbit.com SPAM Source List'; - $filters['2mbit.com SPAM Source']['link'] = 'http://www.2mbit.com/sbl.php'; - $filters['2mbit.com SPAM Source']['dns'] = 'blackholes.2mbit.com'; - $filters['2mbit.com SPAM Source']['result'] = '127.0.0.4'; - $filters['2mbit.com SPAM Source']['comment'] = - _("FREE - 2mbit.com SPAM Source - List of Direct SPAM Sources."); - - $filters['2mbit.com SPAM ISPs']['prefname'] = 'filters_spam_2mb_isp'; - $filters['2mbit.com SPAM ISPs']['name'] = '2mbit.com SPAM-friendly ISP List'; - $filters['2mbit.com SPAM ISPs']['link'] = 'http://www.2mbit.com/sbl.php'; - $filters['2mbit.com SPAM ISPs']['dns'] = 'blackholes.2mbit.com'; - $filters['2mbit.com SPAM ISPs']['result'] = '127.0.0.10'; - $filters['2mbit.com SPAM ISPs']['comment'] = - _("FREE - 2mbit.com SPAM ISPs - List of SPAM-friendly ISPs."); + $filters['ahbl.org Open Relays']['prefname'] = 'filters_spam_2mb_or'; + $filters['ahbl.org Open Relays']['name'] = 'ahbl.org Open Relays List'; + $filters['ahbl.org Open Relays']['link'] = 'http://www.ahbl.org/'; + $filters['ahbl.org Open Relays']['dns'] = 'dnsbl.ahbl.org'; + $filters['ahbl.org Open Relays']['result'] = '127.0.0.2'; + $filters['ahbl.org Open Relays']['comment'] = + _("FREE - ahbl.org Open Relays - Another list of Open Relays."); + + $filters['ahbl.org SPAM Source']['prefname'] = 'filters_spam_2mb_ss'; + $filters['ahbl.org SPAM Source']['name'] = 'ahbl.org SPAM Source List'; + $filters['ahbl.org SPAM Source']['link'] = 'http://www.ahbl.org/'; + $filters['ahbl.org SPAM Source']['dns'] = 'dnsbl.ahbl.org'; + $filters['ahbl.org SPAM Source']['result'] = '127.0.0.4'; + $filters['ahbl.org SPAM Source']['comment'] = + _("FREE - ahbl.org SPAM Source - List of Direct SPAM Sources."); + + $filters['ahbl.org SPAM ISPs']['prefname'] = 'filters_spam_2mb_isp'; + $filters['ahbl.org SPAM ISPs']['name'] = 'ahbl.org SPAM-friendly ISP List'; + $filters['ahbl.org SPAM ISPs']['link'] = 'http://www.ahbl.org/'; + $filters['ahbl.org SPAM ISPs']['dns'] = 'dnsbl.ahbl.org'; + $filters['ahbl.org SPAM ISPs']['result'] = '127.0.0.7'; + $filters['ahbl.org SPAM ISPs']['comment'] = + _("FREE - ahbl.org SPAM ISPs - List of SPAM-friendly ISPs."); $filters['Leadmon DUL']['prefname'] = 'filters_spam_lm_dul'; $filters['Leadmon DUL']['name'] = 'Leadmon.net DUL List'; @@ -671,19 +840,46 @@ function load_spam_filters() { $filters['NJABL DUL']['comment'] = _("FREE, for now - Not Just Another Blacklist - Dial-up IPs."); + $filters['Conf DSBL.ORG Relay']['prefname'] = 'filters_spam_dsbl_conf_ss'; + $filters['Conf DSBL.ORG Relay']['name'] = 'DSBL.org Confirmed Relay List'; + $filters['Conf DSBL.ORG Relay']['link'] = 'http://www.dsbl.org/'; + $filters['Conf DSBL.ORG Relay']['dns'] = 'list.dsbl.org'; + $filters['Conf DSBL.ORG Relay']['result'] = '127.0.0.2'; + $filters['Conf DSBL.ORG Relay']['comment'] = + _("FREE - Distributed Sender Boycott List - Confirmed Relays"); + + $filters['Conf DSBL.ORG Multi-Stage']['prefname'] = 'filters_spam_dsbl_conf_ms'; + $filters['Conf DSBL.ORG Multi-Stage']['name'] = 'DSBL.org Confirmed Multi-Stage Relay List'; + $filters['Conf DSBL.ORG Multi-Stage']['link'] = 'http://www.dsbl.org/'; + $filters['Conf DSBL.ORG Multi-Stage']['dns'] = 'multihop.dsbl.org'; + $filters['Conf DSBL.ORG Multi-Stage']['result'] = '127.0.0.2'; + $filters['Conf DSBL.ORG Multi-Stage']['comment'] = + _("FREE - Distributed Sender Boycott List - Confirmed Multi-stage Relays"); + + $filters['UN-Conf DSBL.ORG']['prefname'] = 'filters_spam_dsbl_unc'; + $filters['UN-Conf DSBL.ORG']['name'] = 'DSBL.org UN-Confirmed Relay List'; + $filters['UN-Conf DSBL.ORG']['link'] = 'http://www.dsbl.org/'; + $filters['UN-Conf DSBL.ORG']['dns'] = 'unconfirmed.dsbl.org'; + $filters['UN-Conf DSBL.ORG']['result'] = '127.0.0.2'; + $filters['UN-Conf DSBL.ORG']['comment'] = + _("FREE - Distributed Sender Boycott List - UN-Confirmed Relays"); + foreach ($filters as $Key => $Value) { - $filters[$Key]['enabled'] = getPref($data_dir, $username, - $filters[$Key]['prefname']); + $filters[$Key]['enabled'] = (bool)getPref($data_dir, $username, $filters[$Key]['prefname']); } return $filters; } +/** + * Removes a User filter + * @param int $id ID of the filter to remove + * @access private + */ function remove_filter ($id) { global $data_dir, $username; - while ($nextFilter = getPref($data_dir, $username, 'filter' . - ($id + 1))) { + while ($nextFilter = getPref($data_dir, $username, 'filter' . ($id + 1))) { setPref($data_dir, $username, 'filter' . $id, $nextFilter); $id ++; } @@ -691,6 +887,12 @@ function remove_filter ($id) { removePref($data_dir, $username, 'filter' . $id); } +/** + * Swaps two filters + * @param int $id1 ID of first filter to swap + * @param int $id2 ID of second filter to swap + * @access private + */ function filter_swap($id1, $id2) { global $data_dir, $username; @@ -702,4 +904,49 @@ function filter_swap($id1, $id2) { setPref($data_dir, $username, 'filter' . $id1, $SecondFilter); } } -?> + +/** + * This updates the filter rules when renaming or deleting folders + * @param array $args + * @access private + */ +function update_for_folder ($args) { + + $old_folder = $args[0]; + $new_folder = $args[2]; + $action = $args[1]; + global $data_dir, $username; + $filters = array(); + $filters = load_filters(); + $filter_count = count($filters); + $p = 0; + for ($i = 0; $i < $filter_count; $i++) { + if (!empty($filters)) { + if ($old_folder == $filters[$i]['folder']) { + if ($action == 'rename') { + $filters[$i]['folder'] = $new_folder; + setPref($data_dir, $username, 'filter'.$i, + $filters[$i]['where'].','.$filters[$i]['what'].','.$new_folder); + } + elseif ($action == 'delete') { + remove_filter($p); + $p = $p-1; + } + } + $p++; + } + } +} + +/** + * Display formated error message + * @param string $string text message + * @return string html formated text message + * @access private + */ +function do_error($string) { + global $color; + echo "

"; + echo $string; + echo "

\n"; +}