No OneTemporary
Actions

Size

47 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/installer/config.php b/installer/config.php
	index b0f56889d..52991242c 100644
	--- a/installer/config.php
	+++ b/installer/config.php
	@@ -1,567 +1,567 @@
	<form action="index.php" method="post">
	<input type="hidden" name="_step" value="2" />
	<?php

	// also load the default config to fill in the fields
	$RCI->load_defaults();

	// register these boolean fields
	-$RCI->config_props = array(
	+$RCI->bool_config_props = array(
	'ip_check' => 1,
	'enable_caching' => 1,
	'enable_spellcheck' => 1,
	'auto_create_user' => 1,
	'smtp_log' => 1,
	'prefer_html' => 1,
	'preview_pane' => 1,
	'htmleditor' => 1,
	'debug_level' => 1,
	);

	// allow the current user to get to the next step
	$_SESSION['allowinstaller'] = true;

	if (!empty($_POST['submit'])) {

	echo '<p class="notice">Copy or download the following configurations and save them in two files';
	echo ' (names above the text box) within the <tt>'.RCMAIL_CONFIG_DIR.'</tt> directory of your RoundCube installation.<br/>';
	echo ' Make sure that there are no characters outside the <tt><?php ?></tt> brackets when saving the files.</p>';

	$textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile"));

	echo '<div><em>main.inc.php (<a href="index.php?_getfile=main">download</a>)</em></div>';
	echo $textbox->show(($_SESSION['main.inc.php'] = $RCI->create_config('main')));

	echo '<div style="margin-top:1em"><em>db.inc.php (<a href="index.php?_getfile=db">download</a>)</em></div>';
	echo $textbox->show($_SESSION['db.inc.php'] = $RCI->create_config('db'));

	echo '<p class="hint">Of course there are more options to configure.
	Have a look at the config files or visit <a href="http://trac.roundcube.net/wiki/Howto_Config">Howto_Config</a> to find out.</p>';

	echo '<p><input type="button" onclick="location.href=\'./index.php?_step=3\'" value="CONTINUE" /></p>';

	// echo '<style type="text/css"> .configblock { display:none } </style>';
	echo "\n<hr style='margin-bottom:1.6em' />\n";
	}

	?>
	<fieldset>
	<legend>General configuration</legend>
	<dl class="configblock">

	<dt class="propname">product_name</dt>
	<dd>
	<?php

	$input_prodname = new html_inputfield(array('name' => '_product_name', 'size' => 30, 'id' => "cfgprodname"));
	echo $input_prodname->show($RCI->getprop('product_name'));

	?>
	<div>The name of your service (used to compose page titles)</div>
	</dd>

	<dt class="propname">temp_dir</dt>
	<dd>
	<?php

	$input_tempdir = new html_inputfield(array('name' => '_temp_dir', 'size' => 30, 'id' => "cfgtempdir"));
	echo $input_tempdir->show($RCI->getprop('temp_dir'));

	?>
	<div>Use this folder to store temp files (must be writeable for webserver)</div>
	</dd>


	<dt class="propname">ip_check</dt>
	<dd>
	<?php

	$check_ipcheck = new html_checkbox(array('name' => '_ip_check', 'id' => "cfgipcheck"));
	echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1));

	?>
	<label for="cfgipcheck">Check client IP in session authorization</label><br />

	<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changeing IPs.</p>
	</dd>

	<dt class="propname">des_key</dt>
	<dd>
	<?php

	$input_deskey = new html_inputfield(array('name' => '_des_key', 'size' => 30, 'id' => "cfgdeskey"));
	echo $input_deskey->show($RCI->getprop('des_key'));

	?>
	<div>This key is used to encrypt the users imap password before storing in the session record</div>
	<p class="hint">It's a random generated string to ensure that every installation has it's own key.
	If you enter it manually please provide a string of exactly 24 chars.</p>
	</dd>

	<dt class="propname">enable_caching</dt>
	<dd>
	<?php

	$check_caching = new html_checkbox(array('name' => '_enable_caching', 'id' => "cfgcache"));
	echo $check_caching->show(intval($RCI->getprop('enable_caching')), array('value' => 1));

	?>
	<label for="cfgcache">Cache messages in local database</label><br />
	</dd>

	<dt class="propname">enable_spellcheck</dt>
	<dd>
	<?php

	$check_caching = new html_checkbox(array('name' => '_enable_spellcheck', 'id' => "cfgspellcheck"));
	echo $check_caching->show(intval($RCI->getprop('enable_spellcheck')), array('value' => 1));

	?>
	<label for="cfgspellcheck">Make use of the built-in spell checker</label><br />

	<p class="hint">It is based on GoogieSpell what implies that the message content will be sent to Google in order to check the spelling.</p>
	</dd>

	</dl>
	</fieldset>

	<fieldset>
	<legend>Logging & Debugging</legend>
	<dl class="loggingblock">

	<dt class="propname">debug_level</dt>
	<dd>
	<?php

	$value = $RCI->getprop('debug_level');
	$check_debug = new html_checkbox(array('name' => '_debug_level[]'));
	echo $check_debug->show(($value & 1) ? 1 : 0 , array('value' => 1, 'id' => 'cfgdebug1'));
	echo '<label for="cfgdebug1">Log errors</label><br />';

	echo $check_debug->show(($value & 4) ? 4 : 0, array('value' => 4, 'id' => 'cfgdebug4'));
	echo '<label for="cfgdebug4">Print errors (to the browser)</label><br />';

	echo $check_debug->show(($value & 8) ? 8 : 0, array('value' => 8, 'id' => 'cfgdebug8'));
	echo '<label for="cfgdebug8">Verbose display (enables debug console)</label><br />';

	?>
	</dd>

	<dt class="propname">log_driver</dt>
	<dd>
	<?php

	$select_log_driver = new html_select(array('name' => '_log_driver', 'id' => "cfglogdriver"));
	$select_log_driver->add(array('file', 'syslog'), array('file', 'syslog'));
	echo $select_log_driver->show($RCI->getprop('log_driver', 'file'));

	?>
	<div>How to do logging? 'file' - write to files in the log directory, 'syslog' - use the syslog facility.</div>
	</dd>

	<dt class="propname">log_dir</dt>
	<dd>
	<?php

	$input_logdir = new html_inputfield(array('name' => '_log_dir', 'size' => 30, 'id' => "cfglogdir"));
	echo $input_logdir->show($RCI->getprop('log_dir'));

	?>
	<div>Use this folder to store log files (must be writeable for webserver). Note that this only applies if you are using the 'file' log_driver.</div>
	</dd>

	<dt class="propname">syslog_id</dt>
	<dd>
	<?php

	$input_syslogid = new html_inputfield(array('name' => '_syslog_id', 'size' => 30, 'id' => "cfgsyslogid"));
	echo $input_syslogid->show($RCI->getprop('syslog_id', 'roundcube'));

	?>
	<div>What ID to use when logging with syslog. Note that this only applies if you are using the 'syslog' log_driver.</div>
	</dd>

	<dt class="propname">syslog_facility</dt>
	<dd>
	<?php

	$input_syslogfacility = new html_select(array('name' => '_syslog_facility', 'id' => "cfgsyslogfacility"));
	$input_syslogfacility->add('user-level messages', LOG_USER);
	$input_syslogfacility->add('mail subsystem', LOG_MAIL);
	$input_syslogfacility->add('local level 0', LOG_LOCAL0);
	$input_syslogfacility->add('local level 1', LOG_LOCAL1);
	$input_syslogfacility->add('local level 2', LOG_LOCAL2);
	$input_syslogfacility->add('local level 3', LOG_LOCAL3);
	$input_syslogfacility->add('local level 4', LOG_LOCAL4);
	$input_syslogfacility->add('local level 5', LOG_LOCAL5);
	$input_syslogfacility->add('local level 6', LOG_LOCAL6);
	$input_syslogfacility->add('local level 7', LOG_LOCAL7);
	echo $input_syslogfacility->show($RCI->getprop('syslog_facility'), LOG_USER);

	?>
	<div>What ID to use when logging with syslog. Note that this only applies if you are using the 'syslog' log_driver.</div>
	</dd>




	</dl>
	</fieldset>


	<fieldset>
	<legend>Database setup</legend>
	<dl class="configblock" id="cgfblockdb">
	<dt class="propname">db_dsnw</dt>
	<dd>
	<p>Database settings for read/write operations:</p>
	<?php

	require_once 'MDB2.php';

	$supported_dbs = array('MySQL' => 'mysql', 'MySQLi' => 'mysqli',
	'PgSQL' => 'pgsql', 'SQLite' => 'sqlite');

	$select_dbtype = new html_select(array('name' => '_dbtype', 'id' => "cfgdbtype"));
	foreach ($supported_dbs AS $database => $ext) {
	if (extension_loaded($ext)) {
	$select_dbtype->add($database, $ext);
	}
	}

	$input_dbhost = new html_inputfield(array('name' => '_dbhost', 'size' => 20, 'id' => "cfgdbhost"));
	$input_dbname = new html_inputfield(array('name' => '_dbname', 'size' => 20, 'id' => "cfgdbname"));
	$input_dbuser = new html_inputfield(array('name' => '_dbuser', 'size' => 20, 'id' => "cfgdbuser"));
	$input_dbpass = new html_passwordfield(array('name' => '_dbpass', 'size' => 20, 'id' => "cfgdbpass"));

	$dsnw = MDB2::parseDSN($RCI->getprop('db_dsnw'));

	echo $select_dbtype->show($RCI->is_post ? $_POST['_dbtype'] : $dsnw['phptype']);
	echo '<label for="cfgdbtype">Database type</label><br />';
	echo $input_dbhost->show($RCI->is_post ? $_POST['_dbhost'] : $dsnw['hostspec']);
	echo '<label for="cfgdbhost">Database server</label><br />';
	echo $input_dbname->show($RCI->is_post ? $_POST['_dbname'] : $dsnw['database']);
	echo '<label for="cfgdbname">Database name</label><br />';
	echo $input_dbuser->show($RCI->is_post ? $_POST['_dbuser'] : $dsnw['username']);
	echo '<label for="cfgdbuser">Database user name (needs write permissions)</label><br />';
	echo $input_dbpass->show($RCI->is_post ? $_POST['_dbpass'] : $dsnw['password']);
	echo '<label for="cfgdbpass">Database password</label><br />';

	?>
	</dd>
	</dl>
	</fieldset>


	<fieldset>
	<legend>IMAP Settings</legend>
	<dl class="configblock" id="cgfblockimap">
	<dt class="propname">default_host</dt>
	<dd>
	<div>The IMAP host(s) chosen to perform the log-in</div>
	<div id="defaulthostlist">
	<?php

	$text_imaphost = new html_inputfield(array('name' => '_default_host[]', 'size' => 30));
	$default_hosts = $RCI->get_hostlist();

	if (empty($default_hosts))
	$default_hosts = array('');

	$i = 0;
	foreach ($default_hosts as $host) {
	echo '<div id="defaulthostentry'.$i.'">' . $text_imaphost->show($host);
	if ($i++ > 0)
	echo '<a href="#" onclick="removehostfield(this.parentNode);return false" class="removelink" title="Remove this entry">remove</a>';
	echo '</div>';
	}

	?>
	</div>
	<div><a href="javascript:addhostfield()" class="addlink" title="Add another field">add</a></div>

	<p class="hint">Leave blank to show a textbox at login. To use SSL/IMAPS connection, type ssl://hostname</p>
	</dd>

	<dt class="propname">default_port</dt>
	<dd>
	<?php

	$text_imapport = new html_inputfield(array('name' => '_default_port', 'size' => 6, 'id' => "cfgimapport"));
	echo $text_imapport->show($RCI->getprop('default_port'));

	?>
	<div>TCP port used for IMAP connections</div>
	</dd>

	<dt class="propname">username_domain</dt>
	<dd>
	<?php

	$text_userdomain = new html_inputfield(array('name' => '_username_domain', 'size' => 30, 'id' => "cfguserdomain"));
	echo $text_userdomain->show($RCI->getprop('username_domain'));

	?>
	<div>Automatically add this domain to user names for login</div>

	<p class="hint">Only for IMAP servers that require full e-mail addresses for login</p>
	</dd>

	<dt class="propname">auto_create_user</dt>
	<dd>
	<?php

	$check_autocreate = new html_checkbox(array('name' => '_auto_create_user', 'id' => "cfgautocreate"));
	echo $check_autocreate->show(intval($RCI->getprop('auto_create_user')), array('value' => 1));

	?>
	<label for="cfgautocreate">Automatically create a new RoundCube user when log-in the first time</label><br />

	<p class="hint">A user is authenticated by the IMAP server but it requires a local record to store settings
	and contacts. With this option enabled a new user record will automatically be created once the IMAP login succeeds.</p>

	<p class="hint">If this option is disabled, the login only succeeds if there's a matching user-record in the local RoundCube database
	what means that you have to create those records manually or disable this option after the first login.</p>
	</dd>

	<dt class="propname">sent_mbox</dt>
	<dd>
	<?php

	$text_sentmbox = new html_inputfield(array('name' => '_sent_mbox', 'size' => 20, 'id' => "cfgsentmbox"));
	echo $text_sentmbox->show($RCI->getprop('sent_mbox'));

	?>
	<div>Store sent messages is this folder</div>

	<p class="hint">Leave blank if sent messages should not be stored</p>
	</dd>

	<dt class="propname">trash_mbox</dt>
	<dd>
	<?php

	$text_trashmbox = new html_inputfield(array('name' => '_trash_mbox', 'size' => 20, 'id' => "cfgtrashmbox"));
	echo $text_trashmbox->show($RCI->getprop('trash_mbox'));

	?>
	<div>Move messages to this folder when deleting them</div>

	<p class="hint">Leave blank if they should be deleted directly</p>
	</dd>

	<dt class="propname">drafts_mbox</dt>
	<dd>
	<?php

	$text_draftsmbox = new html_inputfield(array('name' => '_drafts_mbox', 'size' => 20, 'id' => "cfgdraftsmbox"));
	echo $text_draftsmbox->show($RCI->getprop('drafts_mbox'));

	?>
	<div>Store draft messages is this folder</div>
	</dd>

	</dl>
	</fieldset>


	<fieldset>
	<legend>SMTP Settings</legend>
	<dl class="configblock" id="cgfblocksmtp">
	<dt class="propname">smtp_server</dt>
	<dd>
	<?php

	$text_smtphost = new html_inputfield(array('name' => '_smtp_server', 'size' => 30, 'id' => "cfgsmtphost"));
	echo $text_smtphost->show($RCI->getprop('smtp_server'));

	?>
	<div>Use this host for sending mails</div>

	<p class="hint">To use SSL connection, set ssl://smtp.host.com. If left blank, the PHP mail() function is used</p>
	</dd>

	<dt class="propname">smtp_port</dt>
	<dd>
	<?php

	$text_smtpport = new html_inputfield(array('name' => '_smtp_port', 'size' => 6, 'id' => "cfgsmtpport"));
	echo $text_smtpport->show($RCI->getprop('smtp_port'));

	?>
	<div>SMTP port (default is 25; 465 for SSL)</div>
	</dd>

	<dt class="propname">smtp_user/smtp_pass</dt>
	<dd>
	<?php

	$text_smtpuser = new html_inputfield(array('name' => '_smtp_user', 'size' => 20, 'id' => "cfgsmtpuser"));
	$text_smtppass = new html_passwordfield(array('name' => '_smtp_pass', 'size' => 20, 'id' => "cfgsmtppass"));
	echo $text_smtpuser->show($RCI->getprop('smtp_user'));
	echo $text_smtppass->show($RCI->getprop('smtp_pass'));

	?>
	<div>SMTP username and password (if required)</div>
	<p>
	<?php

	$check_smtpuser = new html_checkbox(array('name' => '_smtp_user_u', 'id' => "cfgsmtpuseru"));
	echo $check_smtpuser->show($RCI->getprop('smtp_user') == '%u' \|\| $_POST['_smtp_user_u'] ? 1 : 0, array('value' => 1));

	?>
	<label for="cfgsmtpuseru">Use the current IMAP username and password for SMTP authentication</label>
	</p>
	</dd>
	<!--
	<dt class="propname">smtp_auth_type</dt>
	<dd>
	<?php
	/*
	$select_smtpauth = new html_select(array('name' => '_smtp_auth_type', 'id' => "cfgsmtpauth"));
	$select_smtpauth->add(array('(auto)', 'PLAIN', 'DIGEST-MD5', 'CRAM-MD5', 'LOGIN'), array('0', 'PLAIN', 'DIGEST-MD5', 'CRAM-MD5', 'LOGIN'));
	echo $select_smtpauth->show(intval($RCI->getprop('smtp_auth_type')));
	*/
	?>
	<div>Method to authenticate at the SMTP server. Choose (auto) if you don't know what this is</div>
	</dd>
	-->
	<dt class="propname">smtp_log</dt>
	<dd>
	<?php

	$check_smtplog = new html_checkbox(array('name' => '_smtp_log', 'id' => "cfgsmtplog"));
	echo $check_smtplog->show(intval($RCI->getprop('smtp_log')), array('value' => 1));

	?>
	<label for="cfgsmtplog">Log sent messages in <tt>{log_dir}/sendmail</tt> or to syslog.</label><br />
	</dd>

	</dl>
	</fieldset>


	<fieldset>
	<legend>Display settings & user prefs</legend>
	<dl class="configblock" id="cgfblockdisplay">

	<dt class="propname">language</dt>
	<dd>
	<?php

	$input_locale = new html_inputfield(array('name' => '_language', 'size' => 6, 'id' => "cfglocale"));
	echo $input_locale->show($RCI->getprop('language'));

	?>
	<div>The default locale setting. This also defines the language of the login screen.<br/>Leave it empty to auto-detect the user agent language.</div>
	<p class="hint">Enter a <a href="http://www.faqs.org/rfcs/rfc1766">RFC1766</a> formatted language name. Examples: en_US, de_DE, de_CH, fr_FR, pt_BR</p>
	</dd>

	<dt class="propname">skin <span class="userconf">*</span></dt>
	<dd>
	<?php

	$input_skin = new html_inputfield(array('name' => '_skin', 'size' => 30, 'id' => "cfgskin"));
	echo $input_skin->show($RCI->getprop('skin'));

	?>
	<div>Name of interface skin (folder in /skins)</div>
	</dd>

	<dt class="propname">pagesize <span class="userconf">*</span></dt>
	<dd>
	<?php

	$input_pagesize = new html_inputfield(array('name' => '_pagesize', 'size' => 6, 'id' => "cfgpagesize"));
	echo $input_pagesize->show($RCI->getprop('pagesize'));

	?>
	<div>Show up to X items in list view.</div>
	</dd>

	<dt class="propname">prefer_html <span class="userconf">*</span></dt>
	<dd>
	<?php

	$check_htmlview = new html_checkbox(array('name' => '_prefer_html', 'id' => "cfghtmlview", 'value' => 1));
	echo $check_htmlview->show(intval($RCI->getprop('prefer_html')));

	?>
	<label for="cfghtmlview">Prefer displaying HTML messages</label><br />
	</dd>

	<dt class="propname">preview_pane <span class="userconf">*</span></dt>
	<dd>
	<?php

	$check_prevpane = new html_checkbox(array('name' => '_preview_pane', 'id' => "cfgprevpane", 'value' => 1));
	echo $check_prevpane->show(intval($RCI->getprop('preview_pane')));

	?>
	<label for="cfgprevpane">If preview pane is enabled</label><br />
	</dd>

	<dt class="propname">htmleditor <span class="userconf">*</span></dt>
	<dd>
	<?php

	$check_htmlcomp = new html_checkbox(array('name' => '_htmleditor', 'id' => "cfghtmlcompose", 'value' => 1));
	echo $check_htmlcomp->show(intval($RCI->getprop('htmleditor')));

	?>
	<label for="cfghtmlcompose">Compose HTML formatted messages</label><br />
	</dd>

	<dt class="propname">draft_autosave <span class="userconf">*</span></dt>
	<dd>
	<label for="cfgautosave">Save compose message every</label>
	<?php

	$select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => 'cfgautosave'));
	$select_autosave->add('never', 0);
	foreach (array(3, 5, 10) as $i => $min)
	$select_autosave->add("$min min", $min*60);

	echo $select_autosave->show(intval($RCI->getprop('draft_autosave')));

	?>
	</dd>

	<dt class="propname">mdn_requests <span class="userconf">*</span></dt>
	<dd>
	<?php

	$select_mdnreq = new html_select(array('name' => '_mdn_requests', 'id' => "cfgmdnreq"));
	$select_mdnreq->add(array('ask the user', 'send automatically', 'ignore'), array(0, 1, 2));
	echo $select_mdnreq->show(intval($RCI->getprop('mdn_requests')));

	?>
	<div>Behavior if a received message requests a message delivery notification (read receipt)</div>
	</dd>

	<dt class="propname">mime_param_folding <span class="userconf">*</span></dt>
	<dd>
	<?php

	$select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => "cfgmimeparamfolding"));
	$select_param_folding->add('Full RFC 2231 (Roundcube, Thunderbird)', '0');
	$select_param_folding->add('RFC 2047/2231 (MS Outlook, OE)', '1');
	$select_param_folding->add('Full RFC 2047 (deprecated)', '2');

	echo $select_param_folding->show(intval($RCI->getprop('mime_param_folding')));

	?>
	<div>How to encode attachment long/non-ascii names</div>
	</dd>

	</dl>

	<p class="hint"><span class="userconf">*</span>  These settings are defaults for the user preferences</p>
	</fieldset>

	<?php

	echo '<p><input type="submit" name="submit" value="' . ($RCI->configured ? 'UPDATE' : 'CREATE') . ' CONFIG" ' . ($RCI->failures ? 'disabled' : '') . ' /></p>';

	?>
	</form>
	diff --git a/installer/rcube_install.php b/installer/rcube_install.php
	index 21e353c9c..808994dca 100644
	--- a/installer/rcube_install.php
	+++ b/installer/rcube_install.php
	@@ -1,465 +1,566 @@
	<?php

	/*
	+-----------------------------------------------------------------------+
	\| rcube_install.php \|
	\| \|
	\| This file is part of the RoundCube Webmail package \|
	\| Copyright (C) 2008, RoundCube Dev. - Switzerland \|
	\| Licensed under the GNU Public License \|
	+-----------------------------------------------------------------------+

	$Id: $

	*/


	/**
	* 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 $config_props = array();
	+ var $bool_config_props = array();

	var $obsolete_config = array('db_backend');
	var $replaced_config = array('skin_path' => 'skin', 'locale_string' => 'language');

	// these config options are optional or can be set to null
	var $optional_config = array(
	'log_driver', 'syslog_id', 'syslog_facility', 'imap_auth_type',
	'smtp_helo_host', 'sendmail_delay', 'double_auth', 'language',
	'mail_header_delimiter', 'create_default_folders',
	'quota_zero_as_unlimited', 'spellcheck_uri', 'spellcheck_languages',
	'http_received_header', 'session_domain', 'mime_magic', 'log_logins',
	'enable_installer', 'skin_include_php');

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

	/**
	* Singleton getter
	*/
	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)
	{
	@include RCMAIL_CONFIG_DIR . '/main.inc' . $suffix;
	if (is_array($rcmail_config)) {
	$this->config += $rcmail_config;
	}

	@include RCMAIL_CONFIG_DIR . '/db.inc'. $suffix;
	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("../config/{$which}.inc.php.dist");

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

	foreach ($this->config as $prop => $default) {
	- $value = (isset($_POST["_$prop"]) \|\| $this->config_props[$prop]) ? $_POST["_$prop"] : $default;
	+ $value = (isset($_POST["_$prop"]) \|\| $this->bool_config_props[$prop]) ? $_POST["_$prop"] : $default;

	// convert some form data
	if ($prop == 'debug_level') {
	$val = 0;
	if (is_array($value))
	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
	$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 == '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 (is_bool($default)) {
	$value = (bool)$value;
	}
	else if (is_numeric($value)) {
	$value = intval($value);
	}

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

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

	// replace the matching line in config file
	$out = preg_replace(
	'/(\$rcmail_config\[\''.preg_quote($prop).'\'\])\s+=\s+(.+);/Uie',
	"'\\1 = ' . var_export(\$value, true) . ';'",
	$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();
	$optional = array_flip($this->optional_config);

	// ireate 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;
	}
	}

	// iterate over default config
	foreach ($defaults as $prop => $value) {
	if (!$seen[$prop] && !isset($this->config[$prop]) && !isset($optional[$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.');
	+ }
	+ if (empty($this->config['spellcheck_languages'])) {
	+ $out['dependencies'][] = array('prop' => 'spellcheck_languages',
	+ 'explain' => 'You should specify the list of languages supported by your local pspell installation.');
	+ }
	+ }
	+
	+ if ($this->config['log_driver'] == 'syslog') {
	+ if (!function_exists('openlog')) {
	+ $out['dependencies'][] = array('prop' => 'log_driver',
	+ 'explain' => 'This requires the <tt>sylog</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');
	+ }
	+
	+ }
	+
	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
	$this->config[$replacement] = $current[$prop];

	unset($current[$prop]);
	}

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

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


	+ /**
	+ * Compare the local database schema with the reference schema
	+ * required for this version of RoundCube
	+ *
	+ * @param boolean True if the schema schould be updated
	+ * @return boolean True if the schema is up-to-date, false if not or an error occured
	+ */
	+ function db_schema_check($update = false)
	+ {
	+ if (!$this->configured)
	+ return false;
	+
	+ $options = array(
	+ 'use_transactions' => false,
	+ 'log_line_break' => "\n",
	+ 'idxname_format' => '%s',
	+ 'debug' => false,
	+ 'quote_identifier' => true,
	+ 'force_defaults' => false,
	+ 'portability' => true
	+ );
	+
	+ $schema =& MDB2_Schema::factory($this->config['db_dsnw'], $options);
	+ $schema->db->supported['transactions'] = false;
	+
	+ if (PEAR::isError($schema)) {
	+ $this->raise_error(array('code' => $schema->getCode(), 'message' => $schema->getMessage() . ' ' . $schema->getUserInfo()));
	+ return false;
	+ }
	+ else {
	+ $definition = $schema->getDefinitionFromDatabase();
	+ $definition['charset'] = 'utf8';
	+
	+ if (PEAR::isError($definition)) {
	+ $this->raise_error(array('code' => $definition->getCode(), 'message' => $definition->getMessage() . ' ' . $definition->getUserInfo()));
	+ return false;
	+ }
	+
	+ // load reference schema
	+ $dsn = MDB2::parseDSN($this->config['db_dsnw']);
	+ $ref_schema = INSTALL_PATH . 'SQL/' . $dsn['phptype'] . '.schema.xml';
	+
	+ if (is_file($ref_schema)) {
	+ $reference = $schema->parseDatabaseDefinition($ref_schema, false, array(), $schema->options['fail_on_invalid_names']);
	+
	+ if (PEAR::isError($reference)) {
	+ $this->raise_error(array('code' => $reference->getCode(), 'message' => $reference->getMessage() . ' ' . $reference->getUserInfo()));
	+ }
	+ else {
	+ $diff = $schema->compareDefinitions($reference, $definition);
	+
	+ if (empty($diff)) {
	+ return true;
	+ }
	+ else if ($update) {
	+ // update database schema with the diff from the above check
	+ $success = $schema->alterDatabase($reference, $definition, $diff);
	+
	+ if (PEAR::isError($success)) {
	+ $this->raise_error(array('code' => $success->getCode(), 'message' => $success->getMessage() . ' ' . $success->getUserInfo()));
	+ }
	+ else
	+ return true;
	+ }
	+ echo '<pre>'; var_dump($diff); echo '</pre>';
	+ return false;
	+ }
	+ }
	+ else
	+ $this->raise_error(array('message' => "Could not find reference schema file ($ref_schema)"));
	+ return false;
	+ }
	+
	+ return false;
	+ }
	+
	+
	/**
	* 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[] = is_numeric($key) ? $name : $key;
	}

	return $out;
	}


	/**
	* 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
	*/
	function fail($name, $message = '', $url = '')
	{
	$this->failures++;

	echo Q($name) . ':  <span class="fail">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>';
	}


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

	foreach (array_unique($arr) as $i => $val)
	if (!empty($val))
	$out[] = $val;

	return $out;
	}


	/**
	* 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)
	{
	$db_map = array('pgsql' => 'postgres', 'mysqli' => 'mysql');
	$engine = isset($db_map[$DB->db_provider]) ? $db_map[$DB->db_provider] : $DB->db_provider;

	// find out db version
	if ($engine == 'mysql') {
	$DB->query('SELECT VERSION() AS version');
	$sql_arr = $DB->fetch_assoc();
	$version = floatval($sql_arr['version']);

	if ($version >= 4.1)
	$engine = 'mysql5';
	}

	// read schema file from /SQL/*
	$fname = "../SQL/$engine.initial.sql";
	if ($lines = @file($fname, FILE_SKIP_EMPTY_LINES)) {
	$buff = '';
	foreach ($lines as $i => $line) {
	if (eregi('^--', $line))
	continue;

	$buff .= $line . "\n";
	if (eregi(';$', trim($line))) {
	$DB->query($buff);
	$buff = '';
	if ($this->get_error())
	break;
	}
	}
	}
	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;
	}

	/**
	* 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;
	}

	}


	/**
	* 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/test.php b/installer/test.php
	index edf77325a..d66fe34f2 100644
	--- a/installer/test.php
	+++ b/installer/test.php
	@@ -1,389 +1,412 @@
	<form action="index.php?_step=3" method="post">

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

	$read_main = is_readable(RCMAIL_CONFIG_DIR.'/main.inc.php');
	$read_db = is_readable(RCMAIL_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_table_users'])) {
	$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 present in the current configuration.<br/>';
	echo 'Please check the default config files and add the missing properties to your local config files.</p>';

	echo '<ul class="configwarings">';
	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'];
	if($RCI->config['log_driver'] != 'syslog')
	$dirs[] = $RCI->config['log_dir'];

	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 configured database settings</h3>
	<?php

	$db_working = false;
	if ($RCI->configured) {
	if (!empty($RCI->config['db_dsnw'])) {

	$DB = new rcube_mdb2($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>';
	}
	}

	// test database
	if ($db_working) {
	$db_read = $DB->query("SELECT count(*) FROM {$RCI->config['db_table_users']}");
	if (!$db_read) {
	$RCI->fail('DB Schema', "Database not initialized");
	- $db_working = false;
	echo '<p><input type="submit" name="initdb" value="Initialize database" /></p>';
	+ $db_working = false;
	+ }
	+ /*
	+ else if (!$RCI->db_schema_check($update = !empty($_POST['updatedb']))) {
	+ $RCI->fail('DB Schema', "Database schema differs");
	+
	+ echo $update ? '<p class="warning">Failed to update the database schema! Please manually execute the SQL statements from the SQL/*.update.sql file on your database</p>' :
	+ '<p><input type="submit" name="updatedb" value="Update schema now" /></p>';
	+ $db_working = false;
	}
	+ */
	else {
	$RCI->pass('DB Schema');
	+ echo '<br />';
	}
	- echo '<br />';
	}

	// more database tests
	if ($db_working) {
	// write test
	$insert_id = md5(uniqid());
	$db_write = $DB->query("INSERT INTO {$RCI->config['db_table_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_table_session']} WHERE sess_id=?", $insert_id);
	}
	else {
	$RCI->fail('DB Write', $RCI->get_error());
	}
	- echo '<br />';
	+ 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 SMTP settings</h3>

	<p>
	Server: <?php echo $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']) && !empty($_POST['_from']) && !empty($_POST['_to'])) {

	require_once 'rcube_smtp.inc';

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

	if (preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_from'])) &&
	preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_to']))) {

	$headers = array(
	'From' => trim($_POST['_from']),
	'To' => trim($_POST['_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 rcube_mail_mime();
	$send_headers = $mail_object->headers($headers);

	$status = smtp_mail($headers['From'], $headers['To'],
	($foo = $mail_object->txtHeaders($send_headers)),
	$body, $smtp_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 configuration</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 />';

	$a_host = parse_url($_POST['_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;
	$imap_port = isset($a_host['port']) ? $a_host['port'] : ($imap_ssl ? 993 : $CONFIG['default_port']);
	}
	else {
	$imap_host = trim($_POST['_host']);
	$imap_port = $RCI->getprop('default_port');
	}

	$imap = new rcube_imap(null);
	if ($imap->connect($imap_host, $_POST['_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.<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, 10:58 AM (7 h, 41 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166759
Default Alt Text: (47 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions