Merge remote-tracking branch 'upstream/master' into ras-22643

Author: christianbeeznest

assets/vue/components/basecomponents/BaseTinyEditor.vue

@@ -214,14 +214,15 @@ const editorConfig = computed(() => ({
   ...defaultEditorConfig,
   ...props.editorConfig,
   file_picker_callback: filePickerCallback,
+  setup(editor) {
+    editor.on("GetContent", (e) => {
+      if (!e.content.includes("tiny-content")) {
+        e.content = `<div class="tiny-content">${e.content}</div>`
+      }
+    })
+  },
 }))
 
-watch(modelValue, (newValue) => {
-  if (newValue && !newValue.includes("tiny-content")) {
-    modelValue.value = `<div class="tiny-content">${newValue}</div>`
-  }
-})
-
 async function filePickerCallback(callback, value, meta) {
   let url = getUrlForTinyEditor()
   if ("image" === meta.filetype) {

assets/vue/components/social/SocialWallPost.vue

@@ -13,7 +13,7 @@
         />
 
         <div class="flex flex-col">
-          <div v-if="null === post.userReceiver || post.sender['@id'] === post.userReceiver['@id']">
+          <div v-if="!post.userReceiver || post.sender['@id'] === post.userReceiver?.['@id']">
             <BaseAppLink :to="{ name: 'SocialWall', query: { id: post.sender['@id'] } }">
               {{ post.sender.fullName }}
             </BaseAppLink>

assets/vue/composables/formatDate.js

@@ -1,13 +1,29 @@
 import { DateTime } from "luxon"
 import { useLocale } from "./locale"
+import { usePlatformConfig } from "../store/platformConfig"
+import { useSecurityStore } from "../store/securityStore"
 
 export function useFormatDate() {
   const { appParentLocale } = useLocale()
+  const platformConfigStore = usePlatformConfig()
+  const securityStore = useSecurityStore()
+
+  function getCurrentTimezone() {
+    const allowUserTimezone = platformConfigStore.getSetting("profile.use_users_timezone") === "true"
+    const userTimezone = securityStore.user?.timezone
+    const platformTimezone = platformConfigStore.getSetting("platform.timezone")
+
+    if (allowUserTimezone && userTimezone) {
+      return userTimezone
+    }
+
+    if (platformTimezone && platformTimezone !== "false") {
+      return platformTimezone
+    }
+
+    return Intl.DateTimeFormat().resolvedOptions().timeZone
+  }
 
-  /**
-   * @param {Date|string} datetime
-   * @returns {DateTime|null}
-   */
   function getDateTimeObject(datetime) {
     if (!datetime) {
       return null
@@ -16,16 +32,18 @@ export function useFormatDate() {
     let dt
 
     if (typeof datetime === "string") {
-      dt = DateTime.fromISO(datetime)
-    } else if (typeof datetime === "object") {
-      dt = DateTime.fromJSDate(datetime)
+      dt = DateTime.fromISO(datetime, { zone: "utc" })
+    } else if (datetime instanceof Date) {
+      dt = DateTime.fromJSDate(datetime, { zone: "utc" })
+    } else {
+      return null
     }
 
     if (!dt.isValid) {
       return null
     }
 
-    return dt.setLocale(appParentLocale.value)
+    return dt.setZone(getCurrentTimezone()).setLocale(appParentLocale.value)
   }
 
   const abbreviatedDatetime = (datetime) =>
@@ -34,10 +52,12 @@ export function useFormatDate() {
       month: "long",
     })
 
-  const relativeDatetime = (datetime) => getDateTimeObject(datetime)?.toRelative()
+  const relativeDatetime = (datetime) =>
+    getDateTimeObject(datetime)?.toRelative()
 
   return {
     abbreviatedDatetime,
     relativeDatetime,
+    getCurrentTimezone,
   }
 }

assets/vue/utils/dates.js

@@ -1,15 +1,30 @@
-const { DateTime } = require("luxon")
+import { DateTime } from "luxon"
+import { useFormatDate } from "../composables/formatDate"
 
-const formatDateTime = function (date) {
-  if (!date) return null
+const { getCurrentTimezone } = useFormatDate()
 
-  return DateTime(date).format("DD/MM/YYYY")
+/**
+ * Format a JS Date object to string using the current or provided timezone.
+ * @param {Date} date - JavaScript Date object
+ * @param {string} [timezone] - Optional timezone (e.g. "America/Lima")
+ * @returns {string}
+ */
+const formatDateTime = function (date, timezone) {
+  if (!date) return ""
+  const tz = timezone || getCurrentTimezone()
+  return DateTime.fromJSDate(date, { zone: "utc" }).setZone(tz).toFormat("dd/LL/yyyy HH:mm")
 }
 
-const formatDateTimeFromISO = function (dateStr) {
+/**
+ * Format an ISO string to readable string using the current or provided timezone.
+ * @param {string} dateStr - ISO date string (e.g. "2025-06-17T14:00:00Z")
+ * @param {string} [timezone] - Optional timezone
+ * @returns {string}
+ */
+const formatDateTimeFromISO = function (dateStr, timezone) {
   if (!dateStr) return ""
-
-  return DateTime.fromISO(dateStr).toFormat("dd/LL/yyyy HH:mm")
+  const tz = timezone || getCurrentTimezone()
+  return DateTime.fromISO(dateStr, { zone: "utc" }).setZone(tz).toFormat("dd/LL/yyyy HH:mm")
 }
 
 export { formatDateTime, formatDateTimeFromISO }

assets/vue/views/ccalendarevent/CCalendarEventList.vue

@@ -150,16 +150,15 @@ import { useCalendarEvent } from "../../composables/calendar/calendarEvent"
 import resourceLinkService from "../../services/resourceLinkService"
 import { useSecurityStore } from "../../store/securityStore"
 import { useCourseSettings } from "../../store/courseSettingStore"
+import { DateTime } from "luxon"
 
 const store = useStore()
 const securityStore = useSecurityStore()
 const confirm = useConfirm()
 const cidReqStore = useCidReqStore()
 
 const { course, session, group } = storeToRefs(cidReqStore)
-
-const { abbreviatedDatetime } = useFormatDate()
-
+const { abbreviatedDatetime, getCurrentTimezone } = useFormatDate()
 const { showAddButton } = useCalendarActionButtons()
 
 const { isEditableByUser, allowSubscribeToEvent, allowUnsubscribeToEvent } = useCalendarEvent()
@@ -235,13 +234,15 @@ async function getCalendarEvents({ start, end }) {
   const calendarEvents = await cCalendarEventService.findAll({ params }).then((response) => response.json())
 
   return calendarEvents["hydra:member"].map((event) => {
-    let color = event.color || "#007BFF"
+    const timezone = getCurrentTimezone()
+    const start = DateTime.fromISO(event.startDate, { zone: "utc" }).setZone(timezone)
+    const end = DateTime.fromISO(event.endDate, { zone: "utc" }).setZone(timezone)
 
     return {
       ...event,
-      start: event.startDate,
-      end: event.endDate,
-      color,
+      start: start.toString(),
+      end: end.toString(),
+      color: event.color || "#007BFF",
     }
   })
 }
@@ -257,16 +258,9 @@ const showAddEventDialog = () => {
 
   dialog.value = true
 }
-
-const goToMyStudentsSchedule = () => {
-  window.location.href = "/main/calendar/planification.php"
-}
-
-const goToSessionPanning = () => {
-  window.location.href = "/main/my_space/calendar_plan.php"
-}
-
+const timezone = getCurrentTimezone()
 const calendarOptions = ref({
+  timeZone: timezone,
   plugins: [dayGridPlugin, timeGridPlugin, interactionPlugin],
   locales: allLocales,
   locale: calendarLocale?.code ?? "en-GB",

public/main/inc/lib/database.lib.php

@@ -312,7 +312,7 @@ public static function store_result(\Doctrine\DBAL\Result $result, $option = 'BO
      * @throws \Doctrine\DBAL\Exception
      * @throws Exception
      */
-    public static function insert(string $table_name, array $attributes, bool $show_query = false): bool|int
+    public static function insert(string $table_name, array $attributes, bool $show_query = false, array $options = []): bool|int
     {
         if (empty($attributes) || empty($table_name)) {
             return false;
@@ -321,8 +321,9 @@ public static function insert(string $table_name, array $attributes, bool $show_
         $params = array_keys($attributes);
 
         if (!empty($params)) {
-            $sql = 'INSERT INTO '.$table_name.' ('.implode(',', $params).')
-                    VALUES (:'.implode(', :', $params).')';
+            $prefix = (!empty($options['ignore'])) ? 'INSERT IGNORE INTO' : 'INSERT INTO';
+            $sql = $prefix.' '.$table_name.' ('.implode(',', $params).')
+                VALUES (:'.implode(', :', $params).')';
 
             if ($show_query) {
                 var_dump($sql);

public/main/inc/lib/internationalization.lib.php

@@ -192,29 +192,28 @@ function api_get_timezones()
  *
  * @return string The timezone chosen
  */
-function api_get_timezone()
+function api_get_timezone(): string
 {
     $timezone = Session::read('system_timezone');
     if (empty($timezone)) {
-        // First, get the default timezone of the server
+        // 1. Default server timezone
         $timezone = date_default_timezone_get();
-        // Second, see if a timezone has been chosen for the platform
-        $timezoneFromSettings = api_get_setting('platform.timezone', false, 'timezones');
 
-        if (null != $timezoneFromSettings) {
+        // 2. Platform-specific timezone setting (overrides server default)
+        $timezoneFromSettings = api_get_setting('platform.timezone', false, 'timezones');
+        if (!empty($timezoneFromSettings)) {
             $timezone = $timezoneFromSettings;
         }
 
-        // If allowed by the administrator
+        // 3. User-specific timezone if allowed
         $allowUserTimezones = api_get_setting('profile.use_users_timezone', false, 'timezones');
         $userId = api_get_user_id();
 
         if ('true' === $allowUserTimezones && !empty($userId)) {
-            // Get the timezone based on user preference, if it exists
-            $newExtraField = new ExtraFieldValue('user');
-            $data = $newExtraField->get_values_by_handler_and_field_variable($userId, 'timezone');
-            if (!empty($data) && isset($data['timezone']) && !empty($data['timezone'])) {
-                $timezone = $data['timezone'];
+            $user = api_get_user_entity($userId);
+
+            if ($user && $user->getTimezone()) {
+                $timezone = $user->getTimezone();
             }
         }
         Session::write('system_timezone', $timezone);