From 4455484b8a56f5db70b316cc5014dba1a338deec Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 08:19:13 +0200
Subject: [PATCH 01/11] Minor - Get correct user #2554

---
 main/auth/inscription.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/auth/inscription.php b/main/auth/inscription.php
index 923b95ea8f..7b0ce68d19 100755
--- a/main/auth/inscription.php
+++ b/main/auth/inscription.php
@@ -898,7 +898,7 @@ if ($form->validate()) {
                 Event::addEvent(
                     LOG_TERM_CONDITION_ACCEPTED,
                     LOG_USER_OBJECT,
-                    api_get_user_info(),
+                    api_get_user_info($user_id),
                     api_get_utc_datetime()
                 );
 

From c4ad69395994fb8fca2b93b0c6bea84ac8aca52c Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 08:33:07 +0200
Subject: [PATCH 02/11] Minor - flint fixes

---
 main/cron/lang/langstats.class.php                       | 1 +
 main/cron/lang/list_unused_langvars.php                  | 1 -
 main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php | 2 +-
 main/extra/myStudents.php                                | 3 +--
 main/inc/lib/template.lib.php                            | 1 +
 main/lp/lp_final_item.php                                | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/main/cron/lang/langstats.class.php b/main/cron/lang/langstats.class.php
index 6d0ad415ac..60c630d125 100755
--- a/main/cron/lang/langstats.class.php
+++ b/main/cron/lang/langstats.class.php
@@ -139,6 +139,7 @@ class langstats
                 return $this->db->lastInsertRowID();
             }
         }
+
         return true;
     }
 
diff --git a/main/cron/lang/list_unused_langvars.php b/main/cron/lang/list_unused_langvars.php
index 9ff99b3934..68154b99e5 100755
--- a/main/cron/lang/list_unused_langvars.php
+++ b/main/cron/lang/list_unused_langvars.php
@@ -61,7 +61,6 @@ foreach ($files as $file) {
                     }
                     $usedTerms[$term] = $shortFile;
                 }
-
             }
         } else {
             $myTerms = [];
diff --git a/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php b/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
index 482ccd34be..e07d0d8020 100644
--- a/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
+++ b/main/exercise/MultipleAnswerTrueFalseDegreeCertainty.php
@@ -1311,7 +1311,7 @@ class MultipleAnswerTrueFalseDegreeCertainty extends Question
             .api_get_cidreq()
             ."&id=$exeId'>";
         $exerciseTitle = $objExercise->title;
-        
+
         $message .= sprintf(
             get_lang('MessageQuestionCertainty'),
             $exerciseTitle,
diff --git a/main/extra/myStudents.php b/main/extra/myStudents.php
index ebedee26c5..55e1192db8 100644
--- a/main/extra/myStudents.php
+++ b/main/extra/myStudents.php
@@ -64,7 +64,6 @@ if (isset($_GET['from']) && $_GET['from'] == 'myspace') {
     $this_section = SECTION_COURSES;
 }
 
-
 $nameTools = get_lang('StudentDetails');
 $em = Database::getManager();
 
@@ -592,7 +591,7 @@ if (!empty($studentId)) {
                         <td align="right">
                             <?php
                             echo get_lang('Score').' ';
-                            Display:: display_icon(
+        Display:: display_icon(
                                 'info3.gif',
                                 get_lang('ScormAndLPTestTotalAverage'),
                                 ['align' => 'absmiddle', 'hspace' => '3px']
diff --git a/main/inc/lib/template.lib.php b/main/inc/lib/template.lib.php
index 6bda632326..24ce8cf73d 100755
--- a/main/inc/lib/template.lib.php
+++ b/main/inc/lib/template.lib.php
@@ -1376,6 +1376,7 @@ class Template
     {
         $queryString = empty($_SERVER['QUERY_STRING']) ? '' : $_SERVER['QUERY_STRING'];
         $requestURI = empty($_SERVER['REQUEST_URI']) ? '' : $_SERVER['REQUEST_URI'];
+
         return [
             'web' => api_get_path(WEB_PATH),
             'web_url' => api_get_web_url(),
diff --git a/main/lp/lp_final_item.php b/main/lp/lp_final_item.php
index f4206864ba..44502bc63d 100644
--- a/main/lp/lp_final_item.php
+++ b/main/lp/lp_final_item.php
@@ -54,7 +54,7 @@ if ($checker) {
                 'normal',
                 false
             ),
-            '<a href="'.$url.'">'. $url .'</a>'
+            '<a href="'.$url.'">'.$url.'</a>'
         );
         $tpl->assign('content', $content);
         $tpl->display_blank_template();

From bfe18800f7948b2d58af709060eba9a73bf2c449 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 08:49:24 +0200
Subject: [PATCH 03/11] Minor - format code, use (int) casting

---
 main/lp/lp_view.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/main/lp/lp_view.php b/main/lp/lp_view.php
index 6c2c3a9068..95bb07e833 100755
--- a/main/lp/lp_view.php
+++ b/main/lp/lp_view.php
@@ -35,7 +35,7 @@ $show_learnpath = true;
 
 api_protect_course_script();
 
-$lp_id = !empty($_GET['lp_id']) ? intval($_GET['lp_id']) : 0;
+$lp_id = !empty($_GET['lp_id']) ? (int) $_GET['lp_id'] : 0;
 $sessionId = api_get_session_id();
 $course_code = api_get_course_id();
 $course_id = api_get_course_int_id();
@@ -60,8 +60,8 @@ $visibility = api_get_item_visibility(
     $sessionId
 );
 
-if (!api_is_allowed_to_edit(false, true, false, false) &&
-    intval($visibility) == 0
+if ($visibility === 0 &&
+    !api_is_allowed_to_edit(false, true, false, false)
 ) {
     api_not_allowed(true);
 }
@@ -113,7 +113,7 @@ if (!$is_allowed_to_edit) {
     }
 }
 
-$platform_theme = api_get_setting('stylesheets'); // Platform's css.
+$platform_theme = api_get_setting('stylesheets');
 $my_style = $platform_theme;
 $ajaxUrl = api_get_path(WEB_AJAX_PATH).'lp.ajax.php?a=get_item_prerequisites&'.api_get_cidreq();
 $htmlHeadXtra[] = '<script>
@@ -309,9 +309,9 @@ if (!empty($_REQUEST['exeId']) &&
     $TBL_TRACK_EXERCICES = Database::get_main_table(TABLE_STATISTIC_TRACK_E_EXERCISES);
     $TBL_LP_ITEM_VIEW = Database::get_course_table(TABLE_LP_ITEM_VIEW);
     $TBL_LP_ITEM = Database::get_course_table(TABLE_LP_ITEM);
-    $safe_item_id = intval($_GET['lp_item_id']);
+    $safe_item_id = (int) $_GET['lp_item_id'];
     $safe_id = $lp_id;
-    $safe_exe_id = intval($_REQUEST['exeId']);
+    $safe_exe_id = (int) $_REQUEST['exeId'];
 
     if ($safe_id == strval(intval($safe_id)) &&
         $safe_item_id == strval(intval($safe_item_id))

From dfa0f3d722e92ed1b77bf07ce34a995c0a0c1009 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 09:32:41 +0200
Subject: [PATCH 04/11] Minor - use protected instead of private

---
 src/Chamilo/CoreBundle/Entity/AccessUrl.php   | 28 +++++-----
 .../CoreBundle/Entity/AccessUrlRelCourse.php  | 18 ++++---
 .../Entity/AccessUrlRelCourseCategory.php     | 10 ++--
 .../CoreBundle/Entity/AccessUrlRelSession.php |  4 +-
 .../CoreBundle/Entity/AccessUrlRelUser.php    | 27 +++++-----
 .../Entity/AccessUrlRelUserGroup.php          |  6 +--
 src/Chamilo/CoreBundle/Entity/Admin.php       |  4 +-
 .../Entity/AnnouncementRelGroup.php           |  4 +-
 src/Chamilo/CoreBundle/Entity/Block.php       | 12 ++---
 src/Chamilo/CoreBundle/Entity/BranchSync.php  | 52 +++++++++----------
 src/Chamilo/CoreBundle/Entity/ClassUser.php   |  4 +-
 .../CoreBundle/Entity/CourseCategory.php      | 16 +++---
 .../CoreBundle/Entity/CourseModule.php        | 30 +++++------
 13 files changed, 111 insertions(+), 104 deletions(-)

diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrl.php b/src/Chamilo/CoreBundle/Entity/AccessUrl.php
index d1a198d6fa..c8b4b3115f 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrl.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrl.php
@@ -13,10 +13,6 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class AccessUrl
 {
-    /**
-     * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
-     */
-    protected $course;
     /**
      * @var int
      *
@@ -24,49 +20,54 @@ class AccessUrl
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    protected $id;
+
+    /**
+     * @ORM\OneToMany(targetEntity="AccessUrlRelCourse", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
+     */
+    protected $course;
 
     /**
      * @var string
      *
      * @ORM\Column(name="url", type="string", length=255, nullable=false, unique=false)
      */
-    private $url;
+    protected $url;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", unique=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="active", type="integer", nullable=false, unique=false)
      */
-    private $active;
+    protected $active;
 
     /**
      * @var int
      *
      * @ORM\Column(name="created_by", type="integer", nullable=false, unique=false)
      */
-    private $createdBy;
+    protected $createdBy;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="tms", type="datetime", nullable=true)
      */
-    private $tms;
+    protected $tms;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="url_type", type="boolean", nullable=true)
      */
-    private $urlType;
+    protected $urlType;
 
     /**
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SettingsCurrent", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
@@ -76,8 +77,11 @@ class AccessUrl
     /**
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\SessionCategory", mappedBy="url", cascade={"persist"}, orphanRemoval=true)
      */
-    private $sessionCategory;
+    protected $sessionCategory;
 
+    /**
+     * AccessUrl constructor.
+     */
     public function __construct()
     {
         $this->tms = new \DateTime();
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
index 5a82e64aed..38b9f93f28 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
@@ -13,6 +13,16 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class AccessUrlRelCourse
 {
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="AUTO")
+     */
+    protected $id;
+
+
     /**
      * @ORM\ManyToOne(targetEntity="Course", inversedBy="urls", cascade={"persist"})
      * @ORM\JoinColumn(name="c_id", referencedColumnName="id")
@@ -24,14 +34,6 @@ class AccessUrlRelCourse
      * @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
      */
     protected $url;
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer", precision=0, scale=0, nullable=false, unique=false)
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    private $id;
 
     /**
      * @return string
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php
index 2943d608a1..0353081095 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourseCategory.php
@@ -20,28 +20,28 @@ class AccessUrlRelCourseCategory
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="AUTO")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer")
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="course_category_id", type="integer")
      */
-    private $courseCategoryId;
+    protected $courseCategoryId;
 
     /**
      * Set accessUrlId.
      *
      * @param int $accessUrlId
      *
-     * @return AccessUrlRelSession
+     * @return $this
      */
     public function setAccessUrlId($accessUrlId)
     {
@@ -71,7 +71,7 @@ class AccessUrlRelCourseCategory
     /**
      * @param int $courseCategoryId
      *
-     * @return AccessUrlRelCourseCategory
+     * @return $this
      */
     public function setCourseCategoryId($courseCategoryId)
     {
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelSession.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelSession.php
index 5a3846d1d0..2a81d6f4e7 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelSession.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelSession.php
@@ -20,7 +20,7 @@ class AccessUrlRelSession
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
@@ -29,7 +29,7 @@ class AccessUrlRelSession
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set accessUrlId.
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUser.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUser.php
index ce59ca5b30..383c63edda 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUser.php
@@ -20,24 +20,13 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class AccessUrlRelUser
 {
-    /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
-     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
-     */
-    protected $user;
-
-    /**
-     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\AccessUrl")
-     * @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
-     */
-    protected $portal;
     /**
      * @var int
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      * @ORM\Column(name="access_url_id", type="integer")
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
@@ -45,7 +34,19 @@ class AccessUrlRelUser
      * @ORM\GeneratedValue(strategy="NONE")
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
+     * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
+     */
+    protected $user;
+
+    /**
+     * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\AccessUrl")
+     * @ORM\JoinColumn(name="access_url_id", referencedColumnName="id")
+     */
+    protected $portal;
 
     /**
      * Set accessUrlId.
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
index 5ccf9b4c51..e3752348ea 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelUserGroup.php
@@ -20,21 +20,21 @@ class AccessUrlRelUserGroup
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer")
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="usergroup_id", type="integer")
      */
-    private $userGroupId;
+    protected $userGroupId;
 
     /**
      * Set accessUrlId.
diff --git a/src/Chamilo/CoreBundle/Entity/Admin.php b/src/Chamilo/CoreBundle/Entity/Admin.php
index 317ea78f2d..ab8f76ca38 100644
--- a/src/Chamilo/CoreBundle/Entity/Admin.php
+++ b/src/Chamilo/CoreBundle/Entity/Admin.php
@@ -20,14 +20,14 @@ class Admin
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/AnnouncementRelGroup.php b/src/Chamilo/CoreBundle/Entity/AnnouncementRelGroup.php
index fa26f23d6c..15df591b9d 100644
--- a/src/Chamilo/CoreBundle/Entity/AnnouncementRelGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/AnnouncementRelGroup.php
@@ -20,7 +20,7 @@ class AnnouncementRelGroup
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var int
@@ -29,7 +29,7 @@ class AnnouncementRelGroup
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $announcementId;
+    protected $announcementId;
 
     /**
      * Set groupId.
diff --git a/src/Chamilo/CoreBundle/Entity/Block.php b/src/Chamilo/CoreBundle/Entity/Block.php
index 10ddf8758b..90234c31b4 100644
--- a/src/Chamilo/CoreBundle/Entity/Block.php
+++ b/src/Chamilo/CoreBundle/Entity/Block.php
@@ -20,42 +20,42 @@ class Block
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=true)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="controller", type="string", length=100, nullable=false)
      */
-    private $controller;
+    protected $controller;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="active", type="boolean", nullable=false)
      */
-    private $active;
+    protected $active;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CoreBundle/Entity/BranchSync.php b/src/Chamilo/CoreBundle/Entity/BranchSync.php
index 9b0c3624ea..56f23fb764 100644
--- a/src/Chamilo/CoreBundle/Entity/BranchSync.php
+++ b/src/Chamilo/CoreBundle/Entity/BranchSync.php
@@ -22,181 +22,181 @@ class BranchSync
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer", nullable=false, unique=false)
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="unique_id", type="string", length=50, nullable=false, unique=true)
      */
-    private $uniqueId;
+    protected $uniqueId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="branch_name", type="string", length=250, nullable=false, unique=false)
      */
-    private $branchName;
+    protected $branchName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="branch_ip", type="string", length=40, nullable=true, unique=false)
      */
-    private $branchIp;
+    protected $branchIp;
 
     /**
      * @var float
      *
      * @ORM\Column(name="latitude", type="decimal", nullable=true, unique=false)
      */
-    private $latitude;
+    protected $latitude;
 
     /**
      * @var float
      *
      * @ORM\Column(name="longitude", type="decimal", nullable=true, unique=false)
      */
-    private $longitude;
+    protected $longitude;
 
     /**
      * @var int
      *
      * @ORM\Column(name="dwn_speed", type="integer", nullable=true, unique=false)
      */
-    private $dwnSpeed;
+    protected $dwnSpeed;
 
     /**
      * @var int
      *
      * @ORM\Column(name="up_speed", type="integer", nullable=true, unique=false)
      */
-    private $upSpeed;
+    protected $upSpeed;
 
     /**
      * @var int
      *
      * @ORM\Column(name="delay", type="integer", nullable=true, unique=false)
      */
-    private $delay;
+    protected $delay;
 
     /**
      * @var string
      *
      * @ORM\Column(name="admin_mail", type="string", length=250, nullable=true, unique=false)
      */
-    private $adminMail;
+    protected $adminMail;
 
     /**
      * @var string
      *
      * @ORM\Column(name="admin_name", type="string", length=250, nullable=true, unique=false)
      */
-    private $adminName;
+    protected $adminName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="admin_phone", type="string", length=250, nullable=true, unique=false)
      */
-    private $adminPhone;
+    protected $adminPhone;
 
     /**
      * @var int
      *
      * @ORM\Column(name="last_sync_trans_id", type="bigint", nullable=true, unique=false)
      */
-    private $lastSyncTransId;
+    protected $lastSyncTransId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="last_sync_trans_date", type="datetime", nullable=true, unique=false)
      */
-    private $lastSyncTransDate;
+    protected $lastSyncTransDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="last_sync_type", type="string", length=20, nullable=true, unique=false)
      */
-    private $lastSyncType;
+    protected $lastSyncType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ssl_pub_key", type="string", length=250, nullable=true, unique=false)
      */
-    private $sslPubKey;
+    protected $sslPubKey;
 
     /**
      * @var string
      *
      * @ORM\Column(name="branch_type", type="string", length=250, nullable=true, unique=false)
      */
-    private $branchType;
+    protected $branchType;
 
     /**
      * @var int
      * @Gedmo\TreeLeft
      * @ORM\Column(name="lft", type="integer", nullable=true, unique=false)
      */
-    private $lft;
+    protected $lft;
 
     /**
      * @var int
      * @Gedmo\TreeRight
      * @ORM\Column(name="rgt", type="integer", nullable=true, unique=false)
      */
-    private $rgt;
+    protected $rgt;
 
     /**
      * @var int
      * @Gedmo\TreeLevel
      * @ORM\Column(name="lvl", type="integer", nullable=true, unique=false)
      */
-    private $lvl;
+    protected $lvl;
 
     /**
      * @var int
      * @Gedmo\TreeRoot
      * @ORM\Column(name="root", type="integer", nullable=true, unique=false)
      */
-    private $root;
+    protected $root;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_id", type="integer", nullable=true, unique=false)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @Gedmo\TreeParent
      * @ORM\ManyToOne(targetEntity="BranchSync", inversedBy="children")
      * @ORM\JoinColumn(name="parent_id", referencedColumnName="id", onDelete="SET NULL")
      */
-    private $parent;
+    protected $parent;
 
     /**
      * @ORM\OneToMany(targetEntity="BranchSync", mappedBy="parent")
      * @ORM\OrderBy({"lft" = "ASC"})
      */
-    private $children;
+    protected $children;
 
     /**
      * Constructor.
diff --git a/src/Chamilo/CoreBundle/Entity/ClassUser.php b/src/Chamilo/CoreBundle/Entity/ClassUser.php
index 86b547a032..127c2d722d 100644
--- a/src/Chamilo/CoreBundle/Entity/ClassUser.php
+++ b/src/Chamilo/CoreBundle/Entity/ClassUser.php
@@ -20,7 +20,7 @@ class ClassUser
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $classId;
+    protected $classId;
 
     /**
      * @var int
@@ -29,7 +29,7 @@ class ClassUser
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set classId.
diff --git a/src/Chamilo/CoreBundle/Entity/CourseCategory.php b/src/Chamilo/CoreBundle/Entity/CourseCategory.php
index e8a9a3dd12..3417a0f640 100644
--- a/src/Chamilo/CoreBundle/Entity/CourseCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/CourseCategory.php
@@ -29,56 +29,56 @@ class CourseCategory
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=100, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="code", type="string", length=40, nullable=false)
      */
-    private $code;
+    protected $code;
 
     /**
      * @var string
      *
      * @ORM\Column(name="parent_id", type="string", length=40, nullable=true)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="tree_pos", type="integer", nullable=true)
      */
-    private $treePos;
+    protected $treePos;
 
     /**
      * @var int
      *
      * @ORM\Column(name="children_count", type="smallint", nullable=true)
      */
-    private $childrenCount;
+    protected $childrenCount;
 
     /**
      * @var string
      *
      * @ORM\Column(name="auth_course_child", type="string", length=40, nullable=true)
      */
-    private $authCourseChild;
+    protected $authCourseChild;
 
     /**
      * @var string
      *
      * @ORM\Column(name="auth_cat_child", type="string", length=40, nullable=true)
      */
-    private $authCatChild;
+    protected $authCatChild;
 
     /**
      * @return string
diff --git a/src/Chamilo/CoreBundle/Entity/CourseModule.php b/src/Chamilo/CoreBundle/Entity/CourseModule.php
index 40714c07ab..f8fabdb867 100644
--- a/src/Chamilo/CoreBundle/Entity/CourseModule.php
+++ b/src/Chamilo/CoreBundle/Entity/CourseModule.php
@@ -13,56 +13,56 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class CourseModule
 {
+    /**
+     * @var int
+     *
+     * @ORM\Column(name="id", type="integer")
+     * @ORM\Id
+     * @ORM\GeneratedValue(strategy="IDENTITY")
+     */
+    protected $id;
+
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="link", type="string", length=255, nullable=false)
      */
-    private $link;
+    protected $link;
 
     /**
      * @var string
      *
      * @ORM\Column(name="image", type="string", length=100, nullable=true)
      */
-    private $image;
+    protected $image;
 
     /**
      * @var int
      *
      * @ORM\Column(name="row", type="integer", nullable=false)
      */
-    private $row;
+    protected $row;
 
     /**
      * @var int
      *
      * @ORM\Column(name="column", type="integer", nullable=false)
      */
-    private $column;
+    protected $column;
 
     /**
      * @var string
      *
      * @ORM\Column(name="position", type="string", length=20, nullable=false)
      */
-    private $position;
-
-    /**
-     * @var int
-     *
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="IDENTITY")
-     */
-    private $id;
+    protected $position;
 
     /**
      * Set name.

From 56ae32906592153441e10721396282e781dac8ac Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 09:50:25 +0200
Subject: [PATCH 05/11] Minor - Remove api calls in Entities, moved into a lib

- Replace private with protected
---
 main/badge/issued.php                         | 10 +--
 main/badge/issued_all.php                     | 21 +++---
 main/inc/lib/skill.lib.php                    | 48 ++++++++++++
 src/Chamilo/CoreBundle/Entity/Session.php     | 33 ++++----
 .../CoreBundle/Entity/SkillRelUser.php        | 75 +++++--------------
 5 files changed, 98 insertions(+), 89 deletions(-)

diff --git a/main/badge/issued.php b/main/badge/issued.php
index 3b61f6b975..9dfc8cc470 100644
--- a/main/badge/issued.php
+++ b/main/badge/issued.php
@@ -3,6 +3,7 @@
 
 use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUserComment;
+use \SkillRelUser as SkillRelUserManager;
 
 /**
  * Show information about the issued badge.
@@ -107,7 +108,7 @@ $skillIssueInfo = [
     'skill_short_code' => $skillIssue->getSkill()->getShortCode(),
     'skill_description' => $skillIssue->getSkill()->getDescription(),
     'skill_criteria' => $skillIssue->getSkill()->getCriteria(),
-    'badge_assertion' => $skillIssue->getAssertionUrl(),
+    'badge_assertion' => SkillRelUserManager::getAssertionUrl($skillIssue),
     'comments' => [],
     'feedback_average' => $skillIssue->getAverage(),
 ];
@@ -120,7 +121,6 @@ $skillId = $skillIssueInfo['skill_id'];
 /** @var SkillRelUserComment $comment */
 foreach ($skillIssueComments as $comment) {
     $commentDate = api_get_local_time($comment->getFeedbackDateTime());
-
     $skillIssueInfo['comments'][] = [
         'text' => $comment->getFeedbackText(),
         'value' => $comment->getFeedbackValue(),
@@ -157,7 +157,6 @@ if (!$profile) {
 
 if ($profile) {
     $profileId = $profile->getId();
-
     $levels = $skillLevelRepo->findBy([
         'profile' => $profileId,
     ]);
@@ -168,7 +167,6 @@ if ($profile) {
     }
 
     ksort($profileLevels); // Sort the array by Position.
-
     foreach ($profileLevels as $profileLevel) {
         $profileId = key($profileLevel);
         $acquiredLevel[$profileId] = $profileLevel[$profileId];
@@ -193,7 +191,7 @@ if ($showLevels && $allowToEdit) {
         $entityManager->flush();
         Display::addFlash(Display::return_message(get_lang('Saved')));
 
-        header("Location: ".$skillIssue->getIssueUrl());
+        header('Location: '.SkillRelUserManager::getIssueUrl($skillIssue));
         exit;
     }
 }
@@ -226,7 +224,7 @@ if ($form->validate() && $allowComment && $allowToEdit) {
     $entityManager->flush();
     Display::addFlash(Display::return_message(get_lang('Added')));
 
-    header("Location: ".$skillIssue->getIssueUrl());
+    header('Location: '.SkillRelUserManager::getIssueUrl($skillIssue));
     exit;
 }
 
diff --git a/main/badge/issued_all.php b/main/badge/issued_all.php
index 477a1cd51a..b07344bd19 100644
--- a/main/badge/issued_all.php
+++ b/main/badge/issued_all.php
@@ -4,6 +4,7 @@
 use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUserComment;
 use Chamilo\UserBundle\Entity\User;
+use \SkillRelUser as SkillRelUserManager;
 
 /**
  * Show information about all issued badges with same skill by user.
@@ -14,8 +15,8 @@ use Chamilo\UserBundle\Entity\User;
  */
 require_once __DIR__.'/../inc/global.inc.php';
 
-$userId = isset($_GET['user']) ? intval($_GET['user']) : 0;
-$skillId = isset($_GET['skill']) ? intval($_GET['skill']) : 0;
+$userId = isset($_GET['user']) ? (int) $_GET['user'] : 0;
+$skillId = isset($_GET['skill']) ? (int) $_GET['skill'] : 0;
 
 if (!$userId || !$skillId) {
     api_not_allowed(true);
@@ -26,7 +27,6 @@ Skill::isAllowed($userId);
 $em = Database::getManager();
 $user = api_get_user_entity($userId);
 $skill = $em->find('ChamiloCoreBundle:Skill', $skillId);
-
 $currentUserId = api_get_user_id();
 
 if (!$user || !$skill) {
@@ -80,7 +80,10 @@ foreach ($userSkills as $index => $skillIssue) {
         'datetime' => api_format_date($skillIssueDate, DATE_TIME_FORMAT_SHORT),
         'acquired_level' => $currentSkillLevel,
         'argumentation_author_id' => $skillIssue->getArgumentationAuthorId(),
-        'argumentation_author_name' => api_get_person_name($argumentationAuthor['firstname'], $argumentationAuthor['lastname']),
+        'argumentation_author_name' => api_get_person_name(
+            $argumentationAuthor['firstname'],
+            $argumentationAuthor['lastname']
+        ),
         'argumentation' => $skillIssue->getArgumentation(),
         'source_name' => $skillIssue->getSourceName(),
         'user_id' => $skillIssue->getUser()->getId(),
@@ -91,7 +94,7 @@ foreach ($userSkills as $index => $skillIssue) {
         'skill_short_code' => $skillIssue->getSkill()->getShortCode(),
         'skill_description' => $skillIssue->getSkill()->getDescription(),
         'skill_criteria' => $skillIssue->getSkill()->getCriteria(),
-        'badge_assertion' => $skillIssue->getAssertionUrl(),
+        'badge_assertion' => SkillRelUserManager::getAssertionUrl($skillIssue),
         'comments' => [],
         'feedback_average' => $skillIssue->getAverage(),
     ];
@@ -156,7 +159,7 @@ foreach ($userSkills as $index => $skillIssue) {
     $formAcquiredLevel = new FormValidator(
         'acquired_level'.$skillIssue->getId(),
         'post',
-        $skillIssue->getIssueUrlAll()
+        SkillRelUserManager::getIssueUrlAll($skillIssue)
     );
     $formAcquiredLevel->addSelect('acquired_level', get_lang('AcquiredLevel'), $acquiredLevel);
     $formAcquiredLevel->addHidden('user', $skillIssue->getUser()->getId());
@@ -172,14 +175,14 @@ foreach ($userSkills as $index => $skillIssue) {
         $em->persist($skillIssue);
         $em->flush();
 
-        header("Location: ".$skillIssue->getIssueUrlAll());
+        header('Location: '.SkillRelUserManager::getIssueUrlAll($skillIssue));
         exit;
     }
 
     $form = new FormValidator(
         'comment'.$skillIssue->getId(),
         'post',
-        $skillIssue->getIssueUrlAll()
+        SkillRelUserManager::getIssueUrlAll($skillIssue)
     );
     $form->addTextarea('comment', get_lang('NewComment'), ['rows' => 4]);
     $form->applyFilter('comment', 'trim');
@@ -207,7 +210,7 @@ foreach ($userSkills as $index => $skillIssue) {
         $em->persist($skillUserComment);
         $em->flush();
 
-        header("Location: ".$skillIssue->getIssueUrlAll());
+        header('Location: '.SkillRelUserManager::getIssueUrlAll($skillIssue));
         exit;
     }
 
diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php
index 974bbffb12..5628f64d5e 100755
--- a/main/inc/lib/skill.lib.php
+++ b/main/inc/lib/skill.lib.php
@@ -3,6 +3,7 @@
 
 use Chamilo\CoreBundle\Component\Utils\ChamiloApi;
 use Chamilo\CoreBundle\Entity\Skill as SkillEntity;
+use Chamilo\CoreBundle\Entity\SkillRelUser as SkillRelUserEntity;
 use Chamilo\SkillBundle\Entity\SkillRelCourse;
 use Chamilo\SkillBundle\Entity\SkillRelItem;
 use Chamilo\UserBundle\Entity\User;
@@ -11,6 +12,7 @@ use Fhaculty\Graph\Vertex;
 
 /**
  * Class SkillProfile.
+ * @todo break the file in different classes
  *
  * @package chamilo.library
  */
@@ -614,6 +616,52 @@ class SkillRelUser extends Model
             'where' => $where,
         ], 'first');
     }
+
+    /**
+     * Get the URL for the issue.
+     *
+     * @param SkillRelUserEntity $skillIssue
+     *
+     * @return string
+     *
+     */
+    public static function getIssueUrl(SkillRelUserEntity $skillIssue)
+    {
+        return api_get_path(WEB_PATH)."badge/{$skillIssue->getId()}";
+    }
+
+
+    /**
+     * Get the URL for the All issues page.
+     *
+     * @param SkillRelUserEntity $skillIssue
+     *
+     * @return string
+     */
+    public static function getIssueUrlAll(SkillRelUserEntity $skillIssue)
+    {
+        return api_get_path(WEB_PATH)."skill/{$skillIssue->getSkill()->getId()}/user/{$skillIssue->getUser()->getId()}";
+    }
+
+    /**
+     * Get the URL for the assertion.
+     * @param SkillRelUserEntity $skillIssue
+     *
+     * @return string
+     */
+    public static function getAssertionUrl(SkillRelUserEntity $skillIssue)
+    {
+        $url = api_get_path(WEB_CODE_PATH).'badge/assertion.php?';
+
+        $url .= http_build_query([
+            'user' => $skillIssue->getUser()->getId(),
+            'skill' => $skillIssue->getSkill()->getId(),
+            'course' => $skillIssue->getCourse() ? $skillIssue->getCourse()->getId() : 0,
+            'session' => $skillIssue->getSession() ? $skillIssue->getSession()->getId() : 0,
+        ]);
+
+        return $url;
+    }
 }
 
 /**
diff --git a/src/Chamilo/CoreBundle/Entity/Session.php b/src/Chamilo/CoreBundle/Entity/Session.php
index 1ffb378dc8..3709c6d625 100644
--- a/src/Chamilo/CoreBundle/Entity/Session.php
+++ b/src/Chamilo/CoreBundle/Entity/Session.php
@@ -4,6 +4,7 @@
 namespace Chamilo\CoreBundle\Entity;
 
 use Chamilo\CourseBundle\Entity\CStudentPublication;
+use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\UserBundle\Entity\User;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
@@ -411,7 +412,7 @@ class Session
     {
         if ($this->getCourses()->count()) {
             $criteria = Criteria::create()->where(
-                Criteria::expr()->eq("course", $course)
+                Criteria::expr()->eq('course', $course)
             );
             $relation = $this->getCourses()->matching($criteria);
 
@@ -508,14 +509,14 @@ class Session
     public function getUserInCourse(User $user, Course $course, $status = null)
     {
         $criteria = Criteria::create()->where(
-            Criteria::expr()->eq("course", $course)
+            Criteria::expr()->eq('course', $course)
         )->andWhere(
-            Criteria::expr()->eq("user", $user)
+            Criteria::expr()->eq('user', $user)
         );
 
         if (!is_null($status)) {
             $criteria->andWhere(
-                Criteria::expr()->eq("status", $status)
+                Criteria::expr()->eq('status', $status)
             );
         }
 
@@ -527,7 +528,7 @@ class Session
      *
      * @param string $name
      *
-     * @return Session
+     * @return $this
      */
     public function setName($name)
     {
@@ -551,7 +552,7 @@ class Session
      *
      * @param string $description
      *
-     * @return Groups
+     * @return $this
      */
     public function setDescription($description)
     {
@@ -919,11 +920,7 @@ class Session
     {
         $now = new \Datetime('now');
 
-        if ($now > $this->getAccessStartDate()) {
-            return true;
-        }
-
-        return false;
+        return $now > $this->getAccessStartDate();
     }
 
     /**
@@ -1021,11 +1018,11 @@ class Session
     {
         if ($this->getUserCourseSubscriptions()->count()) {
             $criteria = Criteria::create()->where(
-                Criteria::expr()->eq("user", $subscription->getUser())
+                Criteria::expr()->eq('user', $subscription->getUser())
             )->andWhere(
-                Criteria::expr()->eq("course", $subscription->getCourse())
+                Criteria::expr()->eq('course', $subscription->getCourse())
             )->andWhere(
-                Criteria::expr()->eq("session", $subscription->getSession())
+                Criteria::expr()->eq('session', $subscription->getSession())
             );
             $relation = $this->getUserCourseSubscriptions()->matching($criteria);
 
@@ -1085,8 +1082,8 @@ class Session
     /**
      * Get user from course by status.
      *
-     * @param \Chamilo\CoreBundle\Entity\Course $course
-     * @param int                               $status
+     * @param Course $course
+     * @param int    $status
      *
      * @return \Doctrine\Common\Collections\ArrayCollection|\Doctrine\Common\Collections\Collection
      */
@@ -1094,10 +1091,10 @@ class Session
     {
         $criteria = Criteria::create()
             ->where(
-                Criteria::expr()->eq("course", $course)
+                Criteria::expr()->eq('course', $course)
             )
             ->andWhere(
-                Criteria::expr()->eq("status", $status)
+                Criteria::expr()->eq('status', $status)
             );
 
         return $this->userCourseSubscriptions->matching($criteria);
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelUser.php b/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
index 581eefbff6..8c8a2e8dfa 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
@@ -24,10 +24,6 @@ use Doctrine\ORM\Mapping as ORM;
  */
 class SkillRelUser
 {
-    /**
-     * @ORM\OneToMany(targetEntity="SkillRelUserComment", mappedBy="skillRelUser")
-     */
-    protected $comments;
     /**
      * @var int
      *
@@ -35,39 +31,45 @@ class SkillRelUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
+
+    /**
+     * @ORM\OneToMany(targetEntity="SkillRelUserComment", mappedBy="skillRelUser")
+     */
+    protected $comments;
+
 
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="achievedSkills", cascade={"persist"})
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)
      */
-    private $user;
+    protected $user;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Skill", inversedBy="issuedSkills", cascade={"persist"})
      * @ORM\JoinColumn(name="skill_id", referencedColumnName="id", nullable=false)
      */
-    private $skill;
+    protected $skill;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="acquired_skill_at", type="datetime", nullable=false)
      */
-    private $acquiredSkillAt;
+    protected $acquiredSkillAt;
 
     /**
      * @var int
      *
      * @ORM\Column(name="assigned_by", type="integer", nullable=false)
      */
-    private $assignedBy;
+    protected $assignedBy;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Course", inversedBy="issuedSkills", cascade={"persist"})
      * @ORM\JoinColumn(name="course_id", referencedColumnName="id", nullable=true)
      */
-    private $course;
+    protected $course;
 
     /**
      * @var Session
@@ -75,7 +77,7 @@ class SkillRelUser
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Session", inversedBy="issuedSkills", cascade={"persist"})
      * @ORM\JoinColumn(name="session_id", referencedColumnName="id", nullable=true)
      */
-    private $session;
+    protected $session;
 
     /**
      * @var Level
@@ -83,21 +85,21 @@ class SkillRelUser
      * @ORM\ManyToOne(targetEntity="Chamilo\SkillBundle\Entity\Level")
      * @ORM\JoinColumn(name="acquired_level", referencedColumnName="id")
      */
-    private $acquiredLevel;
+    protected $acquiredLevel;
 
     /**
      * @var string
      *
      * @ORM\Column(name="argumentation", type="text")
      */
-    private $argumentation;
+    protected $argumentation;
 
     /**
      * @var int
      *
      * @ORM\Column(name="argumentation_author_id", type="integer")
      */
-    private $argumentationAuthorId;
+    protected $argumentationAuthorId;
 
     /**
      * SkillRelUser constructor.
@@ -342,56 +344,17 @@ class SkillRelUser
     {
         $source = '';
 
-        if ($this->session && $this->session->getId() != 0) {
-            $source .= "[{$this->session->getName()}] ";
+        if ($this->session && $this->getSession()->getId() != 0) {
+            $source .= "[{$this->getSession()->getName()}] ";
         }
 
         if ($this->course) {
-            $source .= $this->course->getTitle();
+            $source .= $this->getCourse()->getTitle();
         }
 
         return $source;
     }
 
-    /**
-     * Get the URL for the issue.
-     *
-     * @return string
-     */
-    public function getIssueUrl()
-    {
-        return api_get_path(WEB_PATH)."badge/{$this->id}";
-    }
-
-    /**
-     * Get the URL for the All issues page.
-     *
-     * @return string
-     */
-    public function getIssueUrlAll()
-    {
-        return api_get_path(WEB_PATH)."skill/{$this->skill->getId()}/user/{$this->user->getId()}";
-    }
-
-    /**
-     * Get the URL for the assertion.
-     *
-     * @return string
-     */
-    public function getAssertionUrl()
-    {
-        $url = api_get_path(WEB_CODE_PATH).'badge/assertion.php?';
-
-        $url .= http_build_query([
-            'user' => $this->getUser()->getId(),
-            'skill' => $this->getSkill()->getId(),
-            'course' => $this->course ? $this->getCourse()->getId() : 0,
-            'session' => $this->session ? $this->getSession()->getId() : 0,
-        ]);
-
-        return $url;
-    }
-
     /**
      * Get comments.
      *

From 22f45586d98fe61b033aded345fa761606e23ed3 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 09:58:57 +0200
Subject: [PATCH 06/11] Minor - format code

---
 main/badge/issued.php                                | 2 +-
 main/badge/issued_all.php                            | 2 +-
 main/inc/lib/skill.lib.php                           | 4 ++--
 src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php | 1 -
 src/Chamilo/CoreBundle/Entity/Session.php            | 1 -
 src/Chamilo/CoreBundle/Entity/SkillRelUser.php       | 1 -
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/main/badge/issued.php b/main/badge/issued.php
index 9dfc8cc470..df9962150e 100644
--- a/main/badge/issued.php
+++ b/main/badge/issued.php
@@ -3,7 +3,7 @@
 
 use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUserComment;
-use \SkillRelUser as SkillRelUserManager;
+use SkillRelUser as SkillRelUserManager;
 
 /**
  * Show information about the issued badge.
diff --git a/main/badge/issued_all.php b/main/badge/issued_all.php
index b07344bd19..a1e17f0bde 100644
--- a/main/badge/issued_all.php
+++ b/main/badge/issued_all.php
@@ -4,7 +4,7 @@
 use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUserComment;
 use Chamilo\UserBundle\Entity\User;
-use \SkillRelUser as SkillRelUserManager;
+use SkillRelUser as SkillRelUserManager;
 
 /**
  * Show information about all issued badges with same skill by user.
diff --git a/main/inc/lib/skill.lib.php b/main/inc/lib/skill.lib.php
index 5628f64d5e..3d2c59fd34 100755
--- a/main/inc/lib/skill.lib.php
+++ b/main/inc/lib/skill.lib.php
@@ -12,6 +12,7 @@ use Fhaculty\Graph\Vertex;
 
 /**
  * Class SkillProfile.
+ *
  * @todo break the file in different classes
  *
  * @package chamilo.library
@@ -623,14 +624,12 @@ class SkillRelUser extends Model
      * @param SkillRelUserEntity $skillIssue
      *
      * @return string
-     *
      */
     public static function getIssueUrl(SkillRelUserEntity $skillIssue)
     {
         return api_get_path(WEB_PATH)."badge/{$skillIssue->getId()}";
     }
 
-
     /**
      * Get the URL for the All issues page.
      *
@@ -645,6 +644,7 @@ class SkillRelUser extends Model
 
     /**
      * Get the URL for the assertion.
+     *
      * @param SkillRelUserEntity $skillIssue
      *
      * @return string
diff --git a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
index 38b9f93f28..a3965fb18b 100644
--- a/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
+++ b/src/Chamilo/CoreBundle/Entity/AccessUrlRelCourse.php
@@ -22,7 +22,6 @@ class AccessUrlRelCourse
      */
     protected $id;
 
-
     /**
      * @ORM\ManyToOne(targetEntity="Course", inversedBy="urls", cascade={"persist"})
      * @ORM\JoinColumn(name="c_id", referencedColumnName="id")
diff --git a/src/Chamilo/CoreBundle/Entity/Session.php b/src/Chamilo/CoreBundle/Entity/Session.php
index 3709c6d625..0d02b02645 100644
--- a/src/Chamilo/CoreBundle/Entity/Session.php
+++ b/src/Chamilo/CoreBundle/Entity/Session.php
@@ -4,7 +4,6 @@
 namespace Chamilo\CoreBundle\Entity;
 
 use Chamilo\CourseBundle\Entity\CStudentPublication;
-use Chamilo\CoreBundle\Entity\Course;
 use Chamilo\UserBundle\Entity\User;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Criteria;
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelUser.php b/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
index 8c8a2e8dfa..585c758680 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelUser.php
@@ -38,7 +38,6 @@ class SkillRelUser
      */
     protected $comments;
 
-
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="achievedSkills", cascade={"persist"})
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false)

From d2721a61d68af28d013c4fe83aac9d54a31feb49 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 10:26:26 +0200
Subject: [PATCH 07/11] Minor - replace private with protected

---
 .../CoreBundle/Entity/BranchTransaction.php   | 24 +++----
 .../Entity/BranchTransactionStatus.php        |  4 +-
 src/Chamilo/CoreBundle/Entity/Career.php      | 12 ++--
 src/Chamilo/CoreBundle/Entity/Chat.php        | 12 ++--
 src/Chamilo/CoreBundle/Entity/ChatVideo.php   | 10 +--
 src/Chamilo/CoreBundle/Entity/ClassItem.php   |  6 +-
 src/Chamilo/CoreBundle/Entity/Course.php      |  4 +-
 src/Chamilo/CoreBundle/Entity/CourseType.php  | 10 +--
 .../CoreBundle/Entity/EventEmailTemplate.php  | 12 ++--
 src/Chamilo/CoreBundle/Entity/EventSent.php   |  8 +--
 .../Entity/ExtraFieldOptionRelFieldOption.php |  2 +-
 .../CoreBundle/Entity/ExtraFieldRelTag.php    |  8 +--
 .../CoreBundle/Entity/GradeComponents.php     | 10 +--
 src/Chamilo/CoreBundle/Entity/GradeModel.php  | 12 ++--
 .../CoreBundle/Entity/GradebookCategory.php   | 32 ++++-----
 .../Entity/GradebookCertificate.php           | 12 ++--
 .../CoreBundle/Entity/GradebookEvaluation.php | 24 +++----
 .../CoreBundle/Entity/GradebookLink.php       | 20 +++---
 .../Entity/GradebookLinkevalLog.php           | 18 ++---
 .../CoreBundle/Entity/GradebookResult.php     | 10 +--
 .../CoreBundle/Entity/GradebookScoreLog.php   | 10 +--
 src/Chamilo/CoreBundle/Entity/HookCall.php    | 12 ++--
 src/Chamilo/CoreBundle/Entity/HookEvent.php   |  6 +-
 .../CoreBundle/Entity/HookObserver.php        |  8 +--
 src/Chamilo/CoreBundle/Entity/Language.php    | 16 ++---
 src/Chamilo/CoreBundle/Entity/Legal.php       | 14 ++--
 .../Entity/Manager/SessionManager.php         |  2 +-
 src/Chamilo/CoreBundle/Entity/Message.php     | 22 +++---
 .../CoreBundle/Entity/MessageAttachment.php   | 12 ++--
 .../CoreBundle/Entity/Notification.php        | 16 ++---
 .../CoreBundle/Entity/OpenidAssociation.php   | 16 ++---
 .../CoreBundle/Entity/PersonalAgenda.php      | 20 +++---
 .../Entity/PersonalAgendaRepeat.php           | 10 +--
 .../Entity/PersonalAgendaRepeatNot.php        |  4 +-
 .../CoreBundle/Entity/PortfolioCategory.php   | 12 ++--
 src/Chamilo/CoreBundle/Entity/Promotion.php   | 14 ++--
 .../Entity/Repository/SequenceRepository.php  |  2 +-
 src/Chamilo/CoreBundle/Entity/Room.php        | 14 ++--
 .../CoreBundle/Entity/SearchEngineRef.php     | 12 ++--
 src/Chamilo/CoreBundle/Entity/Sequence.php    | 10 +--
 .../CoreBundle/Entity/SequenceCondition.php   | 12 ++--
 .../CoreBundle/Entity/SequenceFormula.php     |  6 +-
 .../CoreBundle/Entity/SequenceMethod.php      | 12 ++--
 .../CoreBundle/Entity/SequenceResource.php    |  6 +-
 .../CoreBundle/Entity/SequenceRowEntity.php   | 12 ++--
 .../CoreBundle/Entity/SequenceRule.php        |  4 +-
 .../Entity/SequenceRuleCondition.php          |  6 +-
 .../CoreBundle/Entity/SequenceRuleMethod.php  |  8 +--
 .../CoreBundle/Entity/SequenceTypeEntity.php  |  8 +--
 .../CoreBundle/Entity/SequenceValid.php       |  6 +-
 .../CoreBundle/Entity/SequenceValue.php       | 22 +++---
 .../CoreBundle/Entity/SequenceVariable.php    |  8 +--
 .../CoreBundle/Entity/SessionCategory.php     |  8 +--
 .../CoreBundle/Entity/SettingsCurrent.php     | 26 +++----
 .../CoreBundle/Entity/SettingsOptions.php     |  8 +--
 .../CoreBundle/Entity/SharedSurvey.php        | 22 +++---
 .../Entity/SharedSurveyQuestion.php           | 18 ++---
 .../Entity/SharedSurveyQuestionOption.php     | 10 +--
 src/Chamilo/CoreBundle/Entity/Skill.php       | 18 ++---
 .../CoreBundle/Entity/SkillProfile.php        |  6 +-
 .../CoreBundle/Entity/SkillRelGradebook.php   |  8 +--
 .../CoreBundle/Entity/SkillRelProfile.php     |  6 +-
 .../CoreBundle/Entity/SkillRelSkill.php       | 10 +--
 .../CoreBundle/Entity/SkillRelUserComment.php | 12 ++--
 .../CoreBundle/Entity/SpecificField.php       |  6 +-
 .../CoreBundle/Entity/SpecificFieldValues.php | 12 ++--
 .../CoreBundle/Entity/SysAnnouncement.php     | 20 +++---
 src/Chamilo/CoreBundle/Entity/SysCalendar.php | 14 ++--
 .../CoreBundle/Entity/SystemTemplate.php      | 10 +--
 src/Chamilo/CoreBundle/Entity/Tag.php         |  8 +--
 src/Chamilo/CoreBundle/Entity/Templates.php   | 14 ++--
 .../CoreBundle/Entity/TrackCourseRanking.php  | 16 ++---
 .../CoreBundle/Entity/TrackEAccess.php        | 14 ++--
 .../CoreBundle/Entity/TrackEAttempt.php       | 24 +++----
 .../CoreBundle/Entity/TrackEAttemptCoeff.php  |  6 +-
 .../Entity/TrackEAttemptRecording.php         | 16 ++---
 .../CoreBundle/Entity/TrackECourseAccess.php  | 16 ++---
 .../CoreBundle/Entity/TrackEDefault.php       | 16 ++---
 .../CoreBundle/Entity/TrackEDownloads.php     | 12 ++--
 .../CoreBundle/Entity/TrackEExercises.php     | 38 +++++-----
 .../CoreBundle/Entity/TrackEHotpotatoes.php   | 14 ++--
 .../CoreBundle/Entity/TrackEHotspot.php       | 18 ++---
 .../CoreBundle/Entity/TrackEItemProperty.php  | 18 ++---
 .../CoreBundle/Entity/TrackELastaccess.php    | 12 ++--
 src/Chamilo/CoreBundle/Entity/TrackELinks.php | 12 ++--
 src/Chamilo/CoreBundle/Entity/TrackELogin.php | 10 +--
 .../CoreBundle/Entity/TrackEOnline.php        | 14 ++--
 src/Chamilo/CoreBundle/Entity/TrackEOpen.php  | 10 +--
 .../CoreBundle/Entity/TrackEUploads.php       | 14 ++--
 .../CoreBundle/Entity/TrackStoredValues.php   | 12 ++--
 .../Entity/TrackStoredValuesStack.php         | 14 ++--
 src/Chamilo/CoreBundle/Entity/UserApiKey.php  | 18 ++---
 .../CoreBundle/Entity/UserCourseCategory.php  |  8 +--
 .../Entity/UserFriendRelationType.php         |  4 +-
 .../Entity/UserGroupRelUserGroup.php          |  8 +--
 .../CoreBundle/Entity/UserRelCourseVote.php   | 12 ++--
 .../CoreBundle/Entity/UserRelEventType.php    |  6 +-
 src/Chamilo/CoreBundle/Entity/UserRelTag.php  |  6 +-
 src/Chamilo/CoreBundle/Entity/UserRelUser.php | 10 +--
 .../CoreBundle/Entity/UsergroupRelCourse.php  |  6 +-
 .../Entity/UsergroupRelQuestion.php           | 10 +--
 .../CoreBundle/Entity/UsergroupRelSession.php |  6 +-
 .../CoreBundle/Entity/UsergroupRelUser.php    |  2 +-
 .../CourseBundle/Entity/CAnnouncement.php     | 18 ++---
 .../Entity/CAnnouncementAttachment.php        | 16 ++---
 .../CourseBundle/Entity/CAttendance.php       | 22 +++---
 .../Entity/CAttendanceCalendar.php            | 12 ++--
 .../Entity/CAttendanceCalendarRelGroup.php    | 10 +--
 .../CourseBundle/Entity/CAttendanceResult.php | 12 ++--
 .../CourseBundle/Entity/CAttendanceSheet.php  | 10 +--
 .../Entity/CAttendanceSheetLog.php            | 16 ++---
 src/Chamilo/CourseBundle/Entity/CBlog.php     | 16 ++---
 .../CourseBundle/Entity/CBlogAttachment.php   | 20 +++---
 .../CourseBundle/Entity/CBlogComment.php      | 22 +++---
 src/Chamilo/CourseBundle/Entity/CBlogPost.php | 16 ++---
 .../CourseBundle/Entity/CBlogRating.php       | 16 ++---
 .../CourseBundle/Entity/CBlogRelUser.php      |  8 +--
 src/Chamilo/CourseBundle/Entity/CBlogTask.php | 16 ++---
 .../CourseBundle/Entity/CBlogTaskRelUser.php  | 12 ++--
 .../CourseBundle/Entity/CCalendarEvent.php    | 26 +++----
 .../Entity/CCalendarEventAttachment.php       | 16 ++---
 .../Entity/CCalendarEventRepeat.php           | 14 ++--
 .../Entity/CCalendarEventRepeatNot.php        |  8 +--
 .../CourseBundle/Entity/CChatConnected.php    | 14 ++--
 .../Entity/CCourseDescription.php             | 16 ++---
 .../CourseBundle/Entity/CCourseSetting.php    | 22 +++---
 src/Chamilo/CourseBundle/Entity/CDocument.php | 20 +++---
 .../CourseBundle/Entity/CDropboxCategory.php  | 16 ++---
 .../CourseBundle/Entity/CDropboxFeedback.php  | 14 ++--
 .../CourseBundle/Entity/CDropboxFile.php      | 26 +++----
 .../CourseBundle/Entity/CDropboxPerson.php    |  8 +--
 .../CourseBundle/Entity/CDropboxPost.php      | 16 ++---
 .../CourseBundle/Entity/CForumAttachment.php  | 16 ++---
 .../CourseBundle/Entity/CForumCategory.php    | 16 ++---
 .../CourseBundle/Entity/CForumForum.php       | 66 ++++++++---------
 .../CourseBundle/Entity/CForumMailcue.php     | 12 ++--
 .../Entity/CForumNotification.php             | 14 ++--
 .../CourseBundle/Entity/CForumPost.php        | 28 ++++----
 .../CourseBundle/Entity/CForumThread.php      | 40 +++++------
 .../Entity/CForumThreadQualify.php            | 18 ++---
 .../Entity/CForumThreadQualifyLog.php         | 18 ++---
 src/Chamilo/CourseBundle/Entity/CGlossary.php | 14 ++--
 .../CourseBundle/Entity/CGroupCategory.php    | 34 ++++-----
 .../CourseBundle/Entity/CGroupInfo.php        | 40 +++++------
 .../CourseBundle/Entity/CGroupRelTutor.php    | 10 +--
 .../CourseBundle/Entity/CGroupRelUser.php     | 14 ++--
 src/Chamilo/CourseBundle/Entity/CLink.php     | 22 +++---
 .../CourseBundle/Entity/CLinkCategory.php     | 14 ++--
 src/Chamilo/CourseBundle/Entity/CLp.php       | 70 +++++++++----------
 .../CourseBundle/Entity/CLpCategory.php       | 10 +--
 .../CourseBundle/Entity/CLpCategoryUser.php   |  6 +-
 src/Chamilo/CourseBundle/Entity/CLpItem.php   | 50 ++++++-------
 .../CourseBundle/Entity/CLpItemView.php       | 28 ++++----
 .../CourseBundle/Entity/CLpIvInteraction.php  | 26 +++----
 .../CourseBundle/Entity/CLpIvObjective.php    | 20 +++---
 src/Chamilo/CourseBundle/Entity/CLpView.php   | 18 ++---
 src/Chamilo/CourseBundle/Entity/CNotebook.php | 22 +++---
 .../CourseBundle/Entity/COnlineConnected.php  |  8 +--
 .../CourseBundle/Entity/COnlineLink.php       | 10 +--
 .../CourseBundle/Entity/CPermissionGroup.php  | 12 ++--
 .../CourseBundle/Entity/CPermissionTask.php   | 12 ++--
 .../CourseBundle/Entity/CPermissionUser.php   | 12 ++--
 src/Chamilo/CourseBundle/Entity/CQuiz.php     | 54 +++++++-------
 .../CourseBundle/Entity/CQuizAnswer.php       | 28 ++++----
 .../CourseBundle/Entity/CQuizCategory.php     | 10 +--
 .../CourseBundle/Entity/CQuizQuestion.php     | 24 +++----
 .../Entity/CQuizQuestionCategory.php          | 10 +--
 .../Entity/CQuizQuestionOption.php            | 12 ++--
 .../Entity/CQuizQuestionRelCategory.php       |  8 +--
 .../CourseBundle/Entity/CQuizRelQuestion.php  | 10 +--
 src/Chamilo/CourseBundle/Entity/CResource.php | 14 ++--
 src/Chamilo/CourseBundle/Entity/CRole.php     | 12 ++--
 .../CourseBundle/Entity/CRoleGroup.php        | 12 ++--
 .../CourseBundle/Entity/CRolePermissions.php  | 14 ++--
 src/Chamilo/CourseBundle/Entity/CRoleUser.php | 10 +--
 .../Entity/CStudentPublication.php            | 52 +++++++-------
 .../Entity/CStudentPublicationAssignment.php  | 16 ++---
 .../Entity/CStudentPublicationComment.php     | 16 ++---
 .../Entity/CStudentPublicationRelDocument.php | 10 +--
 .../Entity/CStudentPublicationRelUser.php     | 10 +--
 src/Chamilo/CourseBundle/Entity/CSurvey.php   | 62 ++++++++--------
 .../CourseBundle/Entity/CSurveyAnswer.php     | 16 ++---
 .../CourseBundle/Entity/CSurveyGroup.php      | 12 ++--
 .../CourseBundle/Entity/CSurveyInvitation.php | 22 +++---
 .../CourseBundle/Entity/CSurveyQuestion.php   | 28 ++++----
 .../Entity/CSurveyQuestionOption.php          | 16 ++---
 src/Chamilo/CourseBundle/Entity/CThematic.php | 16 ++---
 .../CourseBundle/Entity/CThematicAdvance.php  | 20 +++---
 .../CourseBundle/Entity/CThematicPlan.php     | 14 ++--
 .../CourseBundle/Entity/CUserinfoContent.php  | 16 ++---
 .../CourseBundle/Entity/CUserinfoDef.php      | 14 ++--
 src/Chamilo/CourseBundle/Entity/CWiki.php     | 56 +++++++--------
 src/Chamilo/CourseBundle/Entity/CWikiConf.php | 32 ++++-----
 .../CourseBundle/Entity/CWikiDiscuss.php      | 16 ++---
 .../CourseBundle/Entity/CWikiMailcue.php      | 14 ++--
 195 files changed, 1522 insertions(+), 1522 deletions(-)

diff --git a/src/Chamilo/CoreBundle/Entity/BranchTransaction.php b/src/Chamilo/CoreBundle/Entity/BranchTransaction.php
index af28fc9a50..6f275b280c 100644
--- a/src/Chamilo/CoreBundle/Entity/BranchTransaction.php
+++ b/src/Chamilo/CoreBundle/Entity/BranchTransaction.php
@@ -20,7 +20,7 @@ class BranchTransaction
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var Room
@@ -28,70 +28,70 @@ class BranchTransaction
      * @ORM\ManyToOne(targetEntity="BranchTransactionStatus")
      * @ORM\JoinColumn(name="status_id", referencedColumnName="id")
      */
-    private $branchTransactionStatus;
+    protected $branchTransactionStatus;
 
     /**
      * @var int
      *
      * @ORM\Column(name="transaction_id", type="bigint", nullable=false, unique=false)
      */
-    private $externalTransactionId;
+    protected $externalTransactionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="action", type="string", length=20, nullable=true, unique=false)
      */
-    private $action;
+    protected $action;
 
     /**
      * @var string
      *
      * @ORM\Column(name="item_id", type="string", length=255, nullable=true, unique=false)
      */
-    private $itemId;
+    protected $itemId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="origin", type="string", length=255, nullable=true, unique=false)
      */
-    private $origin;
+    protected $origin;
 
     /**
      * @var string
      *
      * @ORM\Column(name="dest_id", type="string", length=255, nullable=true, unique=false)
      */
-    private $destId;
+    protected $destId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="external_info", type="string", length=255, nullable=true, unique=false)
      */
-    private $externalInfo;
+    protected $externalInfo;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="time_insert", type="datetime", nullable=false, unique=false)
      */
-    private $timeInsert;
+    protected $timeInsert;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="time_update", type="datetime", nullable=false, unique=false)
      */
-    private $timeUpdate;
+    protected $timeUpdate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="failed_attempts", type="integer", nullable=false, unique=false)
      */
-    private $failedAttempts;
+    protected $failedAttempts;
 
     /**
      * @var BranchSync
@@ -99,7 +99,7 @@ class BranchTransaction
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\BranchSync")
      * @ORM\JoinColumn(name="branch_id", referencedColumnName="id")
      */
-    private $branch;
+    protected $branch;
 
     /**
      * Set id.
diff --git a/src/Chamilo/CoreBundle/Entity/BranchTransactionStatus.php b/src/Chamilo/CoreBundle/Entity/BranchTransactionStatus.php
index d2a07a900e..4b4b9b6b61 100644
--- a/src/Chamilo/CoreBundle/Entity/BranchTransactionStatus.php
+++ b/src/Chamilo/CoreBundle/Entity/BranchTransactionStatus.php
@@ -20,14 +20,14 @@ class BranchTransactionStatus
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true, unique=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/Career.php b/src/Chamilo/CoreBundle/Entity/Career.php
index 55b6a72cbf..ed9c42a022 100644
--- a/src/Chamilo/CoreBundle/Entity/Career.php
+++ b/src/Chamilo/CoreBundle/Entity/Career.php
@@ -20,42 +20,42 @@ class Career
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="status", type="integer", nullable=false)
      */
-    private $status;
+    protected $status;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="updated_at", type="datetime", nullable=false)
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/Chat.php b/src/Chamilo/CoreBundle/Entity/Chat.php
index 780c8b831f..6fa67c0253 100644
--- a/src/Chamilo/CoreBundle/Entity/Chat.php
+++ b/src/Chamilo/CoreBundle/Entity/Chat.php
@@ -23,42 +23,42 @@ class Chat
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="from_user", type="integer", nullable=true)
      */
-    private $fromUser;
+    protected $fromUser;
 
     /**
      * @var int
      *
      * @ORM\Column(name="to_user", type="integer", nullable=true)
      */
-    private $toUser;
+    protected $toUser;
 
     /**
      * @var string
      *
      * @ORM\Column(name="message", type="text", nullable=false)
      */
-    private $message;
+    protected $message;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="sent", type="datetime", nullable=false)
      */
-    private $sent;
+    protected $sent;
 
     /**
      * @var int
      *
      * @ORM\Column(name="recd", type="integer", nullable=false)
      */
-    private $recd;
+    protected $recd;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/ChatVideo.php b/src/Chamilo/CoreBundle/Entity/ChatVideo.php
index 9aff8d34ee..5074ba1e78 100644
--- a/src/Chamilo/CoreBundle/Entity/ChatVideo.php
+++ b/src/Chamilo/CoreBundle/Entity/ChatVideo.php
@@ -27,35 +27,35 @@ class ChatVideo
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="from_user", type="integer", nullable=false)
      */
-    private $fromUser;
+    protected $fromUser;
 
     /**
      * @var int
      *
      * @ORM\Column(name="to_user", type="integer", nullable=false)
      */
-    private $toUser;
+    protected $toUser;
 
     /**
      * @var string
      *
      * @ORM\Column(name="room_name", type="string", nullable=false)
      */
-    private $roomName;
+    protected $roomName;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="datetime", type="datetime", nullable=false)
      */
-    private $datetime;
+    protected $datetime;
 
     /**
      * Set fromUser.
diff --git a/src/Chamilo/CoreBundle/Entity/ClassItem.php b/src/Chamilo/CoreBundle/Entity/ClassItem.php
index 2faa08dee4..e7cd9f4c8d 100644
--- a/src/Chamilo/CoreBundle/Entity/ClassItem.php
+++ b/src/Chamilo/CoreBundle/Entity/ClassItem.php
@@ -18,14 +18,14 @@ class ClassItem
      *
      * @ORM\Column(name="code", type="string", length=40, nullable=true)
      */
-    private $code;
+    protected $code;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="text", nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var int
@@ -34,7 +34,7 @@ class ClassItem
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set code.
diff --git a/src/Chamilo/CoreBundle/Entity/Course.php b/src/Chamilo/CoreBundle/Entity/Course.php
index 3eb7e1659a..5d1f6afd50 100644
--- a/src/Chamilo/CoreBundle/Entity/Course.php
+++ b/src/Chamilo/CoreBundle/Entity/Course.php
@@ -1181,7 +1181,7 @@ class Course
      *
      * @return bool
      */
-    private function hasSubscription(CourseRelUser $subscription)
+    protected function hasSubscription(CourseRelUser $subscription)
     {
         if ($this->getUsers()->count()) {
             $criteria = Criteria::create()->where(
@@ -1206,7 +1206,7 @@ class Course
      * @param string $role
      * @param string $status
      */
-    private function addUser(User $user, $relationType, $role, $status)
+    protected function addUser(User $user, $relationType, $role, $status)
     {
         $courseRelUser = new CourseRelUser();
         $courseRelUser->setCourse($this);
diff --git a/src/Chamilo/CoreBundle/Entity/CourseType.php b/src/Chamilo/CoreBundle/Entity/CourseType.php
index b6cc41118a..4d6f99246d 100644
--- a/src/Chamilo/CoreBundle/Entity/CourseType.php
+++ b/src/Chamilo/CoreBundle/Entity/CourseType.php
@@ -18,28 +18,28 @@ class CourseType
      *
      * @ORM\Column(name="name", type="string", length=50, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="translation_var", type="string", length=40, nullable=true)
      */
-    private $translationVar;
+    protected $translationVar;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="props", type="text", nullable=true)
      */
-    private $props;
+    protected $props;
 
     /**
      * @var int
@@ -48,7 +48,7 @@ class CourseType
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CoreBundle/Entity/EventEmailTemplate.php b/src/Chamilo/CoreBundle/Entity/EventEmailTemplate.php
index 8331a5f124..03e3811bf5 100644
--- a/src/Chamilo/CoreBundle/Entity/EventEmailTemplate.php
+++ b/src/Chamilo/CoreBundle/Entity/EventEmailTemplate.php
@@ -18,35 +18,35 @@ class EventEmailTemplate
      *
      * @ORM\Column(name="message", type="text", nullable=true)
      */
-    private $message;
+    protected $message;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subject", type="string", length=255, nullable=true)
      */
-    private $subject;
+    protected $subject;
 
     /**
      * @var string
      *
      * @ORM\Column(name="event_type_name", type="string", length=255, nullable=true)
      */
-    private $eventTypeName;
+    protected $eventTypeName;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="activated", type="boolean", nullable=false)
      */
-    private $activated;
+    protected $activated;
 
     /**
      * @var int
      *
      * @ORM\Column(name="language_id", type="integer", nullable=true)
      */
-    private $languageId;
+    protected $languageId;
 
     /**
      * @var int
@@ -55,7 +55,7 @@ class EventEmailTemplate
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set message.
diff --git a/src/Chamilo/CoreBundle/Entity/EventSent.php b/src/Chamilo/CoreBundle/Entity/EventSent.php
index 725b165499..7e581b12f2 100644
--- a/src/Chamilo/CoreBundle/Entity/EventSent.php
+++ b/src/Chamilo/CoreBundle/Entity/EventSent.php
@@ -20,28 +20,28 @@ class EventSent
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_from", type="integer", nullable=false)
      */
-    private $userFrom;
+    protected $userFrom;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_to", type="integer", nullable=true)
      */
-    private $userTo;
+    protected $userTo;
 
     /**
      * @var string
      *
      * @ORM\Column(name="event_type_name", type="string", length=100, nullable=true)
      */
-    private $eventTypeName;
+    protected $eventTypeName;
 
     /**
      * Set userFrom.
diff --git a/src/Chamilo/CoreBundle/Entity/ExtraFieldOptionRelFieldOption.php b/src/Chamilo/CoreBundle/Entity/ExtraFieldOptionRelFieldOption.php
index cd260d51ef..8f49501acb 100644
--- a/src/Chamilo/CoreBundle/Entity/ExtraFieldOptionRelFieldOption.php
+++ b/src/Chamilo/CoreBundle/Entity/ExtraFieldOptionRelFieldOption.php
@@ -51,7 +51,7 @@ class ExtraFieldOptionRelFieldOption
      *
      * @ORM\Column(name="field_id", type="integer", precision=0, scale=0, nullable=true, unique=false)
      */
-    private $fieldId;
+    protected $fieldId;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/ExtraFieldRelTag.php b/src/Chamilo/CoreBundle/Entity/ExtraFieldRelTag.php
index 3526d86d24..5db22da502 100644
--- a/src/Chamilo/CoreBundle/Entity/ExtraFieldRelTag.php
+++ b/src/Chamilo/CoreBundle/Entity/ExtraFieldRelTag.php
@@ -26,21 +26,21 @@ class ExtraFieldRelTag
      *
      * @ORM\Column(name="field_id", type="integer", nullable=false)
      */
-    private $fieldId;
+    protected $fieldId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="tag_id", type="integer", nullable=false)
      */
-    private $tagId;
+    protected $tagId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="item_id", type="integer", nullable=false)
      */
-    private $itemId;
+    protected $itemId;
 
     /**
      * @var int
@@ -49,7 +49,7 @@ class ExtraFieldRelTag
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set fieldId.
diff --git a/src/Chamilo/CoreBundle/Entity/GradeComponents.php b/src/Chamilo/CoreBundle/Entity/GradeComponents.php
index 0e05c452e3..31a352b183 100644
--- a/src/Chamilo/CoreBundle/Entity/GradeComponents.php
+++ b/src/Chamilo/CoreBundle/Entity/GradeComponents.php
@@ -20,35 +20,35 @@ class GradeComponents
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="percentage", type="string", length=255, nullable=false)
      */
-    private $percentage;
+    protected $percentage;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="acronym", type="string", length=255, nullable=false)
      */
-    private $acronym;
+    protected $acronym;
 
     /**
      * @var int
      *
      * @ORM\Column(name="grade_model_id", type="integer", nullable=false)
      */
-    private $gradeModelId;
+    protected $gradeModelId;
 
     /**
      * Set percentage.
diff --git a/src/Chamilo/CoreBundle/Entity/GradeModel.php b/src/Chamilo/CoreBundle/Entity/GradeModel.php
index 5ebec59def..749bf23bae 100644
--- a/src/Chamilo/CoreBundle/Entity/GradeModel.php
+++ b/src/Chamilo/CoreBundle/Entity/GradeModel.php
@@ -20,42 +20,42 @@ class GradeModel
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="default_lowest_eval_exclude", type="boolean", nullable=true)
      */
-    private $defaultLowestEvalExclude;
+    protected $defaultLowestEvalExclude;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="default_external_eval", type="boolean", nullable=true)
      */
-    private $defaultExternalEval;
+    protected $defaultExternalEval;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_external_eval_prefix", type="string", length=140, nullable=true)
      */
-    private $defaultExternalEvalPrefix;
+    protected $defaultExternalEvalPrefix;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookCategory.php b/src/Chamilo/CoreBundle/Entity/GradebookCategory.php
index fa0e97a4fe..42a0d68597 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookCategory.php
@@ -20,105 +20,105 @@ class GradebookCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="text", nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=true)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_id", type="integer", nullable=true)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="weight", type="float", precision=10, scale=0, nullable=false)
      */
-    private $weight;
+    protected $weight;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visible", type="boolean", nullable=false)
      */
-    private $visible;
+    protected $visible;
 
     /**
      * @var int
      *
      * @ORM\Column(name="certif_min_score", type="integer", nullable=true)
      */
-    private $certifMinScore;
+    protected $certifMinScore;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="document_id", type="integer", nullable=true)
      */
-    private $documentId;
+    protected $documentId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="default_lowest_eval_exclude", type="boolean", nullable=true)
      */
-    private $defaultLowestEvalExclude;
+    protected $defaultLowestEvalExclude;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="generate_certificates", type="boolean", nullable=false)
      */
-    private $generateCertificates;
+    protected $generateCertificates;
 
     /**
      * @var int
      *
      * @ORM\Column(name="grade_model_id", type="integer", nullable=true)
      */
-    private $gradeModelId;
+    protected $gradeModelId;
 
     /**
      * @var bool
@@ -130,7 +130,7 @@ class GradebookCategory
      *      options={"default": 0 }
      * )
      */
-    private $isRequirement;
+    protected $isRequirement;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookCertificate.php b/src/Chamilo/CoreBundle/Entity/GradebookCertificate.php
index afe457a8a5..fbeb0b8106 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookCertificate.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookCertificate.php
@@ -20,42 +20,42 @@ class GradebookCertificate
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cat_id", type="integer", nullable=false)
      */
-    private $catId;
+    protected $catId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score_certificate", type="float", precision=10, scale=0, nullable=false)
      */
-    private $scoreCertificate;
+    protected $scoreCertificate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path_certificate", type="text", nullable=true)
      */
-    private $pathCertificate;
+    protected $pathCertificate;
 
     /**
      * Set catId.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookEvaluation.php b/src/Chamilo/CoreBundle/Entity/GradebookEvaluation.php
index fab7cc2170..41fa7db724 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookEvaluation.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookEvaluation.php
@@ -20,84 +20,84 @@ class GradebookEvaluation
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="text", nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=true)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=true)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var float
      *
      * @ORM\Column(name="weight", type="float", precision=10, scale=0, nullable=false)
      */
-    private $weight;
+    protected $weight;
 
     /**
      * @var float
      *
      * @ORM\Column(name="max", type="float", precision=10, scale=0, nullable=false)
      */
-    private $max;
+    protected $max;
 
     /**
      * @var int
      *
      * @ORM\Column(name="visible", type="integer", nullable=false)
      */
-    private $visible;
+    protected $visible;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=40, nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookLink.php b/src/Chamilo/CoreBundle/Entity/GradebookLink.php
index f44fb56dea..b26733a8af 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookLink.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookLink.php
@@ -20,70 +20,70 @@ class GradebookLink
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="type", type="integer", nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="ref_id", type="integer", nullable=false)
      */
-    private $refId;
+    protected $refId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=false)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=false)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var float
      *
      * @ORM\Column(name="weight", type="float", precision=10, scale=0, nullable=false)
      */
-    private $weight;
+    protected $weight;
 
     /**
      * @var int
      *
      * @ORM\Column(name="visible", type="integer", nullable=false)
      */
-    private $visible;
+    protected $visible;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * Set type.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookLinkevalLog.php b/src/Chamilo/CoreBundle/Entity/GradebookLinkevalLog.php
index e29129c76d..f6a6a3708b 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookLinkevalLog.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookLinkevalLog.php
@@ -18,56 +18,56 @@ class GradebookLinkevalLog
      *
      * @ORM\Column(name="id_linkeval_log", type="integer", nullable=false)
      */
-    private $idLinkevalLog;
+    protected $idLinkevalLog;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="text", nullable=true)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var int
      *
      * @ORM\Column(name="weight", type="smallint", nullable=true)
      */
-    private $weight;
+    protected $weight;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visible", type="boolean", nullable=true)
      */
-    private $visible;
+    protected $visible;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=20, nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id_log", type="integer", nullable=false)
      */
-    private $userIdLog;
+    protected $userIdLog;
 
     /**
      * @var int
@@ -76,7 +76,7 @@ class GradebookLinkevalLog
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set idLinkevalLog.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookResult.php b/src/Chamilo/CoreBundle/Entity/GradebookResult.php
index 9e1ec93b02..77d92aeec2 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookResult.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookResult.php
@@ -18,28 +18,28 @@ class GradebookResult
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="evaluation_id", type="integer", nullable=false)
      */
-    private $evaluationId;
+    protected $evaluationId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score", type="float", precision=10, scale=0, nullable=true)
      */
-    private $score;
+    protected $score;
 
     /**
      * @var int
@@ -48,7 +48,7 @@ class GradebookResult
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php b/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php
index c8f3f7d3d1..513bc22dae 100644
--- a/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php
+++ b/src/Chamilo/CoreBundle/Entity/GradebookScoreLog.php
@@ -25,35 +25,35 @@ class GradebookScoreLog
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=false)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score", type="float", precision=10, scale=0, nullable=false)
      */
-    private $score;
+    protected $score;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="registered_at", type="datetime", nullable=false)
      */
-    private $registeredAt;
+    protected $registeredAt;
 
     /**
      * Get the category id.
diff --git a/src/Chamilo/CoreBundle/Entity/HookCall.php b/src/Chamilo/CoreBundle/Entity/HookCall.php
index bba64cc0c6..91771dcf36 100644
--- a/src/Chamilo/CoreBundle/Entity/HookCall.php
+++ b/src/Chamilo/CoreBundle/Entity/HookCall.php
@@ -18,35 +18,35 @@ class HookCall
      *
      * @ORM\Column(name="hook_event_id", type="integer", nullable=false)
      */
-    private $hookEventId;
+    protected $hookEventId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hook_observer_id", type="integer", nullable=false)
      */
-    private $hookObserverId;
+    protected $hookObserverId;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="type", type="boolean", nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hook_order", type="integer", nullable=false)
      */
-    private $hookOrder;
+    protected $hookOrder;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="enabled", type="boolean", nullable=false)
      */
-    private $enabled;
+    protected $enabled;
 
     /**
      * @var int
@@ -55,7 +55,7 @@ class HookCall
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set hookEventId.
diff --git a/src/Chamilo/CoreBundle/Entity/HookEvent.php b/src/Chamilo/CoreBundle/Entity/HookEvent.php
index 6e207e354d..bda7bd0533 100644
--- a/src/Chamilo/CoreBundle/Entity/HookEvent.php
+++ b/src/Chamilo/CoreBundle/Entity/HookEvent.php
@@ -18,14 +18,14 @@ class HookEvent
      *
      * @ORM\Column(name="class_name", type="string", length=255, nullable=true)
      */
-    private $className;
+    protected $className;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="string", length=255, nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
@@ -34,7 +34,7 @@ class HookEvent
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set className.
diff --git a/src/Chamilo/CoreBundle/Entity/HookObserver.php b/src/Chamilo/CoreBundle/Entity/HookObserver.php
index 7cf3a9312e..5511b0849d 100644
--- a/src/Chamilo/CoreBundle/Entity/HookObserver.php
+++ b/src/Chamilo/CoreBundle/Entity/HookObserver.php
@@ -18,21 +18,21 @@ class HookObserver
      *
      * @ORM\Column(name="class_name", type="string", length=255, nullable=true)
      */
-    private $className;
+    protected $className;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="plugin_name", type="string", length=255, nullable=true)
      */
-    private $pluginName;
+    protected $pluginName;
 
     /**
      * @var int
@@ -41,7 +41,7 @@ class HookObserver
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set className.
diff --git a/src/Chamilo/CoreBundle/Entity/Language.php b/src/Chamilo/CoreBundle/Entity/Language.php
index 238be8f73e..b86bb2f649 100644
--- a/src/Chamilo/CoreBundle/Entity/Language.php
+++ b/src/Chamilo/CoreBundle/Entity/Language.php
@@ -21,55 +21,55 @@ class Language
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="original_name", type="string", length=255, nullable=true)
      */
-    private $originalName;
+    protected $originalName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="english_name", type="string", length=255, nullable=true)
      */
-    private $englishName;
+    protected $englishName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="isocode", type="string", length=10, nullable=true)
      */
-    private $isocode;
+    protected $isocode;
 
     /**
      * @var string
      *
      * @ORM\Column(name="dokeos_folder", type="string", length=250, nullable=true)
      */
-    private $dokeosFolder;
+    protected $dokeosFolder;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="available", type="boolean", nullable=false)
      */
-    private $available;
+    protected $available;
 
     /**
      * @var \Chamilo\CoreBundle\Entity\Language
      * @ORM\ManyToOne(targetEntity="Language", inversedBy="subLanguages")
      * @ORM\JoinColumn(name="parent_id", referencedColumnName="id", nullable=true)
      */
-    private $parent;
+    protected $parent;
 
     /**
      * @var ArrayCollection
      * @ORM\OneToMany(targetEntity="Language", mappedBy="parent")
      */
-    private $subLanguages;
+    protected $subLanguages;
 
     /**
      * Language constructor.
diff --git a/src/Chamilo/CoreBundle/Entity/Legal.php b/src/Chamilo/CoreBundle/Entity/Legal.php
index 36d4d12aef..f5556fe690 100644
--- a/src/Chamilo/CoreBundle/Entity/Legal.php
+++ b/src/Chamilo/CoreBundle/Entity/Legal.php
@@ -20,49 +20,49 @@ class Legal
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="date", type="integer", nullable=false)
      */
-    private $date;
+    protected $date;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="type", type="integer", nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var string
      *
      * @ORM\Column(name="changes", type="text", nullable=false)
      */
-    private $changes;
+    protected $changes;
 
     /**
      * @var int
      *
      * @ORM\Column(name="version", type="integer", nullable=true)
      */
-    private $version;
+    protected $version;
 
     /**
      * @var int
      *
      * @ORM\Column(name="language_id", type="integer")
      */
-    private $languageId;
+    protected $languageId;
 
     /**
      * @return int
diff --git a/src/Chamilo/CoreBundle/Entity/Manager/SessionManager.php b/src/Chamilo/CoreBundle/Entity/Manager/SessionManager.php
index 44715fc9a6..4e17d8a788 100644
--- a/src/Chamilo/CoreBundle/Entity/Manager/SessionManager.php
+++ b/src/Chamilo/CoreBundle/Entity/Manager/SessionManager.php
@@ -121,7 +121,7 @@ class SessionManager extends BaseEntityManager
      * @param Course  $course
      * @param Session $session
      */
-    private function addUserInCourse(
+    protected function addUserInCourse(
         $status,
         User $user,
         Course $course,
diff --git a/src/Chamilo/CoreBundle/Entity/Message.php b/src/Chamilo/CoreBundle/Entity/Message.php
index 6f0c66be6c..940b156d9d 100644
--- a/src/Chamilo/CoreBundle/Entity/Message.php
+++ b/src/Chamilo/CoreBundle/Entity/Message.php
@@ -27,77 +27,77 @@ class Message
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_sender_id", type="integer", nullable=false)
      */
-    private $userSenderId;
+    protected $userSenderId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_receiver_id", type="integer", nullable=false)
      */
-    private $userReceiverId;
+    protected $userReceiverId;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="msg_status", type="boolean", nullable=false)
      */
-    private $msgStatus;
+    protected $msgStatus;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="send_date", type="datetime", nullable=false)
      */
-    private $sendDate;
+    protected $sendDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=false)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_id", type="integer", nullable=false)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="update_date", type="datetime", nullable=true)
      */
-    private $updateDate;
+    protected $updateDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="votes", type="integer", nullable=true)
      */
-    private $votes;
+    protected $votes;
 
     /**
      * Set userSenderId.
diff --git a/src/Chamilo/CoreBundle/Entity/MessageAttachment.php b/src/Chamilo/CoreBundle/Entity/MessageAttachment.php
index bd01d49793..b94ceddf54 100644
--- a/src/Chamilo/CoreBundle/Entity/MessageAttachment.php
+++ b/src/Chamilo/CoreBundle/Entity/MessageAttachment.php
@@ -20,42 +20,42 @@ class MessageAttachment
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="size", type="integer", nullable=false)
      */
-    private $size;
+    protected $size;
 
     /**
      * @var int
      *
      * @ORM\Column(name="message_id", type="integer", nullable=false)
      */
-    private $messageId;
+    protected $messageId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=255, nullable=false)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * Set path.
diff --git a/src/Chamilo/CoreBundle/Entity/Notification.php b/src/Chamilo/CoreBundle/Entity/Notification.php
index f048167cdc..459924f681 100644
--- a/src/Chamilo/CoreBundle/Entity/Notification.php
+++ b/src/Chamilo/CoreBundle/Entity/Notification.php
@@ -27,49 +27,49 @@ class Notification
      *
      * @ORM\Column(name="dest_user_id", type="integer", nullable=false)
      */
-    private $destUserId;
+    protected $destUserId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="dest_mail", type="string", length=255, nullable=true)
      */
-    private $destMail;
+    protected $destMail;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="send_freq", type="smallint", nullable=true)
      */
-    private $sendFreq;
+    protected $sendFreq;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="sent_at", type="datetime", nullable=true)
      */
-    private $sentAt;
+    protected $sentAt;
 
     /**
      * @var int
@@ -78,7 +78,7 @@ class Notification
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set destUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/OpenidAssociation.php b/src/Chamilo/CoreBundle/Entity/OpenidAssociation.php
index c2f85b3adc..0de62f3df0 100644
--- a/src/Chamilo/CoreBundle/Entity/OpenidAssociation.php
+++ b/src/Chamilo/CoreBundle/Entity/OpenidAssociation.php
@@ -18,49 +18,49 @@ class OpenidAssociation
      *
      * @ORM\Column(name="idp_endpoint_uri", type="text", nullable=false)
      */
-    private $idpEndpointUri;
+    protected $idpEndpointUri;
 
     /**
      * @var string
      *
      * @ORM\Column(name="session_type", type="string", length=30, nullable=false)
      */
-    private $sessionType;
+    protected $sessionType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="assoc_handle", type="text", nullable=false)
      */
-    private $assocHandle;
+    protected $assocHandle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="assoc_type", type="text", nullable=false)
      */
-    private $assocType;
+    protected $assocType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="expires_in", type="bigint", nullable=false)
      */
-    private $expiresIn;
+    protected $expiresIn;
 
     /**
      * @var string
      *
      * @ORM\Column(name="mac_key", type="text", nullable=false)
      */
-    private $macKey;
+    protected $macKey;
 
     /**
      * @var int
      *
      * @ORM\Column(name="created", type="bigint", nullable=false)
      */
-    private $created;
+    protected $created;
 
     /**
      * @var int
@@ -69,7 +69,7 @@ class OpenidAssociation
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set idpEndpointUri.
diff --git a/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php b/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php
index 0a864eef1a..29b26fac4e 100644
--- a/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php
+++ b/src/Chamilo/CoreBundle/Entity/PersonalAgenda.php
@@ -21,70 +21,70 @@ class PersonalAgenda
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user", type="integer", nullable=true)
      */
-    private $user;
+    protected $user;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="text", nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="text", type="text", nullable=true)
      */
-    private $text;
+    protected $text;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date", type="datetime", nullable=true)
      */
-    private $date;
+    protected $date;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="enddate", type="datetime", nullable=true)
      */
-    private $enddate;
+    protected $enddate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course", type="string", length=255, nullable=true)
      */
-    private $course;
+    protected $course;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_event_id", type="integer", nullable=true)
      */
-    private $parentEventId;
+    protected $parentEventId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="all_day", type="integer", nullable=false)
      */
-    private $allDay;
+    protected $allDay;
 
     /**
      * @var string
      *
      * @ORM\Column(name="color", type="string", length=255, nullable=true)
      */
-    private $color;
+    protected $color;
 
     /**
      * Set user.
diff --git a/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php b/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php
index 8d4936b06f..5cc2ea2d89 100644
--- a/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php
+++ b/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeat.php
@@ -18,28 +18,28 @@ class PersonalAgendaRepeat
      *
      * @ORM\Column(name="cal_type", type="string", length=20, nullable=true)
      */
-    private $calType;
+    protected $calType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_end", type="integer", nullable=true)
      */
-    private $calEnd;
+    protected $calEnd;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_frequency", type="integer", nullable=true)
      */
-    private $calFrequency;
+    protected $calFrequency;
 
     /**
      * @var string
      *
      * @ORM\Column(name="cal_days", type="string", length=7, nullable=true)
      */
-    private $calDays;
+    protected $calDays;
 
     /**
      * @var int
@@ -48,7 +48,7 @@ class PersonalAgendaRepeat
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $calId;
+    protected $calId;
 
     /**
      * Set calType.
diff --git a/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeatNot.php b/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeatNot.php
index b4161aa519..f3b23eb587 100644
--- a/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeatNot.php
+++ b/src/Chamilo/CoreBundle/Entity/PersonalAgendaRepeatNot.php
@@ -20,7 +20,7 @@ class PersonalAgendaRepeatNot
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $calId;
+    protected $calId;
 
     /**
      * @var int
@@ -29,7 +29,7 @@ class PersonalAgendaRepeatNot
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="NONE")
      */
-    private $calDate;
+    protected $calDate;
 
     /**
      * Set calId.
diff --git a/src/Chamilo/CoreBundle/Entity/PortfolioCategory.php b/src/Chamilo/CoreBundle/Entity/PortfolioCategory.php
index e64a301a8b..8976eed2cc 100644
--- a/src/Chamilo/CoreBundle/Entity/PortfolioCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/PortfolioCategory.php
@@ -31,21 +31,21 @@ class PortfolioCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var null
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description = null;
+    protected $description = null;
 
     /**
      * @var User
@@ -53,21 +53,21 @@ class PortfolioCategory
      * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id", nullable=false, onDelete="CASCADE")
      */
-    private $user;
+    protected $user;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="is_visible", type="boolean", options={"default": true})
      */
-    private $isVisible = true;
+    protected $isVisible = true;
 
     /**
      * @var \Doctrine\Common\Collections\ArrayCollection
      *
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\Portfolio", mappedBy="category")
      */
-    private $items;
+    protected $items;
 
     /**
      * PortfolioCategory constructor.
diff --git a/src/Chamilo/CoreBundle/Entity/Promotion.php b/src/Chamilo/CoreBundle/Entity/Promotion.php
index 467f9e32f5..6f405b1ad2 100644
--- a/src/Chamilo/CoreBundle/Entity/Promotion.php
+++ b/src/Chamilo/CoreBundle/Entity/Promotion.php
@@ -20,21 +20,21 @@ class Promotion
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var Career
@@ -42,28 +42,28 @@ class Promotion
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Career")
      * @ORM\JoinColumn(name="career_id", referencedColumnName="id")
      */
-    private $career;
+    protected $career;
 
     /**
      * @var int
      *
      * @ORM\Column(name="status", type="integer", nullable=false)
      */
-    private $status;
+    protected $status;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_at", type="datetime", nullable=false)
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="updated_at", type="datetime", nullable=false)
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php b/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php
index facd3fdc90..467cced6ae 100644
--- a/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php
+++ b/src/Chamilo/CoreBundle/Entity/Repository/SequenceRepository.php
@@ -215,7 +215,7 @@ class SequenceRepository extends EntityRepository
      *
      * @return array
      */
-    private function findSessionFromVerticesEdges(Vertices $verticesEdges)
+    protected function findSessionFromVerticesEdges(Vertices $verticesEdges)
     {
         $sessionVertices = [];
         foreach ($verticesEdges as $supVertex) {
diff --git a/src/Chamilo/CoreBundle/Entity/Room.php b/src/Chamilo/CoreBundle/Entity/Room.php
index f2fe517d38..a6912c1c30 100644
--- a/src/Chamilo/CoreBundle/Entity/Room.php
+++ b/src/Chamilo/CoreBundle/Entity/Room.php
@@ -20,42 +20,42 @@ class Room
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true, unique=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="geolocation", type="string", length=255, nullable=true, unique=false)
      */
-    private $geolocation;
+    protected $geolocation;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ip", type="string", length=39, nullable=true, unique=false)
      */
-    private $ip;
+    protected $ip;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ip_mask", type="string", length=6, nullable=true, unique=false)
      */
-    private $ipMask;
+    protected $ipMask;
 
     /**
      * @var BranchSync
@@ -63,7 +63,7 @@ class Room
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\BranchSync")
      * @ORM\JoinColumn(name="branch_id", referencedColumnName="id")
      */
-    private $branch;
+    protected $branch;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SearchEngineRef.php b/src/Chamilo/CoreBundle/Entity/SearchEngineRef.php
index baced79616..bd7b43edd7 100644
--- a/src/Chamilo/CoreBundle/Entity/SearchEngineRef.php
+++ b/src/Chamilo/CoreBundle/Entity/SearchEngineRef.php
@@ -18,35 +18,35 @@ class SearchEngineRef
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=false)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tool_id", type="string", length=100, nullable=false)
      */
-    private $toolId;
+    protected $toolId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="ref_id_high_level", type="integer", nullable=false)
      */
-    private $refIdHighLevel;
+    protected $refIdHighLevel;
 
     /**
      * @var int
      *
      * @ORM\Column(name="ref_id_second_level", type="integer", nullable=true)
      */
-    private $refIdSecondLevel;
+    protected $refIdSecondLevel;
 
     /**
      * @var int
      *
      * @ORM\Column(name="search_did", type="integer", nullable=false)
      */
-    private $searchDid;
+    protected $searchDid;
 
     /**
      * @var int
@@ -55,7 +55,7 @@ class SearchEngineRef
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set courseCode.
diff --git a/src/Chamilo/CoreBundle/Entity/Sequence.php b/src/Chamilo/CoreBundle/Entity/Sequence.php
index 74b5644479..1bafea011c 100644
--- a/src/Chamilo/CoreBundle/Entity/Sequence.php
+++ b/src/Chamilo/CoreBundle/Entity/Sequence.php
@@ -22,21 +22,21 @@ class Sequence
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string")
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="graph", type="text", nullable=true)
      */
-    private $graph;
+    protected $graph;
 
     /**
      * @var \DateTime
@@ -44,7 +44,7 @@ class Sequence
      * @Gedmo\Timestampable(on="create")
      * @ORM\Column(name="created_at", type="datetime")
      */
-    private $createdAt;
+    protected $createdAt;
 
     /**
      * @var \DateTime
@@ -52,7 +52,7 @@ class Sequence
      * @Gedmo\Timestampable(on="update")
      * @ORM\Column(name="updated_at", type="datetime")
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * @return string
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceCondition.php b/src/Chamilo/CoreBundle/Entity/SequenceCondition.php
index bea82864ae..9deef72233 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceCondition.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceCondition.php
@@ -20,42 +20,42 @@ class SequenceCondition
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="mat_op", type="string")
      */
-    private $mathOperation;
+    protected $mathOperation;
 
     /**
      * @var string
      *
      * @ORM\Column(name="param", type="float")
      */
-    private $param;
+    protected $param;
 
     /**
      * @var string
      *
      * @ORM\Column(name="act_true", type="integer")
      */
-    private $actTrue;
+    protected $actTrue;
 
     /**
      * @var string
      *
      * @ORM\Column(name="act_false", type="string")
      */
-    private $actFalse;
+    protected $actFalse;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceFormula.php b/src/Chamilo/CoreBundle/Entity/SequenceFormula.php
index 1a242770c4..64f7c63af9 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceFormula.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceFormula.php
@@ -20,19 +20,19 @@ class SequenceFormula
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceMethod")
      * @ORM\JoinColumn(name="sequence_method_id", referencedColumnName="id")
      */
-    private $method;
+    protected $method;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceVariable")
      * @ORM\JoinColumn(name="sequence_variable_id", referencedColumnName="id")
      */
-    private $variable;
+    protected $variable;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceMethod.php b/src/Chamilo/CoreBundle/Entity/SequenceMethod.php
index 1d5f8842e7..f1cd7d6af5 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceMethod.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceMethod.php
@@ -20,42 +20,42 @@ class SequenceMethod
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="formula", type="text")
      */
-    private $formula;
+    protected $formula;
 
     /**
      * @var string
      *
      * @ORM\Column(name="assign", type="integer")
      */
-    private $assign;
+    protected $assign;
 
     /**
      * @var string
      *
      * @ORM\Column(name="met_type", type="string")
      */
-    private $metType;
+    protected $metType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="act_false", type="string")
      */
-    private $actFalse;
+    protected $actFalse;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceResource.php b/src/Chamilo/CoreBundle/Entity/SequenceResource.php
index 70202dcd6b..0e80a45ead 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceResource.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceResource.php
@@ -31,21 +31,21 @@ class SequenceResource
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="type", type="integer")
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="resource_id", type="integer")
      */
-    private $resourceId;
+    protected $resourceId;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceRowEntity.php b/src/Chamilo/CoreBundle/Entity/SequenceRowEntity.php
index 9e93d338a5..8efa32021e 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceRowEntity.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceRowEntity.php
@@ -20,41 +20,41 @@ class SequenceRowEntity
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer")
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="row_id", type="integer")
      */
-    private $rowId;
+    protected $rowId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceTypeEntity")
      * @ORM\JoinColumn(name="sequence_type_entity_id", referencedColumnName="id")
      */
-    private $type;
+    protected $type;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceRule.php b/src/Chamilo/CoreBundle/Entity/SequenceRule.php
index bd04b614c2..209ada826b 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceRule.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceRule.php
@@ -20,14 +20,14 @@ class SequenceRule
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php b/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php
index a02f72e0fe..5984b7bc73 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceRuleCondition.php
@@ -20,19 +20,19 @@ class SequenceRuleCondition
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceRule")
      * @ORM\JoinColumn(name="sequence_rule_id", referencedColumnName="id")
      */
-    private $rule;
+    protected $rule;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceCondition")
      * @ORM\JoinColumn(name="sequence_condition_id", referencedColumnName="id")
      */
-    private $condition;
+    protected $condition;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceRuleMethod.php b/src/Chamilo/CoreBundle/Entity/SequenceRuleMethod.php
index 8a09abcc60..41dfb0a1bb 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceRuleMethod.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceRuleMethod.php
@@ -20,26 +20,26 @@ class SequenceRuleMethod
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="method_order", type="integer")
      */
-    private $methodOrder;
+    protected $methodOrder;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceRule")
      * @ORM\JoinColumn(name="sequence_rule_id", referencedColumnName="id")
      */
-    private $rule;
+    protected $rule;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceMethod")
      * @ORM\JoinColumn(name="sequence_method_id", referencedColumnName="id")
      */
-    private $method;
+    protected $method;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php b/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php
index 08c37578f0..8d14a30695 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceTypeEntity.php
@@ -20,28 +20,28 @@ class SequenceTypeEntity
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ent_table", type="string", length=255, nullable=false)
      */
-    private $entityTable;
+    protected $entityTable;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceValid.php b/src/Chamilo/CoreBundle/Entity/SequenceValid.php
index 09e47e734f..7171b808ae 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceValid.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceValid.php
@@ -20,19 +20,19 @@ class SequenceValid
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceVariable")
      * @ORM\JoinColumn(name="sequence_variable_id", referencedColumnName="id")
      */
-    private $variable;
+    protected $variable;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceCondition")
      * @ORM\JoinColumn(name="sequence_condition_id", referencedColumnName="id")
      */
-    private $condition;
+    protected $condition;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceValue.php b/src/Chamilo/CoreBundle/Entity/SequenceValue.php
index 4fd0bbf05d..d92080a219 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceValue.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceValue.php
@@ -20,76 +20,76 @@ class SequenceValue
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @ORM\ManyToOne(targetEntity="SequenceRowEntity")
      * @ORM\JoinColumn(name="sequence_row_entity_id", referencedColumnName="id")
      */
-    private $entity;
+    protected $entity;
 
     /**
      * @var int
      *
      * @ORM\Column(name="advance", type="float")
      */
-    private $advance;
+    protected $advance;
 
     /**
      * @var int
      *
      * @ORM\Column(name="complete_items", type="integer")
      */
-    private $completeItems;
+    protected $completeItems;
 
     /**
      * @var int
      *
      * @ORM\Column(name="total_items", type="integer")
      */
-    private $totalItems;
+    protected $totalItems;
 
     /**
      * @var int
      *
      * @ORM\Column(name="success", type="boolean")
      */
-    private $success;
+    protected $success;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="success_date", type="datetime", nullable=true)
      */
-    private $successDate;
+    protected $successDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="available", type="boolean")
      */
-    private $available;
+    protected $available;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="available_start_date", type="datetime", nullable=true)
      */
-    private $availableStartDate;
+    protected $availableStartDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="available_end_date", type="datetime", nullable=true)
      */
-    private $availableEndDate;
+    protected $availableEndDate;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SequenceVariable.php b/src/Chamilo/CoreBundle/Entity/SequenceVariable.php
index 2052869e2e..d1e73d4306 100644
--- a/src/Chamilo/CoreBundle/Entity/SequenceVariable.php
+++ b/src/Chamilo/CoreBundle/Entity/SequenceVariable.php
@@ -20,28 +20,28 @@ class SequenceVariable
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", nullable=true)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_val", type="string", nullable=true)
      */
-    private $defaultValue;
+    protected $defaultValue;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SessionCategory.php b/src/Chamilo/CoreBundle/Entity/SessionCategory.php
index 24a8e107e7..f5c41be87d 100644
--- a/src/Chamilo/CoreBundle/Entity/SessionCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/SessionCategory.php
@@ -30,28 +30,28 @@ class SessionCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=100, nullable=true, unique=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_start", type="date", nullable=true, unique=false)
      */
-    private $dateStart;
+    protected $dateStart;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_end", type="date", nullable=true, unique=false)
      */
-    private $dateEnd;
+    protected $dateEnd;
 
     /**
      * @return string
diff --git a/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php b/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php
index 8f68f20fd6..05c8d93b27 100644
--- a/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php
+++ b/src/Chamilo/CoreBundle/Entity/SettingsCurrent.php
@@ -23,91 +23,91 @@ class SettingsCurrent
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="variable", type="string", length=255, nullable=true)
      */
-    private $variable;
+    protected $variable;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subkey", type="string", length=255, nullable=true)
      */
-    private $subkey;
+    protected $subkey;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=255, nullable=true)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var string
      *
      * @ORM\Column(name="category", type="string", length=255, nullable=true)
      */
-    private $category;
+    protected $category;
 
     /**
      * @var string
      *
      * @ORM\Column(name="selected_value", type="string", length=255, nullable=true)
      */
-    private $selectedValue;
+    protected $selectedValue;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="string", length=255, nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="scope", type="string", length=50, nullable=true)
      */
-    private $scope;
+    protected $scope;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subkeytext", type="string", length=255, nullable=true)
      */
-    private $subkeytext;
+    protected $subkeytext;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url", type="integer", nullable=false, options={"default": 1 } )
      */
-    private $accessUrl;
+    protected $accessUrl;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_changeable", type="integer", nullable=false)
      */
-    private $accessUrlChangeable;
+    protected $accessUrlChangeable;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_locked", type="integer", nullable=false, options={"default": 0 } )
      */
-    private $accessUrlLocked = 0;
+    protected $accessUrlLocked = 0;
 
     /**
      * Set variable.
diff --git a/src/Chamilo/CoreBundle/Entity/SettingsOptions.php b/src/Chamilo/CoreBundle/Entity/SettingsOptions.php
index 689b92e9a5..e04263b063 100644
--- a/src/Chamilo/CoreBundle/Entity/SettingsOptions.php
+++ b/src/Chamilo/CoreBundle/Entity/SettingsOptions.php
@@ -20,28 +20,28 @@ class SettingsOptions
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="variable", type="string", length=255, nullable=true)
      */
-    private $variable;
+    protected $variable;
 
     /**
      * @var string
      *
      * @ORM\Column(name="value", type="string", length=255, nullable=true)
      */
-    private $value;
+    protected $value;
 
     /**
      * @var string
      *
      * @ORM\Column(name="display_text", type="string", length=255, nullable=false)
      */
-    private $displayText;
+    protected $displayText;
 
     /**
      * Set variable.
diff --git a/src/Chamilo/CoreBundle/Entity/SharedSurvey.php b/src/Chamilo/CoreBundle/Entity/SharedSurvey.php
index d8a2f14bfa..9d403cfda7 100644
--- a/src/Chamilo/CoreBundle/Entity/SharedSurvey.php
+++ b/src/Chamilo/CoreBundle/Entity/SharedSurvey.php
@@ -18,70 +18,70 @@ class SharedSurvey
      *
      * @ORM\Column(name="code", type="string", length=20, nullable=true)
      */
-    private $code;
+    protected $code;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="text", nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subtitle", type="text", nullable=true)
      */
-    private $subtitle;
+    protected $subtitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="author", type="string", length=250, nullable=true)
      */
-    private $author;
+    protected $author;
 
     /**
      * @var string
      *
      * @ORM\Column(name="lang", type="string", length=20, nullable=true)
      */
-    private $lang;
+    protected $lang;
 
     /**
      * @var string
      *
      * @ORM\Column(name="template", type="string", length=20, nullable=true)
      */
-    private $template;
+    protected $template;
 
     /**
      * @var string
      *
      * @ORM\Column(name="intro", type="text", nullable=true)
      */
-    private $intro;
+    protected $intro;
 
     /**
      * @var string
      *
      * @ORM\Column(name="surveythanks", type="text", nullable=true)
      */
-    private $surveythanks;
+    protected $surveythanks;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="creation_date", type="datetime", nullable=false)
      */
-    private $creationDate;
+    protected $creationDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=false)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var int
@@ -90,7 +90,7 @@ class SharedSurvey
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * Set code.
diff --git a/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestion.php b/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestion.php
index 46f63967b2..bbedef30f9 100644
--- a/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestion.php
+++ b/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestion.php
@@ -18,56 +18,56 @@ class SharedSurveyQuestion
      *
      * @ORM\Column(name="survey_id", type="integer", nullable=false)
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="survey_question", type="text", nullable=false)
      */
-    private $surveyQuestion;
+    protected $surveyQuestion;
 
     /**
      * @var string
      *
      * @ORM\Column(name="survey_question_comment", type="text", nullable=false)
      */
-    private $surveyQuestionComment;
+    protected $surveyQuestionComment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=250, nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var string
      *
      * @ORM\Column(name="display", type="string", length=10, nullable=false)
      */
-    private $display;
+    protected $display;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sort", type="integer", nullable=false)
      */
-    private $sort;
+    protected $sort;
 
     /**
      * @var string
      *
      * @ORM\Column(name="code", type="string", length=40, nullable=false)
      */
-    private $code;
+    protected $code;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_value", type="integer", nullable=false)
      */
-    private $maxValue;
+    protected $maxValue;
 
     /**
      * @var int
@@ -76,7 +76,7 @@ class SharedSurveyQuestion
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * Set surveyId.
diff --git a/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestionOption.php b/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestionOption.php
index f74a6a2171..d0a300c338 100644
--- a/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestionOption.php
+++ b/src/Chamilo/CoreBundle/Entity/SharedSurveyQuestionOption.php
@@ -18,28 +18,28 @@ class SharedSurveyQuestionOption
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_id", type="integer", nullable=false)
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="option_text", type="text", nullable=false)
      */
-    private $optionText;
+    protected $optionText;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sort", type="integer", nullable=false)
      */
-    private $sort;
+    protected $sort;
 
     /**
      * @var int
@@ -48,7 +48,7 @@ class SharedSurveyQuestionOption
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $questionOptionId;
+    protected $questionOptionId;
 
     /**
      * Set questionId.
diff --git a/src/Chamilo/CoreBundle/Entity/Skill.php b/src/Chamilo/CoreBundle/Entity/Skill.php
index 76ef2729ec..76792bec6c 100644
--- a/src/Chamilo/CoreBundle/Entity/Skill.php
+++ b/src/Chamilo/CoreBundle/Entity/Skill.php
@@ -52,63 +52,63 @@ class Skill
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="short_code", type="string", length=100, nullable=false)
      */
-    private $shortCode;
+    protected $shortCode;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer", nullable=false)
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="icon", type="string", length=255, nullable=false)
      */
-    private $icon;
+    protected $icon;
 
     /**
      * @var string
      *
      * @ORM\Column(name="criteria", type="text", nullable=true)
      */
-    private $criteria;
+    protected $criteria;
 
     /**
      * @var int
      *
      * @ORM\Column(name="status", type="integer", nullable=false, options={"default": 1})
      */
-    private $status;
+    protected $status;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="updated_at", type="datetime", nullable=false)
      */
-    private $updatedAt;
+    protected $updatedAt;
 
     /**
      * @return string
diff --git a/src/Chamilo/CoreBundle/Entity/SkillProfile.php b/src/Chamilo/CoreBundle/Entity/SkillProfile.php
index dc397f3bac..6efa2d8f10 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillProfile.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillProfile.php
@@ -20,21 +20,21 @@ class SkillProfile
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelGradebook.php b/src/Chamilo/CoreBundle/Entity/SkillRelGradebook.php
index 2887e46a6c..cf2fff8da3 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelGradebook.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelGradebook.php
@@ -20,28 +20,28 @@ class SkillRelGradebook
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="gradebook_id", type="integer", nullable=false)
      */
-    private $gradebookId;
+    protected $gradebookId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="skill_id", type="integer", nullable=false)
      */
-    private $skillId;
+    protected $skillId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=10, nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * Set gradebookId.
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelProfile.php b/src/Chamilo/CoreBundle/Entity/SkillRelProfile.php
index aad0905ffd..9f2e586fbb 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelProfile.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelProfile.php
@@ -20,21 +20,21 @@ class SkillRelProfile
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="skill_id", type="integer", nullable=false)
      */
-    private $skillId;
+    protected $skillId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="profile_id", type="integer", nullable=false)
      */
-    private $profileId;
+    protected $profileId;
 
     /**
      * Set skillId.
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelSkill.php b/src/Chamilo/CoreBundle/Entity/SkillRelSkill.php
index f6729b522a..8aed99e363 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelSkill.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelSkill.php
@@ -20,35 +20,35 @@ class SkillRelSkill
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="skill_id", type="integer", nullable=false)
      */
-    private $skillId;
+    protected $skillId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_id", type="integer", nullable=false)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="relation_type", type="integer", nullable=false)
      */
-    private $relationType;
+    protected $relationType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="level", type="integer", nullable=false)
      */
-    private $level;
+    protected $level;
 
     /**
      * Set skillId.
diff --git a/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php b/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php
index 8c53c15320..f68f9f547e 100644
--- a/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php
+++ b/src/Chamilo/CoreBundle/Entity/SkillRelUserComment.php
@@ -26,40 +26,40 @@ class SkillRelUserComment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\SkillRelUser", inversedBy="comments")
      * @ORM\JoinColumn(name="skill_rel_user_id", referencedColumnName="id")
      */
-    private $skillRelUser;
+    protected $skillRelUser;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User", inversedBy="commentedUserSkills")
      * @ORM\JoinColumn(name="feedback_giver_id", referencedColumnName="id")
      */
-    private $feedbackGiver;
+    protected $feedbackGiver;
 
     /**
      * @var string
      *
      * @ORM\Column(name="feedback_text", type="text")
      */
-    private $feedbackText;
+    protected $feedbackText;
 
     /**
      * @var int
      *
      * @ORM\Column(name="feedback_value", type="integer", nullable=true, options={"default":1})
      */
-    private $feedbackValue;
+    protected $feedbackValue;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="feedback_datetime", type="datetime")
      */
-    private $feedbackDateTime;
+    protected $feedbackDateTime;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CoreBundle/Entity/SpecificField.php b/src/Chamilo/CoreBundle/Entity/SpecificField.php
index 29f0f52e29..ff31010bc6 100644
--- a/src/Chamilo/CoreBundle/Entity/SpecificField.php
+++ b/src/Chamilo/CoreBundle/Entity/SpecificField.php
@@ -20,14 +20,14 @@ class SpecificField
      *
      * @ORM\Column(name="code", type="string", length=1, nullable=false)
      */
-    private $code;
+    protected $code;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=200, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var int
@@ -36,7 +36,7 @@ class SpecificField
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set code.
diff --git a/src/Chamilo/CoreBundle/Entity/SpecificFieldValues.php b/src/Chamilo/CoreBundle/Entity/SpecificFieldValues.php
index a684e1da7b..8305eab44b 100644
--- a/src/Chamilo/CoreBundle/Entity/SpecificFieldValues.php
+++ b/src/Chamilo/CoreBundle/Entity/SpecificFieldValues.php
@@ -18,35 +18,35 @@ class SpecificFieldValues
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=false)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tool_id", type="string", length=100, nullable=false)
      */
-    private $toolId;
+    protected $toolId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="ref_id", type="integer", nullable=false)
      */
-    private $refId;
+    protected $refId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="field_id", type="integer", nullable=false)
      */
-    private $fieldId;
+    protected $fieldId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="value", type="string", length=200, nullable=false)
      */
-    private $value;
+    protected $value;
 
     /**
      * @var int
@@ -55,7 +55,7 @@ class SpecificFieldValues
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set courseCode.
diff --git a/src/Chamilo/CoreBundle/Entity/SysAnnouncement.php b/src/Chamilo/CoreBundle/Entity/SysAnnouncement.php
index dc856f6683..e8d1e5b700 100644
--- a/src/Chamilo/CoreBundle/Entity/SysAnnouncement.php
+++ b/src/Chamilo/CoreBundle/Entity/SysAnnouncement.php
@@ -18,63 +18,63 @@ class SysAnnouncement
      *
      * @ORM\Column(name="date_start", type="datetime", nullable=false)
      */
-    private $dateStart;
+    protected $dateStart;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_end", type="datetime", nullable=false)
      */
-    private $dateEnd;
+    protected $dateEnd;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visible_teacher", type="boolean", nullable=false)
      */
-    private $visibleTeacher;
+    protected $visibleTeacher;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visible_student", type="boolean", nullable=false)
      */
-    private $visibleStudent;
+    protected $visibleStudent;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visible_guest", type="boolean", nullable=false)
      */
-    private $visibleGuest;
+    protected $visibleGuest;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=250, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=false)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var string
      *
      * @ORM\Column(name="lang", type="string", length=70, nullable=true)
      */
-    private $lang;
+    protected $lang;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer", nullable=false)
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
@@ -83,7 +83,7 @@ class SysAnnouncement
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set dateStart.
diff --git a/src/Chamilo/CoreBundle/Entity/SysCalendar.php b/src/Chamilo/CoreBundle/Entity/SysCalendar.php
index c8df52bc7d..6c8cfb0a47 100644
--- a/src/Chamilo/CoreBundle/Entity/SysCalendar.php
+++ b/src/Chamilo/CoreBundle/Entity/SysCalendar.php
@@ -18,42 +18,42 @@ class SysCalendar
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="start_date", type="datetime", nullable=true)
      */
-    private $startDate;
+    protected $startDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="end_date", type="datetime", nullable=true)
      */
-    private $endDate;
+    protected $endDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer", nullable=false)
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="all_day", type="integer", nullable=false)
      */
-    private $allDay;
+    protected $allDay;
 
     /**
      * @var int
@@ -62,7 +62,7 @@ class SysCalendar
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CoreBundle/Entity/SystemTemplate.php b/src/Chamilo/CoreBundle/Entity/SystemTemplate.php
index 837c3479d7..4bf549d643 100644
--- a/src/Chamilo/CoreBundle/Entity/SystemTemplate.php
+++ b/src/Chamilo/CoreBundle/Entity/SystemTemplate.php
@@ -20,35 +20,35 @@ class SystemTemplate
      * @ORM\Id
      * @ORM\GeneratedValue()
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=250, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=false)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="image", type="string", length=250, nullable=false)
      */
-    private $image;
+    protected $image;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=false)
      */
-    private $content;
+    protected $content;
 
     public function __construct()
     {
diff --git a/src/Chamilo/CoreBundle/Entity/Tag.php b/src/Chamilo/CoreBundle/Entity/Tag.php
index 1bbbdfc044..a948def8f6 100644
--- a/src/Chamilo/CoreBundle/Entity/Tag.php
+++ b/src/Chamilo/CoreBundle/Entity/Tag.php
@@ -20,28 +20,28 @@ class Tag
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tag", type="string", length=255, nullable=false)
      */
-    private $tag;
+    protected $tag;
 
     /**
      * @var int
      *
      * @ORM\Column(name="field_id", type="integer", nullable=false)
      */
-    private $fieldId;
+    protected $fieldId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="count", type="integer", nullable=false)
      */
-    private $count;
+    protected $count;
 
     /**
      * Set tag.
diff --git a/src/Chamilo/CoreBundle/Entity/Templates.php b/src/Chamilo/CoreBundle/Entity/Templates.php
index d09aedf1ad..bfa1452106 100644
--- a/src/Chamilo/CoreBundle/Entity/Templates.php
+++ b/src/Chamilo/CoreBundle/Entity/Templates.php
@@ -18,42 +18,42 @@ class Templates
      *
      * @ORM\Column(name="title", type="string", length=100, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="string", length=250, nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_code", type="string", length=40, nullable=false)
      */
-    private $courseCode;
+    protected $courseCode;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="ref_doc", type="integer", nullable=false)
      */
-    private $refDoc;
+    protected $refDoc;
 
     /**
      * @var string
      *
      * @ORM\Column(name="image", type="string", length=250, nullable=false)
      */
-    private $image;
+    protected $image;
 
     /**
      * @var int
@@ -62,7 +62,7 @@ class Templates
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php b/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php
index 09bc7da003..0f5e7fb029 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackCourseRanking.php
@@ -23,49 +23,49 @@ class TrackCourseRanking
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="url_id", type="integer", nullable=false)
      */
-    private $urlId;
+    protected $urlId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="accesses", type="integer", nullable=false)
      */
-    private $accesses;
+    protected $accesses;
 
     /**
      * @var int
      *
      * @ORM\Column(name="total_score", type="integer", nullable=false)
      */
-    private $totalScore;
+    protected $totalScore;
 
     /**
      * @var int
      *
      * @ORM\Column(name="users", type="integer", nullable=false)
      */
-    private $users;
+    protected $users;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="creation_date", type="datetime", nullable=false)
      */
-    private $creationDate;
+    protected $creationDate;
 
     /**
      * @var int
@@ -74,7 +74,7 @@ class TrackCourseRanking
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAccess.php b/src/Chamilo/CoreBundle/Entity/TrackEAccess.php
index 058452d332..42e78a4558 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAccess.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAccess.php
@@ -22,42 +22,42 @@ class TrackEAccess
      *
      * @ORM\Column(name="access_user_id", type="integer", nullable=true)
      */
-    private $accessUserId;
+    protected $accessUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="access_date", type="datetime", nullable=false)
      */
-    private $accessDate;
+    protected $accessDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="access_tool", type="string", length=30, nullable=true)
      */
-    private $accessTool;
+    protected $accessTool;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_session_id", type="integer", nullable=false)
      */
-    private $accessSessionId;
+    protected $accessSessionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user_ip", type="string", length=39, nullable=false)
      */
-    private $userIp;
+    protected $userIp;
 
     /**
      * @var int
@@ -66,7 +66,7 @@ class TrackEAccess
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $accessId;
+    protected $accessId;
 
     /**
      * Set accessUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php b/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php
index e521994599..2191cc707f 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAttempt.php
@@ -27,77 +27,77 @@ class TrackEAttempt
      *
      * @ORM\Column(name="exe_id", type="integer", nullable=true)
      */
-    private $exeId;
+    protected $exeId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="answer", type="text", nullable=false)
      */
-    private $answer;
+    protected $answer;
 
     /**
      * @var string
      *
      * @ORM\Column(name="teacher_comment", type="text", nullable=false)
      */
-    private $teacherComment;
+    protected $teacherComment;
 
     /**
      * @var float
      *
      * @ORM\Column(name="marks", type="float", precision=6, scale=2, nullable=false)
      */
-    private $marks;
+    protected $marks;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="position", type="integer", nullable=true)
      */
-    private $position;
+    protected $position;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="tms", type="datetime", nullable=true)
      */
-    private $tms;
+    protected $tms;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=255, nullable=true)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * @var int
@@ -106,7 +106,7 @@ class TrackEAttempt
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set exeId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php b/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
index 7373b367e9..a5133280dc 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAttemptCoeff.php
@@ -20,21 +20,21 @@ class TrackEAttemptCoeff
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attempt_id", type="integer", nullable=false)
      */
-    private $attemptId;
+    protected $attemptId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="marks_coeff", type="float", precision=6, scale=2, nullable=true)
      */
-    private $marksCoeff;
+    protected $marksCoeff;
 
     /**
      * Set attemptId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php b/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
index 98fc6f52b7..6f03852c47 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEAttemptRecording.php
@@ -25,56 +25,56 @@ class TrackEAttemptRecording
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exe_id", type="integer", nullable=false)
      */
-    private $exeId;
+    protected $exeId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="marks", type="integer", nullable=false)
      */
-    private $marks;
+    protected $marks;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="insert_date", type="datetime", nullable=false)
      */
-    private $insertDate;
+    protected $insertDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="author", type="integer", nullable=false)
      */
-    private $author;
+    protected $author;
 
     /**
      * @var string
      *
      * @ORM\Column(name="teacher_comment", type="text", nullable=false)
      */
-    private $teacherComment;
+    protected $teacherComment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set exeId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php b/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php
index 9ba9d77db2..0dac974899 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackECourseAccess.php
@@ -28,56 +28,56 @@ class TrackECourseAccess
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $courseAccessId;
+    protected $courseAccessId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="login_course_date", type="datetime", nullable=false)
      */
-    private $loginCourseDate;
+    protected $loginCourseDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="logout_course_date", type="datetime", nullable=true)
      */
-    private $logoutCourseDate;
+    protected $logoutCourseDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="counter", type="integer", nullable=false)
      */
-    private $counter;
+    protected $counter;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user_ip", type="string", length=39, nullable=false)
      */
-    private $userIp;
+    protected $userIp;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEDefault.php b/src/Chamilo/CoreBundle/Entity/TrackEDefault.php
index 6c62af6971..26e3655218 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEDefault.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEDefault.php
@@ -26,56 +26,56 @@ class TrackEDefault
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $defaultId;
+    protected $defaultId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="default_user_id", type="integer", nullable=false)
      */
-    private $defaultUserId;
+    protected $defaultUserId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=true)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="default_date", type="datetime", nullable=true)
      */
-    private $defaultDate;
+    protected $defaultDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_event_type", type="string", length=255, nullable=false)
      */
-    private $defaultEventType;
+    protected $defaultEventType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_value_type", type="string", length=255, nullable=false)
      */
-    private $defaultValueType;
+    protected $defaultValueType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_value", type="text", nullable=false)
      */
-    private $defaultValue;
+    protected $defaultValue;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set defaultUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php b/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php
index b482d168a0..3c42378bcb 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEDownloads.php
@@ -24,42 +24,42 @@ class TrackEDownloads
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $downId;
+    protected $downId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="down_user_id", type="integer", nullable=true)
      */
-    private $downUserId;
+    protected $downUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="down_date", type="datetime", nullable=false)
      */
-    private $downDate;
+    protected $downDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="down_doc_path", type="string", length=255, nullable=false)
      */
-    private $downDocPath;
+    protected $downDocPath;
 
     /**
      * @var int
      *
      * @ORM\Column(name="down_session_id", type="integer", nullable=false)
      */
-    private $downSessionId;
+    protected $downSessionId;
 
     /**
      * Set downUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEExercises.php b/src/Chamilo/CoreBundle/Entity/TrackEExercises.php
index fe20616f78..1dca552c3f 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEExercises.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEExercises.php
@@ -22,126 +22,126 @@ class TrackEExercises
      *
      * @ORM\Column(name="exe_user_id", type="integer", nullable=true)
      */
-    private $exeUserId;
+    protected $exeUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="exe_date", type="datetime", nullable=false)
      */
-    private $exeDate;
+    protected $exeDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exe_exo_id", type="integer", nullable=false)
      */
-    private $exeExoId;
+    protected $exeExoId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="exe_result", type="float", precision=6, scale=2, nullable=false)
      */
-    private $exeResult;
+    protected $exeResult;
 
     /**
      * @var float
      *
      * @ORM\Column(name="exe_weighting", type="float", precision=6, scale=2, nullable=false)
      */
-    private $exeWeighting;
+    protected $exeWeighting;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user_ip", type="string", length=39, nullable=false)
      */
-    private $userIp;
+    protected $userIp;
 
     /**
      * @var string
      *
      * @ORM\Column(name="status", type="string", length=20, nullable=false)
      */
-    private $status;
+    protected $status;
 
     /**
      * @var string
      *
      * @ORM\Column(name="data_tracking", type="text", nullable=false)
      */
-    private $dataTracking;
+    protected $dataTracking;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="start_date", type="datetime", nullable=false)
      */
-    private $startDate;
+    protected $startDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="steps_counter", type="smallint", nullable=false)
      */
-    private $stepsCounter;
+    protected $stepsCounter;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="smallint", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="orig_lp_id", type="integer", nullable=false)
      */
-    private $origLpId;
+    protected $origLpId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="orig_lp_item_id", type="integer", nullable=false)
      */
-    private $origLpItemId;
+    protected $origLpItemId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exe_duration", type="integer", nullable=false)
      */
-    private $exeDuration;
+    protected $exeDuration;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="expired_time_control", type="datetime", nullable=true)
      */
-    private $expiredTimeControl;
+    protected $expiredTimeControl;
 
     /**
      * @var int
      *
      * @ORM\Column(name="orig_lp_item_view_id", type="integer", nullable=false)
      */
-    private $origLpItemViewId;
+    protected $origLpItemViewId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="questions_to_check", type="text", nullable=false)
      */
-    private $questionsToCheck;
+    protected $questionsToCheck;
 
     /**
      * @var int
@@ -150,7 +150,7 @@ class TrackEExercises
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $exeId;
+    protected $exeId;
 
     /**
      * Set exeUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php b/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
index 7dcefd583b..c128ed933e 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEHotpotatoes.php
@@ -23,49 +23,49 @@ class TrackEHotpotatoes
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="exe_name", type="string", length=255, nullable=false)
      */
-    private $exeName;
+    protected $exeName;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exe_user_id", type="integer", nullable=true)
      */
-    private $exeUserId;
+    protected $exeUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="exe_date", type="datetime", nullable=false)
      */
-    private $exeDate;
+    protected $exeDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exe_result", type="smallint", nullable=false)
      */
-    private $exeResult;
+    protected $exeResult;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exe_weighting", type="smallint", nullable=false)
      */
-    private $exeWeighting;
+    protected $exeWeighting;
 
     /**
      * Set exeName.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php b/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
index 99069e8095..8066dc2e53 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEHotspot.php
@@ -25,63 +25,63 @@ class TrackEHotspot
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $hotspotId;
+    protected $hotspotId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hotspot_user_id", type="integer", nullable=false)
      */
-    private $hotspotUserId;
+    protected $hotspotUserId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="hotspot_course_code", type="string", length=50, nullable=false)
      */
-    private $hotspotCourseCode;
+    protected $hotspotCourseCode;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=true)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hotspot_exe_id", type="integer", nullable=false)
      */
-    private $hotspotExeId;
+    protected $hotspotExeId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hotspot_question_id", type="integer", nullable=false)
      */
-    private $hotspotQuestionId;
+    protected $hotspotQuestionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hotspot_answer_id", type="integer", nullable=false)
      */
-    private $hotspotAnswerId;
+    protected $hotspotAnswerId;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="hotspot_correct", type="boolean", nullable=false)
      */
-    private $hotspotCorrect;
+    protected $hotspotCorrect;
 
     /**
      * @var string
      *
      * @ORM\Column(name="hotspot_coordinate", type="text", nullable=false)
      */
-    private $hotspotCoordinate;
+    protected $hotspotCoordinate;
 
     /**
      * Set hotspotUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php b/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
index ded38ed509..e947fd8778 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEItemProperty.php
@@ -22,63 +22,63 @@ class TrackEItemProperty
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="course_id", type="integer", nullable=false)
      */
-    private $courseId;
+    protected $courseId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="item_property_id", type="integer", nullable=false)
      */
-    private $itemPropertyId;
+    protected $itemPropertyId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="progress", type="integer", nullable=false)
      */
-    private $progress;
+    protected $progress;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="lastedit_date", type="datetime", nullable=false)
      */
-    private $lasteditDate;
+    protected $lasteditDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lastedit_user_id", type="integer", nullable=false)
      */
-    private $lasteditUserId;
+    protected $lasteditUserId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set courseId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php b/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php
index e146d59d0b..fdf0b79e61 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackELastaccess.php
@@ -22,35 +22,35 @@ class TrackELastaccess
      *
      * @ORM\Column(name="access_user_id", type="integer", nullable=true)
      */
-    private $accessUserId;
+    protected $accessUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="access_date", type="datetime", nullable=false)
      */
-    private $accessDate;
+    protected $accessDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="access_tool", type="string", length=30, nullable=true)
      */
-    private $accessTool;
+    protected $accessTool;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_session_id", type="integer", nullable=true)
      */
-    private $accessSessionId;
+    protected $accessSessionId;
 
     /**
      * @var int
@@ -59,7 +59,7 @@ class TrackELastaccess
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $accessId;
+    protected $accessId;
 
     /**
      * Set accessUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackELinks.php b/src/Chamilo/CoreBundle/Entity/TrackELinks.php
index 594f9071ce..bf395f5069 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackELinks.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackELinks.php
@@ -22,35 +22,35 @@ class TrackELinks
      *
      * @ORM\Column(name="links_user_id", type="integer", nullable=true)
      */
-    private $linksUserId;
+    protected $linksUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="links_date", type="datetime", nullable=false)
      */
-    private $linksDate;
+    protected $linksDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="links_link_id", type="integer", nullable=false)
      */
-    private $linksLinkId;
+    protected $linksLinkId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="links_session_id", type="integer", nullable=false)
      */
-    private $linksSessionId;
+    protected $linksSessionId;
 
     /**
      * @var int
@@ -59,7 +59,7 @@ class TrackELinks
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $linksId;
+    protected $linksId;
 
     /**
      * Set linksUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackELogin.php b/src/Chamilo/CoreBundle/Entity/TrackELogin.php
index c73b38e8ce..fd57268960 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackELogin.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackELogin.php
@@ -20,28 +20,28 @@ class TrackELogin
      *
      * @ORM\Column(name="login_user_id", type="integer", nullable=false)
      */
-    private $loginUserId;
+    protected $loginUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="login_date", type="datetime", nullable=false)
      */
-    private $loginDate;
+    protected $loginDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user_ip", type="string", length=39, nullable=false)
      */
-    private $userIp;
+    protected $userIp;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="logout_date", type="datetime", nullable=true)
      */
-    private $logoutDate;
+    protected $logoutDate;
 
     /**
      * @var int
@@ -50,7 +50,7 @@ class TrackELogin
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $loginId;
+    protected $loginId;
 
     /**
      * Set loginUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEOnline.php b/src/Chamilo/CoreBundle/Entity/TrackEOnline.php
index 6a81c754aa..e08d6139c5 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEOnline.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEOnline.php
@@ -25,42 +25,42 @@ class TrackEOnline
      *
      * @ORM\Column(name="login_user_id", type="integer", nullable=false)
      */
-    private $loginUserId;
+    protected $loginUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="login_date", type="datetime", nullable=false)
      */
-    private $loginDate;
+    protected $loginDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user_ip", type="string", length=39, nullable=false)
      */
-    private $userIp;
+    protected $userIp;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="access_url_id", type="integer", nullable=false)
      */
-    private $accessUrlId;
+    protected $accessUrlId;
 
     /**
      * @var int
@@ -69,7 +69,7 @@ class TrackEOnline
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $loginId;
+    protected $loginId;
 
     /**
      * Set loginUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEOpen.php b/src/Chamilo/CoreBundle/Entity/TrackEOpen.php
index 72dac4b12d..a4290e026f 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEOpen.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEOpen.php
@@ -18,28 +18,28 @@ class TrackEOpen
      *
      * @ORM\Column(name="open_remote_host", type="text", nullable=false)
      */
-    private $openRemoteHost;
+    protected $openRemoteHost;
 
     /**
      * @var string
      *
      * @ORM\Column(name="open_agent", type="text", nullable=false)
      */
-    private $openAgent;
+    protected $openAgent;
 
     /**
      * @var string
      *
      * @ORM\Column(name="open_referer", type="text", nullable=false)
      */
-    private $openReferer;
+    protected $openReferer;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="open_date", type="datetime", nullable=false)
      */
-    private $openDate;
+    protected $openDate;
 
     /**
      * @var int
@@ -48,7 +48,7 @@ class TrackEOpen
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $openId;
+    protected $openId;
 
     /**
      * Set openRemoteHost.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackEUploads.php b/src/Chamilo/CoreBundle/Entity/TrackEUploads.php
index 062b76a6f1..381851cc69 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackEUploads.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackEUploads.php
@@ -26,42 +26,42 @@ class TrackEUploads
      *
      * @ORM\Column(name="upload_user_id", type="integer", nullable=true)
      */
-    private $uploadUserId;
+    protected $uploadUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="upload_date", type="datetime", nullable=false)
      */
-    private $uploadDate;
+    protected $uploadDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="upload_cours_id", type="string", length=40, nullable=false)
      */
-    private $uploadCoursId;
+    protected $uploadCoursId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=true)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="upload_work_id", type="integer", nullable=false)
      */
-    private $uploadWorkId;
+    protected $uploadWorkId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="upload_session_id", type="integer", nullable=false)
      */
-    private $uploadSessionId;
+    protected $uploadSessionId;
 
     /**
      * @var int
@@ -70,7 +70,7 @@ class TrackEUploads
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $uploadId;
+    protected $uploadId;
 
     /**
      * Set uploadUserId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php b/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php
index 2a0cbd4538..825aa407f9 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackStoredValues.php
@@ -26,35 +26,35 @@ class TrackStoredValues
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sco_id", type="integer", nullable=false)
      */
-    private $scoId;
+    protected $scoId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_id", type="string", length=40, nullable=false)
      */
-    private $courseId;
+    protected $courseId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="sv_key", type="string", length=64, nullable=false)
      */
-    private $svKey;
+    protected $svKey;
 
     /**
      * @var string
      *
      * @ORM\Column(name="sv_value", type="text", nullable=false)
      */
-    private $svValue;
+    protected $svValue;
 
     /**
      * @var int
@@ -63,7 +63,7 @@ class TrackStoredValues
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php b/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php
index 9c891b36be..c78fadf790 100644
--- a/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php
+++ b/src/Chamilo/CoreBundle/Entity/TrackStoredValuesStack.php
@@ -28,49 +28,49 @@ class TrackStoredValuesStack
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sco_id", type="integer", nullable=false)
      */
-    private $scoId;
+    protected $scoId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="stack_order", type="integer", nullable=false)
      */
-    private $stackOrder;
+    protected $stackOrder;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course_id", type="string", length=40, nullable=false)
      */
-    private $courseId;
+    protected $courseId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="sv_key", type="string", length=64, nullable=false)
      */
-    private $svKey;
+    protected $svKey;
 
     /**
      * @var string
      *
      * @ORM\Column(name="sv_value", type="text", nullable=false)
      */
-    private $svValue;
+    protected $svValue;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserApiKey.php b/src/Chamilo/CoreBundle/Entity/UserApiKey.php
index b8e355e2c9..0bc2f27e14 100644
--- a/src/Chamilo/CoreBundle/Entity/UserApiKey.php
+++ b/src/Chamilo/CoreBundle/Entity/UserApiKey.php
@@ -20,63 +20,63 @@ class UserApiKey
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="api_key", type="string", length=32, nullable=false)
      */
-    private $apiKey;
+    protected $apiKey;
 
     /**
      * @var string
      *
      * @ORM\Column(name="api_service", type="string", length=10, nullable=false)
      */
-    private $apiService;
+    protected $apiService;
 
     /**
      * @var string
      *
      * @ORM\Column(name="api_end_point", type="text", nullable=true)
      */
-    private $apiEndPoint;
+    protected $apiEndPoint;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_date", type="datetime", nullable=true)
      */
-    private $createdDate;
+    protected $createdDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="validity_start_date", type="datetime", nullable=true)
      */
-    private $validityStartDate;
+    protected $validityStartDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="validity_end_date", type="datetime", nullable=true)
      */
-    private $validityEndDate;
+    protected $validityEndDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php b/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php
index 4955105bcf..7ba359a9b5 100644
--- a/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php
+++ b/src/Chamilo/CoreBundle/Entity/UserCourseCategory.php
@@ -20,28 +20,28 @@ class UserCourseCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="text", nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sort", type="integer", nullable=true)
      */
-    private $sort;
+    protected $sort;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php b/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
index ae88731300..f1f7adf6f4 100644
--- a/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
+++ b/src/Chamilo/CoreBundle/Entity/UserFriendRelationType.php
@@ -18,7 +18,7 @@ class UserFriendRelationType
      *
      * @ORM\Column(name="title", type="string", length=20, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var int
@@ -27,7 +27,7 @@ class UserFriendRelationType
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php b/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php
index b0dbb9d9d2..d861b8a772 100644
--- a/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php
+++ b/src/Chamilo/CoreBundle/Entity/UserGroupRelUserGroup.php
@@ -20,28 +20,28 @@ class UserGroupRelUserGroup
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="subgroup_id", type="integer", nullable=false)
      */
-    private $subgroupId;
+    protected $subgroupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="relation_type", type="integer", nullable=false)
      */
-    private $relationType;
+    protected $relationType;
 
     /**
      * Set groupId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php b/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php
index 068d07296f..cc8c669340 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelCourseVote.php
@@ -22,35 +22,35 @@ class UserRelCourseVote
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="url_id", type="integer", nullable=false)
      */
-    private $urlId;
+    protected $urlId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="vote", type="integer", nullable=false)
      */
-    private $vote;
+    protected $vote;
 
     /**
      * @var int
@@ -59,7 +59,7 @@ class UserRelCourseVote
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelEventType.php b/src/Chamilo/CoreBundle/Entity/UserRelEventType.php
index c9fd22c161..c4ef2df9e2 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelEventType.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelEventType.php
@@ -22,21 +22,21 @@ class UserRelEventType
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="event_type_name", type="string", length=255, nullable=false)
      */
-    private $eventTypeName;
+    protected $eventTypeName;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelTag.php b/src/Chamilo/CoreBundle/Entity/UserRelTag.php
index d85eb27e71..962ab91770 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelTag.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelTag.php
@@ -24,14 +24,14 @@ class UserRelTag
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="tag_id", type="integer", nullable=false)
      */
-    private $tagId;
+    protected $tagId;
 
     /**
      * @var int
@@ -40,7 +40,7 @@ class UserRelTag
      * @ORM\Id
      * @ORM\GeneratedValue(strategy="IDENTITY")
      */
-    private $id;
+    protected $id;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/UserRelUser.php b/src/Chamilo/CoreBundle/Entity/UserRelUser.php
index 0e76db4539..3aa9f89434 100644
--- a/src/Chamilo/CoreBundle/Entity/UserRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/UserRelUser.php
@@ -24,35 +24,35 @@ class UserRelUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="friend_user_id", type="integer", nullable=false)
      */
-    private $friendUserId;
+    protected $friendUserId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="relation_type", type="integer", nullable=false)
      */
-    private $relationType;
+    protected $relationType;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="last_edit", type="datetime", nullable=true)
      */
-    private $lastEdit;
+    protected $lastEdit;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php
index bb79225b8b..80b5534950 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelCourse.php
@@ -20,21 +20,21 @@ class UsergroupRelCourse
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
      */
-    private $usergroupId;
+    protected $usergroupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="course_id", type="integer", nullable=false)
      */
-    private $courseId;
+    protected $courseId;
 
     /**
      * Set usergroupId.
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php
index 9f1fbf9fef..b72bef5a8d 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelQuestion.php
@@ -20,35 +20,35 @@ class UsergroupRelQuestion
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", nullable=false)
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
      */
-    private $usergroupId;
+    protected $usergroupId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="coefficient", type="float", precision=6, scale=2, nullable=true)
      */
-    private $coefficient;
+    protected $coefficient;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php
index 6f8017eb6a..782026b957 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelSession.php
@@ -20,21 +20,21 @@ class UsergroupRelSession
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="usergroup_id", type="integer", nullable=false)
      */
-    private $usergroupId;
+    protected $usergroupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set usergroupId.
diff --git a/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php b/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
index 3602b16c74..38a9f5a3f4 100644
--- a/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
+++ b/src/Chamilo/CoreBundle/Entity/UsergroupRelUser.php
@@ -50,7 +50,7 @@ class UsergroupRelUser
      *
      * @ORM\Column(name="relation_type", type="integer", nullable=false)
      */
-    private $relationType;
+    protected $relationType;
 
     /**
      * Get id.
diff --git a/src/Chamilo/CourseBundle/Entity/CAnnouncement.php b/src/Chamilo/CourseBundle/Entity/CAnnouncement.php
index 8446086017..89d628c9db 100644
--- a/src/Chamilo/CourseBundle/Entity/CAnnouncement.php
+++ b/src/Chamilo/CourseBundle/Entity/CAnnouncement.php
@@ -26,63 +26,63 @@ class CAnnouncement
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="text", nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="end_date", type="date", nullable=true)
      */
-    private $endDate;
+    protected $endDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="email_sent", type="boolean", nullable=true)
      */
-    private $emailSent;
+    protected $emailSent;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php b/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php
index 93131ac370..d6f1670be1 100644
--- a/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CAnnouncementAttachment.php
@@ -25,56 +25,56 @@ class CAnnouncementAttachment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="size", type="integer", nullable=false)
      */
-    private $size;
+    protected $size;
 
     /**
      * @var int
      *
      * @ORM\Column(name="announcement_id", type="integer", nullable=false)
      */
-    private $announcementId;
+    protected $announcementId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=255, nullable=false)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * Set path.
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendance.php b/src/Chamilo/CourseBundle/Entity/CAttendance.php
index 466e324929..6477e8c960 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendance.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendance.php
@@ -27,77 +27,77 @@ class CAttendance
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="text", nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="active", type="boolean", nullable=false)
      */
-    private $active;
+    protected $active;
 
     /**
      * @var string
      *
      * @ORM\Column(name="attendance_qualify_title", type="string", length=255, nullable=true)
      */
-    private $attendanceQualifyTitle;
+    protected $attendanceQualifyTitle;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attendance_qualify_max", type="integer", nullable=false)
      */
-    private $attendanceQualifyMax;
+    protected $attendanceQualifyMax;
 
     /**
      * @var float
      *
      * @ORM\Column(name="attendance_weight", type="float", precision=6, scale=2, nullable=false)
      */
-    private $attendanceWeight;
+    protected $attendanceWeight;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php
index 8ee9613f51..4837eba986 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendar.php
@@ -27,42 +27,42 @@ class CAttendanceCalendar
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attendance_id", type="integer", nullable=false)
      */
-    private $attendanceId;
+    protected $attendanceId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_time", type="datetime", nullable=false)
      */
-    private $dateTime;
+    protected $dateTime;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="done_attendance", type="boolean", nullable=false)
      */
-    private $doneAttendance;
+    protected $doneAttendance;
 
     /**
      * Set attendanceId.
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php
index 35c8faeb6b..89bb6dba99 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceCalendarRelGroup.php
@@ -26,35 +26,35 @@ class CAttendanceCalendarRelGroup
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="calendar_id", type="integer", nullable=false)
      */
-    private $calendarId;
+    protected $calendarId;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php b/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php
index 6795c94e89..2c2bedb779 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceResult.php
@@ -27,42 +27,42 @@ class CAttendanceResult
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attendance_id", type="integer", nullable=false)
      */
-    private $attendanceId;
+    protected $attendanceId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="score", type="integer", nullable=false)
      */
-    private $score;
+    protected $score;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php b/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php
index e441204531..7935891b63 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceSheet.php
@@ -27,35 +27,35 @@ class CAttendanceSheet
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="presence", type="boolean", nullable=false)
      */
-    private $presence;
+    protected $presence;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attendance_calendar_id", type="integer")
      */
-    private $attendanceCalendarId;
+    protected $attendanceCalendarId;
 
     /**
      * Set presence.
diff --git a/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php b/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php
index 5904353619..1e56f62f62 100644
--- a/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php
+++ b/src/Chamilo/CourseBundle/Entity/CAttendanceSheetLog.php
@@ -25,56 +25,56 @@ class CAttendanceSheetLog
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attendance_id", type="integer", nullable=false)
      */
-    private $attendanceId;
+    protected $attendanceId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="lastedit_date", type="datetime", nullable=false)
      */
-    private $lasteditDate;
+    protected $lasteditDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="lastedit_type", type="string", length=200, nullable=false)
      */
-    private $lasteditType;
+    protected $lasteditType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lastedit_user_id", type="integer", nullable=false)
      */
-    private $lasteditUserId;
+    protected $lasteditUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="calendar_date_value", type="datetime", nullable=true)
      */
-    private $calendarDateValue;
+    protected $calendarDateValue;
 
     /**
      * Set attendanceId.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlog.php b/src/Chamilo/CourseBundle/Entity/CBlog.php
index 818fe65331..fbe2433b8c 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlog.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlog.php
@@ -26,56 +26,56 @@ class CBlog
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer")
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="blog_name", type="string", length=250, nullable=false)
      */
-    private $blogName;
+    protected $blogName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="blog_subtitle", type="string", length=250, nullable=true)
      */
-    private $blogSubtitle;
+    protected $blogSubtitle;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_creation", type="datetime", nullable=false)
      */
-    private $dateCreation;
+    protected $dateCreation;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visibility", type="boolean", nullable=false)
      */
-    private $visibility;
+    protected $visibility;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set blogName.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php b/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php
index 51c80075a3..dfd2e2d4a1 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogAttachment.php
@@ -25,70 +25,70 @@ class CBlogAttachment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="size", type="integer", nullable=false)
      */
-    private $size;
+    protected $size;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer", nullable=false)
      */
-    private $postId;
+    protected $postId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=255, nullable=false)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer", nullable=false)
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="comment_id", type="integer", nullable=false)
      */
-    private $commentId;
+    protected $commentId;
 
     /**
      * Set path.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogComment.php b/src/Chamilo/CourseBundle/Entity/CBlogComment.php
index f7b2dd9c7b..99e401d8b0 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogComment.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogComment.php
@@ -25,77 +25,77 @@ class CBlogComment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="comment_id", type="integer")
      */
-    private $commentId;
+    protected $commentId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=250, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=false)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="author_id", type="integer", nullable=false)
      */
-    private $authorId;
+    protected $authorId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_creation", type="datetime", nullable=false)
      */
-    private $dateCreation;
+    protected $dateCreation;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer", nullable=false)
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer", nullable=false)
      */
-    private $postId;
+    protected $postId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="task_id", type="integer", nullable=true)
      */
-    private $taskId;
+    protected $taskId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_comment_id", type="integer", nullable=false)
      */
-    private $parentCommentId;
+    protected $parentCommentId;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogPost.php b/src/Chamilo/CourseBundle/Entity/CBlogPost.php
index 4a17f8c40f..9ac2e0ad79 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogPost.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogPost.php
@@ -24,56 +24,56 @@ class CBlogPost
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer", nullable=false)
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=250, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="full_text", type="text", nullable=false)
      */
-    private $fullText;
+    protected $fullText;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_creation", type="datetime", nullable=false)
      */
-    private $dateCreation;
+    protected $dateCreation;
 
     /**
      * @var int
      *
      * @ORM\Column(name="author_id", type="integer", nullable=false)
      */
-    private $authorId;
+    protected $authorId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer")
      */
-    private $postId;
+    protected $postId;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogRating.php b/src/Chamilo/CourseBundle/Entity/CBlogRating.php
index 4f1a3d54bd..9cecac029e 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogRating.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogRating.php
@@ -25,56 +25,56 @@ class CBlogRating
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="rating_id", type="integer")
      */
-    private $ratingId;
+    protected $ratingId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer", nullable=false)
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="rating_type", type="string", length=40, nullable=false)
      */
-    private $ratingType;
+    protected $ratingType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="item_id", type="integer", nullable=false)
      */
-    private $itemId;
+    protected $itemId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="rating", type="integer", nullable=false)
      */
-    private $rating;
+    protected $rating;
 
     /**
      * Set blogId.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php b/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php
index 76bc23a3de..339cde6675 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogRelUser.php
@@ -25,28 +25,28 @@ class CBlogRelUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer")
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogTask.php b/src/Chamilo/CourseBundle/Entity/CBlogTask.php
index 77b71ba763..e034ee73b7 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogTask.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogTask.php
@@ -25,56 +25,56 @@ class CBlogTask
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="task_id", type="integer")
      */
-    private $taskId;
+    protected $taskId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer", nullable=false)
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=250, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="color", type="string", length=10, nullable=false)
      */
-    private $color;
+    protected $color;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="system_task", type="boolean", nullable=false)
      */
-    private $systemTask;
+    protected $systemTask;
 
     /**
      * Set blogId.
diff --git a/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php b/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php
index ab66ed3a24..8477422f54 100644
--- a/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CBlogTaskRelUser.php
@@ -27,42 +27,42 @@ class CBlogTaskRelUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="blog_id", type="integer")
      */
-    private $blogId;
+    protected $blogId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="target_date", type="date", nullable=false)
      */
-    private $targetDate;
+    protected $targetDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="task_id", type="integer")
      */
-    private $taskId;
+    protected $taskId;
 
     /**
      * Set targetDate.
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php b/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php
index c1e470c134..35fde5e986 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEvent.php
@@ -26,84 +26,84 @@ class CCalendarEvent
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="start_date", type="datetime", nullable=true)
      */
-    private $startDate;
+    protected $startDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="end_date", type="datetime", nullable=true)
      */
-    private $endDate;
+    protected $endDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_event_id", type="integer", nullable=true)
      */
-    private $parentEventId;
+    protected $parentEventId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="all_day", type="integer", nullable=false)
      */
-    private $allDay;
+    protected $allDay;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="color", type="string", length=100, nullable=true)
      */
-    private $color;
+    protected $color;
 
     /**
      * @var Room
@@ -111,7 +111,7 @@ class CCalendarEvent
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Room")
      * @ORM\JoinColumn(name="room_id", referencedColumnName="id")
      */
-    private $room;
+    protected $room;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php b/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php
index 77b9160bd7..709184d5cc 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEventAttachment.php
@@ -25,56 +25,56 @@ class CCalendarEventAttachment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="size", type="integer", nullable=false)
      */
-    private $size;
+    protected $size;
 
     /**
      * @var int
      *
      * @ORM\Column(name="agenda_id", type="integer", nullable=false)
      */
-    private $agendaId;
+    protected $agendaId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=255, nullable=false)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * Set path.
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
index 2df4aab124..b09da02e6c 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeat.php
@@ -25,49 +25,49 @@ class CCalendarEventRepeat
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_id", type="integer")
      */
-    private $calId;
+    protected $calId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="cal_type", type="string", length=20, nullable=true)
      */
-    private $calType;
+    protected $calType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_end", type="integer", nullable=true)
      */
-    private $calEnd;
+    protected $calEnd;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_frequency", type="integer", nullable=true)
      */
-    private $calFrequency;
+    protected $calFrequency;
 
     /**
      * @var string
      *
      * @ORM\Column(name="cal_days", type="string", length=7, nullable=true)
      */
-    private $calDays;
+    protected $calDays;
 
     /**
      * Set calType.
diff --git a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php
index 6f61ba86d2..ec942d2524 100644
--- a/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php
+++ b/src/Chamilo/CourseBundle/Entity/CCalendarEventRepeatNot.php
@@ -25,28 +25,28 @@ class CCalendarEventRepeatNot
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_id", type="integer")
      */
-    private $calId;
+    protected $calId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cal_date", type="integer")
      */
-    private $calDate;
+    protected $calDate;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CourseBundle/Entity/CChatConnected.php b/src/Chamilo/CourseBundle/Entity/CChatConnected.php
index 620eeec79a..6ecefa60ef 100644
--- a/src/Chamilo/CourseBundle/Entity/CChatConnected.php
+++ b/src/Chamilo/CourseBundle/Entity/CChatConnected.php
@@ -27,49 +27,49 @@ class CChatConnected
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="to_group_id", type="integer", nullable=false)
      */
-    private $toGroupId;
+    protected $toGroupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="last_connection", type="datetime")
      */
-    private $lastConnection;
+    protected $lastConnection;
 
     /**
      * Set sessionId.
diff --git a/src/Chamilo/CourseBundle/Entity/CCourseDescription.php b/src/Chamilo/CourseBundle/Entity/CCourseDescription.php
index 24349b07b9..c140e675d1 100644
--- a/src/Chamilo/CourseBundle/Entity/CCourseDescription.php
+++ b/src/Chamilo/CourseBundle/Entity/CCourseDescription.php
@@ -29,56 +29,56 @@ class CCourseDescription
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="description_type", type="integer", nullable=false)
      */
-    private $descriptionType;
+    protected $descriptionType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="progress", type="integer", nullable=false)
      */
-    private $progress;
+    protected $progress;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CCourseSetting.php b/src/Chamilo/CourseBundle/Entity/CCourseSetting.php
index 741a3ce58b..50577716c6 100644
--- a/src/Chamilo/CourseBundle/Entity/CCourseSetting.php
+++ b/src/Chamilo/CourseBundle/Entity/CCourseSetting.php
@@ -25,77 +25,77 @@ class CCourseSetting
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="variable", type="string", length=255, nullable=false)
      */
-    private $variable;
+    protected $variable;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subkey", type="string", length=255, nullable=true)
      */
-    private $subkey;
+    protected $subkey;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=255, nullable=true)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var string
      *
      * @ORM\Column(name="category", type="string", length=255, nullable=true)
      */
-    private $category;
+    protected $category;
 
     /**
      * @var string
      *
      * @ORM\Column(name="value", type="text", nullable=true)
      */
-    private $value;
+    protected $value;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="string", length=255, nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subkeytext", type="string", length=255, nullable=true)
      */
-    private $subkeytext;
+    protected $subkeytext;
 
     /**
      * Set variable.
diff --git a/src/Chamilo/CourseBundle/Entity/CDocument.php b/src/Chamilo/CourseBundle/Entity/CDocument.php
index 5e720f212f..f65081b386 100644
--- a/src/Chamilo/CourseBundle/Entity/CDocument.php
+++ b/src/Chamilo/CourseBundle/Entity/CDocument.php
@@ -25,70 +25,70 @@ class CDocument
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filetype", type="string", length=10, nullable=false)
      */
-    private $filetype;
+    protected $filetype;
 
     /**
      * @var int
      *
      * @ORM\Column(name="size", type="integer", nullable=false)
      */
-    private $size;
+    protected $size;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="readonly", type="boolean", nullable=false)
      */
-    private $readonly;
+    protected $readonly;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set path.
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php b/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php
index 05c003e5a6..20559dfefb 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxCategory.php
@@ -26,56 +26,56 @@ class CDropboxCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cat_id", type="integer")
      */
-    private $catId;
+    protected $catId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="cat_name", type="text", nullable=false)
      */
-    private $catName;
+    protected $catName;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="received", type="boolean", nullable=false)
      */
-    private $received;
+    protected $received;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="sent", type="boolean", nullable=false)
      */
-    private $sent;
+    protected $sent;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set catName.
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php b/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php
index 4564ee2897..75ffa27800 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxFeedback.php
@@ -27,49 +27,49 @@ class CDropboxFeedback
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="feedback_id", type="integer")
      */
-    private $feedbackId;
+    protected $feedbackId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="file_id", type="integer", nullable=false)
      */
-    private $fileId;
+    protected $fileId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="author_user_id", type="integer", nullable=false)
      */
-    private $authorUserId;
+    protected $authorUserId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="feedback", type="text", nullable=false)
      */
-    private $feedback;
+    protected $feedback;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="feedback_date", type="datetime", nullable=false)
      */
-    private $feedbackDate;
+    protected $feedbackDate;
 
     /**
      * Set fileId.
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxFile.php b/src/Chamilo/CourseBundle/Entity/CDropboxFile.php
index 1ce552b24a..98bae21f82 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxFile.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxFile.php
@@ -29,91 +29,91 @@ class CDropboxFile
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="uploader_id", type="integer", nullable=false)
      */
-    private $uploaderId;
+    protected $uploaderId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=250, nullable=false)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * @var int
      *
      * @ORM\Column(name="filesize", type="integer", nullable=false)
      */
-    private $filesize;
+    protected $filesize;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=250, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="string", length=250, nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="author", type="string", length=250, nullable=true)
      */
-    private $author;
+    protected $author;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="upload_date", type="datetime", nullable=false)
      */
-    private $uploadDate;
+    protected $uploadDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="last_upload_date", type="datetime", nullable=false)
      */
-    private $lastUploadDate;
+    protected $lastUploadDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cat_id", type="integer", nullable=false)
      */
-    private $catId;
+    protected $catId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set uploaderId.
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php b/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php
index 85d19141c7..1766db5cee 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxPerson.php
@@ -26,28 +26,28 @@ class CDropboxPerson
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="file_id", type="integer")
      */
-    private $fileId;
+    protected $fileId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set cId.
diff --git a/src/Chamilo/CourseBundle/Entity/CDropboxPost.php b/src/Chamilo/CourseBundle/Entity/CDropboxPost.php
index 9bb8644141..0a860d24ce 100644
--- a/src/Chamilo/CourseBundle/Entity/CDropboxPost.php
+++ b/src/Chamilo/CourseBundle/Entity/CDropboxPost.php
@@ -27,56 +27,56 @@ class CDropboxPost
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="feedback_date", type="datetime", nullable=false)
      */
-    private $feedbackDate;
+    protected $feedbackDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="feedback", type="text", nullable=true)
      */
-    private $feedback;
+    protected $feedback;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cat_id", type="integer", nullable=false)
      */
-    private $catId;
+    protected $catId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="file_id", type="integer")
      */
-    private $fileId;
+    protected $fileId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="dest_user_id", type="integer")
      */
-    private $destUserId;
+    protected $destUserId;
 
     /**
      * Set feedbackDate.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumAttachment.php b/src/Chamilo/CourseBundle/Entity/CForumAttachment.php
index 3e65c1c9ca..bd965895d7 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumAttachment.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumAttachment.php
@@ -25,56 +25,56 @@ class CForumAttachment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="string", length=255, nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="size", type="integer", nullable=false)
      */
-    private $size;
+    protected $size;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer", nullable=false)
      */
-    private $postId;
+    protected $postId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filename", type="string", length=255, nullable=false)
      */
-    private $filename;
+    protected $filename;
 
     /**
      * Set path.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumCategory.php b/src/Chamilo/CourseBundle/Entity/CForumCategory.php
index 23d9ba92e2..deef3937b4 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumCategory.php
@@ -26,56 +26,56 @@ class CForumCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="cat_title", type="string", length=255, nullable=false)
      */
-    private $catTitle;
+    protected $catTitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="cat_comment", type="text", nullable=true)
      */
-    private $catComment;
+    protected $catComment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cat_order", type="integer", nullable=false)
      */
-    private $catOrder;
+    protected $catOrder;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="cat_id", type="integer")
      */
-    private $catId;
+    protected $catId;
 
     /**
      * Set catTitle.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumForum.php b/src/Chamilo/CourseBundle/Entity/CForumForum.php
index 9ba09d05ea..f0e92004cf 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumForum.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumForum.php
@@ -25,175 +25,175 @@ class CForumForum
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_id", type="integer")
      */
-    private $forumId;
+    protected $forumId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="forum_title", type="string", length=255, nullable=false)
      */
-    private $forumTitle;
+    protected $forumTitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="forum_comment", type="text", nullable=true)
      */
-    private $forumComment;
+    protected $forumComment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_threads", type="integer", nullable=true)
      */
-    private $forumThreads;
+    protected $forumThreads;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_posts", type="integer", nullable=true)
      */
-    private $forumPosts;
+    protected $forumPosts;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_last_post", type="integer", nullable=true)
      */
-    private $forumLastPost;
+    protected $forumLastPost;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_category", type="integer", nullable=true)
      */
-    private $forumCategory;
+    protected $forumCategory;
 
     /**
      * @var int
      *
      * @ORM\Column(name="allow_anonymous", type="integer", nullable=true)
      */
-    private $allowAnonymous;
+    protected $allowAnonymous;
 
     /**
      * @var int
      *
      * @ORM\Column(name="allow_edit", type="integer", nullable=true)
      */
-    private $allowEdit;
+    protected $allowEdit;
 
     /**
      * @var string
      *
      * @ORM\Column(name="approval_direct_post", type="string", length=20, nullable=true)
      */
-    private $approvalDirectPost;
+    protected $approvalDirectPost;
 
     /**
      * @var int
      *
      * @ORM\Column(name="allow_attachments", type="integer", nullable=true)
      */
-    private $allowAttachments;
+    protected $allowAttachments;
 
     /**
      * @var int
      *
      * @ORM\Column(name="allow_new_threads", type="integer", nullable=true)
      */
-    private $allowNewThreads;
+    protected $allowNewThreads;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_view", type="string", length=20, nullable=true)
      */
-    private $defaultView;
+    protected $defaultView;
 
     /**
      * @var string
      *
      * @ORM\Column(name="forum_of_group", type="string", length=20, nullable=true)
      */
-    private $forumOfGroup;
+    protected $forumOfGroup;
 
     /**
      * @var string
      *
-     * @ORM\Column(name="forum_group_public_private", type="string", length=20, nullable=true)
+     * @ORM\Column(name="forum_group_public_protected", type="string", length=20, nullable=true)
      */
-    private $forumGroupPublicPrivate;
+    protected $forumGroupPublicprotected;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_order", type="integer", nullable=true)
      */
-    private $forumOrder;
+    protected $forumOrder;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="forum_image", type="string", length=255, nullable=false)
      */
-    private $forumImage;
+    protected $forumImage;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="start_time", type="datetime", nullable=true)
      */
-    private $startTime;
+    protected $startTime;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="end_time", type="datetime", nullable=true)
      */
-    private $endTime;
+    protected $endTime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_id", type="integer", options={"unsigned":true})
      */
-    private $lpId;
+    protected $lpId;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="moderated", type="boolean", nullable=true)
      */
-    private $moderated;
+    protected $moderated;
 
     /**
      * Set forumTitle.
@@ -508,27 +508,27 @@ class CForumForum
     }
 
     /**
-     * Set forumGroupPublicPrivate.
+     * Set forumGroupPublicprotected.
      *
-     * @param string $forumGroupPublicPrivate
+     * @param string $forumGroupPublicprotected
      *
      * @return CForumForum
      */
-    public function setForumGroupPublicPrivate($forumGroupPublicPrivate)
+    public function setForumGroupPublicprotected($forumGroupPublicprotected)
     {
-        $this->forumGroupPublicPrivate = $forumGroupPublicPrivate;
+        $this->forumGroupPublicprotected = $forumGroupPublicprotected;
 
         return $this;
     }
 
     /**
-     * Get forumGroupPublicPrivate.
+     * Get forumGroupPublicprotected.
      *
      * @return string
      */
-    public function getForumGroupPublicPrivate()
+    public function getForumGroupPublicprotected()
     {
-        return $this->forumGroupPublicPrivate;
+        return $this->forumGroupPublicprotected;
     }
 
     /**
diff --git a/src/Chamilo/CourseBundle/Entity/CForumMailcue.php b/src/Chamilo/CourseBundle/Entity/CForumMailcue.php
index 531824e95e..b773537c5c 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumMailcue.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumMailcue.php
@@ -28,42 +28,42 @@ class CForumMailcue
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_id", type="integer")
      */
-    private $threadId;
+    protected $threadId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer")
      */
-    private $postId;
+    protected $postId;
 
     /**
      * Set id.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumNotification.php b/src/Chamilo/CourseBundle/Entity/CForumNotification.php
index d667be1014..41c1bd20fb 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumNotification.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumNotification.php
@@ -29,49 +29,49 @@ class CForumNotification
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_id", type="integer")
      */
-    private $forumId;
+    protected $forumId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_id", type="integer")
      */
-    private $threadId;
+    protected $threadId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer")
      */
-    private $postId;
+    protected $postId;
 
     /**
      * Set id.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumPost.php b/src/Chamilo/CourseBundle/Entity/CForumPost.php
index 53664c3adc..9ea96a73dc 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumPost.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumPost.php
@@ -33,98 +33,98 @@ class CForumPost
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_id", type="integer")
      */
-    private $postId;
+    protected $postId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="post_title", type="string", length=250, nullable=true)
      */
-    private $postTitle;
+    protected $postTitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="post_text", type="text", nullable=true)
      */
-    private $postText;
+    protected $postText;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_id", type="integer", nullable=true)
      */
-    private $threadId;
+    protected $threadId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_id", type="integer", nullable=true)
      */
-    private $forumId;
+    protected $forumId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="poster_id", type="integer", nullable=true)
      */
-    private $posterId;
+    protected $posterId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="poster_name", type="string", length=100, nullable=true)
      */
-    private $posterName;
+    protected $posterName;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="post_date", type="datetime", nullable=true)
      */
-    private $postDate;
+    protected $postDate;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="post_notification", type="boolean", nullable=true)
      */
-    private $postNotification;
+    protected $postNotification;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_parent_id", type="integer", nullable=true)
      */
-    private $postParentId;
+    protected $postParentId;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="visible", type="boolean", nullable=true)
      */
-    private $visible;
+    protected $visible;
 
     /**
      * @var int
      *
      * @ORM\Column(name="status", type="integer", nullable=true)
      */
-    private $status;
+    protected $status;
 
     /**
      * Set postTitle.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThread.php b/src/Chamilo/CourseBundle/Entity/CForumThread.php
index 3b35233313..4b5448317f 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThread.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThread.php
@@ -26,140 +26,140 @@ class CForumThread
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_id", type="integer")
      */
-    private $threadId;
+    protected $threadId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="thread_title", type="string", length=255, nullable=true)
      */
-    private $threadTitle;
+    protected $threadTitle;
 
     /**
      * @var int
      *
      * @ORM\Column(name="forum_id", type="integer", nullable=true)
      */
-    private $forumId;
+    protected $forumId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_replies", type="integer", nullable=false, options={"unsigned":true, "default" = 0})
      */
-    private $threadReplies;
+    protected $threadReplies;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_poster_id", type="integer", nullable=true)
      */
-    private $threadPosterId;
+    protected $threadPosterId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="thread_poster_name", type="string", length=100, nullable=true)
      */
-    private $threadPosterName;
+    protected $threadPosterName;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_views", type="integer", nullable=false, options={"unsigned":true, "default" = 0})
      */
-    private $threadViews;
+    protected $threadViews;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_last_post", type="integer", nullable=true)
      */
-    private $threadLastPost;
+    protected $threadLastPost;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="thread_date", type="datetime", nullable=true)
      */
-    private $threadDate;
+    protected $threadDate;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="thread_sticky", type="boolean", nullable=true)
      */
-    private $threadSticky;
+    protected $threadSticky;
 
     /**
      * @var int
      *
      * @ORM\Column(name="locked", type="integer", nullable=false)
      */
-    private $locked;
+    protected $locked;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="thread_title_qualify", type="string", length=255, nullable=true)
      */
-    private $threadTitleQualify;
+    protected $threadTitleQualify;
 
     /**
      * @var float
      *
      * @ORM\Column(name="thread_qualify_max", type="float", precision=6, scale=2, nullable=false)
      */
-    private $threadQualifyMax;
+    protected $threadQualifyMax;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="thread_close_date", type="datetime", nullable=true)
      */
-    private $threadCloseDate;
+    protected $threadCloseDate;
 
     /**
      * @var float
      *
      * @ORM\Column(name="thread_weight", type="float", precision=6, scale=2, nullable=false)
      */
-    private $threadWeight;
+    protected $threadWeight;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="thread_peer_qualify", type="boolean")
      */
-    private $threadPeerQualify;
+    protected $threadPeerQualify;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_item_id", type="integer", options={"unsigned":true})
      */
-    private $lpItemId;
+    protected $lpItemId;
 
     /**
      * Constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php b/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php
index 8733e211f5..441b6e88c8 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThreadQualify.php
@@ -26,63 +26,63 @@ class CForumThreadQualify
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_id", type="integer", nullable=false)
      */
-    private $threadId;
+    protected $threadId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="qualify", type="float", precision=6, scale=2, nullable=false)
      */
-    private $qualify;
+    protected $qualify;
 
     /**
      * @var int
      *
      * @ORM\Column(name="qualify_user_id", type="integer", nullable=true)
      */
-    private $qualifyUserId;
+    protected $qualifyUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="qualify_time", type="datetime", nullable=true)
      */
-    private $qualifyTime;
+    protected $qualifyTime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php b/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php
index 349406a1bc..4961a28721 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumThreadQualifyLog.php
@@ -26,63 +26,63 @@ class CForumThreadQualifyLog
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thread_id", type="integer", nullable=false)
      */
-    private $threadId;
+    protected $threadId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="qualify", type="float", precision=6, scale=2, nullable=false)
      */
-    private $qualify;
+    protected $qualify;
 
     /**
      * @var int
      *
      * @ORM\Column(name="qualify_user_id", type="integer", nullable=true)
      */
-    private $qualifyUserId;
+    protected $qualifyUserId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="qualify_time", type="datetime", nullable=true)
      */
-    private $qualifyTime;
+    protected $qualifyTime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CGlossary.php b/src/Chamilo/CourseBundle/Entity/CGlossary.php
index abb6b511fe..df54db8d8b 100644
--- a/src/Chamilo/CourseBundle/Entity/CGlossary.php
+++ b/src/Chamilo/CourseBundle/Entity/CGlossary.php
@@ -26,49 +26,49 @@ class CGlossary
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="glossary_id", type="integer")
      */
-    private $glossaryId;
+    protected $glossaryId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=true)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupCategory.php b/src/Chamilo/CourseBundle/Entity/CGroupCategory.php
index da85a7a87a..05bd027df6 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupCategory.php
@@ -25,119 +25,119 @@ class CGroupCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="doc_state", type="boolean", nullable=false)
      */
-    private $docState;
+    protected $docState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="calendar_state", type="boolean", nullable=false)
      */
-    private $calendarState;
+    protected $calendarState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="work_state", type="boolean", nullable=false)
      */
-    private $workState;
+    protected $workState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="announcements_state", type="boolean", nullable=false)
      */
-    private $announcementsState;
+    protected $announcementsState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="forum_state", type="boolean", nullable=false)
      */
-    private $forumState;
+    protected $forumState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="wiki_state", type="boolean", nullable=false)
      */
-    private $wikiState;
+    protected $wikiState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="chat_state", type="boolean", nullable=false)
      */
-    private $chatState;
+    protected $chatState;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_student", type="integer", nullable=false)
      */
-    private $maxStudent;
+    protected $maxStudent;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="self_reg_allowed", type="boolean", nullable=false)
      */
-    private $selfRegAllowed;
+    protected $selfRegAllowed;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="self_unreg_allowed", type="boolean", nullable=false)
      */
-    private $selfUnregAllowed;
+    protected $selfUnregAllowed;
 
     /**
      * @var int
      *
      * @ORM\Column(name="groups_per_user", type="integer", nullable=false)
      */
-    private $groupsPerUser;
+    protected $groupsPerUser;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupInfo.php b/src/Chamilo/CourseBundle/Entity/CGroupInfo.php
index 28d654d3a2..b37a3c2f87 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupInfo.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupInfo.php
@@ -26,140 +26,140 @@ class CGroupInfo
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=100, nullable=true)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="status", type="boolean", nullable=true)
      */
-    private $status;
+    protected $status;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=false)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_student", type="integer", nullable=false)
      */
-    private $maxStudent;
+    protected $maxStudent;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="doc_state", type="boolean", nullable=false)
      */
-    private $docState;
+    protected $docState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="calendar_state", type="boolean", nullable=false)
      */
-    private $calendarState;
+    protected $calendarState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="work_state", type="boolean", nullable=false)
      */
-    private $workState;
+    protected $workState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="announcements_state", type="boolean", nullable=false)
      */
-    private $announcementsState;
+    protected $announcementsState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="forum_state", type="boolean", nullable=false)
      */
-    private $forumState;
+    protected $forumState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="wiki_state", type="boolean", nullable=false)
      */
-    private $wikiState;
+    protected $wikiState;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="chat_state", type="boolean", nullable=false)
      */
-    private $chatState;
+    protected $chatState;
 
     /**
      * @var string
      *
      * @ORM\Column(name="secret_directory", type="string", length=255, nullable=true)
      */
-    private $secretDirectory;
+    protected $secretDirectory;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="self_registration_allowed", type="boolean", nullable=false)
      */
-    private $selfRegistrationAllowed;
+    protected $selfRegistrationAllowed;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="self_unregistration_allowed", type="boolean", nullable=false)
      */
-    private $selfUnregistrationAllowed;
+    protected $selfUnregistrationAllowed;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int needed for setting['group_document_access']
      *
      * ORM\Column(name="doc_access", type="integer", nullable=false, options={"default":0})
      */
-    //private $docAccess;
+    //protected $docAccess;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php b/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php
index 1e0a83b8c7..ae71a80b91 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupRelTutor.php
@@ -25,35 +25,35 @@ class CGroupRelTutor
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php b/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php
index f235930cbf..2953ddc01d 100644
--- a/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CGroupRelUser.php
@@ -25,49 +25,49 @@ class CGroupRelUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="status", type="integer", nullable=false)
      */
-    private $status;
+    protected $status;
 
     /**
      * @var string
      *
      * @ORM\Column(name="role", type="string", length=50, nullable=false)
      */
-    private $role;
+    protected $role;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CLink.php b/src/Chamilo/CourseBundle/Entity/CLink.php
index 9bc324d83c..6469587428 100644
--- a/src/Chamilo/CourseBundle/Entity/CLink.php
+++ b/src/Chamilo/CourseBundle/Entity/CLink.php
@@ -26,77 +26,77 @@ class CLink
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="url", type="text", nullable=false)
      */
-    private $url;
+    protected $url;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=150, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=true)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var string
      *
      * @ORM\Column(name="on_homepage", type="string", length=10, nullable=false)
      */
-    private $onHomepage;
+    protected $onHomepage;
 
     /**
      * @var string
      *
      * @ORM\Column(name="target", type="string", length=10, nullable=true)
      */
-    private $target;
+    protected $target;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set url.
diff --git a/src/Chamilo/CourseBundle/Entity/CLinkCategory.php b/src/Chamilo/CourseBundle/Entity/CLinkCategory.php
index dd82586e05..4dcdc56843 100644
--- a/src/Chamilo/CourseBundle/Entity/CLinkCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CLinkCategory.php
@@ -26,49 +26,49 @@ class CLinkCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="category_title", type="string", length=255, nullable=false)
      */
-    private $categoryTitle;
+    protected $categoryTitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set categoryTitle.
diff --git a/src/Chamilo/CourseBundle/Entity/CLp.php b/src/Chamilo/CourseBundle/Entity/CLp.php
index 68f9a07bab..848adbe2e8 100644
--- a/src/Chamilo/CourseBundle/Entity/CLp.php
+++ b/src/Chamilo/CourseBundle/Entity/CLp.php
@@ -26,245 +26,245 @@ class CLp
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_type", type="integer", nullable=false)
      */
-    private $lpType;
+    protected $lpType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ref", type="text", nullable=true)
      */
-    private $ref;
+    protected $ref;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="text", nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="force_commit", type="boolean", nullable=false)
      */
-    private $forceCommit;
+    protected $forceCommit;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_view_mod", type="string", length=32, nullable=false, options={"default":"embedded"})
      */
-    private $defaultViewMod;
+    protected $defaultViewMod;
 
     /**
      * @var string
      *
      * @ORM\Column(name="default_encoding", type="string", length=32, nullable=false, options={"default":"UTF-8"})
      */
-    private $defaultEncoding;
+    protected $defaultEncoding;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false, options={"default":"0"})
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content_maker", type="text", nullable=false)
      */
-    private $contentMaker;
+    protected $contentMaker;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content_local", type="string", length=32, nullable=false, options={"default":"local"})
      */
-    private $contentLocal;
+    protected $contentLocal;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content_license", type="text", nullable=false)
      */
-    private $contentLicense;
+    protected $contentLicense;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="prevent_reinit", type="boolean", nullable=false, options={"default":"1"})
      */
-    private $preventReinit;
+    protected $preventReinit;
 
     /**
      * @var string
      *
      * @ORM\Column(name="js_lib", type="text", nullable=false)
      */
-    private $jsLib;
+    protected $jsLib;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="debug", type="boolean", nullable=false)
      */
-    private $debug;
+    protected $debug;
 
     /**
      * @var string
      *
      * @ORM\Column(name="theme", type="string", length=255, nullable=false)
      */
-    private $theme;
+    protected $theme;
 
     /**
      * @var string
      *
      * @ORM\Column(name="preview_image", type="string", length=255, nullable=false)
      */
-    private $previewImage;
+    protected $previewImage;
 
     /**
      * @var string
      *
      * @ORM\Column(name="author", type="string", length=255, nullable=false)
      */
-    private $author;
+    protected $author;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="prerequisite", type="integer", nullable=false)
      */
-    private $prerequisite;
+    protected $prerequisite;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="hide_toc_frame", type="boolean", nullable=false)
      */
-    private $hideTocFrame;
+    protected $hideTocFrame;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="seriousgame_mode", type="boolean", nullable=false)
      */
-    private $seriousgameMode;
+    protected $seriousgameMode;
 
     /**
      * @var int
      *
      * @ORM\Column(name="use_max_score", type="integer", nullable=false, options={"default":"1"})
      */
-    private $useMaxScore;
+    protected $useMaxScore;
 
     /**
      * @var int
      *
      * @ORM\Column(name="autolaunch", type="integer", nullable=false)
      */
-    private $autolaunch;
+    protected $autolaunch;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", precision=0, scale=0, nullable=false, unique=false)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_attempts", type="integer", nullable=false)
      */
-    private $maxAttempts;
+    protected $maxAttempts;
 
     /**
      * @var int
      *
      * @ORM\Column(name="subscribe_users", type="integer", nullable=false)
      */
-    private $subscribeUsers;
+    protected $subscribeUsers;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="created_on", type="datetime", nullable=false)
      */
-    private $createdOn;
+    protected $createdOn;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="modified_on", type="datetime", nullable=false)
      */
-    private $modifiedOn;
+    protected $modifiedOn;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="publicated_on", type="datetime", nullable=true)
      */
-    private $publicatedOn;
+    protected $publicatedOn;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="expired_on", type="datetime", nullable=true)
      */
-    private $expiredOn;
+    protected $expiredOn;
 
     /**
      * @var string
      *
      * @ORM\Column(name="accumulate_scorm_time", type="integer", nullable=false, options={"default":1})
      */
-    private $accumulateScormTime;
+    protected $accumulateScormTime;
 
     /**
      * Constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CLpCategory.php b/src/Chamilo/CourseBundle/Entity/CLpCategory.php
index 2c0c07ef5d..24a5469207 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpCategory.php
@@ -29,31 +29,31 @@ class CLpCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @Gedmo\SortableGroup
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name")
      */
-    private $name;
+    protected $name;
 
     /**
      * @Gedmo\SortablePosition
      * @ORM\Column(name="position", type="integer")
      */
-    private $position;
+    protected $position;
 
     /**
      * @ORM\OneToMany(targetEntity="Chamilo\CourseBundle\Entity\CLpCategoryUser", mappedBy="category", cascade={"persist", "remove"}, orphanRemoval=true)
      */
-    private $users;
+    protected $users;
 
     /**
      * CLpCategory constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CLpCategoryUser.php b/src/Chamilo/CourseBundle/Entity/CLpCategoryUser.php
index 03c5a688c2..e491793185 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpCategoryUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpCategoryUser.php
@@ -21,13 +21,13 @@ class CLpCategoryUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $id;
+    protected $id;
 
     /**
      * @ORM\ManyToOne(targetEntity="Chamilo\CourseBundle\Entity\CLpCategory", inversedBy="users")
      * @ORM\JoinColumn(name="category_id", referencedColumnName="iid")
      */
-    private $category;
+    protected $category;
 
     /**
      * @var User
@@ -35,7 +35,7 @@ class CLpCategoryUser
      * @ORM\ManyToOne(targetEntity="Chamilo\UserBundle\Entity\User")
      * @ORM\JoinColumn(name="user_id", referencedColumnName="id")
      */
-    private $user;
+    protected $user;
 
     /**
      * @return string
diff --git a/src/Chamilo/CourseBundle/Entity/CLpItem.php b/src/Chamilo/CourseBundle/Entity/CLpItem.php
index 20edc2d4eb..9515cf0427 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpItem.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpItem.php
@@ -27,175 +27,175 @@ class CLpItem
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_id", type="integer", nullable=false)
      */
-    private $lpId;
+    protected $lpId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="item_type", type="string", length=32, nullable=false)
      */
-    private $itemType;
+    protected $itemType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="ref", type="text", nullable=false)
      */
-    private $ref;
+    protected $ref;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=511, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="string", length=511, nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="path", type="text", nullable=false)
      */
-    private $path;
+    protected $path;
 
     /**
      * @var float
      *
      * @ORM\Column(name="min_score", type="float", precision=10, scale=0, nullable=false)
      */
-    private $minScore;
+    protected $minScore;
 
     /**
      * @var float
      *
      * @ORM\Column(name="max_score", type="float", precision=10, scale=0, nullable=true, options={"default":"100"})
      */
-    private $maxScore;
+    protected $maxScore;
 
     /**
      * @var float
      *
      * @ORM\Column(name="mastery_score", type="float", precision=10, scale=0, nullable=true)
      */
-    private $masteryScore;
+    protected $masteryScore;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_item_id", type="integer", nullable=false)
      */
-    private $parentItemId;
+    protected $parentItemId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="previous_item_id", type="integer", nullable=false)
      */
-    private $previousItemId;
+    protected $previousItemId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="next_item_id", type="integer", nullable=false)
      */
-    private $nextItemId;
+    protected $nextItemId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var string
      *
      * @ORM\Column(name="prerequisite", type="text", nullable=true)
      */
-    private $prerequisite;
+    protected $prerequisite;
 
     /**
      * @var string
      *
      * @ORM\Column(name="parameters", type="text", nullable=true)
      */
-    private $parameters;
+    protected $parameters;
 
     /**
      * @var string
      *
      * @ORM\Column(name="launch_data", type="text", nullable=false)
      */
-    private $launchData;
+    protected $launchData;
 
     /**
      * @var string
      *
      * @ORM\Column(name="max_time_allowed", type="string", length=13, nullable=true)
      */
-    private $maxTimeAllowed;
+    protected $maxTimeAllowed;
 
     /**
      * @var string
      *
      * @ORM\Column(name="terms", type="text", nullable=true)
      */
-    private $terms;
+    protected $terms;
 
     /**
      * @var int
      *
      * @ORM\Column(name="search_did", type="integer", nullable=true)
      */
-    private $searchDid;
+    protected $searchDid;
 
     /**
      * @var string
      *
      * @ORM\Column(name="audio", type="string", length=250, nullable=true)
      */
-    private $audio;
+    protected $audio;
 
     /**
      * @var float
      *
      * @ORM\Column(name="prerequisite_min_score", type="float", precision=10, scale=0, nullable=true)
      */
-    private $prerequisiteMinScore;
+    protected $prerequisiteMinScore;
 
     /**
      * @var float
      *
      * @ORM\Column(name="prerequisite_max_score", type="float", precision=10, scale=0, nullable=true)
      */
-    private $prerequisiteMaxScore;
+    protected $prerequisiteMaxScore;
 
     /**
      * CLpItem constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CLpItemView.php b/src/Chamilo/CourseBundle/Entity/CLpItemView.php
index 8f7612dbca..6dd5d57a5c 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpItemView.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpItemView.php
@@ -28,98 +28,98 @@ class CLpItemView
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_item_id", type="integer", nullable=false)
      */
-    private $lpItemId;
+    protected $lpItemId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_view_id", type="integer", nullable=false)
      */
-    private $lpViewId;
+    protected $lpViewId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="view_count", type="integer", nullable=false)
      */
-    private $viewCount;
+    protected $viewCount;
 
     /**
      * @var int
      *
      * @ORM\Column(name="start_time", type="integer", nullable=false)
      */
-    private $startTime;
+    protected $startTime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="total_time", type="integer", nullable=false)
      */
-    private $totalTime;
+    protected $totalTime;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score", type="float", precision=10, scale=0, nullable=false)
      */
-    private $score;
+    protected $score;
 
     /**
      * @var string
      *
      * @ORM\Column(name="status", type="string", length=32, nullable=false, options={"default":"not attempted"})
      */
-    private $status;
+    protected $status;
 
     /**
      * @var string
      *
      * @ORM\Column(name="suspend_data", type="text", nullable=true)
      */
-    private $suspendData;
+    protected $suspendData;
 
     /**
      * @var string
      *
      * @ORM\Column(name="lesson_location", type="text", nullable=true)
      */
-    private $lessonLocation;
+    protected $lessonLocation;
 
     /**
      * @var string
      *
      * @ORM\Column(name="core_exit", type="string", length=32, nullable=false, options={"default":"none"})
      */
-    private $coreExit;
+    protected $coreExit;
 
     /**
      * @var string
      *
      * @ORM\Column(name="max_score", type="string", length=8, nullable=true)
      */
-    private $maxScore;
+    protected $maxScore;
 
     /**
      * CLpItemView constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php b/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php
index 49371f79d8..0a2549839b 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpIvInteraction.php
@@ -26,91 +26,91 @@ class CLpIvInteraction
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="order_id", type="integer", nullable=false)
      */
-    private $orderId;
+    protected $orderId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_iv_id", type="bigint", nullable=false)
      */
-    private $lpIvId;
+    protected $lpIvId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="interaction_id", type="string", length=255, nullable=false)
      */
-    private $interactionId;
+    protected $interactionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="interaction_type", type="string", length=255, nullable=false)
      */
-    private $interactionType;
+    protected $interactionType;
 
     /**
      * @var float
      *
      * @ORM\Column(name="weighting", type="float", precision=10, scale=0, nullable=false)
      */
-    private $weighting;
+    protected $weighting;
 
     /**
      * @var string
      *
      * @ORM\Column(name="completion_time", type="string", length=16, nullable=false)
      */
-    private $completionTime;
+    protected $completionTime;
 
     /**
      * @var string
      *
      * @ORM\Column(name="correct_responses", type="text", nullable=false)
      */
-    private $correctResponses;
+    protected $correctResponses;
 
     /**
      * @var string
      *
      * @ORM\Column(name="student_response", type="text", nullable=false)
      */
-    private $studentResponse;
+    protected $studentResponse;
 
     /**
      * @var string
      *
      * @ORM\Column(name="result", type="string", length=255, nullable=false)
      */
-    private $result;
+    protected $result;
 
     /**
      * @var string
      *
      * @ORM\Column(name="latency", type="string", length=16, nullable=false)
      */
-    private $latency;
+    protected $latency;
 
     /**
      * Set orderId.
diff --git a/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php b/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php
index 0c87f96474..a86cf6dd88 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpIvObjective.php
@@ -26,70 +26,70 @@ class CLpIvObjective
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_iv_id", type="bigint", nullable=false)
      */
-    private $lpIvId;
+    protected $lpIvId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="order_id", type="integer", nullable=false)
      */
-    private $orderId;
+    protected $orderId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="objective_id", type="string", length=255, nullable=false)
      */
-    private $objectiveId;
+    protected $objectiveId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score_raw", type="float", precision=10, scale=0, nullable=false)
      */
-    private $scoreRaw;
+    protected $scoreRaw;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score_max", type="float", precision=10, scale=0, nullable=false)
      */
-    private $scoreMax;
+    protected $scoreMax;
 
     /**
      * @var float
      *
      * @ORM\Column(name="score_min", type="float", precision=10, scale=0, nullable=false)
      */
-    private $scoreMin;
+    protected $scoreMin;
 
     /**
      * @var string
      *
      * @ORM\Column(name="status", type="string", length=32, nullable=false)
      */
-    private $status;
+    protected $status;
 
     /**
      * Set lpIvId.
diff --git a/src/Chamilo/CourseBundle/Entity/CLpView.php b/src/Chamilo/CourseBundle/Entity/CLpView.php
index 49d79037dd..a8b6fbfdfb 100644
--- a/src/Chamilo/CourseBundle/Entity/CLpView.php
+++ b/src/Chamilo/CourseBundle/Entity/CLpView.php
@@ -28,63 +28,63 @@ class CLpView
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="lp_id", type="integer", nullable=false)
      */
-    private $lpId;
+    protected $lpId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="view_count", type="integer", nullable=false)
      */
-    private $viewCount;
+    protected $viewCount;
 
     /**
      * @var int
      *
      * @ORM\Column(name="last_item", type="integer", nullable=false)
      */
-    private $lastItem;
+    protected $lastItem;
 
     /**
      * @var int
      *
      * @ORM\Column(name="progress", type="integer", nullable=true)
      */
-    private $progress;
+    protected $progress;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set lpId.
diff --git a/src/Chamilo/CourseBundle/Entity/CNotebook.php b/src/Chamilo/CourseBundle/Entity/CNotebook.php
index 2643ca20c9..66e84224b9 100644
--- a/src/Chamilo/CourseBundle/Entity/CNotebook.php
+++ b/src/Chamilo/CourseBundle/Entity/CNotebook.php
@@ -25,77 +25,77 @@ class CNotebook
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="notebook_id", type="integer")
      */
-    private $notebookId;
+    protected $notebookId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="course", type="string", length=40, nullable=false)
      */
-    private $course;
+    protected $course;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="creation_date", type="datetime", nullable=false)
      */
-    private $creationDate;
+    protected $creationDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="update_date", type="datetime", nullable=false)
      */
-    private $updateDate;
+    protected $updateDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="status", type="integer", nullable=true)
      */
-    private $status;
+    protected $status;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/COnlineConnected.php b/src/Chamilo/CourseBundle/Entity/COnlineConnected.php
index 1284323554..d896a29a9c 100644
--- a/src/Chamilo/CourseBundle/Entity/COnlineConnected.php
+++ b/src/Chamilo/CourseBundle/Entity/COnlineConnected.php
@@ -25,28 +25,28 @@ class COnlineConnected
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="last_connection", type="datetime", nullable=false)
      */
-    private $lastConnection;
+    protected $lastConnection;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set lastConnection.
diff --git a/src/Chamilo/CourseBundle/Entity/COnlineLink.php b/src/Chamilo/CourseBundle/Entity/COnlineLink.php
index 999b1d6e19..d927a16174 100644
--- a/src/Chamilo/CourseBundle/Entity/COnlineLink.php
+++ b/src/Chamilo/CourseBundle/Entity/COnlineLink.php
@@ -25,35 +25,35 @@ class COnlineLink
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=50, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="url", type="string", length=100, nullable=false)
      */
-    private $url;
+    protected $url;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php b/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php
index 6809869e90..08bb0246a2 100644
--- a/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CPermissionGroup.php
@@ -24,42 +24,42 @@ class CPermissionGroup
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tool", type="string", length=250, nullable=false)
      */
-    private $tool;
+    protected $tool;
 
     /**
      * @var string
      *
      * @ORM\Column(name="action", type="string", length=250, nullable=false)
      */
-    private $action;
+    protected $action;
 
     /**
      * Set groupId.
diff --git a/src/Chamilo/CourseBundle/Entity/CPermissionTask.php b/src/Chamilo/CourseBundle/Entity/CPermissionTask.php
index 6ad9ae4ab0..cd9d30c1f2 100644
--- a/src/Chamilo/CourseBundle/Entity/CPermissionTask.php
+++ b/src/Chamilo/CourseBundle/Entity/CPermissionTask.php
@@ -25,42 +25,42 @@ class CPermissionTask
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="task_id", type="integer", nullable=false)
      */
-    private $taskId;
+    protected $taskId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tool", type="string", length=250, nullable=false)
      */
-    private $tool;
+    protected $tool;
 
     /**
      * @var string
      *
      * @ORM\Column(name="action", type="string", length=250, nullable=false)
      */
-    private $action;
+    protected $action;
 
     /**
      * Set taskId.
diff --git a/src/Chamilo/CourseBundle/Entity/CPermissionUser.php b/src/Chamilo/CourseBundle/Entity/CPermissionUser.php
index 5141b8d795..37a3666c48 100644
--- a/src/Chamilo/CourseBundle/Entity/CPermissionUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CPermissionUser.php
@@ -25,42 +25,42 @@ class CPermissionUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tool", type="string", length=250, nullable=false)
      */
-    private $tool;
+    protected $tool;
 
     /**
      * @var string
      *
      * @ORM\Column(name="action", type="string", length=250, nullable=false)
      */
-    private $action;
+    protected $action;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CQuiz.php b/src/Chamilo/CourseBundle/Entity/CQuiz.php
index 89e6c75154..134ca73261 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuiz.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuiz.php
@@ -26,188 +26,188 @@ class CQuiz
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="sound", type="string", length=255, nullable=true)
      */
-    private $sound;
+    protected $sound;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="type", type="boolean", nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="random", type="integer", nullable=false)
      */
-    private $random;
+    protected $random;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="random_answers", type="boolean", nullable=false)
      */
-    private $randomAnswers;
+    protected $randomAnswers;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="active", type="boolean", nullable=false)
      */
-    private $active;
+    protected $active;
 
     /**
      * @var int
      *
      * @ORM\Column(name="results_disabled", type="integer", nullable=false)
      */
-    private $resultsDisabled;
+    protected $resultsDisabled;
 
     /**
      * @var string
      *
      * @ORM\Column(name="access_condition", type="text", nullable=true)
      */
-    private $accessCondition;
+    protected $accessCondition;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_attempt", type="integer", nullable=false)
      */
-    private $maxAttempt;
+    protected $maxAttempt;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="start_time", type="datetime", nullable=true)
      */
-    private $startTime;
+    protected $startTime;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="end_time", type="datetime", nullable=true)
      */
-    private $endTime;
+    protected $endTime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="feedback_type", type="integer", nullable=false)
      */
-    private $feedbackType;
+    protected $feedbackType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="expired_time", type="integer", nullable=false)
      */
-    private $expiredTime;
+    protected $expiredTime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="propagate_neg", type="integer", nullable=false)
      */
-    private $propagateNeg;
+    protected $propagateNeg;
 
     /**
      * @var bool
      * @ORm\Column(name="save_correct_answers", type="boolean", nullable=false)
      */
-    private $saveCorrectAnswers;
+    protected $saveCorrectAnswers;
 
     /**
      * @var int
      *
      * @ORM\Column(name="review_answers", type="integer", nullable=false)
      */
-    private $reviewAnswers;
+    protected $reviewAnswers;
 
     /**
      * @var int
      *
      * @ORM\Column(name="random_by_category", type="integer", nullable=false)
      */
-    private $randomByCategory;
+    protected $randomByCategory;
 
     /**
      * @var string
      *
      * @ORM\Column(name="text_when_finished", type="text", nullable=true)
      */
-    private $textWhenFinished;
+    protected $textWhenFinished;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_category_name", type="integer", nullable=false)
      */
-    private $displayCategoryName;
+    protected $displayCategoryName;
 
     /**
      * @var int
      *
      * @ORM\Column(name="pass_percentage", type="integer", nullable=true)
      */
-    private $passPercentage;
+    protected $passPercentage;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_selection_type", type="integer", nullable=true)
      */
-    private $questionSelectionType;
+    protected $questionSelectionType;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="hide_question_title", type="boolean", nullable=true)
      */
-    private $hideQuestionTitle;
+    protected $hideQuestionTitle;
 
     /**
      * CQuiz constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php b/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php
index c53a999dba..2cc83deb4a 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizAnswer.php
@@ -26,98 +26,98 @@ class CQuizAnswer
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id_auto", type="integer", options={"unsigned": true, "default": null})
      */
-    private $idAuto;
+    protected $idAuto;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer", options={"unsigned": true, "default": null})
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="answer", type="text", nullable=false)
      */
-    private $answer;
+    protected $answer;
 
     /**
      * @var int
      *
      * @ORM\Column(name="correct", type="integer", nullable=true)
      */
-    private $correct;
+    protected $correct;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var float
      *
      * @ORM\Column(name="ponderation", type="float", precision=6, scale=2, nullable=false, options={"default": 0})
      */
-    private $ponderation;
+    protected $ponderation;
 
     /**
      * @var int
      *
      * @ORM\Column(name="position", type="integer", nullable=false)
      */
-    private $position;
+    protected $position;
 
     /**
      * @var string
      *
      * @ORM\Column(name="hotspot_coordinates", type="text", nullable=true)
      */
-    private $hotspotCoordinates;
+    protected $hotspotCoordinates;
 
     /**
      * @var string
      *
      * @ORM\Column(name="hotspot_type", type="string", length=40, nullable=true)
      */
-    private $hotspotType;
+    protected $hotspotType;
 
     /**
      * @var string
      *
      * @ORM\Column(name="destination", type="text", nullable=true)
      */
-    private $destination;
+    protected $destination;
 
     /**
      * @var string
      *
      * @ORM\Column(name="answer_code", type="string", length=10, nullable=true)
      */
-    private $answerCode;
+    protected $answerCode;
 
     public function __construct()
     {
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizCategory.php b/src/Chamilo/CourseBundle/Entity/CQuizCategory.php
index 418070659d..ff2df37500 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizCategory.php
@@ -20,35 +20,35 @@ class CQuizCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=true)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exercise_id", type="integer", nullable=false)
      */
-    private $exerciseId;
+    protected $exerciseId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="count_questions", type="integer", nullable=true)
      */
-    private $countQuestions;
+    protected $countQuestions;
 
     /**
      * @return int
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php
index 72d74b29fc..e7943a6743 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestion.php
@@ -26,84 +26,84 @@ class CQuizQuestion
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="question", type="text", nullable=false)
      */
-    private $question;
+    protected $question;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var float
      *
      * @ORM\Column(name="ponderation", type="float", precision=6, scale=2, nullable=false, options={"default": 0})
      */
-    private $ponderation;
+    protected $ponderation;
 
     /**
      * @var int
      *
      * @ORM\Column(name="position", type="integer", nullable=false)
      */
-    private $position;
+    protected $position;
 
     /**
      * @var int
      *
      * @ORM\Column(name="type", type="integer", nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var string
      *
      * @ORM\Column(name="picture", type="string", length=50, nullable=true)
      */
-    private $picture;
+    protected $picture;
 
     /**
      * @var int
      *
      * @ORM\Column(name="level", type="integer", nullable=false)
      */
-    private $level;
+    protected $level;
 
     /**
      * @var string
      *
      * @ORM\Column(name="extra", type="string", length=255, nullable=true)
      */
-    private $extra;
+    protected $extra;
 
     /**
      * @var string
      *
      * @ORM\Column(name="question_code", type="string", length=10, nullable=true)
      */
-    private $questionCode;
+    protected $questionCode;
 
     /**
      * CQuizQuestion constructor.
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php
index 00806a97c0..00cccf5fd6 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestionCategory.php
@@ -25,35 +25,35 @@ class CQuizQuestionCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php
index bc631d3965..ee4a3fefbd 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestionOption.php
@@ -25,42 +25,42 @@ class CQuizQuestionOption
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=255, nullable=true)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var int
      *
      * @ORM\Column(name="position", type="integer", nullable=false)
      */
-    private $position;
+    protected $position;
 
     /**
      * Set questionId.
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php b/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php
index 8166561a69..54a4025c3e 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizQuestionRelCategory.php
@@ -26,28 +26,28 @@ class CQuizQuestionRelCategory
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="category_id", type="integer", nullable=false)
      */
-    private $categoryId;
+    protected $categoryId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer")
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * Set categoryId.
diff --git a/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php b/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php
index f487a3206d..49fec1427c 100644
--- a/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php
+++ b/src/Chamilo/CourseBundle/Entity/CQuizRelQuestion.php
@@ -27,35 +27,35 @@ class CQuizRelQuestion
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_order", type="integer", nullable=false)
      */
-    private $questionOrder;
+    protected $questionOrder;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer")
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="exercice_id", type="integer")
      */
-    private $exerciceId;
+    protected $exerciceId;
 
     /**
      * Set questionOrder.
diff --git a/src/Chamilo/CourseBundle/Entity/CResource.php b/src/Chamilo/CourseBundle/Entity/CResource.php
index 5ba130fad7..6f51c891d5 100644
--- a/src/Chamilo/CourseBundle/Entity/CResource.php
+++ b/src/Chamilo/CourseBundle/Entity/CResource.php
@@ -25,49 +25,49 @@ class CResource
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="source_type", type="string", length=50, nullable=true)
      */
-    private $sourceType;
+    protected $sourceType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="source_id", type="integer", nullable=true)
      */
-    private $sourceId;
+    protected $sourceId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="resource_type", type="string", length=50, nullable=true)
      */
-    private $resourceType;
+    protected $resourceType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="resource_id", type="integer", nullable=true)
      */
-    private $resourceId;
+    protected $resourceId;
 
     /**
      * Set sourceType.
diff --git a/src/Chamilo/CourseBundle/Entity/CRole.php b/src/Chamilo/CourseBundle/Entity/CRole.php
index 29921a5e82..5f4b9f08ef 100644
--- a/src/Chamilo/CourseBundle/Entity/CRole.php
+++ b/src/Chamilo/CourseBundle/Entity/CRole.php
@@ -25,42 +25,42 @@ class CRole
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="role_name", type="string", length=250, nullable=false)
      */
-    private $roleName;
+    protected $roleName;
 
     /**
      * @var string
      *
      * @ORM\Column(name="role_comment", type="text", nullable=true)
      */
-    private $roleComment;
+    protected $roleComment;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="default_role", type="boolean", nullable=true)
      */
-    private $defaultRole;
+    protected $defaultRole;
 
     /**
      * @var int
      *
      * @ORM\Column(name="role_id", type="integer")
      */
-    private $roleId;
+    protected $roleId;
 
     /**
      * Set roleName.
diff --git a/src/Chamilo/CourseBundle/Entity/CRoleGroup.php b/src/Chamilo/CourseBundle/Entity/CRoleGroup.php
index 710e3c1615..e78bcf7805 100644
--- a/src/Chamilo/CourseBundle/Entity/CRoleGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CRoleGroup.php
@@ -26,42 +26,42 @@ class CRoleGroup
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="role_id", type="integer", nullable=false)
      */
-    private $roleId;
+    protected $roleId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="scope", type="string", length=20, nullable=false)
      */
-    private $scope;
+    protected $scope;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer")
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * Set roleId.
diff --git a/src/Chamilo/CourseBundle/Entity/CRolePermissions.php b/src/Chamilo/CourseBundle/Entity/CRolePermissions.php
index d3ea9164ff..d44d35ef26 100644
--- a/src/Chamilo/CourseBundle/Entity/CRolePermissions.php
+++ b/src/Chamilo/CourseBundle/Entity/CRolePermissions.php
@@ -26,49 +26,49 @@ class CRolePermissions
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="default_perm", type="boolean", nullable=false)
      */
-    private $defaultPerm;
+    protected $defaultPerm;
 
     /**
      * @var int
      *
      * @ORM\Column(name="role_id", type="integer")
      */
-    private $roleId;
+    protected $roleId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tool", type="string", length=250)
      */
-    private $tool;
+    protected $tool;
 
     /**
      * @var string
      *
      * @ORM\Column(name="action", type="string", length=50)
      */
-    private $action;
+    protected $action;
 
     /**
      * Set defaultPerm.
diff --git a/src/Chamilo/CourseBundle/Entity/CRoleUser.php b/src/Chamilo/CourseBundle/Entity/CRoleUser.php
index d041fc1c13..78e6c54456 100644
--- a/src/Chamilo/CourseBundle/Entity/CRoleUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CRoleUser.php
@@ -26,35 +26,35 @@ class CRoleUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="scope", type="string", length=20, nullable=false)
      */
-    private $scope;
+    protected $scope;
 
     /**
      * @var int
      *
      * @ORM\Column(name="role_id", type="integer")
      */
-    private $roleId;
+    protected $roleId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set scope.
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublication.php b/src/Chamilo/CourseBundle/Entity/CStudentPublication.php
index c158fdd04f..d8349a202e 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublication.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublication.php
@@ -28,182 +28,182 @@ class CStudentPublication
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="url", type="string", length=255, nullable=true)
      */
-    private $url;
+    protected $url;
 
     /**
      * @var string
      *
      * @ORM\Column(name="url_correction", type="string", length=255, nullable=true)
      */
-    private $urlCorrection;
+    protected $urlCorrection;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title_correction", type="string", length=255, nullable=true)
      */
-    private $titleCorrection;
+    protected $titleCorrection;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var string
      *
      * @ORM\Column(name="author", type="string", length=255, nullable=true)
      */
-    private $author;
+    protected $author;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="active", type="boolean", nullable=true)
      */
-    private $active;
+    protected $active;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="accepted", type="boolean", nullable=true)
      */
-    private $accepted;
+    protected $accepted;
 
     /**
      * @var int
      *
      * @ORM\Column(name="post_group_id", type="integer", nullable=false)
      */
-    private $postGroupId;
+    protected $postGroupId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="sent_date", type="datetime", nullable=true)
      */
-    private $sentDate;
+    protected $sentDate;
 
     /**
      * @var string
      *
      * @ORM\Column(name="filetype", type="string", length=10, nullable=false)
      */
-    private $filetype;
+    protected $filetype;
 
     /**
      * @var int
      *
      * @ORM\Column(name="has_properties", type="integer", nullable=false)
      */
-    private $hasProperties;
+    protected $hasProperties;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="view_properties", type="boolean", nullable=true)
      */
-    private $viewProperties;
+    protected $viewProperties;
 
     /**
      * @var float
      *
      * @ORM\Column(name="qualification", type="float", precision=6, scale=2, nullable=false)
      */
-    private $qualification;
+    protected $qualification;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="date_of_qualification", type="datetime", nullable=true)
      */
-    private $dateOfQualification;
+    protected $dateOfQualification;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_id", type="integer", nullable=false)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="qualificator_id", type="integer", nullable=false)
      */
-    private $qualificatorId;
+    protected $qualificatorId;
 
     /**
      * @var float
      *
      * @ORM\Column(name="weight", type="float", precision=6, scale=2, nullable=false)
      */
-    private $weight;
+    protected $weight;
 
     /**
      * @var Session
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Session", inversedBy="studentPublications")
      * @ORM\JoinColumn(name="session_id", referencedColumnName="id")
      */
-    private $session;
+    protected $session;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="allow_text_assignment", type="integer", nullable=false)
      */
-    private $allowTextAssignment;
+    protected $allowTextAssignment;
 
     /**
      * @var int
      *
      * @ORM\Column(name="contains_file", type="integer", nullable=false)
      */
-    private $containsFile;
+    protected $containsFile;
 
     /**
      * @var int
      *
      * @ORM\Column(name="document_id", type="integer", nullable=false)
      */
-    private $documentId;
+    protected $documentId;
 
     /**
      * Set url.
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php
index 2cfcf9dae5..0ded9c43bf 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationAssignment.php
@@ -25,56 +25,56 @@ class CStudentPublicationAssignment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="expires_on", type="datetime", nullable=true)
      */
-    private $expiresOn;
+    protected $expiresOn;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="ends_on", type="datetime", nullable=true)
      */
-    private $endsOn;
+    protected $endsOn;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="add_to_calendar", type="integer", nullable=false)
      */
-    private $addToCalendar;
+    protected $addToCalendar;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="enable_qualification", type="boolean", nullable=false)
      */
-    private $enableQualification;
+    protected $enableQualification;
 
     /**
      * @var int
      *
      * @ORM\Column(name="publication_id", type="integer", nullable=false)
      */
-    private $publicationId;
+    protected $publicationId;
 
     /**
      * Set expiresOn.
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php
index 04750915bb..6c0680853f 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationComment.php
@@ -27,56 +27,56 @@ class CStudentPublicationComment
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="work_id", type="integer", nullable=false)
      */
-    private $workId;
+    protected $workId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="file", type="string", length=255, nullable=true)
      */
-    private $file;
+    protected $file;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="sent_at", type="datetime", nullable=false)
      */
-    private $sentAt;
+    protected $sentAt;
 
     /**
      * Set workId.
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php
index 427ff3457f..f29d6ef1d6 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelDocument.php
@@ -27,35 +27,35 @@ class CStudentPublicationRelDocument
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="work_id", type="integer", nullable=false)
      */
-    private $workId;
+    protected $workId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="document_id", type="integer", nullable=false)
      */
-    private $documentId;
+    protected $documentId;
 
     /**
      * Set workId.
diff --git a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php
index 077560a270..ddf26227c0 100644
--- a/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php
+++ b/src/Chamilo/CourseBundle/Entity/CStudentPublicationRelUser.php
@@ -27,35 +27,35 @@ class CStudentPublicationRelUser
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="work_id", type="integer", nullable=false)
      */
-    private $workId;
+    protected $workId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set workId.
diff --git a/src/Chamilo/CourseBundle/Entity/CSurvey.php b/src/Chamilo/CourseBundle/Entity/CSurvey.php
index ed6c801157..c7349b52af 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurvey.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurvey.php
@@ -26,217 +26,217 @@ class CSurvey
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_id", type="integer")
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="code", type="string", length=20, nullable=true)
      */
-    private $code;
+    protected $code;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="text", nullable=true)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="subtitle", type="text", nullable=true)
      */
-    private $subtitle;
+    protected $subtitle;
 
     /**
      * @var string
      *
      * @ORM\Column(name="author", type="string", length=20, nullable=true)
      */
-    private $author;
+    protected $author;
 
     /**
      * @var string
      *
      * @ORM\Column(name="lang", type="string", length=20, nullable=true)
      */
-    private $lang;
+    protected $lang;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="avail_from", type="date", nullable=true)
      */
-    private $availFrom;
+    protected $availFrom;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="avail_till", type="date", nullable=true)
      */
-    private $availTill;
+    protected $availTill;
 
     /**
      * @var string
      *
      * @ORM\Column(name="is_shared", type="string", length=1, nullable=true)
      */
-    private $isShared;
+    protected $isShared;
 
     /**
      * @var string
      *
      * @ORM\Column(name="template", type="string", length=20, nullable=true)
      */
-    private $template;
+    protected $template;
 
     /**
      * @var string
      *
      * @ORM\Column(name="intro", type="text", nullable=true)
      */
-    private $intro;
+    protected $intro;
 
     /**
      * @var string
      *
      * @ORM\Column(name="surveythanks", type="text", nullable=true)
      */
-    private $surveythanks;
+    protected $surveythanks;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="creation_date", type="datetime", nullable=false)
      */
-    private $creationDate;
+    protected $creationDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="invited", type="integer", nullable=false)
      */
-    private $invited;
+    protected $invited;
 
     /**
      * @var int
      *
      * @ORM\Column(name="answered", type="integer", nullable=false)
      */
-    private $answered;
+    protected $answered;
 
     /**
      * @var string
      *
      * @ORM\Column(name="invite_mail", type="text", nullable=false)
      */
-    private $inviteMail;
+    protected $inviteMail;
 
     /**
      * @var string
      *
      * @ORM\Column(name="reminder_mail", type="text", nullable=false)
      */
-    private $reminderMail;
+    protected $reminderMail;
 
     /**
      * @var string
      *
      * @ORM\Column(name="mail_subject", type="string", length=255, nullable=false)
      */
-    private $mailSubject;
+    protected $mailSubject;
 
     /**
      * @var string
      *
      * @ORM\Column(name="anonymous", type="string", length=10, nullable=false)
      */
-    private $anonymous;
+    protected $anonymous;
 
     /**
      * @var string
      *
      * @ORM\Column(name="access_condition", type="text", nullable=true)
      */
-    private $accessCondition;
+    protected $accessCondition;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="shuffle", type="boolean", nullable=false)
      */
-    private $shuffle;
+    protected $shuffle;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="one_question_per_page", type="boolean", nullable=false)
      */
-    private $oneQuestionPerPage;
+    protected $oneQuestionPerPage;
 
     /**
      * @var string
      *
      * @ORM\Column(name="survey_version", type="string", length=255, nullable=false)
      */
-    private $surveyVersion;
+    protected $surveyVersion;
 
     /**
      * @var int
      *
      * @ORM\Column(name="parent_id", type="integer", nullable=false)
      */
-    private $parentId;
+    protected $parentId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_type", type="integer", nullable=false)
      */
-    private $surveyType;
+    protected $surveyType;
 
     /**
      * @var int
      *
      * @ORM\Column(name="show_form_profile", type="integer", nullable=false)
      */
-    private $showFormProfile;
+    protected $showFormProfile;
 
     /**
      * @var string
      *
      * @ORM\Column(name="form_fields", type="text", nullable=false)
      */
-    private $formFields;
+    protected $formFields;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="visible_results", type="integer", nullable=true)
      */
-    private $visibleResults;
+    protected $visibleResults;
 
     /**
      * Set code.
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php b/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php
index 4de1e80070..b037c638a6 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyAnswer.php
@@ -25,56 +25,56 @@ class CSurveyAnswer
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="answer_id", type="integer")
      */
-    private $answerId;
+    protected $answerId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_id", type="integer", nullable=false)
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="option_id", type="text", nullable=false)
      */
-    private $optionId;
+    protected $optionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="value", type="integer", nullable=false)
      */
-    private $value;
+    protected $value;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user", type="string", length=250, nullable=false)
      */
-    private $user;
+    protected $user;
 
     /**
      * Set surveyId.
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php b/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php
index 96cc36f011..2732a0d4ba 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyGroup.php
@@ -25,42 +25,42 @@ class CSurveyGroup
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="name", type="string", length=20, nullable=false)
      */
-    private $name;
+    protected $name;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="string", length=255, nullable=false)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_id", type="integer", nullable=false)
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * Set name.
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php b/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
index c7775e8d75..0924e8d358 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyInvitation.php
@@ -25,77 +25,77 @@ class CSurveyInvitation
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_invitation_id", type="integer")
      */
-    private $surveyInvitationId;
+    protected $surveyInvitationId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="survey_code", type="string", length=20, nullable=false)
      */
-    private $surveyCode;
+    protected $surveyCode;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user", type="string", length=250, nullable=false)
      */
-    private $user;
+    protected $user;
 
     /**
      * @var string
      *
      * @ORM\Column(name="invitation_code", type="string", length=250, nullable=false)
      */
-    private $invitationCode;
+    protected $invitationCode;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="invitation_date", type="datetime", nullable=false)
      */
-    private $invitationDate;
+    protected $invitationDate;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="reminder_date", type="datetime", nullable=false)
      */
-    private $reminderDate;
+    protected $reminderDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="answered", type="integer", nullable=false)
      */
-    private $answered;
+    protected $answered;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=false)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * Set surveyCode.
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php b/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php
index cdd1b2c20c..eb6f3f6c69 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyQuestion.php
@@ -25,98 +25,98 @@ class CSurveyQuestion
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer")
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_id", type="integer", nullable=false)
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="survey_question", type="text", nullable=false)
      */
-    private $surveyQuestion;
+    protected $surveyQuestion;
 
     /**
      * @var string
      *
      * @ORM\Column(name="survey_question_comment", type="text", nullable=false)
      */
-    private $surveyQuestionComment;
+    protected $surveyQuestionComment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="string", length=250, nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var string
      *
      * @ORM\Column(name="display", type="string", length=10, nullable=false)
      */
-    private $display;
+    protected $display;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sort", type="integer", nullable=false)
      */
-    private $sort;
+    protected $sort;
 
     /**
      * @var int
      *
      * @ORM\Column(name="shared_question_id", type="integer", nullable=true)
      */
-    private $sharedQuestionId;
+    protected $sharedQuestionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_value", type="integer", nullable=true)
      */
-    private $maxValue;
+    protected $maxValue;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_group_pri", type="integer", nullable=false)
      */
-    private $surveyGroupPri;
+    protected $surveyGroupPri;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_group_sec1", type="integer", nullable=false)
      */
-    private $surveyGroupSec1;
+    protected $surveyGroupSec1;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_group_sec2", type="integer", nullable=false)
      */
-    private $surveyGroupSec2;
+    protected $surveyGroupSec2;
 
     /**
      * Set surveyId.
diff --git a/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php b/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php
index 4fc840ed38..6e99b5326a 100644
--- a/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php
+++ b/src/Chamilo/CourseBundle/Entity/CSurveyQuestionOption.php
@@ -25,56 +25,56 @@ class CSurveyQuestionOption
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_option_id", type="integer")
      */
-    private $questionOptionId;
+    protected $questionOptionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="question_id", type="integer", nullable=false)
      */
-    private $questionId;
+    protected $questionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="survey_id", type="integer", nullable=false)
      */
-    private $surveyId;
+    protected $surveyId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="option_text", type="text", nullable=false)
      */
-    private $optionText;
+    protected $optionText;
 
     /**
      * @var int
      *
      * @ORM\Column(name="sort", type="integer", nullable=false)
      */
-    private $sort;
+    protected $sort;
 
     /**
      * @var int
      *
      * @ORM\Column(name="value", type="integer", nullable=false)
      */
-    private $value;
+    protected $value;
 
     /**
      * Set questionId.
diff --git a/src/Chamilo/CourseBundle/Entity/CThematic.php b/src/Chamilo/CourseBundle/Entity/CThematic.php
index 59f6c7bd9b..bed137c113 100644
--- a/src/Chamilo/CourseBundle/Entity/CThematic.php
+++ b/src/Chamilo/CourseBundle/Entity/CThematic.php
@@ -26,56 +26,56 @@ class CThematic
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="display_order", type="integer", nullable=false)
      */
-    private $displayOrder;
+    protected $displayOrder;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="active", type="boolean", nullable=false)
      */
-    private $active;
+    protected $active;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=false)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php b/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php
index bf799bfe10..c40dacc911 100644
--- a/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php
+++ b/src/Chamilo/CourseBundle/Entity/CThematicAdvance.php
@@ -27,63 +27,63 @@ class CThematicAdvance
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thematic_id", type="integer", nullable=false)
      */
-    private $thematicId;
+    protected $thematicId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="attendance_id", type="integer", nullable=false)
      */
-    private $attendanceId;
+    protected $attendanceId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=true)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="start_date", type="datetime", nullable=false)
      */
-    private $startDate;
+    protected $startDate;
 
     /**
      * @var int
      *
      * @ORM\Column(name="duration", type="integer", nullable=false)
      */
-    private $duration;
+    protected $duration;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="done_advance", type="boolean", nullable=false)
      */
-    private $doneAdvance;
+    protected $doneAdvance;
 
     /**
      * @var Room
@@ -91,7 +91,7 @@ class CThematicAdvance
      * @ORM\ManyToOne(targetEntity="Chamilo\CoreBundle\Entity\Room")
      * @ORM\JoinColumn(name="room_id", referencedColumnName="id")
      */
-    private $room;
+    protected $room;
 
     /**
      * Set thematicId.
diff --git a/src/Chamilo/CourseBundle/Entity/CThematicPlan.php b/src/Chamilo/CourseBundle/Entity/CThematicPlan.php
index cab2a8facd..9e44c3485f 100644
--- a/src/Chamilo/CourseBundle/Entity/CThematicPlan.php
+++ b/src/Chamilo/CourseBundle/Entity/CThematicPlan.php
@@ -26,49 +26,49 @@ class CThematicPlan
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="thematic_id", type="integer", nullable=false)
      */
-    private $thematicId;
+    protected $thematicId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="description", type="text", nullable=true)
      */
-    private $description;
+    protected $description;
 
     /**
      * @var int
      *
      * @ORM\Column(name="description_type", type="integer", nullable=false)
      */
-    private $descriptionType;
+    protected $descriptionType;
 
     /**
      * Set thematicId.
diff --git a/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php b/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php
index afc1e00a94..684e1c8c85 100644
--- a/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php
+++ b/src/Chamilo/CourseBundle/Entity/CUserinfoContent.php
@@ -26,56 +26,56 @@ class CUserinfoContent
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="definition_id", type="integer", nullable=false)
      */
-    private $definitionId;
+    protected $definitionId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="editor_ip", type="string", length=39, nullable=true)
      */
-    private $editorIp;
+    protected $editorIp;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="edition_time", type="datetime", nullable=true)
      */
-    private $editionTime;
+    protected $editionTime;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=false)
      */
-    private $content;
+    protected $content;
 
     /**
      * Set userId.
diff --git a/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php b/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php
index 7d725d4e2b..c38f67e635 100644
--- a/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php
+++ b/src/Chamilo/CourseBundle/Entity/CUserinfoDef.php
@@ -25,49 +25,49 @@ class CUserinfoDef
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=80, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=true)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="line_count", type="boolean", nullable=false)
      */
-    private $lineCount;
+    protected $lineCount;
 
     /**
      * @var bool
      *
      * @ORM\Column(name="rank", type="boolean", nullable=false)
      */
-    private $rank;
+    protected $rank;
 
     /**
      * Set title.
diff --git a/src/Chamilo/CourseBundle/Entity/CWiki.php b/src/Chamilo/CourseBundle/Entity/CWiki.php
index 91a7e43f7f..5dbd70ad3d 100644
--- a/src/Chamilo/CourseBundle/Entity/CWiki.php
+++ b/src/Chamilo/CourseBundle/Entity/CWiki.php
@@ -29,196 +29,196 @@ class CWiki
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="page_id", type="integer", nullable=true)
      */
-    private $pageId;
+    protected $pageId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="reflink", type="string", length=255, nullable=false)
      */
-    private $reflink;
+    protected $reflink;
 
     /**
      * @var string
      *
      * @ORM\Column(name="title", type="string", length=255, nullable=false)
      */
-    private $title;
+    protected $title;
 
     /**
      * @var string
      *
      * @ORM\Column(name="content", type="text", nullable=false)
      */
-    private $content;
+    protected $content;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer", nullable=false)
      */
-    private $userId;
+    protected $userId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=true)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="dtime", type="datetime", nullable=true)
      */
-    private $dtime;
+    protected $dtime;
 
     /**
      * @var int
      *
      * @ORM\Column(name="addlock", type="integer", nullable=false)
      */
-    private $addlock;
+    protected $addlock;
 
     /**
      * @var int
      *
      * @ORM\Column(name="editlock", type="integer", nullable=false)
      */
-    private $editlock;
+    protected $editlock;
 
     /**
      * @var int
      *
      * @ORM\Column(name="visibility", type="integer", nullable=false)
      */
-    private $visibility;
+    protected $visibility;
 
     /**
      * @var int
      *
      * @ORM\Column(name="addlock_disc", type="integer", nullable=false)
      */
-    private $addlockDisc;
+    protected $addlockDisc;
 
     /**
      * @var int
      *
      * @ORM\Column(name="visibility_disc", type="integer", nullable=false)
      */
-    private $visibilityDisc;
+    protected $visibilityDisc;
 
     /**
      * @var int
      *
      * @ORM\Column(name="ratinglock_disc", type="integer", nullable=false)
      */
-    private $ratinglockDisc;
+    protected $ratinglockDisc;
 
     /**
      * @var int
      *
      * @ORM\Column(name="assignment", type="integer", nullable=false)
      */
-    private $assignment;
+    protected $assignment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=false)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="progress", type="text", nullable=false)
      */
-    private $progress;
+    protected $progress;
 
     /**
      * @var int
      *
      * @ORM\Column(name="score", type="integer", nullable=true)
      */
-    private $score;
+    protected $score;
 
     /**
      * @var int
      *
      * @ORM\Column(name="version", type="integer", nullable=true)
      */
-    private $version;
+    protected $version;
 
     /**
      * @var int
      *
      * @ORM\Column(name="is_editing", type="integer", nullable=false)
      */
-    private $isEditing;
+    protected $isEditing;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="time_edit", type="datetime", nullable=true)
      */
-    private $timeEdit;
+    protected $timeEdit;
 
     /**
      * @var int
      *
      * @ORM\Column(name="hits", type="integer", nullable=true)
      */
-    private $hits;
+    protected $hits;
 
     /**
      * @var string
      *
      * @ORM\Column(name="linksto", type="text", nullable=false)
      */
-    private $linksto;
+    protected $linksto;
 
     /**
      * @var string
      *
      * @ORM\Column(name="tag", type="text", nullable=false)
      */
-    private $tag;
+    protected $tag;
 
     /**
      * @var string
      *
      * @ORM\Column(name="user_ip", type="string", length=39, nullable=false)
      */
-    private $userIp;
+    protected $userIp;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * Set pageId.
diff --git a/src/Chamilo/CourseBundle/Entity/CWikiConf.php b/src/Chamilo/CourseBundle/Entity/CWikiConf.php
index 764903ac23..95ef200cd1 100644
--- a/src/Chamilo/CourseBundle/Entity/CWikiConf.php
+++ b/src/Chamilo/CourseBundle/Entity/CWikiConf.php
@@ -26,112 +26,112 @@ class CWikiConf
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="page_id", type="integer")
      */
-    private $pageId;
+    protected $pageId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="task", type="text", nullable=false)
      */
-    private $task;
+    protected $task;
 
     /**
      * @var string
      *
      * @ORM\Column(name="feedback1", type="text", nullable=false)
      */
-    private $feedback1;
+    protected $feedback1;
 
     /**
      * @var string
      *
      * @ORM\Column(name="feedback2", type="text", nullable=false)
      */
-    private $feedback2;
+    protected $feedback2;
 
     /**
      * @var string
      *
      * @ORM\Column(name="feedback3", type="text", nullable=false)
      */
-    private $feedback3;
+    protected $feedback3;
 
     /**
      * @var string
      *
      * @ORM\Column(name="fprogress1", type="string", length=3, nullable=false)
      */
-    private $fprogress1;
+    protected $fprogress1;
 
     /**
      * @var string
      *
      * @ORM\Column(name="fprogress2", type="string", length=3, nullable=false)
      */
-    private $fprogress2;
+    protected $fprogress2;
 
     /**
      * @var string
      *
      * @ORM\Column(name="fprogress3", type="string", length=3, nullable=false)
      */
-    private $fprogress3;
+    protected $fprogress3;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_size", type="integer", nullable=true)
      */
-    private $maxSize;
+    protected $maxSize;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_text", type="integer", nullable=true)
      */
-    private $maxText;
+    protected $maxText;
 
     /**
      * @var int
      *
      * @ORM\Column(name="max_version", type="integer", nullable=true)
      */
-    private $maxVersion;
+    protected $maxVersion;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="startdate_assig", type="datetime", nullable=true)
      */
-    private $startdateAssig;
+    protected $startdateAssig;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="enddate_assig", type="datetime", nullable=true)
      */
-    private $enddateAssig;
+    protected $enddateAssig;
 
     /**
      * @var int
      *
      * @ORM\Column(name="delayedsubmit", type="integer", nullable=false)
      */
-    private $delayedsubmit;
+    protected $delayedsubmit;
 
     /**
      * Set task.
diff --git a/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php b/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php
index a0661e9e92..a7a740c4cc 100644
--- a/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php
+++ b/src/Chamilo/CourseBundle/Entity/CWikiDiscuss.php
@@ -25,56 +25,56 @@ class CWikiDiscuss
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var int
      *
      * @ORM\Column(name="publication_id", type="integer", nullable=false)
      */
-    private $publicationId;
+    protected $publicationId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="userc_id", type="integer", nullable=false)
      */
-    private $usercId;
+    protected $usercId;
 
     /**
      * @var string
      *
      * @ORM\Column(name="comment", type="text", nullable=false)
      */
-    private $comment;
+    protected $comment;
 
     /**
      * @var string
      *
      * @ORM\Column(name="p_score", type="string", length=255, nullable=true)
      */
-    private $pScore;
+    protected $pScore;
 
     /**
      * @var \DateTime
      *
      * @ORM\Column(name="dtime", type="datetime", nullable=false)
      */
-    private $dtime;
+    protected $dtime;
 
     /**
      * Set publicationId.
diff --git a/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php b/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php
index caaf01ec26..8b495c0c4f 100644
--- a/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php
+++ b/src/Chamilo/CourseBundle/Entity/CWikiMailcue.php
@@ -27,49 +27,49 @@ class CWikiMailcue
      * @ORM\Id
      * @ORM\GeneratedValue
      */
-    private $iid;
+    protected $iid;
 
     /**
      * @var int
      *
      * @ORM\Column(name="c_id", type="integer")
      */
-    private $cId;
+    protected $cId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="id", type="integer", nullable=true)
      */
-    private $id;
+    protected $id;
 
     /**
      * @var string
      *
      * @ORM\Column(name="type", type="text", nullable=false)
      */
-    private $type;
+    protected $type;
 
     /**
      * @var int
      *
      * @ORM\Column(name="group_id", type="integer", nullable=true)
      */
-    private $groupId;
+    protected $groupId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="session_id", type="integer", nullable=true)
      */
-    private $sessionId;
+    protected $sessionId;
 
     /**
      * @var int
      *
      * @ORM\Column(name="user_id", type="integer")
      */
-    private $userId;
+    protected $userId;
 
     /**
      * Set type.

From 3349166cde660aa87d34dc705713dea19af6d50f Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 11:10:11 +0200
Subject: [PATCH 08/11] Minor - restore previous variable

---
 .../CourseBundle/Entity/CForumForum.php       | 26 ++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/Chamilo/CourseBundle/Entity/CForumForum.php b/src/Chamilo/CourseBundle/Entity/CForumForum.php
index f0e92004cf..fd95842cb1 100644
--- a/src/Chamilo/CourseBundle/Entity/CForumForum.php
+++ b/src/Chamilo/CourseBundle/Entity/CForumForum.php
@@ -135,9 +135,9 @@ class CForumForum
     /**
      * @var string
      *
-     * @ORM\Column(name="forum_group_public_protected", type="string", length=20, nullable=true)
+     * @ORM\Column(name="forum_group_public_private", type="string", length=20, nullable=true)
      */
-    protected $forumGroupPublicprotected;
+    protected $forumGroupPublicPrivate;
 
     /**
      * @var int
@@ -508,27 +508,23 @@ class CForumForum
     }
 
     /**
-     * Set forumGroupPublicprotected.
-     *
-     * @param string $forumGroupPublicprotected
-     *
-     * @return CForumForum
+     * @return string
      */
-    public function setForumGroupPublicprotected($forumGroupPublicprotected)
+    public function getForumGroupPublicPrivate()
     {
-        $this->forumGroupPublicprotected = $forumGroupPublicprotected;
-
-        return $this;
+        return $this->forumGroupPublicPrivate;
     }
 
     /**
-     * Get forumGroupPublicprotected.
+     * @param string $forumGroupPublicPrivate
      *
-     * @return string
+     * @return CForumForum
      */
-    public function getForumGroupPublicprotected()
+    public function setForumGroupPublicPrivate($forumGroupPublicPrivate)
     {
-        return $this->forumGroupPublicprotected;
+        $this->forumGroupPublicPrivate = $forumGroupPublicPrivate;
+
+        return $this;
     }
 
     /**

From 48304997bf2cb5c3ebdcc128b3a9595358e2ab28 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 11:54:25 +0200
Subject: [PATCH 09/11] Adding courses, classes, sessions in the personal data
 page #2503

---
 main/social/personal_data.php                 | 58 ++++++++++++++--
 src/Chamilo/UserBundle/Entity/User.php        |  3 +-
 .../UserBundle/Repository/UserRepository.php  | 66 ++++++++++++++++---
 3 files changed, 110 insertions(+), 17 deletions(-)

diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index 83018f0402..9236b25e39 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -24,6 +24,28 @@ $substitutionTerms = [
     'empty' => get_lang('NoData'),
 ];
 
+$action = isset($_GET['action']) ? $_GET['action'] : '';
+
+/*switch ($action) {
+    case 'delete_legal':
+        $extraFieldValue = new ExtraFieldValue('user');
+        $value = $extraFieldValue->get_values_by_handler_and_field_variable(
+            $userId,
+            'legal_accept'
+        );
+        $result = $extraFieldValue->delete($value['id']);
+
+        Display::addFlash(Display::return_message(get_lang('Deleted')));
+
+        Event::addEvent(
+            LOG_USER_REMOVED_LEGAL_ACCEPT,
+            LOG_USER_OBJECT,
+            api_get_user_info()
+        );
+        break;
+}*/
+
+
 $propertiesToJson = UserManager::getRepository()->getPersonalDataToJson($userId, $substitutionTerms);
 
 if (!empty($_GET['export'])) {
@@ -70,12 +92,36 @@ $properties = json_decode($propertiesToJson);
 
 foreach ($properties as $key => $value) {
     if (is_array($value) || is_object($value)) {
-        if ($key === 'extraFields') {
-            $personalDataContent .= '<li>'.$key.': </li><ul>';
-            foreach ($value as $subValue) {
-                $personalDataContent .= '<li>'.$subValue->variable.': '.$subValue->value.'</li>';
-            }
-            $personalDataContent .= '</ul>';
+        switch ($key) {
+            case 'extraFields':
+                $personalDataContent .= '<li>'.$key.': </li><ul>';
+                foreach ($value as $subValue) {
+                    $personalDataContent .= '<li>'.$subValue->variable.': '.$subValue->value.'</li>';
+                }
+                $personalDataContent .= '</ul>';
+                break;
+            case 'portals':
+            case 'achievedSkills':
+            case 'sessionAsGeneralCoach':
+            case 'classes':
+            case 'courses':
+                $personalDataContent .= '<li>'.$key.': </li><ul>';
+                foreach ($value as $subValue) {
+                    $personalDataContent .= '<li>'.$subValue.'</li>';
+                }
+                $personalDataContent .= '</ul>';
+                break;
+            case 'sessionCourseSubscriptions':
+                $personalDataContent .= '<li>'.$key.': </li><ul>';
+                foreach ($value as $session => $courseList) {
+                    $personalDataContent .= '<li>'.$session.'<ul>';
+                    foreach ($courseList as $course) {
+                        $personalDataContent .= '<li>'.$course.'</li>';
+                    }
+                    $personalDataContent .= '</ul>';
+                }
+                $personalDataContent .= '</ul>';
+                break;
         }
 
         /*foreach ($value as $subValue) {
diff --git a/src/Chamilo/UserBundle/Entity/User.php b/src/Chamilo/UserBundle/Entity/User.php
index c62b3e1a13..61f1ed8e38 100644
--- a/src/Chamilo/UserBundle/Entity/User.php
+++ b/src/Chamilo/UserBundle/Entity/User.php
@@ -271,9 +271,8 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
      */
     protected $curriculumItems;
 
-    /*
+    /**
      * @ORM\OneToMany(targetEntity="Chamilo\CoreBundle\Entity\AccessUrlRelUser", mappedBy="user")
-     *
      */
     protected $portals;
 
diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index f62f7132f1..b788d5c6b7 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -3,10 +3,15 @@
 
 namespace Chamilo\UserBundle\Repository;
 
+use Chamilo\CoreBundle\Entity\AccessUrlRelUser;
 use Chamilo\CoreBundle\Entity\Course;
+use Chamilo\CoreBundle\Entity\CourseRelUser;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
+use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\TrackELogin;
+use Chamilo\CoreBundle\Entity\Usergroup;
+use Chamilo\CoreBundle\Entity\UsergroupRelUser;
 use Chamilo\UserBundle\Entity\User;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
@@ -442,7 +447,7 @@ class UserRepository extends EntityRepository
      * @param int   $userId
      * @param array $substitutionTerms Substitute terms for some elements
      *
-     * @return array $values
+     * @return string
      */
     public function getPersonalDataToJson($userId, array $substitutionTerms)
     {
@@ -473,24 +478,68 @@ class UserRepository extends EntityRepository
         $user->setWebsite($noDataLabel);
         $user->setToken($noDataLabel);
 
-        //$courses = $user->getCourses();
+        $courses = $user->getCourses();
+        $list = [];
+        /** @var CourseRelUser $course */
+        foreach ($courses as $course) {
+            $list[] = $course->getCourse()->getCode();
+        }
+        $user->setCourses($list);
+
+        $classes = $user->getClasses();
+        $list = [];
+        /** @var UsergroupRelUser $class */
+        foreach ($classes as $class) {
+            $list[] = $class->getUsergroup()->getName();
+        }
+        $user->setClasses($list);
+
+        $collection = $user->getSessionCourseSubscriptions();
+        $list = [];
+        /** @var SessionRelCourseRelUser $item */
+        foreach ($collection as $item) {
+            $list[$item->getSession()->getName()][] = $item->getCourse()->getCode();
+        }
+        $user->setSessionCourseSubscriptions($list);
 
-        $user->setCourses([]);
-        $user->setClasses([]);
         $user->setDropBoxSentFiles([]);
         $user->setDropBoxReceivedFiles([]);
         $user->setGroups([]);
         $user->setCurriculumItems([]);
-        $user->setPortals([]);
-        $user->setSessionCourseSubscriptions([]);
-        $user->setSessionAsGeneralCoach([]);
-        $user->setAchievedSkills([]);
+
+        $portals = $user->getPortals();
+
+        $list = [];
+        /** @var AccessUrlRelUser $portal */
+        foreach ($portals as $portal) {
+            $portalInfo = \UrlManager::get_url_data_from_id($portal->getAccessUrlId());
+            $list[] = $portalInfo['url'];
+        }
+        $user->setPortals($list);
+
+        $coachList = $user->getSessionAsGeneralCoach();
+        $list = [];
+        /** @var Session $session */
+        foreach ($coachList as $session) {
+            $list[] = $session->getName();
+        }
+        $user->setSessionAsGeneralCoach($list);
+
+        $skillRelUserList = $user->getAchievedSkills();
+        $list = [];
+        /** @var SkillRelUser $skillRelUser */
+        foreach ($skillRelUserList as $skillRelUser) {
+            $list[] = $skillRelUser->getSkill()->getName();
+        }
+        $user->setAchievedSkills($list);
+
         $user->setCommentedUserSkills([]);
 
         $extraFieldValues = new \ExtraFieldValue('user');
         $items = $extraFieldValues->getAllValuesByItem($userId);
         $user->setExtraFields($items);
 
+
         $lastLogin = $user->getLastLogin();
         if (empty($lastLogin)) {
             $login = $this->getLastLogin($user);
@@ -501,7 +550,6 @@ class UserRepository extends EntityRepository
         $user->setLastLogin($lastLogin);
 
         $dateNormalizer = new GetSetMethodNormalizer();
-
         $dateNormalizer->setCircularReferenceHandler(function ($object) {
             return get_class($object);
         });

From 618c56cd90e1f00fac11df9cb0c35dd4c68539da Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 15:30:02 +0200
Subject: [PATCH 10/11] Add "Delete legal agreement" button see #2555

---
 main/admin/index.php                          |  25 +-
 main/admin/user_list.php                      |  81 +-
 main/admin/user_list_consent.php              | 705 ++++++++++++++++++
 main/inc/lib/api.lib.php                      |  14 +-
 .../lib/formvalidator/FormValidator.class.php |  11 +-
 main/inc/lib/message.lib.php                  |  16 +
 main/inc/lib/usermanager.lib.php              |  90 +++
 main/social/personal_data.php                 | 162 +++-
 .../template/default/social/personal_data.tpl |  19 +-
 9 files changed, 996 insertions(+), 127 deletions(-)
 create mode 100644 main/admin/user_list_consent.php

diff --git a/main/admin/index.php b/main/admin/index.php
index 08d7c2da66..2e44bbe95c 100644
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -534,8 +534,31 @@ if (api_is_platform_admin()) {
         }
     }
 
-    /* Chamilo.org */
+    // Data protection
+    $blocks['data_privacy']['icon'] = Display::return_icon(
+        'platform.png',
+        get_lang('Platform'),
+        [],
+        ICON_SIZE_MEDIUM,
+        false
+    );
+    $blocks['data_privacy']['label'] = api_ucfirst(get_lang('PersonalDataPrivacy'));
+    $blocks['data_privacy']['class'] = 'block-admin-platform';
+    $blocks['data_privacy']['editable'] = false;
 
+    $items = [];
+
+    $items[] = [
+        'url' => api_get_path(WEB_CODE_PATH).'admin/user_list_consent.php',
+        'label' => get_lang('UserList'),
+    ];
+
+    $blocks['data_privacy']['items'] = $items;
+    $blocks['data_privacy']['extra'] = null;
+    $blocks['data_privacy']['search_form'] = null;
+
+
+    /* Chamilo.org */
     $blocks['chamilo']['icon'] = Display::return_icon(
         'platform.png',
         'Chamilo.org',
diff --git a/main/admin/user_list.php b/main/admin/user_list.php
index e1c0de0e9f..20a306ccec 100755
--- a/main/admin/user_list.php
+++ b/main/admin/user_list.php
@@ -46,12 +46,6 @@ if (isset($_GET['user_id']) && $action == 'login_as') {
 
 api_protect_admin_script(true);
 
-// Blocks the possibility to delete a user
-$deleteUserAvailable = true;
-if (api_get_configuration_value('deny_delete_users')) {
-    $deleteUserAvailable = false;
-}
-
 trimVariables();
 
 $url = api_get_path(WEB_AJAX_PATH).'course.ajax.php?a=get_user_courses';
@@ -870,40 +864,10 @@ if (!empty($action)) {
                 }
                 break;
             case 'delete_user':
-                $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
-                if (api_is_platform_admin() ||
-                    ($allowDelete && api_is_session_admin())
-                ) {
-                    $userToUpdate = $_GET['user_id'];
-                    $userToUpdateInfo = api_get_user_info($userToUpdate);
-                    $currentUserId = api_get_user_id();
-
-                    if ($userToUpdateInfo && $deleteUserAvailable &&
-                        api_global_admin_can_edit_admin($_GET['user_id'], null, $allowDelete)
-                    ) {
-                        if ($userToUpdate != $currentUserId &&
-                            UserManager::delete_user($_GET['user_id'])
-                        ) {
-                            $message = Display::return_message(
-                                get_lang('UserDeleted').': '.$userToUpdateInfo['complete_name_with_username'],
-                                'confirmation'
-                            );
-                        } else {
-                            $message = Display::return_message(
-                                get_lang('CannotDeleteUserBecauseOwnsCourse'),
-                                'error'
-                            );
-                        }
-                    } else {
-                        $message = Display::return_message(
-                            get_lang('CannotDeleteUser'),
-                            'error'
-                        );
-                    }
-                    Display::addFlash($message);
-                    header('Location: '.api_get_self());
-                    exit;
-                }
+                $message = UserManager::deleteUserWithVerification($_GET['user_id']);
+                Display::addFlash($message);
+                header('Location: '.api_get_self());
+                exit;
                 break;
             case 'delete':
                 if (api_is_platform_admin()) {
@@ -984,39 +948,10 @@ if (!empty($action)) {
                 }
                 break;
             case 'anonymize':
-                if (api_is_platform_admin() ||
-                    ($allowDelete && api_is_session_admin())
-                ) {
-                    $userToUpdate = (int) $_GET['user_id'];
-                    $userToUpdateInfo = api_get_user_info($userToUpdate);
-                    $currentUserId = api_get_user_id();
-
-                    if ($userToUpdateInfo &&
-                        api_global_admin_can_edit_admin($userToUpdate, null, $allowDelete)
-                    ) {
-                        if ($userToUpdate != $currentUserId &&
-                            UserManager::anonymize($userToUpdate)
-                        ) {
-                            $message = Display::return_message(
-                                sprintf(get_lang('UserXAnonymized'), $userToUpdateInfo['complete_name_with_username']),
-                                'confirmation'
-                            );
-                        } else {
-                            $message = Display::return_message(
-                                sprintf(get_lang('CannotAnonymizeUserX'), $userToUpdateInfo['complete_name_with_username']),
-                                'error'
-                            );
-                        }
-                    } else {
-                        $message = Display::return_message(
-                            sprintf(get_lang('NoPermissionToAnonymizeUserX'), $userToUpdateInfo['complete_name_with_username']),
-                            'error'
-                        );
-                    }
-                    Display::addFlash($message);
-                    header('Location: '.api_get_self());
-                    exit;
-                }
+                $message = UserManager::anonymizeUserWithVerification($_GET['user_id']);
+                Display::addFlash($message);
+                header('Location: '.api_get_self());
+                exit;
                 break;
         }
         Security::clear_token();
diff --git a/main/admin/user_list_consent.php b/main/admin/user_list_consent.php
new file mode 100644
index 0000000000..c23188baf8
--- /dev/null
+++ b/main/admin/user_list_consent.php
@@ -0,0 +1,705 @@
+<?php
+/* For licensing terms, see /license.txt */
+
+use ChamiloSession as Session;
+
+/**
+ * @author Bart Mollet
+ * @author Julio Montoya <gugli100@gmail.com> BeezNest 2011
+ *
+ * @package chamilo.admin
+ */
+$cidReset = true;
+require_once __DIR__.'/../inc/global.inc.php';
+
+$urlId = api_get_current_access_url_id();
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+
+api_protect_admin_script();
+
+$this_section = SECTION_PLATFORM_ADMIN;
+
+
+
+
+/**
+ * Prepares the shared SQL query for the user table.
+ * See get_user_data() and get_number_of_users().
+ *
+ * @param bool $getCount Whether to count, or get data
+ *
+ * @return string SQL query
+ */
+function prepare_user_sql_query($getCount)
+{
+    $sql = '';
+    $user_table = Database::get_main_table(TABLE_MAIN_USER);
+    $admin_table = Database::get_main_table(TABLE_MAIN_ADMIN);
+
+    if ($getCount) {
+        $sql .= "SELECT COUNT(u.id) AS total_number_of_items FROM $user_table u";
+    } else {
+        $sql .= "SELECT u.id AS col0, u.official_code AS col2, ";
+        if (api_is_western_name_order()) {
+            $sql .= "u.firstname AS col3, u.lastname AS col4, ";
+        } else {
+            $sql .= "u.lastname AS col3, u.firstname AS col4, ";
+        }
+
+        $sql .= " u.username AS col5,
+                    u.email AS col6,
+                    u.status AS col7,
+                    u.active AS col8,
+                    u.id AS col9,
+                    u.registration_date AS col10,
+                    u.expiration_date AS exp,
+                    u.password
+                FROM $user_table u";
+    }
+
+    // adding the filter to see the user's only of the current access_url
+    if ((api_is_platform_admin() || api_is_session_admin()) && api_get_multiple_access_url()) {
+        $access_url_rel_user_table = Database::get_main_table(TABLE_MAIN_ACCESS_URL_REL_USER);
+        $sql .= " INNER JOIN $access_url_rel_user_table url_rel_user 
+                  ON (u.id=url_rel_user.user_id)";
+    }
+
+    $extraFieldId = UserManager::create_extra_field(
+        'request_for_legal_agreement_consent_removal',
+        1, //text
+        'Request for legal agreement consent removal',
+        ''
+    );
+
+    $extraFieldValue = Database::get_main_table(TABLE_EXTRA_FIELD_VALUES);
+    $sql .= " INNER JOIN $extraFieldValue v
+              ON (u.id = v.item_id AND field_id = $extraFieldId) ";
+
+    $keywordList = [
+        'keyword_firstname',
+        'keyword_lastname',
+        'keyword_username',
+        'keyword_email',
+        'keyword_officialcode',
+        'keyword_status',
+        'keyword_active',
+        'keyword_inactive',
+        'check_easy_passwords',
+    ];
+
+    $keywordListValues = [];
+    $atLeastOne = false;
+    foreach ($keywordList as $keyword) {
+        $keywordListValues[$keyword] = null;
+        if (isset($_GET[$keyword]) && !empty($_GET[$keyword])) {
+            $keywordListValues[$keyword] = $_GET[$keyword];
+            $atLeastOne = true;
+        }
+    }
+
+    if ($atLeastOne == false) {
+        $keywordListValues = [];
+    }
+
+    if (isset($_GET['keyword']) && !empty($_GET['keyword'])) {
+        $keywordFiltered = Database::escape_string("%".$_GET['keyword']."%");
+        $sql .= " WHERE (
+                    u.firstname LIKE '$keywordFiltered' OR
+                    u.lastname LIKE '$keywordFiltered' OR
+                    concat(u.firstname, ' ', u.lastname) LIKE '$keywordFiltered' OR
+                    concat(u.lastname,' ',u.firstname) LIKE '$keywordFiltered' OR
+                    u.username LIKE '$keywordFiltered' OR
+                    u.official_code LIKE '$keywordFiltered' OR
+                    u.email LIKE '$keywordFiltered'
+                )
+        ";
+    } elseif (isset($keywordListValues) && !empty($keywordListValues)) {
+        $query_admin_table = '';
+        $keyword_admin = '';
+
+        if (isset($keywordListValues['keyword_status']) &&
+            $keywordListValues['keyword_status'] == PLATFORM_ADMIN
+        ) {
+            $query_admin_table = " , $admin_table a ";
+            $keyword_admin = ' AND a.user_id = u.id ';
+            $keywordListValues['keyword_status'] = '%';
+        }
+
+        $keyword_extra_value = '';
+
+        $sql .= " $query_admin_table
+            WHERE (
+                u.firstname LIKE '".Database::escape_string("%".$keywordListValues['keyword_firstname']."%")."' AND
+                u.lastname LIKE '".Database::escape_string("%".$keywordListValues['keyword_lastname']."%")."' AND
+                u.username LIKE '".Database::escape_string("%".$keywordListValues['keyword_username']."%")."' AND
+                u.email LIKE '".Database::escape_string("%".$keywordListValues['keyword_email']."%")."' AND
+                u.status LIKE '".Database::escape_string($keywordListValues['keyword_status'])."' ";
+        if (!empty($keywordListValues['keyword_officialcode'])) {
+            $sql .= " AND u.official_code LIKE '".Database::escape_string("%".$keywordListValues['keyword_officialcode']."%")."' ";
+        }
+
+        $sql .= "
+            $keyword_admin
+            $keyword_extra_value
+        ";
+
+
+
+
+
+        if (isset($keywordListValues['keyword_active']) &&
+            !isset($keywordListValues['keyword_inactive'])
+        ) {
+            $sql .= " AND u.active = 1";
+        } elseif (isset($keywordListValues['keyword_inactive']) &&
+            !isset($keywordListValues['keyword_active'])
+        ) {
+            $sql .= " AND u.active = 0";
+        }
+        $sql .= " ) ";
+    }
+
+    $preventSessionAdminsToManageAllUsers = api_get_setting('prevent_session_admins_to_manage_all_users');
+    if (api_is_session_admin() && $preventSessionAdminsToManageAllUsers === 'true') {
+        $sql .= " AND u.creator_id = ".api_get_user_id();
+    }
+
+    $variables = Session::read('variables_to_show', []);
+    if (!empty($variables)) {
+        $extraField = new ExtraField('user');
+        $extraFieldResult = [];
+        $extraFieldHasData = [];
+        foreach ($variables as $variable) {
+            if (isset($_GET['extra_'.$variable])) {
+                if (is_array($_GET['extra_'.$variable])) {
+                    $values = $_GET['extra_'.$variable];
+                } else {
+                    $values = [$_GET['extra_'.$variable]];
+                }
+
+                if (empty($values)) {
+                    continue;
+                }
+
+                $info = $extraField->get_handler_field_info_by_field_variable(
+                    $variable
+                );
+
+                if (empty($info)) {
+                    continue;
+                }
+
+                foreach ($values as $value) {
+                    if (empty($value)) {
+                        continue;
+                    }
+                    if ($info['field_type'] == ExtraField::FIELD_TYPE_TAG) {
+                        $result = $extraField->getAllUserPerTag(
+                            $info['id'],
+                            $value
+                        );
+                        $result = empty($result) ? [] : array_column(
+                            $result,
+                            'user_id'
+                        );
+                    } else {
+                        $result = UserManager::get_extra_user_data_by_value(
+                            $variable,
+                            $value
+                        );
+                    }
+                    $extraFieldHasData[] = true;
+                    if (!empty($result)) {
+                        $extraFieldResult = array_merge(
+                            $extraFieldResult,
+                            $result
+                        );
+                    }
+                }
+            }
+        }
+
+        if (!empty($extraFieldHasData)) {
+            $sql .= " AND (u.id IN ('".implode("','", $extraFieldResult)."')) ";
+        }
+    }
+
+    // adding the filter to see the user's only of the current access_url
+    if ((api_is_platform_admin() || api_is_session_admin()) &&
+        api_get_multiple_access_url()
+    ) {
+        $sql .= " AND url_rel_user.access_url_id=".api_get_current_access_url_id();
+    }
+
+    return $sql;
+}
+
+/**
+ * Get the total number of users on the platform.
+ *
+ * @see SortableTable#get_total_number_of_items()
+ */
+function get_number_of_users()
+{
+    $sql = prepare_user_sql_query(true);
+    $res = Database::query($sql);
+    $obj = Database::fetch_object($res);
+
+    return $obj->total_number_of_items;
+}
+
+/**
+ * Get the users to display on the current page (fill the sortable-table).
+ *
+ * @param   int     offset of first user to recover
+ * @param   int     Number of users to get
+ * @param   int     Column to sort on
+ * @param   string  Order (ASC,DESC)
+ *
+ * @return array Users list
+ *
+ * @see SortableTable#get_table_data($from)
+ */
+function get_user_data($from, $number_of_items, $column, $direction)
+{
+    $sql = prepare_user_sql_query(false);
+    if (!in_array($direction, ['ASC', 'DESC'])) {
+        $direction = 'ASC';
+    }
+    $column = (int) $column;
+    $from = intval($from);
+    $number_of_items = intval($number_of_items);
+    $sql .= " ORDER BY col$column $direction ";
+    $sql .= " LIMIT $from,$number_of_items";
+
+    $res = Database::query($sql);
+
+    $users = [];
+    $t = time();
+    while ($user = Database::fetch_row($res)) {
+        $userPicture = UserManager::getUserPicture(
+            $user[0],
+            USER_IMAGE_SIZE_SMALL
+        );
+        $photo = '<img 
+            src="'.$userPicture.'" width="22" height="22" 
+            alt="'.api_get_person_name($user[2], $user[3]).'" 
+            title="'.api_get_person_name($user[2], $user[3]).'" />';
+
+        if ($user[7] == 1 && !empty($user[10])) {
+            // check expiration date
+            $expiration_time = convert_sql_date($user[10]);
+            // if expiration date is passed, store a special value for active field
+            if ($expiration_time < $t) {
+                $user[7] = '-1';
+            }
+        }
+
+        // forget about the expiration date field
+        $users[] = [
+            $user[0],
+            $photo,
+            $user[1],
+            $user[2],
+            $user[3],
+            $user[4],
+            $user[5],
+            $user[6],
+            $user[7],
+            api_get_local_time($user[9]),
+            $user[0],
+        ];
+    }
+
+    return $users;
+}
+
+/**
+ * Returns a mailto-link.
+ *
+ * @param string $email An email-address
+ *
+ * @return string HTML-code with a mailto-link
+ */
+function email_filter($email)
+{
+    return Display::encrypted_mailto_link($email, $email);
+}
+
+/**
+ * Returns a mailto-link.
+ *
+ * @param string $email  An email-address
+ * @param array  $params Deprecated
+ * @param array  $row
+ *
+ * @return string HTML-code with a mailto-link
+ */
+function user_filter($name, $params, $row)
+{
+    return '<a href="'.api_get_path(WEB_PATH).'whoisonline.php?origin=user_list&id='.$row[0].'">'.$name.'</a>';
+}
+
+/**
+ * Build the modify-column of the table.
+ *
+ * @param   int     The user id
+ * @param   string  URL params to add to table links
+ * @param   array   Row of elements to alter
+ *
+ * @throws Exception
+ *
+ * @return string Some HTML-code with modify-buttons
+ */
+function modify_filter($user_id, $url_params, $row)
+{
+    $_admins_list = Session::read('admin_list', []);
+    $is_admin = in_array($user_id, $_admins_list);
+    $token = Security::getTokenFromSession();
+    $result = '';
+    $result .= '<a href="user_information.php?user_id='.$user_id.'">'.
+        Display::return_icon('synthese_view.gif', get_lang('Info')).'</a>&nbsp;&nbsp;';
+
+    $result .= Display::url(
+        get_lang('SendMessage'),
+        api_get_path(WEB_CODE_PATH).'messages/new_message.php?send_to_user='.$user_id
+    );
+    $result .= '&nbsp;&nbsp;';
+    $result .= Display::url(
+        get_lang('RemoveTerms'),
+        api_get_self().'?user_id='.$user_id.'&action=delete_terms&sec_token='.$token
+    );
+    $result .= '&nbsp;&nbsp;';
+
+    $result .= ' <a href="'.api_get_self().'?action=anonymize&user_id='.$user_id.'&'.$url_params.'&sec_token='.$token.'"  onclick="javascript:if(!confirm('."'".addslashes(
+            api_htmlentities(get_lang("ConfirmYourChoice"))
+        )."'".')) return false;">'.
+        Display::return_icon(
+            'anonymous.png',
+            get_lang('Anonymize'),
+            [],
+            ICON_SIZE_SMALL
+        ).
+        '</a>';
+
+    if ($user_id != api_get_user_id()) {
+    $result .= ' <a href="'.api_get_self().'?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$token.'"  onclick="javascript:if(!confirm('."'".addslashes(
+            api_htmlentities(get_lang("ConfirmYourChoice"))
+        )."'".')) return false;">'.
+        Display::return_icon(
+            'delete.png',
+            get_lang('Delete'),
+            [],
+            ICON_SIZE_SMALL
+        ).
+        '</a>';
+    }
+
+    $editProfileUrl = Display::getProfileEditionLink($user_id, true);
+
+    $result .= '<a href="'.$editProfileUrl.'">'.
+        Display::return_icon(
+            'edit.png',
+            get_lang('Edit'),
+            [],
+            ICON_SIZE_SMALL
+        ).
+        '</a>&nbsp;';
+
+
+    if ($is_admin) {
+        $result .= Display::return_icon(
+            'admin_star.png',
+            get_lang('IsAdministrator'),
+            ['width' => ICON_SIZE_SMALL, 'heigth' => ICON_SIZE_SMALL]
+        );
+    } else {
+        $result .= Display::return_icon(
+            'admin_star_na.png',
+            get_lang('IsNotAdministrator')
+        );
+    }
+
+    return $result;
+}
+
+/**
+ * Build the active-column of the table to lock or unlock a certain user
+ * lock = the user can no longer use this account.
+ *
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University
+ *
+ * @param int    $active the current state of the account
+ * @param string $params
+ * @param array  $row
+ *
+ * @return string Some HTML-code with the lock/unlock button
+ */
+function active_filter($active, $params, $row)
+{
+    $_user = api_get_user_info();
+
+    if ($active == '1') {
+        $action = 'Lock';
+        $image = 'accept';
+    } elseif ($active == '-1') {
+        $action = 'edit';
+        $image = 'warning';
+    } elseif ($active == '0') {
+        $action = 'Unlock';
+        $image = 'error';
+    }
+
+    $result = '';
+
+    if ($action === 'edit') {
+        $result = Display::return_icon(
+            $image.'.png',
+            get_lang('AccountExpired'),
+            [],
+            16
+        );
+    } elseif ($row['0'] != $_user['user_id']) {
+        // you cannot lock yourself out otherwise you could disable all the
+        // accounts including your own => everybody is locked out and nobody
+        // can change it anymore.
+        $result = Display::return_icon(
+            $image.'.png',
+            get_lang(ucfirst($action)),
+            ['onclick' => 'active_user(this);', 'id' => 'img_'.$row['0']],
+            16
+        );
+    }
+
+    return $result;
+}
+
+/**
+ * Instead of displaying the integer of the status, we give a translation for the status.
+ *
+ * @param int $status
+ *
+ * @return string translation
+ *
+ * @version march 2008
+ *
+ * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University, Belgium
+ */
+function status_filter($status)
+{
+    $statusname = api_get_status_langvars();
+
+    return $statusname[$status];
+}
+
+if (isset($_GET['keyword']) || isset($_GET['keyword_firstname'])) {
+    $interbreadcrumb[] = ["url" => 'index.php', "name" => get_lang('PlatformAdmin')];
+    $interbreadcrumb[] = ["url" => 'user_list.php', "name" => get_lang('UserList')];
+    $tool_name = get_lang('SearchUsers');
+} else {
+    $interbreadcrumb[] = ["url" => 'index.php', "name" => get_lang('PlatformAdmin')];
+    $tool_name = get_lang('UserList');
+}
+
+$message = '';
+
+if (!empty($action)) {
+    $check = Security::check_token('get');
+    if ($check) {
+        switch ($action) {
+            case 'delete_terms':
+                $extraFieldValue = new ExtraFieldValue('user');
+                $value = $extraFieldValue->get_values_by_handler_and_field_variable(
+                    $_GET['user_id'],
+                    'legal_accept'
+                );
+                $result = $extraFieldValue->delete($value['id']);
+
+                $value = $extraFieldValue->get_values_by_handler_and_field_variable(
+                    $_GET['user_id'],
+                    'request_for_legal_agreement_consent_removal'
+                );
+                $result = $extraFieldValue->delete($value['id']);
+
+                Display::addFlash(Display::return_message(get_lang('Deleted')));
+                header('Location: '.api_get_self());
+                exit;
+
+                break;
+            case 'delete_user':
+                $message = UserManager::deleteUserWithVerification($_GET['user_id']);
+                Display::addFlash($message);
+                header('Location: '.api_get_self());
+                exit;
+                break;
+            case 'delete':
+                if (api_is_platform_admin()) {
+                    $number_of_selected_users = count($_POST['id']);
+                    $number_of_affected_users = 0;
+                    if (is_array($_POST['id'])) {
+                        foreach ($_POST['id'] as $index => $user_id) {
+                            if ($user_id != $_user['user_id']) {
+                                if (UserManager::delete_user($user_id)) {
+                                    $number_of_affected_users++;
+                                }
+                            }
+                        }
+                    }
+                    if ($number_of_selected_users == $number_of_affected_users) {
+                        $message = Display::return_message(
+                            get_lang('SelectedUsersDeleted'),
+                            'confirmation'
+                        );
+                    } else {
+                        $message = Display::return_message(
+                            get_lang('SomeUsersNotDeleted'),
+                            'error'
+                        );
+                    }
+                }
+                break;
+            case 'anonymize':
+                $message = UserManager::anonymizeUserWithVerification($_GET['user_id']);
+                Display::addFlash($message);
+                header('Location: '.api_get_self());
+                exit;
+                break;
+        }
+        Security::clear_token();
+    }
+}
+
+// Create a search-box
+$form = new FormValidator('search_simple', 'get', null, null, null, 'inline');
+$form->addText(
+    'keyword',
+    get_lang('Search'),
+    false,
+    [
+        'aria-label' => get_lang("SearchUsers"),
+    ]
+);
+$form->addButtonSearch(get_lang('Search'));
+
+$actionsLeft = '';
+$actionsCenter = '';
+$actionsRight = '';
+$actionsLeft .= $form->returnForm();
+
+if (isset($_GET['keyword'])) {
+    $parameters = ['keyword' => Security::remove_XSS($_GET['keyword'])];
+} elseif (isset($_GET['keyword_firstname'])) {
+    $parameters['keyword_firstname'] = Security::remove_XSS($_GET['keyword_firstname']);
+    $parameters['keyword_lastname'] = Security::remove_XSS($_GET['keyword_lastname']);
+    $parameters['keyword_username'] = Security::remove_XSS($_GET['keyword_username']);
+    $parameters['keyword_email'] = Security::remove_XSS($_GET['keyword_email']);
+    $parameters['keyword_officialcode'] = Security::remove_XSS($_GET['keyword_officialcode']);
+    $parameters['keyword_status'] = Security::remove_XSS($_GET['keyword_status']);
+    $parameters['keyword_active'] = Security::remove_XSS($_GET['keyword_active']);
+    $parameters['keyword_inactive'] = Security::remove_XSS($_GET['keyword_inactive']);
+}
+// Create a sortable table with user-data
+$parameters['sec_token'] = Security::get_token();
+
+$_admins_list = array_keys(UserManager::get_all_administrators());
+Session::write('admin_list', $_admins_list);
+// Display Advanced search form.
+$form = new FormValidator(
+    'advanced_search',
+    'get',
+    '',
+    '',
+    [],
+    FormValidator::LAYOUT_HORIZONTAL
+);
+
+$form->addElement('html', '<div id="advanced_search_form" style="display:none;">');
+$form->addElement('header', get_lang('AdvancedSearch'));
+$form->addText('keyword_firstname', get_lang('FirstName'), false);
+$form->addText('keyword_lastname', get_lang('LastName'), false);
+$form->addText('keyword_username', get_lang('LoginName'), false);
+$form->addText('keyword_email', get_lang('Email'), false);
+$form->addText('keyword_officialcode', get_lang('OfficialCode'), false);
+
+$status_options = [];
+$status_options['%'] = get_lang('All');
+$status_options[STUDENT] = get_lang('Student');
+$status_options[COURSEMANAGER] = get_lang('Teacher');
+$status_options[DRH] = get_lang('Drh');
+$status_options[SESSIONADMIN] = get_lang('SessionsAdmin');
+$status_options[PLATFORM_ADMIN] = get_lang('Administrator');
+
+$form->addElement(
+    'select',
+    'keyword_status',
+    get_lang('Profile'),
+    $status_options
+);
+$form->addButtonSearch(get_lang('SearchUsers'));
+
+$defaults = [];
+$defaults['keyword_active'] = 1;
+$defaults['keyword_inactive'] = 1;
+$form->setDefaults($defaults);
+$form->addElement('html', '</div>');
+
+$form = $form->returnForm();
+
+$table = new SortableTable(
+    'users',
+    'get_number_of_users',
+    'get_user_data',
+    (api_is_western_name_order() xor api_sort_by_first_name()) ? 3 : 2
+);
+$table->set_additional_parameters($parameters);
+$table->set_header(0, '', false, 'width="18px"');
+$table->set_header(1, get_lang('Photo'), false);
+$table->set_header(2, get_lang('OfficialCode'));
+
+if (api_is_western_name_order()) {
+    $table->set_header(3, get_lang('FirstName'));
+    $table->set_header(4, get_lang('LastName'));
+} else {
+    $table->set_header(3, get_lang('LastName'));
+    $table->set_header(4, get_lang('FirstName'));
+}
+$table->set_header(5, get_lang('LoginName'));
+$table->set_header(6, get_lang('Email'));
+$table->set_header(7, get_lang('Profile'));
+$table->set_header(8, get_lang('Active'), true, 'width="15px"');
+$table->set_header(9, get_lang('RegistrationDate'), true, 'width="90px"');
+$table->set_header(10, get_lang('Action'), false, 'width="220px"');
+
+$table->set_column_filter(3, 'user_filter');
+$table->set_column_filter(4, 'user_filter');
+$table->set_column_filter(6, 'email_filter');
+$table->set_column_filter(7, 'status_filter');
+$table->set_column_filter(8, 'active_filter');
+$table->set_column_filter(10, 'modify_filter');
+
+// Only show empty actions bar if delete users has been blocked
+$actionsList = [];
+if (api_is_platform_admin() &&
+    !api_get_configuration_value('deny_delete_users')
+) {
+    $actionsList['delete'] = get_lang('DeleteFromPlatform');
+}
+$actionsList['disable'] = get_lang('Disable');
+$actionsList['enable'] = get_lang('Enable');
+$table->set_form_actions($actionsList);
+
+$table_result = $table->return_table();
+$extra_search_options = '';
+$toolbarActions = Display::toolbarAction(
+    'toolbarUser',
+    [$actionsLeft, $actionsCenter, $actionsRight],
+    [4, 4, 4]
+);
+
+$notice = Display::return_message(get_lang('InformationRightToBeForgottenText'), 'normal', false);
+
+$tpl = new Template($tool_name);
+$tpl->assign('actions', $toolbarActions);
+$tpl->assign('message', $message);
+$tpl->assign('content', $form.$table_result.$extra_search_options.$notice);
+$tpl->display_one_col_template();
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index d10d8b0726..2c97f3b997 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -273,6 +273,8 @@ define('LOG_MY_FOLDER_NEW_PATH', 'new_path');
 
 define('LOG_TERM_CONDITION_ACCEPTED', 'term_condition_accepted');
 define('LOG_USER_CONFIRMED_EMAIL', 'user_confirmed_email');
+define('LOG_USER_REMOVED_LEGAL_ACCEPT', 'user_removed_legal_accept');
+
 
 define('USERNAME_PURIFIER', '/[^0-9A-Za-z_\.]/');
 
@@ -3875,13 +3877,13 @@ function convert_sql_date($last_post_datetime)
  * the only one that is actually from the session, in case there are results from
  * session 0 *AND* session n).
  *
- * @param array     Course properties array (result of api_get_course_info())
- * @param string    Tool (learnpath, document, etc)
- * @param int       The item ID in the given tool
- * @param int       The session ID (optional)
- * @param string $tool
+ * @param array  $_course Course properties array (result of api_get_course_info())
+ * @param string $tool    Tool (learnpath, document, etc)
+ * @param int    $id      The item ID in the given tool
+ * @param int    $session The session ID (optional)
  * @param int    $user_id
  * @param string $type
+ * @param string $group_id
  *
  * @return int -1 on error, 0 if invisible, 1 if visible
  */
@@ -3939,7 +3941,7 @@ function api_get_item_visibility(
     }
     $row = Database::fetch_array($res);
 
-    return $row['visibility'];
+    return (int) $row['visibility'];
 }
 
 /**
diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index db9333b0ea..65ef3f17dc 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -296,12 +296,19 @@ EOT;
      * @param string $name
      * @param string $label
      * @param array  $attributes
+     * @param bool   $required
      *
      * @return HTML_QuickForm_textarea
      */
-    public function addTextarea($name, $label, $attributes = [])
+    public function addTextarea($name, $label, $attributes = [], $required = false)
     {
-        return $this->addElement('textarea', $name, $label, $attributes);
+        $element = $this->addElement('textarea', $name, $label, $attributes);
+
+        if ($required) {
+            $this->addRule($name, get_lang('ThisFieldIsRequired'), 'required');
+        }
+
+        return $element;
     }
 
     /**
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index 4510bd621d..de429d1206 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -2621,4 +2621,20 @@ class MessageManager
 
         return $row['count'];
     }
+
+    /**
+     * @param int    $senderId
+     * @param string $subject
+     * @param string $message
+     */
+    public static function sendMessageToAllAdminUsers(
+        $senderId,
+        $subject,
+        $message
+    ) {
+        $admins = UserManager::get_all_administrators();
+        foreach ($admins as $admin) {
+            self::send_message_simple($admin['user_id'], $subject, $message, $senderId);
+        }
+    }
 }
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index ad24cf8e3f..0fc06df642 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -6157,6 +6157,50 @@ SQL;
         return true;
     }
 
+    /**
+     * @param int $userId
+     *
+     * @return string
+     * @throws Exception
+     */
+    public static function anonymizeUserWithVerification($userId)
+    {
+        $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
+
+        $message = '';
+        if (api_is_platform_admin() ||
+            ($allowDelete && api_is_session_admin())
+        ) {
+            $userToUpdateInfo = api_get_user_info($userId);
+            $currentUserId = api_get_user_id();
+
+            if ($userToUpdateInfo &&
+                api_global_admin_can_edit_admin($userId, null, $allowDelete)
+            ) {
+                if ($userId != $currentUserId &&
+                    self::anonymize($userId)
+                ) {
+                    $message = Display::return_message(
+                        sprintf(get_lang('UserXAnonymized'), $userToUpdateInfo['complete_name_with_username']),
+                        'confirmation'
+                    );
+                } else {
+                    $message = Display::return_message(
+                        sprintf(get_lang('CannotAnonymizeUserX'), $userToUpdateInfo['complete_name_with_username']),
+                        'error'
+                    );
+                }
+            } else {
+                $message = Display::return_message(
+                    sprintf(get_lang('NoPermissionToAnonymizeUserX'), $userToUpdateInfo['complete_name_with_username']),
+                    'error'
+                );
+            }
+        }
+
+        return $message;
+    }
+
     /**
      * @return EncoderFactory
      */
@@ -6254,4 +6298,50 @@ SQL;
 
         return $url;
     }
+
+    /**
+     * @param int $userId
+     *
+     * @return string
+     * @throws Exception
+     */
+    public static function deleteUserWithVerification($userId)
+    {
+        $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
+        $deleteUserAvailable = api_get_configuration_value('deny_delete_users');
+
+        $message = '';
+
+        if (api_is_platform_admin() ||
+            ($allowDelete && api_is_session_admin())
+        ) {
+            $userToUpdateInfo = api_get_user_info($userId);
+            $currentUserId = api_get_user_id();
+
+            if ($userToUpdateInfo && $deleteUserAvailable &&
+                api_global_admin_can_edit_admin($userId, null, $allowDelete)
+            ) {
+                if ($userId != $currentUserId &&
+                    UserManager::delete_user($userId)
+                ) {
+                    $message = Display::return_message(
+                        get_lang('UserDeleted').': '.$userToUpdateInfo['complete_name_with_username'],
+                        'confirmation'
+                    );
+                } else {
+                    $message = Display::return_message(
+                        get_lang('CannotDeleteUserBecauseOwnsCourse'),
+                        'error'
+                    );
+                }
+            } else {
+                $message = Display::return_message(
+                    get_lang('CannotDeleteUser'),
+                    'error'
+                );
+            }
+        }
+
+        return $message;
+    }
 }
diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index 9236b25e39..311e5df8ce 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -17,6 +17,7 @@ if (!api_get_configuration_value('enable_gdpr')) {
 }
 
 $userId = api_get_user_id();
+$userInfo = api_get_user_info();
 
 $substitutionTerms = [
     'password' => get_lang('EncryptedData'),
@@ -24,26 +25,134 @@ $substitutionTerms = [
     'empty' => get_lang('NoData'),
 ];
 
-$action = isset($_GET['action']) ? $_GET['action'] : '';
+$action = isset($_REQUEST['action']) ? $_REQUEST['action'] : '';
+$formToString = '';
 
-/*switch ($action) {
-    case 'delete_legal':
-        $extraFieldValue = new ExtraFieldValue('user');
-        $value = $extraFieldValue->get_values_by_handler_and_field_variable(
+if (api_get_setting('allow_terms_conditions') === 'true') {
+    $form = new FormValidator('term', 'post', api_get_self().'?action=delete_legal&user_id='.$userId);
+    $form->addHtml(Display::return_message(get_lang('WhyYouWantToDeleteYourLegalAgreement')));
+    $form->addTextarea('explanation', get_lang('ExplanationDeleteLegal'), [], true);
+    $form->addButtonSave(get_lang('DeleteLegal'));
+    $form->addHidden('action', 'delete_legal');
+    $formToString = $form->returnForm();
+}
+
+switch ($action) {
+    case 'send_legal':
+        $language = api_get_interface_language();
+        $language = api_get_language_id($language);
+        $terms = LegalManager::get_last_condition($language);
+        if (!$terms) {
+            //look for the default language
+            $language = api_get_setting('platformLanguage');
+            $language = api_get_language_id($language);
+            $terms = LegalManager::get_last_condition($language);
+        }
+
+        $legalAcceptType = $terms['version'].':'.$terms['language_id'].':'.time();
+        UserManager::update_extra_field_value(
             $userId,
-            'legal_accept'
+            'legal_accept',
+            $legalAcceptType
         );
-        $result = $extraFieldValue->delete($value['id']);
-
-        Display::addFlash(Display::return_message(get_lang('Deleted')));
 
         Event::addEvent(
-            LOG_USER_REMOVED_LEGAL_ACCEPT,
+            LOG_TERM_CONDITION_ACCEPTED,
             LOG_USER_OBJECT,
-            api_get_user_info()
+            api_get_user_info($userId),
+            api_get_utc_datetime()
         );
+
+        $bossList = UserManager::getStudentBossList($userId);
+        if (!empty($bossList)) {
+            $bossList = array_column($bossList, 'boss_id');
+            $currentUserInfo = api_get_user_info($userId);
+            foreach ($bossList as $bossId) {
+                $subjectEmail = sprintf(
+                    get_lang('UserXSignedTheAgreement'),
+                    $currentUserInfo['complete_name']
+                );
+                $contentEmail = sprintf(
+                    get_lang('UserXSignedTheAgreementTheY'),
+                    $currentUserInfo['complete_name'],
+                    api_get_local_time($time)
+                );
+
+                MessageManager::send_message_simple(
+                    $bossId,
+                    $subjectEmail,
+                    $contentEmail,
+                    $user_id
+                );
+            }
+        }
+
+        Display::addFlash(Display::return_message(get_lang('Saved')));
+        break;
+    case 'delete_legal':
+        if ($form->validate()) {
+            $explanation = $form->getSubmitValue('explanation');
+
+            UserManager::create_extra_field(
+                'request_for_legal_agreement_consent_removal',
+                1, //text
+                        'Request for legal agreement consent removal',
+                ''
+            );
+
+            UserManager::update_extra_field_value(
+                $userId,
+                'request_for_legal_agreement_consent_removal',
+                1
+            );
+
+            UserManager::create_extra_field(
+                'request_for_legal_agreement_consent_removal_justification',
+                1, //text
+                'Request for legal agreement consent removal justification',
+                ''
+            );
+
+            UserManager::update_extra_field_value(
+                $userId,
+                'request_for_legal_agreement_consent_removal_justification',
+                $explanation
+            );
+
+            $extraFieldValue = new ExtraFieldValue('user');
+            $value = $extraFieldValue->get_values_by_handler_and_field_variable(
+                $userId,
+                'legal_accept'
+            );
+            $result = $extraFieldValue->delete($value['id']);
+
+            Display::addFlash(Display::return_message(get_lang('Deleted')));
+
+            Event::addEvent(
+                LOG_USER_REMOVED_LEGAL_ACCEPT,
+                LOG_USER_OBJECT,
+                $userInfo
+            );
+
+            $url = api_get_path(WEB_CODE_PATH).'admin/';
+            $link = Display::url($url, $url);
+            $subject = get_lang('RequestForLegalConsentRemoval');
+            $content = sprintf(
+                get_lang('TheUserXAskRemovalWithJustifactionYGoHere'),
+                $userInfo['complete_name'],
+                $explanation,
+                $link
+            );
+
+            $email = api_get_configuration_value('data_protection_officer_email');
+            if (!empty($email)) {
+                api_mail_html('', $email, $subject, $content);
+            } else {
+                MessageManager::sendMessageToAllAdminUsers(api_get_user_id(), $subject, $content);
+            }
+        }
         break;
-}*/
+}
 
 
 $propertiesToJson = UserManager::getRepository()->getPersonalDataToJson($userId, $substitutionTerms);
@@ -143,45 +252,43 @@ foreach ($properties as $key => $value) {
 $personalDataContent .= '</ul>';
 
 // Check terms acceptation
-$termsAndConditionsAcceptance = [];
-$termsAndConditionsAcceptance['accepted'] = false;
+$permitionBlock = '';
 if (api_get_setting('allow_terms_conditions') === 'true') {
     $extraFieldValue = new ExtraFieldValue('user');
     $value = $extraFieldValue->get_values_by_handler_and_field_variable(
         $userId,
         'legal_accept'
     );
-    $termsAndConditionsAcceptance['icon'] = Display::return_icon('accept_na.png', get_lang('NotAccepted'));
+    $permitionBlock .= Display::return_icon('accept_na.png', get_lang('NotAccepted'));
     if (isset($value['value']) && !empty($value['value'])) {
         list($legalId, $legalLanguageId, $legalTime) = explode(':', $value['value']);
-        $termsAndConditionsAcceptance['accepted'] = true;
-        $termsAndConditionsAcceptance['icon'] = Display::return_icon('accept.png', get_lang('LegalAgreementAccepted'));
-        $termsAndConditionsAcceptance['date'] = api_get_local_time($legalTime);
-        // @TODO add action handling for button
-        $termsAndConditionsAcceptance['button'] = Display::url(
+        $permitionBlock = get_lang('CurrentStatus').': '.
+            Display::return_icon('accept.png', get_lang('LegalAgreementAccepted')).get_lang('LegalAgreementAccepted').
+            '<br />';
+        $permitionBlock .= get_lang('Date').': '.api_get_local_time($legalTime).'<br />';
+        $permitionBlock .= $formToString;
+
+        /*$permitionBlock .= Display::url(
             get_lang('DeleteLegal'),
             api_get_self().'?action=delete_legal&user_id='.$userId,
             ['class' => 'btn btn-danger btn-xs']
-        );
+        );*/
     } else {
         // @TODO add action handling for button
-        $termsAndConditionsAcceptance['button'] = Display::url(
+        $permitionBlock .= Display::url(
             get_lang('SendLegal'),
             api_get_self().'?action=send_legal&user_id='.$userId,
             ['class' => 'btn btn-primary btn-xs']
         );
     }
-    $termsAndConditionsAcceptance['label'] = get_lang('LegalAccepted');
 } else {
-    $termsAndConditionsAcceptance['label'] = get_lang('NoTermsAndConditionsAvailable');
+    $permitionBlock .= get_lang('NoTermsAndConditionsAvailable');
 }
 
+
 //Build the final array to pass to template
 $personalData = [];
 $personalData['data'] = $personalDataContent;
-$icon = Display::return_icon('export_excel.png', get_lang('Export'), null, ICON_SIZE_MEDIUM);
-$personalData['data_export_icon'] = $icon;
-$personalData['permissions'] = $termsAndConditionsAcceptance;
 //$personalData['responsible'] = api_get_setting('personal_data_responsible_org');
 
 $em = Database::getManager();
@@ -233,6 +340,7 @@ if (api_get_setting('allow_social_tool') === 'true') {
     $tpl->assign('personal_data_block', $personalDataContent);
 }
 
+$tpl->assign('permission', $permitionBlock);
 $tpl->assign('term_link', $termLink);
 $socialLayout = $tpl->get_template('social/personal_data.tpl');
 $tpl->display($socialLayout);
diff --git a/main/template/default/social/personal_data.tpl b/main/template/default/social/personal_data.tpl
index a4a30e2274..f6acfe322a 100644
--- a/main/template/default/social/personal_data.tpl
+++ b/main/template/default/social/personal_data.tpl
@@ -12,24 +12,7 @@
     <div class="col-md-9">
         {{ display.panel('PersonalDataIntroductionTitle' | get_lang , 'PersonalDataIntroductionText' | get_lang) }}
         {{ display.panel('PersonalDataKeptOnYou' | get_lang, personal_data.data) }}
-
-        <div class="panel personal-data-permissions">
-            <div class="panel-title">{{ 'PersonalDataPermissionsYouGaveUs' | get_lang }}</div>
-            <div class="personal-data-raw-data">
-                {{ personal_data.permissions.label }}
-                <ul>
-                {% if personal_data.permissions.accepted %}
-                    <li>
-                        {{ 'CurrentStatus' | get_lang }}: {{ personal_data.permissions.icon }} ({{ 'LegalAgreementAccepted' | get_lang }})
-                    </li>
-                    <li>
-                        {{ 'Date' | get_lang }}: {{ personal_data.permissions.date }}
-                    </li>
-                {% endif %}
-                <li>{{ personal_data.permissions.button }}</li>
-                </ul>
-            </div>
-        </div>
+        {{ display.panel('PersonalDataPermissionsYouGaveUs' | get_lang, permission) }}
 
         {% if personal_data.responsible %}
             {{ display.panel('PersonalDataResponsibleOrganizationTitle' | get_lang , personal_data.responsible ) }}

From f2c97adaef715105e0a3670b01f49f47a27a8e20 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Fri, 3 Aug 2018 15:35:48 +0200
Subject: [PATCH 11/11] Minor - flint fixes

---
 main/admin/index.php                          |  1 -
 main/admin/user_list_consent.php              | 10 +-
 main/inc/lib/api.lib.php                      |  9 +-
 main/inc/lib/message.lib.php                  | 32 +++----
 main/inc/lib/usermanager.lib.php              | 96 ++++++++++---------
 main/social/personal_data.php                 | 12 +--
 .../UserBundle/Repository/UserRepository.php  |  2 -
 7 files changed, 75 insertions(+), 87 deletions(-)

diff --git a/main/admin/index.php b/main/admin/index.php
index 2e44bbe95c..6edd06fa07 100644
--- a/main/admin/index.php
+++ b/main/admin/index.php
@@ -557,7 +557,6 @@ if (api_is_platform_admin()) {
     $blocks['data_privacy']['extra'] = null;
     $blocks['data_privacy']['search_form'] = null;
 
-
     /* Chamilo.org */
     $blocks['chamilo']['icon'] = Display::return_icon(
         'platform.png',
diff --git a/main/admin/user_list_consent.php b/main/admin/user_list_consent.php
index c23188baf8..c9086e4e6b 100644
--- a/main/admin/user_list_consent.php
+++ b/main/admin/user_list_consent.php
@@ -19,9 +19,6 @@ api_protect_admin_script();
 
 $this_section = SECTION_PLATFORM_ADMIN;
 
-
-
-
 /**
  * Prepares the shared SQL query for the user table.
  * See get_user_data() and get_number_of_users().
@@ -143,10 +140,6 @@ function prepare_user_sql_query($getCount)
             $keyword_extra_value
         ";
 
-
-
-
-
         if (isset($keywordListValues['keyword_active']) &&
             !isset($keywordListValues['keyword_inactive'])
         ) {
@@ -383,7 +376,7 @@ function modify_filter($user_id, $url_params, $row)
         '</a>';
 
     if ($user_id != api_get_user_id()) {
-    $result .= ' <a href="'.api_get_self().'?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$token.'"  onclick="javascript:if(!confirm('."'".addslashes(
+        $result .= ' <a href="'.api_get_self().'?action=delete_user&user_id='.$user_id.'&'.$url_params.'&sec_token='.$token.'"  onclick="javascript:if(!confirm('."'".addslashes(
             api_htmlentities(get_lang("ConfirmYourChoice"))
         )."'".')) return false;">'.
         Display::return_icon(
@@ -406,7 +399,6 @@ function modify_filter($user_id, $url_params, $row)
         ).
         '</a>&nbsp;';
 
-
     if ($is_admin) {
         $result .= Display::return_icon(
             'admin_star.png',
diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 2c97f3b997..9dded82e33 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -275,7 +275,6 @@ define('LOG_TERM_CONDITION_ACCEPTED', 'term_condition_accepted');
 define('LOG_USER_CONFIRMED_EMAIL', 'user_confirmed_email');
 define('LOG_USER_REMOVED_LEGAL_ACCEPT', 'user_removed_legal_accept');
 
-
 define('USERNAME_PURIFIER', '/[^0-9A-Za-z_\.]/');
 
 //used when login_is_email setting is true
@@ -3877,10 +3876,10 @@ function convert_sql_date($last_post_datetime)
  * the only one that is actually from the session, in case there are results from
  * session 0 *AND* session n).
  *
- * @param array  $_course Course properties array (result of api_get_course_info())
- * @param string $tool    Tool (learnpath, document, etc)
- * @param int    $id      The item ID in the given tool
- * @param int    $session The session ID (optional)
+ * @param array  $_course  Course properties array (result of api_get_course_info())
+ * @param string $tool     Tool (learnpath, document, etc)
+ * @param int    $id       The item ID in the given tool
+ * @param int    $session  The session ID (optional)
  * @param int    $user_id
  * @param string $type
  * @param string $group_id
diff --git a/main/inc/lib/message.lib.php b/main/inc/lib/message.lib.php
index de429d1206..9cfa2ed407 100755
--- a/main/inc/lib/message.lib.php
+++ b/main/inc/lib/message.lib.php
@@ -2598,6 +2598,22 @@ class MessageManager
         }
     }
 
+    /**
+     * @param int    $senderId
+     * @param string $subject
+     * @param string $message
+     */
+    public static function sendMessageToAllAdminUsers(
+        $senderId,
+        $subject,
+        $message
+    ) {
+        $admins = UserManager::get_all_administrators();
+        foreach ($admins as $admin) {
+            self::send_message_simple($admin['user_id'], $subject, $message, $senderId);
+        }
+    }
+
     /**
      * Execute the SQL necessary to know the number of messages in the database.
      *
@@ -2621,20 +2637,4 @@ class MessageManager
 
         return $row['count'];
     }
-
-    /**
-     * @param int    $senderId
-     * @param string $subject
-     * @param string $message
-     */
-    public static function sendMessageToAllAdminUsers(
-        $senderId,
-        $subject,
-        $message
-    ) {
-        $admins = UserManager::get_all_administrators();
-        foreach ($admins as $admin) {
-            self::send_message_simple($admin['user_id'], $subject, $message, $senderId);
-        }
-    }
 }
diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php
index 0fc06df642..e7adda5a19 100755
--- a/main/inc/lib/usermanager.lib.php
+++ b/main/inc/lib/usermanager.lib.php
@@ -6160,8 +6160,9 @@ SQL;
     /**
      * @param int $userId
      *
-     * @return string
      * @throws Exception
+     *
+     * @return string
      */
     public static function anonymizeUserWithVerification($userId)
     {
@@ -6201,6 +6202,53 @@ SQL;
         return $message;
     }
 
+    /**
+     * @param int $userId
+     *
+     * @throws Exception
+     *
+     * @return string
+     */
+    public static function deleteUserWithVerification($userId)
+    {
+        $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
+        $deleteUserAvailable = api_get_configuration_value('deny_delete_users');
+
+        $message = '';
+
+        if (api_is_platform_admin() ||
+            ($allowDelete && api_is_session_admin())
+        ) {
+            $userToUpdateInfo = api_get_user_info($userId);
+            $currentUserId = api_get_user_id();
+
+            if ($userToUpdateInfo && $deleteUserAvailable &&
+                api_global_admin_can_edit_admin($userId, null, $allowDelete)
+            ) {
+                if ($userId != $currentUserId &&
+                    UserManager::delete_user($userId)
+                ) {
+                    $message = Display::return_message(
+                        get_lang('UserDeleted').': '.$userToUpdateInfo['complete_name_with_username'],
+                        'confirmation'
+                    );
+                } else {
+                    $message = Display::return_message(
+                        get_lang('CannotDeleteUserBecauseOwnsCourse'),
+                        'error'
+                    );
+                }
+            } else {
+                $message = Display::return_message(
+                    get_lang('CannotDeleteUser'),
+                    'error'
+                );
+            }
+        }
+
+        return $message;
+    }
+
     /**
      * @return EncoderFactory
      */
@@ -6298,50 +6346,4 @@ SQL;
 
         return $url;
     }
-
-    /**
-     * @param int $userId
-     *
-     * @return string
-     * @throws Exception
-     */
-    public static function deleteUserWithVerification($userId)
-    {
-        $allowDelete = api_get_configuration_value('allow_delete_user_for_session_admin');
-        $deleteUserAvailable = api_get_configuration_value('deny_delete_users');
-
-        $message = '';
-
-        if (api_is_platform_admin() ||
-            ($allowDelete && api_is_session_admin())
-        ) {
-            $userToUpdateInfo = api_get_user_info($userId);
-            $currentUserId = api_get_user_id();
-
-            if ($userToUpdateInfo && $deleteUserAvailable &&
-                api_global_admin_can_edit_admin($userId, null, $allowDelete)
-            ) {
-                if ($userId != $currentUserId &&
-                    UserManager::delete_user($userId)
-                ) {
-                    $message = Display::return_message(
-                        get_lang('UserDeleted').': '.$userToUpdateInfo['complete_name_with_username'],
-                        'confirmation'
-                    );
-                } else {
-                    $message = Display::return_message(
-                        get_lang('CannotDeleteUserBecauseOwnsCourse'),
-                        'error'
-                    );
-                }
-            } else {
-                $message = Display::return_message(
-                    get_lang('CannotDeleteUser'),
-                    'error'
-                );
-            }
-        }
-
-        return $message;
-    }
 }
diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index 311e5df8ce..47ce1eb4b4 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -154,7 +154,6 @@ switch ($action) {
         break;
 }
 
-
 $propertiesToJson = UserManager::getRepository()->getPersonalDataToJson($userId, $substitutionTerms);
 
 if (!empty($_GET['export'])) {
@@ -268,11 +267,11 @@ if (api_get_setting('allow_terms_conditions') === 'true') {
         $permitionBlock .= get_lang('Date').': '.api_get_local_time($legalTime).'<br />';
         $permitionBlock .= $formToString;
 
-        /*$permitionBlock .= Display::url(
-            get_lang('DeleteLegal'),
-            api_get_self().'?action=delete_legal&user_id='.$userId,
-            ['class' => 'btn btn-danger btn-xs']
-        );*/
+    /*$permitionBlock .= Display::url(
+        get_lang('DeleteLegal'),
+        api_get_self().'?action=delete_legal&user_id='.$userId,
+        ['class' => 'btn btn-danger btn-xs']
+    );*/
     } else {
         // @TODO add action handling for button
         $permitionBlock .= Display::url(
@@ -285,7 +284,6 @@ if (api_get_setting('allow_terms_conditions') === 'true') {
     $permitionBlock .= get_lang('NoTermsAndConditionsAvailable');
 }
 
-
 //Build the final array to pass to template
 $personalData = [];
 $personalData['data'] = $personalDataContent;
diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index b788d5c6b7..e5545a6673 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -10,7 +10,6 @@ use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUser;
 use Chamilo\CoreBundle\Entity\TrackELogin;
-use Chamilo\CoreBundle\Entity\Usergroup;
 use Chamilo\CoreBundle\Entity\UsergroupRelUser;
 use Chamilo\UserBundle\Entity\User;
 use Doctrine\ORM\EntityRepository;
@@ -539,7 +538,6 @@ class UserRepository extends EntityRepository
         $items = $extraFieldValues->getAllValuesByItem($userId);
         $user->setExtraFields($items);
 
-
         $lastLogin = $user->getLastLogin();
         if (empty($lastLogin)) {
             $login = $this->getLastLogin($user);