[Hastymail-cvs] hastymail/html mailbox.php,1.196,1.197 search.php,1.21,1.22
Brought to you by:
sailfrog,
slushpupie
From: <sai...@us...> - 2003-08-02 20:45:00
|
Update of /cvsroot/hastymail/hastymail/html In directory sc8-pr-cvs1:/tmp/cvs-serv15530/html Modified Files: mailbox.php search.php Log Message: created a function to echo the folder list options for various places in the program Index: mailbox.php =================================================================== RCS file: /cvsroot/hastymail/hastymail/html/mailbox.php,v retrieving revision 1.196 retrieving revision 1.197 diff -u -d -r1.196 -r1.197 --- mailbox.php 1 Aug 2003 17:18:03 -0000 1.196 +++ mailbox.php 2 Aug 2003 20:44:57 -0000 1.197 @@ -38,7 +38,9 @@ /* if we don't have the folder list in the session, get it */ if (!isset($_SESSION['folders'])) { $_SESSION['folders'] = hm_boxlist($imap_stream, true, 'all'); - + if (!isset($_SESSION['dsp_folders'])) { + $_SESSION['dsp_folders'] = hm_folder_dsp($_SESSION['folders']); + } /* check for trash and sent settings and make sure the folders exist */ if (isset($_SESSION['settings']['trash_folder']) && @@ -64,7 +66,6 @@ } } } -$dsp_folders = hm_folder_dsp($_SESSION['folders']); /* select the mailbox for imap */ hm_select_mailbox($imap_stream, $hm_input['mailbox']); @@ -193,7 +194,7 @@ } /* toolbar and any status messages */ -hm_toolbar($imap_stream, $hm_input['mailbox'], $unseen, false, $dsp_folders); +hm_toolbar($imap_stream, $hm_input['mailbox'], $unseen, false); /* check for login warning */ if (isset($warning)) { @@ -261,7 +262,7 @@ if (!array_key_exists($hm_input['page_num'], $sort_info[1])) { $hm_input['page_num'] = 0; } - $folder_dsp = $dsp_folders[urldecode($hm_input['mailbox'])]; + $dsp_folders = $_SESSION['dsp_folders']; if (!$simple) { echo ' <table width="98%" align="center" cellpadding="2" cellspacing="4" class="tables5"> @@ -270,7 +271,7 @@ <table width="100%" align="center" cellpadding="1" cellspacing="6" class="tables5"> <tr> <td class="tables4" width="15%" nowrap> - ',$folder_dsp,' + ',$dsp_folders[urldecode($hm_input['mailbox'])],' </td> <td class="tables1" nowrap> ',"\n"; @@ -401,12 +402,7 @@ <input type="submit" class="button4" name="action" value="Delete"> <input type="submit" class="button4" name="action" value="Copy">-<input type="submit" class="button4" name="action" value="Move">--> <select class="select3" name="destination">',"\n"; - foreach($_SESSION['folders'] as $folder) { - if (!in_array($folder, $_SESSION['nosel_folders'])) { - echo ' <option class="option3" value="',$folder, - '">',$dsp_folders[$folder],"</option>\n"; - } - } + hm_folder_options($hm_input['mailbox'], false, $simple, false, 'class="option3"'); echo ' </select>',"\n"; if (!$simple) { echo ' </td> @@ -699,12 +695,7 @@ <input type="submit" class="button4" name="action2" value="Delete"> <input type="submit" class="button4" name="action2" value="Copy">-<input type="submit" class="button4" name="action2" value="Move">--> <select class="select3" name="destination2">'; - foreach($_SESSION['folders'] as $folder) { - if (!in_array($folder, $_SESSION['nosel_folders'])) { - echo ' <option class="option3" value="',$folder, - '">',$dsp_folders[$folder],"</option>\n"; - } - } + hm_folder_options($hm_input['mailbox'], false, $simple, false, 'class="option3"'); echo ' </select> </td> </tr> @@ -719,7 +710,7 @@ <table width="100%" align="center" cellpadding="1" cellspacing="6" class="tables5"> <tr> <td class="tables4" nowrap width="15%"> - <b>',$folder_dsp,'</b> + <b>',$dsp_folders[urldecode($hm_input['mailbox'])],'</b> </td> <td class="tables1"> ',"\n"; Index: search.php =================================================================== RCS file: /cvsroot/hastymail/hastymail/html/search.php,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- search.php 1 Aug 2003 04:25:29 -0000 1.21 +++ search.php 2 Aug 2003 20:44:57 -0000 1.22 @@ -23,6 +23,10 @@ } $hm_input['id'] = session_id(); +if (isset($_SESSION['settings']['simple']) && $_SESSION['settings']['simple'] == 'true') { + $simple = $_SESSION['settings']['simple']; +} + /* login to imap */ if (!$imap_stream = hm_imap_login($_SESSION['user'], $_SESSION['pass'], $config['imap_server'], $config['imap_port'], $config['imap_ssl'])) { @@ -33,13 +37,15 @@ if (!isset($_SESSION['folders'])) { $_SESSION['folders'] = hm_boxlist($imap_stream); } -$dsp_folders = hm_folder_dsp($_SESSION['folders']); +if (!isset($_SESSION['dsp_folders'])) { + $_SESSION['dsp_folders'] = hm_folder_dsp($_SESSION['folders']); +} /* get unseen messages */ $unseen = hm_unseen_status ($imap_stream, $_SESSION['folders']); /* toolbar */ -hm_toolbar($imap_stream, $hm_input['mailbox'], $unseen, false, $dsp_folders); +hm_toolbar($imap_stream, $hm_input['mailbox'], $unseen, false); /* check for error message */ if (isset($_SESSION['del_error']) && $_SESSION['del_error'] != '') { @@ -380,12 +386,7 @@ <input type="submit" class="button4" name="action" value="Delete"> <input type="submit" class="button4" name="action" value="Copy">-<input type="submit" class="button4" name="action" value="Move">--> <select class="select3" name="destination">',"\n"; - foreach($_SESSION['folders'] as $folder) { - if (!in_array($folder, $_SESSION['nosel_folders'])) { - echo ' <option class="option3" value="',$folder, - '">',$dsp_folders[$folder],"</option>\n"; - } - } + hm_folder_options($hm_input['mailbox'], false, $simple, false, 'class="option3"'); echo ' </select> </td> </tr> @@ -429,7 +430,7 @@ <a class="font2" href="mailbox.php?mailbox=',urlencode($folder), '&id=',$hm_input['id'],'"> - <b><small>',htmlentities($dsp_folders[$folder]),' + <b><small>',htmlentities($_SESSION['dsp_folders'][$folder]),' </small></b> </a> <font class="font2"><small><small> @@ -570,15 +571,7 @@ <tr> <td nowrap align="center"> <select name="search_folders[]" multiple size="20">',"\n"; - foreach($_SESSION['folders'] as $folder) { - if (!in_array($folder, $_SESSION['nosel_folders'])) { - echo ' <option class="option2" '; - if (in_array($folder, $search_folder)) { - echo 'SELECTED '; - } - echo 'value="',$folder,'">',$dsp_folders[$folder],"</option>\n"; - } - } + hm_folder_options($search_folder, false, $simple, false); echo ' </select> </td> </tr> |