projects
/
php-utility-classes.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
0c81b5b
)
boundary should 1) be more random, 2) be preceded by a linebreak
author
robert
<robert>
Fri, 5 Dec 2003 16:43:59 +0000
(16:43 +0000)
committer
robert
<robert>
Fri, 5 Dec 2003 16:43:59 +0000
(16:43 +0000)
include/classes/email.php-class
patch
|
blob
|
blame
|
history
diff --git
a/include/classes/email.php-class
b/include/classes/email.php-class
index 0ea1698b3a5fc26ab18f8def1e84915e1498d5c8..9e5adba9a2ba91a53a01bc9b8e371c86492fa36b 100755
(executable)
--- a/
include/classes/email.php-class
+++ b/
include/classes/email.php-class
@@
-177,13
+177,20
@@
class email {
}
}
if (count($this->attachments)) {
}
}
if (count($this->attachments)) {
- $boundary = "KaiRoJVPSteyr1030713";
+ // create random boundary, 20 chars, always beginning with KaiRo ;-)
+ $boundary = 'KaiRo';
+ for ($i=1; $i<=15; $i++) {
+ $r=rand(0,61);
+ if ($r<10) { $boundary .= chr($r+48); }
+ elseif ($r<36) { $boundary .= chr($r+55); }
+ elseif ($r<62) { $boundary .= chr($r+61); }
+ }
$hdrs .= "Content-Type: multipart/mixed; boundary=\"$boundary\";\n";
$hdrs .= "Content-Transfer-Encoding: 7bit\n";
$mtxt .= "This part of the E-mail should never be seen. If\n";
$mtxt .= "you are reading this, consider upgrading your e-mail\n";
$mtxt .= "client to a MIME-compatible client.\n";
$hdrs .= "Content-Type: multipart/mixed; boundary=\"$boundary\";\n";
$hdrs .= "Content-Transfer-Encoding: 7bit\n";
$mtxt .= "This part of the E-mail should never be seen. If\n";
$mtxt .= "you are reading this, consider upgrading your e-mail\n";
$mtxt .= "client to a MIME-compatible client.\n";
- $mtxt .= "--$boundary\n";
+ $mtxt .= "
\n
--$boundary\n";
if (ereg("text/.*", $this->content_type)) {
$mtxt .= "Content-Type: ".$this->content_type."; charset=\"".$this->charset."\"\n";
}
if (ereg("text/.*", $this->content_type)) {
$mtxt .= "Content-Type: ".$this->content_type."; charset=\"".$this->charset."\"\n";
}
@@
-204,7
+211,7
@@
class email {
$mtxt .= stripslashes($this->mailtext);
if (count($this->attachments)) {
foreach ($this->attachments as $attach) {
$mtxt .= stripslashes($this->mailtext);
if (count($this->attachments)) {
foreach ($this->attachments as $attach) {
- $mtxt .= "--$boundary\n";
+ $mtxt .= "
\n
--$boundary\n";
$mtxt .= "Content-Type: ".$attach["type"]."; name=\"".$attach["name"]."\";\n";
$mtxt .= "Content-Transfer-Encoding: base64\n";
$mtxt .= "Content-Disposition: attachment\n\n";
$mtxt .= "Content-Type: ".$attach["type"]."; name=\"".$attach["name"]."\";\n";
$mtxt .= "Content-Transfer-Encoding: base64\n";
$mtxt .= "Content-Disposition: attachment\n\n";