← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/squirrelmail/intrepid-security

« back to all changes in this revision

Viewing changes to src/folders_delete.php

  • Committer: Bazaar Package Importer
  • Author(s): Thijs Kinkhorst
  • Date: 2006-12-04 09:18:09 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061204091809-f5tmhfdfy71y0cwn
Tags: 2:1.4.9a-1
* New upstream security release.
  - Additionally tightens HTML filter for IE <= 5 parsing
    absolutely everything and it's horse.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/folders_delete.php
9
9
 * Deletes folders from the IMAP server. 
10
10
 * Called from the folders.php
11
11
 *
12
 
 * @version $Id: folders_delete.php,v 1.60.2.6 2006/02/03 22:27:55 jervfors Exp $
 
12
 * @version $Id: folders_delete.php,v 1.60.2.7 2006/08/15 17:42:32 tokul Exp $
13
13
 * @package squirrelmail
14
14
 */
15
15
 
89
89
 
90
90
/** lets see if we CAN move folders to the trash.. otherwise,
91
91
    ** just delete them **/
92
 
 
93
 
/* Courier IMAP doesn't like subfolders of Trash
94
 
 * If global options say we can't move it into Trash
95
 
 * If it's already a subfolder of trash, we'll have to delete it */
96
 
if (strtolower($imap_server_type) == 'courier' || 
97
 
    (isset($delete_folder) && $delete_folder) ||
98
 
    eregi('^'.$trash_folder.'.+', $mailbox) )
99
 
{
 
92
if ((isset($delete_folder) && $delete_folder) ||
 
93
    eregi('^'.$trash_folder.'.+', $mailbox) ) {
100
94
    $can_move_to_trash = FALSE;
101
95
}
102
96