diff options
| -rw-r--r-- | it.class | 2 | ||||
| -rw-r--r-- | it_mail.class | 3 |
2 files changed, 3 insertions, 2 deletions
@@ -256,7 +256,7 @@ function bail($message = "Bailed.\n") */ function is_live() { - return (preg_match("/^live/", $GLOBALS['ULTRASERVERTYPE']) || EDC('aslive')) && !EDC('asdevel'); + return (preg_match("/^live/", $GLOBALS['ULTRASERVERTYPE']) || !$GLOBALS['ULTRASERVERTYPE'] || EDC('aslive')) && !EDC('asdevel'); } diff --git a/it_mail.class b/it_mail.class index 0eb7643..0995e49 100644 --- a/it_mail.class +++ b/it_mail.class @@ -32,6 +32,7 @@ define('IT_MAIL_CHECKEMAIL_OK', 10); /** * Construct an email message with headers, body (plaintext and/or HTML) and * send it. Also provides utility function to check email address validity.<br> + * On devel/twin machines, will output mail instead of sending it.<br> * <em>Example:</em><br> * <code><nobr> * if (!it_mail::check_email($to))<br> @@ -285,7 +286,7 @@ function send() $text .= "--$boundary1--\n"; } - $func = EDC('nomail') ? "ED" : "mail"; + $func = it::is_live() ? "mail" : "ED"; return $func($to, $this->header_escape($this->subject), $text, join("\n", $headers), $this->flags); } |