From 390a2a8624b71be7d598b945452fc6e0000f3df5 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@pobox.com>
Date: Fri, 23 Apr 2010 07:17:52 -0700
Subject: Fix for Blacklist plugin: was saving an empty entry if blacklist was
 empty, which would match *all* possible nickname registrations, preventing
 all registration on mozilla.status.net. Now saving only non-empty lines, and
 only matching non-empty lines so we don't fail if we still have a bogus
 entry.

---
 plugins/Blacklist/BlacklistPlugin.php     |  4 ++--
 plugins/Blacklist/blacklistadminpanel.php | 29 ++++++++++++++---------------
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'plugins')

diff --git a/plugins/Blacklist/BlacklistPlugin.php b/plugins/Blacklist/BlacklistPlugin.php
index adc4d9d7e..63bffe2c6 100644
--- a/plugins/Blacklist/BlacklistPlugin.php
+++ b/plugins/Blacklist/BlacklistPlugin.php
@@ -262,7 +262,7 @@ class BlacklistPlugin extends Plugin
         $patterns = $this->_getUrlPatterns();
 
         foreach ($patterns as $pattern) {
-            if (preg_match("/$pattern/", $url)) {
+            if ($pattern != '' && preg_match("/$pattern/", $url)) {
                 return false;
             }
         }
@@ -285,7 +285,7 @@ class BlacklistPlugin extends Plugin
         $patterns = $this->_getNicknamePatterns();
 
         foreach ($patterns as $pattern) {
-            if (preg_match("/$pattern/", $nickname)) {
+            if ($pattern != '' && preg_match("/$pattern/", $nickname)) {
                 return false;
             }
         }
diff --git a/plugins/Blacklist/blacklistadminpanel.php b/plugins/Blacklist/blacklistadminpanel.php
index b996aba8d..23c503cd8 100644
--- a/plugins/Blacklist/blacklistadminpanel.php
+++ b/plugins/Blacklist/blacklistadminpanel.php
@@ -88,28 +88,27 @@ class BlacklistadminpanelAction extends AdminPanelAction
 
     function saveSettings()
     {
-        $nickPatterns = array();
-
-        $rawNickPatterns = explode("\n", $this->trimmed('blacklist-nicknames'));
-
-        foreach ($rawNickPatterns as $raw) {
-            $nickPatterns[] = trim($raw);
-        }
-
+        $nickPatterns = $this->splitPatterns($this->trimmed('blacklist-nicknames'));
         Nickname_blacklist::saveNew($nickPatterns);
 
-        $rawUrlPatterns = explode("\n", $this->trimmed('blacklist-urls'));
-        $urlPatterns  = array();
-
-        foreach ($rawUrlPatterns as $raw) {
-            $urlPatterns[] = trim($raw);
-        }
-
+        $urlPatterns = $this->splitPatterns($this->trimmed('url-nicknames'));
         Homepage_blacklist::saveNew($urlPatterns);
 
         return;
     }
 
+    protected function splitPatterns($text)
+    {
+        $patterns = array();
+        foreach (explode("\n", $text) as $raw) {
+            $trimmed = trim($raw);
+            if ($trimmed != '') {
+                $patterns[] = $trimmed;
+            }
+        }
+        return $patterns;
+    }
+
     /**
      * Validate the values
      *
-- 
cgit v1.2.3-54-g00ecf