diff --git a/CHANGELOG b/CHANGELOG index 1efdea12d..6281b82a4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,4 @@ -CHANGELOG RoundCube Webmail +CHANGELOG Roundcube Webmail =========================== - Prevent from saving a non-existing skin path in user prefs (#1486936) diff --git a/INSTALL b/INSTALL index 19a9aa516..534eac65b 100644 --- a/INSTALL +++ b/INSTALL @@ -1,7 +1,7 @@ INTRODUCTION ============ -This file describes the basic steps to install RoundCube Webmail on your +This file describes the basic steps to install Roundcube Webmail on your web server. For additional information, please also consult the project's wiki page at http://trac.roundcube.net/wiki @@ -42,7 +42,7 @@ INSTALLATION are writable by the webserver - /temp - /logs -3. Create a new database and a database user for RoundCube (see DATABASE SETUP) +3. Create a new database and a database user for Roundcube (see DATABASE SETUP) 4. Point your browser to http://url-to-roundcube/installer/ 5. Follow the instructions of the install script (or see MANUAL CONFIGURATION) 6. After creating and testing the configuration, remove the installer directory diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql index ef29a393c..1aa771b1f 100644 --- a/SQL/mssql.upgrade.sql +++ b/SQL/mssql.upgrade.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail update script for MSSQL databases +-- Roundcube Webmail update script for MSSQL databases -- Updates from version 0.3.1 diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql index 08f7d93c9..fdab11505 100644 --- a/SQL/mysql.initial.sql +++ b/SQL/mysql.initial.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail initial database structure +-- Roundcube Webmail initial database structure /*!40014 SET FOREIGN_KEY_CHECKS=0 */; diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql index 739a3d801..28ebf6f49 100644 --- a/SQL/mysql.update.sql +++ b/SQL/mysql.update.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail update script for MySQL databases +-- Roundcube Webmail update script for MySQL databases -- Updates from version 0.1-stable diff --git a/SQL/postgres.initial.sql b/SQL/postgres.initial.sql index e57a70637..ac59efb18 100644 --- a/SQL/postgres.initial.sql +++ b/SQL/postgres.initial.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail initial database structure +-- Roundcube Webmail initial database structure -- -- Sequence "user_ids" diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql index bbfbcc9c6..1ef93d8b6 100644 --- a/SQL/postgres.update.sql +++ b/SQL/postgres.update.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail update script for Postgres databases +-- Roundcube Webmail update script for Postgres databases -- Updates from version 0.1-stable to 0.1.1 CREATE INDEX cache_user_id_idx ON cache (user_id, cache_key); diff --git a/SQL/sqlite.initial.sql b/SQL/sqlite.initial.sql index 8565eae25..e7faeedea 100644 --- a/SQL/sqlite.initial.sql +++ b/SQL/sqlite.initial.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail initial database structure +-- Roundcube Webmail initial database structure -- -- Table structure for table `cache` diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql index f2977ef14..2db782153 100644 --- a/SQL/sqlite.update.sql +++ b/SQL/sqlite.update.sql @@ -1,4 +1,4 @@ --- RoundCube Webmail update script for SQLite databases +-- Roundcube Webmail update script for SQLite databases -- Updates from version 0.1-stable to 0.1.1 DROP TABLE messages; diff --git a/bin/cleandb.sh b/bin/cleandb.sh index 51746446a..8124d2c2a 100755 --- a/bin/cleandb.sh +++ b/bin/cleandb.sh @@ -5,8 +5,8 @@ +-----------------------------------------------------------------------+ | bin/cleandb.sh | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2010, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2010, Roundcube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | diff --git a/bin/decrypt.sh b/bin/decrypt.sh index 51a89e903..95f16532e 100755 --- a/bin/decrypt.sh +++ b/bin/decrypt.sh @@ -5,8 +5,8 @@ +-----------------------------------------------------------------------+ | bin/decrypt.sh | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | diff --git a/bin/dumpschema.sh b/bin/dumpschema.sh index 5afcb7cf5..13b156270 100755 --- a/bin/dumpschema.sh +++ b/bin/dumpschema.sh @@ -5,8 +5,8 @@ +-----------------------------------------------------------------------+ | bin/dumpschema.sh | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland | | Licensed under the GNU GPL | | | | PURPOSE: | diff --git a/bin/update.sh b/bin/update.sh index 2d59b26c1..5f4e3f24c 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -124,12 +124,12 @@ if ($RCI->configured) { if ($success) { - echo "This instance of RoundCube is up-to-date.\n"; + echo "This instance of Roundcube is up-to-date.\n"; echo "Have fun!\n"; } } else { - echo "This instance of RoundCube is not yet configured!\n"; + echo "This instance of Roundcube is not yet configured!\n"; echo "Open http://url-to-roundcube/installer/ in your browser and follow the instuctions.\n"; } diff --git a/config/db.inc.php.dist b/config/db.inc.php.dist index 3137e51e5..e8938a17c 100644 --- a/config/db.inc.php.dist +++ b/config/db.inc.php.dist @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | Configuration file for database access | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2009, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2009, Roundcube Dev. - Switzerland | | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist index e036395d6..c0c2b0321 100644 --- a/config/main.inc.php.dist +++ b/config/main.inc.php.dist @@ -4,8 +4,8 @@ +-----------------------------------------------------------------------+ | Main configuration file | | | - | This file is part of the RoundCube Webmail client | - | Copyright (C) 2005-2010, RoundCube Dev. - Switzerland | + | This file is part of the Roundcube Webmail client | + | Copyright (C) 2005-2010, Roundcube Dev. - Switzerland | | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ @@ -105,11 +105,11 @@ $rcmail_config['smtp_server'] = ''; // SMTP port (default is 25; 465 for SSL) $rcmail_config['smtp_port'] = 25; -// SMTP username (if required) if you use %u as the username RoundCube +// SMTP username (if required) if you use %u as the username Roundcube // will use the current username for login $rcmail_config['smtp_user'] = ''; -// SMTP password (if required) if you use %p as the password RoundCube +// SMTP password (if required) if you use %p as the password Roundcube // will use the current user's password for login $rcmail_config['smtp_pass'] = ''; @@ -154,7 +154,7 @@ $rcmail_config['message_cache_lifetime'] = '10d'; // set the port for the ssl connection as value of this option if it differs from the default 443 $rcmail_config['force_https'] = false; -// 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 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; @@ -225,11 +225,11 @@ $rcmail_config['product_name'] = 'Roundcube Webmail'; $rcmail_config['include_host_config'] = false; // path to a text file which will be added to each sent message -// paths are relative to the RoundCube root folder +// paths are relative to the Roundcube root folder $rcmail_config['generic_message_footer'] = ''; // path to a text file which will be added to each sent HTML message -// paths are relative to the RoundCube root folder +// paths are relative to the Roundcube root folder $rcmail_config['generic_message_footer_html'] = ''; // add a received header to outgoing mails containing the creators IP and hostname diff --git a/index.php b/index.php index 0192ff9ae..6bc771c1d 100644 --- a/index.php +++ b/index.php @@ -1,10 +1,10 @@ 1, 'spell'=>1); // check client X-header to verify request origin if ($OUTPUT->ajax_call) { - if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-RoundCube-Request') != $RCMAIL->get_request_token() && !empty($RCMAIL->user->ID)) { + if (!$RCMAIL->config->get('devel_mode') && rc_request_header('X-Roundcube-Request') != $RCMAIL->get_request_token() && !empty($RCMAIL->user->ID)) { header('HTTP/1.1 404 Not Found'); die("Invalid Request"); } @@ -169,8 +169,8 @@ if (empty($RCMAIL->user->ID)) { if ($RCMAIL->config->get('enable_installer') && is_readable('./installer/index.php')) { $OUTPUT->add_footer(html::div(array('style' => "background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em"), html::tag('h2', array('style' => "margin-top:0.2em"), "Installer script is still accessible") . - html::p(null, "The install script of your RoundCube installation is still stored in its default location!") . - html::p(null, "Please remove the whole installer folder from the RoundCube directory because . + html::p(null, "The install script of your Roundcube installation is still stored in its default location!") . + html::p(null, "Please remove the whole installer folder from the Roundcube directory because . these files may expose sensitive configuration data like server passwords and encryption keys to the public. Make sure you cannot access the installer script from your browser.") ) diff --git a/installer/check.php b/installer/check.php index d1775a3ff..408f477b5 100644 --- a/installer/check.php +++ b/installer/check.php @@ -75,7 +75,7 @@ if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) { ?>

Checking PHP extensions

-

The following modules/extensions are required to run RoundCube:

+

The following modules/extensions are required to run Roundcube:

$file) { ?>

Checking php.ini/.htaccess settings

-

The following settings are required to run RoundCube:

+

The following settings are required to run Roundcube:

$val) { failures) { - echo '

Sorry but your webserver does not meet the requirements for RoundCube!
+ echo '

Sorry but your webserver does not meet the requirements for Roundcube!
Please install the missing modules or fix the php.ini settings according to the above check results.
Hint: only checks showing NOT OK need to be fixed.

'; } diff --git a/installer/config.php b/installer/config.php index 02deb9b6d..073b7b5b2 100644 --- a/installer/config.php +++ b/installer/config.php @@ -24,7 +24,7 @@ $_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 '.RCMAIL_CONFIG_DIR.' 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")); @@ -343,12 +343,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)); ?> -
+

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.

diff --git a/installer/index.php b/installer/index.php index d1c55e4ec..1c157da7f 100644 --- a/installer/index.php +++ b/installer/index.php @@ -58,7 +58,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) { "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -RoundCube Webmail Installer +Roundcube Webmail Installer @@ -69,7 +69,7 @@ if ($RCI->configured && empty($_REQUEST['_step'])) {