Incorporate review changes

2 files changed, 29 insertions, 46 deletions

diff --git a/lib/private/mail/mailer.php b/lib/private/mail/mailer.php
index ff4b0a0ef62..92e6b91ce1c 100644
--- a/lib/private/mail/mailer.php
+++ b/lib/private/mail/mailer.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Copyright (c) 2014 Lukas Reschke <lukas@owncloud.com>
+ * Copyright (c) 2014-2015 Lukas Reschke <lukas@owncloud.com>
  * This file is licensed under the Affero General Public License version 3 or
  * later.
  * See the COPYING-README file.
@@ -78,6 +78,34 @@ class Mailer implements IMailer {
 	}
 
 	/**
+	 * Checks if an e-mail address is valid
+	 *
+	 * @param string $email Email address to be validated
+	 * @return bool True if the mail address is valid, false otherwise
+	 */
+	public function validateMailAddress($email) {
+		return \Swift_Validate::email($this->convertEmail($email));
+	}
+
+	/**
+	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
+	 *
+	 * FIXME: Remove this once SwiftMailer supports IDN
+	 *
+	 * @param string $email
+	 * @return string Converted mail address if `idn_to_ascii` exists
+	 */
+	protected function convertEmail($email) {
+		if (!function_exists('idn_to_ascii') || strpos($email, '@') === false) {
+			return $email;
+		}
+
+		list($name, $domain) = explode('@', $email, 2);
+		$domain = idn_to_ascii($domain);
+		return $name.'@'.$domain;
+	}
+
+	/**
 	 * Returns whatever transport is configured within the config
 	 *
 	 * @return \Swift_SmtpTransport|\Swift_SendmailTransport|\Swift_MailTransport
diff --git a/lib/private/mail/util.php b/lib/private/mail/util.php
deleted file mode 100644
index b301e79d492..00000000000
--- a/lib/private/mail/util.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Copyright (c) 2014-2015 Lukas Reschke <lukas@owncloud.com>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-namespace OC\Mail;
-
-/**
- * Class Util
- *
- * @package OC\Mail
- */
-class Util {
-	/**
-	 * Checks if an e-mail address is valid
-	 *
-	 * @param string $email Email address to be validated
-	 * @return bool True if the mail address is valid, false otherwise
-	 */
-	public static function validateMailAddress($email) {
-		return \Swift_Validate::email(self::convertEmail($email));
-	}
-
-	/**
-	 * SwiftMailer does currently not work with IDN domains, this function therefore converts the domains
-	 *
-	 * FIXME: Remove this once SwiftMailer supports IDN
-	 *
-	 * @param string $email
-	 * @return string Converted mail address if `idn_to_ascii` exists
-	 */
-	protected static function convertEmail($email) {
-		if (!function_exists('idn_to_ascii') || strpos($email, '@') === false) {
-			return $email;
-		}
-
-		list($name, $domain) = explode('@', $email, 2);
-		$domain = idn_to_ascii($domain);
-		return $name.'@'.$domain;
-	}
-
-}