From 3d0d5dbd0f35c47b21e2e574703a08f07ce677dd Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 08 May 2016 08:27:56 -0400
Subject: [PATCH] Performance improvements in format_flowed() and unfold_flowed()

---
 bin/cleandb.sh |   63 ++++---------------------------
 1 files changed, 8 insertions(+), 55 deletions(-)

diff --git a/bin/cleandb.sh b/bin/cleandb.sh
index 8124d2c..0bf71ea 100755
--- a/bin/cleandb.sh
+++ b/bin/cleandb.sh
@@ -1,13 +1,15 @@
 #!/usr/bin/env php
 <?php
 /*
-
  +-----------------------------------------------------------------------+
  | bin/cleandb.sh                                                        |
  |                                                                       |
  | This file is part of the Roundcube Webmail client                     |
- | Copyright (C) 2010, Roundcube Dev. - Switzerland                      |
- | Licensed under the GNU GPL                                            |
+ | 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.                |
+ | See the README file for a full license statement.                     |
  |                                                                       |
  | PURPOSE:                                                              |
  |   Finally remove all db records marked as deleted some time ago       |
@@ -15,66 +17,17 @@
  +-----------------------------------------------------------------------+
  | Author: Thomas Bruederli <roundcube@gmail.com>                        |
  +-----------------------------------------------------------------------+
-
- $Id$
-
 */
 
-if (php_sapi_name() != 'cli') {
-    die('Not on the "shell" (php-cli).');
-}
+define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
 
-define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
-require INSTALL_PATH.'program/include/iniset.php';
-
-// mapping for table name => primary key
-$primary_keys = array(
-    'contacts' => "contact_id",
-    'contactgroups' => "contactgroup_id",
-);
-
-// connect to DB
-$RCMAIL = rcmail::get_instance();
-$db = $RCMAIL->get_dbh();
-
-if (!$db->is_connected() || $db->is_error)
-    die("No DB connection");
+require INSTALL_PATH.'program/include/clisetup.php';
 
 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 = get_table_name($table);
-
-    // 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 = get_table_name('contactgroupmembers');
-
-        $db->query(
-            "DELETE FROM $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);
 
 ?>

--
Gitblit v1.9.1