- replace claim in Roundcube logo

- require support_url config option in installer

1 files changed, 33 insertions, 22 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