Merge branch 'master' of https://github.com/phpList/phplist3 into release-3.5.9

Author: marianaballa

README.md

@@ -5,7 +5,7 @@
 
 #
 [![Build Status](https://travis-ci.com/phpList/phplist3.svg?branch=master)](https://travis-ci.com/phpList/phplist3)
-[![Stable release](https://img.shields.io/badge/stable-3.5.6-blue.svg)](https://sourceforge.net/projects/phplist/files/phplist/)
+[![Stable release](https://img.shields.io/badge/stable-3.5.9-blue.svg)](https://sourceforge.net/projects/phplist/files/phplist/)
 [![License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
 <a href="http://translate.phplist.org/engage/phplist/?utm_source=widget">
 <img src="http://translate.phplist.org/widgets/phplist/-/svg-badge.svg" alt="Translation status" />

public_html/lists/admin/defaultplugin.php

@@ -1086,6 +1086,16 @@ public function validateEmailAddress($emailAddress)
         return true;
     }
 
+    /**
+      * isBlacklistedEmail
+      * @param string $emailaddress
+      * @return bool true if email address should is considered blacklisted
+     */
+    public function isBlackListedEmail($email = '') 
+    {
+        return false;
+    }
+
     /**
      * Allow additional processing of a link click.
      *

public_html/lists/admin/importadmin.php

@@ -264,7 +264,7 @@
                             }
 
                             Sql_query(sprintf('replace into %s (adminattributeid,adminid,value) values("%s","%s","%s")',
-                                $tables['admin_attribute'], $attribute_index, $adminid, $att_value));
+                                $tables['admin_attribute'], $attribute_index, $adminid, sql_escape($att_value)));
                         }
                     }
 

public_html/lists/admin/inc/userlib.php

@@ -509,7 +509,19 @@ function isBlackListed($email = '', $immediate = true)
     $req = Sql_Query(sprintf('select * from %s where email = "%s" and date_add(added,interval %d minute) < now()',
         $GLOBALS['tables']['user_blacklist'], sql_escape($email), $gracetime));
 
-    return Sql_Affected_Rows();
+    $isBlackListed = Sql_Affected_Rows();
+    ## ask plugins as well
+    if (!$isBlackListed) {
+        if (isset($GLOBALS['plugins']) && is_array($GLOBALS['plugins'])) {
+            foreach ($GLOBALS['plugins'] as $pluginname => $plugin) {
+                if (method_exists($plugin, "isBlacklistedEmail")) {
+                    $isBlackListed = $plugin->isBlacklistedEmail($email);
+                }
+                if ($isBlackListed) break;
+            }
+        }
+    }
+    return $isBlackListed;
 }
 
 /**

public_html/lists/admin/index.php

@@ -525,22 +525,22 @@ function mb_strtolower($string)
     }
 
  #   if (!DEVVERSION) { ## why not, quite useful to see
-
+    if (ALLOW_UPDATER) {
         $updaterdir = __DIR__ . '/../updater';
 
         include 'updateLib.php';
         $updateNotif = checkForUpdate();
         $moreInfo = ' <ul><li><a href="https://www.phplist.com/download?utm_source=pl' . VERSION . '&amp;utm_medium=updatedownload&amp;utm_campaign=phpList" title="' . s('Download the new version') . '" target="_blank">' . s('Download the new version') . '</a></li>';
 
-        if (file_exists($updaterdir) && ALLOW_UPDATER) {
+        if (file_exists($updaterdir)) {
             $moreInfo .= '<li>'.s('or use the %sphpList Updater%s','<a href="?page=update" title="' . s('automatic updater') . '">','</a>');
         }
         $moreInfo .= '</ul>';
 
         if ($updateNotif !== '') {
             Info($updateNotif . '' . $moreInfo);
         }
-
+    }
 #   }
 
     if (version_compare(PHP_VERSION, '5.3.3', '<') && WARN_ABOUT_PHP_SETTINGS) {