From 1476db5e5ba1212216fa56ef21df9a3a8c25724c Mon Sep 17 00:00:00 2001 From: thomasb Date: Wed, 4 Apr 2012 14:59:16 +0000 Subject: - replace claim in Roundcube logo - require support_url config option in installer git-svn-id: https://svn.roundcube.net/trunk@6036 208e9e7b-5314-0410-a742-e7e81cd9613c --- roundcubemail/config/main.inc.php.dist | 26 +++++----- roundcubemail/installer/config.php | 55 ++++++++++++--------- roundcubemail/installer/images/rcube_logo.gif | Bin 4526 -> 0 bytes roundcubemail/installer/images/roundcube_logo.png | Bin 0 -> 7956 bytes roundcubemail/installer/index.php | 6 +-- roundcubemail/installer/rcube_install.php | 4 +- roundcubemail/installer/welcome.html | 33 ------------- .../skins/default/images/roundcube_logo.png | Bin 6794 -> 7530 bytes 8 files changed, 51 insertions(+), 73 deletions(-) delete mode 100644 roundcubemail/installer/images/rcube_logo.gif create mode 100644 roundcubemail/installer/images/roundcube_logo.png delete mode 100644 roundcubemail/installer/welcome.html diff --git a/roundcubemail/config/main.inc.php.dist b/roundcubemail/config/main.inc.php.dist index 69871e3ed..b5019abdc 100644 --- a/roundcubemail/config/main.inc.php.dist +++ b/roundcubemail/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/roundcubemail/installer/config.php b/roundcubemail/installer/config.php index b71e3d5d5..bd676b12e 100644 --- a/roundcubemail/installer/config.php +++ b/roundcubemail/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 {
diff --git a/roundcubemail/installer/rcube_install.php b/roundcubemail/installer/rcube_install.php index 8591f1e74..365d297b6 100644 --- a/roundcubemail/installer/rcube_install.php +++ b/roundcubemail/installer/rcube_install.php @@ -50,7 +50,7 @@ class rcube_install // these config options are required for a working system var $required_config = array( 'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers', - 'des_key', 'session_lifetime', + 'des_key', 'session_lifetime', 'support_url', ); /** @@ -254,7 +254,7 @@ class rcube_install // iterate over default config foreach ($defaults as $prop => $value) { - if (!isset($seen[$prop]) && !isset($this->config[$prop]) && isset($required[$prop])) + if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop]))) $out['missing'][] = array('prop' => $prop); } diff --git a/roundcubemail/installer/welcome.html b/roundcubemail/installer/welcome.html deleted file mode 100644 index a992c5ee9..000000000 --- a/roundcubemail/installer/welcome.html +++ /dev/null @@ -1,33 +0,0 @@ -
- - -

Welcome to the interactive install script for the Roundcube Webmail package

-

First let's check your local environment and find out if everything Roundcube needs is available.

- -

The basic requirements are:

-
    -
  • PHP Version 5.2.0 or greater including -
      -
    • PCRE (perl compatible regular expression)
      • -
    • Session support
      • -
    • Libiconv (recommended)
      • -
    • OpenSSL (recommended)
      • -
    • FileInfo (optional)
      • -
    • Multibyte/mbstring (optional)
      • -
    • Mcrypt (optional)
      • -
    -
    • -
  • php.ini options: -
      -
    • error_reporting E_ALL & ~E_NOTICE (or lower)
      • -
    • file_uploads on (for attachment upload features)
      • -
    • session.auto_start needs to be off
      • -
    -
    • -
  • A MySQL or PostgreSQL database engine or the SQLite extension for PHP
    • -
  • An SMTP server (recommended) or PHP configured for mail delivery
    • -
- - - -
diff --git a/roundcubemail/skins/default/images/roundcube_logo.png b/roundcubemail/skins/default/images/roundcube_logo.png index 1a4783e6e..4323c6b5f 100644 Binary files a/roundcubemail/skins/default/images/roundcube_logo.png and b/roundcubemail/skins/default/images/roundcube_logo.png differ -- cgit v1.2.3