* fixing #1484494 (people can delete the last identity otherwise)

* FOR TRANSLATERS: introducing new message
release-0.6
till 17 years ago
parent 56c4587f0a
commit e3a0af34d5

@ -241,6 +241,15 @@ class rcube_user
if (!$this->ID)
return false;
$sql_result = $DB->query("SELECT count(*) AS ident_count FROM " .
get_table_name('identities') .
" WHERE user_id = ? AND del != 1",
$this->ID);
$sql_arr = $DB->fetch_assoc($sql_result);
if ($sql_arr['ident_count'] <= 1)
return false;
$DB->query(
"UPDATE ".get_table_name('identities')."

@ -76,5 +76,5 @@ $messages['errorsavingcontact'] = 'Die Änderungen konnten nicht gespeichert wer
$messages['movingmessage'] = 'Die E-Mail wird verschoben...';
$messages['receiptsent'] = 'Bestätigung erfolgreich gesendet';
$messages['errorsendingreceipt'] = 'Bestätigung konnte nicht gesendet werden';
$messages['nodeletelastidentity'] = 'Sie koennen diesen Absender nicht loeschen.';
?>

@ -74,5 +74,5 @@ $messages['copyerror'] = 'Could not copy any addresses';
$messages['sourceisreadonly'] = 'This address source is read-only';
$messages['errorsavingcontact'] = 'Could not save the contact address';
$messages['movingmessage'] = 'Moving message...';
$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
?>

@ -76,5 +76,5 @@ $messages['errorsavingcontact'] = 'Could not save the contact address';
$messages['movingmessage'] = 'Moving message...';
$messages['receiptsent'] = 'Successfully sent a read receipt';
$messages['errorsendingreceipt'] = 'Could not send the receipt';
$messages['nodeletelastidentity'] = 'You cannot delete this identity, it\'s your last one.';
?>

@ -23,8 +23,13 @@ if (($ids = get_input_value('_iid', RCUBE_INPUT_GET)) && preg_match('/^[0-9]+(,[
{
if ($USER->delete_identity($ids))
{
$OUTPUT->show_message('deletedsuccessfully', 'confirmation');
}
else
{
$OUTPUT->show_message('nodeletelastidentity', 'error');
}
// send response
if ($OUTPUT->ajax_call)
$OUTPUT->send();

Loading…
Cancel
Save