X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=blobdiff_plain;f=src%2Ffolders.php;h=e0aab0643ae44be00259b0451bd3c507723834a3;hp=680ca1e0a0a00863561446375534c23b2fe80817;hb=b65a57eafe670d1550f663704ec100a5fe719bef;hpb=4b4abf93a9624311afef0c385023724ee46a2b60 diff --git a/src/folders.php b/src/folders.php index 680ca1e0..e0aab064 100644 --- a/src/folders.php +++ b/src/folders.php @@ -1,5 +1,4 @@ ' . - html_tag( 'table', '', 'center', $color[0], 'width="95%" cellpadding="1" cellspacing="0" border="0"' ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center' ) . '' . _("Folders") . '' . - html_tag( 'table', '', 'center', '', 'width="100%" cellpadding="5" cellspacing="0" border="0"' ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[4] ); - -$imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); +global $imap_stream_options; // in case not defined in config +$imapConnection = sqimap_login ($username, false, $imapServerAddress, $imapPort, 0, $imap_stream_options); /* switch to the right function based on what the user selected */ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) { - switch ($action) { case 'create': + + // first, validate security token + sm_validate_security_token($submitted_token, -1, TRUE); + sqgetGlobalVar('folder_name', $folder_name, SQ_POST); sqgetGlobalVar('subfolder', $subfolder, SQ_POST); sqgetGlobalVar('contain_subs', $contain_subs, SQ_POST); @@ -70,6 +60,10 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) { sqgetGlobalVar('old_name', $old_name, SQ_POST); folders_rename_getname($imapConnection, $delimiter, $old_name); } else { + + // first, validate security token + sm_validate_security_token($submitted_token, -1, TRUE); + sqgetGlobalVar('orig', $orig, SQ_POST); sqgetGlobalVar('old_name', $old_name, SQ_POST); folders_rename_do($imapConnection, $delimiter, $orig, $old_name, $new_name); @@ -82,6 +76,10 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) { } sqgetGlobalVar('folder_name', $folder_name, SQ_POST); if ( sqgetGlobalVar('confirmed', $dummy, SQ_POST) ) { + + // first, validate security token + sm_validate_security_token($submitted_token, -1, TRUE); + folders_delete_do($imapConnection, $delimiter, $folder_name); $td_str = _("Deleted folder successfully."); } else { @@ -89,50 +87,39 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) { } break; case 'subscribe': + + // first, validate security token + sm_validate_security_token($submitted_token, -1, TRUE); + sqgetGlobalVar('folder_names', $folder_names, SQ_POST); folders_subscribe($imapConnection, $folder_names); $td_str = _("Subscribed successfully."); break; case 'unsubscribe': + + // first, validate security token + sm_validate_security_token($submitted_token, -1, TRUE); + sqgetGlobalVar('folder_names', $folder_names, SQ_POST); folders_unsubscribe($imapConnection, $folder_names); $td_str = _("Unsubscribed successfully."); break; default: - // TODO: add hook for plugin action processing. - $td_str = ''; +// TODO: this is a new hook for plugin action processing that has not been TESTED. + $td_str = do_hook('folder_action', $action); break; } - // if there are any messages, output them. - if ( !empty($td_str) ) { - echo html_tag( 'table', - html_tag( 'tr', - html_tag( 'td', '' . $td_str . "
\n" . - '' . - _("refresh folder list") . '' , - 'center' ) - ) , - 'center', '', 'width="100%" cellpadding="4" cellspacing="0" border="0"' ); - } } -echo "\n
"; +if (isset($td_str)) { + $oTemplate->assign('note', sm_encode_html_special_chars($td_str)); + $oTemplate->display('note.tpl'); +} $boxes = sqimap_mailbox_list($imapConnection,true); /** CREATING FOLDERS **/ -echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) . - html_tag( 'tr', - html_tag( 'td', '' . _("Create Folder") . '', 'center', $color[9] ) - ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[0] ) . - addForm('folders.php', 'post', 'cf'). - addHidden('smaction','create'). - addInput('folder_name', '', 25). - "
\n". _("as a subfolder of"). '
'. - "\n"; -if ($show_contain_subfolders_option) { - echo '
'. - addCheckBox('contain_subs', FALSE, '1') .'  ' - . _("Let this folder contain subfolders") - . '
'; -} -echo "\n"; -echo "\n"; +$mbx_option_list .= sqimap_mailbox_option_list($imapConnection, $show_selected, $skip_folders, $boxes, 'noinferiors', true); -echo html_tag( 'tr', - html_tag( 'td', ' ', 'left', $color[4] ) - ) ."\n"; /** count special folders **/ foreach ($boxes as $index => $aBoxData) { - if (isSpecialMailbox($aBoxData['unformatted']) && + if (isSpecialMailbox($aBoxData['unformatted'],false) && ! in_array($aBoxData['unformatted'],$skip_folders)) { $skip_folders[] = $aBoxData['unformatted']; - } + } } /** * Retrieve list of folders when special folders are excluded. Special folders * should be unavailable in rename/delete/unsubscribe. Theoretically user can - * modify form and perform these operations with special folders, but if user - * manages to delete/rename/unsubscribe special folder by hacking form... + * modify form and perform these operations with special folders, but if user + * manages to delete/rename/unsubscribe special folder by hacking form... * * If script or program depends on special folder, they should not assume that * folder is available. * * $filtered_folders contains empty string or html formated option list. */ -$filtered_folders = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); - -/** RENAMING FOLDERS **/ -echo html_tag( 'tr', - html_tag( 'td', '' . _("Rename a Folder") . '', 'center', $color[9] ) - ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[0] ); - -/* show only if we have folders to rename */ -if (! empty($filtered_folders)) { - echo addForm('folders.php') - . addHidden('smaction', 'rename') - . "\n". - '\n". - "\n"; -} else { - echo _("No folders found") . '

'; -} +$rendel_folder_list = sqimap_mailbox_option_list($imapConnection, 0, $skip_folders, $boxes, NULL, true); -echo html_tag( 'tr', - html_tag( 'td', ' ', 'left', $color[4] ) - ) ."\n"; - -/** DELETING FOLDERS **/ -echo html_tag( 'tr', - html_tag( 'td', '' . _("Delete Folder") . '', 'center', $color[9] ) - ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[0] ); - -/* show only if we have folders to delete */ -if (!empty($filtered_folders)) { - echo addForm('folders.php') - . addHidden('smaction', 'delete') - . "\n" - . '\n" - . "\n"; -} else { - echo _("No folders found") . "

"; -} -echo html_tag( 'tr', - html_tag( 'td', ' ', 'left', $color[4] ) - ) ."\n"; +$subbox_option_list = array(); - -if ($show_only_subscribed_folders) { +if ($show_only_subscribed_folders && !$no_list_for_subscribe) { // FIXME: fix subscription options when top folder is not subscribed and sub folder is subscribed - // TODO: use checkboxes instead of select options. - /** UNSUBSCRIBE FOLDERS **/ - echo html_tag( 'table', '', 'center', '', 'width="70%" cellpadding="4" cellspacing="0" border="0"' ) . - html_tag( 'tr', - html_tag( 'td', '' . _("Unsubscribe") . '/' . _("Subscribe") . '', 'center', $color[9], 'colspan="2"' ) - ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[0], 'width="50%"' ); - - if (!empty($filtered_folders)) { - echo addForm('folders.php') - . addHidden('smaction', 'unsubscribe') - . "

\n" - . '\n" - . "\n"; - } else { - echo _("No folders were found to unsubscribe from.") . ''; - } - - /** SUBSCRIBE TO FOLDERS **/ - echo html_tag( 'td', '', 'center', $color[0], 'width="50%"' ); - if(!$no_list_for_subscribe) { - $boxes_all = sqimap_mailbox_list_all ($imapConnection); - - $subboxes = array(); - // here we filter out all boxes we're already subscribed to, - // so we keep only the unsubscribed ones. - foreach ($boxes_all as $box_a) { - - $use_folder = true; - foreach ( $boxes as $box ) { - if ($box_a['unformatted'] == $box['unformatted'] || - $box_a['unformatted-dm'] == $folder_prefix ) { - $use_folder = false; - } - } - - if ($use_folder == true) { - $box_enc = htmlspecialchars($box_a['unformatted-dm']); - $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp'])); - $subboxes[$box_enc] = $box_disp; - } - } + // TODO: use checkboxes instead of select options. + // DONE Steve Brown 2006-08-08 + + /** SUBSCRIBE TO FOLDERS **/ + $boxes_all = sqimap_mailbox_list_all ($imapConnection); + + // here we filter out all boxes we're already subscribed to, + // so we keep only the unsubscribed ones. + foreach ($boxes_all as $box_a) { + + $use_folder = true; + foreach ( $boxes as $box ) { + if ($box_a['unformatted'] == $box['unformatted'] || + $box_a['unformatted-dm'] == $folder_prefix ) { + $use_folder = false; + } + } + + if ($use_folder) { + $box_enc = sm_encode_html_special_chars($box_a['unformatted-dm']); + $box_disp = sm_encode_html_special_chars(imap_utf7_decode_local($box_a['unformatted-disp'])); + $subbox_option_list[] = array( 'Value' => $box_enc, 'Display' => $box_disp); + } + } +} - if ( count($subboxes) > 0 ) { - echo addForm('folders.php') - . addHidden('smaction', 'subscribe') - . '

' - . '\n" - . "
\n"; - } else { - echo _("No folders were found to subscribe to.") . ''; - } - } else { - /* don't perform the list action -- this is much faster */ - echo addForm('folders.php') - . addHidden('smaction', 'subscribe') - . _("Subscribe to:") . '
' - . '' - . '\n" - . "
\n"; - } -} +$oTemplate->assign('mbx_option_list', $mbx_option_list); +$oTemplate->assign('rendel_folder_list', $rendel_folder_list); +$oTemplate->assign('subbox_option_list', $subbox_option_list); -do_hook('folders_bottom'); -sqimap_logout($imapConnection); +$oTemplate->display('folder_manip.tpl'); -?> - - - - - \ No newline at end of file +$oTemplate->display('footer.tpl');