Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-04 23:34:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

- Plugin API: improved 'abort' flag handling, added 'result' item in some hooks: group_*, contact_*, identity_* (#1486914)

Browse Source
This commit is contained in:
alecpl
2010-09-30 13:24:33 +00:00
parent 66c674cc57
commit ce92ba767a
9 changed files with 112 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
program/steps/settings/delete_identity.inc
View File

@@ -32,12 +32,13 @@ if ($iid && preg_match('/^[0-9]+(,[0-9]+)*$/', $iid))
{
$plugin = $RCMAIL->plugins->exec_hook('identity_delete', array('id' => $iid));
if (!$plugin['abort'] && $USER->delete_identity($iid)) {
$deleted = !$plugin['abort'] ? $USER->delete_identity($iid) : $plugin['result'];
if ($deleted)
$OUTPUT->show_message('deletedsuccessfully', 'confirmation', null, false);
}
else {
$OUTPUT->show_message('nodeletelastidentity', 'error', null, false);
}
else
$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'nodeletelastidentity', 'error', null, false);
// send response
if ($OUTPUT->ajax_call)
$OUTPUT->send();
@@ -48,5 +49,3 @@ if ($OUTPUT->ajax_call)
// go to identities page
rcmail_overwrite_action('identities');

35
program/steps/settings/save_identity.inc
View File

@@ -83,23 +83,25 @@ if ($_POST['_iid'])
if ($save_data['reply-to'])
$save_data['reply-to'] = idn_to_ascii($save_data['reply-to']);
if (!$plugin['abort'] && ($updated = $USER->update_identity($iid, $save_data)))
{
if (!$plugin['abort'])
$updated = $USER->update_identity($iid, $save_data);
else
$updated = $plugin['result'];
if ($updated) {
$OUTPUT->show_message('successfullysaved', 'confirmation');
if (!empty($_POST['_standard']))
$default_id = get_input_value('_iid', RCUBE_INPUT_POST);
if ($_POST['_framed'])
{
if ($_POST['_framed']) {
// update the changed col in list
// ...
}
}
else if ($plugin['abort'] || $DB->is_error())
{
else {
// show error message
$OUTPUT->show_message('errorsaving', 'error', null, false);
$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
rcmail_overwrite_action('edit-identity');
return;
}
@@ -118,8 +120,12 @@ else if (IDENTITIES_LEVEL < 2)
$save_data['bcc'] = idn_to_ascii($save_data['bcc']);
$save_data['reply-to'] = idn_to_ascii($save_data['reply-to']);
if (!$plugin['abort'] && $save_data['email'] && ($insert_id = $USER->insert_identity($save_data)))
{
if (!$plugin['abort'])
$insert_id = $save_data['email'] ? $USER->insert_identity($save_data) : null;
else
$insert_id = $plugin['result'];
if ($insert_id) {
$OUTPUT->show_message('successfullysaved', 'confirmation', null, false);
$_GET['_iid'] = $insert_id;
@@ -127,10 +133,9 @@ else if (IDENTITIES_LEVEL < 2)
if (!empty($_POST['_standard']))
$default_id = $insert_id;
}
else
{
else {
// show error message
$OUTPUT->show_message('errorsaving', 'error', null, false);
$OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'errorsaving', 'error', null, false);
rcmail_overwrite_action('edit-identity');
return;
}
@@ -145,5 +150,3 @@ if ($default_id)
// go to next step
rcmail_overwrite_action('identities');