From: kink Date: Tue, 1 Aug 2006 15:34:19 +0000 (+0000) Subject: templatize folder management (create, rename, delete, subscribe). X-Git-Url: https://vcs.fsf.org/?p=squirrelmail.git;a=commitdiff_plain;h=9829e1d84ea35989d03c1956871a8f48ad3c538c;ds=sidebyside templatize folder management (create, rename, delete, subscribe). it's not complete in the sense that it still uses $color etc, feel free to cssify! I'd like feedback if this is not the proper way to templatize something. git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11456 7612ce4b-ef26-0410-bec9-ea0150e637f0 --- diff --git a/functions/folder_manip.php b/functions/folder_manip.php index b1032dc9..e15ab617 100644 --- a/functions/folder_manip.php +++ b/functions/folder_manip.php @@ -78,12 +78,13 @@ function folders_create ($imapConnection, $delimiter, $folder_name, $subfolder, * folder should be renamed to. */ function folders_rename_getname ($imapConnection, $delimiter, $old) { - global $color,$default_folder_prefix; + global $color, $default_folder_prefix, $oTemplate; if ( $old == '' ) { plain_error_message(_("You have not selected a folder to rename. Please do so."). '
'._("Click here to go back").'.', $color); sqimap_logout($imapConnection); + $oTemplate->display('footer.tpl'); exit; } @@ -111,30 +112,19 @@ function folders_rename_getname ($imapConnection, $delimiter, $old) { $old_name = $old; $old_parent = ''; } + + sqimap_logout($imapConnection); - echo '
' . - html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) . - html_tag( 'tr', - html_tag( 'td', '' . _("Rename a folder") . '', 'center', $color[0] ) - ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[4] ) . - addForm('folders.php'). - addHidden('smaction', 'rename'). - '' . - '
' . htmlspecialchars($old_parent) . '' . - addInput('new_name', $old_name, 25) . '

' . "\n"; - if ( $isfolder ) { - echo addHidden('isfolder', 'true'); - } - echo addHidden('orig', $old). - addHidden('old_name', $old_name). - '\n". - '\n". - '
'; - echo "\n\n\n\n"; + $oTemplate->assign('dialog_type', 'rename'); + $oTemplate->assign('color', $color); + $oTemplate->assign('old_parent', htmlspecialchars($old_parent)); + $oTemplate->assign('old', htmlspecialchars($old)); + $oTemplate->assign('old_name', htmlspecialchars($old_name)); + $oTemplate->assign('isfolder', $isfolder); + + $oTemplate->display('folder_manip_dialog.tpl'); + $oTemplate->display('footer.tpl'); - sqimap_logout($imapConnection); exit; } @@ -182,11 +172,13 @@ function folders_rename_do($imapConnection, $delimiter, $orig, $old_name, $new_n */ function folders_delete_ask ($imapConnection, $folder_name) { - global $color,$default_folder_prefix; + global $color, $default_folder_prefix, $oTemplate; if ($folder_name == '') { plain_error_message(_("You have not selected a folder to delete. Please do so."). '
'._("Click here to go back").'.', $color); + sqimap_logout($imapConnection); + $oTemplate->display('footer.tpl'); exit; } @@ -196,25 +188,16 @@ function folders_delete_ask ($imapConnection, $folder_name) $prefix_length = (preg_match("/^$quoted_prefix/",$visible_folder_name) ? strlen($default_folder_prefix) : 0); $visible_folder_name = substr($visible_folder_name,$prefix_length); - echo '
' . - html_tag( 'table', '', 'center', '', 'width="95%" border="0"' ) . - html_tag( 'tr', - html_tag( 'td', '' . _("Delete Folder") . '', 'center', $color[0] ) - ) . - html_tag( 'tr' ) . - html_tag( 'td', '', 'center', $color[4] ) . - sprintf(_("Are you sure you want to delete %s?"), - str_replace(array(' ','<','>'),array(' ','<','>'),$visible_folder_name)). - addForm('folders.php', 'post')."

\n". - addHidden('smaction', 'delete'). - addHidden('folder_name', $folder_name). - addSubmit(_("Yes"), 'confirmed'). - addSubmit(_("No"), 'cancelbutton'). - '


'; - - echo "\n\n\n\n"; - sqimap_logout($imapConnection); + + $oTemplate->assign('dialog_type', 'delete'); + $oTemplate->assign('color', $color); + $oTemplate->assign('folder_name', htmlspecialchars($folder_name)); + $oTemplate->assign('visible_folder_name', htmlspecialchars($visible_folder_name)); + + $oTemplate->display('folder_manip_dialog.tpl'); + $oTemplate->display('footer.tpl'); + exit; } @@ -290,12 +273,13 @@ function folders_delete_do ($imapConnection, $delimiter, $folder_name) */ function folders_subscribe($imapConnection, $folder_names) { - global $color; + global $color, $oTemplate; if (count($folder_names) == 0 || $folder_names[0] == '') { plain_error_message(_("You have not selected a folder to subscribe. Please do so."). '
'._("Click here to go back").'.', $color); sqimap_logout($imapConnection); + $oTemplate->display('footer.tpl'); exit; } @@ -325,12 +309,13 @@ function folders_subscribe($imapConnection, $folder_names) */ function folders_unsubscribe($imapConnection, $folder_names) { - global $color; + global $color, $oTemplate; if (count($folder_names) == 0 || $folder_names[0] == '') { plain_error_message(_("You have not selected a folder to unsubscribe. Please do so."). '
'._("Click here to go back").'.', $color); sqimap_logout($imapConnection); + $oTemplate->display('footer.tpl'); exit; } diff --git a/src/folders.php b/src/folders.php index 3ca3e869..c4568af7 100644 --- a/src/folders.php +++ b/src/folders.php @@ -36,14 +36,6 @@ sqgetGlobalVar('smaction', $action, SQ_POST); /* end of get globals */ -echo '
' . - 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); /* switch to the right function based on what the user selected */ @@ -100,35 +92,11 @@ if ( sqgetGlobalVar('smaction', $action, SQ_POST) ) { 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
"; - $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) { @@ -202,158 +157,50 @@ foreach ($boxes as $index => $aBoxData) { * * $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 = ''; - -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; - } - } - - 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"; - } + /** 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 = htmlspecialchars($box_a['unformatted-dm']); + $box_disp = htmlspecialchars(imap_utf7_decode_local($box_a['unformatted-disp'])); + $subbox_option_list .= '\n"; + } + } } -do_hook('folders_bottom'); sqimap_logout($imapConnection); -?> - - - - -assign('td_str', @$td_str); +$oTemplate->assign('color', $color); +$oTemplate->assign('mbx_option_list', $mbx_option_list); +$oTemplate->assign('show_contain_subfolders_option', $show_contain_subfolders_option); +$oTemplate->assign('show_only_subscribed_folders', $show_only_subscribed_folders); +$oTemplate->assign('rendel_folder_list', $rendel_folder_list); +$oTemplate->assign('subbox_option_list', $subbox_option_list); +$oTemplate->assign('no_list_for_subscribe', $no_list_for_subscribe); + +$oTemplate->display('folder_manip.tpl'); + $oTemplate->display('footer.tpl'); -?> \ No newline at end of file + diff --git a/templates/default/folder_manip.tpl b/templates/default/folder_manip.tpl new file mode 100644 index 00000000..3b56d1d0 --- /dev/null +++ b/templates/default/folder_manip.tpl @@ -0,0 +1,174 @@ + + +
+ + +
+ + + + +
+ + + + +

+ +
+ + + +
+ + + + + + + + +
+ +
+ +
+
+ + +
+ 
+ +" /> +
+
 
+ + + + + + + +
+ + + +
+ + +" /> +
+ + + +

+ + +
 
+ + + + + + + + +
+ + + +
+ + +" /> +
+ + + +

+ + +
 
+ + + + +
+ + + +
+ +

+" /> +
+ + +		 + +
+ + +" /> +
+ +
+ +

+" /> +
+ + + + + + + + + +
+
+ diff --git a/templates/default/folder_manip_dialog.tpl b/templates/default/folder_manip_dialog.tpl new file mode 100644 index 00000000..2e1c2f85 --- /dev/null +++ b/templates/default/folder_manip_dialog.tpl @@ -0,0 +1,66 @@ + + +
+ + + + + + + + + + + + + + +
+ +
+

+ +" /> +" /> + + + + + + + + + +
+ +'),array(' ','<','>'),$visible_folder_name)); ?> +

+ +" /> +" /> + + + + +
+ + + +