From e268209924bc680689740244441a49dc631442dd Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 10:50:41 -0500
Subject: [PATCH 01/18] Privacy: reverse name/url in Display::url() call for
 documents

---
 main/social/personal_data.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index ef3efe7abf..2265674857 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -264,8 +264,8 @@ foreach ($properties as $key => $value) {
                     foreach ($subValue as $subSubValue) {
                         if ($category === 'DocumentsAdded') {
                             $documentLink = Display::url(
-                                $webCoursePath.$subSubValue->directory.'/document'.$subSubValue->path,
-                                $subSubValue->code_path
+                                $subSubValue->code_path,
+                                $webCoursePath.$subSubValue->directory.'/document'.$subSubValue->path
                             );
                             $personalDataContent .= '<li>'.$documentLink.'</li>';
                         } else {

From eb413367362ebc7772eeaf8a098b6272e2f49f6d Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 11:02:31 -0500
Subject: [PATCH 02/18] Privacy: Add "no data" entry where needs be

---
 main/social/personal_data.php | 46 +++++++++++++++++++++++------------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index 2265674857..7c79db32ca 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -251,8 +251,12 @@ foreach ($properties as $key => $value) {
         switch ($key) {
             case 'extraFields':
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
-                foreach ($value as $subValue) {
-                    $personalDataContent .= '<li>'.$subValue->variable.': '.$subValue->value.'</li>';
+                if (empty($value)) {
+                    $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                } else {
+                    foreach ($value as $subValue) {
+                        $personalDataContent .= '<li>'.$subValue->variable.': '.$subValue->value.'</li>';
+                    }
                 }
                 $personalDataContent .= '</ul>';
                 break;
@@ -261,15 +265,19 @@ foreach ($properties as $key => $value) {
                     $personalDataContent .= '<li class="advanced_options" id="personal-data-list-'.$category.'">';
                     $personalDataContent .= '<u>'.get_lang($category).'</u> &gt;</li>';
                     $personalDataContent .= '<ul id="personal-data-list-'.$category.'_options" style="display:none;">';
-                    foreach ($subValue as $subSubValue) {
-                        if ($category === 'DocumentsAdded') {
-                            $documentLink = Display::url(
-                                $subSubValue->code_path,
-                                $webCoursePath.$subSubValue->directory.'/document'.$subSubValue->path
-                            );
-                            $personalDataContent .= '<li>'.$documentLink.'</li>';
-                        } else {
-                            $personalDataContent .= '<li>'.$subSubValue.'</li>';
+                    if (empty($subValue)) {
+                        $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                    } else {
+                        foreach ($subValue as $subSubValue) {
+                            if ($category === 'DocumentsAdded') {
+                                $documentLink = Display::url(
+                                    $subSubValue->code_path,
+                                    $webCoursePath.$subSubValue->directory.'/document'.$subSubValue->path
+                                );
+                                $personalDataContent .= '<li>'.$documentLink.'</li>';
+                            } else {
+                                $personalDataContent .= '<li>'.$subSubValue.'</li>';
+                            }
                         }
                     }
                     $personalDataContent .= '</ul>';
@@ -285,8 +293,12 @@ foreach ($properties as $key => $value) {
             case 'groupNames':
             case 'groups':
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
-                foreach ($value as $subValue) {
-                    $personalDataContent .= '<li>'.$subValue.'</li>';
+                if (empty($subValue)) {
+                    $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                } else {
+                    foreach ($value as $subValue) {
+                        $personalDataContent .= '<li>'.$subValue.'</li>';
+                    }
                 }
                 $personalDataContent .= '</ul>';
                 break;
@@ -294,8 +306,12 @@ foreach ($properties as $key => $value) {
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
                 foreach ($value as $session => $courseList) {
                     $personalDataContent .= '<li>'.$session.'<ul>';
-                    foreach ($courseList as $course) {
-                        $personalDataContent .= '<li>'.$course.'</li>';
+                    if (empty($courseList)) {
+                        $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                    } else {
+                        foreach ($courseList as $course) {
+                            $personalDataContent .= '<li>'.$course.'</li>';
+                        }
                     }
                     $personalDataContent .= '</ul>';
                 }

From 48add955bb5130c3168b5a0755d6c23b3307859a Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 20:58:00 +0200
Subject: [PATCH 03/18] Add more data in the export see #2503

---
 .../UserBundle/Repository/UserRepository.php  | 61 ++++++++++++++++++-
 1 file changed, 59 insertions(+), 2 deletions(-)

diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 3aeaf4b177..7aa891a160 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -12,6 +12,7 @@ use Chamilo\CoreBundle\Entity\Message;
 use Chamilo\CoreBundle\Entity\Session;
 use Chamilo\CoreBundle\Entity\SessionRelCourseRelUser;
 use Chamilo\CoreBundle\Entity\SkillRelUser;
+use Chamilo\CoreBundle\Entity\SkillRelUserComment;
 use Chamilo\CoreBundle\Entity\TrackEAccess;
 use Chamilo\CoreBundle\Entity\TrackEAttempt;
 use Chamilo\CoreBundle\Entity\TrackECourseAccess;
@@ -22,8 +23,10 @@ use Chamilo\CoreBundle\Entity\TrackELastaccess;
 use Chamilo\CoreBundle\Entity\TrackELogin;
 use Chamilo\CoreBundle\Entity\TrackEOnline;
 use Chamilo\CoreBundle\Entity\TrackEUploads;
+use Chamilo\CoreBundle\Entity\UserApiKey;
 use Chamilo\CoreBundle\Entity\UserCourseCategory;
 use Chamilo\CoreBundle\Entity\UsergroupRelUser;
+use Chamilo\CoreBundle\Entity\UserRelCourseVote;
 use Chamilo\CourseBundle\Entity\CAttendanceResult;
 use Chamilo\CourseBundle\Entity\CAttendanceSheet;
 use Chamilo\CourseBundle\Entity\CBlogPost;
@@ -521,7 +524,7 @@ class UserRepository extends EntityRepository
         $list = [];
         /** @var UsergroupRelUser $class */
         foreach ($classes as $class) {
-            $list[] = $class->getUsergroup()->getName();
+            $list[] = $class->getUsergroup()->getName().' - '.$class->getUsergroup()->getGroupType();
         }
         $user->setClasses($list);
 
@@ -1042,12 +1045,63 @@ class UserRepository extends EntityRepository
             $list = [
                 'Subject: '.$item->getSubject(),
                 'IP: '.$item->getIpAddress(),
-                'Status: '. $item->getStatus(),
+                'Status: '.$item->getStatus(),
                 'Creation date: '.$item->getInsertDateTime()->format($dateFormat),
             ];
             $ticketMessage[] = implode(', ', $list);
         }
 
+        // SkillRelUserComment
+        $criteria = [
+            'feedbackGiver' => $userId,
+        ];
+        $result = $em->getRepository('ChamiloCoreBundle:SkillRelUserComment')->findBy($criteria);
+        $skillRelUserComment = [];
+        /** @var SkillRelUserComment $item */
+        foreach ($result as $item) {
+            $list = [
+                'Feedback: '.$item->getFeedbackText(),
+                'Value: '. $item->getFeedbackValue(),
+                'Created at: '.$item->getFeedbackDateTime()->format($dateFormat),
+            ];
+            $skillRelUserComment[] = implode(', ', $list);
+        }
+
+        // UserRelCourseVote
+        $criteria = [
+            'userId' => $userId,
+        ];
+        $result = $em->getRepository('ChamiloCoreBundle:UserRelCourseVote')->findBy($criteria);
+        $userRelCourseVote = [];
+        /** @var UserRelCourseVote $item */
+        foreach ($result as $item) {
+            $list = [
+                'Course #'.$item->getCId(),
+                'Session #'.$item->getSessionId(),
+                'Vote: '. $item->getVote(),
+            ];
+            $userRelCourseVote[] = implode(', ', $list);
+        }
+
+        // UserApiKey
+        $criteria = [
+            'userId' => $userId,
+        ];
+        $result = $em->getRepository('ChamiloCoreBundle:UserApiKey')->findBy($criteria);
+        $userApiKey = [];
+        /** @var UserApiKey $item */
+        foreach ($result as $item) {
+            $list = [
+                'ApiKey #'.$item->getApiKey(),
+                'Service: '.$item->getApiService(),
+                'EndPoint: '.$item->getApiEndPoint(),
+                'Validity start date: '.$item->getValidityEndDate()->format($dateFormat),
+                'Validity enddate: '.$item->getValidityStartDate()->format($dateFormat),
+                'Created at: '. $item->getCreatedDate()->format($dateFormat),
+            ];
+            $userApiKey[] = implode(', ', $list);
+        }
+
         $user->setDropBoxSentFiles(
             [
                 'Friends' => $friendList,
@@ -1064,6 +1118,9 @@ class UserRepository extends EntityRepository
                 'GradebookResult' => $gradebookResult,
                 'Downloads' => $trackEDownloads,
                 'UserCourseCategory' => $userCourseCategory,
+                'SkillRelUserComment' => $skillRelUserComment,
+                'UserRelCourseVote' => $userRelCourseVote,
+                'UserApiKey' => $userApiKey,
 
                 // courses
                 'AttendanceResult' => $cAttendanceResult,

From cbf49ee5d6689068cb68c961f444d954e00bd7af Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 21:13:20 +0200
Subject: [PATCH 04/18] Separate social and class groups see #2503

---
 main/social/personal_data.php                 | 20 ++++++++++++++++++-
 .../UserBundle/Repository/UserRepository.php  |  3 ++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index 7c79db32ca..771b2d73c5 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -249,6 +249,25 @@ $webCoursePath = api_get_path(WEB_COURSE_PATH);
 foreach ($properties as $key => $value) {
     if (is_array($value) || is_object($value)) {
         switch ($key) {
+            case 'classes':
+                foreach ($value as $category => $subValue) {
+                    $categoryName = 'Social group';
+                    if ($category == 0) {
+                        $categoryName = 'Class';
+                    }
+                    $personalDataContent .= '<li class="advanced_options" id="personal-data-list-'.$category.'">';
+                    $personalDataContent .= '<u>'.$categoryName.'</u> &gt;</li>';
+                    $personalDataContent .= '<ul id="personal-data-list-'.$category.'_options" style="display:none;">';
+                    if (empty($subValue)) {
+                        $personalDataContent .= '<li>'.get_lang('NoData').'</li>';
+                    } else {
+                        foreach ($subValue as $subSubValue) {
+                            $personalDataContent .= '<li>'.$subSubValue.'</li>';
+                        }
+                    }
+                    $personalDataContent .= '</ul>';
+                }
+                break;
             case 'extraFields':
                 $personalDataContent .= '<li>'.$key.': </li><ul>';
                 if (empty($value)) {
@@ -288,7 +307,6 @@ foreach ($properties as $key => $value) {
             case 'roles':
             case 'achievedSkills':
             case 'sessionAsGeneralCoach':
-            case 'classes':
             case 'courses':
             case 'groupNames':
             case 'groups':
diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 7aa891a160..493c892b7b 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -524,7 +524,8 @@ class UserRepository extends EntityRepository
         $list = [];
         /** @var UsergroupRelUser $class */
         foreach ($classes as $class) {
-            $list[] = $class->getUsergroup()->getName().' - '.$class->getUsergroup()->getGroupType();
+            $name = $class->getUsergroup()->getName();
+            $list[$class->getUsergroup()->getGroupType()][] = $name.' - Status: '.$class->getRelationType();
         }
         $user->setClasses($list);
 

From 7c601efb2c85a4053fc31a649b5806d97decf968 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 14:29:45 -0500
Subject: [PATCH 05/18] Privacy: Convert indexes in getTreatmentTypeList() to
 internal value title for extra_fields - refs #2554

---
 main/inc/lib/legal.lib.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/main/inc/lib/legal.lib.php b/main/inc/lib/legal.lib.php
index 58ba47357c..ed13faa939 100755
--- a/main/inc/lib/legal.lib.php
+++ b/main/inc/lib/legal.lib.php
@@ -386,21 +386,21 @@ class LegalManager
     public static function getTreatmentTypeList()
     {
         return  [
-            101 => 'collection',
-            102 => 'recording',
-            103 => 'organization',
-            104 => 'structure',
-            105 => 'conservation',
-            106 => 'adaptation',
-            107 => 'extraction',
-            108 => 'consultation',
-            109 => 'usage',
-            110 => 'communication',
-            111 => 'interconnection',
-            112 => 'limitation',
-            113 => 'deletion',
-            114 => 'destruction',
-            115 => 'profiling',
+            'privacy_terms_collection' => 'collection',
+            'privacy_terms_recording' => 'recording',
+            'privacy_terms_organization' => 'organization',
+            'privacy_terms_structure' => 'structure',
+            'privacy_terms_conservation' => 'conservation',
+            'privacy_terms_adaptation' => 'adaptation',
+            'privacy_terms_extraction' => 'extraction',
+            'privacy_terms_consultation' => 'consultation',
+            'privacy_terms_usage' => 'usage',
+            'privacy_terms_communication' => 'communication',
+            'privacy_terms_interconnection' => 'interconnection',
+            'privacy_terms_limitation' => 'limitation',
+            'privacy_terms_deletion' => 'deletion',
+            'privacy_terms_destruction' => 'destruction',
+            'privacy_terms_profiling' => 'profiling',
         ];
     }
 }

From afcec41aae96c84efdf1d8155a0e6fa89ff30f67 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 21:31:26 +0200
Subject: [PATCH 06/18] Add more data in the export see #2503

---
 .../UserBundle/Repository/UserRepository.php  | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 493c892b7b..3297c4f0af 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -801,6 +801,21 @@ class UserRepository extends EntityRepository
             $cForumThreadList[] = implode(', ', $list);
         }
 
+        // CForumAttachment
+        /*$criteria = [
+            'threadPosterId' => $userId,
+        ];
+        $result = $em->getRepository('ChamiloCourseBundle:CForumAttachment')->findBy($criteria);
+        $cForumThreadList = [];
+        * @var CForumThread $item
+        foreach ($result as $item) {
+            $list = [
+                'Title: '.$item->getThreadTitle(),
+                'Creation date: '.$item->getThreadDate()->format($dateFormat),
+            ];
+            $cForumThreadList[] = implode(', ', $list);
+        }*/
+
         // cGroupRelUser
         $criteria = [
             'userId' => $userId,
@@ -873,7 +888,8 @@ class UserRepository extends EntityRepository
             $list = [
                 'Title: '.$item->getTitle(),
                 'Sent date: '.$item->getSendDate()->format($dateFormat),
-                'To user# '.$item->getUserReceiverId(),
+                'To user # '.$item->getUserReceiverId(),
+                'Status'.$item->getMsgStatus(),
             ];
             $messageList[] = implode(', ', $list);
         }
@@ -919,6 +935,7 @@ class UserRepository extends EntityRepository
         foreach ($result as $item) {
             $list = [
                 'File #'.$item->getFileId(),
+                'Course #'.$item->getCId(),
             ];
             $cDropboxPerson[] = implode(', ', $list);
         }
@@ -1062,7 +1079,7 @@ class UserRepository extends EntityRepository
         foreach ($result as $item) {
             $list = [
                 'Feedback: '.$item->getFeedbackText(),
-                'Value: '. $item->getFeedbackValue(),
+                'Value: '.$item->getFeedbackValue(),
                 'Created at: '.$item->getFeedbackDateTime()->format($dateFormat),
             ];
             $skillRelUserComment[] = implode(', ', $list);
@@ -1079,7 +1096,7 @@ class UserRepository extends EntityRepository
             $list = [
                 'Course #'.$item->getCId(),
                 'Session #'.$item->getSessionId(),
-                'Vote: '. $item->getVote(),
+                'Vote: '.$item->getVote(),
             ];
             $userRelCourseVote[] = implode(', ', $list);
         }
@@ -1098,7 +1115,7 @@ class UserRepository extends EntityRepository
                 'EndPoint: '.$item->getApiEndPoint(),
                 'Validity start date: '.$item->getValidityEndDate()->format($dateFormat),
                 'Validity enddate: '.$item->getValidityStartDate()->format($dateFormat),
-                'Created at: '. $item->getCreatedDate()->format($dateFormat),
+                'Created at: '.$item->getCreatedDate()->format($dateFormat),
             ];
             $userApiKey[] = implode(', ', $list);
         }

From ce1de05be8bff15c8b4ba3d94ca2b96c0effede7 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 14:37:22 -0500
Subject: [PATCH 07/18] Minor - Update PHPDoc, including authors reference as
 this code doesn't bear any trace of its previous version anymore

---
 main/inc/ajax/admin.ajax.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/main/inc/ajax/admin.ajax.php b/main/inc/ajax/admin.ajax.php
index 180d5d2973..12b2b08952 100755
--- a/main/inc/ajax/admin.ajax.php
+++ b/main/inc/ajax/admin.ajax.php
@@ -108,13 +108,9 @@ function version_check()
 /**
  * Check if the current installation is up to date
  * The code is borrowed from phpBB and slighlty modified.
- *
- * @author The phpBB Group <support@phpbb.com> (the code)
- * @author Patrick Cool <patrick.cool@UGent.be>, Ghent University (the modifications)
- * @author Yannick Warnier <ywarnier@beeznest.org> for the move to HTTP request
- * @copyright (C) 2001 The phpBB Group
- *
  * @return string language string with some layout (color)
+ * @throws \Exception
+ * @throws \InvalidArgumentException
  */
 function check_system_version()
 {

From f6cb4e198533eaf9b3baa123b98358c54e66cfe6 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 22:15:26 +0200
Subject: [PATCH 08/18] Add extra fields from getTreatmentTypeList()

---
 main/admin/legal_add.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index 02d08102e1..13e70f726d 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -25,6 +25,25 @@ $term_preview = [
     'content' => '',
     'changes' => '',
 ];
+
+$extraField = new ExtraField('terms_and_condition');
+
+$types = LegalManager::getTreatmentTypeList();
+foreach ($types as $variable => $name) {
+    $params = [
+        'variable' => $variable,
+        'display_text' => $name,
+        'field_type' => ExtraField::FIELD_TYPE_TEXTAREA,
+        'default_value' => '',
+        'visible' => true,
+        'changeable' => true,
+        'filter' => true,
+        'visible_to_self' => true,
+        'visible_to_others' => true,
+    ];
+    $extraField->save($params);
+}
+
 if ($form->validate()) {
     $check = Security::check_token('post');
     if ($check) {
@@ -67,7 +86,7 @@ if ($form->validate()) {
                 $tok = Security::get_token();
                 header('Location: legal_list.php?sec_token='.$tok);
                 exit();
-            } elseif ($submit == 'preview') {
+            } elseif ($submit === 'preview') {
                 $defaults['type'] = $type;
                 $defaults['content'] = $content;
                 $defaults['changes'] = $changes;
@@ -128,7 +147,6 @@ if (isset($_POST['language'])) {
     }
 
     $termId = isset($term_preview['id']) ? $term_preview['id'] : 0;
-    $extraField = new ExtraField('terms_and_condition');
     $returnParams = $extraField->addElements(
         $form,
         $termId,

From 89b4761e0970f6fb7fc5333a3f0a0cbbeac4a474 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 22:22:42 +0200
Subject: [PATCH 09/18] Comment unused code see #2503

---
 main/social/personal_data.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/main/social/personal_data.php b/main/social/personal_data.php
index 771b2d73c5..34f3098233 100755
--- a/main/social/personal_data.php
+++ b/main/social/personal_data.php
@@ -403,7 +403,7 @@ $legalTermsRepo = $em->getRepository('ChamiloCoreBundle:Legal');
 // Get data about the treatment of data
 $treatmentTypes = LegalManager::getTreatmentTypeList();
 
-foreach ($treatmentTypes as $id => $item) {
+/*foreach ($treatmentTypes as $id => $item) {
     $personalData['treatment'][$item]['title'] = get_lang('PersonalData'.ucfirst($item).'Title');
     $legalTerm = $legalTermsRepo->findOneByTypeAndLanguage($id, api_get_language_id($user_language));
     $legalTermContent = '';
@@ -411,7 +411,8 @@ foreach ($treatmentTypes as $id => $item) {
         $legalTermContent = $legalTerm[0]['content'];
     }
     $personalData['treatment'][$item]['content'] = $legalTermContent;
-}
+}*/
+
 $officerName = api_get_configuration_value('data_protection_officer_name');
 $officerRole = api_get_configuration_value('data_protection_officer_role');
 $officerEmail = api_get_configuration_value('data_protection_officer_email');

From 5c6ab06edc5dedfa174774fbaa6a876f69972a62 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 22:30:27 +0200
Subject: [PATCH 10/18] Minor - fix name #2503

---
 main/admin/legal_add.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index 13e70f726d..70d15d80b2 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -30,9 +30,10 @@ $extraField = new ExtraField('terms_and_condition');
 
 $types = LegalManager::getTreatmentTypeList();
 foreach ($types as $variable => $name) {
+    $label = 'PrivacyTerms'.ucfirst($name);
     $params = [
         'variable' => $variable,
-        'display_text' => $name,
+        'display_text' => $label,
         'field_type' => ExtraField::FIELD_TYPE_TEXTAREA,
         'default_value' => '',
         'visible' => true,

From 38eba4dcbbbce0c1caafc414f8e385710564efa8 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 22:50:22 +0200
Subject: [PATCH 11/18] Add chat from courses #2503

---
 .../UserBundle/Repository/UserRepository.php       | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 3297c4f0af..78f567a075 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -46,6 +46,7 @@ use Chamilo\TicketBundle\Entity\Ticket;
 use Chamilo\UserBundle\Entity\User;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query\Expr\Join;
+use Symfony\Component\Finder\Finder;
 use Symfony\Component\Serializer\Encoder\JsonEncoder;
 use Symfony\Component\Serializer\Normalizer\GetSetMethodNormalizer;
 use Symfony\Component\Serializer\Serializer;
@@ -514,10 +515,22 @@ class UserRepository extends EntityRepository
 
         $courses = $user->getCourses();
         $list = [];
+        $documentDir = [];
+        $chatFiles = [];
         /** @var CourseRelUser $course */
         foreach ($courses as $course) {
             $list[] = $course->getCourse()->getCode();
+            $courseDir = api_get_path(SYS_COURSE_PATH).$course->getCourse()->getDirectory();
+            $documentDir = $courseDir.'/document/chat_files/';
+            if (is_dir($documentDir)) {
+                $fs = new Finder();
+                $fs->files()->in($documentDir);
+                foreach ($fs as $file) {
+                    $chatFiles[] = $file->getFilename();
+                }
+            }
         }
+
         $user->setCourses($list);
 
         $classes = $user->getClasses();
@@ -1144,6 +1157,7 @@ class UserRepository extends EntityRepository
                 'AttendanceResult' => $cAttendanceResult,
                 'Blog' => $cBlog,
                 'DocumentsAdded' => $documents,
+                'Chat' => $chatFiles,
                 'ForumPost' => $cForumPostList,
                 'ForumThread' => $cForumThreadList,
                 'TrackEExercises' => $trackEExercises,

From e2e5102eee35eb7c28f8e2e0243048d73b1147db Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 22:52:07 +0200
Subject: [PATCH 12/18] Add chat course file see #2503

---
 src/Chamilo/UserBundle/Repository/UserRepository.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 78f567a075..cda01a8791 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -526,6 +526,8 @@ class UserRepository extends EntityRepository
                 $fs = new Finder();
                 $fs->files()->in($documentDir);
                 foreach ($fs as $file) {
+//                    $data = file_get_contents($file->getRealPath());
+                    //$chatFiles[] = $file->getRealPath();
                     $chatFiles[] = $file->getFilename();
                 }
             }

From ea907496f39dd858cd0aab885b0cbeb819bcaf50 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 23:09:28 +0200
Subject: [PATCH 13/18] Show only name of the chat course html file #2503

Lang variable added ContentNotAccessibleRequestFromDataPrivacyOfficer
---
 src/Chamilo/UserBundle/Repository/UserRepository.php | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index cda01a8791..6bb25cc631 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -515,7 +515,6 @@ class UserRepository extends EntityRepository
 
         $courses = $user->getCourses();
         $list = [];
-        $documentDir = [];
         $chatFiles = [];
         /** @var CourseRelUser $course */
         foreach ($courses as $course) {
@@ -526,9 +525,9 @@ class UserRepository extends EntityRepository
                 $fs = new Finder();
                 $fs->files()->in($documentDir);
                 foreach ($fs as $file) {
-//                    $data = file_get_contents($file->getRealPath());
-                    //$chatFiles[] = $file->getRealPath();
-                    $chatFiles[] = $file->getFilename();
+                    $chatFiles[] =
+                        $course->getCourse()->getDirectory().'/document/chat_files/'.$file->getFilename().' - '.
+                        get_lang('ContentNotAccessibleRequestFromDataPrivacyOfficer');
                 }
             }
         }

From ded8de9758505b31bedd6ef649ab688334de73d8 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2018 23:10:44 +0200
Subject: [PATCH 14/18] Hide results from exercise and attempt #2503

---
 src/Chamilo/UserBundle/Repository/UserRepository.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php
index 6bb25cc631..2bf6a6176a 100644
--- a/src/Chamilo/UserBundle/Repository/UserRepository.php
+++ b/src/Chamilo/UserBundle/Repository/UserRepository.php
@@ -598,8 +598,8 @@ class UserRepository extends EntityRepository
                 'IP: '.$item->getUserIp(),
                 'Start: '.$item->getExeDate()->format($dateFormat),
                 'Status: '.$item->getStatus(),
-                'Result: '.$item->getExeResult(),
-                'Weighting: '.$item->getExeWeighting(),
+               // 'Result: '.$item->getExeResult(),
+               // 'Weighting: '.$item->getExeWeighting(),
             ];
             $trackEExercises[] = implode(', ', $list);
         }
@@ -615,9 +615,9 @@ class UserRepository extends EntityRepository
             $list = [
                 'Attempt #'.$item->getExeId(),
                 'Course # '.$item->getCId(),
-                'Answer: '.$item->getAnswer(),
+                //'Answer: '.$item->getAnswer(),
                 'Session #'.$item->getSessionId(),
-                'Marks: '.$item->getMarks(),
+                //'Marks: '.$item->getMarks(),
                 'Position: '.$item->getPosition(),
                 'Date: '.$item->getTms()->format($dateFormat),
             ];
@@ -751,7 +751,7 @@ class UserRepository extends EntityRepository
         foreach ($result as $item) {
             $list = [
                 'Evaluation id# '.$item->getEvaluationId(),
-                'Score: '.$item->getScore(),
+                //'Score: '.$item->getScore(),
                 'Creation date: '.$item->getCreatedAt()->format($dateFormat),
             ];
             $gradebookResult[] = implode(', ', $list);

From 82ebde4843d3a0e83818c54763a3357ad95bac7d Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 17:10:11 -0500
Subject: [PATCH 15/18] Admin: Add branch_sync.unique_id to elements reported
 to chamilo.org. Unique ID is generated upon install and is supposed to
 uniquely represent each portal, which will improve tracking and reduce
 redundancy of information in our statistics in the long-term future

---
 main/inc/ajax/admin.ajax.php                  | 16 ++++++++++++
 .../Repository/BranchSyncRepository.php       | 25 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/main/inc/ajax/admin.ajax.php b/main/inc/ajax/admin.ajax.php
index 12b2b08952..3acb723b2d 100755
--- a/main/inc/ajax/admin.ajax.php
+++ b/main/inc/ajax/admin.ajax.php
@@ -1,5 +1,10 @@
 <?php
 /* For licensing terms, see /license.txt */
+
+use \Chamilo\CoreBundle\Entity\Repository\BranchSyncRepository;
+use \Chamilo\CoreBundle\Entity\BranchSync;
+use \Doctrine\Common\Collections\Criteria;
+
 /**
  * Responses to AJAX calls.
  */
@@ -158,6 +163,16 @@ function check_system_version()
             $packager = 'chamilo';
         }
 
+        $uniqueId = '';
+        $entityManager = Database::getManager();
+        /** @var BranchSyncRepository $branch */
+        $repository = $entityManager->getRepository('ChamiloCoreBundle:BranchSync');
+        /** @var BranchSync $branch */
+        $branch = $repository->getTopBranch();
+        if (is_a($branch, '\Chamilo\CoreBundle\Entity\BranchSync')) {
+            $uniqueId = $branch->getUniqueId();
+        }
+
         $data = [
             'url' => api_get_path(WEB_PATH),
             'campus' => api_get_setting('siteName'),
@@ -179,6 +194,7 @@ function check_system_version()
             // the default config file (main/install/configuration.dist.php)
             // or in the installed config file. The default value is 'chamilo'
             'packager' => $packager,
+            'unique_id' => $uniqueId,
         ];
 
         $version = null;
diff --git a/src/Chamilo/CoreBundle/Entity/Repository/BranchSyncRepository.php b/src/Chamilo/CoreBundle/Entity/Repository/BranchSyncRepository.php
index 57cfacbd69..a3bd56a9f6 100644
--- a/src/Chamilo/CoreBundle/Entity/Repository/BranchSyncRepository.php
+++ b/src/Chamilo/CoreBundle/Entity/Repository/BranchSyncRepository.php
@@ -37,4 +37,29 @@ class BranchSyncRepository extends NestedTreeRepository
 
         return $q->execute();
     }
+
+    /**
+     * Gets the first branch with parent_id = NULL
+     * @return mixed
+     */
+    public function getTopBranch()
+    {
+        $qb = $this->createQueryBuilder('a');
+
+        //Selecting user info
+        $qb->select('DISTINCT b');
+
+        $qb->from('Chamilo\CoreBundle\Entity\BranchSync', 'b');
+        $qb->where('b.parentId IS NULL');
+        $qb->add('orderBy', 'b.id ASC');
+        $qb->setMaxResults(1);
+        $q = $qb->getQuery()->getResult();
+        if (empty($q)) {
+            return null;
+        } else {
+            foreach ($q as $result) {
+                return $result;
+            }
+        }
+    }
 }

From ab28b822fd990abd579527ce800ef206bcf8dabb Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 18:15:22 -0500
Subject: [PATCH 16/18] Internal: Update get_lang() to use the "reserved"
 parameter as "strict". If the "strict" param is set to true, get_lang will
 return en empty string if it cannot find the given variable.

---
 main/inc/lib/internationalization.lib.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/main/inc/lib/internationalization.lib.php b/main/inc/lib/internationalization.lib.php
index 52e5f226af..b82baa490c 100755
--- a/main/inc/lib/internationalization.lib.php
+++ b/main/inc/lib/internationalization.lib.php
@@ -60,11 +60,11 @@ define('PERSON_NAME_EMAIL_ADDRESS', PERSON_NAME_WESTERN_ORDER);
 define('PERSON_NAME_DATA_EXPORT', PERSON_NAME_EASTERN_ORDER);
 
 /**
- * Returns a translated (localized) string, called by its identificator.
+ * Returns a translated (localized) string, called by its ID.
  *
- * @param string $variable this is the identificator (name) of the translated string to be retrieved
- * @param string $reserved this parameter has been reserved for future use
- * @param string $language (optional)    Language indentificator. If it is omited, the current interface language is assumed.
+ * @param string $variable this is the ID (name) of the translated string to be retrieved
+ * @param bool   $strict   If variable is not found, then: if false: returns variable name with or without brackets; true: returns ''
+ * @param string $language (optional)    Language ID. If it is omitted, the current interface language is assumed.
  *
  * @return string returns the requested string in the correspondent language
  *
@@ -82,7 +82,7 @@ define('PERSON_NAME_DATA_EXPORT', PERSON_NAME_EASTERN_ORDER);
  *
  * @see http://translate.chamilo.org/
  */
-function get_lang($variable, $reserved = null, $language = null)
+function get_lang($variable, $strict = false, $language = null)
 {
     // For serving some old hacks:
     // By manipulating this global variable the translation may
@@ -141,17 +141,18 @@ function get_lang($variable, $reserved = null, $language = null)
     // - from a local variable after reloading the language files - on test server mode or when requested language
     // is different than the genuine interface language.
     $read_global_variables = $is_interface_language;
+    $langvar = '';
 
     if ($read_global_variables) {
         if (isset($GLOBALS[$variable])) {
             $langvar = $GLOBALS[$variable];
         } elseif (isset($GLOBALS["lang$variable"])) {
             $langvar = $GLOBALS["lang$variable"];
-        } else {
+        } elseif (!$strict) {
             $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
         }
     }
-    if (empty($langvar) || !is_string($langvar)) {
+    if (empty($langvar) || !is_string($langvar) && !$strict) {
         $langvar = $show_special_markup ? SPECIAL_OPENING_TAG.$variable.SPECIAL_CLOSING_TAG : $variable;
     }
     $ret = $cache[$language][$variable] = $langvar;
@@ -168,6 +169,7 @@ function get_lang($variable, $reserved = null, $language = null)
  * @param bool $setParentLanguageName
  *
  * @return string the current language of the interface
+ * @throws Exception
  */
 function api_get_interface_language(
     $purified = false,

From 47685b169b99f560e591fb0283e36d50bf0436fa Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 18:21:39 -0500
Subject: [PATCH 17/18] Extra fields: add support for the automated translation
 of extra field's display_text, if the term is found in the language terms

---
 main/inc/lib/extra_field.lib.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/main/inc/lib/extra_field.lib.php b/main/inc/lib/extra_field.lib.php
index 857626156e..0e000a09b0 100755
--- a/main/inc/lib/extra_field.lib.php
+++ b/main/inc/lib/extra_field.lib.php
@@ -1049,6 +1049,11 @@ class ExtraField extends Model
                     $freezeElement = $field_details['visible_to_self'] == 0 || $field_details['changeable'] == 0;
                 }
 
+                $translatedDisplayText = get_lang($field_details['display_text'], true);
+                if (!empty($translatedDisplayText)) {
+                    $field_details['display_text'] = $translatedDisplayText;
+                }
+
                 switch ($field_details['field_type']) {
                     case self::FIELD_TYPE_TEXT:
                         $form->addElement(

From 905f3facb7e88f9ed71adc604ef07bf304d4d1b8 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 9 Aug 2018 18:23:05 -0500
Subject: [PATCH 18/18] Privacy: Internal: Update label of privacy terms extra
 fields to match those already defined in translation - refs #2554

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

diff --git a/main/admin/legal_add.php b/main/admin/legal_add.php
index 70d15d80b2..9b653e3771 100755
--- a/main/admin/legal_add.php
+++ b/main/admin/legal_add.php
@@ -30,7 +30,7 @@ $extraField = new ExtraField('terms_and_condition');
 
 $types = LegalManager::getTreatmentTypeList();
 foreach ($types as $variable => $name) {
-    $label = 'PrivacyTerms'.ucfirst($name);
+    $label = 'PersonalData'.ucfirst($name).'Title';
     $params = [
         'variable' => $variable,
         'display_text' => $label,