X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fright_main.php;h=88841c6a576a2090c04f0166acc43e47ca94e888;hb=a15f9d9379cebc62fa39b6cb10d2195f95ed5081;hp=60111838f402d1512587c35f193f2557638b665e;hpb=139b39917a6eb7d26469c7a9159b1f335bda6f8c;p=squirrelmail.git
diff --git a/src/right_main.php b/src/right_main.php
index 60111838..88841c6a 100644
--- a/src/right_main.php
+++ b/src/right_main.php
@@ -1,13 +1,13 @@
'test1'));
/* lets get the global vars we may need */
sqgetGlobalVar('key', $key, SQ_COOKIE);
@@ -54,151 +43,240 @@ sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION);
sqgetGlobalVar('mailbox', $mailbox);
sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION);
-sqgetGlobalVar('numMessages' , $numMessages, SQ_SESSION);
-sqgetGlobalVar('session', $session, SQ_GET);
+sqgetGlobalVar('targetMailbox', $lastTargetMailbox, SQ_POST);
sqgetGlobalVar('note', $note, SQ_GET);
sqgetGlobalVar('mail_sent', $mail_sent, SQ_GET);
-sqgetGlobalVar('use_mailbox_cache', $use_mailbox_cache, SQ_GET);
+
if ( sqgetGlobalVar('startMessage', $temp) ) {
- $startMessage = (int) $temp;
-}
-if ( sqgetGlobalVar('PG_SHOWNUM', $temp) ) {
- $PG_SHOWNUM = (int) $temp;
+ $startMessage = (int) $temp;
+} else {
+ $startMessage = 1;
}
-if ( sqgetGlobalVar('PG_SHOWALL', $temp, SQ_GET) ) {
- $PG_SHOWALL = (int) $temp;
+// sort => srt because of the changed behaviour which can break new behaviour
+if ( sqgetGlobalVar('srt', $temp, SQ_GET) ) {
+ $srt = (int) $temp;
}
-if ( sqgetGlobalVar('newsort', $temp, SQ_GET) ) {
- $newsort = (int) $temp;
+
+if ( sqgetGlobalVar('showall', $temp, SQ_GET) ) {
+ $showall = (int) $temp;
}
+
if ( sqgetGlobalVar('checkall', $temp, SQ_GET) ) {
$checkall = (int) $temp;
}
-if ( sqgetGlobalVar('set_thread', $temp, SQ_GET) ) {
- $set_thread = (int) $temp;
-}
-if ( !sqgetGlobalVar('composenew', $composenew, SQ_GET) ) {
- $composenew = false;
+
+/* future work */
+if ( sqgetGlobalVar('account', $account, SQ_GET) ) {
+ $account = (int) $account;
+} else {
+ $account = 0;
}
+
/* end of get globals */
-/* Open a connection on the imap port (143) */
+/* Open an imap connection */
$imapConnection = sqimap_login($username, $key, $imapServerAddress, $imapPort, 0);
-if (isset($PG_SHOWALL)) {
- if ($PG_SHOWALL) {
- $PG_SHOWNUM=999999;
- $show_num=$PG_SHOWNUM;
- sqsession_register($PG_SHOWNUM, 'PG_SHOWNUM');
- }
- else {
- sqsession_unregister('PG_SHOWNUM');
- unset($PG_SHOWNUM);
- }
+$mailbox = (isset($mailbox) && $mailbox) ? $mailbox : 'INBOX';
+
+/* compensate for the UW vulnerability. */
+if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
+ substr($mailbox, 0, 1) == '/')) {
+ $mailbox = 'INBOX';
}
-else if( isset( $PG_SHOWNUM ) ) {
- $show_num = $PG_SHOWNUM;
+/**
+ * Set the global settings for a mailbox and merge them with the usersettings
+ * for the mailbox. In the future we can add more mailbox specific preferences
+ * preferences.
+ */
+
+$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_'.$account.'_'.$mailbox,serialize($default_mailbox_pref));
+ $aMailboxPref = $default_mailbox_pref;
+}
+if (isset($srt)) {
+ $aMailboxPref[MBX_PREF_SORT] = (int) $srt;
}
-if (isset($newsort) ) {
- if ( $newsort != $sort )
- setPref($data_dir, $username, 'sort', $newsort);
+$trash_folder = (isset($trash_folder)) ? $trash_folder : false;
+$sent_folder = (isset($sent_folder)) ? $sent_folder : false;
+$draft_folder = (isset($draft_folder)) ? $draft_folder : false;
- $sort = $newsort;
- sqsession_register($sort, 'sort');
-}
-/* If the page has been loaded without a specific mailbox, */
-/* send them to the inbox */
-if (!isset($mailbox)) {
- $mailbox = 'INBOX';
- $startMessage = 1;
+/**
+ * until there is no per mailbox option screen to set prefs we override
+ * the mailboxprefs by the default ones
+ */
+$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));
}
-if (!isset($startMessage) || ($startMessage == '')) {
- $startMessage = 1;
+
+/**
+ * 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;
+ }
}
-/* compensate for the UW vulnerability. */
-if ($imap_server_type == 'uw' && (strstr($mailbox, '../') ||
- substr($mailbox, 0, 1) == '/')) {
- $mailbox = 'INBOX';
+/**
+ * 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(
+ 'user' => $username,
+ // incoming vars
+ 'offset' => $startMessage // offset in paginator
+ );
+/**
+ * The showall functionality is for the moment added to the config array
+ * to avoid storage of the showall link in the mailbox pref. We could change
+ * this behaviour later and add it to $aMailboxPref instead
+ */
+if (isset($showall)) {
+ $aConfig['showall'] = $showall; // show all messages in a mailbox (paginator is disabled)
+} else {
+ $showall = false;
}
-do_hook ('generic_header');
-$aMbxResponse = sqimap_mailbox_select($imapConnection, $mailbox);
-$aMbxResponse['SORT_ARRAY'] = false;
+/**
+ * Retrieve the mailbox cache from the session.
+ */
+sqgetGlobalVar('mailbox_cache',$mailbox_cache,SQ_SESSION);
-sqgetGlobalVar('aLastSelectedMailbox',$aLastSelectedMailbox,SQ_SESSION);
+/**
+ * Select the mailbox and retrieve the cached info.
+ */
+$aMailbox = sqm_api_mailbox_select($imapConnection,$account, $mailbox,$aConfig,$aMailboxPref);
-// deal with imap servers that do not return the required UIDNEXT or
-// UIDVALIDITY response
-// from a SELECT call (since rfc 3501 it's required)
-if (!isset($aMbxResponse['UIDNEXT']) || !isset($aMbxResponse['UIDVALIDITY'])) {
- $aStatus = sqimap_status_messages($imapConnection,$mailbox,
- array('UIDNEXT','UIDVALIDITY'));
- $aMbxResponse['UIDNEXT'] = $aStatus['UIDNEXT'];
- $aMbxResponse['UIDVALIDTY'] = $aStatus['UIDVALIDITY'];
+/**
+ * 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');
}
-if ($aLastSelectedMailbox && !isset($newsort)) {
- // check if we deal with the same mailbox
- if ($aLastSelectedMailbox['NAME'] == $mailbox) {
- if ($aLastSelectedMailbox['EXISTS'] == $aMbxResponse['EXISTS'] &&
- $aLastSelectedMailbox['UIDVALIDITY'] == $aMbxResponse['UIDVALIDITY'] &&
- $aLastSelectedMailbox['UIDNEXT'] == $aMbxResponse['UIDNEXT']) {
- // sort is still valid
- sqgetGlobalVar('server_sort_array',$server_sort_array,SQ_SESSION);
- if ($server_sort_array && is_array($server_sort_array)) {
- $aMbxResponse['SORT_ARRAY'] = $server_sort_array;
- }
- }
- }
+/*
+ * After initialisation of the mailbox array it's time to handle the FORM data
+ */
+$sError = handleMessageListForm($imapConnection,$aMailbox);
+if ($sError) {
+ $note = $sError;
}
-$aLastSelectedMailbox['NAME'] = $mailbox;
-$aLastSelectedMailbox['EXISTS'] = $aMbxResponse['EXISTS'];
-$aLastSelectedMailbox['UIDVALIDITY'] = $aMbxResponse['UIDVALIDITY'];
-$aLastSelectedMailbox['UIDNEXT'] = $aMbxResponse['UIDNEXT'];
-
-/* decide if we are thread sorting or not */
-if ($allow_thread_sort == TRUE) {
- if (isset($set_thread)) {
- $aMbxResponse['SORT_ARRAY'] = false;
- if (sqsession_is_registered('indent_array')) {
- sqsession_unregister('indent_array');
- }
- if (sqsession_is_registered('server_sort_array')) {
- sqsession_unregister('server_sort_array');
+
+
+/*
+ * 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();
+ // 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 ($set_thread == 1) {
- setPref($data_dir, $username, "thread_$mailbox", 1);
- $thread_sort_messages = '1';
- } else if ($set_thread == 2) {
- setPref($data_dir, $username, "thread_$mailbox", 0);
- $thread_sort_messages = '0';
+ 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', $compose_width, $compose_height);", '');
} else {
- $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox");
+ $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
+ $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
+ '&session='.$aMailbox['FORWARD_SESSION'];
+ header("Location: $location");
+ exit;
}
-} else {
- $thread_sort_messages = 0;
-}
-
-
-
-if ($composenew) {
- $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox).
- "&session=$session";
- displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false);
} else {
displayPageHeader($color, $mailbox);
}
+
do_hook('right_main_after_header');
/* display a message to the user that their mail has been sent */
@@ -206,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) ) {
@@ -231,53 +309,55 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) {
}
-/*********************************************************************
- * Check to see if we can use cache or not. Currently the only time *
- * when you will not use it is when a link on the left hand frame is *
- * used. Also check to make sure we actually have the array in the *
- * registered session data. :) *
- *********************************************************************/
-if (! isset($use_mailbox_cache)) {
- $use_mailbox_cache = 0;
-}
-
-if ($use_mailbox_cache && sqsession_is_registered('msgs')) {
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
- $startMessage, $sort, $color, $show_num,
- $use_mailbox_cache, '',$aMbxResponse);
-} else {
- if (sqsession_is_registered('msgs')) {
- unset($msgs);
- }
-
- if (sqsession_is_registered('msort')) {
- unset($msort);
- }
+if ($aMailbox['EXISTS'] > 0) {
+ $aTemplateVars = showMessagesForMailbox($imapConnection,$aMailbox,$aProps,$iError);
+ if ($iError) {
- if (sqsession_is_registered('numMessages')) {
- unset($numMessages);
}
-
- $numMessages = $aMbxResponse['EXISTS'];
-
- showMessagesForMailbox($imapConnection, $mailbox, $numMessages,
- $startMessage, $sort, $color, $show_num,
- $use_mailbox_cache,'',$aMbxResponse);
-
- if (sqsession_is_registered('msgs') && isset($msgs)) {
- sqsession_register($msgs, 'msgs');
+ foreach ($aTemplateVars as $k => $v) {
+ $oTemplate->assign($k, $v);
}
- if (sqsession_is_registered('msort') && isset($msort)) {
- sqsession_register($msort, 'msort');
- }
+ /*
+ * 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');
- sqsession_register($numMessages, 'numMessages');
+} else {
+ $string = '' . _("THIS FOLDER IS EMPTY") . '';
+ echo '
';
+ echo ' ';
+ echo ' ';
+ echo ' ';
+ echo ' ';
+ echo ' ' . html_tag( 'td', $string."\n", 'left')
+ . ' ';
+ echo ' ';
+ echo '
| ';
+ echo ' |
';
+ echo '
';
}
+
do_hook('right_main_bottom');
sqimap_logout ($imapConnection);
-echo '