* $Id$
*/
-require_once('../functions/strings.php');
-require_once('../functions/html.php');
-require_once('../class/html.class.php');
-require_once('../functions/imap_mailbox.php');
+require_once(SM_PATH . 'functions/strings.php');
+require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'class/html.class.php');
+require_once(SM_PATH . 'functions/imap_mailbox.php');
/* Default value for page_selector_max. */
define('PG_SEL_MAX', 10);
$row->class = 'm_r';
$row->id = 'mr'.$t;
-
+ $col = 0;
if (sizeof($index_order)){
foreach ($index_order as $index_order_part) {
switch ($index_order_part) {
"<input type=checkbox name=\"msg[$t]\" value=\"".$msg['ID']."\"$checked>",
'center',
$hlt_color );
+ ++$col;
break;
case 2: /* from */
echo html_tag( 'td',
$fontstr_end . $flag_end . $bold_end . $italic_end,
'left',
$hlt_color );
+ ++$col;
break;
case 3: /* date */
echo html_tag( 'td',
'center',
$hlt_color,
'nowrap' );
+ ++$col;
break;
case 4: /* subject */
$td_str = $bold;
}
$td_str .= ">$flag$subject$flag_end</a>$bold_end";
echo html_tag( 'td', $td_str, 'left', $hlt_color );
+ ++$col;
break;
case 5: /* flags */
$stuff = false;
'center',
$hlt_color,
'nowrap' );
+ ++$col;
break;
case 6: /* size */
$fontstr_end . $bold_end,
'right',
$hlt_color );
+ ++$col;
break;
}
}
}
- echo "</tr>\n";
+ echo '</tr>'."\n".'<tr><td colspan="'.$col.'" BGCOLOR="'.
+ $color[0].'" HEIGHT="1"></td></tr>'."\n";
}
function getThreadMessages($imapConnection, $start_msg, $show_num, $num_msgs) {
if ($auto_expunge == true) {
$exp_cnt = sqimap_mailbox_expunge($imapConnection, $mailbox, false, '');
$mbxresponse['EXISTS'] = $mbxresponse['EXISTS'] - $exp_cnt;
+ $num_msgs = $mbxresponse['EXISTS'];
}
if ($mbxresponse['EXISTS']>0) {
switch ($mode) {
case 'thread':
- session_unregister('msort');
- session_unregister('msgs');
+ sqsession_unregister('msort');
+ sqsession_unregister('msgs');
$msgs = getThreadMessages($imapConnection, $start_msg, $show_num,
$num_msgs);
if ($msgs === false) {
'</center></small></b>';
$thread_sort_messages = 0;
$msort = $msgs = array();
- session_register('msort');
- session_register('msgs');
+ sqsession_register($msort, 'msort');
+ sqsession_register($msgs, 'msgs');
} else {
$msort= $msgs;
$sort = 6;
- session_register('msort');
- session_register('msgs');
+ sqsession_register($msort, 'msort');
+ sqsession_register($msgs, 'msgs');
}
break;
$sort = $server_sort_order;
$allow_server_sort = FALSE;
$msort = $msgs = array();
- session_register('msort');
- session_register('msgs');
+ sqsession_register($msort, 'msort');
+ sqsession_register($msgs, 'msgs');
$id = array();
} else {
$sort = 6;
$msort = $msgs;
- session_register('msort');
- session_register('msgs');
+ sqsession_register($msort, 'msort');
+ sqsession_register($msgs, 'msgs');
}
break;
default:
if (!$use_cache) {
- session_unregister('msgs');
- session_unregister('msort');
+ sqsession_unregister('msgs');
+ sqsession_unregister('msort');
$msgs= getSelfSortMessages($imapConnection, $start_msg, $show_num,
$num_msgs, $sort, $mbxresponse);
$msort = calc_msort($msgs, $sort);
- session_register('msort');
- session_register('msgs');
+ sqsession_register($msort, 'msort');
+ sqsession_register($msgs, 'msgs');
} /* !use cache */
break;
} // switch
$msg_cnt_str, $paginator_str, $start_msg);
+ echo '<table bgcolor="' . $color[0] . '" border="0" width="100%" cellpadding="1" cellspacing="0"><tr><td>';
printHeader($mailbox, $srt, $color, !$thread_sort_messages);
displayMessageArray($imapConnection, $num_msgs, $start_msg,
$msort, $mailbox, $sort, $color, $show_num,0,0);
mail_message_listing_end($num_msgs, $paginator_str, $msg_cnt_str, $color);
+ echo '</td></tr></table>';
/**
* TODO: Switch to using $_SESSION[] whenever we ditch the 4.0.x series.
global $color, $auto_expunge, $base_uri, $thread_sort_messages,
$allow_thread_sort, $allow_server_sort, $server_sort_order,
$PHP_SELF;
-
+
+ $php_self = $PHP_SELF;
+ /* fix for incorrect $PHP_SELF */
+ if (strpos($php_self, 'move_messages.php')) {
+ $php_self = str_replace('move_messages.php', 'right_main.php', $php_self);
+ }
$urlMailbox = urlencode($mailbox);
- if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
+ if (preg_match('/^(.+)\?.+$/',$php_self,$regs)) {
$source_url = $regs[1];
} else {
- $source_url = $PHP_SELF;
+ $source_url = $php_self;
}
if (!isset($msg)) {
}
$moveURL = "move_messages.php?msg=$msg&mailbox=$urlMailbox"
. "&startMessage=$start_msg";
-
/*
* This is the beginning of the message list table.
* It wraps around all messages
echo getButton('SUBMIT', 'markRead',_("Read"));
echo getButton('SUBMIT', 'markUnread',_("Unread"));
echo getButton('SUBMIT', 'delete',_("Delete")) ." \n";
- echo '<INPUT TYPE="HIDDEN" NAME="location" VALUE="'.$PHP_SELF.'">';
+ if (!strpos($php_self,'mailbox')) {
+ $location = $php_self.'?mailbox=INBOX&startMessage=1';
+ } else {
+ $location = $php_self;
+ }
+ echo '<INPUT TYPE="HIDDEN" NAME="location" VALUE="'.$location.'">';
echo "</TD>\n"
. " </TR>\n";
echo '</td></tr>'
. html_tag( 'tr' )
. html_tag( 'td' ,'' , '', $color[0], '' );
- if ($GLOBALS['alt_index_colors']){
- $cellspacing = '0';
- } else {
- $cellspacing = '1';
- }
- echo html_tag( 'table' ,'' , '', $color[0], 'border="0" width="100%" cellpadding="2" cellspacing="'. $cellspacing .'"' );
/* if using server sort we highjack the
* the $sort var and use $server_sort_order
function printHeader($mailbox, $sort, $color, $showsort=true) {
global $index_order;
- echo html_tag( 'table' ,'' , '', $color[9], 'border="0" width="100%" cellpadding="1" cellspacing="1"' );
+ echo html_tag( 'table' ,'' , '', $color[4], 'border="0" width="100%" cellpadding="1" cellspacing="0"' );
echo html_tag( 'tr' ,'' , 'center', $color[5] );
for ($i=1; $i <= count($index_order); $i++) {
switch ($index_order[$i]) {
function get_paginator_link($box, $start_msg, $use, $text) {
global $PHP_SELF;
+ $result = "<A HREF=\"right_main.php?use_mailbox_cache=$use"
+ . "&startMessage=$start_msg&mailbox=$box\" "
+ . "TARGET=\"right\">$text</A>";
+ return ($result);
+/*
if (preg_match('/^(.+)\?.+$/',$PHP_SELF,$regs)) {
$source_url = $regs[1];
} else {
. "&startMessage=$start_msg&mailbox=$box\" "
. "TARGET=\"right\">$text</A>";
return ($result);
+*/
}
/*
}
function processSubject($subject) {
+ global $languages, $squirrelmail_language;
/* Shouldn't ever happen -- caught too many times in the IMAP functions */
if ($subject == '')
return _("(no subject)");
return $subject;
}
+ if (isset($languages[$squirrelmail_language]['XTRA_CODE']) &&
+ function_exists($languages[$squirrelmail_language]['XTRA_CODE'])) {
+ return $languages[$squirrelmail_language]['XTRA_CODE']('strimwidth', $subject, $trim_val);
+ }
+
return substr($subject, 0, $trim_val) . '...';
}
}
function getButton($type, $name, $value) {
-return '<INPUT TYPE="'.$type.'" NAME="'.$name.'" VALUE="'.$value . '">';
+global $color;
+$style = ' STYLE="background:'.$color[4].';font-size:80%;font-weight:bold;'.
+ 'color:'.$color[8].';margin:0.05em;border:0.2em outset '.
+ $color[9].';"';
+$javascript = " onmouseover=\"this.style.color='$color[4]'".
+ ";this.style.borderStyle='inset'" .
+ ";this.style.background='$color[3]';\";" .
+ " onmouseout=\"this.style.color='$color[8]'".
+ ";this.style.borderStyle='outset'" .
+ ";this.style.background='$color[4]';\";";
+
+return '<INPUT TYPE="'.$type.'" NAME="'.$name.'" VALUE="'.$value . '"'.$style.$javascript.'>';
}
function getSmallStringCell($string, $align) {
projects / squirrelmail.git / blobdiff