Merge pull request #1 from Brianetta/de-svn

Aleksander Machniak

2012-05-09 66510e20d36cb8da4f3012ef063de7bfce9b51aa

 installer/index.php

@@ -3,7 +3,7 @@
/*
 +-------------------------------------------------------------------------+
 | Roundcube Webmail setup tool                                            |
 | Version 0.8                                                             |
 | Version 0.9-git                                                         |
 |                                                                         |
 | Copyright (C) 2009-2012, The Roundcube Dev Team                         |
 |                                                                         |
@@ -39,11 +39,12 @@

*/

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

define('INSTALL_PATH', realpath(dirname(__FILE__) . '/../').'/');
define('RCMAIL_CONFIG_DIR', INSTALL_PATH . 'config');
define('RCMAIL_CHARSET', 'UTF-8');

$include_path  = INSTALL_PATH . 'program/lib' . PATH_SEPARATOR;
$include_path .= INSTALL_PATH . 'program' . PATH_SEPARATOR;
@@ -53,7 +54,9 @@
set_include_path($include_path);

require_once 'utils.php';
require_once 'main.inc';
require_once 'rcube_shared.inc';
// deprecated aliases (to be removed)
require_once 'rcube_bc.inc';

session_start();

@@ -108,7 +111,7 @@

<div id="banner">
  <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 class="banner-logo"><a href="http://roundcube.net"><img src="images/roundcube_logo.png" width="210" height="55" border="0" alt="Roundcube - open source webmail software" /></a></div>
</div>

<div id="topnav">
@@ -144,7 +147,7 @@
</ol>

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

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

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