From 975f298f1182a9dcba556e644c76ce7b62659026 Mon Sep 17 00:00:00 2001
From: pdontthink <pdontthink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Thu, 6 Jul 2017 02:36:51 +0000
Subject: [PATCH] Add newline after <textarea> because it is always removed by
 the browser per spec:
 https://www.w3.org/TR/html401/appendix/notes.html#notes-line-breaks

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@14699 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 src/options_identities.php                     | 2 +-
 templates/default/compose_body.tpl             | 3 ++-
 templates/default/options_advidentity_list.tpl | 3 ++-
 templates/default/textarea.tpl                 | 2 +-
 templates/default_advanced/compose_body.tpl    | 3 ++-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/options_identities.php b/src/options_identities.php
index 6467a0f2..6517349a 100644
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -230,7 +230,7 @@ function sti_textarea( $title, $name, $data, $bgcolor ) {
     $str = '';
     $str .= '<tr' . $bgcolor . ">\n";
     $str .= '  <td style="white-space: nowrap;text-align:right;">' . $title . ' </td>' . "\n";
-    $str .= '  <td> <textarea name="' . $name . '" cols="50" rows="5">'. sm_encode_html_special_chars($data) . '</textarea> </td>' . "\n";
+    $str .= '  <td> <textarea name="' . $name . '" cols="50" rows="5">'. "\n" . sm_encode_html_special_chars($data) . '</textarea> </td>' . "\n";
     $str .= '</tr>';
 
     return $str;
diff --git a/templates/default/compose_body.tpl b/templates/default/compose_body.tpl
index 62940cc4..368b5352 100644
--- a/templates/default/compose_body.tpl
+++ b/templates/default/compose_body.tpl
@@ -26,7 +26,8 @@ extract($t);
 <table cellspacing="0" class="table1">
  <tr>
   <td style="text-align: center">
-   <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>><?php echo $body; ?></textarea>
+   <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>>
+<?php echo $body; ?></textarea>
   </td>
  </tr>
  <?php
diff --git a/templates/default/options_advidentity_list.tpl b/templates/default/options_advidentity_list.tpl
index a239589d..3ed7b709 100644
--- a/templates/default/options_advidentity_list.tpl
+++ b/templates/default/options_advidentity_list.tpl
@@ -82,7 +82,8 @@ extract($t);
       <?php echo _("Signature"); ?>
      </td>
      <td class="fieldValue">
-      <textarea name="newidentities[<?php echo $index; ?>][signature]" cols="50" rows="5"><?php echo $identity['Signature']; ?></textarea>
+      <textarea name="newidentities[<?php echo $index; ?>][signature]" cols="50" rows="5">
+<?php echo $identity['Signature']; ?></textarea>
      </td>
     </tr>
     <?php /* FIXME: No hooks in templates! */ $temp = array('', &$identity['New'], &$index); echo concat_hook_function('options_identities_table', $temp); ?>
diff --git a/templates/default/textarea.tpl b/templates/default/textarea.tpl
index 298492ee..365e3bb4 100644
--- a/templates/default/textarea.tpl
+++ b/templates/default/textarea.tpl
@@ -32,6 +32,6 @@ echo '<textarea name="' . $name . '" rows="' . $rows . '" cols="' . $cols . '"';
 foreach ($aAttribs as $key => $value) {
     echo ' ' . $key . (is_null($value) ? '' : '="' . $value . '"');
 }
-echo '>' . $text . "</textarea>\n";
+echo ">\n" . $text . "</textarea>\n";
 
 
diff --git a/templates/default_advanced/compose_body.tpl b/templates/default_advanced/compose_body.tpl
index c3e0fadb..f0d81601 100644
--- a/templates/default_advanced/compose_body.tpl
+++ b/templates/default_advanced/compose_body.tpl
@@ -26,7 +26,8 @@ extract($t);
 <table cellspacing="0" class="table1">
  <tr>
   <td style="text-align: center">
-   <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>><?php echo $body; ?></textarea>
+   <textarea name="body" id="body" rows="<?php echo $editor_height; ?>" cols="<?php echo $editor_width; ?>" <?php if ($accesskey_compose_body != 'NONE') echo 'accesskey="' . $accesskey_compose_body . '" '; echo $input_onfocus; ?>>
+<?php echo $body; ?></textarea>
 
 <?php if (checkForJavascript()) // Display text area resizing handle
 
-- 
2.25.1