SOURCES: php-mail.patch - make warning message more self explanatory

glen glen at pld-linux.org
Sat Jun 10 22:05:50 CEST 2006


Author: glen                         Date: Sat Jun 10 20:05:50 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- make warning message more self explanatory

---- Files affected:
SOURCES:
   php-mail.patch (1.11 -> 1.12) 

---- Diffs:

================================================================
Index: SOURCES/php-mail.patch
diff -u SOURCES/php-mail.patch:1.11 SOURCES/php-mail.patch:1.12
--- SOURCES/php-mail.patch:1.11	Wed Jun  7 16:51:04 2006
+++ SOURCES/php-mail.patch	Sat Jun 10 22:05:45 2006
@@ -25,29 +25,29 @@
  
 +    /* check for spam attempts with buggy webforms */
 +    if (strchr(to, '\n') != NULL || strchr(to, '\r') != NULL) {
-+        zend_error(E_WARNING, "Newlines aren't allowed in the To header.");
++        zend_error(E_WARNING, "Newlines aren't allowed in the To header. Mail not sent.");
 +        RETURN_FALSE;
 +    }
 +
 +    if (strchr(subject, '\n') != NULL || strchr(subject, '\r') != NULL) {
-+        zend_error(E_WARNING, "Newlines aren't allowed in the Subject header.");
++        zend_error(E_WARNING, "Newlines aren't allowed in the Subject header. Mail not sent.");
 +        RETURN_FALSE;
 +    }
 +
 +    /* search for to, cc or bcc headers */
 +    if (headers != NULL) {
 +        if (strncasecmp(headers, "to:", sizeof("to:") - 1) == 0 || strcasestr(headers, "\nto:")) {
-+            zend_error(E_WARNING, "To: headers aren't allowed in the headers parameter.");
++            zend_error(E_WARNING, "To: headers aren't allowed in the additional_headers parameter. Mail not sent.");
 +            RETURN_FALSE;
 +        }
 +
 +        if (strncasecmp(headers, "cc:", sizeof("cc:") - 1) == 0 || strcasestr(headers, "\ncc:")) {
-+            zend_error(E_WARNING, "CC: headers aren't allowed in the headers parameter.");
++            zend_error(E_WARNING, "CC: headers aren't allowed in the additional_headers parameter. Mail not sent.");
 +            RETURN_FALSE;
 +        }
 +
 +        if (strncasecmp(headers, "bcc:", sizeof("bcc:") - 1) == 0 || strcasestr(headers, "\nbcc:")) {
-+            zend_error(E_WARNING, "BCC: headers aren't allowed in the headers parameter.");
++            zend_error(E_WARNING, "BCC: headers aren't allowed in the additional_headers parameter. Mail not sent.");
 +            RETURN_FALSE;
 +        }
 +    }
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/php-mail.patch?r1=1.11&r2=1.12&f=u



More information about the pld-cvs-commit mailing list