Dominique.Fournier/DomFramework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

mail: change the getMessageID method to provideMessageID

Browse Source 
git-svn-id: https://svn.fournier38.fr/svn/ProgSVN/trunk@3738 bf3deb0d-5f1a-0410-827f-c0cc1f45334c
This commit is contained in:
Dominique Fournier
2017-05-30 18:48:46 +00:00
parent d70014ad3e
commit 2ae8a6dad0
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mail.php
View File

@@ -430,7 +430,7 @@ class mail
throw new \Exception (_("Missing OpenSSL PHP Extension"), 500); throw new \Exception (_("Missing OpenSSL PHP Extension"), 500);
// Define default headers // Define default headers
$this->addHeader ("Date", date ("r")); $this->addHeader ("Date", date ("r"));
$this->addHeader ("Message-ID", $this->getMessageID ()); $this->addHeader ("Message-ID", $this->provideMessageID ());
$user = posix_getpwuid (posix_geteuid()); $user = posix_getpwuid (posix_geteuid());
$this->addHeader ("From", $user["name"]."@".php_uname('n')); $this->addHeader ("From", $user["name"]."@".php_uname('n'));
$this->addHeader ("MIME-Version", "1.0"); $this->addHeader ("MIME-Version", "1.0");
@@ -825,7 +825,7 @@ class mail
strlen ("Content-Disposition: inline; filename=") strlen ("Content-Disposition: inline; filename=")
))."\r\n", ))."\r\n",
$sectionID); $sectionID);
$contentID = $this->getMessageID (); $contentID = $this->provideMessageID ();
$this->addHeader ("Content-ID", "$contentID\r\n", $sectionID); $this->addHeader ("Content-ID", "$contentID\r\n", $sectionID);
} }
$this->addHeader ("Content-Transfer-Encoding", "$encoding\r\n", $sectionID); $this->addHeader ("Content-Transfer-Encoding", "$encoding\r\n", $sectionID);
@@ -1345,7 +1345,7 @@ class mail
/** Create a messageID /** Create a messageID
* @return string the textual MessageID * @return string the textual MessageID
*/ */
public function getMessageID () public function provideMessageID ()
{ {
$data = openssl_random_pseudo_bytes (16); $data = openssl_random_pseudo_bytes (16);
$data[6] = chr(ord($data[6]) & 0x0f | 0x40); // set version to 0010 $data[6] = chr(ord($data[6]) & 0x0f | 0x40); // set version to 0010