diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_addressbook.php | 3 | ||||
| -rw-r--r-- | program/include/rcube_contacts.php | 17 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 5 | ||||
| -rw-r--r-- | program/steps/addressbook/delete.inc | 9 | ||||
| -rw-r--r-- | program/steps/addressbook/func.inc | 5 |
5 files changed, 22 insertions, 17 deletions
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php index 3581b83d1..45ad0be5d 100644 --- a/program/include/rcube_addressbook.php +++ b/program/include/rcube_addressbook.php @@ -250,8 +250,9 @@ abstract class rcube_addressbook * Mark one or more contact records as deleted * * @param array Record identifiers + * @param bool Remove records irreversible (see self::undelete) */ - function delete($ids) + function delete($ids, $force=true) { /* empty for read-only address books */ } diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index 52667fab3..799d59618 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -604,13 +604,13 @@ class rcube_contacts extends rcube_addressbook return $updated; } - - + + private function convert_db_data($sql_arr) { $record = array(); $record['ID'] = $sql_arr[$this->primary_key]; - + if ($sql_arr['vcard']) { unset($sql_arr['email']); $vcard = new rcube_vcard($sql_arr['vcard']); @@ -620,7 +620,7 @@ class rcube_contacts extends rcube_addressbook $record += $sql_arr; $record['email'] = preg_split('/,\s*/', $record['email']); } - + return $record; } @@ -668,16 +668,17 @@ class rcube_contacts extends rcube_addressbook /** * Mark one or more contact records as deleted * - * @param array Record identifiers + * @param array Record identifiers + * @param boolean Remove record(s) irreversible (unsupported) */ - function delete($ids) + function delete($ids, $force=true) { if (!is_array($ids)) $ids = explode(',', $ids); $ids = $this->db->array2list($ids, 'integer'); - // flag record as deleted + // flag record as deleted (always) $this->db->query( "UPDATE ".get_table_name($this->db_name). " SET del=1, changed=".$this->db->now(). @@ -704,7 +705,7 @@ class rcube_contacts extends rcube_addressbook $ids = $this->db->array2list($ids, 'integer'); - // flag record as deleted + // clear deleted flag $this->db->query( "UPDATE ".get_table_name($this->db_name). " SET del=0, changed=".$this->db->now(). diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 4ea4f6046..4205df271 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -834,11 +834,12 @@ class rcube_ldap extends rcube_addressbook /** * Mark one or more contact records as deleted * - * @param array Record identifiers + * @param array Record identifiers + * @param boolean Remove record(s) irreversible (unsupported) * * @return boolean True on success, False on error */ - function delete($ids) + function delete($ids, $force=true) { if (!is_array($ids)) { // Not an array, break apart the encoded DNs. diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc index f11752b70..b0b255e27 100644 --- a/program/steps/addressbook/delete.inc +++ b/program/steps/addressbook/delete.inc @@ -27,6 +27,7 @@ $cids = rcmail_get_cids(); $delcnt = 0; // remove previous deletes +$undo_time = $RCMAIL->config->get('undo_timeout', 0); $RCMAIL->session->remove('contact_undo'); foreach ($cids as $source => $cid) @@ -47,7 +48,7 @@ foreach ($cids as $source => $cid) $plugin = $RCMAIL->plugins->exec_hook('contact_delete', array( 'id' => $cid, 'source' => $source)); - $deleted = !$plugin['abort'] ? $CONTACTS->delete($cid) : $plugin['result']; + $deleted = !$plugin['abort'] ? $CONTACTS->delete($cid, $undo_time < 1) : $plugin['result']; if (!$deleted) { $OUTPUT->show_message($plugin['message'] ? $plugin['message'] : 'contactdelerror', 'error'); @@ -57,8 +58,8 @@ foreach ($cids as $source => $cid) else { $delcnt += $deleted; - // store deleted contacts IDs in session for undelete - if ($CONTACTS->undelete) { + // store deleted contacts IDs in session for undo action + if ($undo_time > 0 && $CONTACTS->undelete) { $_SESSION['contact_undo']['data'][$source] = $cid; } } @@ -147,7 +148,7 @@ if (!empty($_SESSION['contact_undo'])) { $msg = html::span(null, rcube_label(array('name' => 'itemsdeleted', 'vars' => array('num' => $deleted)))) . ' ' . html::a(array('onclick' => JS_OBJECT_NAME.".command('undo', '', this)"), rcube_label('undo')); - $OUTPUT->show_message($msg, 'confirmation', null, true, $RCMAIL->config->get('undo_timeout', 15)); + $OUTPUT->show_message($msg, 'confirmation', null, true, $undo_time); } else { $OUTPUT->show_message('contactdeleted', 'confirmation'); diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index a895b617f..62c61ecd0 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.inc @@ -90,8 +90,9 @@ if (!$RCMAIL->action && !$OUTPUT->ajax_call) { // remove undo information... if ($undo = $_SESSION['contact_undo']) { - // ...after 30 seconds - if ($undo['ts'] < time() - 30) + // ...after timeout + $undo_time = $RCMAIL->config->get('undo_timeout', 0); + if ($undo['ts'] < time() - $undo_time) $RCMAIL->session->remove('contact_undo'); } |