X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=88841c6a576a2090c04f0166acc43e47ca94e888;hb=a15f9d9379cebc62fa39b6cb10d2195f95ed5081;hp=00a166e1bcd5fbbf5c1c532367766349e253605d;hpb=134e4174c8919790bcc463587e90ac37cabc2f90;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 00a166e1..88841c6a 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -3,12 +3,11 @@
/**
* right_main.php
*
- * Copyright (c) 1999-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.
- *
* This is where the mailboxes are listed. This controls most of what
* goes on in SquirrelMail.
*
+ * @copyright © 1999-2006 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
* @version $Id$
* @package squirrelmail
*/
@@ -20,31 +19,20 @@
define('SM_PATH','../');
/* SquirrelMail required files. */
-require_once(SM_PATH . 'include/validate.php');
-require_once(SM_PATH . 'functions/global.php');
+include_once(SM_PATH . 'include/validate.php');
+//include_once(SM_PATH . 'functions/global.php');
require_once(SM_PATH . 'functions/imap.php');
require_once(SM_PATH . 'functions/date.php');
require_once(SM_PATH . 'functions/mime.php');
require_once(SM_PATH . 'functions/mailbox_display.php');
require_once(SM_PATH . 'functions/display_messages.php');
require_once(SM_PATH . 'functions/html.php');
-require_once(SM_PATH . 'functions/plugin.php');
-
-/***********************************************************
- * incoming variables from URL: *
- * $sort Direction to sort by date *
- * values: 0 - descending order *
- * values: 1 - ascending order *
- * $startMessage Message to start at *
- * $mailbox Full Mailbox name *
- * *
- * incoming from cookie: *
- * $key pass *
- * incoming from session: *
- * $username duh *
- * *
- ***********************************************************/
+//require_once(SM_PATH . 'functions/plugin.php');
+
+// Trigger Developers to look at CSS ;)
+// trigger_error("This layout sucks. Adapt squirrelmail.css!!!",E_USER_WARNING);
+//sqm_trigger_imap_error('SQM_IMAP_NO_THREAD',"BLA1",'BAD', 'BLA2', array('test1'=>'test1'));
/* lets get the global vars we may need */
sqgetGlobalVar('key', $key, SQ_COOKIE);
@@ -77,6 +65,14 @@ if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) {
if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
$checkall = (int) $temp;
}
+
+/* future work */
+if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
+ $account = (int) $account;
+} else {
+ $account = 0;
+}
+
/* end of get globals */
@@ -97,29 +93,22 @@ if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
* preferences.
*/
-
-$aMailboxGlobalPref = array(
- MBX_PREF_SORT => 0,
- MBX_PREF_LIMIT => (int) $show_num,
- MBX_PREF_AUTO_EXPUNGE => (bool) $auto_expunge,
- MBX_PREF_INTERNALDATE => (bool) getPref($data_dir, $username, 'internal_date_sort')
- // MBX_PREF_FUTURE => (var) $future
- );
-
-/* not sure if this hook should be capable to alter the global pref array */
-do_hook ('generic_header');
-
-$aMailboxPrefSer=getPref($data_dir, $username, "pref_$mailbox");
+$aMailboxPrefSer=getPref($data_dir, $username,'pref_'.$account.'_'.$mailbox);
if ($aMailboxPrefSer) {
$aMailboxPref = unserialize($aMailboxPrefSer);
+ $aMailboxPref[MBX_PREF_COLUMNS] = $index_order; // index_order contains the columns to show and the order of the columns
} else {
- setUserPref($username,"pref_$mailbox",serialize($aMailboxGlobalPref));
- $aMailboxPref = $aMailboxGlobalPref;
+ setUserPref($username,'pref_'.$account.'_'.$mailbox,serialize($default_mailbox_pref));
+ $aMailboxPref = $default_mailbox_pref;
}
if (isset($srt)) {
$aMailboxPref[MBX_PREF_SORT] = (int) $srt;
}
+$trash_folder = (isset($trash_folder)) ? $trash_folder : false;
+$sent_folder = (isset($sent_folder)) ? $sent_folder : false;
+$draft_folder = (isset($draft_folder)) ? $draft_folder : false;
+
/**
* until there is no per mailbox option screen to set prefs we override
@@ -128,17 +117,78 @@ if (isset($srt)) {
$aMailboxPref[MBX_PREF_LIMIT] = (int) $show_num;
$aMailboxPref[MBX_PREF_AUTO_EXPUNGE] = (bool) $auto_expunge;
$aMailboxPref[MBX_PREF_INTERNALDATE] = (bool) getPref($data_dir, $username, 'internal_date_sort');
+$aMailboxPref[MBX_PREF_COLUMNS] = $index_order;
+
+/**
+ * Replace From => To in case it concerns a draft or sent folder
+ */
+if (($mailbox == $sent_folder || $mailbox == $draft_folder) &&
+ !in_array(SQM_COL_TO,$aMailboxPref[MBX_PREF_COLUMNS])) {
+ $aNewOrder = array(); // nice var name ;)
+ foreach($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) {
+ if ($iCol == SQM_COL_FROM) {
+ $iCol = SQM_COL_TO;
+ }
+ $aNewOrder[] = $iCol;
+ }
+ $aMailboxPref[MBX_PREF_COLUMNS] = $aNewOrder;
+ setUserPref($username,'pref_'.$account.'_'.$mailbox,serialize($aMailboxPref));
+}
+
+
+
+/**
+ * Set the config options for the messages list
+ */
+$aColumns = array(); // contains settings per column. Switch to key -> value based array, order is the order of the array keys
+foreach ($aMailboxPref[MBX_PREF_COLUMNS] as $iCol) {
+ $aColumns[$iCol] = array();
+ switch ($iCol) {
+ case SQM_COL_SUBJ:
+ if ($truncate_subject) {
+ $aColumns[$iCol]['truncate'] = $truncate_subject;
+ }
+ break;
+ case SQM_COL_FROM:
+ case SQM_COL_TO:
+ case SQM_COL_CC:
+ case SQM_COL_BCC:
+ if ($truncate_sender) {
+ $aColumns[$iCol]['truncate'] = $truncate_sender;
+ }
+ break;
+ }
+}
+
+/**
+ * Properties required by showMessagesForMailbox
+ */
+$aProps = array(
+ 'columns' => $aColumns, // columns bound settings
+ 'config' => array('alt_index_colors' => $alt_index_colors, // alternating row colors (should be a template thing)
+ 'highlight_list' => $message_highlight_list, // row highlighting rules
+ 'fancy_index_highlite' => $fancy_index_highlite, // highlight rows on hover or on click -> check
+ 'show_flag_buttons' => (isset($show_flag_buttons)) ? $show_flag_buttons : true,
+ 'lastTargetMailbox' => (isset($lastTargetMailbox)) ? $lastTargetMailbox : '', // last mailbox where messages are moved/copied to
+ 'trash_folder' => $trash_folder,
+ 'sent_folder' => $sent_folder,
+ 'draft_folder' => $draft_folder,
+ 'color' => $color,
+ 'enablesort' => true // enable sorting on columns
+ ),
+ 'mailbox' => $mailbox,
+ 'account' => (isset($account)) ? $account : 0, // future usage if we support multiple imap accounts
+ 'module' => 'read_body',
+ 'email' => false);
/**
* system wide admin settings and incoming vars.
*/
$aConfig = array(
- 'allow_thread_sort' => $allow_thread_sort,
- 'allow_server_sort' => $allow_server_sort,
'user' => $username,
// incoming vars
- 'offset' => $startMessage
+ 'offset' => $startMessage // offset in paginator
);
/**
* The showall functionality is for the moment added to the config array
@@ -146,17 +196,34 @@ $aConfig = array(
* this behaviour later and add it to $aMailboxPref instead
*/
if (isset($showall)) {
- $aConfig['showall'] = $showall;
+ $aConfig['showall'] = $showall; // show all messages in a mailbox (paginator is disabled)
+} else {
+ $showall = false;
}
+
/**
* Retrieve the mailbox cache from the session.
*/
sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
+/**
+ * Select the mailbox and retrieve the cached info.
+ */
+$aMailbox = sqm_api_mailbox_select($imapConnection,$account, $mailbox,$aConfig,$aMailboxPref);
-$aMailbox = sqm_api_mailbox_select($imapConnection,$mailbox,$aConfig,$aMailboxPref);
-
+/**
+ * MOVE THIS to a central init section !!!!
+ */
+if (!sqgetGlobalVar('align',$align,SQ_SESSION)) {
+ $dir = ( isset( $languages[$squirrelmail_language]['DIR']) ) ? $languages[$squirrelmail_language]['DIR'] : 'ltr';
+ if ( $dir == 'ltr' ) {
+ $align = array('left' => 'left', 'right' => 'right');
+ } else {
+ $align = array('left' => 'right', 'right' => 'left');
+ }
+ sqsession_register($align, 'align');
+}
/*
* After initialisation of the mailbox array it's time to handle the FORM data
@@ -166,31 +233,43 @@ if ($sError) {
$note = $sError;
}
+
+
/*
* If we try to forward messages as attachment we have to open a new window
* in case of compose in new window or redirect to compose.php
*/
if (isset($aMailbox['FORWARD_SESSION'])) {
if ($compose_new_win) {
+ /* add the mailbox to the cache */
+ $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
+ sqsession_register($mailbox_cache,'mailbox_cache');
// write the session in order to make sure that the compose window has
// access to the composemessages array which is stored in the session
session_write_close();
- sqsession_is_active();
+ // restart the session. Do not use sqsession_is_active because the session_id
+ // isn't empty after a session_write_close
+ sqsession_start();
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_width)) {
+ $compose_width = '640';
+ }
+ if (!preg_match("/^[0-9]{3,4}$/", $compose_height)) {
+ $compose_height = '550';
+ }
+ // do not use &, it will break the query string and $session will not be detected!!!
$comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
'&session='.$aMailbox['FORWARD_SESSION'];
- displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
+ displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri', $compose_width, $compose_height);", '');
} else {
+ $mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox;
+ sqsession_register($mailbox_cache,'mailbox_cache');
+
// save mailboxstate
sqsession_register($aMailbox,'aLastSelectedMailbox');
session_write_close();
// we have to redirect to the compose page
- global $PHP_SELF;
- if (!strpos($PHP_SELF,'?')) {
- $location = $PHP_SELF.'?mailbox=INBOX&startMessage=1';
- } else {
- $location = $PHP_SELF;
- }
- $location = set_url_var($location, 'session',$aMailbox['FORWARD_SESSION'], false);
+ $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+ '&session='.$aMailbox['FORWARD_SESSION'];
header("Location: $location");
exit;
}
@@ -205,7 +284,7 @@ if (isset($mail_sent) && $mail_sent == 'yes') {
$note = _("Your Message has been sent.");
}
if (isset($note)) {
- echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n";
+ echo html_tag( 'div', '' . htmlspecialchars($note) .'', 'center' ) . "
\n";
}
if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
@@ -228,8 +307,36 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
}
}
}
+
+
if ($aMailbox['EXISTS'] > 0) {
- showMessagesForMailbox($imapConnection,$aMailbox);
+ $aTemplateVars = showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError);
+ if ($iError) {
+
+ }
+ foreach ($aTemplateVars as $k => $v) {
+ $oTemplate->assign($k, $v);
+ }
+
+ /*
+ * TODO: To many config related vars. We should move all config related vars to
+ * one single associative array and assign that to the template
+ */
+ $oTemplate->assign('page_selector', $page_selector);
+ $oTemplate->assign('page_selector_max', $page_selector_max);
+ $oTemplate->assign('compact_paginator', $compact_paginator);
+ $oTemplate->assign('javascript_on', $javascript_on);
+ $oTemplate->assign('enablesort', (isset($aProps['config']['enablesort'])) ? $aProps['config']['enablesort'] : false);
+ // Aaaaaahhhhhhh FIX ME DO NOT USE the string "none" for a var when you mean the boolean false or null
+ $oTemplate->assign('icon_theme', (isset($icon_theme) && $icon_theme !== 'none') ? $icon_theme : false);
+ $oTemplate->assign('use_icons', (isset($use_icons)) ? $use_icons : false);
+ $oTemplate->assign('aOrder', array_keys($aColumns));
+ $oTemplate->assign('alt_index_colors', isset($alt_index_colors) ? $alt_index_colors: false);
+ $oTemplate->assign('color', $color);
+ $oTemplate->assign('align', $align);
+
+ $oTemplate->display('message_list.tpl');
+
} else {
$string = '' . _("THIS FOLDER IS EMPTY") . '';
echo ' ';
@@ -247,10 +354,10 @@ if ($aMailbox['EXISTS'] > 0) {
do_hook('right_main_bottom');
sqimap_logout ($imapConnection);
-echo '