Try to tag all the places that need to be fixed (no echoing direct from core). We...

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12525 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/src/compose.php b/src/compose.php
index a81e2e2a7f99cfa6e5fb0d0e81afd5c3db3fb713..4bc00a2fa49e009e8ac8abf00085ebe84ed7d0e9 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -434,6 +434,7 @@ if ($draft) {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
             } else {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/compose.php?saved_draft=yes&session=$composesession");
             } else {

+//FIXME: DON'T ECHO HTML FROM CORE!

                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . '/compose.php?saved_sent=yes&amp;session=' . $composesession . '">'
                     . _("Return") . '</a></div>';
                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . '/compose.php?saved_sent=yes&amp;session=' . $composesession . '">'
                     . _("Return") . '</a></div>';


@@ -444,6 +445,7 @@ if ($draft) {
                 Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
                    "&startMessage=1&note=".urlencode($draft_message));
             } else {
                 Header("Location: $location/right_main.php?mailbox=" . urlencode($draft_folder) .
                    "&startMessage=1&note=".urlencode($draft_message));
             } else {

+//FIXME: DON'T ECHO HTML FROM CORE!

                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . '/right_main.php?mailbox=' . urlencode($draft_folder)
                     . '&amp;startMessage=1&amp;note=' . urlencode($draft_message) .'">'
                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . '/right_main.php?mailbox=' . urlencode($draft_folder)
                     . '&amp;startMessage=1&amp;note=' . urlencode($draft_message) .'">'


@@ -544,6 +546,7 @@ if ($send) {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/compose.php?mail_sent=$mail_sent");
             } else {
             if ( !isset($pageheader_sent) || !$pageheader_sent ) {
                 Header("Location: $location/compose.php?mail_sent=$mail_sent");
             } else {

+//FIXME: DON'T ECHO HTML FROM CORE!

                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . '/compose.php?mail_sent=$mail_sent">'
                     . _("Return") . '</a></div>';
                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . '/compose.php?mail_sent=$mail_sent">'
                     . _("Return") . '</a></div>';


@@ -554,6 +557,7 @@ if ($send) {
                 Header("Location: $location/right_main.php?mailbox=$urlMailbox".
                     "&startMessage=$startMessage&mail_sent=$mail_sent");
             } else {
                 Header("Location: $location/right_main.php?mailbox=$urlMailbox".
                     "&startMessage=$startMessage&mail_sent=$mail_sent");
             } else {

+//FIXME: DON'T ECHO HTML FROM CORE!

                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . "/right_main.php?mailbox=$urlMailbox"
                     . "&amp;startMessage=$startMessage&amp;mail_sent=$mail_sent\">"
                 echo '   <br><br><div style="text-align: center;"><a href="' . $location
                     . "/right_main.php?mailbox=$urlMailbox"
                     . "&amp;startMessage=$startMessage&amp;mail_sent=$mail_sent\">"


@@ -1099,6 +1103,7 @@ function showInputForm ($session, $values=false) {
     }
 
     if ($use_javascript_addr_book) {
     }
 
     if ($use_javascript_addr_book) {

+//FIXME: NO HTML IN CORE!

         echo "\n". '<script type="text/javascript">'."\n<!--\n" .
             'function open_abook() { ' . "\n" .
             '  var nwin = window.open("addrbook_popup.php","abookpopup",' .
         echo "\n". '<script type="text/javascript">'."\n<!--\n" .
             'function open_abook() { ' . "\n" .
             '  var nwin = window.open("addrbook_popup.php","abookpopup",' .


@@ -1109,6 +1114,7 @@ function showInputForm ($session, $values=false) {
             "// -->\n</script>\n\n";
     }
 
             "// -->\n</script>\n\n";
     }
 

+//FIXME: NO HTML IN CORE!

     echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
         'enctype="multipart/form-data"';
 
     echo "\n" . '<form name="compose" action="compose.php" method="post" ' .
         'enctype="multipart/form-data"';
 


@@ -1139,25 +1145,32 @@ function showInputForm ($session, $values=false) {
             $onsubmit_text .= $text;
         }
 
             $onsubmit_text .= $text;
         }
 

+//FIXME: DON'T ECHO HTML FROM CORE!

         echo $onsubmit_text . ' return true;"';
     }
 
 
         echo $onsubmit_text . ' return true;"';
     }
 
 

+//FIXME: NO HTML IN CORE!

     echo ">\n";
 
     echo ">\n";
 

+//FIXME: DON'T ECHO HTML FROM CORE!

     echo addHidden('startMessage', $startMessage);
 
     if ($action == 'draft') {
     echo addHidden('startMessage', $startMessage);
 
     if ($action == 'draft') {

+//FIXME: DON'T ECHO HTML FROM CORE!

         echo addHidden('delete_draft', $passed_id);
     }
     if (isset($delete_draft)) {
         echo addHidden('delete_draft', $passed_id);
     }
     if (isset($delete_draft)) {

+//FIXME: DON'T ECHO HTML FROM CORE!

         echo addHidden('delete_draft', $delete_draft);
     }
     if (isset($session)) {
         echo addHidden('delete_draft', $delete_draft);
     }
     if (isset($session)) {

+//FIXME: DON'T ECHO HTML FROM CORE!

         echo addHidden('session', $session);
     }
 
     if (isset($passed_id)) {
         echo addHidden('session', $session);
     }
 
     if (isset($passed_id)) {

+//FIXME: DON'T ECHO HTML FROM CORE!

         echo addHidden('passed_id', $passed_id);
     }
 
         echo addHidden('passed_id', $passed_id);
     }
 


@@ -1174,6 +1187,7 @@ function showInputForm ($session, $values=false) {
     }
 
     if ($location_of_buttons == 'top') {
     }
 
     if ($location_of_buttons == 'top') {

+//FIXME: DON'T ECHO HTML FROM CORE!

         showComposeButtonRow();
     }
 
         showComposeButtonRow();
     }
 


@@ -1197,6 +1211,7 @@ function showInputForm ($session, $values=false) {
     $oTemplate->display('compose_header.tpl');
 
     if ($location_of_buttons == 'between') {
     $oTemplate->display('compose_header.tpl');
 
     if ($location_of_buttons == 'between') {

+//FIXME: DON'T ECHO HTML FROM CORE!

         showComposeButtonRow();
     }
 
         showComposeButtonRow();
     }
 


@@ -1239,6 +1254,7 @@ function showInputForm ($session, $values=false) {
     $oTemplate->display ('compose_body.tpl');
 
     if ($location_of_buttons == 'bottom') {
     $oTemplate->display ('compose_body.tpl');
 
     if ($location_of_buttons == 'bottom') {

+//FIXME: DON'T ECHO HTML FROM CORE!

         showComposeButtonRow();
     }
 
         showComposeButtonRow();
     }