X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=8d2f9efbb099c7454aaa74b355e1c4ed837d0830;hb=247b0f1d99ac6553b5efc4dbe8c0c37f486a9e14;hp=7223cacf8a9f1cf3ae42d778247080076a9466cd;hpb=2ffeb7c581517ebf09eac844c9de7ec4f8132722;p=squirrelmail.git diff --git a/src/right_main.php b/src/right_main.php index 7223cacf..8d2f9efb 100644 --- a/src/right_main.php +++ b/src/right_main.php @@ -1,18 +1,21 @@ 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); - } -} -else if( isset( $PG_SHOWNUM ) ) { - $show_num = $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'; } +/** + * 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. + */ -if (isset($newsort) && $newsort != $sort) { - setPref($data_dir, $username, 'sort', $newsort); + +/* not sure if this hook should be capable to alter the global pref array */ +do_hook ('generic_header'); + +$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; } +$trash_folder = (isset($trash_folder)) ? $trash_folder : false; +$sent_folder = (isset($sent_folder)) ? $sent_folder : false; +$draft_folder = (isset($draft_folder)) ? $draft_folder : false; -/* 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; } -/* decide if we are thread sorting or not */ -if ($allow_thread_sort == TRUE) { - if (isset($set_thread)) { - if ($set_thread == 1) { - setPref($data_dir, $username, "thread_$mailbox", 1); - $thread_sort_messages = '1'; - } - elseif ($set_thread == 2) { - setPref($data_dir, $username, "thread_$mailbox", 0); - $thread_sort_messages = '0'; - } - } - else { - $thread_sort_messages = getPref($data_dir, $username, "thread_$mailbox"); + +/** + * 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); + +/** + * 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'); } -else { - $thread_sort_messages = 0; -} -do_hook ('generic_header'); +/* + * After initialisation of the mailbox array it's time to handle the FORM data + */ +$sError = handleMessageListForm($imapConnection,$aMailbox); +if ($sError) { + $note = $sError; +} + +/** + * Which templatedir are we using. TODO, add make a config var of this and make it possible to switch templates + */ +$sTplDir = SM_PATH . 'templates/default/'; -sqimap_mailbox_select($imapConnection, $mailbox); -if ($composenew) { - $comp_uri = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). - "&session=$session"; - displayPageHeader($color, $mailbox, "comp_in_new('$comp_uri');", false); +/* + * 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(); + + 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', $compose_width, $compose_height);", false); + } 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 + $location = SM_PATH . 'src/compose.php?mailbox='. urlencode($mailbox). + '&session='.$aMailbox['FORWARD_SESSION']; + header("Location: $location"); + exit; + } } else { displayPageHeader($color, $mailbox); +// $compose_uri = $base_uri.'src/compose.php?newmessage=1'; } + do_hook('right_main_after_header'); /* display a message to the user that their mail has been sent */ @@ -161,7 +291,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', '' . $note .'', 'center' ) . "
\n"; } if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { @@ -172,7 +302,7 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { if (strlen(trim($motd)) > 0) { echo html_tag( 'table', html_tag( 'tr', - html_tag( 'td', + html_tag( 'td', html_tag( 'table', html_tag( 'tr', html_tag( 'td', $motd, 'center' ) @@ -185,58 +315,63 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { } } -if (isset($newsort)) { - $sort = $newsort; - sqsession_register($sort, 'sort'); -} +/** + * In the future, move this the the initialisation area + */ -/********************************************************************* - * 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); -} else { - if (sqsession_is_registered('msgs')) { - unset($msgs); - } +$oTemplate = new Template($sTplDir); - 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 = sqimap_get_num_messages ($imapConnection, $mailbox); - - showMessagesForMailbox($imapConnection, $mailbox, $numMessages, - $startMessage, $sort, $color, $show_num, - $use_mailbox_cache); - - if (sqsession_is_registered('msgs') && isset($msgs)) { - sqsession_register($msgs, 'msgs'); - //$_SESSION['msgs'] = $msgs; + foreach ($aTemplateVars as $k => $v) { + $oTemplate->assign($k, $v); } - if (sqsession_is_registered('msort') && isset($msort)) { - sqsession_register($msort, 'msort'); - //$_SESSION['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->assign('showall', $showall); + + $oTemplate->display('message_list.tpl'); - sqsession_register($numMessages, 'numMessages'); - //$_SESSION['numMessages'] = $numMessages; +} else { + $string = '' . _("THIS FOLDER IS EMPTY") . ''; + echo ' '; + echo ' '; + echo '
'; + echo ' '; + echo ' '; + echo '

'; + echo ' '; + echo ' ' . html_tag( 'td', $string."\n", 'left') + . ''; + echo '
'; + echo '
'; } + do_hook('right_main_bottom'); sqimap_logout ($imapConnection); - echo ''; -?> +/* add the mailbox to the cache */ +$mailbox_cache[$account.'_'.$aMailbox['NAME']] = $aMailbox; +sqsession_register($mailbox_cache,'mailbox_cache'); + +?> \ No newline at end of file