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
---
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 ----------------------
6 files changed, 38 insertions(+), 60 deletions(-)
delete mode 100644 installer/images/rcube_logo.gif
create mode 100644 installer/images/roundcube_logo.png
delete mode 100644 installer/welcome.html
(limited to 'installer')
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)
-temp_dir
+support_url
'_temp_dir', 'size' => 30, 'id' => "cfgtempdir"));
-echo $input_tempdir->show($RCI->getprop('temp_dir'));
+$input_support = new html_inputfield(array('name' => '_support_url', 'size' => 50, 'id' => "cfgsupporturl"));
+echo $input_support->show($RCI->getprop('support_url'));
?>
-Use this folder to store temp files (must be writeable for webserver)
+Provide an URL where a user can get support for this Roundcube installation.
PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!
+Enter an absolute URL (inculding http://) to a support page/form or a mailto: link.
-
-ip_check
+skin_logo
'_ip_check', 'id' => "cfgipcheck"));
-echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1));
+$input_skin = new html_inputfield(array('name' => '_skin_logo', 'size' => 50, 'id' => "cfgskinlogo"));
+echo $input_skin->show($RCI->getprop('skin_logo'));
?>
-
+Custom image to display instead of the Roundcube logo.
+Enter a URL relative to the document root of this Roundcube installation.
+
-This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.
+temp_dir
+
+ '_temp_dir', 'size' => 30, 'id' => "cfgtempdir"));
+echo $input_tempdir->show($RCI->getprop('temp_dir'));
+
+?>
+Use this folder to store temp files (must be writeable for webserver)
des_key
@@ -97,6 +107,19 @@ echo $input_deskey->show($RCI->getprop('des_key'));
If you enter it manually please provide a string of exactly 24 chars.
+ip_check
+
+ '_ip_check', 'id' => "cfgipcheck"));
+echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1));
+
+?>
+
+
+This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.
+
+
enable_caching
show($RCI->getprop('skin'));
Name of interface skin (folder in /skins)
-skin_logo
-
- '_skin_logo', 'size' => 50, 'id' => "cfgskinlogo"));
-echo $input_skin->show($RCI->getprop('skin_logo'));
-
-?>
-Custom image to display instead of the Roundcube logo.
-Enter a URL relative to the document root of this Roundcube installation.
-
-
mail_pagesize *
configured && empty($_REQUEST['_step'])) {
@@ -144,7 +144,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {
step]) {
include $include_steps[$RCI->step];
@@ -158,7 +158,7 @@ else {