summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cleandb.sh49
-rwxr-xr-xbin/indexcontacts.sh27
-rwxr-xr-xbin/initdb.sh42
-rwxr-xr-xbin/moduserprefs.sh35
-rwxr-xr-xbin/update.sh8
-rwxr-xr-xbin/updatedb.sh138
6 files changed, 51 insertions, 248 deletions
diff --git a/bin/cleandb.sh b/bin/cleandb.sh
index d811c8d01..0bf71ea62 100755
--- a/bin/cleandb.sh
+++ b/bin/cleandb.sh
@@ -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 @@ define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
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);
?>
diff --git a/bin/indexcontacts.sh b/bin/indexcontacts.sh
index 2844742f7..760e53792 100755
--- a/bin/indexcontacts.sh
+++ b/bin/indexcontacts.sh
@@ -24,31 +24,6 @@ define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
require_once INSTALL_PATH.'program/include/clisetup.php';
ini_set('memory_limit', -1);
-// 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);
-}
-
-// iterate over all users
-$sql_result = $db->query("SELECT `user_id` FROM " . $db->table_name('users', true) . " ORDER BY `user_id`");
-while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
- echo "Indexing contacts for user " . $sql_arr['user_id'] . "...";
-
- $contacts = new rcube_contacts($db, $sql_arr['user_id']);
- $contacts->set_pagesize(9999);
-
- $result = $contacts->list_records();
- while ($result->count && ($row = $result->next())) {
- unset($row['words']);
- $contacts->update($row['ID'], $row);
- }
-
- echo "done.\n";
-}
+rcmail_utils::indexcontacts();
?>
diff --git a/bin/initdb.sh b/bin/initdb.sh
new file mode 100755
index 000000000..fd22007d2
--- /dev/null
+++ b/bin/initdb.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/env php
+<?php
+/*
+ +-----------------------------------------------------------------------+
+ | bin/initdb.sh |
+ | |
+ | This file is part of the Roundcube Webmail client |
+ | Copyright (C) 2010-2015, The Roundcube Dev Team |
+ | Copyright (C) 2010-2015, Kolab Systems AG |
+ | |
+ | 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: |
+ | Create database schema |
+ +-----------------------------------------------------------------------+
+ | Author: Aleksander Machniak <alec@alec.pl> |
+ +-----------------------------------------------------------------------+
+*/
+
+define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' );
+
+require_once INSTALL_PATH . 'program/include/clisetup.php';
+
+// get arguments
+$opts = rcube_utils::get_opt(array(
+ 'd' => 'dir',
+));
+
+if (empty($opts['dir'])) {
+ rcube::raise_error("Database schema directory not specified (--dir).", false, true);
+}
+
+// Check if directory exists
+if (!file_exists($opts['dir'])) {
+ rcube::raise_error("Specified database schema directory doesn't exist.", false, true);
+}
+
+rcmail_utils::db_init($opts['dir']);
+
+?>
diff --git a/bin/moduserprefs.sh b/bin/moduserprefs.sh
index 3d46baaa4..09f73983a 100755
--- a/bin/moduserprefs.sh
+++ b/bin/moduserprefs.sh
@@ -5,7 +5,7 @@
| bin/moduserprefs.sh |
| |
| This file is part of the Roundcube Webmail client |
- | Copyright (C) 2012, The Roundcube Dev Team |
+ | Copyright (C) 2012-2015, The Roundcube Dev Team |
| |
| Licensed under the GNU General Public License version 3 or |
| any later version with exceptions for skins & plugins. |
@@ -46,37 +46,6 @@ else if (empty($args[0]) || (!isset($args[1]) && !$args['delete'])) {
$pref_name = trim($args[0]);
$pref_value = $args['delete'] ? null : trim($args[1]);
-// connect to DB
-$rcmail = rcube::get_instance();
-
-$db = $rcmail->get_dbh();
-$db->db_connect('w');
-
-if (!$db->is_connected() || $db->is_error())
- die("No DB connection\n" . $db->is_error());
-
-$query = '1=1';
-
-if ($args['user'])
- $query = '`user_id` = ' . intval($args['user']);
-
-// iterate over all users
-$sql_result = $db->query("SELECT * FROM " . $db->table_name('users', true) . " WHERE $query");
-while ($sql_result && ($sql_arr = $db->fetch_assoc($sql_result))) {
- echo "Updating prefs for user " . $sql_arr['user_id'] . "...";
-
- $user = new rcube_user($sql_arr['user_id'], $sql_arr);
- $prefs = $old_prefs = $user->get_prefs();
-
- $prefs[$pref_name] = $pref_value;
-
- if ($prefs != $old_prefs) {
- $user->save_prefs($prefs);
- echo "saved.\n";
- }
- else {
- echo "nothing changed.\n";
- }
-}
+rcmail_utils::mod_pref($pref_name, $pref_value, $args['user']);
?>
diff --git a/bin/update.sh b/bin/update.sh
index 1dfaa961d..bfb2148f7 100755
--- a/bin/update.sh
+++ b/bin/update.sh
@@ -156,10 +156,8 @@ if ($RCI->configured) {
// check database schema
if ($RCI->config['db_dsnw']) {
echo "Executing database schema update.\n";
- system("php " . INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
- . " --dir=" . INSTALL_PATH . "SQL", $res);
-
- $success = !$res;
+ $success = rcmail_utils::db_update(INSTALL_PATH . 'SQL', 'roundcube', $opts['version'],
+ array('errors' => true));
}
// update composer dependencies
@@ -239,7 +237,7 @@ if ($RCI->configured) {
// index contacts for fulltext searching
if ($opts['version'] && version_compare(version_parse($opts['version']), '0.6.0', '<')) {
- system("php " . INSTALL_PATH . 'bin/indexcontacts.sh');
+ rcmail_utils::indexcontacts();
}
if ($success) {
diff --git a/bin/updatedb.sh b/bin/updatedb.sh
index ffeac0ba8..7e4f0f526 100755
--- a/bin/updatedb.sh
+++ b/bin/updatedb.sh
@@ -37,142 +37,6 @@ if (empty($opts['package'])) {
rcube::raise_error("Database schema package name not specified (--package).", false, true);
}
-// Check if directory exists
-if (!file_exists($opts['dir'])) {
- rcube::raise_error("Specified database schema directory doesn't exist.", false, true);
-}
-
-$RC = rcube::get_instance();
-$DB = rcube_db::factory($RC->config->get('db_dsnw'));
-
-$DB->set_debug((bool)$RC->config->get('sql_debug'));
-
-// Connect to database
-$DB->db_connect('w');
-if (!$DB->is_connected()) {
- rcube::raise_error("Error connecting to database: " . $DB->is_error(), false, true);
-}
-
-// Read DB schema version from database (if 'system' table exists)
-if (in_array($DB->table_name('system'), (array)$DB->list_tables())) {
- $DB->query("SELECT `value`"
- ." FROM " . $DB->table_name('system', true)
- ." WHERE `name` = ?",
- $opts['package'] . '-version');
-
- $row = $DB->fetch_array();
- $version = preg_replace('/[^0-9]/', '', $row[0]);
-}
-
-// DB version not found, but release version is specified
-if (!$version && $opts['version']) {
- // Map old release version string to DB schema version
- // Note: This is for backward compat. only, do not need to be updated
- $map = array(
- '0.1-stable' => 1,
- '0.1.1' => 2008030300,
- '0.2-alpha' => 2008040500,
- '0.2-beta' => 2008060900,
- '0.2-stable' => 2008092100,
- '0.2.1' => 2008092100,
- '0.2.2' => 2008092100,
- '0.3-stable' => 2008092100,
- '0.3.1' => 2009090400,
- '0.4-beta' => 2009103100,
- '0.4' => 2010042300,
- '0.4.1' => 2010042300,
- '0.4.2' => 2010042300,
- '0.5-beta' => 2010100600,
- '0.5' => 2010100600,
- '0.5.1' => 2010100600,
- '0.5.2' => 2010100600,
- '0.5.3' => 2010100600,
- '0.5.4' => 2010100600,
- '0.6-beta' => 2011011200,
- '0.6' => 2011011200,
- '0.7-beta' => 2011092800,
- '0.7' => 2011111600,
- '0.7.1' => 2011111600,
- '0.7.2' => 2011111600,
- '0.7.3' => 2011111600,
- '0.7.4' => 2011111600,
- '0.8-beta' => 2011121400,
- '0.8-rc' => 2011121400,
- '0.8.0' => 2011121400,
- '0.8.1' => 2011121400,
- '0.8.2' => 2011121400,
- '0.8.3' => 2011121400,
- '0.8.4' => 2011121400,
- '0.8.5' => 2011121400,
- '0.8.6' => 2011121400,
- '0.9-beta' => 2012080700,
- );
-
- $version = $map[$opts['version']];
-}
-
-// Assume last version before the 'system' table was added
-if (empty($version)) {
- $version = 2012080700;
-}
-
-$dir = $opts['dir'] . '/' . $DB->db_provider;
-if (!file_exists($dir)) {
- rcube::raise_error("DDL Upgrade files for " . $DB->db_provider . " driver not found.", false, true);
-}
-
-$dh = opendir($dir);
-$result = array();
-
-while ($file = readdir($dh)) {
- if (preg_match('/^([0-9]+)\.sql$/', $file, $m) && $m[1] > $version) {
- $result[] = $m[1];
- }
-}
-sort($result, SORT_NUMERIC);
-
-foreach ($result as $v) {
- echo "Updating database schema ($v)... ";
- $error = update_db_schema($opts['package'], $v, "$dir/$v.sql");
-
- if ($error) {
- echo "[FAILED]\n";
- rcube::raise_error("Error in DDL upgrade $v: $error", false, true);
- }
- echo "[OK]\n";
-}
-
-
-function update_db_schema($package, $version, $file)
-{
- global $DB;
-
- // read DDL file
- if ($sql = file_get_contents($file)) {
- if (!$DB->exec_script($sql)) {
- return $DB->is_error();
- }
- }
-
- // escape if 'system' table does not exist
- if ($version < 2013011000) {
- return;
- }
-
- $system_table = $DB->table_name('system', true);
-
- $DB->query("UPDATE " . $system_table
- ." SET `value` = ?"
- ." WHERE `name` = ?",
- $version, $package . '-version');
-
- if (!$DB->is_error() && !$DB->affected_rows()) {
- $DB->query("INSERT INTO " . $system_table
- ." (`name`, `value`) VALUES (?, ?)",
- $package . '-version', $version);
- }
-
- return $DB->is_error();
-}
+rcmail_utils::db_update($opts['dir'], $opts['package'], $opts['version'], array('errors' => true));
?>
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 08:02:36 +0000