From ade0a81e02dc237beac8b3699077c12139af7dfc Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Wed, 1 Jun 2016 14:04:58 +0200
Subject: [PATCH 01/12] Fix PHP warning (from chamilo-awx)

---
 main/inc/lib/usermanager.lib.php | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index c4feeece00..cee9e630f7 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -3586,7 +3586,7 @@ class UserManager
         if (is_array($extraFields) && count($extraFields)>0 ) {
             foreach ($extraFields as $extraField) {
                 $varName = 'field_'.$extraField['variable'];
-                if (UserManager::is_extra_field_available($extraField['variable'])) {
+                //if (UserManager::is_extra_field_available($extraField['variable'])) {
                     if (isset($_GET[$varName]) && $_GET[$varName]!='0') {
                         $useExtraFields = true;
                         $extraFieldResult[]= UserManager::get_extra_user_data_by_value(
@@ -3594,7 +3594,7 @@ class UserManager
                             $_GET[$varName]
                         );
                     }
-                }
+                //}
             }
         }
 
@@ -3602,7 +3602,7 @@ class UserManager
             $finalResult = array();
             if (count($extraFieldResult)>1) {
                 for ($i=0; $i < count($extraFieldResult) -1; $i++) {
-                    if (is_array($extraFieldResult[$i+1])) {
+                if (is_array($extraFieldResult[$i]) && is_array($extraFieldResult[$i+1])) {
                         $finalResult  = array_intersect($extraFieldResult[$i], $extraFieldResult[$i+1]);
                     }
                 }
@@ -3626,7 +3626,7 @@ class UserManager
      * @param string $query the value of the search box
      * @return string HTML form
      */
-    public static function get_search_form($query)
+    public static function get_search_form($query, $defaultParams = [])
     {
         $searchType = isset($_GET['search_type']) ? $_GET['search_type'] : null;
         $form = new FormValidator(
@@ -3678,6 +3678,10 @@ class UserManager
 
         $defaults['search_type'] = intval($searchType);
         $defaults['q'] = api_htmlentities(Security::remove_XSS($query));
+
+        if (!empty($defaultParams)) {
+            $defaults = array_merge($defaults, $defaultParams);
+        }
         $form->setDefaults($defaults);
 
         $form->addButtonSearch(get_lang('Search'));
@@ -4815,7 +4819,7 @@ EOF;
 
     /**
      * Subscribe boss to students
-     * 
+     *
      * @param int $bossId The boss id
      * @param array $usersId The users array
      * @return int Affected rows

From c0da860b7f59d5d89e0144d27ddfded2049e88d9 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 2 Jun 2016 12:22:35 +0200
Subject: [PATCH 02/12] Fix PHP warning (from chamilo-awx)

---
 main/admin/add_users_to_usergroup.php |  2 +-
 main/inc/lib/usermanager.lib.php      | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/main/admin/add_users_to_usergroup.php b/main/admin/add_users_to_usergroup.php
index 22367ed007..4998fe451c 100755
--- a/main/admin/add_users_to_usergroup.php
+++ b/main/admin/add_users_to_usergroup.php
@@ -177,7 +177,7 @@ if ($use_extra_fields) {
     if (count($extra_field_result)>1) {
         for ($i=0; $i<count($extra_field_result)-1; $i++) {
             if (is_array($extra_field_result[$i+1])) {
-                $final_result  = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]);
+                $final_result = array_intersect($extra_field_result[$i], $extra_field_result[$i+1]);
             }
         }
     } else {
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index cee9e630f7..53684dae15 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -2269,24 +2269,28 @@ class UserManager
     }
 
     /** Get extra user data by value
-     * @param string the internal variable name of the field
-     * @param string the internal value of the field
+     * @param string $field_variable the internal variable name of the field
+     * @param string $field_value the internal value of the field
+     * @param bool $all_visibility
+     *
      * @return array with extra data info of a user i.e array('field_variable'=>'value');
      */
-    public static function get_extra_user_data_by_value($field_variable, $field_value)
+     public static function get_extra_user_data_by_value($field_variable, $field_value, $all_visibility = true)
     {
         $extraField = new ExtraFieldValue('user');
 
-        $data = $extraField->get_item_id_from_field_variable_and_field_value(
+        $data = $extraField->get_values_by_handler_and_field_variable(
             $field_variable,
             $field_value,
-            true
+            null,
+            true,
+            intval($all_visibility)
         );
 
         $result = [];
         if (!empty($data)) {
             foreach ($data as $data) {
-                $result[] = $data;
+                $result[] = $data['item_id'];
             }
         }
 
@@ -3586,7 +3590,7 @@ class UserManager
         if (is_array($extraFields) && count($extraFields)>0 ) {
             foreach ($extraFields as $extraField) {
                 $varName = 'field_'.$extraField['variable'];
-                //if (UserManager::is_extra_field_available($extraField['variable'])) {
+                if (UserManager::is_extra_field_available($extraField['variable'])) {
                     if (isset($_GET[$varName]) && $_GET[$varName]!='0') {
                         $useExtraFields = true;
                         $extraFieldResult[]= UserManager::get_extra_user_data_by_value(
@@ -3594,7 +3598,7 @@ class UserManager
                             $_GET[$varName]
                         );
                     }
-                //}
+                }
             }
         }
 

From 3a9dfa6cf4b949fb33f5216abe97c21c259da348 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 2 Jun 2016 12:45:43 +0200
Subject: [PATCH 03/12] Fix fatal error #8274

---
 main/coursecopy/classes/Resource.class.php | 53 +++++++++++++++-------
 1 file changed, 37 insertions(+), 16 deletions(-)

diff --git a/main/coursecopy/classes/Resource.class.php b/main/coursecopy/classes/Resource.class.php
index d421d4e2d5..f91fc2f00f 100755
--- a/main/coursecopy/classes/Resource.class.php
+++ b/main/coursecopy/classes/Resource.class.php
@@ -233,28 +233,49 @@ class Resource
     }
 
     /**
-     * Fix objects coming from  1.9.x to 1.10.x
+     * Fix objects coming from 1.9.x to 1.10.x
      * Example class Event to CalendarEvent
      *
      * @param Resource $resource
      */
     public static function setClassType(&$resource)
     {
-        if (get_class($resource) == 'Event') {
-            /** @var $resource CalendarEvent */
-            $newResource = new CalendarEvent(
-                $resource->source_id,
-                $resource->title,
-                $resource->content,
-                $resource->start_date,
-                $resource->end_date,
-                $resource->attachment_path,
-                $resource->attachment_filename,
-                $resource->attachment_size,
-                $resource->attachment_comment,
-                $resource->all_day
-            );
-            $resource = $newResource;
+        $class = get_class($resource);
+        switch ($class) {
+            case 'Event':
+                /** @var $resource \CalendarEvent */
+                $newResource = new \CalendarEvent(
+                    $resource->source_id,
+                    $resource->title,
+                    $resource->content,
+                    $resource->start_date,
+                    $resource->end_date,
+                    $resource->attachment_path,
+                    $resource->attachment_filename,
+                    $resource->attachment_size,
+                    $resource->attachment_comment,
+                    $resource->all_day
+                );
+                $resource = $newResource;
+                break;
+            case 'CourseDescription':
+                if (!method_exists($resource, 'show')) {
+                    $resource = (array) $resource;
+                    $newResource = new CourseDescription(
+                        isset($resource['id']) ? $resource['id'] : '',
+                        $resource['title'],
+                        $resource['content'],
+                        $resource['description_type']
+                    );
+                    $newResource->source_id = $resource['source_id'];
+                    $newResource->destination_id = $resource['source_id'];
+                    $newResource->linked_resources = $resource['source_id'];
+                    $newResource->item_properties = $resource['source_id'];
+                    $newResource->obj = $resource['obj'];
+                    $resource = $newResource;
+                }
+
+                break;
         }
     }
 }

From 0328a9890d3fbff01b01c9abc6df97af30eec9bf Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 2 Jun 2016 12:47:15 +0200
Subject: [PATCH 04/12] Format code

---
 .../coursecopy/classes/Announcement.class.php |  98 +--
 main/coursecopy/classes/Attendance.class.php  |  26 +-
 .../classes/CourseDescription.class.php       |  69 ++-
 .../classes/CourseSelectForm.class.php        |   3 +-
 .../classes/CourseSession.class.php           |  37 +-
 .../classes/DummyCourseCreator.class.php      | 567 +++++++++---------
 main/coursecopy/classes/Event.class.php       |   2 +-
 main/coursecopy/classes/Forum.class.php       |   5 +-
 .../classes/ForumCategory.class.php           |   2 +-
 main/coursecopy/classes/ForumTopic.class.php  |   4 +-
 main/coursecopy/classes/Glossary.class.php    |  50 +-
 main/coursecopy/classes/Link.class.php        |  73 ++-
 .../coursecopy/classes/LinkCategory.class.php |  66 +-
 main/coursecopy/classes/Quiz.class.php        |   4 +
 .../classes/ScormDocument.class.php           |  22 +-
 main/coursecopy/classes/Survey.class.php      | 206 +++----
 .../classes/SurveyInvitation.class.php        |  92 +--
 .../classes/SurveyQuestion.class.php          | 175 +++---
 main/coursecopy/classes/Thematic.class.php    |   2 +-
 main/coursecopy/classes/ToolIntro.class.php   | 150 ++---
 main/coursecopy/classes/Work.class.php        |   2 +-
 main/coursecopy/classes/wiki.class.php        |  84 +--
 22 files changed, 879 insertions(+), 860 deletions(-)

diff --git a/main/coursecopy/classes/Announcement.class.php b/main/coursecopy/classes/Announcement.class.php
index aff329f442..67fab68a38 100755
--- a/main/coursecopy/classes/Announcement.class.php
+++ b/main/coursecopy/classes/Announcement.class.php
@@ -10,25 +10,25 @@ require_once 'Resource.class.php';
  */
 class Announcement extends Coursecopy\Resource
 {
-	/**
-	 * The title of the announcement
-	 */
+    /**
+     * The title of the announcement
+     */
     public $title;
-	/**
-	 * The content of the announcement
-	 */
+    /**
+     * The content of the announcement
+     */
     public $content;
-	/**
-	 * The date on which this announcement was made
-	 */
+    /**
+     * The date on which this announcement was made
+     */
     public $date;
-	/**
-	 * The display order of this announcement
-	 */
+    /**
+     * The display order of this announcement
+     */
     public $display_order;
-	/**
-	 * Has the e-mail been sent?
-	 */
+    /**
+     * Has the e-mail been sent?
+     */
     public $email_sent;
 
     public $attachment_path;
@@ -39,36 +39,46 @@ class Announcement extends Coursecopy\Resource
 
     public $attachment_comment;
 
-	/**
-	 * Create a new announcement
-	 * @param int $id
-	 * @param string $title
-	 * @param string $content
-	 * @param string $date
-	 * @param int display_order
-	 */
-    function __construct($id, $title, $content, $date, $display_order, $email_sent, $path, $filename, $size, $comment)
-    {
-		parent::__construct($id,RESOURCE_ANNOUNCEMENT);
+    /**
+     * Create a new announcement
+     * @param int $id
+     * @param string $title
+     * @param string $content
+     * @param string $date
+     * @param int display_order
+     */
+    public function __construct(
+        $id,
+        $title,
+        $content,
+        $date,
+        $display_order,
+        $email_sent,
+        $path,
+        $filename,
+        $size,
+        $comment
+    ) {
+        parent::__construct($id,RESOURCE_ANNOUNCEMENT);
 
-		$this->content	= $content;
-		$this->title 	= $title;
-		$this->date 	= $date;
-		$this->display_order	= $display_order;
-		$this->email_sent	 	= $email_sent;
+        $this->content	= $content;
+        $this->title 	= $title;
+        $this->date 	= $date;
+        $this->display_order	= $display_order;
+        $this->email_sent	 	= $email_sent;
 
-		$this->attachment_path 	= $path;
-		$this->attachment_filename = $filename;
-		$this->attachment_size 	= $size;
-		$this->attachment_comment 	= $comment;
-	}
+        $this->attachment_path 	= $path;
+        $this->attachment_filename = $filename;
+        $this->attachment_size 	= $size;
+        $this->attachment_comment 	= $comment;
+    }
 
-	/**
-	 * Show this announcement
-	 */
-	function show()
-	{
-		parent::show();
-		echo $this->date.': '.$this->title;
-	}
+    /**
+     * Show this announcement
+     */
+    function show()
+    {
+        parent::show();
+        echo $this->date.': '.$this->title;
+    }
 }
diff --git a/main/coursecopy/classes/Attendance.class.php b/main/coursecopy/classes/Attendance.class.php
index c4ee9584c5..51d33badc4 100755
--- a/main/coursecopy/classes/Attendance.class.php
+++ b/main/coursecopy/classes/Attendance.class.php
@@ -13,28 +13,28 @@ class Attendance extends Coursecopy\Resource
     public $params = array();
     public $attendance_calendar = array();
 
-	/**
-	 * Create a new Thematic
-	 *
-	 * @param array parameters
-	 */
+    /**
+     * Create a new Thematic
+     *
+     * @param array parameters
+     */
     public function __construct($params)
     {
-		parent::__construct($params['id'], RESOURCE_ATTENDANCE);
-		$this->params = $params;
-	}
+        parent::__construct($params['id'], RESOURCE_ATTENDANCE);
+        $this->params = $params;
+    }
 
     /**
      * @inheritdoc
      */
     public function show()
     {
-		parent::show();
-		echo $this->params['name'];
-	}
+        parent::show();
+        echo $this->params['name'];
+    }
 
     public function add_attendance_calendar($data)
     {
-		$this->attendance_calendar[] = $data;
-	}
+        $this->attendance_calendar[] = $data;
+    }
 }
diff --git a/main/coursecopy/classes/CourseDescription.class.php b/main/coursecopy/classes/CourseDescription.class.php
index ca5e93d4aa..3d5a207192 100755
--- a/main/coursecopy/classes/CourseDescription.class.php
+++ b/main/coursecopy/classes/CourseDescription.class.php
@@ -1,6 +1,7 @@
 <?php
 /* For licensing terms, see /license.txt */
 namespace Coursecopy;
+
 require_once 'Resource.class.php';
 
 /**
@@ -10,39 +11,41 @@ require_once 'Resource.class.php';
  */
 class CourseDescription extends Resource
 {
-	/**
-	 * The title
-	 */
-	public $title;
-	/**
-	 * The content
-	 */
-	public $content;
-	/**
-	 * The description type
-	 */
-	public $description_type;
+    /**
+     * The title
+     */
+    public $title;
+    
+    /**
+     * The content
+     */
+    public $content;
+
+    /**
+     * The description type
+     */
+    public $description_type;
 
-	/**
-	 * Create a new course description
-	 * @param int $id
-	 * @param string $title
-	 * @param string $content
-	 */
-	public function __construct($id,$title,$content,$description_type)
-	{
-		parent::__construct($id,RESOURCE_COURSEDESCRIPTION);
-		$this->title = $title;
-		$this->content = $content;
-		$this->description_type = $description_type;
-	}
+    /**
+     * Create a new course description
+     * @param int $id
+     * @param string $title
+     * @param string $content
+     */
+    public function __construct($id, $title, $content, $description_type)
+    {
+        parent::__construct($id, RESOURCE_COURSEDESCRIPTION);
+        $this->title = $title;
+        $this->content = $content;
+        $this->description_type = $description_type;
+    }
 
-	/**
-	 * Show this Event
-	 */
-	function show()
-	{
-		parent::show();
-		echo $this->title;
-	}
+    /**
+     * Show this Event
+     */
+    public function show()
+    {
+        parent::show();
+        echo $this->title;
+    }
 }
diff --git a/main/coursecopy/classes/CourseSelectForm.class.php b/main/coursecopy/classes/CourseSelectForm.class.php
index f83d2a1795..a0827ff4bb 100755
--- a/main/coursecopy/classes/CourseSelectForm.class.php
+++ b/main/coursecopy/classes/CourseSelectForm.class.php
@@ -16,7 +16,7 @@ class CourseSelectForm
 	 * @param array $hidden_fields Hidden fields to add to the form.
 	 * @param boolean the document array will be serialize. This is used in the course_copy.php file
 	 */
-	static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
+	public static function display_form($course, $hidden_fields = null, $avoid_serialize = false)
     {
         global $charset;
         $resource_titles[RESOURCE_GRADEBOOK] = get_lang('Gradebook');
@@ -224,7 +224,6 @@ class CourseSelectForm
 
 						foreach ($resources as $id => $resource) {
                             if ($resource) {
-								// Event obj in 1.9.x in 1.10.x the class is CalendarEvent
                                 Coursecopy\Resource::setClassType($resource);
                                 echo '<label class="checkbox">';
                                 echo '<input type="checkbox" name="resource['.$type.']['.$id.']"  id="resource['.$type.']['.$id.']" />';
diff --git a/main/coursecopy/classes/CourseSession.class.php b/main/coursecopy/classes/CourseSession.class.php
index e61743ac91..cf7d67cc7d 100755
--- a/main/coursecopy/classes/CourseSession.class.php
+++ b/main/coursecopy/classes/CourseSession.class.php
@@ -11,24 +11,25 @@ require_once 'Resource.class.php';
 class CourseSession extends Coursecopy\Resource
 {
     // The title session
-	public $title;
+    public $title;
 
-	/**
-	 * Create a new Session
-	 * @param int $id
-	 * @param string $title
-	 */
-	public function __construct($id,$title)
-	{
-		parent::__construct($id, RESOURCE_SESSION_COURSE);
-		$this->title = $title;
-	}
+    /**
+     * Create a new Session
+     * @param int $id
+     * @param string $title
+     */
+    public function __construct($id,$title)
+    {
+        parent::__construct($id, RESOURCE_SESSION_COURSE);
+        $this->title = $title;
+    }
 
-	/**
-	 * Show this Event
-	 */
-	function show() {
-		parent::show();
-		echo $this->title;
-	}
+    /**
+     * Show this Event
+     */
+    public function show()
+    {
+        parent::show();
+        echo $this->title;
+    }
 }
diff --git a/main/coursecopy/classes/DummyCourseCreator.class.php b/main/coursecopy/classes/DummyCourseCreator.class.php
index 610a97e446..bdc5b4df97 100755
--- a/main/coursecopy/classes/DummyCourseCreator.class.php
+++ b/main/coursecopy/classes/DummyCourseCreator.class.php
@@ -20,289 +20,290 @@ require_once 'CourseRestorer.class.php';
  */
 class DummyCourseCreator
 {
-	/**
-	 * The dummy course
-	 */
-	public $course;
-	/**
-	 *
-	 */
-	public $default_property = array();
+    /**
+     * The dummy course
+     */
+    public $course;
+    /**
+     *
+     */
+    public $default_property = array();
 
-	/**
-	 * Create the dummy course
-	 */
-	public function create_dummy_course($course_code)
-	{
-		$this->default_property['insert_user_id'] = '1';
-		$this->default_property['insert_date'] = date('Y-m-d H:i:s');
-		$this->default_property['lastedit_date'] = date('Y-m-d H:i:s');
-		$this->default_property['lastedit_user_id'] = '1';
-		$this->default_property['to_group_id'] = '0';
-		$this->default_property['to_user_id'] = null;
-		$this->default_property['visibility'] = '1';
-		$this->default_property['start_visible'] = '0000-00-00 00:00:00';
-		$this->default_property['end_visible'] =  '0000-00-00 00:00:00';
+    /**
+     * Create the dummy course
+     */
+    public function create_dummy_course($course_code)
+    {
+        $this->default_property['insert_user_id'] = '1';
+        $this->default_property['insert_date'] = date('Y-m-d H:i:s');
+        $this->default_property['lastedit_date'] = date('Y-m-d H:i:s');
+        $this->default_property['lastedit_user_id'] = '1';
+        $this->default_property['to_group_id'] = '0';
+        $this->default_property['to_user_id'] = null;
+        $this->default_property['visibility'] = '1';
+        $this->default_property['start_visible'] = '0000-00-00 00:00:00';
+        $this->default_property['end_visible'] =  '0000-00-00 00:00:00';
 
-		$course = api_get_course_info($course_code);
-		$this->course = new Course();
-		$tmp_path = api_get_path(SYS_COURSE_PATH).$course['directory'].'/document/tmp_'.uniqid('');
-		@mkdir($tmp_path, api_get_permissions_for_new_directories(), true);
-		$this->course->backup_path = $tmp_path;
-		$this->create_dummy_links();
-		$this->create_dummy_events();
-		$this->create_dummy_forums();
-		$this->create_dummy_announcements();
-		$this->create_dummy_documents();
-		$this->create_dummy_learnpaths();
-		$cr = new CourseRestorer($this->course);
-		$cr->set_file_option(FILE_OVERWRITE);
-		$cr->restore($course_code);
-		rmdirr($tmp_path);
-	}
-	/**
-	 * Create dummy documents
-	 */
-	function create_dummy_documents()
-	{
-		$course = api_get_course_info();
-		$course_doc_path = $this->course->backup_path.'/document/';
-		$number_of_documents = rand(10, 30);
-		$extensions = array ('html', 'doc');
-		$directories = array();
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'DocumentAdded';
-		$property['tool'] = TOOL_DOCUMENT;
-		$doc_id = 0;
-		for ($doc_id = 1; $doc_id < $number_of_documents; $doc_id ++)
-		{
-			$path = '';
-			$doc_type = rand(0, count($extensions) - 1);
-			$extension = $extensions[$doc_type];
-			$filename = $this->get_dummy_content('title').'_'.$doc_id.'.'.$extension;
-			$content = $this->get_dummy_content('text');
-			$dirs = rand(0, 3);
-			for ($i = 0; $i < $dirs; $i ++)
-			{
-				$path .= 'directory/';
-				$directories[$path] = 1;
-			}
-			$dir_to_make = $course_doc_path.$path;
-			if (!is_dir($dir_to_make))
-			{
-				@mkdir($dir_to_make, api_get_permissions_for_new_directories(), true);
-			}
-			$file = $course_doc_path.$path.$filename;
-			$fp = fopen($file, 'w');
-			fwrite($fp, $content);
-			fclose($fp);
-			$size = filesize($file);
-			$document = new Document($doc_id, '/'.$path.$filename,$this->get_dummy_content('description'),$this->get_dummy_content('title'), 'file', $size);
-			$document->item_properties[] = $property;
-			$this->course->add_resource($document);
-		}
-		foreach($directories as $path => $flag)
-		{
-			$path = substr($path,0,strlen($path)-1);
-			$document = new Document($doc_id++,'/'.$path, $this->get_dummy_content('description'),$this->get_dummy_content('title'),'folder',0);
-			$property['lastedit_type'] = 'FolderCreated';
-			$document->item_properties[] = $property;
-			$this->course->add_resource($document);
-		}
-	}
-	/**
-	 * Create dummy announcements
-	 */
-	function create_dummy_announcements()
-	{
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'AnnouncementAdded';
-		$property['tool'] = TOOL_ANNOUNCEMENT;
-		$number_of_announcements = rand(10, 30);
-		for ($i = 0; $i < $number_of_announcements; $i ++)
-		{
-			$time = mktime(rand(1, 24), rand(1, 60), 0, rand(1, 12), rand(1, 28), intval(date('Y')));
-			$date = date('Y-m-d', $time);
-			$announcement = new Announcement($i,$this->get_dummy_content('title'),$this->get_dummy_content('text'), $date,0);
-			$announcement->item_properties[] = $property;
-			$this->course->add_resource($announcement);
-		}
-	}
-	/**
-	 * Create dummy events
-	 */
-	function create_dummy_events()
-	{
-		$number_of_events = rand(10, 30);
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'AgendaAdded';
-		$property['tool'] = TOOL_CALENDAR_EVENT;
-		for ($i = 0; $i < $number_of_events; $i ++)
-		{
-			$hour = rand(1,24);
-			$minute = rand(1,60);
-			$second = rand(1,60);
-			$day = rand(1,28);
-			$month = rand(1,12);
-			$year = intval(date('Y'));
-			$time = mktime($hour,$minute,$second,$month,$day,$year);
-			$start_date = date('Y-m-d H:m:s', $time);
-			$hour = rand($hour,24);
-			$minute = rand($minute,60);
-			$second = rand($second,60);
-			$day = rand($day,28);
-			$month = rand($month,12);
-			$year = intval(date('Y'));
-			$time = mktime($hour,$minute,$second,$month,$day,$year);
-			$end_date = date('Y-m-d H:m:s', $time);
-			$event = new CalendarEvent(
-				$i,
-				$this->get_dummy_content('title'),
-				$this->get_dummy_content('text'),
-				$start_date,
-				$end_date
-			);
-			$event->item_properties[] = $property;
-			$this->course->add_resource($event);
-		}
-	}
-	/**
-	 * Create dummy links
-	 */
-	function create_dummy_links()
-	{
-		// create categorys
-		$number_of_categories = rand(5, 10);
-		for ($i = 0; $i < $number_of_categories; $i ++)
-		{
-			$linkcat = new LinkCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'),$i);
-			$this->course->add_resource($linkcat);
-		}
-		// create links
-		$number_of_links = rand(5, 50);
-		$on_homepage = rand(0,20) == 0 ? 1 : 0;
-		$property = $this->default_property;
-		$property['lastedit_type'] = 'LinkAdded';
-		$property['tool'] = TOOL_LINK;
-		for ($i = 0; $i < $number_of_links; $i ++)
-		{
-			$link = new Link($i, $this->get_dummy_content('title'), 'http://www.google.com/search?q='.$this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(0, $number_of_categories -1),$on_homepage);
-			$link->item_properties[] = $property;
-			$this->course->add_resource($link);
-		}
-	}
-	/**
-	 * Create dummy forums
-	 */
-	function create_dummy_forums()
-	{
-		$number_of_categories = rand(2, 6);
-		$number_of_forums = rand(5, 50);
-		$number_of_topics = rand(30, 100);
-		$number_of_posts = rand(100, 1000);
-		$last_forum_post = array ();
-		$last_topic_post = array ();
-		// create categorys
-		$order = 1;
-		for ($i = 1; $i <= $number_of_categories; $i ++)
-		{
-			$forumcat = new ForumCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $order, 0, 0);
-			$this->course->add_resource($forumcat);
-			$order++;
-		}
-		// create posts
-		for ($post_id = 1; $post_id <= $number_of_posts; $post_id ++)
-		{
-			$topic_id = rand(1, $number_of_topics);
-			$last_topic_post[$topic_id] = $post_id;
-			$post = new ForumPost($post_id, $this->get_dummy_content('title'), $this->get_dummy_content('text'), date('Y-m-d H:i:s'), 1, 'Portal Administrator', 0, 0, $topic_id, 0, 1);
-			$this->course->add_resource($post);
-		}
-		// create topics
-		for ($topic_id = 1; $topic_id <= $number_of_topics; $topic_id ++)
-		{
-			$forum_id = rand(1, $number_of_forums);
-			$last_forum_post[$forum_id] = $last_topic_post[$topic_id];
-			$topic = new ForumTopic($topic_id, $this->get_dummy_content('title'), '2011-03-31 12:10:00', 'Chamilo', 'Administrator', 0, $forum_id, $last_topic_post[$topic_id]);
-			$this->course->add_resource($topic);
-		}
-		// create forums
-		for ($forum_id = 1; $forum_id <= $number_of_forums; $forum_id ++)
-		{
-			$forum = new Forum($forum_id, $this->get_dummy_content('title'),$this->get_dummy_content('description'), rand(1, $number_of_categories), $last_forum_post[$forum_id]);
-			$this->course->add_resource($forum);
-		}
-	}
-	/**
-	 * Create dummy learnpaths
-	 */
-	function create_dummy_learnpaths()
-	{
-		$number_of_learnpaths = rand(3,5);
-		$global_item_id = 1;
-		for($i=1; $i<=$number_of_learnpaths;$i++)
-		{
-		$chapters = array();
-		$number_of_chapters = rand(1,6);
-		for($chapter_id = 1; $chapter_id <= $number_of_chapters; $chapter_id++)
-		{
-			$chapter['name'] = $this->get_dummy_content('title');
-			$chapter['description'] = $this->get_dummy_content('description');
-			$chapter['display_order'] = $chapter_id;
-			$chapter['items'] = array();
-			$number_of_items = rand(5,20);
-			for( $item_id = 1; $item_id<$number_of_items; $item_id++)
-			{
-				$types = array(RESOURCE_ANNOUNCEMENT, RESOURCE_EVENT, RESOURCE_DOCUMENT,RESOURCE_LINK,RESOURCE_FORUM,RESOURCE_FORUMPOST,RESOURCE_FORUMTOPIC);
-				$type = $types[rand(0,count($types)-1)];
-				$resources = $this->course->resources[$type];
-				$resource = $resources[rand(0,count($resources)-1)];
-				$item = array();
-				$item['type'] = $resource->type;
-				$item['id'] = $resource->source_id;
-				$item['display_order'] = $item_id;
-				$item['title'] = $this->get_dummy_content('title');
-				$item['description'] = $this->get_dummy_content('description');
-				$item['ref_id'] = $global_item_id;
-				if( rand(0,5) == 1 && $item_id > 1)
-				{
-					$item['prereq_type'] = 'i';
-					$item['prereq'] = rand($global_item_id - $item_id,$global_item_id-1);
-				}
-				$chapter['items'][] = $item;
-				$global_item_id++;
-			}
-			$chapters[] = $chapter;
-		}
-		$lp = new CourseCopyLearnpath($i,$this->get_dummy_content('title'),$this->get_dummy_content('description'),1,$chapters);
-		$this->course->add_resource($lp);
-		}
-	}
-	/**
-	 * Get dummy titles, descriptions and texts
-	 */
-	function get_dummy_content($type)
-	{
-		$dummy_text = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque lectus. Duis sodales. Vivamus et nunc. Phasellus interdum est a lorem. Fusce venenatis luctus lectus. Mauris quis turpis ac erat rhoncus suscipit. Phasellus elit dui, semper at, porta ut, egestas ac, enim. Quisque pellentesque, nisl nec consequat mollis, ipsum justo pellentesque nibh, non faucibus odio ante at lorem. Donec vitae pede ut felis ultricies semper. Suspendisse velit nibh, interdum quis, gravida nec, dapibus ac, leo. Cras id sem ut tellus tincidunt scelerisque. Aenean ac magna feugiat dolor accumsan dignissim. Integer eget nisl.
-		Ut sit amet nulla. Vestibulum venenatis posuere mauris. Nullam magna leo, blandit luctus, consequat quis, gravida nec, justo. Nam pede. Etiam ut nisl. In at quam scelerisque sapien faucibus commodo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Proin mattis lorem quis nunc. Praesent placerat ligula id elit. Aenean blandit, purus sit amet pharetra auctor, libero orci rutrum felis, sit amet sodales mauris ipsum ultricies sapien. Vivamus wisi. Cras elit elit, ullamcorper ac, interdum nec, pulvinar nec, lacus. In lacus. Vivamus auctor, arcu vitae tincidunt porta, eros lacus tristique justo, vitae semper risus neque eget massa. Vivamus turpis.
-		Aenean ac wisi non enim aliquam scelerisque. Praesent eget mi. Vestibulum volutpat pulvinar justo. Phasellus sapien ante, pharetra id, bibendum sed, porta non, purus. Maecenas leo velit, luctus quis, porta non, feugiat sit amet, sapien. Proin vitae augue ut massa adipiscing placerat. Morbi ac risus. Proin dapibus eros egestas quam. Fusce fermentum lobortis elit. Duis lectus tellus, convallis nec, lobortis vel, accumsan ut, nunc. Nunc est. Donec ullamcorper laoreet quam.
-		Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Suspendisse potenti. Mauris mi. Vivamus risus lacus, faucibus sit amet, sollicitudin a, blandit et, justo. In hendrerit. Sed imperdiet, eros at fringilla tempor, turpis augue semper enim, quis rhoncus nibh enim quis dui. Sed massa sapien, mattis et, laoreet sit amet, dignissim nec, urna. Integer laoreet quam quis lectus. Curabitur convallis gravida dui. Nam metus. Ut sit amet augue in nibh interdum scelerisque. Donec venenatis, lacus et pulvinar euismod, libero massa condimentum pede, commodo tristique nunc massa eu quam. Donec vulputate. Aenean in nibh. Phasellus porttitor. Donec molestie, sem ac porttitor vulputate, mauris dui egestas libero, ac lobortis dolor sem vel ligula. Nam vulputate pretium libero. Cras accumsan. Vivamus lacinia sapien sit amet elit.
-		Duis bibendum elementum justo. Duis posuere. Fusce nulla odio, posuere eget, condimentum nec, venenatis eu, elit. In hac habitasse platea dictumst. Aenean ac sem in enim imperdiet feugiat. Integer tincidunt lectus at elit. Integer magna lacus, vehicula quis, eleifend eget, suscipit vitae, leo. Nunc porta augue nec enim. Curabitur vehicula volutpat enim. Aliquam consequat. Vestibulum rhoncus tellus vitae erat. Integer est. Quisque fermentum leo nec odio. Suspendisse lobortis sollicitudin augue. Nullam urna mi, suscipit eu, sagittis laoreet, ultrices ac, sem. Aliquam enim tortor, hendrerit non, cursus a, tristique sit amet, sapien. Suspendisse potenti. Aenean semper placerat neque.';
-		switch($type)
-		{
-		 case 'description':
-		 	$descriptions = explode(".",$dummy_text);
-		 	return $descriptions[rand(0,count($descriptions)-1)];
-		 	break;
-		 case 'title':
-		 	$dummy_text = str_replace(array("\n",'.',',',"\t"),array(' ','','',' '),$dummy_text);
-		 	$titles = explode(" ",$dummy_text);
-		 	return trim($titles[rand(0,count($titles)-1)]);
-		 	break;
-		 case 'text':
-		 	$texts = explode("\n",$dummy_text);
-		 	return $texts[rand(0,count($texts)-1)];
-		 	break;
-		}
-	}
+        $course = api_get_course_info($course_code);
+        $this->course = new Course();
+        $tmp_path = api_get_path(SYS_COURSE_PATH).$course['directory'].'/document/tmp_'.uniqid('');
+        @mkdir($tmp_path, api_get_permissions_for_new_directories(), true);
+        $this->course->backup_path = $tmp_path;
+        $this->create_dummy_links();
+        $this->create_dummy_events();
+        $this->create_dummy_forums();
+        $this->create_dummy_announcements();
+        $this->create_dummy_documents();
+        $this->create_dummy_learnpaths();
+        $cr = new CourseRestorer($this->course);
+        $cr->set_file_option(FILE_OVERWRITE);
+        $cr->restore($course_code);
+        rmdirr($tmp_path);
+    }
+    
+    /**
+     * Create dummy documents
+     */
+    public function create_dummy_documents()
+    {
+        $course = api_get_course_info();
+        $course_doc_path = $this->course->backup_path.'/document/';
+        $number_of_documents = rand(10, 30);
+        $extensions = array ('html', 'doc');
+        $directories = array();
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'DocumentAdded';
+        $property['tool'] = TOOL_DOCUMENT;
+        $doc_id = 0;
+        for ($doc_id = 1; $doc_id < $number_of_documents; $doc_id ++)
+        {
+            $path = '';
+            $doc_type = rand(0, count($extensions) - 1);
+            $extension = $extensions[$doc_type];
+            $filename = $this->get_dummy_content('title').'_'.$doc_id.'.'.$extension;
+            $content = $this->get_dummy_content('text');
+            $dirs = rand(0, 3);
+            for ($i = 0; $i < $dirs; $i ++)
+            {
+                $path .= 'directory/';
+                $directories[$path] = 1;
+            }
+            $dir_to_make = $course_doc_path.$path;
+            if (!is_dir($dir_to_make))
+            {
+                @mkdir($dir_to_make, api_get_permissions_for_new_directories(), true);
+            }
+            $file = $course_doc_path.$path.$filename;
+            $fp = fopen($file, 'w');
+            fwrite($fp, $content);
+            fclose($fp);
+            $size = filesize($file);
+            $document = new Document($doc_id, '/'.$path.$filename,$this->get_dummy_content('description'),$this->get_dummy_content('title'), 'file', $size);
+            $document->item_properties[] = $property;
+            $this->course->add_resource($document);
+        }
+        foreach($directories as $path => $flag)
+        {
+            $path = substr($path,0,strlen($path)-1);
+            $document = new Document($doc_id++,'/'.$path, $this->get_dummy_content('description'),$this->get_dummy_content('title'),'folder',0);
+            $property['lastedit_type'] = 'FolderCreated';
+            $document->item_properties[] = $property;
+            $this->course->add_resource($document);
+        }
+    }
+    /**
+     * Create dummy announcements
+     */
+    function create_dummy_announcements()
+    {
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'AnnouncementAdded';
+        $property['tool'] = TOOL_ANNOUNCEMENT;
+        $number_of_announcements = rand(10, 30);
+        for ($i = 0; $i < $number_of_announcements; $i ++)
+        {
+            $time = mktime(rand(1, 24), rand(1, 60), 0, rand(1, 12), rand(1, 28), intval(date('Y')));
+            $date = date('Y-m-d', $time);
+            $announcement = new Announcement($i,$this->get_dummy_content('title'),$this->get_dummy_content('text'), $date,0);
+            $announcement->item_properties[] = $property;
+            $this->course->add_resource($announcement);
+        }
+    }
+    /**
+     * Create dummy events
+     */
+    function create_dummy_events()
+    {
+        $number_of_events = rand(10, 30);
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'AgendaAdded';
+        $property['tool'] = TOOL_CALENDAR_EVENT;
+        for ($i = 0; $i < $number_of_events; $i ++)
+        {
+            $hour = rand(1,24);
+            $minute = rand(1,60);
+            $second = rand(1,60);
+            $day = rand(1,28);
+            $month = rand(1,12);
+            $year = intval(date('Y'));
+            $time = mktime($hour,$minute,$second,$month,$day,$year);
+            $start_date = date('Y-m-d H:m:s', $time);
+            $hour = rand($hour,24);
+            $minute = rand($minute,60);
+            $second = rand($second,60);
+            $day = rand($day,28);
+            $month = rand($month,12);
+            $year = intval(date('Y'));
+            $time = mktime($hour,$minute,$second,$month,$day,$year);
+            $end_date = date('Y-m-d H:m:s', $time);
+            $event = new CalendarEvent(
+                $i,
+                $this->get_dummy_content('title'),
+                $this->get_dummy_content('text'),
+                $start_date,
+                $end_date
+            );
+            $event->item_properties[] = $property;
+            $this->course->add_resource($event);
+        }
+    }
+    /**
+     * Create dummy links
+     */
+    function create_dummy_links()
+    {
+        // create categorys
+        $number_of_categories = rand(5, 10);
+        for ($i = 0; $i < $number_of_categories; $i ++)
+        {
+            $linkcat = new LinkCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'),$i);
+            $this->course->add_resource($linkcat);
+        }
+        // create links
+        $number_of_links = rand(5, 50);
+        $on_homepage = rand(0,20) == 0 ? 1 : 0;
+        $property = $this->default_property;
+        $property['lastedit_type'] = 'LinkAdded';
+        $property['tool'] = TOOL_LINK;
+        for ($i = 0; $i < $number_of_links; $i ++)
+        {
+            $link = new Link($i, $this->get_dummy_content('title'), 'http://www.google.com/search?q='.$this->get_dummy_content('title'), $this->get_dummy_content('description'), rand(0, $number_of_categories -1),$on_homepage);
+            $link->item_properties[] = $property;
+            $this->course->add_resource($link);
+        }
+    }
+    /**
+     * Create dummy forums
+     */
+    function create_dummy_forums()
+    {
+        $number_of_categories = rand(2, 6);
+        $number_of_forums = rand(5, 50);
+        $number_of_topics = rand(30, 100);
+        $number_of_posts = rand(100, 1000);
+        $last_forum_post = array ();
+        $last_topic_post = array ();
+        // create categorys
+        $order = 1;
+        for ($i = 1; $i <= $number_of_categories; $i ++)
+        {
+            $forumcat = new ForumCategory($i, $this->get_dummy_content('title'), $this->get_dummy_content('description'), $order, 0, 0);
+            $this->course->add_resource($forumcat);
+            $order++;
+        }
+        // create posts
+        for ($post_id = 1; $post_id <= $number_of_posts; $post_id ++)
+        {
+            $topic_id = rand(1, $number_of_topics);
+            $last_topic_post[$topic_id] = $post_id;
+            $post = new ForumPost($post_id, $this->get_dummy_content('title'), $this->get_dummy_content('text'), date('Y-m-d H:i:s'), 1, 'Portal Administrator', 0, 0, $topic_id, 0, 1);
+            $this->course->add_resource($post);
+        }
+        // create topics
+        for ($topic_id = 1; $topic_id <= $number_of_topics; $topic_id ++)
+        {
+            $forum_id = rand(1, $number_of_forums);
+            $last_forum_post[$forum_id] = $last_topic_post[$topic_id];
+            $topic = new ForumTopic($topic_id, $this->get_dummy_content('title'), '2011-03-31 12:10:00', 'Chamilo', 'Administrator', 0, $forum_id, $last_topic_post[$topic_id]);
+            $this->course->add_resource($topic);
+        }
+        // create forums
+        for ($forum_id = 1; $forum_id <= $number_of_forums; $forum_id ++)
+        {
+            $forum = new Forum($forum_id, $this->get_dummy_content('title'),$this->get_dummy_content('description'), rand(1, $number_of_categories), $last_forum_post[$forum_id]);
+            $this->course->add_resource($forum);
+        }
+    }
+    /**
+     * Create dummy learnpaths
+     */
+    function create_dummy_learnpaths()
+    {
+        $number_of_learnpaths = rand(3,5);
+        $global_item_id = 1;
+        for($i=1; $i<=$number_of_learnpaths;$i++)
+        {
+        $chapters = array();
+        $number_of_chapters = rand(1,6);
+        for($chapter_id = 1; $chapter_id <= $number_of_chapters; $chapter_id++)
+        {
+            $chapter['name'] = $this->get_dummy_content('title');
+            $chapter['description'] = $this->get_dummy_content('description');
+            $chapter['display_order'] = $chapter_id;
+            $chapter['items'] = array();
+            $number_of_items = rand(5,20);
+            for( $item_id = 1; $item_id<$number_of_items; $item_id++)
+            {
+                $types = array(RESOURCE_ANNOUNCEMENT, RESOURCE_EVENT, RESOURCE_DOCUMENT,RESOURCE_LINK,RESOURCE_FORUM,RESOURCE_FORUMPOST,RESOURCE_FORUMTOPIC);
+                $type = $types[rand(0,count($types)-1)];
+                $resources = $this->course->resources[$type];
+                $resource = $resources[rand(0,count($resources)-1)];
+                $item = array();
+                $item['type'] = $resource->type;
+                $item['id'] = $resource->source_id;
+                $item['display_order'] = $item_id;
+                $item['title'] = $this->get_dummy_content('title');
+                $item['description'] = $this->get_dummy_content('description');
+                $item['ref_id'] = $global_item_id;
+                if( rand(0,5) == 1 && $item_id > 1)
+                {
+                    $item['prereq_type'] = 'i';
+                    $item['prereq'] = rand($global_item_id - $item_id,$global_item_id-1);
+                }
+                $chapter['items'][] = $item;
+                $global_item_id++;
+            }
+            $chapters[] = $chapter;
+        }
+        $lp = new CourseCopyLearnpath($i,$this->get_dummy_content('title'),$this->get_dummy_content('description'),1,$chapters);
+        $this->course->add_resource($lp);
+        }
+    }
+    /**
+     * Get dummy titles, descriptions and texts
+     */
+    function get_dummy_content($type)
+    {
+        $dummy_text = 'Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Quisque lectus. Duis sodales. Vivamus et nunc. Phasellus interdum est a lorem. Fusce venenatis luctus lectus. Mauris quis turpis ac erat rhoncus suscipit. Phasellus elit dui, semper at, porta ut, egestas ac, enim. Quisque pellentesque, nisl nec consequat mollis, ipsum justo pellentesque nibh, non faucibus odio ante at lorem. Donec vitae pede ut felis ultricies semper. Suspendisse velit nibh, interdum quis, gravida nec, dapibus ac, leo. Cras id sem ut tellus tincidunt scelerisque. Aenean ac magna feugiat dolor accumsan dignissim. Integer eget nisl.
+        Ut sit amet nulla. Vestibulum venenatis posuere mauris. Nullam magna leo, blandit luctus, consequat quis, gravida nec, justo. Nam pede. Etiam ut nisl. In at quam scelerisque sapien faucibus commodo. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Proin mattis lorem quis nunc. Praesent placerat ligula id elit. Aenean blandit, purus sit amet pharetra auctor, libero orci rutrum felis, sit amet sodales mauris ipsum ultricies sapien. Vivamus wisi. Cras elit elit, ullamcorper ac, interdum nec, pulvinar nec, lacus. In lacus. Vivamus auctor, arcu vitae tincidunt porta, eros lacus tristique justo, vitae semper risus neque eget massa. Vivamus turpis.
+        Aenean ac wisi non enim aliquam scelerisque. Praesent eget mi. Vestibulum volutpat pulvinar justo. Phasellus sapien ante, pharetra id, bibendum sed, porta non, purus. Maecenas leo velit, luctus quis, porta non, feugiat sit amet, sapien. Proin vitae augue ut massa adipiscing placerat. Morbi ac risus. Proin dapibus eros egestas quam. Fusce fermentum lobortis elit. Duis lectus tellus, convallis nec, lobortis vel, accumsan ut, nunc. Nunc est. Donec ullamcorper laoreet quam.
+        Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos hymenaeos. Suspendisse potenti. Mauris mi. Vivamus risus lacus, faucibus sit amet, sollicitudin a, blandit et, justo. In hendrerit. Sed imperdiet, eros at fringilla tempor, turpis augue semper enim, quis rhoncus nibh enim quis dui. Sed massa sapien, mattis et, laoreet sit amet, dignissim nec, urna. Integer laoreet quam quis lectus. Curabitur convallis gravida dui. Nam metus. Ut sit amet augue in nibh interdum scelerisque. Donec venenatis, lacus et pulvinar euismod, libero massa condimentum pede, commodo tristique nunc massa eu quam. Donec vulputate. Aenean in nibh. Phasellus porttitor. Donec molestie, sem ac porttitor vulputate, mauris dui egestas libero, ac lobortis dolor sem vel ligula. Nam vulputate pretium libero. Cras accumsan. Vivamus lacinia sapien sit amet elit.
+        Duis bibendum elementum justo. Duis posuere. Fusce nulla odio, posuere eget, condimentum nec, venenatis eu, elit. In hac habitasse platea dictumst. Aenean ac sem in enim imperdiet feugiat. Integer tincidunt lectus at elit. Integer magna lacus, vehicula quis, eleifend eget, suscipit vitae, leo. Nunc porta augue nec enim. Curabitur vehicula volutpat enim. Aliquam consequat. Vestibulum rhoncus tellus vitae erat. Integer est. Quisque fermentum leo nec odio. Suspendisse lobortis sollicitudin augue. Nullam urna mi, suscipit eu, sagittis laoreet, ultrices ac, sem. Aliquam enim tortor, hendrerit non, cursus a, tristique sit amet, sapien. Suspendisse potenti. Aenean semper placerat neque.';
+        switch($type)
+        {
+         case 'description':
+            $descriptions = explode(".",$dummy_text);
+            return $descriptions[rand(0,count($descriptions)-1)];
+            break;
+         case 'title':
+            $dummy_text = str_replace(array("\n",'.',',',"\t"),array(' ','','',' '),$dummy_text);
+            $titles = explode(" ",$dummy_text);
+            return trim($titles[rand(0,count($titles)-1)]);
+            break;
+         case 'text':
+            $texts = explode("\n",$dummy_text);
+            return $texts[rand(0,count($texts)-1)];
+            break;
+        }
+    }
 }
diff --git a/main/coursecopy/classes/Event.class.php b/main/coursecopy/classes/Event.class.php
index 8d57daf7f6..02109d589a 100755
--- a/main/coursecopy/classes/Event.class.php
+++ b/main/coursecopy/classes/Event.class.php
@@ -80,7 +80,7 @@ class CalendarEvent extends Coursecopy\Resource
     /**
      * Show this Event
      */
-    function show()
+    public function show()
     {
         parent::show();
         echo $this->title.' ('.$this->start_date.' -> '.$this->end_date.')';
diff --git a/main/coursecopy/classes/Forum.class.php b/main/coursecopy/classes/Forum.class.php
index e452524d7e..58fee0f208 100755
--- a/main/coursecopy/classes/Forum.class.php
+++ b/main/coursecopy/classes/Forum.class.php
@@ -103,7 +103,7 @@ class Forum extends Coursecopy\Resource
     /**
      * Create a new Forum
      */
-    function __construct($obj)
+    public function __construct($obj)
     {
         parent::__construct($obj->forum_id, RESOURCE_FORUM);
         $this->obj = $obj;
@@ -112,7 +112,8 @@ class Forum extends Coursecopy\Resource
     /**
      * Show this resource
      */
-    function show() {
+    public function show()
+    {
         parent::show();
         echo $this->obj->forum_title;
     }
diff --git a/main/coursecopy/classes/ForumCategory.class.php b/main/coursecopy/classes/ForumCategory.class.php
index ec44f7c008..2a9a387e7e 100755
--- a/main/coursecopy/classes/ForumCategory.class.php
+++ b/main/coursecopy/classes/ForumCategory.class.php
@@ -22,7 +22,7 @@ class ForumCategory extends Coursecopy\Resource
     /**
      * Show this resource
      */
-    function show()
+    public function show()
     {
         parent::show();
         echo $this->obj->cat_title;
diff --git a/main/coursecopy/classes/ForumTopic.class.php b/main/coursecopy/classes/ForumTopic.class.php
index 48449a4639..7b8ebb58dc 100755
--- a/main/coursecopy/classes/ForumTopic.class.php
+++ b/main/coursecopy/classes/ForumTopic.class.php
@@ -15,7 +15,7 @@ class ForumTopic extends Coursecopy\Resource
      */
     /* function ForumTopic($id, $title, $time, $topic_poster_id, $topic_poster_name, $forum_id, $last_post, $replies, $views = 0, $sticky = 0, $locked = 0,
       $time_closed = null, $weight = 0, $title_qualify = null, $qualify_max = 0) */
-    function __construct($obj)
+    public function __construct($obj)
     {
         parent::__construct($obj->thread_id, RESOURCE_FORUMTOPIC);
         $this->obj = $obj;
@@ -39,7 +39,7 @@ class ForumTopic extends Coursecopy\Resource
     /**
      * Show this resource
      */
-    function show()
+    public function show()
     {
         parent::show();
         $extra = api_convert_and_format_date($this->obj->thread_date);
diff --git a/main/coursecopy/classes/Glossary.class.php b/main/coursecopy/classes/Glossary.class.php
index 6946faa74d..932841d402 100755
--- a/main/coursecopy/classes/Glossary.class.php
+++ b/main/coursecopy/classes/Glossary.class.php
@@ -10,33 +10,33 @@ require_once 'Resource.class.php';
  */
 class Glossary extends Coursecopy\Resource
 {
-	public $glossary_id;
-	public $name;
-	public $description;
-	public $display_order;
+    public $glossary_id;
+    public $name;
+    public $description;
+    public $display_order;
 
-	/**
-	 * Create a new Glossary
-	 * @param int $id
-	 * @param string $name
-	 * @param string $description
-	 * @param int $display_order
-	 */
+    /**
+     * Create a new Glossary
+     * @param int $id
+     * @param string $name
+     * @param string $description
+     * @param int $display_order
+     */
     public function __construct($id,$name,$description,$display_order)
-	{
-		parent::__construct($id,RESOURCE_GLOSSARY);
-		$this->glossary_id = $id;
-		$this->name = $name;
-		$this->description = $description;
-		$this->display_order = $display_order;
-	}
+    {
+        parent::__construct($id,RESOURCE_GLOSSARY);
+        $this->glossary_id = $id;
+        $this->name = $name;
+        $this->description = $description;
+        $this->display_order = $display_order;
+    }
 
-	/**
-	 * Show this glossary
-	 */
-	public function show()
+    /**
+     * Show this glossary
+     */
+    public function show()
     {
-		parent::show();
-		echo $this->name;
-	}
+        parent::show();
+        echo $this->name;
+    }
 }
diff --git a/main/coursecopy/classes/Link.class.php b/main/coursecopy/classes/Link.class.php
index 10ddfbc8d4..d72d063c8d 100755
--- a/main/coursecopy/classes/Link.class.php
+++ b/main/coursecopy/classes/Link.class.php
@@ -11,33 +11,33 @@ require_once 'Resource.class.php';
  */
 class Link extends Coursecopy\Resource
 {
-	/**
-	 * The title
-	 */
+    /**
+     * The title
+     */
     public $title;
-	/**
-	 * The URL
-	 */
+    /**
+     * The URL
+     */
     public $url;
-	/**
-	 * The description
-	 */
+    /**
+     * The description
+     */
     public $description;
-	/**
-	 * Id of this links category
-	 */
+    /**
+     * Id of this links category
+     */
     public $category_id;
-	/**
-	 * Display link on course homepage
-	 */
+    /**
+     * Display link on course homepage
+     */
     public $on_homepage;
-	/**
-	 * Create a new Link
-	 * @param int $id The id of this link in the Chamilo-course
-	 * @param string $title
-	 * @param string $url
-	 * @param string $description
-	 */
+    /**
+     * Create a new Link
+     * @param int $id The id of this link in the Chamilo-course
+     * @param string $title
+     * @param string $url
+     * @param string $description
+     */
     public function __construct(
         $id,
         $title,
@@ -45,22 +45,21 @@ class Link extends Coursecopy\Resource
         $description,
         $category_id,
         $on_homepage
-    )
-	{
-		parent::__construct($id,RESOURCE_LINK);
-		$this->title = $title;
-		$this->url = $url;
-		$this->description = $description;
-		$this->category_id = $category_id;
-		$this->on_homepage = $on_homepage;
-	}
+    ) {
+        parent::__construct($id,RESOURCE_LINK);
+        $this->title = $title;
+        $this->url = $url;
+        $this->description = $description;
+        $this->category_id = $category_id;
+        $this->on_homepage = $on_homepage;
+    }
 
     /**
-	 * Show this resource
-	 */
+     * Show this resource
+     */
     public function show()
-	{
-		parent::show();
-		echo $this->title.' ('.$this->url.')';
-	}
+    {
+        parent::show();
+        echo $this->title.' ('.$this->url.')';
+    }
 }
diff --git a/main/coursecopy/classes/LinkCategory.class.php b/main/coursecopy/classes/LinkCategory.class.php
index d83c74239f..c1e8622040 100755
--- a/main/coursecopy/classes/LinkCategory.class.php
+++ b/main/coursecopy/classes/LinkCategory.class.php
@@ -10,39 +10,39 @@ require_once 'Resource.class.php';
  */
 class LinkCategory extends Coursecopy\Resource
 {
-	/**
-	 * The title
-	 */
-	public $title;
-	/**
-	 * The description
-	 */
-	public $description;
-	/**
-	 * The display order
-	 */
-	public $display_order;
+    /**
+     * The title
+     */
+    public $title;
+    /**
+     * The description
+     */
+    public $description;
+    /**
+     * The display order
+     */
+    public $display_order;
 
-	/**
-	 * Create a new LinkCategory
-	 * @param int $id
-	 * @param string $title
-	 * @param string $description
-	 */
-	function __construct($id,$title,$description,$display_order)
-	{
-		parent::__construct($id,RESOURCE_LINKCATEGORY);
-		$this->title = $title;
-		$this->description = $description;
-		$this->display_order = $display_order;
-	}
+    /**
+     * Create a new LinkCategory
+     * @param int $id
+     * @param string $title
+     * @param string $description
+     */
+    public function __construct($id,$title,$description,$display_order)
+    {
+        parent::__construct($id,RESOURCE_LINKCATEGORY);
+        $this->title = $title;
+        $this->description = $description;
+        $this->display_order = $display_order;
+    }
 
-	/**
-	 * Show this LinkCategory
-	 */
-	function show()
-	{
-		parent::show();
-		echo $this->title.' '.$this->description.'<br />';
-	}
+    /**
+     * Show this LinkCategory
+     */
+    public function show()
+    {
+        parent::show();
+        echo $this->title.' '.$this->description.'<br />';
+    }
 }
diff --git a/main/coursecopy/classes/Quiz.class.php b/main/coursecopy/classes/Quiz.class.php
index 11fd4efe8a..845a2a8b10 100755
--- a/main/coursecopy/classes/Quiz.class.php
+++ b/main/coursecopy/classes/Quiz.class.php
@@ -21,6 +21,10 @@ class Quiz extends Coursecopy\Resource
      */
     public $obj; //question
 
+    /**
+     * Quiz constructor.
+     * @param int $obj
+     */
     public function __construct($obj)
     {
         $this->obj = $obj;
diff --git a/main/coursecopy/classes/ScormDocument.class.php b/main/coursecopy/classes/ScormDocument.class.php
index 8c828d3aea..96f492af16 100755
--- a/main/coursecopy/classes/ScormDocument.class.php
+++ b/main/coursecopy/classes/ScormDocument.class.php
@@ -13,18 +13,18 @@ class ScormDocument extends Coursecopy\Resource
     public $path;
     public $title;
 
-	/**
-	 * Create a new Scorm Document
-	 * @param int $id
-	 * @param string $path
-	 * @param string $title
-	 */
+    /**
+     * Create a new Scorm Document
+     * @param int $id
+     * @param string $path
+     * @param string $title
+     */
     public function __construct($id, $path, $title)
-	{
-		parent::__construct($id,RESOURCE_SCORM);
-		$this->path = 'scorm'.$path;
-		$this->title = $title;
-	}
+    {
+        parent::__construct($id,RESOURCE_SCORM);
+        $this->path = 'scorm'.$path;
+        $this->title = $title;
+    }
 
     /**
      * Show this document
diff --git a/main/coursecopy/classes/Survey.class.php b/main/coursecopy/classes/Survey.class.php
index 0018ee3938..255898d166 100755
--- a/main/coursecopy/classes/Survey.class.php
+++ b/main/coursecopy/classes/Survey.class.php
@@ -10,86 +10,86 @@ require_once 'Resource.class.php';
  */
 class Survey extends Coursecopy\Resource
 {
-	/**
-	 * The survey code
-	 */
+    /**
+     * The survey code
+     */
     public $code;
-	/**
-	 * The title and subtitle
-	 */
+    /**
+     * The title and subtitle
+     */
     public $title;
     public $subtitle;
-	/**
-	 * The author's name
-	 */
+    /**
+     * The author's name
+     */
     public $author;
-	/**
-	 * The survey's language
-	 */
+    /**
+     * The survey's language
+     */
     public $lang;
-	/**
-	 * The availability period
-	 */
+    /**
+     * The availability period
+     */
     public $avail_from;
     public $avail_till;
-	/**
-	 * Flag for shared status
-	 */
+    /**
+     * Flag for shared status
+     */
     public $is_shared;
-	/**
-	 * Template used
-	 */
+    /**
+     * Template used
+     */
     public $template;
-	/**
-	 * Introduction text
-	 */
+    /**
+     * Introduction text
+     */
     public $intro;
-	/**
-	 * Thanks text
-	 */
+    /**
+     * Thanks text
+     */
     public $surveythanks;
-	/**
-	 * Creation date
-	 */
+    /**
+     * Creation date
+     */
     public $creation_date;
-	/**
-	 * Invitation status
-	 */
+    /**
+     * Invitation status
+     */
     public $invited;
-	/**
-	 * Answer status
-	 */
+    /**
+     * Answer status
+     */
     public $answered;
-	/**
-	 * Invitation and reminder mail contents
-	 */
+    /**
+     * Invitation and reminder mail contents
+     */
     public $invite_mail;
     public $reminder_mail;
-	/**
-	 * Questions and invitations lists
-	 */
+    /**
+     * Questions and invitations lists
+     */
     public $question_ids;
     public $invitation_ids;
 
-	/**
-	 * Create a new Survey
-	 * @param string $code
-	 * @param string $title
-	 * @param string $subtitle
-	 * @param string $author
-	 * @param string $lang
-	 * @param string $avail_from
-	 * @param string $avail_till
-	 * @param char $is_shared
-	 * @param string $template
-	 * @param string $intro
-	 * @param string $surveythanks
-	 * @param string $creation_date
-	 * @param int $invited
-	 * @param int $answered
-	 * @param string $invite_mail
-	 * @param string $reminder_mail
-	 */
+    /**
+     * Create a new Survey
+     * @param string $code
+     * @param string $title
+     * @param string $subtitle
+     * @param string $author
+     * @param string $lang
+     * @param string $avail_from
+     * @param string $avail_till
+     * @param char $is_shared
+     * @param string $template
+     * @param string $intro
+     * @param string $surveythanks
+     * @param string $creation_date
+     * @param int $invited
+     * @param int $answered
+     * @param string $invite_mail
+     * @param string $reminder_mail
+     */
     public function __construct(
         $id,
         $code,
@@ -109,49 +109,49 @@ class Survey extends Coursecopy\Resource
         $invite_mail,
         $reminder_mail
     ) {
-		parent::__construct($id,RESOURCE_SURVEY);
-		$this->code = $code;
-		$this->title = $title;
-		$this->subtitle = $subtitle;
-		$this->author = $author;
-		$this->lang = $lang;
-		$this->avail_from = $avail_from;
-		$this->avail_till = $avail_till;
-		$this->is_shared = $is_shared;
-		$this->template = $template;
-		$this->intro = $intro;
-		$this->surveythanks = $surveythanks;
-		$this->creation_date = $creation_date;
-		$this->invited = $invited;
-		$this->answered = $answered;
-		$this->invite_mail = $invite_mail;
-		$this->reminder_mail = $reminder_mail;
-		$this->question_ids = array();
-		$this->invitation_ids = array();
-	}
+        parent::__construct($id, RESOURCE_SURVEY);
+        $this->code = $code;
+        $this->title = $title;
+        $this->subtitle = $subtitle;
+        $this->author = $author;
+        $this->lang = $lang;
+        $this->avail_from = $avail_from;
+        $this->avail_till = $avail_till;
+        $this->is_shared = $is_shared;
+        $this->template = $template;
+        $this->intro = $intro;
+        $this->surveythanks = $surveythanks;
+        $this->creation_date = $creation_date;
+        $this->invited = $invited;
+        $this->answered = $answered;
+        $this->invite_mail = $invite_mail;
+        $this->reminder_mail = $reminder_mail;
+        $this->question_ids = array();
+        $this->invitation_ids = array();
+    }
 
-	/**
-	 * Add a question to this survey
-	 */
-	function add_question($id)
-	{
-		$this->question_ids[] = $id;
-	}
+    /**
+     * Add a question to this survey
+     */
+    public function add_question($id)
+    {
+        $this->question_ids[] = $id;
+    }
 
-	/**
-	 * Add an invitation to this survey
-	 */
-	function add_invitation($id)
-	{
-		$this->invitation_ids[] = $id;
-	}
+    /**
+     * Add an invitation to this survey
+     */
+    public function add_invitation($id)
+    {
+        $this->invitation_ids[] = $id;
+    }
 
-	/**
-	 * Show this survey
-	 */
-	function show()
-	{
-		parent::show();
-		echo $this->code.' - '.$this->title;
-	}
+    /**
+     * Show this survey
+     */
+    public function show()
+    {
+        parent::show();
+        echo $this->code.' - '.$this->title;
+    }
 }
diff --git a/main/coursecopy/classes/SurveyInvitation.class.php b/main/coursecopy/classes/SurveyInvitation.class.php
index 752da95a67..c5d0d158ff 100755
--- a/main/coursecopy/classes/SurveyInvitation.class.php
+++ b/main/coursecopy/classes/SurveyInvitation.class.php
@@ -10,52 +10,52 @@ require_once 'Resource.class.php';
  */
 class SurveyInvitation extends Coursecopy\Resource
 {
-	/**
-	 * Survey code
-	 */
-	public $code;
-	/**
-	 * User info
-	 */
-	public $user;
-	/**
-	 * Invitation code
-	 */
-	public $invitation_code;
-	/**
-	 * Invitation date
-	 */
-	public $invitation_date;
-	/**
-	 * Reminder date
-	 */
-	public $reminder_date;
+    /**
+     * Survey code
+     */
+    public $code;
+    /**
+     * User info
+     */
+    public $user;
+    /**
+     * Invitation code
+     */
+    public $invitation_code;
+    /**
+     * Invitation date
+     */
+    public $invitation_date;
+    /**
+     * Reminder date
+     */
+    public $reminder_date;
 
-	/**
-	 * Create a new SurveyInvitation
-	 * @param	int	 $id
-	 * @param string $code
-	 * @param string $user
-	 * @param string $invitation_code
-	 * @param string $invitation_date
-	 * @param string $reminder_date
-	 */
-	public function __construct($id,$code,$user,$invitation_code,$invitation_date,$reminder_date)
-	{
-		parent::__construct($id, RESOURCE_SURVEYINVITATION);
-		$this->code = $code;
-		$this->user = $user;
-		$this->invitation_code = $invitation_code;
-		$this->invitation_date = $invitation_date;
-		$this->reminder_date = $reminder_date;
-	}
+    /**
+     * Create a new SurveyInvitation
+     * @param int	 $id
+     * @param string $code
+     * @param string $user
+     * @param string $invitation_code
+     * @param string $invitation_date
+     * @param string $reminder_date
+     */
+    public function __construct($id, $code, $user, $invitation_code, $invitation_date, $reminder_date)
+    {
+        parent::__construct($id, RESOURCE_SURVEYINVITATION);
+        $this->code = $code;
+        $this->user = $user;
+        $this->invitation_code = $invitation_code;
+        $this->invitation_date = $invitation_date;
+        $this->reminder_date = $reminder_date;
+    }
 
-	/**
-	 * Show this invitation
-	 */
-	function show()
-	{
-		parent::show();
-		echo $this->invitation_code;
-	}
+    /**
+     * Show this invitation
+     */
+    public function show()
+    {
+        parent::show();
+        echo $this->invitation_code;
+    }
 }
diff --git a/main/coursecopy/classes/SurveyQuestion.class.php b/main/coursecopy/classes/SurveyQuestion.class.php
index b6a50f7f3e..6038da9a28 100755
--- a/main/coursecopy/classes/SurveyQuestion.class.php
+++ b/main/coursecopy/classes/SurveyQuestion.class.php
@@ -10,93 +10,94 @@ require_once 'Resource.class.php';
  */
 class SurveyQuestion extends Coursecopy\Resource
 {
-	/**
-	 * Survey ID
-	 */
-	public $survey_id;
-	/**
-	 * Question and question comment
-	 */
-	public $survey_question;
-	public $survey_question_comment;
-	/**
-	 * Question type
-	 */
-	public $survey_question_type;
-	/**
-	 * Display ?
-	 */
-	public $display;
-	/**
-	 * Sorting order
-	 */
-	public $sort;
-	/**
-	 * Shared question ID
-	 */
-	public $shared_question_id;
-	/**
-	 * Maximum value for the vote
-	 */
-	public $max_value;
+    /**
+     * Survey ID
+     */
+    public $survey_id;
+    /**
+     * Question and question comment
+     */
+    public $survey_question;
+    public $survey_question_comment;
+    /**
+     * Question type
+     */
+    public $survey_question_type;
+    /**
+     * Display ?
+     */
+    public $display;
+    /**
+     * Sorting order
+     */
+    public $sort;
+    /**
+     * Shared question ID
+     */
+    public $shared_question_id;
+    /**
+     * Maximum value for the vote
+     */
+    public $max_value;
 
-	/**
-	 * Question's options
-	 */
-	public $options;
+    /**
+     * Question's options
+     */
+    public $options;
 
-	/**
-	 * Create a new SurveyQuestion
-	 * @param int	 $id
-	 * @param int 	 $survey_id
-	 * @param string $survey_question
-	 * @param string $survey_question_comment
-	 * @param string $type
-	 * @param string $display
-	 * @param int	 $sort
-	 * @param int	 $shared_question_id
-	 * @param int	 $max_value
-	 */
-	function __construct(
-		$id,
-		$survey_id,
-		$survey_question,
-		$survey_question_comment,
-		$type,
-		$display,
-		$sort,
-		$shared_question_id,
-		$max_value
-	) {
-		parent::__construct($id,RESOURCE_SURVEYQUESTION);
-		$this->survey_id = $survey_id;
-		$this->survey_question = $survey_question;
-		$this->survey_question_comment = $survey_question_comment;
-		$this->survey_question_type = $type;
-		$this->display = $display;
-		$this->sort = $sort;
-		$this->shared_question_id = $shared_question_id;
-		$this->max_value = $max_value;
-		$this->answers = array();
-	}
-	/**
-	 * Add an answer option to this SurveyQuestion
-	 * @param string $option_text
-	 * @param int	 $sort
-	 */
-	function add_answer($option_text,$sort)
-	{
-		$answer = array();
-		$answer['option_text'] = $option_text;
-		$answer['sort'] = $sort;
-		$this->answers[] = $answer;
-	}
-	/**
-	 * Show this question
-	 */
-	function show()
-	{
-		parent::show();
-		echo $this->survey_question;
-	}
+    /**
+     * Create a new SurveyQuestion
+     * @param int	 $id
+     * @param int 	 $survey_id
+     * @param string $survey_question
+     * @param string $survey_question_comment
+     * @param string $type
+     * @param string $display
+     * @param int	 $sort
+     * @param int	 $shared_question_id
+     * @param int	 $max_value
+     */
+    public function __construct(
+        $id,
+        $survey_id,
+        $survey_question,
+        $survey_question_comment,
+        $type,
+        $display,
+        $sort,
+        $shared_question_id,
+        $max_value
+    ) {
+        parent::__construct($id, RESOURCE_SURVEYQUESTION);
+        $this->survey_id = $survey_id;
+        $this->survey_question = $survey_question;
+        $this->survey_question_comment = $survey_question_comment;
+        $this->survey_question_type = $type;
+        $this->display = $display;
+        $this->sort = $sort;
+        $this->shared_question_id = $shared_question_id;
+        $this->max_value = $max_value;
+        $this->answers = array();
+    }
+
+    /**
+     * Add an answer option to this SurveyQuestion
+     * @param string $option_text
+     * @param int	 $sort
+     */
+    public function add_answer($option_text,$sort)
+    {
+        $answer = array();
+        $answer['option_text'] = $option_text;
+        $answer['sort'] = $sort;
+        $this->answers[] = $answer;
+    }
+    /**
+     * Show this question
+     */
+    public function show()
+    {
+        parent::show();
+        echo $this->survey_question;
+    }
 }
diff --git a/main/coursecopy/classes/Thematic.class.php b/main/coursecopy/classes/Thematic.class.php
index 71013446db..b1ce3ee921 100755
--- a/main/coursecopy/classes/Thematic.class.php
+++ b/main/coursecopy/classes/Thematic.class.php
@@ -16,7 +16,7 @@ class Thematic extends Coursecopy\Resource
     /**
     * Create a new Thematic
     *
-    * @param array parameters
+    * @param array $params
     */
     public function __construct($params)
     {
diff --git a/main/coursecopy/classes/ToolIntro.class.php b/main/coursecopy/classes/ToolIntro.class.php
index 5f2d0f6abd..d5374bb465 100755
--- a/main/coursecopy/classes/ToolIntro.class.php
+++ b/main/coursecopy/classes/ToolIntro.class.php
@@ -10,82 +10,82 @@ require_once 'Resource.class.php';
  */
 class ToolIntro extends Coursecopy\Resource
 {
-	public $id;
+    public $id;
 
-	/**
-	 * intro text
-	 */
-	public $intro_text;
+    /**
+     * intro text
+     */
+    public $intro_text;
 
-	/**
-	 * Create a new text introduction
-	 * @param int $id The id of this tool introduction in the Chamilo-course
-	 * @param string $intro_text
-	 */
-	public function __construct($id, $intro_text)
-	{
-		parent::__construct($id, RESOURCE_TOOL_INTRO);
-		$this->id = $id;
-		$this->intro_text = $intro_text;
-	}
+    /**
+     * Create a new text introduction
+     * @param int $id The id of this tool introduction in the Chamilo-course
+     * @param string $intro_text
+     */
+    public function __construct($id, $intro_text)
+    {
+        parent::__construct($id, RESOURCE_TOOL_INTRO);
+        $this->id = $id;
+        $this->intro_text = $intro_text;
+    }
 
-	/**
-	 * Show this resource
-	 */
-	function show()
-	{
-		parent::show();
-		switch ($this->id)
-		{
-			case TOOL_DOCUMENT:
-				$lang_id = 'Documents';
-				break;
-			case TOOL_CALENDAR_EVENT:
-				$lang_id = 'Agenda';
-				break;
-			case TOOL_LINK:
-				$lang_id = 'Links';
-				break;
-			case TOOL_LEARNPATH:
-				$lang_id = 'LearningPath';
-				break;
-			case TOOL_ANNOUNCEMENT:
-				$lang_id = 'Announcements';
-				break;
-			case TOOL_FORUM:
-				$lang_id = 'Forums';
-				break;
-			case TOOL_DROPBOX:
-				$lang_id = 'Dropbox';
-				break;
-			case TOOL_QUIZ:
-				$lang_id = 'Exercises';
-				break;
-			case TOOL_USER:
-				$lang_id = 'Users';
-				break;
-			case TOOL_GROUP:
-				$lang_id = 'Group';
-				break;
-			case TOOL_WIKI:
-				$lang_id = 'Wiki';
-				break;
-			case TOOL_STUDENTPUBLICATION:
-				$lang_id = 'StudentPublications';
-				break;
-			case TOOL_COURSE_HOMEPAGE:
-				$lang_id = 'CourseHomepageLink';
-				break;
-			case TOOL_GLOSSARY:
-				$lang_id = 'Glossary';
-				break;
-			case TOOL_NOTEBOOK:
-				$lang_id = 'Notebook';
-				break;
-			default:
-				$lang_id = ucfirst($this->id); // This is a wild guess.
-		}
-		echo '<strong>'.get_lang($lang_id, '').':</strong><br />';
-		echo $this->intro_text;
-	}
+    /**
+     * Show this resource
+     */
+    public function show()
+    {
+        parent::show();
+        switch ($this->id)
+        {
+            case TOOL_DOCUMENT:
+                $lang_id = 'Documents';
+                break;
+            case TOOL_CALENDAR_EVENT:
+                $lang_id = 'Agenda';
+                break;
+            case TOOL_LINK:
+                $lang_id = 'Links';
+                break;
+            case TOOL_LEARNPATH:
+                $lang_id = 'LearningPath';
+                break;
+            case TOOL_ANNOUNCEMENT:
+                $lang_id = 'Announcements';
+                break;
+            case TOOL_FORUM:
+                $lang_id = 'Forums';
+                break;
+            case TOOL_DROPBOX:
+                $lang_id = 'Dropbox';
+                break;
+            case TOOL_QUIZ:
+                $lang_id = 'Exercises';
+                break;
+            case TOOL_USER:
+                $lang_id = 'Users';
+                break;
+            case TOOL_GROUP:
+                $lang_id = 'Group';
+                break;
+            case TOOL_WIKI:
+                $lang_id = 'Wiki';
+                break;
+            case TOOL_STUDENTPUBLICATION:
+                $lang_id = 'StudentPublications';
+                break;
+            case TOOL_COURSE_HOMEPAGE:
+                $lang_id = 'CourseHomepageLink';
+                break;
+            case TOOL_GLOSSARY:
+                $lang_id = 'Glossary';
+                break;
+            case TOOL_NOTEBOOK:
+                $lang_id = 'Notebook';
+                break;
+            default:
+                $lang_id = ucfirst($this->id); // This is a wild guess.
+        }
+        echo '<strong>'.get_lang($lang_id, '').':</strong><br />';
+        echo $this->intro_text;
+    }
 }
diff --git a/main/coursecopy/classes/Work.class.php b/main/coursecopy/classes/Work.class.php
index 57f8d97d8f..fb2b35b4fd 100755
--- a/main/coursecopy/classes/Work.class.php
+++ b/main/coursecopy/classes/Work.class.php
@@ -15,7 +15,7 @@ class Work extends Coursecopy\Resource
     /**
      * Create a new Work
      *
-     * @param array parameters
+     * @param array $params
      */
     public function __construct($params)
     {
diff --git a/main/coursecopy/classes/wiki.class.php b/main/coursecopy/classes/wiki.class.php
index 80631aefd4..0bb4d61365 100755
--- a/main/coursecopy/classes/wiki.class.php
+++ b/main/coursecopy/classes/wiki.class.php
@@ -9,43 +9,43 @@
  */
 class Wiki extends Coursecopy\Resource
 {
-	public $id;
-	public $page_id;
-	public $reflink;
-	public $title;
-	public $content;
-	public $user_id;
-	public $group_id;
-	public $timestamp;
-	public $progress;
-	public $version;
+    public $id;
+    public $page_id;
+    public $reflink;
+    public $title;
+    public $content;
+    public $user_id;
+    public $group_id;
+    public $timestamp;
+    public $progress;
+    public $version;
 
-	/**
-	 * Wiki constructor.
-	 * @param int $id
-	 * @param int $page_id
-	 * @param $reflink
-	 * @param $title
-	 * @param $content
-	 * @param $user_id
-	 * @param $group_id
-	 * @param $timestamp
-	 * @param $progress
-	 * @param $version
-	 */
-	public function __construct(
-		$id,
-		$page_id,
-		$reflink,
-		$title,
-		$content,
-		$user_id,
-		$group_id,
-		$timestamp,
-		$progress,
-		$version
-	) {
-		parent::__construct($id,RESOURCE_WIKI);
+    /**
+     * Wiki constructor.
+     * @param int $id
+     * @param int $page_id
+     * @param $reflink
+     * @param $title
+     * @param $content
+     * @param $user_id
+     * @param $group_id
+     * @param $timestamp
+     * @param $progress
+     * @param $version
+     */
+    public function __construct(
+        $id,
+        $page_id,
+        $reflink,
+        $title,
+        $content,
+        $user_id,
+        $group_id,
+        $timestamp,
+        $progress,
+        $version
+    ) {
+        parent::__construct($id,RESOURCE_WIKI);
         $this->id = $id;
         $this->page_id = $page_id;
         $this->reflink = $reflink;
@@ -56,11 +56,11 @@ class Wiki extends Coursecopy\Resource
         $this->dtime = $timestamp;
         $this->progress = $progress;
         $this->version = $version;
-	}
+    }
 
-	public function show()
-	{
-		parent::show();
-		echo $this->reflink.' ('. (empty($this->group_id) ? get_lang('Everyone') : get_lang('Group') . ' ' .  $this->group_id) .') ' . '<i>(' . $this->dtime . ')</i>';
-	}
+    public function show()
+    {
+        parent::show();
+        echo $this->reflink.' ('. (empty($this->group_id) ? get_lang('Everyone') : get_lang('Group') . ' ' .  $this->group_id) .') ' . '<i>(' . $this->dtime . ')</i>';
+    }
 }

From 78e5733fa7902d612c2dfb3097f671fa0e0ea024 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 2 Jun 2016 12:55:48 +0200
Subject: [PATCH 05/12] Fix query

---
 documentation/optimization.html | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/documentation/optimization.html b/documentation/optimization.html
index 6cb09dba92..b9cfbc9a77 100755
--- a/documentation/optimization.html
+++ b/documentation/optimization.html
@@ -342,7 +342,7 @@ ALTER TABLE user_rel_tag ADD INDEX idx_user_rel_tag_user (user_id);
 In Chamilo 1.10.0 (the first version of the serie), many indexes were forgotten, so you can boost your database by adding the following indexes:<br />
 <pre>
 alter table extra_field_values add index idx_extra_field_values (field_id, item_id);
-alter table usergroup_rel_user add index idx_usergroup_ru (group_id);
+alter table usergroup_rel_user add index idx_usergroup_ru (usergroup_id);
 alter table usergroup_rel_user add index idx_usergroup_ru_u (user_id);
 alter table c_student_publication add index idxstudpub_cid (c_id);
 alter table c_student_publication add index idxstudpub_uid (user_id);
@@ -558,23 +558,23 @@ This is easy, doesn't require a server reload and you should see the results pre
     you should avoid using this technique.
 </p>
 <p>
-You can also mitigate the risk by disabling permissions check only 
+You can also mitigate the risk by disabling permissions check only
 for some static resource like css,js and fonts files.
 <br/>
-For that is required to load header module  
+For that is required to load header module
 in apache (check with a2enmod in your favorite root terminal)<br />
 add theses line after RewriteBase /courses/:
 <pre>
 &lt;IfModule mod_headers.c&gt;
     # all file name ended with these  extensions names will bypass the permission check   (and also served by the browser cache at  the next request)
     &lt;FilesMatch &quot;\.(gif|jpg|jpeg|png|js|pdf|ico|icon|css|swf|avi|mp3|ogg|wav|ttf|otf|eot|woff)$&quot;&gt;
-        Header unset Cache-Control  
-        Header set Cache-Control &quot;public, max-age=29030400&quot; 
-        RequestHeader unset Cookie      
+        Header unset Cache-Control
+        Header set Cache-Control &quot;public, max-age=29030400&quot;
+        RequestHeader unset Cookie
         Header unset ETag
     &lt;/FilesMatch&gt;
 &lt;/IfModule&gt;
-# also adjust files here 
+# also adjust files here
 RewriteRule (\.(html|gif|jpg|jpeg|png|js|pdf|ico|icon|css|swf|avi|mp3|ogg|wav|ttf|otf|eot|woff))$ - [L]
 </pre>
 </p>

From cca92dfab4b0d876b47db94e91dd65328a7d165a Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Thu, 2 Jun 2016 13:01:05 +0200
Subject: [PATCH 06/12] Add comments, format code

---
 src/Chamilo/CoreBundle/Entity/SysCalendar.php |  1 +
 .../CoreBundle/Entity/SystemTemplate.php      |  1 +
 src/Chamilo/CoreBundle/Entity/Tag.php         | 21 ++++++++---------
 src/Chamilo/CoreBundle/Entity/Templates.php   |  1 +
 .../CoreBundle/Entity/TrackCourseRanking.php  |  1 +
 .../CoreBundle/Entity/TrackEAccess.php        |  1 +
 .../CoreBundle/Entity/TrackEAttempt.php       |  1 +
 .../CoreBundle/Entity/TrackEAttemptCoeff.php  |  1 +
 .../Entity/TrackEAttemptRecording.php         | 21 ++++++++---------
 .../CoreBundle/Entity/TrackECourseAccess.php  | 21 ++++++++---------
 .../CoreBundle/Entity/TrackEDownloads.php     |  1 +
 .../CoreBundle/Entity/TrackEExercises.php     |  1 +
 .../CoreBundle/Entity/TrackEHotpotatoes.php   |  1 +
 .../CoreBundle/Entity/TrackEHotspot.php       |  1 +
 .../CoreBundle/Entity/TrackEItemProperty.php  |  1 +
 .../CoreBundle/Entity/TrackELastaccess.php    |  1 +
 src/Chamilo/CoreBundle/Entity/TrackELinks.php |  1 +
 src/Chamilo/CoreBundle/Entity/TrackELogin.php |  1 +
 .../CoreBundle/Entity/TrackEOnline.php        |  1 +
 src/Chamilo/CoreBundle/Entity/TrackEOpen.php  |  1 +
 .../CoreBundle/Entity/TrackEUploads.php       |  1 +
 .../CoreBundle/Entity/TrackStoredValues.php   |  1 +
 .../Entity/TrackStoredValuesStack.php         | 23 +++++++++----------
 src/Chamilo/CoreBundle/Entity/UserApiKey.php  | 21 ++++++++---------
 .../CoreBundle/Entity/UserCourseCategory.php  | 21 ++++++++---------
 .../Entity/UserFriendRelationType.php         |  1 +
 .../Entity/UserGroupRelUserGroup.php          |  1 +
 .../CoreBundle/Entity/UserRelCourseVote.php   |  1 +
 .../CoreBundle/Entity/UserRelEventType.php    | 21 ++++++++---------
 src/Chamilo/CoreBundle/Entity/UserRelUser.php | 21 ++++++++---------
 src/Chamilo/CoreBundle/Entity/Usergroup.php   |  2 +-
 .../CoreBundle/Entity/UsergroupRelCourse.php  | 19 ++++++++-------
 .../Entity/UsergroupRelQuestion.php           | 21 ++++++++---------
 .../CoreBundle/Entity/UsergroupRelSession.php | 19 ++++++++-------
 .../CoreBundle/Entity/UsergroupRelUser.php    |  8 -------
 35 files changed, 132 insertions(+), 129 deletions(-)

diff --git a/src/Chamilo/CoreBundle/Entity/SysCalendar.php b/src/Chamilo/CoreBundle/Entity/SysCalendar.php
index 135178ff99..329956c1a9 100644
--- a/src/Chamilo/CoreBundle/Entity/SysCalendar.php
+++ b/src/Chamilo/CoreBundle/Entity/SysCalendar.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/SystemTemplate.php b/src/Chamilo/CoreBundle/Entity/SystemTemplate.php
index 93f8c95568..045b5b378e 100644
--- a/src/Chamilo/CoreBundle/Entity/SystemTemplate.php
+++ b/src/Chamilo/CoreBundle/Entity/SystemTemplate.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/Tag.php b/src/Chamilo/CoreBundle/Entity/Tag.php
index cd549603f1..f65fc5f07c 100644
--- a/src/Chamilo/CoreBundle/Entity/Tag.php
+++ b/src/Chamilo/CoreBundle/Entity/Tag.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class Tag
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var string
      *
@@ -33,17 +43,6 @@ class Tag
      */
     private $count;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set tag
      *
diff --git a/src/Chamilo/CoreBundle/Entity/Templates.php b/src/Chamilo/CoreBundle/Entity/Templates.php
index 4e353404c1..54e4bda96d 100644
--- a/src/Chamilo/CoreBundle/Entity/Templates.php
+++ b/src/Chamilo/CoreBundle/Entity/Templates.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php b/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php
index 39ed7de4c8..d15d3b5e48 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAccess.php b/src/Chamilo/CoreBundle/Entity/TrackEAccess.php
index 1ef32790da..d8422cc48a 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAccess.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAccess.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php b/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php
index cfec3d697c..1f0f9cac96 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php b/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
index 929ef2b851..54cd1668c0 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php b/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
index d8b5c8189b..4376655a62 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class TrackEAttemptRecording
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -61,17 +71,6 @@ class TrackEAttemptRecording
      */
     private $sessionId;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set exeId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php b/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php
index 6f23bde7b5..227c708872 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -20,6 +21,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class TrackECourseAccess
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="course_access_id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $courseAccessId;
+
     /**
      * @var integer
      *
@@ -69,17 +79,6 @@ class TrackECourseAccess
      */
     private $userIp;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="course_access_id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $courseAccessId;
-
-
-
     /**
      * Set cId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php b/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php
index ce151df67f..59760c7709 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEExercises.php b/src/Chamilo/CoreBundle/Entity/TrackEExercises.php
index 13067f6a3f..9b2e34b20a 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEExercises.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEExercises.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php b/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
index 081d4a97a2..18726a39b2 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php b/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
index 02d0a6c698..978ae4ea7b 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php b/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
index e378bd8682..e78c846d47 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php b/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php
index d4be8cd5e0..3c1afe89de 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackELinks.php b/src/Chamilo/CoreBundle/Entity/TrackELinks.php
index ed6a1086ad..4a855c2149 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackELinks.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackELinks.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackELogin.php b/src/Chamilo/CoreBundle/Entity/TrackELogin.php
index 82053c0f46..7dd0dc8e91 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackELogin.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackELogin.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEOnline.php b/src/Chamilo/CoreBundle/Entity/TrackEOnline.php
index 9db77bde35..8d3eb46546 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEOnline.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEOnline.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEOpen.php b/src/Chamilo/CoreBundle/Entity/TrackEOpen.php
index c863a5e799..1469c3725b 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEOpen.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEOpen.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEUploads.php b/src/Chamilo/CoreBundle/Entity/TrackEUploads.php
index 92c585edef..37d3ba50a5 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEUploads.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEUploads.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php b/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php
index f6e7588fbc..2673623ab4 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php b/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php
index 4c940ebf96..03c44eadad 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -19,7 +20,16 @@ use Doctrine\ORM\Mapping as ORM;
  * @ORM\Entity
  */
 class TrackStoredValuesStack
-{
+{    
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+    
     /**
      * @var integer
      *
@@ -62,17 +72,6 @@ class TrackStoredValuesStack
      */
     private $svValue;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/UserApiKey.php b/src/Chamilo/CoreBundle/Entity/UserApiKey.php
index 3d0360eb03..d2012e36de 100644
--- a/src/Chamilo/CoreBundle/Entity/UserApiKey.php
+++ b/src/Chamilo/CoreBundle/Entity/UserApiKey.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class UserApiKey
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -68,17 +78,6 @@ class UserApiKey
      */
     private $description;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php b/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php
index ec390f8877..92656533f0 100644
--- a/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class UserCourseCategory
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -33,17 +43,6 @@ class UserCourseCategory
      */
     private $sort;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php b/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
index 17ebf0cd36..5c19e94cd8 100644
--- a/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
+++ b/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php b/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php
index 10c296c929..6ae2bf75ba 100644
--- a/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php b/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php
index 4b96b92896..9612aa60a6 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelEventType.php b/src/Chamilo/CoreBundle/Entity/UserRelEventType.php
index d473437103..049fa0bc09 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelEventType.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelEventType.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class UserRelEventType
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -26,17 +36,6 @@ class UserRelEventType
      */
     private $eventTypeName;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelUser.php b/src/Chamilo/CoreBundle/Entity/UserRelUser.php
index 0858c10d63..b08ae722a7 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelUser.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class UserRelUser
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="bigint")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -40,17 +50,6 @@ class UserRelUser
      */
     private $lastEdit;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="bigint")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set userId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/Usergroup.php b/src/Chamilo/CoreBundle/Entity/Usergroup.php
index 669d180b66..6288156a8a 100644
--- a/src/Chamilo/CoreBundle/Entity/Usergroup.php
+++ b/src/Chamilo/CoreBundle/Entity/Usergroup.php
@@ -20,7 +20,7 @@ class Usergroup
      *
      * @ORM\Column(name="id", type="integer", nullable=false)
      * @ORM\Id
-     * @ORM\GeneratedValue()
+     * @ORM\GeneratedValue
      */
     protected $id;
 
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php
index f6ce1b0886..559ef3bfdd 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -15,27 +16,25 @@ class UsergroupRelCourse
     /**
      * @var integer
      *
-     * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $usergroupId;
+    private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="course_id", type="integer", nullable=false)
+     * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
      */
-    private $courseId;
+    private $usergroupId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\Column(name="course_id", type="integer", nullable=false)
      */
-    private $id;
-
-
+    private $courseId;
 
     /**
      * Set usergroupId
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php
index d144db3f94..6dddb5f834 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -12,6 +13,15 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class UsergroupRelQuestion
 {
+    /**
+     * @var integer
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
+     */
+    private $id;
+
     /**
      * @var integer
      *
@@ -40,17 +50,6 @@ class UsergroupRelQuestion
      */
     private $coefficient;
 
-    /**
-     * @var integer
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
-
-
-
     /**
      * Set cId
      *
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php
index ac525844e2..2d6fc03f57 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php
@@ -1,4 +1,5 @@
 <?php
+/* For licensing terms, see /license.txt */
 
 namespace Chamilo\CoreBundle\Entity;
 
@@ -15,27 +16,25 @@ class UsergroupRelSession
     /**
      * @var integer
      *
-     * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue
      */
-    private $usergroupId;
+    private $id;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="session_id", type="integer", nullable=false)
+     * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    private $usergroupId;
 
     /**
      * @var integer
      *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
+     * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $id;
-
-
+    private $sessionId;
 
     /**
      * Set usergroupId
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
index 4ab8ff6fc7..896947ec5a 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
@@ -6,14 +6,6 @@ namespace Chamilo\CoreBundle\Entity;
 use Chamilo\UserBundle\Entity\User;
 use Doctrine\ORM\Mapping as ORM;
 
-/**
- * ,
- *      indexes={
-// *          @ORM\Index(name="IDX_739515A9A76ED395", columns={"user_id"}),
-// *          @ORM\Index(name="IDX_739515A9D2112630", columns={"usergroup_id"})
- *      }
- */
-
 /**
  * Class UsergroupRelUser
  *

From d58ef87fa47fa8449456991c752f8462b160b626 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 3 Jun 2016 14:05:53 +0200
Subject: [PATCH 07/12] Improve speed.

---
 main/newscorm/lp_nav.php | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/main/newscorm/lp_nav.php b/main/newscorm/lp_nav.php
index ff8f7eadcd..ec92f46d6a 100755
--- a/main/newscorm/lp_nav.php
+++ b/main/newscorm/lp_nav.php
@@ -21,22 +21,18 @@ $navigation_bar = '';
 $display_mode = '';
 $autostart = 'true';
 
-if (isset($_SESSION['lpobject'])) {
-    $oLP = unserialize($_SESSION['lpobject']);
-    if (is_object($oLP)) {
-        $_SESSION['oLP'] = $oLP;
-    } else {
-        die('Could not instanciate lp object');
-    }
-    $display_mode = $_SESSION['oLP']->mode;
+$myLP = learnpath::getLpFromSession(api_get_course_id(), '', '');
+
+if ($myLP) {
+    $display_mode = $myLP->mode;
     $scorm_css_header = true;
-    $lp_theme_css = $_SESSION['oLP']->get_theme();
+    $lp_theme_css = $myLP->get_theme();
 
     $my_style = api_get_visual_theme();
 
     // Setting up the CSS theme if exists
     $mycourselptheme = null;
-    if (api_get_setting('allow_course_theme') == 'true') {
+    if (api_get_setting('allow_course_theme') === 'true') {
         $mycourselptheme = api_get_course_setting('allow_learning_path_theme');
     }
 
@@ -46,13 +42,13 @@ if (isset($_SESSION['lpobject'])) {
         $lp_theme_css = $my_style;
     }
 
-    $progress_bar 	= $_SESSION['oLP']->getProgressBar();
-    $navigation_bar = $_SESSION['oLP']->get_navigation_bar();
-    $mediaplayer 	= $_SESSION['oLP']->get_mediaplayer($autostart);
+    $progress_bar = $myLP->getProgressBar();
+    $navigation_bar = $myLP->get_navigation_bar();
+    $mediaplayer = $myLP->get_mediaplayer($autostart);
 }
 session_write_close();
 ?>
-<script type="text/javascript">
+<script>
     $(document).ready(function() {
         jQuery('video:not(.skip), audio:not(.skip)').mediaelementplayer({
             success: function(player, node) {
@@ -61,5 +57,5 @@ session_write_close();
     });
 </script>
 <span>
-    <?php echo (!empty($mediaplayer)) ? $mediaplayer : '&nbsp;' ?>
+    <?php echo !empty($mediaplayer) ? $mediaplayer : '&nbsp;' ?>
 </span>

From 919fb7411148ef7e897a2170d7183608f4442e16 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 3 Jun 2016 14:08:41 +0200
Subject: [PATCH 08/12] Fix typo

---
 main/newscorm/scorm_api.php              |  4 ++--
 main/template/default/learnpath/view.tpl | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/main/newscorm/scorm_api.php b/main/newscorm/scorm_api.php
index 535555c890..a81f979aa8 100755
--- a/main/newscorm/scorm_api.php
+++ b/main/newscorm/scorm_api.php
@@ -1663,7 +1663,7 @@ function switch_item(current_item, next_item){
     });
     olms.switch_finished = 0; //only changed back once LMSInitialize() happens
 
-    loadForumThead(olms.lms_lp_id, next_item);
+    loadForumThread(olms.lms_lp_id, next_item);
 
     return true;
 }
@@ -1671,7 +1671,7 @@ function switch_item(current_item, next_item){
 /**
  * Get a forum info when the learning path item has a associated forum
  */
-var loadForumThead = function(lpId, lpItemId) {
+var loadForumThread = function(lpId, lpItemId) {
     var loadForum = $.getJSON('<?php echo api_get_path(WEB_AJAX_PATH) ?>lp.ajax.php', {
             a: 'get_forum_thread',
             lp: lpId,
diff --git a/main/template/default/learnpath/view.tpl b/main/template/default/learnpath/view.tpl
index 07c1ab0fbe..97576b441d 100644
--- a/main/template/default/learnpath/view.tpl
+++ b/main/template/default/learnpath/view.tpl
@@ -33,7 +33,7 @@
 
                                 {% if gamification_mode == 1 %}
                                     <hr>
-                                    <!--- gamification -->    
+                                    <!--- gamification -->
                                     <div id="scorm-gamification">
                                         <div class="row">
                                             <div class="col-xs-6">
@@ -61,8 +61,8 @@
                                             </div>
                                         </div>
                                     </div>
-                                   <!--- end gamification -->          
-                                {% else %}         
+                                   <!--- end gamification -->
+                                {% else %}
                                     <div id="progress_bar">
                                         {{ progress_bar }}
                                     </div>
@@ -79,7 +79,7 @@
                                     <em class="fa fa-home"></em> <span class="hidden-xs hidden-sm"></span>
                                 </a>
                             </div>
-                            
+
                         </div>
                     </div>
 
@@ -139,7 +139,7 @@
                                 {% endif %}
                             </div>
                             <div role="tabpanel" class="tab-pane" id="lp-view-forum">
-                                
+
                             </div>
                         </div>
                     </div>
@@ -161,7 +161,7 @@
         };
 
         $(document).on('ready', function () {
-            
+
             {% if lp_mode == 'embedframe' %}
                 //$('#learning_path_main').addClass('lp-view-collapsed');
                 $('#lp-view-expand-button, #lp-view-expand-toggle').on('click', function (e) {
@@ -181,7 +181,7 @@
                 $('#lp-view-expand-toggle span.fa').toggleClass('fa-expand');
                 $('#lp-view-expand-toggle span.fa').toggleClass('fa-compress');
             });
-            
+
             {% endif %}
 
             $('.lp-view-tabs').on('click', '.disabled', function (e) {
@@ -214,7 +214,7 @@
                 $('.lp-view-tabs').fadeIn();
             });
 
-            loadForumThead({{ lp_id }}, {{ lp_current_item_id }});
+            loadForumThread({{ lp_id }}, {{ lp_current_item_id }});
 
             {% if glossary_extra_tools in glossary_tool_availables %}
                 // Loads the glossary library.

From 06fcbe2f88509e1e802921b931b8d7500222fbec Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 3 Jun 2016 15:09:56 +0200
Subject: [PATCH 09/12] Improve LP speed

---
 main/inc/ajax/lp.ajax.php | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/main/inc/ajax/lp.ajax.php b/main/inc/ajax/lp.ajax.php
index b250e1ddb1..b0d740f547 100755
--- a/main/inc/ajax/lp.ajax.php
+++ b/main/inc/ajax/lp.ajax.php
@@ -64,9 +64,8 @@ switch ($action) {
     case 'update_lp_item_order':
         if (api_is_allowed_to_edit(null, true)) {
 
-            $new_order   = $_POST['new_order'];
-
-            $sections	= explode('^', $new_order);
+            $new_order = $_POST['new_order'];
+            $sections = explode('^', $new_order);
             $new_array = array();
 
             // We have to update parent_item_id, previous_item_id, next_item_id, display_order in the database
@@ -189,12 +188,7 @@ switch ($action) {
             break;
         }
 
-        $learningPath = new learnpath(
-            api_get_course_id(),
-            $lpId,
-            api_get_user_id()
-        );
-
+        $learningPath = learnpath::getLpFromSession(api_get_course_id(), $lpId, api_get_user_id());
         $lpItem = $learningPath->getItem($lpItemId);
 
         if (empty($lpItem)) {

From 24c512bea83625301b99ef7d6843b42bc665fc13 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 3 Jun 2016 15:49:15 +0200
Subject: [PATCH 10/12] Fix PHP warnings

---
 main/inc/lib/pear/PEAR.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/main/inc/lib/pear/PEAR.php b/main/inc/lib/pear/PEAR.php
index b794dc9aec..05427661ca 100755
--- a/main/inc/lib/pear/PEAR.php
+++ b/main/inc/lib/pear/PEAR.php
@@ -19,10 +19,6 @@
  * @since      File available since Release 0.1
  */
 
-// Added by Chamilo team, 16-MAR-2010
-if (class_exists('pear')) { return; }
-//
-
 /**#@+
  * ERROR constants
  */
@@ -156,7 +152,7 @@ class PEAR
      * @access public
      * @return void
      */
-    function PEAR($error_class = null)
+    public function __construct($error_class = null)
     {
         $classname = strtolower(get_class($this));
         if ($this->_debug) {
@@ -867,9 +863,13 @@ class PEAR_Error
      * @access public
      *
      */
-    function PEAR_Error($message = 'unknown error', $code = null,
-                        $mode = null, $options = null, $userinfo = null)
-    {
+    public function __constructor(
+        $message = 'unknown error',
+        $code = null,
+        $mode = null,
+        $options = null,
+        $userinfo = null
+    ) {
         if ($mode === null) {
             $mode = PEAR_ERROR_RETURN;
         }

From fb838b4f860a8e02442b2f2b5cc2af0856186c3a Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 3 Jun 2016 15:49:23 +0200
Subject: [PATCH 11/12] Update command

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d746b95697..431ba75e10 100644
--- a/README.md
+++ b/README.md
@@ -168,7 +168,7 @@ php bin/doctrine.php migrations:execute 20150527120703 --up --configuration=app/
 
 You can also print the differences between your database and what it should be by issuing the following command from the Chamilo base folder:
 ```
-php bin/doctrine.php orm:schema:update --dump-sql
+php bin/doctrine.php orm:schema-tool:update --dump-sql
 ```
 
 ## Contributing

From 2635b526e91154fbedcad941b5510a2142489864 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 3 Jun 2016 16:08:09 +0200
Subject: [PATCH 12/12] Fix bbb group settings.

---
 plugin/bbb/lib/bbb.lib.php | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/plugin/bbb/lib/bbb.lib.php b/plugin/bbb/lib/bbb.lib.php
index c97e05fee7..7c46bb74dc 100755
--- a/plugin/bbb/lib/bbb.lib.php
+++ b/plugin/bbb/lib/bbb.lib.php
@@ -55,11 +55,21 @@ class bbb
         $this->groupSupport = isset($columns['group_id']) ? true : false;
 
         if ($this->groupSupport) {
+            // Plugin check
             $this->groupSupport = (bool) $plugin->get('enable_conference_in_course_groups');
             if ($this->groupSupport) {
-                $courseInfo = api_get_course_info();
-                if ($courseInfo) {
-                    $this->groupSupport = api_get_course_setting('bbb_enable_conference_in_groups') === '1';
+
+                // Platform check
+                $bbbSetting = api_get_setting('bbb_enable_conference_in_course_groups');
+                $bbbSetting = isset($bbbSetting['bbb']) ? $bbbSetting['bbb'] === 'true' : false;
+
+                if ($bbbSetting) {
+                    // Course check
+                    $courseInfo = api_get_course_info();
+
+                    if ($courseInfo) {
+                        $this->groupSupport = api_get_course_setting('bbb_enable_conference_in_groups') === '1';
+                    }
                 }
             }
         }
@@ -152,7 +162,7 @@ class bbb
         # a user joins. If after this period, a user hasn't joined, the meeting is
         # removed from memory.
         defaultMeetingCreateJoinDuration=5
-     * 
+     *
      * @return mixed
      */
     public function createMeeting($params)