X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Ferror_message.tpl;h=640f8645f5006bac2e4b8c6f149c173174eba63a;hp=a87439d08bcbce7facbc9d61c13a2650b9293165;hb=353d074afac6827c90f4bb03e846c5e453d3b5b1;hpb=b80b7b6baf4df064de743044698fa7f003e68f20

diff --git a/templates/default/error_message.tpl b/templates/default/error_message.tpl
index a87439d0..640f8645 100644
--- a/templates/default/error_message.tpl
+++ b/templates/default/error_message.tpl
@@ -3,11 +3,10 @@
 /**
  * error_message.tpl
  *
- * Copyright (c) 1999-2005 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
  * Template for viewing error handler error messages
  *
+ * @copyright 1999-2018 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
  * @subpackage templates
@@ -18,13 +17,14 @@
 
 /* retrieve the template vars */
 extract($t);
+
 if (isset($aErrors) && is_array($aErrors)) {
 ?>
 <div id="error_list">
 <table class="error_table">
   <tr class="error_thead">
     <td class="error_thead_caption" colspan="2">
-       <div class="thead_caption"><?php echo _("SquirrelMail notice messages");?></div>
+       <div class="thead_caption"><?php echo _("SquirrelMail notice messages"); ?></div>
     </td>
   </tr>
 <?php
@@ -32,60 +32,65 @@ if (isset($aErrors) && is_array($aErrors)) {
 ?>
   <tr class="error_row">
     <td class="error_key">
-       <?php echo _("Category")?>:
+       <?php echo _("Category:"); ?>
     </td>
     <td class="error_val">
-       <?php foreach ($aError['category'] as $sCategory) {echo $sCategory;}?>
+       <?php echo join(', ', $aError['category']); ?>
     </td>
   </tr>
   <tr>
      <td class="error_key">
-       <?php echo _("Message")?>:
+       <?php echo _("Message:"); ?>
      </td>
      <td class="error_val">
-       <?php echo $aError['message'];?>
+       <?php echo $aError['message']; ?>
      </td>
   </tr>
 <?php if (isset($aError['extra']) && is_array($aError['extra'])) {
-           foreach ($aError['extra'] as $sKey => $sValue) {?>
+           foreach ($aError['extra'] as $sKey => $sValue) { ?>
   <tr class="error_row">
     <td class="error_key">
-      <?php echo $sKey;?>:
+      <?php echo $sKey; ?>:
     </td>
-    <td>
-      <?php echo $sValue;?>
+    <td class="error_val">
+      <?php echo $sValue; ?>
     </td>
   </tr>
 <?php     } // foreach ($aError['extra'] as sKkey => $sValue)
        }   // isset($aError['extra']) && is_array($aError['extra']))
 ?>
 
-<?php if (isset($aError['tip']) && ($aError['tip'])) {?>
+<?php if (isset($aError['tip']) && ($aError['tip'])) { ?>
   <tr class="error_row">
     <td class="error_key">
-      <?php echo _("Tip");?>:
+      <?php echo _("Tip:"); ?>
     </td>
     <td class="error_val">
-      <?php echo $aError['tip'];?>
+      <?php echo $aError['tip']; ?>
     </td>
   </tr>
 <?php }   // (isset($aError['tip']) && ($aError['tip']))
 ?>
 
-<?php if (isset($aError['link']) && ($aError['link'])) {?>
+<?php if (isset($aError['link']) && ($aError['link'])) { ?>
   <tr class="error_row">
     <td class="error_key">
-      <?php echo _("More info");?>:
+      <?php echo _("More info:"); ?>
     </td>
     <td class="error_val">
-      <?php echo $aError['link'];?>
+      <?php echo $aError['link']; ?>
     </td>
   </tr>
 <?php }   // (isset($aError['link']) && ($aError['link']))
+        ?>
+ <tr class="error_thead">
+   <td class="error_thead_caption" colspan="2">
+   </td>
+ </tr>
+        <?php
     } // foreach($aErrors as $aError)
 ?>
 </table>
 </div>
 <?php
 } // isset($aErrors)
-?>
\ No newline at end of file