SF.net SVN: squirrelmail:[14311] branches/SM-1_4-STABLE/squirrelmail/class/ deliver

Revision: 14311
          http://squirrelmail.svn.sourceforge.net/squirrelmail/?rev=14311&view=rev
Author:   pdontthink
Date:     2012-04-01 22:09:14 +0000 (Sun, 01 Apr 2012)
Log Message:
-----------
Fix E_STRICT notices

Modified Paths:
--------------
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
    branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2012-04-01 21:28:13
UTC (rev 14310)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver.class.php	2012-04-01 22:09:14
UTC (rev 14311)
 <at>  <at>  -433,16 +433,26  <at>  <at> 
      *
      * 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
+     *
      *  <at> param Message $message  Message object
+     *  <at> param string  $domain
+     *  <at> param integer $length
      *  <at> param string  $host     host name or IP to connect to
+     *  <at> param integer $port
      *  <at> param string  $user     username to log into the SMTP server with
      *  <at> param string  $pass     password to log into the SMTP server with
-     *  <at> param integer $length
+     *  <at> param boolean $authpop  whether or not to use POP-before-SMTP authorization
+     *  <at> param string  $pop_host host name or IP to connect to for POP-before-SMTP authorization
      *
      *  <at> 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;
     }

Modified: branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php
===================================================================
--- branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php	2012-04-01
21:28:13 UTC (rev 14310)
+++ branches/SM-1_4-STABLE/squirrelmail/class/deliver/Deliver_SendMail.class.php	2012-04-01
22:09:14 UTC (rev 14311)
 <at>  <at>  -84,10 +84,12  <at>  <at> 
     *
     *  <at> param Message $message Message object containing the from address
     *  <at> param string $sendmail_path Location of sendmail binary
+    *  <at> param mixed $ignore Seven extra arguments that the parent class
+    *                      requires which are not used here
     *  <at> return void
     *  <at> 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.' <at> '.$from->host);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open
Source development site.

------------------------------------------------------------------------------
This SF email is sponsosred by:
Try Windows Azure free for 90 days Click Here 
http://p.sf.net/sfu/sfd2d-msazure
-----
squirrelmail-cvs mailing list
List address: squirrelmail-cvs@...
List info (subscribe/unsubscribe/change options): https://lists.sourceforge.net/lists/listinfo/squirrelmail-cvs
Repository: http://squirrelmail.org/svn