Reformat SQL queries using spaces
authorMatthias Schmidt <gravatronics@live.com>
Tue, 19 Jan 2021 05:57:49 +0000 (06:57 +0100)
committerMatthias Schmidt <gravatronics@live.com>
Tue, 19 Jan 2021 05:57:49 +0000 (06:57 +0100)
19 files changed:
files/acp/install_com.woltlab.wcf.conversation.php
files/lib/data/conversation/Conversation.class.php
files/lib/data/conversation/ConversationAction.class.php
files/lib/data/conversation/ConversationEditor.class.php
files/lib/data/conversation/ConversationParticipantList.class.php
files/lib/data/conversation/FeedConversationList.class.php
files/lib/data/conversation/UserConversationList.class.php
files/lib/data/conversation/ViewableConversation.class.php
files/lib/data/conversation/label/ConversationLabelAction.class.php
files/lib/data/conversation/message/ConversationMessageAction.class.php
files/lib/data/modification/log/ConversationLogModificationLogList.class.php
files/lib/page/ConversationListPage.class.php
files/lib/page/ConversationPage.class.php
files/lib/system/clipboard/action/ConversationClipboardAction.class.php
files/lib/system/conversation/ConversationHandler.class.php
files/lib/system/importer/ConversationUserImporter.class.php
files/lib/system/search/ConversationMessageSearch.class.php
files/lib/system/worker/ConversationMessageRebuildDataWorker.class.php
files/lib/system/worker/ConversationRebuildDataWorker.class.php

index 7527b59e50e7a487a1564816eb002118fb24c790..05cfae848f5010fcc2d1a01f53a2a312447e665c 100644 (file)
@@ -12,22 +12,22 @@ use wcf\system\WCF;
 // set default mod permissions
 $group = new UserGroup(5);
 if ($group->groupID) {
-    $sql = "REPLACE INTO       wcf" . WCF_N . "_user_group_option_value
-                               (groupID, optionID, optionValue)
-               SELECT          5, optionID, 1
-               FROM            wcf" . WCF_N . "_user_group_option
-               WHERE           optionName LIKE 'mod.conversation.%'";
+    $sql = "REPLACE INTO    wcf" . WCF_N . "_user_group_option_value
+                            (groupID, optionID, optionValue)
+            SELECT          5, optionID, 1
+            FROM            wcf" . WCF_N . "_user_group_option
+            WHERE       optionName LIKE 'mod.conversation.%'";
     $statement = WCF::getDB()->prepareStatement($sql);
     $statement->execute();
 }
 
 $group = new UserGroup(6);
 if ($group->groupID) {
-    $sql = "REPLACE INTO       wcf" . WCF_N . "_user_group_option_value
-                               (groupID, optionID, optionValue)
-               SELECT          6, optionID, 1
-               FROM            wcf" . WCF_N . "_user_group_option
-               WHERE           optionName LIKE 'mod.conversation.%'";
+    $sql = "REPLACE INTO    wcf" . WCF_N . "_user_group_option_value
+                            (groupID, optionID, optionValue)
+            SELECT          6, optionID, 1
+            FROM            wcf" . WCF_N . "_user_group_option
+            WHERE           optionName LIKE 'mod.conversation.%'";
     $statement = WCF::getDB()->prepareStatement($sql);
     $statement->execute();
 }
index 5624c604793235e93e48adf3953c557b9099b478..5ebe5ca102654bab37c4a11980d418360b75b5de 100644 (file)
@@ -172,10 +172,10 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
             $userID = WCF::getUser()->userID;
         }
 
-        $sql = "SELECT *
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       WHERE   participantID = ?
-                               AND conversationID = ?";
+        $sql = "SELECT  *
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                WHERE   participantID = ?
+                    AND conversationID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([$userID, $this->conversationID]);
         $row = $statement->fetchArray();
@@ -193,11 +193,14 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
      */
     public static function getUserConversation($conversationID, $userID)
     {
-        $sql = "SELECT         conversation_to_user.*, conversation.*
-                       FROM            wcf" . WCF_N . "_conversation conversation
-                       LEFT JOIN       wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       ON              (conversation_to_user.participantID = ? AND conversation_to_user.conversationID = conversation.conversationID)
-                       WHERE           conversation.conversationID = ?";
+        $sql = "SELECT      conversation_to_user.*, conversation.*
+                FROM        wcf" . WCF_N . "_conversation conversation
+                LEFT JOIN   wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                ON          (
+                                conversation_to_user.participantID = ?
+                                AND conversation_to_user.conversationID = conversation.conversationID
+                            )
+                WHERE       conversation.conversationID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([$userID, $conversationID]);
         $row = $statement->fetchArray();
@@ -217,11 +220,14 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
     {
         $conditionBuilder = new PreparedStatementConditionBuilder();
         $conditionBuilder->add('conversation.conversationID IN (?)', [$conversationIDs]);
-        $sql = "SELECT         conversation_to_user.*, conversation.*
-                       FROM            wcf" . WCF_N . "_conversation conversation
-                       LEFT JOIN       wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       ON              (conversation_to_user.participantID = " . $userID . " AND conversation_to_user.conversationID = conversation.conversationID)
-                       " . $conditionBuilder;
+        $sql = "SELECT      conversation_to_user.*, conversation.*
+                FROM        wcf" . WCF_N . "_conversation conversation
+                LEFT JOIN   wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                ON          (
+                                conversation_to_user.participantID = " . $userID . "
+                                AND conversation_to_user.conversationID = conversation.conversationID
+                            )
+                " . $conditionBuilder;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditionBuilder->getParameters());
         $conversations = [];
@@ -299,9 +305,9 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
             $this->canAddUnrestricted = false;
             if ($this->isActiveParticipant()) {
                 $sql = "SELECT  joinedAt
-                                       FROM    wcf" . WCF_N . "_conversation_to_user
-                                       WHERE   conversationID = ?
-                                               AND participantID = ?";
+                        FROM    wcf" . WCF_N . "_conversation_to_user
+                        WHERE   conversationID = ?
+                            AND participantID = ?";
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute([
                     $this->conversationID,
@@ -357,9 +363,9 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
             $conditions->add("(hideConversation <> ? AND leftAt = ?)", [self::STATE_LEFT, 0]);
         }
 
-        $sql = "SELECT         participantID
-                       FROM            wcf" . WCF_N . "_conversation_to_user
-                       " . $conditions;
+        $sql = "SELECT  participantID
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
 
@@ -384,11 +390,11 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
             $conditions->add("conversation_to_user.leftByOwnChoice = ?", [1]);
         }
 
-        $sql = "SELECT         user_table.username
-                       FROM            wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       LEFT JOIN       wcf" . WCF_N . "_user user_table
-                       ON              (user_table.userID = conversation_to_user.participantID)
-                       " . $conditions;
+        $sql = "SELECT      user_table.username
+                FROM        wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                LEFT JOIN   wcf" . WCF_N . "_user user_table
+                ON          (user_table.userID = conversation_to_user.participantID)
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
 
@@ -419,10 +425,10 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
 
             if ($this->userID) {
                 // check if author has left the conversation
-                $sql = "SELECT hideConversation
-                                       FROM    wcf" . WCF_N . "_conversation_to_user
-                                       WHERE   conversationID = ?
-                                               AND participantID = ?";
+                $sql = "SELECT  hideConversation
+                        FROM    wcf" . WCF_N . "_conversation_to_user
+                        WHERE   conversationID = ?
+                            AND participantID = ?";
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute([$this->conversationID, $this->userID]);
                 $row = $statement->fetchArray();
@@ -446,9 +452,9 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
     {
         if ($this->isActiveParticipant === null) {
             $sql = "SELECT  leftAt
-                               FROM    wcf" . WCF_N . "_conversation_to_user
-                               WHERE   conversationID = ?
-                                       AND participantID = ?";
+                    FROM    wcf" . WCF_N . "_conversation_to_user
+                    WHERE   conversationID = ?
+                        AND participantID = ?";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute([
                 $this->conversationID,
@@ -489,9 +495,9 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
         $conditions->add("conversationID IN (?)", [$conversationIDs]);
         $conditions->add("userID = ?", [$userID]);
 
-        $sql = "SELECT conversationID
-                       FROM    wcf" . WCF_N . "_conversation
-                       " . $conditions;
+        $sql = "SELECT  conversationID
+                FROM    wcf" . WCF_N . "_conversation
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
         while ($row = $statement->fetchArray()) {
@@ -506,9 +512,9 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
             $conditions->add("participantID = ?", [$userID]);
             $conditions->add("hideConversation <> ?", [self::STATE_LEFT]);
 
-            $sql = "SELECT     conversationID
-                               FROM    wcf" . WCF_N . "_conversation_to_user
-                               " . $conditions;
+            $sql = "SELECT  conversationID
+                    FROM    wcf" . WCF_N . "_conversation_to_user
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
             while ($row = $statement->fetchArray()) {
@@ -615,8 +621,8 @@ class Conversation extends DatabaseObject implements IPopoverObject, IRouteContr
             $conditionBuilder = new PreparedStatementConditionBuilder();
             $conditionBuilder->add('groupID IN (?)', [$validGroupIDs]);
             $sql = "SELECT  DISTINCT userID
-                               FROM    wcf" . WCF_N . "_user_to_group
-                               " . $conditionBuilder;
+                    FROM    wcf" . WCF_N . "_user_to_group
+                    " . $conditionBuilder;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditionBuilder->getParameters());
             while ($userID = $statement->fetchColumn()) {
index 16706007f04f23648c88aab72e553fa4ba774f2c..75c31fabce6638074df2362c87510b54ff543950 100644 (file)
@@ -97,10 +97,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
             UserStorageHandler::getInstance()->reset($conversation->getParticipantIDs(), 'conversationCount');
 
             // mark conversation as read for the author
-            $sql = "UPDATE     wcf" . WCF_N . "_conversation_to_user
-                               SET     lastVisitTime = ?
-                               WHERE   participantID = ?
-                                       AND conversationID = ?";
+            $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                    SET     lastVisitTime = ?
+                    WHERE   participantID = ?
+                        AND conversationID = ?";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute([$data['time'], $data['userID'], $conversation->conversationID]);
         } else {
@@ -167,8 +167,8 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
             $conditions = new PreparedStatementConditionBuilder();
             $conditions->add("conversationID IN (?)", [$this->objectIDs]);
             $sql = "SELECT  DISTINCT participantID
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       " . $conditions;
+                    FROM    wcf" . WCF_N . "_conversation_to_user
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
 
@@ -282,10 +282,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
         }
 
         $conversationIDs = [];
-        $sql = "UPDATE wcf" . WCF_N . "_conversation_to_user
-                       SET     lastVisitTime = ?
-                       WHERE   participantID = ?
-                               AND conversationID = ?";
+        $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                SET     lastVisitTime = ?
+                WHERE   participantID = ?
+                    AND conversationID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         WCF::getDB()->beginTransaction();
         foreach ($this->getObjects() as $conversation) {
@@ -315,10 +315,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
             $conditionBuilder->add('conversation.conversationID IN (?)', [$conversationIDs]);
             $conditionBuilder->add('conversation.time <= ?', [$this->parameters['visitTime']]);
 
-            $sql = "SELECT             conversation.conversationID
-                               FROM            wcf" . WCF_N . "_conversation conversation,
-                                               wcf" . WCF_N . "_user_notification notification
-                               " . $conditionBuilder;
+            $sql = "SELECT  conversation.conversationID
+                    FROM    wcf" . WCF_N . "_conversation conversation,
+                            wcf" . WCF_N . "_user_notification notification
+                    " . $conditionBuilder;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditionBuilder->getParameters());
             $notificationObjectIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
@@ -344,10 +344,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
             $conditionBuilder->add('conversation_message.conversationID IN (?)', [$conversationIDs]);
             $conditionBuilder->add('conversation_message.time <= ?', [$this->parameters['visitTime']]);
 
-            $sql = "SELECT             conversation_message.messageID
-                               FROM            wcf" . WCF_N . "_conversation_message conversation_message,
-                                               wcf" . WCF_N . "_user_notification notification
-                               " . $conditionBuilder;
+            $sql = "SELECT  conversation_message.messageID
+                    FROM    wcf" . WCF_N . "_conversation_message conversation_message,
+                            wcf" . WCF_N . "_user_notification notification
+                    " . $conditionBuilder;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditionBuilder->getParameters());
             $notificationObjectIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
@@ -418,9 +418,9 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
      */
     public function markAllAsRead()
     {
-        $sql = "UPDATE wcf" . WCF_N . "_conversation_to_user
-                       SET     lastVisitTime = ?
-                       WHERE   participantID = ?";
+        $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                SET     lastVisitTime = ?
+                WHERE   participantID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([
             TIME_NOW,
@@ -651,10 +651,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
     public function getLeaveForm()
     {
         // get hidden state from first conversation (all others have the same state)
-        $sql = "SELECT hideConversation
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       WHERE   conversationID = ?
-                               AND participantID = ?";
+        $sql = "SELECT  hideConversation
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                WHERE   conversationID = ?
+                    AND participantID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([
             \current($this->objectIDs),
@@ -706,10 +706,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
      */
     public function hideConversation()
     {
-        $sql = "UPDATE wcf" . WCF_N . "_conversation_to_user
-                       SET     hideConversation = ?
-                       WHERE   conversationID = ?
-                               AND participantID = ?";
+        $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                SET     hideConversation = ?
+                WHERE   conversationID = ?
+                    AND participantID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
 
         WCF::getDB()->beginTransaction();
@@ -752,13 +752,15 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
             $conditionBuilder = new PreparedStatementConditionBuilder();
             $conditionBuilder->add('conversation.conversationID IN (?)', [$this->objectIDs]);
             $conditionBuilder->add('conversation_to_user.conversationID IS NULL');
-            $sql = "SELECT             DISTINCT conversation.conversationID
-                               FROM            wcf" . WCF_N . "_conversation conversation
-                               LEFT JOIN       wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                               ON              (       conversation_to_user.conversationID = conversation.conversationID
-                                               AND     conversation_to_user.hideConversation <> " . Conversation::STATE_LEFT . "
-                                               AND     conversation_to_user.participantID IS NOT NULL)
-                               " . $conditionBuilder;
+            $sql = "SELECT      DISTINCT conversation.conversationID
+                    FROM        wcf" . WCF_N . "_conversation conversation
+                    LEFT JOIN   wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                    ON          (
+                                    conversation_to_user.conversationID = conversation.conversationID
+                                    AND conversation_to_user.hideConversation <> " . Conversation::STATE_LEFT . "
+                                    AND conversation_to_user.participantID IS NOT NULL
+                                )
+                    " . $conditionBuilder;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditionBuilder->getParameters());
             $conversationIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
@@ -790,8 +792,24 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
      */
     public function getMixedConversationList()
     {
-        $sqlSelect = '  , (SELECT participantID FROM wcf' . WCF_N . '_conversation_to_user WHERE conversationID = conversation.conversationID AND participantID <> conversation.userID AND isInvisible = 0 ORDER BY username, participantID LIMIT 1) AS otherParticipantID
-                               , (SELECT username FROM wcf' . WCF_N . '_conversation_to_user WHERE conversationID = conversation.conversationID AND participantID <> conversation.userID AND isInvisible = 0 ORDER BY username, participantID LIMIT 1) AS otherParticipant';
+        $sqlSelect = '  , (
+            SELECT      participantID
+            FROM        wcf' . WCF_N . '_conversation_to_user
+            WHERE       conversationID = conversation.conversationID
+                    AND participantID <> conversation.userID
+                    AND isInvisible = 0
+            ORDER BY    username, participantID
+            LIMIT 1
+        ) AS otherParticipantID
+        , (
+            SELECT      username
+            FROM        wcf' . WCF_N . '_conversation_to_user
+            WHERE       conversationID = conversation.conversationID
+                    AND participantID <> conversation.userID
+                    AND isInvisible = 0
+            ORDER BY    username, participantID
+            LIMIT       1
+        ) AS otherParticipant';
 
         $unreadConversationList = new UserConversationList(WCF::getUser()->userID);
         $unreadConversationList->sqlSelects .= $sqlSelect;
@@ -1083,10 +1101,10 @@ class ConversationAction extends AbstractDatabaseObjectAction implements
         // collect number of messages for each conversation
         $conditionBuilder = new PreparedStatementConditionBuilder();
         $conditionBuilder->add('conversation_message.conversationID IN (?)', [$this->objectIDs]);
-        $sql = "SELECT         conversationID, COUNT(messageID) AS messages, SUM(attachments) AS attachments
-                       FROM            wcf" . WCF_N . "_conversation_message conversation_message
-                       " . $conditionBuilder . "
-                       GROUP BY        conversationID";
+        $sql = "SELECT      conversationID, COUNT(messageID) AS messages, SUM(attachments) AS attachments
+                FROM        wcf" . WCF_N . "_conversation_message conversation_message
+                " . $conditionBuilder . "
+                GROUP BY    conversationID";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditionBuilder->getParameters());
 
index 13b6706181a85c4471f4f2672f58ed98b729ed80..1bbf2118b35dccf693d2a9bed64a02140bc116f8 100644 (file)
@@ -47,9 +47,9 @@ class ConversationEditor extends DatabaseObjectEditor
      */
     public function resetParticipants()
     {
-        $sql = "DELETE FROM    wcf" . WCF_N . "_conversation_to_user
-                       WHERE           conversationID = ?
-                                       AND participantID <> ?";
+        $sql = "DELETE FROM wcf" . WCF_N . "_conversation_to_user
+                WHERE       conversationID = ?
+                        AND participantID <> ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([$this->conversationID, $this->userID]);
     }
@@ -68,9 +68,9 @@ class ConversationEditor extends DatabaseObjectEditor
             $conditions = new PreparedStatementConditionBuilder();
             $conditions->add("userID IN (?)", [\array_merge($participantIDs, $invisibleParticipantIDs)]);
 
-            $sql = "SELECT     userID, username
-                               FROM    wcf" . WCF_N . "_user
-                               " . $conditions;
+            $sql = "SELECT  userID, username
+                    FROM    wcf" . WCF_N . "_user
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
             while ($row = $statement->fetchArray()) {
@@ -80,11 +80,13 @@ class ConversationEditor extends DatabaseObjectEditor
 
         if (!empty($participantIDs)) {
             WCF::getDB()->beginTransaction();
-            $sql = "INSERT INTO                wcf" . WCF_N . "_conversation_to_user
-                                                       (conversationID, participantID, username, isInvisible, joinedAt)
-                               VALUES                  (?, ?, ?, ?, ?)
-                               ON DUPLICATE KEY
-                               UPDATE                  hideConversation = 0, leftAt = 0, leftByOwnChoice = 1";
+            $sql = "INSERT INTO wcf" . WCF_N . "_conversation_to_user
+                                (conversationID, participantID, username, isInvisible, joinedAt)
+                    VALUES      (?, ?, ?, ?, ?)
+                    ON DUPLICATE KEY
+                    UPDATE      hideConversation = 0,
+                                leftAt = 0,
+                                leftByOwnChoice = 1";
             $statement = WCF::getDB()->prepareStatement($sql);
 
             foreach ($participantIDs as $userID) {
@@ -101,9 +103,9 @@ class ConversationEditor extends DatabaseObjectEditor
 
         if (!empty($invisibleParticipantIDs)) {
             WCF::getDB()->beginTransaction();
-            $sql = "INSERT INTO                wcf" . WCF_N . "_conversation_to_user
-                                                       (conversationID, participantID, username, isInvisible)
-                               VALUES                  (?, ?, ?, ?)";
+            $sql = "INSERT INTO     wcf" . WCF_N . "_conversation_to_user
+                                    (conversationID, participantID, username, isInvisible)
+                    VALUES          (?, ?, ?, ?)";
             $statement = WCF::getDB()->prepareStatement($sql);
 
             foreach ($invisibleParticipantIDs as $userID) {
@@ -125,16 +127,16 @@ class ConversationEditor extends DatabaseObjectEditor
      */
     public function updateParticipantCount()
     {
-        $sql = "UPDATE wcf" . WCF_N . "_conversation conversation
-                       SET     participants = (
-                                       SELECT  COUNT(*) AS count
-                                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                                       WHERE   conversation_to_user.conversationID = conversation.conversationID
-                                               AND conversation_to_user.hideConversation <> ?
-                                               AND conversation_to_user.participantID <> ?
-                                               AND conversation_to_user.isInvisible = ?
-                               )
-                       WHERE   conversation.conversationID = ?";
+        $sql = "UPDATE  wcf" . WCF_N . "_conversation conversation
+                SET     participants = (
+                            SELECT  COUNT(*) AS count
+                            FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                            WHERE   conversation_to_user.conversationID = conversation.conversationID
+                                AND conversation_to_user.hideConversation <> ?
+                                AND conversation_to_user.participantID <> ?
+                                AND conversation_to_user.isInvisible = ?
+                        )
+                WHERE   conversation.conversationID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([
             Conversation::STATE_LEFT,
@@ -149,12 +151,12 @@ class ConversationEditor extends DatabaseObjectEditor
      */
     public function updateParticipantSummary()
     {
-        $sql = "SELECT         participantID AS userID, hideConversation, username
-                       FROM            wcf" . WCF_N . "_conversation_to_user
-                       WHERE           conversationID = ?
-                                       AND participantID <> ?
-                                       AND isInvisible = 0
-                       ORDER BY        username";
+        $sql = "SELECT      participantID AS userID, hideConversation, username
+                FROM        wcf" . WCF_N . "_conversation_to_user
+                WHERE       conversationID = ?
+                        AND participantID <> ?
+                        AND isInvisible = 0
+                ORDER BY    username";
         $statement = WCF::getDB()->prepareStatement($sql, 5);
         $statement->execute([$this->conversationID, $this->userID]);
 
@@ -169,18 +171,18 @@ class ConversationEditor extends DatabaseObjectEditor
     public function removeParticipant($userID)
     {
         $sql = "SELECT  joinedAt
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       WHERE   conversationID = ?
-                               AND participantID = ?";
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                WHERE   conversationID = ?
+                    AND participantID = ?";
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute([$this->conversationID, $userID]);
         $joinedAt = $statement->fetchSingleColumn();
 
         $sql = "SELECT  messageID
-                       FROM    wcf" . WCF_N . "_conversation_message
-                       WHERE   conversationID = ?
-                               AND time >= ?
-                               AND time <= ?";
+                FROM    wcf" . WCF_N . "_conversation_message
+                WHERE   conversationID = ?
+                    AND time >= ?
+                    AND time <= ?";
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute([
             $this->conversationID,
@@ -189,12 +191,12 @@ class ConversationEditor extends DatabaseObjectEditor
         ]);
         $lastMessageID = $statement->fetchSingleColumn();
 
-        $sql = "UPDATE wcf" . WCF_N . "_conversation_to_user
-                       SET     leftAt = ?,
-                               lastMessageID = ?,
-                               leftByOwnChoice = ?
-                       WHERE   conversationID = ?
-                               AND participantID = ?";
+        $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                SET     leftAt = ?,
+                        lastMessageID = ?,
+                        leftByOwnChoice = ?
+                WHERE   conversationID = ?
+                    AND participantID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([
             TIME_NOW,
@@ -217,10 +219,10 @@ class ConversationEditor extends DatabaseObjectEditor
      */
     public function updateFirstMessage()
     {
-        $sql = "SELECT         messageID
-                       FROM            wcf" . WCF_N . "_conversation_message
-                       WHERE           conversationID = ?
-                       ORDER BY        time ASC";
+        $sql = "SELECT      messageID
+                FROM        wcf" . WCF_N . "_conversation_message
+                WHERE       conversationID = ?
+                ORDER BY    time ASC";
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute([
             $this->conversationID,
@@ -236,10 +238,10 @@ class ConversationEditor extends DatabaseObjectEditor
      */
     public function updateLastMessage()
     {
-        $sql = "SELECT         time, userID, username
-                       FROM            wcf" . WCF_N . "_conversation_message
-                       WHERE           conversationID = ?
-                       ORDER BY        time DESC";
+        $sql = "SELECT      time, userID, username
+                FROM        wcf" . WCF_N . "_conversation_message
+                WHERE       conversationID = ?
+                ORDER BY    time DESC";
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute([
             $this->conversationID,
index 55c616019c1fa98d595abe0041bb43a9fc619ac8..6231635d9bf324e9238f11c92d34d85dd329df13 100644 (file)
@@ -66,10 +66,10 @@ class ConversationParticipantList extends UserProfileList
      */
     public function countObjects()
     {
-        $sql = "SELECT COUNT(*) AS count
-                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       " . $this->sqlConditionJoins . "
-                       " . $this->getConditionBuilder()->__toString();
+        $sql = "SELECT  COUNT(*) AS count
+                FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                " . $this->sqlConditionJoins . "
+                " . $this->getConditionBuilder()->__toString();
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($this->getConditionBuilder()->getParameters());
         $row = $statement->fetchArray();
@@ -83,11 +83,11 @@ class ConversationParticipantList extends UserProfileList
     public function readObjectIDs()
     {
         $this->objectIDs = [];
-        $sql = "SELECT conversation_to_user.participantID AS objectID
-                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                               " . $this->sqlConditionJoins . "
-                               " . $this->getConditionBuilder()->__toString() . "
-                               " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
+        $sql = "SELECT  conversation_to_user.participantID AS objectID
+                FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                " . $this->sqlConditionJoins . "
+                " . $this->getConditionBuilder()->__toString() . "
+                " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
         $statement = WCF::getDB()->prepareStatement($sql, $this->sqlLimit, $this->sqlOffset);
         $statement->execute($this->getConditionBuilder()->getParameters());
         $this->objectIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
@@ -101,10 +101,10 @@ class ConversationParticipantList extends UserProfileList
         parent::readObjects();
 
         // check for deleted users
-        $sql = "SELECT username
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       WHERE   conversationID = ?
-                               AND participantID IS NULL";
+        $sql = "SELECT  username
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                WHERE   conversationID = ?
+                    AND participantID IS NULL";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([$this->conversationID]);
         $i = 0;
index 701a8d6bcfd2dec4651ae46b6fcc88b88122d557..d58fdfd5b1c7ad83bde3d079b0d9d54bc4cf3b6c 100644 (file)
@@ -34,11 +34,11 @@ class FeedConversationList extends ConversationList
      */
     public function readObjectIDs()
     {
-        $sql = "SELECT conversation_to_user.conversationID AS objectID
-                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                               " . $this->sqlConditionJoins . "
-                               " . $this->getConditionBuilder() . "
-                               " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
+        $sql = "SELECT  conversation_to_user.conversationID AS objectID
+                FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                " . $this->sqlConditionJoins . "
+                " . $this->getConditionBuilder() . "
+                " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
         $statement = WCF::getDB()->prepareStatement($sql, $this->sqlLimit, $this->sqlOffset);
         $statement->execute($this->getConditionBuilder()->getParameters());
         $this->objectIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
index 0c7db3119a710bddc098a81b0f3270bdd731a0e0..ec15273467a253b748687332587a56d3ed2ed933 100644 (file)
@@ -76,10 +76,10 @@ class UserConversationList extends ConversationList
         // filter by label id
         if ($labelID) {
             $this->getConditionBuilder()->add("conversation.conversationID IN (
-                               SELECT  conversationID
-                               FROM    wcf" . WCF_N . "_conversation_label_to_object
-                               WHERE   labelID = ?
-                       )", [$labelID]);
+                SELECT  conversationID
+                FROM    wcf" . WCF_N . "_conversation_label_to_object
+                WHERE   labelID = ?
+            )", [$labelID]);
         }
 
         // own posts
@@ -119,10 +119,10 @@ class UserConversationList extends ConversationList
             return parent::countObjects();
         }
 
-        $sql = "SELECT COUNT(*) AS count
-                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       " . $this->sqlConditionJoins . "
-                       " . $this->getConditionBuilder()->__toString();
+        $sql = "SELECT  COUNT(*) AS count
+                FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                " . $this->sqlConditionJoins . "
+                " . $this->getConditionBuilder()->__toString();
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($this->getConditionBuilder()->getParameters());
         $row = $statement->fetchArray();
@@ -141,11 +141,11 @@ class UserConversationList extends ConversationList
             return;
         }
 
-        $sql = "SELECT conversation_to_user.conversationID AS objectID
-                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                               " . $this->sqlConditionJoins . "
-                               " . $this->getConditionBuilder()->__toString() . "
-                               " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
+        $sql = "SELECT  conversation_to_user.conversationID AS objectID
+                FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                    " . $this->sqlConditionJoins . "
+                    " . $this->getConditionBuilder()->__toString() . "
+                    " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
         $statement = WCF::getDB()->prepareStatement($sql, $this->sqlLimit, $this->sqlOffset);
         $statement->execute($this->getConditionBuilder()->getParameters());
         $this->objectIDs = $statement->fetchAll(\PDO::FETCH_COLUMN);
@@ -173,8 +173,8 @@ class UserConversationList extends ConversationList
                 $conditions = new PreparedStatementConditionBuilder();
                 $conditions->add("messageID IN (?)", [$messageIDs]);
                 $sql = "SELECT  messageID, userID, username, time
-                                       FROM    wcf" . WCF_N . "_conversation_message
-                                       " . $conditions;
+                        FROM    wcf" . WCF_N . "_conversation_message
+                        " . $conditions;
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute($conditions->getParameters());
                 $messageData = [];
@@ -248,9 +248,9 @@ class UserConversationList extends ConversationList
         $conditions->add("conversationID IN (?)", [\array_keys($this->objects)]);
         $conditions->add("labelID IN (?)", [\array_keys($labels)]);
 
-        $sql = "SELECT labelID, conversationID
-                       FROM    wcf" . WCF_N . "_conversation_label_to_object
-                       " . $conditions;
+        $sql = "SELECT  labelID, conversationID
+                FROM    wcf" . WCF_N . "_conversation_label_to_object
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
         $data = [];
index cf5ec1669e8fef482fe80cfa64f64e83a30e3ac9..cc9089580a29d8a7d5fafe1f4260fe2a4cfd08d1 100644 (file)
@@ -248,9 +248,9 @@ class ViewableConversation extends DatabaseObjectDecorator
             $conditions->add("conversationID = ?", [$conversation->conversationID]);
             $conditions->add("labelID IN (?)", [\array_keys($labels)]);
 
-            $sql = "SELECT     labelID
-                               FROM    wcf" . WCF_N . "_conversation_label_to_object
-                               " . $conditions;
+            $sql = "SELECT  labelID
+                    FROM    wcf" . WCF_N . "_conversation_label_to_object
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
             while ($row = $statement->fetchArray()) {
index 06348c20f84ae4ee51be347d85c9e69f0bc2edbf..0795888447f8768a8772938412fa5e3265b576b9 100644 (file)
@@ -190,9 +190,9 @@ class ConversationLabelAction extends AbstractDatabaseObjectAction
             $conditions->add("conversationID = ?", [$conversationID]);
             $conditions->add("labelID IN (?)", [$labelIDs]);
 
-            $sql = "SELECT     labelID
-                               FROM    wcf" . WCF_N . "_conversation_label_to_object
-                               " . $conditions;
+            $sql = "SELECT  labelID
+                    FROM    wcf" . WCF_N . "_conversation_label_to_object
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
             $assignedLabels = $statement->fetchAll(\PDO::FETCH_COLUMN);
@@ -256,16 +256,16 @@ class ConversationLabelAction extends AbstractDatabaseObjectAction
         $conditions->add("conversationID IN (?)", [$this->parameters['conversationIDs']]);
         $conditions->add("labelID IN (?)", [$labelIDs]);
 
-        $sql = "DELETE FROM    wcf" . WCF_N . "_conversation_label_to_object
-                       " . $conditions;
+        $sql = "DELETE FROM wcf" . WCF_N . "_conversation_label_to_object
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
 
         // assign label ids
         if (!empty($this->parameters['labelIDs'])) {
-            $sql = "INSERT INTO        wcf" . WCF_N . "_conversation_label_to_object
-                                               (labelID, conversationID)
-                               VALUES          (?, ?)";
+            $sql = "INSERT INTO wcf" . WCF_N . "_conversation_label_to_object
+                                (labelID, conversationID)
+                    VALUES      (?, ?)";
             $statement = WCF::getDB()->prepareStatement($sql);
 
             WCF::getDB()->beginTransaction();
index d1a89be0a632b09c25c6edfa9ac5cb1a91581565..5394fd701ea7e5429555b5ad76e93b8486daa64c 100644 (file)
@@ -129,10 +129,10 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
             $userConversation = Conversation::getUserConversation($conversation->conversationID, $message->userID);
             if ($userConversation !== null && $userConversation->isInvisible) {
                 // make invisible participant visible
-                $sql = "UPDATE wcf" . WCF_N . "_conversation_to_user
-                                       SET     isInvisible = 0
-                                       WHERE   participantID = ?
-                                               AND conversationID = ?";
+                $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                        SET     isInvisible = 0
+                        WHERE   participantID = ?
+                            AND conversationID = ?";
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute([$message->userID, $conversation->conversationID]);
 
@@ -141,10 +141,10 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
             }
 
             // reset visibility if it was hidden but not left
-            $sql = "UPDATE     wcf" . WCF_N . "_conversation_to_user
-                               SET     hideConversation = ?
-                               WHERE   conversationID = ?
-                                       AND hideConversation = ?";
+            $sql = "UPDATE  wcf" . WCF_N . "_conversation_to_user
+                    SET     hideConversation = ?
+                    WHERE   conversationID = ?
+                        AND hideConversation = ?";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute([
                 Conversation::STATE_DEFAULT,
@@ -611,9 +611,9 @@ class ConversationMessageAction extends AbstractDatabaseObjectAction implements
     {
         /** @var Conversation $conversation */
 
-        $sql = "SELECT COUNT(*) AS count
-                       FROM    wcf" . WCF_N . "_conversation_message
-                       WHERE   conversationID = ?";
+        $sql = "SELECT  COUNT(*) AS count
+                FROM    wcf" . WCF_N . "_conversation_message
+                WHERE   conversationID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([$conversation->conversationID]);
         $count = $statement->fetchArray();
index 7babf94a66b2b92a036a0c0202e82275c07b611b..c9fec3a0df2ca334fa7f7ae6f85a7fcebaa711ba 100644 (file)
@@ -44,10 +44,10 @@ class ConversationLogModificationLogList extends ModificationLogList
      */
     public function readObjects()
     {
-        $sql = "SELECT modification_log.*
-                       FROM    wcf" . WCF_N . "_modification_log modification_log
-                       " . $this->getConditionBuilder() . "
-                       " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
+        $sql = "SELECT  modification_log.*
+                FROM    wcf" . WCF_N . "_modification_log modification_log
+                " . $this->getConditionBuilder() . "
+                " . (!empty($this->sqlOrderBy) ? "ORDER BY " . $this->sqlOrderBy : '');
         $statement = WCF::getDB()->prepareStatement($sql, $this->sqlLimit, $this->sqlOffset);
         $statement->execute($this->getConditionBuilder()->getParameters());
         $this->objects = $statement->fetchObjects(($this->objectClassName ?: $this->className));
index 29d338ba74b728adf94d12071f74fa720735124c..f4de8aabfc2c6009e1c614948a6abbd03744d5f6 100644 (file)
@@ -165,8 +165,8 @@ class ConversationListPage extends SortablePage
             $conditions = new PreparedStatementConditionBuilder();
             $conditions->add('username IN (?)', [$this->participants]);
             $sql = "SELECT  userID
-                               FROM    wcf" . WCF_N . "_user
-                               " . $conditions;
+                    FROM    wcf" . WCF_N . "_user
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
             $userIDs = [];
@@ -185,32 +185,30 @@ class ConversationListPage extends SortablePage
                 //
                 // See https://github.com/WoltLab/com.woltlab.wcf.conversation/issues/131
                 $this->objectList->getConditionBuilder()->add('
-                                       (
-                                               (
-                                                       conversation.userID = ?
-                                                       AND
-                                                       conversation.conversationID IN (
-                                                               SELECT          conversationID
-                                                               FROM            wcf' . WCF_N . '_conversation_to_user
-                                                               WHERE           participantID IN (?)
-                                                               GROUP BY        conversationID
-                                                               HAVING          COUNT(conversationID) = ?
-                                                       )
-                                               )
-                                               OR
-                                               (
-                                                       conversation.userID <> ?
-                                                       AND
-                                                       conversation.conversationID IN (
-                                                               SELECT          conversationID
-                                                               FROM            wcf' . WCF_N . '_conversation_to_user
-                                                               WHERE           participantID IN (?)
-                                                                               AND isInvisible = ?
-                                                               GROUP BY        conversationID
-                                                               HAVING          COUNT(conversationID) = ?
-                                                       )
-                                               )
-                                       )', [
+                    (
+                        (
+                            conversation.userID = ?
+                            AND conversation.conversationID IN (
+                                SELECT      conversationID
+                                FROM        wcf' . WCF_N . '_conversation_to_user
+                                WHERE       participantID IN (?)
+                                GROUP BY    conversationID
+                                HAVING      COUNT(conversationID) = ?
+                            )
+                        )
+                        OR
+                        (
+                            conversation.userID <> ?
+                            AND conversation.conversationID IN (
+                                SELECT      conversationID
+                                FROM        wcf' . WCF_N . '_conversation_to_user
+                                WHERE       participantID IN (?)
+                                        AND isInvisible = ?
+                                GROUP BY    conversationID
+                                HAVING      COUNT(conversationID) = ?
+                            )
+                        )
+                    )', [
                     // Parameters for the first condition.
                     WCF::getUser()->userID,
                     $userIDs,
index 62d0ae8adee8b35f4abb3fb443a8813811e5903f..27420a416e21b6550fdf729ecef639d84ab52f02 100644 (file)
@@ -281,11 +281,11 @@ class ConversationPage extends MultipleLinkPage
         if ($count > 1) {
             $this->objectList->seek($count - 1);
             if ($this->objectList->current()->time < $this->conversation->lastPostTime) {
-                $sql = "SELECT          time
-                                       FROM            wcf" . WCF_N . "_conversation_message
-                                       WHERE           conversationID = ?
-                                                       AND time > ?
-                                       ORDER BY        time";
+                $sql = "SELECT      time
+                        FROM        wcf" . WCF_N . "_conversation_message
+                        WHERE       conversationID = ?
+                                AND time > ?
+                        ORDER BY    time";
                 $statement = WCF::getDB()->prepareStatement($sql, 1);
                 $statement->execute([$this->conversationID, $this->objectList->current()->time]);
                 $endTime = $statement->fetchSingleColumn() - 1;
@@ -360,9 +360,9 @@ class ConversationPage extends MultipleLinkPage
         $conditionBuilder = clone $this->objectList->getConditionBuilder();
         $conditionBuilder->add('time ' . ($this->sortOrder == 'ASC' ? '<=' : '>=') . ' ?', [$this->message->time]);
 
-        $sql = "SELECT COUNT(*) AS messages
-                       FROM    wcf" . WCF_N . "_conversation_message conversation_message
-                       " . $conditionBuilder;
+        $sql = "SELECT  COUNT(*) AS messages
+                FROM    wcf" . WCF_N . "_conversation_message conversation_message
+                " . $conditionBuilder;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditionBuilder->getParameters());
         $row = $statement->fetchArray();
@@ -374,10 +374,10 @@ class ConversationPage extends MultipleLinkPage
      */
     protected function goToLastPost()
     {
-        $sql = "SELECT         conversation_message.messageID
-                       FROM            wcf" . WCF_N . "_conversation_message conversation_message
-                       " . $this->objectList->getConditionBuilder() . "
-                       ORDER BY        time " . ($this->sortOrder == 'ASC' ? 'DESC' : 'ASC');
+        $sql = "SELECT      conversation_message.messageID
+                FROM        wcf" . WCF_N . "_conversation_message conversation_message
+                " . $this->objectList->getConditionBuilder() . "
+                ORDER BY    time " . ($this->sortOrder == 'ASC' ? 'DESC' : 'ASC');
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute($this->objectList->getConditionBuilder()->getParameters());
         $row = $statement->fetchArray();
@@ -403,10 +403,10 @@ class ConversationPage extends MultipleLinkPage
         $conditionBuilder = clone $this->objectList->getConditionBuilder();
         $conditionBuilder->add('time > ?', [$this->conversation->lastVisitTime]);
 
-        $sql = "SELECT         conversation_message.messageID
-                       FROM            wcf" . WCF_N . "_conversation_message conversation_message
-                       " . $conditionBuilder . "
-                       ORDER BY        time ASC";
+        $sql = "SELECT      conversation_message.messageID
+                FROM        wcf" . WCF_N . "_conversation_message conversation_message
+                " . $conditionBuilder . "
+                ORDER BY    time ASC";
         $statement = WCF::getDB()->prepareStatement($sql, 1);
         $statement->execute($conditionBuilder->getParameters());
         $row = $statement->fetchArray();
index a6674d482193238fe36dd178ae4a30704e1e47bd..f8c8342f5208ea28b71440793a79680354553f69 100644 (file)
@@ -66,9 +66,9 @@ class ConversationClipboardAction extends AbstractClipboardAction
         switch ($action->actionName) {
             case 'assignLabel':
                 // check if user has labels
-                $sql = "SELECT COUNT(*) AS count
-                                       FROM    wcf" . WCF_N . "_conversation_label
-                                       WHERE   userID = ?";
+                $sql = "SELECT  COUNT(*) AS count
+                        FROM    wcf" . WCF_N . "_conversation_label
+                        WHERE   userID = ?";
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute([WCF::getUser()->userID]);
                 $row = $statement->fetchArray();
@@ -155,9 +155,9 @@ class ConversationClipboardAction extends AbstractClipboardAction
             $conditions->add("conversationID IN (?)", [$conversationIDs]);
             $conditions->add("participantID = ?", [WCF::getUser()->userID]);
 
-            $sql = "SELECT     conversationID
-                               FROM    wcf" . WCF_N . "_conversation_to_user
-                               " . $conditions;
+            $sql = "SELECT  conversationID
+                    FROM    wcf" . WCF_N . "_conversation_to_user
+                    " . $conditions;
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute($conditions->getParameters());
             while ($row = $statement->fetchArray()) {
@@ -215,9 +215,9 @@ class ConversationClipboardAction extends AbstractClipboardAction
         $conditions->add("participantID = ?", [WCF::getUser()->userID]);
         $conditions->add("hideConversation <> ?", [1]);
 
-        $sql = "SELECT conversationID
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       " . $conditions;
+        $sql = "SELECT  conversationID
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
 
@@ -237,9 +237,9 @@ class ConversationClipboardAction extends AbstractClipboardAction
         $conditions->add("conversationID IN (?)", [\array_keys($this->conversations)]);
         $conditions->add("participantID = ?", [WCF::getUser()->userID]);
 
-        $sql = "SELECT conversationID, lastVisitTime
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       " . $conditions;
+        $sql = "SELECT  conversationID, lastVisitTime
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
         $lastVisitTime = [];
@@ -294,9 +294,9 @@ class ConversationClipboardAction extends AbstractClipboardAction
         $conditions->add("participantID = ?", [WCF::getUser()->userID]);
         $conditions->add("hideConversation <> ?", [0]);
 
-        $sql = "SELECT conversationID
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       " . $conditions;
+        $sql = "SELECT  conversationID
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                " . $conditions;
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute($conditions->getParameters());
 
index 37162d51ff2de36782ee258c5690eced8def84bd..5d895462edbeb3a6c037e45ea7dee57a29e75ca8 100644 (file)
@@ -63,10 +63,10 @@ class ConversationHandler extends SingletonFactory
                 $conditionBuilder->add('conversation_to_user.lastVisitTime < conversation.lastPostTime');
                 $conditionBuilder->add('conversation_to_user.leftAt = 0');
 
-                $sql = "SELECT COUNT(*) AS count
-                                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user,
-                                               wcf" . WCF_N . "_conversation conversation
-                                       " . $conditionBuilder;
+                $sql = "SELECT  COUNT(*) AS count
+                        FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user,
+                                wcf" . WCF_N . "_conversation conversation
+                        " . $conditionBuilder;
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute($conditionBuilder->getParameters());
                 $row = $statement->fetchArray();
@@ -116,13 +116,15 @@ class ConversationHandler extends SingletonFactory
                 $conditionBuilder2->add('conversation.userID = ?', [$userID]);
                 $conditionBuilder2->add('conversation.isDraft = 1');
 
-                $sql = "SELECT (SELECT COUNT(*)
-                                               FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                                               " . $conditionBuilder1->__toString() . ")
-                                               +
-                                               (SELECT COUNT(*)
-                                               FROM    wcf" . WCF_N . "_conversation conversation
-                                               " . $conditionBuilder2->__toString() . ") AS count";
+                $sql = "SELECT (
+                            SELECT  COUNT(*)
+                            FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                            " . $conditionBuilder1->__toString() . "
+                        ) + (
+                            SELECT  COUNT(*)
+                            FROM    wcf" . WCF_N . "_conversation conversation
+                            " . $conditionBuilder2->__toString() . "
+                        ) AS count";
                 $statement = WCF::getDB()->prepareStatement($sql);
                 $statement->execute(\array_merge(
                     $conditionBuilder1->getParameters(),
index 4cd97ad873f54b5301119a6b3fe26a17d7e3f0bb..e638ed3283fdc5c53aba19c8f5727ca113acf223 100644 (file)
@@ -26,12 +26,12 @@ class ConversationUserImporter extends AbstractImporter
         }
         $data['participantID'] = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.user', $data['participantID']);
 
-        $sql = "INSERT INTO                    wcf" . WCF_N . "_conversation_to_user
-                                                       (conversationID, participantID, username, hideConversation, isInvisible, lastVisitTime)
-                       VALUES                          (?, ?, ?, ?, ?, ?)
-                       ON DUPLICATE KEY UPDATE         hideConversation = IF(hideConversation > 0 AND hideConversation = VALUES(hideConversation),hideConversation,0),
-                                                       isInvisible = IF(isInvisible AND VALUES(isInvisible),1,0),
-                                                       lastVisitTime = GREATEST(lastVisitTime,VALUES(lastVisitTime))";
+        $sql = "INSERT INTO             wcf" . WCF_N . "_conversation_to_user
+                                        (conversationID, participantID, username, hideConversation, isInvisible, lastVisitTime)
+                VALUES                  (?, ?, ?, ?, ?, ?)
+                ON DUPLICATE KEY UPDATE hideConversation = IF(hideConversation > 0 AND hideConversation = VALUES(hideConversation),hideConversation,0),
+                                        isInvisible = IF(isInvisible AND VALUES(isInvisible),1,0),
+                                        lastVisitTime = GREATEST(lastVisitTime,VALUES(lastVisitTime))";
         $statement = WCF::getDB()->prepareStatement($sql);
         $statement->execute([
             $data['conversationID'],
@@ -44,9 +44,9 @@ class ConversationUserImporter extends AbstractImporter
 
         // save labels
         if ($data['participantID'] && !empty($additionalData['labelIDs'])) {
-            $sql = "INSERT IGNORE INTO         wcf" . WCF_N . "_conversation_label_to_object
-                                                               (labelID, conversationID)
-                               VALUES                          (?, ?)";
+            $sql = "INSERT IGNORE INTO  wcf" . WCF_N . "_conversation_label_to_object
+                                        (labelID, conversationID)
+                    VALUES              (?, ?)";
             $statement = WCF::getDB()->prepareStatement($sql);
             foreach ($additionalData['labelIDs'] as $labelID) {
                 $labelID = ImportHandler::getInstance()->getNewID('com.woltlab.wcf.conversation.label', $labelID);
index 190e78a2ca9fa3ea31e3fa5167ad61b2afe49028..ace6d308a25352390fa01457c0a315ad4f41600b 100644 (file)
@@ -76,8 +76,13 @@ class ConversationMessageSearch extends AbstractSearchableObjectType
      */
     public function getJoins()
     {
-        return "JOIN wcf" . WCF_N . "_conversation_to_user conversation_to_user ON (conversation_to_user.participantID = " . WCF::getUser()->userID . " AND conversation_to_user.conversationID = " . $this->getTableName() . ".conversationID)
-                       LEFT JOIN wcf" . WCF_N . "_conversation conversation ON (conversation.conversationID = " . $this->getTableName() . ".conversationID)";
+        return "    JOIN        wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                    ON          (
+                                    conversation_to_user.participantID = " . WCF::getUser()->userID . "
+                                    AND conversation_to_user.conversationID = " . $this->getTableName() . ".conversationID
+                                )
+                    LEFT JOIN   wcf" . WCF_N . "_conversation conversation
+                    ON          (conversation.conversationID = " . $this->getTableName() . ".conversationID)";
     }
 
     /**
index ad018d4f5f6d9c3c424ef25db2582ad712fcfa60..db32f51f33b9e7305c7d3b50f0eb310e3186143d 100644 (file)
@@ -40,8 +40,8 @@ class ConversationMessageRebuildDataWorker extends AbstractRebuildDataWorker
     {
         if ($this->count === null) {
             $this->count = 0;
-            $sql = "SELECT     MAX(messageID) AS messageID
-                               FROM    wcf" . WCF_N . "_conversation_message";
+            $sql = "SELECT  MAX(messageID) AS messageID
+                    FROM    wcf" . WCF_N . "_conversation_message";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute();
             $row = $statement->fetchArray();
@@ -85,10 +85,10 @@ class ConversationMessageRebuildDataWorker extends AbstractRebuildDataWorker
         // prepare statements
         $attachmentObjectType = ObjectTypeCache::getInstance()
             ->getObjectTypeByName('com.woltlab.wcf.attachment.objectType', 'com.woltlab.wcf.conversation.message');
-        $sql = "SELECT         COUNT(*) AS attachments
-                       FROM            wcf" . WCF_N . "_attachment
-                       WHERE           objectTypeID = ?
-                                       AND objectID = ?";
+        $sql = "SELECT  COUNT(*) AS attachments
+                FROM    wcf" . WCF_N . "_attachment
+                WHERE   objectTypeID = ?
+                    AND objectID = ?";
         $attachmentStatement = WCF::getDB()->prepareStatement($sql);
 
         // retrieve permissions
@@ -152,11 +152,11 @@ class ConversationMessageRebuildDataWorker extends AbstractRebuildDataWorker
         }
 
         $sql = "UPDATE  wcf" . WCF_N . "_conversation_message
-                       SET     attachments = ?,
-                               message = ?,
-                               enableHtml = ?,
-                               hasEmbeddedObjects = ?
-                       WHERE   messageID = ?";
+                SET     attachments = ?,
+                        message = ?,
+                        enableHtml = ?,
+                        hasEmbeddedObjects = ?
+                WHERE   messageID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
 
         WCF::getDB()->beginTransaction();
index 881bc61179acb89fad83414ce52495a284404916..7d6b20e04e1e770ca166a70419fb7611a49d7a42 100644 (file)
@@ -32,8 +32,8 @@ class ConversationRebuildDataWorker extends AbstractRebuildDataWorker
     {
         if ($this->count === null) {
             $this->count = 0;
-            $sql = "SELECT     MAX(conversationID) AS conversationID
-                               FROM    wcf" . WCF_N . "_conversation";
+            $sql = "SELECT  MAX(conversationID) AS conversationID
+                    FROM    wcf" . WCF_N . "_conversation";
             $statement = WCF::getDB()->prepareStatement($sql);
             $statement->execute();
             $row = $statement->fetchArray();
@@ -65,43 +65,43 @@ class ConversationRebuildDataWorker extends AbstractRebuildDataWorker
         parent::execute();
 
         // prepare statements
-        $sql = "SELECT         messageID, time, userID, username
-                       FROM            wcf" . WCF_N . "_conversation_message
-                       WHERE           conversationID = ?
-                       ORDER BY        time";
+        $sql = "SELECT      messageID, time, userID, username
+                FROM        wcf" . WCF_N . "_conversation_message
+                WHERE       conversationID = ?
+                ORDER BY    time";
         $firstMessageStatement = WCF::getDB()->prepareStatement($sql, 1);
-        $sql = "SELECT         time, userID, username
-                       FROM            wcf" . WCF_N . "_conversation_message
-                       WHERE           conversationID = ?
-                       ORDER BY        time DESC";
+        $sql = "SELECT      time, userID, username
+                FROM        wcf" . WCF_N . "_conversation_message
+                WHERE       conversationID = ?
+                ORDER BY    time DESC";
         $lastMessageStatement = WCF::getDB()->prepareStatement($sql, 1);
-        $sql = "SELECT COUNT(*) AS messages,
-                               SUM(attachments) AS attachments
-                       FROM    wcf" . WCF_N . "_conversation_message
-                       WHERE   conversationID = ?";
+        $sql = "SELECT  COUNT(*) AS messages,
+                        SUM(attachments) AS attachments
+                FROM    wcf" . WCF_N . "_conversation_message
+                WHERE   conversationID = ?";
         $statsStatement = WCF::getDB()->prepareStatement($sql);
-        $sql = "SELECT COUNT(*) AS participants
-                       FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       WHERE   conversation_to_user.conversationID = ?
-                               AND conversation_to_user.hideConversation <> ?
-                               AND conversation_to_user.participantID <> ?
-                               AND conversation_to_user.isInvisible = ?";
+        $sql = "SELECT  COUNT(*) AS participants
+                FROM    wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                WHERE   conversation_to_user.conversationID = ?
+                    AND conversation_to_user.hideConversation <> ?
+                    AND conversation_to_user.participantID <> ?
+                    AND conversation_to_user.isInvisible = ?";
         $participantCounterStatement = WCF::getDB()->prepareStatement($sql);
-        $sql = "SELECT         conversation_to_user.participantID AS userID, conversation_to_user.hideConversation, user_table.username
-                       FROM            wcf" . WCF_N . "_conversation_to_user conversation_to_user
-                       LEFT JOIN       wcf" . WCF_N . "_user user_table
-                       ON              (user_table.userID = conversation_to_user.participantID)
-                       WHERE           conversation_to_user.conversationID = ?
-                                       AND conversation_to_user.participantID <> ?
-                                       AND conversation_to_user.isInvisible = ?
-                       ORDER BY        user_table.username";
+        $sql = "SELECT      conversation_to_user.participantID AS userID, conversation_to_user.hideConversation, user_table.username
+                FROM        wcf" . WCF_N . "_conversation_to_user conversation_to_user
+                LEFT JOIN   wcf" . WCF_N . "_user user_table
+                ON          (user_table.userID = conversation_to_user.participantID)
+                WHERE       conversation_to_user.conversationID = ?
+                        AND conversation_to_user.participantID <> ?
+                        AND conversation_to_user.isInvisible = ?
+                ORDER BY    user_table.username";
         $participantStatement = WCF::getDB()->prepareStatement($sql, 5);
 
-        $sql = "SELECT COUNT(*) AS participants
-                       FROM    wcf" . WCF_N . "_conversation_to_user
-                       WHERE   conversationID = ?
-                               AND hideConversation <> ?
-                               AND participantID IS NOT NULL";
+        $sql = "SELECT  COUNT(*) AS participants
+                FROM    wcf" . WCF_N . "_conversation_to_user
+                WHERE   conversationID = ?
+                    AND hideConversation <> ?
+                    AND participantID IS NOT NULL";
         $existingParticipantStatement = WCF::getDB()->prepareStatement($sql);
 
         $obsoleteConversations = [];
@@ -180,17 +180,17 @@ class ConversationRebuildDataWorker extends AbstractRebuildDataWorker
         }
 
         $sql = "UPDATE  wcf" . WCF_N . "_conversation
-                       SET     firstMessageID = ?,
-                               lastPostTime = ?,
-                               lastPosterID = ?,
-                               lastPoster = ?,
-                               userID = ?,
-                               username = ?,
-                               replies = ?,
-                               attachments = ?,
-                               participants = ?,
-                               participantSummary = ?
-                       WHERE   conversationID = ?";
+                SET     firstMessageID = ?,
+                        lastPostTime = ?,
+                        lastPosterID = ?,
+                        lastPoster = ?,
+                        userID = ?,
+                        username = ?,
+                        replies = ?,
+                        attachments = ?,
+                        participants = ?,
+                        participantSummary = ?
+                WHERE   conversationID = ?";
         $statement = WCF::getDB()->prepareStatement($sql);
 
         WCF::getDB()->beginTransaction();