From 653a7e8738ce74830826c25771c1d8938106da96 Mon Sep 17 00:00:00 2001
From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 1 Apr 2012 22:18:51 +0000
Subject: [PATCH] Fix E_STRICT notices

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14312 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 class/deliver/Deliver.class.php          | 14 ++++++++++++--
 class/deliver/Deliver_SendMail.class.php |  4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/class/deliver/Deliver.class.php b/class/deliver/Deliver.class.php
index 5fbba83b..88b99f63 100644
--- a/class/deliver/Deliver.class.php
+++ b/class/deliver/Deliver.class.php
@@ -437,16 +437,26 @@ class Deliver {
      *
      * This function is not yet implemented.
      * Reserved for extended functionality.
+     * UPDATE: It is implemented in Deliver_SMTP and Deliver_SendMail classes,
+     *         but it remains unimplemented in this base class (and thus not
+     *         in Deliver_IMAP or other child classes that don't define it)
+     *
+     * NOTE: some parameters are specific to the child class
+     *       that is implementing this method
      *
      * @param Message $message  Message object
+     * @param string  $domain
+     * @param integer $length
      * @param string  $host     host name or IP to connect to
+     * @param integer $port
      * @param string  $user     username to log into the SMTP server with
      * @param string  $pass     password to log into the SMTP server with
-     * @param integer $length
+     * @param boolean $authpop  whether or not to use POP-before-SMTP authorization
+     * @param string  $pop_host host name or IP to connect to for POP-before-SMTP authorization
      *
      * @return handle $stream file handle resource to SMTP stream
      */
-    function initStream($message, $length=0, $host='', $port='', $user='', $pass='') {
+    function initStream($message, $domain, $length=0, $host='', $port='', $user='', $pass='', $authpop=false, $pop_host='') {
         return $stream;
     }
 
diff --git a/class/deliver/Deliver_SendMail.class.php b/class/deliver/Deliver_SendMail.class.php
index 5e4e6a2b..e0f1aecf 100644
--- a/class/deliver/Deliver_SendMail.class.php
+++ b/class/deliver/Deliver_SendMail.class.php
@@ -86,10 +86,12 @@ class Deliver_SendMail extends Deliver {
     *
     * @param Message $message Message object containing the from address
     * @param string $sendmail_path Location of sendmail binary
+    * @param mixed $ignore Seven extra arguments that the parent class
+    *                      requires which are not used here
     * @return resource
     * @access public
     */
-    function initStream($message, $sendmail_path) {
+    function initStream($message, $sendmail_path, $ignore=0, $ignore='', $ignore='', $ignore='', $ignore='', $ignore=false, $ignore='') {
         $rfc822_header = $message->rfc822_header;
         $from = $rfc822_header->from[0];
         $envelopefrom = trim($from->mailbox.'@'.$from->host);
-- 
2.25.1