- replace claim in Roundcube logo

- require support_url config option in installer

6 files changed, 38 insertions, 60 deletions

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
deleted 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
new 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 &copy; 2008-2011 - Published under the GNU Public License;&nbsp;
+  Installer by the Roundcube Dev Team. Copyright &copy; 2008-2012 – Published under the GNU Public License;&nbsp;
   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 &amp; ~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>