X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=installer%2Fconfig.php;h=5250782f9bd85d35c8913e830a2b4424a2d59223;hb=3933ebbd21c2ce2b47410c2cac9bb484a0710f75;hp=04683b9c45a4601be37e7f449b50e156a9052c20;hpb=244596b3e5adbf9b7c67bf9d03ee49fbdd915e37;p=roundcube.git
diff --git a/installer/config.php b/installer/config.php
index 04683b9..5250782 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -6,7 +6,7 @@
$RCI->load_defaults();
// register these boolean fields
-$RCI->config_props = array(
+$RCI->bool_config_props = array(
'ip_check' => 1,
'enable_caching' => 1,
'enable_spellcheck' => 1,
@@ -14,7 +14,7 @@ $RCI->config_props = array(
'smtp_log' => 1,
'prefer_html' => 1,
'preview_pane' => 1,
- 'htmleditor' => 1,
+ 'debug_level' => 1,
);
// allow the current user to get to the next step
@@ -23,16 +23,16 @@ $_SESSION['allowinstaller'] = true;
if (!empty($_POST['submit'])) {
echo '
Copy or download the following configurations and save them in two files';
- echo ' (names above the text box) within the config/ directory of your RoundCube installation. ';
+ echo ' (names above the text box) within the '.RCMAIL_CONFIG_DIR.' directory of your Roundcube installation. ';
echo ' Make sure that there are no characters outside the <?php ?> brackets when saving the files.
';
$textbox = new html_textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile"));
echo '';
- echo $textbox->show($RCI->create_config('main'));
+ echo $textbox->show(($_SESSION['main.inc.php'] = $RCI->create_config('main')));
echo '';
- echo $textbox->show($RCI->create_config('db'));
+ echo $textbox->show($_SESSION['db.inc.php'] = $RCI->create_config('db'));
echo 'Of course there are more options to configure.
Have a look at the config files or visit Howto_Config to find out.
';
@@ -47,25 +47,6 @@ if (!empty($_POST['submit'])) {
General configuration
-
product_name
@@ -78,17 +59,6 @@ echo $input_prodname->show($RCI->getprop('product_name'));
The name of your service (used to compose page titles)
-skin_path
-
- '_skin_path', 'size' => 30, 'id' => "cfgskinpath"));
-echo $input_skinpath->show($RCI->getprop('skin_path'));
-
-?>
-Relative path to the skin folder
-
-
temp_dir
'_temp_dir', 'size' => 30,
echo $input_tempdir->show($RCI->getprop('temp_dir'));
?>
-Use this folder to store temp files (must be writebale for webserver)
+Use this folder to store temp files (must be writeable for webserver)
-log_dir
-
- '_log_dir', 'size' => 30, 'id' => "cfglogdir"));
-echo $input_logdir->show($RCI->getprop('log_dir'));
-
-?>
-Use this folder to store log files (must be writebale for webserver)
-
ip_check
@@ -151,31 +111,131 @@ echo $check_caching->show(intval($RCI->getprop('enable_caching')), array('value'
enable_spellcheck
'_enable_spellcheck', 'id' => "cfgspellcheck"));
+echo $check_spell->show(intval($RCI->getprop('enable_spellcheck')), array('value' => 1));
+?>
+Make use of the spell checker
+
+
+spellcheck_engine
+
+ '_spellcheck_engine', 'id' => "cfgspellcheckengine"));
+if (extension_loaded('pspell'))
+ $select_spell->add('pspell', 'pspell');
+$select_spell->add('Googie', 'googie');
-$check_caching = new html_checkbox(array('name' => '_enable_spellcheck', 'id' => "cfgspellcheck"));
-echo $check_caching->show(intval($RCI->getprop('enable_spellcheck')), array('value' => 1));
+echo $select_spell->show($RCI->is_post ? $_POST['_spellcheck_engine'] : 'pspell');
?>
-Make use of the built-in spell checker
+Which spell checker to use
-It is based on GoogieSpell what implies that the message content will be sent to Google in order to check the spelling.
+GoogieSpell implies that the message content will be sent to Google in order to check the spelling.
-mdn_requests
+identities_level
'_mdn_requests', 'id' => "cfgmdnreq"));
-$select_mdnreq->add(array('ask the user', 'send automatically', 'ignore'), array(0, 1, 2));
-echo $select_mdnreq->show(intval($RCI->getprop('mdn_requests')));
+$input_ilevel = new html_select(array('name' => '_identities_level', 'id' => "cfgidentitieslevel"));
+$input_ilevel->add('many identities with possibility to edit all params', 0);
+$input_ilevel->add('many identities with possibility to edit all params but not email address', 1);
+$input_ilevel->add('one identity with possibility to edit all params', 2);
+$input_ilevel->add('one identity with possibility to edit all params but not email address', 3);
+echo $input_ilevel->show($RCI->getprop('identities_level'), 0);
?>
-Behavior if a received message requests a message delivery notification (read receipt)
+Level of identities access
+Defines what users can do with their identities.
+
+
+
+
+
+
+Logging & Debugging
+
+
+debug_level
+
+getprop('debug_level');
+$check_debug = new html_checkbox(array('name' => '_debug_level[]'));
+echo $check_debug->show(($value & 1) ? 1 : 0 , array('value' => 1, 'id' => 'cfgdebug1'));
+echo 'Log errors ';
+
+echo $check_debug->show(($value & 4) ? 4 : 0, array('value' => 4, 'id' => 'cfgdebug4'));
+echo 'Print errors (to the browser) ';
+
+echo $check_debug->show(($value & 8) ? 8 : 0, array('value' => 8, 'id' => 'cfgdebug8'));
+echo 'Verbose display (enables debug console) ';
+
+?>
+
+
+log_driver
+
+ '_log_driver', 'id' => "cfglogdriver"));
+$select_log_driver->add(array('file', 'syslog'), array('file', 'syslog'));
+echo $select_log_driver->show($RCI->getprop('log_driver', 'file'));
+
+?>
+How to do logging? 'file' - write to files in the log directory, 'syslog' - use the syslog facility.
+
+
+log_dir
+
+ '_log_dir', 'size' => 30, 'id' => "cfglogdir"));
+echo $input_logdir->show($RCI->getprop('log_dir'));
+
+?>
+Use this folder to store log files (must be writeable for webserver). Note that this only applies if you are using the 'file' log_driver.
+
+
+syslog_id
+
+ '_syslog_id', 'size' => 30, 'id' => "cfgsyslogid"));
+echo $input_syslogid->show($RCI->getprop('syslog_id', 'roundcube'));
+
+?>
+What ID to use when logging with syslog. Note that this only applies if you are using the 'syslog' log_driver.
+syslog_facility
+
+ '_syslog_facility', 'id' => "cfgsyslogfacility"));
+$input_syslogfacility->add('user-level messages', LOG_USER);
+$input_syslogfacility->add('mail subsystem', LOG_MAIL);
+$input_syslogfacility->add('local level 0', LOG_LOCAL0);
+$input_syslogfacility->add('local level 1', LOG_LOCAL1);
+$input_syslogfacility->add('local level 2', LOG_LOCAL2);
+$input_syslogfacility->add('local level 3', LOG_LOCAL3);
+$input_syslogfacility->add('local level 4', LOG_LOCAL4);
+$input_syslogfacility->add('local level 5', LOG_LOCAL5);
+$input_syslogfacility->add('local level 6', LOG_LOCAL6);
+$input_syslogfacility->add('local level 7', LOG_LOCAL7);
+echo $input_syslogfacility->show($RCI->getprop('syslog_facility'), LOG_USER);
+
+?>
+What ID to use when logging with syslog. Note that this only applies if you are using the 'syslog' log_driver.
+
+
+
+
+
+
Database setup
@@ -206,38 +266,16 @@ $dsnw = MDB2::parseDSN($RCI->getprop('db_dsnw'));
echo $select_dbtype->show($RCI->is_post ? $_POST['_dbtype'] : $dsnw['phptype']);
echo 'Database type ';
echo $input_dbhost->show($RCI->is_post ? $_POST['_dbhost'] : $dsnw['hostspec']);
-echo 'Database server ';
+echo 'Database server (omit for sqlite) ';
echo $input_dbname->show($RCI->is_post ? $_POST['_dbname'] : $dsnw['database']);
-echo 'Database name ';
+echo 'Database name (use absolute path and filename for sqlite) ';
echo $input_dbuser->show($RCI->is_post ? $_POST['_dbuser'] : $dsnw['username']);
-echo 'Database user name (needs write permissions) ';
+echo 'Database user name (needs write permissions)(omit for sqlite) ';
echo $input_dbpass->show($RCI->is_post ? $_POST['_dbpass'] : $dsnw['password']);
-echo 'Database password ';
-
-?>
-
-
-db_backend
-
- '_db_backend', 'id' => "cfgdbba"));
-
-if (class_exists('DB'))
- $select_dbba->add('DB', 'db');
-if (class_exists('MDB2'))
- $select_dbba->add('MDB2', 'mdb2');
-
-echo $select_dbba->show($RCI->getprop('db_backend'));
+echo 'Database password (omit for sqlite) ';
?>
-PEAR Database backend to use
-
@@ -304,12 +342,12 @@ $check_autocreate = new html_checkbox(array('name' => '_auto_create_user', 'id'
echo $check_autocreate->show(intval($RCI->getprop('auto_create_user')), array('value' => 1));
?>
-Automatically create a new RoundCube user when log-in the first time
+Automatically create a new Roundcube user when log-in the first time
A user is authenticated by the IMAP server but it requires a local record to store settings
and contacts. With this option enabled a new user record will automatically be created once the IMAP login succeeds.
-If this option is disabled, the login only succeeds if there's a matching user-record in the local RoundCube database
+
If this option is disabled, the login only succeeds if there's a matching user-record in the local Roundcube database
what means that you have to create those records manually or disable this option after the first login.
@@ -321,7 +359,7 @@ $text_sentmbox = new html_inputfield(array('name' => '_sent_mbox', 'size' => 20,
echo $text_sentmbox->show($RCI->getprop('sent_mbox'));
?>
-Store sent messages is this folder
+Store sent messages in this folder
Leave blank if sent messages should not be stored
@@ -347,9 +385,21 @@ $text_draftsmbox = new html_inputfield(array('name' => '_drafts_mbox', 'size' =>
echo $text_draftsmbox->show($RCI->getprop('drafts_mbox'));
?>
-Store draft messages is this folder
+Store draft messages in this folder
+
+Leave blank if they should not be stored
+junk_mbox
+
+ '_junk_mbox', 'size' => 20, 'id' => "cfgjunkmbox"));
+echo $text_junkmbox->show($RCI->getprop('junk_mbox'));
+
+?>
+Store spam messages in this folder
+
@@ -378,7 +428,7 @@ $text_smtpport = new html_inputfield(array('name' => '_smtp_port', 'size' => 6,
echo $text_smtpport->show($RCI->getprop('smtp_port'));
?>
-SMTP port (default is 25; 465 for SSL)
+SMTP port (default is 25; 465 for SSL; 587 for submission)
smtp_user/smtp_pass
@@ -423,7 +473,7 @@ $check_smtplog = new html_checkbox(array('name' => '_smtp_log', 'id' => "cfgsmtp
echo $check_smtplog->show(intval($RCI->getprop('smtp_log')), array('value' => 1));
?>
-Log sent messages in logs/sendmail
+Log sent messages in {log_dir}/sendmail or to syslog.
@@ -434,16 +484,27 @@ echo $check_smtplog->show(intval($RCI->getprop('smtp_log')), array('value' => 1)
Display settings & user prefs
-locale_string
+language *
+
+ '_language', 'size' => 6, 'id' => "cfglocale"));
+echo $input_locale->show($RCI->getprop('language'));
+
+?>
+The default locale setting. This also defines the language of the login screen. Leave it empty to auto-detect the user agent language.
+Enter a RFC1766 formatted language name. Examples: en_US, de_DE, de_CH, fr_FR, pt_BR
+
+
+skin *
'_locale_string', 'size' => 6, 'id' => "cfglocale"));
-echo $input_locale->show($RCI->getprop('locale_string'));
+$input_skin = new html_inputfield(array('name' => '_skin', 'size' => 30, 'id' => "cfgskin"));
+echo $input_skin->show($RCI->getprop('skin'));
?>
-The default locale setting. This also defines the language of the login screen.
-Enter a RFC1766 formatted locale name. Examples: en_US, de, de_CH, fr, pt_BR
+Name of interface skin (folder in /skins)
pagesize *
@@ -481,13 +542,16 @@ echo $check_prevpane->show(intval($RCI->getprop('preview_pane')));
htmleditor *
+Compose HTML formatted messages
'_htmleditor', 'id' => "cfghtmlcompose", 'value' => 1));
-echo $check_htmlcomp->show(intval($RCI->getprop('htmleditor')));
+$select_htmlcomp = new html_select(array('name' => '_htmleditor', 'id' => "cfghtmlcompose"));
+$select_htmlcomp->add('never', 0);
+$select_htmlcomp->add('always', 1);
+$select_htmlcomp->add('on reply to HTML message only', 2);
+echo $select_htmlcomp->show(intval($RCI->getprop('htmleditor')));
?>
-Compose HTML formatted messages
draft_autosave *
@@ -497,7 +561,7 @@ echo $check_htmlcomp->show(intval($RCI->getprop('htmleditor')));
$select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => 'cfgautosave'));
$select_autosave->add('never', 0);
-foreach (array(3, 5, 10) as $i => $min)
+foreach (array(1, 3, 5, 10) as $i => $min)
$select_autosave->add("$min min", $min*60);
echo $select_autosave->show(intval($RCI->getprop('draft_autosave')));
@@ -505,6 +569,41 @@ echo $select_autosave->show(intval($RCI->getprop('draft_autosave')));
?>
+mdn_requests *
+
+ 'ask the user',
+ 1 => 'send automatically',
+ 3 => 'send receipt to user contacts, otherwise ask the user',
+ 4 => 'send receipt to user contacts, otherwise ignore',
+ 2 => 'ignore',
+);
+
+$select_mdnreq = new html_select(array('name' => '_mdn_requests', 'id' => "cfgmdnreq"));
+$select_mdnreq->add(array_values($mdn_opts), array_keys($mdn_opts));
+echo $select_mdnreq->show(intval($RCI->getprop('mdn_requests')));
+
+?>
+Behavior if a received message requests a message delivery notification (read receipt)
+
+
+mime_param_folding *
+
+ '_mime_param_folding', 'id' => "cfgmimeparamfolding"));
+$select_param_folding->add('Full RFC 2231 (Roundcube, Thunderbird)', '0');
+$select_param_folding->add('RFC 2047/2231 (MS Outlook, OE)', '1');
+$select_param_folding->add('Full RFC 2047 (deprecated)', '2');
+
+echo $select_param_folding->show(intval($RCI->getprop('mime_param_folding')));
+
+?>
+How to encode attachment long/non-ascii names
+
+
* These settings are defaults for the user preferences