diff --git a/documentation/changelog.html b/documentation/changelog.html index 6cccb35515..3d7345687b 100755 --- a/documentation/changelog.html +++ b/documentation/changelog.html @@ -2,6 +2,7 @@ Chamilo Changelog + diff --git a/documentation/credits.html b/documentation/credits.html index 8e12e294cb..9864741ef3 100755 --- a/documentation/credits.html +++ b/documentation/credits.html @@ -2,6 +2,7 @@ Chamilo Credits + diff --git a/documentation/dependencies.html b/documentation/dependencies.html index cc905fc877..e8708dd399 100755 --- a/documentation/dependencies.html +++ b/documentation/dependencies.html @@ -2,6 +2,7 @@ Chamilo Server Dependencies + diff --git a/documentation/index.html b/documentation/index.html index 0684011082..ae5e5d87c6 100755 --- a/documentation/index.html +++ b/documentation/index.html @@ -2,6 +2,7 @@ Chamilo + @@ -20,11 +21,11 @@ + @@ -46,13 +47,13 @@

Are you interested in translating the installation guide to your own language? The best way to proceed is to ask us on the Chamilo forum for the latest version – there may be updates to the guide since - this version was released – and send new translations off to the translation@chamilo.com email address. + this version was released – and send new translations off to the translation@chamilo.com email address.

- +
Valid XHTML 1.0 Transitional diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html index 2141b25677..9372ce9dc2 100755 --- a/documentation/installation_guide.html +++ b/documentation/installation_guide.html @@ -2,6 +2,7 @@ Chamilo Installation Guide + diff --git a/documentation/installation_guide_es_ES.html b/documentation/installation_guide_es_ES.html index 38f23f15d2..f2b122d89f 100755 --- a/documentation/installation_guide_es_ES.html +++ b/documentation/installation_guide_es_ES.html @@ -1,7 +1,8 @@ - Guia de Instalación de Chamilo 1.9 + Guia de Instalación de Chamilo 1.10 + diff --git a/documentation/installation_guide_fr_FR.html b/documentation/installation_guide_fr_FR.html index ba58a10a85..5b9a78b67a 100644 --- a/documentation/installation_guide_fr_FR.html +++ b/documentation/installation_guide_fr_FR.html @@ -2,6 +2,7 @@ Guide d'installation de Chamilo + diff --git a/documentation/installation_guide_it_IT.html b/documentation/installation_guide_it_IT.html index 6d1b04a028..d87148249d 100644 --- a/documentation/installation_guide_it_IT.html +++ b/documentation/installation_guide_it_IT.html @@ -2,6 +2,7 @@ Guida di installazione di Chamilo LMS + diff --git a/documentation/license.html b/documentation/license.html index 6a00c8f31a..412cccf56c 100755 --- a/documentation/license.html +++ b/documentation/license.html @@ -1,7 +1,8 @@ - + Chamilo License + @@ -20,22 +21,22 @@ + -
+

Chamilo License

@@ -118,7 +119,7 @@ modification follow.

“Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks.

- +

“The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and @@ -559,7 +560,7 @@ covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid.

- +

If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties diff --git a/documentation/migration-checklist.html b/documentation/migration-checklist.html index c2f7577939..a596432063 100755 --- a/documentation/migration-checklist.html +++ b/documentation/migration-checklist.html @@ -2,6 +2,7 @@ Chamilo Migration Checklist + diff --git a/documentation/optimization.html b/documentation/optimization.html index ea70f8fbed..1b771e8b08 100755 --- a/documentation/optimization.html +++ b/documentation/optimization.html @@ -2,6 +2,7 @@ Chamilo Optimization Guide + @@ -20,11 +21,11 @@

+
@@ -347,7 +348,7 @@ SetEnvIfNoCase Request_URI \ # Make sure proxies don't deliver the wrong content Header append Vary User-Agent env=!dont-vary - +
Don't have time or resources to optimize your Chamilo installation yourself? Hire an official Chamilo provider and get it sorted out professionally by specialists. diff --git a/documentation/readme.html b/documentation/readme.html index 4689141b6e..d258aaedd6 100755 --- a/documentation/readme.html +++ b/documentation/readme.html @@ -1,10 +1,11 @@ - Chamilo Information - - - + Chamilo Information + + + +
@@ -20,26 +21,26 @@ +
- +
- + - +

About Chamilo

Chamilo is an e-learning and course management web application, and free software under the GNU/GPLv3+ license. It's translated into more 30 languages, SCORM compatible, light and flexible.

@@ -51,7 +52,7 @@ Administrators provide support to trainers and trainee

-

Technically, Chamilo is a web application written in PHP that stores data in a MySQL database. +

Technically, Chamilo is a web application written in PHP that stores data in a MySQL database. Users access it using a web browser. The first stable version of Chamilo, 1.8.6.2 Salto, was based on the Dokeos(TM) 1.8.6.1 code and is meant to be the next software step for institutions currently using Dokeos.

@@ -135,6 +136,6 @@ Mail: info@chamilo.org Valid CSS - + diff --git a/documentation/security.html b/documentation/security.html index a6480c9c89..2fb16e6818 100755 --- a/documentation/security.html +++ b/documentation/security.html @@ -2,6 +2,7 @@ Chamilo Security Guide + @@ -44,7 +45,7 @@ Subscribe to our free security alerts mailing-list: the latest stable version of Firefox.

4. Moving your configuration file out of the web directory

-

It is considered unsafe to leave the configuration file inside the main/inc/conf/ directory, as it will be directly accessible for all users, which could lead crackers to download it, uninterpreted, and read through your configuration, which could lead to illicit +

It is considered unsafe to leave the configuration file inside the main/inc/conf/ directory, as it will be directly accessible for all users, which could lead crackers to download it, uninterpreted, and read through your configuration, which could lead to illicit access to your database if that one isn't well protected and many other stuff we'd prefer to avoid. To secure it, move the configuration file out of your web directory. If your Chamilo installation is in /var/www/, move your configuration to /etc/chamilo/configuration.php, for example. Then create a new main/inc/conf/configuration.php file, open it, and write the following:

diff --git a/main/inc/global_error_message.inc.php b/main/inc/global_error_message.inc.php index dd7f9138ad..215eba3eac 100755 --- a/main/inc/global_error_message.inc.php +++ b/main/inc/global_error_message.inc.php @@ -114,7 +114,7 @@ if (is_int($global_error_code) && $global_error_code > 0) { $length = strlen($IncorrectPhpVersionDescription); $read_installation_guide = substr($IncorrectPhpVersionDescription, $pos + 3, $length); $IncorrectPhpVersionDescription = substr($IncorrectPhpVersionDescription, 0, $pos); - $IncorrectPhpVersionDescription .= '
'.$read_installation_guide.''; + $IncorrectPhpVersionDescription .= '
'.$read_installation_guide.''; } $global_error_message['description'] = $IncorrectPhpVersionDescription; break; @@ -129,7 +129,7 @@ if (is_int($global_error_code) && $global_error_code > 0) {

- '.$read_installation_guide.' + '.$read_installation_guide.'

'; diff --git a/main/install/index.php b/main/install/index.php index dccc865918..5b5c84e302 100755 --- a/main/install/index.php +++ b/main/install/index.php @@ -13,14 +13,11 @@ * @todo (busy) organise code into functions * @package chamilo.install */ -/** - * Init - */ + /* CONSTANTS */ use \ChamiloSession as Session; - define('SYSTEM_INSTALLATION', 1); define('INSTALL_TYPE_UPDATE', 'update'); define('FORM_FIELD_DISPLAY_LENGTH', 40); @@ -314,7 +311,7 @@ if ($encryptPassForm == '1') { /*]]>*/ -