X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=src%2Fright_main.php;h=9135c31342a323980fceadd69bca56c83fc7b212;hb=1a811a46752079f895c4f483fa77a77b3ef03fd9;hp=5ce2ba2f04354ab19250b5447007f0f24088ee55;hpb=3c621ba1116356a3a8e2616ef6d267f5edb3ea06;p=squirrelmail.git diff --git a/src/right_main.php b/src/right_main.php index 5ce2ba2f..9135c313 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); sqgetGlobalVar('username', $username, SQ_SESSION); sqgetGlobalVar('onetimepad',$onetimepad, SQ_SESSION); sqgetGlobalVar('delimiter', $delimiter, SQ_SESSION); sqgetGlobalVar('base_uri', $base_uri, SQ_SESSION); - +sqgetGlobalVar('delayed_errors', $delayed_errors, SQ_SESSION); +if (is_array($delayed_errors)) { + $oErrorHandler->AssignDelayedErrors($delayed_errors); + sqsession_unregister("delayed_errors"); +} sqgetGlobalVar('mailbox', $mailbox); sqgetGlobalVar('lastTargetMailbox', $lastTargetMailbox, SQ_SESSION); sqgetGlobalVar('targetMailbox', $lastTargetMailbox, SQ_POST); @@ -76,6 +69,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 */ @@ -96,29 +97,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 @@ -127,17 +121,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 @@ -145,17 +200,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 @@ -165,31 +237,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; } @@ -204,7 +288,8 @@ if (isset($mail_sent) && $mail_sent == 'yes') { $note = _("Your Message has been sent."); } if (isset($note)) { - echo html_tag( 'div', '' . $note .'', 'center' ) . "
\n"; + $oTemplate->assign('note', htmlspecialchars($note)); + $oTemplate->display('note.tpl'); } if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { @@ -212,44 +297,51 @@ if ( sqgetGlobalVar('just_logged_in', $just_logged_in, SQ_SESSION) ) { $just_logged_in = false; sqsession_register($just_logged_in, 'just_logged_in'); - if (strlen(trim($motd)) > 0) { - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', - html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', $motd, 'center' ) - ) , - '', $color[4], 'width="100%" cellpadding="5" cellspacing="1" border="0"' ) - ) - ) , - 'center', $color[9], 'width="70%" cellpadding="0" cellspacing="3" border="0"' ); + $motd = trim($motd); + if (strlen($motd) > 0) { + $oTemplate->assign('motd', $motd); + $oTemplate->display('motd.tpl'); } } } + + 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); + $oTemplate->assign('icon_theme_path', $icon_theme_path); + $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 ' '; - echo ' '; - echo '
'; - echo ' '; - echo ' '; - echo '

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