extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-10-06 10:02:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

stuff regarding egw_refresh and interdependecys with the mail app

Browse Source
This commit is contained in:
Klaus Leithoff 2014-01-13 13:06:29 +00:00
parent dc614521b3
commit eb97a233a1
4 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mail/inc/class.mail_bo.inc.php
View File

@ -2855,6 +2855,7 @@ class mail_bo
$ret = $this->icServer->store($folder, array('add'=>array('\\Flagged'), 'ids'=> $uidsToModify)); $ret = $this->icServer->store($folder, array('add'=>array('\\Flagged'), 'ids'=> $uidsToModify));
break; break;
case "read": case "read":
case "seen":
$ret = $this->icServer->store($folder, array('add'=>array('\\Seen'), 'ids'=> $uidsToModify)); $ret = $this->icServer->store($folder, array('add'=>array('\\Seen'), 'ids'=> $uidsToModify));
break; break;
case "forwarded": case "forwarded":
@ -2866,6 +2867,7 @@ class mail_bo
$ret = $this->icServer->store($folder, array('remove'=>array('\\Flagged'), 'ids'=> $uidsToModify)); $ret = $this->icServer->store($folder, array('remove'=>array('\\Flagged'), 'ids'=> $uidsToModify));
break; break;
case "unread": case "unread":
case "unseen":
$ret = $this->icServer->store($folder, array('remove'=>array('\\Seen','\\Answered','$Forwarded'), 'ids'=> $uidsToModify)); $ret = $this->icServer->store($folder, array('remove'=>array('\\Seen','\\Answered','$Forwarded'), 'ids'=> $uidsToModify));
break; break;
case "mdnsent": case "mdnsent":

2
mail/inc/class.mail_compose.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package mail * @package mail
* @author Stylite AG [info@stylite.de] * @author Stylite AG [info@stylite.de]
* @copyright (c) 2013 by Stylite AG <info-AT-stylite.de> * @copyright (c) 2013-2014 by Stylite AG <info-AT-stylite.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */

18
mail/inc/class.mail_ui.inc.php
View File

@ -5,7 +5,7 @@
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @package mail * @package mail
* @author Stylite AG [info@stylite.de] * @author Stylite AG [info@stylite.de]
* @copyright (c) 2013 by Stylite AG <info-AT-stylite.de> * @copyright (c) 2013-2014 by Stylite AG <info-AT-stylite.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
*/ */
@ -3293,7 +3293,7 @@ blockquote[type=cite] {
{ {
$this->mail_bo->resetFolderObjectCache($profileID); $this->mail_bo->resetFolderObjectCache($profileID);
$response = egw_json_response::get(); $response = egw_json_response::get();
$response->call('app.mail.mail_reloadNode',array($_parentFolderName=>$oldFolderInfo['shortDisplayName']),'mail'); $response->call('app.mail.mail_reloadNode',array($_parentFolderName=>$oldFolderInfo['shortDisplayName']));
} }
} }
} }
@ -3365,7 +3365,7 @@ $success=true;
$response = egw_json_response::get(); $response = egw_json_response::get();
if ($oA && $success) if ($oA && $success)
{ {
$response->call('app.mail.mail_setLeaf',$oA,'mail'); $response->call('app.mail.mail_setLeaf',$oA);
} }
else else
{ {
@ -3506,7 +3506,7 @@ $success=true;
$response = egw_json_response::get(); $response = egw_json_response::get();
if ($oA && $success) if ($oA && $success)
{ {
$response->call('app.mail.mail_setLeaf',$oA,'mail'); $response->call('app.mail.mail_setLeaf',$oA);
} }
else else
{ {
@ -3757,7 +3757,7 @@ $success=true;
} }
egw_cache::setCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$folders2return, $expiration=60*60*1); egw_cache::setCache(egw_cache::INSTANCE,'email','folderObjects'.trim($GLOBALS['egw_info']['user']['account_id']),$folders2return, $expiration=60*60*1);
//error_log(__METHOD__.__LINE__.array2string($oA)); //error_log(__METHOD__.__LINE__.array2string($oA));
$response->call('app.mail.mail_removeLeaf',$oA,'mail'); $response->call('app.mail.mail_removeLeaf',$oA);
} }
else else
{ {
@ -3816,7 +3816,7 @@ $success=true;
} }
$response = egw_json_response::get(); $response = egw_json_response::get();
$response->call('app.mail.mail_setQuotaDisplay',array('data'=>$content),'mail'); $response->call('app.mail.mail_setQuotaDisplay',array('data'=>$content));
} }
/** /**
@ -3897,7 +3897,7 @@ $success=true;
} }
*/ */
$response = egw_json_response::get(); $response = egw_json_response::get();
$response->call('egw_refresh',lang('flagged %1 messages as %2 in %3',count($_messageList['msg']),lang($_flag),$folder),'mail'); $response->call('egw_message',lang('flagged %1 messages as %2 in %3',count($_messageList['msg']),lang($_flag),$folder));
} }
/** /**
@ -3940,12 +3940,12 @@ $success=true;
$response = egw_json_response::get(); $response = egw_json_response::get();
if (empty($error)) if (empty($error))
{ {
$response->call('egw_refresh',lang('deleted %1 messages in %2',count($_messageList['msg']),$folder),'mail'); $response->call('app.mail.mail_deleteMessagesShowResult',array('egw_message'=>lang('deleted %1 messages in %2',count($_messageList['msg']),$folder),'msg'=>$_messageList['msg']));
} }
else else
{ {
$error = str_replace('\n',"\n",lang('mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)',$error)); $error = str_replace('\n',"\n",lang('mailserver reported:\n%1 \ndo you want to proceed by deleting the selected messages immediately (click ok)?\nif not, please try to empty your trashfolder before continuing. (click cancel)',$error));
$response->call('app.mail.mail_retryForcedDelete',array('response'=>$error,'messageList'=>$_messageList),'mail'); $response->call('app.mail.mail_retryForcedDelete',array('response'=>$error,'messageList'=>$_messageList));
} }
} }
else else

47
mail/js/app.js
View File

@ -3,7 +3,7 @@
* *
* @link http://www.egroupware.org * @link http://www.egroupware.org
* @author Stylite AG [info@stylite.de] * @author Stylite AG [info@stylite.de]
* @copyright (c) 2013 by Stylite AG <info-AT-stylite.de> * @copyright (c) 2013-2014 by Stylite AG <info-AT-stylite.de>
* @package mail * @package mail
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$ * @version $Id$
@ -67,7 +67,7 @@ app.classes.mail = AppJS.extend(
0 0
); );
window.register_app_refresh("mail", this.app_refresh); //window.register_app_refresh("mail", this.app_refresh);
}, },
/** /**
@ -800,7 +800,7 @@ app.classes.mail = AppJS.extend(
for (var i in _status) for (var i in _status)
{ {
// if olddesc is undefined or #skip# then skip the message, as we process subfolders // if olddesc is undefined or #skip# then skip the message, as we process subfolders
if (typeof _status[i]['olddesc'] !== 'undefined' && _status[i]['olddesc'] !== '#skip-user-interaction-message#') this.app_refresh(this.egw.lang("Renamed Folder %1 to %2",_status[i]['olddesc'],_status[i]['desc'], 'mail')); if (typeof _status[i]['olddesc'] !== 'undefined' && _status[i]['olddesc'] !== '#skip-user-interaction-message#') egw_message(this.egw.lang("Renamed Folder %1 to %2",_status[i]['olddesc'],_status[i]['desc']));
ftree.renameItem(i,_status[i]['id'],_status[i]['desc']); ftree.renameItem(i,_status[i]['id'],_status[i]['desc']);
//alert(i +'->'+_status[i]['id']+'+'+_status[i]['desc']); //alert(i +'->'+_status[i]['id']+'+'+_status[i]['desc']);
if (_status[i]['id']==selectedNode.id) if (_status[i]['id']==selectedNode.id)
@ -825,7 +825,7 @@ app.classes.mail = AppJS.extend(
for (var i in _status) for (var i in _status)
{ {
// if olddesc is undefined or #skip# then skip the message, as we process subfolders // if olddesc is undefined or #skip# then skip the message, as we process subfolders
if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#') this.app_refresh(this.egw.lang("Removed Folder %1 ",_status[i], 'mail')); if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#') egw_message(this.egw.lang("Removed Folder %1 ",_status[i]));
ftree.deleteItem(i,(selectedNode.id==i)); ftree.deleteItem(i,(selectedNode.id==i));
var selectedNodeAfter = ftree.getSelectedNode(); var selectedNodeAfter = ftree.getSelectedNode();
//alert(i +'->'+_status[i]['id']+'+'+_status[i]['desc']); //alert(i +'->'+_status[i]['id']+'+'+_status[i]['desc']);
@ -852,7 +852,7 @@ app.classes.mail = AppJS.extend(
// if olddesc is undefined or #skip# then skip the message, as we process subfolders // if olddesc is undefined or #skip# then skip the message, as we process subfolders
if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#') if (typeof _status[i] !== 'undefined' && _status[i] !== '#skip-user-interaction-message#')
{ {
this.app_refresh(this.egw.lang("Reloaded Folder %1 ",typeof _status[i] == "string" ? _status[i] : _status[i].text), 'mail'); egw_message(this.egw.lang("Reloaded Folder %1 ",typeof _status[i] == "string" ? _status[i] : _status[i].text));
} }
ftree.refreshItem(i,typeof _status[i] == "object" ? _status[i] : null); ftree.refreshItem(i,typeof _status[i] == "object" ? _status[i] : null);
} }
@ -895,6 +895,7 @@ app.classes.mail = AppJS.extend(
* @param string|int _id=null id of entry to refresh * @param string|int _id=null id of entry to refresh
* @param string _type=null either 'edit', 'delete', 'add' or null * @param string _type=null either 'edit', 'delete', 'add' or null
*/ */
/*
app_refresh: function(_msg, _app, _id, _type) app_refresh: function(_msg, _app, _id, _type)
{ {
var bufferExists = false; var bufferExists = false;
@ -920,6 +921,7 @@ app.classes.mail = AppJS.extend(
//this.doStatus = window.setInterval("app.mail.mail_setMsg(myMessageBuffer);", 10000); //this.doStatus = window.setInterval("app.mail.mail_setMsg(myMessageBuffer);", 10000);
} }
}, },
*/
/** /**
* mail_getMsg - gets the current Message * mail_getMsg - gets the current Message
@ -977,7 +979,7 @@ app.classes.mail = AppJS.extend(
} }
var msg = this.mail_getFormData(_elems); var msg = this.mail_getFormData(_elems);
//alert(_action.id+','+ msg); //alert(_action.id+','+ msg);
this.app_refresh(this.egw.lang('delete messages'), 'mail'); egw_message(this.egw.lang('delete messages'));
if (!calledFromPopup) this.mail_setRowClass(_elems,'deleted'); if (!calledFromPopup) this.mail_setRowClass(_elems,'deleted');
this.mail_deleteMessages(msg,'no',calledFromPopup); this.mail_deleteMessages(msg,'no',calledFromPopup);
if (calledFromPopup && this.mail_isMainWindow==false) window.close(); if (calledFromPopup && this.mail_isMainWindow==false) window.close();
@ -991,11 +993,26 @@ app.classes.mail = AppJS.extend(
*/ */
mail_deleteMessages: function(_msg,_action,_calledFromPopup) mail_deleteMessages: function(_msg,_action,_calledFromPopup)
{ {
this.app_refresh(this.egw.lang('delete messages'), 'mail'); egw_message(this.egw.lang('delete messages'));
egw.json('mail.mail_ui.ajax_deleteMessages',[_msg,(typeof _action == 'undefined'?'no':_action)]) egw.json('mail.mail_ui.ajax_deleteMessages',[_msg,(typeof _action == 'undefined'?'no':_action)])
.sendRequest(); .sendRequest();
for (var i = 0; i < _msg['msg'].length; i++) egw.dataDeleteUID(_msg['msg'][i]); },
this.mail_refreshMessageGrid(_calledFromPopup);
/**
* Delete mails show result - called from the backend function for display of deletionmessages
* takes in all arguments
* @param _msg - message list
*/
mail_deleteMessagesShowResult: function(_msg)
{
var myMessage = _msg['egw_message'];
for (var i = 0; i < _msg['msg'].length; i++)
{
egw_refresh(myMessage,'mail',_msg['msg'][i].replace(/mail::/,''),'delete');
egw.dataDeleteUID(_msg['msg'][i]);
}
//this.mail_refreshMessageGrid(_calledFromPopup);
this.mail_preview(); this.mail_preview();
}, },
@ -1016,7 +1033,7 @@ app.classes.mail = AppJS.extend(
} }
else else
{ {
this.app_refresh(this.egw.lang('canceled deletion due to userinteraction'), 'mail'); egw_message(this.egw.lang('canceled deletion due to userinteraction'));
this.mail_removeRowClass(messageList,'deleted'); this.mail_removeRowClass(messageList,'deleted');
} }
this.mail_refreshMessageGrid(); this.mail_refreshMessageGrid();
@ -1048,7 +1065,7 @@ app.classes.mail = AppJS.extend(
* mail_emptyTrash * mail_emptyTrash
*/ */
mail_emptyTrash: function() { mail_emptyTrash: function() {
this.app_refresh(this.egw.lang('empty trash'), 'mail'); egw_message(this.egw.lang('empty trash'));
egw.json('mail.mail_ui.ajax_emptyTrash') egw.json('mail.mail_ui.ajax_emptyTrash')
.sendRequest(true); .sendRequest(true);
this.mail_refreshFolderStatus(); this.mail_refreshFolderStatus();
@ -1058,7 +1075,7 @@ app.classes.mail = AppJS.extend(
* mail_compressFolder * mail_compressFolder
*/ */
mail_compressFolder: function() { mail_compressFolder: function() {
this.app_refresh(this.egw.lang('compress folder'), 'mail'); egw_message(this.egw.lang('compress folder'));
egw.json('mail.mail_ui.ajax_compressFolder') egw.json('mail.mail_ui.ajax_compressFolder')
.sendRequest(true); .sendRequest(true);
this.mail_refreshFolderStatus(); this.mail_refreshFolderStatus();
@ -1086,7 +1103,7 @@ app.classes.mail = AppJS.extend(
mail_changeFolder: function(folder,_widget) { mail_changeFolder: function(folder,_widget) {
//alert('change Folder called:'+folder); //alert('change Folder called:'+folder);
var server = folder.split('::'); var server = folder.split('::');
this.app_refresh(this.egw.lang('change folder')+'...', 'mail'); (this.egw.lang('change folder')+'...', 'mail');
var img = _widget.getSelectedNode().images[0]; // fetch first image var img = _widget.getSelectedNode().images[0]; // fetch first image
var profileChange = false; var profileChange = false;
if (!(img.search(eval('/'+'NoSelect'+'/'))<0) || !(img.search(eval('/'+'thunderbird'+'/'))<0)) if (!(img.search(eval('/'+'NoSelect'+'/'))<0) || !(img.search(eval('/'+'thunderbird'+'/'))<0))
@ -1245,10 +1262,10 @@ app.classes.mail = AppJS.extend(
{ {
//console.log('mail_flagMessages',_flag, _elems); //console.log('mail_flagMessages',_flag, _elems);
if (typeof _refreshGrid == 'undefined') _refreshGrid=true; if (typeof _refreshGrid == 'undefined') _refreshGrid=true;
this.app_refresh(this.egw.lang('flag messages'), 'mail'); egw_message(this.egw.lang('flag messages'));
egw.json('mail.mail_ui.ajax_flagMessages',[_flag, _elems]) egw.json('mail.mail_ui.ajax_flagMessages',[_flag, _elems])
.sendRequest(); .sendRequest();
if (_refreshGrid) this.mail_refreshMessageGrid(_isPopup); //if (_refreshGrid) this.mail_refreshMessageGrid(_isPopup);
}, },
/** /**