Changeset 14560 for trunk/administration

Timestamp:

10/27/10 23:33:19 (19 months ago)

Author:

Alexander Trofimov

Message:

Ticket #2250

Location:

trunk/administration

Files:

• antispam.php (modified) (9 diffs)
• templates/base/antispam_akismet.html (added)
• templates/base/antispam_dnsbl_help.html (added)
• templates/base/antispam_dnsbl_recheck.html (added)
• templates/base/antispam_log.html (added)
• templates/base/antispam_manage_dnsbl.html (added)
• templates/base/css/general.css (modified) (1 diff)
• templates/base/dnsbl_help.html (deleted)
• templates/base/manage_dnsbl.html (deleted)

trunk/administration/antispam.php

@@ -107 +107 @@
                     'type' => 'text',
                     'name' => 'recheck',
-                    'caption' => _t('_sys_adm_fld_dnsbl_recheck'),
+                    'caption' => _t('_sys_adm_fld_dnsbl_recheck_url'),
                     'db' => array (
                         'pass' => 'Xss', 
@@ -146 +146 @@
 }
     
+
+
+class BxDolAdmFormDnsblRecheck extends BxTemplFormView {
+
+    function BxDolAdmFormDnsblRecheck ($sTitle, $sId) {
+
+        $aCustomForm = array(
+
+            'form_attrs' => array(
+                'id' => 'sys-adm-dnsbl-recheck',
+                'name' => 'sys-adm-dnsbl-recheck',
+                'onsubmit' => "return bs_sys_adm_dbsbl_recheck($('#$sId').val());",
+                'method' => 'post',
+            ),      
+                  
+            'inputs' => array(
+
+                'test' => array(
+                    'type' => 'text',
+                    'attrs' => array('id' => $sId),
+                    'name' => $sId,
+                    'caption' => $sTitle,
+                    'required' => true,
+                ),
+
+                'Submit' => array (
+                    'type' => 'submit',
+                    'name' => 'dnsbl_recheck',
+                    'value' => _t('_Submit'),
+                    'colspan' => true,
+                ),
+            ),            
+        );
+
+        parent::BxTemplFormView ($aCustomForm);
+    }
+}
+
 $logged['admin'] = member_auth( 1, true, true );
 
@@ -154 +192 @@
 
     switch ($_GET['popup']) {
+
+        case 'dnsbl_log':
+            $sPopupTitle = _t('_sys_adm_title_dnsbl_log');  
+            $sPopupContent = PageCodeLog ('dnsbl');
+            break;
+
+        case 'dnsbluri_log':
+            $sPopupTitle = _t('_sys_adm_title_dnsbluri_log');  
+            $sPopupContent = PageCodeLog ('dnsbluri');
+            break;
+
+        case 'akismet_log':
+            $sPopupTitle = _t('_sys_adm_title_akismet_log');  
+            $sPopupContent = PageCodeLog ('akismet');
+            break;
+
+        case 'dnsbl_recheck':
+            $sPopupTitle = _t('_sys_adm_title_dnsbl_recheck');
+            $aChains = array(BX_DOL_DNSBL_CHAIN_SPAMMERS, BX_DOL_DNSBL_CHAIN_WHITELIST);
+            $sPopupContent = PageCodeRecheckPopup ($aChains, _t('_sys_adm_fld_dnsbl_recheck'), 'sys-adm-dnsbl-test', 'dnsbl-recheck-ip');
+            break;
+
+        case 'dnsbluri_recheck':
+            $sPopupTitle = _t('_sys_adm_title_dnsbluri_recheck');
+            $aChains = array(BX_DOL_DNSBL_CHAIN_URIDNS);
+            $sPopupContent = PageCodeRecheckPopup ($aChains, _t('_sys_adm_fld_dnsbluri_recheck'), 'sys-adm-dnsbl-test', 'dnsbl-recheck-uri');
+            break;
+
         case 'dnsbl_help':
             $sPopupTitle = _t('_sys_adm_btn_dnsbl_help');
-            $sPopupContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('dnsbl_help.html', array('text' => _t('_sys_adm_btn_dnsbl_help_text')));
+            $sPopupContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_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')));
+            $sPopupContent = $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_dnsbl_help.html', array('text' => _t('_sys_adm_btn_dnsbluri_help_text')));
             break;
         case 'dnsbl_add':
@@ -184 +250 @@
 // Process actions
 switch (true) {
+
+    case (isset($_GET['action']) && $_GET['action'] == 'log' && isset($_GET['type'])):
+        header("Content-type: text/html; charset=utf-8");
+        echo PageCodeLog ($_GET['type']);
+        exit;
+
+    case (isset($_POST['action']) && isset($_POST['id']) && isset($_POST['test'])):
+
+        $o = bx_instance('BxDolDNSBlacklists');
+        $aChain = $GLOBALS['MySQL']->getAll("SELECT `zonedomain`, `postvresp` FROM `sys_dnsbl_rules` WHERE `id` = '".(int)$_POST['id']."' AND `active` = 1");
+        
+        $iRet = BX_DOL_DNSBL_FAILURE;
+        if ($aChain) {
+            if ($_POST['action'] == 'dnsbl-recheck-ip') {
+                $iRet = $o->dnsbl_lookup_ip($aChain, $_POST['test']);
+            } elseif ($_POST['action'] == 'dnsbl-recheck-uri') {
+                $sUrl = preg_replace('/^\w+:\/\//', '', $_POST['test']);
+                $sUrl = preg_replace('/^www\./', '', $sUrl);
+                $oBxDolDNSURIBlacklists = bx_instance('BxDolDNSURIBlacklists');
+                $aUrls = $oBxDolDNSURIBlacklists->validateUrls(array($sUrl)); 
+                if ($aUrls)
+                    $iRet = $o->dnsbl_lookup_uri($aUrls[0], $aChain);
+            }
+        }
+
+        switch ($iRet) {
+            case BX_DOL_DNSBL_POSITIVE:
+                echo 'LISTED';
+                exit;
+            case BX_DOL_DNSBL_NEGATIVE:
+                echo 'NOT LISTED';
+                exit;
+            default:
+            case BX_DOL_DNSBL_FAILURE:
+                echo 'FAIL';
+                exit;
+        }
 
     case (isset($_POST['adm-dnsbl-activate'])):
@@ -217 +320 @@
 $aPages = array (
     'dnsbl' => array (
+        'option' => 'sys_dnsbl_enable',
         'title' => _t('_sys_adm_page_cpt_dnsbl'),
         'url' => BX_DOL_URL_ADMIN . 'antispam.php?mode=dnsbl',
@@ -223 +327 @@
     ),
     'dnsbluri' => array (
+        'option' => 'sys_uridnsbl_enable',
         'title' => _t('_sys_adm_page_cpt_uridnsbl'),
         'url' => BX_DOL_URL_ADMIN . 'antispam.php?mode=dnsbluri',
@@ -229 +334 @@
     ),
     'akismet' => array (
+        'option' => 'sys_akismet_enable',
         'title' => _t('_sys_adm_page_cpt_akismet'),
         'url' => BX_DOL_URL_ADMIN . 'antispam.php?mode=akismet',
         'func' => 'PageCodeAkismet',
+        'func_params' => array('akismet'),
     ),
 );
@@ -271 +378 @@
 function PageCodeDNSBL($aChains, $sMode) {
 
+    global $aPages;
+
     $sControls = BxTemplSearchResult::showAdminActionsPanel('adm-dnsbl-form', array(
         'adm-dnsbl-delete' => _t('_sys_adm_btn_dnsbl_delete'),
@@ -284 +393 @@
     }
 
-    $s = $GLOBALS['oAdmTemplate']->parseHtmlByName('manage_dnsbl.html', array(
-        'bx_repeat:items' => is_array($aRules) && !empty($aRules) ? $aRules : MsgBox(_t('_Empty')),
-        'controls' => $sControls,
-        'admin_url' => BX_DOL_URL_ADMIN,
-        'global_message' => $GLOBALS['sGlMsg'],
-        'mode' => $sMode,
-    ));
+    if (is_array($aRules) && !empty($aRules)) {
+        $s = $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_manage_dnsbl.html', array(
+            'bx_repeat:items' => $aRules,
+            'controls' => $sControls,
+            'admin_url' => BX_DOL_URL_ADMIN,
+            'global_message' => $GLOBALS['sGlMsg'],
+            'mode' => $sMode,
+            'status' => 'on' == getParam($aPages[$sMode]['option']) ? _t('_sys_adm_enabled') : _t('_sys_adm_disabled'),
+            'status_class' => 'sys-adm-' . ('on' == getParam($aPages[$sMode]['option']) ? 'enabled' : 'disabled'),
+        ));
+    } else {
+        $s = MsgBox(_t('_Empty'));
+    }
     
     return DesignBoxContent ($GLOBALS['sPageTitle'], $s, 1, $GLOBALS['sActions']);
 }
 
-function PageCodeAkismet() {
-    $s = 'TODO:';
+function PageCodeAkismet($sMode) {
+
+    global $aPages;
+
+    $sKeyStatusClass = '';
+    $sKeyStatus = _t('_sys_adm_akismet_key_empty');
+    if (getParam('sys_akismet_api_key')) {
+
+        $oBxDolAkismet = bx_instance('BxDolAkismet');
+        if ($oBxDolAkismet->oAkismet->isKeyValid()) {
+            $sKeyStatusClass = 'sys-adm-enabled';
+            $sKeyStatus = _t('_sys_adm_akismet_key_valid');
+        } else {
+            $sKeyStatusClass = 'sys-adm-disabled';
+            $sKeyStatus = _t('_sys_adm_akismet_key_invalid');
+        }
+    }
+
+    $s = $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_akismet.html', array(
+        'admin_url' => BX_DOL_URL_ADMIN,
+        'key_status' => $sKeyStatus,
+        'key_status_class' => $sKeyStatusClass,
+        'status' => 'on' == getParam($aPages[$sMode]['option']) ? _t('_sys_adm_enabled') : _t('_sys_adm_disabled'),
+        'status_class' => 'sys-adm-' . ('on' == getParam($aPages[$sMode]['option']) ? 'enabled' : 'disabled'),
+    ));
+
     return DesignBoxContent ($GLOBALS['sPageTitle'], $s, 1, $GLOBALS['sActions']);
 }
 
 
+function PageCodeRecheckPopup ($aChains, $sFieldTitle, $sId, $sAction) {
+            
+    $sChains = "'" . implode("','", $aChains) . "'";
+    $aRules = $GLOBALS['MySQL']->getAll("SELECT * FROM `sys_dnsbl_rules` WHERE `chain` IN($sChains) AND `active` = 1 ORDER BY `chain`, `added` ");            
+    $oForm = new BxDolAdmFormDnsblRecheck($sFieldTitle, $sId);
+    return $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_dnsbl_recheck.html', array(
+        'txt_listed' => bx_js_string(_t('_sys_adm_dnsbl_listed')),
+        'txt_not_listed' => bx_js_string(_t('_sys_adm_dnsbl_not_listed')),
+        'txt_failed' => bx_js_string(_t('_sys_adm_dnsbl_failed')),
+        'form' => $oForm->getCode(),
+        'action' => $sAction,
+        'admin_url' => BX_DOL_URL_ADMIN,
+        'bx_repeat:items' => $aRules,
+    ));
+}
+
+function PageCodeLog ($sMode) { 
+    
+    switch ($sMode) {
+        case 'dnsbl':
+        case 'dnsbluri':
+        case 'akismet':
+            break;
+        default:
+            $sMode = 'dnsbl';
+    }
+
+    $iPage = isset($_GET['page']) && (int)$_GET['page'] > 0 ? (int)$_GET['page'] : 1; 
+    $iPerPage = 12;
+    $iStart = ($iPage-1) * $iPerPage;
+    
+    $aLog = $GLOBALS['MySQL']->getAll("SELECT SQL_CALC_FOUND_ROWS * FROM `sys_antispam_block_log` WHERE `type` = '$sMode' ORDER BY `added` DESC LIMIT $iStart, $iPerPage");
+    $iCount = $GLOBALS['MySQL']->getOne("SELECT FOUND_ROWS()");
+    foreach ($aLog as $k => $r) {
+        $aLog[$k]['ip'] = long2ip ($r['ip']);
+        $aLog[$k]['member_url'] = $r['member_id'] ? getProfileLink($r['member_id']) : 'javascript:void(0);';
+        $aLog[$k]['member_nickname'] = $r['member_id'] ? getNickName($r['member_id']) : _t('_Guest');
+        $aLog[$k]['extra'] = bx_html_attribute ($r['extra']);
+        $aLog[$k]['ago'] = _format_when (time() - $r['added']);
+    }
+
+    $sPaginate = '';
+    if ($iCount > $iPerPage) {
+        $sUrlStart = BX_DOL_URL_ADMIN . 'antispam.php?action=log&type='.$sMode;
+        $oPaginate = new BxDolPaginate(array(
+            'page_url' => 'javascript:void(0);',
+            'count' => $iCount,
+            'per_page' => $iPerPage,
+            'page' => $iPage,
+            'on_change_page' => "getHtmlData('sys-adm-antispam-log', '{$sUrlStart}&page={page}');",
+        ));
+
+        $sPaginate = $oPaginate->getSimplePaginate(false, -1, -1, false);
+    }
+
+    if (is_array($aLog) && !empty($aLog)) {
+        return $GLOBALS['oAdmTemplate']->parseHtmlByName('antispam_log.html', array(
+            'bx_repeat:items' => $aLog,
+            'paginate' => $sPaginate,
+        ));
+    } else {
+        return MsgBox(_t('_Empty'));
+    }
+}
+
 ?>

trunk/administration/templates/base/css/general.css

@@ -485 +485 @@
     color:#999;
 }
+
+.sys-adm-enabled {    
+    color:#fff;
+    background-color:#0b0;
+}
+
+.sys-adm-disabled {    
+    color:#fff;
+    background-color:#d00;
+}
+