From c04b23adfd3945fe2f177cc4b86f4cbcc325bd96 Mon Sep 17 00:00:00 2001
From: thomascube
Date: Wed, 4 Apr 2012 14:59:16 +0000
Subject: - replace claim in Roundcube logo - require support_url config option
in installer
---
config/main.inc.php.dist | 26 +++++++--------
installer/config.php | 55 +++++++++++++++++++-------------
installer/images/rcube_logo.gif | Bin 4526 -> 0 bytes
installer/images/roundcube_logo.png | Bin 0 -> 7956 bytes
installer/index.php | 6 ++--
installer/rcube_install.php | 4 +--
installer/welcome.html | 33 -------------------
skins/default/images/roundcube_logo.png | Bin 6794 -> 7530 bytes
8 files changed, 51 insertions(+), 73 deletions(-)
delete mode 100644 installer/images/rcube_logo.gif
create mode 100644 installer/images/roundcube_logo.png
delete mode 100644 installer/welcome.html
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 69871e3ed..b5019abdc 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -176,6 +176,19 @@ $rcmail_config['smtp_timeout'] = 0;
// ONLY ENABLE IT IF YOU'RE REALLY SURE WHAT YOU'RE DOING!
$rcmail_config['enable_installer'] = false;
+// provide an URL where a user can get support for this Roundcube installation
+// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
+$rcmail_config['support_url'] = '';
+
+// replace Roundcube logo with this image
+// specify an URL relative to the document root of this Roundcube installation
+$rcmail_config['skin_logo'] = null;
+
+// automatically create a new Roundcube user when log-in the first time.
+// a new user will be created once the IMAP login succeeds.
+// set to false if only registered users can use this service
+$rcmail_config['auto_create_user'] = true;
+
// use this folder to store log files (must be writeable for apache user)
// This is used by the 'file' log driver.
$rcmail_config['log_dir'] = 'logs/';
@@ -208,19 +221,6 @@ $rcmail_config['login_autocomplete'] = 0;
// UPDATE users SET username = LOWER(username);
$rcmail_config['login_lc'] = false;
-// automatically create a new Roundcube user when log-in the first time.
-// a new user will be created once the IMAP login succeeds.
-// set to false if only registered users can use this service
-$rcmail_config['auto_create_user'] = true;
-
-// provide an URL where a user can get support for this Roundcube installation
-// PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
-$rcmail_config['support_url'] = '';
-
-// replace Roundcube logo with this image
-// specify an URL relative to the document root of this Roundcube installation
-$rcmail_config['skin_logo'] = null;
-
// Includes should be interpreted as PHP files
$rcmail_config['skin_include_php'] = false;
diff --git a/installer/config.php b/installer/config.php
index b71e3d5d5..bd676b12e 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -59,29 +59,39 @@ echo $input_prodname->show($RCI->getprop('product_name'));
The name of your service (used to compose page titles)