diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php index b749f912..34feeb32 100644 --- a/adminer/include/functions.inc.php +++ b/adminer/include/functions.inc.php @@ -730,7 +730,7 @@ function password_file() { * @param string * @return bool */ -function is_email($email) { +function is_mail($email) { $atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name $domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component $pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain"; diff --git a/adminer/select.inc.php b/adminer/select.inc.php index 079c1d33..363ef22a 100644 --- a/adminer/select.inc.php +++ b/adminer/select.inc.php @@ -279,7 +279,7 @@ if (!$columns) { if (isset($names[$key])) { $field = $fields[$key]; if ($val != "" && (!isset($email_fields[$key]) || $email_fields[$key] != "")) { - $email_fields[$key] = (is_email($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages + $email_fields[$key] = (is_mail($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages } $link = ""; $val = $adminer->editVal($val, $field); @@ -322,7 +322,7 @@ if (!$columns) { } } if (!$link) { - if (is_email($val)) { + if (is_mail($val)) { $link = "mailto:$val"; } if ($protocol = is_url($row[$key])) { diff --git a/editor/include/adminer.inc.php b/editor/include/adminer.inc.php index 92249fd2..8c8d990d 100644 --- a/editor/include/adminer.inc.php +++ b/editor/include/adminer.inc.php @@ -358,7 +358,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5 $replace['{$' . "$val}"] = $this->editVal($row[$val], $fields[$val]); } $email = $row[$_POST["email_field"]]; - if (is_email($email) && send_email($email, strtr($subject, $replace), strtr($message, $replace), $_POST["email_from"], $_FILES["email_files"])) { + if (is_mail($email) && send_mail($email, strtr($subject, $replace), strtr($message, $replace), $_POST["email_from"], $_FILES["email_files"])) { $sent++; } } diff --git a/editor/include/editing.inc.php b/editor/include/editing.inc.php index 58fedbb5..45d12d40 100644 --- a/editor/include/editing.inc.php +++ b/editor/include/editing.inc.php @@ -16,7 +16,7 @@ function email_header($header) { * @param array * @return */ -function send_email($email, $subject, $message, $from = "", $files = array()) { +function send_mail($email, $subject, $message, $from = "", $files = array()) { $eol = (strncasecmp(PHP_OS, "win", 3) ? "\n" : "\r\n"); // PHP_EOL available since PHP 4.3.10 and 5.0.2 $message = str_replace("\n", $eol, wordwrap(str_replace("\r", "", "$message\n"))); $boundary = uniqid("boundary");