Feature #542 - Installation scripts: Purging the old brand as much as it is possible.

skala
Ivan Tcholakov 16 years ago
parent 6bf375035d
commit 565423dd98
  1. 14
      main/install/configuration.dist.php
  2. 2
      main/install/htaccess.dist
  3. 2
      main/install/index.php
  4. 8
      main/install/install.lib.php
  5. 2
      main/install/install_files.inc.php
  6. 2
      main/install/update-db-1.6.x-1.8.0.inc.php
  7. 2
      main/install/update-db-1.8.0-1.8.2.inc.php
  8. 2
      main/install/update-db-1.8.2-1.8.3.inc.php
  9. 2
      main/install/update-db-1.8.3-1.8.4.inc.php
  10. 2
      main/install/update-db-1.8.4-1.8.5.inc.php
  11. 2
      main/install/update-db-1.8.5-1.8.6.inc.php
  12. 2
      main/install/update-db-1.8.6-1.8.6.1.inc.php
  13. 2
      main/install/update-db-1.8.6.1-1.8.6.2.inc.php
  14. 2
      main/install/update-db-1.8.6.2-1.8.7.inc.php
  15. 9
      main/install/update-files-1.6.x-1.8.0.inc.php
  16. 2
      main/install/update-files-1.8.3-1.8.4.inc.php
  17. 2
      main/install/update-files-1.8.4-1.8.5.inc.php
  18. 2
      main/install/update-files-1.8.5-1.8.6.inc.php
  19. 2
      main/install/update-files-1.8.6-1.8.6.1.inc.php
  20. 2
      main/install/update-files-1.8.6.1-1.8.6.2.inc.php
  21. 2
      main/install/update-files-1.8.6.2-1.8.7.inc.php

@ -8,7 +8,7 @@
This file contains a list of variables that can be modified by the campus
site administrator. Pay attention when changing these variables, some changes
can cause Dokeos to stop working.
can cause Chamilo to stop working.
If you changed some settings and want to restore them, please have a look at
configuration.php. That file is an exact copy of the config file at
install time.
@ -51,11 +51,11 @@ $_configuration['table_prefix'] = '{COURSE_TABLE_PREFIX}';
$_configuration['db_glue'] = '{DATABASE_GLUE}';
// prefix all created bases (for courses) with this string
$_configuration['db_prefix'] = '{DATABASE_PREFIX}';
// main Dokeos database
// main Chamilo database
$_configuration['main_database'] = '{DATABASE_MAIN}';
// stats Dokeos database
// stats Chamilo database
$_configuration['statistics_database'] ='{DATABASE_STATS}';
// Scorm Dokeos database
// Scorm Chamilo database
$_configuration['scorm_database'] ='{DATABASE_SCORM}';
// User Personal Database (where all the personal stuff of the user is stored
// (personal agenda items, course sorting)
@ -65,16 +65,16 @@ $_configuration['user_personal_database'] ='{DATABASE_PERSONAL}';
// Directory settings
//============================================================================
// URL to the root of your Dokeos installation, example: http://www.mydokeos.com/
// URL to the root of your Chamilo installation, example: http://www.mychamilo.com/
$_configuration['root_web'] = '{ROOT_WEB}';
// Path to the webroot of system, example: /var/www/
$_configuration['root_sys'] = '{ROOT_SYS}';
// Path from your WWW-root to the root of your Dokeos installation, example: dokeos (this means dokeos is installed in /var/www/dokeos/
// Path from your WWW-root to the root of your Chamilo installation, example: chamilo (this means chamilo is installed in /var/www/chamilo/
$_configuration['url_append'] = '{URL_APPEND_PATH}';
// Directory of the Dokeos code. You could change this but it is not advised since this has not been tested yet.
// Directory of the Chamilo code. You could change this but it is not advised since this has not been tested yet.
$_configuration['code_append'] = "main/";
// Directory to store all course-related files. You could change this but it is not advised since this has not been tested yet.

@ -8,7 +8,7 @@
RewriteEngine On
#rewrite base is the dir dokeos is installed in with trailing slash
RewriteBase {DOKEOS_URL_APPEND_PATH}/courses/
RewriteBase {CHAMILO_URL_APPEND_PATH}/courses/
#do not rewrite on the main dir
#change this path to the path of your main folder

@ -761,7 +761,7 @@ if ($_POST['step2']) {
<div class="push"></div>
</div><!-- wrapper end-->
<div id="footer">
<div class="copyright"><?php echo get_lang('Platform'); ?> <a href="http://www.chamilo.org" target="_blank"> Chamilo <?php echo $new_version; ?></a> &copy; <?php echo date('Y'); ?> </div>
<div class="copyright"><?php echo get_lang('Platform'); ?> <a href="<?php echo $software_url; ?>" target="_blank"><?php echo $software_name; ?> <?php echo $new_version; ?></a> &copy; <?php echo date('Y'); ?> </div>
&nbsp;
</div>
</body>

@ -267,7 +267,7 @@ function set_file_folder_permissions() {
function write_courses_htaccess_file($url_append) {
$file_path = dirname(__FILE__).'/'.COURSES_HTACCESS_FILENAME;
$content = file_get_contents($file_path);
$content = str_replace('{DOKEOS_URL_APPEND_PATH}', $url_append, $content);
$content = str_replace('{CHAMILO_URL_APPEND_PATH}', $url_append, $content);
$fp = @ fopen('../../courses/.htaccess', 'w');
if ($fp) {
fwrite($fp, $content);
@ -1000,7 +1000,7 @@ function display_language_selection() { ?>
}
/**
* This function displays the requirements for installing Dokeos.
* This function displays the requirements for installing Chamilo.
*
* @param string $installType
* @param boolean $badUpdatePath
@ -1086,7 +1086,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
echo '</div>';
// RECOMMENDED SETTINGS
// Note: these are the settings for Joomla, does this also apply for Dokeos?
// Note: these are the settings for Joomla, does this also apply for Chamilo?
// Note: also add upload_max_filesize here so that large uploads are possible
echo '<div class="RequirementHeading"><h1>'.get_lang('RecommendedSettings').'</h1>';
echo '<div class="RequirementText">'.get_lang('RecommendedSettingsInfo').'</div>';
@ -1189,7 +1189,7 @@ function display_requirements($installType, $badUpdatePath, $updatePath = '', $u
<td class="requirements-value">'.check_writable('lang/',true).' ('.get_lang('SuggestionOnlyToEnableSubLanguageFeature').')</td>
</tr>'.
//'<tr>
// <td class="requirements-item">dokeos/searchdb/</td>
// <td class="requirements-item">chamilo/searchdb/</td>
// <td class="requirements-value">'.check_writable('../searchdb/').'</td>
//</tr>'.
//'<tr>

@ -6,7 +6,7 @@
* Notice : This script has to be included by install/index.php
*
* The script creates two files:
* - configuration.php, the file that contains very important info for Dokeos
* - configuration.php, the file that contains very important info for Chamilo
* such as the database names.
* - .htaccess file (in the courses directory) that is optional but improves
* security

@ -25,7 +25,7 @@
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (empty($updateFromConfigFile) || !file_exists($_POST['updatePath'].$updateFromConfigFile) || !in_array(get_config_param('clarolineVersion'), $update_from_version_6)) {

@ -25,7 +25,7 @@
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -25,7 +25,7 @@
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -25,7 +25,7 @@
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -28,7 +28,7 @@ $new_file_version = '1.8.5';
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -28,7 +28,7 @@ $new_file_version = '1.8.6';
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -28,7 +28,7 @@ $new_file_version = '1.8.6.1';
*/
//check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -28,7 +28,7 @@ $new_file_version = '1.8.6.2';
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -28,7 +28,7 @@ $new_file_version = '1.8.7';
*/
// Check if we come from index.php or update_courses.php - otherwise display error msg
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Check if the current Dokeos install is eligible for update
if (!file_exists('../inc/conf/configuration.php')) {

@ -11,10 +11,7 @@
* SYSTEM_INSTALLATION is defined in the install/index.php (means that we are in
* the regular upgrade process)
*
* DOKEOS_COURSE_UPDATE is defined in update_courses.php (means we are
* executing update_courses.php to update courses separately)
*
* When SYSTEM_INSTALLATION or DOKEOS_COURSE_UPDATE are defined, do for every course:
* When SYSTEM_INSTALLATION is defined, do for every course:
* - create a new set of directories that reflect the new tools offered by 1.8
* - record an item_property for each directory added
*
@ -43,7 +40,7 @@ function insert_db($db_name, $folder_name, $text) {
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
$sys_course_path = $pathForm.'courses/';
//$tbl_course = Database :: get_main_table(TABLE_MAIN_COURSE);
@ -139,7 +136,7 @@ if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
}
}
// Write the Dokeos config file
// Write the config file
write_system_config_file('../inc/conf/configuration.php');
// Write a distribution file with the config as a backup for the admin
write_system_config_file('../inc/conf/configuration.dist.php');

@ -18,7 +18,7 @@
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');

@ -18,7 +18,7 @@
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');

@ -18,7 +18,7 @@
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');

@ -18,7 +18,7 @@
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');

@ -12,7 +12,7 @@
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');

@ -12,7 +12,7 @@
==============================================================================
*/
if (defined('SYSTEM_INSTALLATION') || defined('DOKEOS_COURSE_UPDATE')) {
if (defined('SYSTEM_INSTALLATION')) {
// Edit the configuration file
$file = file('../inc/conf/configuration.php');

Loading…
Cancel
Save