From 2a63a4448567f2fd23abb8fdbe47b69aa9ba0469 Mon Sep 17 00:00:00 2001 From: Ryan Cramer Date: Fri, 19 Apr 2019 09:19:03 -0400 Subject: [PATCH] Minor adjustments --- wire/core/WireMail.php | 1 + wire/core/WireMailTools.php | 4 ++++ .../modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module | 1 + 3 files changed, 6 insertions(+) diff --git a/wire/core/WireMail.php b/wire/core/WireMail.php index 12558282..210d45e9 100644 --- a/wire/core/WireMail.php +++ b/wire/core/WireMail.php @@ -145,6 +145,7 @@ class WireMail extends WireData implements WireMailInterface { * */ protected function sanitizeEmail($email) { + if(!strlen($email)) return ''; $email = strtolower(trim($email)); $clean = $this->wire('sanitizer')->email($email); if($email !== $clean) { diff --git a/wire/core/WireMailTools.php b/wire/core/WireMailTools.php index 6e6d92ae..8ee8f354 100644 --- a/wire/core/WireMailTools.php +++ b/wire/core/WireMailTools.php @@ -446,6 +446,10 @@ class WireMailTools extends Wire { $inBlacklist = false; $tt = $this->wire('sanitizer')->getTextTools(); $email = trim($tt->strtolower($email)); + + if(strpos($email, '@') === false) { + return $options['why'] ? "Invalid email address" : true; + } foreach($blacklist as $line) { $line = $tt->strtolower(trim($line)); diff --git a/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module b/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module index 9cdd3cf8..ddd1d441 100644 --- a/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module +++ b/wire/modules/AdminTheme/AdminThemeUikit/AdminThemeUikit.module @@ -85,6 +85,7 @@ class AdminThemeUikit extends AdminThemeFramework implements Module, Configurabl $this->setClasses(array( 'input' => 'uk-input', + 'input-small' => 'uk-input uk-form-small', 'input-checkbox' => 'uk-checkbox', 'input-radio' => 'uk-radio', 'input-password' => 'uk-input uk-form-width-medium',