Changeset 1512:ef727a109ce6 for plugins

Timestamp:

08/21/13 10:17:59 (12 years ago)

Author:

Franck Paul <carnet.franck.paul@…>

Branch:

default

Parents:

1508:60c4414bcd87 (diff), 1511:b8a3b61d4b84 (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 in pascalchevrel/dotclear/ticket1515 (pull request #46) - Fixes 1515: move hardcoded css from antispam filters to css file

Location:

plugins/antispam/filters

Files:

• class.dc.filter.ip.php (modified) (3 diffs)
• class.dc.filter.ip.php (modified) (1 diff)
• class.dc.filter.words.php (modified) (3 diffs)
• class.dc.filter.words.php (modified) (1 diff)

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

@@ -17 +17 @@
      public $has_gui = true;
 
-     private $style_list = 'height: 200px; overflow: auto; margin-bottom: 1em; ';
-     private $style_p = 'margin: 1px 0 0 0; padding: 0.2em 0.5em; ';
-     private $style_global = 'background: #ccff99; ';
-
      private $con;
      private $table;
@@ -151 +147 @@
                '<form action="'.html::escapeURL($url).'" method="post">'.
                '<h3>' . __('IP list') . '</h3>'.
-               '<div style="'.$this->style_list.'">';
+               '<div class="antispam">';
 
                $res_global = '';
@@ -163 +159 @@
 
                     $disabled_ip = false;
-                    $p_style = $this->style_p;
+                    $p_style = '';
                     if (!$rs->blog_id) {
                          $disabled_ip = !$core->auth->isSuperAdmin();
-                         $p_style .= $this->style_global;
+                         $p_style .= ' global';
                     }
 
                     $item =
-                    '<p style="'.$p_style.'"><label class="classic" for="'.$type.'-ip-'.$rs->rule_id.'">'.
+                    '<p class="'.$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).

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

@@ -120 +120 @@
 
           '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'.
+
+          '<p>'.
           form::hidden(array('ip_type'),$type).
-          '<label class="classic" for="addip_'.$type.'">'.__('Add an IP address: ').' '.
-          form::field(array('addip', 'addip_'.$type),18,255).
-          '</label>';
-          if ($core->auth->isSuperAdmin()) {
-               $res .= '<label class="classic" for="globalip_'.$type.'">'.form::checkbox(array('globalip', 'globalip_'.$type),1).' '.
-               __('Global IP (used for all blogs)').'</label> ';
-          }
+          '<label class="classic" for="addip_'.$type.'">'.__('Add an IP address: ').'</label> '.
+          form::field(array('addip', 'addip_'.$type),18,255);
+               if ($core->auth->isSuperAdmin()) {
+                    $res .= '<label class="classic" for="globalip_'.$type.'">'.form::checkbox(array('globalip', 'globalip_'.$type),1).' '.
+                    __('Global IP (used for all blogs)').'</label> ';
+               }
 
           $res .=

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

@@ -17 +17 @@
      public $name = 'Bad Words';
 
-     private $style_list = 'height: 200px; overflow: auto; margin-bottom: 1em; ';
-     private $style_p = 'margin: 1px 0 0 0; padding: 0.2em 0.5em; ';
-     private $style_global = 'background: #ccff99; ';
-
      private $con;
      private $table;
@@ -143 +139 @@
                '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'.
                '<h3>' . __('List of bad words') . '</h3>'.
-               '<div style="'.$this->style_list.'">';
+               '<div class="antispam">';
 
                $res_global = '';
@@ -150 +146 @@
                {
                     $disabled_word = false;
-                    $p_style = $this->style_p;
+
+                    $p_style = '';
+
                     if (!$rs->blog_id) {
                          $disabled_word = !$core->auth->isSuperAdmin();
-                         $p_style .= $this->style_global;
+                         $p_style .= ' global';
                     }
 
-                    $item = '<p style="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
+                    $item = '<p class="'.$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).

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

@@ -116 +116 @@
           $res .=
           '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'.
-          '<p><label class="classic" for="swa">'.__('Add a word ').' '.form::field('swa',20,128).'</label>';
+          '<p><label class="classic" for="swa">'.__('Add a word ').'</label> '.form::field('swa',20,128);
 
           if ($core->auth->isSuperAdmin()) {
-               $res .= '<label class="classic" for="globalsw">'.form::checkbox('globalsw',1).' '.
-               __('Global word (used for all blogs)').'</label> ';
+               $res .= '<label class="classic" for="globalsw">'.form::checkbox('globalsw',1).'</label> '.
+               __('Global word (used for all blogs)');
           }