Changeset 14546

Timestamp:

10/22/10 02:14:12 (19 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2250

Location:

trunk

Files:

• administration/antispam.php (modified) (11 diffs)
• administration/templates/base/dnsbl_help.html (modified) (1 diff)
• administration/templates/base/manage_dnsbl.html (modified) (2 diffs)
• inc/classes/BxDolDNSBlacklists.php (added)
• inc/classes/BxDolDNSURIBlacklists.php (added)
• inc/utils.inc.php (modified) (1 diff)
• install/langs/lang-en.php (modified) (2 diffs)
• install/sql/v70.sql (modified) (4 diffs)
• three-level-tlds (added)
• two-level-tlds (added)

trunk/administration/antispam.php

@@ -27 +27 @@
 $oBxDolDNSBlacklists = bx_instance('BxDolDNSBlacklists');
 
+
 class BxDolAdmFormDnsblAdd extends BxTemplFormView {
 
-    function BxDolAdmFormDnsblAdd () {
+    function BxDolAdmFormDnsblAdd ($aChains, $sDefaultMode) {
 
         $aCustomForm = array(
@@ -36 +37 @@
             'id' => 'sys-adm-dnsbl-add',
             'name' => 'sys-adm-dnsbl-add',
-            'action' => BX_DOL_URL_ADMIN . 'antispam.php?action=dnsbl_add',
+            'action' => BX_DOL_URL_ADMIN . 'antispam.php?action=dnsbl_add&mode='.$sDefaultMode,
             'method' => 'post',
             ),      
@@ -54 +55 @@
                     'name' => 'chain',
                     'caption' => _t('_sys_adm_fld_dnsbl_chain'),
-                    'values' => array ('spammers' => 'spammers', 'whitelist' => 'whitelist'),
+                    'values' => $aChains,
                     'value' => '',
                     'required' => true,
@@ -155 +156 @@
         case 'dnsbl_help':
             $sPopupTitle = _t('_sys_adm_btn_dnsbl_help');
-            $sPopupContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('dnsbl_help.html', array());
+            $sPopupContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('dnsbl_help.html', array('text' => _t('_sys_adm_btn_dnsbl_help_text')));
+            break;
+        case 'dnsbluri_help':
+            $sPopupTitle = _t('_sys_adm_btn_dnsbl_help');
+            $sPopupContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('dnsbl_help.html', array('text' => _t('_sys_adm_btn_dnsbluri_help_text')));
             break;
         case 'dnsbl_add':
             $sPopupTitle = _t('_sys_adm_btn_dnsbl_add');
-            $oForm = new BxDolAdmFormDnsblAdd();
+            $oForm = new BxDolAdmFormDnsblAdd(array ('spammers' => 'spammers', 'whitelist' => 'whitelist'), 'dnsbl');
+            $sPopupContent = $oForm->getCode();
+            break;
+        case 'dnsbluri_add':
+            $sPopupTitle = _t('_sys_adm_btn_dnsbl_add');
+            $oForm = new BxDolAdmFormDnsblAdd(array ('uridns' => 'uridns'), 'dnsbluri');
             $sPopupContent = $oForm->getCode();
             break;
@@ -210 +220 @@
         'url' => BX_DOL_URL_ADMIN . 'antispam.php?mode=dnsbl',
         'func' => 'PageCodeDNSBL',
+        'func_params' => array(array(BX_DOL_DNSBL_CHAIN_SPAMMERS, BX_DOL_DNSBL_CHAIN_WHITELIST), 'dnsbl'),
     ),
-    'uridnsbl' => array (
+    'dnsbluri' => array (
         'title' => _t('_sys_adm_page_cpt_uridnsbl'),
-        'url' => BX_DOL_URL_ADMIN . 'antispam.php?mode=uridnsbl',
-        'func' => 'PageCodeURIDNSBL',
+        'url' => BX_DOL_URL_ADMIN . 'antispam.php?mode=dnsbluri',
+        'func' => 'PageCodeDNSBL',
+        'func_params' => array(array(BX_DOL_DNSBL_CHAIN_URIDNS), 'dnsbluri'),
     ),
     'akismet' => array (
@@ -222 +234 @@
     ),
 );
+
 
 if (!isset($_GET['mode']) || !isset($aPages[$_GET['mode']]))
@@ -241 +254 @@
 
 $sPageTitle = $aPages[$sMode]['title'];
-$sFunc = $aPages[$sMode]['func'];
-$_page_cont[$iNameIndex]['page_main_code'] = $sFunc();
+$_page_cont[$iNameIndex]['page_main_code'] = call_user_func($aPages[$sMode]['func'], $aPages[$sMode]['func_params'][0], $aPages[$sMode]['func_params'][1]);
 
 $_page = array(
@@ -257 +269 @@
 
 
-function PageCodeDNSBL() {
+function PageCodeDNSBL($aChains, $sMode) {
 
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-dnsbl-form', array(
@@ -265 +277 @@
     ), 'rules');
     
-    $aRules = $GLOBALS['MySQL']->getAll("SELECT * FROM `sys_dnsbl_rules` ORDER BY `chain`, `added`");
+    $sChains = "'" . implode("','", $aChains) . "'";
+
+    $aRules = $GLOBALS['MySQL']->getAll("SELECT * FROM `sys_dnsbl_rules` WHERE `chain` IN($sChains) ORDER BY `chain`, `added` ");
     foreach ($aRules as $k => $r) {
         $aRules[$k]['comment'] = bx_html_attribute ($r['comment']);
@@ -275 +289 @@
         'admin_url' => BX_DOL_URL_ADMIN,
         'global_message' => $GLOBALS['sGlMsg'],
+        'mode' => $sMode,
     ));
     
@@ -280 +295 @@
 }
 
-function PageCodeURIDNSBL() {
-    $s = '<div>TODO: 2<br />123</div>';
+function PageCodeAkismet() {
+    $s = 'TODO:';
     return DesignBoxContent ($GLOBALS['sPageTitle'], $s, 1, $GLOBALS['sActions']);
 }
 
-function PageCodeAkismet() {
-    $s = 'TODO: 1';
-    return DesignBoxContent ($GLOBALS['sPageTitle'], $s, 1, $GLOBALS['sActions']);
-}
-
 
 ?>

trunk/administration/templates/base/dnsbl_help.html

@@ -1 +1 @@
 <div class="bx_sys_default_padding" style="width:400px;">
-    <bx_text:_sys_adm_btn_dnsbl_help_text />
+    __text__
 </div>

trunk/administration/templates/base/manage_dnsbl.html

@@ -2 +2 @@
 <div class="top_settings_block">
     <div style="padding:5px 9px 0 9px; text-align:right;">
-        <a href="javascript:void(0);" onclick="showPopupAnyHtml ('__admin_url__antispam.php?popup=dnsbl_help');"><bx_text:_sys_adm_btn_dnsbl_help /></a>
+        <a href="javascript:void(0);" onclick="showPopupAnyHtml ('__admin_url__antispam.php?popup=__mode___help');"><bx_text:_sys_adm_btn_dnsbl_help /></a>
         |
         <a href="__admin_url__advanced_settings.php"><bx_text:_sys_adm_btn_dnsbl_settings /></a>
         |
-        <a href="javascript:void(0);" onclick="showPopupAnyHtml ('__admin_url__antispam.php?popup=dnsbl_add');"><bx_text:_sys_adm_btn_dnsbl_add /></a>
+        <a href="javascript:void(0);" onclick="showPopupAnyHtml ('__admin_url__antispam.php?popup=__mode___add');"><bx_text:_sys_adm_btn_dnsbl_add /></a>
     </div>
 </div>
@@ -12 +12 @@
 __global_message__
 </div>
-<form id="adm-dnsbl-form" name="adm-dnsbl-form" action="__admin_url__antispam.php?mode=dnsbl" method="post">
+<form id="adm-dnsbl-form" name="adm-dnsbl-form" action="__admin_url__antispam.php?mode=__mode__" method="post">
     <table style="width:100%;">
         <bx_repeat:items>

trunk/inc/utils.inc.php

@@ -562 +562 @@
         return $val;
 
+    if ('on' == getParam('sys_uridnsbl_enable')) {
+        $oBxDolDNSURIBlacklists = bx_instance('BxDolDNSURIBlacklists');
+        if ($oBxDolDNSURIBlacklists->isSpam($val)) {
+            echo sprintf(_t("_sys_spam_detected"), BX_DOL_URL_ROOT . 'contact.php');
+            exit;
+        }
+    }
+
     // HTML Purifier plugin    
     global $oHtmlPurifier;

trunk/install/langs/lang-en.php

@@ -2696 +2696 @@
 <a href="http://stats.dnsbl.com/">http://stats.dnsbl.com/</a><br />
 <a href="http://www.moensted.dk/spam/">http://www.moensted.dk/spam/</a>',
+    '_sys_adm_btn_dnsbluri_help_text' => 'A URI DNSBL is a DNSBL that lists the domain names and IP addresses which are found in the "clickable" links contained in the body of spams, but generally not found inside legitimate messages.
+This antispam method scan submitted content for the urls and check them if any of them is a link to spam site. If such url detected in the text then content is not submitted. 
+<br /><br />
+More info about URI DNSBL: <br />
+<a href="http://www.surbl.org/">http://www.surbl.org/</a> <br />
+<a href="http://dnsbl.invaluement.com/ivmuri/">http://dnsbl.invaluement.com/ivmuri/</a>',
     '_sys_adm_form_err_required_field' => 'This is required field',
     '_sys_adm_fld_dnsbl_chain' => 'Chain',
     '_sys_adm_fld_dnsbl_zonedomain' => 'Domain zone',
-    '_sys_adm_fld_dnsbl_postvresp' => 'Return value',
+    '_sys_adm_fld_dnsbl_postvresp' => 'Return value ("any" - any result)',
     '_sys_adm_fld_dnsbl_url' => 'URL',
     '_sys_adm_fld_dnsbl_recheck' => 'Recheck URL',
@@ -2705 +2711 @@
     '_sys_adm_fld_dnsbl_active' => 'Active',
     '_sys_sucess_result' => 'Data has been succesfully submited.',
-    '' => '',
+    '_sys_spam_detected' => 'Sorry, it looks like you are trying to submit spam, if you believe that it is not spam please submit false positive report here: %s',
     '' => '',
     '' => '',

trunk/install/sql/v70.sql

@@ -6 +6 @@
 
 SET NAMES 'utf8';
-DROP TABLE IF EXISTS `sys_account_custom_stat_elements`, `sys_admin_ban_list`, `sys_admin_dashboard`, `sys_menu_admin`, `sys_menu_admin_top`, `sys_menu_bottom`, `sys_albums`, `sys_albums_objects`,`sys_banners`, `sys_banners_clicks`, `sys_banners_shows`, `sys_block_list`, `sys_categories`, `sys_objects_categories`, `sys_objects_cmts`, `sys_cmts_profile`, `sys_cmts_track`, `sys_color_base`, `sys_countries`, `sys_email_templates`, `sys_menu_member`, `sys_friend_list`, `sys_options`, `sys_options_cats`, `sys_fave_list`, `sys_ip_list`, `sys_ip_members_visits`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_string_params`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `sys_messages`, `sys_page_compose`, `sys_page_compose_pages`, `sys_page_compose_privacy`, `sys_sessions`, `sys_stat_member`, `sys_pre_values`, `sys_profile_fields`, `sys_acl_levels_members`, `Profiles`, `sys_profile_views_track`, `sys_profiles_match`, `sys_profile_rating`, `sys_profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayChatMembershipsSettings`, `RayChatMemberships`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayMp3Tokens`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideoTokens`, `RayVideo_commentsFiles`, `RayVideo_commentsTokens`, `sys_objects_search`, `sys_shared_sites`, `sys_stat_site`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `sys_privacy_actions`, `sys_privacy_defaults`, `sys_privacy_groups`, `sys_privacy_members`, `sys_tags`, `sys_objects_tag`, `sys_menu_top`, `sys_transactions`, `sys_objects_actions`, `sys_objects_auths`, `sys_greetings`, `sys_zip_codes`, `sys_objects_vote`, `sys_objects_views`, `sys_box_download`, `sys_cron_jobs`, `sys_sbs_users`, `sys_sbs_entries`, `sys_sbs_types`, `sys_sbs_queue`, `sys_sbs_messages`, `sys_profiles_match_mails`;
+DROP TABLE IF EXISTS `sys_account_custom_stat_elements`, `sys_admin_ban_list`, `sys_admin_dashboard`, `sys_menu_admin`, `sys_menu_admin_top`, `sys_menu_bottom`, `sys_albums`, `sys_albums_objects`,`sys_banners`, `sys_banners_clicks`, `sys_banners_shows`, `sys_block_list`, `sys_categories`, `sys_objects_categories`, `sys_objects_cmts`, `sys_cmts_profile`, `sys_cmts_track`, `sys_color_base`, `sys_countries`, `sys_email_templates`, `sys_menu_member`, `sys_friend_list`, `sys_options`, `sys_options_cats`, `sys_fave_list`, `sys_ip_list`, `sys_ip_members_visits`, `sys_localization_categories`, `sys_localization_keys`, `sys_localization_languages`, `sys_localization_string_params`, `sys_localization_strings`, `sys_acl_actions`, `sys_acl_actions_track`, `sys_acl_matrix`, `sys_acl_level_prices`, `sys_acl_levels`, `sys_messages`, `sys_page_compose`, `sys_page_compose_pages`, `sys_page_compose_privacy`, `sys_sessions`, `sys_stat_member`, `sys_pre_values`, `sys_profile_fields`, `sys_acl_levels_members`, `Profiles`, `sys_profile_views_track`, `sys_profiles_match`, `sys_profile_rating`, `sys_profile_voting_track`, `RayBoardCurrentUsers`, `RayBoardBoards`, `RayBoardUsers`, `RayChatCurrentUsers`, `RayChatMessages`, `RayChatProfiles`, `RayChatRooms`, `RayChatRoomsUsers`, `RayChatMembershipsSettings`, `RayChatMemberships`, `RayImContacts`, `RayImMessages`, `RayImPendings`, `RayImProfiles`, `RayMp3Files`, `RayMp3Tokens`, `RayShoutboxMessages`, `RayVideoFiles`, `RayVideoTokens`, `RayVideo_commentsFiles`, `RayVideo_commentsTokens`, `sys_objects_search`, `sys_shared_sites`, `sys_stat_site`, `sys_alerts`, `sys_alerts_handlers`, `sys_injections`, `sys_injections_admin`, `sys_modules`, `sys_modules_file_tracks`, `sys_permalinks`, `sys_privacy_actions`, `sys_privacy_defaults`, `sys_privacy_groups`, `sys_privacy_members`, `sys_tags`, `sys_objects_tag`, `sys_menu_top`, `sys_transactions`, `sys_objects_actions`, `sys_objects_auths`, `sys_greetings`, `sys_zip_codes`, `sys_objects_vote`, `sys_objects_views`, `sys_box_download`, `sys_cron_jobs`, `sys_sbs_users`, `sys_sbs_entries`, `sys_sbs_types`, `sys_sbs_queue`, `sys_sbs_messages`, `sys_profiles_match_mails`, `sys_dnsbl_rules`, `sys_dnsbl_block_log`, `sys_dnsbluri_zones`;
 ALTER DATABASE DEFAULT CHARACTER SET 'utf8' COLLATE 'utf8_unicode_ci';
 
@@ -3576 +3576 @@
 CREATE TABLE IF NOT EXISTS `sys_dnsbl_rules` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
-  `chain` enum('spammers','whitelist') NOT NULL,
+  `chain` enum('spammers','whitelist','uridns') NOT NULL,
   `zonedomain` varchar(255) NOT NULL,
   `postvresp` varchar(32) NOT NULL,
@@ -3592 +3592 @@
 (7, 'spammers', 'zomgbl.spameatingmonkey.net.', 'any', 'http://spameatingmonkey.com/index.html', '', 'This zone is guaranteed to block 100% of all IPs because it lists everything (0.0.0.0/0). This list should never be used in production but exists to verify overall functionality of the blacklist servers.', 1287642420, 0),
 (4, 'spammers', 'cn.countries.nerd.dk.', '127.0.0.2', 'http://countries.nerd.dk/', '', 'Country based zone, any ip from China is blocked', 1287642420, 0);
-
+(5, 'uridns', 'multi.surbl.org.', 'any', 'http://www.surbl.org/', 'http://george.surbl.org/lookup.html', 'SURBLs are lists of web sites that have appeared in unsolicited messages. Unlike most lists, SURBLs are not lists of message senders.', 1287642420, 1);
 
 CREATE TABLE IF NOT EXISTS `sys_dnsbl_block_log` (
@@ -3600 +3600 @@
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 
-
+CREATE TABLE IF NOT EXISTS `sys_dnsbluri_zones` (
+  `level` tinyint(4) NOT NULL,
+  `zone` varchar(64) NOT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+