githubFork/roundcubemail.git

			@@ -1,4 +1,33 @@
			<?php

			/*
			+-------------------------------------------------------------------------+
			\| Roundcube Webmail setup tool \|
			\| Version 0.6 \|
			\| \|
			\| Copyright (C) 2009-2011, The Roundcube Dev Team \|
			\| \|
			\| This program is free software; you can redistribute it and/or modify \|
			\| it under the terms of the GNU General Public License version 2 \|
			\| as published by the Free Software Foundation. \|
			\| \|
			\| This program is distributed in the hope that it will be useful, \|
			\| but WITHOUT ANY WARRANTY; without even the implied warranty of \|
			\| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the \|
			\| GNU General Public License for more details. \|
			\| \|
			\| You should have received a copy of the GNU General Public License along \|
			\| with this program; if not, write to the Free Software Foundation, Inc., \|
			\| 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. \|
			\| \|
			+-------------------------------------------------------------------------+
			\| Author: Thomas Bruederli <roundcube@gmail.com> \|
			+-------------------------------------------------------------------------+

			$Id$

			*/

			ini_set('error_reporting', E_ALL&~E_NOTICE);
			ini_set('display_errors', 1);

			@@ -12,21 +41,10 @@

			set_include_path($include_path);

			session_start();
			require_once 'utils.php';
			require_once 'main.inc';

			/**
			* Use PHP5 autoload for dynamic class loading
			* (copy from program/incllude/iniset.php)
			*/
			function __autoload($classname)
			{
			$filename = preg_replace(
			array('/MDB2_(.+)/', '/Mail_(.+)/', '/^html_.+/', '/^utf8$/'),
			array('MDB2/\\1', 'Mail/\\1', 'html', 'utf8.class'),
			$classname
			);
			include_once $filename. '.php';
			}
			session_start();

			$RCI = rcube_install::get_instance();
			$RCI->load_config();
			@@ -45,13 +63,32 @@
			}
			}

			if ($RCI->configured && ($RCI->getprop('enable_installer') \|\| $_SESSION['allowinstaller']) &&
			isset($_GET['_mergeconfig']) && in_array($_GET['_mergeconfig'], array('main', 'db'))) {
			$filename = $_GET['_mergeconfig'] . '.inc.php';

			header('Content-type: text/plain');
			header('Content-Disposition: attachment; filename="'.$filename.'"');

			$RCI->merge_config();
			echo $RCI->create_config($_GET['_mergeconfig'], true);
			exit;
			}

			// go to 'check env' step if we have a local configuration
			if ($RCI->configured && empty($_REQUEST['_step'])) {
			header("Location: ./?_step=1");
			exit;
			}

			?>
			<!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"/>
			<title>Roundcube Webmail Installer</title>
			<meta name="Robots" content="noindex,nofollow" />
			<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>
			@@ -59,14 +96,13 @@
			<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 class="banner-bg"></div>
			<div class="banner-logo"><a href="http://roundcube.net"><img src="images/rcube_logo.gif" width="210" height="55" border="0" alt="Roundcube - Open source webmail project" /></a></div>
			</div>

			<div id="topnav">
			<a href="http://trac.roundcube.net/wiki/Howto_Install">How-to Wiki</a>
			</div>

			<div id="content">

			@@ -76,14 +112,14 @@
			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 '<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>
			<h1>Roundcube Webmail Installer</h1>

			<ol id="progress">
			<?php
			@@ -97,7 +133,7 @@
			</ol>

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

			if ($include_steps[$RCI->step]) {
			include $include_steps[$RCI->step];
			@@ -111,7 +147,7 @@
			</div>

			<div id="footer">
			Installer by the RoundCube Dev Team. Copyright © 2008 - Published under the GNU Public License;
			Installer by the Roundcube Dev Team. Copyright © 2008-2011 - Published under the GNU Public License;
			Icons by <a href="http://famfamfam.com">famfamfam</a>
			</div>
			</body>