extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-23 23:29:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

on deleting auto-draft-messages, use remove_immediately, to avoid cluttering the trash-box

Browse Source
This commit is contained in:
Klaus Leithoff 2012-05-02 14:21:43 +00:00
parent 154b8ac761
commit 0b3e5228ac
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
felamimail/inc/class.ajaxfelamimail.inc.php
View File

@ -335,7 +335,7 @@ class ajaxfelamimail
if (isset($bocompose->sessionData['lastDrafted'])) $lastDrafted = $bocompose->sessionData['lastDrafted'];
$messageUid = $bocompose->saveAsDraft($formData,$folder); // folder may change
if ($lastDrafted && is_array($lastDrafted) && isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $lastDrafted['uid'] = trim($lastDrafted['uid']);
if ($lastDrafted && is_array($lastDrafted) && isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $this->bofelamimail->deleteMessages((array)$lastDrafted['uid'],$lastDrafted['folder']);
if ($lastDrafted && is_array($lastDrafted) && isset($lastDrafted['uid']) && !empty($lastDrafted['uid'])) $this->bofelamimail->deleteMessages((array)$lastDrafted['uid'],$lastDrafted['folder'],"remove_immediately");
if ($_autoSave)
{
$bocompose->sessionData['lastDrafted'] = array('uid'=>$messageUid,'folder'=>$folder);

18
felamimail/inc/class.bocompose.inc.php
View File

@ -32,7 +32,7 @@
function bocompose($_composeID = '', $_charSet = 'iso-8859-1')
{
$profileID = 0;
if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID']))
if (isset($GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID']))
$profileID = (int)$GLOBALS['egw_info']['user']['preferences']['felamimail']['ActiveProfileID'];
$this->displayCharset = strtolower($_charSet);
$this->bosignatures = new felamimail_bosignatures();
@ -41,7 +41,7 @@
$this->bopreferences =& $this->bofelamimail->bopreferences;
$this->preferences =& $this->bofelamimail->mailPreferences; // $this->bopreferences->getPreferences();
// we should get away from this $this->preferences->preferences should hold the same info
$this->preferencesArray =& $this->preferences->preferences; //$GLOBALS['egw_info']['user']['preferences']['felamimail'];
$this->preferencesArray =& $this->preferences->preferences; //$GLOBALS['egw_info']['user']['preferences']['felamimail'];
//force the default for the forwarding -> asmail
if (is_array($this->preferencesArray)) {
if (!array_key_exists('message_forwarding',$this->preferencesArray)
@ -84,11 +84,11 @@
$alert_msg = $e->getMessage();
}
if ($eliminateDoubleAttachments == true)
if ($eliminateDoubleAttachments == true)
foreach ((array)$this->sessionData['attachments'] as $k =>$attach)
if ($attach['name'] && $attach['name'] == $_formData['name'] &&
strtolower($_formData['type'])== strtolower($attach['type']) &&
stripos($_formData['file'],'vfs://') !== false) return;
stripos($_formData['file'],'vfs://') !== false) return;
if ($attachfailed === false)
{
@ -1040,9 +1040,9 @@
if(isset($this->preferences->preferences['sentFolder']) &&
$this->preferences->preferences['sentFolder'] != 'none' &&
$this->preferences->preferences['sendOptions'] != 'send_only' &&
$messageIsDraft == false)
$messageIsDraft == false)
{
if ($this->bofelamimail->folderExists($this->preferences->preferences['sentFolder'], true))
if ($this->bofelamimail->folderExists($this->preferences->preferences['sentFolder'], true))
{
$folder[] = $this->preferences->preferences['sentFolder'];
}
@ -1064,7 +1064,7 @@
}
}
$folder = array_unique($folder);
if (($this->preferences->preferences['sendOptions'] != 'send_only' && $this->preferences->preferences['sentFolder'] != 'none') && !(count($folder) > 0) &&
if (($this->preferences->preferences['sendOptions'] != 'send_only' && $this->preferences->preferences['sentFolder'] != 'none') && !(count($folder) > 0) &&
!($_formData['to_infolog']=='on' || $_formData['to_tracker']=='on'))
{
$this->errorInfo = lang("Error: ").lang("No Folder destination supplied, and no folder to save message or other measure to store the mail (save to infolog/tracker) provided, but required.").($this->errorInfo?' '.$this->errorInfo:'');
@ -1129,7 +1129,7 @@
$sentMailBody = $mail->getMessageBody();
}
// copying mail to folder
if (count($folder) > 0)
if (count($folder) > 0)
{
foreach($folder as $folderName) {
if (is_array($folderName)) $folderName = array_shift($folderName); // should not happen at all
@ -1171,7 +1171,7 @@
if (isset($lastDrafted['uid']) && (empty($lastDrafted['uid']) || $lastDrafted['uid'] == $this->sessionData['uid'])) $lastDrafted=false;
//error_log(__METHOD__.__LINE__.array2string($lastDrafted));
}
if ($lastDrafted && is_array($lastDrafted) && $bofelamimail->isDraftFolder($lastDrafted['folder'])) $bofelamimail->deleteMessages((array)$lastDrafted['uid'],$lastDrafted['folder']);
if ($lastDrafted && is_array($lastDrafted) && $bofelamimail->isDraftFolder($lastDrafted['folder'])) $bofelamimail->deleteMessages((array)$lastDrafted['uid'],$lastDrafted['folder'],"remove_immediately");
unset($this->sessionData['lastDrafted']);
//error_log("handling draft messages, flagging and such");

12
felamimail/inc/class.felamimail_bo.inc.php
View File

@ -824,7 +824,7 @@ class felamimail_bo
return true;
}
function deleteMessages($_messageUID, $_folder=NULL)
function deleteMessages($_messageUID, $_folder=NULL, $_forceDeleteMethod='no')
{
//error_log(__METHOD__.__LINE__.'->'.array2string($_messageUID).','.$_folder);
$msglist = '';
@ -842,8 +842,8 @@ class felamimail_bo
return false;
}
}
$deleteOptions = $this->mailPreferences->preferences['deleteOptions'];
$deleteOptions = $_forceDeleteMethod; // use forceDeleteMethod if not "no", or unknown method
if ($_forceDeleteMethod === 'no' || !in_array($_forceDeleteMethod,array('move_to_trash',"mark_as_deleted","remove_immediately"))) $deleteOptions = $this->mailPreferences->preferences['deleteOptions'];
$trashFolder = $this->mailPreferences->preferences['trashFolder'];
$draftFolder = $this->mailPreferences->preferences['draftFolder']; //$GLOBALS['egw_info']['user']['preferences']['felamimail']['draftFolder'];
$templateFolder = $this->mailPreferences->preferences['templateFolder']; //$GLOBALS['egw_info']['user']['preferences']['felamimail']['templateFolder'];
@ -989,14 +989,14 @@ class felamimail_bo
function getNotifyFlags ($_messageUID, $flags=null)
{
if($flags===null) $flags = $this->icServer->getFlags($_messageUID, true);
if (self::$debug) error_log(__METHOD__.$_messageUID.array2string($flags));
if (self::$debug) error_log(__METHOD__.$_messageUID.' Flags:'.array2string($flags));
if (PEAR::isError($flags)) {
return null;
}
if ( in_array('MDNSent',$flags[0]) )
if ( stripos( array2string($flags),'MDNSent')!==false)
return true;
if ( in_array('MDNnotSent',$flags[0]) )
if ( stripos( array2string($flags),'MDNnotSent')!==false)
return false;
return null;