Required Param Not Allowed After Optional (Part 2)

Whoever wrote this thought PHP worked in a way which it does not.
I'm not changing any parameter order, for backward compatibility...
...for now.

class/deliver/Deliver.class.php

@@ -165,7 +165,7 @@ class Deliver {
      *
      */
     function send_mail($message, $header, $boundary, $stream=false, 
-                       &$raw_length, $extra=NULL) {
+                       &$raw_length=0, $extra=NULL) {
 
 
         if ($stream) {

class/deliver/Deliver_IMAP.class.php

@@ -52,7 +52,7 @@ class Deliver_IMAP extends Deliver {
      *
      */
     function send_mail($message, $header, $boundary, $stream=false, 
-                       &$raw_length, $folder=NULL) {
+                       &$raw_length=0, $folder=NULL) {
 
         if (is_null($folder))
             die('Internal error. Cannot pass NULL folder name to Deliver_IMAP::send_mail()');

class/deliver/Deliver_SMTP.class.php

@@ -528,7 +528,7 @@ class Deliver_SMTP extends Deliver {
         return true;
     }
 
-    function authPop($pop_server='', $pop_port='', $user, $pass) {
+    function authPop($pop_server='', $pop_port='', $user='', $pass='') {
         if (!$pop_port) {
             $pop_port = 110;
         }

src/compose.php

@@ -1204,17 +1204,19 @@ function getAttachments($message, &$composeMessage, $passed_id, $entities, $imap
 }
 
 function getMessage_RFC822_Attachment($message, $composeMessage, $passed_id,
-        $passed_ent_id='', $imapConnection) {
-    if (!$passed_ent_id) {
-        $body_a = sqimap_run_command($imapConnection,
-                'FETCH '.$passed_id.' RFC822',
-                TRUE, $response, $readmessage,
-                TRUE);
-    } else {
-        $body_a = sqimap_run_command($imapConnection,
-                'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
-                TRUE, $response, $readmessage, TRUE);
-        $message = $message->parent;
+        $passed_ent_id='', $imapConnection=null) {
+    if ($imapConnection) {
+        if (!$passed_ent_id) {
+            $body_a = sqimap_run_command($imapConnection,
+                    'FETCH '.$passed_id.' RFC822',
+                    TRUE, $response, $readmessage,
+                    TRUE);
+        } else {
+            $body_a = sqimap_run_command($imapConnection,
+                    'FETCH '.$passed_id.' BODY['.$passed_ent_id.']',
+                    TRUE, $response, $readmessage, TRUE);
+            $message = $message->parent;
+        }
     }
     if ($response == 'OK') {
         $subject = encodeHeader($message->rfc822_header->subject);