diff options
| -rw-r--r-- | config/main.inc.php.dist | 26 | ||||
| -rw-r--r-- | installer/config.php | 55 | ||||
| -rw-r--r-- | installer/images/rcube_logo.gif | bin | 4526 -> 0 bytes | |||
| -rw-r--r-- | installer/images/roundcube_logo.png | bin | 0 -> 7956 bytes | |||
| -rw-r--r-- | installer/index.php | 6 | ||||
| -rw-r--r-- | installer/rcube_install.php | 4 | ||||
| -rw-r--r-- | installer/welcome.html | 33 | ||||
| -rw-r--r-- | skins/default/images/roundcube_logo.png | bin | 6794 -> 7530 bytes |
8 files changed, 51 insertions, 73 deletions
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')); <div>The name of your service (used to compose page titles)</div> </dd> -<dt class="propname">temp_dir</dt> +<dt class="propname">support_url</dt> <dd> <?php -$input_tempdir = new html_inputfield(array('name' => '_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')); ?> -<div>Use this folder to store temp files (must be writeable for webserver)</div> +<div>Provide an URL where a user can get support for this Roundcube installation.<br/>PLEASE DO NOT LINK TO THE ROUNDCUBE.NET WEBSITE HERE!</div> +<p class="hint">Enter an absolute URL (inculding http://) to a support page/form or a mailto: link.</p> </dd> - -<dt class="propname">ip_check</dt> +<dt class="propname">skin_logo</dt> <dd> <?php -$check_ipcheck = new html_checkbox(array('name' => '_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')); ?> -<label for="cfgipcheck">Check client IP in session authorization</label><br /> +<div>Custom image to display instead of the Roundcube logo.</div> +<p class="hint">Enter a URL relative to the document root of this Roundcube installation.</p> +</dd> -<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p> +<dt class="propname">temp_dir</dt> +<dd> +<?php + +$input_tempdir = new html_inputfield(array('name' => '_temp_dir', 'size' => 30, 'id' => "cfgtempdir")); +echo $input_tempdir->show($RCI->getprop('temp_dir')); + +?> +<div>Use this folder to store temp files (must be writeable for webserver)</div> </dd> <dt class="propname">des_key</dt> @@ -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.</p> </dd> +<dt class="propname">ip_check</dt> +<dd> +<?php + +$check_ipcheck = new html_checkbox(array('name' => '_ip_check', 'id' => "cfgipcheck")); +echo $check_ipcheck->show(intval($RCI->getprop('ip_check')), array('value' => 1)); + +?> +<label for="cfgipcheck">Check client IP in session authorization</label><br /> + +<p class="hint">This increases security but can cause sudden logouts when someone uses a proxy with changing IPs.</p> +</dd> + <dt class="propname">enable_caching</dt> <dd> <?php @@ -512,18 +535,6 @@ echo $input_skin->show($RCI->getprop('skin')); <div>Name of interface skin (folder in /skins)</div> </dd> -<dt class="propname">skin_logo</dt> -<dd> -<?php - -$input_skin = new html_inputfield(array('name' => '_skin_logo', 'size' => 50, 'id' => "cfgskinlogo")); -echo $input_skin->show($RCI->getprop('skin_logo')); - -?> -<div>Custom image to display instead of the Roundcube logo.</div> -<p class="hint">Enter a URL relative to the document root of this Roundcube installation.</p> -</dd> - <dt class="propname">mail_pagesize <span class="userconf">*</span></dt> <dd> <?php diff --git a/installer/images/rcube_logo.gif b/installer/images/rcube_logo.gif Binary files differdeleted file mode 100644 index 26f82ff99..000000000 --- a/installer/images/rcube_logo.gif +++ /dev/null diff --git a/installer/images/roundcube_logo.png b/installer/images/roundcube_logo.png Binary files differnew file mode 100644 index 000000000..c14b74e66 --- /dev/null +++ b/installer/images/roundcube_logo.png diff --git a/installer/index.php b/installer/index.php index 6653ac159..65e84a3b4 100644 --- a/installer/index.php +++ b/installer/index.php @@ -108,7 +108,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { <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 +144,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { </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 +158,7 @@ else { </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> diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 8591f1e74..365d297b6 100644 --- a/installer/rcube_install.php +++ b/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/installer/welcome.html b/installer/welcome.html deleted file mode 100644 index a992c5ee9..000000000 --- a/installer/welcome.html +++ /dev/null @@ -1,33 +0,0 @@ -<form action="index.php" methond="get"> -<input type="hidden" name="_step" value="1" /> - -<p>Welcome to the interactive install script for the Roundcube Webmail package</p> -<p>First let's check your local environment and find out if everything Roundcube needs is available.</p> - -<p>The basic requirements are:</p> -<ul> - <li>PHP Version 5.2.0 or greater including - <ul> - <li>PCRE (perl compatible regular expression)</li> - <li>Session support</li> - <li>Libiconv (recommended)</li> - <li>OpenSSL (recommended)</li> - <li>FileInfo (optional)</li> - <li>Multibyte/mbstring (optional)</li> - <li>Mcrypt (optional)</li> - </ul> - </li> - <li>php.ini options: - <ul> - <li>error_reporting E_ALL & ~E_NOTICE (or lower)</li> - <li>file_uploads on (for attachment upload features)</li> - <li>session.auto_start needs to be off</li> - </ul> - </li> - <li>A MySQL or PostgreSQL database engine or the SQLite extension for PHP</li> - <li>An SMTP server (recommended) or PHP configured for mail delivery</li> -</ul> - -<input type="submit" value="START INSTALLATION" /> - -</form> diff --git a/skins/default/images/roundcube_logo.png b/skins/default/images/roundcube_logo.png Binary files differindex 1a4783e6e..4323c6b5f 100644 --- a/skins/default/images/roundcube_logo.png +++ b/skins/default/images/roundcube_logo.png |
