Changeset 2986:1e5a2d6a0074 for plugins

Timestamp:

03/31/15 20:42:36 (10 years ago)

Author:

Nicolas <nikrou77@…>

Branch:

default

Message:

Fix #1647
Allow user to add the same word for severals blogs not necessary global.
Add behat tests for that feature.

File:

• plugins/antispam/filters/class.dc.filter.words.php (modified) (4 diffs)

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

@@ -113 +113 @@
 
           if ($core->auth->isSuperAdmin()) {
-               $res .= '<label class="classic" for="globalsw">'.form::checkbox('globalsw',1).'</label> '.
-               __('Global word (used for all blogs)');
+               $res .= form::checkbox('globalsw',1).
+               '<label class="classic" for="globalsw">'.__('Global word (used for all blogs)').'</label> ';
           }
 
@@ -167 +167 @@
                     }
                }
-               $res .= $res_local.$res_global;
+               $res .= '<div class="local">'.$res_local.'</div>';
+               $res .= '<div class="global">'.$res_global.'</div>';
 
                $res .=
@@ -208 +209 @@
                     "WHERE rule_type = 'word' ".
                     "AND rule_content = '".$this->con->escape($content)."' ";
+          if (!$general) {
+               $strReq .= ' AND blog_id = \''.$this->core->blog->id.'\'';
+          }
           $rs = $this->con->select($strReq);
 
-          if (!$rs->isEmpty()) {
+          if (!$rs->isEmpty() && !$general) {
                throw new Exception(__('This word exists'));
           }
@@ -228 +232 @@
           }
 
-          $cur->insert();
+          if (!$rs->isEmpty() && $general) {
+               $cur->update();
+          } else {
+               $cur->insert();
+          }
      }