No OneTemporary
Actions

Size

32 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/installer/config.php b/installer/config.php
	index 53a4655ed..d5e10e8b4 100644
	--- a/installer/config.php
	+++ b/installer/config.php
	@@ -1,552 +1,552 @@
	<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(
	'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($RCI->create_config('main'));
	+ 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($RCI->create_config('db'));
	+ 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>

	</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/index.php b/installer/index.php
	index ff31667f9..d14e6ff37 100644
	--- a/installer/index.php
	+++ b/installer/index.php
	@@ -1,112 +1,118 @@
	<?php
	ini_set('error_reporting', E_ALL&~E_NOTICE);
	ini_set('display_errors', 1);

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

	$include_path = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
	$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
	$include_path .= INSTALL_PATH . 'program/include' . PATH_SEPARATOR;
	$include_path .= ini_get('include_path');

	set_include_path($include_path);

	session_start();

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

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

	-if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db')))
	-{
	- header('Content-type: text/plain');
	- header('Content-Disposition: attachment; filename="'.$_GET['_getfile'].'.inc.php"');
	- echo $RCI->create_config($_GET['_getfile']);
	- exit;
	+if (isset($_GET['_getfile']) && in_array($_GET['_getfile'], array('main', 'db'))) {
	+ $filename = $_GET['_getfile'] . '.inc.php';
	+ if (!empty($_SESSION[$filename])) {
	+ header('Content-type: text/plain');
	+ header('Content-Disposition: attachment; filename="'.$filename.'"');
	+ echo $_SESSION[$filename];
	+ exit;
	+ }
	+ else {
	+ header('HTTP/1.0 404 Not found');
	+ die("The requested configuration was not found. Please run the installer from the beginning.");
	+ }
	}

	?>
	<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
	"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
	<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
	<head>
	<title>RoundCube Webmail Installer</title>
	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
	<link rel="stylesheet" type="text/css" href="styles.css" />
	<script type="text/javascript" src="client.js"></script>
	</head>

	<body>

	<div id="banner">
	<div id="header">
	<div class="banner-logo"><a href="http://www.roundcube.net"><img src="images/banner_logo.gif" width="200" height="56" border="0" alt="RoundCube Webmal Project" /></a></div>
	<div class="banner-right"><img src="images/banner_right.gif" width="10" height="56" alt="" /></div>
	</div>
	<div id="topnav">
	<a href="http://trac.roundcube.net/wiki/Howto_Install">How-to Wiki</a>
	</div>
	</div>

	<div id="content">

	<?php

	// exit if installation is complete
	if ($RCI->configured && !$RCI->getprop('enable_installer') && !$_SESSION['allowinstaller']) {
	// header("HTTP/1.0 404 Not Found");
	echo '<h2 class="error">The installer is disabled!</h2>';
	echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in '.RCMAIL_CONFIG_DIR.'/main.inc.php</p>';
	echo '</div></body></html>';
	exit;
	}

	?>

	<h1>RoundCube Webmail Installer</h1>

	<ol id="progress">
	<?php

	foreach (array('Check environment', 'Create config', 'Test config') as $i => $item) {
	$j = $i + 1;
	$link = ($RCI->step >= $j \|\| $RCI->configured) ? '<a href="./index.php?_step='.$j.'">' . Q($item) . '</a>' : Q($item);
	printf('<li class="step%d%s">%s</li>', $j+1, $RCI->step > $j ? ' passed' : ($RCI->step == $j ? ' current' : ''), $link);
	}
	?>
	</ol>

	<?php
	$include_steps = array('welcome.html', 'check.php', 'config.php', 'test.php');

	if ($include_steps[$RCI->step]) {
	include $include_steps[$RCI->step];
	}
	else {
	header("HTTP/1.0 404 Not Found");
	echo '<h2 class="error">Invalid step</h2>';
	}

	?>
	</div>

	<div id="footer">
	Installer by the RoundCube Dev Team. Copyright © 2008 - Published under the GNU Public License;
	Icons by <a href="http://famfamfam.com">famfamfam</a>
	</div>
	</body>
	</html>
	diff --git a/installer/rcube_install.php b/installer/rcube_install.php
	index e528cfc1f..37645adbc 100644
	--- a/installer/rcube_install.php
	+++ b/installer/rcube_install.php
	@@ -1,385 +1,384 @@
	<?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();

	/**
	* 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)
	{
	$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;

	// convert some form data
	if ($prop == 'debug_level') {
	$val = 0;
	- if (isset($value))
	- foreach ($value as $dbgval)
	+ if (is_array($value))
	+ foreach ($value as $dbgval)
	$val += intval($dbgval);
	- $value = $val;
	+ $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']);
	+ 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 ($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);
	}


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

File Metadata

Mime Type: text/x-diff
Expires: Sat, Mar 1, 10:24 AM (11 h, 29 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 166659
Default Alt Text: (32 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions