No OneTemporary
Actions

Size

44 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/bin/update.sh b/bin/update.sh
	index 05956b933..15edc2880 100755
	--- a/bin/update.sh
	+++ b/bin/update.sh
	@@ -1,170 +1,180 @@
	#!/usr/bin/env php
	<?php
	/*
	+-----------------------------------------------------------------------+
	\| bin/update.sh \|
	\| \|
	\| This file is part of the Roundcube Webmail client \|
	\| Copyright (C) 2010-2011, 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: \|
	\| Check local configuration and database schema after upgrading \|
	\| to a new version \|
	+-----------------------------------------------------------------------+
	\| Author: Thomas Bruederli <roundcube@gmail.com> \|
	+-----------------------------------------------------------------------+
	*/

	define('INSTALL_PATH', realpath(dirname(__FILE__) . '/..') . '/' );

	require_once INSTALL_PATH . 'program/include/clisetup.php';
	require_once INSTALL_PATH . 'installer/rcube_install.php';

	// get arguments
	$opts = rcube_utils::get_opt(array('v' => 'version'));

	// ask user if no version is specified
	if (!$opts['version']) {
	echo "What version are you upgrading from? Type '?' if you don't know.\n";
	if (($input = trim(fgets(STDIN))) && preg_match('/^[0-9.]+[a-z-]*$/', $input))
	$opts['version'] = $input;
	else
	$opts['version'] = RCMAIL_VERSION;
	}

	if ($opts['version'] && version_compare(version_parse($opts['version']), version_parse(RCMAIL_VERSION), '>='))
	die("Nothing to be done here. Bye!\n");


	$RCI = rcube_install::get_instance();
	$RCI->load_config();

	if ($RCI->configured) {
	$success = true;

	if ($messages = $RCI->check_config()) {
	$success = false;
	$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'] . "' 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-to-date!\n";

	if ($messages['missing']) {
	echo "But you still need to add the following missing options:\n";
	foreach ($messages['missing'] as $msg)
	echo "- '" . $msg['prop'] . ($msg['name'] ? "': " . $msg['name'] : "'") . "\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";
	}
	}

	+ // check file type detection
	+ if ($RCI->check_mime_detection()) {
	+ echo "WARNING: File type detection doesn't work properly!\n";
	+ echo "Please check the 'mime_magic' config option or the finfo functions of PHP andrun this script again.\n";
	+ }
	+ if ($RCI->check_mime_extensions()) {
	+ echo "WARNING: Mimetype to file extension mapping doesn't work properly!\n";
	+ echo "Please check the 'mime_types' config option and run this script again.\n";
	+ }
	+
	// check database schema
	if ($RCI->config['db_dsnw']) {
	echo "Executing database schema update.\n";
	system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube --version=" . $opts['version']
	. " --dir=" . INSTALL_PATH . DIRECTORY_SEPARATOR . "SQL", $res);

	$success = !$res;
	}

	// index contacts for fulltext searching
	if (version_compare(version_parse($opts['version']), '0.6.0', '<')) {
	system(INSTALL_PATH . 'bin/indexcontacts.sh');
	}

	if ($success) {
	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";
	}

	?>
	diff --git a/installer/rcube_install.php b/installer/rcube_install.php
	index 637808e8a..ab7967708 100644
	--- a/installer/rcube_install.php
	+++ b/installer/rcube_install.php
	@@ -1,741 +1,786 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| rcube_install.php \|
	\| \|
	\| This file is part of the Roundcube Webmail package \|
	\| Copyright (C) 2008-2012, 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. \|
	+-----------------------------------------------------------------------+
	*/


	/**
	* Class to control the installation process of the Roundcube Webmail package
	*
	* @category Install
	* @package Roundcube
	* @author Thomas Bruederli
	*/
	class rcube_install
	{
	var $step;
	var $is_post = false;
	var $failures = 0;
	var $config = array();
	var $configured = false;
	var $last_error = null;
	var $email_pattern = '([a-z0-9][a-z0-9\-\.\+\_]@[a-z0-9]([a-z0-9\-][.]?)[a-z0-9])';
	var $bool_config_props = array();

	var $obsolete_config = array('db_backend', 'double_auth');
	var $replaced_config = array(
	'skin_path' => 'skin',
	'locale_string' => 'language',
	'multiple_identities' => 'identities_level',
	'addrbook_show_images' => 'show_images',
	'imap_root' => 'imap_ns_personal',
	'pagesize' => 'mail_pagesize',
	'default_imap_folders' => 'default_folders',
	'top_posting' => 'reply_mode',
	);

	// these config options are required for a working system
	var $required_config = array(
	'db_dsnw', 'des_key', 'session_lifetime',
	);

	// list of supported database drivers
	var $supported_dbs = array(
	'MySQL' => 'pdo_mysql',
	'PostgreSQL' => 'pdo_pgsql',
	'SQLite' => 'pdo_sqlite',
	'SQLite (v2)' => 'pdo_sqlite2',
	'SQL Server (SQLSRV)' => 'pdo_sqlsrv',
	'SQL Server (DBLIB)' => 'pdo_dblib',
	);


	/**
	* Constructor
	*/
	function __construct()
	{
	$this->step = intval($_REQUEST['_step']);
	$this->is_post = $_SERVER['REQUEST_METHOD'] == 'POST';
	}

	/**
	* Singleton getter
	*/
	static function get_instance()
	{
	static $inst;

	if (!$inst)
	$inst = new rcube_install();

	return $inst;
	}

	/**
	* Read the default config files and store properties
	*/
	function load_defaults()
	{
	$this->_load_config('.php.dist');
	}


	/**
	* Read the local config files and store properties
	*/
	function load_config()
	{
	$this->config = array();
	$this->_load_config('.php');
	$this->configured = !empty($this->config);
	}

	/**
	* Read the default config file and store properties
	* @access private
	*/
	function _load_config($suffix)
	{
	if (is_readable($main_inc = RCUBE_CONFIG_DIR . 'main.inc' . $suffix)) {
	include($main_inc);
	if (is_array($rcmail_config))
	$this->config += $rcmail_config;
	}
	if (is_readable($db_inc = RCUBE_CONFIG_DIR . 'db.inc'. $suffix)) {
	include($db_inc);
	if (is_array($rcmail_config))
	$this->config += $rcmail_config;
	}
	}


	/**
	* Getter for a certain config property
	*
	* @param string Property name
	* @param string Default value
	* @return string The property value
	*/
	function getprop($name, $default = '')
	{
	$value = $this->config[$name];

	if ($name == 'des_key' && !$this->configured && !isset($_REQUEST["_$name"]))
	$value = rcube_install::random_key(24);

	return $value !== null && $value !== '' ? $value : $default;
	}


	/**
	* Take the default config file and replace the parameters
	* with the submitted form data
	*
	* @param string Which config file (either 'main' or 'db')
	* @return string The complete config file content
	*/
	function create_config($which, $force = false)
	{
	$out = @file_get_contents(RCUBE_CONFIG_DIR . $which . '.inc.php.dist');

	if (!$out)
	return '[Warning: could not read the config template file]';

	foreach ($this->config as $prop => $default) {

	$is_default = !isset($_POST["_$prop"]);
	$value = !$is_default \|\| $this->bool_config_props[$prop] ? $_POST["_$prop"] : $default;

	// convert some form data
	if ($prop == 'debug_level' && !$is_default) {
	if (is_array($value)) {
	$val = 0;
	foreach ($value as $dbgval)
	$val += intval($dbgval);
	$value = $val;
	}
	}
	else if ($which == 'db' && $prop == 'db_dsnw' && !empty($_POST['_dbtype'])) {
	if ($_POST['_dbtype'] == 'sqlite')
	$value = sprintf('%s://%s?mode=0646', $_POST['_dbtype'], $_POST['_dbname']{0} == '/' ? '/' . $_POST['_dbname'] : $_POST['_dbname']);
	else if ($_POST['_dbtype'])
	$value = sprintf('%s://%s:%s@%s/%s', $_POST['_dbtype'],
	rawurlencode($_POST['_dbuser']), rawurlencode($_POST['_dbpass']), $_POST['_dbhost'], $_POST['_dbname']);
	}
	else if ($prop == 'smtp_auth_type' && $value == '0') {
	$value = '';
	}
	else if ($prop == 'default_host' && is_array($value)) {
	$value = rcube_install::_clean_array($value);
	if (count($value) <= 1)
	$value = $value[0];
	}
	else if ($prop == 'mail_pagesize' \|\| $prop == 'addressbook_pagesize') {
	$value = max(2, intval($value));
	}
	else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) {
	$value = '%u';
	}
	else if ($prop == 'smtp_pass' && !empty($_POST['_smtp_user_u'])) {
	$value = '%p';
	}
	else if ($prop == 'default_folders') {
	$value = array();
	foreach ($this->config['default_folders'] as $_folder) {
	switch ($_folder) {
	case 'Drafts': $_folder = $this->config['drafts_mbox']; break;
	case 'Sent': $_folder = $this->config['sent_mbox']; break;
	case 'Junk': $_folder = $this->config['junk_mbox']; break;
	case 'Trash': $_folder = $this->config['trash_mbox']; break;
	}
	if (!in_array($_folder, $value))
	$value[] = $_folder;
	}
	}
	else if (is_bool($default)) {
	$value = (bool)$value;
	}
	else if (is_numeric($value)) {
	$value = intval($value);
	}

	// skip this property
	if (!$force && !$this->configured && ($value == $default))
	continue;

	// save change
	$this->config[$prop] = $value;

	$dump = self::_dump_var($value, $prop);

	// replace the matching line in config file
	$out = preg_replace(
	'/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Ui',
	"\\1 = $dump;",
	$out);
	}

	return trim($out);
	}


	/**
	* Check the current configuration for missing properties
	* and deprecated or obsolete settings
	*
	* @return array List with problems detected
	*/
	function check_config()
	{
	$this->config = array();
	$this->load_defaults();
	$defaults = $this->config;

	$this->load_config();
	if (!$this->configured)
	return null;

	$out = $seen = array();
	$required = array_flip($this->required_config);

	// iterate over the current configuration
	foreach ($this->config as $prop => $value) {
	if ($replacement = $this->replaced_config[$prop]) {
	$out['replaced'][] = array('prop' => $prop, 'replacement' => $replacement);
	$seen[$replacement] = true;
	}
	else if (!$seen[$prop] && in_array($prop, $this->obsolete_config)) {
	$out['obsolete'][] = array('prop' => $prop);
	$seen[$prop] = true;
	}
	}

	// the old default mime_magic reference is obsolete
	if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
	$out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
	}

	// iterate over default config
	foreach ($defaults as $prop => $value) {
	if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) \|\| strlen($this->config[$prop])))
	$out['missing'][] = array('prop' => $prop);
	}

	// check config dependencies and contradictions
	if ($this->config['enable_spellcheck'] && $this->config['spellcheck_engine'] == 'pspell') {
	if (!extension_loaded('pspell')) {
	$out['dependencies'][] = array('prop' => 'spellcheck_engine',
	'explain' => 'This requires the <tt>pspell</tt> extension which could not be loaded.');
	}
	else if (!empty($this->config['spellcheck_languages'])) {
	foreach ($this->config['spellcheck_languages'] as $lang => $descr)
	if (!@pspell_new($lang))
	$out['dependencies'][] = array('prop' => 'spellcheck_languages',
	'explain' => "You are missing pspell support for language $lang ($descr)");
	}
	}

	if ($this->config['log_driver'] == 'syslog') {
	if (!function_exists('openlog')) {
	$out['dependencies'][] = array('prop' => 'log_driver',
	'explain' => 'This requires the <tt>syslog</tt> extension which could not be loaded.');
	}
	if (empty($this->config['syslog_id'])) {
	$out['dependencies'][] = array('prop' => 'syslog_id',
	'explain' => 'Using <tt>syslog</tt> for logging requires a syslog ID to be configured');
	}
	}

	// check ldap_public sources having global_search enabled
	if (is_array($this->config['ldap_public']) && !is_array($this->config['autocomplete_addressbooks'])) {
	foreach ($this->config['ldap_public'] as $ldap_public) {
	if ($ldap_public['global_search']) {
	$out['replaced'][] = array('prop' => 'ldap_public::global_search', 'replacement' => 'autocomplete_addressbooks');
	break;
	}
	}
	}

	return $out;
	}


	/**
	* Merge the current configuration with the defaults
	* and copy replaced values to the new options.
	*/
	function merge_config()
	{
	$current = $this->config;
	$this->config = array();
	$this->load_defaults();

	foreach ($this->replaced_config as $prop => $replacement) {
	if (isset($current[$prop])) {
	if ($prop == 'skin_path')
	$this->config[$replacement] = preg_replace('#skins/(\w+)/?$#', '\\1', $current[$prop]);
	else if ($prop == 'multiple_identities')
	$this->config[$replacement] = $current[$prop] ? 2 : 0;
	else
	$this->config[$replacement] = $current[$prop];
	}
	unset($current[$prop]);
	}

	foreach ($this->obsolete_config as $prop) {
	unset($current[$prop]);
	}

	// add all ldap_public sources having global_search enabled to autocomplete_addressbooks
	if (is_array($current['ldap_public'])) {
	foreach ($current['ldap_public'] as $key => $ldap_public) {
	if ($ldap_public['global_search']) {
	$this->config['autocomplete_addressbooks'][] = $key;
	unset($current['ldap_public'][$key]['global_search']);
	}
	}
	}

	$this->config = array_merge($this->config, $current);

	foreach (array_keys((array)$current['ldap_public']) as $key) {
	$this->config['ldap_public'][$key] = $current['ldap_public'][$key];
	}
	}

	/**
	* Compare the local database schema with the reference schema
	* required for this version of Roundcube
	*
	* @param rcube_db Database object
	*
	* @return boolean True if the schema is up-to-date, false if not or an error occured
	*/
	function db_schema_check($DB)
	{
	if (!$this->configured)
	return false;

	// read reference schema from mysql.initial.sql
	$db_schema = $this->db_read_schema(INSTALL_PATH . 'SQL/mysql.initial.sql');
	$errors = array();

	// check list of tables
	$existing_tables = $DB->list_tables();

	foreach ($db_schema as $table => $cols) {
	$table = $this->config['db_prefix'] . $table;
	if (!in_array($table, $existing_tables)) {
	$errors[] = "Missing table '".$table."'";
	}
	else { // compare cols
	$db_cols = $DB->list_cols($table);
	$diff = array_diff(array_keys($cols), $db_cols);
	if (!empty($diff))
	$errors[] = "Missing columns in table '$table': " . join(',', $diff);
	}
	}

	return !empty($errors) ? $errors : false;
	}

	/**
	* Utility function to read database schema from an .sql file
	*/
	private function db_read_schema($schemafile)
	{
	$lines = file($schemafile);
	$table_block = false;
	$schema = array();
	foreach ($lines as $line) {
	if (preg_match('/^\s*create table `?([a-z0-9_]+)`?/i', $line, $m)) {
	$table_block = $m[1];
	}
	else if ($table_block && preg_match('/^\s*`?([a-z0-9_-]+)`?\s+([a-z]+)/', $line, $m)) {
	$col = $m[1];
	if (!in_array(strtoupper($col), array('PRIMARY','KEY','INDEX','UNIQUE','CONSTRAINT','REFERENCES','FOREIGN'))) {
	$schema[$table_block][$col] = $m[2];
	}
	}
	}

	return $schema;
	}

	+ /**
	+ * Try to detect some file's mimetypes to test the correct behavior of fileinfo
	+ */
	+ function check_mime_detection()
	+ {
	+ $files = array(
	+ 'installer/images/roundcube_logo.png' => 'image/png',
	+ 'program/resources/blank.tif' => 'image/tiff',
	+ 'skins/larry/templates/login.html' => 'text/html',
	+ );
	+
	+ $errors = array();
	+ foreach ($files as $path => $expected) {
	+ $mimetype = rcube_mime::file_content_type(INSTALL_PATH . $path, basename($path));
	+ if ($mimetype != $expected) {
	+ $errors[] = array($path, $mimetype, $expected);
	+ }
	+ }
	+
	+ return $errors;
	+ }
	+
	+ /**
	+ * Check the correct configuration of the 'mime_types' mapping option
	+ */
	+ function check_mime_extensions()
	+ {
	+ $types = array(
	+ 'application/zip' => 'zip',
	+ 'application/x-tar' => 'tar',
	+ 'application/java-archive' => 'jar',
	+ 'image/bmp' => 'bmp',
	+ 'image/svg+xml' => 'svg',
	+ );
	+
	+ $errors = array();
	+ foreach ($types as $mimetype => $expected) {
	+ $ext = rcube_mime::get_mime_extensions($mimetype);
	+ if ($ext[0] != $expected) {
	+ $errors[] = array($mimetype, $ext, $expected);
	+ }
	+ }
	+
	+ return $errors;
	+ }

	/**
	* Getter for the last error message
	*
	* @return string Error message or null if none exists
	*/
	function get_error()
	{
	return $this->last_error['message'];
	}


	/**
	* Return a list with all imap hosts configured
	*
	* @return array Clean list with imap hosts
	*/
	function get_hostlist()
	{
	$default_hosts = (array)$this->getprop('default_host');
	$out = array();

	foreach ($default_hosts as $key => $name) {
	if (!empty($name))
	$out[] = rcube_parse_host(is_numeric($key) ? $name : $key);
	}

	return $out;
	}

	/**
	* Create a HTML dropdown to select a previous version of Roundcube
	*/
	function versions_select($attrib = array())
	{
	$select = new html_select($attrib);
	$select->add(array(
	'0.1-stable', '0.1.1',
	'0.2-alpha', '0.2-beta', '0.2-stable',
	'0.3-stable', '0.3.1',
	'0.4-beta', '0.4.2',
	'0.5-beta', '0.5', '0.5.1', '0.5.2', '0.5.3', '0.5.4',
	'0.6-beta', '0.6',
	'0.7-beta', '0.7', '0.7.1', '0.7.2', '0.7.3', '0.7.4',
	'0.8-beta', '0.8-rc', '0.8.0', '0.8.1', '0.8.2', '0.8.3', '0.8.4', '0.8.5', '0.8.6',
	'0.9-beta', '0.9-rc', '0.9-rc2',
	// Note: Do not add newer versions here
	));
	return $select;
	}

	/**
	* Return a list with available subfolders of the skin directory
	*/
	function list_skins()
	{
	$skins = array();
	$skindir = INSTALL_PATH . 'skins/';
	foreach (glob($skindir . '*') as $path) {
	if (is_dir($path) && is_readable($path)) {
	$skins[] = substr($path, strlen($skindir));
	}
	}
	return $skins;
	}

	/**
	* Display OK status
	*
	* @param string Test name
	* @param string Confirm message
	*/
	function pass($name, $message = '')
	{
	echo Q($name) . ':  <span class="success">OK</span>';
	$this->_showhint($message);
	}


	/**
	* Display an error status and increase failure count
	*
	* @param string Test name
	* @param string Error message
	* @param string URL for details
	* @param bool Do not count this failure
	*/
	function fail($name, $message = '', $url = '', $optional=false)
	{
	if (!$optional) {
	$this->failures++;
	}

	echo Q($name) . ':  <span class="fail">NOT OK</span>';
	$this->_showhint($message, $url);
	}


	/**
	* Display an error status for optional settings/features
	*
	* @param string Test name
	* @param string Error message
	* @param string URL for details
	*/
	function optfail($name, $message = '', $url = '')
	{
	echo Q($name) . ':  <span class="na">NOT OK</span>';
	$this->_showhint($message, $url);
	}


	/**
	* Display warning status
	*
	* @param string Test name
	* @param string Warning message
	* @param string URL for details
	*/
	function na($name, $message = '', $url = '')
	{
	echo Q($name) . ':  <span class="na">NOT AVAILABLE</span>';
	$this->_showhint($message, $url);
	}


	function _showhint($message, $url = '')
	{
	$hint = Q($message);

	if ($url)
	$hint .= ($hint ? '; ' : '') . 'See <a href="' . Q($url) . '" target="_blank">' . Q($url) . '</a>';

	if ($hint)
	echo '<span class="indent">(' . $hint . ')</span>';
	}


	static function _clean_array($arr)
	{
	$out = array();

	foreach (array_unique($arr) as $k => $val) {
	if (!empty($val)) {
	if (is_numeric($k))
	$out[] = $val;
	else
	$out[$k] = $val;
	}
	}

	return $out;
	}


	static function _dump_var($var, $name=null) {
	// special values
	switch ($name) {
	case 'syslog_facility':
	$list = array(32 => 'LOG_AUTH', 80 => 'LOG_AUTHPRIV', 72 => ' LOG_CRON',
	24 => 'LOG_DAEMON', 0 => 'LOG_KERN', 128 => 'LOG_LOCAL0',
	136 => 'LOG_LOCAL1', 144 => 'LOG_LOCAL2', 152 => 'LOG_LOCAL3',
	160 => 'LOG_LOCAL4', 168 => 'LOG_LOCAL5', 176 => 'LOG_LOCAL6',
	184 => 'LOG_LOCAL7', 48 => 'LOG_LPR', 16 => 'LOG_MAIL',
	56 => 'LOG_NEWS', 40 => 'LOG_SYSLOG', 8 => 'LOG_USER', 64 => 'LOG_UUCP');
	if ($val = $list[$var])
	return $val;
	break;
	}


	if (is_array($var)) {
	if (empty($var)) {
	return 'array()';
	}
	else { // check if all keys are numeric
	$isnum = true;
	foreach (array_keys($var) as $key) {
	if (!is_numeric($key)) {
	$isnum = false;
	break;
	}
	}

	if ($isnum)
	return 'array(' . join(', ', array_map(array('rcube_install', '_dump_var'), $var)) . ')';
	}
	}

	return var_export($var, true);
	}


	/**
	* Initialize the database with the according schema
	*
	* @param object rcube_db Database connection
	* @return boolen True on success, False on error
	*/
	function init_db($DB)
	{
	$engine = $DB->db_provider;

	// read schema file from /SQL/*
	$fname = INSTALL_PATH . "SQL/$engine.initial.sql";
	if ($sql = @file_get_contents($fname)) {
	$this->exec_sql($sql, $DB);
	}
	else {
	$this->fail('DB Schema', "Cannot read the schema file: $fname");
	return false;
	}

	if ($err = $this->get_error()) {
	$this->fail('DB Schema', "Error creating database schema: $err");
	return false;
	}

	return true;
	}


	/**
	* Update database schema
	*
	* @param string Version to update from
	*
	* @return boolen True on success, False on error
	*/
	function update_db($version)
	{
	system(INSTALL_PATH . "bin/updatedb.sh --package=roundcube"
	. " --version=" . escapeshellarg($version)
	. " --dir=" . INSTALL_PATH . "SQL"
	. " 2>&1", $result);

	return !$result;
	}


	/**
	* Execute the given SQL queries on the database connection
	*
	* @param string SQL queries to execute
	* @param object rcube_db Database connection
	* @return boolen True on success, False on error
	*/
	function exec_sql($sql, $DB)
	{
	$sql = $this->fix_table_names($sql, $DB);
	$buff = '';
	foreach (explode("\n", $sql) as $line) {
	if (preg_match('/^--/', $line) \|\| trim($line) == '')
	continue;

	$buff .= $line . "\n";
	if (preg_match('/(;\|^GO)$/', trim($line))) {
	$DB->query($buff);
	$buff = '';
	if ($DB->is_error())
	break;
	}
	}

	return !$DB->is_error();
	}


	/**
	* Parse SQL file and fix table names according to db_prefix
	* Note: This need to be a complete database initial file
	*/
	private function fix_table_names($sql, $DB)
	{
	if (empty($this->config['db_prefix'])) {
	return $sql;
	}

	// replace table names
	if (preg_match_all('/CREATE TABLE (\[dbo\]\.\|IF NOT EXISTS )?[`"\[\]]*([^`"\[\] \r\n]+)/i', $sql, $matches)) {
	foreach ($matches[2] as $table) {
	$real_table = $this->config['db_prefix'] . $table;
	$sql = preg_replace("/([^a-zA-Z0-9_])$table([^a-zA-Z0-9_])/", "\\1$real_table\\2", $sql);
	}
	}
	// replace sequence names
	if ($DB->db_provider == 'postgres' && preg_match_all('/CREATE SEQUENCE (IF NOT EXISTS )?"?([^" \n\r]+)/i', $sql, $matches)) {
	foreach ($matches[2] as $sequence) {
	$real_sequence = $this->config['db_prefix'] . $sequence;
	$sql = preg_replace("/([^a-zA-Z0-9_])$sequence([^a-zA-Z0-9_])/", "\\1$real_sequence\\2", $sql);
	}
	}

	return $sql;
	}


	/**
	* Handler for Roundcube errors
	*/
	function raise_error($p)
	{
	$this->last_error = $p;
	}


	/**
	* Generarte a ramdom string to be used as encryption key
	*
	* @param int Key length
	* @return string The generated random string
	* @static
	*/
	function random_key($length)
	{
	$alpha = 'ABCDEFGHIJKLMNOPQERSTUVXYZabcdefghijklmnopqrtsuvwxyz0123456789+*%&?!$-_=';
	$out = '';

	for ($i=0; $i < $length; $i++)
	$out .= $alpha{rand(0, strlen($alpha)-1)};

	return $out;
	}

	}

	diff --git a/installer/test.php b/installer/test.php
	index fb3e7e937..75dac47aa 100644
	--- a/installer/test.php
	+++ b/installer/test.php
	@@ -1,436 +1,472 @@
	<?php

	if (!class_exists('rcube_install') \|\| !is_object($RCI)) {
	die("Not allowed! Please open installer/index.php instead.");
	}

	?>
	<form action="index.php?_step=3" method="post">

	<h3>Check config files</h3>
	<?php

	$read_main = is_readable(RCUBE_CONFIG_DIR . 'main.inc.php');
	$read_db = is_readable(RCUBE_CONFIG_DIR . 'db.inc.php');

	if ($read_main && !empty($RCI->config)) {
	$RCI->pass('main.inc.php');
	}
	else if ($read_main) {
	$RCI->fail('main.inc.php', 'Syntax error');
	}
	else if (!$read_main) {
	$RCI->fail('main.inc.php', 'Unable to read file. Did you create the config files?');
	}
	echo '<br />';

	if ($read_db && !empty($RCI->config['db_dsnw'])) {
	$RCI->pass('db.inc.php');
	}
	else if ($read_db) {
	$RCI->fail('db.inc.php', 'Syntax error');
	}
	else if (!$read_db) {
	$RCI->fail('db.inc.php', 'Unable to read file. Did you create the config files?');
	}

	if ($RCI->configured && ($messages = $RCI->check_config())) {

	if (is_array($messages['missing'])) {
	echo '<h3 class="warning">Missing config options</h3>';
	echo '<p class="hint">The following config options are not set (not present or empty) in the current configuration.<br/>';
	echo 'Please check the default config files and set the missing properties in your local config files.</p>';

	echo '<ul class="configwarnings">';
	foreach ($messages['missing'] as $msg) {
	echo html::tag('li', null, html::span('propname', $msg['prop']) . ($msg['name'] ? ': ' . $msg['name'] : ''));
	}
	echo '</ul>';
	}

	if (is_array($messages['replaced'])) {
	echo '<h3 class="warning">Replaced config options</h3>';
	echo '<p class="hint">The following config options have been replaced or renamed. ';
	echo 'Please update them accordingly in your config files.</p>';

	echo '<ul class="configwarings">';
	foreach ($messages['replaced'] as $msg) {
	echo html::tag('li', null, html::span('propname', $msg['prop']) .
	' was replaced by ' . html::span('propname', $msg['replacement']));
	}
	echo '</ul>';
	}

	if (is_array($messages['obsolete'])) {
	echo '<h3>Obsolete config options</h3>';
	echo '<p class="hint">You still have some obsolete or inexistent properties set. This isn\'t a problem but should be noticed.</p>';

	echo '<ul class="configwarings">';
	foreach ($messages['obsolete'] as $msg) {
	echo html::tag('li', null, html::span('propname', $msg['prop']) . ($msg['name'] ? ': ' . $msg['name'] : ''));
	}
	echo '</ul>';
	}

	echo '<p class="suggestion">OK, lazy people can download the updated config files here: ';
	echo html::a(array('href' => './?_mergeconfig=main'), 'main.inc.php') . '  ';
	echo html::a(array('href' => './?_mergeconfig=db'), 'db.inc.php');
	echo "</p>";


	if (is_array($messages['dependencies'])) {
	echo '<h3 class="warning">Dependency check failed</h3>';
	echo '<p class="hint">Some of your configuration settings require other options to be configured or additional PHP modules to be installed</p>';

	echo '<ul class="configwarings">';
	foreach ($messages['dependencies'] as $msg) {
	echo html::tag('li', null, html::span('propname', $msg['prop']) . ': ' . $msg['explain']);
	}
	echo '</ul>';
	}


	}

	?>

	<h3>Check if directories are writable</h3>
	<p>Roundcube may need to write/save files into these directories</p>
	<?php

	if ($RCI->configured) {
	$pass = false;

	$dirs[] = $RCI->config['temp_dir'] ? $RCI->config['temp_dir'] : 'temp';
	if($RCI->config['log_driver'] != 'syslog')
	$dirs[] = $RCI->config['log_dir'] ? $RCI->config['log_dir'] : 'logs';

	foreach ($dirs as $dir) {
	$dirpath = $dir[0] == '/' ? $dir : INSTALL_PATH . $dir;
	if (is_writable(realpath($dirpath))) {
	$RCI->pass($dir);
	$pass = true;
	}
	else {
	$RCI->fail($dir, 'not writeable for the webserver');
	}
	echo '<br />';
	}

	if (!$pass)
	echo '<p class="hint">Use <tt>chmod</tt> or <tt>chown</tt> to grant write privileges to the webserver</p>';
	}
	else {
	$RCI->fail('Config', 'Could not read config files');
	}

	?>

	<h3>Check DB config</h3>
	<?php

	$db_working = false;
	if ($RCI->configured) {
	if (!empty($RCI->config['db_dsnw'])) {
	$DB = rcube_db::factory($RCI->config['db_dsnw'], '', false);
	$DB->db_connect('w');

	if (!($db_error_msg = $DB->is_error())) {
	$RCI->pass('DSN (write)');
	echo '<br />';
	$db_working = true;
	}
	else {
	$RCI->fail('DSN (write)', $db_error_msg);
	echo '<p class="hint">Make sure that the configured database exists and that the user has write privileges<br />';
	echo 'DSN: ' . $RCI->config['db_dsnw'] . '</p>';
	}
	}
	else {
	$RCI->fail('DSN (write)', 'not set');
	}
	}
	else {
	$RCI->fail('Config', 'Could not read config files');
	}

	// initialize db with schema found in /SQL/*
	if ($db_working && $_POST['initdb']) {
	if (!($success = $RCI->init_db($DB))) {
	$db_working = false;
	echo '<p class="warning">Please try to inizialize the database manually as described in the INSTALL guide.
	Make sure that the configured database extists and that the user as write privileges</p>';
	}
	}

	else if ($db_working && $_POST['updatedb']) {
	if (!($success = $RCI->update_db($_POST['version']))) {
	echo '<p class="warning">Database schema update failed.</p>';
	}
	}

	// test database
	if ($db_working) {
	$db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_prefix']}users");
	if ($DB->is_error()) {
	$RCI->fail('DB Schema', "Database not initialized");
	echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
	$db_working = false;
	}
	else if ($err = $RCI->db_schema_check($DB, $update = !empty($_POST['updatedb']))) {
	$RCI->fail('DB Schema', "Database schema differs");
	echo '<ul style="margin:0"><li>' . join("</li>\n<li>", $err) . "</li></ul>";
	$select = $RCI->versions_select(array('name' => 'version'));
	$select->add('0.9 or newer', '');
	echo '<p class="suggestion">You should run the update queries to get the schema fixed.<br/><br/>Version to update from: ' . $select->show() . ' <input type="submit" name="updatedb" value="Update" /></p>';
	$db_working = false;
	}
	else {
	$RCI->pass('DB Schema');
	echo '<br />';
	}
	}

	// more database tests
	if ($db_working) {
	// write test
	$insert_id = md5(uniqid());
	$db_write = $DB->query("INSERT INTO {$RCI->config['db_prefix']}session (sess_id, created, ip, vars) VALUES (?, ".$DB->now().", '127.0.0.1', 'foo')", $insert_id);

	if ($db_write) {
	$RCI->pass('DB Write');
	$DB->query("DELETE FROM {$RCI->config['db_prefix']}session WHERE sess_id=?", $insert_id);
	}
	else {
	$RCI->fail('DB Write', $RCI->get_error());
	}
	echo '<br />';

	// check timezone settings
	$tz_db = 'SELECT ' . $DB->unixtimestamp($DB->now()) . ' AS tz_db';
	$tz_db = $DB->query($tz_db);
	$tz_db = $DB->fetch_assoc($tz_db);
	$tz_db = (int) $tz_db['tz_db'];
	$tz_local = (int) time();
	$tz_diff = $tz_local - $tz_db;

	// sometimes db and web servers are on separate hosts, so allow a 30 minutes delta
	if (abs($tz_diff) > 1800) {
	$RCI->fail('DB Time', "Database time differs {$td_ziff}s from PHP time");
	}
	else {
	$RCI->pass('DB Time');
	}
	}

	?>

	+<h3>Test filetype detection</h3>
	+
	+<p>
	+<?php
	+
	+if ($errors = $RCI->check_mime_detection()) {
	+ $RCI->fail('Fileinfo/mime_content_type configuration');
	+ if (!empty($RCI->config['mime_magic'])) {
	+ echo '<p class="hint">Try setting the <tt>mime_magic</tt> config option to <tt>null</tt>.</p>';
	+ }
	+ else {
	+ echo '<p class="hint">Check the <a href="http://www.php.net/manual/en/function.finfo-open.php">Fileinfo functions</a> of your PHP installation.<br/>';
	+ echo 'The path to the magic.mime file can be set using the <tt>mime_magic</tt> config option in Roundcube.</p>';
	+ }
	+}
	+else {
	+ $RCI->pass('Fileinfo/mime_content_type configuration');
	+}
	+
	+?>
	+</p>
	+<p>
	+<?php
	+
	+if ($errors = $RCI->check_mime_extensions()) {
	+ $RCI->fail('Mimetype to file extension mapping');
	+ echo '<p class="hint">Please set a valid path to your webserver\'s mime.types file to the <tt>mime_types</tt> config option.<br/>';
	+ echo 'If you can\'t find such a file, download it from <a href="http://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types">svn.apache.org</a>.</p>';
	+}
	+else {
	+ $RCI->pass('Mimetype to file extension mapping');
	+}
	+
	+?>
	+
	+
	<h3>Test SMTP config</h3>

	<p>
	Server: <?php echo rcube_parse_host($RCI->getprop('smtp_server', 'PHP mail()')); ?><br />
	Port: <?php echo $RCI->getprop('smtp_port'); ?><br />

	<?php

	if ($RCI->getprop('smtp_server')) {
	$user = $RCI->getprop('smtp_user', '(none)');
	$pass = $RCI->getprop('smtp_pass', '(none)');

	if ($user == '%u') {
	$user_field = new html_inputfield(array('name' => '_smtp_user'));
	$user = $user_field->show($_POST['_smtp_user']);
	}
	if ($pass == '%p') {
	$pass_field = new html_passwordfield(array('name' => '_smtp_pass'));
	$pass = $pass_field->show();
	}

	echo "User: $user<br />";
	echo "Password: $pass<br />";
	}

	$from_field = new html_inputfield(array('name' => '_from', 'id' => 'sendmailfrom'));
	$to_field = new html_inputfield(array('name' => '_to', 'id' => 'sendmailto'));

	?>
	</p>

	<?php

	if (isset($_POST['sendmail'])) {

	echo '<p>Trying to send email...<br />';

	$from = idn_to_ascii(trim($_POST['_from']));
	$to = idn_to_ascii(trim($_POST['_to']));

	if (preg_match('/^' . $RCI->email_pattern . '$/i', $from) &&
	preg_match('/^' . $RCI->email_pattern . '$/i', $to)
	) {
	$headers = array(
	'From' => $from,
	'To' => $to,
	'Subject' => 'Test message from Roundcube',
	);

	$body = 'This is a test to confirm that Roundcube can send email.';
	$smtp_response = array();

	// send mail using configured SMTP server
	if ($RCI->getprop('smtp_server')) {
	$CONFIG = $RCI->config;

	if (!empty($_POST['_smtp_user'])) {
	$CONFIG['smtp_user'] = $_POST['_smtp_user'];
	}
	if (!empty($_POST['_smtp_pass'])) {
	$CONFIG['smtp_pass'] = $_POST['_smtp_pass'];
	}

	$mail_object = new Mail_mime();
	$send_headers = $mail_object->headers($headers);

	$SMTP = new rcube_smtp();
	$SMTP->connect(rcube_parse_host($RCI->getprop('smtp_server')),
	$RCI->getprop('smtp_port'), $CONFIG['smtp_user'], $CONFIG['smtp_pass']);

	$status = $SMTP->send_mail($headers['From'], $headers['To'],
	($foo = $mail_object->txtHeaders($send_headers)), $body);

	$smtp_response = $SMTP->get_response();
	}
	else { // use mail()
	$header_str = 'From: ' . $headers['From'];

	if (ini_get('safe_mode'))
	$status = mail($headers['To'], $headers['Subject'], $body, $header_str);
	else
	$status = mail($headers['To'], $headers['Subject'], $body, $header_str, '-f'.$headers['From']);

	if (!$status)
	$smtp_response[] = 'Mail delivery with mail() failed. Check your error logs for details';
	}

	if ($status) {
	$RCI->pass('SMTP send');
	}
	else {
	$RCI->fail('SMTP send', join('; ', $smtp_response));
	}
	}
	else {
	$RCI->fail('SMTP send', 'Invalid sender or recipient');
	}

	echo '</p>';
	}

	?>

	<table>
	<tbody>
	<tr>
	<td><label for="sendmailfrom">Sender</label></td>
	<td><?php echo $from_field->show($_POST['_from']); ?></td>
	</tr>
	<tr>
	<td><label for="sendmailto">Recipient</label></td>
	<td><?php echo $to_field->show($_POST['_to']); ?></td>
	</tr>
	</tbody>
	</table>

	<p><input type="submit" name="sendmail" value="Send test mail" /></p>


	<h3>Test IMAP config</h3>

	<?php

	$default_hosts = $RCI->get_hostlist();
	if (!empty($default_hosts)) {
	$host_field = new html_select(array('name' => '_host', 'id' => 'imaphost'));
	$host_field->add($default_hosts);
	}
	else {
	$host_field = new html_inputfield(array('name' => '_host', 'id' => 'imaphost'));
	}

	$user_field = new html_inputfield(array('name' => '_user', 'id' => 'imapuser'));
	$pass_field = new html_passwordfield(array('name' => '_pass', 'id' => 'imappass'));

	?>

	<table>
	<tbody>
	<tr>
	<td><label for="imaphost">Server</label></td>
	<td><?php echo $host_field->show($_POST['_host']); ?></td>
	</tr>
	<tr>
	<td>Port</td>
	<td><?php echo $RCI->getprop('default_port'); ?></td>
	</tr>
	<tr>
	<td><label for="imapuser">Username</label></td>
	<td><?php echo $user_field->show($_POST['_user']); ?></td>
	</tr>
	<tr>
	<td><label for="imappass">Password</label></td>
	<td><?php echo $pass_field->show(); ?></td>
	</tr>
	</tbody>
	</table>

	<?php

	if (isset($_POST['imaptest']) && !empty($_POST['_host']) && !empty($_POST['_user'])) {

	echo '<p>Connecting to ' . Q($_POST['_host']) . '...<br />';

	$imap_host = trim($_POST['_host']);
	$imap_port = $RCI->getprop('default_port');
	$a_host = parse_url($imap_host);

	if ($a_host['host']) {
	$imap_host = $a_host['host'];
	$imap_ssl = (isset($a_host['scheme']) && in_array($a_host['scheme'], array('ssl','imaps','tls'))) ? $a_host['scheme'] : null;
	if (isset($a_host['port']))
	$imap_port = $a_host['port'];
	else if ($imap_ssl && $imap_ssl != 'tls' && (!$imap_port \|\| $imap_port == 143))
	$imap_port = 993;
	}

	$imap_host = idn_to_ascii($imap_host);
	$imap_user = idn_to_ascii($_POST['_user']);

	$imap = new rcube_imap(null);
	if ($imap->connect($imap_host, $imap_user, $_POST['_pass'], $imap_port, $imap_ssl)) {
	$RCI->pass('IMAP connect', 'SORT capability: ' . ($imap->get_capability('SORT') ? 'yes' : 'no'));
	$imap->close();
	}
	else {
	$RCI->fail('IMAP connect', $RCI->get_error());
	}
	}

	?>

	<p><input type="submit" name="imaptest" value="Check login" /></p>

	</form>

	<hr />

	<p class="warning">

	After completing the installation and the final tests please <b>remove</b> the whole
	installer folder from the document root of the webserver or make sure that
	<tt>enable_installer</tt> option in config/main.inc.php is disabled.<br />
	<br />

	These files may expose sensitive configuration data like server passwords and encryption keys
	to the public. Make sure you cannot access this installer from your browser.

	</p>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 5:25 AM (1 d, 16 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 165986
Default Alt Text: (44 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions