merge_release_5-4

.htaccess

@@ -12,7 +12,8 @@
 	RewriteCond %{HTTP_USER_AGENT} ^(DavClnt)$
 	RewriteCond %{REQUEST_METHOD} ^(OPTIONS)$
 	RewriteRule .* "-" [R=401,L]
-
+</IfModule>
+<IfModule mod_alias.c>
 	RedirectMatch 404 /\.git
 </IfModule>
 <IfModule mod_xsendfile.c>

Modules/Blog/classes/class.ilBlogPostingGUI.php

@@ -801,6 +801,8 @@ public function saveKeywordsForm()
             if ($this->checkAccess("write") || $this->checkAccess("contribute")) {
                 if (is_array($keywords)) {
                     $this->getBlogPosting()->updateKeywords($keywords);
+                } else {
+                    $this->getBlogPosting()->updateKeywords([]);
                 }
             }
 

Modules/BookingManager/classes/class.ilBookingObjectsTableGUI.php

@@ -376,17 +376,23 @@ protected function fillRow($a_set)
             // note: this call is currently super expensive
             // see #26388, it has been performed even for users without edit permissions before
             // now the call has been moved here, but still this needs improvement
-            if (!empty(ilBookingParticipant::getAssignableParticipants($a_set["booking_object_id"]))) {
+            // EDIT: deactivated for now due to performance reasons
+            // if (!empty(ilBookingParticipant::getAssignableParticipants($a_set["booking_object_id"]))) {
                 if (is_object($this->filter['period']['from'])) {
-                    $ilCtrl->setParameter($this->parent_obj, 'sseed',
-                        $this->filter['period']['from']->get(IL_CAL_DATE));
+                    $ilCtrl->setParameter(
+                        $this->parent_obj,
+                        'sseed',
+                        $this->filter['period']['from']->get(IL_CAL_DATE)
+                    );
                 }
 
-                $items[] = $this->ui_factory->button()->shy($lng->txt('book_assign_participant'),
-                    $ilCtrl->getLinkTarget($this->parent_obj, 'assignParticipants'));
+                $items[] = $this->ui_factory->button()->shy(
+                    $lng->txt('book_assign_participant'),
+                    $ilCtrl->getLinkTarget($this->parent_obj, 'assignParticipants')
+                );
 
                 $ilCtrl->setParameter($this->parent_obj, 'sseed', '');
-            }
+            //}
         }
 
         if ($a_set['info_file']) {

Modules/BookingManager/classes/class.ilBookingReservationsTableGUI.php

@@ -500,20 +500,65 @@ public function getItems(array $filter)
                 return $d['user_id'];
             }, $data));
 
+            $user_columns = [];
+            $odf_ids = [];
+            foreach ($this->getSelectedUserColumns() as $field) {
+                if (substr($field, 0, 3) == 'odf') {
+                    $odf_ids[] = substr($field, 4);
+                } else {
+                    $user_columns[] = $field;
+                }
+            }
+
             // user data fields
             $query = new ilUserQuery();
             $query->setLimit(9999);
-            $query->setAdditionalFields($this->getSelectedUserColumns());
+            $query->setAdditionalFields($user_columns);
             $query->setUserFilter($user_ids);
             $ud = $query->query();
+
             $usr_data = [];
             foreach ($ud["set"] as $v) {
-                foreach ($this->getSelectedUserColumns() as $c) {
+                foreach ($user_columns as $c) {
                     $usr_data[$v["usr_id"]][$c] = $v[$c];
                 }
             }
             foreach ($data as $key => $v) {
-                $data[$key] = array_merge($v, $usr_data[$v["user_id"]]);
+                if (isset($usr_data[$v["user_id"]])) {
+                    $data[$key] = array_merge($v, $usr_data[$v["user_id"]]);
+                }
+            }
+
+            // object specific user data fields of parent course or group
+            if ($odf_ids) {
+                $parent = $this->getParentGroupCourse();
+                $parent_obj_id = ilObject::_lookupObjectId($parent['ref_id']);
+                $parent_obj_type = ilObject::_lookupType($parent_obj_id);
+
+                $confirmation_required = ($parent_obj_type == 'crs')
+                    ? ilPrivacySettings::_getInstance()->courseConfirmationRequired()
+                    : ilPrivacySettings::_getInstance()->groupConfirmationRequired();
+                if ($confirmation_required) {
+                    $user_ids = array_diff($user_ids, ilMemberAgreement::lookupAcceptedAgreements($parent_obj_id));
+                }
+                $odf_data = ilCourseUserData::_getValuesByObjId($parent_obj_id);
+
+                $usr_data = [];
+                foreach ($odf_data as $usr_id => $fields) {
+                    if (in_array($usr_id, $user_ids)) {
+                        foreach ($fields as $field_id => $value) {
+                            if (in_array($field_id, $odf_ids)) {
+                                $usr_data[$usr_id]['odf_' . $field_id] = $value;
+                            }
+                        }
+                    }
+                }
+
+                foreach ($data as $key => $v) {
+                    if (isset($usr_data[$v["user_id"]])) {
+                        $data[$key] = array_merge($v, $usr_data[$v["user_id"]]);
+                    }
+                }
             }
         }
 
@@ -628,6 +673,17 @@ protected function fillRow($a_set)
             $this->tpl->setVariable("URL_ACTION", $ilCtrl->getLinkTarget($this->parent_obj, 'rsvConfirmCancel'));
             $ilCtrl->setParameter($this->parent_obj, 'reservation_id', "");
             $this->tpl->setVariable("TXT_ACTION", $lng->txt('book_set_cancel'));
+            $this->tpl->setCurrentBlock("action");
+            $this->tpl->parseCurrentBlock();
+        }
+
+        if ($ilAccess->checkAccess('write', '', $this->ref_id)) {
+            $ilCtrl->setParameter($this->parent_obj, 'reservation_id', $a_set['booking_reservation_id']);
+            $this->tpl->setVariable("URL_ACTION", $ilCtrl->getLinkTarget($this->parent_obj, 'rsvConfirmDelete'));
+            $ilCtrl->setParameter($this->parent_obj, 'reservation_id', "");
+            $this->tpl->setVariable("TXT_ACTION", $lng->txt('delete'));
+            $this->tpl->setCurrentBlock("action");
+            $this->tpl->parseCurrentBlock();
         }
 
         /* advsellist version

Modules/BookingManager/classes/class.ilObjBookingPoolGUI.php

@@ -1648,6 +1648,73 @@ public function rsvCancelObject()
         $this->logObject();
     }
 
+    public function rsvConfirmDeleteObject()
+    {
+        global $DIC;
+        if (!$this->checkPermissionBool("write")) {
+            ilUtil::sendFailure($this->lng->txt('permission_denied'), true);
+            $this->ctrl->redirect($this, 'log');
+        }
+
+        $this->tabs_gui->clearTargets();
+        $this->tabs_gui->setBackTarget(
+            $this->lng->txt("back"),
+            $this->ctrl->getLinkTarget($this, "log")
+        );
+
+        include_once 'Services/Utilities/classes/class.ilConfirmationGUI.php';
+        $conf = new ilConfirmationGUI();
+        $conf->setFormAction($this->ctrl->getFormAction($this, 'rsvDelete'));
+        $conf->setHeaderText($this->lng->txt('book_confirm_delete'));
+        $conf->setConfirm($this->lng->txt('book_set_delete'), 'rsvDelete');
+        $conf->setCancel($this->lng->txt('cancel'), 'log');
+
+        list($obj_id, $user_id, $from, $to) = explode("_", $DIC->http()->request()->getQueryParams()['reservation_id']);
+        $ids = ilBookingReservation::getCancelDetails($obj_id, $user_id, $from, $to);
+        $rsv = new ilBookingReservation($ids[0]);
+        $obj = new ilBookingObject($rsv->getObjectId());
+
+        $details = sprintf($this->lng->txt('X_reservations_of'), count($ids)) . ' ' . $obj->getTitle();
+        if ($this->object->getScheduleType() != ilObjBookingPool::TYPE_NO_SCHEDULE) {
+            $details .= ", " . ilDatePresentation::formatPeriod(
+                new ilDateTime($rsv->getFrom(), IL_CAL_UNIX),
+                new ilDateTime($rsv->getTo() + 1, IL_CAL_UNIX)
+            );
+        }
+
+        $conf->addItem('rsv_ids', implode(',', $ids), $details);
+        $this->tpl->setContent($conf->getHTML());
+    }
+
+    public function rsvDeleteObject()
+    {
+        global $DIC;
+        $get = $DIC->http()->request()->getParsedBody()['rsv_ids'];
+        if ($get) {
+            include_once 'Modules/BookingManager/classes/class.ilBookingReservation.php';
+            foreach (explode(',', $get) as $id) {
+                $res = new ilBookingReservation($id);
+                $obj = new ilBookingObject($res->getObjectId());
+                if ($obj->getPoolId() != $this->object->getId() || !$this->checkPermissionBool("write")) {
+                    ilUtil::sendFailure($this->lng->txt('permission_denied'), true);
+                    $this->ctrl->redirect($this, 'log');
+                }
+                if ($this->object->getScheduleType() != ilObjBookingPool::TYPE_NO_SCHEDULE) {
+                    $cal_entry_id = $res->getCalendarEntry();
+                    if ($cal_entry_id) {
+                        include_once 'Services/Calendar/classes/class.ilCalendarEntry.php';
+                        $entry = new ilCalendarEntry($cal_entry_id);
+                        $entry->delete();
+                    }
+                }
+                $res->delete();
+            }
+        }
+
+        ilUtil::sendSuccess($this->lng->txt('reservation_deleted'));
+        $this->logObject();
+    }
+
     public function rsvInUseObject()
     {
         $this->checkPermission("write");

Modules/BookingManager/classes/class.ilScheduleInputGUI.php

@@ -134,7 +134,7 @@ public function checkInput()
     public static function getPostData($a_post_var, $a_remove_invalid = true)
     {
         $res = array();
-        for ($loop = 0; $loop < 24; $loop++) {
+        for ($loop = 0; $loop < 240; $loop++) {
             $days = $_POST[$a_post_var . "_days~" . $loop];
             $from = self::parseTime(
                 $_POST[$a_post_var . "_from_hh~" . $loop],

Modules/BookingManager/templates/default/tpl.booking_reservation_row.html

@@ -48,6 +48,8 @@
 	</td>
 	<!-- END user_col -->
 	<td class="std">
+		<!-- BEGIN action -->
 		<a href="{URL_ACTION}">{TXT_ACTION}</a>
+		<!-- END action -->
 	</td>
 </tr>

Modules/Category/classes/class.ilCategoryXmlWriter.php

@@ -137,17 +137,15 @@ protected function buildTranslations()
         $this->xmlStartTag('Translations');
 
         $translations = $this->getCategory()->getObjectTranslation()->getLanguages();
-
-
         foreach ((array) $translations as $translation) {
             $this->xmlStartTag(
                 'Translation',
                 array(
                 'default' => (int) $translation['lang_default'],
-                'language' => $translation['lang'])
+                'language' => $translation['lang_code'])
             );
             $this->xmlElement('Title', array(), $translation['title']);
-            $this->xmlElement('Description', array(), $translation['desc']);
+            $this->xmlElement('Description', array(), $translation['description']);
             $this->xmlEndTag('Translation');
         }
         $this->xmlEndTag('Translations');

Modules/Category/classes/class.ilObjCategoryListGUI.php

@@ -145,4 +145,12 @@ public function getCommandLink($a_cmd)
 
         return $cmd_link;
     }
+
+    /**
+     * @inheritDoc
+     */
+    public function checkInfoPageOnAsynchronousRendering() : bool
+    {
+        return true;
+    }
 } // END class.ilObjCategoryGUI

Modules/Chatroom/chat/Bootstrap/SetupEnvironment.js

@@ -2,6 +2,7 @@ var CONST	= require('../Constants');
 var Container = require('../AppContainer');
 var Winston = require('winston');
 var Util = require('util');
+var DateHelper = require('../Helper/Date');
 
 
 /**
@@ -37,9 +38,9 @@ module.exports = function SetupEnvironment(result, callback) {
 				filename: logFile,
 				level: logLevel,
 				json: false,
-				timestamp: function(){
-					var date = new Date();
-					return date.toDateString() + ' ' + date.toTimeString();
+				timestamp: function() {
+					const t = new Date();
+					return DateHelper.iso8601DatetimeFormat(t) + DateHelper.iso8601TimezoneFormat(t);
 				},
 				formatter: function(options) {
 					return Util.format(
@@ -61,8 +62,8 @@ module.exports = function SetupEnvironment(result, callback) {
 			humanReadableUnhandledException: true,
 			json: false,
 			timestamp: function(){
-				var date = new Date();
-				return date.toDateString() + ' ' + date.toTimeString();
+				const t = new Date();
+				return DateHelper.iso8601DatetimeFormat(t) + DateHelper.iso8601TimezoneFormat(t);
 			},
 			formatter: function(options) {
 				return Util.format(

Modules/Chatroom/chat/Handler/AccessHandler.js

@@ -43,7 +43,7 @@ AccessHandler.prototype.canAccessRoom = function(socket, subscriberId, roomId) {
  * @param {Socket} socket
  */
 AccessHandler.prototype.disconnect = function(socket) {
-	Container.getLogger().info('Disconnected socket %s', socket.id);
+	Container.getLogger().debug('Disconnected socket %s', socket.id);
 	socket.disconnect();
 };
 

Modules/Chatroom/chat/Handler/AuthenticationHandler.js

@@ -9,7 +9,7 @@ module.exports = function(req, res, next) {
 		Container.getLogger().warn('Access denied cause of no permission for %s', req.params.namespace);
 		_accessDenied(res);
 	} else {
-		Container.getLogger().info('Access granted for %s', req.params.namespace);
+		Container.getLogger().debug('Access granted for %s', req.params.namespace);
 		next();
 	}
 };

Modules/Chatroom/chat/Handler/IMSocketHandler.js

@@ -2,7 +2,7 @@ var Container = require('../AppContainer');
 
 module.exports = function(socket) {
 
-	Container.getLogger().info('New IM Connection with SocketId: %s', socket.id);
+	Container.getLogger().debug('New IM Connection with SocketId: %s', socket.id);
 
 	socket.on('login', _getTask('ConversationLogin'));
 	socket.on('conversations', _getTask('ListConversations'));

Modules/Chatroom/chat/Handler/SocketHandler.js

@@ -2,7 +2,7 @@ var Container = require('../AppContainer');
 
 module.exports = function(socket) {
 
-	Container.getLogger().info('New Connection with SocketId: %s', socket.id);
+	Container.getLogger().debug('New Connection with SocketId: %s', socket.id);
 
 	socket.on('login', _getTask('Login'));
 	socket.on('enterRoom', _getTask('EnterRoom'));

Modules/Chatroom/chat/Helper/Date.js

@@ -16,6 +16,51 @@ DateHelper.prototype.getTimestamp = function() {
 	return date.getTime();
 };
 
+DateHelper.prototype.iso8601TimezoneFormat = function(date) {
+	let timezone_offset_i = date.getTimezoneOffset(),
+		offset_H = parseInt(Math.abs(timezone_offset_i / 60)),
+		offset_i = Math.abs(timezone_offset_i % 60),
+		timezone_standard;
+
+	if (offset_H < 10) {
+		offset_H = '0' + offset_H;
+	}
+
+	if (offset_i < 10) {
+		offset_i = '0' + offset_i;
+	}
+
+	if (timezone_offset_i < 0) {
+		timezone_standard = '+' + offset_H + ':' + offset_i;
+	} else if (timezone_offset_i > 0) {
+		timezone_standard = '-' + offset_H + ':' + offset_i;
+	} else if (timezone_offset_i === 0) {
+		timezone_standard = 'Z';
+	}
+
+	return timezone_standard
+};
+
+DateHelper.prototype.iso8601DatetimeFormat = function(date) {
+	let Y = date.getFullYear(),
+		m = date.getMonth() + 1,
+		d = date.getDate(),
+		H = date.getHours(),
+		i = date.getMinutes(),
+		s = date.getSeconds();
+
+	d = d < 10 ? '0' + d : d;
+	m = m < 10 ? '0' + m : m;
+	H = H < 10 ? '0' + H : H;
+	i = i < 10 ? '0' + i : i;
+	s = s < 10 ? '0' + s : s;
+
+	return [
+		Y + '-' + m + '-' + d +
+		'T' + H + ':' + i + ':' + s
+	].join("");
+};
+
 /**
  * @type {DateHelper}
  */