Changeset 2986:1e5a2d6a0074

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.

Files:

• features/bootstrap/DbContext.php (modified) (3 diffs)
• features/bootstrap/FeatureContext.php (modified) (1 diff)
• features/plugins/antispam.feature (added)
• features/sql/db_cleanup.sql (modified) (1 diff)
• plugins/antispam/filters/class.dc.filter.words.php (modified) (4 diffs)

features/bootstrap/DbContext.php

@@ -46 +46 @@
     }
 
+    /**
+     * @Given /^a blog:$/
+     */
+    public function aBlog(TableNode $table) {
+        foreach ($table->getHash() as $blog) {
+            $this->last_id = self::addBlog($blog);
+        }
+    }
+
     /*
     /* ORM methods
@@ -85 +94 @@
         }
         self::executeSqlFile($parameters['sql_cleanup_file'], $replace_user_id);
-   }
+    }
 
     private function addUser(array $params) {
@@ -100 +109 @@
             $user->user_super = 1;
             $user->insert();
+        }
+    }
+
+    private function addBlog(array $params) {
+        self::getConnection($this->parameters);
+        if (empty($params['blog_id']) || empty($params['blog_name']) || empty($params['blog_url'])) {
+            throw new Exception('blog_id, blog_name and blog_url for blog are mandatory'."\n");
+        }
+
+        $strReq = 'SELECT count(1) FROM '.self::$prefix.'blog';
+        $strReq .= ' WHERE blog_id = \''.self::$con->escape($params['blog_id']).'\'';
+        if ((int) self::$con->select($strReq)->f(0)==0) {
+            $blog = self::$con->openCursor(self::$prefix . 'blog');
+            $blog->blog_id = $params['blog_id'];
+            $blog->blog_name = $params['blog_name'];
+            $blog->blog_url = $params['blog_url'];
+            $blog->blog_creadt = date('Y-m-d H:i:s');
+            $blog->blog_upddt = date('Y-m-d H:i:s');
+            $blog->blog_uid = md5(uniqid());
+            $blog->insert();
         }
     }

features/bootstrap/FeatureContext.php

@@ -62 +62 @@
         $this->getMink()->assertSession()->cookieExists($session_name);
     }
+
+    /**
+     * @When /^I switch to blog "([^"]*)"$/
+     */
+    public function iSwitchToBlog($blog_name) {
+        $this->selectOption('switchblog', $blog_name);
+        $this->pressButton('ok');
+    }
 }

features/sql/db_cleanup.sql

@@ -1 +1 @@
 DELETE FROM dc_user WHERE user_id != '__USER_ID__';
+DELETE FROM dc_spamrule;
+DELETE FROM dc_blog WHERE blog_id!='default';

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();
+          }
      }