Changeset 782:01efbf050a8a for plugins/antispam/filters

Timestamp:

12/06/11 11:43:14 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Parents:

781:b509ac00bf4a (diff), 779:58c45f1b96e5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged last default changes with formfilter branch

File:

• plugins/antispam/filters/class.dc.filter.ip.php (modified) (6 diffs)

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

@@ -4 +4 @@
 # This file is part of Antispam, a plugin for Dotclear 2.
 #
-# Copyright (c) 2003-2010 Olivier Meunier & Association Dotclear
+# Copyright (c) 2003-2011 Olivier Meunier & Association Dotclear
 # Licensed under the GPL version 2.0 license.
 # See LICENSE file or
@@ -123 +123 @@
           '<div class="multi-part" id="tab_'.$type.'" title="'.$title.'">'.
 
-          '<form action="'.html::escapeURL($url).'" method="post">'.
-          '<fieldset><legend>'.__('Add an IP address').'</legend><p>'.
+          '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'.
           form::hidden(array('ip_type'),$type).
-          '<label class="classic" for="addip_'.$type.'">'.__('Add an IP address').' '.
+          '<label class="classic" for="addip_'.$type.'">'.__('Add an IP address: ').' '.
           form::field(array('addip', 'addip_'.$type),18,255).
           '</label>';
@@ -136 +135 @@
           $res .=
           $core->formNonce().
-          '<input type="submit" value="'.__('Add').'"/></p>'.
-          '</fieldset></form>';
+          '</p>'.
+          '<p><input type="submit" value="'.__('Add').'"/></p>'.
+          '</form>';
 
           $rs = $this->getRules($type);
@@ -149 +149 @@
                $res .=
                '<form action="'.html::escapeURL($url).'" method="post">'.
-               '<fieldset><legend>' . __('IP list') . '</legend>'.
+               '<h3>' . __('IP list') . '</h3>'.
                '<div style="'.$this->style_list.'">';
 
@@ -167 +167 @@
 
                     $res .=
-                    '<p style="'.$p_style.'"><label class="classic">'.
-                    form::checkbox(array('delip[]'),$rs->rule_id,false,'','',$disabled_ip, 'title="'.html::escapeHTML($pattern).'"').' '.
+                    '<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>';
@@ -178 +178 @@
                form::hidden(array('ip_type'),$type).
                '</p>'.
-               '</fieldset></form>';
+               '</form>';
           }