Changeset 14546 for trunk/administration

Timestamp:

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

Author:

Alexander Trofimov

Message:

Ticket #2250

Location:

trunk/administration

Files:

• antispam.php (modified) (11 diffs)
• templates/base/dnsbl_help.html (modified) (1 diff)
• templates/base/manage_dnsbl.html (modified) (2 diffs)

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>