Merge branch '1.10.x' of ssh://github.com/chamilo/chamilo-lms into 1.10.x

app/Resources/public/css/base.css

@@ -6107,9 +6107,26 @@ div#chat-remote-video video {
   margin-left: auto;
   margin-right: auto;
 }
+
 #session-list .information-item{
   padding: 10px;
 }
+#session-list .information-item .requirements .fa-book{
+  margin-right: 10px;
+  color: #00829C;
+}
+#session-list .information-item .requirements{
+  color: #666666;
+  font-size: 12px;
+}
+#session-list .information-item .options .info-catalog{
+  background-color: #35A8C9;
+  color: #ffffff;
+  padding: 5px;
+  text-align: center;
+  border-radius: 5px;
+  font-size: 12px;
+}
 #session-list .author-session,
 #session-list .date-session{
   font-size: 12px;

main/auth/courses_controller.php

@@ -526,9 +526,9 @@ class CoursesController
      */
     public function getAlreadyRegisteredInSessionLabel()
     {
-        $icon = Display::return_icon('students.gif', get_lang('Student'));
+        $icon = '<i class="fa fa-smile-o"></i>';
 
-        return Display::label($icon . ' ' . get_lang("AlreadyRegisteredToSession"), "info");
+        return Display::div($icon . ' ' . get_lang("AlreadyRegisteredToSession"),array('class'=>'info-catalog'));
     }
 
     /**

main/inc/lib/sessionmanager.lib.php

@@ -5750,12 +5750,13 @@ class SessionManager
             }
             // Get session field values
             $extra = new ExtraFieldValue('session');
-            $sessionFieldValueList = $extra->get_all(array('field_id IN ( ' . $questionMarks . ' )' => array_keys($fields)));
+            $questionMarksFields = substr(str_repeat('?, ', count($fields)), 0, -2);
+            $sessionFieldValueList = $extra->get_all(array ('where' => array('field_id IN ( ' . $questionMarksFields . ' )' => array_keys($fields))));
             // Add session fields values to session list
             foreach ($sessionList as $id => &$session) {
                 foreach ($sessionFieldValueList as $sessionFieldValue) {
                     // Match session field values to session
-                    if ($sessionFieldValue['session_id'] == $id) {
+                    if ($sessionFieldValue['item_id'] == $id) {
                         // Check if session field value is set in session field list
                         if (isset($fields[$sessionFieldValue['field_id']])) {
                             // Avoid overwriting the session's ID field

main/inc/lib/template.lib.php

@@ -66,7 +66,7 @@ class Template
         $this->load_plugins     = $load_plugins;
 
         $template_paths = array(
-            api_get_path(SYS_PATH) . 'custompages', // custom pages folder
+            api_get_path(SYS_CODE_PATH) . 'template/overrides', // user defined templates
             api_get_path(SYS_CODE_PATH).'template', //template folder
             api_get_path(SYS_PLUGIN_PATH) //plugin folder
         );

main/inc/lib/webservices/WebService.class.php

@@ -45,28 +45,15 @@ abstract class WebService
             return false;
         }
 
-        $userTable = Database::get_main_table(TABLE_MAIN_USER);
+        $user = UserManager::getRepository()->findOneBy([
+            'username' => $username
+        ]);
 
-        $whereConditions = array(
+        if (empty($user)) {
-            "username = '?' " => $username,
+            return false;
-            "AND password = '?'" => sha1($password)
-        );
-
-        $conditions = array(
-            'where' => $whereConditions
-        );
-
-        $table = Database::select('count(1) as qty', $userTable, $conditions);
-
-        if ($table != false) {
-            $row = current($table);
-
-            if ($row['qty'] > 0) {
-                return true;
-            }
         }
 
-        return false;
+        return UserManager::isPasswordValid($password, $user);
     }
 
 }

main/lang/english/trad4all.inc.php

@@ -2979,6 +2979,7 @@ $Description = "Description";
 $Links = "Links";
 $Works = "Assignments";
 $Forums = "Forums";
+$GradebookListOfStudentsReports = "Students list report";
 $CreateDir = "Create folder";
 $Name = "Name";
 $Comment = "Comment";
@@ -7389,8 +7390,14 @@ $UntilDateX = "Until %s";
 $GraphDependencyTree = "Dependency tree";
 $CustomizeIcons = "Customize icons";
 $ExportAllToPDF = "Export all to PDF";
+$GradeGeneratedOnX = "Grade generated on %s";
 $ExerciseAvailableSinceX = "Exercise available since %s";
+$ExerciseIsActivatedFromXToY = "The test is enabled from %s to %s";
 $SelectSomeOptions = "Select some options";
 $AddCustomCourseIntro = "You may add an introduction to this course here by clicking the edition icon";
 $SocialGroup = "Social group";
+$RequiredSessions = "Required sessions";
+$DependentSessions = "Dependent sessions";
+$ByDuration = "By duration";
+$ByDates = "By dates";
 ?>

main/lang/french/trad4all.inc.php

@@ -2970,6 +2970,7 @@ $Description = "Description";
 $Links = "Liens";
 $Works = "Travaux";
 $Forums = "Forums";
+$GradebookListOfStudentsReports = "Rapport de liste d'étudiants";
 $CreateDir = "Créer un répertoire";
 $Name = "Nom";
 $Comment = "Commentaire";
@@ -7382,6 +7383,15 @@ $FromDateX = "Du %s";
 $UntilDateX = "Au %s";
 $GraphDependencyTree = "Arbre de dépendances";
 $CustomizeIcons = "Changer les icônes";
+$ExportAllToPDF = "Tout exporter à PDF";
+$GradeGeneratedOnX = "Score généré le %s";
 $ExerciseAvailableSinceX = "Exercice disponible depuis le %s";
 $ExerciseIsActivatedFromXToY = "L'exercice est disponible du %s au %s";
+$SelectSomeOptions = "Sélectionnez une option";
+$AddCustomCourseIntro = "Vous pouvez ajouter une introduction à votre cours dans cette section en cliquant sur l'icône d'édition";
+$SocialGroup = "Groupe social";
+$RequiredSessions = "Sessions requises";
+$DependentSessions = "Sessions dépendantes";
+$ByDuration = "Par durée";
+$ByDates = "Par dates";
 ?>

main/lang/spanish/trad4all.inc.php

@@ -2979,6 +2979,7 @@ $Description = "Descripción";
 $Links = "Enlaces";
 $Works = "Tareas";
 $Forums = "Foros";
+$GradebookListOfStudentsReports = "Reporte de lista de alumnos";
 $CreateDir = "Crear una carpeta";
 $Name = "Nombre";
 $Comment = "Comentarios";
@@ -7417,6 +7418,15 @@ $FromDateX = "Del %s";
 $UntilDateX = "Al %s";
 $GraphDependencyTree = "Árbol de dependencias";
 $CustomizeIcons = "Personalizar iconos";
+$ExportAllToPDF = "Exportar todo a PDF";
+$GradeGeneratedOnX = "Nota generada el %s";
+$ExerciseAvailableSinceX = "Ejercicio disponible desde el %s";
+$ExerciseIsActivatedFromXToY = "El ejercicio está habilitado del %s al %s";
+$SelectSomeOptions = "Seleccione alguna opción";
 $AddCustomCourseIntro = "Puede añadir una introducción a su curso en esta sección, dando clic en el icono de edición";
 $SocialGroup = "Grupo de red social";
+$RequiredSessions = "Sesiones requeridas";
+$DependentSessions = "Sesiones dependientes";
+$ByDuration = "Por duración";
+$ByDates = "Por fechas";
 ?>

main/template/default/auth/session_catalog.tpl

@@ -105,8 +105,7 @@
                                 </ul>
                                 <div class="requirements">
                                     {% if session.requirements %}
-                                    <h4>{{ 'Requirements'|get_lang }}</h4>
+                                    <p><i class="fa fa-book"></i> {{ 'RequiredSessions'|get_lang }} :
-                                    <p>
                                         {% for requirement in session.requirements %}
                                         {{ requirement.name  }}
                                         {% endfor %}
@@ -114,8 +113,7 @@
                                     {% endif %}
 
                                     {% if session.dependencies %}
-                                    <h4>{{ 'Dependencies'|get_lang }}</h4>
+                                    <p> <i class="fa fa-book"></i> {{ 'DependentSessions'|get_lang }} :
-                                    <p>
                                         {% for dependency in session.dependencies %}
                                         {{ dependency.name  }}
                                         {% endfor %}

main/template/overrides/README.md

@@ -0,0 +1,11 @@
+Place template files in this directory to override any existing template.
+
+Just copy the orignal template file with the same relative path.
+e.g.:
+```
+layout/head.tpl
+```
+or
+```
+the_plugin_dirname/path/of/template/in/plugins.tpl
+```