Changeset 893:27fed157954d

Timestamp:

10/22/12 13:02:48 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Clearer wording and layout on filter configuration pages (IP and Bad words), fixes #1341

Files:

• locales/en/plugins.po (modified) (3 diffs)
• locales/fr/plugins.po (modified) (4 diffs)
• plugins/antispam/filters/class.dc.filter.ip.php (modified) (3 diffs)
• plugins/antispam/filters/class.dc.filter.words.php (modified) (3 diffs)

locales/en/plugins.po

@@ -99 +99 @@
 msgstr ""
 
+msgid "Global IP (used for all blogs)"
+msgstr ""
+
 msgid "Add"
 msgstr ""
@@ -108 +111 @@
 msgstr ""
 
+msgid "Local IPs (used only for this blog)"
+msgstr ""
+
+msgid "Global IPs (used only for this blog)"
+msgstr ""
+
 msgid "Checks sender IP address against DNSBL servers"
 msgstr ""
@@ -146 +155 @@
 msgstr ""
 
+msgid "Global word (used for all blogs)"
+msgstr ""
+
 msgid "No word in list."
 msgstr ""
 
 msgid "List of bad words"
+msgstr ""
+
+msgid "Local words (used only for this blog)"
+msgstr ""
+
+msgid "Global words (used for all blogs)"
 msgstr ""
 

locales/fr/plugins.po

@@ -104 +104 @@
 msgstr "IP globale"
 
+msgid "Global IP (used for all blogs)"
+msgstr "IP globale (valable pour tous les blogs)"
+
 msgid "Add"
 msgstr "Ajouter"
@@ -113 +116 @@
 msgstr "Liste IP"
 
+msgid "Local IPs (used only for this blog)"
+msgstr "IP locales (valables seulement pour ce blog)"
+
+msgid "Global IPs (used for all blogs)"
+msgstr "IP globales (valables pour tous les blogs)"
+
 msgid "Checks sender IP address against DNSBL servers"
 msgstr "Contrôle l'adresse IP de l'émetteur via les serveurs DNSBL"
@@ -151 +160 @@
 msgstr "Mot global"
 
+msgid "Global word (used for all blogs)"
+msgstr "Mot global (valable pour tous les blogs)"
+
 msgid "No word in list."
 msgstr "Aucun mot dans la liste."
@@ -156 +168 @@
 msgid "List of bad words"
 msgstr "Liste de mots interdits"
+
+msgid "Local words (used only for this blog)"
+msgstr "Mots locaux (valables seulement pour ce blog)"
+
+msgid "Global words (used for all blogs)"
+msgstr "Mots globaux (valables pour tous les blogs)"
 
 msgid "Delete selected words"

plugins/antispam/filters/class.dc.filter.ip.php

@@ -130 +130 @@
           if ($core->auth->isSuperAdmin()) {
                $res .= '<label class="classic" for="globalip_'.$type.'">'.form::checkbox(array('globalip', 'globalip_'.$type),1).' '.
-               __('Global IP').'</label> ';
+               __('Global IP (used for all blogs)').'</label> ';
           }
 
@@ -152 +152 @@
                '<div style="'.$this->style_list.'">';
 
+               $res_global = '';
+               $res_local = '';
                while ($rs->fetch())
                {
@@ -166 +168 @@
                     }
 
-                    $res .=
+                    $item =
                     '<p style="'.$p_style.'"><label class="classic" for="'.$type.'-ip-'.$rs->rule_id.'">'.
                     form::checkbox(array('delip[]',$type.'-ip-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_ip).' '.
                     html::escapeHTML($pattern).
                     '</label></p>';
-               }
+
+                    if ($rs->blog_id) {
+                         // local list
+                         if ($res_local == '') {
+                              $res_local = '<h4>'.__('Local IPs (used only for this blog)').'</h4>';
+                         }
+                         $res_local .= $item;
+                    } else {
+                         // global list
+                         if ($res_global == '') {
+                              $res_global = '<h4>'.__('Global IPs (used for all blogs)').'</h4>';
+                         }
+                         $res_global .= $item;
+                    }
+               }
+               $res .= $res_local.$res_global;
+
                $res .=
                '</div>'.

plugins/antispam/filters/class.dc.filter.words.php

@@ -124 +124 @@
           if ($core->auth->isSuperAdmin()) {
                $res .= '<label class="classic" for="globalsw">'.form::checkbox('globalsw',1).' '.
-               __('Global word').'</label> ';
+               __('Global word (used for all blogs)').'</label> ';
           }
 
@@ -145 +145 @@
                '<div style="'.$this->style_list.'">';
 
+               $res_global = '';
+               $res_local = '';
                while ($rs->fetch())
                {
@@ -154 +156 @@
                     }
 
-                    $res .=
-                    '<p style="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
-                    form::checkbox(array('swd[]', 'word-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_word).' '.
-                    html::escapeHTML($rs->rule_content).
-                    '</label></p>';
-               }
+                    $item = '<p style="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
+                         form::checkbox(array('swd[]', 'word-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_word).' '.
+                         html::escapeHTML($rs->rule_content).
+                         '</label></p>';
+
+                    if ($rs->blog_id) {
+                         // local list
+                         if ($res_local == '') {
+                              $res_local = '<h4>'.__('Local words (used only for this blog)').'</h4>';
+                         }
+                         $res_local .= $item;
+                    } else {
+                         // global list
+                         if ($res_global == '') {
+                              $res_global = '<h4>'.__('Global words (used for all blogs)').'</h4>';
+                         }
+                         $res_global .= $item;
+                    }
+               }
+               $res .= $res_local.$res_global;
 
                $res .=