[svn r10060] cleanup: replace clar_main.conf.php by configuration.php

skala
Patrick Cool 18 years ago
parent 8981f69c6d
commit 213a851585
  1. 8
      documentation/installation_guide.html
  2. 8
      documentation/installation_guide_french.html
  3. 8
      documentation/installation_guide_german.html
  4. 8
      documentation/installation_guide_slovenian.html
  5. 6
      main/auth/ldap/authldap.php
  6. 6
      main/auth/ldap/ldap_var.inc.php
  7. 6
      main/inc/global.inc.php
  8. 2
      main/inc/lib/fckeditor/editor/plugins/ImageManager/config.inc.php
  9. 2
      main/inc/lib/fckeditor/fcktemplates.xml.php
  10. 2
      main/inc/lib/main_api.lib.php
  11. 2
      main/inc/local.inc.php
  12. 2
      main/install/configuration.dist.php
  13. 8
      main/install/install_files.inc.php
  14. 16
      main/install/install_functions.inc.php
  15. 6
      main/install/update_courses.php
  16. 14
      main/install/update_files.inc.php
  17. 2
      main/lang/brazilian/install.inc.php
  18. 2
      main/lang/dutch/install.inc.php
  19. 2
      main/lang/english/install.inc.php
  20. 2
      main/lang/french/install.inc.php
  21. 2
      main/lang/german/install.inc.php
  22. 2
      main/lang/hungarian/install.inc.php
  23. 2
      main/lang/italian/install.inc.php
  24. 2
      main/lang/portuguese/install.inc.php
  25. 2
      main/lang/slovenian/install.inc.php
  26. 2
      main/lang/spanish/install.inc.php
  27. 2
      main/lang/spanish_latin/install.inc.php
  28. 2
      main/newscorm/scorm_migrate_clean_db.php
  29. 2
      main/newscorm/scorm_migrate_clean_tracking_time.php
  30. 2
      main/newscorm/scorm_migrate_db.php
  31. 2
      main/newscorm/scorm_migrate_db_one_course.php
  32. 2
      main/newscorm/scorm_migrate_hometools.php
  33. 2
      main/newscorm/scorm_migrate_hometools_reverse.php
  34. 2
      main/newscorm/scorm_update_db.php
  35. 2
      main/newscorm/scorm_update_db_alter.php

@ -169,7 +169,7 @@ In Windows, you may need to check the properties of the folders (by right-clicki
2.5. The following files need to be readable and writeable for everyone: 2.5. The following files need to be readable and writeable for everyone:
</p> </p>
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (if present)</li> <li>dokeos/main/inc/conf/configuration.php (if present)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
</ul> </ul>
<p> <p>
@ -202,7 +202,7 @@ choose "Configure the homepage" in the Dokeos administration section.
<ul> <ul>
<li><strong>Protect your configuration file: </strong> <li><strong>Protect your configuration file: </strong>
make sure no one can overwrite it. You can find the config file in <em>(dokeos folder)</em>/main/inc/conf/claro_main.conf.php. Make it read-only (windows/xwindows: right-click the file to edit the properties. linux/bsd/macosx: use the chmod 444 command). The config file is created by Apache so you may need to be root user to change its permissions.</li> make sure no one can overwrite it. You can find the config file in <em>(dokeos folder)</em>/main/inc/conf/configuration.php. Make it read-only (windows/xwindows: right-click the file to edit the properties. linux/bsd/macosx: use the chmod 444 command). The config file is created by Apache so you may need to be root user to change its permissions.</li>
<li><strong>Protect your installation folder: </strong> <li><strong>Protect your installation folder: </strong>
if the <em>(dokeos folder)</em>/main/install folder is still accessible, someone could install over your existing version (you could lose your data that way). Move the folder somewhere out of the web directories so it is not accessible, change its name, or edit its properties so no one can read or execute it.</li> if the <em>(dokeos folder)</em>/main/install folder is still accessible, someone could install over your existing version (you could lose your data that way). Move the folder somewhere out of the web directories so it is not accessible, change its name, or edit its properties so no one can read or execute it.</li>
<li><strong>For better security: </strong> <li><strong>For better security: </strong>
@ -266,7 +266,7 @@ the previous version :
3.4. The following files need to be readable and writeable for everyone: 3.4. The following files need to be readable and writeable for everyone:
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (if present)</li> <li>dokeos/main/inc/conf/configuration.php (if present)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
</ul> </ul>
@ -340,7 +340,7 @@ Newer distributions also allow downloading rpms for additional packages.
<p> <p>
<b>Activating LDAP in Dokeos</b><br/> <b>Activating LDAP in Dokeos</b><br/>
In (dokeos folder)/main/inc/conf/claro_main.conf.php, around line 90, you see<br/> In (dokeos folder)/main/inc/conf/configuration.php, around line 90, you see<br/>
//for new login module<br/> //for new login module<br/>
//uncomment these to activate ldap<br/> //uncomment these to activate ldap<br/>
//$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br/> //$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br/>

@ -154,7 +154,7 @@ Avec Windows, vous avez besoin de v&eacute;rifier les propri&eacute;t&eacute;s d
2.5. Les fichiers suivants doivent &ecirc;tre param&eacute;tr&eacute;s en lecture et &eacute;criture pour tous les utilisateurs: 2.5. Les fichiers suivants doivent &ecirc;tre param&eacute;tr&eacute;s en lecture et &eacute;criture pour tous les utilisateurs:
</p> </p>
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (si present)</li> <li>dokeos/main/inc/conf/configuration.php (si present)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
</ul> </ul>
<p> <p>
@ -185,7 +185,7 @@ Ne modifiez pas les fichiers home_*.html directement. Pour r&eacute;aliser les m
<ul> <ul>
<li><strong>Prot&eacute;ger le fichier de configuration : </strong> <li><strong>Prot&eacute;ger le fichier de configuration : </strong>
assurez-vous que personne ne puisse en modifier le contenu. Vous trouverez le fichier de configuration dans <em>(dokeos folder)</em>/main/inc/conf/claro_main.conf.php. R&eacute;duisez ses droits &agrave; la lecture seule (windows/xwindows: effectuez un clic droit au dessus du nom pour modifier les propri&eacute;t&eacute;s du fichier. Linux/bsd/macosx: r&eacute;alisez un CHMOD 444). Le fichier de configuration est cr&eacute;&eacute; par Apache, ainsi, vous devez poss&eacute;der les droits n&eacute;cessaires (root) pour modifier les permissions.</li> assurez-vous que personne ne puisse en modifier le contenu. Vous trouverez le fichier de configuration dans <em>(dokeos folder)</em>/main/inc/conf/configuration.php. R&eacute;duisez ses droits &agrave; la lecture seule (windows/xwindows: effectuez un clic droit au dessus du nom pour modifier les propri&eacute;t&eacute;s du fichier. Linux/bsd/macosx: r&eacute;alisez un CHMOD 444). Le fichier de configuration est cr&eacute;&eacute; par Apache, ainsi, vous devez poss&eacute;der les droits n&eacute;cessaires (root) pour modifier les permissions.</li>
<li><strong>Prot&eacute;ger le dossier d'installation : </strong> si le dossier <li><strong>Prot&eacute;ger le dossier d'installation : </strong> si le dossier
<em>(dokeos folder)</em>/main/install est toujours accessible, une nouvelle installation &eacute;crasant la v&ocirc;tre est possible (vous perdriez ainsi toutes vos donn&eacute;es). D&eacute;placez le dossier en dehors de votre dossier web pour le rendre inaccessible, modifiez son nom, ou modifiez ses propri&eacute;t&eacute;s de telle sorte que personne ne puisse le lire ou l'&eacute;xecuter.</li> <em>(dokeos folder)</em>/main/install est toujours accessible, une nouvelle installation &eacute;crasant la v&ocirc;tre est possible (vous perdriez ainsi toutes vos donn&eacute;es). D&eacute;placez le dossier en dehors de votre dossier web pour le rendre inaccessible, modifiez son nom, ou modifiez ses propri&eacute;t&eacute;s de telle sorte que personne ne puisse le lire ou l'&eacute;xecuter.</li>
<li><strong>Pour une meilleure s&eacute;curit&eacute; : </strong> <li><strong>Pour une meilleure s&eacute;curit&eacute; : </strong>
@ -230,7 +230,7 @@ Si vous souhaitez que Dokeos 1.6.2 soit install&eacute; dans le m&ecirc;me dossi
</p> </p>
3.4. Les fichiers suivants doivent &ecirc;tre param&eacute;tr&eacute;s en lecture et &eacute;criture pour tous les utilisateurs: 3.4. Les fichiers suivants doivent &ecirc;tre param&eacute;tr&eacute;s en lecture et &eacute;criture pour tous les utilisateurs:
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (si present)</li> <li>dokeos/main/inc/conf/configuration.php (si present)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
</ul> </ul>
@ -337,7 +337,7 @@ Les distributions r&eacute;centes autorisent le t&eacute;l&eacute;chargement de
<p> <p>
<b>Activer LDAP dans Dokeos</b><br/> <b>Activer LDAP dans Dokeos</b><br/>
Dans (dokeos folder)/main/inc/conf/claro_main.conf.php, aux environs de la ligne 90, vous pouvez lire: <br/> Dans (dokeos folder)/main/inc/conf/configuration.php, aux environs de la ligne 90, vous pouvez lire: <br/>
//for new login module<br/> //for new login module<br/>
//uncomment these to activate ldap<br/> //uncomment these to activate ldap<br/>
//$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br/> //$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br/>

@ -166,7 +166,7 @@ In Windows mssen Sie vielleicht die Verzeichnis Eigenschaften (per rechts Klick)
2.5. Die nachfolgenden Dateien mssen fr alle readable und writeable sein: 2.5. Die nachfolgenden Dateien mssen fr alle readable und writeable sein:
</p> </p>
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (wenn vorhanden)</li> <li>dokeos/main/inc/conf/configuration.php (wenn vorhanden)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
</ul> </ul>
<p> <p>
@ -199,7 +199,7 @@ in der Dokeos Administration.
<ul> <ul>
<li><strong>Schtzen Sie ihre Konfigurationsdatei: </strong> <li><strong>Schtzen Sie ihre Konfigurationsdatei: </strong>
Vergewissern Sie sich, da<EFBFBD>niemand die Datei berschreiben kann. Die Konfigurationsdatei befindet sich hier: <em>(Dokeos Verzeichnis)</em>/main/inc/conf/claro_main.conf.php. Vergewissern Sie sich, da<EFBFBD>niemand die Datei berschreiben kann. Die Konfigurationsdatei befindet sich hier: <em>(Dokeos Verzeichnis)</em>/main/inc/conf/configuration.php.
Die Datei sollte nur lesbar sein (Windows/XWindows: rechts Klick auf die Datei und die Eigenschaften anpassen. Die Datei sollte nur lesbar sein (Windows/XWindows: rechts Klick auf die Datei und die Eigenschaften anpassen.
linux/bsd/macosx: den chmod 444 Befehl benutzen). Die Konfigurationsdatei wird von Apache erstellt, daher mssen Sie linux/bsd/macosx: den chmod 444 Befehl benutzen). Die Konfigurationsdatei wird von Apache erstellt, daher mssen Sie
eventuell ein "root" Benutzer sein, um die Erlaubnisse zu ver<EFBFBD>dern.</li> eventuell ein "root" Benutzer sein, um die Erlaubnisse zu ver<EFBFBD>dern.</li>
@ -271,7 +271,7 @@ Falls Sie Dokeos 1.6.1 im gleichen Verzeichnis wie die vorherige Version install
3.4. Die nachfolgenden Dateien mssen fr alle readable und writeable sein: 3.4. Die nachfolgenden Dateien mssen fr alle readable und writeable sein:
</p><ul> </p><ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (falls vorhanden)</li> <li>dokeos/main/inc/conf/configuration.php (falls vorhanden)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
</ul> </ul>
<p> <p>
@ -389,7 +389,7 @@ Linux Server: Es k<EFBFBD>nte sein, da<EFBFBD>Sie PHP mit LDAP Untersttzung neu kompiliere
<p> <p>
<b>LDAP in Dokeos aktivieren</b><br> <b>LDAP in Dokeos aktivieren</b><br>
In (Dokeos Verzeichnis)/main/inc/conf/claro_main.conf.php, etwa in Zeile 90, sehen Sie <br> In (Dokeos Verzeichnis)/main/inc/conf/configuration.php, etwa in Zeile 90, sehen Sie <br>
//for new login module<br> //for new login module<br>
//uncomment these to activate ldap<br> //uncomment these to activate ldap<br>
//$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br> //$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br>

@ -344,7 +344,7 @@ Pri Windows OS, preverite lastnosti map (klik z desnim miškinim gumbom na mapi)
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (Ä?e obstaja)</li> <li>dokeos/main/inc/conf/configuration.php (Ä?e obstaja)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
@ -412,7 +412,7 @@ uporabite možnost "Uredi doma
<li><strong>ZaÅ¡Ä?ita datoteke z nastavitvami: </strong> <li><strong>ZaÅ¡Ä?ita datoteke z nastavitvami: </strong>
zagotovite, da je nihÄ?e ne bo mogel spremeniti. Datoteko z nastavitvami najdete na <em>(dokeos mapa)</em>/main/inc/conf/claro_main.conf.php. zagotovite, da je nihÄ?e ne bo mogel spremeniti. Datoteko z nastavitvami najdete na <em>(dokeos mapa)</em>/main/inc/conf/configuration.php.
Naredite jo zgolj bralno (windows/xwindows: desni miškin klik na datoteki, lastnosti. Naredite jo zgolj bralno (windows/xwindows: desni miškin klik na datoteki, lastnosti.
@ -538,7 +538,7 @@ Ne brišite obstoje
<ul> <ul>
<li>dokeos/main/inc/conf/claro_main.conf.php (Ä?e obstaja)</li> <li>dokeos/main/inc/conf/configuration.php (Ä?e obstaja)</li>
<li>dokeos/home/*.html</li> <li>dokeos/home/*.html</li>
@ -694,7 +694,7 @@ Novejše distribucije tudi dovoljujejo selektiven prenos rpm-jev za dodatne podp
<b>Activiranje LDAP v Dokeos</b><br/> <b>Activiranje LDAP v Dokeos</b><br/>
V (dokeos mapa)/main/inc/conf/claro_main.conf.php, okoli vrstice 90, se nahaja naslednje besedilo<br/> V (dokeos mapa)/main/inc/conf/configuration.php, okoli vrstice 90, se nahaja naslednje besedilo<br/>

@ -1,4 +1,4 @@
<?php // $Id: authldap.php 9983 2006-11-15 00:21:16Z pcool $ <?php // $Id: authldap.php 10060 2006-11-20 19:18:00Z pcool $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -58,7 +58,7 @@
- code cleanup - code cleanup
- fixed bug: dc = xx, dc = yy was configured for UGent - fixed bug: dc = xx, dc = yy was configured for UGent
and put literally in the code, this is now a variable and put literally in the code, this is now a variable
in claro_main.conf.php ($ldapDc) in configuration.php ($ldapDc)
with thanks to with thanks to
- Stefan De Wannemacker (Ghent University) - Stefan De Wannemacker (Ghent University)
@ -78,7 +78,7 @@ include ('ldap_var.inc.php');
---------------------------------------------------- ----------------------------------------------------
Necessary constants for the LDAP functions Necessary constants for the LDAP functions
---------------------------------------------------- ----------------------------------------------------
These should be placed in the claro_main.conf.php. These should be placed in the configuration.php.
done: $usesLDAP, $ldaphost, $ldapport, $usesCurriculum --> config.inc done: $usesLDAP, $ldaphost, $ldapport, $usesCurriculum --> config.inc
*/ */
$PLACEHOLDER = "PLACEHOLDER"; $PLACEHOLDER = "PLACEHOLDER";

@ -1,4 +1,4 @@
<?php // $Id: ldap_var.inc.php 5291 2005-06-01 09:31:57Z olivierb78 $ <?php // $Id: ldap_var.inc.php 10060 2006-11-20 19:18:00Z pcool $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -31,13 +31,13 @@
* in the future but then perhaps in a more general way. * in the future but then perhaps in a more general way.
* *
* Originally, Thomas and I agreed to store all settings in one file * Originally, Thomas and I agreed to store all settings in one file
* (claro_main.conf.php) to make it easier for claroline admins to make changes. * (configuration.php) to make it easier for claroline admins to make changes.
* Since October 2003, this changed: the include directory has been * Since October 2003, this changed: the include directory has been
* changed to be called "inc", and all tools should have their own file(s). * changed to be called "inc", and all tools should have their own file(s).
* *
* This file "ldap_var.inc.php" was already used by the * This file "ldap_var.inc.php" was already used by the
* older french authentification functions. I have moved the new * older french authentification functions. I have moved the new
* variables from the claro_main.conf.php to here as well. * variables from the configuration.php to here as well.
* *
* @author Roan Embrechts * @author Roan Embrechts
* @package dokeos.auth.ldap * @package dokeos.auth.ldap

@ -6,12 +6,12 @@
* - http get, post, post_files, session, server-vars extraction into global namespace; * - http get, post, post_files, session, server-vars extraction into global namespace;
* (which doesn't occur anymore when servertype config setting is set to test, * (which doesn't occur anymore when servertype config setting is set to test,
* and which will disappear completely in Dokeos 1.6.1) * and which will disappear completely in Dokeos 1.6.1)
* - include of /conf/claro_main.conf.php and /lib/main_api.lib.php; * - include of /conf/configuration.php and /lib/main_api.lib.php;
* - selecting the main database; * - selecting the main database;
* - include of language files. * - include of language files.
* *
* @package dokeos.include * @package dokeos.include
* @todo isn't claro_main.conf.php renamed to configuration.inc.php yet? * @todo isn't configuration.php renamed to configuration.inc.php yet?
* @todo use the $_configuration array for all the needed variables * @todo use the $_configuration array for all the needed variables
* @todo remove the code that displays the button that links to the install page * @todo remove the code that displays the button that links to the install page
* but use a redirect immediately. By doing so the $already_installed variable can be removed. * but use a redirect immediately. By doing so the $already_installed variable can be removed.
@ -28,7 +28,7 @@ $includePath = dirname(__FILE__);
// @todo isn't this file renamed to configuration.inc.php yet? // @todo isn't this file renamed to configuration.inc.php yet?
// include the main Dokeos platform configuration file // include the main Dokeos platform configuration file
$main_configuration_file_path = $includePath . "/conf/claro_main.conf.php"; $main_configuration_file_path = $includePath . "/conf/configuration.php";
$already_installed = false; $already_installed = false;

@ -26,7 +26,7 @@
for this directory (i.e. disable PHP, Perl, CGI). We only want to store assets for this directory (i.e. disable PHP, Perl, CGI). We only want to store assets
in this directory and its subdirectories. in this directory and its subdirectories.
*/ */
require_once('../../../../../conf/claro_main.conf.php'); require_once('../../../../../conf/configuration.php');
$IMConfig['base_url'] = $rootWeb.'main/img/gallery/'; $IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
//$IMConfig['base_dir'] = $_SERVER['DOCUMENT_ROOT'].$IMConfig['base_url']; //$IMConfig['base_dir'] = $_SERVER['DOCUMENT_ROOT'].$IMConfig['base_url'];

@ -1,6 +1,6 @@
<?php header('Content-Type: text/xml; charset=utf-8'); <?php header('Content-Type: text/xml; charset=utf-8');
echo '<?xml version="1.0" encoding="utf-8" ?>'; echo '<?xml version="1.0" encoding="utf-8" ?>';
require_once('../../conf/claro_main.conf.php'); require_once('../../conf/configuration.php');
$IMConfig['base_url'] = $rootWeb.'main/img/gallery/'; $IMConfig['base_url'] = $rootWeb.'main/img/gallery/';
?> ?>

@ -242,7 +242,7 @@ function api_is_self_registration_allowed()
* Returns a full path to a certain Dokeos area, which you specify * Returns a full path to a certain Dokeos area, which you specify
* through a parameter. * through a parameter.
* *
* See $coursesRepositoryAppend in the claro_main.conf.php * See $coursesRepositoryAppend in the configuration.php
* to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters. * to alter the WEB_COURSE_PATH and SYS_COURSE_PATH parameters.
* *
* @param one of the following constants: * @param one of the following constants:

@ -292,7 +292,7 @@ else
$key = $uData['auth_source']; $key = $uData['auth_source'];
/* >>>>>>>>>>>>>>>> External authentication modules <<<<<<<<<<<<<<<< */ /* >>>>>>>>>>>>>>>> External authentication modules <<<<<<<<<<<<<<<< */
// see claro_main.conf.php to define these // see configuration.php to define these
include_once($extAuthSource[$key]['login']); include_once($extAuthSource[$key]['login']);
/* >>>>>>>>>>>>>>>> External authentication modules <<<<<<<<<<<<<<<<<< */ /* >>>>>>>>>>>>>>>> External authentication modules <<<<<<<<<<<<<<<<<< */
} }

@ -31,7 +31,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 site administrator. Pay attention when changing these variables, some changes
can cause Dokeos to stop working. can cause Dokeos to stop working.
If you changed some settings and want to restore them, please have a look at If you changed some settings and want to restore them, please have a look at
claro_main.conf.dist.php. That file is an exact copy of the config file at configuration.php. That file is an exact copy of the config file at
install time. install time.
============================================================================== ==============================================================================
*/ */

@ -1,4 +1,4 @@
<?php // $Id: install_files.inc.php 6030 2005-08-17 13:56:28Z bmol $ <?php // $Id: install_files.inc.php 10060 2006-11-20 19:18:00Z pcool $
/* /*
============================================================================== ==============================================================================
Dokeos - elearning and course management software Dokeos - elearning and course management software
@ -27,7 +27,7 @@
* Notice : This script has to be included by install/index.php * Notice : This script has to be included by install/index.php
* *
* The script creates two files: * The script creates two files:
* - claro_main.conf.php, the file that contains very important info for Dokeos * - configuration.php, the file that contains very important info for Dokeos
* such as the database names. * such as the database names.
* - .htaccess file (in the courses directory) that is optional but improves * - .htaccess file (in the courses directory) that is optional but improves
* security * security
@ -39,9 +39,9 @@
if(defined('DOKEOS_INSTALL')) if(defined('DOKEOS_INSTALL'))
{ {
// Write the Dokeos config file // Write the Dokeos config file
write_dokeos_config_file('../inc/conf/claro_main.conf.php'); write_dokeos_config_file('../inc/conf/configuration.php');
// Write a distribution file with the config as a backup for the admin // Write a distribution file with the config as a backup for the admin
write_dokeos_config_file('../inc/conf/claro_main.conf.dist.php'); write_dokeos_config_file('../inc/conf/configuration.dist.php');
// Write a .htaccess file in the course repository // Write a .htaccess file in the course repository
write_courses_htaccess_file($urlAppendPath); write_courses_htaccess_file($urlAppendPath);
} }

@ -123,9 +123,9 @@ function get_config_param($param)
{ {
$updateFromConfigFile='main/include/config.inc.php'; $updateFromConfigFile='main/include/config.inc.php';
} }
elseif(file_exists($_POST['updatePath'].'main/inc/conf/claro_main.conf.php')) elseif(file_exists($_POST['updatePath'].'main/inc/conf/configuration.php'))
{ {
$updateFromConfigFile='main/inc/conf/claro_main.conf.php'; $updateFromConfigFile='main/inc/conf/configuration.php';
} }
else else
{ {
@ -513,10 +513,10 @@ function display_requirements($installType, $badUpdatePath, $update_from_version
@chmod('../../home',0777); @chmod('../../home',0777);
} }
if(file_exists('../inc/conf/claro_main.conf.php') && !is_writable('../inc/conf/claro_main.conf.php')) if(file_exists('../inc/conf/configuration.php') && !is_writable('../inc/conf/configuration.php'))
{ {
$notwritable[]='../inc/conf/claro_main.conf.php'; $notwritable[]='../inc/conf/configuration.php';
@chmod('../inc/conf/claro_main.conf.php',0666); @chmod('../inc/conf/configuration.php',0666);
} }
//Second, if this fails, report an error //Second, if this fails, report an error
@ -527,7 +527,7 @@ function display_requirements($installType, $badUpdatePath, $update_from_version
!is_writable('../../archive') || !is_writable('../../archive') ||
!is_writable('../../courses') || !is_writable('../../courses') ||
!is_writable('../../home') || !is_writable('../../home') ||
(file_exists('../inc/conf/claro_main.conf.php') && !is_writable('../inc/conf/claro_main.conf.php'))) (file_exists('../inc/conf/configuration.php') && !is_writable('../inc/conf/configuration.php')))
{ {
$error=true; $error=true;
?> ?>
@ -550,7 +550,7 @@ function display_requirements($installType, $badUpdatePath, $update_from_version
<?php <?php
} }
// check wether a Dokeos configuration file already exists. // check wether a Dokeos configuration file already exists.
elseif(file_exists('../inc/conf/claro_main.conf.php')) elseif(file_exists('../inc/conf/configuration.php'))
{ {
echo '<div style="color:#cc0033; background-color:white; font-weight:bold; text-align:center;">'; echo '<div style="color:#cc0033; background-color:white; font-weight:bold; text-align:center;">';
echo get_lang('WarningExistingDokeosInstallationDetected'); echo get_lang('WarningExistingDokeosInstallationDetected');
@ -948,7 +948,7 @@ function display_after_install_message($installType, $nbr_courses)
<?php endif; ?> <?php endif; ?>
<br><br> <br><br>
<b>Security advice :</b> To protect your site, make read-only (CHMOD 444) 'main/inc/conf/claro_main.conf.php' and 'main/install/index.php'. <b>Security advice :</b> To protect your site, make read-only (CHMOD 444) 'main/inc/conf/configuration.php' and 'main/install/index.php'.
<br><br><br><br> <br><br><br><br>
</form> </form>

@ -66,7 +66,7 @@ $updateFromVersion=array('1.5','1.5.4','1.5.5');
INITIALISE FORM VARIABLES INITIALISE FORM VARIABLES
(If this is the first visit to this script.) (If this is the first visit to this script.)
Variables are read from the configuration file Variables are read from the configuration file
of the old Dokeos version (claro_main.conf.php). of the old Dokeos version (configuration.php).
============================================================================== ==============================================================================
*/ */
@ -254,9 +254,9 @@ function get_config_param($param)
{ {
$updateFromConfigFile='main/include/config.inc.php.old'; $updateFromConfigFile='main/include/config.inc.php.old';
} }
elseif(file_exists($_POST['updatePath'].'main/inc/conf/claro_main.conf.php.old')) elseif(file_exists($_POST['updatePath'].'main/inc/conf/configuration.php.old'))
{ {
$updateFromConfigFile='main/inc/conf/claro_main.conf.php.old'; $updateFromConfigFile='main/inc/conf/configuration.php.old';
} }
else else
{ {

@ -44,12 +44,12 @@
* - update the item properties of the group documents * - update the item properties of the group documents
* *
* Additionally, when DOKEOS_INSTALL is defined * Additionally, when DOKEOS_INSTALL is defined
* - write a config file, claro_main.conf.php, with important settings * - write a config file, configuration.php, with important settings
* - write a .htaccess file (with instructions for Apache) in the courses directory * - write a .htaccess file (with instructions for Apache) in the courses directory
* - remove the new main/upload/users directory and rename the main/img/users * - remove the new main/upload/users directory and rename the main/img/users
* directory of the old version to main/upload/users * directory of the old version to main/upload/users
* - rename the old claro_main.conf.php to claro_main.conf.php.old, * - rename the old configuration.php to configuration.php.old,
* or if this fails delete the old claro_main.conf.php * or if this fails delete the old configuration.php
* *
* @package dokeos.install * @package dokeos.install
============================================================================== ==============================================================================
@ -222,9 +222,9 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
if (defined('DOKEOS_INSTALL')) if (defined('DOKEOS_INSTALL'))
{ {
// Write the Dokeos config file // Write the Dokeos config file
write_dokeos_config_file($newPath.'main/inc/conf/claro_main.conf.php'); write_dokeos_config_file($newPath.'main/inc/conf/configuration.php');
// Write a distribution file with the config as a backup for the admin // Write a distribution file with the config as a backup for the admin
write_dokeos_config_file($newPath.'main/inc/conf/claro_main.conf.dist.php'); write_dokeos_config_file($newPath.'main/inc/conf/configuration.dist.php');
// Write a .htaccess file in the course repository // Write a .htaccess file in the course repository
write_courses_htaccess_file($urlAppendPath); write_courses_htaccess_file($urlAppendPath);
@ -234,9 +234,9 @@ if (defined('DOKEOS_INSTALL') || defined('DOKEOS_COURSE_UPDATE'))
// Move the old user images to the new installation // Move the old user images to the new installation
@ rename($oldPath.'main/img/users', $newPath.'main/upload/users'); @ rename($oldPath.'main/img/users', $newPath.'main/upload/users');
if (!@ rename($oldPath.'main/inc/conf/claro_main.conf.php', $oldPath.'main/inc/conf/claro_main.conf.php.old')) if (!@ rename($oldPath.'main/inc/conf/configuration.php', $oldPath.'main/inc/conf/configuration.php.old'))
{ {
unlink($oldPath.'main/inc/conf/claro_main.conf.php'); unlink($oldPath.'main/inc/conf/configuration.php');
} }
} }
} }

@ -77,7 +77,7 @@ $ExtensionLDAPNotAvailable = "Extens
$ExtensionGDNotAvailable = "Extensão GD não disponível"; $ExtensionGDNotAvailable = "Extensão GD não disponível";
$DokeosLicenseInfo = "Dokeos é um software livre distribuído sob a GNU Licença Pública Geral (GPL)"; $DokeosLicenseInfo = "Dokeos é um software livre distribuído sob a GNU Licença Pública Geral (GPL)";
$IAccept = "Eu aceito"; $IAccept = "Eu aceito";
$ConfigSettingsInfo = "Os seguintes valores serão registados no arquivo de configuração<b> main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "Os seguintes valores serão registados no arquivo de configuração<b> main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Instalar Dokeos"; $InstallDokeos = "Instalar Dokeos";
$GoToYourNewlyCreatedPortal = "Ir para o seu novo portal."; $GoToYourNewlyCreatedPortal = "Ir para o seu novo portal.";
$FirstUseTip = "Quando acessar ao campus pela primeira vez, a melhor maneira para compreender/explorar é registrar-se com a opção \"Criar cursos\" e seguir as indicações. $FirstUseTip = "Quando acessar ao campus pela primeira vez, a melhor maneira para compreender/explorar é registrar-se com a opção \"Criar cursos\" e seguir as indicações.

@ -77,7 +77,7 @@ $ExtensionLDAPNotAvailable = "LDAP extensie niet beschikbaar";
$ExtensionGDNotAvailable = "GD extensie niet beschikbaar"; $ExtensionGDNotAvailable = "GD extensie niet beschikbaar";
$DokeosLicenseInfo = "Dokeos is vrije software die verdeeld wordt onder de GNU Algemene Publieke Licentie (GPL)."; $DokeosLicenseInfo = "Dokeos is vrije software die verdeeld wordt onder de GNU Algemene Publieke Licentie (GPL).";
$IAccept = "Ik ga akkoord"; $IAccept = "Ik ga akkoord";
$ConfigSettingsInfo = "De volgende waarden worden in uw configuratiebestand (<b>main/inc/conf/claro_main.conf.php</b>) bewaard:"; $ConfigSettingsInfo = "De volgende waarden worden in uw configuratiebestand (<b>main/inc/conf/configuration.php</b>) bewaard:";
$InstallDokeos = "Installeer Dokeos"; $InstallDokeos = "Installeer Dokeos";
$GoToYourNewlyCreatedPortal = "Ga naar uw geïnstalleerde portaal."; $GoToYourNewlyCreatedPortal = "Ga naar uw geïnstalleerde portaal.";
$FirstUseTip = "Wanneer u de campus voor het eerst gebruikt, is de beste werkwijze om de werking te begrijpen een nieuwe cursus aan te maken en de opties te verkennen. "; $FirstUseTip = "Wanneer u de campus voor het eerst gebruikt, is de beste werkwijze om de werking te begrijpen een nieuwe cursus aan te maken en de opties te verkennen. ";

@ -77,7 +77,7 @@ $ExtensionLDAPNotAvailable = "LDAP Extension not available";
$ExtensionGDNotAvailable = "GD Extension not available"; $ExtensionGDNotAvailable = "GD Extension not available";
$DokeosLicenseInfo = "Dokeos is free software distributed under the GNU General Public licence (GPL)."; $DokeosLicenseInfo = "Dokeos is free software distributed under the GNU General Public licence (GPL).";
$IAccept = "I Accept"; $IAccept = "I Accept";
$ConfigSettingsInfo = "The following values will be written into your configuration file <b>main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "The following values will be written into your configuration file <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Install Dokeos"; $InstallDokeos = "Install Dokeos";
$GoToYourNewlyCreatedPortal = "Go to your newly created portal."; $GoToYourNewlyCreatedPortal = "Go to your newly created portal.";
$FirstUseTip = "When you enter your campus for the first time, the best way to understand it is to register with the option \'Create course area\' and then follow the way."; $FirstUseTip = "When you enter your campus for the first time, the best way to understand it is to register with the option \'Create course area\' and then follow the way.";

@ -78,7 +78,7 @@ $ExtensionLDAPNotAvailable = "Extension LDAP non disponible";
$ExtensionGDNotAvailable = "Extension GD non disponible"; $ExtensionGDNotAvailable = "Extension GD non disponible";
$DokeosLicenseInfo = "Dokeos est un logiciel libre distribué sous la licence GNU General Public Licence (GPL)."; $DokeosLicenseInfo = "Dokeos est un logiciel libre distribué sous la licence GNU General Public Licence (GPL).";
$IAccept = "J\'accepte"; $IAccept = "J\'accepte";
$ConfigSettingsInfo = "Les valeurs suivantes seront écrites dans votre fichier de configuration <b>main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "Les valeurs suivantes seront écrites dans votre fichier de configuration <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Installer Dokeos"; $InstallDokeos = "Installer Dokeos";
$GoToYourNewlyCreatedPortal = "Aller directement sur votre nouveau portail."; $GoToYourNewlyCreatedPortal = "Aller directement sur votre nouveau portail.";
$FirstUseTip = "Lorsque vous entrez pour la première fois sur votre campus, la meilleure façon de vous y retrouver est de vous créer un compte avec l\'option \'Créer des cours\' et ensuite de suivre les indications."; $FirstUseTip = "Lorsque vous entrez pour la première fois sur votre campus, la meilleure façon de vous y retrouver est de vous créer un compte avec l\'option \'Créer des cours\' et ensuite de suivre les indications.";

@ -79,7 +79,7 @@ $ExtensionLDAPNotAvailable = "LDAP Erweiterung ist nicht verf
$ExtensionGDNotAvailable = "GD Erweiterung ist nicht verfügbar"; $ExtensionGDNotAvailable = "GD Erweiterung ist nicht verfügbar";
$DokeosLicenseInfo = "Dokeos ist frei Software, die unter der GNU General Public Licence angeboten wird."; $DokeosLicenseInfo = "Dokeos ist frei Software, die unter der GNU General Public Licence angeboten wird.";
$IAccept = "Ich akzeptiere"; $IAccept = "Ich akzeptiere";
$ConfigSettingsInfo = "Die nachfolgenden Werte werden in Ihre Konfigurationsdatei <b>main/inc/conf/claro_main.conf.php</b> geschrieben:"; $ConfigSettingsInfo = "Die nachfolgenden Werte werden in Ihre Konfigurationsdatei <b>main/inc/conf/configuration.php</b> geschrieben:";
$InstallDokeos = "Dokeos installieren"; $InstallDokeos = "Dokeos installieren";
$GoToYourNewlyCreatedPortal = "Gehen Sie zu Ihrem neu erstellten Portal"; $GoToYourNewlyCreatedPortal = "Gehen Sie zu Ihrem neu erstellten Portal";
$FirstUseTip = "Sie können die Funktionsweise am besten verstehen, wenn Sie sich bei der ersten Benutzung des Campus mit der Option \"Kurs erstellen\" einschreiben und dann den vorgegebenen Schritten folgen"; $FirstUseTip = "Sie können die Funktionsweise am besten verstehen, wenn Sie sich bei der ersten Benutzung des Campus mit der Option \"Kurs erstellen\" einschreiben und dann den vorgegebenen Schritten folgen";

@ -77,7 +77,7 @@ $ExtensionLDAPNotAvailable = "Az LDAP b&#337;v
$ExtensionGDNotAvailable = "A GD b&#337;vítmény nem áll rendelkezésre"; $ExtensionGDNotAvailable = "A GD b&#337;vítmény nem áll rendelkezésre";
$DokeosLicenseInfo = "A Dokeos egy GNU Általános Nyilvános Licensz (General Public Licence) alapján terjesztett szabad szofter."; $DokeosLicenseInfo = "A Dokeos egy GNU Általános Nyilvános Licensz (General Public Licence) alapján terjesztett szabad szofter.";
$IAccept = "Elfogadom"; $IAccept = "Elfogadom";
$ConfigSettingsInfo = "Az alábbi értékek kerülnek beállításra a <b>main/inc/conf/claro_main.conf.php</b> állományban:"; $ConfigSettingsInfo = "Az alábbi értékek kerülnek beállításra a <b>main/inc/conf/configuration.php</b> állományban:";
$InstallDokeos = "Dokeos telepítése"; $InstallDokeos = "Dokeos telepítése";
$GoToYourNewlyCreatedPortal = "Az újonnan létrehozott portál megtekintése"; $GoToYourNewlyCreatedPortal = "Az újonnan létrehozott portál megtekintése";
$FirstUseTip = "Könnyen megértheti a portál m&#369;ködését, ha az els&#337; belépéskor a \'Kurzusterület létrehozása\' opció kijelölésével regisztrálja magát, majd követi a lépéseket."; $FirstUseTip = "Könnyen megértheti a portál m&#369;ködését, ha az els&#337; belépéskor a \'Kurzusterület létrehozása\' opció kijelölésével regisztrálja magát, majd követi a lépéseket.";

@ -81,7 +81,7 @@ $ExtensionLDAPNotAvailable = "Estensione LDAP non disponibile";
$ExtensionGDNotAvailable = "Estensione GD non disponibile"; $ExtensionGDNotAvailable = "Estensione GD non disponibile";
$DokeosLicenseInfo = "Dokeos è un software libero distribuito con licenza GPL (General Public Licence)"; $DokeosLicenseInfo = "Dokeos è un software libero distribuito con licenza GPL (General Public Licence)";
$IAccept = "Accetto"; $IAccept = "Accetto";
$ConfigSettingsInfo = "I valori indicati di seguito verranno scritti nel vostro file di configurazione <b>main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "I valori indicati di seguito verranno scritti nel vostro file di configurazione <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Installa Dokeos"; $InstallDokeos = "Installa Dokeos";
$GoToYourNewlyCreatedPortal = "Vai direttamente al portale appena creato"; $GoToYourNewlyCreatedPortal = "Vai direttamente al portale appena creato";
$FirstUseTip = "Se entri per la prima volta nel campus, la prima cosa da fare è quella di \"Creare un corso\" e seguire le indicazioni."; $FirstUseTip = "Se entri per la prima volta nel campus, la prima cosa da fare è quella di \"Creare un corso\" e seguire le indicazioni.";

@ -78,7 +78,7 @@ $ExtensionGDNotAvailable = "Extens
$DokeosLicenseInfo = "Dokeos é um software distribuído sob a GNU Licença Pública Geral (GPL)"; $DokeosLicenseInfo = "Dokeos é um software distribuído sob a GNU Licença Pública Geral (GPL)";
$IAccept = "Aceito"; $IAccept = "Aceito";
$ConfigSettingsInfo = "Os seguintes valores serão registados no ficheiro de configuração $ConfigSettingsInfo = "Os seguintes valores serão registados no ficheiro de configuração
<b>main/inc/conf/claro_main.conf.php</b>:"; <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Instalar Dokeos"; $InstallDokeos = "Instalar Dokeos";
$GoToYourNewlyCreatedPortal = "Ir para o portal do curso acabado de criar."; $GoToYourNewlyCreatedPortal = "Ir para o portal do curso acabado de criar.";
$FirstUseTip = "Quando aceder ao campus pela primeira vez, a melhor maneira de o compreender/explorar é registar-se com a opção \"Criar cursos\" e seguir as indicações."; $FirstUseTip = "Quando aceder ao campus pela primeira vez, a melhor maneira de o compreender/explorar é registar-se com a opção \"Criar cursos\" e seguir as indicações.";

@ -79,7 +79,7 @@ $ExtensionLDAPNotAvailable = "LDAP raz
$ExtensionGDNotAvailable = "GD razširitev ni na voljo"; $ExtensionGDNotAvailable = "GD razširitev ni na voljo";
$DokeosLicenseInfo = "Dokeos je brezpla&#269;na programska oprema, ki se distribuira pod pogoji GNU-GPL (GNU General Public Licence)"; $DokeosLicenseInfo = "Dokeos je brezpla&#269;na programska oprema, ki se distribuira pod pogoji GNU-GPL (GNU General Public Licence)";
$IAccept = "Sprejmem"; $IAccept = "Sprejmem";
$ConfigSettingsInfo = "Naslednje vrednosti bodo zapisane v vašo konfiguracijsko datoteko <b>main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "Naslednje vrednosti bodo zapisane v vašo konfiguracijsko datoteko <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Namesti Dokeos"; $InstallDokeos = "Namesti Dokeos";
$GoToYourNewlyCreatedPortal = "Pojdi na novo ustvarjen portal."; $GoToYourNewlyCreatedPortal = "Pojdi na novo ustvarjen portal.";
$FirstUseTip = "Ko vstopi v portal prvič, je najboljši način spoznavanja z delovanjem, da se registrirate z opcijo \'Ustvari področje tečaja\' in sledite navodilom."; $FirstUseTip = "Ko vstopi v portal prvič, je najboljši način spoznavanja z delovanjem, da se registrirate z opcijo \'Ustvari področje tečaja\' in sledite navodilom.";

@ -78,7 +78,7 @@ $ExtensionLDAPNotAvailable = "Extensi
$ExtensionGDNotAvailable = "Extensión GD no disponible"; $ExtensionGDNotAvailable = "Extensión GD no disponible";
$DokeosLicenseInfo = "Dokeos es software libre distribuido bajo GNU General Public licence (GPL)"; $DokeosLicenseInfo = "Dokeos es software libre distribuido bajo GNU General Public licence (GPL)";
$IAccept = "Acepto"; $IAccept = "Acepto";
$ConfigSettingsInfo = "Los siguientes valores serán escritos en su archivo de configuración <b>main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "Los siguientes valores serán escritos en su archivo de configuración <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Instalar Dokeos"; $InstallDokeos = "Instalar Dokeos";
$GoToYourNewlyCreatedPortal = "Ir al portal que acaba de crear."; $GoToYourNewlyCreatedPortal = "Ir al portal que acaba de crear.";
$FirstUseTip = "Cuando entra en su campus por primera vez, la mejor manera de entenderlo es registrarse con la opción \"Crear el sitio de un curso\" y seguir el camino."; $FirstUseTip = "Cuando entra en su campus por primera vez, la mejor manera de entenderlo es registrarse con la opción \"Crear el sitio de un curso\" y seguir el camino.";

@ -78,6 +78,6 @@ $ExtensionLDAPNotAvailable = "Extensi
$ExtensionGDNotAvailable = "Extensión GD no disponible"; $ExtensionGDNotAvailable = "Extensión GD no disponible";
$DokeosLicenseInfo = "Dokeos es un software libre distribuido bajo licencia GNU General Public licence (GPL)"; $DokeosLicenseInfo = "Dokeos es un software libre distribuido bajo licencia GNU General Public licence (GPL)";
$IAccept = "Acepto"; $IAccept = "Acepto";
$ConfigSettingsInfo = "Los siguientes valores serán escritos en su archivo de configuración <b>main/inc/conf/claro_main.conf.php</b>:"; $ConfigSettingsInfo = "Los siguientes valores serán escritos en su archivo de configuración <b>main/inc/conf/configuration.php</b>:";
$InstallDokeos = "Instalar Dokeos"; $InstallDokeos = "Instalar Dokeos";
?> ?>

@ -10,7 +10,7 @@ echo $sql."<br />\n";
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -10,7 +10,7 @@ echo $sql."<br />\n";
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -50,7 +50,7 @@ $sql = "SELECT * FROM ".Database::get_main_table(MAIN_COURSE_TABLE)."";
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -46,7 +46,7 @@ $sql = "SELECT * FROM ".Database::get_main_table(MAIN_COURSE_TABLE)." WHERE code
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -14,7 +14,7 @@ $sql = "SELECT * FROM ".Database::get_main_table(MAIN_COURSE_TABLE)."";
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -14,7 +14,7 @@ $sql = "SELECT * FROM ".Database::get_main_table(MAIN_COURSE_TABLE)."";
$res = api_sql_query($sql,__FILE__,__LINE__); $res = api_sql_query($sql,__FILE__,__LINE__);
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -121,7 +121,7 @@ $courses_id_list = array();
$courses_dir_list = array(); $courses_dir_list = array();
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

@ -66,7 +66,7 @@ $courses_id_list = array();
$courses_dir_list = array(); $courses_dir_list = array();
while ($row = Database::fetch_array($res)) while ($row = Database::fetch_array($res))
{ {
//TODO change this db name construction to use DB instead of claro_main.conf settings //TODO change this db name construction to use DB instead of configuration.php settings
$course_pref = Database::get_course_table_prefix(); $course_pref = Database::get_course_table_prefix();
$dbname = $row['db_name'].'.'.$course_pref; $dbname = $row['db_name'].'.'.$course_pref;
$courses_list[] = $row['db_name']; $courses_list[] = $row['db_name'];

Loading…
Cancel
Save