From 5d66a4bcf3ad5d584255184776f1f04451c929fc Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 19 Apr 2012 03:42:19 -0400
Subject: [PATCH] - Improved ttl values handling
---
installer/index.php | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 deletions(-)
diff --git a/installer/index.php b/installer/index.php
index 8df7ab0..32fde22 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -1,10 +1,50 @@
<?php
-ini_set('error_reporting', E_ALL&~E_NOTICE);
+/*
+ +-------------------------------------------------------------------------+
+ | Roundcube Webmail setup tool |
+ | Version 0.9-svn |
+ | |
+ | Copyright (C) 2009-2012, 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 (with exceptions |
+ | for skins & plugins) as published by the Free Software Foundation, |
+ | either version 3 of the License, or (at your option) any later version. |
+ | |
+ | This file forms part of the Roundcube Webmail Software for which the |
+ | following exception is added: Plugins and Skins which merely make |
+ | function calls to the Roundcube Webmail Software, and for that purpose |
+ | include it by reference shall not be considered modifications of |
+ | the software. |
+ | |
+ | If you wish to use this file in another project or create a modified |
+ | version that will not be part of the Roundcube Webmail Software, you |
+ | may remove the exception above and use this source code under the |
+ | original version of the license. |
+ | |
+ | 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, see http://www.gnu.org/licenses/. |
+ | |
+ +-------------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com> |
+ +-------------------------------------------------------------------------+
+
+ $Id$
+
+*/
+
+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;
@@ -14,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();
@@ -69,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">
@@ -105,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];
@@ -119,7 +161,7 @@
</div>
<div id="footer">
- Installer by the Roundcube Dev Team. Copyright © 2008-2011 - Published under the GNU Public License;
+ Installer by the Roundcube Dev Team. Copyright © 2008-2012 – Published under the GNU Public License;
Icons by <a href="http://famfamfam.com">famfamfam</a>
</div>
</body>
--
Gitblit v1.9.1