[svn r13925] Removed erroneous references to claroline

documentation/installation_guide.html

@@ -195,11 +195,11 @@ The following directories need to be readable, writeable and executable for ever
 
 <ul>
 
-  <li>dokeos/claroline/inc/conf/</li>
+  <li>dokeos/main/inc/conf/</li>
 
-  <li>dokeos/claroline/garbage/</li>
+  <li>dokeos/main/garbage/</li>
 
-  <li>dokeos/claroline/upload/</li>
+  <li>dokeos/main/upload/</li>
 
   <li>dokeos/archive/</li>
 
@@ -223,7 +223,7 @@ In Windows, you may need to check the properties of the folders (by right-clicki
 
 <ul>
 
-  <li>dokeos/claroline/inc/conf/claro_main.conf.php (if present)</li>
+  <li>dokeos/main/inc/conf/configuration.php (if present)</li>
 
   <li>dokeos/home/*.html</li>
 
@@ -254,14 +254,14 @@ choose "Configure the homepage" in the Dokeos administration section.</p>
 <ul>
 
   <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>/claroline/inc/conf/claro_main.conf.php.
+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>
-if the <em>(dokeos folder)</em>/claroline/install
+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
@@ -281,7 +281,7 @@ in the administration section of Dokeos, you can use the Dokeos Config Settings
   <li><strong>Configure Dokeos mail: </strong>
 most of Dokeos uses the mail settings from the php.ini file. However,
 the announcements tool uses phpMailer (another free software project)
-and the settings for this tool can be adjusted in <em>(dokeos folder)</em>/claroline/inc/conf/mail.conf.php.</li>
+and the settings for this tool can be adjusted in <em>(dokeos folder)</em>/main/inc/conf/mail.conf.php.</li>
 
 </ul>
 
@@ -532,7 +532,7 @@ Newer distributions also allow downloading rpms for additional packages.
 <h3><b>Activating LDAP in Dokeos</b></h3>
 
 <p>
-In (dokeos folder)/claroline/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>
@@ -541,10 +541,10 @@ In (dokeos folder)/claroline/inc/conf/claro_main.conf.php, around line 90, you s
 //uncomment these to activate ldap<br>
 
 
-//$extAuthSource['ldap']['login'] = "./claroline/auth/ldap/login.php";<br>
+//$extAuthSource['ldap']['login'] = "./main/auth/ldap/login.php";<br>
 
 
-//$extAuthSource['ldap']['newUser'] = "./claroline/auth/ldap/newUser.php";<br>
+//$extAuthSource['ldap']['newUser'] = "./main/auth/ldap/newUser.php";<br>
 
 
 <br>
@@ -583,7 +583,7 @@ Ask the LDAP server admin for the settings:
 
 
 You must enter these in
-(dokeos folder)/claroline/auth/ldap/ldap_var.inc.php
+(dokeos folder)/main/auth/ldap/ldap_var.inc.php
 <br>
 
 
@@ -614,8 +614,8 @@ $ldapDc = "dc=xx, dc=yy, dc=zz"; //domain<br>
 <p>
 If you wish, you can give teacher/student status to dokeos users according to settings in the ldap server.
 This is not a standard field however, so you'll have to change some code.
-claroline/auth/ldap/ldap_var.inc.php
+main/auth/ldap/ldap_var.inc.php
-around line 189, function putUserInfoInClaroline ($login, $infoArray)
+around line 189, function putUserInfoInDokeos ($login, $infoArray)
 </p>
 
 

main/auth/ldap/authldap.php

@@ -1,4 +1,4 @@
-<?php // $Id: authldap.php 13366 2007-10-01 01:52:09Z yannoo $
+<?php // $Id: authldap.php 13925 2007-12-05 03:20:28Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -62,7 +62,7 @@
 
 	with thanks to
 	- Stefan De Wannemacker (Ghent University)
-	- Université Jean Monet (J Dubois / Michel Courbon)
+	- Universit<EFBFBD> Jean Monet (J Dubois / Michel Courbon)
 	- Michel Panckoucke for reporting and fixing a bug
 	- Patrick Cool: fixing security hole
 
@@ -80,7 +80,7 @@ include ('ldap_var.inc.php');
 	CHECK LOGIN & PASSWORD WITH LDAP
 *	@return true when login & password both OK, false otherwise
 ===============================================================
-*	@author Roan Embrechts (based on code from Université Jean Monet)
+*	@author Roan Embrechts (based on code from Universit<EFBFBD> Jean Monet)
 */
 //include_once("$includePath/../connect/authldap.php");
 
@@ -186,9 +186,9 @@ function findUserInfoInLdap ($login)
 /**
 ===============================================================
 *	function
-*	PUT USER INFO IN CLAROLINE
+*	PUT USER INFO IN DOKEOS
 *	this function uses the data from findUserInfoInLdap()
-*	to add the userdata to Claroline
+*	to add the userdata to Dokeos
 *
 *	the "rugid" field is specifically for the Ghent University.
 *
@@ -243,7 +243,7 @@ function putUserInfoInDokeos ($login, $infoArray)
 					 $email, $uname, $password, $official_code,
 					 'english','', '', 'ldap');
 
-	//echo "new user added to claroline, id = $_userId";
+	//echo "new user added to Dokeos, id = $_userId";
 
 	//user_id, username, password, auth_source
 
@@ -263,7 +263,7 @@ function putUserInfoInDokeos ($login, $infoArray)
 
 /* >>>>>>>>>>>>>>>> end of UGent LDAP routines <<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< */
 
-/* >>>>> Older but necessary code of Université Jean-Monet <<<<< */
+/* >>>>> Older but necessary code of Universit<EFBFBD> Jean-Monet <<<<< */
 
 /*
 ===========================================================
@@ -277,12 +277,12 @@ function putUserInfoInDokeos ($login, $infoArray)
 	* let these functions use the variables in config.inc instead of ldap_var.inc
 */
 
-//*** variables en entrée
+//*** variables en entr<EFBFBD>e
-// $uname : username entré au clavier
+// $uname : username entr<EFBFBD> au clavier
 // $passwd : password fournit par l'utilisateur
 
 //*** en sortie : 3 valeurs possibles
-// 0 -> authentif réussie
+// 0 -> authentif r<EFBFBD>ussie
 // 1 -> password incorrect
 // -1 -> ne fait partie du LDAP
 

main/auth/ldap/newUser.php

@@ -1,4 +1,4 @@
-<?php # $Id: newUser.php 13366 2007-10-01 01:52:09Z yannoo $
+<?php # $Id: newUser.php 13925 2007-12-05 03:20:28Z yannoo $
 /*
 ==============================================================================
 	Dokeos - elearning and course management software
@@ -35,9 +35,9 @@
 	
 /*
 ==================================================
-	when a user does not exist yet in claroline, 
+	when a user does not exist yet in dokeos, 
 	but he or she does exist in the LDAP,
-	we add him to the claroline database
+	we add him to the dokeos database
 ==================================================
 */
 
@@ -49,7 +49,7 @@ if ($loginLdapSucces)
 {
 	/*
 		In here, we know that
-		- the user does not exist in Claroline
+		- the user does not exist in dokeos
 		- the users login and password are correct
 	*/
 	$infoArray = findUserInfoInLdap($login);