X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=templates%2Fdefault%2Fmessage_list.tpl;h=15b47d174d0b179639b10dd4884eddcec530a763;hp=6e948f5a211e40f6e659d018f89c770e49200982;hb=f2e2aa7f76156e10696874c8e289565e7813c836;hpb=95e203e9d4b206857db76bf951898bb44cb63f0b
diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl
index 6e948f5a..15b47d17 100644
--- a/templates/default/message_list.tpl
+++ b/templates/default/message_list.tpl
@@ -3,7 +3,7 @@
/**
* message_list.tpl
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
+ * Copyright (c) 1999-2005 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Template for viewing a messages list
@@ -12,6 +12,7 @@
* @package squirrelmail
*/
+/** add required includes */
include_once(SM_PATH . 'templates/util_message_list.php');
/* retrieve the template vars */
@@ -196,7 +197,7 @@ else
foreach($aOrder as $iCol) {
?>
-
+
$aMsg) {
echo $sLine;
@@ -285,7 +287,6 @@ else
/**
* Check usage of images for attachments, flags and priority
- * Aaaaaaaaaah fix me. DO NOT USE the string "None" if you mean FALSE, no icon theme
*/
$bIcons = ($use_icons && $icon_theme) ? true : false;
@@ -390,16 +391,19 @@ else
'; $sEnd = '';
- }
- if (in_array('deleted',$aFlags) && $aFlags['deleted']) {
- $sPre = "" . $sPre;
- $sEnd .= '';
- } else {
- if (in_array('flagged',$aFlags) && $aFlags['flagged']) {
- $sPre = "" . $sPre;
+ // make sure that flags column is used by end user
+ if (isset($aFlags)) {
+ if (!in_array('seen',$aFlags)) {
+ $sPre = ''; $sEnd = '';
+ }
+ if (in_array('deleted',$aFlags) && $aFlags['deleted']) {
+ $sPre = "" . $sPre;
$sEnd .= '';
+ } else {
+ if (in_array('flagged',$aFlags) && $aFlags['flagged']) {
+ $sPre = "" . $sPre;
+ $sEnd .= '';
+ }
}
}
/**
@@ -407,14 +411,14 @@ else
* we have to do some php coding to display the columns in the right order
*/
foreach ($aOrder as $iCol) {
- if (in_array($index_order_part, $show_label_columns)) {
+ if (in_array($iCol, $show_label_columns)) {
$sLabelStart = '';
} else {
$sLabelStart = '';
$sLabelEnd = '';
}
- $aCol = (isset($aColumns[$iCol])) ? $aColumns[$iCol] : '';
+ $aCol = (isset($aColumns[$iCol])) ? $aColumns[$iCol] : array();
$title = (isset($aCol['title'])) ? $aCol['title'] : '';
$link = (isset($aCol['link'])) ? $aCol['link'] : '';
$value = (isset($aCol['value'])) ? $aCol['value'] : '';
@@ -426,7 +430,7 @@ else
switch ($iCol) {
case SQM_COL_CHECK:
- echo '
' ?>
+ echo '
' ?>
" id="" value="" />
";
+ $sText = "
";
$sText .= "$value
\n";
echo $sText;
break;
case SQM_COL_INT_DATE:
case SQM_COL_DATE:
- $sText = "