merge

documentation/credits.html

@@ -18,7 +18,6 @@
 </div>
 <a href="index.html">Documentation</a> &gt; Credits
 <h1>Creator (2000)</h1>
-
 Thomas De Praetere (thomas.depraetere@dokeos.com)
 
 <h1>Core developers</h1>
@@ -30,6 +29,12 @@ Thomas De Praetere (thomas.depraetere@dokeos.com)
     <li>Christian Fasanando (christian534@hotmail.com)</li>
   </ul>
   </li>
+  <li>Independent (2008-2011)
+  <ul>
+    <li> Juan Carlos Raña Trabado - considerable work on the wiki integration and improvements, and the FCKEditor/Mimetex extension as well as *many* FCKEditor's file manager and other modules improvements, as well as a continuous stream of recommendations that helped shape 1.8.5 and 1.8.6.*</li>
+    <li> Ivan Tcholakov - various bugfixes in 1.8.6.*, very accurate bug reporting contributions and a considerable work in the integration of a new version of FCKEditor, along with a bunch of useful plugins and an exceptional work on internationalization</li>
+  </ul>
+  </li>
   <li>Dokeos (2004-2009)
   <ul>
     <li>Arnaud Ligot (arnaud@cblue.be)</li>
@@ -62,14 +67,6 @@ Thomas De Praetere (thomas.depraetere@dokeos.com)
     <li> Bart Mollet (bart.mollet@hogent.be)</li>
   </ul>
   </li>
-
-  <li>Independent (2008-2011)
-  <ul>
-    <li> Juan Carlos Raña Trabado - considerable work on the wiki integration and improvements, and the FCKEditor/Mimetex extension as well as *many* FCKEditor's file manager and other modules improvements, as well as a continuous stream of recommendations that helped shape 1.8.5 and 1.8.6.*</li>
-    <li> Ivan Tcholakov - various bugfixes in 1.8.6.*, very accurate bug reporting contributions and a considerable work in the integration of a new version of FCKEditor, along with a bunch of useful plugins and an exceptional work on internationalization</li>
-
-  </ul>
-  </li>
 </ol>
 
 <h1>Quality Assurance</h1>
@@ -514,14 +511,14 @@ Please see http://www.chamilo.com/DLTT/ to see a list of the translators.
   <li> Michela Karina Mosquera Guardamino, for helping improve the visibility of Dokeos in the Latin American area, patiently answering crazy amounts
 of information requests and organizing great community events</li>
   <li> Jhon Rhoos Hinojosa Portuguez, for various bugfixes in 1.8.6</li>
-  <li> Carlos Vargas, for a huge amount of bugfixes in 1.8.6</li>
+  <li> Carlos Vargas (litox84@hotmail.com), for a huge amount of bugfixes in 1.8.6</li>
   <li> Jan Derriks- various bugfixes in 1.8.7 and very accurate bug reporting contributions </li>
   <li> Ronny Velasquez, for a series of bugfixes and improvements in 1.8.6</li>
   <li> Ricardo Rodriguez, for implementing the first set of unit tests in 1.8.6, and manual testing and reporting</li>
   <li> Franco Cedillo, for minor bugfixes in 1.8.6</li>
   <li> Ruben Pereira, Ana Elena Olivera and all the kids from the Joaquin Sant'Anna school for being an inspiration to all of us.</li>
   <li> Wolfgang Schneider for various bugfixes in various tools</li>
-  <li> Carlos Brolo  for reporting bugs for 1.8.7</li>
+  <li> Carlos Brolo for reporting bugs for 1.8.7</li>
   <li> Hubert Borderiou - various bugfixes in 1.8.7 and very accurate bug reporting contributions </li>
   <li> David Auzeine- various bugfixes in 1.8.7</li>
   <li> Anna Frovola for reporting bugs for 1.8.7</li>

tests/datafiller/data_courses.php

@@ -0,0 +1,23 @@
+<?php //$id$
+/**
+ * This script contains the data to fill (or empty) the database with using
+ * the fillers in this directory.
+ * @author Yannick Warnier <yannick.warnier@dokeos.com>
+ *
+ */
+/**
+ * Initialisation section
+ */
+global $_configuration;
+$courses = array();
+$courses[] = array(
+    'code' => 'ENGLISH101',
+    'title' => 'English for beginners',
+    'tutor' => '',
+    'category' => 'PROJ',
+    'language' => 'english',
+    'admin_id' => 1,
+    'db_prefix' => $_configuration['db_prefix'],
+    'expires' => '2020-09-01 00:00:00',
+    'fill' => true,
+);

tests/datafiller/fill_courses.php

@@ -0,0 +1,31 @@
+<?php //$id$
+/**
+ * This script contains a data filling procedure for users
+ * @author Yannick Warnier <yannick.warnier@beeznest.com>
+ *
+ */
+/**
+ * Initialisation section
+ */
+//require_once '../../main/inc/global.inc.php';
+require_once api_get_path(LIBRARY_PATH).'add_course.lib.inc.php';
+/**
+ * Loads the data and injects it into the Chamilo database, using the Chamilo
+ * internal functions.
+ * @return  array  List of user IDs for the users that have just been inserted
+ */
+function fill_courses() {
+    $eol = PHP_EOL;
+    $courses = array(); //declare only to avoid parsing notice
+    require_once 'data_courses.php'; //fill the $users array
+    $output = array();
+    $output[] = array('title'=>'Courses Filling Report:');
+    $i = 1;
+    foreach ($courses as $i => $course) {
+        //first check that the first item doesn't exist already
+    	$output[$i]['line-init'] = $course['title'];
+    	$output[$i]['line-info'] = (create_course($course[)?$res:get_lang('NotInserted'));
+    	$i++;
+    }
+    return $output;
+}

tests/datafiller/fill_users.php

@@ -1,7 +1,7 @@
 <?php //$id$
 /**
  * This script contains a data filling procedure for users
- * @author Yannick Warnier <yannick.warnier@dokeos.com>
+ * @author Yannick Warnier <yannick.warnier@beeznest.com>
  *
  */
 /**
@@ -10,7 +10,7 @@
 //require_once '../../main/inc/global.inc.php';
 require_once api_get_path(LIBRARY_PATH).'usermanager.lib.php';
 /**
- * Loads the data and injects it into the Dokeos database, using the Dokeos
+ * Loads the data and injects it into the Chamilo database, using the Chamilo
  * internal functions.
  * @return  array  List of user IDs for the users that have just been inserted
  */