removed DEFAULT values for TEXT columns in MySQL sendmailwrapper.messages table

fixes #5

Author: onlime

CHANGELOG.md

@@ -2,11 +2,12 @@
 
 ## 1.0.3 (2019-10-14)
 
-- Fix for PHP setup where extensions are not compiled-in, loaded as modules. Standard php.ini is now loaded.
+- Fix for PHP setup where extensions are not compiled-in, loaded as modules. Standard php.ini is now loaded. fixes #1, #4
 - Code style: replaced traditional syntax array literals
 - Code smells: fixes various minor code smells
 - Pushed minimum required PHP version to 7.2
 - Improved array to object conversion in ConfigLoader by using json_encode/decode trick.
+- Removed DEFAULT values for TEXT columns in MySQL sendmailwrapper.messages table, fixes #5
 
 ## 1.0.2 (2015-11-04)
 

app/SendmailThrottle.php

@@ -212,37 +212,14 @@ protected function _logMessage($throttleId, $username, $rcptCount, $status)
         $stmt->bindParam(':rcptCount' , $rcptCount);
         $stmt->bindParam(':status'    , $status);
         $stmt->bindParam(':msgid'     , $headerArr['x-meta-msgid']);
-        $stmt->bindParam(':fromAddr'  , $this->_mimeHeaderDecode($headerArr['from']));
-        $stmt->bindParam(':toAddr'    , $this->_mimeHeaderDecode($headerArr['to']));
-        $stmt->bindParam(':ccAddr'    , $this->_mimeHeaderDecode($headerArr['cc']));
-        $stmt->bindParam(':bccAddr'   , $this->_mimeHeaderDecode($headerArr['bcc']));
-        $stmt->bindParam(':subject'   , $this->_mimeHeaderDecode($headerArr['subject']));
+        $stmt->bindParam(':fromAddr'  , mb_decode_mimeheader($headerArr['from']));
+        $stmt->bindParam(':toAddr'    , mb_decode_mimeheader($headerArr['to']));
+        $stmt->bindParam(':ccAddr'    , mb_decode_mimeheader($headerArr['cc']));
+        $stmt->bindParam(':bccAddr'   , mb_decode_mimeheader($headerArr['bcc']));
+        $stmt->bindParam(':subject'   , mb_decode_mimeheader($headerArr['subject']));
         $stmt->bindParam(':site'      , $headerArr['x-meta-site']);
         $stmt->bindParam(':client'    , $headerArr['x-meta-client']);
         $stmt->bindParam(':script'    , $headerArr['x-meta-script']);
         $stmt->execute();
     }
-
-    /**
-     * Decode MIME header elements
-     *
-     * @param string $header
-     * @return string
-     */
-    protected function _mimeHeaderDecode($header)
-    {
-        return mb_decode_mimeheader($header);
-        //return iconv_mime_decode($header, 0, 'UTF-8');
-
-        /*
-        $utf8Header = imap_utf8($header);
-        $decoded = imap_mime_header_decode($utf8Header);
-        if (isset($decoded[0])) {
-            $decodedObj = $decoded[0];
-            return $decodedObj->text;
-        } else {
-            return $utf8Header;
-        }
-        */
-    }
 }

schema/schema.mysql.sql

@@ -42,9 +42,9 @@ CREATE TABLE IF NOT EXISTS `sendmailwrapper`.`messages` (
   `status` INT NOT NULL DEFAULT 0 COMMENT 'throttle status code (exit code)',
   `msgid` VARCHAR(255) NULL COMMENT 'sendmail-wrapper message ID',
   `from_addr` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'from address',
-  `to_addr` TEXT NOT NULL DEFAULT '' COMMENT 'to address(es)',
-  `cc_addr` TEXT NOT NULL DEFAULT '' COMMENT 'Cc address(es)',
-  `bcc_addr` TEXT NOT NULL DEFAULT '' COMMENT 'Bcc address(es)',
+  `to_addr` TEXT NOT NULL COMMENT 'to address(es)',
+  `cc_addr` TEXT NOT NULL COMMENT 'Cc address(es)',
+  `bcc_addr` TEXT NOT NULL COMMENT 'Bcc address(es)',
   `subject` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'email subject',
   `site` VARCHAR(255) NOT NULL DEFAULT '' COMMENT 'site where this email was sent from',
   `client` VARCHAR(40) NULL COMMENT 'client IP that invoked the email generation',