Merge branch 'BT9464' of https://github.com/AngelFQC/chamilo-lms into AngelFQC-BT9464

main/admin/session_add.php

@@ -394,8 +394,8 @@ if ($form->validate()) {
     $coach_username = $params['coach_username'];
     $id_session_category = $params['session_category'];
     $id_visibility = $params['session_visibility'];
-    $end_limit = isset($params['end_limit']) ? true : false;
-    $start_limit = isset($params['start_limit']) ? true : false;
+    $end_limit = isset($params['end_limit']);
+    $start_limit = isset($params['start_limit']);
     $duration = isset($params['duration']) ? $params['duration'] : null;
     $description = $params['description'];
     $showDescription = isset($params['show_description']) ? 1: 0;

main/admin/session_edit.php

@@ -295,8 +295,8 @@ if ($form->validate()) {
     $description = $params['description'];
     $showDescription = isset($params['show_description']) ? 1: 0;
 
-    $end_limit = $params['end_limit'];
-    $start_limit = $params['start_limit'];
+    $end_limit = isset($params['end_limit']);
+    $start_limit = isset($params['start_limit']);
 
     if (empty($end_limit) && empty($start_limit)) {
         $nolimit = 1;

main/inc/lib/sessionmanager.lib.php

@@ -157,6 +157,8 @@ class SessionManager
         } elseif (!empty($start_limit) && !empty($end_limit) && empty($nolimit) && $date_start >= $date_end) {
             $msg = get_lang('StartDateShouldBeBeforeEndDate');
             return $msg;
+        } elseif (!empty($duration) && (!empty($start_limit) || !empty($end_limit))) {
+            return get_lang('ChooseEitherDurationOrTimeLimit');
         } else {
             $ready_to_create = false;
             if ($fix_name) {
@@ -1407,6 +1409,8 @@ class SessionManager
         } elseif (!empty($start_limit) && !empty($end_limit) && empty($nolimit) && $date_start >= $date_end) {
             $msg = get_lang('StartDateShouldBeBeforeEndDate');
             return $msg;
+        } elseif (!empty($duration) && (!empty($start_limit) || !empty($end_limit))) {
+            return get_lang('ChooseEitherDurationOrTimeLimit');
         } else {
 
             $rs = Database::query("SELECT id FROM $tbl_session WHERE name='" . Database::escape_string($name) . "'");

main/lang/english/trad4all.inc.php

@@ -340,6 +340,7 @@ $NoTimeLimits = "No time limits";
 $SearchXapianModuleNotInstalled = "The Xapian search module is not installed";
 $TypeMessage = "Please type your message!";
 $ConfirmReset = "Do you really want to delete all messages?";
+$ChooseEitherDurationOrTimeLimit = "Choose either duration or time limit";
 $ClearList = "Clear the chat";
 $SessionBanner = "Session banner";
 $ShortDescription = "Short description";

main/lang/spanish/trad4all.inc.php

@@ -340,6 +340,7 @@ $NoTimeLimits = "Sin límite de tiempo";
 $SearchXapianModuleNotInstalled = "El modulo Xapian de PHP no está configurado en su servidor, póngase en contacto con su administrador";
 $TypeMessage = "Por favor, escriba su mensaje";
 $ConfirmReset = "¿Seguro que quiere borrar todos los mensajes?";
+$ChooseEitherDurationOrTimeLimit = "Elija entre duración o límite de tiempo";
 $ClearList = "Borrar la lista";
 $SessionBanner = "Banner de sesión";
 $ShortDescription = "Descripción corta";