Skip to content

Commit

Permalink
Merge branch '6.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
@dtdesign
dtdesign committed Apr 15, 2024
2 parents 1e49678 + 70eba68 commit 7af6291
Show file tree
Hide file tree
Showing 7 changed files with 19 additions and 30 deletions.
2 changes: 1 addition & 1 deletion files/js/WoltLabSuite.Core.Conversation.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion files/js/WoltLabSuite.Core.Conversation.tiny.min.js
View file

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion files/lib/data/conversation/ConversationAction.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use wcf\system\user\notification\UserNotificationHandler;
use wcf\system\user\storage\UserStorageHandler;
use wcf\system\WCF;
use wcf\util\StringUtil;

/**
* Executes conversation-related actions.
Expand Down Expand Up @@ -856,7 +857,7 @@ public function getConversations(): array
);

return [
'content' => $conversation->getTitle(),
'content' => StringUtil::encodeHTML($conversation->getTitle()),
'image' => $image,
'isUnread' => $conversation->isNew(),
'link' => $link,
Expand Down
7 changes: 5 additions & 2 deletions files/lib/page/ConversationPage.class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -210,8 +210,7 @@ public function readData()
// update last visit time count
if (
$this->conversation->isNew()
&& (
$this->objectList->getMaxPostTime() > $this->conversation->lastVisitTime
&& ($this->objectList->getMaxPostTime() > $this->conversation->lastVisitTime
|| ($this->conversation->joinedAt && !\count($this->objectList))
)
) {
Expand Down Expand Up @@ -387,6 +386,10 @@ protected function goToLastPost()
$statement = WCF::getDB()->prepareStatement($sql, 1);
$statement->execute($this->objectList->getConditionBuilder()->getParameters());
$row = $statement->fetchArray();
if ($row === false) {
return;
}

HeaderUtil::redirect(
LinkHandler::getInstance()->getLink(
'Conversation',
Expand Down
2 changes: 1 addition & 1 deletion language/de.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
<item name="wcf.conversation.error.mailboxIsFull"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du hast{else}Sie haben{/if} das zulässige Limit für Konversationen bereits erreicht und {if LANGUAGE_USE_INFORMAL_VARIANT}kannst{else}können{/if} keine neuen Konversationen starten.]]></item>
<item name="wcf.conversation.message.editNote"><![CDATA[{$message->username} hat diese Nachricht {#$message->editCount} Mal editiert, zuletzt: {time time=$message->lastEditTime}.]]></item>
<item name="wcf.conversation.noParticipantsWarning"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du bist{else}Sie sind{/if} dabei, auf eine Konversation ohne weitere Teilnehmer zu antworten. Alle anderen Teilnehmer haben diese Konversation verlassen. Niemand wird {if LANGUAGE_USE_INFORMAL_VARIANT}deine{else}Ihre{/if} Nachricht lesen!]]></item>
<item name="wcf.conversation.invisibleParticipantWarning"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du nimmst{else}Sie nehmen{/if} gegenwärtig an dieser Konversation als unsichtbarer Teilnehmer teil. Sobald {if LANGUAGE_USE_INFORMAL_VARIANT}du eine Antwort verfasst{else}Sie eine Antwort verfassen{/if}, wird diese für alle sichtbar sein und {if LANGUAGE_USE_INFORMAL_VARIANT}du bist{else}Sie sind{/if} nicht nicht länger für andere Teilnehmer unsichtbar.]]></item>
<item name="wcf.conversation.invisibleParticipantWarning"><![CDATA[{if LANGUAGE_USE_INFORMAL_VARIANT}Du nimmst{else}Sie nehmen{/if} gegenwärtig an dieser Konversation als unsichtbarer Teilnehmer teil. Sobald {if LANGUAGE_USE_INFORMAL_VARIANT}du eine Antwort verfasst{else}Sie eine Antwort verfassen{/if}, wird diese für alle sichtbar sein und {if LANGUAGE_USE_INFORMAL_VARIANT}du bist{else}Sie sind{/if} nicht länger für andere Teilnehmer unsichtbar.]]></item>
<item name="wcf.conversation.message.permalink"><![CDATA[Permalink zur {#$startIndex}. Nachricht]]></item>
<item name="wcf.conversation.markAsRead.doubleClick"><![CDATA[Konversation durch Doppelklick als gelesen markieren]]></item>
<item name="wcf.conversation.visibility"><![CDATA[Leseberechtigung]]></item>
Expand Down
30 changes: 6 additions & 24 deletions package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<packagename language="de">WoltLab Suite Core: Konversationen</packagename>
<packagedescription>Private conversations between multiple users.</packagedescription>
<packagedescription language="de">Private Konversationen zwischen mehreren Benutzern.</packagedescription>
<version>6.0.0 RC 1</version>
<date>2023-09-15</date>
<version>6.0.7</version>
<date>2024-01-29</date>
</packageinformation>

<authorinformation>
Expand All @@ -15,7 +15,7 @@
</authorinformation>

<requiredpackages>
<requiredpackage minversion="6.0.0 RC 1">com.woltlab.wcf</requiredpackage>
<requiredpackage minversion="6.0.7">com.woltlab.wcf</requiredpackage>
</requiredpackages>

<excludedpackages>
Expand All @@ -40,28 +40,10 @@
<instruction type="page" />
</instructions>

<instructions type="update" fromversion="5.5.*">
<instruction type="file" />
<instruction type="database">acp/database/install_com.woltlab.wcf.conversation.php</instruction>
<instruction type="userGroupOption" />
<instruction type="template" />
<instruction type="acpTemplate" />
<instruction type="option" />
<instruction type="templateListener" />
<instruction type="language" />
<instruction type="objectType" />
<instruction type="clipboardAction" />
<instruction type="coreObject" />
<instruction type="userNotificationEvent" />
<instruction type="userOption" />
<instruction type="eventListener" />
<instruction type="page" />

<instruction type="fileDelete" />
<instruction type="templateDelete" />
<instructions type="update" fromversion="6.0.6">
<instruction type="template">templates_update.tar</instruction>
</instructions>

<instructions type="update" fromversion="6.0.0 Beta 1">
<instructions type="update" fromversion="6.0.7 dev 1">
<void/>
</instructions>
</package>
3 changes: 3 additions & 0 deletions templates/conversationList.tpl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,9 @@
<div class="boxContent">
{assign var='conversationCount' value=$__wcf->getConversationHandler()->getConversationCount()}
{assign var='maxConversationCount' value=$__wcf->session->getPermission('user.conversation.maxConversations')}
{if $maxConversationCount == 0}
{assign var='maxConversationCount' value=1}
{/if}
{assign var='conversationCountValue' value=$conversationCount/$maxConversationCount*100}
<meter class="conversationQuotaMeter" min="0" max="100" low="90" high="99" value="{$conversationCountValue|ceil}" aria-label="{lang}wcf.conversation.quota{/lang}">
{#$conversationCountValue}&nbsp;%
Expand Down

0 comments on commit 7af6291

Please sign in to comment.