Remove deprecated function usage (get_table_name)

Aleksander Machniak

2014-09-10 315a0b787c2b1409365226842751face7ab0974c

 bin/cleandb.sh

@@ -1,7 +1,6 @@
#!/usr/bin/env php
<?php
/*

 +-----------------------------------------------------------------------+
 | bin/cleandb.sh                                                        |
 |                                                                       |
@@ -18,9 +17,6 @@
 +-----------------------------------------------------------------------+
 | Author: Thomas Bruederli <roundcube@gmail.com>                        |
 +-----------------------------------------------------------------------+

 $Id$

*/

define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
@@ -38,8 +34,9 @@
$db = $RCMAIL->get_dbh();
$db->db_connect('w');

if (!$db->is_connected() || $db->is_error())
    die("No DB connection\n");
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]);
@@ -51,7 +48,7 @@

foreach (array('contacts','contactgroups','identities') as $table) {

    $sqltable = get_table_name($table);
    $sqltable = $db->table_name($table);

    // also delete linked records
    // could be skipped for databases which respect foreign key constraints
@@ -59,7 +56,7 @@
        && ($table == 'contacts' || $table == 'contactgroups')
    ) {
        $pk = $primary_keys[$table];
        $memberstable = get_table_name('contactgroupmembers');
        $memberstable = $db->table_name('contactgroupmembers');

        $db->query(
            "DELETE FROM $memberstable".