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

Author: AngelFQC

main/admin/user_edit.php

@@ -65,6 +65,7 @@ function confirmation(name) {
 }
 </script>';
 
+$htmlHeadXtra[] = api_get_password_checker_js('#username', '#password');
 $htmlHeadXtra[] = api_get_css_asset('cropper/dist/cropper.min.css');
 $htmlHeadXtra[] = api_get_asset('cropper/dist/cropper.min.js');
 $tool_name = get_lang('ModifyUserInfo');
@@ -226,7 +227,13 @@ function confirmation(name) {
     'password',
     'password',
     null,
-    ['onkeydown' => 'javascript: password_switch_radio_button();', 'autocomplete' => 'new-password']
+    [
+        'id' => 'password',
+        'autocomplete' => 'new-password',
+        'onkeydown' => 'javascript: password_switch_radio_button();',
+        'show_hide' => true,
+        //'required' => 'required'
+    ]
 );
 
 $form->addGroup($group, 'password', null, null, false);

main/inc/lib/agenda.lib.php

@@ -528,28 +528,31 @@ public function generateDatesByType($type, $startEvent, $endEvent, $repeatUntilD
                 break;
             }
 
-            // @todo remove comment code
-            $startDateInLocal = new DateTime($newStartDate, new DateTimeZone($timeZone));
+	    // @todo remove comment code
+	    // The code below was not adpating to saving light time but was doubling the difference with UTC time.
+	    // Might be necessary to adapt to update saving light time difference.
+/*            $startDateInLocal = new DateTime($newStartDate, new DateTimeZone($timeZone));
             if ($startDateInLocal->format('I') == 0) {
                 // Is saving time? Then fix UTC time to add time
                 $seconds = $startDateInLocal->getOffset();
                 $startDate->add(new DateInterval("PT".$seconds."S"));
                 //$startDateFixed = $startDate->format('Y-m-d H:i:s');
-                /*$startDateInLocalFixed = new DateTime($startDateFixed, new DateTimeZone($timeZone));
-                $newStartDate = $startDateInLocalFixed->format('Y-m-d H:i:s');*/
+                //$startDateInLocalFixed = new DateTime($startDateFixed, new DateTimeZone($timeZone));
+                //$newStartDate = $startDateInLocalFixed->format('Y-m-d H:i:s');
                 //$newStartDate = $startDate->setTimezone(new DateTimeZone($timeZone))->format('Y-m-d H:i:s');
             }
-            $newStartDate = $startDate->setTimezone(new DateTimeZone($timeZone))->format('Y-m-d H:i:s');
-            $endDateInLocal = new DateTime($newEndDate, new DateTimeZone($timeZone));
 
+            $endDateInLocal = new DateTime($newEndDate, new DateTimeZone($timeZone));
             if ($endDateInLocal->format('I') == 0) {
                 // Is saving time? Then fix UTC time to add time
                 $seconds = $endDateInLocal->getOffset();
                 $endDate->add(new DateInterval("PT".$seconds."S"));
                 //$endDateFixed = $endDate->format('Y-m-d H:i:s');
                 //$endDateInLocalFixed = new DateTime($endDateFixed, new DateTimeZone($timeZone));
                 //$newEndDate = $endDateInLocalFixed->format('Y-m-d H:i:s');
-            }
+	    }
+*/
+	    $newStartDate = $startDate->setTimezone(new DateTimeZone($timeZone))->format('Y-m-d H:i:s');
             $newEndDate = $endDate->setTimezone(new DateTimeZone($timeZone))->format('Y-m-d H:i:s');
             $list[] = ['start' => $newStartDate, 'end' => $newEndDate];
             $counter++;