phpdocumentor preparation and a few corrections to earlier phpdocumentor work

[squirrelmail.git] / src / compose.php

diff --git a/src/compose.php b/src/compose.php
index 8f7393ccd7e66379d3b8182ed99d4c8f834720b7..466bbfa1337289a113a9fe2645980cfd82a31a2c 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -15,9 +15,10 @@
  *    - Save As Draft
  *
  * $Id$
+ * @package squirrelmail
  */
 
-/* Path for SquirrelMail required files. */
+/** Path for SquirrelMail required files. */
 define('SM_PATH','../');
 
 /* SquirrelMail required files. */
@@ -73,7 +74,7 @@ sqgetGlobalVar('draft_id',$draft_id);
 sqgetGlobalVar('ent_num',$ent_num);
 sqgetGlobalVar('saved_draft',$saved_draft);
 sqgetGlobalVar('delete_draft',$delete_draft);
-sqgetGlobalVar('startmessage',$startMessage);
+sqgetGlobalVar('startMessage',$startMessage);
 
 /** POST VARS */
 sqgetGlobalVar('sigappend',             $sigappend,             SQ_POST);
@@ -620,7 +621,12 @@ function newMail ($mailbox='', $passed_id='', $passed_ent_id='', $action='', $se
                 }
             }
            
-           $actual = $body_part_entity->header->parameters['charset'];
+           if (isset($body_part_entity->header->parameters['charset'])) {
+            $actual = $body_part_entity->header->parameters['charset'];
+        } else {
+            $actual = 'us-ascii';
+        }
+
            if ( $actual && is_conversion_safe($actual) && $actual != $default_charset){
                $bodypart = charset_decode($actual,$bodypart);
            }