From 145b7c6c478bbd8ac6dd0c4644b797338571f36d Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 18 Aug 2016 12:23:40 -0500
Subject: [PATCH 1/8] Fix student detail time tracking data collection - refs
 CT#8405

---
 main/inc/ajax/myspace.ajax.php |  4 +-
 main/inc/lib/myspace.lib.php   | 91 +++++++++++++++++-----------------
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/main/inc/ajax/myspace.ajax.php b/main/inc/ajax/myspace.ajax.php
index 6538278c59..a85794c36f 100755
--- a/main/inc/ajax/myspace.ajax.php
+++ b/main/inc/ajax/myspace.ajax.php
@@ -20,7 +20,7 @@ switch ($action) {
         if ($range == 1) {
             $start_date = Security::remove_XSS($_REQUEST['sd']);
             $end_date = Security::remove_XSS($_REQUEST['ed']);
-            $sql_result = get_connections_to_course_by_date(
+            $sql_result = MySpace::get_connections_to_course_by_date(
                 $user_id,
                 $courseId,
                 $start_date,
@@ -47,7 +47,7 @@ switch ($action) {
         $courseInfo = api_get_course_info($course_code);
         $courseId = $courseInfo['real_id'];
 
-        $sql_result = get_connections_to_course_by_date(
+        $sql_result = MySpace::get_connections_to_course_by_date(
             $user_id,
             $courseId,
             $start_date,
diff --git a/main/inc/lib/myspace.lib.php b/main/inc/lib/myspace.lib.php
index 6f0f95b3a9..1bc64c22d3 100644
--- a/main/inc/lib/myspace.lib.php
+++ b/main/inc/lib/myspace.lib.php
@@ -2967,6 +2967,51 @@ class MySpace
 
         return $return;
     }
+
+    /**
+     * Gets the connections to a course as an array of login and logout time
+     *
+     * @param   int       $user_id
+     * @param   int    $courseId
+     * @author  Jorge Frisancho Jibaja
+     * @author  Julio Montoya <gugli100@gmail.com> fixing the function
+     * @version OCT-22- 2010
+     * @return  array
+     */
+    public static function get_connections_to_course_by_date($user_id, $courseId, $start_date, $end_date)
+    {
+        // Database table definitions
+        $tbl_track_course = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
+        $course_info = api_get_course_info_by_id($courseId);
+        $user_id = intval($user_id);
+        $courseId = intval($courseId);
+        $connections = array();
+
+        if (!empty($course_info)) {
+            $end_date = add_day_to($end_date);
+            $sql = "SELECT login_course_date, logout_course_date
+                FROM $tbl_track_course
+                WHERE
+                    user_id = $user_id AND
+                    c_id = $courseId AND
+                    login_course_date BETWEEN '$start_date' AND '$end_date' AND
+                    logout_course_date BETWEEN '$start_date' AND '$end_date'
+                ORDER BY login_course_date ASC";
+            $rs = Database::query($sql);
+
+            while ($row = Database::fetch_array($rs)) {
+                $login_date = $row['login_course_date'];
+                $logout_date = $row['logout_course_date'];
+                $timestamp_login_date = strtotime($login_date);
+                $timestamp_logout_date = strtotime($logout_date);
+                $connections[] = array(
+                    'login' => $timestamp_login_date,
+                    'logout' => $timestamp_logout_date
+                );
+            }
+        }
+        return $connections;
+    }
 }
 
 /**
@@ -3021,52 +3066,6 @@ function add_day_to($end_date) {
     return $foo_date;
 }
 
-
-/**
- * Gets the connections to a course as an array of login and logout time
- *
- * @param   int       $user_id
- * @param   int    $courseId
- * @author  Jorge Frisancho Jibaja
- * @author  Julio Montoya <gugli100@gmail.com> fixing the function
- * @version OCT-22- 2010
- * @return  array
- */
-function get_connections_to_course_by_date($user_id, $courseId, $start_date, $end_date)
-{
-    // Database table definitions
-    $tbl_track_course = Database::get_main_table(TABLE_STATISTIC_TRACK_E_COURSE_ACCESS);
-    $course_info = api_get_course_info_by_id($courseId);
-    $user_id = intval($user_id);
-    $courseId = intval($courseId);
-    $connections = array();
-
-    if (!empty($course_info)) {
-        $end_date = add_day_to($end_date);
-        $sql = "SELECT login_course_date, logout_course_date
-                FROM $tbl_track_course
-                WHERE
-                    user_id = $user_id AND
-                    c_id = $courseId AND
-                    login_course_date BETWEEN '$start_date' AND '$end_date' AND
-                    logout_course_date BETWEEN '$start_date' AND '$end_date'
-                ORDER BY login_course_date ASC";
-        $rs = Database::query($sql);
-
-        while ($row = Database::fetch_array($rs)) {
-            $login_date = $row['login_course_date'];
-            $logout_date = $row['logout_course_date'];
-            $timestamp_login_date = strtotime($login_date);
-            $timestamp_logout_date = strtotime($logout_date);
-            $connections[] = array(
-                'login' => $timestamp_login_date,
-                'logout' => $timestamp_logout_date
-            );
-        }
-    }
-    return $connections;
-}
-
 /**
  *
  *

From a0ee00b727a1f88ba9e777c6ff1577a408702f86 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 18 Aug 2016 13:55:49 -0500
Subject: [PATCH 2/8] Fix #1364 extended profile field values not visible in
 profile edition

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

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 12d345c591..8191b8f30a 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -1447,6 +1447,12 @@ function _api_format_user($user, $add_password = false)
         'expiration_date',
         'last_login'
     );
+    if (api_get_setting('extended_profile') === 'true') {
+        $attributes[] = 'competences';
+        $attributes[] = 'diplomas';
+        $attributes[] = 'teach';
+        $attributes[] = 'openarea';
+    }
 
     foreach ($attributes as $attribute) {
         $result[$attribute] = isset($user[$attribute]) ? $user[$attribute] : null;

From 9b821ab6ee1abe11df2a0dc303fcf795f28d1642 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Thu, 18 Aug 2016 14:07:52 -0500
Subject: [PATCH 3/8] Fix #1369 preventing teachers from seeing page 2 of
 teachers list in users tool

---
 main/user/user.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/user/user.php b/main/user/user.php
index ce784f9240..5bfb0f8f96 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -856,6 +856,7 @@ $parameters['keyword'] = isset($_GET['keyword']) ? Security::remove_XSS($_GET['k
 $parameters['sec_token'] = Security::get_token();
 $parameters['cidReq'] = api_get_cidreq();
 $parameters['id_session'] = api_get_session_id();
+$parameters['type'] = $type;
 
 $table->set_additional_parameters($parameters);
 $header_nr = 0;

From 019cd4bca5724f683e7611f4dc83e3350e7b6e2c Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 19 Aug 2016 10:40:10 +0200
Subject: [PATCH 4/8] Fix js error adding addslashes

---
 main/inc/lib/formvalidator/FormValidator.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main/inc/lib/formvalidator/FormValidator.class.php b/main/inc/lib/formvalidator/FormValidator.class.php
index b91883951f..9823b19c3f 100755
--- a/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/main/inc/lib/formvalidator/FormValidator.class.php
@@ -1337,14 +1337,14 @@ EOT;
             var uploadButton = $('<button/>')
                 .addClass('btn btn-primary')
                 .prop('disabled', true)
-                .text('".get_lang('Loading')."')
+                .text('".addslashes(get_lang('Loading'))."')
                 .on('click', function () {
                     var \$this = $(this),
                     data = \$this.data();
 
                     \$this
                         .off('click')
-                        .text('".get_lang('Cancel')."')
+                        .text('".addslashes(get_lang('Cancel'))."')
                         .on('click', function () {
                             \$this.remove();
                             data.abort();
@@ -1388,7 +1388,7 @@ EOT;
                         .prepend(file.preview);
                     node
                         .append('<br>')
-                        .append($('<span class=\"text-success\"/>').text('" . get_lang('UplUploadSucceeded') . "'));
+                        .append($('<span class=\"text-success\"/>').text('" . addslashes(get_lang('UplUploadSucceeded')). "'));
                 }
                 if (file.error) {
                     node
@@ -1423,7 +1423,7 @@ EOT;
                 });
             }).on('fileuploadfail', function (e, data) {
                 $.each(data.files, function (index) {
-                    var failedMessage = '" . get_lang('UplUploadFailed') . "';
+                    var failedMessage = '" . addslashes(get_lang('UplUploadFailed')) . "';
                     var error = $('<span class=\"text-danger\"/>').text(failedMessage);
                     $(data.context.children()[index])
                         .append('<br>')

From 4666293bd1691331627aa33a5521afe812fdd037 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Fri, 19 Aug 2016 11:04:55 +0200
Subject: [PATCH 5/8] dd config $_configuration['editor_driver_list']

To block course documents in ckeditor see BT#11538
---
 main/inc/lib/elfinder/connectorAction.php | 18 ++++++++++++------
 main/install/configuration.dist.php       |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/main/inc/lib/elfinder/connectorAction.php b/main/inc/lib/elfinder/connectorAction.php
index 159b735934..9d00ac8996 100644
--- a/main/inc/lib/elfinder/connectorAction.php
+++ b/main/inc/lib/elfinder/connectorAction.php
@@ -9,12 +9,18 @@ use Chamilo\CoreBundle\Component\Editor\Finder;
 error_reporting(-1);
 /** @var Connector $connector */
 $connector = new Connector();
-$driverList = array(
-    'PersonalDriver',
-    'CourseDriver',
-    //'CourseUserDriver',
-    //'HomeDriver'
-);
+
+// Check driver list in configuration
+$driverList = api_get_configuration_value('editor_driver_list');
+if (empty($driverList)) {
+    $driverList = array(
+        'PersonalDriver',
+        'CourseDriver',
+        //'CourseUserDriver',
+        //'HomeDriver'
+    );
+}
+
 $connector->setDriverList($driverList);
 
 $operations = $connector->getOperations();
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index 8680bbca9c..d5a47070cc 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -247,3 +247,5 @@ $_configuration['system_stable'] = NEW_VERSION_STABLE;
 // to reflect their packaging method. The default value is 'chamilo'. This will
 // be reflected on the https://version.chamilo.org/stats page in the future.
 //$_configuration['packager'] = 'chamilo';
+// List of driver to plugin in ckeditor
+//$_configuration['editor_driver_list'] = ['PersonalDriver', 'CourseDriver'];
\ No newline at end of file

From 66b38c21241be0eee8879b0f93d8b1c8890c8dcf Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Tue, 23 Aug 2016 13:41:42 +0200
Subject: [PATCH 6/8] Use iid to delete groups.

---
 main/inc/lib/groupmanager.lib.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 9eb1e086a9..1d6d9c3ac2 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -401,12 +401,13 @@ class GroupManager
         self::unsubscribe_all_users($group_ids);
         self::unsubscribe_all_tutors($group_ids);
 
-        $sql = "SELECT id, secret_directory, session_id
+        $sql = "SELECT id, iid, secret_directory, session_id
                 FROM $group_table
                 WHERE c_id = $course_id AND id IN (".implode(' , ', $group_ids).")";
         $db_result = Database::query($sql);
 
         while ($group = Database::fetch_object($db_result)) {
+            $groupId = $group['iid'];
             // move group-documents to garbage
             $source_directory = api_get_path(SYS_COURSE_PATH).$course_info['path']."/document".$group->secret_directory;
             // File to renamed
@@ -426,22 +427,22 @@ class GroupManager
                     }
                 }
             }
-        }
 
-        $sql = "DELETE FROM ".$forum_table."
-                WHERE c_id = $course_id AND forum_of_group IN ('".implode("' , '", $group_ids)."')";
-        Database::query($sql);
+            $sql = "DELETE FROM $forum_table
+                    WHERE c_id = $course_id AND forum_of_group = $groupId ";
+            Database::query($sql);
 
-        // Delete item properties of this group.
-        $itemPropertyTable = Database::get_course_table(TABLE_ITEM_PROPERTY);
-        $sql = "DELETE FROM ".$itemPropertyTable."
-                WHERE c_id = $course_id AND to_group_id IN ('".implode("' , '", $group_ids)."')";
-        Database::query($sql);
+            // Delete item properties of this group.
+            $itemPropertyTable = Database::get_course_table(TABLE_ITEM_PROPERTY);
+            $sql = "DELETE FROM $itemPropertyTable
+                    WHERE c_id = $course_id AND to_group_id = $groupId ";
+            Database::query($sql);
 
-        // delete the groups
-        $sql = "DELETE FROM ".$group_table."
-                WHERE c_id = $course_id AND id IN ('".implode("' , '", $group_ids)."')";
-        Database::query($sql);
+            // delete the groups
+            $sql = "DELETE FROM $group_table
+                    WHERE c_id = $course_id AND iid = $groupId ";
+            Database::query($sql);
+        }
 
         return true;
     }

From 575d8a262e4183fc1bc797819d8467210ae69acd Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Tue, 23 Aug 2016 13:49:22 +0200
Subject: [PATCH 7/8] Minor - Fix assignation

---
 main/inc/lib/groupmanager.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/inc/lib/groupmanager.lib.php b/main/inc/lib/groupmanager.lib.php
index 1d6d9c3ac2..97327320db 100755
--- a/main/inc/lib/groupmanager.lib.php
+++ b/main/inc/lib/groupmanager.lib.php
@@ -407,7 +407,7 @@ class GroupManager
         $db_result = Database::query($sql);
 
         while ($group = Database::fetch_object($db_result)) {
-            $groupId = $group['iid'];
+            $groupId = $group->iid;
             // move group-documents to garbage
             $source_directory = api_get_path(SYS_COURSE_PATH).$course_info['path']."/document".$group->secret_directory;
             // File to renamed

From c1dbf7c31abf3be7eb6a4aedc2e61fad978f9e42 Mon Sep 17 00:00:00 2001
From: jmontoyaa <gugli100@gmail.com>
Date: Tue, 23 Aug 2016 16:31:17 +0200
Subject: [PATCH 8/8] Fix course import see #1297

---
 main/admin/course_user_import.php | 54 +++++++++++++++++--------------
 1 file changed, 29 insertions(+), 25 deletions(-)

diff --git a/main/admin/course_user_import.php b/main/admin/course_user_import.php
index 6cc588ddab..2795c3a859 100755
--- a/main/admin/course_user_import.php
+++ b/main/admin/course_user_import.php
@@ -43,6 +43,7 @@ function validate_data($users_courses)
             }
         }
 
+
         // 3. Check whether username exists.
         if (isset ($user_course['UserName']) && strlen($user_course['UserName']) != 0) {
             if (UserManager::is_username_available($user_course['UserName'])) {
@@ -72,12 +73,21 @@ function save_data($users_courses)
     $course_user_table = Database::get_main_table(TABLE_MAIN_COURSE_USER);
     $csv_data = array();
     $inserted_in_course = array();
-
+    $courseListCache = [];
+    $courseListById = [];
     foreach ($users_courses as $user_course) {
-        $csv_data[$user_course['UserName']][$user_course['CourseCode']] = $user_course['Status'];
+        if (!in_array($user_course['CourseCode'], array_keys($courseListCache))) {
+            $courseInfo = api_get_course_info($user_course['CourseCode']);
+            $courseListCache[$user_course['CourseCode']] = $courseInfo;
+        } else {
+            $courseInfo = $courseListCache[$user_course['CourseCode']];
+        }
+        $courseListById[$courseInfo['real_id']] = $courseInfo;
+        $csv_data[$user_course['UserName']][$courseInfo['real_id']] = $user_course['Status'];
     }
 
     foreach ($csv_data as $username => $csv_subscriptions) {
+
         $sql = "SELECT * FROM $user_table u
                 WHERE u.username = '".Database::escape_string($username)."'";
         $res = Database::query($sql);
@@ -96,33 +106,24 @@ function save_data($users_courses)
 
         if ($_POST['subscribe']) {
             foreach ($to_subscribe as $courseId) {
-                $courseInfo = api_get_course_info_by_id($courseId);
-                $course_code = $courseInfo['code'];
-
-                if (CourseManager :: course_exists($course_code)) {
-                    CourseManager::subscribe_user(
-                        $user_id,
-                        $course_code,
-                        $csv_subscriptions[$course_code]
-                    );
-                    $course_info = CourseManager::get_course_information($course_code);
-                    $inserted_in_course[$course_code] = $course_info['title'];
-                    $inserted_in_course[$course_info['code']] = $course_info['title'];
-                }
+                $courseInfo = $courseListById[$courseId];
+                $courseCode = $courseInfo['code'];
+
+                CourseManager::subscribe_user(
+                    $user_id,
+                    $courseCode,
+                    $csv_subscriptions[$courseId]
+                );
+                $inserted_in_course[$courseInfo['code']] = $courseInfo['title'];
+
             }
         }
 
         if ($_POST['unsubscribe']) {
             foreach ($to_unsubscribe as $courseId) {
-                $courseInfo = api_get_course_info_by_id($courseId);
-                $course_code = $courseInfo['code'];
-
-                if (CourseManager :: course_exists($course_code)) {
-                    CourseManager::unsubscribe_user($user_id, $course_code);
-                    $course_info = CourseManager::get_course_information($course_code);
-                    CourseManager::unsubscribe_user($user_id, $course_code);
-                    $inserted_in_course[$course_info['code']] = $course_info['title'];
-                }
+                $courseInfo = $courseListById[$courseId];
+                $courseCode = $courseInfo['code'];
+                CourseManager::unsubscribe_user($user_id, $courseCode);
             }
         }
     }
@@ -170,6 +171,7 @@ $errors = array();
 if ($form->validate()) {
     $users_courses = parse_csv_data($_FILES['import_file']['tmp_name']);
     $errors = validate_data($users_courses);
+
     if (count($errors) == 0) {
         $inserted_in_course = save_data($users_courses);
         // Build the alert message in case there were visual codes subscribed to.
@@ -189,9 +191,11 @@ if ($form->validate()) {
             $warn = get_lang('ErrorsWhenImportingFile');
         }
 
+        Display::addFlash(Display::return_message($warn));
+
         Security::clear_token();
         $tok = Security::get_token();
-        header('Location: user_list.php?action=show_message&warn='.urlencode($warn).'&sec_token='.$tok);
+        header('Location: '.api_get_self());
         exit();
     }
 }