Changeset 1468:3132a0aca046 for plugins/antispam

Timestamp:

08/19/13 09:55:29 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Parents:

1466:e67efe636ce1 (diff), 1467:917fc08f3a59 (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:

Merge 2.5 commits into default branch (should be verified)

Files:

• plugins/antispam/filters/class.dc.filter.iplookup.php (modified) (1 diff)
• plugins/antispam/filters/class.dc.filter.iplookup.php (modified) (1 diff)

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

@@ -44 +44 @@
           }
 
-          $match = array();
-
           $bls = $this->getServers();
           $bls = preg_split('/\s*,\s*/',$bls);
 
-          foreach ($bls as $bl)
-          {
+          foreach ($bls as $bl) {
                if ($this->dnsblLookup($ip,$bl)) {
-                    $match[] = $bl;
+                    // Pass by reference $status to contain matching DNSBL
+                    $status = $bl;
+                    return true;
                }
-          }
-
-          if (!empty($match)) {
-               $status = substr(implode(', ',$match),0,128);
-               return true;
           }
      }

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

@@ -78 +78 @@
           '<form action="'.html::escapeURL($url).'" method="post">'.
           '<fieldset><legend>' . __('IP Lookup servers') . '</legend>'.
-          '<p><label for="bls">'.__('Add here a coma separated list of servers.').
+          '<p><label for="bls">'.__('Add here a coma separated list of servers.').'</label>'.
           form::textarea('bls',40,3,html::escapeHTML($bls),'maximal').
           '</p>'.
-          '<p><input type="submit" value="'.__('Save').'" /></label></p>'.
+          '<p><input type="submit" value="'.__('Save').'" /></p>'.
           $this->core->formNonce().'</p>'.
           '</fieldset>'.