From fee8c6ceab0f66d83e5c62eae44ee7c624847972 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Mon, 27 Oct 2008 16:11:32 -0400
Subject: [PATCH] First version of the commandline update script
---
installer/rcube_install.php | 24 -----
bin/update.sh | 115 ++++++++++++++++++++++++++++
installer/utils.php | 40 ++++++++++
installer/index.php | 17 ---
4 files changed, 159 insertions(+), 37 deletions(-)
diff --git a/bin/update.sh b/bin/update.sh
new file mode 100755
index 0000000..5be7633
--- /dev/null
+++ b/bin/update.sh
@@ -0,0 +1,115 @@
+#!/usr/bin/php
+<?php
+
+define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );
+
+require_once INSTALL_PATH . 'program/include/iniset.php';
+require_once INSTALL_PATH . 'installer/rcube_install.php';
+
+$RCI = rcube_install::get_instance();
+$RCI->load_config();
+
+if ($RCI->configured) {
+ if ($messages = $RCI->check_config()) {
+ $err = 0;
+
+ // list missing config options
+ if (is_array($messages['missing'])) {
+ echo "WARNING: Missing config options:\n";
+ echo "(These config options should be present in the current configuration)\n";
+
+ foreach ($messages['missing'] as $msg) {
+ echo '- ' . $msg['prop'] . ($msg['name'] ? ': ' . $msg['name'] : '') . "\n";
+ $err++;
+ }
+ echo "\n";
+ }
+
+ // list old/replaced config options
+ if (is_array($messages['replaced'])) {
+ echo "WARNING: Replaced config options:\n";
+ echo "(These config options have been replaced or renamed)\n";
+
+ foreach ($messages['replaced'] as $msg) {
+ echo "- " . $msg['prop'] . "\t\t was replaced by " . $msg['replacement'] . "\n";
+ $err++;
+ }
+ echo "\n";
+ }
+
+ // list obsolete config options (just a notice)
+ if (is_array($messages['obsolete'])) {
+ echo "NOTICE: Obsolete config options:\n";
+ echo "(You still have some obsolete or inexistent properties set. This isn't a problem but should be noticed)\n";
+
+ foreach ($messages['obsolete'] as $msg) {
+ echo "- " . $msg['prop'] . ($msg['name'] ? ': ' . $msg['name'] : '') . "\n";
+ $err++;
+ }
+ echo "\n";
+ }
+
+ // ask user to update config files
+ if ($err) {
+ echo "Do you want me to fix your local configuration? (y/N)\n";
+ $input = trim(fgets(STDIN));
+
+ // positive: let's merge the local config with the defaults
+ if (strtolower($input) == 'y') {
+ $copy1 = $copy2 = $write1 = $write2 = false;
+
+ // backup current config
+ echo ". backing up the current config files...\n";
+ $copy1 = copy(RCMAIL_CONFIG_DIR . '/main.inc.php', RCMAIL_CONFIG_DIR . '/main.old.php');
+ $copy2 = copy(RCMAIL_CONFIG_DIR . '/db.inc.php', RCMAIL_CONFIG_DIR . '/db.old.php');
+
+ if ($copy1 && $copy2) {
+ $RCI->merge_config();
+
+ echo ". writing " . RCMAIL_CONFIG_DIR . "/main.inc.php...\n";
+ $write1 = file_put_contents(RCMAIL_CONFIG_DIR . '/main.inc.php', $RCI->create_config('main', true));
+ echo ". writing " . RCMAIL_CONFIG_DIR . "/main.db.php...\n";
+ $write2 = file_put_contents(RCMAIL_CONFIG_DIR . '/db.inc.php', $RCI->create_config('db', true));
+ }
+
+ // Success!
+ if ($write1 && $write2) {
+ echo "Done.\n";
+ echo "Your configuration files are now up-tp-date!\n";
+ }
+ else {
+ echo "Failed to write config files!\n";
+ echo "Grant write privileges to the current user or update the files manually according to the above messages.\n";
+ }
+ }
+ else {
+ echo "Please update your config files manually according to the above messages.\n";
+ }
+ }
+
+ // check dependencies based on the current configuration
+ if (is_array($messages['dependencies'])) {
+ echo "WARNING: Dependency check failed!\n";
+ echo "(Some of your configuration settings require other options to be configured or additional PHP modules to be installed)\n";
+
+ foreach ($messages['dependencies'] as $msg) {
+ echo "- " . $msg['prop'] . ': ' . $msg['explain'] . "\n";
+ }
+ echo "Please fix your config files and run this script again!\n";
+ echo "See ya.\n";
+ }
+
+ }
+ else {
+ echo "This instance of RoundCube is up-to-date.\n";
+ echo "Have fun!\n";
+ }
+}
+else {
+ echo "This instance of RoundCube is not yet configured!\n";
+ echo "Open http://url-to-roundcube/installer/ in your browser and follow the instuctions.\n";
+}
+
+echo "\n";
+
+?>
\ No newline at end of file
diff --git a/installer/index.php b/installer/index.php
index c7f69e3..ea83741 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,4 +1,5 @@
<?php
+
ini_set('error_reporting', E_ALL&~E_NOTICE);
ini_set('display_errors', 1);
@@ -12,21 +13,9 @@
set_include_path($include_path);
-session_start();
+require_once 'utils.php';
-/**
- * Use PHP5 autoload for dynamic class loading
- * (copy from program/incllude/iniset.php)
- */
-function __autoload($classname)
-{
- $filename = preg_replace(
- array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
- array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
- $classname
- );
- include_once $filename. '.php';
-}
+session_start();
$RCI = rcube_install::get_instance();
$RCI->load_config();
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 808994d..12afc15 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -130,7 +130,7 @@
*/
function create_config($which, $force = false)
{
- $out = file_get_contents("../config/{$which}.inc.php.dist");
+ $out = file_get_contents(RCMAIL_CONFIG_DIR . "/{$which}.inc.php.dist");
if (!$out)
return '[Warning: could not read the template file]';
@@ -540,27 +540,5 @@
return $out;
}
-}
-
-
-/**
- * Shortcut function for htmlentities()
- *
- * @param string String to quote
- * @return string The html-encoded string
- */
-function Q($string)
-{
- return htmlentities($string);
-}
-
-
-/**
- * Fake rinternal error handler to catch errors
- */
-function raise_error($p)
-{
- $rci = rcube_install::get_instance();
- $rci->raise_error($p);
}
diff --git a/installer/utils.php b/installer/utils.php
new file mode 100644
index 0000000..76a3357
--- /dev/null
+++ b/installer/utils.php
@@ -0,0 +1,40 @@
+<?php
+
+
+/**
+ * Use PHP5 autoload for dynamic class loading
+ * (copy from program/incllude/iniset.php)
+ */
+function __autoload($classname)
+{
+ $filename = preg_replace(
+ array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
+ array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
+ $classname
+ );
+ include_once $filename. '.php';
+}
+
+
+/**
+ * Shortcut function for htmlentities()
+ *
+ * @param string String to quote
+ * @return string The html-encoded string
+ */
+function Q($string)
+{
+ return htmlentities($string);
+}
+
+
+/**
+ * Fake rinternal error handler to catch errors
+ */
+function raise_error($p)
+{
+ $rci = rcube_install::get_instance();
+ $rci->raise_error($p);
+}
+
+
--
Gitblit v1.9.1