Merge branch 'trunk_font_sizes' into trunk_font_size

Author: ezenzen

.gitignore

@@ -51,6 +51,7 @@ virtual-data
 captainhook.config.json
 captainhook.local.json
 .phpunit.result.cache
+.php-cs-fixer.cache
 
 # File Delivery
 override.php

Modules/Chatroom/GlobalScreen/ChatInvitationNotificationProvider.php

@@ -0,0 +1,108 @@
+<?php declare(strict_types=1);
+
+namespace ILIAS\Chatroom\GlobalScreen;
+
+use ilDatePresentation;
+use ilDateTime;
+use ILIAS\GlobalScreen\Scope\Notification\Provider\AbstractNotificationProvider;
+use ILIAS\UI\Component\Symbol\Icon\Standard;
+use ilNotificationOSDHandler;
+
+/******************************************************************************
+ *
+ * This file is part of ILIAS, a powerful learning management system.
+ *
+ * ILIAS is licensed with the GPL-3.0, you should have received a copy
+ * of said license along with the source code.
+ *
+ * If this is not the case or you just want to try ILIAS, you'll find
+ * us at:
+ * https://www.ilias.de
+ * https://github.com/ILIAS-eLearning
+ *
+ *****************************************************************************/
+class ChatInvitationNotificationProvider extends AbstractNotificationProvider
+{
+
+    /**
+     * @inheritDoc
+     */
+    public function getNotifications() : array
+    {
+        if (0 === $this->dic->user()->getId() || $this->dic->user()->isAnonymous()) {
+            return [];
+        }
+
+        $invitations = [];
+        $latest_time = 0;
+        foreach (ilNotificationOSDHandler::getNotificationsForUser(
+            $this->dic->user()->getId(),
+            true,
+            0,
+            'chat_invitation'
+        ) as $osd) {
+            $invitations[] = $osd;
+            if ($latest_time < (int) $osd['time_added']) {
+                $latest_time = (int) $osd['time_added'];
+            }
+        }
+
+        $this->dic->language()->loadLanguageModule('chatroom');
+        $notificationItem = $this->dic->ui()->factory()->item()->notification(
+            $this->dic->language()->txt('chat_invitations'),
+            $this->dic->ui()->factory()->symbol()->icon()->standard(Standard::CHTA, 'chat_invitations')
+                ->withIsOutlined(true)
+        )
+        ->withDescription($this->dic->language()->txt('chat_invitation_nc_no_inv'));
+
+        if (count($invitations) !== 0) {
+            foreach ($invitations as $invitation) {
+                $link = '';
+                if (count($invitation['data']->links) === 1) {
+                    $link = $this->dic->ui()->renderer()->render(
+                        $this->dic->ui()->factory()->link()->standard(
+                            $invitation['data']->shortDescription,
+                            $invitation['data']->links[0]->getUrl()
+                        )
+                    );
+                }
+                $aggregatedItems[] = $this->dic->ui()->factory()->item()->notification(
+                    $invitation['data']->title,
+                    $this->dic->ui()->factory()->symbol()->icon()->standard(Standard::CHTA, 'chat_invitations')
+                              ->withIsOutlined(true)
+                )
+                ->withDescription($link)
+                ->withProperties([
+                    $this->dic->language()->txt('time') => ilDatePresentation::formatDate(
+                        new ilDateTime($osd['time_added'], IL_CAL_UNIX)
+                    )
+                ]);
+            }
+
+            $notificationItem = $this->dic->ui()->factory()->item()->notification(
+                $this->dic->ui()->factory()->link()->standard($this->dic->language()->txt('chat_invitations'), '#'),
+                $this->dic->ui()->factory()->symbol()->icon()->standard(Standard::CHTA, 'chat_invitations')
+                          ->withIsOutlined(true)
+            )
+                ->withAggregateNotifications($aggregatedItems)
+                ->withDescription(sprintf($this->dic->language()->txt('chat_invitation_nc_inv_x'), count($aggregatedItems)))
+                ->withProperties([
+                    $this->dic->language()->txt('time') => ilDatePresentation::formatDate(
+                        new ilDateTime($latest_time, IL_CAL_UNIX)
+                    )
+                ]);
+        } else {
+            return [];
+        }
+
+        return [
+            $this->globalScreen()->notifications()->factory()->standardGroup($this->if->identifier('chat_invitation_bucket_group'))
+                 ->withTitle('Chat')
+                 ->addNotification(
+                     $this->globalScreen()->notifications()->factory()->standard($this->if->identifier('chat_invitation_bucket'))
+                          ->withNotificationItem($notificationItem)
+                          ->withNewAmount(count($invitations))
+                 )
+        ];
+    }
+}

Modules/Chatroom/README.md

@@ -285,12 +285,9 @@ client.cfg:
 ```json
 {
     "name": "onscreen",
-    "enable_osd": false,
     "enable_osc": true,
-    "osd_intervall": 60,
     "chat_enabled": true,
     "enable_smilies": true,
-    "play_invitation_sound": false,
     "auth": {
     "key": "0cdc8989-d5f0-1111-4444-244320d9dabc",
     "secret": "f7471a0e-c454-2222-3333-bb0f1b5d4123"

Modules/Chatroom/classes/admingui/class.ilChatroomAdminSmileyGUI.php

@@ -24,7 +24,7 @@ public function executeDefault(string $requestedMethod) : void
      */
     public function view() : void
     {
-        ilChatroom::checkUserPermissions('read', $this->gui->ref_id);
+        ilChatroom::checkUserPermissions('read', $this->gui->getRefId());
 
         $this->gui->switchToVisibleMode();
 
@@ -121,10 +121,10 @@ private static function _insertDefaultValues() : void
      */
     public function editSmiliesObject() : void
     {
-        if (!$this->rbacsystem->checkAccess('read', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('read', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_read'),
-                $this->gui->ilias->error_obj->MESSAGE
+                $this->ilias->error_obj->MESSAGE
             );
         }
 
@@ -143,7 +143,7 @@ public function editSmiliesObject() : void
             'Modules/Chatroom'
         );
         $tpl_smilies->setVariable('SMILEY_TABLE', $table);
-        $tpl_smilies->setVariable('SMILEY_FORM', $this->form_gui->getHtml());
+        $tpl_smilies->setVariable('SMILEY_FORM', $this->form_gui->getHTML());
 
         $this->mainTpl->setContent($tpl_smilies->get());
     }
@@ -188,7 +188,7 @@ public function initSmiliesForm() : ilPropertyFormGUI
         $this->form_gui->addItem($inp);
 
 
-        if ($this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if ($this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->form_gui->addCommandButton(
                 'smiley-uploadSmileyObject',
                 $DIC->language()->txt('chatroom_upload_smiley')
@@ -206,7 +206,7 @@ public function showEditSmileyEntryFormObject() : void
     {
         $this->gui->switchToVisibleMode();
 
-        if (!$this->rbacsystem->checkAccess('read', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('read', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_read'),
                 $this->ilias->error_obj->MESSAGE
@@ -239,13 +239,11 @@ protected function getSmileyFormDataById(int $smileyId) : array
     {
         $smiley = ilChatroomSmilies::_getSmiley($smileyId);
 
-        $form_data = [
+        return [
             'chatroom_smiley_id' => $smiley['smiley_id'],
             'chatroom_smiley_keywords' => $smiley['smiley_keywords'],
             'chatroom_current_smiley_image_path' => $smiley['smiley_fullpath'],
         ];
-
-        return $form_data;
     }
 
     /**
@@ -322,7 +320,7 @@ public function showDeleteSmileyFormObject() : void
     {
         $this->gui->switchToVisibleMode();
 
-        if (!$this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_write'),
                 $this->ilias->error_obj->MESSAGE
@@ -349,7 +347,7 @@ public function showDeleteSmileyFormObject() : void
 
     public function deleteSmileyObject() : void
     {
-        if (!$this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_write'),
                 $this->ilias->error_obj->MESSAGE
@@ -368,7 +366,7 @@ public function deleteSmileyObject() : void
 
     public function updateSmiliesObject() : void
     {
-        if (!$this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_write'),
                 $this->ilias->error_obj->MESSAGE
@@ -434,7 +432,7 @@ public function deleteMultipleObject() : void
     {
         $this->gui->switchToVisibleMode();
 
-        if (!$this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_write'),
                 $this->ilias->error_obj->MESSAGE
@@ -478,7 +476,7 @@ public function deleteMultipleObject() : void
 
     public function confirmedDeleteMultipleObject() : void
     {
-        if (!$this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_write'),
                 $this->ilias->error_obj->MESSAGE
@@ -504,7 +502,7 @@ public function confirmedDeleteMultipleObject() : void
 
     public function uploadSmileyObject() : void
     {
-        if (!$this->rbacsystem->checkAccess('write', $this->gui->ref_id)) {
+        if (!$this->rbacsystem->checkAccess('write', $this->gui->getRefId())) {
             $this->ilias->raiseError(
                 $this->ilLng->txt('msg_no_perm_write'),
                 $this->ilias->error_obj->MESSAGE

Modules/Chatroom/classes/admingui/class.ilChatroomAdminViewGUI.php

@@ -111,33 +111,25 @@ public function saveClientSettings() : void
 
         $settings = array(
             'name' => (string) $form->getInput('client_name'),
-            'enable_osd' => (bool) $form->getInput('enable_osd'),
             'enable_osc' => (bool) $form->getInput('enable_osc'),
             'enable_browser_notifications' => (bool) $form->getInput('enable_browser_notifications'),
             'conversation_idle_state_in_minutes' => $convIdleStateTime,
-            'osd_intervall' => (int) $form->getInput('osd_intervall'),
             'chat_enabled' => (bool) $form->getInput('chat_enabled'),
             'enable_smilies' => (bool) $form->getInput('enable_smilies'),
-            'play_invitation_sound' => (bool) $form->getInput('play_invitation_sound'),
             'auth' => $form->getInput('auth')
         );
 
         if (!$settings['chat_enabled']) {
             $settings['enable_osc'] = false;
         }
 
-        $notificationSettings = new ilSetting('notifications');
-        $notificationSettings->set('osd_polling_intervall', (string) ((int) $form->getInput('osd_intervall')));
-        $notificationSettings->set('enable_osd', (string) ((bool) $form->getInput('enable_osd')));
-
         $chatSettings = new ilSetting('chatroom');
         $chatSettings->set('chat_enabled', (string) $settings['chat_enabled']);
         $chatSettings->set('enable_browser_notifications', (string) $settings['enable_browser_notifications']);
         $chatSettings->set('conversation_idle_state_in_minutes', (string) $convIdleStateTime);
         $chatSettings->set('enable_osc', (string) $settings['enable_osc']);
-        $chatSettings->set('play_invitation_sound', (string) ((bool) $form->getInput('play_invitation_sound')));
 
-        $adminSettings = new ilChatroomAdmin($this->gui->object->getId());
+        $adminSettings = new ilChatroomAdmin($this->gui->getObject()->getId());
         $adminSettings->saveClientSettings((object) $settings);
 
         $fileHandler = new ilChatroomConfigFileHandler();
@@ -154,7 +146,7 @@ public function clientsettings(ilPropertyFormGUI $form = null) : void
         $this->defaultActions();
         $this->gui->switchToVisibleMode();
 
-        $adminSettings = new ilChatroomAdmin($this->gui->object->getId());
+        $adminSettings = new ilChatroomAdmin($this->gui->getObject()->getId());
         $serverSettings = $adminSettings->loadGeneralSettings();
 
         if ($form === null) {
@@ -167,7 +159,7 @@ public function clientsettings(ilPropertyFormGUI $form = null) : void
         $this->checkServerConnection($serverSettings);
 
         $form->setTitle($this->ilLng->txt('general_settings_title'));
-        if (ilChatroom::checkUserPermissions('write', $this->gui->ref_id, false)) {
+        if (ilChatroom::checkUserPermissions('write', $this->gui->getRefId(), false)) {
             $form->addCommandButton('view-saveClientSettings', $this->ilLng->txt('save'));
         } else {
             $form->getItemByPostVar('auth')->setIsReadOnly(true);

Modules/Chatroom/classes/class.ilBannedUsersTableGUI.php

@@ -9,7 +9,7 @@
  */
 class ilBannedUsersTableGUI extends ilTable2GUI
 {
-    public function __construct(ilObjChatroomGUI $a_parent_obj, string $a_parent_cmd)
+    public function __construct(ilChatroomObjectGUI $a_parent_obj, string $a_parent_cmd)
     {
         $this->setId('banned_users');