--- a/bin/cleandb.sh	Sat Dec 29 06:32:49 2018 -0500
+++ b/bin/cleandb.sh	Sat Dec 29 07:07:34 2018 -0500
@@ -5,7 +5,7 @@
  | bin/cleandb.sh                                                        |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2010, The Roundcube Dev Team                            |
+ | Copyright (C) 2010-2015, The Roundcube Dev Team                       |
  |                                                                       |
  | Licensed under the GNU General Public License version 3 or            |
  | any later version with exceptions for skins & plugins.                |
@@ -23,56 +23,11 @@
 
 require INSTALL_PATH.'program/include/clisetup.php';
 
-// mapping for table name => primary key
-$primary_keys = array(
-    'contacts' => "contact_id",
-    'contactgroups' => "contactgroup_id",
-);
-
-// connect to DB
-$RCMAIL = rcube::get_instance();
-$db = $RCMAIL->get_dbh();
-$db->db_connect('w');
-
-if (!$db->is_connected() || $db->is_error()) {
-    rcube::raise_error("No DB connection", false, true);
-}
-
 if (!empty($_SERVER['argv'][1]))
     $days = intval($_SERVER['argv'][1]);
 else
     $days = 7;
 
-// remove all deleted records older than two days
-$threshold = date('Y-m-d 00:00:00', time() - $days * 86400);
-
-foreach (array('contacts','contactgroups','identities') as $table) {
-
-    $sqltable = $db->table_name($table, true);
-
-    // also delete linked records
-    // could be skipped for databases which respect foreign key constraints
-    if ($db->db_provider == 'sqlite'
-        && ($table == 'contacts' || $table == 'contactgroups')
-    ) {
-        $pk = $primary_keys[$table];
-        $memberstable = $db->table_name('contactgroupmembers');
-
-        $db->query(
-            "DELETE FROM " . $db->quote_identifier($memberstable).
-            " WHERE `$pk` IN (".
-                "SELECT `$pk` FROM $sqltable".
-                " WHERE `del` = 1 AND `changed` < ?".
-            ")",
-            $threshold);
-
-        echo $db->affected_rows() . " records deleted from '$memberstable'\n";
-    }
-
-    // delete outdated records
-    $db->query("DELETE FROM $sqltable WHERE `del` = 1 AND `changed` < ?", $threshold);
-
-    echo $db->affected_rows() . " records deleted from '$table'\n";
-}
+rcmail_utils::db_clean($days);
 
 ?>