Feature #272 - Installation scripts: Some minor changes.

16 years ago · 4318469da8
parent 0c1280587b
commit 4318469da8
27 changed files with 42 additions and 43 deletions
--- a/main/install/compare_db.php
+++ b/main/install/compare_db.php
@ -1,11 +1,11 @@
 <?php // $Id: compare_db.php 22577 2009-08-03 04:31:24Z yannoo $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 *	This script allows you to know which tables have been modified
 *	between two versions of Dokeos databases.
 *
-*	@package dokeos.install
+*	@package chamilo.install
 ==============================================================================
 */

--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@ -1,7 +1,7 @@
 <?php
-# DOKEOS version {DOKEOS_VERSION}
+# Chamilo version {DOKEOS_VERSION}
 # File generated by /install/index.php script - {DATE_GENERATED}
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /*
 ==============================================================================
 		Configuration of virtual campus
@ -80,9 +80,6 @@ $_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.
 $_configuration['course_folder'] 						= "courses/";

-
-
-
 // @todo this shouldn't be here.
 // Directory of the admin-area
 $rootAdminAppend             							= "admin/";
@ -93,8 +90,10 @@ $clarolineRepositorySys      							= $_configuration['root_sys'].$_configuratio
 $clarolineRepositoryWeb      							= $_configuration['root_web'].$_configuration['code_append'];
 $rootAdminSys                							= $clarolineRepositorySys.$rootAdminAppend;
 $rootAdminWeb                							= $clarolineRepositoryWeb.$rootAdminAppend;
+
 // directory to store archived courses
 $archiveDirName              							= "archive";
+
 // URL to your phpMyAdmin installation.
 // If not empty, a link will be available in the Platform Administration
 $phpMyAdminPath              							= '';
--- a/main/install/index.php
+++ b/main/install/index.php
@ -1,5 +1,5 @@
 <?php //$id: $
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 * GOAL : Chamilo installation
--- a/main/install/install_db.inc.php
+++ b/main/install/install_db.inc.php
@ -1,5 +1,5 @@
 <?php
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 *	Install the Chamilo database
--- a/main/install/install_files.inc.php
+++ b/main/install/install_files.inc.php
@ -1,5 +1,5 @@
 <?php // $Id: install_files.inc.php 22577 2009-08-03 04:31:24Z yannoo $
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 * Install the Chamilo files
--- a/main/install/install_upgrade.lib.php
+++ b/main/install/install_upgrade.lib.php
@ -1,5 +1,5 @@
 <?php //$id: $
-/* For licensing terms, see /chamilo_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 * This file contains functions used by the install and upgrade scripts.
--- a/main/install/update-db-1.6.x-1.8.0.inc.php
+++ b/main/install/update-db-1.6.x-1.8.0.inc.php
@ -27,7 +27,7 @@
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.0-1.8.2.inc.php
+++ b/main/install/update-db-1.8.0-1.8.2.inc.php
@ -27,7 +27,7 @@
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.2-1.8.3.inc.php
+++ b/main/install/update-db-1.8.2-1.8.3.inc.php
@ -27,7 +27,7 @@
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.3-1.8.4.inc.php
+++ b/main/install/update-db-1.8.3-1.8.4.inc.php
@ -27,7 +27,7 @@
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.4-1.8.5.inc.php
+++ b/main/install/update-db-1.8.4-1.8.5.inc.php
@ -1,11 +1,11 @@
 <?php // $Id: update-db-1.8.4-1.8.5.inc.php 19471 2009-03-31 23:28:53Z cvargas1 $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.5-1.8.6.inc.php
+++ b/main/install/update-db-1.8.5-1.8.6.inc.php
@ -1,11 +1,11 @@
 <?php // $Id: update-db-1.8.5-1.8.6.inc.php 22197 2009-07-17 17:49:44Z ivantcholakov $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.6-1.8.6.1.inc.php
+++ b/main/install/update-db-1.8.6-1.8.6.1.inc.php
@ -1,11 +1,11 @@
 <?php // $Id: $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.6.1-1.8.6.2.inc.php
+++ b/main/install/update-db-1.8.6.1-1.8.6.2.inc.php
@ -1,11 +1,11 @@
 <?php // $Id: $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-1.8.6.2-1.8.7.inc.php
+++ b/main/install/update-db-1.8.6.2-1.8.7.inc.php
@ -1,11 +1,11 @@
 <?php // $Id: $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update-db-scorm-1.6.x-1.8.0.inc.php
+++ b/main/install/update-db-scorm-1.6.x-1.8.0.inc.php
@ -2,7 +2,7 @@
 /**
 * Script handling the migration between an old Dokeos platform (<1.8.0) to
 * setup the new database system (4 scorm tables inside the course's database)
- * @package dokeos.scorm
+ * @package chamilo.scorm
 * @author Yannick Warnier <ywarnier@beeznest.org>
 */
 /**
--- a/main/install/update-files-1.6.x-1.8.0.inc.php
+++ b/main/install/update-files-1.6.x-1.8.0.inc.php
@ -37,7 +37,7 @@
 * - create a new set of directories that reflect the new tools offered by 1.8
 * - record an item_property for each directory added
 *
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */

--- a/main/install/update-files-1.8.3-1.8.4.inc.php
+++ b/main/install/update-files-1.8.3-1.8.4.inc.php
@ -33,7 +33,7 @@
 * Being in configuration.php, it benefits from the configuration.dist.php
 * advantages that a new version doesn't overwrite it, thus letting the old
 * version be available until the end of the installation.
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 require_once '../inc/lib/main_api.lib.php';
--- a/main/install/update-files-1.8.4-1.8.5.inc.php
+++ b/main/install/update-files-1.8.4-1.8.5.inc.php
@ -1,5 +1,5 @@
 <?php //$Id: update-files-1.8.4-1.8.5.inc.php 16083 2008-08-27 20:33:01Z juliomontoya $
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Updates the Dokeos files from version 1.8.4 to version 1.8.5
@ -12,7 +12,7 @@
 * Being in configuration.php, it benefits from the configuration.dist.php
 * advantages that a new version doesn't overwrite it, thus letting the old
 * version be available until the end of the installation.
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 require_once '../inc/lib/main_api.lib.php';
--- a/main/install/update-files-1.8.5-1.8.6.inc.php
+++ b/main/install/update-files-1.8.5-1.8.6.inc.php
@ -1,5 +1,5 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Updates the Dokeos files from version 1.8.5 to version 1.8.6
@ -12,7 +12,7 @@
 * Being in configuration.php, it benefits from the configuration.dist.php
 * advantages that a new version doesn't overwrite it, thus letting the old
 * version be available until the end of the installation.
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 require_once '../inc/lib/main_api.lib.php';
--- a/main/install/update-files-1.8.6-1.8.6.1.inc.php
+++ b/main/install/update-files-1.8.6-1.8.6.1.inc.php
@ -1,5 +1,5 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Updates the Dokeos files from version 1.8.6 to version 1.8.6.1
@ -12,7 +12,7 @@
 * Being in configuration.php, it benefits from the configuration.dist.php
 * advantages that a new version doesn't overwrite it, thus letting the old
 * version be available until the end of the installation.
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 require_once '../inc/lib/main_api.lib.php';
--- a/main/install/update-files-1.8.6.1-1.8.6.2.inc.php
+++ b/main/install/update-files-1.8.6.1-1.8.6.2.inc.php
@ -1,12 +1,12 @@
 <?php
-/* See license terms in /dokeos_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Updates the Dokeos files from version 1.8.6.1 to version 1.8.6.2
 * This script operates only in the case of an update, and only to change the
 * active version number (and other things that might need a change) in the
 * current configuration file.
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 require_once '../inc/lib/main_api.lib.php';
--- a/main/install/update-files-1.8.6.2-1.8.7.inc.php
+++ b/main/install/update-files-1.8.6.2-1.8.7.inc.php
@ -1,5 +1,5 @@
 <?php
-/* See license terms in /chamilo_license.txt */
+/* See license terms in /license.txt */
 /**
 ==============================================================================
 * Updates the Chamilo files from version 1.8.6.2 to version 1.8.7
--- a/main/install/update_courses.php
+++ b/main/install/update_courses.php
@ -1,5 +1,5 @@
 <?php //$id: $
-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */

 // TODO: Ivan, 13-FEB-2010: Is this file really needed?

@ -13,7 +13,7 @@
 *
 * To update the rest of the courses you need to run this script.
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo remove duplication: MAX_COURSE_TRANSFER is defined here and
 * also in install.index.php
 ==============================================================================
--- a/main/install/update_db.inc.php
+++ b/main/install/update_db.inc.php
@ -29,7 +29,7 @@ THIS FILE IS DEPRECATED - ONLY REMAINING FOR LEGACY CODE STUDY FOR NOW - YW20070
 * Update the Dokeos database from an older version
 * Notice : This script has to be included by index.php or update_courses.php
 *
-* @package dokeos.install
+* @package chamilo.install
 * @todo
 * - conditional changing of tables. Currently we execute for example
 * ALTER TABLE `$dbNameForm`.`cours` instructions without checking wether this is necessary.
--- a/main/install/update_files.inc.php
+++ b/main/install/update_files.inc.php
@ -54,7 +54,7 @@
 * - rename the old configuration.php to configuration.php.old,
 *   or if this fails delete the old configuration.php
 *
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 /*
--- a/main/install/upgrade.php
+++ b/main/install/upgrade.php
@ -2,7 +2,7 @@

 // TODO: Ivan, 13-FEB-2010: Is this file needed? It looks like unfinished business.

-/* For licensing terms, see /dokeos_license.txt */
+/* For licensing terms, see /license.txt */
 /**
 ==============================================================================
 * In this file we're working on a well-organised upgrade script to
@ -27,7 +27,7 @@
 * - ability to let old databases remain and clone them for new install so
 * Dokeos admins can have old and new version running side by side
 *
-* @package dokeos.install
+* @package chamilo.install
 ==============================================================================
 */
 /*